96777 2012-09-14 07:04:53 -0700 [GTK] Don't use the C API internally in WebKitFormSubmissionRequest 2012-10-18 08:49:31 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 96775 96766 96778 99705 1 cgarcia webkit-unassigned gustavo mario mrobinson webkit.review.bot oldest_to_newest 720713 0 cgarcia 2012-09-14 07:04:53 -0700 Use the C++ classes instead. 720716 1 164137 cgarcia 2012-09-14 07:06:30 -0700 Created attachment 164137 Patch 720723 2 webkit.review.bot 2012-09-14 07:10:46 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 733444 3 164137 mario 2012-10-03 01:42:22 -0700 Comment on attachment 164137 Patch Nothing to comment. Looks good to me 742951 4 168889 cgarcia 2012-10-16 01:33:56 -0700 Created attachment 168889 Patch updated to build on current git master Updated patch after the hash map first/second rename 745158 5 168889 xan.lopez 2012-10-18 04:51:52 -0700 Comment on attachment 168889 Patch updated to build on current git master View in context: https://bugs.webkit.org/attachment.cgi?id=168889&action=review > Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h:26 > +using namespace WebKit; I believe the coding style advises against this kind of thing, see the section about the 'using' directive. So not sure if you are just missing some include here or need to qualify the types directly. 745164 6 cgarcia 2012-10-18 05:00:08 -0700 (In reply to comment #5) > (From update of attachment 168889 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=168889&action=review > > > Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequestPrivate.h:26 > > +using namespace WebKit; > > I believe the coding style advises against this kind of thing, see the section about the 'using' directive. So not sure if you are just missing some include here or need to qualify the types directly. Yes, you are right, I already agreed with Martin to fix all of those in one step once all the patches have landed. 745278 7 168889 xan.lopez 2012-10-18 08:28:54 -0700 Comment on attachment 168889 Patch updated to build on current git master Looks good then. 745291 8 cgarcia 2012-10-18 08:49:31 -0700 Committed r131756: <http://trac.webkit.org/changeset/131756> 164137 2012-09-14 07:06:30 -0700 2012-10-16 01:33:56 -0700 Patch wk2-no-c-api-form-request.diff text/plain 6400 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmZjY2M2ZiLi5jZTNlMjg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMDktMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRGb3JtU3VibWlzc2lvblJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk2Nzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNpbmcgdGhlIEMrKyBjbGFzc2VzIGRpcmVjdGx5IGluc3RlYWQgb2Yg dGhlIEMgQVBJIHdyYXBwZXJzIHdlCisgICAgICAgIGF2b2lkIGEgbG90IG9mIHRvSW1wbC90b0FQ SSBjYXN0cywgc3RyaW5nIGNvbnZlcnNpb25zIGFuZAorICAgICAgICBhbGxvY2F0aW9ucy4gVGhl IGNvZGUgaXMgYWxzbyBhIGxvdCBzaW1wbGVyIGFuZCBlYXNpZXIgdG8gcmVhZC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3BwOgorICAgICAgICAod2ls bFN1Ym1pdEZvcm0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1TdWJt aXNzaW9uUmVxdWVzdC5jcHA6CisgICAgICAgIChfV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0 UHJpdmF0ZSk6CisgICAgICAgICh3ZWJraXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUpOgor ICAgICAgICAod2Via2l0X2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0X2dldF90ZXh0X2ZpZWxkcyk6 CisgICAgICAgICh3ZWJraXRfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3Rfc3VibWl0KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRl Lmg6CisKIDIwMTItMDktMTIgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMjc4NzYuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtQ2xpZW50LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3Bw CmluZGV4IGZkNWJlM2QuLjc1OTc4Y2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3BwCkBAIC0zMCw3ICszMCw3IEBAIHVz aW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIHN0YXRpYyB2b2lkIHdpbGxTdWJtaXRGb3JtKFdLUGFn ZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0ZyYW1lUmVmIHNvdXJjZUZyYW1lLCBXS0Rp Y3Rpb25hcnlSZWYgdmFsdWVzLCBXS1R5cGVSZWYgdXNlckRhdGEsIFdLRm9ybVN1Ym1pc3Npb25M aXN0ZW5lclJlZiBsaXN0ZW5lciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKLSAgICBHUmVm UHRyPFdlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0R1JlZih3ZWJr aXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUodmFsdWVzLCBsaXN0ZW5lcikpOworICAgIEdS ZWZQdHI8V2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0PiByZXF1ZXN0ID0gYWRvcHRHUmVmKHdl YmtpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdENyZWF0ZSh0b0ltcGwodmFsdWVzKSwgdG9JbXBsKGxp c3RlbmVyKSkpOwogICAgIHdlYmtpdFdlYlZpZXdTdWJtaXRGb3JtUmVxdWVzdChXRUJLSVRfV0VC X1ZJRVcoY2xpZW50SW5mbyksIHJlcXVlc3QuZ2V0KCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3Qu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybVN1Ym1pc3Np b25SZXF1ZXN0LmNwcAppbmRleCA0MGUyZDE3Li45YmFhNGYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1TdWJtaXNz aW9uUmVxdWVzdC5jcHAKQEAgLTIwLDE3ICsyMCwxNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgog I2luY2x1ZGUgIldlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdC5oIgogCisjaW5jbHVkZSAiSW1t dXRhYmxlRGljdGlvbmFyeS5oIgorI2luY2x1ZGUgIldlYkZvcm1TdWJtaXNzaW9uTGlzdGVuZXJQ cm94eS5oIgogI2luY2x1ZGUgIldlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdFByaXZhdGUuaCIK ICNpbmNsdWRlIDx3dGYvZ29iamVjdC9HUmVmUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0 cmluZy5oPgogCi11c2luZyBuYW1lc3BhY2UgV2ViS2l0OwotCiBHX0RFRklORV9UWVBFKFdlYktp dEZvcm1TdWJtaXNzaW9uUmVxdWVzdCwgd2Via2l0X2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0LCBH X1RZUEVfT0JKRUNUKQogCiBzdHJ1Y3QgX1dlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdFByaXZh dGUgewotICAgIFdLUmV0YWluUHRyPFdLRGljdGlvbmFyeVJlZj4gd2tWYWx1ZXM7Ci0gICAgV0tS ZXRhaW5QdHI8V0tGb3JtU3VibWlzc2lvbkxpc3RlbmVyUmVmPiB3a0xpc3RlbmVyOworICAgIFJl ZlB0cjxJbW11dGFibGVEaWN0aW9uYXJ5PiB3ZWJWYWx1ZXM7CisgICAgUmVmUHRyPFdlYkZvcm1T dWJtaXNzaW9uTGlzdGVuZXJQcm94eT4gbGlzdGVuZXI7CiAgICAgR1JlZlB0cjxHSGFzaFRhYmxl PiB2YWx1ZXM7CiAgICAgYm9vbCBoYW5kbGVkUmVxdWVzdDsKIH07CkBAIC02MSwxMSArNjEsMTEg QEAgc3RhdGljIHZvaWQgd2Via2l0X2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0X2NsYXNzX2luaXQo V2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXMKICAgICBnX3R5cGVfY2xhc3NfYWRkX3ByaXZhdGUo cmVxdWVzdENsYXNzLCBzaXplb2YoV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0UHJpdmF0ZSkp OwogfQogCi1XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3QqIHdlYmtpdEZvcm1TdWJtaXNzaW9u UmVxdWVzdENyZWF0ZShXS0RpY3Rpb25hcnlSZWYgd2tWYWx1ZXMsIFdLRm9ybVN1Ym1pc3Npb25M aXN0ZW5lclJlZiB3a0xpc3RlbmVyKQorV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0KiB3ZWJr aXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUoSW1tdXRhYmxlRGljdGlvbmFyeSogdmFsdWVz LCBXZWJGb3JtU3VibWlzc2lvbkxpc3RlbmVyUHJveHkqIGxpc3RlbmVyKQogewogICAgIFdlYktp dEZvcm1TdWJtaXNzaW9uUmVxdWVzdCogcmVxdWVzdCA9IFdFQktJVF9GT1JNX1NVQk1JU1NJT05f UkVRVUVTVChnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfRk9STV9TVUJNSVNTSU9OX1JFUVVFU1Qs IE5VTEwpKTsKLSAgICByZXF1ZXN0LT5wcml2LT53a1ZhbHVlcyA9IHdrVmFsdWVzOwotICAgIHJl cXVlc3QtPnByaXYtPndrTGlzdGVuZXIgPSB3a0xpc3RlbmVyOworICAgIHJlcXVlc3QtPnByaXYt PndlYlZhbHVlcyA9IHZhbHVlczsKKyAgICByZXF1ZXN0LT5wcml2LT5saXN0ZW5lciA9IGxpc3Rl bmVyOwogICAgIHJldHVybiByZXF1ZXN0OwogfQogCkBAIC04NiwxOSArODYsMTkgQEAgR0hhc2hU YWJsZSogd2Via2l0X2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0X2dldF90ZXh0X2ZpZWxkcyhXZWJL aXRGb3JtU3VibWlzc2lvblIKICAgICBpZiAocmVxdWVzdC0+cHJpdi0+dmFsdWVzKQogICAgICAg ICByZXR1cm4gcmVxdWVzdC0+cHJpdi0+dmFsdWVzLmdldCgpOwogCi0gICAgaWYgKCFXS0RpY3Rp b25hcnlHZXRTaXplKHJlcXVlc3QtPnByaXYtPndrVmFsdWVzLmdldCgpKSkKKyAgICBpZiAoIXJl cXVlc3QtPnByaXYtPndlYlZhbHVlcy0+c2l6ZSgpKQogICAgICAgICByZXR1cm4gMDsKIAogICAg IHJlcXVlc3QtPnByaXYtPnZhbHVlcyA9IGFkb3B0R1JlZihnX2hhc2hfdGFibGVfbmV3X2Z1bGwo Z19zdHJfaGFzaCwgZ19zdHJfZXF1YWwsIGdfZnJlZSwgZ19mcmVlKSk7CiAKLSAgICBXS1JldGFp blB0cjxXS0FycmF5UmVmPiB3a0tleXMoQWRvcHRXSywgV0tEaWN0aW9uYXJ5Q29weUtleXMocmVx dWVzdC0+cHJpdi0+d2tWYWx1ZXMuZ2V0KCkpKTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IFdLQXJyYXlHZXRTaXplKHdrS2V5cy5nZXQoKSk7ICsraSkgewotICAgICAgICBXS1N0cmluZ1Jl ZiB3a0tleSA9IHN0YXRpY19jYXN0PFdLU3RyaW5nUmVmPihXS0FycmF5R2V0SXRlbUF0SW5kZXgo d2tLZXlzLmdldCgpLCBpKSk7Ci0gICAgICAgIFdLU3RyaW5nUmVmIHdrVmFsdWUgPSBzdGF0aWNf Y2FzdDxXS1N0cmluZ1JlZj4oV0tEaWN0aW9uYXJ5R2V0SXRlbUZvcktleShyZXF1ZXN0LT5wcml2 LT53a1ZhbHVlcy5nZXQoKSwgd2tLZXkpKTsKLSAgICAgICAgZ19oYXNoX3RhYmxlX2luc2VydChy ZXF1ZXN0LT5wcml2LT52YWx1ZXMuZ2V0KCksIGdfc3RyZHVwKHRvSW1wbCh3a0tleSktPnN0cmlu ZygpLnV0ZjgoKS5kYXRhKCkpLCBnX3N0cmR1cCh0b0ltcGwod2tWYWx1ZSktPnN0cmluZygpLnV0 ZjgoKS5kYXRhKCkpKTsKKyAgICBjb25zdCBJbW11dGFibGVEaWN0aW9uYXJ5OjpNYXBUeXBlJiBt YXAgPSByZXF1ZXN0LT5wcml2LT53ZWJWYWx1ZXMtPm1hcCgpOworICAgIEltbXV0YWJsZURpY3Rp b25hcnk6Ok1hcFR5cGU6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1hcC5lbmQoKTsKKyAgICBmb3Ig KEltbXV0YWJsZURpY3Rpb25hcnk6Ok1hcFR5cGU6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbWFwLmJl Z2luKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICBXZWJTdHJpbmcqIHZhbHVlID0gc3Rh dGljX2Nhc3Q8V2ViU3RyaW5nKj4oaXQtPnNlY29uZC5nZXQoKSk7CisgICAgICAgIGdfaGFzaF90 YWJsZV9pbnNlcnQocmVxdWVzdC0+cHJpdi0+dmFsdWVzLmdldCgpLCBnX3N0cmR1cChpdC0+Zmly c3QudXRmOCgpLmRhdGEoKSksIGdfc3RyZHVwKHZhbHVlLT5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KSk7CiAgICAgfQogCi0gICAgcmVxdWVzdC0+cHJpdi0+d2tWYWx1ZXMgPSAwOworICAgIHJlcXVl c3QtPnByaXYtPndlYlZhbHVlcyA9IDA7CiAKICAgICByZXR1cm4gcmVxdWVzdC0+cHJpdi0+dmFs dWVzLmdldCgpOwogfQpAQCAtMTEzLDYgKzExMyw2IEBAIHZvaWQgd2Via2l0X2Zvcm1fc3VibWlz c2lvbl9yZXF1ZXN0X3N1Ym1pdChXZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3QqIHJlcXVlc3Qp CiB7CiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNfRk9STV9TVUJNSVNTSU9OX1JFUVVF U1QocmVxdWVzdCkpOwogCi0gICAgV0tGb3JtU3VibWlzc2lvbkxpc3RlbmVyQ29udGludWUocmVx dWVzdC0+cHJpdi0+d2tMaXN0ZW5lci5nZXQoKSk7CisgICAgcmVxdWVzdC0+cHJpdi0+bGlzdGVu ZXItPmNvbnRpbnVlU3VibWlzc2lvbigpOwogICAgIHJlcXVlc3QtPnByaXYtPmhhbmRsZWRSZXF1 ZXN0ID0gdHJ1ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdFByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdFByaXZhdGUuaApp bmRleCBhZDRhNjE5Li4xNGFkZmQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlLmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0 UHJpdmF0ZS5oCkBAIC0yMyw2ICsyMyw4IEBACiAjaW5jbHVkZSAiV2ViS2l0Rm9ybVN1Ym1pc3Np b25SZXF1ZXN0LmgiCiAjaW5jbHVkZSAiV2ViS2l0UHJpdmF0ZS5oIgogCi1XZWJLaXRGb3JtU3Vi bWlzc2lvblJlcXVlc3QqIHdlYmtpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdENyZWF0ZShXS0RpY3Rp b25hcnlSZWYsIFdLRm9ybVN1Ym1pc3Npb25MaXN0ZW5lclJlZik7Cit1c2luZyBuYW1lc3BhY2Ug V2ViS2l0OworCitXZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3QqIHdlYmtpdEZvcm1TdWJtaXNz aW9uUmVxdWVzdENyZWF0ZShJbW11dGFibGVEaWN0aW9uYXJ5KiB2YWx1ZXMsIFdlYkZvcm1TdWJt aXNzaW9uTGlzdGVuZXJQcm94eSopOwogCiAjZW5kaWYgLy8gV2ViS2l0Rm9ybVN1Ym1pc3Npb25S ZXF1ZXN0UHJpdmF0ZV9oCg== 168889 2012-10-16 01:33:56 -0700 2012-10-18 08:28:53 -0700 Patch updated to build on current git master wk2-c-api-form-request.diff text/plain 6437 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlYzFlMjk3Li45NWNhNjg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTItMTAtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIERvbid0IHVzZSB0aGUgQyBBUEkgaW50ZXJuYWxseSBpbiBXZWJL aXRGb3JtU3VibWlzc2lvblJlcXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTk2Nzc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVXNpbmcgdGhlIEMrKyBjbGFzc2VzIGRpcmVjdGx5IGluc3RlYWQgb2Yg dGhlIEMgQVBJIHdyYXBwZXJzIHdlCisgICAgICAgIGF2b2lkIGEgbG90IG9mIHRvSW1wbC90b0FQ SSBjYXN0cywgc3RyaW5nIGNvbnZlcnNpb25zIGFuZAorICAgICAgICBhbGxvY2F0aW9ucy4gVGhl IGNvZGUgaXMgYWxzbyBhIGxvdCBzaW1wbGVyIGFuZCBlYXNpZXIgdG8gcmVhZC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1DbGllbnQuY3BwOgorICAgICAgICAod2ls bFN1Ym1pdEZvcm0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1TdWJt aXNzaW9uUmVxdWVzdC5jcHA6CisgICAgICAgIChfV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0 UHJpdmF0ZSk6CisgICAgICAgICh3ZWJraXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUpOgor ICAgICAgICAod2Via2l0X2Zvcm1fc3VibWlzc2lvbl9yZXF1ZXN0X2dldF90ZXh0X2ZpZWxkcyk6 CisgICAgICAgICh3ZWJraXRfZm9ybV9zdWJtaXNzaW9uX3JlcXVlc3Rfc3VibWl0KToKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRl Lmg6CisKIDIwMTItMTAtMTUgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGlu dGVsLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIFJlZ3Jlc3Npb24ocjEzMTMzNyk6IE1hZGUg MyBDb29raWUgTWFuYWdlciBBUEkgdGVzdHMgZmFpbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtQ2xpZW50LmNwcAppbmRleCBmZDViZTNkLi43 NTk3OGNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRGb3JtQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRGb3JtQ2xpZW50LmNwcApAQCAtMzAsNyArMzAsNyBAQCB1c2luZyBuYW1lc3BhY2UgV2Vi S2l0OwogCiBzdGF0aWMgdm9pZCB3aWxsU3VibWl0Rm9ybShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFt ZVJlZiBmcmFtZSwgV0tGcmFtZVJlZiBzb3VyY2VGcmFtZSwgV0tEaWN0aW9uYXJ5UmVmIHZhbHVl cywgV0tUeXBlUmVmIHVzZXJEYXRhLCBXS0Zvcm1TdWJtaXNzaW9uTGlzdGVuZXJSZWYgbGlzdGVu ZXIsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7Ci0gICAgR1JlZlB0cjxXZWJLaXRGb3JtU3Vi bWlzc2lvblJlcXVlc3Q+IHJlcXVlc3QgPSBhZG9wdEdSZWYod2Via2l0Rm9ybVN1Ym1pc3Npb25S ZXF1ZXN0Q3JlYXRlKHZhbHVlcywgbGlzdGVuZXIpKTsKKyAgICBHUmVmUHRyPFdlYktpdEZvcm1T dWJtaXNzaW9uUmVxdWVzdD4gcmVxdWVzdCA9IGFkb3B0R1JlZih3ZWJraXRGb3JtU3VibWlzc2lv blJlcXVlc3RDcmVhdGUodG9JbXBsKHZhbHVlcyksIHRvSW1wbChsaXN0ZW5lcikpKTsKICAgICB3 ZWJraXRXZWJWaWV3U3VibWl0Rm9ybVJlcXVlc3QoV0VCS0lUX1dFQl9WSUVXKGNsaWVudEluZm8p LCByZXF1ZXN0LmdldCgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdC5jcHAKaW5k ZXggNDBlMmQxNy4uODJlN2UzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3QuY3BwCkBA IC0yMCwxNyArMjAsMTcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJLaXRG b3JtU3VibWlzc2lvblJlcXVlc3QuaCIKIAorI2luY2x1ZGUgIkltbXV0YWJsZURpY3Rpb25hcnku aCIKKyNpbmNsdWRlICJXZWJGb3JtU3VibWlzc2lvbkxpc3RlbmVyUHJveHkuaCIKICNpbmNsdWRl ICJXZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlLmgiCiAjaW5jbHVkZSA8d3RmL2dv YmplY3QvR1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAotdXNpbmcg bmFtZXNwYWNlIFdlYktpdDsKLQogR19ERUZJTkVfVFlQRShXZWJLaXRGb3JtU3VibWlzc2lvblJl cXVlc3QsIHdlYmtpdF9mb3JtX3N1Ym1pc3Npb25fcmVxdWVzdCwgR19UWVBFX09CSkVDVCkKIAog c3RydWN0IF9XZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlIHsKLSAgICBXS1JldGFp blB0cjxXS0RpY3Rpb25hcnlSZWY+IHdrVmFsdWVzOwotICAgIFdLUmV0YWluUHRyPFdLRm9ybVN1 Ym1pc3Npb25MaXN0ZW5lclJlZj4gd2tMaXN0ZW5lcjsKKyAgICBSZWZQdHI8SW1tdXRhYmxlRGlj dGlvbmFyeT4gd2ViVmFsdWVzOworICAgIFJlZlB0cjxXZWJGb3JtU3VibWlzc2lvbkxpc3RlbmVy UHJveHk+IGxpc3RlbmVyOwogICAgIEdSZWZQdHI8R0hhc2hUYWJsZT4gdmFsdWVzOwogICAgIGJv b2wgaGFuZGxlZFJlcXVlc3Q7CiB9OwpAQCAtNjEsMTEgKzYxLDExIEBAIHN0YXRpYyB2b2lkIHdl YmtpdF9mb3JtX3N1Ym1pc3Npb25fcmVxdWVzdF9jbGFzc19pbml0KFdlYktpdEZvcm1TdWJtaXNz aW9uUmVxdWVzCiAgICAgZ190eXBlX2NsYXNzX2FkZF9wcml2YXRlKHJlcXVlc3RDbGFzcywgc2l6 ZW9mKFdlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdFByaXZhdGUpKTsKIH0KIAotV2ViS2l0Rm9y bVN1Ym1pc3Npb25SZXF1ZXN0KiB3ZWJraXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUoV0tE aWN0aW9uYXJ5UmVmIHdrVmFsdWVzLCBXS0Zvcm1TdWJtaXNzaW9uTGlzdGVuZXJSZWYgd2tMaXN0 ZW5lcikKK1dlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdCogd2Via2l0Rm9ybVN1Ym1pc3Npb25S ZXF1ZXN0Q3JlYXRlKEltbXV0YWJsZURpY3Rpb25hcnkqIHZhbHVlcywgV2ViRm9ybVN1Ym1pc3Np b25MaXN0ZW5lclByb3h5KiBsaXN0ZW5lcikKIHsKICAgICBXZWJLaXRGb3JtU3VibWlzc2lvblJl cXVlc3QqIHJlcXVlc3QgPSBXRUJLSVRfRk9STV9TVUJNSVNTSU9OX1JFUVVFU1QoZ19vYmplY3Rf bmV3KFdFQktJVF9UWVBFX0ZPUk1fU1VCTUlTU0lPTl9SRVFVRVNULCBOVUxMKSk7Ci0gICAgcmVx dWVzdC0+cHJpdi0+d2tWYWx1ZXMgPSB3a1ZhbHVlczsKLSAgICByZXF1ZXN0LT5wcml2LT53a0xp c3RlbmVyID0gd2tMaXN0ZW5lcjsKKyAgICByZXF1ZXN0LT5wcml2LT53ZWJWYWx1ZXMgPSB2YWx1 ZXM7CisgICAgcmVxdWVzdC0+cHJpdi0+bGlzdGVuZXIgPSBsaXN0ZW5lcjsKICAgICByZXR1cm4g cmVxdWVzdDsKIH0KIApAQCAtODYsMTkgKzg2LDE5IEBAIEdIYXNoVGFibGUqIHdlYmtpdF9mb3Jt X3N1Ym1pc3Npb25fcmVxdWVzdF9nZXRfdGV4dF9maWVsZHMoV2ViS2l0Rm9ybVN1Ym1pc3Npb25S CiAgICAgaWYgKHJlcXVlc3QtPnByaXYtPnZhbHVlcykKICAgICAgICAgcmV0dXJuIHJlcXVlc3Qt PnByaXYtPnZhbHVlcy5nZXQoKTsKIAotICAgIGlmICghV0tEaWN0aW9uYXJ5R2V0U2l6ZShyZXF1 ZXN0LT5wcml2LT53a1ZhbHVlcy5nZXQoKSkpCisgICAgaWYgKCFyZXF1ZXN0LT5wcml2LT53ZWJW YWx1ZXMtPnNpemUoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICByZXF1ZXN0LT5wcml2LT52 YWx1ZXMgPSBhZG9wdEdSZWYoZ19oYXNoX3RhYmxlX25ld19mdWxsKGdfc3RyX2hhc2gsIGdfc3Ry X2VxdWFsLCBnX2ZyZWUsIGdfZnJlZSkpOwogCi0gICAgV0tSZXRhaW5QdHI8V0tBcnJheVJlZj4g d2tLZXlzKEFkb3B0V0ssIFdLRGljdGlvbmFyeUNvcHlLZXlzKHJlcXVlc3QtPnByaXYtPndrVmFs dWVzLmdldCgpKSk7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBXS0FycmF5R2V0U2l6ZSh3 a0tleXMuZ2V0KCkpOyArK2kpIHsKLSAgICAgICAgV0tTdHJpbmdSZWYgd2tLZXkgPSBzdGF0aWNf Y2FzdDxXS1N0cmluZ1JlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KHdrS2V5cy5nZXQoKSwgaSkp OwotICAgICAgICBXS1N0cmluZ1JlZiB3a1ZhbHVlID0gc3RhdGljX2Nhc3Q8V0tTdHJpbmdSZWY+ KFdLRGljdGlvbmFyeUdldEl0ZW1Gb3JLZXkocmVxdWVzdC0+cHJpdi0+d2tWYWx1ZXMuZ2V0KCks IHdrS2V5KSk7Ci0gICAgICAgIGdfaGFzaF90YWJsZV9pbnNlcnQocmVxdWVzdC0+cHJpdi0+dmFs dWVzLmdldCgpLCBnX3N0cmR1cCh0b0ltcGwod2tLZXkpLT5zdHJpbmcoKS51dGY4KCkuZGF0YSgp KSwgZ19zdHJkdXAodG9JbXBsKHdrVmFsdWUpLT5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKSk7Cisg ICAgY29uc3QgSW1tdXRhYmxlRGljdGlvbmFyeTo6TWFwVHlwZSYgbWFwID0gcmVxdWVzdC0+cHJp di0+d2ViVmFsdWVzLT5tYXAoKTsKKyAgICBJbW11dGFibGVEaWN0aW9uYXJ5OjpNYXBUeXBlOjpj b25zdF9pdGVyYXRvciBlbmQgPSBtYXAuZW5kKCk7CisgICAgZm9yIChJbW11dGFibGVEaWN0aW9u YXJ5OjpNYXBUeXBlOjpjb25zdF9pdGVyYXRvciBpdCA9IG1hcC5iZWdpbigpOyBpdCAhPSBlbmQ7 ICsraXQpIHsKKyAgICAgICAgV2ViU3RyaW5nKiB2YWx1ZSA9IHN0YXRpY19jYXN0PFdlYlN0cmlu Zyo+KGl0LT52YWx1ZS5nZXQoKSk7CisgICAgICAgIGdfaGFzaF90YWJsZV9pbnNlcnQocmVxdWVz dC0+cHJpdi0+dmFsdWVzLmdldCgpLCBnX3N0cmR1cChpdC0+a2V5LnV0ZjgoKS5kYXRhKCkpLCBn X3N0cmR1cCh2YWx1ZS0+c3RyaW5nKCkudXRmOCgpLmRhdGEoKSkpOwogICAgIH0KIAotICAgIHJl cXVlc3QtPnByaXYtPndrVmFsdWVzID0gMDsKKyAgICByZXF1ZXN0LT5wcml2LT53ZWJWYWx1ZXMg PSAwOwogCiAgICAgcmV0dXJuIHJlcXVlc3QtPnByaXYtPnZhbHVlcy5nZXQoKTsKIH0KQEAgLTEx Myw2ICsxMTMsNiBAQCB2b2lkIHdlYmtpdF9mb3JtX3N1Ym1pc3Npb25fcmVxdWVzdF9zdWJtaXQo V2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0KiByZXF1ZXN0KQogewogICAgIGdfcmV0dXJuX2lm X2ZhaWwoV0VCS0lUX0lTX0ZPUk1fU1VCTUlTU0lPTl9SRVFVRVNUKHJlcXVlc3QpKTsKIAotICAg IFdLRm9ybVN1Ym1pc3Npb25MaXN0ZW5lckNvbnRpbnVlKHJlcXVlc3QtPnByaXYtPndrTGlzdGVu ZXIuZ2V0KCkpOworICAgIHJlcXVlc3QtPnByaXYtPmxpc3RlbmVyLT5jb250aW51ZVN1Ym1pc3Np b24oKTsKICAgICByZXF1ZXN0LT5wcml2LT5oYW5kbGVkUmVxdWVzdCA9IHRydWU7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRGb3JtU3VibWlz c2lvblJlcXVlc3RQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRGb3JtU3VibWlzc2lvblJlcXVlc3RQcml2YXRlLmgKaW5kZXggYWQ0YTYxOS4uMTRhZGZk NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Rm9y bVN1Ym1pc3Npb25SZXF1ZXN0UHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdFByaXZhdGUuaApAQCAtMjMsNiAr MjMsOCBAQAogI2luY2x1ZGUgIldlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdC5oIgogI2luY2x1 ZGUgIldlYktpdFByaXZhdGUuaCIKIAotV2ViS2l0Rm9ybVN1Ym1pc3Npb25SZXF1ZXN0KiB3ZWJr aXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUoV0tEaWN0aW9uYXJ5UmVmLCBXS0Zvcm1TdWJt aXNzaW9uTGlzdGVuZXJSZWYpOwordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKworV2ViS2l0Rm9y bVN1Ym1pc3Npb25SZXF1ZXN0KiB3ZWJraXRGb3JtU3VibWlzc2lvblJlcXVlc3RDcmVhdGUoSW1t dXRhYmxlRGljdGlvbmFyeSogdmFsdWVzLCBXZWJGb3JtU3VibWlzc2lvbkxpc3RlbmVyUHJveHkq KTsKIAogI2VuZGlmIC8vIFdlYktpdEZvcm1TdWJtaXNzaW9uUmVxdWVzdFByaXZhdGVfaAo=