117533 2013-06-12 02:08:11 -0700 [GTK] MiniBrowser to automatically download "non-showable" documents when left click in link 2013-06-12 06:39:33 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 agomez webkit-unassigned cgarcia commit-queue mrobinson rego oldest_to_newest 899477 0 agomez 2013-06-12 02:08:11 -0700 Currently only way of saving to disk a link is through the context menu. Non-showable/navigatable documents behind links lead to no action in MiniBrowser. We would like to start automatically the download of such documents when left clicking it their link. 899501 1 204425 agomez 2013-06-12 04:48:29 -0700 Created attachment 204425 Patch 899502 2 204425 svillar 2013-06-12 04:58:18 -0700 Comment on attachment 204425 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204425&action=review Overall LGTM > Tools/ChangeLog:11 > + itself on link left clicking. The patch description normally goes just after the Reviewed by paragraph. These lines are normally used to comment about specific implementation stuff in some functions > Tools/MiniBrowser/gtk/BrowserWindow.c:371 > + mimeType = webkit_uri_response_get_mime_type(response); It's normally preferred to initialize the values in the declarations so: WebKitResponsePolicyDecision *responseDecision = WEBKIT_RESPONSE_POLICY_DECISION(decision); WebKitURIResponse *response = webkit_response_policy_decision_get_response(responseDecision); and the like > Tools/MiniBrowser/gtk/BrowserWindow.c:379 > + if (g_strcmp0 (webkit_web_resource_get_uri(mainResource), requestURI)) remove the blank after g_strcmp0 899505 3 204425 cgarcia 2013-06-12 05:05:08 -0700 Comment on attachment 204425 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=204425&action=review Looks great, thanks! There are just a few minor nits. > Tools/MiniBrowser/gtk/BrowserWindow.c:344 > + { This brace should be in the previous line. > Tools/MiniBrowser/gtk/BrowserWindow.c:347 > + || webkit_navigation_policy_decision_get_mouse_button(navigationDecision) != 2) Now that we depend on recent GTK+ we can use GDK_BUTTON_MIDDLE instead of 2 :-) > Tools/MiniBrowser/gtk/BrowserWindow.c:350 > + // Opening a new window if link clicked with the middle button Nit: Comments should finish with a period. > Tools/MiniBrowser/gtk/BrowserWindow.c:352 > + webkit_web_view_set_settings(newWebView, webkit_web_view_get_settings(webView)); I think this is no longer needed, since both web views are in the same web view group (the default one) and then sharing the settings already. > Tools/MiniBrowser/gtk/BrowserWindow.c:361 > + { This brace should be in the previous line. > Tools/MiniBrowser/gtk/BrowserWindow.c:367 > + WebKitResponsePolicyDecision *responseDecision; > + WebKitURIResponse *response; > + WebKitURIRequest *request; > + WebKitWebResource *mainResource; > + const char *mimeType; > + const char *requestURI; You can declare the variables when used instead of having this block. > Tools/MiniBrowser/gtk/BrowserWindow.c:379 > + if (g_strcmp0 (webkit_web_resource_get_uri(mainResource), requestURI)) Extra space between function name and parentheses. 899514 4 204428 agomez 2013-06-12 05:58:00 -0700 Created attachment 204428 Patch 899517 5 204428 cgarcia 2013-06-12 06:12:24 -0700 Comment on attachment 204428 Patch Perfect! 899518 6 agomez 2013-06-12 06:18:25 -0700 (In reply to comment #2) > (From update of attachment 204425 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=204425&action=review > > Overall LGTM (In reply to comment #5) > (From update of attachment 204428 [details]) > Perfect! Thanks for the reviews, guys! 899526 7 204428 commit-queue 2013-06-12 06:39:31 -0700 Comment on attachment 204428 Patch Clearing flags on attachment: 204428 Committed r151496: <http://trac.webkit.org/changeset/151496> 899527 8 commit-queue 2013-06-12 06:39:33 -0700 All reviewed patches have been landed. Closing bug. 204425 2013-06-12 04:48:29 -0700 2013-06-12 05:57:42 -0700 Patch bug-117533-20130612144649.patch text/plain 4735 agomez U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNDkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjI2ZDNmMDQ5MjU5MDlmMTc3ZjM3N2UyN2ZmZWYxZDYz N2Y5YWY3Ny4uNDFjMjQyZWEyZGNlZTIzNmU5NTI4MDM3NDFkMGVmMTUxZjAwODg5YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEzLTA2LTEyICBBbmRyZXMgR29tZXogIDxhZ29tZXpAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBNaW5pQnJvd3NlciB0byBhdXRvbWF0aWNhbGx5IGRvd25sb2FkICJub24tc2hv d2FibGUiIGRvY3VtZW50cyB3aGVuIGxlZnQgY2xpY2sgaW4gbGluaworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NTMzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3Nl cldpbmRvdy5jOgorICAgICAgICAod2ViVmlld0RlY2lkZVBvbGljeSk6IE1pbmlCcm93c2VyIG5v dyBzdGFydHMgYXV0b21hdGljYWxseSB0aGUKKyAgICAgICAgZG93bmxvYWQgb2YgdGhlIGRvY3Vt ZW50cyB0aGF0IGNhbm5vdCBiZSBzaG93biBqdXN0IGJ5IFdlYktpdAorICAgICAgICBpdHNlbGYg b24gbGluayBsZWZ0IGNsaWNraW5nLgorCisKIDIwMTMtMDYtMTIgIFphbiBEb2JlcnNlayAgPHpk b2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFJlbW92ZSB0aGUgV2ViQ29yZUxh eWVyKEd0azIpLmEgYXJjaGl2ZXMgYmVmb3JlIHJlZ2VuZXJhdGluZyB0aGVtCmRpZmYgLS1naXQg YS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jIGIvVG9vbHMvTWluaUJyb3dz ZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwppbmRleCBlMGNlZTYyNGI0MTZlYzMzN2JhODg2MGNiOWZm ZjY3OGE3OGNlMGYxLi40NmIxNzg3YzRiOWE2MDRjYWJiNGRiN2JmNjBiNWRmZWY1MWQ2ODMwIDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCisrKyBiL1Rv b2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKQEAgLTMzOSwyMiArMzM5LDUzIEBA IHN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3TG9hZEZhaWxlZChXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3 LCBXZWJLaXRMb2FkRXZlbnQgbG9hZEV2CiAKIHN0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3RGVjaWRl UG9saWN5KFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIFdlYktpdFBvbGljeURlY2lzaW9uICpkZWNp c2lvbiwgV2ViS2l0UG9saWN5RGVjaXNpb25UeXBlIGRlY2lzaW9uVHlwZSwgQnJvd3NlcldpbmRv dyAqd2luZG93KQogewotICAgIGlmIChkZWNpc2lvblR5cGUgIT0gV0VCS0lUX1BPTElDWV9ERUNJ U0lPTl9UWVBFX05BVklHQVRJT05fQUNUSU9OKQotICAgICAgICByZXR1cm4gRkFMU0U7Ci0KLSAg ICBXZWJLaXROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24gKm5hdmlnYXRpb25EZWNpc2lvbiA9IFdF QktJVF9OQVZJR0FUSU9OX1BPTElDWV9ERUNJU0lPTihkZWNpc2lvbik7Ci0gICAgaWYgKHdlYmtp dF9uYXZpZ2F0aW9uX3BvbGljeV9kZWNpc2lvbl9nZXRfbmF2aWdhdGlvbl90eXBlKG5hdmlnYXRp b25EZWNpc2lvbikgIT0gV0VCS0lUX05BVklHQVRJT05fVFlQRV9MSU5LX0NMSUNLRUQKLSAgICAg ICAgfHwgd2Via2l0X25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9uX2dldF9tb3VzZV9idXR0b24o bmF2aWdhdGlvbkRlY2lzaW9uKSAhPSAyKQorICAgIHN3aXRjaCAoZGVjaXNpb25UeXBlKSB7Cisg ICAgY2FzZSBXRUJLSVRfUE9MSUNZX0RFQ0lTSU9OX1RZUEVfTkFWSUdBVElPTl9BQ1RJT046Cisg ICAgICAgIHsKKyAgICAgICAgICAgIFdlYktpdE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbiAqbmF2 aWdhdGlvbkRlY2lzaW9uID0gV0VCS0lUX05BVklHQVRJT05fUE9MSUNZX0RFQ0lTSU9OKGRlY2lz aW9uKTsKKyAgICAgICAgICAgIGlmICh3ZWJraXRfbmF2aWdhdGlvbl9wb2xpY3lfZGVjaXNpb25f Z2V0X25hdmlnYXRpb25fdHlwZShuYXZpZ2F0aW9uRGVjaXNpb24pICE9IFdFQktJVF9OQVZJR0FU SU9OX1RZUEVfTElOS19DTElDS0VECisgICAgICAgICAgICAgICAgfHwgd2Via2l0X25hdmlnYXRp b25fcG9saWN5X2RlY2lzaW9uX2dldF9tb3VzZV9idXR0b24obmF2aWdhdGlvbkRlY2lzaW9uKSAh PSAyKQorICAgICAgICAgICAgICAgIHJldHVybiBGQUxTRTsKKworICAgICAgICAgICAgLy8gT3Bl bmluZyBhIG5ldyB3aW5kb3cgaWYgbGluayBjbGlja2VkIHdpdGggdGhlIG1pZGRsZSBidXR0b24K KyAgICAgICAgICAgIFdlYktpdFdlYlZpZXcgKm5ld1dlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVco d2Via2l0X3dlYl92aWV3X25ld193aXRoX2NvbnRleHQod2Via2l0X3dlYl92aWV3X2dldF9jb250 ZXh0KHdlYlZpZXcpKSk7CisgICAgICAgICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdz KG5ld1dlYlZpZXcsIHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3Mod2ViVmlldykpOworICAg ICAgICAgICAgR3RrV2lkZ2V0ICpuZXdXaW5kb3cgPSBicm93c2VyX3dpbmRvd19uZXcobmV3V2Vi VmlldywgR1RLX1dJTkRPVyh3aW5kb3cpKTsKKyAgICAgICAgICAgIHdlYmtpdF93ZWJfdmlld19s b2FkX3JlcXVlc3QobmV3V2ViVmlldywgd2Via2l0X25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9u X2dldF9yZXF1ZXN0KG5hdmlnYXRpb25EZWNpc2lvbikpOworICAgICAgICAgICAgZ3RrX3dpZGdl dF9zaG93KG5ld1dpbmRvdyk7CisKKyAgICAgICAgICAgIHdlYmtpdF9wb2xpY3lfZGVjaXNpb25f aWdub3JlKGRlY2lzaW9uKTsKKyAgICAgICAgICAgIHJldHVybiBUUlVFOworICAgICAgICB9Cisg ICAgY2FzZSBXRUJLSVRfUE9MSUNZX0RFQ0lTSU9OX1RZUEVfUkVTUE9OU0U6CisgICAgICAgIHsK KyAgICAgICAgICAgIFdlYktpdFJlc3BvbnNlUG9saWN5RGVjaXNpb24gKnJlc3BvbnNlRGVjaXNp b247CisgICAgICAgICAgICBXZWJLaXRVUklSZXNwb25zZSAqcmVzcG9uc2U7CisgICAgICAgICAg ICBXZWJLaXRVUklSZXF1ZXN0ICpyZXF1ZXN0OworICAgICAgICAgICAgV2ViS2l0V2ViUmVzb3Vy Y2UgKm1haW5SZXNvdXJjZTsKKyAgICAgICAgICAgIGNvbnN0IGNoYXIgKm1pbWVUeXBlOworICAg ICAgICAgICAgY29uc3QgY2hhciAqcmVxdWVzdFVSSTsKKworICAgICAgICAgICAgcmVzcG9uc2VE ZWNpc2lvbiA9IFdFQktJVF9SRVNQT05TRV9QT0xJQ1lfREVDSVNJT04oZGVjaXNpb24pOworICAg ICAgICAgICAgcmVzcG9uc2UgPSB3ZWJraXRfcmVzcG9uc2VfcG9saWN5X2RlY2lzaW9uX2dldF9y ZXNwb25zZShyZXNwb25zZURlY2lzaW9uKTsKKyAgICAgICAgICAgIG1pbWVUeXBlID0gd2Via2l0 X3VyaV9yZXNwb25zZV9nZXRfbWltZV90eXBlKHJlc3BvbnNlKTsKKworICAgICAgICAgICAgaWYg KHdlYmtpdF93ZWJfdmlld19jYW5fc2hvd19taW1lX3R5cGUod2ViVmlldywgbWltZVR5cGUpKQor ICAgICAgICAgICAgICAgIHJldHVybiBGQUxTRTsKKworICAgICAgICAgICAgcmVxdWVzdCA9IHdl YmtpdF9yZXNwb25zZV9wb2xpY3lfZGVjaXNpb25fZ2V0X3JlcXVlc3QocmVzcG9uc2VEZWNpc2lv bik7CisgICAgICAgICAgICByZXF1ZXN0VVJJID0gd2Via2l0X3VyaV9yZXF1ZXN0X2dldF91cmko cmVxdWVzdCk7CisgICAgICAgICAgICBtYWluUmVzb3VyY2UgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X21haW5fcmVzb3VyY2Uod2ViVmlldyk7CisgICAgICAgICAgICBpZiAoZ19zdHJjbXAwICh3ZWJr aXRfd2ViX3Jlc291cmNlX2dldF91cmkobWFpblJlc291cmNlKSwgcmVxdWVzdFVSSSkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgICAgICAgICB3ZWJraXRfcG9saWN5X2Rl Y2lzaW9uX2Rvd25sb2FkKGRlY2lzaW9uKTsKKyAgICAgICAgICAgIHJldHVybiBUUlVFOworICAg ICAgICB9CisgICAgY2FzZSBXRUJLSVRfUE9MSUNZX0RFQ0lTSU9OX1RZUEVfTkVXX1dJTkRPV19B Q1RJT046CisgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIEZBTFNFOwotCi0gICAgV2ViS2l0 V2ViVmlldyAqbmV3V2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3 X3dpdGhfY29udGV4dCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2NvbnRleHQod2ViVmlldykpKTsKLSAg ICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3NldHRpbmdzKG5ld1dlYlZpZXcsIHdlYmtpdF93ZWJfdmll d19nZXRfc2V0dGluZ3Mod2ViVmlldykpOwotICAgIEd0a1dpZGdldCAqbmV3V2luZG93ID0gYnJv d3Nlcl93aW5kb3dfbmV3KG5ld1dlYlZpZXcsIEdUS19XSU5ET1cod2luZG93KSk7Ci0gICAgd2Vi a2l0X3dlYl92aWV3X2xvYWRfcmVxdWVzdChuZXdXZWJWaWV3LCB3ZWJraXRfbmF2aWdhdGlvbl9w b2xpY3lfZGVjaXNpb25fZ2V0X3JlcXVlc3QobmF2aWdhdGlvbkRlY2lzaW9uKSk7Ci0gICAgZ3Rr X3dpZGdldF9zaG93KG5ld1dpbmRvdyk7Ci0KLSAgICB3ZWJraXRfcG9saWN5X2RlY2lzaW9uX2ln bm9yZShkZWNpc2lvbik7Ci0gICAgcmV0dXJuIFRSVUU7CisgICAgfQogfQogCiBzdGF0aWMgZ2Jv b2xlYW4gd2ViVmlld0RlY2lkZVBlcm1pc3Npb25SZXF1ZXN0KFdlYktpdFdlYlZpZXcgKndlYlZp ZXcsIFdlYktpdFBlcm1pc3Npb25SZXF1ZXN0ICpyZXF1ZXN0LCBCcm93c2VyV2luZG93ICp3aW5k b3cpCg== 204428 2013-06-12 05:58:00 -0700 2013-06-12 06:39:30 -0700 Patch bug-117533-20130612155620.patch text/plain 4463 agomez U3VidmVyc2lvbiBSZXZpc2lvbjogMTUxNDkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjI2ZDNmMDQ5MjU5MDlmMTc3ZjM3N2UyN2ZmZWYxZDYz N2Y5YWY3Ny4uNDhhMTUzYTgwZmQ1NDZkNzM2OTk1ZWYzZjc3OGYxMzMyODlhMDdhMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEzLTA2LTEyICBBbmRyZXMgR29tZXogIDxhZ29tZXpAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBNaW5pQnJvd3NlciB0byBhdXRvbWF0aWNhbGx5IGRvd25sb2FkICJub24tc2hv d2FibGUiIGRvY3VtZW50cyB3aGVuIGxlZnQgY2xpY2sgaW4gbGluaworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE3NTMzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWluaUJyb3dzZXIgbm93IHN0YXJ0cyBh dXRvbWF0aWNhbGx5IHRoZSBkb3dubG9hZCBvZiB0aGUgZG9jdW1lbnRzCisgICAgICAgIHRoYXQg Y2Fubm90IGJlIHNob3duIGp1c3QgYnkgV2ViS2l0IGl0c2VsZiBvbiBsaW5rIGxlZnQgY2xpY2tp bmcuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAgICAg ICAod2ViVmlld0RlY2lkZVBvbGljeSk6IGhhbmRsZWQgdGhlCisgICAgICAgIFdFQktJVF9QT0xJ Q1lfREVDSVNJT05fVFlQRV9SRVNQT05TRSBkZWNpc2lvbiB0eXBlIHRvby4KKwogMjAxMy0wNi0x MiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10g UmVtb3ZlIHRoZSBXZWJDb3JlTGF5ZXIoR3RrMikuYSBhcmNoaXZlcyBiZWZvcmUgcmVnZW5lcmF0 aW5nIHRoZW0KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93 LmMgYi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCmluZGV4IGUwY2VlNjI0 YjQxNmVjMzM3YmE4ODYwY2I5ZmZmNjc4YTc4Y2UwZjEuLjU1ZjkwNjgyMGM5ZDYxNThkM2M1NTc3 MzMwMmZmODBhYjZlYWViNmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93 c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwpA QCAtMzM5LDIyICszMzksNDMgQEAgc3RhdGljIGdib29sZWFuIHdlYlZpZXdMb2FkRmFpbGVkKFdl YktpdFdlYlZpZXcgKndlYlZpZXcsIFdlYktpdExvYWRFdmVudCBsb2FkRXYKIAogc3RhdGljIGdi b29sZWFuIHdlYlZpZXdEZWNpZGVQb2xpY3koV2ViS2l0V2ViVmlldyAqd2ViVmlldywgV2ViS2l0 UG9saWN5RGVjaXNpb24gKmRlY2lzaW9uLCBXZWJLaXRQb2xpY3lEZWNpc2lvblR5cGUgZGVjaXNp b25UeXBlLCBCcm93c2VyV2luZG93ICp3aW5kb3cpCiB7Ci0gICAgaWYgKGRlY2lzaW9uVHlwZSAh PSBXRUJLSVRfUE9MSUNZX0RFQ0lTSU9OX1RZUEVfTkFWSUdBVElPTl9BQ1RJT04pCi0gICAgICAg IHJldHVybiBGQUxTRTsKLQotICAgIFdlYktpdE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbiAqbmF2 aWdhdGlvbkRlY2lzaW9uID0gV0VCS0lUX05BVklHQVRJT05fUE9MSUNZX0RFQ0lTSU9OKGRlY2lz aW9uKTsKLSAgICBpZiAod2Via2l0X25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9uX2dldF9uYXZp Z2F0aW9uX3R5cGUobmF2aWdhdGlvbkRlY2lzaW9uKSAhPSBXRUJLSVRfTkFWSUdBVElPTl9UWVBF X0xJTktfQ0xJQ0tFRAotICAgICAgICB8fCB3ZWJraXRfbmF2aWdhdGlvbl9wb2xpY3lfZGVjaXNp b25fZ2V0X21vdXNlX2J1dHRvbihuYXZpZ2F0aW9uRGVjaXNpb24pICE9IDIpCisgICAgc3dpdGNo IChkZWNpc2lvblR5cGUpIHsKKyAgICBjYXNlIFdFQktJVF9QT0xJQ1lfREVDSVNJT05fVFlQRV9O QVZJR0FUSU9OX0FDVElPTjogeworICAgICAgICBXZWJLaXROYXZpZ2F0aW9uUG9saWN5RGVjaXNp b24gKm5hdmlnYXRpb25EZWNpc2lvbiA9IFdFQktJVF9OQVZJR0FUSU9OX1BPTElDWV9ERUNJU0lP TihkZWNpc2lvbik7CisgICAgICAgIGlmICh3ZWJraXRfbmF2aWdhdGlvbl9wb2xpY3lfZGVjaXNp b25fZ2V0X25hdmlnYXRpb25fdHlwZShuYXZpZ2F0aW9uRGVjaXNpb24pICE9IFdFQktJVF9OQVZJ R0FUSU9OX1RZUEVfTElOS19DTElDS0VECisgICAgICAgICAgICB8fCB3ZWJraXRfbmF2aWdhdGlv bl9wb2xpY3lfZGVjaXNpb25fZ2V0X21vdXNlX2J1dHRvbihuYXZpZ2F0aW9uRGVjaXNpb24pICE9 IEdES19CVVRUT05fTUlERExFKQorICAgICAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgICAg IC8vIE9wZW5pbmcgYSBuZXcgd2luZG93IGlmIGxpbmsgY2xpY2tlZCB3aXRoIHRoZSBtaWRkbGUg YnV0dG9uLgorICAgICAgICBXZWJLaXRXZWJWaWV3ICpuZXdXZWJWaWV3ID0gV0VCS0lUX1dFQl9W SUVXKHdlYmtpdF93ZWJfdmlld19uZXdfd2l0aF9jb250ZXh0KHdlYmtpdF93ZWJfdmlld19nZXRf Y29udGV4dCh3ZWJWaWV3KSkpOworICAgICAgICBHdGtXaWRnZXQgKm5ld1dpbmRvdyA9IGJyb3dz ZXJfd2luZG93X25ldyhuZXdXZWJWaWV3LCBHVEtfV0lORE9XKHdpbmRvdykpOworICAgICAgICB3 ZWJraXRfd2ViX3ZpZXdfbG9hZF9yZXF1ZXN0KG5ld1dlYlZpZXcsIHdlYmtpdF9uYXZpZ2F0aW9u X3BvbGljeV9kZWNpc2lvbl9nZXRfcmVxdWVzdChuYXZpZ2F0aW9uRGVjaXNpb24pKTsKKyAgICAg ICAgZ3RrX3dpZGdldF9zaG93KG5ld1dpbmRvdyk7CisKKyAgICAgICAgd2Via2l0X3BvbGljeV9k ZWNpc2lvbl9pZ25vcmUoZGVjaXNpb24pOworICAgICAgICByZXR1cm4gVFJVRTsKKyAgICB9Cisg ICAgY2FzZSBXRUJLSVRfUE9MSUNZX0RFQ0lTSU9OX1RZUEVfUkVTUE9OU0U6IHsKKyAgICAgICAg V2ViS2l0UmVzcG9uc2VQb2xpY3lEZWNpc2lvbiAqcmVzcG9uc2VEZWNpc2lvbiA9IFdFQktJVF9S RVNQT05TRV9QT0xJQ1lfREVDSVNJT04oZGVjaXNpb24pOworICAgICAgICBXZWJLaXRVUklSZXNw b25zZSAqcmVzcG9uc2UgPSB3ZWJraXRfcmVzcG9uc2VfcG9saWN5X2RlY2lzaW9uX2dldF9yZXNw b25zZShyZXNwb25zZURlY2lzaW9uKTsKKyAgICAgICAgY29uc3QgY2hhciAqbWltZVR5cGUgPSB3 ZWJraXRfdXJpX3Jlc3BvbnNlX2dldF9taW1lX3R5cGUocmVzcG9uc2UpOworCisgICAgICAgIGlm ICh3ZWJraXRfd2ViX3ZpZXdfY2FuX3Nob3dfbWltZV90eXBlKHdlYlZpZXcsIG1pbWVUeXBlKSkK KyAgICAgICAgICAgIHJldHVybiBGQUxTRTsKKworICAgICAgICBXZWJLaXRXZWJSZXNvdXJjZSAq bWFpblJlc291cmNlID0gd2Via2l0X3dlYl92aWV3X2dldF9tYWluX3Jlc291cmNlKHdlYlZpZXcp OworICAgICAgICBXZWJLaXRVUklSZXF1ZXN0ICpyZXF1ZXN0ID0gd2Via2l0X3Jlc3BvbnNlX3Bv bGljeV9kZWNpc2lvbl9nZXRfcmVxdWVzdChyZXNwb25zZURlY2lzaW9uKTsKKyAgICAgICAgY29u c3QgY2hhciAqcmVxdWVzdFVSSSA9IHdlYmtpdF91cmlfcmVxdWVzdF9nZXRfdXJpKHJlcXVlc3Qp OworICAgICAgICBpZiAoZ19zdHJjbXAwKHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X3VyaShtYWlu UmVzb3VyY2UpLCByZXF1ZXN0VVJJKSkKKyAgICAgICAgICAgIHJldHVybiBGQUxTRTsKKworICAg ICAgICB3ZWJraXRfcG9saWN5X2RlY2lzaW9uX2Rvd25sb2FkKGRlY2lzaW9uKTsKKyAgICAgICAg cmV0dXJuIFRSVUU7CisgICAgfQorICAgIGNhc2UgV0VCS0lUX1BPTElDWV9ERUNJU0lPTl9UWVBF X05FV19XSU5ET1dfQUNUSU9OOgorICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBGQUxTRTsK LQotICAgIFdlYktpdFdlYlZpZXcgKm5ld1dlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2Via2l0 X3dlYl92aWV3X25ld193aXRoX2NvbnRleHQod2Via2l0X3dlYl92aWV3X2dldF9jb250ZXh0KHdl YlZpZXcpKSk7Ci0gICAgd2Via2l0X3dlYl92aWV3X3NldF9zZXR0aW5ncyhuZXdXZWJWaWV3LCB3 ZWJraXRfd2ViX3ZpZXdfZ2V0X3NldHRpbmdzKHdlYlZpZXcpKTsKLSAgICBHdGtXaWRnZXQgKm5l d1dpbmRvdyA9IGJyb3dzZXJfd2luZG93X25ldyhuZXdXZWJWaWV3LCBHVEtfV0lORE9XKHdpbmRv dykpOwotICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3JlcXVlc3QobmV3V2ViVmlldywgd2Via2l0 X25hdmlnYXRpb25fcG9saWN5X2RlY2lzaW9uX2dldF9yZXF1ZXN0KG5hdmlnYXRpb25EZWNpc2lv bikpOwotICAgIGd0a193aWRnZXRfc2hvdyhuZXdXaW5kb3cpOwotCi0gICAgd2Via2l0X3BvbGlj eV9kZWNpc2lvbl9pZ25vcmUoZGVjaXNpb24pOwotICAgIHJldHVybiBUUlVFOworICAgIH0KIH0K IAogc3RhdGljIGdib29sZWFuIHdlYlZpZXdEZWNpZGVQZXJtaXNzaW9uUmVxdWVzdChXZWJLaXRX ZWJWaWV3ICp3ZWJWaWV3LCBXZWJLaXRQZXJtaXNzaW9uUmVxdWVzdCAqcmVxdWVzdCwgQnJvd3Nl cldpbmRvdyAqd2luZG93KQo=