36404 2010-03-19 20:29:24 -0700 [Gtk] Debug build fix when using a Gtk 2.20 2010-03-25 00:26:15 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED DUPLICATE 36398 P2 Normal --- 1 zecke webkit-unassigned gustavo webkit.review.bot xan.lopez oldest_to_newest 202155 0 zecke 2010-03-19 20:29:24 -0700 In debug mode we are compiling with GTK_NO_DEPRECATED and with Gtk+ 2.20 we are using deprecated symbols. 202160 1 51213 zecke 2010-03-19 20:42:56 -0700 Created attachment 51213 Use non depcreated variants for the GtkWidget GTK_WIDGET_REALIZED and GTK_WIDGET_NO_WINDOW are deprecated. For the GTK_WIDGET_NO_WINDOW case we need to use gtk_widget_get_has_window which actually returns _if_ we have a window, this means we need to negate that. 202162 2 webkit.review.bot 2010-03-19 20:51:36 -0700 Attachment 51213 did not build on gtk: Build output: http://webkit-commit-queue.appspot.com/results/977055 202186 3 51217 zecke 2010-03-20 00:54:44 -0700 Created attachment 51217 Use the right version Gtk Version The new methods were added in 2.19... correct the GTK_CHECK_VERSION for that. 202187 4 webkit.review.bot 2010-03-20 00:56:54 -0700 Attachment 51217 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/plugins/gtk/gtk2xtbin.c:405: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:465: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:465: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 3 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 202499 5 gustavo 2010-03-22 08:19:25 -0700 Holger, I have an alternate proposal at https://bugs.webkit.org/show_bug.cgi?id=36398 What do you think? 202501 6 gustavo 2010-03-22 08:20:05 -0700 And yeah, it needs the same realized fix still, didn't get time to get to it yet, will fix the patch tonight. 202611 7 gustavo 2010-03-22 10:59:48 -0700 Since zecke told me he thinks my patch is good, I'll mark this as a duplicate of the bug I opened. *** This bug has been marked as a duplicate of bug 36398 *** 203862 8 51217 eric 2010-03-25 00:26:15 -0700 Comment on attachment 51217 Use the right version Gtk Version clearing r? on this closed bug. 51213 2010-03-19 20:42:56 -0700 2010-03-20 00:54:44 -0700 Use non depcreated variants for the GtkWidget 0002-Gtk-Fix-the-debug-build-by-using-non-deprecated-symb.patch text/plain 4805 zecke RnJvbSAyYzNkZmVlNjY1YjlmZjA2M2ZlY2QyZGMxYzhkNDE4MzA1ZThiYzFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFNhdCwgMjAgTWFyIDIwMTAgMDQ6Mjc6NTYgKzAxMDAKU3ViamVjdDog W1BBVENIIDIvMl0gW0d0a10gRml4IHRoZSBkZWJ1ZyBidWlsZCBieSB1c2luZyBub24gZGVwcmVj YXRlZCBzeW1ib2xzCgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY0 MDQKCkd0ayBoYXMgZGVwcmVjYXRlZCBHVEtfV0lER0VUX1JFQUxJWkVEIGFuZCBHVEtfV0lER0VU X05PX1dJTkRPVwphbmQgbWV0aG9kcyBuZWVkcyB0byBiZSB1c2VkIG5vdyB0byAgZ2V0IHRoZSBz YW1lIGJlaGF2aW9yLgoKV2ViQ29yZQoqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5j cHA6CihXZWJDb3JlOjpnZXRWaXN1YWwpOgoqIHBsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3Bw OgooU2Nyb2xsYmFyR3RrOjpwYWludCk6CgpXZWJLaXQvZ3RrCiogV2ViQ29yZVN1cHBvcnQvQ2hy b21lQ2xpZW50R3RrLmNwcDoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgfCAgIDE1ICsrKysrKysrKysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UGxhdGZvcm1TY3JlZW5HdGsuY3BwICAgIHwgICAgOCArKysrKysrKwogV2ViQ29yZS9wbGF0Zm9y bS9ndGsvU2Nyb2xsYmFyR3RrLmNwcCAgICAgICAgIHwgICAgNiArKysrKysKIFdlYktpdC9ndGsv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTIgKysrKysrKysrKysrCiBX ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAgfCAgICA0ICsrKysK IDUgZmlsZXMgY2hhbmdlZCwgNDUgaW5zZXJ0aW9ucygrKSwgMCBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDk3NDE5 NDQuLjg4NzRjYTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDMtMTkgIEhvbGdlciBIYW5zIFBldGVy IEZyZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW0d0a10gRml4IHRoZSBkZWJ1ZyBidWlsZCBieSB1c2lu ZyBub24gZGVwcmVjYXRlZCBzeW1ib2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0zNjQwNAorCisgICAgICAgIEd0ayBoYXMgZGVwcmVjYXRlZCBHVEtf V0lER0VUX1JFQUxJWkVEIGFuZCBHVEtfV0lER0VUX05PX1dJTkRPVworICAgICAgICBhbmQgbWV0 aG9kcyBuZWVkcyB0byBiZSB1c2VkIG5vdyB0byAgZ2V0IHRoZSBzYW1lIGJlaGF2aW9yLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmdldFZpc3VhbCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5j cHA6CisgICAgICAgIChTY3JvbGxiYXJHdGs6OnBhaW50KToKKwogMjAxMC0wMy0xOCAgRGFyaW4g RmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0g QmFydGguCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0 ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKaW5kZXgg OTJjY2ZmNC4uNjY4Y2IxNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZv cm1TY3JlZW5HdGsuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVu R3RrLmNwcApAQCAtNTQsNyArNTQsMTEgQEAgc3RhdGljIEdka1Zpc3VhbCogZ2V0VmlzdWFsKFdp ZGdldCogd2lkZ2V0KQogICAgIGlmICghY29udGFpbmVyKQogICAgICAgICByZXR1cm4gMDsKIAor I2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQorICAgIGlmICghZ3RrX3dpZGdldF9nZXRf cmVhbGl6ZWQoY29udGFpbmVyKSkgeworI2Vsc2UKICAgICBpZiAoIUdUS19XSURHRVRfUkVBTEla RUQoY29udGFpbmVyKSkgeworI2VuZGlmCiAgICAgICAgIEd0a1dpZGdldCogdG9wbGV2ZWwgPSBn dGtfd2lkZ2V0X2dldF90b3BsZXZlbChjb250YWluZXIpOwogI2lmIEdUS19DSEVDS19WRVJTSU9O KDIsIDE4LCAwKQogICAgICAgICBpZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh0b3BsZXZlbCkp CkBAIC0xMjYsNyArMTMwLDExIEBAIEZsb2F0UmVjdCBzY3JlZW5BdmFpbGFibGVSZWN0KFdpZGdl dCogd2lkZ2V0KQogICAgIGlmICghY29udGFpbmVyKQogICAgICAgICByZXR1cm4gRmxvYXRSZWN0 KCk7CiAKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKKyAgICBpZiAoIWd0a193aWRn ZXRfZ2V0X3JlYWxpemVkKGNvbnRhaW5lcikpCisjZWxzZQogICAgIGlmICghR1RLX1dJREdFVF9S RUFMSVpFRChjb250YWluZXIpKQorI2VuZGlmCiAgICAgICAgIHJldHVybiBzY3JlZW5SZWN0KHdp ZGdldCk7CiAKICAgICBHZGtEcmF3YWJsZSogcm9vdFdpbmRvdyA9IEdES19EUkFXQUJMRShndGtf d2lkZ2V0X2dldF9yb290X3dpbmRvdyhjb250YWluZXIpKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3Jv bGxiYXJHdGsuY3BwCmluZGV4IDBjMzAzN2EuLjg1ZjUzMTggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv U2Nyb2xsYmFyR3RrLmNwcApAQCAtMjA4LDcgKzIwOCwxMyBAQCB2b2lkIFNjcm9sbGJhckd0azo6 cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAg ICAgICByZXR1cm47CiAKICAgICBHdGtXaWRnZXQqIHdpZGdldCA9IHBsYXRmb3JtV2lkZ2V0KCk7 CisKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKKyAgICBBU1NFUlQoIWd0a193aWRn ZXRfZ2V0X2hhc193aW5kb3cod2lkZ2V0KSk7CisjZWxzZQogICAgIEFTU0VSVChHVEtfV0lER0VU X05PX1dJTkRPVyh3aWRnZXQpKTsKKyNlbmRpZgorCiAKICAgICBHZGtFdmVudCogZXZlbnQgPSBn ZGtfZXZlbnRfbmV3KEdES19FWFBPU0UpOwogICAgIGV2ZW50LT5leHBvc2UgPSAqY29udGV4dC0+ Z2RrRXhwb3NlRXZlbnQoKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNDU4OTcxOS4uNGQxY2UwMyAxMDA2NDQKLS0tIGEvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxMC0wMy0xOSAgSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIgIDx6ZWNrZUBzZWxm aXNoLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbR3RrXSBGaXggdGhlIGRlYnVnIGJ1aWxkIGJ5IHVzaW5nIG5vbiBkZXByZWNhdGVkIHN5bWJv bHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NDA0 CisKKyAgICAgICAgR3RrIGhhcyBkZXByZWNhdGVkIEdUS19XSURHRVRfUkVBTElaRUQgYW5kIEdU S19XSURHRVRfTk9fV0lORE9XCisgICAgICAgIGFuZCBtZXRob2RzIG5lZWRzIHRvIGJlIHVzZWQg bm93IHRvICBnZXQgdGhlIHNhbWUgYmVoYXZpb3IuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9DaHJvbWVDbGllbnRHdGsuY3BwOgorCiAyMDEwLTAzLTE4ICBQaGlsaXAgQ2hpbWVudG8gIDxw aGlsaXAuY2hpbWVudG9AZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBI dW50LgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRH dGsuY3BwIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCmlu ZGV4IGM2M2EwM2IuLjVhMmMxYjEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBv cnQvQ2hyb21lQ2xpZW50R3RrLmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0No cm9tZUNsaWVudEd0ay5jcHAKQEAgLTQzOSw3ICs0MzksMTEgQEAgdm9pZCBDaHJvbWVDbGllbnQ6 OmNvbnRlbnRzU2l6ZUNoYW5nZWQoRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRTaXplJiBzaXplKSBj b25zdAogICAgIC8vIFdlIG5lZWQgdG8gcXVldWUgYSByZXNpemUgcmVxdWVzdCBvbmx5IGlmIHRo ZSBzaXplIGNoYW5nZWQsCiAgICAgLy8gb3RoZXJ3aXNlIHdlIGdldCBpbnRvIGFuIGluZmluaXRl IGxvb3AhCiAgICAgR3RrV2lkZ2V0KiB3aWRnZXQgPSBHVEtfV0lER0VUKG1fd2ViVmlldyk7Cisj aWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCisgICAgaWYgKGd0a193aWRnZXRfZ2V0X3Jl YWxpemVkKHdpZGdldCkKKyNlbHNlCiAgICAgaWYgKEdUS19XSURHRVRfUkVBTElaRUQod2lkZ2V0 KQorI2VuZGlmCiAgICAgICAgICYmICh3aWRnZXQtPnJlcXVpc2l0aW9uLmhlaWdodCAhPSBzaXpl LmhlaWdodCgpKQogICAgICAgICB8fCAod2lkZ2V0LT5yZXF1aXNpdGlvbi53aWR0aCAhPSBzaXpl LndpZHRoKCkpKQogICAgICAgICBndGtfd2lkZ2V0X3F1ZXVlX3Jlc2l6ZV9ub19yZWRyYXcod2lk Z2V0KTsKLS0gCjEuNy4wCgo= 51217 2010-03-20 00:54:44 -0700 2010-03-25 00:26:15 -0700 Use the right version Gtk Version 0002-Gtk-Fix-the-debug-build-by-using-non-deprecated-symb.patch text/plain 5793 zecke RnJvbSBmZDQ0YjU0Zjk3ZWQ2NThjOThlMTUxZThkZmE0MDViZjQ3ZGVlNzM4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFNhdCwgMjAgTWFyIDIwMTAgMDQ6Mjc6NTYgKzAxMDAKU3ViamVjdDog W1BBVENIIDIvMl0gW0d0a10gRml4IHRoZSBkZWJ1ZyBidWlsZCBieSB1c2luZyBub24gZGVwcmVj YXRlZCBzeW1ib2xzCgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY0 MDQKCkd0ayBoYXMgZGVwcmVjYXRlZCBHVEtfV0lER0VUX1JFQUxJWkVEIGFuZCBHVEtfV0lER0VU X05PX1dJTkRPVwphbmQgbWV0aG9kcyBuZWVkcyB0byBiZSB1c2VkIG5vdyB0byAgZ2V0IHRoZSBz YW1lIGJlaGF2aW9yLgoKV2ViQ29yZQoqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5j cHA6CihXZWJDb3JlOjpnZXRWaXN1YWwpOgoqIHBsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3Bw OgooU2Nyb2xsYmFyR3RrOjpwYWludCk6CiogcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmM6CihndGtf eHRiaW5fc2V0X3Bvc2l0aW9uKToKCldlYktpdC9ndGsKKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVD bGllbnRHdGsuY3BwOgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB8ICAgMTcgKysrKysrKysrKysrKysrKysKIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1Bs YXRmb3JtU2NyZWVuR3RrLmNwcCAgICB8ICAgIDggKysrKysrKysKIFdlYkNvcmUvcGxhdGZvcm0v Z3RrL1Njcm9sbGJhckd0ay5jcHAgICAgICAgICB8ICAgIDYgKysrKysrCiBXZWJDb3JlL3BsdWdp bnMvZ3RrL2d0azJ4dGJpbi5jICAgICAgICAgICAgICAgfCAgICA5ICsrKysrKysrKwogV2ViS2l0 L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMiArKysrKysrKysr KysKIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcCB8ICAgIDQg KysrKwogNiBmaWxlcyBjaGFuZ2VkLCA1NiBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQoK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OTc0MTk0NC4uMmI0MmY1YyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wMy0xOSAgSG9sZ2VyIEhhbnMg UGV0ZXIgRnJleXRoZXIgIDx6ZWNrZUBzZWxmaXNoLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR3RrXSBGaXggdGhlIGRlYnVnIGJ1aWxkIGJ5 IHVzaW5nIG5vbiBkZXByZWNhdGVkIHN5bWJvbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NDA0CisKKyAgICAgICAgR3RrIGhhcyBkZXByZWNhdGVk IEdUS19XSURHRVRfUkVBTElaRUQgYW5kIEdUS19XSURHRVRfTk9fV0lORE9XCisgICAgICAgIGFu ZCBtZXRob2RzIG5lZWRzIHRvIGJlIHVzZWQgbm93IHRvICBnZXQgdGhlIHNhbWUgYmVoYXZpb3Iu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Z2V0VmlzdWFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2Nyb2xsYmFy R3RrLmNwcDoKKyAgICAgICAgKFNjcm9sbGJhckd0azo6cGFpbnQpOgorICAgICAgICAqIHBsdWdp bnMvZ3RrL2d0azJ4dGJpbi5jOgorICAgICAgICAoZ3RrX3h0YmluX3NldF9wb3NpdGlvbik6CisK IDIwMTAtMDMtMTggIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1T Y3JlZW5HdGsuY3BwCmluZGV4IDkyY2NmZjQuLmM1ZmM1NWYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKQEAgLTU0LDcgKzU0LDExIEBAIHN0YXRpYyBHZGtW aXN1YWwqIGdldFZpc3VhbChXaWRnZXQqIHdpZGdldCkKICAgICBpZiAoIWNvbnRhaW5lcikKICAg ICAgICAgcmV0dXJuIDA7CiAKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOSwgMCkKKyAgICBp ZiAoIWd0a193aWRnZXRfZ2V0X3JlYWxpemVkKGNvbnRhaW5lcikpIHsKKyNlbHNlCiAgICAgaWYg KCFHVEtfV0lER0VUX1JFQUxJWkVEKGNvbnRhaW5lcikpIHsKKyNlbmRpZgogICAgICAgICBHdGtX aWRnZXQqIHRvcGxldmVsID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoY29udGFpbmVyKTsKICNp ZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKICAgICAgICAgaWYgKGd0a193aWRnZXRfaXNf dG9wbGV2ZWwodG9wbGV2ZWwpKQpAQCAtMTI2LDcgKzEzMCwxMSBAQCBGbG9hdFJlY3Qgc2NyZWVu QXZhaWxhYmxlUmVjdChXaWRnZXQqIHdpZGdldCkKICAgICBpZiAoIWNvbnRhaW5lcikKICAgICAg ICAgcmV0dXJuIEZsb2F0UmVjdCgpOwogCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTksIDAp CisgICAgaWYgKCFndGtfd2lkZ2V0X2dldF9yZWFsaXplZChjb250YWluZXIpKQorI2Vsc2UKICAg ICBpZiAoIUdUS19XSURHRVRfUkVBTElaRUQoY29udGFpbmVyKSkKKyNlbmRpZgogICAgICAgICBy ZXR1cm4gc2NyZWVuUmVjdCh3aWRnZXQpOwogCiAgICAgR2RrRHJhd2FibGUqIHJvb3RXaW5kb3cg PSBHREtfRFJBV0FCTEUoZ3RrX3dpZGdldF9nZXRfcm9vdF93aW5kb3coY29udGFpbmVyKSk7CmRp ZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyR3RrLmNwcAppbmRleCAwYzMwMzdhLi5kM2NkYzM5IDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAKQEAgLTIwOCw3ICsyMDgsMTMgQEAg dm9pZCBTY3JvbGxiYXJHdGs6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3Qg SW50UmVjdCYgcmVjdCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgR3RrV2lkZ2V0KiB3aWRnZXQg PSBwbGF0Zm9ybVdpZGdldCgpOworCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTksIDApCisg ICAgQVNTRVJUKCFndGtfd2lkZ2V0X2dldF9oYXNfd2luZG93KHdpZGdldCkpOworI2Vsc2UKICAg ICBBU1NFUlQoR1RLX1dJREdFVF9OT19XSU5ET1cod2lkZ2V0KSk7CisjZW5kaWYKKwogCiAgICAg R2RrRXZlbnQqIGV2ZW50ID0gZ2RrX2V2ZW50X25ldyhHREtfRVhQT1NFKTsKICAgICBldmVudC0+ ZXhwb3NlID0gKmNvbnRleHQtPmdka0V4cG9zZUV2ZW50KCk7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BsdWdpbnMvZ3RrL2d0azJ4dGJpbi5jIGIvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4u YwppbmRleCA2OGM1MzczLi5kOTVjZWVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsdWdpbnMvZ3Rr L2d0azJ4dGJpbi5jCisrKyBiL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMKQEAgLTQw MSw3ICs0MDEsMTEgQEAgZ3RrX3h0YmluX3NldF9wb3NpdGlvbiAoR3RrWHRCaW4gKnh0YmluLAog ICB4dGJpbi0+eCA9IHg7CiAgIHh0YmluLT55ID0geTsKIAorI2lmIEdUS19DSEVDS19WRVJTSU9O KDIsIDE5LCAwKQorICBpZiAoZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQgKHh0YmluKSkKKyNlbHNl CiAgIGlmIChHVEtfV0lER0VUX1JFQUxJWkVEICh4dGJpbikpCisjZW5kaWYKICAgICBnZGtfd2lu ZG93X21vdmUgKEdUS19XSURHRVQgKHh0YmluKS0+d2luZG93LCB4LCB5KTsKIH0KIApAQCAtNDU2 LDcgKzQ2MCwxMiBAQCBndGtfeHRiaW5fdW5yZWFsaXplIChHdGtXaWRnZXQgKm9iamVjdCkKICAg d2lkZ2V0ID0gR1RLX1dJREdFVChvYmplY3QpOwogCiAgIEdUS19XSURHRVRfVU5TRVRfRkxBR1Mg KHdpZGdldCwgR1RLX1ZJU0lCTEUpOworCisjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTksIDAp CisgIGlmIChndGtfd2lkZ2V0X2dldF9yZWFsaXplZCAod2lkZ2V0KSkgeworI2Vsc2UKICAgaWYg KEdUS19XSURHRVRfUkVBTElaRUQgKHdpZGdldCkpIHsKKyNlbmRpZgogICAgIHh0X2NsaWVudF91 bnJlYWxpemUoJih4dGJpbi0+eHRjbGllbnQpKTsKICAgfQogCmRpZmYgLS1naXQgYS9XZWJLaXQv Z3RrL0NoYW5nZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDQ1ODk3MTkuLjRkMWNl MDMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDMtMTkgIEhvbGdlciBIYW5zIFBldGVyIEZy ZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW0d0a10gRml4IHRoZSBkZWJ1ZyBidWlsZCBieSB1c2luZyBu b24gZGVwcmVjYXRlZCBzeW1ib2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zNjQwNAorCisgICAgICAgIEd0ayBoYXMgZGVwcmVjYXRlZCBHVEtfV0lE R0VUX1JFQUxJWkVEIGFuZCBHVEtfV0lER0VUX05PX1dJTkRPVworICAgICAgICBhbmQgbWV0aG9k cyBuZWVkcyB0byBiZSB1c2VkIG5vdyB0byAgZ2V0IHRoZSBzYW1lIGJlaGF2aW9yLgorCisgICAg ICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcDoKKwogMjAxMC0wMy0xOCAg UGhpbGlwIENoaW1lbnRvICA8cGhpbGlwLmNoaW1lbnRvQGdtYWlsLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hy b21lQ2xpZW50R3RrLmNwcAppbmRleCBjNjNhMDNiLi42YmI5Nzk5IDEwMDY0NAotLS0gYS9XZWJL aXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCkBAIC00MzksNyArNDM5LDExIEBA IHZvaWQgQ2hyb21lQ2xpZW50Ojpjb250ZW50c1NpemVDaGFuZ2VkKEZyYW1lKiBmcmFtZSwgY29u c3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKICAgICAvLyBXZSBuZWVkIHRvIHF1ZXVlIGEgcmVzaXpl IHJlcXVlc3Qgb25seSBpZiB0aGUgc2l6ZSBjaGFuZ2VkLAogICAgIC8vIG90aGVyd2lzZSB3ZSBn ZXQgaW50byBhbiBpbmZpbml0ZSBsb29wIQogICAgIEd0a1dpZGdldCogd2lkZ2V0ID0gR1RLX1dJ REdFVChtX3dlYlZpZXcpOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE5LCAwKQorICAgIGlm IChndGtfd2lkZ2V0X2dldF9yZWFsaXplZCh3aWRnZXQpCisjZWxzZQogICAgIGlmIChHVEtfV0lE R0VUX1JFQUxJWkVEKHdpZGdldCkKKyNlbmRpZgogICAgICAgICAmJiAod2lkZ2V0LT5yZXF1aXNp dGlvbi5oZWlnaHQgIT0gc2l6ZS5oZWlnaHQoKSkKICAgICAgICAgfHwgKHdpZGdldC0+cmVxdWlz aXRpb24ud2lkdGggIT0gc2l6ZS53aWR0aCgpKSkKICAgICAgICAgZ3RrX3dpZGdldF9xdWV1ZV9y ZXNpemVfbm9fcmVkcmF3KHdpZGdldCk7Ci0tIAoxLjcuMAoK