94315 2012-08-17 01:59:55 -0700 [GTK] Add destroy notify for register_uri_scheme 2012-08-21 05:50:45 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 jessevdk webkit-unassigned cgarcia gustavo mrobinson webkit.review.bot oldest_to_newest 698057 0 jessevdk 2012-08-17 01:59:55 -0700 For introspection to work correctly, a destroy notify needs to be added to register_uri_scheme so that bindings know when to finalize the userdata. I've added a patch which adds the destroy notify and calls it when the uri handler is finalized. I really don't know much about webkit so it might well be that this doesn't work correctly (I don't know if those objects in HashMap get copied or not), but it's a start :) 698058 1 159050 jessevdk 2012-08-17 02:02:11 -0700 Created attachment 159050 Add destroy notify 698116 2 159050 cgarcia 2012-08-17 02:53:37 -0700 Comment on attachment 159050 Add destroy notify View in context: https://bugs.webkit.org/attachment.cgi?id=159050&action=review Thank you very much for the patch. Please read this http://www.webkit.org/coding/contributing.html Patches should include a ChangeLog and you should set the r flag to ? to ask for a review. > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:68 > + if (destroyNotify) > + { > + destroyNotify(userData); > + } Don't see use braces for one-line ifs, see http://www.webkit.org/coding/coding-style.html > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:394 > + * @destroy_notify: destroy notify for @user_data I prefer to call this something like user_data_destroy_func > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:568 > - WebKitURISchemeHandler handler = context->priv->uriSchemeHandlers.get(webkit_uri_scheme_request_get_scheme(request)); > + WebKitURISchemeHandler const &handler = context->priv->uriSchemeHandlers.get(webkit_uri_scheme_request_get_scheme(request)); Unfortunately this is not enough, when the handler is set to the HashMap it's also copied, so the destructor will be called in that case too. So, we have several options here: a) Make WebKitURISchemeHandler a refcounted class instead of a struct. b) Ierate all handlers in webkitWebContextFinalize to call destroy_notify function probably a) is easier, you need to convert it into a class deriving from RefCounted class WebKitURISchemeHandler: public RefCounted<WebKitURISchemeHandler> { and then change the HashMap definition to: typedef HashMap<String, RefPtr<WebKitURISchemeHandler> > URISchemeHandlerMap; > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp:165 > - webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this); > + webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this, 0); Ideally the destroy notify should also be tested in the unit tests, but in this case it's not so easy, because the web context is destroyed when all tests have finished. 699458 3 cgarcia 2012-08-20 06:34:31 -0700 Jesse, are you working on a new patch for this? Since it's an api change I would like to land this patch before the release. 700582 4 159644 cgarcia 2012-08-21 03:37:16 -0700 Created attachment 159644 Updated patch 700585 5 webkit.review.bot 2012-08-21 03:40:03 -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 700594 6 159644 pnormand 2012-08-21 03:53:02 -0700 Comment on attachment 159644 Updated patch LGTM 700595 7 159644 pnormand 2012-08-21 03:54:36 -0700 Comment on attachment 159644 Updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=159644&action=review > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp:168 > - webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this); > + webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this, 0); I think Carlos wanted to have the test checking the destroy notify callback. 700596 8 cgarcia 2012-08-21 03:56:45 -0700 (In reply to comment #7) > (From update of attachment 159644 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=159644&action=review > > > Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebContext.cpp:168 > > - webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this); > > + webkit_web_context_register_uri_scheme(webkit_web_context_get_default(), scheme, uriSchemeRequestCallback, this, 0); > > I think Carlos wanted to have the test checking the destroy notify callback. Yes, but unfortunately it's not possible: "Ideally the destroy notify should also be tested in the unit tests, but in this case it's not so easy, because the web context is destroyed when all tests have finished." 700606 9 159644 pnormand 2012-08-21 04:10:41 -0700 Comment on attachment 159644 Updated patch Please wait EWS before landing :) 700607 10 cgarcia 2012-08-21 04:13:29 -0700 (In reply to comment #9) > (From update of attachment 159644 [details]) > Please wait EWS before landing :) Sure, thanks reviewing! 700669 11 cgarcia 2012-08-21 05:50:45 -0700 Committed r126152: <http://trac.webkit.org/changeset/126152> 159050 2012-08-17 02:02:11 -0700 2012-08-21 03:37:16 -0700 Add destroy notify 0003-Added-destroy-notify-for-register_uri_scheme.patch text/plain 5712 jessevdk RnJvbSA3ODlhNjU5YWMwOWI2ZjkwMDAzNjRkNmE3NWY4ZWFiNzUxNDM3YWQzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKZXNzZSB2YW4gZGVuIEtpZWJvb20gPGplc3NlLnZhbmRlbmtp ZWJvb21AZXBmbC5jaD4KRGF0ZTogRnJpLCAxNyBBdWcgMjAxMiAxMDo1MDoyMSArMDIwMApTdWJq ZWN0OiBbUEFUQ0ggMy8zXSBBZGRlZCBkZXN0cm95IG5vdGlmeSBmb3IgcmVnaXN0ZXJfdXJpX3Nj aGVtZQoKLS0tCiAuLi4vV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0 LmNwcCB8ICAgMjMgKysrKysrKysrKysrKysrLS0tLS0KIC4uLi9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaCAgIHwgICAgMyArKy0KIC4uLi9BUEkvZ3RrL3Rlc3Rz L1Rlc3RXZWJLaXRXZWJDb250ZXh0LmNwcCAgICAgICAgIHwgICAgMiArLQogMyBmaWxlcyBjaGFu Z2VkLCAyMSBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKaW5kZXggYmNl YzA5Yy4uNTY5ZTZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTUwLDE2ICs1MCwyNyBAQCBzdHJ1Y3QgV2Vi S2l0VVJJU2NoZW1lSGFuZGxlciB7CiAgICAgV2ViS2l0VVJJU2NoZW1lSGFuZGxlcigpCiAgICAg ICAgIDogY2FsbGJhY2soMCkKICAgICAgICAgLCB1c2VyRGF0YSgwKQorICAgICAgICAsIGRlc3Ry b3lOb3RpZnkoMCkKICAgICB7CiAgICAgfQotICAgIFdlYktpdFVSSVNjaGVtZUhhbmRsZXIoV2Vi S2l0VVJJU2NoZW1lUmVxdWVzdENhbGxiYWNrIGNhbGxiYWNrLCB2b2lkKiB1c2VyRGF0YSkKKyAg ICBXZWJLaXRVUklTY2hlbWVIYW5kbGVyKFdlYktpdFVSSVNjaGVtZVJlcXVlc3RDYWxsYmFjayBj YWxsYmFjaywgdm9pZCogdXNlckRhdGEsIEdEZXN0cm95Tm90aWZ5IGRlc3Ryb3lOb3RpZnkpCiAg ICAgICAgIDogY2FsbGJhY2soY2FsbGJhY2spCiAgICAgICAgICwgdXNlckRhdGEodXNlckRhdGEp CisgICAgICAgICwgZGVzdHJveU5vdGlmeShkZXN0cm95Tm90aWZ5KQogICAgIHsKICAgICB9CiAK KyAgICB+V2ViS2l0VVJJU2NoZW1lSGFuZGxlcigpCisgICAgeworICAgICAgICBpZiAoZGVzdHJv eU5vdGlmeSkKKyAgICAgICAgeworICAgICAgICAgICAgZGVzdHJveU5vdGlmeSh1c2VyRGF0YSk7 CisgICAgICAgIH0KKyAgICB9CisKICAgICBXZWJLaXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2sg Y2FsbGJhY2s7CiAgICAgdm9pZCogdXNlckRhdGE7CisgICAgR0Rlc3Ryb3lOb3RpZnkgZGVzdHJv eU5vdGlmeTsKIH07CiAKIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFdlYktpdFVSSVNjaGVtZUhh bmRsZXI+IFVSSVNjaGVtZUhhbmRsZXJNYXA7CkBAIC0zNzgsOCArMzg5LDkgQEAgR0xpc3QqIHdl YmtpdF93ZWJfY29udGV4dF9nZXRfcGx1Z2luc19maW5pc2goV2ViS2l0V2ViQ29udGV4dCogY29u dGV4dCwgR0FzeW5jUmUKICAqIHdlYmtpdF93ZWJfY29udGV4dF9yZWdpc3Rlcl91cmlfc2NoZW1l OgogICogQGNvbnRleHQ6IGEgI1dlYktpdFdlYkNvbnRleHQKICAqIEBzY2hlbWU6IHRoZSBuZXR3 b3JrIHNjaGVtZSB0byByZWdpc3RlcgotICogQGNhbGxiYWNrOiBhICNXZWJLaXRVUklTY2hlbWVS ZXF1ZXN0Q2FsbGJhY2sKKyAqIEBjYWxsYmFjazogKHNjb3BlIGFzeW5jKTogYSAjV2ViS2l0VVJJ U2NoZW1lUmVxdWVzdENhbGxiYWNrCiAgKiBAdXNlcl9kYXRhOiBkYXRhIHRvIHBhc3MgdG8gY2Fs bGJhY2sgZnVuY3Rpb24KKyAqIEBkZXN0cm95X25vdGlmeTogZGVzdHJveSBub3RpZnkgZm9yIEB1 c2VyX2RhdGEKICAqCiAgKiBSZWdpc3RlciBAc2NoZW1lIGluIEBjb250ZXh0LCBzbyB0aGF0IHdo ZW4gYW4gVVJJIHJlcXVlc3Qgd2l0aCBAc2NoZW1lIGlzIG1hZGUgaW4gdGhlCiAgKiAjV2ViS2l0 V2ViQ29udGV4dCwgdGhlICNXZWJLaXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2sgcmVnaXN0ZXJl ZCB3aWxsIGJlIGNhbGxlZCB3aXRoIGEKQEAgLTQxNiwxMyArNDI4LDEzIEBAIEdMaXN0KiB3ZWJr aXRfd2ViX2NvbnRleHRfZ2V0X3BsdWdpbnNfZmluaXNoKFdlYktpdFdlYkNvbnRleHQqIGNvbnRl eHQsIEdBc3luY1JlCiAgKiB9CiAgKiA8L3Byb2dyYW1saXN0aW5nPjwvaW5mb3JtYWxleGFtcGxl PgogICovCi12b2lkIHdlYmtpdF93ZWJfY29udGV4dF9yZWdpc3Rlcl91cmlfc2NoZW1lKFdlYktp dFdlYkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IGNoYXIqIHNjaGVtZSwgV2ViS2l0VVJJU2NoZW1l UmVxdWVzdENhbGxiYWNrIGNhbGxiYWNrLCBncG9pbnRlciB1c2VyRGF0YSkKK3ZvaWQgd2Via2l0 X3dlYl9jb250ZXh0X3JlZ2lzdGVyX3VyaV9zY2hlbWUoV2ViS2l0V2ViQ29udGV4dCogY29udGV4 dCwgY29uc3QgY2hhciogc2NoZW1lLCBXZWJLaXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2sgY2Fs bGJhY2ssIGdwb2ludGVyIHVzZXJEYXRhLCBHRGVzdHJveU5vdGlmeSBkZXN0cm95Tm90aWZ5KQog ewogICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1dFQl9DT05URVhUKGNvbnRleHQpKTsK ICAgICBnX3JldHVybl9pZl9mYWlsKHNjaGVtZSk7CiAgICAgZ19yZXR1cm5faWZfZmFpbChjYWxs YmFjayk7CiAKLSAgICBjb250ZXh0LT5wcml2LT51cmlTY2hlbWVIYW5kbGVycy5zZXQoU3RyaW5n Ojpmcm9tVVRGOChzY2hlbWUpLCBXZWJLaXRVUklTY2hlbWVIYW5kbGVyKGNhbGxiYWNrLCB1c2Vy RGF0YSkpOworICAgIGNvbnRleHQtPnByaXYtPnVyaVNjaGVtZUhhbmRsZXJzLnNldChTdHJpbmc6 OmZyb21VVEY4KHNjaGVtZSksIFdlYktpdFVSSVNjaGVtZUhhbmRsZXIoY2FsbGJhY2ssIHVzZXJE YXRhLCBkZXN0cm95Tm90aWZ5KSk7CiAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrU2No ZW1lKEFkb3B0V0ssIFdLU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHNjaGVtZSkpOwogICAg IFdLU291cFJlcXVlc3RNYW5hZ2VyUmVnaXN0ZXJVUklTY2hlbWUoY29udGV4dC0+cHJpdi0+cmVx dWVzdE1hbmFnZXIuZ2V0KCksIHdrU2NoZW1lLmdldCgpKTsKIH0KQEAgLTU1Myw3ICs1NjUsOCBA QCBXS1NvdXBSZXF1ZXN0TWFuYWdlclJlZiB3ZWJraXRXZWJDb250ZXh0R2V0UmVxdWVzdE1hbmFn ZXIoV2ViS2l0V2ViQ29udGV4dCogY29udAogCiB2b2lkIHdlYmtpdFdlYkNvbnRleHRSZWNlaXZl ZFVSSVJlcXVlc3QoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgV2ViS2l0VVJJU2NoZW1lUmVx dWVzdCogcmVxdWVzdCkKIHsKLSAgICBXZWJLaXRVUklTY2hlbWVIYW5kbGVyIGhhbmRsZXIgPSBj b250ZXh0LT5wcml2LT51cmlTY2hlbWVIYW5kbGVycy5nZXQod2Via2l0X3VyaV9zY2hlbWVfcmVx dWVzdF9nZXRfc2NoZW1lKHJlcXVlc3QpKTsKKyAgICBXZWJLaXRVUklTY2hlbWVIYW5kbGVyIGNv bnN0ICZoYW5kbGVyID0gY29udGV4dC0+cHJpdi0+dXJpU2NoZW1lSGFuZGxlcnMuZ2V0KHdlYmtp dF91cmlfc2NoZW1lX3JlcXVlc3RfZ2V0X3NjaGVtZShyZXF1ZXN0KSk7CisKICAgICBpZiAoIWhh bmRsZXIuY2FsbGJhY2spCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5oCmluZGV4IDBkMzJiYTUuLmU1 YTA2ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYkNvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJDb250ZXh0LmgKQEAgLTEzMSw3ICsxMzEsOCBAQCBXRUJLSVRfQVBJIHZvaWQKIHdlYmtp dF93ZWJfY29udGV4dF9yZWdpc3Rlcl91cmlfc2NoZW1lICAgICAgICAgICAgICAoV2ViS2l0V2Vi Q29udGV4dCAgICAgICAgICAgICAgKmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdjaGFyICAgICAgICAgICAgICAgICAg ICpzY2hlbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFdlYktpdFVSSVNjaGVtZVJlcXVlc3RDYWxsYmFjayBjYWxsYmFjaywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3BvaW50ZXIgICAg ICAgICAgICAgICAgICAgICAgIHVzZXJfZGF0YSk7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdwb2ludGVyICAgICAgICAgICAgICAgICAgICAg ICB1c2VyX2RhdGEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEdEZXN0cm95Tm90aWZ5ICAgICAgICAgICAgICAgICBkZXN0cm95X25vdGlmeSk7 CiAKIFdFQktJVF9BUEkgZ2Jvb2xlYW4KIHdlYmtpdF93ZWJfY29udGV4dF9nZXRfc3BlbGxfY2hl Y2tpbmdfZW5hYmxlZCAgICAgICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAgICAgICAgKmNvbnRl eHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMv VGVzdFdlYktpdFdlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvdGVzdHMvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IDFiMTcyZGYuLjE0MWYzZTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RX ZWJLaXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTE2Miw3ICsxNjIsNyBAQCBwdWJs aWM6CiAgICAgdm9pZCByZWdpc3RlclVSSVNjaGVtZUhhbmRsZXIoY29uc3QgY2hhciogc2NoZW1l LCBjb25zdCBjaGFyKiByZXBseSwgaW50IHJlcGx5TGVuZ3RoLCBjb25zdCBjaGFyKiBtaW1lVHlw ZSwgYm9vbCByZXBseVdpdGhQYXRoID0gZmFsc2UpCiAgICAgewogICAgICAgICBtX2hhbmRsZXJz TWFwLnNldChTdHJpbmc6OmZyb21VVEY4KHNjaGVtZSksIFVSSVNjaGVtZUhhbmRsZXIocmVwbHks IHJlcGx5TGVuZ3RoLCBtaW1lVHlwZSwgcmVwbHlXaXRoUGF0aCkpOwotICAgICAgICB3ZWJraXRf d2ViX2NvbnRleHRfcmVnaXN0ZXJfdXJpX3NjaGVtZSh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2Rl ZmF1bHQoKSwgc2NoZW1lLCB1cmlTY2hlbWVSZXF1ZXN0Q2FsbGJhY2ssIHRoaXMpOworICAgICAg ICB3ZWJraXRfd2ViX2NvbnRleHRfcmVnaXN0ZXJfdXJpX3NjaGVtZSh3ZWJraXRfd2ViX2NvbnRl eHRfZ2V0X2RlZmF1bHQoKSwgc2NoZW1lLCB1cmlTY2hlbWVSZXF1ZXN0Q2FsbGJhY2ssIHRoaXMs IDApOwogICAgIH0KIAogICAgIHN0YXRpYyB2b2lkIHJlc291cmNlR2V0RGF0YUNhbGxiYWNrKEdP YmplY3QqIG9iamVjdCwgR0FzeW5jUmVzdWx0KiByZXN1bHQsIGdwb2ludGVyIHVzZXJEYXRhKQot LSAKMS43LjkuNQoK 159644 2012-08-21 03:37:16 -0700 2012-08-21 04:10:41 -0700 Updated patch wk2-register-uri-scheme-destroy-notify.diff text/plain 7592 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1NGMwMDU2Li4xNDAxNDlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDgtMjEgIEplc3NlIHZhbiBkZW4gS2llYm9vbSAgPGplc3NldmRrQGdub21lLm9y Zz4gYW5kIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIEFkZCBkZXN0cm95IG5vdGlmeSBmb3IgcmVnaXN0ZXJfdXJpX3NjaGVtZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQzMTUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgaW50cm9zcGVj dGlvbiB0byB3b3JrIGNvcnJlY3RseSwgYSBkZXN0cm95IG5vdGlmeSBuZWVkcyB0byBiZQorICAg ICAgICBhZGRlZCB0byByZWdpc3Rlcl91cmlfc2NoZW1lIHNvIHRoYXQgYmluZGluZ3Mga25vdyB3 aGVuIHRvCisgICAgICAgIGZpbmFsaXplIHRoZSB1c2VyX2RhdGEuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJf Y29udGV4dF9yZWdpc3Rlcl91cmlfc2NoZW1lKToKKyAgICAgICAgKHdlYmtpdFdlYkNvbnRleHRS ZWNlaXZlZFVSSVJlcXVlc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YkNvbnRleHQuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0 V2ViQ29udGV4dC5jcHA6CisKIDIwMTItMDgtMTggIEpvaG4gU3VsbGl2YW4gIDxzdWxsaXZhbkBh cHBsZS5jb20+CiAKICAgICAgICAgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05NDQ4Nj4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0V2ViQ29udGV4dC5jcHAKaW5kZXggNjIwYzlhOC4uMjExMTMzZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dC5jcHAK QEAgLTM1LDYgKzM1LDggQEAKICNpbmNsdWRlIDxXZWJDb3JlL0xhbmd1YWdlLmg+CiAjaW5jbHVk ZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CisjaW5jbHVkZSA8d3Rm L1Bhc3NSZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0 Zi9nb2JqZWN0L0dPd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvZ29iamVjdC9HUmVmUHRyLmg+CiAj aW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtNDcsMjMgKzQ5LDQ2IEBAIGVudW0gewog ICAgIExBU1RfU0lHTkFMCiB9OwogCi1zdHJ1Y3QgV2ViS2l0VVJJU2NoZW1lSGFuZGxlciB7Citj bGFzcyBXZWJLaXRVUklTY2hlbWVIYW5kbGVyOiBwdWJsaWMgUmVmQ291bnRlZDxXZWJLaXRVUklT Y2hlbWVIYW5kbGVyPiB7CitwdWJsaWM6CiAgICAgV2ViS2l0VVJJU2NoZW1lSGFuZGxlcigpCi0g ICAgICAgIDogY2FsbGJhY2soMCkKLSAgICAgICAgLCB1c2VyRGF0YSgwKQorICAgICAgICA6IG1f Y2FsbGJhY2soMCkKKyAgICAgICAgLCBtX3VzZXJEYXRhKDApCisgICAgICAgICwgbV9kZXN0cm95 Tm90aWZ5KDApCiAgICAgewogICAgIH0KLSAgICBXZWJLaXRVUklTY2hlbWVIYW5kbGVyKFdlYktp dFVSSVNjaGVtZVJlcXVlc3RDYWxsYmFjayBjYWxsYmFjaywgdm9pZCogdXNlckRhdGEpCi0gICAg ICAgIDogY2FsbGJhY2soY2FsbGJhY2spCi0gICAgICAgICwgdXNlckRhdGEodXNlckRhdGEpCisg ICAgV2ViS2l0VVJJU2NoZW1lSGFuZGxlcihXZWJLaXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2sg Y2FsbGJhY2ssIHZvaWQqIHVzZXJEYXRhLCBHRGVzdHJveU5vdGlmeSBkZXN0cm95Tm90aWZ5KQor ICAgICAgICA6IG1fY2FsbGJhY2soY2FsbGJhY2spCisgICAgICAgICwgbV91c2VyRGF0YSh1c2Vy RGF0YSkKKyAgICAgICAgLCBtX2Rlc3Ryb3lOb3RpZnkoZGVzdHJveU5vdGlmeSkKICAgICB7CiAg ICAgfQogCi0gICAgV2ViS2l0VVJJU2NoZW1lUmVxdWVzdENhbGxiYWNrIGNhbGxiYWNrOwotICAg IHZvaWQqIHVzZXJEYXRhOworICAgIH5XZWJLaXRVUklTY2hlbWVIYW5kbGVyKCkKKyAgICB7Cisg ICAgICAgIGlmIChtX2Rlc3Ryb3lOb3RpZnkpCisgICAgICAgICAgICBtX2Rlc3Ryb3lOb3RpZnko bV91c2VyRGF0YSk7CisgICAgfQorCisgICAgYm9vbCBoYXNDYWxsYmFjaygpCisgICAgeworICAg ICAgICByZXR1cm4gbV9jYWxsYmFjazsKKyAgICB9CisKKyAgICB2b2lkIHBlcmZvcm1DYWxsYmFj ayhXZWJLaXRVUklTY2hlbWVSZXF1ZXN0KiByZXF1ZXN0KQorICAgIHsKKyAgICAgICAgQVNTRVJU KG1fY2FsbGJhY2spOworCisgICAgICAgIG1fY2FsbGJhY2socmVxdWVzdCwgbV91c2VyRGF0YSk7 CisgICAgfQorCitwcml2YXRlOgorICAgIFdlYktpdFVSSVNjaGVtZVJlcXVlc3RDYWxsYmFjayBt X2NhbGxiYWNrOworICAgIHZvaWQqIG1fdXNlckRhdGE7CisgICAgR0Rlc3Ryb3lOb3RpZnkgbV9k ZXN0cm95Tm90aWZ5OwogfTsKIAotdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgV2ViS2l0VVJJU2No ZW1lSGFuZGxlcj4gVVJJU2NoZW1lSGFuZGxlck1hcDsKK3R5cGVkZWYgSGFzaE1hcDxTdHJpbmcs IFJlZlB0cjxXZWJLaXRVUklTY2hlbWVIYW5kbGVyPiA+IFVSSVNjaGVtZUhhbmRsZXJNYXA7CiB0 eXBlZGVmIEhhc2hNYXA8dWludDY0X3QsIEdSZWZQdHI8V2ViS2l0VVJJU2NoZW1lUmVxdWVzdD4g PiBVUklTY2hlbWVSZXF1ZXN0TWFwOwogCiBzdHJ1Y3QgX1dlYktpdFdlYkNvbnRleHRQcml2YXRl IHsKQEAgLTM3OSw4ICs0MDQsOSBAQCBHTGlzdCogd2Via2l0X3dlYl9jb250ZXh0X2dldF9wbHVn aW5zX2ZpbmlzaChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0LCBHQXN5bmNSZQogICogd2Via2l0 X3dlYl9jb250ZXh0X3JlZ2lzdGVyX3VyaV9zY2hlbWU6CiAgKiBAY29udGV4dDogYSAjV2ViS2l0 V2ViQ29udGV4dAogICogQHNjaGVtZTogdGhlIG5ldHdvcmsgc2NoZW1lIHRvIHJlZ2lzdGVyCi0g KiBAY2FsbGJhY2s6IGEgI1dlYktpdFVSSVNjaGVtZVJlcXVlc3RDYWxsYmFjaworICogQGNhbGxi YWNrOiAoc2NvcGUgYXN5bmMpOiBhICNXZWJLaXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2sKICAq IEB1c2VyX2RhdGE6IGRhdGEgdG8gcGFzcyB0byBjYWxsYmFjayBmdW5jdGlvbgorICogQHVzZXJf ZGF0YV9kZXN0cm95X2Z1bmM6IGRlc3Ryb3kgbm90aWZ5IGZvciBAdXNlcl9kYXRhCiAgKgogICog UmVnaXN0ZXIgQHNjaGVtZSBpbiBAY29udGV4dCwgc28gdGhhdCB3aGVuIGFuIFVSSSByZXF1ZXN0 IHdpdGggQHNjaGVtZSBpcyBtYWRlIGluIHRoZQogICogI1dlYktpdFdlYkNvbnRleHQsIHRoZSAj V2ViS2l0VVJJU2NoZW1lUmVxdWVzdENhbGxiYWNrIHJlZ2lzdGVyZWQgd2lsbCBiZSBjYWxsZWQg d2l0aCBhCkBAIC00MTcsMTMgKzQ0MywxNCBAQCBHTGlzdCogd2Via2l0X3dlYl9jb250ZXh0X2dl dF9wbHVnaW5zX2ZpbmlzaChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0LCBHQXN5bmNSZQogICog fQogICogPC9wcm9ncmFtbGlzdGluZz48L2luZm9ybWFsZXhhbXBsZT4KICAqLwotdm9pZCB3ZWJr aXRfd2ViX2NvbnRleHRfcmVnaXN0ZXJfdXJpX3NjaGVtZShXZWJLaXRXZWJDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBjaGFyKiBzY2hlbWUsIFdlYktpdFVSSVNjaGVtZVJlcXVlc3RDYWxsYmFjayBj YWxsYmFjaywgZ3BvaW50ZXIgdXNlckRhdGEpCit2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9yZWdp c3Rlcl91cmlfc2NoZW1lKFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IGNoYXIqIHNj aGVtZSwgV2ViS2l0VVJJU2NoZW1lUmVxdWVzdENhbGxiYWNrIGNhbGxiYWNrLCBncG9pbnRlciB1 c2VyRGF0YSwgR0Rlc3Ryb3lOb3RpZnkgZGVzdHJveU5vdGlmeSkKIHsKICAgICBnX3JldHVybl9p Zl9mYWlsKFdFQktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0KSk7CiAgICAgZ19yZXR1cm5faWZf ZmFpbChzY2hlbWUpOwogICAgIGdfcmV0dXJuX2lmX2ZhaWwoY2FsbGJhY2spOwogCi0gICAgY29u dGV4dC0+cHJpdi0+dXJpU2NoZW1lSGFuZGxlcnMuc2V0KFN0cmluZzo6ZnJvbVVURjgoc2NoZW1l KSwgV2ViS2l0VVJJU2NoZW1lSGFuZGxlcihjYWxsYmFjaywgdXNlckRhdGEpKTsKKyAgICBSZWZQ dHI8V2ViS2l0VVJJU2NoZW1lSGFuZGxlcj4gaGFuZGxlciA9IGFkb3B0UmVmKG5ldyBXZWJLaXRV UklTY2hlbWVIYW5kbGVyKGNhbGxiYWNrLCB1c2VyRGF0YSwgZGVzdHJveU5vdGlmeSkpOworICAg IGNvbnRleHQtPnByaXYtPnVyaVNjaGVtZUhhbmRsZXJzLnNldChTdHJpbmc6OmZyb21VVEY4KHNj aGVtZSksIGhhbmRsZXIuZ2V0KCkpOwogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a1Nj aGVtZShBZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhzY2hlbWUpKTsKICAg ICBXS1NvdXBSZXF1ZXN0TWFuYWdlclJlZ2lzdGVyVVJJU2NoZW1lKGNvbnRleHQtPnByaXYtPnJl cXVlc3RNYW5hZ2VyLmdldCgpLCB3a1NjaGVtZS5nZXQoKSk7CiB9CkBAIC01NzksMTIgKzYwNiwx NCBAQCBXS1NvdXBSZXF1ZXN0TWFuYWdlclJlZiB3ZWJraXRXZWJDb250ZXh0R2V0UmVxdWVzdE1h bmFnZXIoV2ViS2l0V2ViQ29udGV4dCogY29udAogCiB2b2lkIHdlYmtpdFdlYkNvbnRleHRSZWNl aXZlZFVSSVJlcXVlc3QoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgV2ViS2l0VVJJU2NoZW1l UmVxdWVzdCogcmVxdWVzdCkKIHsKLSAgICBXZWJLaXRVUklTY2hlbWVIYW5kbGVyIGhhbmRsZXIg PSBjb250ZXh0LT5wcml2LT51cmlTY2hlbWVIYW5kbGVycy5nZXQod2Via2l0X3VyaV9zY2hlbWVf cmVxdWVzdF9nZXRfc2NoZW1lKHJlcXVlc3QpKTsKLSAgICBpZiAoIWhhbmRsZXIuY2FsbGJhY2sp CisgICAgU3RyaW5nIHNjaGVtZShTdHJpbmc6OmZyb21VVEY4KHdlYmtpdF91cmlfc2NoZW1lX3Jl cXVlc3RfZ2V0X3NjaGVtZShyZXF1ZXN0KSkpOworICAgIFJlZlB0cjxXZWJLaXRVUklTY2hlbWVI YW5kbGVyPiBoYW5kbGVyID0gY29udGV4dC0+cHJpdi0+dXJpU2NoZW1lSGFuZGxlcnMuZ2V0KHNj aGVtZSk7CisgICAgQVNTRVJUKGhhbmRsZXIuZ2V0KCkpOworICAgIGlmICghaGFuZGxlci0+aGFz Q2FsbGJhY2soKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgY29udGV4dC0+cHJpdi0+dXJpU2No ZW1lUmVxdWVzdHMuc2V0KHdlYmtpdFVSSVNjaGVtZVJlcXVlc3RHZXRJRChyZXF1ZXN0KSwgcmVx dWVzdCk7Ci0gICAgaGFuZGxlci5jYWxsYmFjayhyZXF1ZXN0LCBoYW5kbGVyLnVzZXJEYXRhKTsK KyAgICBoYW5kbGVyLT5wZXJmb3JtQ2FsbGJhY2socmVxdWVzdCk7CiB9CiAKIHZvaWQgd2Via2l0 V2ViQ29udGV4dERpZEZhaWxUb0xvYWRVUklSZXF1ZXN0KFdlYktpdFdlYkNvbnRleHQqIGNvbnRl eHQsIHVpbnQ2NF90IHJlcXVlc3RJRCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuaAppbmRleCA1YWY3ZjI0Li4zYzk3YzcxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0 LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4 dC5oCkBAIC0xMzEsNyArMTMxLDggQEAgV0VCS0lUX0FQSSB2b2lkCiB3ZWJraXRfd2ViX2NvbnRl eHRfcmVnaXN0ZXJfdXJpX3NjaGVtZSAgICAgICAgICAgICAgKFdlYktpdFdlYkNvbnRleHQgICAg ICAgICAgICAgICpjb250ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnY2hhciAgICAgICAgICAgICAgICAgICAqc2NoZW1lLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBXZWJL aXRVUklTY2hlbWVSZXF1ZXN0Q2FsbGJhY2sgY2FsbGJhY2ssCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdwb2ludGVyICAgICAgICAgICAgICAg ICAgICAgICB1c2VyX2RhdGEpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBncG9pbnRlciAgICAgICAgICAgICAgICAgICAgICAgdXNlcl9kYXRh LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBH RGVzdHJveU5vdGlmeSAgICAgICAgICAgICAgICAgdXNlcl9kYXRhX2Rlc3Ryb3lfZnVuYyk7CiAK IFdFQktJVF9BUEkgZ2Jvb2xlYW4KIHdlYmtpdF93ZWJfY29udGV4dF9nZXRfc3BlbGxfY2hlY2tp bmdfZW5hYmxlZCAgICAgICAoV2ViS2l0V2ViQ29udGV4dCAgICAgICAgICAgICAgKmNvbnRleHQp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVz dFdlYktpdFdlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv dGVzdHMvVGVzdFdlYktpdFdlYkNvbnRleHQuY3BwCmluZGV4IGNkZTBiYzMuLjI3ZjZhNTQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJL aXRXZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90 ZXN0cy9UZXN0V2ViS2l0V2ViQ29udGV4dC5jcHAKQEAgLTE2NSw3ICsxNjUsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCByZWdpc3RlclVSSVNjaGVtZUhhbmRsZXIoY29uc3QgY2hhciogc2NoZW1lLCBj b25zdCBjaGFyKiByZXBseSwgaW50IHJlcGx5TGVuZ3RoLCBjb25zdCBjaGFyKiBtaW1lVHlwZSwg Ym9vbCByZXBseVdpdGhQYXRoID0gZmFsc2UpCiAgICAgewogICAgICAgICBtX2hhbmRsZXJzTWFw LnNldChTdHJpbmc6OmZyb21VVEY4KHNjaGVtZSksIFVSSVNjaGVtZUhhbmRsZXIocmVwbHksIHJl cGx5TGVuZ3RoLCBtaW1lVHlwZSwgcmVwbHlXaXRoUGF0aCkpOwotICAgICAgICB3ZWJraXRfd2Vi X2NvbnRleHRfcmVnaXN0ZXJfdXJpX3NjaGVtZSh3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2RlZmF1 bHQoKSwgc2NoZW1lLCB1cmlTY2hlbWVSZXF1ZXN0Q2FsbGJhY2ssIHRoaXMpOworICAgICAgICB3 ZWJraXRfd2ViX2NvbnRleHRfcmVnaXN0ZXJfdXJpX3NjaGVtZSh3ZWJraXRfd2ViX2NvbnRleHRf Z2V0X2RlZmF1bHQoKSwgc2NoZW1lLCB1cmlTY2hlbWVSZXF1ZXN0Q2FsbGJhY2ssIHRoaXMsIDAp OwogICAgIH0KIAogICAgIEdSZWZQdHI8V2ViS2l0VVJJU2NoZW1lUmVxdWVzdD4gbV91cmlTY2hl bWVSZXF1ZXN0Owo=