36398 2010-03-19 16:37:06 -0700 [GTK] Does not build with latest GTK+ development release 2010-03-23 06:25:19 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P2 Normal --- 1 gustavo webkit-unassigned gustavo webkit.review.bot xan.lopez zecke oldest_to_newest 202095 0 gustavo 2010-03-19 16:37:06 -0700 Latest development release deprecates a number of macros we use, such as GTK_WIDGET_REALIZED, and GTK_WIDGET_NO_WINDOW. We should have a nice way of handling this without causing too much churn. 202107 1 51206 gustavo 2010-03-19 17:01:45 -0700 Created attachment 51206 fix building with newest GTK+ Since deprecation is a growing trend in GTK+, for the 3.0 release, I thought we needed a more centralized, and nice solution, instead of adding churn everywhere. This is my proposed solution. 202109 2 webkit.review.bot 2010-03-19 17:03:28 -0700 Attachment 51206 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/plugins/gtk/gtk2xtbin.c:45: Found other header before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] 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:460: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:460: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 202111 3 webkit.review.bot 2010-03-19 17:07:52 -0700 Attachment 51206 did not build on gtk: Build output: http://webkit-commit-queue.appspot.com/results/1051019 202608 4 51310 gustavo 2010-03-22 10:58:58 -0700 Created attachment 51310 proposed fix This one actually builds with earlier GTK+ versions, and fixes the logical bug with using gtk_widget_has_window() pointed out by Holger. 202612 5 gustavo 2010-03-22 10:59:48 -0700 *** Bug 36404 has been marked as a duplicate of this bug. *** 202614 6 webkit.review.bot 2010-03-22 11:03:35 -0700 Attachment 51310 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/plugins/gtk/gtk2xtbin.c:45: Found other header before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] 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:460: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:460: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 11 files If any of these errors are false positives, please file a bug against check-webkit-style. 202645 7 webkit.review.bot 2010-03-22 11:40:26 -0700 Attachment 51310 did not build on gtk: Build output: http://webkit-commit-queue.appspot.com/results/1051108 202880 8 51381 gustavo 2010-03-22 18:48:58 -0700 Created attachment 51381 proposed fix I suck. Forgot to add the file in my new tree. 202881 9 webkit.review.bot 2010-03-22 18:51:26 -0700 Attachment 51381 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/plugins/gtk/gtk2xtbin.c:45: Found other header before WebCore config.h. Should be: config.h, primary header, blank line, and then alphabetically sorted. [build/include_order] [4] 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:460: Weird number of spaces at line-start. Are you using a 4-space indent? [whitespace/indent] [3] WebCore/plugins/gtk/gtk2xtbin.c:460: Extra space before ( in function call [whitespace/parens] [4] Total errors found: 4 in 12 files If any of these errors are false positives, please file a bug against check-webkit-style. 202967 10 51381 zecke 2010-03-23 01:35:05 -0700 Comment on attachment 51381 proposed fix Mostly fine, we will just ignore the style warning as we want to keep the mozilla code mergable. > - /* only paint widgets with NO_WINDOW this way */ > - if (!GTK_WIDGET_NO_WINDOW(platformWidget())) > + /* only paint widgets with no window this way */ > + if (!!gtk_widget_get_has_window(platformWidget())) > return; You can just remove the '!'?! 203004 11 gustavo 2010-03-23 05:35:30 -0700 (In reply to comment #10) > (From update of attachment 51381 [details]) > Mostly fine, we will just ignore the style warning as we want to keep the > mozilla code mergable. > > > > - /* only paint widgets with NO_WINDOW this way */ > > - if (!GTK_WIDGET_NO_WINDOW(platformWidget())) > > + /* only paint widgets with no window this way */ > > + if (!!gtk_widget_get_has_window(platformWidget())) > > return; > > You can just remove the '!'?! Search and replace fail =D 203017 12 51381 gustavo 2010-03-23 06:24:59 -0700 Comment on attachment 51381 proposed fix Landed as r56387. 51206 2010-03-19 17:01:45 -0700 2010-03-22 10:58:58 -0700 fix building with newest GTK+ 0001-Fix-building-with-newest-gtk.patch text/plain 17860 gustavo RnJvbSAxODdjODhiNjcwM2NlOWFhYTNjMzVlN2QwZWQ1Zjk5ZGVkZGZiNWUwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IEZyaSwgMTkgTWFyIDIwMTAgMjA6Mjg6MzQgLTAzMDAKU3ViamVjdDogW1BBVENIXSBG aXggYnVpbGRpbmcgd2l0aCBuZXdlc3QgZ3RrCgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjQgKysrKysrKysrKysrKysrKysKIFdlYkNvcmUv R05VbWFrZWZpbGUuYW0gICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDEgKwogV2ViQ29yZS9w bGF0Zm9ybS9ndGsvR3RrUGx1Z2luV2lkZ2V0LmNwcCAgICAgIHwgICAgOSArKystLS0KIFdlYkNv cmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaCAgICAgICAgICB8ICAgMzQgKysrKysrKysr KysrKysrKysrKysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsu Y3BwICAgIHwgICAxMyArKy0tLS0tLS0KIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0 ay5jcHAgICAgICAgICB8ICAgIDQgKy0KIFdlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMg ICAgICAgICAgICAgICB8ICAgIDUgKystCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAg ICAgICAgICAgICAgICAgfCAgIDI1ICsrKysrKysrKysrKysrKysrKwogV2ViS2l0L2d0ay9XZWJD b3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwIHwgICAxOSArLS0tLS0tLS0tLS0tCiBXZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcCAgICAgICAgICAgfCAgICA1ICstLS0KIFdl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcCAgICAgICAgICB8ICAgMTMgKy0tLS0t LS0tLQogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgICAgICAgICAgIHwgICAx MyArLS0tLS0tLS0tCiAxMiBmaWxlcyBjaGFuZ2VkLCAxMDIgaW5zZXJ0aW9ucygrKSwgNjMgZGVs ZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVy c2lvbmluZy5oCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCAzNzA5NzJiLi40ZmFjZjcwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxv ZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEwLTAzLTE5ICBH dXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNvLnVrPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIERv ZXMgbm90IGJ1aWxkIHdpdGggbGF0ZXN0IEdUSysgZGV2ZWxvcG1lbnQgcmVsZWFzZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzYzOTgKKworICAgICAg ICBGaXggYnVpbGRpbmcgd2l0aCBuZXdlc3QgR1RLKyB2ZXJzaW9ucy4KKworICAgICAgICAqIEdO VW1ha2VmaWxlLmFtOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtQbHVnaW5XaWRnZXQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6R3RrUGx1Z2luV2lkZ2V0OjppbnZhbGlkYXRlUmVjdCk6Cisg ICAgICAgIChXZWJDb3JlOjpHdGtQbHVnaW5XaWRnZXQ6OnBhaW50KToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsv UGxhdGZvcm1TY3JlZW5HdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0VmlzdWFsKToKKyAg ICAgICAgKFdlYkNvcmU6OnNjcmVlblJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6c2NyZWVuQXZh aWxhYmxlUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHA6Cisg ICAgICAgIChTY3JvbGxiYXJHdGs6OnBhaW50KToKKyAgICAgICAgKiBwbHVnaW5zL2d0ay9ndGsy eHRiaW4uYzoKKyAgICAgICAgKGd0a194dGJpbl9zZXRfcG9zaXRpb24pOgorICAgICAgICAoZ3Rr X3h0YmluX3VucmVhbGl6ZSk6CisKIDIwMTAtMDMtMTkgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBw bGUuY29tPgogCiAgICAgICAgIFdpbmRvd3MgY2xlYW4gYnVpbGQgZml4IGFmdGVyIHI1NjE5Mgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbSBiL1dlYkNvcmUvR05VbWFrZWZpbGUu YW0KaW5kZXggYWJkMTY0OC4uNjUzZDRhYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9HTlVtYWtlZmls ZS5hbQorKysgYi9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtCkBAIC0yMDUzLDYgKzIwNTMsNyBAQCB3 ZWJjb3JlZ3RrX3NvdXJjZXMgKz0gXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0dSZWZQdHJHdGsu aCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrUGx1Z2luV2lkZ2V0LmNwcCBcCiAJV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrUGx1Z2luV2lkZ2V0LmggXAorCVdlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1ZlcnNpb25pbmcuaCBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ndGsvS1VSTEd0ay5jcHAgXAog CVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0tleUV2ZW50R3RrLmNwcCBcCiAJV2ViQ29yZS9wbGF0Zm9y bS9ndGsvTGFuZ3VhZ2UuY3BwIFwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0 a1BsdWdpbldpZGdldC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtQbHVnaW5XaWRnZXQu Y3BwCmluZGV4IGJjMmRkOTIuLjlmODljZTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0d0a1BsdWdpbldpZGdldC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrUGx1 Z2luV2lkZ2V0LmNwcApAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1ZGUgIkd0a1BsdWdpbldpZGdl dC5oIgogCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCisjaW5jbHVkZSAiR3RrVmVyc2lv bmluZy5oIgogI2luY2x1ZGUgIlNjcm9sbFZpZXcuaCIKIAogI2luY2x1ZGUgPGd0ay9ndGsuaD4K QEAgLTQzLDcgKzQ0LDcgQEAgR3RrUGx1Z2luV2lkZ2V0OjpHdGtQbHVnaW5XaWRnZXQoR3RrV2lk Z2V0KiB3aWRnZXQpCiB2b2lkIEd0a1BsdWdpbldpZGdldDo6aW52YWxpZGF0ZVJlY3QoY29uc3Qg SW50UmVjdCYgX3JlY3QpCiB7CiAgICAgLyogbm8gbmVlZCB0byAqLwotICAgIGlmIChHVEtfV0lE R0VUX05PX1dJTkRPVyhwbGF0Zm9ybVdpZGdldCgpKSkKKyAgICBpZiAoZ3RrX3dpZGdldF9nZXRf aGFzX3dpbmRvdyhwbGF0Zm9ybVdpZGdldCgpKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgR2Rr V2luZG93KiB3aW5kb3cgPSBwbGF0Zm9ybVdpZGdldCgpLT53aW5kb3c7CkBAIC03MCwxMiArNzEs MTIgQEAgdm9pZCBHdGtQbHVnaW5XaWRnZXQ6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4 dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBpZiAoIWNvbnRleHQtPmdka0V4cG9zZUV2ZW50 KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8qIG9ubHkgcGFpbnQgd2lkZ2V0cyB3aXRoIE5P X1dJTkRPVyB0aGlzIHdheSAqLwotICAgIGlmICghR1RLX1dJREdFVF9OT19XSU5ET1cocGxhdGZv cm1XaWRnZXQoKSkpCisgICAgLyogb25seSBwYWludCB3aWRnZXRzIHdpdGggbm8gd2luZG93IHRo aXMgd2F5ICovCisgICAgaWYgKCFndGtfd2lkZ2V0X2dldF9oYXNfd2luZG93KHBsYXRmb3JtV2lk Z2V0KCkpKQogICAgICAgICByZXR1cm47CiAKICAgICBHdGtXaWRnZXQqIHdpZGdldCA9IHBsYXRm b3JtV2lkZ2V0KCk7Ci0gICAgQVNTRVJUKEdUS19XSURHRVRfTk9fV0lORE9XKHdpZGdldCkpOwor ICAgIEFTU0VSVChndGtfd2lkZ2V0X2dldF9oYXNfd2luZG93KHdpZGdldCkpOwogCiAgICAgR2Rr RXZlbnQqIGV2ZW50ID0gZ2RrX2V2ZW50X25ldyhHREtfRVhQT1NFKTsKICAgICBldmVudC0+ZXhw b3NlID0gKmNvbnRleHQtPmdka0V4cG9zZUV2ZW50KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJz aW9uaW5nLmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uODJiZmZhZQotLS0g L2Rldi9udWxsCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaApAQCAt MCwwICsxLDM0IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDEwIENvbGxhYm9yYSBMdGQuCisg KgorICogIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0 ZSBpdCBhbmQvb3IKKyAqICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGli cmFyeSBHZW5lcmFsIFB1YmxpYworICogIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVl IFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlcgorICogIHZlcnNpb24gMiBvZiB0aGUgTGljZW5z ZSwgb3IgKGF0IHlvdXIgb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKyAqCisgKiAgVGhpcyBs aWJyYXJ5IGlzIGRpc3RyaWJ1dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWws CisgKiAgYnV0IFdJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQg d2FycmFudHkgb2YKKyAqICBNRVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNV TEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQorICogIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMgTGlj ZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorICoKKyAqICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQg YSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgKiAgYWxv bmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwg d3JpdGUgdG8KKyAqICB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFu a2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICogIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNB LgorICovCisKKyNpZm5kZWYgR3RrVmVyc2lvbmluZ19oCisjZGVmaW5lIEd0a1ZlcnNpb25pbmdf aAorCisjaW5jbHVkZSA8Z3RrL2d0ay5oPgorCisvLyBNYWNyb3MgdG8gYXZvaWQgZGVwcmVjYXRp b24gY2hlY2tpbmcgY2h1cm4KKyNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCisjZGVm aW5lIGd0a193aWRnZXRfaXNfdG9wbGV2ZWwod2lkZ2V0KSBHVEtfV0lER0VUX1RPUExFVkVMKHdp ZGdldCkKKyNkZWZpbmUgZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQod2lkZ2V0KSBHVEtfV0lER0VU X1JFQUxJWkVEKHdpZGdldCkKKyNkZWZpbmUgZ3RrX3dpZGdldF9nZXRfaGFzX3dpbmRvdyh3aWRn ZXQpIEdUS19XSURHRVRfTk9fV0lORE9XKHdpZGdldCkKKyNkZWZpbmUgZ3RrX3dpZGdldF9nZXRf Y2FuX2ZvY3VzKHdpZGdldCkgR1RLX1dJREdFVF9DQU5fRk9DVVMod2lkZ2V0KQorI2RlZmluZSBn dGtfd2lkZ2V0X2lzX3NlbnNpdGl2ZSh3aWRnZXQpIEdUS19XSURHRVRfSVNfU0VOU0lUSVZFKHdp ZGdldCkKKyNlbmRpZiAvLyBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKKworI2VuZGlmIC8v IEd0a1ZlcnNpb25pbmdfaApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZv cm1TY3JlZW5HdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsu Y3BwCmluZGV4IDkyY2NmZjQuLjkzNDE3MTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0 Zm9ybVNjcmVlbkd0ay5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIK ICNpbmNsdWRlICJQbGF0Zm9ybVNjcmVlbi5oIgogCisjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5o IgogI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKICNpbmNsdWRlICJTY3JvbGxWaWV3LmgiCiAjaW5j bHVkZSAiV2lkZ2V0LmgiCkBAIC01NCwxMyArNTUsOSBAQCBzdGF0aWMgR2RrVmlzdWFsKiBnZXRW aXN1YWwoV2lkZ2V0KiB3aWRnZXQpCiAgICAgaWYgKCFjb250YWluZXIpCiAgICAgICAgIHJldHVy biAwOwogCi0gICAgaWYgKCFHVEtfV0lER0VUX1JFQUxJWkVEKGNvbnRhaW5lcikpIHsKKyAgICBp ZiAoIWd0a193aWRnZXRfZ2V0X3JlYWxpemVkKGNvbnRhaW5lcikpIHsKICAgICAgICAgR3RrV2lk Z2V0KiB0b3BsZXZlbCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKGNvbnRhaW5lcik7Ci0jaWYg R1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCiAgICAgICAgIGlmIChndGtfd2lkZ2V0X2lzX3Rv cGxldmVsKHRvcGxldmVsKSkKLSNlbHNlCi0gICAgICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVM KHRvcGxldmVsKSkKLSNlbmRpZgogICAgICAgICAgICAgY29udGFpbmVyID0gdG9wbGV2ZWw7CiAg ICAgICAgIGVsc2UKICAgICAgICAgICAgIHJldHVybiAwOwpAQCAtOTgsMTEgKzk1LDcgQEAgRmxv YXRSZWN0IHNjcmVlblJlY3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgICAgIHJldHVybiBGbG9hdFJl Y3QoKTsKIAogICAgIEd0a1dpZGdldCogY29udGFpbmVyID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2 ZWwoR1RLX1dJREdFVCh3aWRnZXQtPnJvb3QoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VD bGllbnQoKSkpOwotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQogICAgIGlmICghZ3Rr X3dpZGdldF9pc190b3BsZXZlbChjb250YWluZXIpKQotI2Vsc2UKLSAgICBpZiAoIUdUS19XSURH RVRfVE9QTEVWRUwoY29udGFpbmVyKSkKLSNlbmRpZgogICAgICAgICByZXR1cm4gRmxvYXRSZWN0 KCk7CiAKICAgICBHZGtTY3JlZW4qIHNjcmVlbiA9IGd0a193aWRnZXRfaGFzX3NjcmVlbihjb250 YWluZXIpID8gZ3RrX3dpZGdldF9nZXRfc2NyZWVuKGNvbnRhaW5lcikgOiBnZGtfc2NyZWVuX2dl dF9kZWZhdWx0KCk7CkBAIC0xMjYsNyArMTE5LDcgQEAgRmxvYXRSZWN0IHNjcmVlbkF2YWlsYWJs ZVJlY3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgaWYgKCFjb250YWluZXIpCiAgICAgICAgIHJldHVy biBGbG9hdFJlY3QoKTsKIAotICAgIGlmICghR1RLX1dJREdFVF9SRUFMSVpFRChjb250YWluZXIp KQorICAgIGlmICghZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQoY29udGFpbmVyKSkKICAgICAgICAg cmV0dXJuIHNjcmVlblJlY3Qod2lkZ2V0KTsKIAogICAgIEdka0RyYXdhYmxlKiByb290V2luZG93 ID0gR0RLX0RSQVdBQkxFKGd0a193aWRnZXRfZ2V0X3Jvb3Rfd2luZG93KGNvbnRhaW5lcikpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyR3RrLmNwcCBiL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAKaW5kZXggMGMzMDM3YS4uM2M5OGNjNSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyR3RrLmNwcAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3BwCkBAIC0xOTYsNyArMTk2LDcgQEAg dm9pZCBTY3JvbGxiYXJHdGs6OnNldEVuYWJsZWQoYm9vbCBzaG91bGRFbmFibGUpCiAvKgogICog U3RyYXRlZ3kgdG8gcGFpbnRpbmcgYSBXaWRnZXQ6CiAgKiAgMS4pIGRvIG5vdCBwYWludCBpZiB0 aGVyZSBpcyBubyBHdGtXaWRnZXQgc2V0Ci0gKiAgMi4pIFdlIGFzc3VtZSB0aGF0IEdUS19OT19X SU5ET1cgaXMgc2V0IGFuZCB0aGF0IGZyYW1lUmVjdHNDaGFuZ2VkIHBvc2l0aW9uZWQKKyAqICAy LikgV2UgYXNzdW1lIHRoYXQgdGhlIHdpZGdldCBoYXMgbm8gd2luZG93IGFuZCB0aGF0IGZyYW1l UmVjdHNDaGFuZ2VkIHBvc2l0aW9uZWQKICAqICAgICAgdGhlIHdpZGdldCBjb3JyZWN0bHkuIEFU TSB3ZSBkbyBub3QgaG9ub3IgdGhlIEdyYXBoaWNzQ29udGV4dCB0cmFuc2xhdGlvbi4KICAqLwog dm9pZCBTY3JvbGxiYXJHdGs6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3Qg SW50UmVjdCYgcmVjdCkKQEAgLTIwOCw3ICsyMDgsNyBAQCB2b2lkIFNjcm9sbGJhckd0azo6cGFp bnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAgICAg ICByZXR1cm47CiAKICAgICBHdGtXaWRnZXQqIHdpZGdldCA9IHBsYXRmb3JtV2lkZ2V0KCk7Ci0g ICAgQVNTRVJUKEdUS19XSURHRVRfTk9fV0lORE9XKHdpZGdldCkpOworICAgIEFTU0VSVChndGtf d2lkZ2V0X2dldF9oYXNfd2luZG93KHdpZGdldCkpOwogCiAgICAgR2RrRXZlbnQqIGV2ZW50ID0g Z2RrX2V2ZW50X25ldyhHREtfRVhQT1NFKTsKICAgICBldmVudC0+ZXhwb3NlID0gKmNvbnRleHQt Pmdka0V4cG9zZUV2ZW50KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsdWdpbnMvZ3RrL2d0azJ4 dGJpbi5jIGIvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYwppbmRleCA2OGM1MzczLi5m YWQ2NmZlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsdWdpbnMvZ3RrL2d0azJ4dGJpbi5jCisrKyBi L1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMKQEAgLTQyLDYgKzQyLDcgQEAKICAqIGlu c2lkZSBhIEdUSyBhcHBsaWNhdGlvbi4gIAogICovCiAKKyNpbmNsdWRlICJHdGtWZXJzaW9uaW5n LmgiCiAjaW5jbHVkZSAieGVtYmVkLmgiCiAjaW5jbHVkZSAiZ3RrMnh0YmluLmgiCiAjaW5jbHVk ZSA8Z3RrL2d0ay5oPgpAQCAtNDAxLDcgKzQwMiw3IEBAIGd0a194dGJpbl9zZXRfcG9zaXRpb24g KEd0a1h0QmluICp4dGJpbiwKICAgeHRiaW4tPnggPSB4OwogICB4dGJpbi0+eSA9IHk7CiAKLSAg aWYgKEdUS19XSURHRVRfUkVBTElaRUQgKHh0YmluKSkKKyAgaWYgKGd0a193aWRnZXRfZ2V0X3Jl YWxpemVkICh4dGJpbikpCiAgICAgZ2RrX3dpbmRvd19tb3ZlIChHVEtfV0lER0VUICh4dGJpbikt PndpbmRvdywgeCwgeSk7CiB9CiAKQEAgLTQ1Niw3ICs0NTcsNyBAQCBndGtfeHRiaW5fdW5yZWFs aXplIChHdGtXaWRnZXQgKm9iamVjdCkKICAgd2lkZ2V0ID0gR1RLX1dJREdFVChvYmplY3QpOwog CiAgIEdUS19XSURHRVRfVU5TRVRfRkxBR1MgKHdpZGdldCwgR1RLX1ZJU0lCTEUpOwotICBpZiAo R1RLX1dJREdFVF9SRUFMSVpFRCAod2lkZ2V0KSkgeworICBpZiAoZ3RrX3dpZGdldF9nZXRfcmVh bGl6ZWQgKHdpZGdldCkpIHsKICAgICB4dF9jbGllbnRfdW5yZWFsaXplKCYoeHRiaW4tPnh0Y2xp ZW50KSk7CiAgIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCA0NTg5NzE5Li43YzYwMDk5IDEwMDY0NAotLS0gYS9XZWJLaXQv Z3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBA CisyMDEwLTAzLTE5ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29s bGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtHVEtdIERvZXMgbm90IGJ1aWxkIHdpdGggbGF0ZXN0IEdUSysgZGV2ZWxvcG1lbnQg cmVsZWFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzYzOTgKKworICAgICAgICBGaXggYnVpbGRpbmcgd2l0aCBuZXdlc3QgR1RLKyB2ZXJzaW9ucy4K KworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHA6CisgICAgICAg IChXZWJLaXQ6OkNocm9tZUNsaWVudDo6d2luZG93UmVjdCk6CisgICAgICAgIChXZWJLaXQ6OkNo cm9tZUNsaWVudDo6c2V0V2luZG93UmVjdCk6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVu dDo6dW5mb2N1cyk6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6Y2FuVGFrZUZvY3Vz KToKKyAgICAgICAgKFdlYktpdDo6Q2hyb21lQ2xpZW50Ojpjb250ZW50c1NpemVDaGFuZ2VkKToK KyAgICAgICAgKiB3ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHA6CisgICAgICAgIChjdXJyZW50VG9w bGV2ZWxDYWxsYmFjayk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcDoKKyAg ICAgICAgKHdlYmtpdF93ZWJfZnJhbWVfcHJpbnRfZnVsbCk6CisgICAgICAgICh3ZWJraXRfd2Vi X2ZyYW1lX3ByaW50KToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAg ICAgICh3ZWJraXRfd2ViX3ZpZXdfZ3JhYl9mb2N1cyk6CisgICAgICAgICh3ZWJraXRfd2ViX3Zp ZXdfZm9jdXNfaW5fZXZlbnQpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X3NjcmlwdF9kaWFs b2cpOgorCiAyMDEwLTAzLTE4ICBQaGlsaXAgQ2hpbWVudG8gIDxwaGlsaXAuY2hpbWVudG9AZ21h aWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpkaWZmIC0tZ2l0IGEv V2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwIGIvV2ViS2l0L2d0 ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCmluZGV4IGM2M2EwM2IuLjg3Yzc2 NmYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3Rr LmNwcAorKysgYi9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAK QEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJGaWxlQ2hvb3Nlci5oIgogI2luY2x1ZGUgIkZs b2F0UmVjdC5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZFJlcXVlc3QuaCIKKyNpbmNsdWRlICJHdGtW ZXJzaW9uaW5nLmgiCiAjaW5jbHVkZSAiSW50UmVjdC5oIgogI2luY2x1ZGUgIlBsYXRmb3JtU3Ry aW5nLmgiCiAjaW5jbHVkZSAiQ1N0cmluZy5oIgpAQCAtNjUsMTEgKzY2LDcgQEAgdm9pZCBDaHJv bWVDbGllbnQ6OmNocm9tZURlc3Ryb3llZCgpCiBGbG9hdFJlY3QgQ2hyb21lQ2xpZW50Ojp3aW5k b3dSZWN0KCkKIHsKICAgICBHdGtXaWRnZXQqIHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3RvcGxl dmVsKEdUS19XSURHRVQobV93ZWJWaWV3KSk7Ci0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgs IDApCiAgICAgaWYgKGd0a193aWRnZXRfaXNfdG9wbGV2ZWwod2luZG93KSkgewotI2Vsc2UKLSAg ICBpZiAoR1RLX1dJREdFVF9UT1BMRVZFTCh3aW5kb3cpKSB7Ci0jZW5kaWYKICAgICAgICAgZ2lu dCBsZWZ0LCB0b3AsIHdpZHRoLCBoZWlnaHQ7CiAgICAgICAgIGd0a193aW5kb3dfZ2V0X3Bvc2l0 aW9uKEdUS19XSU5ET1cod2luZG93KSwgJmxlZnQsICZ0b3ApOwogICAgICAgICBndGtfd2luZG93 X2dldF9zaXplKEdUS19XSU5ET1cod2luZG93KSwgJndpZHRoLCAmaGVpZ2h0KTsKQEAgLTk4LDEx ICs5NSw3IEBAIHZvaWQgQ2hyb21lQ2xpZW50OjpzZXRXaW5kb3dSZWN0KGNvbnN0IEZsb2F0UmVj dCYgcmVjdCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtf d2lkZ2V0X2dldF90b3BsZXZlbChHVEtfV0lER0VUKG1fd2ViVmlldykpOwotI2lmIEdUS19DSEVD S19WRVJTSU9OKDIsIDE4LCAwKQogICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRv dykpIHsKLSNlbHNlCi0gICAgaWYgKEdUS19XSURHRVRfVE9QTEVWRUwod2luZG93KSkgewotI2Vu ZGlmCiAgICAgICAgIGd0a193aW5kb3dfbW92ZShHVEtfV0lORE9XKHdpbmRvdyksIGludHJlY3Qu eCgpLCBpbnRyZWN0LnkoKSk7CiAgICAgICAgIGd0a193aW5kb3dfcmVzaXplKEdUS19XSU5ET1co d2luZG93KSwgaW50cmVjdC53aWR0aCgpLCBpbnRyZWN0LmhlaWdodCgpKTsKICAgICB9CkBAIC0x MjgsMTEgKzEyMSw3IEBAIHZvaWQgQ2hyb21lQ2xpZW50Ojpmb2N1cygpCiB2b2lkIENocm9tZUNs aWVudDo6dW5mb2N1cygpCiB7CiAgICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0X2dl dF90b3BsZXZlbChHVEtfV0lER0VUKG1fd2ViVmlldykpOwotI2lmIEdUS19DSEVDS19WRVJTSU9O KDIsIDE4LCAwKQogICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRvdykpCi0jZWxz ZQotICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHdpbmRvdykpCi0jZW5kaWYKICAgICAgICAg Z3RrX3dpbmRvd19zZXRfZm9jdXMoR1RLX1dJTkRPVyh3aW5kb3cpLCBOVUxMKTsKIH0KIApAQCAt MjYwLDExICsyNDksNyBAQCB2b2lkIENocm9tZUNsaWVudDo6Y2xvc2VXaW5kb3dTb29uKCkKIAog Ym9vbCBDaHJvbWVDbGllbnQ6OmNhblRha2VGb2N1cyhGb2N1c0RpcmVjdGlvbikKIHsKLSNpZiBH VEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKICAgICByZXR1cm4gZ3RrX3dpZGdldF9nZXRfY2Fu X2ZvY3VzKEdUS19XSURHRVQobV93ZWJWaWV3KSk7Ci0jZWxzZQotICAgIHJldHVybiBHVEtfV0lE R0VUX0NBTl9GT0NVUyhtX3dlYlZpZXcpOwotI2VuZGlmCiB9CiAKIHZvaWQgQ2hyb21lQ2xpZW50 Ojp0YWtlRm9jdXMoRm9jdXNEaXJlY3Rpb24pCkBAIC00MzksNyArNDI0LDcgQEAgdm9pZCBDaHJv bWVDbGllbnQ6OmNvbnRlbnRzU2l6ZUNoYW5nZWQoRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRTaXpl JiBzaXplKSBjb25zdAogICAgIC8vIFdlIG5lZWQgdG8gcXVldWUgYSByZXNpemUgcmVxdWVzdCBv bmx5IGlmIHRoZSBzaXplIGNoYW5nZWQsCiAgICAgLy8gb3RoZXJ3aXNlIHdlIGdldCBpbnRvIGFu IGluZmluaXRlIGxvb3AhCiAgICAgR3RrV2lkZ2V0KiB3aWRnZXQgPSBHVEtfV0lER0VUKG1fd2Vi Vmlldyk7Ci0gICAgaWYgKEdUS19XSURHRVRfUkVBTElaRUQod2lkZ2V0KQorICAgIGlmIChndGtf d2lkZ2V0X2dldF9yZWFsaXplZCh3aWRnZXQpCiAgICAgICAgICYmICh3aWRnZXQtPnJlcXVpc2l0 aW9uLmhlaWdodCAhPSBzaXplLmhlaWdodCgpKQogICAgICAgICB8fCAod2lkZ2V0LT5yZXF1aXNp dGlvbi53aWR0aCAhPSBzaXplLndpZHRoKCkpKQogICAgICAgICBndGtfd2lkZ2V0X3F1ZXVlX3Jl c2l6ZV9ub19yZWRyYXcod2lkZ2V0KTsKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHByaXZhdGUuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAKaW5k ZXggYmU4OGJiNS4uNDQ1MDUxYiAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0 cHJpdmF0ZS5jcHAKKysrIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAKQEAg LTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVy LmgiCiAjaW5jbHVkZSAiRnJhbWVMb2FkZXJDbGllbnRHdGsuaCIKKyNpbmNsdWRlICJHdGtWZXJz aW9uaW5nLmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3VsdC5oIgogI2luY2x1ZGUgIkljb25EYXRh YmFzZS5oIgogI2luY2x1ZGUgPGxpYmludGwuaD4KQEAgLTIyMywxMSArMjI0LDcgQEAgc3RhdGlj IEd0a1dpZGdldCogY3VycmVudFRvcGxldmVsQ2FsbGJhY2soV2ViS2l0U291cEF1dGhEaWFsb2cq IGZlYXR1cmUsIFNvdXBNZXMKICAgICAgICAgcmV0dXJuIE5VTEw7CiAKICAgICBHdGtXaWRnZXQq IHRvcGxldmVsID0gIGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKEdUS19XSURHRVQoZnJhbWUtPnBh Z2UoKS0+Y2hyb21lKCktPnBsYXRmb3JtUGFnZUNsaWVudCgpKSk7Ci0jaWYgR1RLX0NIRUNLX1ZF UlNJT04oMiwgMTgsIDApCiAgICAgaWYgKGd0a193aWRnZXRfaXNfdG9wbGV2ZWwodG9wbGV2ZWwp KQotI2Vsc2UKLSAgICBpZiAoR1RLX1dJREdFVF9UT1BMRVZFTCh0b3BsZXZlbCkpCi0jZW5kaWYK ICAgICAgICAgcmV0dXJuIHRvcGxldmVsOwogICAgIGVsc2UKICAgICAgICAgcmV0dXJuIE5VTEw7 CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAgYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAKaW5kZXggOTg3NmMxYS4uZTQ0MWMyYSAx MDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwCisrKyBiL1dl YktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcApAQCAtNDUsNiArNDUsNyBAQAogI2lu Y2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+CiAjaW5jbHVkZSAiR0NDb250cm9sbGVyLmgiCiAjaW5j bHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCisjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5oIgogI2lu Y2x1ZGUgIkhUTUxGcmFtZU93bmVyRWxlbWVudC5oIgogI2luY2x1ZGUgIkpTRE9NV2luZG93Lmgi CiAjaW5jbHVkZSAiSlNMb2NrLmgiCkBAIC05NTYsMTEgKzk1Nyw3IEBAIEd0a1ByaW50T3BlcmF0 aW9uUmVzdWx0IHdlYmtpdF93ZWJfZnJhbWVfcHJpbnRfZnVsbChXZWJLaXRXZWJGcmFtZSogZnJh bWUsIEd0a1ByCiAKICAgICBHdGtXaWRnZXQqIHRvcExldmVsID0gZ3RrX3dpZGdldF9nZXRfdG9w bGV2ZWwoR1RLX1dJREdFVCh3ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJfdmlldyhmcmFtZSkpKTsK IAotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQogICAgIGlmICghZ3RrX3dpZGdldF9p c190b3BsZXZlbCh0b3BMZXZlbCkpCi0jZWxzZQotICAgIGlmICghR1RLX1dJREdFVF9UT1BMRVZF TCh0b3BMZXZlbCkpCi0jZW5kaWYKICAgICAgICAgdG9wTGV2ZWwgPSBOVUxMOwogCiAgICAgRnJh bWUqIGNvcmVGcmFtZSA9IGNvcmUoZnJhbWUpOwpAQCAtOTk5LDE5ICs5OTYsMTEgQEAgdm9pZCB3 ZWJraXRfd2ViX2ZyYW1lX3ByaW50KFdlYktpdFdlYkZyYW1lKiBmcmFtZSkKIAogICAgIGlmIChl cnJvcikgewogICAgICAgICBHdGtXaWRnZXQqIHdpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3RvcGxl dmVsKEdUS19XSURHRVQocHJpdi0+d2ViVmlldykpOwotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIs IDE4LCAwKQogICAgICAgICBHdGtXaWRnZXQqIGRpYWxvZyA9IGd0a19tZXNzYWdlX2RpYWxvZ19u ZXcoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3aW5kb3cpID8gR1RLX1dJTkRPVyh3aW5kb3cpIDog MCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdU S19ESUFMT0dfREVTVFJPWV9XSVRIX1BBUkVOVCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19NRVNTQUdFX0VSUk9SLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1RLX0JVVFRPTlNfQ0xPU0Us CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiJXMi LCBlcnJvci0+bWVzc2FnZSk7Ci0jZWxzZQotICAgICAgICBHdGtXaWRnZXQqIGRpYWxvZyA9IGd0 a19tZXNzYWdlX2RpYWxvZ19uZXcoR1RLX1dJREdFVF9UT1BMRVZFTCh3aW5kb3cpID8gR1RLX1dJ TkRPVyh3aW5kb3cpIDogMCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIEdUS19ESUFMT0dfREVTVFJPWV9XSVRIX1BBUkVOVCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19NRVNTQUdFX0VSUk9S LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR1RL X0JVVFRPTlNfQ0xPU0UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiJXMiLCBlcnJvci0+bWVzc2FnZSk7Ci0jZW5kaWYKIAogICAgICAgICBnX2Vy cm9yX2ZyZWUoZXJyb3IpOwogCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IGQ4 ZTg1NGIuLmI5ZmQyODMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC02NCw2 ICs2NCw3IEBACiAjaW5jbHVkZSA8Z2xpYi9naTE4bi1saWIuaD4KICNpbmNsdWRlIDxHT3duUHRy Lmg+CiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCisjaW5jbHVkZSAiR3RrVmVyc2lvbmlu Zy5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiSGl0VGVzdFJlc3Vs dC5oIgogI2luY2x1ZGUgIkljb25EYXRhYmFzZS5oIgpAQCAtNjk2LDExICs2OTcsNyBAQCBzdGF0 aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2l6ZV9hbGxvY2F0ZShHdGtXaWRnZXQqIHdpZGdldCwg R3RrQWxsb2NhdGlvbiogYWxsbwogc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2dyYWJfZm9j dXMoR3RrV2lkZ2V0KiB3aWRnZXQpCiB7CiAKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwg MCkKICAgICBpZiAoZ3RrX3dpZGdldF9pc19zZW5zaXRpdmUod2lkZ2V0KSkgewotI2Vsc2UKLSAg ICBpZiAoR1RLX1dJREdFVF9JU19TRU5TSVRJVkUod2lkZ2V0KSkgewotI2VuZGlmCiAgICAgICAg IFdlYktpdFdlYlZpZXcqIHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2lkZ2V0KTsKICAgICAg ICAgRm9jdXNDb250cm9sbGVyKiBmb2N1c0NvbnRyb2xsZXIgPSBjb3JlKHdlYlZpZXcpLT5mb2N1 c0NvbnRyb2xsZXIoKTsKIApAQCAtNzIwLDExICs3MTcsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Vi a2l0X3dlYl92aWV3X2ZvY3VzX2luX2V2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEZv Y3VzKgogICAgIC8vIFRPRE86IEltcHJvdmUgZm9jdXMgaGFuZGxpbmcgYXMgc3VnZ2VzdGVkIGlu CiAgICAgLy8gaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5MTAKICAg ICBHdGtXaWRnZXQqIHRvcGxldmVsID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwod2lkZ2V0KTsK LSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKICAgICBpZiAoZ3RrX3dpZGdldF9pc190 b3BsZXZlbCh0b3BsZXZlbCkgJiYgZ3RrX3dpbmRvd19oYXNfdG9wbGV2ZWxfZm9jdXMoR1RLX1dJ TkRPVyh0b3BsZXZlbCkpKSB7Ci0jZWxzZQotICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHRv cGxldmVsKSAmJiBndGtfd2luZG93X2hhc190b3BsZXZlbF9mb2N1cyhHVEtfV0lORE9XKHRvcGxl dmVsKSkpIHsKLSNlbmRpZgogICAgICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lU X1dFQl9WSUVXKHdpZGdldCk7CiAgICAgICAgIEZvY3VzQ29udHJvbGxlciogZm9jdXNDb250cm9s bGVyID0gY29yZSh3ZWJWaWV3KS0+Zm9jdXNDb250cm9sbGVyKCk7CiAKQEAgLTkyMywxMSArOTE2 LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19zY3JpcHRfZGlhbG9nKFdlYktp dFdlYlZpZXcqIHdlYlZpZXcsIFdlYktpdFdlYkYKICAgICB9CiAKICAgICB3aW5kb3cgPSBndGtf d2lkZ2V0X2dldF90b3BsZXZlbChHVEtfV0lER0VUKHdlYlZpZXcpKTsKLSNpZiBHVEtfQ0hFQ0tf VkVSU0lPTigyLCAxOCwgMCkKICAgICBkaWFsb2cgPSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KGd0 a193aWRnZXRfaXNfdG9wbGV2ZWwod2luZG93KSA/IEdUS19XSU5ET1cod2luZG93KSA6IDAsIEdU S19ESUFMT0dfREVTVFJPWV9XSVRIX1BBUkVOVCwgbWVzc2FnZVR5cGUsIGJ1dHRvbnMsICIlcyIs IG1lc3NhZ2UpOwotI2Vsc2UKLSAgICBkaWFsb2cgPSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KEdU S19XSURHRVRfVE9QTEVWRUwod2luZG93KSA/IEdUS19XSU5ET1cod2luZG93KSA6IDAsIEdUS19E SUFMT0dfREVTVFJPWV9XSVRIX1BBUkVOVCwgbWVzc2FnZVR5cGUsIGJ1dHRvbnMsICIlcyIsIG1l c3NhZ2UpOwotI2VuZGlmCiAgICAgZ2NoYXIqIHRpdGxlID0gZ19zdHJjb25jYXQoIkphdmFTY3Jp cHQgLSAiLCB3ZWJraXRfd2ViX2ZyYW1lX2dldF91cmkoZnJhbWUpLCBOVUxMKTsKICAgICBndGtf d2luZG93X3NldF90aXRsZShHVEtfV0lORE9XKGRpYWxvZyksIHRpdGxlKTsKICAgICBnX2ZyZWUo dGl0bGUpOwotLSAKMS43LjAKCg== 51310 2010-03-22 10:58:58 -0700 2010-03-22 18:48:58 -0700 proposed fix 0001-Fix-building-with-newer-GTK.patch text/plain 16127 gustavo RnJvbSBlZDY1NTdjNjRjOGM2ZDFiN2NkM2IyZDU3ZWYyNzI3Yjc0YmVhMTRjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IE1vbiwgMjIgTWFyIDIwMTAgMTQ6NTE6NDIgLTAzMDAKU3ViamVjdDogW1BBVENIXSBG aXggYnVpbGRpbmcgd2l0aCBuZXdlciBHVEsrLgoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI0ICsrKysrKysrKysrKysrKysrKysrKysrKwog V2ViQ29yZS9HTlVtYWtlZmlsZS5hbSAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgMSArCiBX ZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtQbHVnaW5XaWRnZXQuY3BwICAgICAgfCAgICA5ICsrKysr LS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwICAgIHwgICAx MyArKystLS0tLS0tLS0tCiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3BwICAg ICAgICAgfCAgICA0ICsrLS0KIFdlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMgICAgICAg ICAgICAgICB8ICAgIDUgKysrLS0KIFdlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMjUgKysrKysrKysrKysrKysrKysrKysrKysrKwogV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwIHwgICAxOSArKy0tLS0tLS0tLS0tLS0t LS0tCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcCAgICAgICAgICAgfCAgICA1 ICstLS0tCiBXZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAgICAgICAgICAgfCAg IDEzICstLS0tLS0tLS0tLS0KIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwICAg ICAgICAgICB8ICAgMTMgKy0tLS0tLS0tLS0tLQogMTEgZmlsZXMgY2hhbmdlZCwgNjggaW5zZXJ0 aW9ucygrKSwgNjMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NGI2YjBmLi4xOGZlNmFkIDEwMDY0NAotLS0gYS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBA CisyMDEwLTAzLTIyICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29s bGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtHVEtdIERvZXMgbm90IGJ1aWxkIHdpdGggbGF0ZXN0IEdUSysgZGV2ZWxvcG1lbnQg cmVsZWFzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzYzOTgKKworICAgICAgICBGaXggYnVpbGRpbmcgd2l0aCBuZXdlc3QgR1RLKyB2ZXJzaW9ucy4K KworICAgICAgICAqIEdOVW1ha2VmaWxlLmFtOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtQ bHVnaW5XaWRnZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3RrUGx1Z2luV2lkZ2V0OjppbnZh bGlkYXRlUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpHdGtQbHVnaW5XaWRnZXQ6OnBhaW50KToK KyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oOiBBZGRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Z2V0VmlzdWFsKToKKyAgICAgICAgKFdlYkNvcmU6OnNjcmVlblJlY3QpOgorICAgICAgICAoV2Vi Q29yZTo6c2NyZWVuQXZhaWxhYmxlUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Njcm9s bGJhckd0ay5jcHA6CisgICAgICAgIChTY3JvbGxiYXJHdGs6OnBhaW50KToKKyAgICAgICAgKiBw bHVnaW5zL2d0ay9ndGsyeHRiaW4uYzoKKyAgICAgICAgKGd0a194dGJpbl9zZXRfcG9zaXRpb24p OgorICAgICAgICAoZ3RrX3h0YmluX3VucmVhbGl6ZSk6CisKIDIwMTAtMDMtMjIgIFl1cnkgU2Vt aWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2 ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0gYi9XZWJDb3Jl L0dOVW1ha2VmaWxlLmFtCmluZGV4IGFiZDE2NDguLjY1M2Q0YWIgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvR05VbWFrZWZpbGUuYW0KKysrIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5hbQpAQCAtMjA1Myw2 ICsyMDUzLDcgQEAgd2ViY29yZWd0a19zb3VyY2VzICs9IFwKIAlXZWJDb3JlL3BsYXRmb3JtL2d0 ay9HUmVmUHRyR3RrLmggXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1BsdWdpbldpZGdldC5j cHAgXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1BsdWdpbldpZGdldC5oIFwKKwlXZWJDb3Jl L3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggXAogCVdlYkNvcmUvcGxhdGZvcm0vZ3RrL0tV UkxHdGsuY3BwIFwKIAlXZWJDb3JlL3BsYXRmb3JtL2d0ay9LZXlFdmVudEd0ay5jcHAgXAogCVdl YkNvcmUvcGxhdGZvcm0vZ3RrL0xhbmd1YWdlLmNwcCBcCmRpZmYgLS1naXQgYS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtQbHVnaW5XaWRnZXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3Rr UGx1Z2luV2lkZ2V0LmNwcAppbmRleCBiYzJkZDkyLi5jM2ZhMTZkIDEwMDY0NAotLS0gYS9XZWJD b3JlL3BsYXRmb3JtL2d0ay9HdGtQbHVnaW5XaWRnZXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0d0a1BsdWdpbldpZGdldC5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKICNpbmNsdWRlICJH dGtQbHVnaW5XaWRnZXQuaCIKIAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgorI2luY2x1 ZGUgIkd0a1ZlcnNpb25pbmcuaCIKICNpbmNsdWRlICJTY3JvbGxWaWV3LmgiCiAKICNpbmNsdWRl IDxndGsvZ3RrLmg+CkBAIC00Myw3ICs0NCw3IEBAIEd0a1BsdWdpbldpZGdldDo6R3RrUGx1Z2lu V2lkZ2V0KEd0a1dpZGdldCogd2lkZ2V0KQogdm9pZCBHdGtQbHVnaW5XaWRnZXQ6OmludmFsaWRh dGVSZWN0KGNvbnN0IEludFJlY3QmIF9yZWN0KQogewogICAgIC8qIG5vIG5lZWQgdG8gKi8KLSAg ICBpZiAoR1RLX1dJREdFVF9OT19XSU5ET1cocGxhdGZvcm1XaWRnZXQoKSkpCisgICAgaWYgKCFn dGtfd2lkZ2V0X2dldF9oYXNfd2luZG93KHBsYXRmb3JtV2lkZ2V0KCkpKQogICAgICAgICByZXR1 cm47CiAKICAgICBHZGtXaW5kb3cqIHdpbmRvdyA9IHBsYXRmb3JtV2lkZ2V0KCktPndpbmRvdzsK QEAgLTcwLDEyICs3MSwxMiBAQCB2b2lkIEd0a1BsdWdpbldpZGdldDo6cGFpbnQoR3JhcGhpY3ND b250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAgIGlmICghY29udGV4dC0+ Z2RrRXhwb3NlRXZlbnQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLyogb25seSBwYWludCB3 aWRnZXRzIHdpdGggTk9fV0lORE9XIHRoaXMgd2F5ICovCi0gICAgaWYgKCFHVEtfV0lER0VUX05P X1dJTkRPVyhwbGF0Zm9ybVdpZGdldCgpKSkKKyAgICAvKiBvbmx5IHBhaW50IHdpZGdldHMgd2l0 aCBubyB3aW5kb3cgdGhpcyB3YXkgKi8KKyAgICBpZiAoISFndGtfd2lkZ2V0X2dldF9oYXNfd2lu ZG93KHBsYXRmb3JtV2lkZ2V0KCkpKQogICAgICAgICByZXR1cm47CiAKICAgICBHdGtXaWRnZXQq IHdpZGdldCA9IHBsYXRmb3JtV2lkZ2V0KCk7Ci0gICAgQVNTRVJUKEdUS19XSURHRVRfTk9fV0lO RE9XKHdpZGdldCkpOworICAgIEFTU0VSVCghZ3RrX3dpZGdldF9nZXRfaGFzX3dpbmRvdyh3aWRn ZXQpKTsKIAogICAgIEdka0V2ZW50KiBldmVudCA9IGdka19ldmVudF9uZXcoR0RLX0VYUE9TRSk7 CiAgICAgZXZlbnQtPmV4cG9zZSA9ICpjb250ZXh0LT5nZGtFeHBvc2VFdmVudCgpOwpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwIGIvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5HdGsuY3BwCmluZGV4IDkyY2NmZjQuLjkzNDE3 MTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNw cAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVNjcmVlbkd0ay5jcHAKQEAgLTMx LDYgKzMxLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVNjcmVl bi5oIgogCisjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5oIgogI2luY2x1ZGUgIkhvc3RXaW5kb3cu aCIKICNpbmNsdWRlICJTY3JvbGxWaWV3LmgiCiAjaW5jbHVkZSAiV2lkZ2V0LmgiCkBAIC01NCwx MyArNTUsOSBAQCBzdGF0aWMgR2RrVmlzdWFsKiBnZXRWaXN1YWwoV2lkZ2V0KiB3aWRnZXQpCiAg ICAgaWYgKCFjb250YWluZXIpCiAgICAgICAgIHJldHVybiAwOwogCi0gICAgaWYgKCFHVEtfV0lE R0VUX1JFQUxJWkVEKGNvbnRhaW5lcikpIHsKKyAgICBpZiAoIWd0a193aWRnZXRfZ2V0X3JlYWxp emVkKGNvbnRhaW5lcikpIHsKICAgICAgICAgR3RrV2lkZ2V0KiB0b3BsZXZlbCA9IGd0a193aWRn ZXRfZ2V0X3RvcGxldmVsKGNvbnRhaW5lcik7Ci0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgs IDApCiAgICAgICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcGxldmVsKSkKLSNlbHNl Ci0gICAgICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHRvcGxldmVsKSkKLSNlbmRpZgogICAg ICAgICAgICAgY29udGFpbmVyID0gdG9wbGV2ZWw7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IHJldHVybiAwOwpAQCAtOTgsMTEgKzk1LDcgQEAgRmxvYXRSZWN0IHNjcmVlblJlY3QoV2lkZ2V0 KiB3aWRnZXQpCiAgICAgICAgIHJldHVybiBGbG9hdFJlY3QoKTsKIAogICAgIEd0a1dpZGdldCog Y29udGFpbmVyID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVCh3aWRnZXQtPnJv b3QoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkpOwotI2lmIEdUS19DSEVD S19WRVJTSU9OKDIsIDE4LCAwKQogICAgIGlmICghZ3RrX3dpZGdldF9pc190b3BsZXZlbChjb250 YWluZXIpKQotI2Vsc2UKLSAgICBpZiAoIUdUS19XSURHRVRfVE9QTEVWRUwoY29udGFpbmVyKSkK LSNlbmRpZgogICAgICAgICByZXR1cm4gRmxvYXRSZWN0KCk7CiAKICAgICBHZGtTY3JlZW4qIHNj cmVlbiA9IGd0a193aWRnZXRfaGFzX3NjcmVlbihjb250YWluZXIpID8gZ3RrX3dpZGdldF9nZXRf c2NyZWVuKGNvbnRhaW5lcikgOiBnZGtfc2NyZWVuX2dldF9kZWZhdWx0KCk7CkBAIC0xMjYsNyAr MTE5LDcgQEAgRmxvYXRSZWN0IHNjcmVlbkF2YWlsYWJsZVJlY3QoV2lkZ2V0KiB3aWRnZXQpCiAg ICAgaWYgKCFjb250YWluZXIpCiAgICAgICAgIHJldHVybiBGbG9hdFJlY3QoKTsKIAotICAgIGlm ICghR1RLX1dJREdFVF9SRUFMSVpFRChjb250YWluZXIpKQorICAgIGlmICghZ3RrX3dpZGdldF9n ZXRfcmVhbGl6ZWQoY29udGFpbmVyKSkKICAgICAgICAgcmV0dXJuIHNjcmVlblJlY3Qod2lkZ2V0 KTsKIAogICAgIEdka0RyYXdhYmxlKiByb290V2luZG93ID0gR0RLX0RSQVdBQkxFKGd0a193aWRn ZXRfZ2V0X3Jvb3Rfd2luZG93KGNvbnRhaW5lcikpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvU2Nyb2xsYmFyR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJh ckd0ay5jcHAKaW5kZXggMGMzMDM3YS4uMDBjYmNmMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvU2Nyb2xsYmFyR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3Jv bGxiYXJHdGsuY3BwCkBAIC0xOTYsNyArMTk2LDcgQEAgdm9pZCBTY3JvbGxiYXJHdGs6OnNldEVu YWJsZWQoYm9vbCBzaG91bGRFbmFibGUpCiAvKgogICogU3RyYXRlZ3kgdG8gcGFpbnRpbmcgYSBX aWRnZXQ6CiAgKiAgMS4pIGRvIG5vdCBwYWludCBpZiB0aGVyZSBpcyBubyBHdGtXaWRnZXQgc2V0 Ci0gKiAgMi4pIFdlIGFzc3VtZSB0aGF0IEdUS19OT19XSU5ET1cgaXMgc2V0IGFuZCB0aGF0IGZy YW1lUmVjdHNDaGFuZ2VkIHBvc2l0aW9uZWQKKyAqICAyLikgV2UgYXNzdW1lIHRoYXQgdGhlIHdp ZGdldCBoYXMgbm8gd2luZG93IGFuZCB0aGF0IGZyYW1lUmVjdHNDaGFuZ2VkIHBvc2l0aW9uZWQK ICAqICAgICAgdGhlIHdpZGdldCBjb3JyZWN0bHkuIEFUTSB3ZSBkbyBub3QgaG9ub3IgdGhlIEdy YXBoaWNzQ29udGV4dCB0cmFuc2xhdGlvbi4KICAqLwogdm9pZCBTY3JvbGxiYXJHdGs6OnBhaW50 KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTIwOCw3 ICsyMDgsNyBAQCB2b2lkIFNjcm9sbGJhckd0azo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAgICAgICByZXR1cm47CiAKICAgICBHdGtXaWRn ZXQqIHdpZGdldCA9IHBsYXRmb3JtV2lkZ2V0KCk7Ci0gICAgQVNTRVJUKEdUS19XSURHRVRfTk9f V0lORE9XKHdpZGdldCkpOworICAgIEFTU0VSVCghZ3RrX3dpZGdldF9nZXRfaGFzX3dpbmRvdyh3 aWRnZXQpKTsKIAogICAgIEdka0V2ZW50KiBldmVudCA9IGdka19ldmVudF9uZXcoR0RLX0VYUE9T RSk7CiAgICAgZXZlbnQtPmV4cG9zZSA9ICpjb250ZXh0LT5nZGtFeHBvc2VFdmVudCgpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYyBiL1dlYkNvcmUvcGx1Z2lu cy9ndGsvZ3RrMnh0YmluLmMKaW5kZXggNjhjNTM3My4uZmFkNjZmZSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYworKysgYi9XZWJDb3JlL3BsdWdpbnMvZ3RrL2d0 azJ4dGJpbi5jCkBAIC00Miw2ICs0Miw3IEBACiAgKiBpbnNpZGUgYSBHVEsgYXBwbGljYXRpb24u ICAKICAqLwogCisjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5oIgogI2luY2x1ZGUgInhlbWJlZC5o IgogI2luY2x1ZGUgImd0azJ4dGJpbi5oIgogI2luY2x1ZGUgPGd0ay9ndGsuaD4KQEAgLTQwMSw3 ICs0MDIsNyBAQCBndGtfeHRiaW5fc2V0X3Bvc2l0aW9uIChHdGtYdEJpbiAqeHRiaW4sCiAgIHh0 YmluLT54ID0geDsKICAgeHRiaW4tPnkgPSB5OwogCi0gIGlmIChHVEtfV0lER0VUX1JFQUxJWkVE ICh4dGJpbikpCisgIGlmIChndGtfd2lkZ2V0X2dldF9yZWFsaXplZCAoeHRiaW4pKQogICAgIGdk a193aW5kb3dfbW92ZSAoR1RLX1dJREdFVCAoeHRiaW4pLT53aW5kb3csIHgsIHkpOwogfQogCkBA IC00NTYsNyArNDU3LDcgQEAgZ3RrX3h0YmluX3VucmVhbGl6ZSAoR3RrV2lkZ2V0ICpvYmplY3Qp CiAgIHdpZGdldCA9IEdUS19XSURHRVQob2JqZWN0KTsKIAogICBHVEtfV0lER0VUX1VOU0VUX0ZM QUdTICh3aWRnZXQsIEdUS19WSVNJQkxFKTsKLSAgaWYgKEdUS19XSURHRVRfUkVBTElaRUQgKHdp ZGdldCkpIHsKKyAgaWYgKGd0a193aWRnZXRfZ2V0X3JlYWxpemVkICh3aWRnZXQpKSB7CiAgICAg eHRfY2xpZW50X3VucmVhbGl6ZSgmKHh0YmluLT54dGNsaWVudCkpOwogICB9CiAKZGlmZiAtLWdp dCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNDU4 OTcxOS4uNjA0ZGQ5YyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMC0wMy0yMiAgR3VzdGF2byBO b3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBEb2VzIG5vdCBi dWlsZCB3aXRoIGxhdGVzdCBHVEsrIGRldmVsb3BtZW50IHJlbGVhc2UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2Mzk4CisKKyAgICAgICAgRml4IGJ1 aWxkaW5nIHdpdGggbmV3ZXN0IEdUSysgdmVyc2lvbnMuCisKKyAgICAgICAgKiBXZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6 OndpbmRvd1JlY3QpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnNldFdpbmRvd1Jl Y3QpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OnVuZm9jdXMpOgorICAgICAgICAo V2ViS2l0OjpDaHJvbWVDbGllbnQ6OmNhblRha2VGb2N1cyk6CisgICAgICAgIChXZWJLaXQ6OkNo cm9tZUNsaWVudDo6Y29udGVudHNTaXplQ2hhbmdlZCk6CisgICAgICAgICogd2Via2l0L3dlYmtp dHByaXZhdGUuY3BwOgorICAgICAgICAoY3VycmVudFRvcGxldmVsQ2FsbGJhY2spOgorICAgICAg ICAqIHdlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1l X3ByaW50X2Z1bGwpOgorICAgICAgICAod2Via2l0X3dlYl9mcmFtZV9wcmludCk6CisgICAgICAg ICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2dy YWJfZm9jdXMpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2ZvY3VzX2luX2V2ZW50KToKKyAg ICAgICAgKHdlYmtpdF93ZWJfdmlld19zY3JpcHRfZGlhbG9nKToKKwogMjAxMC0wMy0xOCAgUGhp bGlwIENoaW1lbnRvICA8cGhpbGlwLmNoaW1lbnRvQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBv cnQvQ2hyb21lQ2xpZW50R3RrLmNwcCBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21l Q2xpZW50R3RrLmNwcAppbmRleCBjNjNhMDNiLi44N2M3NjZmIDEwMDY0NAotLS0gYS9XZWJLaXQv Z3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0ay9X ZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5j bHVkZSAiRmlsZUNob29zZXIuaCIKICNpbmNsdWRlICJGbG9hdFJlY3QuaCIKICNpbmNsdWRlICJG cmFtZUxvYWRSZXF1ZXN0LmgiCisjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5oIgogI2luY2x1ZGUg IkludFJlY3QuaCIKICNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIkNTdHJp bmcuaCIKQEAgLTY1LDExICs2Niw3IEBAIHZvaWQgQ2hyb21lQ2xpZW50OjpjaHJvbWVEZXN0cm95 ZWQoKQogRmxvYXRSZWN0IENocm9tZUNsaWVudDo6d2luZG93UmVjdCgpCiB7CiAgICAgR3RrV2lk Z2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZlbChHVEtfV0lER0VUKG1fd2ViVmll dykpOwotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQogICAgIGlmIChndGtfd2lkZ2V0 X2lzX3RvcGxldmVsKHdpbmRvdykpIHsKLSNlbHNlCi0gICAgaWYgKEdUS19XSURHRVRfVE9QTEVW RUwod2luZG93KSkgewotI2VuZGlmCiAgICAgICAgIGdpbnQgbGVmdCwgdG9wLCB3aWR0aCwgaGVp Z2h0OwogICAgICAgICBndGtfd2luZG93X2dldF9wb3NpdGlvbihHVEtfV0lORE9XKHdpbmRvdyks ICZsZWZ0LCAmdG9wKTsKICAgICAgICAgZ3RrX3dpbmRvd19nZXRfc2l6ZShHVEtfV0lORE9XKHdp bmRvdyksICZ3aWR0aCwgJmhlaWdodCk7CkBAIC05OCwxMSArOTUsNyBAQCB2b2lkIENocm9tZUNs aWVudDo6c2V0V2luZG93UmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiAgICAgICAgIHJldHVy bjsKIAogICAgIEd0a1dpZGdldCogd2luZG93ID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RL X1dJREdFVChtX3dlYlZpZXcpKTsKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKICAg ICBpZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3aW5kb3cpKSB7Ci0jZWxzZQotICAgIGlmIChH VEtfV0lER0VUX1RPUExFVkVMKHdpbmRvdykpIHsKLSNlbmRpZgogICAgICAgICBndGtfd2luZG93 X21vdmUoR1RLX1dJTkRPVyh3aW5kb3cpLCBpbnRyZWN0LngoKSwgaW50cmVjdC55KCkpOwogICAg ICAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtfV0lORE9XKHdpbmRvdyksIGludHJlY3Qud2lkdGgo KSwgaW50cmVjdC5oZWlnaHQoKSk7CiAgICAgfQpAQCAtMTI4LDExICsxMjEsNyBAQCB2b2lkIENo cm9tZUNsaWVudDo6Zm9jdXMoKQogdm9pZCBDaHJvbWVDbGllbnQ6OnVuZm9jdXMoKQogewogICAg IEd0a1dpZGdldCogd2luZG93ID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVCht X3dlYlZpZXcpKTsKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKICAgICBpZiAoZ3Rr X3dpZGdldF9pc190b3BsZXZlbCh3aW5kb3cpKQotI2Vsc2UKLSAgICBpZiAoR1RLX1dJREdFVF9U T1BMRVZFTCh3aW5kb3cpKQotI2VuZGlmCiAgICAgICAgIGd0a193aW5kb3dfc2V0X2ZvY3VzKEdU S19XSU5ET1cod2luZG93KSwgTlVMTCk7CiB9CiAKQEAgLTI2MCwxMSArMjQ5LDcgQEAgdm9pZCBD aHJvbWVDbGllbnQ6OmNsb3NlV2luZG93U29vbigpCiAKIGJvb2wgQ2hyb21lQ2xpZW50OjpjYW5U YWtlRm9jdXMoRm9jdXNEaXJlY3Rpb24pCiB7Ci0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgs IDApCiAgICAgcmV0dXJuIGd0a193aWRnZXRfZ2V0X2Nhbl9mb2N1cyhHVEtfV0lER0VUKG1fd2Vi VmlldykpOwotI2Vsc2UKLSAgICByZXR1cm4gR1RLX1dJREdFVF9DQU5fRk9DVVMobV93ZWJWaWV3 KTsKLSNlbmRpZgogfQogCiB2b2lkIENocm9tZUNsaWVudDo6dGFrZUZvY3VzKEZvY3VzRGlyZWN0 aW9uKQpAQCAtNDM5LDcgKzQyNCw3IEBAIHZvaWQgQ2hyb21lQ2xpZW50Ojpjb250ZW50c1NpemVD aGFuZ2VkKEZyYW1lKiBmcmFtZSwgY29uc3QgSW50U2l6ZSYgc2l6ZSkgY29uc3QKICAgICAvLyBX ZSBuZWVkIHRvIHF1ZXVlIGEgcmVzaXplIHJlcXVlc3Qgb25seSBpZiB0aGUgc2l6ZSBjaGFuZ2Vk LAogICAgIC8vIG90aGVyd2lzZSB3ZSBnZXQgaW50byBhbiBpbmZpbml0ZSBsb29wIQogICAgIEd0 a1dpZGdldCogd2lkZ2V0ID0gR1RLX1dJREdFVChtX3dlYlZpZXcpOwotICAgIGlmIChHVEtfV0lE R0VUX1JFQUxJWkVEKHdpZGdldCkKKyAgICBpZiAoZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQod2lk Z2V0KQogICAgICAgICAmJiAod2lkZ2V0LT5yZXF1aXNpdGlvbi5oZWlnaHQgIT0gc2l6ZS5oZWln aHQoKSkKICAgICAgICAgfHwgKHdpZGdldC0+cmVxdWlzaXRpb24ud2lkdGggIT0gc2l6ZS53aWR0 aCgpKSkKICAgICAgICAgZ3RrX3dpZGdldF9xdWV1ZV9yZXNpemVfbm9fcmVkcmF3KHdpZGdldCk7 CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRwcml2YXRlLmNwcCBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwCmluZGV4IGJlODhiYjUuLjQ0NTA1MWIgMTAw NjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwCisrKyBiL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVk ZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lTG9h ZGVyQ2xpZW50R3RrLmgiCisjaW5jbHVkZSAiR3RrVmVyc2lvbmluZy5oIgogI2luY2x1ZGUgIkhp dFRlc3RSZXN1bHQuaCIKICNpbmNsdWRlICJJY29uRGF0YWJhc2UuaCIKICNpbmNsdWRlIDxsaWJp bnRsLmg+CkBAIC0yMjMsMTEgKzIyNCw3IEBAIHN0YXRpYyBHdGtXaWRnZXQqIGN1cnJlbnRUb3Bs ZXZlbENhbGxiYWNrKFdlYktpdFNvdXBBdXRoRGlhbG9nKiBmZWF0dXJlLCBTb3VwTWVzCiAgICAg ICAgIHJldHVybiBOVUxMOwogCiAgICAgR3RrV2lkZ2V0KiB0b3BsZXZlbCA9ICBndGtfd2lkZ2V0 X2dldF90b3BsZXZlbChHVEtfV0lER0VUKGZyYW1lLT5wYWdlKCktPmNocm9tZSgpLT5wbGF0Zm9y bVBhZ2VDbGllbnQoKSkpOwotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQogICAgIGlm IChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcGxldmVsKSkKLSNlbHNlCi0gICAgaWYgKEdUS19X SURHRVRfVE9QTEVWRUwodG9wbGV2ZWwpKQotI2VuZGlmCiAgICAgICAgIHJldHVybiB0b3BsZXZl bDsKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBOVUxMOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIGIvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vi ZnJhbWUuY3BwCmluZGV4IDk4NzZjMWEuLmU0NDFjMmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsv d2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJmcmFtZS5jcHAKQEAgLTQ1LDYgKzQ1LDcgQEAKICNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5o PgogI2luY2x1ZGUgIkdDQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5o IgorI2luY2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIKICNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVs ZW1lbnQuaCIKICNpbmNsdWRlICJKU0RPTVdpbmRvdy5oIgogI2luY2x1ZGUgIkpTTG9jay5oIgpA QCAtOTU2LDExICs5NTcsNyBAQCBHdGtQcmludE9wZXJhdGlvblJlc3VsdCB3ZWJraXRfd2ViX2Zy YW1lX3ByaW50X2Z1bGwoV2ViS2l0V2ViRnJhbWUqIGZyYW1lLCBHdGtQcgogCiAgICAgR3RrV2lk Z2V0KiB0b3BMZXZlbCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKEdUS19XSURHRVQod2Via2l0 X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcoZnJhbWUpKSk7CiAKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lP TigyLCAxOCwgMCkKICAgICBpZiAoIWd0a193aWRnZXRfaXNfdG9wbGV2ZWwodG9wTGV2ZWwpKQot I2Vsc2UKLSAgICBpZiAoIUdUS19XSURHRVRfVE9QTEVWRUwodG9wTGV2ZWwpKQotI2VuZGlmCiAg ICAgICAgIHRvcExldmVsID0gTlVMTDsKIAogICAgIEZyYW1lKiBjb3JlRnJhbWUgPSBjb3JlKGZy YW1lKTsKQEAgLTk5OSwxOSArOTk2LDExIEBAIHZvaWQgd2Via2l0X3dlYl9mcmFtZV9wcmludChX ZWJLaXRXZWJGcmFtZSogZnJhbWUpCiAKICAgICBpZiAoZXJyb3IpIHsKICAgICAgICAgR3RrV2lk Z2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0X2dldF90b3BsZXZlbChHVEtfV0lER0VUKHByaXYtPndl YlZpZXcpKTsKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKICAgICAgICAgR3RrV2lk Z2V0KiBkaWFsb2cgPSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KGd0a193aWRnZXRfaXNfdG9wbGV2 ZWwod2luZG93KSA/IEdUS19XSU5ET1cod2luZG93KSA6IDAsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHVEtfRElBTE9HX0RFU1RST1lfV0lUSF9Q QVJFTlQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHVEtfTUVTU0FHRV9FUlJPUiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEdUS19CVVRUT05TX0NMT1NFLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiVzIiwgZXJyb3ItPm1lc3NhZ2UpOwotI2Vs c2UKLSAgICAgICAgR3RrV2lkZ2V0KiBkaWFsb2cgPSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KEdU S19XSURHRVRfVE9QTEVWRUwod2luZG93KSA/IEdUS19XSU5ET1cod2luZG93KSA6IDAsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHVEtfRElBTE9H X0RFU1RST1lfV0lUSF9QQVJFTlQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBHVEtfTUVTU0FHRV9FUlJPUiwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19CVVRUT05TX0NMT1NFLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiVzIiwgZXJyb3It Pm1lc3NhZ2UpOwotI2VuZGlmCiAKICAgICAgICAgZ19lcnJvcl9mcmVlKGVycm9yKTsKIApkaWZm IC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgYi9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAppbmRleCBkOGU4NTRiLi5iOWZkMjgzIDEwMDY0NAot LS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcApAQCAtNjQsNiArNjQsNyBAQAogI2luY2x1ZGUgPGds aWIvZ2kxOG4tbGliLmg+CiAjaW5jbHVkZSA8R093blB0ci5oPgogI2luY2x1ZGUgIkdyYXBoaWNz Q29udGV4dC5oIgorI2luY2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIKICNpbmNsdWRlICJIaXRUZXN0 UmVxdWVzdC5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIKICNpbmNsdWRlICJJY29uRGF0 YWJhc2UuaCIKQEAgLTY5NiwxMSArNjk3LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3 X3NpemVfYWxsb2NhdGUoR3RrV2lkZ2V0KiB3aWRnZXQsIEd0a0FsbG9jYXRpb24qIGFsbG8KIHN0 YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19ncmFiX2ZvY3VzKEd0a1dpZGdldCogd2lkZ2V0KQog ewogCi0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCiAgICAgaWYgKGd0a193aWRnZXRf aXNfc2Vuc2l0aXZlKHdpZGdldCkpIHsKLSNlbHNlCi0gICAgaWYgKEdUS19XSURHRVRfSVNfU0VO U0lUSVZFKHdpZGdldCkpIHsKLSNlbmRpZgogICAgICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3 ID0gV0VCS0lUX1dFQl9WSUVXKHdpZGdldCk7CiAgICAgICAgIEZvY3VzQ29udHJvbGxlciogZm9j dXNDb250cm9sbGVyID0gY29yZSh3ZWJWaWV3KS0+Zm9jdXNDb250cm9sbGVyKCk7CiAKQEAgLTcy MCwxMSArNzE3LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF93ZWJfdmlld19mb2N1c19pbl9l dmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZlbnRGb2N1cyoKICAgICAvLyBUT0RPOiBJbXBy b3ZlIGZvY3VzIGhhbmRsaW5nIGFzIHN1Z2dlc3RlZCBpbgogICAgIC8vIGh0dHA6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTEwCiAgICAgR3RrV2lkZ2V0KiB0b3BsZXZlbCA9 IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKHdpZGdldCk7Ci0jaWYgR1RLX0NIRUNLX1ZFUlNJT04o MiwgMTgsIDApCiAgICAgaWYgKGd0a193aWRnZXRfaXNfdG9wbGV2ZWwodG9wbGV2ZWwpICYmIGd0 a193aW5kb3dfaGFzX3RvcGxldmVsX2ZvY3VzKEdUS19XSU5ET1codG9wbGV2ZWwpKSkgewotI2Vs c2UKLSAgICBpZiAoR1RLX1dJREdFVF9UT1BMRVZFTCh0b3BsZXZlbCkgJiYgZ3RrX3dpbmRvd19o YXNfdG9wbGV2ZWxfZm9jdXMoR1RLX1dJTkRPVyh0b3BsZXZlbCkpKSB7Ci0jZW5kaWYKICAgICAg ICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3aWRnZXQpOwogICAg ICAgICBGb2N1c0NvbnRyb2xsZXIqIGZvY3VzQ29udHJvbGxlciA9IGNvcmUod2ViVmlldyktPmZv Y3VzQ29udHJvbGxlcigpOwogCkBAIC05MjMsMTEgKzkxNiw3IEBAIHN0YXRpYyBnYm9vbGVhbiB3 ZWJraXRfd2ViX3ZpZXdfc2NyaXB0X2RpYWxvZyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJL aXRXZWJGCiAgICAgfQogCiAgICAgd2luZG93ID0gZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RL X1dJREdFVCh3ZWJWaWV3KSk7Ci0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCiAgICAg ZGlhbG9nID0gZ3RrX21lc3NhZ2VfZGlhbG9nX25ldyhndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdp bmRvdykgPyBHVEtfV0lORE9XKHdpbmRvdykgOiAwLCBHVEtfRElBTE9HX0RFU1RST1lfV0lUSF9Q QVJFTlQsIG1lc3NhZ2VUeXBlLCBidXR0b25zLCAiJXMiLCBtZXNzYWdlKTsKLSNlbHNlCi0gICAg ZGlhbG9nID0gZ3RrX21lc3NhZ2VfZGlhbG9nX25ldyhHVEtfV0lER0VUX1RPUExFVkVMKHdpbmRv dykgPyBHVEtfV0lORE9XKHdpbmRvdykgOiAwLCBHVEtfRElBTE9HX0RFU1RST1lfV0lUSF9QQVJF TlQsIG1lc3NhZ2VUeXBlLCBidXR0b25zLCAiJXMiLCBtZXNzYWdlKTsKLSNlbmRpZgogICAgIGdj aGFyKiB0aXRsZSA9IGdfc3RyY29uY2F0KCJKYXZhU2NyaXB0IC0gIiwgd2Via2l0X3dlYl9mcmFt ZV9nZXRfdXJpKGZyYW1lKSwgTlVMTCk7CiAgICAgZ3RrX3dpbmRvd19zZXRfdGl0bGUoR1RLX1dJ TkRPVyhkaWFsb2cpLCB0aXRsZSk7CiAgICAgZ19mcmVlKHRpdGxlKTsKLS0gCjEuNy4wCgo= 51381 2010-03-22 18:48:58 -0700 2010-03-23 06:24:59 -0700 proposed fix 0001-Fix-building-with-newer-GTK.patch text/plain 17864 gustavo RnJvbSBkMDhkYTk3ZTBlNWIyZGM2MzcyYzU4YmQyOWYxZDQyZjA0YmQ5MTUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IE1vbiwgMjIgTWFyIDIwMTAgMTQ6NTE6NDIgLTAzMDAKU3ViamVjdDogW1BBVENIXSBG aXggYnVpbGRpbmcgd2l0aCBuZXdlciBHVEsrLgoKLS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDI0ICsrKysrKysrKysrKysrKysrCiBXZWJDb3Jl L0dOVW1ha2VmaWxlLmFtICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAxICsKIFdlYkNvcmUv cGxhdGZvcm0vZ3RrL0d0a1BsdWdpbldpZGdldC5jcHAgICAgICB8ICAgIDkgKysrLS0tCiBXZWJD b3JlL3BsYXRmb3JtL2d0ay9HdGtWZXJzaW9uaW5nLmggICAgICAgICAgfCAgIDM0ICsrKysrKysr KysrKysrKysrKysrKysrKysKIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3Rr LmNwcCAgICB8ICAgMTMgKystLS0tLS0tCiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJH dGsuY3BwICAgICAgICAgfCAgICA0ICstCiBXZWJDb3JlL3BsdWdpbnMvZ3RrL2d0azJ4dGJpbi5j ICAgICAgICAgICAgICAgfCAgICA1ICsrLQogV2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAg ICAgICAgICAgICAgICAgIHwgICAyNSArKysrKysrKysrKysrKysrKysKIFdlYktpdC9ndGsvV2Vi Q29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcCB8ICAgMTkgKy0tLS0tLS0tLS0tLQogV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0cHJpdmF0ZS5jcHAgICAgICAgICAgIHwgICAgNSArLS0tCiBX ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAgICAgICAgICAgfCAgIDEzICstLS0t LS0tLS0KIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwICAgICAgICAgICB8ICAg MTMgKy0tLS0tLS0tLQogMTIgZmlsZXMgY2hhbmdlZCwgMTAyIGluc2VydGlvbnMoKyksIDYzIGRl bGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IFdlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1Zl cnNpb25pbmcuaAoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggNjRiNmIwZi4uMThmZTZhZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxMC0wMy0yMiAg R3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBE b2VzIG5vdCBidWlsZCB3aXRoIGxhdGVzdCBHVEsrIGRldmVsb3BtZW50IHJlbGVhc2UKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2Mzk4CisKKyAgICAg ICAgRml4IGJ1aWxkaW5nIHdpdGggbmV3ZXN0IEdUSysgdmVyc2lvbnMuCisKKyAgICAgICAgKiBH TlVtYWtlZmlsZS5hbToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvR3RrUGx1Z2luV2lkZ2V0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Okd0a1BsdWdpbldpZGdldDo6aW52YWxpZGF0ZVJlY3QpOgor ICAgICAgICAoV2ViQ29yZTo6R3RrUGx1Z2luV2lkZ2V0OjpwYWludCk6CisgICAgICAgICogcGxh dGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L1BsYXRmb3JtU2NyZWVuR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmdldFZpc3VhbCk6Cisg ICAgICAgIChXZWJDb3JlOjpzY3JlZW5SZWN0KToKKyAgICAgICAgKFdlYkNvcmU6OnNjcmVlbkF2 YWlsYWJsZVJlY3QpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3BwOgor ICAgICAgICAoU2Nyb2xsYmFyR3RrOjpwYWludCk6CisgICAgICAgICogcGx1Z2lucy9ndGsvZ3Rr Mnh0YmluLmM6CisgICAgICAgIChndGtfeHRiaW5fc2V0X3Bvc2l0aW9uKToKKyAgICAgICAgKGd0 a194dGJpbl91bnJlYWxpemUpOgorCiAyMDEwLTAzLTIyICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVy eXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFBhdmVsIEZlbGRtYW4uCmRp ZmYgLS1naXQgYS9XZWJDb3JlL0dOVW1ha2VmaWxlLmFtIGIvV2ViQ29yZS9HTlVtYWtlZmlsZS5h bQppbmRleCBhYmQxNjQ4Li42NTNkNGFiIDEwMDY0NAotLS0gYS9XZWJDb3JlL0dOVW1ha2VmaWxl LmFtCisrKyBiL1dlYkNvcmUvR05VbWFrZWZpbGUuYW0KQEAgLTIwNTMsNiArMjA1Myw3IEBAIHdl YmNvcmVndGtfc291cmNlcyArPSBcCiAJV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR1JlZlB0ckd0ay5o IFwKIAlXZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtQbHVnaW5XaWRnZXQuY3BwIFwKIAlXZWJDb3Jl L3BsYXRmb3JtL2d0ay9HdGtQbHVnaW5XaWRnZXQuaCBcCisJV2ViQ29yZS9wbGF0Zm9ybS9ndGsv R3RrVmVyc2lvbmluZy5oIFwKIAlXZWJDb3JlL3BsYXRmb3JtL2d0ay9LVVJMR3RrLmNwcCBcCiAJ V2ViQ29yZS9wbGF0Zm9ybS9ndGsvS2V5RXZlbnRHdGsuY3BwIFwKIAlXZWJDb3JlL3BsYXRmb3Jt L2d0ay9MYW5ndWFnZS5jcHAgXApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3Rr UGx1Z2luV2lkZ2V0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1BsdWdpbldpZGdldC5j cHAKaW5kZXggYmMyZGQ5Mi4uYzNmYTE2ZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvR3RrUGx1Z2luV2lkZ2V0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtQbHVn aW5XaWRnZXQuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiR3RrUGx1Z2luV2lkZ2V0 LmgiCiAKICNpbmNsdWRlICJHcmFwaGljc0NvbnRleHQuaCIKKyNpbmNsdWRlICJHdGtWZXJzaW9u aW5nLmgiCiAjaW5jbHVkZSAiU2Nyb2xsVmlldy5oIgogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgpA QCAtNDMsNyArNDQsNyBAQCBHdGtQbHVnaW5XaWRnZXQ6Okd0a1BsdWdpbldpZGdldChHdGtXaWRn ZXQqIHdpZGdldCkKIHZvaWQgR3RrUGx1Z2luV2lkZ2V0OjppbnZhbGlkYXRlUmVjdChjb25zdCBJ bnRSZWN0JiBfcmVjdCkKIHsKICAgICAvKiBubyBuZWVkIHRvICovCi0gICAgaWYgKEdUS19XSURH RVRfTk9fV0lORE9XKHBsYXRmb3JtV2lkZ2V0KCkpKQorICAgIGlmICghZ3RrX3dpZGdldF9nZXRf aGFzX3dpbmRvdyhwbGF0Zm9ybVdpZGdldCgpKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgR2Rr V2luZG93KiB3aW5kb3cgPSBwbGF0Zm9ybVdpZGdldCgpLT53aW5kb3c7CkBAIC03MCwxMiArNzEs MTIgQEAgdm9pZCBHdGtQbHVnaW5XaWRnZXQ6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4 dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKICAgICBpZiAoIWNvbnRleHQtPmdka0V4cG9zZUV2ZW50 KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8qIG9ubHkgcGFpbnQgd2lkZ2V0cyB3aXRoIE5P X1dJTkRPVyB0aGlzIHdheSAqLwotICAgIGlmICghR1RLX1dJREdFVF9OT19XSU5ET1cocGxhdGZv cm1XaWRnZXQoKSkpCisgICAgLyogb25seSBwYWludCB3aWRnZXRzIHdpdGggbm8gd2luZG93IHRo aXMgd2F5ICovCisgICAgaWYgKCEhZ3RrX3dpZGdldF9nZXRfaGFzX3dpbmRvdyhwbGF0Zm9ybVdp ZGdldCgpKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgR3RrV2lkZ2V0KiB3aWRnZXQgPSBwbGF0 Zm9ybVdpZGdldCgpOwotICAgIEFTU0VSVChHVEtfV0lER0VUX05PX1dJTkRPVyh3aWRnZXQpKTsK KyAgICBBU1NFUlQoIWd0a193aWRnZXRfZ2V0X2hhc193aW5kb3cod2lkZ2V0KSk7CiAKICAgICBH ZGtFdmVudCogZXZlbnQgPSBnZGtfZXZlbnRfbmV3KEdES19FWFBPU0UpOwogICAgIGV2ZW50LT5l eHBvc2UgPSAqY29udGV4dC0+Z2RrRXhwb3NlRXZlbnQoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGxhdGZvcm0vZ3RrL0d0a1ZlcnNpb25pbmcuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1Zl cnNpb25pbmcuaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5mYzkyZDhiCi0t LSAvZGV2L251bGwKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVmVyc2lvbmluZy5oCkBA IC0wLDAgKzEsMzQgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTAgQ29sbGFib3JhIEx0ZC4K KyAqCisgKiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmli dXRlIGl0IGFuZC9vcgorICogIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBM aWJyYXJ5IEdlbmVyYWwgUHVibGljCisgKiAgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlIEZy ZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyCisgKiAgdmVyc2lvbiAyIG9mIHRoZSBMaWNl bnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorICoKKyAqICBUaGlz IGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1 bCwKKyAqICBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGll ZCB3YXJyYW50eSBvZgorICogIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJ Q1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgKiAgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBM aWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisgKgorICogIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZl ZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAqICBh bG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90 LCB3cml0ZSB0bworICogIHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZy YW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3IsCisgKiAgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBV U0EuCisgKi8KKworI2lmbmRlZiBHdGtWZXJzaW9uaW5nX2gKKyNkZWZpbmUgR3RrVmVyc2lvbmlu Z19oCisKKyNpbmNsdWRlIDxndGsvZ3RrLmg+CisKKy8vIE1hY3JvcyB0byBhdm9pZCBkZXByZWNh dGlvbiBjaGVja2luZyBjaHVybgorI2lmICFHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOSwgMCkKKyNk ZWZpbmUgZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3aWRnZXQpIEdUS19XSURHRVRfVE9QTEVWRUwo d2lkZ2V0KQorI2RlZmluZSBndGtfd2lkZ2V0X2dldF9yZWFsaXplZCh3aWRnZXQpIEdUS19XSURH RVRfUkVBTElaRUQod2lkZ2V0KQorI2RlZmluZSBndGtfd2lkZ2V0X2dldF9oYXNfd2luZG93KHdp ZGdldCkgIUdUS19XSURHRVRfTk9fV0lORE9XKHdpZGdldCkKKyNkZWZpbmUgZ3RrX3dpZGdldF9n ZXRfY2FuX2ZvY3VzKHdpZGdldCkgR1RLX1dJREdFVF9DQU5fRk9DVVMod2lkZ2V0KQorI2RlZmlu ZSBndGtfd2lkZ2V0X2lzX3NlbnNpdGl2ZSh3aWRnZXQpIEdUS19XSURHRVRfSVNfU0VOU0lUSVZF KHdpZGdldCkKKyNlbmRpZiAvLyBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOSwgMCkKKworI2VuZGlm IC8vIEd0a1ZlcnNpb25pbmdfaApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxh dGZvcm1TY3JlZW5HdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1TY3JlZW5H dGsuY3BwCmluZGV4IDkyY2NmZjQuLjkzNDE3MTQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1BsYXRmb3JtU2NyZWVuR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Q bGF0Zm9ybVNjcmVlbkd0ay5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJjb25maWcu aCIKICNpbmNsdWRlICJQbGF0Zm9ybVNjcmVlbi5oIgogCisjaW5jbHVkZSAiR3RrVmVyc2lvbmlu Zy5oIgogI2luY2x1ZGUgIkhvc3RXaW5kb3cuaCIKICNpbmNsdWRlICJTY3JvbGxWaWV3LmgiCiAj aW5jbHVkZSAiV2lkZ2V0LmgiCkBAIC01NCwxMyArNTUsOSBAQCBzdGF0aWMgR2RrVmlzdWFsKiBn ZXRWaXN1YWwoV2lkZ2V0KiB3aWRnZXQpCiAgICAgaWYgKCFjb250YWluZXIpCiAgICAgICAgIHJl dHVybiAwOwogCi0gICAgaWYgKCFHVEtfV0lER0VUX1JFQUxJWkVEKGNvbnRhaW5lcikpIHsKKyAg ICBpZiAoIWd0a193aWRnZXRfZ2V0X3JlYWxpemVkKGNvbnRhaW5lcikpIHsKICAgICAgICAgR3Rr V2lkZ2V0KiB0b3BsZXZlbCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKGNvbnRhaW5lcik7Ci0j aWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCiAgICAgICAgIGlmIChndGtfd2lkZ2V0X2lz X3RvcGxldmVsKHRvcGxldmVsKSkKLSNlbHNlCi0gICAgICAgIGlmIChHVEtfV0lER0VUX1RPUExF VkVMKHRvcGxldmVsKSkKLSNlbmRpZgogICAgICAgICAgICAgY29udGFpbmVyID0gdG9wbGV2ZWw7 CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHJldHVybiAwOwpAQCAtOTgsMTEgKzk1LDcgQEAg RmxvYXRSZWN0IHNjcmVlblJlY3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgICAgIHJldHVybiBGbG9h dFJlY3QoKTsKIAogICAgIEd0a1dpZGdldCogY29udGFpbmVyID0gZ3RrX3dpZGdldF9nZXRfdG9w bGV2ZWwoR1RLX1dJREdFVCh3aWRnZXQtPnJvb3QoKS0+aG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBh Z2VDbGllbnQoKSkpOwotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsIDE4LCAwKQogICAgIGlmICgh Z3RrX3dpZGdldF9pc190b3BsZXZlbChjb250YWluZXIpKQotI2Vsc2UKLSAgICBpZiAoIUdUS19X SURHRVRfVE9QTEVWRUwoY29udGFpbmVyKSkKLSNlbmRpZgogICAgICAgICByZXR1cm4gRmxvYXRS ZWN0KCk7CiAKICAgICBHZGtTY3JlZW4qIHNjcmVlbiA9IGd0a193aWRnZXRfaGFzX3NjcmVlbihj b250YWluZXIpID8gZ3RrX3dpZGdldF9nZXRfc2NyZWVuKGNvbnRhaW5lcikgOiBnZGtfc2NyZWVu X2dldF9kZWZhdWx0KCk7CkBAIC0xMjYsNyArMTE5LDcgQEAgRmxvYXRSZWN0IHNjcmVlbkF2YWls YWJsZVJlY3QoV2lkZ2V0KiB3aWRnZXQpCiAgICAgaWYgKCFjb250YWluZXIpCiAgICAgICAgIHJl dHVybiBGbG9hdFJlY3QoKTsKIAotICAgIGlmICghR1RLX1dJREdFVF9SRUFMSVpFRChjb250YWlu ZXIpKQorICAgIGlmICghZ3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQoY29udGFpbmVyKSkKICAgICAg ICAgcmV0dXJuIHNjcmVlblJlY3Qod2lkZ2V0KTsKIAogICAgIEdka0RyYXdhYmxlKiByb290V2lu ZG93ID0gR0RLX0RSQVdBQkxFKGd0a193aWRnZXRfZ2V0X3Jvb3Rfd2luZG93KGNvbnRhaW5lcikp OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyR3RrLmNwcCBiL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbGJhckd0ay5jcHAKaW5kZXggMGMzMDM3YS4uMDBjYmNm MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyR3RrLmNwcAorKysg Yi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJHdGsuY3BwCkBAIC0xOTYsNyArMTk2LDcg QEAgdm9pZCBTY3JvbGxiYXJHdGs6OnNldEVuYWJsZWQoYm9vbCBzaG91bGRFbmFibGUpCiAvKgog ICogU3RyYXRlZ3kgdG8gcGFpbnRpbmcgYSBXaWRnZXQ6CiAgKiAgMS4pIGRvIG5vdCBwYWludCBp ZiB0aGVyZSBpcyBubyBHdGtXaWRnZXQgc2V0Ci0gKiAgMi4pIFdlIGFzc3VtZSB0aGF0IEdUS19O T19XSU5ET1cgaXMgc2V0IGFuZCB0aGF0IGZyYW1lUmVjdHNDaGFuZ2VkIHBvc2l0aW9uZWQKKyAq ICAyLikgV2UgYXNzdW1lIHRoYXQgdGhlIHdpZGdldCBoYXMgbm8gd2luZG93IGFuZCB0aGF0IGZy YW1lUmVjdHNDaGFuZ2VkIHBvc2l0aW9uZWQKICAqICAgICAgdGhlIHdpZGdldCBjb3JyZWN0bHku IEFUTSB3ZSBkbyBub3QgaG9ub3IgdGhlIEdyYXBoaWNzQ29udGV4dCB0cmFuc2xhdGlvbi4KICAq Lwogdm9pZCBTY3JvbGxiYXJHdGs6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29u c3QgSW50UmVjdCYgcmVjdCkKQEAgLTIwOCw3ICsyMDgsNyBAQCB2b2lkIFNjcm9sbGJhckd0azo6 cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQogICAg ICAgICByZXR1cm47CiAKICAgICBHdGtXaWRnZXQqIHdpZGdldCA9IHBsYXRmb3JtV2lkZ2V0KCk7 Ci0gICAgQVNTRVJUKEdUS19XSURHRVRfTk9fV0lORE9XKHdpZGdldCkpOworICAgIEFTU0VSVCgh Z3RrX3dpZGdldF9nZXRfaGFzX3dpbmRvdyh3aWRnZXQpKTsKIAogICAgIEdka0V2ZW50KiBldmVu dCA9IGdka19ldmVudF9uZXcoR0RLX0VYUE9TRSk7CiAgICAgZXZlbnQtPmV4cG9zZSA9ICpjb250 ZXh0LT5nZGtFeHBvc2VFdmVudCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9n dGsyeHRiaW4uYyBiL1dlYkNvcmUvcGx1Z2lucy9ndGsvZ3RrMnh0YmluLmMKaW5kZXggNjhjNTM3 My4uZmFkNjZmZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbHVnaW5zL2d0ay9ndGsyeHRiaW4uYwor KysgYi9XZWJDb3JlL3BsdWdpbnMvZ3RrL2d0azJ4dGJpbi5jCkBAIC00Miw2ICs0Miw3IEBACiAg KiBpbnNpZGUgYSBHVEsgYXBwbGljYXRpb24uICAKICAqLwogCisjaW5jbHVkZSAiR3RrVmVyc2lv bmluZy5oIgogI2luY2x1ZGUgInhlbWJlZC5oIgogI2luY2x1ZGUgImd0azJ4dGJpbi5oIgogI2lu Y2x1ZGUgPGd0ay9ndGsuaD4KQEAgLTQwMSw3ICs0MDIsNyBAQCBndGtfeHRiaW5fc2V0X3Bvc2l0 aW9uIChHdGtYdEJpbiAqeHRiaW4sCiAgIHh0YmluLT54ID0geDsKICAgeHRiaW4tPnkgPSB5Owog Ci0gIGlmIChHVEtfV0lER0VUX1JFQUxJWkVEICh4dGJpbikpCisgIGlmIChndGtfd2lkZ2V0X2dl dF9yZWFsaXplZCAoeHRiaW4pKQogICAgIGdka193aW5kb3dfbW92ZSAoR1RLX1dJREdFVCAoeHRi aW4pLT53aW5kb3csIHgsIHkpOwogfQogCkBAIC00NTYsNyArNDU3LDcgQEAgZ3RrX3h0YmluX3Vu cmVhbGl6ZSAoR3RrV2lkZ2V0ICpvYmplY3QpCiAgIHdpZGdldCA9IEdUS19XSURHRVQob2JqZWN0 KTsKIAogICBHVEtfV0lER0VUX1VOU0VUX0ZMQUdTICh3aWRnZXQsIEdUS19WSVNJQkxFKTsKLSAg aWYgKEdUS19XSURHRVRfUkVBTElaRUQgKHdpZGdldCkpIHsKKyAgaWYgKGd0a193aWRnZXRfZ2V0 X3JlYWxpemVkICh3aWRnZXQpKSB7CiAgICAgeHRfY2xpZW50X3VucmVhbGl6ZSgmKHh0YmluLT54 dGNsaWVudCkpOwogICB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNDU4OTcxOS4uNjA0ZGQ5YyAxMDA2NDQKLS0tIGEvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy OCBAQAorMjAxMC0wMy0yMiAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3Jvbmhh QGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbR1RLXSBEb2VzIG5vdCBidWlsZCB3aXRoIGxhdGVzdCBHVEsrIGRldmVsb3Bt ZW50IHJlbGVhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTM2Mzk4CisKKyAgICAgICAgRml4IGJ1aWxkaW5nIHdpdGggbmV3ZXN0IEdUSysgdmVyc2lv bnMuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsuY3BwOgorICAg ICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OndpbmRvd1JlY3QpOgorICAgICAgICAoV2ViS2l0 OjpDaHJvbWVDbGllbnQ6OnNldFdpbmRvd1JlY3QpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVD bGllbnQ6OnVuZm9jdXMpOgorICAgICAgICAoV2ViS2l0OjpDaHJvbWVDbGllbnQ6OmNhblRha2VG b2N1cyk6CisgICAgICAgIChXZWJLaXQ6OkNocm9tZUNsaWVudDo6Y29udGVudHNTaXplQ2hhbmdl ZCk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHByaXZhdGUuY3BwOgorICAgICAgICAoY3VycmVu dFRvcGxldmVsQ2FsbGJhY2spOgorICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHA6 CisgICAgICAgICh3ZWJraXRfd2ViX2ZyYW1lX3ByaW50X2Z1bGwpOgorICAgICAgICAod2Via2l0 X3dlYl9mcmFtZV9wcmludCk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgor ICAgICAgICAod2Via2l0X3dlYl92aWV3X2dyYWJfZm9jdXMpOgorICAgICAgICAod2Via2l0X3dl Yl92aWV3X2ZvY3VzX2luX2V2ZW50KToKKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19zY3JpcHRf ZGlhbG9nKToKKwogMjAxMC0wMy0xOCAgUGhpbGlwIENoaW1lbnRvICA8cGhpbGlwLmNoaW1lbnRv QGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAtLWdp dCBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcCBiL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50R3RrLmNwcAppbmRleCBjNjNhMDNiLi44 N2M3NjZmIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVu dEd0ay5jcHAKKysrIGIvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRHdGsu Y3BwCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiRmlsZUNob29zZXIuaCIKICNpbmNsdWRl ICJGbG9hdFJlY3QuaCIKICNpbmNsdWRlICJGcmFtZUxvYWRSZXF1ZXN0LmgiCisjaW5jbHVkZSAi R3RrVmVyc2lvbmluZy5oIgogI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNsdWRlICJQbGF0Zm9y bVN0cmluZy5oIgogI2luY2x1ZGUgIkNTdHJpbmcuaCIKQEAgLTY1LDExICs2Niw3IEBAIHZvaWQg Q2hyb21lQ2xpZW50OjpjaHJvbWVEZXN0cm95ZWQoKQogRmxvYXRSZWN0IENocm9tZUNsaWVudDo6 d2luZG93UmVjdCgpCiB7CiAgICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0X2dldF90 b3BsZXZlbChHVEtfV0lER0VUKG1fd2ViVmlldykpOwotI2lmIEdUS19DSEVDS19WRVJTSU9OKDIs IDE4LCAwKQogICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRvdykpIHsKLSNlbHNl Ci0gICAgaWYgKEdUS19XSURHRVRfVE9QTEVWRUwod2luZG93KSkgewotI2VuZGlmCiAgICAgICAg IGdpbnQgbGVmdCwgdG9wLCB3aWR0aCwgaGVpZ2h0OwogICAgICAgICBndGtfd2luZG93X2dldF9w b3NpdGlvbihHVEtfV0lORE9XKHdpbmRvdyksICZsZWZ0LCAmdG9wKTsKICAgICAgICAgZ3RrX3dp bmRvd19nZXRfc2l6ZShHVEtfV0lORE9XKHdpbmRvdyksICZ3aWR0aCwgJmhlaWdodCk7CkBAIC05 OCwxMSArOTUsNyBAQCB2b2lkIENocm9tZUNsaWVudDo6c2V0V2luZG93UmVjdChjb25zdCBGbG9h dFJlY3QmIHJlY3QpCiAgICAgICAgIHJldHVybjsKIAogICAgIEd0a1dpZGdldCogd2luZG93ID0g Z3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVChtX3dlYlZpZXcpKTsKLSNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKICAgICBpZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3 aW5kb3cpKSB7Ci0jZWxzZQotICAgIGlmIChHVEtfV0lER0VUX1RPUExFVkVMKHdpbmRvdykpIHsK LSNlbmRpZgogICAgICAgICBndGtfd2luZG93X21vdmUoR1RLX1dJTkRPVyh3aW5kb3cpLCBpbnRy ZWN0LngoKSwgaW50cmVjdC55KCkpOwogICAgICAgICBndGtfd2luZG93X3Jlc2l6ZShHVEtfV0lO RE9XKHdpbmRvdyksIGludHJlY3Qud2lkdGgoKSwgaW50cmVjdC5oZWlnaHQoKSk7CiAgICAgfQpA QCAtMTI4LDExICsxMjEsNyBAQCB2b2lkIENocm9tZUNsaWVudDo6Zm9jdXMoKQogdm9pZCBDaHJv bWVDbGllbnQ6OnVuZm9jdXMoKQogewogICAgIEd0a1dpZGdldCogd2luZG93ID0gZ3RrX3dpZGdl dF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVChtX3dlYlZpZXcpKTsKLSNpZiBHVEtfQ0hFQ0tfVkVS U0lPTigyLCAxOCwgMCkKICAgICBpZiAoZ3RrX3dpZGdldF9pc190b3BsZXZlbCh3aW5kb3cpKQot I2Vsc2UKLSAgICBpZiAoR1RLX1dJREdFVF9UT1BMRVZFTCh3aW5kb3cpKQotI2VuZGlmCiAgICAg ICAgIGd0a193aW5kb3dfc2V0X2ZvY3VzKEdUS19XSU5ET1cod2luZG93KSwgTlVMTCk7CiB9CiAK QEAgLTI2MCwxMSArMjQ5LDcgQEAgdm9pZCBDaHJvbWVDbGllbnQ6OmNsb3NlV2luZG93U29vbigp CiAKIGJvb2wgQ2hyb21lQ2xpZW50OjpjYW5UYWtlRm9jdXMoRm9jdXNEaXJlY3Rpb24pCiB7Ci0j aWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCiAgICAgcmV0dXJuIGd0a193aWRnZXRfZ2V0 X2Nhbl9mb2N1cyhHVEtfV0lER0VUKG1fd2ViVmlldykpOwotI2Vsc2UKLSAgICByZXR1cm4gR1RL X1dJREdFVF9DQU5fRk9DVVMobV93ZWJWaWV3KTsKLSNlbmRpZgogfQogCiB2b2lkIENocm9tZUNs aWVudDo6dGFrZUZvY3VzKEZvY3VzRGlyZWN0aW9uKQpAQCAtNDM5LDcgKzQyNCw3IEBAIHZvaWQg Q2hyb21lQ2xpZW50Ojpjb250ZW50c1NpemVDaGFuZ2VkKEZyYW1lKiBmcmFtZSwgY29uc3QgSW50 U2l6ZSYgc2l6ZSkgY29uc3QKICAgICAvLyBXZSBuZWVkIHRvIHF1ZXVlIGEgcmVzaXplIHJlcXVl c3Qgb25seSBpZiB0aGUgc2l6ZSBjaGFuZ2VkLAogICAgIC8vIG90aGVyd2lzZSB3ZSBnZXQgaW50 byBhbiBpbmZpbml0ZSBsb29wIQogICAgIEd0a1dpZGdldCogd2lkZ2V0ID0gR1RLX1dJREdFVCht X3dlYlZpZXcpOwotICAgIGlmIChHVEtfV0lER0VUX1JFQUxJWkVEKHdpZGdldCkKKyAgICBpZiAo Z3RrX3dpZGdldF9nZXRfcmVhbGl6ZWQod2lkZ2V0KQogICAgICAgICAmJiAod2lkZ2V0LT5yZXF1 aXNpdGlvbi5oZWlnaHQgIT0gc2l6ZS5oZWlnaHQoKSkKICAgICAgICAgfHwgKHdpZGdldC0+cmVx dWlzaXRpb24ud2lkdGggIT0gc2l6ZS53aWR0aCgpKSkKICAgICAgICAgZ3RrX3dpZGdldF9xdWV1 ZV9yZXNpemVfbm9fcmVkcmF3KHdpZGdldCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRwcml2YXRlLmNwcCBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuY3Bw CmluZGV4IGJlODhiYjUuLjQ0NTA1MWIgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dl YmtpdHByaXZhdGUuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHByaXZhdGUuY3Bw CkBAIC0yOCw2ICsyOCw3IEBACiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZUxv YWRlci5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyQ2xpZW50R3RrLmgiCisjaW5jbHVkZSAiR3Rr VmVyc2lvbmluZy5oIgogI2luY2x1ZGUgIkhpdFRlc3RSZXN1bHQuaCIKICNpbmNsdWRlICJJY29u RGF0YWJhc2UuaCIKICNpbmNsdWRlIDxsaWJpbnRsLmg+CkBAIC0yMjMsMTEgKzIyNCw3IEBAIHN0 YXRpYyBHdGtXaWRnZXQqIGN1cnJlbnRUb3BsZXZlbENhbGxiYWNrKFdlYktpdFNvdXBBdXRoRGlh bG9nKiBmZWF0dXJlLCBTb3VwTWVzCiAgICAgICAgIHJldHVybiBOVUxMOwogCiAgICAgR3RrV2lk Z2V0KiB0b3BsZXZlbCA9ICBndGtfd2lkZ2V0X2dldF90b3BsZXZlbChHVEtfV0lER0VUKGZyYW1l LT5wYWdlKCktPmNocm9tZSgpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSkpOwotI2lmIEdUS19DSEVD S19WRVJTSU9OKDIsIDE4LCAwKQogICAgIGlmIChndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHRvcGxl dmVsKSkKLSNlbHNlCi0gICAgaWYgKEdUS19XSURHRVRfVE9QTEVWRUwodG9wbGV2ZWwpKQotI2Vu ZGlmCiAgICAgICAgIHJldHVybiB0b3BsZXZlbDsKICAgICBlbHNlCiAgICAgICAgIHJldHVybiBO VUxMOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwIGIv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2ViZnJhbWUuY3BwCmluZGV4IDk4NzZjMWEuLmU0NDFj MmEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYmZyYW1lLmNwcAorKysg Yi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJmcmFtZS5jcHAKQEAgLTQ1LDYgKzQ1LDcgQEAK ICNpbmNsdWRlIDxnbGliL2dpMThuLWxpYi5oPgogI2luY2x1ZGUgIkdDQ29udHJvbGxlci5oIgog I2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUgIkd0a1ZlcnNpb25pbmcuaCIK ICNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKICNpbmNsdWRlICJKU0RPTVdpbmRv dy5oIgogI2luY2x1ZGUgIkpTTG9jay5oIgpAQCAtOTU2LDExICs5NTcsNyBAQCBHdGtQcmludE9w ZXJhdGlvblJlc3VsdCB3ZWJraXRfd2ViX2ZyYW1lX3ByaW50X2Z1bGwoV2ViS2l0V2ViRnJhbWUq IGZyYW1lLCBHdGtQcgogCiAgICAgR3RrV2lkZ2V0KiB0b3BMZXZlbCA9IGd0a193aWRnZXRfZ2V0 X3RvcGxldmVsKEdUS19XSURHRVQod2Via2l0X3dlYl9mcmFtZV9nZXRfd2ViX3ZpZXcoZnJhbWUp KSk7CiAKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigyLCAxOCwgMCkKICAgICBpZiAoIWd0a193aWRn ZXRfaXNfdG9wbGV2ZWwodG9wTGV2ZWwpKQotI2Vsc2UKLSAgICBpZiAoIUdUS19XSURHRVRfVE9Q TEVWRUwodG9wTGV2ZWwpKQotI2VuZGlmCiAgICAgICAgIHRvcExldmVsID0gTlVMTDsKIAogICAg IEZyYW1lKiBjb3JlRnJhbWUgPSBjb3JlKGZyYW1lKTsKQEAgLTk5OSwxOSArOTk2LDExIEBAIHZv aWQgd2Via2l0X3dlYl9mcmFtZV9wcmludChXZWJLaXRXZWJGcmFtZSogZnJhbWUpCiAKICAgICBp ZiAoZXJyb3IpIHsKICAgICAgICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtfd2lkZ2V0X2dldF90 b3BsZXZlbChHVEtfV0lER0VUKHByaXYtPndlYlZpZXcpKTsKLSNpZiBHVEtfQ0hFQ0tfVkVSU0lP TigyLCAxOCwgMCkKICAgICAgICAgR3RrV2lkZ2V0KiBkaWFsb2cgPSBndGtfbWVzc2FnZV9kaWFs b2dfbmV3KGd0a193aWRnZXRfaXNfdG9wbGV2ZWwod2luZG93KSA/IEdUS19XSU5ET1cod2luZG93 KSA6IDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHVEtfRElBTE9HX0RFU1RST1lfV0lUSF9QQVJFTlQsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHVEtfTUVTU0FHRV9FUlJPUiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdUS19CVVRUT05TX0NM T1NFLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IiVzIiwgZXJyb3ItPm1lc3NhZ2UpOwotI2Vsc2UKLSAgICAgICAgR3RrV2lkZ2V0KiBkaWFsb2cg PSBndGtfbWVzc2FnZV9kaWFsb2dfbmV3KEdUS19XSURHRVRfVE9QTEVWRUwod2luZG93KSA/IEdU S19XSU5ET1cod2luZG93KSA6IDAsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBHVEtfRElBTE9HX0RFU1RST1lfV0lUSF9QQVJFTlQsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHVEtfTUVTU0FHRV9F UlJPUiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEdUS19CVVRUT05TX0NMT1NFLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIiVzIiwgZXJyb3ItPm1lc3NhZ2UpOwotI2VuZGlmCiAKICAgICAgICAg Z19lcnJvcl9mcmVlKGVycm9yKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0d2Vidmlldy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAppbmRl eCBkOGU4NTRiLi5iOWZkMjgzIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcApAQCAt NjQsNiArNjQsNyBAQAogI2luY2x1ZGUgPGdsaWIvZ2kxOG4tbGliLmg+CiAjaW5jbHVkZSA8R093 blB0ci5oPgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgorI2luY2x1ZGUgIkd0a1ZlcnNp b25pbmcuaCIKICNpbmNsdWRlICJIaXRUZXN0UmVxdWVzdC5oIgogI2luY2x1ZGUgIkhpdFRlc3RS ZXN1bHQuaCIKICNpbmNsdWRlICJJY29uRGF0YWJhc2UuaCIKQEAgLTY5NiwxMSArNjk3LDcgQEAg c3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3NpemVfYWxsb2NhdGUoR3RrV2lkZ2V0KiB3aWRn ZXQsIEd0a0FsbG9jYXRpb24qIGFsbG8KIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld19ncmFi X2ZvY3VzKEd0a1dpZGdldCogd2lkZ2V0KQogewogCi0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwg MTgsIDApCiAgICAgaWYgKGd0a193aWRnZXRfaXNfc2Vuc2l0aXZlKHdpZGdldCkpIHsKLSNlbHNl Ci0gICAgaWYgKEdUS19XSURHRVRfSVNfU0VOU0lUSVZFKHdpZGdldCkpIHsKLSNlbmRpZgogICAg ICAgICBXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdpZGdldCk7CiAg ICAgICAgIEZvY3VzQ29udHJvbGxlciogZm9jdXNDb250cm9sbGVyID0gY29yZSh3ZWJWaWV3KS0+ Zm9jdXNDb250cm9sbGVyKCk7CiAKQEAgLTcyMCwxMSArNzE3LDcgQEAgc3RhdGljIGdib29sZWFu IHdlYmtpdF93ZWJfdmlld19mb2N1c19pbl9ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2RrRXZl bnRGb2N1cyoKICAgICAvLyBUT0RPOiBJbXByb3ZlIGZvY3VzIGhhbmRsaW5nIGFzIHN1Z2dlc3Rl ZCBpbgogICAgIC8vIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTEw CiAgICAgR3RrV2lkZ2V0KiB0b3BsZXZlbCA9IGd0a193aWRnZXRfZ2V0X3RvcGxldmVsKHdpZGdl dCk7Ci0jaWYgR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTgsIDApCiAgICAgaWYgKGd0a193aWRnZXRf aXNfdG9wbGV2ZWwodG9wbGV2ZWwpICYmIGd0a193aW5kb3dfaGFzX3RvcGxldmVsX2ZvY3VzKEdU S19XSU5ET1codG9wbGV2ZWwpKSkgewotI2Vsc2UKLSAgICBpZiAoR1RLX1dJREdFVF9UT1BMRVZF TCh0b3BsZXZlbCkgJiYgZ3RrX3dpbmRvd19oYXNfdG9wbGV2ZWxfZm9jdXMoR1RLX1dJTkRPVyh0 b3BsZXZlbCkpKSB7Ci0jZW5kaWYKICAgICAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdF QktJVF9XRUJfVklFVyh3aWRnZXQpOwogICAgICAgICBGb2N1c0NvbnRyb2xsZXIqIGZvY3VzQ29u dHJvbGxlciA9IGNvcmUod2ViVmlldyktPmZvY3VzQ29udHJvbGxlcigpOwogCkBAIC05MjMsMTEg KzkxNiw3IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfd2ViX3ZpZXdfc2NyaXB0X2RpYWxvZyhX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRXZWJGCiAgICAgfQogCiAgICAgd2luZG93ID0g Z3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwoR1RLX1dJREdFVCh3ZWJWaWV3KSk7Ci0jaWYgR1RLX0NI RUNLX1ZFUlNJT04oMiwgMTgsIDApCiAgICAgZGlhbG9nID0gZ3RrX21lc3NhZ2VfZGlhbG9nX25l dyhndGtfd2lkZ2V0X2lzX3RvcGxldmVsKHdpbmRvdykgPyBHVEtfV0lORE9XKHdpbmRvdykgOiAw LCBHVEtfRElBTE9HX0RFU1RST1lfV0lUSF9QQVJFTlQsIG1lc3NhZ2VUeXBlLCBidXR0b25zLCAi JXMiLCBtZXNzYWdlKTsKLSNlbHNlCi0gICAgZGlhbG9nID0gZ3RrX21lc3NhZ2VfZGlhbG9nX25l dyhHVEtfV0lER0VUX1RPUExFVkVMKHdpbmRvdykgPyBHVEtfV0lORE9XKHdpbmRvdykgOiAwLCBH VEtfRElBTE9HX0RFU1RST1lfV0lUSF9QQVJFTlQsIG1lc3NhZ2VUeXBlLCBidXR0b25zLCAiJXMi LCBtZXNzYWdlKTsKLSNlbmRpZgogICAgIGdjaGFyKiB0aXRsZSA9IGdfc3RyY29uY2F0KCJKYXZh U2NyaXB0IC0gIiwgd2Via2l0X3dlYl9mcmFtZV9nZXRfdXJpKGZyYW1lKSwgTlVMTCk7CiAgICAg Z3RrX3dpbmRvd19zZXRfdGl0bGUoR1RLX1dJTkRPVyhkaWFsb2cpLCB0aXRsZSk7CiAgICAgZ19m cmVlKHRpdGxlKTsKLS0gCjEuNy4wCgo=