108005 2013-01-26 07:15:42 -0800 [GTK][WK2] MiniBrowser fullscreen signals support 2013-02-01 06:12:54 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned cgarcia pnormand rego webkit.review.bot oldest_to_newest 817186 0 pnormand 2013-01-26 07:15:42 -0800 SSIA 817187 1 184865 pnormand 2013-01-26 07:18:05 -0800 Created attachment 184865 Fullscreen signals support in MiniBrowser 817188 2 webkit.review.bot 2013-01-26 07:21:01 -0800 Attachment 184865 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/MiniBrowser/gtk/BrowserWindow.c']" exit_code: 1 Tools/MiniBrowser/gtk/BrowserWindow.c:272: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Tools/MiniBrowser/gtk/BrowserWindow.c:278: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/BrowserWindow.c:279: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/BrowserWindow.c:280: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/BrowserWindow.c:281: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/BrowserWindow.c:293: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/BrowserWindow.c:294: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/BrowserWindow.c:295: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Tools/MiniBrowser/gtk/BrowserWindow.c:296: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] Total errors found: 9 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 817193 3 184867 pnormand 2013-01-26 07:42:12 -0800 Created attachment 184867 Fullscreen signals support in MiniBrowser 817736 4 184867 pnormand 2013-01-28 07:28:12 -0800 Comment on attachment 184867 Fullscreen signals support in MiniBrowser This needs some more work 821494 5 185774 rego 2013-01-31 06:56:26 -0800 Created attachment 185774 Patch 822443 6 185774 cgarcia 2013-02-01 00:45:09 -0800 Comment on attachment 185774 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=185774&action=review Looks great, I have just a few minor comments. Thanks! > Tools/MiniBrowser/gtk/BrowserWindow.c:55 > + GtkWidget *fullScreenMessageLabel; This is only used for the overlay, so add the GTK_CHECK_VERSION here too. > Tools/MiniBrowser/gtk/BrowserWindow.c:67 > +static guint fullScreenMessageLabelId = 0; Don't use a global variable, move this to the BrowserWindow struct. > Tools/MiniBrowser/gtk/BrowserWindow.c:266 > +static gboolean webViewFullScreenMessageHide(GtkWidget *fullScreenMessageLabel) This method has nothing to do with a webView, so a better name might be browserWindowHideFullScreenMessage(BrowserWindow *window) receiving a window to use both the label and the source id from the BrowserWindow struct. > Tools/MiniBrowser/gtk/BrowserWindow.c:268 > +#if GTK_CHECK_VERSION(3, 2, 0) This function is only called when GTK >= 3.2, so you can move the #if out of the function and define it only in that case. > Tools/MiniBrowser/gtk/BrowserWindow.c:271 > + g_source_remove(fullScreenMessageLabelId); I'm not sure it's correct to remove the source inside the callback, the source is going to be removed anyway because the calback return FALSE. The problem is that you are using this function as the timeout callback and to hide the label manually. Here I would simply hide the label and return FALSE, and move the source remove to the leave callback. > Tools/MiniBrowser/gtk/BrowserWindow.c:283 > + const gchar *uri = webkit_web_view_get_uri(window->webView); > + gchar *message = g_strdup_printf("%s is now full screen. Press ESC or f to exit.", uri); uri is used only once, so you could use webkit_web_view_get_uri directly in the g_strdup_printf. Maybe we could use the title instead of the URI? and the URI only as a fallback when there's not title? > Tools/MiniBrowser/gtk/BrowserWindow.c:289 > + fullScreenMessageLabelId = g_timeout_add_seconds(2, (GSourceFunc) webViewFullScreenMessageHide, window->fullScreenMessageLabel); Remove the space between the cast and the function. If we are going to use it only as a callback we could call it fullScreenMessageTimeoutCallback, or something like that. > Tools/MiniBrowser/gtk/BrowserWindow.c:300 > + webViewFullScreenMessageHide(window->fullScreenMessageLabel); I would check here if the id > 0, and remove the source in such case. Then simply call gtk_widget_hide() to hide the label. > Tools/MiniBrowser/gtk/BrowserWindow.c:318 > + g_signal_connect(newWebView, "enter-fullscreen", G_CALLBACK(webViewEnterFullScreen), newWindow); > + g_signal_connect(newWebView, "leave-fullscreen", G_CALLBACK(webViewLeaveFullScreen), newWindow); You don't need to connect this here, when the new view is creatd the signals are already connected by the constructor. > Tools/MiniBrowser/gtk/BrowserWindow.c:544 > + Remove this extra line. 822590 7 186002 rego 2013-02-01 03:54:01 -0800 Created attachment 186002 Patch 822596 8 186002 cgarcia 2013-02-01 04:06:12 -0800 Comment on attachment 186002 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186002&action=review Looks much better, there are still a few minor issues. You should also check in the window fialize if there's a hide message callback scheduled and remove the source in that case, otherwise the callback might be called with a window already destroyed. > Tools/MiniBrowser/gtk/BrowserWindow.c:271 > + gtk_widget_hide(fullScreenMessageLabel); Here you still need to set the fullScreenMessageLabelId to 0 again, so pass the BrowserWindow instead of the label to the callback. > Tools/MiniBrowser/gtk/BrowserWindow.c:279 > + gchar *titleOrUri = webkit_web_view_get_title(window->webView); This should be const, and the name titleOrURI 822651 9 186017 rego 2013-02-01 05:10:37 -0800 Created attachment 186017 Patch 822659 10 186017 cgarcia 2013-02-01 05:19:20 -0800 Comment on attachment 186017 Patch Excellent. Thank you. 822704 11 186017 webkit.review.bot 2013-02-01 06:12:51 -0800 Comment on attachment 186017 Patch Clearing flags on attachment: 186017 Committed r141585: <http://trac.webkit.org/changeset/141585> 822705 12 webkit.review.bot 2013-02-01 06:12:54 -0800 All reviewed patches have been landed. Closing bug. 184865 2013-01-26 07:18:05 -0800 2013-01-26 07:42:12 -0800 Fullscreen signals support in MiniBrowser Fullscreen-signals-support-in-MiniBrowser.patch text/plain 5391 pnormand RnJvbSA0NDkyMDZhMmUyYTYyM2VkYmE1M2MwMWRiYmI4Nzc5MWMyMzEwMjQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBTdW4sIDIwIEphbiAyMDEzIDIxOjIwOjExICswMTAwClN1YmplY3Q6IFtQQVRDSF0g RnVsbHNjcmVlbiBzaWduYWxzIHN1cHBvcnQgaW4gTWluaUJyb3dzZXIKCi0tLQogVG9vbHMvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTggKysrKysrKysrKysKIFRvb2xzL01p bmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMgfCAgIDU1ICsrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA3MyBpbnNlcnRpb25zKCspCgpkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQ0ZDRkNzQuLmJj NmUyNGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMSBAQAorMjAxMy0wMS0yNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5k QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV0syXSBNaW5pQnJvd3NlciBmdWxsc2NyZWVu IHNpZ25hbHMgc3VwcG9ydAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTA4MDA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTGlrZSBpbiBHdGtMYXVuY2hlciwgc2hvdyBhIHBvcHVwIGFza2luZyB1c2VyIHBl cm1pc3Npb24gYmVmb3JlCisgICAgICAgIGVudGVyaW5nIGZ1bGxzY3JlZW4uCisKKyAgICAgICAg KiBNaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jOgorICAgICAgICAod2ViVmlld0Z1bGxz Y3JlZW5NZXNzYWdlV2luZG93Q2xvc2UpOgorICAgICAgICAod2ViVmlld1dpbmRvd1N0YXRlRXZl bnQpOgorICAgICAgICAod2ViVmlld0VudGVyRnVsbFNjcmVlbik6CisgICAgICAgICh3ZWJWaWV3 TGVhdmVGdWxsU2NyZWVuKToKKyAgICAgICAgKHdlYlZpZXdDcmVhdGUpOgorICAgICAgICAoYnJv d3NlcldpbmRvd0NvbnN0cnVjdGVkKToKKwogMjAxMy0wMS0yNSAgSm9jaGVuIEVpc2luZ2VyICA8 am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIG1vdmUgdHJhY2tpbmcg b2YgdGhlIHRvcCBsb2FkaW5nIGZyYW1lIHRvIFRlc3RSdW5uZXIgbGlicmFyeQpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93 c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXggODZiMDQ0Ni4uNzY3YjEyMyAxMDA2NDQKLS0t IGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5p QnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCkBAIC0yNjAsNiArMjYwLDU3IEBAIHN0YXRpYyB2 b2lkIHdlYlZpZXdSZWFkeVRvU2hvdyhXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBCcm93c2VyV2lu ZG93ICp3aW5kb3cpCiAKICAgICBndGtfd2lkZ2V0X3Nob3coR1RLX1dJREdFVCh3aW5kb3cpKTsK IH0KK3N0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3RnVsbHNjcmVlbk1lc3NhZ2VXaW5kb3dDbG9zZShH dGtXaWRnZXQgKmRpYWxvZykKK3sKKyAgICBpZiAoR1RLX0lTX1dJREdFVChkaWFsb2cpKQorICAg ICAgICBnX3NpZ25hbF9lbWl0X2J5X25hbWUoR1RLX0RJQUxPRyhkaWFsb2cpLCAiY2xvc2UiKTsK KyAgICByZXR1cm4gRkFMU0U7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3V2luZG93U3Rh dGVFdmVudChHdGtXaWRnZXQgKndpZGdldCwgR2RrRXZlbnRXaW5kb3dTdGF0ZSAqZXZlbnQsIEJy b3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICBpZiAoKGV2ZW50LT5jaGFuZ2VkX21hc2sgJiBH REtfV0lORE9XX1NUQVRFX0ZVTExTQ1JFRU4pID09IDApCisgICAgICAgIHJldHVybiBGQUxTRTsK KworICAgIGlmIChldmVudC0+bmV3X3dpbmRvd19zdGF0ZSAmIEdES19XSU5ET1dfU1RBVEVfRlVM TFNDUkVFTikgeworICAgICAgICBjb25zdCBnY2hhciAqdXJpID0gd2Via2l0X3dlYl92aWV3X2dl dF91cmkod2luZG93LT53ZWJWaWV3KTsKKyAgICAgICAgR3RrV2lkZ2V0ICpkaWFsb2cgPSBndGtf bWVzc2FnZV9kaWFsb2dfbmV3KEdUS19XSU5ET1cod2luZG93KSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19ESUFMT0dfTU9EQUwsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHVEtfTUVTU0FH RV9JTkZPLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgR1RLX0JVVFRPTlNfQ0xPU0UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiJXMgaXMgbm93IGZ1bGwgc2NyZWVuLiBQcmVzcyBFU0Mgb3IgZiB0 byBleGl0LiIsIHVyaSk7CisgICAgICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChkaWFsb2cs ICJyZXNwb25zZSIsIEdfQ0FMTEJBQ0soZ3RrX3dpZGdldF9kZXN0cm95KSwgZGlhbG9nKTsKKyAg ICAgICAgZ190aW1lb3V0X2FkZCgxNTAwLCAoR1NvdXJjZUZ1bmMpIHdlYlZpZXdGdWxsc2NyZWVu TWVzc2FnZVdpbmRvd0Nsb3NlLCBkaWFsb2cpOworICAgICAgICBndGtfZGlhbG9nX3J1bihHVEtf RElBTE9HKGRpYWxvZykpOworICAgIH0KKyAgICByZXR1cm4gVFJVRTsKK30KKworc3RhdGljIGdi b29sZWFuIHdlYlZpZXdFbnRlckZ1bGxTY3JlZW4oV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJv d3NlcldpbmRvdyAqd2luZG93KQoreworICAgIGNvbnN0IGdjaGFyICp1cmkgPSB3ZWJraXRfd2Vi X3ZpZXdfZ2V0X3VyaSh3aW5kb3ctPndlYlZpZXcpOworICAgIEd0a1dpZGdldCAqZGlhbG9nID0g Z3RrX21lc3NhZ2VfZGlhbG9nX25ldyhHVEtfV0lORE9XKHdpbmRvdyksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19ESUFMT0dfTU9EQUwsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19NRVNTQUdFX0lO Rk8sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19C VVRUT05TX1lFU19OTywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIkFsbG93IGZ1bGwgc2NyZWVuIGRpc3BsYXkgb2YgJXMgPyIsIHVyaSk7CisgICAgZ2lu dCByZXN1bHQgPSBndGtfZGlhbG9nX3J1bihHVEtfRElBTE9HKGRpYWxvZykpOworICAgIGlmIChy ZXN1bHQgPT0gR1RLX1JFU1BPTlNFX1lFUykgeworICAgICAgICBnX3NpZ25hbF9jb25uZWN0KEdU S19XSURHRVQod2luZG93KSwgIndpbmRvdy1zdGF0ZS1ldmVudCIsIEdfQ0FMTEJBQ0sod2ViVmll d1dpbmRvd1N0YXRlRXZlbnQpLCB3aW5kb3cpOworICAgICAgICBndGtfd2lkZ2V0X2hpZGUod2lu ZG93LT50b29sYmFyKTsKKyAgICAgICAgZ3RrX3dpZGdldF9kZXN0cm95KEdUS19XSURHRVQoZGlh bG9nKSk7CisgICAgICAgIHJldHVybiBGQUxTRTsKKyAgICB9CisgICAgZ3RrX3dpZGdldF9kZXN0 cm95KEdUS19XSURHRVQoZGlhbG9nKSk7CisgICAgcmV0dXJuIFRSVUU7Cit9CisKK3N0YXRpYyBn Ym9vbGVhbiB3ZWJWaWV3TGVhdmVGdWxsU2NyZWVuKFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJy b3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICBndGtfd2lkZ2V0X3Nob3cod2luZG93LT50b29s YmFyKTsKKyAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMoR1RLX1dJREdF VCh3aW5kb3cpLCBHX0NBTExCQUNLKHdlYlZpZXdXaW5kb3dTdGF0ZUV2ZW50KSwgd2luZG93KTsK KyAgICByZXR1cm4gRkFMU0U7Cit9CiAKIHN0YXRpYyBHdGtXaWRnZXQgKndlYlZpZXdDcmVhdGUo V2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJvd3NlcldpbmRvdyAqd2luZG93KQogewpAQCAtMjcw LDYgKzMyMSw4IEBAIHN0YXRpYyBHdGtXaWRnZXQgKndlYlZpZXdDcmVhdGUoV2ViS2l0V2ViVmll dyAqd2ViVmlldywgQnJvd3NlcldpbmRvdyAqd2luZG93KQogICAgIGdfc2lnbmFsX2Nvbm5lY3Qo bmV3V2ViVmlldywgInJlYWR5LXRvLXNob3ciLCBHX0NBTExCQUNLKHdlYlZpZXdSZWFkeVRvU2hv dyksIG5ld1dpbmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChuZXdXZWJWaWV3LCAicnVuLWFz LW1vZGFsIiwgR19DQUxMQkFDSyh3ZWJWaWV3UnVuQXNNb2RhbCksIG5ld1dpbmRvdyk7CiAgICAg Z19zaWduYWxfY29ubmVjdChuZXdXZWJWaWV3LCAiY2xvc2UiLCBHX0NBTExCQUNLKHdlYlZpZXdD bG9zZSksIG5ld1dpbmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVjdChuZXdXZWJWaWV3LCAiZW50 ZXItZnVsbHNjcmVlbiIsIEdfQ0FMTEJBQ0sod2ViVmlld0VudGVyRnVsbFNjcmVlbiksIG5ld1dp bmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVjdChuZXdXZWJWaWV3LCAibGVhdmUtZnVsbHNjcmVl biIsIEdfQ0FMTEJBQ0sod2ViVmlld0xlYXZlRnVsbFNjcmVlbiksIG5ld1dpbmRvdyk7CiAgICAg cmV0dXJuIEdUS19XSURHRVQobmV3V2ViVmlldyk7CiB9CiAKQEAgLTUxMyw2ICs1NjYsOCBAQCBz dGF0aWMgdm9pZCBicm93c2VyV2luZG93Q29uc3RydWN0ZWQoR09iamVjdCAqZ09iamVjdCkKICAg ICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm1vdXNlLXRhcmdldC1jaGFuZ2Vk IiwgR19DQUxMQkFDSyh3ZWJWaWV3TW91c2VUYXJnZXRDaGFuZ2VkKSwgd2luZG93KTsKICAgICBn X3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm5vdGlmeTo6em9vbS1sZXZlbCIsIEdf Q0FMTEJBQ0sod2ViVmlld1pvb21MZXZlbENoYW5nZWQpLCB3aW5kb3cpOwogICAgIGdfc2lnbmFs X2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAibm90aWZ5OjpmYXZpY29uIiwgR19DQUxMQkFDSyhm YXZpY29uQ2hhbmdlZCksIHdpbmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVjdCh3aW5kb3ctPndl YlZpZXcsICJlbnRlci1mdWxsc2NyZWVuIiwgR19DQUxMQkFDSyh3ZWJWaWV3RW50ZXJGdWxsU2Ny ZWVuKSwgd2luZG93KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgImxl YXZlLWZ1bGxzY3JlZW4iLCBHX0NBTExCQUNLKHdlYlZpZXdMZWF2ZUZ1bGxTY3JlZW4pLCB3aW5k b3cpOwogCiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2NvbnRleHQo d2luZG93LT53ZWJWaWV3KSwgImRvd25sb2FkLXN0YXJ0ZWQiLCBHX0NBTExCQUNLKGRvd25sb2Fk U3RhcnRlZCksIHdpbmRvdyk7CiAKLS0gCjEuNy4xMC40 184867 2013-01-26 07:42:12 -0800 2013-01-28 07:28:11 -0800 Fullscreen signals support in MiniBrowser Fullscreen-signals-support-in-MiniBrowser.patch text/plain 5010 pnormand RnJvbSAxN2M2NDgwNTFhMDViMmFkNDZhOTU0NjA4YzhjYmRiZDQ1Y2FiYzFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBTdW4sIDIwIEphbiAyMDEzIDIxOjIwOjExICswMTAwClN1YmplY3Q6IFtQQVRDSF0g RnVsbHNjcmVlbiBzaWduYWxzIHN1cHBvcnQgaW4gTWluaUJyb3dzZXIKCi0tLQogVG9vbHMvQ2hh bmdlTG9nICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTggKysrKysrKysrKysrCiBUb29scy9N aW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jIHwgICA0OSArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNjcgaW5zZXJ0aW9ucygrKQoKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0NGQ0ZDc0Li5i YzZlMjRhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjEgQEAKKzIwMTMtMDEtMjYgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFu ZEBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdW1dLMl0gTWluaUJyb3dzZXIgZnVsbHNjcmVl biBzaWduYWxzIHN1cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEwODAwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIExpa2UgaW4gR3RrTGF1bmNoZXIsIHNob3cgYSBwb3B1cCBhc2tpbmcgdXNlciBw ZXJtaXNzaW9uIGJlZm9yZQorICAgICAgICBlbnRlcmluZyBmdWxsc2NyZWVuLgorCisgICAgICAg ICogTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYzoKKyAgICAgICAgKHdlYlZpZXdGdWxs c2NyZWVuTWVzc2FnZVdpbmRvd0Nsb3NlKToKKyAgICAgICAgKHdlYlZpZXdXaW5kb3dTdGF0ZUV2 ZW50KToKKyAgICAgICAgKHdlYlZpZXdFbnRlckZ1bGxTY3JlZW4pOgorICAgICAgICAod2ViVmll d0xlYXZlRnVsbFNjcmVlbik6CisgICAgICAgICh3ZWJWaWV3Q3JlYXRlKToKKyAgICAgICAgKGJy b3dzZXJXaW5kb3dDb25zdHJ1Y3RlZCk6CisKIDIwMTMtMDEtMjUgIEpvY2hlbiBFaXNpbmdlciAg PGpvY2hlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBtb3ZlIHRyYWNraW5n IG9mIHRoZSB0b3AgbG9hZGluZyBmcmFtZSB0byBUZXN0UnVubmVyIGxpYnJhcnkKZGlmZiAtLWdp dCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMgYi9Ub29scy9NaW5pQnJv d3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCmluZGV4IDg2YjA0NDYuLjEyYjNlNTIgMTAwNjQ0Ci0t LSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKKysrIGIvVG9vbHMvTWlu aUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwpAQCAtMjYwLDYgKzI2MCw1MSBAQCBzdGF0aWMg dm9pZCB3ZWJWaWV3UmVhZHlUb1Nob3coV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJvd3Nlcldp bmRvdyAqd2luZG93KQogCiAgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQod2luZG93KSk7 CiB9CitzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0Z1bGxzY3JlZW5NZXNzYWdlV2luZG93Q2xvc2Uo R3RrV2lkZ2V0ICpkaWFsb2cpCit7CisgICAgaWYgKEdUS19JU19XSURHRVQoZGlhbG9nKSkKKyAg ICAgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKEdUS19ESUFMT0coZGlhbG9nKSwgImNsb3NlIik7 CisgICAgcmV0dXJuIEZBTFNFOworfQorCitzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld1dpbmRvd1N0 YXRlRXZlbnQoR3RrV2lkZ2V0ICp3aWRnZXQsIEdka0V2ZW50V2luZG93U3RhdGUgKmV2ZW50LCBC cm93c2VyV2luZG93ICp3aW5kb3cpCit7CisgICAgaWYgKCEoZXZlbnQtPmNoYW5nZWRfbWFzayAm IEdES19XSU5ET1dfU1RBVEVfRlVMTFNDUkVFTikpCisgICAgICAgIHJldHVybiBGQUxTRTsKKwor ICAgIGlmIChldmVudC0+bmV3X3dpbmRvd19zdGF0ZSAmIEdES19XSU5ET1dfU1RBVEVfRlVMTFND UkVFTikgeworICAgICAgICBjb25zdCBnY2hhciAqdXJpID0gd2Via2l0X3dlYl92aWV3X2dldF91 cmkod2luZG93LT53ZWJWaWV3KTsKKyAgICAgICAgR3RrV2lkZ2V0ICpkaWFsb2cgPSBndGtfbWVz c2FnZV9kaWFsb2dfbmV3KEdUS19XSU5ET1cod2luZG93KSwgR1RLX0RJQUxPR19NT0RBTCwgR1RL X01FU1NBR0VfSU5GTywgR1RLX0JVVFRPTlNfQ0xPU0UsCisgICAgICAgICAgICAiJXMgaXMgbm93 IGZ1bGwgc2NyZWVuLiBQcmVzcyBFU0Mgb3IgZiB0byBleGl0LiIsIHVyaSk7CisgICAgICAgIGdf c2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChkaWFsb2csICJyZXNwb25zZSIsIEdfQ0FMTEJBQ0soZ3Rr X3dpZGdldF9kZXN0cm95KSwgZGlhbG9nKTsKKyAgICAgICAgZ190aW1lb3V0X2FkZCgxNTAwLCAo R1NvdXJjZUZ1bmMpIHdlYlZpZXdGdWxsc2NyZWVuTWVzc2FnZVdpbmRvd0Nsb3NlLCBkaWFsb2cp OworICAgICAgICBndGtfZGlhbG9nX3J1bihHVEtfRElBTE9HKGRpYWxvZykpOworICAgIH0KKyAg ICByZXR1cm4gVFJVRTsKK30KKworc3RhdGljIGdib29sZWFuIHdlYlZpZXdFbnRlckZ1bGxTY3Jl ZW4oV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJvd3NlcldpbmRvdyAqd2luZG93KQoreworICAg IGNvbnN0IGdjaGFyICp1cmkgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3aW5kb3ctPndlYlZp ZXcpOworICAgIEd0a1dpZGdldCAqZGlhbG9nID0gZ3RrX21lc3NhZ2VfZGlhbG9nX25ldyhHVEtf V0lORE9XKHdpbmRvdyksIEdUS19ESUFMT0dfTU9EQUwsIEdUS19NRVNTQUdFX0lORk8sIEdUS19C VVRUT05TX1lFU19OTywKKyAgICAgICAgIkFsbG93IGZ1bGwgc2NyZWVuIGRpc3BsYXkgb2YgJXMg PyIsIHVyaSk7CisgICAgZ2ludCByZXN1bHQgPSBndGtfZGlhbG9nX3J1bihHVEtfRElBTE9HKGRp YWxvZykpOworICAgIGlmIChyZXN1bHQgPT0gR1RLX1JFU1BPTlNFX1lFUykgeworICAgICAgICBn X3NpZ25hbF9jb25uZWN0KEdUS19XSURHRVQod2luZG93KSwgIndpbmRvdy1zdGF0ZS1ldmVudCIs IEdfQ0FMTEJBQ0sod2ViVmlld1dpbmRvd1N0YXRlRXZlbnQpLCB3aW5kb3cpOworICAgICAgICBn dGtfd2lkZ2V0X2hpZGUod2luZG93LT50b29sYmFyKTsKKyAgICAgICAgZ3RrX3dpZGdldF9kZXN0 cm95KEdUS19XSURHRVQoZGlhbG9nKSk7CisgICAgICAgIHJldHVybiBGQUxTRTsKKyAgICB9Cisg ICAgZ3RrX3dpZGdldF9kZXN0cm95KEdUS19XSURHRVQoZGlhbG9nKSk7CisgICAgcmV0dXJuIFRS VUU7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3TGVhdmVGdWxsU2NyZWVuKFdlYktpdFdl YlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICBndGtfd2lkZ2V0 X3Nob3cod2luZG93LT50b29sYmFyKTsKKyAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0 X2J5X2Z1bmMoR1RLX1dJREdFVCh3aW5kb3cpLCBHX0NBTExCQUNLKHdlYlZpZXdXaW5kb3dTdGF0 ZUV2ZW50KSwgd2luZG93KTsKKyAgICByZXR1cm4gRkFMU0U7Cit9CiAKIHN0YXRpYyBHdGtXaWRn ZXQgKndlYlZpZXdDcmVhdGUoV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJvd3NlcldpbmRvdyAq d2luZG93KQogewpAQCAtMjcwLDYgKzMxNSw4IEBAIHN0YXRpYyBHdGtXaWRnZXQgKndlYlZpZXdD cmVhdGUoV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJvd3NlcldpbmRvdyAqd2luZG93KQogICAg IGdfc2lnbmFsX2Nvbm5lY3QobmV3V2ViVmlldywgInJlYWR5LXRvLXNob3ciLCBHX0NBTExCQUNL KHdlYlZpZXdSZWFkeVRvU2hvdyksIG5ld1dpbmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChu ZXdXZWJWaWV3LCAicnVuLWFzLW1vZGFsIiwgR19DQUxMQkFDSyh3ZWJWaWV3UnVuQXNNb2RhbCks IG5ld1dpbmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdChuZXdXZWJWaWV3LCAiY2xvc2UiLCBH X0NBTExCQUNLKHdlYlZpZXdDbG9zZSksIG5ld1dpbmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVj dChuZXdXZWJWaWV3LCAiZW50ZXItZnVsbHNjcmVlbiIsIEdfQ0FMTEJBQ0sod2ViVmlld0VudGVy RnVsbFNjcmVlbiksIG5ld1dpbmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVjdChuZXdXZWJWaWV3 LCAibGVhdmUtZnVsbHNjcmVlbiIsIEdfQ0FMTEJBQ0sod2ViVmlld0xlYXZlRnVsbFNjcmVlbiks IG5ld1dpbmRvdyk7CiAgICAgcmV0dXJuIEdUS19XSURHRVQobmV3V2ViVmlldyk7CiB9CiAKQEAg LTUxMyw2ICs1NjAsOCBAQCBzdGF0aWMgdm9pZCBicm93c2VyV2luZG93Q29uc3RydWN0ZWQoR09i amVjdCAqZ09iamVjdCkKICAgICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm1v dXNlLXRhcmdldC1jaGFuZ2VkIiwgR19DQUxMQkFDSyh3ZWJWaWV3TW91c2VUYXJnZXRDaGFuZ2Vk KSwgd2luZG93KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm5vdGlm eTo6em9vbS1sZXZlbCIsIEdfQ0FMTEJBQ0sod2ViVmlld1pvb21MZXZlbENoYW5nZWQpLCB3aW5k b3cpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAibm90aWZ5OjpmYXZp Y29uIiwgR19DQUxMQkFDSyhmYXZpY29uQ2hhbmdlZCksIHdpbmRvdyk7CisgICAgZ19zaWduYWxf Y29ubmVjdCh3aW5kb3ctPndlYlZpZXcsICJlbnRlci1mdWxsc2NyZWVuIiwgR19DQUxMQkFDSyh3 ZWJWaWV3RW50ZXJGdWxsU2NyZWVuKSwgd2luZG93KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KHdp bmRvdy0+d2ViVmlldywgImxlYXZlLWZ1bGxzY3JlZW4iLCBHX0NBTExCQUNLKHdlYlZpZXdMZWF2 ZUZ1bGxTY3JlZW4pLCB3aW5kb3cpOwogCiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJraXRfd2Vi X3ZpZXdfZ2V0X2NvbnRleHQod2luZG93LT53ZWJWaWV3KSwgImRvd25sb2FkLXN0YXJ0ZWQiLCBH X0NBTExCQUNLKGRvd25sb2FkU3RhcnRlZCksIHdpbmRvdyk7CiAKLS0gCjEuNy4xMC40 185774 2013-01-31 06:56:26 -0800 2013-02-01 03:53:57 -0800 Patch bug-108005-20130131155310.patch text/plain 5721 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMzkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTEyM2YyZTQzY2MyZWZlYzM2N2I0NGZhZGZhNTI5NTZj OGM2NGYyYS4uZWY4N2Q3ZjE2Yjg5YTkwZTA4NzQyZGM3NThkMThmN2VhY2VkOWVlYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEzLTAxLTMxICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW1dLMl0gTWluaUJyb3dzZXIgZnVsbHNjcmVlbiBzaWduYWxzIHN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw ODAwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNo b3dzIGEgbGFiZWwgZm9yIDIgc2Vjb25kcyB1c2luZyBvdmVybGF5IChpZiBHVEsgPj0gMy4yLjAp IGFuZCBoaWRlcworICAgICAgICB0aGUgdG9vbGJhciB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4u IFdoZW4gbGVhdmluZyBmdWxsc2NyZWVuIHRoZQorICAgICAgICBsYWJlbCBpcyBoaWRkZW4gKGlm IGl0J3Mgbm90IGhpZGRlbiB5ZXQpIGFuZCB0aGUgdG9vbGJhciBpcyBzaG93biBhZ2Fpbi4KKwor ICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgIChfQnJv d3NlcldpbmRvdyk6CisgICAgICAgICh3ZWJWaWV3RnVsbFNjcmVlbk1lc3NhZ2VIaWRlKToKKyAg ICAgICAgKHdlYlZpZXdFbnRlckZ1bGxTY3JlZW4pOgorICAgICAgICAod2ViVmlld0xlYXZlRnVs bFNjcmVlbik6CisgICAgICAgICh3ZWJWaWV3Q3JlYXRlKToKKyAgICAgICAgKGJyb3dzZXJfd2lu ZG93X2luaXQpOgorICAgICAgICAoYnJvd3NlcldpbmRvd0NvbnN0cnVjdGVkKToKKwogMjAxMy0w MS0zMSAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb Y2hyb21pdW1dIG1vdmUgcnVuTW9kYWxCZWZvcmVVbmxvYWREaWFsb2cgdG8gVGVzdFJ1bm5lciBs aWJyYXJ5CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5j IGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwppbmRleCA4NmIwNDQ2MWQ4 ZDJiZGM1ZmUyODM0ZDIwMDU5MGY4MDhjNDU4YjQ5Li4zNmFlNTA2MDZmOThiYzZmNjA4YTRmYzcw MTIxZjJmNjE4NWFmZjIwIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3Nl cldpbmRvdy5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMKQEAg LTUyLDYgKzUyLDcgQEAgc3RydWN0IF9Ccm93c2VyV2luZG93IHsKICAgICBXZWJLaXRXZWJWaWV3 ICp3ZWJWaWV3OwogICAgIEd0a1dpZGdldCAqZG93bmxvYWRzQmFyOwogICAgIEdka1BpeGJ1ZiAq ZmF2aWNvbjsKKyAgICBHdGtXaWRnZXQgKmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWw7CiB9OwogCiBz dHJ1Y3QgX0Jyb3dzZXJXaW5kb3dDbGFzcyB7CkBAIC02Myw2ICs2NCw3IEBAIHN0YXRpYyBjb25z dCBnZG91YmxlIG1pbmltdW1ab29tTGV2ZWwgPSAwLjU7CiBzdGF0aWMgY29uc3QgZ2RvdWJsZSBt YXhpbXVtWm9vbUxldmVsID0gMzsKIHN0YXRpYyBjb25zdCBnZG91YmxlIHpvb21TdGVwID0gMS4y Owogc3RhdGljIGdpbnQgd2luZG93Q291bnQgPSAwOworc3RhdGljIGd1aW50IGZ1bGxTY3JlZW5N ZXNzYWdlTGFiZWxJZCA9IDA7CiAKIEdfREVGSU5FX1RZUEUoQnJvd3NlcldpbmRvdywgYnJvd3Nl cl93aW5kb3csIEdUS19UWVBFX1dJTkRPVykKIApAQCAtMjYxLDYgKzI2Myw0OCBAQCBzdGF0aWMg dm9pZCB3ZWJWaWV3UmVhZHlUb1Nob3coV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJvd3Nlcldp bmRvdyAqd2luZG93KQogICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKHdpbmRvdykpOwog fQogCitzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0Z1bGxTY3JlZW5NZXNzYWdlSGlkZShHdGtXaWRn ZXQgKmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWwpCit7CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywg MiwgMCkKKyAgICBpZiAoZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbElkKSB7CisgICAgICAgIGd0a193 aWRnZXRfaGlkZShmdWxsU2NyZWVuTWVzc2FnZUxhYmVsKTsKKyAgICAgICAgZ19zb3VyY2VfcmVt b3ZlKGZ1bGxTY3JlZW5NZXNzYWdlTGFiZWxJZCk7CisgICAgICAgIGZ1bGxTY3JlZW5NZXNzYWdl TGFiZWxJZCA9IDA7CisgICAgfQorI2VuZGlmCisKKyAgICByZXR1cm4gRkFMU0U7Cit9CisKK3N0 YXRpYyBnYm9vbGVhbiB3ZWJWaWV3RW50ZXJGdWxsU2NyZWVuKFdlYktpdFdlYlZpZXcgKndlYlZp ZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAy LCAwKQorICAgIGNvbnN0IGdjaGFyICp1cmkgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3aW5k b3ctPndlYlZpZXcpOworICAgIGdjaGFyICptZXNzYWdlID0gZ19zdHJkdXBfcHJpbnRmKCIlcyBp cyBub3cgZnVsbCBzY3JlZW4uIFByZXNzIEVTQyBvciBmIHRvIGV4aXQuIiwgdXJpKTsKKyAgICBn dGtfbGFiZWxfc2V0X3RleHQoR1RLX0xBQkVMKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJl bCksIG1lc3NhZ2UpOworICAgIGdfZnJlZShtZXNzYWdlKTsKKworICAgIGd0a193aWRnZXRfc2hv dyh3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWwpOworCisgICAgZnVsbFNjcmVlbk1lc3Nh Z2VMYWJlbElkID0gZ190aW1lb3V0X2FkZF9zZWNvbmRzKDIsIChHU291cmNlRnVuYykgd2ViVmll d0Z1bGxTY3JlZW5NZXNzYWdlSGlkZSwgd2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxhYmVsKTsK KyNlbmRpZgorCisgICAgZ3RrX3dpZGdldF9oaWRlKHdpbmRvdy0+dG9vbGJhcik7CisKKyAgICBy ZXR1cm4gRkFMU0U7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3TGVhdmVGdWxsU2NyZWVu KFdlYktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyNpZiBH VEtfQ0hFQ0tfVkVSU0lPTigzLCAyLCAwKQorICAgIHdlYlZpZXdGdWxsU2NyZWVuTWVzc2FnZUhp ZGUod2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxhYmVsKTsKKyNlbmRpZgorCisgICAgZ3RrX3dp ZGdldF9zaG93KHdpbmRvdy0+dG9vbGJhcik7CisKKyAgICByZXR1cm4gRkFMU0U7Cit9CisKIHN0 YXRpYyBHdGtXaWRnZXQgKndlYlZpZXdDcmVhdGUoV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJv d3NlcldpbmRvdyAqd2luZG93KQogewogICAgIFdlYktpdFdlYlZpZXcgKm5ld1dlYlZpZXcgPSBX RUJLSVRfV0VCX1ZJRVcod2Via2l0X3dlYl92aWV3X25ld193aXRoX2NvbnRleHQod2Via2l0X3dl Yl92aWV3X2dldF9jb250ZXh0KHdlYlZpZXcpKSk7CkBAIC0yNzAsNiArMzE0LDggQEAgc3RhdGlj IEd0a1dpZGdldCAqd2ViVmlld0NyZWF0ZShXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3LCBCcm93c2Vy V2luZG93ICp3aW5kb3cpCiAgICAgZ19zaWduYWxfY29ubmVjdChuZXdXZWJWaWV3LCAicmVhZHkt dG8tc2hvdyIsIEdfQ0FMTEJBQ0sod2ViVmlld1JlYWR5VG9TaG93KSwgbmV3V2luZG93KTsKICAg ICBnX3NpZ25hbF9jb25uZWN0KG5ld1dlYlZpZXcsICJydW4tYXMtbW9kYWwiLCBHX0NBTExCQUNL KHdlYlZpZXdSdW5Bc01vZGFsKSwgbmV3V2luZG93KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KG5l d1dlYlZpZXcsICJjbG9zZSIsIEdfQ0FMTEJBQ0sod2ViVmlld0Nsb3NlKSwgbmV3V2luZG93KTsK KyAgICBnX3NpZ25hbF9jb25uZWN0KG5ld1dlYlZpZXcsICJlbnRlci1mdWxsc2NyZWVuIiwgR19D QUxMQkFDSyh3ZWJWaWV3RW50ZXJGdWxsU2NyZWVuKSwgbmV3V2luZG93KTsKKyAgICBnX3NpZ25h bF9jb25uZWN0KG5ld1dlYlZpZXcsICJsZWF2ZS1mdWxsc2NyZWVuIiwgR19DQUxMQkFDSyh3ZWJW aWV3TGVhdmVGdWxsU2NyZWVuKSwgbmV3V2luZG93KTsKICAgICByZXR1cm4gR1RLX1dJREdFVChu ZXdXZWJWaWV3KTsKIH0KIApAQCAtNDk1LDYgKzU0MSw3IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJf d2luZG93X2luaXQoQnJvd3NlcldpbmRvdyAqd2luZG93KQogCiAgICAgZ3RrX2NvbnRhaW5lcl9h ZGQoR1RLX0NPTlRBSU5FUih3aW5kb3cpLCB2Ym94KTsKICAgICBndGtfd2lkZ2V0X3Nob3codmJv eCk7CisKIH0KIAogc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0NvbnN0cnVjdGVkKEdPYmplY3Qg KmdPYmplY3QpCkBAIC01MTMsNiArNTYwLDggQEAgc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0Nv bnN0cnVjdGVkKEdPYmplY3QgKmdPYmplY3QpCiAgICAgZ19zaWduYWxfY29ubmVjdCh3aW5kb3ct PndlYlZpZXcsICJtb3VzZS10YXJnZXQtY2hhbmdlZCIsIEdfQ0FMTEJBQ0sod2ViVmlld01vdXNl VGFyZ2V0Q2hhbmdlZCksIHdpbmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3aW5kb3ctPndl YlZpZXcsICJub3RpZnk6Onpvb20tbGV2ZWwiLCBHX0NBTExCQUNLKHdlYlZpZXdab29tTGV2ZWxD aGFuZ2VkKSwgd2luZG93KTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywg Im5vdGlmeTo6ZmF2aWNvbiIsIEdfQ0FMTEJBQ0soZmF2aWNvbkNoYW5nZWQpLCB3aW5kb3cpOwor ICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAiZW50ZXItZnVsbHNjcmVlbiIs IEdfQ0FMTEJBQ0sod2ViVmlld0VudGVyRnVsbFNjcmVlbiksIHdpbmRvdyk7CisgICAgZ19zaWdu YWxfY29ubmVjdCh3aW5kb3ctPndlYlZpZXcsICJsZWF2ZS1mdWxsc2NyZWVuIiwgR19DQUxMQkFD Syh3ZWJWaWV3TGVhdmVGdWxsU2NyZWVuKSwgd2luZG93KTsKIAogICAgIGdfc2lnbmFsX2Nvbm5l Y3Qod2Via2l0X3dlYl92aWV3X2dldF9jb250ZXh0KHdpbmRvdy0+d2ViVmlldyksICJkb3dubG9h ZC1zdGFydGVkIiwgR19DQUxMQkFDSyhkb3dubG9hZFN0YXJ0ZWQpLCB3aW5kb3cpOwogCkBAIC01 MzQsNiArNTgzLDEyIEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dDb25zdHJ1Y3RlZChHT2Jq ZWN0ICpnT2JqZWN0KQogICAgIGd0a19vdmVybGF5X2FkZF9vdmVybGF5KEdUS19PVkVSTEFZKG92 ZXJsYXkpLCB3aW5kb3ctPnN0YXR1c0xhYmVsKTsKIAogICAgIGd0a19jb250YWluZXJfYWRkKEdU S19DT05UQUlORVIob3ZlcmxheSksIEdUS19XSURHRVQod2luZG93LT53ZWJWaWV3KSk7CisKKyAg ICB3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWwgPSBndGtfbGFiZWxfbmV3KE5VTEwpOwor ICAgIGd0a193aWRnZXRfc2V0X2hhbGlnbih3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWws IEdUS19BTElHTl9DRU5URVIpOworICAgIGd0a193aWRnZXRfc2V0X3ZhbGlnbih3aW5kb3ctPmZ1 bGxTY3JlZW5NZXNzYWdlTGFiZWwsIEdUS19BTElHTl9DRU5URVIpOworICAgIGd0a193aWRnZXRf c2V0X25vX3Nob3dfYWxsKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbCwgVFJVRSk7Cisg ICAgZ3RrX292ZXJsYXlfYWRkX292ZXJsYXkoR1RLX09WRVJMQVkob3ZlcmxheSksIHdpbmRvdy0+ ZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbCk7CiAjZWxzZQogICAgIGd0a19ib3hfcGFja19zdGFydChH VEtfQk9YKHdpbmRvdy0+bWFpbkJveCksIEdUS19XSURHRVQod2luZG93LT53ZWJWaWV3KSwgVFJV RSwgVFJVRSwgMCk7CiAjZW5kaWYK 186002 2013-02-01 03:54:01 -0800 2013-02-01 05:10:33 -0800 Patch bug-108005-20130201125043.patch text/plain 4741 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMzkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTEyM2YyZTQzY2MyZWZlYzM2N2I0NGZhZGZhNTI5NTZj OGM2NGYyYS4uZWUxYjZhMDQ2ZDI5ZTkwN2IyNzY4NmQwMzQ5NGVlZjk5MmNmNjNmOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTAyLTAxICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW1dLMl0gTWluaUJyb3dzZXIgZnVsbHNjcmVlbiBzaWduYWxzIHN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw ODAwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNo b3dzIGEgbGFiZWwgZm9yIDIgc2Vjb25kcyB1c2luZyBvdmVybGF5IChpZiBHVEsgPj0gMy4yLjAp IGFuZCBoaWRlcworICAgICAgICB0aGUgdG9vbGJhciB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4u IFdoZW4gbGVhdmluZyBmdWxsc2NyZWVuIHRoZQorICAgICAgICBsYWJlbCBpcyBoaWRkZW4gKGlm IGl0J3Mgbm90IGhpZGRlbiB5ZXQpIGFuZCB0aGUgdG9vbGJhciBpcyBzaG93biBhZ2Fpbi4KKwor ICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgIChfQnJv d3NlcldpbmRvdyk6CisgICAgICAgIChmdWxsU2NyZWVuTWVzc2FnZVRpbWVvdXRDYWxsYmFjayk6 CisgICAgICAgICh3ZWJWaWV3RW50ZXJGdWxsU2NyZWVuKToKKyAgICAgICAgKHdlYlZpZXdMZWF2 ZUZ1bGxTY3JlZW4pOgorICAgICAgICAoYnJvd3NlcldpbmRvd0NvbnN0cnVjdGVkKToKKwogMjAx My0wMS0zMSAgSm9jaGVuIEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBbY2hyb21pdW1dIG1vdmUgcnVuTW9kYWxCZWZvcmVVbmxvYWREaWFsb2cgdG8gVGVzdFJ1bm5l ciBsaWJyYXJ5CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRv dy5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYwppbmRleCA4NmIwNDQ2 MWQ4ZDJiZGM1ZmUyODM0ZDIwMDU5MGY4MDhjNDU4YjQ5Li44NzgxN2FhNDdmNGZiMWJlYTYyOGJk YTQzNjc1OTM0Mzg0Njc5ODU2IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQnJv d3NlcldpbmRvdy5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmMK QEAgLTUyLDYgKzUyLDEwIEBAIHN0cnVjdCBfQnJvd3NlcldpbmRvdyB7CiAgICAgV2ViS2l0V2Vi VmlldyAqd2ViVmlldzsKICAgICBHdGtXaWRnZXQgKmRvd25sb2Fkc0JhcjsKICAgICBHZGtQaXhi dWYgKmZhdmljb247CisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMiwgMCkKKyAgICBHdGtXaWRn ZXQgKmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWw7CisgICAgZ3VpbnQgZnVsbFNjcmVlbk1lc3NhZ2VM YWJlbElkOworI2VuZGlmCiB9OwogCiBzdHJ1Y3QgX0Jyb3dzZXJXaW5kb3dDbGFzcyB7CkBAIC0y NjEsNiArMjY1LDQ5IEBAIHN0YXRpYyB2b2lkIHdlYlZpZXdSZWFkeVRvU2hvdyhXZWJLaXRXZWJW aWV3ICp3ZWJWaWV3LCBCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgZ3RrX3dpZGdldF9zaG93 KEdUS19XSURHRVQod2luZG93KSk7CiB9CiAKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAyLCAw KQorc3RhdGljIGdib29sZWFuIGZ1bGxTY3JlZW5NZXNzYWdlVGltZW91dENhbGxiYWNrKEd0a1dp ZGdldCAqZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbCkKK3sKKyAgICBndGtfd2lkZ2V0X2hpZGUoZnVs bFNjcmVlbk1lc3NhZ2VMYWJlbCk7CisgICAgcmV0dXJuIEZBTFNFOworfQorI2VuZGlmCisKK3N0 YXRpYyBnYm9vbGVhbiB3ZWJWaWV3RW50ZXJGdWxsU2NyZWVuKFdlYktpdFdlYlZpZXcgKndlYlZp ZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAy LCAwKQorICAgIGdjaGFyICp0aXRsZU9yVXJpID0gd2Via2l0X3dlYl92aWV3X2dldF90aXRsZSh3 aW5kb3ctPndlYlZpZXcpOworICAgIGlmICghdGl0bGVPclVyaSkKKyAgICAgICAgdGl0bGVPclVy aSA9IHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdpbmRvdy0+d2ViVmlldyk7CisgICAgZ2NoYXIg Km1lc3NhZ2UgPSBnX3N0cmR1cF9wcmludGYoIiVzIGlzIG5vdyBmdWxsIHNjcmVlbi4gUHJlc3Mg RVNDIG9yIGYgdG8gZXhpdC4iLCB0aXRsZU9yVXJpKTsKKyAgICBndGtfbGFiZWxfc2V0X3RleHQo R1RLX0xBQkVMKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbCksIG1lc3NhZ2UpOworICAg IGdfZnJlZShtZXNzYWdlKTsKKworICAgIGd0a193aWRnZXRfc2hvdyh3aW5kb3ctPmZ1bGxTY3Jl ZW5NZXNzYWdlTGFiZWwpOworCisgICAgd2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxhYmVsSWQg PSBnX3RpbWVvdXRfYWRkX3NlY29uZHMoMiwgKEdTb3VyY2VGdW5jKWZ1bGxTY3JlZW5NZXNzYWdl VGltZW91dENhbGxiYWNrLCB3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWwpOworI2VuZGlm CisKKyAgICBndGtfd2lkZ2V0X2hpZGUod2luZG93LT50b29sYmFyKTsKKworICAgIHJldHVybiBG QUxTRTsKK30KKworc3RhdGljIGdib29sZWFuIHdlYlZpZXdMZWF2ZUZ1bGxTY3JlZW4oV2ViS2l0 V2ViVmlldyAqd2ViVmlldywgQnJvd3NlcldpbmRvdyAqd2luZG93KQoreworI2lmIEdUS19DSEVD S19WRVJTSU9OKDMsIDIsIDApCisgICAgaWYgKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJl bElkKSB7CisgICAgICAgIGdfc291cmNlX3JlbW92ZSh3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdl TGFiZWxJZCk7CisgICAgICAgIHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbElkID0gMDsK KyAgICB9CisgICAgZ3RrX3dpZGdldF9oaWRlKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJl bCk7CisjZW5kaWYKKworICAgIGd0a193aWRnZXRfc2hvdyh3aW5kb3ctPnRvb2xiYXIpOworCisg ICAgcmV0dXJuIEZBTFNFOworfQorCiBzdGF0aWMgR3RrV2lkZ2V0ICp3ZWJWaWV3Q3JlYXRlKFdl YktpdFdlYlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKIHsKICAgICBXZWJL aXRXZWJWaWV3ICpuZXdXZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdlYmtpdF93ZWJfdmlld19u ZXdfd2l0aF9jb250ZXh0KHdlYmtpdF93ZWJfdmlld19nZXRfY29udGV4dCh3ZWJWaWV3KSkpOwpA QCAtNTEzLDYgKzU2MCw4IEBAIHN0YXRpYyB2b2lkIGJyb3dzZXJXaW5kb3dDb25zdHJ1Y3RlZChH T2JqZWN0ICpnT2JqZWN0KQogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAi bW91c2UtdGFyZ2V0LWNoYW5nZWQiLCBHX0NBTExCQUNLKHdlYlZpZXdNb3VzZVRhcmdldENoYW5n ZWQpLCB3aW5kb3cpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAibm90 aWZ5Ojp6b29tLWxldmVsIiwgR19DQUxMQkFDSyh3ZWJWaWV3Wm9vbUxldmVsQ2hhbmdlZCksIHdp bmRvdyk7CiAgICAgZ19zaWduYWxfY29ubmVjdCh3aW5kb3ctPndlYlZpZXcsICJub3RpZnk6OmZh dmljb24iLCBHX0NBTExCQUNLKGZhdmljb25DaGFuZ2VkKSwgd2luZG93KTsKKyAgICBnX3NpZ25h bF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgImVudGVyLWZ1bGxzY3JlZW4iLCBHX0NBTExCQUNL KHdlYlZpZXdFbnRlckZ1bGxTY3JlZW4pLCB3aW5kb3cpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Qo d2luZG93LT53ZWJWaWV3LCAibGVhdmUtZnVsbHNjcmVlbiIsIEdfQ0FMTEJBQ0sod2ViVmlld0xl YXZlRnVsbFNjcmVlbiksIHdpbmRvdyk7CiAKICAgICBnX3NpZ25hbF9jb25uZWN0KHdlYmtpdF93 ZWJfdmlld19nZXRfY29udGV4dCh3aW5kb3ctPndlYlZpZXcpLCAiZG93bmxvYWQtc3RhcnRlZCIs IEdfQ0FMTEJBQ0soZG93bmxvYWRTdGFydGVkKSwgd2luZG93KTsKIApAQCAtNTM0LDYgKzU4Mywx MiBAQCBzdGF0aWMgdm9pZCBicm93c2VyV2luZG93Q29uc3RydWN0ZWQoR09iamVjdCAqZ09iamVj dCkKICAgICBndGtfb3ZlcmxheV9hZGRfb3ZlcmxheShHVEtfT1ZFUkxBWShvdmVybGF5KSwgd2lu ZG93LT5zdGF0dXNMYWJlbCk7CiAKICAgICBndGtfY29udGFpbmVyX2FkZChHVEtfQ09OVEFJTkVS KG92ZXJsYXkpLCBHVEtfV0lER0VUKHdpbmRvdy0+d2ViVmlldykpOworCisgICAgd2luZG93LT5m dWxsU2NyZWVuTWVzc2FnZUxhYmVsID0gZ3RrX2xhYmVsX25ldyhOVUxMKTsKKyAgICBndGtfd2lk Z2V0X3NldF9oYWxpZ24od2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxhYmVsLCBHVEtfQUxJR05f Q0VOVEVSKTsKKyAgICBndGtfd2lkZ2V0X3NldF92YWxpZ24od2luZG93LT5mdWxsU2NyZWVuTWVz c2FnZUxhYmVsLCBHVEtfQUxJR05fQ0VOVEVSKTsKKyAgICBndGtfd2lkZ2V0X3NldF9ub19zaG93 X2FsbCh3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWwsIFRSVUUpOworICAgIGd0a19vdmVy bGF5X2FkZF9vdmVybGF5KEdUS19PVkVSTEFZKG92ZXJsYXkpLCB3aW5kb3ctPmZ1bGxTY3JlZW5N ZXNzYWdlTGFiZWwpOwogI2Vsc2UKICAgICBndGtfYm94X3BhY2tfc3RhcnQoR1RLX0JPWCh3aW5k b3ctPm1haW5Cb3gpLCBHVEtfV0lER0VUKHdpbmRvdy0+d2ViVmlldyksIFRSVUUsIFRSVUUsIDAp OwogI2VuZGlmCg== 186017 2013-02-01 05:10:37 -0800 2013-02-01 06:12:50 -0800 Patch bug-108005-20130201140719.patch text/plain 5177 rego U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMzkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTEyM2YyZTQzY2MyZWZlYzM2N2I0NGZhZGZhNTI5NTZj OGM2NGYyYS4uOGY3Y2IwZjQxOTU1NWIzNDQ0ODkyYjcwN2ZjYTY3ZjQ2MjAwOTQ5NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEzLTAyLTAxICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdW1dLMl0gTWluaUJyb3dzZXIgZnVsbHNjcmVlbiBzaWduYWxzIHN1 cHBvcnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEw ODAwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNo b3dzIGEgbGFiZWwgZm9yIDIgc2Vjb25kcyB1c2luZyBvdmVybGF5IChpZiBHVEsgPj0gMy4yLjAp IGFuZCBoaWRlcworICAgICAgICB0aGUgdG9vbGJhciB3aGVuIGVudGVyaW5nIGZ1bGxzY3JlZW4u IFdoZW4gbGVhdmluZyBmdWxsc2NyZWVuIHRoZQorICAgICAgICBsYWJlbCBpcyBoaWRkZW4gKGlm IGl0J3Mgbm90IGhpZGRlbiB5ZXQpIGFuZCB0aGUgdG9vbGJhciBpcyBzaG93biBhZ2Fpbi4KKwor ICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgIChfQnJv d3NlcldpbmRvdyk6CisgICAgICAgIChmdWxsU2NyZWVuTWVzc2FnZVRpbWVvdXRDYWxsYmFjayk6 CisgICAgICAgICh3ZWJWaWV3RW50ZXJGdWxsU2NyZWVuKToKKyAgICAgICAgKHdlYlZpZXdMZWF2 ZUZ1bGxTY3JlZW4pOgorICAgICAgICAoYnJvd3NlcldpbmRvd0ZpbmFsaXplKToKKyAgICAgICAg KGJyb3dzZXJXaW5kb3dDb25zdHJ1Y3RlZCk6CisKIDIwMTMtMDEtMzEgIEpvY2hlbiBFaXNpbmdl ciAgPGpvY2hlbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBtb3ZlIHJ1bk1v ZGFsQmVmb3JlVW5sb2FkRGlhbG9nIHRvIFRlc3RSdW5uZXIgbGlicmFyeQpkaWZmIC0tZ2l0IGEv VG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2Vy L2d0ay9Ccm93c2VyV2luZG93LmMKaW5kZXggODZiMDQ0NjFkOGQyYmRjNWZlMjgzNGQyMDA1OTBm ODA4YzQ1OGI0OS4uYTViMGNkMzVjNDdjYTc1Yjg4NTc3MWQ4MGU5YWYzZTA2NzBmYzRhNyAxMDA2 NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9ndGsvQnJvd3NlcldpbmRvdy5jCkBAIC01Miw2ICs1MiwxMCBAQCBzdHJ1 Y3QgX0Jyb3dzZXJXaW5kb3cgewogICAgIFdlYktpdFdlYlZpZXcgKndlYlZpZXc7CiAgICAgR3Rr V2lkZ2V0ICpkb3dubG9hZHNCYXI7CiAgICAgR2RrUGl4YnVmICpmYXZpY29uOworI2lmIEdUS19D SEVDS19WRVJTSU9OKDMsIDIsIDApCisgICAgR3RrV2lkZ2V0ICpmdWxsU2NyZWVuTWVzc2FnZUxh YmVsOworICAgIGd1aW50IGZ1bGxTY3JlZW5NZXNzYWdlTGFiZWxJZDsKKyNlbmRpZgogfTsKIAog c3RydWN0IF9Ccm93c2VyV2luZG93Q2xhc3MgewpAQCAtMjYxLDYgKzI2NSw1MCBAQCBzdGF0aWMg dm9pZCB3ZWJWaWV3UmVhZHlUb1Nob3coV2ViS2l0V2ViVmlldyAqd2ViVmlldywgQnJvd3Nlcldp bmRvdyAqd2luZG93KQogICAgIGd0a193aWRnZXRfc2hvdyhHVEtfV0lER0VUKHdpbmRvdykpOwog fQogCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMiwgMCkKK3N0YXRpYyBnYm9vbGVhbiBmdWxs U2NyZWVuTWVzc2FnZVRpbWVvdXRDYWxsYmFjayhCcm93c2VyV2luZG93ICp3aW5kb3cpCit7Cisg ICAgZ3RrX3dpZGdldF9oaWRlKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbCk7CisgICAg d2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxhYmVsSWQgPSAwOworICAgIHJldHVybiBGQUxTRTsK K30KKyNlbmRpZgorCitzdGF0aWMgZ2Jvb2xlYW4gd2ViVmlld0VudGVyRnVsbFNjcmVlbihXZWJL aXRXZWJWaWV3ICp3ZWJWaWV3LCBCcm93c2VyV2luZG93ICp3aW5kb3cpCit7CisjaWYgR1RLX0NI RUNLX1ZFUlNJT04oMywgMiwgMCkKKyAgICBjb25zdCBnY2hhciAqdGl0bGVPclVSSSA9IHdlYmtp dF93ZWJfdmlld19nZXRfdGl0bGUod2luZG93LT53ZWJWaWV3KTsKKyAgICBpZiAoIXRpdGxlT3JV UkkpCisgICAgICAgIHRpdGxlT3JVUkkgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3VyaSh3aW5kb3ct PndlYlZpZXcpOworICAgIGdjaGFyICptZXNzYWdlID0gZ19zdHJkdXBfcHJpbnRmKCIlcyBpcyBu b3cgZnVsbCBzY3JlZW4uIFByZXNzIEVTQyBvciBmIHRvIGV4aXQuIiwgdGl0bGVPclVSSSk7Cisg ICAgZ3RrX2xhYmVsX3NldF90ZXh0KEdUS19MQUJFTCh3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdl TGFiZWwpLCBtZXNzYWdlKTsKKyAgICBnX2ZyZWUobWVzc2FnZSk7CisKKyAgICBndGtfd2lkZ2V0 X3Nob3cod2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxhYmVsKTsKKworICAgIHdpbmRvdy0+ZnVs bFNjcmVlbk1lc3NhZ2VMYWJlbElkID0gZ190aW1lb3V0X2FkZF9zZWNvbmRzKDIsIChHU291cmNl RnVuYylmdWxsU2NyZWVuTWVzc2FnZVRpbWVvdXRDYWxsYmFjaywgd2luZG93KTsKKyNlbmRpZgor CisgICAgZ3RrX3dpZGdldF9oaWRlKHdpbmRvdy0+dG9vbGJhcik7CisKKyAgICByZXR1cm4gRkFM U0U7Cit9CisKK3N0YXRpYyBnYm9vbGVhbiB3ZWJWaWV3TGVhdmVGdWxsU2NyZWVuKFdlYktpdFdl YlZpZXcgKndlYlZpZXcsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyNpZiBHVEtfQ0hFQ0tf VkVSU0lPTigzLCAyLCAwKQorICAgIGlmICh3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWxJ ZCkgeworICAgICAgICBnX3NvdXJjZV9yZW1vdmUod2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxh YmVsSWQpOworICAgICAgICB3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWxJZCA9IDA7Cisg ICAgfQorICAgIGd0a193aWRnZXRfaGlkZSh3aW5kb3ctPmZ1bGxTY3JlZW5NZXNzYWdlTGFiZWwp OworI2VuZGlmCisKKyAgICBndGtfd2lkZ2V0X3Nob3cod2luZG93LT50b29sYmFyKTsKKworICAg IHJldHVybiBGQUxTRTsKK30KKwogc3RhdGljIEd0a1dpZGdldCAqd2ViVmlld0NyZWF0ZShXZWJL aXRXZWJWaWV3ICp3ZWJWaWV3LCBCcm93c2VyV2luZG93ICp3aW5kb3cpCiB7CiAgICAgV2ViS2l0 V2ViVmlldyAqbmV3V2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3 X3dpdGhfY29udGV4dCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2NvbnRleHQod2ViVmlldykpKTsKQEAg LTM5Niw2ICs0NDQsMTEgQEAgc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0ZpbmFsaXplKEdPYmpl Y3QgKmdPYmplY3QpCiAgICAgICAgIHdpbmRvdy0+ZmF2aWNvbiA9IE5VTEw7CiAgICAgfQogCisj aWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMiwgMCkKKyAgICBpZiAod2luZG93LT5mdWxsU2NyZWVu TWVzc2FnZUxhYmVsSWQpCisgICAgICAgIGdfc291cmNlX3JlbW92ZSh3aW5kb3ctPmZ1bGxTY3Jl ZW5NZXNzYWdlTGFiZWxJZCk7CisjZW5kaWYKKwogICAgIEdfT0JKRUNUX0NMQVNTKGJyb3dzZXJf d2luZG93X3BhcmVudF9jbGFzcyktPmZpbmFsaXplKGdPYmplY3QpOwogCiAgICAgaWYgKGdfYXRv bWljX2ludF9kZWNfYW5kX3Rlc3QoJndpbmRvd0NvdW50KSkKQEAgLTUxMyw2ICs1NjYsOCBAQCBz dGF0aWMgdm9pZCBicm93c2VyV2luZG93Q29uc3RydWN0ZWQoR09iamVjdCAqZ09iamVjdCkKICAg ICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm1vdXNlLXRhcmdldC1jaGFuZ2Vk IiwgR19DQUxMQkFDSyh3ZWJWaWV3TW91c2VUYXJnZXRDaGFuZ2VkKSwgd2luZG93KTsKICAgICBn X3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm5vdGlmeTo6em9vbS1sZXZlbCIsIEdf Q0FMTEJBQ0sod2ViVmlld1pvb21MZXZlbENoYW5nZWQpLCB3aW5kb3cpOwogICAgIGdfc2lnbmFs X2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAibm90aWZ5OjpmYXZpY29uIiwgR19DQUxMQkFDSyhm YXZpY29uQ2hhbmdlZCksIHdpbmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVjdCh3aW5kb3ctPndl YlZpZXcsICJlbnRlci1mdWxsc2NyZWVuIiwgR19DQUxMQkFDSyh3ZWJWaWV3RW50ZXJGdWxsU2Ny ZWVuKSwgd2luZG93KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgImxl YXZlLWZ1bGxzY3JlZW4iLCBHX0NBTExCQUNLKHdlYlZpZXdMZWF2ZUZ1bGxTY3JlZW4pLCB3aW5k b3cpOwogCiAgICAgZ19zaWduYWxfY29ubmVjdCh3ZWJraXRfd2ViX3ZpZXdfZ2V0X2NvbnRleHQo d2luZG93LT53ZWJWaWV3KSwgImRvd25sb2FkLXN0YXJ0ZWQiLCBHX0NBTExCQUNLKGRvd25sb2Fk U3RhcnRlZCksIHdpbmRvdyk7CiAKQEAgLTUzNCw2ICs1ODksMTIgQEAgc3RhdGljIHZvaWQgYnJv d3NlcldpbmRvd0NvbnN0cnVjdGVkKEdPYmplY3QgKmdPYmplY3QpCiAgICAgZ3RrX292ZXJsYXlf YWRkX292ZXJsYXkoR1RLX09WRVJMQVkob3ZlcmxheSksIHdpbmRvdy0+c3RhdHVzTGFiZWwpOwog CiAgICAgZ3RrX2NvbnRhaW5lcl9hZGQoR1RLX0NPTlRBSU5FUihvdmVybGF5KSwgR1RLX1dJREdF VCh3aW5kb3ctPndlYlZpZXcpKTsKKworICAgIHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJl bCA9IGd0a19sYWJlbF9uZXcoTlVMTCk7CisgICAgZ3RrX3dpZGdldF9zZXRfaGFsaWduKHdpbmRv dy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbCwgR1RLX0FMSUdOX0NFTlRFUik7CisgICAgZ3RrX3dp ZGdldF9zZXRfdmFsaWduKHdpbmRvdy0+ZnVsbFNjcmVlbk1lc3NhZ2VMYWJlbCwgR1RLX0FMSUdO X0NFTlRFUik7CisgICAgZ3RrX3dpZGdldF9zZXRfbm9fc2hvd19hbGwod2luZG93LT5mdWxsU2Ny ZWVuTWVzc2FnZUxhYmVsLCBUUlVFKTsKKyAgICBndGtfb3ZlcmxheV9hZGRfb3ZlcmxheShHVEtf T1ZFUkxBWShvdmVybGF5KSwgd2luZG93LT5mdWxsU2NyZWVuTWVzc2FnZUxhYmVsKTsKICNlbHNl CiAgICAgZ3RrX2JveF9wYWNrX3N0YXJ0KEdUS19CT1god2luZG93LT5tYWluQm94KSwgR1RLX1dJ REdFVCh3aW5kb3ctPndlYlZpZXcpLCBUUlVFLCBUUlVFLCAwKTsKICNlbmRpZgo=