212319 2020-05-24 05:46:12 -0700 [GTK4] Implement HTTP auth dialog 2020-05-29 02:47:23 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 212318 210100 1 cgarcia webkit-unassigned berto bugs-noreply ews-watchlist gustavo svillar oldest_to_newest 1655698 0 cgarcia 2020-05-24 05:46:12 -0700 . 1656336 1 400321 cgarcia 2020-05-27 04:57:45 -0700 Created attachment 400321 Patch 1656337 2 ews-watchlist 2020-05-27 04:58:38 -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 1656824 3 400321 svillar 2020-05-28 06:29:10 -0700 Comment on attachment 400321 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400321&action=review Awesome! > Source/WebKit/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:145 > gtk_widget_set_can_default(button, TRUE); Isn't there an alternative for this on GTK4? 1656831 4 cgarcia 2020-05-28 06:56:40 -0700 (In reply to Sergio Villar Senin from comment #3) > Comment on attachment 400321 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=400321&action=review > > Awesome! Thanks for the review! > > Source/WebKit/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp:145 > > gtk_widget_set_can_default(button, TRUE); > > Isn't there an alternative for this on GTK4? No, can-default property was removed because it's no longer needed. 1657190 5 cgarcia 2020-05-29 02:47:23 -0700 Committed r262287: <https://trac.webkit.org/changeset/262287> 400321 2020-05-27 04:57:45 -0700 2020-05-28 06:29:10 -0700 Patch wkgtk4-auth-dialog.diff text/plain 12744 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMTVhNDI2MzExYzlkLi5kM2M5MjA4ZDU5ZjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjMgQEAKKzIwMjAtMDUtMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIFtHVEs0XSBJbXBsZW1lbnQgSFRUUCBhdXRoIGRpYWxvZworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMzE5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRBdXRoZW50aWNhdGlvbkRpYWxvZy5jcHA6CisgICAgICAgICh3ZWJraXRB dXRoZW50aWNhdGlvbkRpYWxvZ0Rlc3Ryb3kpOgorICAgICAgICAob2tCdXR0b25DbGlja2VkKToK KyAgICAgICAgKGNhbmNlbEJ1dHRvbkNsaWNrZWQpOgorICAgICAgICAoYXV0aGVudGljYXRpb25D YW5jZWxsZWQpOgorICAgICAgICAod2Via2l0QXV0aGVudGljYXRpb25EaWFsb2dJbml0aWFsaXpl KToKKyAgICAgICAgKHdlYmtpdEF1dGhlbnRpY2F0aW9uRGlhbG9nTWFwKToKKyAgICAgICAgKHdl YmtpdEF1dGhlbnRpY2F0aW9uRGlhbG9nRGlzcG9zZSk6CisgICAgICAgICh3ZWJraXRBdXRoZW50 aWNhdGlvbkRpYWxvZ05ldyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0QXV0 aGVudGljYXRpb25EaWFsb2cuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3R3RrLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdBdXRoZW50aWNhdGUpOgorCiAy MDIwLTA1LTI3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbR1RLNF0gSW1wbGVtZW50IHNjcmlwdCBkaWFsb2dzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nLmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0QXV0aGVudGljYXRpb25E aWFsb2cuY3BwCmluZGV4IGFjZmQzMDMzZjA3Ni4uMmMxOGMwMGU2NGU5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9n LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEF1dGhlbnRp Y2F0aW9uRGlhbG9nLmNwcApAQCAtMjAsMTIgKzIwLDEyIEBACiAjaW5jbHVkZSAiY29uZmlnLmgi CiAjaW5jbHVkZSAiV2ViS2l0QXV0aGVudGljYXRpb25EaWFsb2cuaCIKIAotI2lmICFVU0UoR1RL NCkKLQogI2luY2x1ZGUgIkF1dGhlbnRpY2F0aW9uRGVjaXNpb25MaXN0ZW5lci5oIgogI2luY2x1 ZGUgIldlYktpdEF1dGhlbnRpY2F0aW9uUmVxdWVzdFByaXZhdGUuaCIKICNpbmNsdWRlICJXZWJL aXRDcmVkZW50aWFsUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktpdFdlYlZpZXcuaCIKKyNpbmNs dWRlIDxXZWJDb3JlL0d0a1V0aWxpdGllcy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvR3RrVmVyc2lv bmluZy5oPgogI2luY2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+CiAjaW5jbHVkZSA8d3RmL2dsaWIv R1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0Zi9nbGliL0dVbmlxdWVQdHIuaD4KQEAgLTQ2LDYgKzQ2 LDE1IEBAIHN0cnVjdCBfV2ViS2l0QXV0aGVudGljYXRpb25EaWFsb2dQcml2YXRlIHsKIAogV0VC S0lUX0RFRklORV9UWVBFKFdlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nLCB3ZWJraXRfYXV0aGVu dGljYXRpb25fZGlhbG9nLCBXRUJLSVRfVFlQRV9XRUJfVklFV19ESUFMT0cpCiAKK3N0YXRpYyB2 b2lkIHdlYmtpdEF1dGhlbnRpY2F0aW9uRGlhbG9nRGVzdHJveShXZWJLaXRBdXRoZW50aWNhdGlv bkRpYWxvZyogYXV0aERpYWxvZykKK3sKKyNpZiBVU0UoR1RLNCkKKyAgICBndGtfd2lkZ2V0X3Vu cGFyZW50KEdUS19XSURHRVQoYXV0aERpYWxvZykpOworI2Vsc2UKKyAgICBndGtfd2lkZ2V0X2Rl c3Ryb3koR1RLX1dJREdFVChhdXRoRGlhbG9nKSk7CisjZW5kaWYKK30KKwogc3RhdGljIHZvaWQg b2tCdXR0b25DbGlja2VkKEd0a0J1dHRvbiosIFdlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nKiBh dXRoRGlhbG9nKQogewogICAgIFdlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nUHJpdmF0ZSogcHJp diA9IGF1dGhEaWFsb2ctPnByaXY7CkBAIC02MCwxOCArNjksMTggQEAgc3RhdGljIHZvaWQgb2tC dXR0b25DbGlja2VkKEd0a0J1dHRvbiosIFdlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nKiBhdXRo RGlhbG9nKQogICAgIFdlYktpdENyZWRlbnRpYWwqIGNyZWRlbnRpYWwgPSB3ZWJraXRDcmVkZW50 aWFsQ3JlYXRlKFdlYkNvcmU6OkNyZWRlbnRpYWwoU3RyaW5nOjpmcm9tVVRGOCh1c2VybmFtZSks IFN0cmluZzo6ZnJvbVVURjgocGFzc3dvcmQpLCBwZXJzaXN0ZW5jZSkpOwogICAgIHdlYmtpdF9h dXRoZW50aWNhdGlvbl9yZXF1ZXN0X2F1dGhlbnRpY2F0ZShwcml2LT5yZXF1ZXN0LmdldCgpLCBj cmVkZW50aWFsKTsKICAgICB3ZWJraXRfY3JlZGVudGlhbF9mcmVlKGNyZWRlbnRpYWwpOwotICAg IGd0a193aWRnZXRfZGVzdHJveShHVEtfV0lER0VUKGF1dGhEaWFsb2cpKTsKKyAgICB3ZWJraXRB dXRoZW50aWNhdGlvbkRpYWxvZ0Rlc3Ryb3koYXV0aERpYWxvZyk7CiB9CiAKIHN0YXRpYyB2b2lk IGNhbmNlbEJ1dHRvbkNsaWNrZWQoR3RrQnV0dG9uKiwgV2ViS2l0QXV0aGVudGljYXRpb25EaWFs b2cqIGF1dGhEaWFsb2cpCiB7CiAgICAgd2Via2l0X2F1dGhlbnRpY2F0aW9uX3JlcXVlc3RfYXV0 aGVudGljYXRlKGF1dGhEaWFsb2ctPnByaXYtPnJlcXVlc3QuZ2V0KCksIG51bGxwdHIpOwotICAg IGd0a193aWRnZXRfZGVzdHJveShHVEtfV0lER0VUKGF1dGhEaWFsb2cpKTsKKyAgICB3ZWJraXRB dXRoZW50aWNhdGlvbkRpYWxvZ0Rlc3Ryb3koYXV0aERpYWxvZyk7CiB9CiAKIHN0YXRpYyB2b2lk IGF1dGhlbnRpY2F0aW9uQ2FuY2VsbGVkKFdlYktpdEF1dGhlbnRpY2F0aW9uUmVxdWVzdCosIFdl YktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nKiBhdXRoRGlhbG9nKQogewotICAgIGd0a193aWRnZXRf ZGVzdHJveShHVEtfV0lER0VUKGF1dGhEaWFsb2cpKTsKKyAgICB3ZWJraXRBdXRoZW50aWNhdGlv bkRpYWxvZ0Rlc3Ryb3koYXV0aERpYWxvZyk7CiB9CiAKIHN0YXRpYyBHdGtXaWRnZXQqIGNyZWF0 ZUxhYmVsV2l0aExpbmVXcmFwKGNvbnN0IGNoYXIqIHRleHQpCkBAIC04OSwzNCArOTgsNTQgQEAg c3RhdGljIHZvaWQgd2Via2l0QXV0aGVudGljYXRpb25EaWFsb2dJbml0aWFsaXplKFdlYktpdEF1 dGhlbnRpY2F0aW9uRGlhbG9nKiBhdXQKICAgICBHdGtXaWRnZXQqIHZCb3ggPSBndGtfYm94X25l dyhHVEtfT1JJRU5UQVRJT05fVkVSVElDQUwsIDIwKTsKIAogICAgIEd0a1dpZGdldCogYm94ID0g Z3RrX2JveF9uZXcoR1RLX09SSUVOVEFUSU9OX0hPUklaT05UQUwsIDApOwotICAgIGd0a19zdHls ZV9jb250ZXh0X2FkZF9jbGFzcyhndGtfd2lkZ2V0X2dldF9zdHlsZV9jb250ZXh0KGJveCksIEdU S19TVFlMRV9DTEFTU19USVRMRUJBUik7CisgICAgZ3RrX3dpZGdldF9hZGRfY3NzX2NsYXNzKGJv eCwgR1RLX1NUWUxFX0NMQVNTX1RJVExFQkFSKTsKICAgICBndGtfd2lkZ2V0X3NldF9zaXplX3Jl cXVlc3QoYm94LCAtMSwgMTYpOwogICAgIEd0a1dpZGdldCogdGl0bGUgPSBndGtfbGFiZWxfbmV3 KF8oIkF1dGhlbnRpY2F0aW9uIFJlcXVpcmVkIikpOwogICAgIGd0a193aWRnZXRfc2V0X21hcmdp bl90b3AodGl0bGUsIDYpOwogICAgIGd0a193aWRnZXRfc2V0X21hcmdpbl9ib3R0b20odGl0bGUs IDYpOwotICAgIGd0a19zdHlsZV9jb250ZXh0X2FkZF9jbGFzcyhndGtfd2lkZ2V0X2dldF9zdHls ZV9jb250ZXh0KHRpdGxlKSwgR1RLX1NUWUxFX0NMQVNTX1RJVExFKTsKKyAgICBndGtfd2lkZ2V0 X2FkZF9jc3NfY2xhc3ModGl0bGUsIEdUS19TVFlMRV9DTEFTU19USVRMRSk7CisjaWYgVVNFKEdU SzQpCisgICAgZ3RrX3dpZGdldF9zZXRfaGV4cGFuZCh0aXRsZSwgVFJVRSk7CisgICAgZ3RrX3dp ZGdldF9zZXRfaGFsaWduKHRpdGxlLCBHVEtfQUxJR05fQ0VOVEVSKTsKKyAgICBndGtfYm94X2Fw cGVuZChHVEtfQk9YKHZCb3gpLCB0aXRsZSk7CisjZWxzZQogICAgIGd0a19ib3hfc2V0X2NlbnRl cl93aWRnZXQoR1RLX0JPWChib3gpLCB0aXRsZSk7CiAgICAgZ3RrX3dpZGdldF9zaG93KHRpdGxl KTsKICAgICBndGtfYm94X3BhY2tfc3RhcnQoR1RLX0JPWCh2Qm94KSwgYm94LCBUUlVFLCBGQUxT RSwgMCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KGJveCk7CisjZW5kaWYKIAorI2lmIFVTRShHVEs0 KQorICAgIEd0a1dpZGdldCogYnV0dG9uQm94ID0gZ3RrX2JveF9uZXcoR1RLX09SSUVOVEFUSU9O X0hPUklaT05UQUwsIDApOworICAgIGd0a19ib3hfc2V0X2hvbW9nZW5lb3VzKEdUS19CT1goYnV0 dG9uQm94KSwgVFJVRSk7CisgICAgZ3RrX3dpZGdldF9zZXRfaGFsaWduKGJ1dHRvbkJveCwgR1RL X0FMSUdOX0ZJTEwpOworI2Vsc2UKICAgICBHdGtXaWRnZXQqIGJ1dHRvbkJveCA9IGd0a19idXR0 b25fYm94X25ldyhHVEtfT1JJRU5UQVRJT05fSE9SSVpPTlRBTCk7CiAgICAgZ3RrX2J1dHRvbl9i b3hfc2V0X2xheW91dChHVEtfQlVUVE9OX0JPWChidXR0b25Cb3gpLCBHVEtfQlVUVE9OQk9YX0VY UEFORCk7CisjZW5kaWYKICAgICBndGtfd2lkZ2V0X3NldF9oZXhwYW5kKGJ1dHRvbkJveCwgVFJV RSk7Ci0gICAgZ3RrX3N0eWxlX2NvbnRleHRfYWRkX2NsYXNzKGd0a193aWRnZXRfZ2V0X3N0eWxl X2NvbnRleHQoYnV0dG9uQm94KSwgImRpYWxvZy1hY3Rpb24tYXJlYSIpOworICAgIGd0a193aWRn ZXRfYWRkX2Nzc19jbGFzcyhidXR0b25Cb3gsICJkaWFsb2ctYWN0aW9uLWFyZWEiKTsKIAogICAg IEd0a1dpZGdldCogYnV0dG9uID0gZ3RrX2J1dHRvbl9uZXdfd2l0aF9tbmVtb25pYyhfKCJfQ2Fu Y2VsIikpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3QoYnV0dG9uLCAiY2xpY2tlZCIsIEdfQ0FMTEJB Q0soY2FuY2VsQnV0dG9uQ2xpY2tlZCksIGF1dGhEaWFsb2cpOworI2lmIFVTRShHVEs0KQorICAg IGd0a19ib3hfYXBwZW5kKEdUS19CT1goYnV0dG9uQm94KSwgYnV0dG9uKTsKKyNlbHNlCiAgICAg Z3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1goYnV0dG9uQm94KSwgYnV0dG9uLCBGQUxTRSwgVFJV RSwgMCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KGJ1dHRvbik7CisjZW5kaWYKIAogICAgIFdlYktp dEF1dGhlbnRpY2F0aW9uRGlhbG9nUHJpdmF0ZSogcHJpdiA9IGF1dGhEaWFsb2ctPnByaXY7CiAg ICAgYnV0dG9uID0gZ3RrX2J1dHRvbl9uZXdfd2l0aF9tbmVtb25pYyhfKCJfQXV0aGVudGljYXRl IikpOwogICAgIHByaXYtPmRlZmF1bHRCdXR0b24gPSBidXR0b247CiAgICAgZ19zaWduYWxfY29u bmVjdChidXR0b24sICJjbGlja2VkIiwgR19DQUxMQkFDSyhva0J1dHRvbkNsaWNrZWQpLCBhdXRo RGlhbG9nKTsKKyNpZiBVU0UoR1RLNCkKKyAgICBndGtfYm94X2FwcGVuZChHVEtfQk9YKGJ1dHRv bkJveCksIGJ1dHRvbik7CisjZWxzZQogICAgIGd0a193aWRnZXRfc2V0X2Nhbl9kZWZhdWx0KGJ1 dHRvbiwgVFJVRSk7CiAgICAgZ3RrX2JveF9wYWNrX2VuZChHVEtfQk9YKGJ1dHRvbkJveCksIGJ1 dHRvbiwgRkFMU0UsIFRSVUUsIDApOwogICAgIGd0a193aWRnZXRfc2hvdyhidXR0b24pOworI2Vu ZGlmCiAKICAgICBHdGtXaWRnZXQqIGF1dGhCb3ggPSBndGtfYm94X25ldyhHVEtfT1JJRU5UQVRJ T05fVkVSVElDQUwsIDEwKTsKICAgICBndGtfd2lkZ2V0X3NldF9tYXJnaW5fc3RhcnQoYXV0aEJv eCwgMTApOwpAQCAtMTI3LDIxICsxNTYsMzMgQEAgc3RhdGljIHZvaWQgd2Via2l0QXV0aGVudGlj YXRpb25EaWFsb2dJbml0aWFsaXplKFdlYktpdEF1dGhlbnRpY2F0aW9uRGlhbG9nKiBhdXQKICAg ICBHVW5pcXVlUHRyPGNoYXI+IHByb21wdChnX3N0cmR1cF9wcmludGYoXygiQXV0aGVudGljYXRp b24gcmVxdWlyZWQgYnkgJXM6JWkiKSwKICAgICAgICAgY2hhbGxlbmdlLnByb3RlY3Rpb25TcGFj ZSgpLmhvc3QoKS51dGY4KCkuZGF0YSgpLCBjaGFsbGVuZ2UucHJvdGVjdGlvblNwYWNlKCkucG9y dCgpKSk7CiAgICAgR3RrV2lkZ2V0KiBsYWJlbCA9IGNyZWF0ZUxhYmVsV2l0aExpbmVXcmFwKHBy b21wdC5nZXQoKSk7CisjaWYgVVNFKEdUSzQpCisgICAgZ3RrX2JveF9hcHBlbmQoR1RLX0JPWChh dXRoQm94KSwgbGFiZWwpOworI2Vsc2UKICAgICBndGtfd2lkZ2V0X3Nob3cobGFiZWwpOwogICAg IGd0a19ib3hfcGFja19zdGFydChHVEtfQk9YKGF1dGhCb3gpLCBsYWJlbCwgRkFMU0UsIEZBTFNF LCAwKTsKKyNlbmRpZgogCiAgICAgU3RyaW5nIHJlYWxtID0gY2hhbGxlbmdlLnByb3RlY3Rpb25T cGFjZSgpLnJlYWxtKCk7CiAgICAgaWYgKCFyZWFsbS5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8g TGFiZWwgb24gdGhlIEhUVFAgYXV0aGVudGljYXRpb24gZGlhbG9nLiAlcyBpcyBhIChwcm9iYWJs eSBFbmdsaXNoKSBtZXNzYWdlIGZyb20gdGhlIHdlYnNpdGUuCiAgICAgICAgIEdVbmlxdWVQdHI8 Y2hhcj4gbWVzc2FnZShnX3N0cmR1cF9wcmludGYoXygiVGhlIHNpdGUgc2F5czog4oCcJXPigJ0i KSwgcmVhbG0udXRmOCgpLmRhdGEoKSkpOwogICAgICAgICBsYWJlbCA9IGNyZWF0ZUxhYmVsV2l0 aExpbmVXcmFwKG1lc3NhZ2UuZ2V0KCkpOworI2lmIFVTRShHVEs0KQorICAgICAgICBndGtfYm94 X2FwcGVuZChHVEtfQk9YKGF1dGhCb3gpLCBsYWJlbCk7CisjZWxzZQogICAgICAgICBndGtfd2lk Z2V0X3Nob3cobGFiZWwpOwogICAgICAgICBndGtfYm94X3BhY2tfc3RhcnQoR1RLX0JPWChhdXRo Qm94KSwgbGFiZWwsIEZBTFNFLCBGQUxTRSwgMCk7CisjZW5kaWYKICAgICB9CiAKICAgICAvLyBD aGVjayBidXR0b24gb24gdGhlIEhUVFAgYXV0aGVudGljYXRpb24gZGlhbG9nLgogICAgIHByaXYt PnJlbWVtYmVyQ2hlY2tCdXR0b24gPSBndGtfY2hlY2tfYnV0dG9uX25ld193aXRoX21uZW1vbmlj KF8oIl9SZW1lbWJlciBwYXNzd29yZCIpKTsKKyNpZiBVU0UoR1RLNCkKKyAgICBndGtfbGFiZWxf c2V0X2xpbmVfd3JhcChHVEtfTEFCRUwoZ3RrX2J1dHRvbl9nZXRfY2hpbGQoR1RLX0JVVFRPTihw cml2LT5yZW1lbWJlckNoZWNrQnV0dG9uKSkpLCBUUlVFKTsKKyNlbHNlCiAgICAgZ3RrX2xhYmVs X3NldF9saW5lX3dyYXAoR1RLX0xBQkVMKGd0a19iaW5fZ2V0X2NoaWxkKEdUS19CSU4ocHJpdi0+ cmVtZW1iZXJDaGVja0J1dHRvbikpKSwgVFJVRSk7CisjZW5kaWYKIAogICAgIHByaXYtPmxvZ2lu RW50cnkgPSBndGtfZW50cnlfbmV3KCk7CiAgICAgZ3RrX3dpZGdldF9zZXRfaGV4cGFuZChwcml2 LT5sb2dpbkVudHJ5LCBUUlVFKTsKQEAgLTE1Miw3ICsxOTMsNyBAQCBzdGF0aWMgdm9pZCB3ZWJr aXRBdXRoZW50aWNhdGlvbkRpYWxvZ0luaXRpYWxpemUoV2ViS2l0QXV0aGVudGljYXRpb25EaWFs b2cqIGF1dAogICAgIEd0a1dpZGdldCogbG9naW5MYWJlbCA9IGd0a19sYWJlbF9uZXdfd2l0aF9t bmVtb25pYyhfKCJfVXNlcm5hbWUiKSk7CiAgICAgZ3RrX2xhYmVsX3NldF9tbmVtb25pY193aWRn ZXQoR1RLX0xBQkVMKGxvZ2luTGFiZWwpLCBwcml2LT5sb2dpbkVudHJ5KTsKICAgICBndGtfd2lk Z2V0X3NldF9oYWxpZ24obG9naW5MYWJlbCwgR1RLX0FMSUdOX0VORCk7Ci0gICAgZ3RrX3N0eWxl X2NvbnRleHRfYWRkX2NsYXNzKGd0a193aWRnZXRfZ2V0X3N0eWxlX2NvbnRleHQobG9naW5MYWJl bCksIEdUS19TVFlMRV9DTEFTU19ESU1fTEFCRUwpOworICAgIGd0a193aWRnZXRfYWRkX2Nzc19j bGFzcyhsb2dpbkxhYmVsLCBHVEtfU1RZTEVfQ0xBU1NfRElNX0xBQkVMKTsKICAgICBndGtfd2lk Z2V0X3Nob3cobG9naW5MYWJlbCk7CiAKICAgICBwcml2LT5wYXNzd29yZEVudHJ5ID0gZ3RrX2Vu dHJ5X25ldygpOwpAQCAtMTY0LDcgKzIwNSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdEF1dGhlbnRp Y2F0aW9uRGlhbG9nSW5pdGlhbGl6ZShXZWJLaXRBdXRoZW50aWNhdGlvbkRpYWxvZyogYXV0CiAg ICAgR3RrV2lkZ2V0KiBwYXNzd29yZExhYmVsID0gZ3RrX2xhYmVsX25ld193aXRoX21uZW1vbmlj KF8oIl9QYXNzd29yZCIpKTsKICAgICBndGtfbGFiZWxfc2V0X21uZW1vbmljX3dpZGdldChHVEtf TEFCRUwocGFzc3dvcmRMYWJlbCksIHByaXYtPnBhc3N3b3JkRW50cnkpOwogICAgIGd0a193aWRn ZXRfc2V0X2hhbGlnbihwYXNzd29yZExhYmVsLCBHVEtfQUxJR05fRU5EKTsKLSAgICBndGtfc3R5 bGVfY29udGV4dF9hZGRfY2xhc3MoZ3RrX3dpZGdldF9nZXRfc3R5bGVfY29udGV4dChwYXNzd29y ZExhYmVsKSwgR1RLX1NUWUxFX0NMQVNTX0RJTV9MQUJFTCk7CisgICAgZ3RrX3dpZGdldF9hZGRf Y3NzX2NsYXNzKHBhc3N3b3JkTGFiZWwsIEdUS19TVFlMRV9DTEFTU19ESU1fTEFCRUwpOwogICAg IGd0a193aWRnZXRfc2hvdyhwYXNzd29yZExhYmVsKTsKIAogICAgIEd0a1dpZGdldCogZ3JpZCA9 IGd0a19ncmlkX25ldygpOwpAQCAtMTc1LDggKzIxNiwxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRB dXRoZW50aWNhdGlvbkRpYWxvZ0luaXRpYWxpemUoV2ViS2l0QXV0aGVudGljYXRpb25EaWFsb2cq IGF1dAogICAgIGd0a19ncmlkX2F0dGFjaChHVEtfR1JJRChncmlkKSwgcGFzc3dvcmRMYWJlbCwg MCwgMSwgMSwgMSk7CiAgICAgZ3RrX2dyaWRfYXR0YWNoKEdUS19HUklEKGdyaWQpLCBwcml2LT5w YXNzd29yZEVudHJ5LCAxLCAxLCAxLCAxKTsKICAgICBndGtfZ3JpZF9hdHRhY2goR1RLX0dSSUQo Z3JpZCksIHByaXYtPnJlbWVtYmVyQ2hlY2tCdXR0b24sIDEsIDIsIDEsIDEpOworI2lmIFVTRShH VEs0KQorICAgIGd0a19ib3hfYXBwZW5kKEdUS19CT1goYXV0aEJveCksIGdyaWQpOworI2Vsc2UK ICAgICBndGtfd2lkZ2V0X3Nob3coZ3JpZCk7CiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19C T1goYXV0aEJveCksIGdyaWQsIEZBTFNFLCBGQUxTRSwgMCk7CisjZW5kaWYKIAogICAgIGd0a19l bnRyeV9zZXRfdmlzaWJpbGl0eShHVEtfRU5UUlkocHJpdi0+cGFzc3dvcmRFbnRyeSksIEZBTFNF KTsKICAgICBndGtfd2lkZ2V0X3NldF92aXNpYmxlKHByaXYtPnJlbWVtYmVyQ2hlY2tCdXR0b24s IHByaXYtPmNyZWRlbnRpYWxTdG9yYWdlTW9kZSAhPSBEaXNhbGxvd1BlcnNpc3RlbnRTdG9yYWdl ICYmICFyZWFsbS5pc0VtcHR5KCkpOwpAQCAtMTg4LDE0ICsyMzMsMjcgQEAgc3RhdGljIHZvaWQg d2Via2l0QXV0aGVudGljYXRpb25EaWFsb2dJbml0aWFsaXplKFdlYktpdEF1dGhlbnRpY2F0aW9u RGlhbG9nKiBhdXQKICAgICAgICAgZ3RrX3RvZ2dsZV9idXR0b25fc2V0X2FjdGl2ZShHVEtfVE9H R0xFX0JVVFRPTihwcml2LT5yZW1lbWJlckNoZWNrQnV0dG9uKSwgVFJVRSk7CiAgICAgfQogCisj aWYgVVNFKEdUSzQpCisgICAgZ3RrX2JveF9hcHBlbmQoR1RLX0JPWCh2Qm94KSwgYXV0aEJveCk7 CisjZWxzZQogICAgIGd0a19ib3hfcGFja19zdGFydChHVEtfQk9YKHZCb3gpLCBhdXRoQm94LCBU UlVFLCBUUlVFLCAwKTsKICAgICBndGtfd2lkZ2V0X3Nob3coYXV0aEJveCk7CisjZW5kaWYKIAor I2lmIFVTRShHVEs0KQorICAgIGd0a19ib3hfYXBwZW5kKEdUS19CT1godkJveCksIGJ1dHRvbkJv eCk7CisjZWxzZQogICAgIGd0a19ib3hfcGFja19lbmQoR1RLX0JPWCh2Qm94KSwgYnV0dG9uQm94 LCBGQUxTRSwgVFJVRSwgMCk7CiAgICAgZ3RrX3dpZGdldF9zaG93KGJ1dHRvbkJveCk7CisjZW5k aWYKIAorI2lmIFVTRShHVEs0KQorICAgIGd0a193aWRnZXRfYWRkX2Nzc19jbGFzcyh2Qm94LCAi ZGlhbG9nLXZib3giKTsKKyAgICB3ZWJraXRXZWJWaWV3RGlhbG9nU2V0Q2hpbGQoV0VCS0lUX1dF Ql9WSUVXX0RJQUxPRyhhdXRoRGlhbG9nKSwgdkJveCk7CisjZWxzZQogICAgIGd0a19jb250YWlu ZXJfYWRkKEdUS19DT05UQUlORVIoYXV0aERpYWxvZyksIHZCb3gpOwogICAgIGd0a193aWRnZXRf c2hvdyh2Qm94KTsKKyNlbmRpZgogCiAgICAgYXV0aERpYWxvZy0+cHJpdi0+YXV0aGVudGljYXRp b25DYW5jZWxsZWRJRCA9IGdfc2lnbmFsX2Nvbm5lY3QoYXV0aERpYWxvZy0+cHJpdi0+cmVxdWVz dC5nZXQoKSwgImNhbmNlbGxlZCIsIEdfQ0FMTEJBQ0soYXV0aGVudGljYXRpb25DYW5jZWxsZWQp LCBhdXRoRGlhbG9nKTsKIH0KQEAgLTIwNCw3ICsyNjIsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRB dXRoZW50aWNhdGlvbkRpYWxvZ01hcChHdGtXaWRnZXQqIHdpZGdldCkKIHsKICAgICBXZWJLaXRB dXRoZW50aWNhdGlvbkRpYWxvZ1ByaXZhdGUqIHByaXYgPSBXRUJLSVRfQVVUSEVOVElDQVRJT05f RElBTE9HKHdpZGdldCktPnByaXY7CiAgICAgZ3RrX3dpZGdldF9ncmFiX2ZvY3VzKHByaXYtPmxv Z2luRW50cnkpOwotICAgIGd0a193aWRnZXRfZ3JhYl9kZWZhdWx0KHByaXYtPmRlZmF1bHRCdXR0 b24pOworICAgIGF1dG8qIHRvcGxldmVsID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwod2lkZ2V0 KTsKKyAgICBpZiAoV2ViQ29yZTo6d2lkZ2V0SXNPbnNjcmVlblRvcGxldmVsV2luZG93KHRvcGxl dmVsKSkKKyAgICAgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdChHVEtfV0lORE9XKHRvcGxldmVs KSwgcHJpdi0+ZGVmYXVsdEJ1dHRvbik7CiAKICAgICBHVEtfV0lER0VUX0NMQVNTKHdlYmtpdF9h dXRoZW50aWNhdGlvbl9kaWFsb2dfcGFyZW50X2NsYXNzKS0+bWFwKHdpZGdldCk7CiB9CkBAIC0y MTcsNiArMjc3LDEwIEBAIHN0YXRpYyB2b2lkIHdlYmtpdEF1dGhlbnRpY2F0aW9uRGlhbG9nRGlz cG9zZShHT2JqZWN0KiBvYmplY3QpCiAgICAgICAgIHByaXYtPmF1dGhlbnRpY2F0aW9uQ2FuY2Vs bGVkSUQgPSAwOwogICAgIH0KIAorI2lmIFVTRShHVEs0KQorICAgIHdlYmtpdFdlYlZpZXdEaWFs b2dTZXRDaGlsZChXRUJLSVRfV0VCX1ZJRVdfRElBTE9HKG9iamVjdCksIG51bGxwdHIpOworI2Vu ZGlmCisKICAgICBHX09CSkVDVF9DTEFTUyh3ZWJraXRfYXV0aGVudGljYXRpb25fZGlhbG9nX3Bh cmVudF9jbGFzcyktPmRpc3Bvc2Uob2JqZWN0KTsKIH0KIApAQCAtMjM3LDUgKzMwMSwzIEBAIEd0 a1dpZGdldCogd2Via2l0QXV0aGVudGljYXRpb25EaWFsb2dOZXcoV2ViS2l0QXV0aGVudGljYXRp b25SZXF1ZXN0KiByZXF1ZXN0LCBDCiAgICAgd2Via2l0QXV0aGVudGljYXRpb25EaWFsb2dJbml0 aWFsaXplKGF1dGhEaWFsb2cpOwogICAgIHJldHVybiBHVEtfV0lER0VUKGF1dGhEaWFsb2cpOwog fQotCi0jZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0QXV0aGVudGljYXRpb25EaWFsb2cuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0QXV0aGVudGljYXRpb25EaWFsb2cuaAppbmRleCA0ZDAzZWJjN2MyYWEuLjJk ZjI3MDlkOTE1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRBdXRoZW50aWNhdGlvbkRpYWxvZy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0QXV0aGVudGljYXRpb25EaWFsb2cuaApAQCAtMTksOCArMTksNiBAQAog CiAjcHJhZ21hIG9uY2UKIAotI2lmICFVU0UoR1RLNCkKLQogI2luY2x1ZGUgIldlYktpdEF1dGhl bnRpY2F0aW9uUmVxdWVzdC5oIgogI2luY2x1ZGUgIldlYktpdFdlYlZpZXdEaWFsb2cuaCIKICNp bmNsdWRlIDxndGsvZ3RrLmg+CkBAIC01Nyw1ICs1NSwzIEBAIEdUeXBlIHdlYmtpdF9hdXRoZW50 aWNhdGlvbl9kaWFsb2dfZ2V0X3R5cGUoKTsKIEd0a1dpZGdldCogd2Via2l0QXV0aGVudGljYXRp b25EaWFsb2dOZXcoV2ViS2l0QXV0aGVudGljYXRpb25SZXF1ZXN0KiwgQ3JlZGVudGlhbFN0b3Jh Z2VNb2RlKTsKIAogR19FTkRfREVDTFMKLQotI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdHdGsuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3R3RrLmNwcAppbmRleCBlZjNhMWVhZjU1 MTIuLmQ0YTU1YzU1NWJlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXdHdGsuY3BwCkBAIC0zMywxMCArMzMsOCBAQAogCiBnYm9vbGVh biB3ZWJraXRXZWJWaWV3QXV0aGVudGljYXRlKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdlYktp dEF1dGhlbnRpY2F0aW9uUmVxdWVzdCogcmVxdWVzdCkKIHsKLSNpZiAhVVNFKEdUSzQpCiAgICAg Q3JlZGVudGlhbFN0b3JhZ2VNb2RlIGNyZWRlbnRpYWxTdG9yYWdlTW9kZSA9IHdlYmtpdF9hdXRo ZW50aWNhdGlvbl9yZXF1ZXN0X2Nhbl9zYXZlX2NyZWRlbnRpYWxzKHJlcXVlc3QpID8gQWxsb3dQ ZXJzaXN0ZW50U3RvcmFnZSA6IERpc2FsbG93UGVyc2lzdGVudFN0b3JhZ2U7CiAgICAgd2Via2l0 V2ViVmlld0Jhc2VBZGREaWFsb2coV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldyksIHdlYmtp dEF1dGhlbnRpY2F0aW9uRGlhbG9nTmV3KHJlcXVlc3QsIGNyZWRlbnRpYWxTdG9yYWdlTW9kZSkp OwotI2VuZGlmCiAKICAgICByZXR1cm4gVFJVRTsKIH0K