69255 2011-10-03 05:37:12 -0700 [GTK] Implement default error pages in WebKit2 GTK+ API 2011-10-04 11:13:31 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 69254 1 cgarcia webkit-unassigned gustavo mrobinson pnormand webkit.review.bot xan.lopez oldest_to_newest 476917 0 cgarcia 2011-10-03 05:37:12 -0700 When a page fails to load and client doesn't handle load errors, we should load a default error page with the error. 476921 1 109475 cgarcia 2011-10-03 05:45:48 -0700 Created attachment 109475 Patch 477030 2 109475 mrobinson 2011-10-03 09:36:31 -0700 Comment on attachment 109475 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109475&action=review Looks fine to me, but I'm not sure if it's the right thing to do to "hide" the loading of the error page from the API. > Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp:72 > + WebKitWebLoaderClient* client = WEBKIT_WEB_LOADER_CLIENT(clientInfo); > + if (client->priv->loadingErrorPage) > + return; > + > gboolean returnValue; > - g_signal_emit(WEBKIT_WEB_LOADER_CLIENT(clientInfo), signals[PROVISIONAL_LOAD_STARTED], 0, &returnValue); > + g_signal_emit(client, signals[PROVISIONAL_LOAD_STARTED], 0, &returnValue); Are you sure it's good to hide inner workings of the error page load from the API? > Source/WebKit2/UIProcess/API/gtk/WebKitWebLoaderClient.cpp:84 > + WebKitWebLoaderClient* client = WEBKIT_WEB_LOADER_CLIENT(clientInfo); > + if (client->priv->loadingErrorPage) > + return; > + > gboolean returnValue; Ditto. 477039 3 cgarcia 2011-10-03 09:42:01 -0700 (In reply to comment #2) > (From update of attachment 109475 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=109475&action=review > > Looks fine to me, but I'm not sure if it's the right thing to do to "hide" the loading of the error page from the API. > It's not hidden, provisional-load-failed and load-failed signals documentation say that a custom error page will be loaded if the user doesn't handle the signal. The behaviour is exactly the same than webkit1 API. 477048 4 mrobinson 2011-10-03 09:54:27 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 109475 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=109475&action=review > > > > Looks fine to me, but I'm not sure if it's the right thing to do to "hide" the loading of the error page from the API. > > > > It's not hidden, provisional-load-failed and load-failed signals documentation say that a custom error page will be loaded if the user doesn't handle the signal. The behaviour is exactly the same than webkit1 API. I was referring to the loading of the custom error page. I was referring to the fact that you cannot observe the loading signals as the custom error page loads. Note that this does not happen on the Mac port. I think we should follow the approach of firing the signals. At least the conservative decision is to fire them now and let the UA track if it is loading an error page. I'm guessing the original decision was made to not break Epiphany. Since we are rewriting this code in Epiphany anyway, we can make whatever decision we want. My tendency is to be more similar to other ports. 477050 5 mrobinson 2011-10-03 09:55:06 -0700 (In reply to comment #4) > I was referring to the loading of the custom error page Sorry. I was *not* referring to the loading of the custom error page. :) 477452 6 cgarcia 2011-10-03 23:28:50 -0700 (In reply to comment #4) > I was referring to the loading of the custom error page. I was referring to the fact that you cannot observe the loading signals as the custom error page loads. Note that this does not happen on the Mac port. I think we should follow the approach of firing the signals. At least the conservative decision is to fire them now and let the UA track if it is loading an error page. > > I'm guessing the original decision was made to not break Epiphany. Since we are rewriting this code in Epiphany anyway, we can make whatever decision we want. My tendency is to be more similar to other ports. For me, the fact that the error message is a web page is an implementation detail, that's why I kept the wk1 behaviour of not exposing the load process of error pages to the user. But I agree, we can just emit the signals for now and take a final decision later, instead of the opposite. 477492 7 109594 cgarcia 2011-10-04 01:47:23 -0700 Created attachment 109594 Updated patch Patch updated to emit load signals even when loading error page. 477494 8 webkit.review.bot 2011-10-04 01:50:10 -0700 Attachment 109594 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp:27: webkit_network_error_quark is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp:38: webkit_policy_error_quark is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/gtk/WebKitError.cpp:49: webkit_plugin_error_quark is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebKit2/UIProcess/API/gtk/WebKitError.h:66: Extra space before ( in function call [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/WebKitError.h:69: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 5 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 477525 9 109594 gustavo 2011-10-04 03:57:00 -0700 Comment on attachment 109594 Updated patch Attachment 109594 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/9935500 477768 10 cgarcia 2011-10-04 11:13:31 -0700 Committed r96616: <http://trac.webkit.org/changeset/96616> 109475 2011-10-03 05:45:48 -0700 2011-10-04 01:47:23 -0700 Patch wk2-default-error-page.diff text/plain 12038 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5ZDdjZWFiLi45NmNhNmFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTEtMTAtMDMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEltcGxlbWVudCBkZWZhdWx0IGVycm9yIHBhZ2VzIGluIFdlYktp dDIgR1RLKyBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY5MjU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRFcnJvci5jcHA6CisgICAgICAgICh3ZWJraXRf cG9saWN5X2Vycm9yX3F1YXJrKTogQWRkIHF1YXJrIGZvciBwb2xpY3kgZXJyb3JzLgorICAgICAg ICAod2Via2l0X3BsdWdpbl9lcnJvcl9xdWFyayk6IEFkZCBxdWFyayBmb3IgcGx1Z2luIGVycm9y cy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRFcnJvci5oOiBBZGQgcG9saWN5 IGFuZCBwbHVnaW4gZXJyb3JzLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YkxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lKTogRG8gbm90IGVtaXQgdGhlIHNpZ25hbCB3aGVuCisgICAgICAgIGxvYWRpbmcgZGVmYXVs dCBlcnJvciBwYWdlLgorICAgICAgICAoZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlz aW9uYWxMb2FkRm9yRnJhbWUpOiBEaXR0by4KKyAgICAgICAgKGRpZEZhaWxQcm92aXNpb25hbExv YWRXaXRoRXJyb3JGb3JGcmFtZSk6IERpdHRvLgorICAgICAgICAoZGlkQ29tbWl0TG9hZEZvckZy YW1lKTogRGl0dG8uCisgICAgICAgIChkaWRGaW5pc2hMb2FkRm9yRnJhbWUpOiBEaXR0by4KKyAg ICAgICAgKGRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpOiBEaXR0by4KKyAgICAgICAgKHdl YmtpdFdlYkxvYWRlckNsaWVudExvYWRGYWlsZWQpOiBMb2FkIGEgY3VzdG9tIGVycm9yIHBhZ2Ug d2hlbgorICAgICAgICBsb2FkIGZhaWxlZCBhbmQgc2lnbmFsIGhhcyBub3QgYmVlbiBoYW5kbGVk LgorICAgICAgICAod2Via2l0X3dlYl9sb2FkZXJfY2xpZW50X2NsYXNzX2luaXQpOiBBZGQgZGVm YXVsdCBpbXBsZW1lbnRhdGlvbgorICAgICAgICBmb3IgcHJvdmlzaW9uYWxfbG9hZF9mYWlsZWQg YW5kIGxvYWRfZmFpbGVkIHZpcnR1YWwgbWV0aG9kcy4KKwogMjAxMS0xMC0wMiAgWmVubyBBbGJp c3NlciAgPHplbm8uYWxiaXNzZXJAbm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXVtNYWNd IFdlYktpdDIgZG9lcyBub3QgYnVpbGQgb24gbWFjIGFmdGVyIG1lcmdlIG9mIFF0NSByZWZhY3Rv ciBicmFuY2guCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRFcnJvci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRF cnJvci5jcHAKaW5kZXggOWJkOTM4ZC4uYTYwYzAxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RXJyb3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEVycm9yLmNwcApAQCAtMjQsNyArMjQsNyBAQAogI2lu Y2x1ZGUgIldlYktpdFByaXZhdGUuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0Vycm9yc0d0ay5oPgog Ci1HUXVhcmsgd2Via2l0X25ldHdvcmtfZXJyb3JfcXVhcmsodm9pZCkKK0dRdWFyayB3ZWJraXRf bmV0d29ya19lcnJvcl9xdWFyaygpCiB7CiAgICAgcmV0dXJuIGdfcXVhcmtfZnJvbV9zdGF0aWNf c3RyaW5nKFdlYkNvcmU6OmVycm9yRG9tYWluTmV0d29yayk7CiB9CkBAIC0zNCwzICszNCwyNiBA QCBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9ORVRXT1JLX0VSUk9SX1RSQU5T UE9SVCwgTmV0d29ya0Vycm9yVHJhbnNwbwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShX RUJLSVRfTkVUV09SS19FUlJPUl9VTktOT1dOX1BST1RPQ09MLCBOZXR3b3JrRXJyb3JVbmtub3du UHJvdG9jb2wpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfTkVUV09SS19F UlJPUl9DQU5DRUxMRUQsIE5ldHdvcmtFcnJvckNhbmNlbGxlZCk7CiBDT01QSUxFX0FTU0VSVF9N QVRDSElOR19FTlVNKFdFQktJVF9ORVRXT1JLX0VSUk9SX0ZJTEVfRE9FU19OT1RfRVhJU1QsIE5l dHdvcmtFcnJvckZpbGVEb2VzTm90RXhpc3QpOworCitHUXVhcmsgd2Via2l0X3BvbGljeV9lcnJv cl9xdWFyaygpCit7CisgICAgcmV0dXJuIGdfcXVhcmtfZnJvbV9zdGF0aWNfc3RyaW5nKFdlYkNv cmU6OmVycm9yRG9tYWluUG9saWN5KTsKK30KKworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5V TShXRUJLSVRfUE9MSUNZX0VSUk9SX0ZBSUxFRCwgUG9saWN5RXJyb3JGYWlsZWQpOworQ09NUElM RV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfUE9MSUNZX0VSUk9SX0NBTk5PVF9TSE9XX01J TUVfVFlQRSwgUG9saWN5RXJyb3JDYW5ub3RTaG93TWltZVR5cGUpOworQ09NUElMRV9BU1NFUlRf TUFUQ0hJTkdfRU5VTShXRUJLSVRfUE9MSUNZX0VSUk9SX0NBTk5PVF9TSE9XX1VSTCwgUG9saWN5 RXJyb3JDYW5ub3RTaG93VVJMKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lU X1BPTElDWV9FUlJPUl9GUkFNRV9MT0FEX0lOVEVSUlVQVEVEX0JZX1BPTElDWV9DSEFOR0UsIFBv bGljeUVycm9yRnJhbWVMb2FkSW50ZXJydXB0ZWRCeVBvbGljeUNoYW5nZSk7CitDT01QSUxFX0FT U0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9QT0xJQ1lfRVJST1JfQ0FOTk9UX1VTRV9SRVNUUklD VEVEX1BPUlQsIFBvbGljeUVycm9yQ2Fubm90VXNlUmVzdHJpY3RlZFBvcnQpOworCitHUXVhcmsg d2Via2l0X3BsdWdpbl9lcnJvcl9xdWFyaygpCit7CisgICAgcmV0dXJuIGdfcXVhcmtfZnJvbV9z dGF0aWNfc3RyaW5nKFdlYkNvcmU6OmVycm9yRG9tYWluUGx1Z2luKTsKK30KKworQ09NUElMRV9B U1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfUExVR0lOX0VSUk9SX0ZBSUxFRCwgUGx1Z2luRXJy b3JGYWlsZWQpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfUExVR0lOX0VS Uk9SX0NBTk5PVF9GSU5EX1BMVUdJTiwgUGx1Z2luRXJyb3JDYW5ub3RGaW5kUGx1Z2luKTsKK0NP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX1BMVUdJTl9FUlJPUl9DQU5OT1RfTE9B RF9QTFVHSU4sIFBsdWdpbkVycm9yQ2Fubm90TG9hZFBsdWdpbik7CitDT01QSUxFX0FTU0VSVF9N QVRDSElOR19FTlVNKFdFQktJVF9QTFVHSU5fRVJST1JfSkFWQV9VTkFWQUlMQUJMRSwgUGx1Z2lu RXJyb3JKYXZhVW5hdmFpbGFibGUpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJL SVRfUExVR0lOX0VSUk9SX0NPTk5FQ1RJT05fQ0FOQ0VMTEVELCBQbHVnaW5FcnJvckNvbm5lY3Rp b25DYW5jZWxsZWQpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfUExVR0lO X0VSUk9SX1dJTExfSEFORExFX0xPQUQsIFBsdWdpbkVycm9yV2lsbEhhbmRsZUxvYWQpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RXJyb3IuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEVycm9yLmgKaW5kZXggNWE2 NGY1NS4uYWZkNDE4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0RXJyb3IuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRFcnJvci5oCkBAIC0zMSw2ICszMSw4IEBACiBHX0JFR0lOX0RFQ0xTCiAKICNkZWZpbmUg V0VCS0lUX05FVFdPUktfRVJST1Igd2Via2l0X25ldHdvcmtfZXJyb3JfcXVhcmsgKCkKKyNkZWZp bmUgV0VCS0lUX1BPTElDWV9FUlJPUiAgd2Via2l0X3BvbGljeV9lcnJvcl9xdWFyayAoKQorI2Rl ZmluZSBXRUJLSVRfUExVR0lOX0VSUk9SICB3ZWJraXRfcGx1Z2luX2Vycm9yX3F1YXJrICgpCiAK IHR5cGVkZWYgZW51bSB7CiAgICAgV0VCS0lUX05FVFdPUktfRVJST1JfRkFJTEVEID0gMzk5LApA QCAtNDAsOSArNDIsMzIgQEAgdHlwZWRlZiBlbnVtIHsKICAgICBXRUJLSVRfTkVUV09SS19FUlJP Ul9GSUxFX0RPRVNfTk9UX0VYSVNUID0gMzAzCiB9IFdlYktpdE5ldHdvcmtFcnJvcjsKIAordHlw ZWRlZiBlbnVtIHsKKyAgICBXRUJLSVRfUE9MSUNZX0VSUk9SX0ZBSUxFRCA9IDE5OSwKKyAgICBX RUJLSVRfUE9MSUNZX0VSUk9SX0NBTk5PVF9TSE9XX01JTUVfVFlQRSA9IDEwMCwKKyAgICBXRUJL SVRfUE9MSUNZX0VSUk9SX0NBTk5PVF9TSE9XX1VSTCA9IDEwMSwKKyAgICBXRUJLSVRfUE9MSUNZ X0VSUk9SX0ZSQU1FX0xPQURfSU5URVJSVVBURURfQllfUE9MSUNZX0NIQU5HRSA9IDEwMiwKKyAg ICBXRUJLSVRfUE9MSUNZX0VSUk9SX0NBTk5PVF9VU0VfUkVTVFJJQ1RFRF9QT1JUID0gMTAzCit9 IFdlYktpdFBvbGljeUVycm9yOworCit0eXBlZGVmIGVudW0geworICAgIFdFQktJVF9QTFVHSU5f RVJST1JfRkFJTEVEID0gMjk5LAorICAgIFdFQktJVF9QTFVHSU5fRVJST1JfQ0FOTk9UX0ZJTkRf UExVR0lOID0gMjAwLAorICAgIFdFQktJVF9QTFVHSU5fRVJST1JfQ0FOTk9UX0xPQURfUExVR0lO ID0gMjAxLAorICAgIFdFQktJVF9QTFVHSU5fRVJST1JfSkFWQV9VTkFWQUlMQUJMRSA9IDIwMiwK KyAgICBXRUJLSVRfUExVR0lOX0VSUk9SX0NPTk5FQ1RJT05fQ0FOQ0VMTEVEID0gMjAzLAorICAg IFdFQktJVF9QTFVHSU5fRVJST1JfV0lMTF9IQU5ETEVfTE9BRCA9IDIwNCwKK30gV2ViS2l0UGx1 Z2luRXJyb3I7CisKIFdLX0VYUE9SVCBHUXVhcmsKIHdlYmtpdF9uZXR3b3JrX2Vycm9yX3F1YXJr ICh2b2lkKTsKIAorV0tfRVhQT1JUIEdRdWFyaword2Via2l0X3BvbGljeV9lcnJvcl9xdWFyayAg KHZvaWQpOworCitXS19FWFBPUlQgR1F1YXJrCit3ZWJraXRfcGx1Z2luX2Vycm9yX3F1YXJrICAo dm9pZCk7CisKIEdfRU5EX0RFQ0xTCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkxvYWRlckNsaWVudC5jcHAKaW5kZXgg OTc4YTk5Ni4uM2YyMjNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViTG9hZGVyQ2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJMb2FkZXJDbGllbnQuY3BwCkBAIC0yMCw2ICsyMCw3IEBA CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViTG9hZGVyQ2xpZW50Lmgi CiAKKyNpbmNsdWRlICJXZWJLaXRFcnJvci5oIgogI2luY2x1ZGUgIldlYktpdE1hcnNoYWwuaCIK ICNpbmNsdWRlICJXZWJLaXRQcml2YXRlLmgiCiAjaW5jbHVkZSAiV2ViS2l0V2ViVmlldy5oIgpA QCAtNTAsNiArNTEsOCBAQCBlbnVtIHsKIAogc3RydWN0IF9XZWJLaXRXZWJMb2FkZXJDbGllbnRQ cml2YXRlIHsKICAgICBHUmVmUHRyPFdlYktpdFdlYlZpZXc+IHZpZXc7CisKKyAgICBib29sIGxv YWRpbmdFcnJvclBhZ2U7CiB9OwogCiBzdGF0aWMgZ3VpbnQgc2lnbmFsc1tMQVNUX1NJR05BTF0g PSB7IDAsIH07CkBAIC02MSw4ICs2NCwxMiBAQCBzdGF0aWMgdm9pZCBkaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXSwogICAg IGlmICghV0tGcmFtZUlzTWFpbkZyYW1lKGZyYW1lKSkKICAgICAgICAgcmV0dXJuOwogCisgICAg V2ViS2l0V2ViTG9hZGVyQ2xpZW50KiBjbGllbnQgPSBXRUJLSVRfV0VCX0xPQURFUl9DTElFTlQo Y2xpZW50SW5mbyk7CisgICAgaWYgKGNsaWVudC0+cHJpdi0+bG9hZGluZ0Vycm9yUGFnZSkKKyAg ICAgICAgcmV0dXJuOworCiAgICAgZ2Jvb2xlYW4gcmV0dXJuVmFsdWU7Ci0gICAgZ19zaWduYWxf ZW1pdChXRUJLSVRfV0VCX0xPQURFUl9DTElFTlQoY2xpZW50SW5mbyksIHNpZ25hbHNbUFJPVklT SU9OQUxfTE9BRF9TVEFSVEVEXSwgMCwgJnJldHVyblZhbHVlKTsKKyAgICBnX3NpZ25hbF9lbWl0 KGNsaWVudCwgc2lnbmFsc1tQUk9WSVNJT05BTF9MT0FEX1NUQVJURURdLCAwLCAmcmV0dXJuVmFs dWUpOwogfQogCiBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNp b25hbExvYWRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tUeXBl UmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQpAQCAtNzAsOCArNzcsMTIgQEAg c3RhdGljIHZvaWQgZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFcKICAgICBpZiAoIVdLRnJhbWVJc01haW5GcmFtZShmcmFt ZSkpCiAgICAgICAgIHJldHVybjsKIAorICAgIFdlYktpdFdlYkxvYWRlckNsaWVudCogY2xpZW50 ID0gV0VCS0lUX1dFQl9MT0FERVJfQ0xJRU5UKGNsaWVudEluZm8pOworICAgIGlmIChjbGllbnQt PnByaXYtPmxvYWRpbmdFcnJvclBhZ2UpCisgICAgICAgIHJldHVybjsKKwogICAgIGdib29sZWFu IHJldHVyblZhbHVlOwotICAgIGdfc2lnbmFsX2VtaXQoV0VCS0lUX1dFQl9MT0FERVJfQ0xJRU5U KGNsaWVudEluZm8pLCBzaWduYWxzW1BST1ZJU0lPTkFMX0xPQURfUkVDRUlWRURfU0VSVkVSX1JF RElSRUNUXSwgMCwgJnJldHVyblZhbHVlKTsKKyAgICBnX3NpZ25hbF9lbWl0KGNsaWVudCwgc2ln bmFsc1tQUk9WSVNJT05BTF9MT0FEX1JFQ0VJVkVEX1NFUlZFUl9SRURJUkVDVF0sIDAsICZyZXR1 cm5WYWx1ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJy b3JGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tFcnJvclJlZiBl cnJvciwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQpAQCAtNzks MTMgKzkwLDE4IEBAIHN0YXRpYyB2b2lkIGRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JG b3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmCiAgICAgaWYgKCFXS0ZyYW1lSXNN YWluRnJhbWUoZnJhbWUpKQogICAgICAgICByZXR1cm47CiAKKyAgICBXZWJLaXRXZWJMb2FkZXJD bGllbnQqIGNsaWVudCA9IFdFQktJVF9XRUJfTE9BREVSX0NMSUVOVChjbGllbnRJbmZvKTsKKyAg ICBpZiAoY2xpZW50LT5wcml2LT5sb2FkaW5nRXJyb3JQYWdlKSB7CisgICAgICAgIGNsaWVudC0+ cHJpdi0+bG9hZGluZ0Vycm9yUGFnZSA9IGZhbHNlOworICAgICAgICByZXR1cm47CisgICAgfQor CiAgICAgY29uc3QgUmVzb3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvciA9IHRvSW1wbChlcnJvcikt PnBsYXRmb3JtRXJyb3IoKTsKICAgICBHT3duUHRyPEdFcnJvcj4gd2ViRXJyb3IoZ19lcnJvcl9u ZXdfbGl0ZXJhbChnX3F1YXJrX2Zyb21fc3RyaW5nKHJlc291cmNlRXJyb3IuZG9tYWluKCkudXRm OCgpLmRhdGEoKSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVzb3VyY2VFcnJvci5lcnJvckNvZGUoKSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZXNvdXJjZUVycm9yLmxvY2FsaXplZERlc2NyaXB0 aW9uKCkudXRmOCgpLmRhdGEoKSkpOwogICAgIGdib29sZWFuIHJldHVyblZhbHVlOwotICAgIGdf c2lnbmFsX2VtaXQoV0VCS0lUX1dFQl9MT0FERVJfQ0xJRU5UKGNsaWVudEluZm8pLCBzaWduYWxz W1BST1ZJU0lPTkFMX0xPQURfRkFJTEVEXSwgMCwgcmVzb3VyY2VFcnJvci5mYWlsaW5nVVJMKCku dXRmOCgpLmRhdGEoKSwKLSAgICAgICAgICAgICAgICAgIHdlYkVycm9yLmdldCgpLCAmcmV0dXJu VmFsdWUpOworICAgIGdfc2lnbmFsX2VtaXQoY2xpZW50LCBzaWduYWxzW1BST1ZJU0lPTkFMX0xP QURfRkFJTEVEXSwgMCwgcmVzb3VyY2VFcnJvci5mYWlsaW5nVVJMKCkudXRmOCgpLmRhdGEoKSwg d2ViRXJyb3IuZ2V0KCksICZyZXR1cm5WYWx1ZSk7CiB9CiAKIHN0YXRpYyB2b2lkIGRpZENvbW1p dExvYWRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVm IHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQpAQCAtOTMsOCArMTA5LDEyIEBAIHN0 YXRpYyB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJl ZiBmcmFtZSwgV0tUeXBlUmVmIHVzCiAgICAgaWYgKCFXS0ZyYW1lSXNNYWluRnJhbWUoZnJhbWUp KQogICAgICAgICByZXR1cm47CiAKKyAgICBXZWJLaXRXZWJMb2FkZXJDbGllbnQqIGNsaWVudCA9 IFdFQktJVF9XRUJfTE9BREVSX0NMSUVOVChjbGllbnRJbmZvKTsKKyAgICBpZiAoY2xpZW50LT5w cml2LT5sb2FkaW5nRXJyb3JQYWdlKQorICAgICAgICByZXR1cm47CisKICAgICBnYm9vbGVhbiBy ZXR1cm5WYWx1ZTsKLSAgICBnX3NpZ25hbF9lbWl0KFdFQktJVF9XRUJfTE9BREVSX0NMSUVOVChj bGllbnRJbmZvKSwgc2lnbmFsc1tMT0FEX0NPTU1JVFRFRF0sIDAsICZyZXR1cm5WYWx1ZSk7Cisg ICAgZ19zaWduYWxfZW1pdChjbGllbnQsIHNpZ25hbHNbTE9BRF9DT01NSVRURURdLCAwLCAmcmV0 dXJuVmFsdWUpOwogfQogCiBzdGF0aWMgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdl UmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9p ZCogY2xpZW50SW5mbykKQEAgLTEwMiw2ICsxMjIsMTIgQEAgc3RhdGljIHZvaWQgZGlkRmluaXNo TG9hZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYg dXMKICAgICBpZiAoIVdLRnJhbWVJc01haW5GcmFtZShmcmFtZSkpCiAgICAgICAgIHJldHVybjsK IAorICAgIFdlYktpdFdlYkxvYWRlckNsaWVudCogY2xpZW50ID0gV0VCS0lUX1dFQl9MT0FERVJf Q0xJRU5UKGNsaWVudEluZm8pOworICAgIGlmIChjbGllbnQtPnByaXYtPmxvYWRpbmdFcnJvclBh Z2UpIHsKKyAgICAgICAgY2xpZW50LT5wcml2LT5sb2FkaW5nRXJyb3JQYWdlID0gZmFsc2U7Cisg ICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBnYm9vbGVhbiByZXR1cm5WYWx1ZTsKICAgICBn X3NpZ25hbF9lbWl0KFdFQktJVF9XRUJfTE9BREVSX0NMSUVOVChjbGllbnRJbmZvKSwgc2lnbmFs c1tMT0FEX0ZJTklTSEVEXSwgMCwgJnJldHVyblZhbHVlKTsKIH0KQEAgLTExMSwxMyArMTM3LDE4 IEBAIHN0YXRpYyB2b2lkIGRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV0tQYWdlUmVmIHBh Z2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLRXJyCiAgICAgaWYgKCFXS0ZyYW1lSXNNYWluRnJhbWUo ZnJhbWUpKQogICAgICAgICByZXR1cm47CiAKKyAgICBXZWJLaXRXZWJMb2FkZXJDbGllbnQqIGNs aWVudCA9IFdFQktJVF9XRUJfTE9BREVSX0NMSUVOVChjbGllbnRJbmZvKTsKKyAgICBpZiAoY2xp ZW50LT5wcml2LT5sb2FkaW5nRXJyb3JQYWdlKSB7CisgICAgICAgIGNsaWVudC0+cHJpdi0+bG9h ZGluZ0Vycm9yUGFnZSA9IGZhbHNlOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgY29u c3QgUmVzb3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvciA9IHRvSW1wbChlcnJvciktPnBsYXRmb3Jt RXJyb3IoKTsKICAgICBHT3duUHRyPEdFcnJvcj4gd2ViRXJyb3IoZ19lcnJvcl9uZXdfbGl0ZXJh bChnX3F1YXJrX2Zyb21fc3RyaW5nKHJlc291cmNlRXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEo KSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVz b3VyY2VFcnJvci5lcnJvckNvZGUoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZXNvdXJjZUVycm9yLmxvY2FsaXplZERlc2NyaXB0aW9uKCkudXRm OCgpLmRhdGEoKSkpOwogICAgIGdib29sZWFuIHJldHVyblZhbHVlOwotICAgIGdfc2lnbmFsX2Vt aXQoV0VCS0lUX1dFQl9MT0FERVJfQ0xJRU5UKGNsaWVudEluZm8pLCBzaWduYWxzW0xPQURfRkFJ TEVEXSwgMCwgcmVzb3VyY2VFcnJvci5mYWlsaW5nVVJMKCkudXRmOCgpLmRhdGEoKSwKLSAgICAg ICAgICAgICAgICAgIHdlYkVycm9yLmdldCgpLCAmcmV0dXJuVmFsdWUpOworICAgIGdfc2lnbmFs X2VtaXQoY2xpZW50LCBzaWduYWxzW0xPQURfRkFJTEVEXSwgMCwgcmVzb3VyY2VFcnJvci5mYWls aW5nVVJMKCkudXRmOCgpLmRhdGEoKSwgd2ViRXJyb3IuZ2V0KCksICZyZXR1cm5WYWx1ZSk7CiB9 CiAKIHN0YXRpYyB2b2lkIHdlYmtpdFdlYkxvYWRlckNsaWVudENvbnN0cnVjdGVkKEdPYmplY3Qq IG9iamVjdCkKQEAgLTE1OCw2ICsxODksMjAgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViTG9hZGVy Q2xpZW50Q29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQogICAgIFdLUGFnZVNldFBhZ2VMb2Fk ZXJDbGllbnQodG9BUEkocGFnZSksICZsb2FkZXJDbGllbnQpOwogfQogCitzdGF0aWMgZ2Jvb2xl YW4gd2Via2l0V2ViTG9hZGVyQ2xpZW50TG9hZEZhaWxlZChXZWJLaXRXZWJMb2FkZXJDbGllbnQq IGNsaWVudCwgY29uc3QgZ2NoYXIqIGZhaWxpbmdVUkksIEdFcnJvciogZXJyb3IpCit7CisgICAg aWYgKGdfZXJyb3JfbWF0Y2hlcyhlcnJvciwgV0VCS0lUX05FVFdPUktfRVJST1IsIFdFQktJVF9O RVRXT1JLX0VSUk9SX0NBTkNFTExFRCkKKyAgICAgICAgfHwgZ19lcnJvcl9tYXRjaGVzKGVycm9y LCBXRUJLSVRfUE9MSUNZX0VSUk9SLCBXRUJLSVRfUE9MSUNZX0VSUk9SX0ZSQU1FX0xPQURfSU5U RVJSVVBURURfQllfUE9MSUNZX0NIQU5HRSkKKyAgICAgICAgfHwgZ19lcnJvcl9tYXRjaGVzKGVy cm9yLCBXRUJLSVRfUExVR0lOX0VSUk9SLCBXRUJLSVRfUExVR0lOX0VSUk9SX1dJTExfSEFORExF X0xPQUQpKQorICAgICAgICByZXR1cm4gRkFMU0U7CisKKyAgICBjbGllbnQtPnByaXYtPmxvYWRp bmdFcnJvclBhZ2UgPSB0cnVlOworICAgIEdPd25QdHI8Y2hhcj4gaHRtbFN0cmluZyhnX3N0cmR1 cF9wcmludGYoIjxodG1sPjxib2R5PiVzPC9ib2R5PjwvaHRtbD4iLCBlcnJvci0+bWVzc2FnZSkp OworICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX2FsdGVybmF0ZV9odG1sX3N0cmluZyhjbGllbnQt PnByaXYtPnZpZXcuZ2V0KCksIGh0bWxTdHJpbmcuZ2V0KCksIDAsIGZhaWxpbmdVUkkpOworCisg ICAgcmV0dXJuIFRSVUU7Cit9CisKIHN0YXRpYyB2b2lkIHdlYmtpdFdlYkxvYWRlckNsaWVudFNl dFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBjb25zdCBHVmFsdWUqIHZh bHVlLCBHUGFyYW1TcGVjKiBwYXJhbVNwZWMpCiB7CiAgICAgV2ViS2l0V2ViTG9hZGVyQ2xpZW50 KiBjbGllbnQgPSBXRUJLSVRfV0VCX0xPQURFUl9DTElFTlQob2JqZWN0KTsKQEAgLTIwNiw2ICsy NTEsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX2xvYWRlcl9jbGllbnRfY2xhc3NfaW5pdChX ZWJLaXRXZWJMb2FkZXJDbGllbnRDbGFzcyogY2xpZQogICAgIG9iamVjdENsYXNzLT5jb25zdHJ1 Y3RlZCA9IHdlYmtpdFdlYkxvYWRlckNsaWVudENvbnN0cnVjdGVkOwogICAgIG9iamVjdENsYXNz LT5maW5hbGl6ZSA9IHdlYmtpdFdlYkxvYWRlckNsaWVudEZpbmFsaXplOwogCisgICAgY2xpZW50 Q2xhc3MtPnByb3Zpc2lvbmFsX2xvYWRfZmFpbGVkID0gd2Via2l0V2ViTG9hZGVyQ2xpZW50TG9h ZEZhaWxlZDsKKyAgICBjbGllbnRDbGFzcy0+bG9hZF9mYWlsZWQgPSB3ZWJraXRXZWJMb2FkZXJD bGllbnRMb2FkRmFpbGVkOworCiAgICAgLyoqCiAgICAgICogV2ViS2l0V2ViVmlldzp3ZWItdmll dzoKICAgICAgKgo= 109594 2011-10-04 01:47:23 -0700 2011-10-04 10:57:21 -0700 Updated patch wk2-default-error2.diff text/plain 6696 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjZjU1NTdhLi5hOTA2Njk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMTAtMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEltcGxlbWVudCBkZWZhdWx0IGVycm9yIHBhZ2VzIGluIFdlYktp dDIgR1RLKyBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTY5MjU1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRFcnJvci5jcHA6CisgICAgICAgICh3ZWJraXRf cG9saWN5X2Vycm9yX3F1YXJrKTogQWRkIHF1YXJrIGZvciBwb2xpY3kgZXJyb3JzLgorICAgICAg ICAod2Via2l0X3BsdWdpbl9lcnJvcl9xdWFyayk6IEFkZCBxdWFyayBmb3IgcGx1Z2luIGVycm9y cy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRFcnJvci5oOiBBZGQgcG9saWN5 IGFuZCBwbHVnaW4gZXJyb3JzLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YkxvYWRlckNsaWVudC5jcHA6CisgICAgICAgICh3ZWJraXRXZWJMb2FkZXJDbGllbnRMb2FkRmFp bGVkKTogTG9hZCBhIGN1c3RvbSBlcnJvciBwYWdlIHdoZW4KKyAgICAgICAgbG9hZCBmYWlsZWQg YW5kIHNpZ25hbCBoYXMgbm90IGJlZW4gaGFuZGxlZC4KKyAgICAgICAgKHdlYmtpdF93ZWJfbG9h ZGVyX2NsaWVudF9jbGFzc19pbml0KTogQWRkIGRlZmF1bHQgaW1wbGVtZW50YXRpb24KKyAgICAg ICAgZm9yIHByb3Zpc2lvbmFsX2xvYWRfZmFpbGVkIGFuZCBsb2FkX2ZhaWxlZCB2aXJ0dWFsIG1l dGhvZHMuCisKIDIwMTEtMTAtMDMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBDb250ZW50IGFyZWEgZG9lcyBub3QgcmV0dXJuIHRvIHRoZSBjb3JyZWN0 IHBvc2l0aW9uIGFmdGVyIHJ1YmJlcmJhbmRpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEVycm9yLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdEVycm9yLmNwcAppbmRleCA5YmQ5MzhkLi5hNjBjMDEzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRFcnJvci5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RXJyb3IuY3BwCkBA IC0yNCw3ICsyNCw3IEBACiAjaW5jbHVkZSAiV2ViS2l0UHJpdmF0ZS5oIgogI2luY2x1ZGUgPFdl YkNvcmUvRXJyb3JzR3RrLmg+CiAKLUdRdWFyayB3ZWJraXRfbmV0d29ya19lcnJvcl9xdWFyayh2 b2lkKQorR1F1YXJrIHdlYmtpdF9uZXR3b3JrX2Vycm9yX3F1YXJrKCkKIHsKICAgICByZXR1cm4g Z19xdWFya19mcm9tX3N0YXRpY19zdHJpbmcoV2ViQ29yZTo6ZXJyb3JEb21haW5OZXR3b3JrKTsK IH0KQEAgLTM0LDMgKzM0LDI2IEBAIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lU X05FVFdPUktfRVJST1JfVFJBTlNQT1JULCBOZXR3b3JrRXJyb3JUcmFuc3BvCiBDT01QSUxFX0FT U0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9ORVRXT1JLX0VSUk9SX1VOS05PV05fUFJPVE9DT0ws IE5ldHdvcmtFcnJvclVua25vd25Qcm90b2NvbCk7CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19F TlVNKFdFQktJVF9ORVRXT1JLX0VSUk9SX0NBTkNFTExFRCwgTmV0d29ya0Vycm9yQ2FuY2VsbGVk KTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX05FVFdPUktfRVJST1JfRklM RV9ET0VTX05PVF9FWElTVCwgTmV0d29ya0Vycm9yRmlsZURvZXNOb3RFeGlzdCk7CisKK0dRdWFy ayB3ZWJraXRfcG9saWN5X2Vycm9yX3F1YXJrKCkKK3sKKyAgICByZXR1cm4gZ19xdWFya19mcm9t X3N0YXRpY19zdHJpbmcoV2ViQ29yZTo6ZXJyb3JEb21haW5Qb2xpY3kpOworfQorCitDT01QSUxF X0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9QT0xJQ1lfRVJST1JfRkFJTEVELCBQb2xpY3lF cnJvckZhaWxlZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9QT0xJQ1lf RVJST1JfQ0FOTk9UX1NIT1dfTUlNRV9UWVBFLCBQb2xpY3lFcnJvckNhbm5vdFNob3dNaW1lVHlw ZSk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9QT0xJQ1lfRVJST1JfQ0FO Tk9UX1NIT1dfVVJMLCBQb2xpY3lFcnJvckNhbm5vdFNob3dVUkwpOworQ09NUElMRV9BU1NFUlRf TUFUQ0hJTkdfRU5VTShXRUJLSVRfUE9MSUNZX0VSUk9SX0ZSQU1FX0xPQURfSU5URVJSVVBURURf QllfUE9MSUNZX0NIQU5HRSwgUG9saWN5RXJyb3JGcmFtZUxvYWRJbnRlcnJ1cHRlZEJ5UG9saWN5 Q2hhbmdlKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX1BPTElDWV9FUlJP Ul9DQU5OT1RfVVNFX1JFU1RSSUNURURfUE9SVCwgUG9saWN5RXJyb3JDYW5ub3RVc2VSZXN0cmlj dGVkUG9ydCk7CisKK0dRdWFyayB3ZWJraXRfcGx1Z2luX2Vycm9yX3F1YXJrKCkKK3sKKyAgICBy ZXR1cm4gZ19xdWFya19mcm9tX3N0YXRpY19zdHJpbmcoV2ViQ29yZTo6ZXJyb3JEb21haW5QbHVn aW4pOworfQorCitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdFQktJVF9QTFVHSU5fRVJS T1JfRkFJTEVELCBQbHVnaW5FcnJvckZhaWxlZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElOR19F TlVNKFdFQktJVF9QTFVHSU5fRVJST1JfQ0FOTk9UX0ZJTkRfUExVR0lOLCBQbHVnaW5FcnJvckNh bm5vdEZpbmRQbHVnaW4pOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXRUJLSVRfUExV R0lOX0VSUk9SX0NBTk5PVF9MT0FEX1BMVUdJTiwgUGx1Z2luRXJyb3JDYW5ub3RMb2FkUGx1Z2lu KTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV0VCS0lUX1BMVUdJTl9FUlJPUl9KQVZB X1VOQVZBSUxBQkxFLCBQbHVnaW5FcnJvckphdmFVbmF2YWlsYWJsZSk7CitDT01QSUxFX0FTU0VS VF9NQVRDSElOR19FTlVNKFdFQktJVF9QTFVHSU5fRVJST1JfQ09OTkVDVElPTl9DQU5DRUxMRUQs IFBsdWdpbkVycm9yQ29ubmVjdGlvbkNhbmNlbGxlZCk7CitDT01QSUxFX0FTU0VSVF9NQVRDSElO R19FTlVNKFdFQktJVF9QTFVHSU5fRVJST1JfV0lMTF9IQU5ETEVfTE9BRCwgUGx1Z2luRXJyb3JX aWxsSGFuZGxlTG9hZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRFcnJvci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0RXJyb3IuaAppbmRleCA1YTY0ZjU1Li5hZmQ0MTgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRFcnJvci5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEVycm9yLmgKQEAgLTMxLDYgKzMxLDggQEAKIEdfQkVH SU5fREVDTFMKIAogI2RlZmluZSBXRUJLSVRfTkVUV09SS19FUlJPUiB3ZWJraXRfbmV0d29ya19l cnJvcl9xdWFyayAoKQorI2RlZmluZSBXRUJLSVRfUE9MSUNZX0VSUk9SICB3ZWJraXRfcG9saWN5 X2Vycm9yX3F1YXJrICgpCisjZGVmaW5lIFdFQktJVF9QTFVHSU5fRVJST1IgIHdlYmtpdF9wbHVn aW5fZXJyb3JfcXVhcmsgKCkKIAogdHlwZWRlZiBlbnVtIHsKICAgICBXRUJLSVRfTkVUV09SS19F UlJPUl9GQUlMRUQgPSAzOTksCkBAIC00MCw5ICs0MiwzMiBAQCB0eXBlZGVmIGVudW0gewogICAg IFdFQktJVF9ORVRXT1JLX0VSUk9SX0ZJTEVfRE9FU19OT1RfRVhJU1QgPSAzMDMKIH0gV2ViS2l0 TmV0d29ya0Vycm9yOwogCit0eXBlZGVmIGVudW0geworICAgIFdFQktJVF9QT0xJQ1lfRVJST1Jf RkFJTEVEID0gMTk5LAorICAgIFdFQktJVF9QT0xJQ1lfRVJST1JfQ0FOTk9UX1NIT1dfTUlNRV9U WVBFID0gMTAwLAorICAgIFdFQktJVF9QT0xJQ1lfRVJST1JfQ0FOTk9UX1NIT1dfVVJMID0gMTAx LAorICAgIFdFQktJVF9QT0xJQ1lfRVJST1JfRlJBTUVfTE9BRF9JTlRFUlJVUFRFRF9CWV9QT0xJ Q1lfQ0hBTkdFID0gMTAyLAorICAgIFdFQktJVF9QT0xJQ1lfRVJST1JfQ0FOTk9UX1VTRV9SRVNU UklDVEVEX1BPUlQgPSAxMDMKK30gV2ViS2l0UG9saWN5RXJyb3I7CisKK3R5cGVkZWYgZW51bSB7 CisgICAgV0VCS0lUX1BMVUdJTl9FUlJPUl9GQUlMRUQgPSAyOTksCisgICAgV0VCS0lUX1BMVUdJ Tl9FUlJPUl9DQU5OT1RfRklORF9QTFVHSU4gPSAyMDAsCisgICAgV0VCS0lUX1BMVUdJTl9FUlJP Ul9DQU5OT1RfTE9BRF9QTFVHSU4gPSAyMDEsCisgICAgV0VCS0lUX1BMVUdJTl9FUlJPUl9KQVZB X1VOQVZBSUxBQkxFID0gMjAyLAorICAgIFdFQktJVF9QTFVHSU5fRVJST1JfQ09OTkVDVElPTl9D QU5DRUxMRUQgPSAyMDMsCisgICAgV0VCS0lUX1BMVUdJTl9FUlJPUl9XSUxMX0hBTkRMRV9MT0FE ID0gMjA0LAorfSBXZWJLaXRQbHVnaW5FcnJvcjsKKwogV0tfRVhQT1JUIEdRdWFyawogd2Via2l0 X25ldHdvcmtfZXJyb3JfcXVhcmsgKHZvaWQpOwogCitXS19FWFBPUlQgR1F1YXJrCit3ZWJraXRf cG9saWN5X2Vycm9yX3F1YXJrICAodm9pZCk7CisKK1dLX0VYUE9SVCBHUXVhcmsKK3dlYmtpdF9w bHVnaW5fZXJyb3JfcXVhcmsgICh2b2lkKTsKKwogR19FTkRfREVDTFMKIAogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJMb2FkZXJD bGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViTG9h ZGVyQ2xpZW50LmNwcAppbmRleCA5NzhhOTk2Li5mNjg2ODAyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJMb2FkZXJDbGllbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkxvYWRlckNsaWVudC5j cHAKQEAgLTIwLDYgKzIwLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJL aXRXZWJMb2FkZXJDbGllbnQuaCIKIAorI2luY2x1ZGUgIldlYktpdEVycm9yLmgiCiAjaW5jbHVk ZSAiV2ViS2l0TWFyc2hhbC5oIgogI2luY2x1ZGUgIldlYktpdFByaXZhdGUuaCIKICNpbmNsdWRl ICJXZWJLaXRXZWJWaWV3LmgiCkBAIC0xNTgsNiArMTU5LDE5IEBAIHN0YXRpYyB2b2lkIHdlYmtp dFdlYkxvYWRlckNsaWVudENvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKICAgICBXS1BhZ2VT ZXRQYWdlTG9hZGVyQ2xpZW50KHRvQVBJKHBhZ2UpLCAmbG9hZGVyQ2xpZW50KTsKIH0KIAorc3Rh dGljIGdib29sZWFuIHdlYmtpdFdlYkxvYWRlckNsaWVudExvYWRGYWlsZWQoV2ViS2l0V2ViTG9h ZGVyQ2xpZW50KiBjbGllbnQsIGNvbnN0IGdjaGFyKiBmYWlsaW5nVVJJLCBHRXJyb3IqIGVycm9y KQoreworICAgIGlmIChnX2Vycm9yX21hdGNoZXMoZXJyb3IsIFdFQktJVF9ORVRXT1JLX0VSUk9S LCBXRUJLSVRfTkVUV09SS19FUlJPUl9DQU5DRUxMRUQpCisgICAgICAgIHx8IGdfZXJyb3JfbWF0 Y2hlcyhlcnJvciwgV0VCS0lUX1BPTElDWV9FUlJPUiwgV0VCS0lUX1BPTElDWV9FUlJPUl9GUkFN RV9MT0FEX0lOVEVSUlVQVEVEX0JZX1BPTElDWV9DSEFOR0UpCisgICAgICAgIHx8IGdfZXJyb3Jf bWF0Y2hlcyhlcnJvciwgV0VCS0lUX1BMVUdJTl9FUlJPUiwgV0VCS0lUX1BMVUdJTl9FUlJPUl9X SUxMX0hBTkRMRV9MT0FEKSkKKyAgICAgICAgcmV0dXJuIEZBTFNFOworCisgICAgR093blB0cjxj aGFyPiBodG1sU3RyaW5nKGdfc3RyZHVwX3ByaW50ZigiPGh0bWw+PGJvZHk+JXM8L2JvZHk+PC9o dG1sPiIsIGVycm9yLT5tZXNzYWdlKSk7CisgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfYWx0ZXJu YXRlX2h0bWwoY2xpZW50LT5wcml2LT52aWV3LmdldCgpLCBodG1sU3RyaW5nLmdldCgpLCAwLCBm YWlsaW5nVVJJKTsKKworICAgIHJldHVybiBUUlVFOworfQorCiBzdGF0aWMgdm9pZCB3ZWJraXRX ZWJMb2FkZXJDbGllbnRTZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJZCwg Y29uc3QgR1ZhbHVlKiB2YWx1ZSwgR1BhcmFtU3BlYyogcGFyYW1TcGVjKQogewogICAgIFdlYktp dFdlYkxvYWRlckNsaWVudCogY2xpZW50ID0gV0VCS0lUX1dFQl9MT0FERVJfQ0xJRU5UKG9iamVj dCk7CkBAIC0yMDYsNiArMjIwLDkgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9sb2FkZXJfY2xp ZW50X2NsYXNzX2luaXQoV2ViS2l0V2ViTG9hZGVyQ2xpZW50Q2xhc3MqIGNsaWUKICAgICBvYmpl Y3RDbGFzcy0+Y29uc3RydWN0ZWQgPSB3ZWJraXRXZWJMb2FkZXJDbGllbnRDb25zdHJ1Y3RlZDsK ICAgICBvYmplY3RDbGFzcy0+ZmluYWxpemUgPSB3ZWJraXRXZWJMb2FkZXJDbGllbnRGaW5hbGl6 ZTsKIAorICAgIGNsaWVudENsYXNzLT5wcm92aXNpb25hbF9sb2FkX2ZhaWxlZCA9IHdlYmtpdFdl YkxvYWRlckNsaWVudExvYWRGYWlsZWQ7CisgICAgY2xpZW50Q2xhc3MtPmxvYWRfZmFpbGVkID0g d2Via2l0V2ViTG9hZGVyQ2xpZW50TG9hZEZhaWxlZDsKKwogICAgIC8qKgogICAgICAqIFdlYktp dFdlYlZpZXc6d2ViLXZpZXc6CiAgICAgICoK