44534 2010-08-24 10:23:07 -0700 [GTK] GTK3: EventSender and API tests should use gdk_event_new when synthesizing events 2010-08-24 13:09:02 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned abarth eric gustavo webkit.review.bot xan.lopez oldest_to_newest 268623 0 mrobinson 2010-08-24 10:23:07 -0700 GTK3 events should be created with gdk_event_new instead of allocated on the stack. 268637 1 65294 mrobinson 2010-08-24 10:41:22 -0700 Created attachment 65294 Patch for this issue 268639 2 65294 xan.lopez 2010-08-24 10:43:41 -0700 Comment on attachment 65294 Patch for this issue r=me 268657 3 65294 mrobinson 2010-08-24 11:08:23 -0700 Comment on attachment 65294 Patch for this issue Clearing flags on attachment: 65294 Committed r65915: <http://trac.webkit.org/changeset/65915> 268658 4 mrobinson 2010-08-24 11:08:27 -0700 All reviewed patches have been landed. Closing bug. 268691 5 webkit.review.bot 2010-08-24 11:49:28 -0700 http://trac.webkit.org/changeset/65915 might have broken GTK Linux 64-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/65913 http://trac.webkit.org/changeset/65914 http://trac.webkit.org/changeset/65915 268705 6 65305 mrobinson 2010-08-24 12:17:13 -0700 Created attachment 65305 Fixes related to use of GdkEvent 268709 7 webkit.review.bot 2010-08-24 12:22:24 -0700 Attachment 65305 did not build on gtk: Build output: http://queues.webkit.org/results/3748626 268710 8 65305 xan.lopez 2010-08-24 12:23:02 -0700 Comment on attachment 65305 Fixes related to use of GdkEvent OK, good catch. 268712 9 65305 mrobinson 2010-08-24 12:26:49 -0700 Comment on attachment 65305 Fixes related to use of GdkEvent Clearing flags on attachment: 65305 Committed r65922: <http://trac.webkit.org/changeset/65922> 268713 10 mrobinson 2010-08-24 12:26:55 -0700 All reviewed patches have been landed. Closing bug. 268739 11 webkit.review.bot 2010-08-24 13:09:02 -0700 http://trac.webkit.org/changeset/65922 might have broken Leopard Intel Release (Tests) 65294 2010-08-24 10:41:22 -0700 2010-08-24 12:17:10 -0700 Patch for this issue bug-44534-20100824104121.patch text/plain 16188 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggZWMwODAxYzdhMWE1ZDMxYzI2ODJkN2YwMTVmOWU0ODBiZjg5YTU5Ny4uMDhhYzM3ODE2 YWE3YTgxNTBkMDM3YTVmMWVlYjAzYTRlNDM3MDBmOCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAx MC0wOC0yNCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gR1RLMzogRXZl bnRTZW5kZXIgYW5kIEFQSSB0ZXN0cyBzaG91bGQgdXNlIGdka19ldmVudF9uZXcgd2hlbiBzeW50 aGVzaXppbmcgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00NDUzNAorCisgICAgICAgICogdGVzdHMvdGVzdGNvcHlhbmRwYXN0ZS5jOgorICAg ICAgICAocnVuUGFzdGVUZXN0Q2FsbGJhY2spOiBTd2l0Y2ggdG8gdXNpbmcgZ2RrX2V2ZW50X25l dyBhbmQgYWxzbyByZWZlcmVuY2UgdGhlIEdka1dpbmRvdy4KKyAgICAgICAgd2hlbiBzZXR0aW5n IGl0IG9uIHRoZSBldmVudC4gSXQgaXMgZGVyZWZlcmVuY2VkIGJ5IGdka19ldmVudF9mcmVlKC4u LikuCisgICAgICAgICogdGVzdHMvdGVzdGhpdHRlc3RyZXN1bHQuYzoKKyAgICAgICAgKGxvYWRf c3RhdHVzX2NiKTogU3dpdGNoIHRvIHVzaW5nIGdka19ldmVudF9uZXcuCisKIDIwMTAtMDgtMjQg IEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+ CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgWGFuIExvcGV6LgpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay90ZXN0cy90ZXN0Y29weWFuZHBhc3RlLmMgYi9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rj b3B5YW5kcGFzdGUuYwppbmRleCAwZWY5MWQxMDc0ZWU2NDc1ZTYxZmU2N2UyODQ1NGFlYzliNWE1 NWU4Li5mM2IxNzgzY2I4ZGFmM2I3ZTVjNzgyMDlmNWYyYzEzNTNiNTJhOTczIDEwMDY0NAotLS0g YS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3Rjb3B5YW5kcGFzdGUuYworKysgYi9XZWJLaXQvZ3RrL3Rl c3RzL3Rlc3Rjb3B5YW5kcGFzdGUuYwpAQCAtMTI4LDIxICsxMjgsMjIgQEAgc3RhdGljIENvcHlB bmRQYXN0ZUZpeHR1cmUqIGN1cnJlbnRGaXh0dXJlOwogc3RhdGljIEpTVmFsdWVSZWYgcnVuUGFz dGVUZXN0Q2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9u LCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNW YWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQogewogICAgIC8vIFNp bXVsYXRlIGEgcGFzdGUga2V5Ym9hcmQgc2VxdWVuY2UuCi0gICAgR2RrRXZlbnQgZXZlbnQ7Ci0g ICAgbWVtc2V0KCZldmVudCwgMCwgc2l6ZW9mKGV2ZW50KSk7Ci0gICAgZXZlbnQua2V5LmtleXZh bCA9IGdka191bmljb2RlX3RvX2tleXZhbCgndicpOwotICAgIGV2ZW50LmtleS5zdGF0ZSA9IEdE S19DT05UUk9MX01BU0s7Ci0gICAgZXZlbnQua2V5LndpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3dp bmRvdyhHVEtfV0lER0VUKGN1cnJlbnRGaXh0dXJlLT53ZWJWaWV3KSk7CisgICAgR2RrRXZlbnQq IGV2ZW50ID0gZ2RrX2V2ZW50X25ldyhHREtfS0VZX1BSRVNTKTsKKyAgICBldmVudC0+a2V5Lmtl eXZhbCA9IGdka191bmljb2RlX3RvX2tleXZhbCgndicpOworICAgIGV2ZW50LT5rZXkuc3RhdGUg PSBHREtfQ09OVFJPTF9NQVNLOworICAgIGV2ZW50LT5rZXkud2luZG93ID0gZ3RrX3dpZGdldF9n ZXRfd2luZG93KEdUS19XSURHRVQoY3VycmVudEZpeHR1cmUtPndlYlZpZXcpKTsKKyAgICBnX29i amVjdF9yZWYoZXZlbnQtPmtleS53aW5kb3cpOwogICAgIEdka0tleW1hcEtleSoga2V5czsKICAg ICBnaW50IG5fa2V5czsKLSAgICBpZiAoZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFs KGdka19rZXltYXBfZ2V0X2RlZmF1bHQoKSwgZXZlbnQua2V5LmtleXZhbCwgJmtleXMsICZuX2tl eXMpKSB7Ci0gICAgICAgIGV2ZW50LmtleS5oYXJkd2FyZV9rZXljb2RlID0ga2V5c1swXS5rZXlj b2RlOworICAgIGlmIChnZGtfa2V5bWFwX2dldF9lbnRyaWVzX2Zvcl9rZXl2YWwoZ2RrX2tleW1h cF9nZXRfZGVmYXVsdCgpLCBldmVudC0+a2V5LmtleXZhbCwgJmtleXMsICZuX2tleXMpKSB7Cisg ICAgICAgIGV2ZW50LT5rZXkuaGFyZHdhcmVfa2V5Y29kZSA9IGtleXNbMF0ua2V5Y29kZTsKICAg ICAgICAgZ19mcmVlKGtleXMpOwogICAgIH0KLSAgICBldmVudC5rZXkudHlwZSA9IEdES19LRVlf UFJFU1M7Ci0gICAgZ3RrX21haW5fZG9fZXZlbnQoJmV2ZW50KTsKLSAgICBldmVudC5rZXkudHlw ZSA9IEdES19LRVlfUkVMRUFTRTsKLSAgICBndGtfbWFpbl9kb19ldmVudCgmZXZlbnQpOworCisg ICAgZ3RrX21haW5fZG9fZXZlbnQoZXZlbnQpOworICAgIGV2ZW50LT5rZXkudHlwZSA9IEdES19L RVlfUkVMRUFTRTsKKyAgICBndGtfbWFpbl9kb19ldmVudChldmVudCk7CisgICAgZ2RrX2V2ZW50 X2ZyZWUoZXZlbnQpOwogCiAgICAgSlNTdHJpbmdSZWYgc2NyaXB0U3RyaW5nID0gSlNTdHJpbmdD cmVhdGVXaXRoVVRGOENTdHJpbmcoImRvY3VtZW50LmJvZHkuaW5uZXJIVE1MOyIpOwogICAgIEpT VmFsdWVSZWYgdmFsdWUgPSBKU0V2YWx1YXRlU2NyaXB0KGNvbnRleHQsIHNjcmlwdFN0cmluZywg MCwgMCwgMCwgMCk7CmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RoaXR0ZXN0cmVz dWx0LmMgYi9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RoaXR0ZXN0cmVzdWx0LmMKaW5kZXggODlmZTk1 Y2I3NGFmNDQ3NjczNTkwMTlkNzhlNjZjM2U0MzA1YWU0Mi4uMGQ3ZmIwNTFhMDFkZDdkOTQ2NGQ1 OGEyNWExNGEyOGNjZmY0YzZhZSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay90ZXN0cy90ZXN0aGl0 dGVzdHJlc3VsdC5jCisrKyBiL1dlYktpdC9ndGsvdGVzdHMvdGVzdGhpdHRlc3RyZXN1bHQuYwpA QCAtODEsMTUgKzgxLDE1IEBAIGxvYWRfc3RhdHVzX2NiKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcs CiAgICAgaWYgKHN0YXR1cyA9PSBXRUJLSVRfTE9BRF9GSU5JU0hFRCkgewogICAgICAgICBXZWJL aXRIaXRUZXN0UmVzdWx0KiByZXN1bHQ7CiAgICAgICAgIGd1aW50IGNvbnRleHQ7Ci0gICAgICAg IEdka0V2ZW50QnV0dG9uIGV2ZW50OworICAgICAgICBHZGtFdmVudCogZXZlbnQgPSBnZGtfZXZl bnRfbmV3KEdES19CVVRUT05fUFJFU1MpOwogICAgICAgICBXZWJLaXRET01Ob2RlKiBub2RlOwog Ci0gICAgICAgIGV2ZW50LnR5cGUgPSBHREtfQlVUVE9OX1BSRVNTOwogICAgICAgICAvKiBDbG9z ZSBlbm91Z2ggdG8gMCwwICovCi0gICAgICAgIGV2ZW50LnggPSA1OwotICAgICAgICBldmVudC55 ID0gNTsKKyAgICAgICAgZXZlbnQtPmJ1dHRvbi54ID0gNTsKKyAgICAgICAgZXZlbnQtPmJ1dHRv bi55ID0gNTsKIAotICAgICAgICByZXN1bHQgPSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X2hpdF90ZXN0 X3Jlc3VsdCh3ZWJWaWV3LCAmZXZlbnQpOworICAgICAgICByZXN1bHQgPSB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X2hpdF90ZXN0X3Jlc3VsdCh3ZWJWaWV3LCAoR2RrRXZlbnRCdXR0b24qKSBldmVudCk7 CisgICAgICAgIGdka19ldmVudF9mcmVlKGV2ZW50KTsKICAgICAgICAgZ19hc3NlcnQocmVzdWx0 KTsKIAogICAgICAgICBnX29iamVjdF9nZXQocmVzdWx0LCAiY29udGV4dCIsICZjb250ZXh0LCBO VUxMKTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0No YW5nZUxvZwppbmRleCAxNjYxOTRiNWIwNjYzNmNlZjQxYWEyOTkyODIyMDQwYWFiMDUxODkwLi5l NjM3MTA5MzQ0MTk5NjA4MzdhNjU1NTMxZGI5ZTE5MWRmMzA1NjExIDEwMDY0NAotLS0gYS9XZWJL aXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjIgQEAKKzIwMTAtMDgtMjQgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtd IEdUSzM6IEV2ZW50U2VuZGVyIGFuZCBBUEkgdGVzdHMgc2hvdWxkIHVzZSBnZGtfZXZlbnRfbmV3 IHdoZW4gc3ludGhlc2l6aW5nIGV2ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDQ1MzQKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9F dmVudFNlbmRlci5jcHA6CisgICAgICAgIChwcmVwYXJlTW91c2VCdXR0b25FdmVudCk6IFVzZSBn ZGtfZXZlbnRfbmV3IGFuZCByZWZlcmVuY2UgdGhlIHJlZmVyZW5jZSB0aGUgR2RrV2luZG93Cisg ICAgICAgIHdoZW4gc2V0dGluZyBpdCBvbiB0aGUgZXZlbnQuIEl0IGlzIGRlcmVmZXJlbmNlZCBi eSBnZGtfZXZlbnRfZnJlZSguLi4pLgorICAgICAgICAoY29udGV4dENsaWNrQ2FsbGJhY2spOiBE aXR0by4KKyAgICAgICAgKG1vdXNlRG93bkNhbGxiYWNrKTogRGl0dG8uCisgICAgICAgIChtb3Vz ZVVwQ2FsbGJhY2spOiBEaXR0by4KKyAgICAgICAgKG1vdXNlTW92ZVRvQ2FsbGJhY2spOiBEaXR0 by4KKyAgICAgICAgKG1vdXNlV2hlZWxUb0NhbGxiYWNrKTogRGl0dG8uCisgICAgICAgIChzZW5k T3JRdWV1ZUV2ZW50KTogVGFrZSBhIEdka0V2ZW50KiBpbnN0ZWFkIG9mIGEgR2RrRXZlbnQuCisg ICAgICAgIChkaXNwYXRjaEV2ZW50KTogRGl0dG8uIEFsc28gZnJlZSB0aGUgZXZlbnQgd2hlbiB3 ZSBhcmUgZG9uZSB3aXRoIGl0LgorICAgICAgICAoa2V5RG93bkNhbGxiYWNrKTogVXNlIGdka19l dmVudF9uZXcgYW5kIHJlZmVyZW5jZSB0aGUgR2RrV2luZG93LgorCiAyMDEwLTA4LTI0ICBBbmRy YXMgQmVjc2kgIDxhYmVjc2lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFdlYktpdDIgYnVp bGQgZml4LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50 U2VuZGVyLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5j cHAKaW5kZXggNTQ2ZDhjZTAxYTk1NWQ5MmM3OWVkMWFjMzU0OGM5OTlkMDE5N2ZhMC4uMzk5YTZj YzY3NzhiMTc4NDc0YWI3ZjEzZDE0ZWRjOGRiY2E5ZmM3OSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcAorKysgYi9XZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwCkBAIC02Myw3ICs2Myw3IEBAIHN0YXRp YyBpbnQgY2xpY2tDb3VudDsKIEdka0RyYWdDb250ZXh0KiBjdXJyZW50RHJhZ1NvdXJjZUNvbnRl eHQ7CiAKIHN0cnVjdCBEZWxheWVkTWVzc2FnZSB7Ci0gICAgR2RrRXZlbnQgZXZlbnQ7CisgICAg R2RrRXZlbnQqIGV2ZW50OwogICAgIGd1bG9uZyBkZWxheTsKIH07CiAKQEAgLTgyLDggKzgyLDgg QEAgZW51bSBLZXlMb2NhdGlvbkNvZGUgewogICAgIERPTV9LRVlfTE9DQVRJT05fTlVNUEFEICAg ICAgICA9IDB4MDMKIH07CiAKLXN0YXRpYyB2b2lkIHNlbmRPclF1ZXVlRXZlbnQoR2RrRXZlbnQs IGJvb2wgPSB0cnVlKTsKLXN0YXRpYyB2b2lkIGRpc3BhdGNoRXZlbnQoR2RrRXZlbnQgZXZlbnQp Oworc3RhdGljIHZvaWQgc2VuZE9yUXVldWVFdmVudChHZGtFdmVudCosIGJvb2wgPSB0cnVlKTsK K3N0YXRpYyB2b2lkIGRpc3BhdGNoRXZlbnQoR2RrRXZlbnQqIGV2ZW50KTsKIHN0YXRpYyBndWlu dCBnZXRTdGF0ZUZsYWdzKCk7CiAKICNpZiAhR1RLX0NIRUNLX1ZFUlNJT04oMiwgMTcsIDMpCkBA IC0xNTIsMTUgKzE1MiwxNSBAQCBib29sIHByZXBhcmVNb3VzZUJ1dHRvbkV2ZW50KEdka0V2ZW50 KiBldmVudCwgaW50IGV2ZW50U2VuZGVyQnV0dG9uTnVtYmVyKQogICAgICAgICBnZGtCdXR0b25O dW1iZXIgPSBldmVudFNlbmRlckJ1dHRvbk51bWJlciArIDE7CiAKICAgICAvLyBmYXN0L2V2ZW50 cy9tb3VzZS1jbGljay1ldmVudHMgZXhwZWN0cyB0aGUgNHRoIGJ1dHRvbgotICAgIC8vIHRvIGJl IGV2ZW50LmJ1dHRvbiA9IDEsIHNvIHNlbmQgYSBtaWRkbGUtYnV0dG9uIGV2ZW50LgorICAgIC8v IHRvIGJlIGV2ZW50LT5idXR0b24gPSAxLCBzbyBzZW5kIGEgbWlkZGxlLWJ1dHRvbiBldmVudC4K ICAgICBlbHNlIGlmIChldmVudFNlbmRlckJ1dHRvbk51bWJlciA9PSAzKQogICAgICAgICBnZGtC dXR0b25OdW1iZXIgPSAyOwogCi0gICAgbWVtc2V0KGV2ZW50LCAwLCBzaXplb2YoZXZlbnQpKTsK ICAgICBldmVudC0+YnV0dG9uLmJ1dHRvbiA9IGdka0J1dHRvbk51bWJlcjsKICAgICBldmVudC0+ YnV0dG9uLnggPSBsYXN0TW91c2VQb3NpdGlvblg7CiAgICAgZXZlbnQtPmJ1dHRvbi55ID0gbGFz dE1vdXNlUG9zaXRpb25ZOwogICAgIGV2ZW50LT5idXR0b24ud2luZG93ID0gZ3RrX3dpZGdldF9n ZXRfd2luZG93KEdUS19XSURHRVQodmlldykpOworICAgIGdfb2JqZWN0X3JlZihldmVudC0+YnV0 dG9uLndpbmRvdyk7CiAgICAgZXZlbnQtPmJ1dHRvbi5kZXZpY2UgPSBnZGtfZGV2aWNlX2dldF9j b3JlX3BvaW50ZXIoKTsKICAgICBldmVudC0+YnV0dG9uLnN0YXRlID0gZ2V0U3RhdGVGbGFncygp OwogICAgIGV2ZW50LT5idXR0b24udGltZSA9IEdES19DVVJSRU5UX1RJTUU7CkBAIC0xNzYsMTMg KzE3NiwxMiBAQCBib29sIHByZXBhcmVNb3VzZUJ1dHRvbkV2ZW50KEdka0V2ZW50KiBldmVudCwg aW50IGV2ZW50U2VuZGVyQnV0dG9uTnVtYmVyKQogCiBzdGF0aWMgSlNWYWx1ZVJlZiBjb250ZXh0 Q2xpY2tDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24s IEpTT2JqZWN0UmVmIHRoaXNPYmplY3QsIHNpemVfdCBhcmd1bWVudENvdW50LCBjb25zdCBKU1Zh bHVlUmVmIGFyZ3VtZW50c1tdLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCiB7Ci0gICAgR2RrRXZl bnQgZXZlbnQ7Ci0gICAgaWYgKCFwcmVwYXJlTW91c2VCdXR0b25FdmVudCgmZXZlbnQsIDIpKQor ICAgIEdka0V2ZW50KiBldmVudCA9IGdka19ldmVudF9uZXcoR0RLX0JVVFRPTl9QUkVTUyk7Cisg ICAgaWYgKCFwcmVwYXJlTW91c2VCdXR0b25FdmVudChldmVudCwgMikpCiAgICAgICAgIHJldHVy biBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKIAotICAgIGV2ZW50LnR5cGUgPSBHREtf QlVUVE9OX1BSRVNTOwogICAgIHNlbmRPclF1ZXVlRXZlbnQoZXZlbnQpOwotICAgIGV2ZW50LnR5 cGUgPSBHREtfQlVUVE9OX1JFTEVBU0U7CisgICAgZXZlbnQtPnR5cGUgPSBHREtfQlVUVE9OX1JF TEVBU0U7CiAgICAgc2VuZE9yUXVldWVFdmVudChldmVudCk7CiAKICAgICByZXR1cm4gSlNWYWx1 ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CkBAIC0yMDcsMTEgKzIwNiwxMSBAQCBzdGF0aWMgSlNW YWx1ZVJlZiBtb3VzZURvd25DYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RS ZWYgZnVuY3Rpb24sCiAgICAgICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKCghZXhjZXB0aW9uIHx8 ICEqZXhjZXB0aW9uKSwgSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCkpOwogICAgIH0KIAot ICAgIEdka0V2ZW50IGV2ZW50OwotICAgIGlmICghcHJlcGFyZU1vdXNlQnV0dG9uRXZlbnQoJmV2 ZW50LCBidXR0b24pKQorICAgIEdka0V2ZW50KiBldmVudCA9IGdka19ldmVudF9uZXcoR0RLX0JV VFRPTl9QUkVTUyk7CisgICAgaWYgKCFwcmVwYXJlTW91c2VCdXR0b25FdmVudChldmVudCwgYnV0 dG9uKSkKICAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOwogCi0g ICAgYnV0dG9uQ3VycmVudGx5RG93biA9IGV2ZW50LmJ1dHRvbi5idXR0b247CisgICAgYnV0dG9u Q3VycmVudGx5RG93biA9IGV2ZW50LT5idXR0b24uYnV0dG9uOwogCiAgICAgLy8gTm9ybWFsbHkg R0RLIHdpbGwgc2VuZCBib3RoIEdES19CVVRUT05fUFJFU1MgYW5kIEdES18yQlVUVE9OX1BSRVNT IGZvcgogICAgIC8vIHRoZSBzZWNvbmQgYnV0dG9uIHByZXNzIGR1cmluZyBkb3VibGUtY2xpY2tz LiBXZWJLaXQgR1RLKyBzZWxlY3RpdmVseQpAQCAtMjIxLDEzICsyMjAsMTEgQEAgc3RhdGljIEpT VmFsdWVSZWYgbW91c2VEb3duQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0 UmVmIGZ1bmN0aW9uLAogICAgIC8vIGl0IGhlcmUuIEV2ZW50dWFsbHkgdGhpcyBjb2RlIHNob3Vs ZCBwcm9iYWJseSBmaWd1cmUgb3V0IGEgd2F5IHRvIGdldCBhbGwKICAgICAvLyBhcHByb3ByaWF0 ZSBldmVudHMgb250byB0aGUgZXZlbnQgcXVldWUgYW5kIHRoaXMgd29yay1hcm91bmQgc2hvdWxk IGJlCiAgICAgLy8gcmVtb3ZlZC4KLSAgICB1cGRhdGVDbGlja0NvdW50KGV2ZW50LmJ1dHRvbi5i dXR0b24pOworICAgIHVwZGF0ZUNsaWNrQ291bnQoZXZlbnQtPmJ1dHRvbi5idXR0b24pOwogICAg IGlmIChjbGlja0NvdW50ID09IDIpCi0gICAgICAgIGV2ZW50LnR5cGUgPSBHREtfMkJVVFRPTl9Q UkVTUzsKKyAgICAgICAgZXZlbnQtPnR5cGUgPSBHREtfMkJVVFRPTl9QUkVTUzsKICAgICBlbHNl IGlmIChjbGlja0NvdW50ID09IDMpCi0gICAgICAgIGV2ZW50LnR5cGUgPSBHREtfM0JVVFRPTl9Q UkVTUzsKLSAgICBlbHNlCi0gICAgICAgIGV2ZW50LnR5cGUgPSBHREtfQlVUVE9OX1BSRVNTOwor ICAgICAgICBldmVudC0+dHlwZSA9IEdES18zQlVUVE9OX1BSRVNTOwogCiAgICAgc2VuZE9yUXVl dWVFdmVudChldmVudCk7CiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQp OwpAQCAtMjUyLDggKzI0OSw4IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlVXBDYWxsYmFjayhK U0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgZnVuY3Rpb24sIEpTCiAgICAgICAgIGdf cmV0dXJuX3ZhbF9pZl9mYWlsKCghZXhjZXB0aW9uIHx8ICEqZXhjZXB0aW9uKSwgSlNWYWx1ZU1h a2VVbmRlZmluZWQoY29udGV4dCkpOwogICAgIH0KIAotICAgIEdka0V2ZW50IGV2ZW50OwotICAg IGlmICghcHJlcGFyZU1vdXNlQnV0dG9uRXZlbnQoJmV2ZW50LCBidXR0b24pKQorICAgIEdka0V2 ZW50KiBldmVudCA9IGdka19ldmVudF9uZXcoR0RLX0JVVFRPTl9SRUxFQVNFKTsKKyAgICBpZiAo IXByZXBhcmVNb3VzZUJ1dHRvbkV2ZW50KGV2ZW50LCBidXR0b24pKQogICAgICAgICByZXR1cm4g SlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CiAKICAgICBsYXN0Q2xpY2tQb3NpdGlvblgg PSBsYXN0TW91c2VQb3NpdGlvblg7CkBAIC0yNjIsNyArMjU5LDYgQEAgc3RhdGljIEpTVmFsdWVS ZWYgbW91c2VVcENhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5j dGlvbiwgSlMKICAgICBsYXN0Q2xpY2tUaW1lT2Zmc2V0ID0gdGltZU9mZnNldDsKICAgICBidXR0 b25DdXJyZW50bHlEb3duID0gMDsKIAotICAgIGV2ZW50LnR5cGUgPSBHREtfQlVUVE9OX1JFTEVB U0U7CiAgICAgc2VuZE9yUXVldWVFdmVudChldmVudCk7CiAgICAgcmV0dXJuIEpTVmFsdWVNYWtl VW5kZWZpbmVkKGNvbnRleHQpOwogfQpAQCAtMjgxLDIyICsyNzcsMjEgQEAgc3RhdGljIEpTVmFs dWVSZWYgbW91c2VNb3ZlVG9DYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RS ZWYgZnVuY3Rpb24KICAgICBsYXN0TW91c2VQb3NpdGlvblkgPSAoaW50KUpTVmFsdWVUb051bWJl cihjb250ZXh0LCBhcmd1bWVudHNbMV0sIGV4Y2VwdGlvbik7CiAgICAgZ19yZXR1cm5fdmFsX2lm X2ZhaWwoKCFleGNlcHRpb24gfHwgISpleGNlcHRpb24pLCBKU1ZhbHVlTWFrZVVuZGVmaW5lZChj b250ZXh0KSk7CiAKLSAgICBHZGtFdmVudCBldmVudDsKLSAgICBtZW1zZXQoJmV2ZW50LCAwLCBz aXplb2YoZXZlbnQpKTsKLSAgICBldmVudC50eXBlID0gR0RLX01PVElPTl9OT1RJRlk7Ci0gICAg ZXZlbnQubW90aW9uLnggPSBsYXN0TW91c2VQb3NpdGlvblg7Ci0gICAgZXZlbnQubW90aW9uLnkg PSBsYXN0TW91c2VQb3NpdGlvblk7CisgICAgR2RrRXZlbnQqIGV2ZW50ID0gZ2RrX2V2ZW50X25l dyhHREtfTU9USU9OX05PVElGWSk7CisgICAgZXZlbnQtPm1vdGlvbi54ID0gbGFzdE1vdXNlUG9z aXRpb25YOworICAgIGV2ZW50LT5tb3Rpb24ueSA9IGxhc3RNb3VzZVBvc2l0aW9uWTsKIAotICAg IGV2ZW50Lm1vdGlvbi50aW1lID0gR0RLX0NVUlJFTlRfVElNRTsKLSAgICBldmVudC5tb3Rpb24u d2luZG93ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQodmlldykpOwotICAgIGV2 ZW50Lm1vdGlvbi5kZXZpY2UgPSBnZGtfZGV2aWNlX2dldF9jb3JlX3BvaW50ZXIoKTsKLSAgICBl dmVudC5tb3Rpb24uc3RhdGUgPSBnZXRTdGF0ZUZsYWdzKCk7Ci0gICAgZXZlbnQubW90aW9uLmF4 ZXMgPSAwOworICAgIGV2ZW50LT5tb3Rpb24udGltZSA9IEdES19DVVJSRU5UX1RJTUU7CisgICAg ZXZlbnQtPm1vdGlvbi53aW5kb3cgPSBndGtfd2lkZ2V0X2dldF93aW5kb3coR1RLX1dJREdFVCh2 aWV3KSk7CisgICAgZ19vYmplY3RfcmVmKGV2ZW50LT5tb3Rpb24ud2luZG93KTsKKyAgICBldmVu dC0+bW90aW9uLmRldmljZSA9IGdka19kZXZpY2VfZ2V0X2NvcmVfcG9pbnRlcigpOworICAgIGV2 ZW50LT5tb3Rpb24uc3RhdGUgPSBnZXRTdGF0ZUZsYWdzKCk7CisgICAgZXZlbnQtPm1vdGlvbi5h eGVzID0gMDsKIAogICAgIGludCB4Um9vdCwgeVJvb3Q7CiAgICAgZ2RrX3dpbmRvd19nZXRfcm9v dF9jb29yZHMoZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQodmlldykpLCBsYXN0TW91 c2VQb3NpdGlvblgsIGxhc3RNb3VzZVBvc2l0aW9uWSwgJnhSb290LCAmeVJvb3QpOwotICAgIGV2 ZW50Lm1vdGlvbi54X3Jvb3QgPSB4Um9vdDsKLSAgICBldmVudC5tb3Rpb24ueV9yb290ID0geVJv b3Q7CisgICAgZXZlbnQtPm1vdGlvbi54X3Jvb3QgPSB4Um9vdDsKKyAgICBldmVudC0+bW90aW9u Lnlfcm9vdCA9IHlSb290OwogCiAgICAgc2VuZE9yUXVldWVFdmVudChldmVudCwgZmFsc2UpOwog ICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKQEAgLTMxOSwyMSArMzE0 LDIxIEBAIHN0YXRpYyBKU1ZhbHVlUmVmIG1vdXNlV2hlZWxUb0NhbGxiYWNrKEpTQ29udGV4dFJl ZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvCiAgICAgLy8gR1RLKyBkb2Vzbid0IHN1cHBv cnQgbXVsdGlwbGUgZGlyZWN0aW9uIHNjcm9sbHMgaW4gdGhlIHNhbWUgZXZlbnQhCiAgICAgZ19y ZXR1cm5fdmFsX2lmX2ZhaWwoKCF2ZXJ0aWNhbCB8fCAhaG9yaXpvbnRhbCksIEpTVmFsdWVNYWtl VW5kZWZpbmVkKGNvbnRleHQpKTsKIAotICAgIEdka0V2ZW50IGV2ZW50OwotICAgIGV2ZW50LnR5 cGUgPSBHREtfU0NST0xMOwotICAgIGV2ZW50LnNjcm9sbC54ID0gbGFzdE1vdXNlUG9zaXRpb25Y OwotICAgIGV2ZW50LnNjcm9sbC55ID0gbGFzdE1vdXNlUG9zaXRpb25ZOwotICAgIGV2ZW50LnNj cm9sbC50aW1lID0gR0RLX0NVUlJFTlRfVElNRTsKLSAgICBldmVudC5zY3JvbGwud2luZG93ID0g Z3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQodmlldykpOworICAgIEdka0V2ZW50KiBl dmVudCA9IGdka19ldmVudF9uZXcoR0RLX1NDUk9MTCk7CisgICAgZXZlbnQtPnNjcm9sbC54ID0g bGFzdE1vdXNlUG9zaXRpb25YOworICAgIGV2ZW50LT5zY3JvbGwueSA9IGxhc3RNb3VzZVBvc2l0 aW9uWTsKKyAgICBldmVudC0+c2Nyb2xsLnRpbWUgPSBHREtfQ1VSUkVOVF9USU1FOworICAgIGV2 ZW50LT5zY3JvbGwud2luZG93ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQodmll dykpOworICAgIGdfb2JqZWN0X3JlZihldmVudC0+c2Nyb2xsLndpbmRvdyk7CiAKICAgICBpZiAo aG9yaXpvbnRhbCA8IDApCi0gICAgICAgIGV2ZW50LnNjcm9sbC5kaXJlY3Rpb24gPSBHREtfU0NS T0xMX0xFRlQ7CisgICAgICAgIGV2ZW50LT5zY3JvbGwuZGlyZWN0aW9uID0gR0RLX1NDUk9MTF9M RUZUOwogICAgIGVsc2UgaWYgKGhvcml6b250YWwgPiAwKQotICAgICAgICBldmVudC5zY3JvbGwu ZGlyZWN0aW9uID0gR0RLX1NDUk9MTF9SSUdIVDsKKyAgICAgICAgZXZlbnQtPnNjcm9sbC5kaXJl Y3Rpb24gPSBHREtfU0NST0xMX1JJR0hUOwogICAgIGVsc2UgaWYgKHZlcnRpY2FsIDwgMCkKLSAg ICAgICAgZXZlbnQuc2Nyb2xsLmRpcmVjdGlvbiA9IEdES19TQ1JPTExfVVA7CisgICAgICAgIGV2 ZW50LT5zY3JvbGwuZGlyZWN0aW9uID0gR0RLX1NDUk9MTF9VUDsKICAgICBlbHNlIGlmICh2ZXJ0 aWNhbCA+IDApCi0gICAgICAgIGV2ZW50LnNjcm9sbC5kaXJlY3Rpb24gPSBHREtfU0NST0xMX0RP V047CisgICAgICAgIGV2ZW50LT5zY3JvbGwuZGlyZWN0aW9uID0gR0RLX1NDUk9MTF9ET1dOOwog ICAgIGVsc2UKICAgICAgICAgZ19hc3NlcnRfbm90X3JlYWNoZWQoKTsKIApAQCAtMzUwLDcgKzM0 NSw3IEBAIHN0YXRpYyBKU1ZhbHVlUmVmIGJlZ2luRHJhZ1dpdGhGaWxlc0NhbGxiYWNrKEpTQ29u dGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmCiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5k ZWZpbmVkKGNvbnRleHQpOwogfQogCi1zdGF0aWMgdm9pZCBzZW5kT3JRdWV1ZUV2ZW50KEdka0V2 ZW50IGV2ZW50LCBib29sIHNob3VsZFJlcGxheVNhdmVkRXZlbnRzKQorc3RhdGljIHZvaWQgc2Vu ZE9yUXVldWVFdmVudChHZGtFdmVudCogZXZlbnQsIGJvb2wgc2hvdWxkUmVwbGF5U2F2ZWRFdmVu dHMpCiB7CiAgICAgLy8gTW91c2UgbW92ZSBldmVudHMgYXJlIHF1ZXVlZCBpZiB0aGUgcHJldmlv dXMgZXZlbnQgd2FzIHF1ZXVlZCBvciBpZiBhCiAgICAgLy8gZGVsYXkgd2FzIHNldCB1cCBieSBs ZWFwRm9yd2FyZCgpLgpAQCAtMzY2LDE5ICszNjEsMjMgQEAgc3RhdGljIHZvaWQgc2VuZE9yUXVl dWVFdmVudChHZGtFdmVudCBldmVudCwgYm9vbCBzaG91bGRSZXBsYXlTYXZlZEV2ZW50cykKICAg ICBkaXNwYXRjaEV2ZW50KGV2ZW50KTsKIH0KIAotc3RhdGljIHZvaWQgZGlzcGF0Y2hFdmVudChH ZGtFdmVudCBldmVudCkKK3N0YXRpYyB2b2lkIGRpc3BhdGNoRXZlbnQoR2RrRXZlbnQqIGV2ZW50 KQogewogICAgIHdlYmtpdF93ZWJfZnJhbWVfbGF5b3V0KG1haW5GcmFtZSk7CiAgICAgV2ViS2l0 V2ViVmlldyogdmlldyA9IHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3dlYl92aWV3KG1haW5GcmFtZSk7 Ci0gICAgaWYgKCF2aWV3KQorICAgIGlmICghdmlldykgeworICAgICAgICBnZGtfZXZlbnRfZnJl ZShldmVudCk7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKLSAgICBndGtfbWFpbl9kb19ldmVu dCgmZXZlbnQpOworICAgIGd0a19tYWluX2RvX2V2ZW50KGV2ZW50KTsKIAotICAgIGlmICghY3Vy cmVudERyYWdTb3VyY2VDb250ZXh0KQorICAgIGlmICghY3VycmVudERyYWdTb3VyY2VDb250ZXh0 KSB7CisgICAgICAgIGdka19ldmVudF9mcmVlKGV2ZW50KTsKICAgICAgICAgcmV0dXJuOworICAg IH0KIAotICAgIGlmIChldmVudC50eXBlID09IEdES19NT1RJT05fTk9USUZZKSB7CisgICAgaWYg KGV2ZW50LT50eXBlID09IEdES19NT1RJT05fTk9USUZZKSB7CiAgICAgICAgIC8vIFdlYktpdCBo YXMgY2FsbGVkIGd0a19kcmFnX3N0YXJ0KCksIGJ1dCBiZWNhdXNlIHRoZSBtYWluIGxvb3AgaXNu J3QKICAgICAgICAgLy8gcnVubmluZyBHREsgaW50ZXJuYWxzIGRvbid0IGtub3cgdGhhdCB0aGUg ZHJhZyBoYXMgc3RhcnRlZCB5ZXQuIFB1bXAKICAgICAgICAgLy8gdGhlIG1haW4gbG9vcCBhIGxp dHRsZSBiaXQgc28gdGhhdCBHREsgaXMgaW4gdGhlIGNvcnJlY3Qgc3RhdGUuCkBAIC0zODksMTIg KzM4OCwxMiBAQCBzdGF0aWMgdm9pZCBkaXNwYXRjaEV2ZW50KEdka0V2ZW50IGV2ZW50KQogICAg ICAgICBHdGtXaWRnZXQqIHBhcmVudFdpZGdldCA9IGd0a193aWRnZXRfZ2V0X3BhcmVudChHVEtf V0lER0VUKHZpZXcpKTsKICAgICAgICAgR2RrV2luZG93KiBwYXJlbnRXaWRnZXRXaW5kb3cgPSBn dGtfd2lkZ2V0X2dldF93aW5kb3cocGFyZW50V2lkZ2V0KTsKICAgICAgICAgZ2RrX2RyYWdfbW90 aW9uKGN1cnJlbnREcmFnU291cmNlQ29udGV4dCwgcGFyZW50V2lkZ2V0V2luZG93LCBHREtfRFJB R19QUk9UT19YRE5ELAotICAgICAgICAgICAgZXZlbnQubW90aW9uLnhfcm9vdCwgZXZlbnQubW90 aW9uLnlfcm9vdCwKKyAgICAgICAgICAgIGV2ZW50LT5tb3Rpb24ueF9yb290LCBldmVudC0+bW90 aW9uLnlfcm9vdCwKICAgICAgICAgICAgIGdka19kcmFnX2NvbnRleHRfZ2V0X3NlbGVjdGVkX2Fj dGlvbihjdXJyZW50RHJhZ1NvdXJjZUNvbnRleHQpLAogICAgICAgICAgICAgZ2RrX2RyYWdfY29u dGV4dF9nZXRfYWN0aW9ucyhjdXJyZW50RHJhZ1NvdXJjZUNvbnRleHQpLAogICAgICAgICAgICAg R0RLX0NVUlJFTlRfVElNRSk7CiAKLSAgICB9IGVsc2UgaWYgKGN1cnJlbnREcmFnU291cmNlQ29u dGV4dCAmJiBldmVudC50eXBlID09IEdES19CVVRUT05fUkVMRUFTRSkgeworICAgIH0gZWxzZSBp ZiAoY3VycmVudERyYWdTb3VyY2VDb250ZXh0ICYmIGV2ZW50LT50eXBlID09IEdES19CVVRUT05f UkVMRUFTRSkgewogICAgICAgICAvLyBXZSd2ZSByZWxlYXNlZCB0aGUgbW91c2UgYnV0dG9uLCB3 ZSBzaG91bGQganVzdCBiZSBhYmxlIHRvIHNwaW4gdGhlCiAgICAgICAgIC8vIGV2ZW50IGxvb3Ag aGVyZSBhbmQgaGF2ZSBHVEsrIHNlbmQgdGhlIGFwcHJvcHJpYXRlIG5vdGlmaWNhdGlvbnMgZm9y CiAgICAgICAgIC8vIHRoZSBlbmQgb2YgdGhlIGRyYWcuCkBAIC00MDIsNiArNDAxLDcgQEAgc3Rh dGljIHZvaWQgZGlzcGF0Y2hFdmVudChHZGtFdmVudCBldmVudCkKICAgICAgICAgICAgIGd0a19t YWluX2l0ZXJhdGlvbigpOwogICAgIH0KIAorICAgIGdka19ldmVudF9mcmVlKGV2ZW50KTsKIH0K IAogdm9pZCByZXBsYXlTYXZlZEV2ZW50cygpCkBAIC01NTEsMjUgKzU1MSwyNCBAQCBzdGF0aWMg SlNWYWx1ZVJlZiBrZXlEb3duQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0 UmVmIGZ1bmN0aW9uLCBKUwogICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29u dGV4dCk7CiAKICAgICAvLyBjcmVhdGUgYW5kIHNlbmQgdGhlIGV2ZW50Ci0gICAgR2RrRXZlbnQg ZXZlbnQ7Ci0gICAgbWVtc2V0KCZldmVudCwgMCwgc2l6ZW9mKGV2ZW50KSk7Ci0gICAgZXZlbnQu a2V5LmtleXZhbCA9IGdka0tleVN5bTsKLSAgICBldmVudC5rZXkuc3RhdGUgPSBzdGF0ZTsKLSAg ICBldmVudC5rZXkud2luZG93ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93KEdUS19XSURHRVQodmll dykpOworICAgIEdka0V2ZW50KiBldmVudCA9IGdka19ldmVudF9uZXcoR0RLX0tFWV9QUkVTUyk7 CisgICAgZXZlbnQtPmtleS5rZXl2YWwgPSBnZGtLZXlTeW07CisgICAgZXZlbnQtPmtleS5zdGF0 ZSA9IHN0YXRlOworICAgIGV2ZW50LT5rZXkud2luZG93ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93 KEdUS19XSURHRVQodmlldykpOworICAgIGdfb2JqZWN0X3JlZihldmVudC0+a2V5LndpbmRvdyk7 CiAKICAgICAvLyBXaGVuIHN5bnRoZXNpemluZyBhbiBldmVudCwgYW4gaW52YWxpZCBoYXJkd2Fy ZV9rZXljb2RlIHZhbHVlCiAgICAgLy8gY2FuIGNhdXNlIGl0IHRvIGJlIGJhZGx5IHByb2Nlc3Nl ZCBieSBHdGsrLgogICAgIEdka0tleW1hcEtleSoga2V5czsKICAgICBnaW50IG5fa2V5czsKICAg ICBpZiAoZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFsKGdka19rZXltYXBfZ2V0X2Rl ZmF1bHQoKSwgZ2RrS2V5U3ltLCAma2V5cywgJm5fa2V5cykpIHsKLSAgICAgICAgZXZlbnQua2V5 LmhhcmR3YXJlX2tleWNvZGUgPSBrZXlzWzBdLmtleWNvZGU7CisgICAgICAgIGV2ZW50LT5rZXku aGFyZHdhcmVfa2V5Y29kZSA9IGtleXNbMF0ua2V5Y29kZTsKICAgICAgICAgZ19mcmVlKGtleXMp OwogICAgIH0KIAotICAgIGV2ZW50LmtleS50eXBlID0gR0RLX0tFWV9QUkVTUzsKICAgICBkaXNw YXRjaEV2ZW50KGV2ZW50KTsKIAotICAgIGV2ZW50LmtleS50eXBlID0gR0RLX0tFWV9SRUxFQVNF OworICAgIGV2ZW50LT5rZXkudHlwZSA9IEdES19LRVlfUkVMRUFTRTsKICAgICBkaXNwYXRjaEV2 ZW50KGV2ZW50KTsKIAogICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsK 65305 2010-08-24 12:17:13 -0700 2010-08-24 12:26:49 -0700 Fixes related to use of GdkEvent bug-44534-20100824121711.patch text/plain 5651 mrobinson ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK aW5kZXggNjYyMWZlNWI1NWQ2ZjY1NWU4NTZjNTk3MzNkMDAyNGUxNDEzN2EwZS4uOTBjYmFjYzEw NzM0MzBjNjA5ZGJlZjc3YmVlZTFiYzUwYTMyZmEwOSAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOCBAQAogMjAx MC0wOC0yNCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gR1RLMzogRXZl bnRTZW5kZXIgYW5kIEFQSSB0ZXN0cyBzaG91bGQgdXNlIGdka19ldmVudF9uZXcgd2hlbiBzeW50 aGVzaXppbmcgZXZlbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00NDUzNAorCisgICAgICAgIEZpeCBhbiBpc3N1ZSB3aGVyZSBhIEdka0V2ZW50KiBp cyB0cmVhdGVkIGxpa2UgYSBHZGtFdmVudC4KKworICAgICAgICAqIHRlc3RzL3Rlc3RrZXlldmVu dHMuYzoKKyAgICAgICAgKGtleV9wcmVzc19ldmVudF9jYik6CisgICAgICAgIChrZXlfcmVsZWFz ZV9ldmVudF9jYik6CisKKzIwMTAtMDgtMjQgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBp Z2FsaWEuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KIAogICAgICAgICBb R1RLXSBHVEszOiBFdmVudFNlbmRlciBhbmQgQVBJIHRlc3RzIHNob3VsZCB1c2UgZ2RrX2V2ZW50 X25ldyB3aGVuIHN5bnRoZXNpemluZyBldmVudHMKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvdGVz dHMvdGVzdGtleWV2ZW50cy5jIGIvV2ViS2l0L2d0ay90ZXN0cy90ZXN0a2V5ZXZlbnRzLmMKaW5k ZXggYjQxYTAzMjgyMDRlMTU4MDkwODY5ZDdkODQ2YzRlOWRmMWIwMjEyYS4uMDg5ZDU2YzY2Mjlj OGQxOGFhZGYyYzIxNzIwMmYwZGQ1ZjMzNWIxNCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay90ZXN0 cy90ZXN0a2V5ZXZlbnRzLmMKKysrIGIvV2ViS2l0L2d0ay90ZXN0cy90ZXN0a2V5ZXZlbnRzLmMK QEAgLTgyLDcgKzgyLDcgQEAgc3RhdGljIHZvaWQga2V5X2V2ZW50X2ZpeHR1cmVfdGVhcmRvd24o S2V5RXZlbnRGaXh0dXJlKiBmaXh0dXJlLCBnY29uc3Rwb2ludGVyIGQKIHN0YXRpYyBnYm9vbGVh biBrZXlfcHJlc3NfZXZlbnRfY2IoV2ViS2l0V2ViVmlldyogd2ViVmlldywgR2RrRXZlbnQqIGV2 ZW50LCBncG9pbnRlciBkYXRhKQogewogICAgIEtleUV2ZW50Rml4dHVyZSogZml4dHVyZSA9IChL ZXlFdmVudEZpeHR1cmUqKWRhdGE7Ci0gICAgZ2Jvb2xlYW4gaGFuZGxlZCA9IEdUS19XSURHRVRf R0VUX0NMQVNTKGZpeHR1cmUtPndlYlZpZXcpLT5rZXlfcHJlc3NfZXZlbnQoR1RLX1dJREdFVChm aXh0dXJlLT53ZWJWaWV3KSwgJmV2ZW50LT5rZXkpOworICAgIGdib29sZWFuIGhhbmRsZWQgPSBH VEtfV0lER0VUX0dFVF9DTEFTUyhmaXh0dXJlLT53ZWJWaWV3KS0+a2V5X3ByZXNzX2V2ZW50KEdU S19XSURHRVQoZml4dHVyZS0+d2ViVmlldyksIGV2ZW50LT5rZXkpOwogICAgIGdfYXNzZXJ0X2Nt cGludChoYW5kbGVkLCA9PSwgZml4dHVyZS0+aW5mby0+c2hvdWxkQmVIYW5kbGVkKTsKIAogICAg IHJldHVybiBGQUxTRTsKQEAgLTkyLDcgKzkyLDcgQEAgc3RhdGljIGdib29sZWFuIGtleV9yZWxl YXNlX2V2ZW50X2NiKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIEdka0V2ZW50KiBldmVudCwgZ3AK IHsKICAgICAvLyBXZWJDb3JlIG5ldmVyIHNlZW1zIHRvIG1hcmsga2V5dXAgZXZlbnRzIGFzIGhh bmRsZWQuCiAgICAgS2V5RXZlbnRGaXh0dXJlKiBmaXh0dXJlID0gKEtleUV2ZW50Rml4dHVyZSop ZGF0YTsKLSAgICBnYm9vbGVhbiBoYW5kbGVkID0gR1RLX1dJREdFVF9HRVRfQ0xBU1MoZml4dHVy ZS0+d2ViVmlldyktPmtleV9wcmVzc19ldmVudChHVEtfV0lER0VUKGZpeHR1cmUtPndlYlZpZXcp LCAmZXZlbnQtPmtleSk7CisgICAgZ2Jvb2xlYW4gaGFuZGxlZCA9IEdUS19XSURHRVRfR0VUX0NM QVNTKGZpeHR1cmUtPndlYlZpZXcpLT5rZXlfcHJlc3NfZXZlbnQoR1RLX1dJREdFVChmaXh0dXJl LT53ZWJWaWV3KSwgZXZlbnQtPmtleSk7CiAgICAgZ19hc3NlcnQoIWhhbmRsZWQpOwogCiAgICAg Z19tYWluX2xvb3BfcXVpdChmaXh0dXJlLT5sb29wKTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCA1Y2QzYjg5ZjczNjdmOTEy M2MwM2NmYWI1ZDMwYWI0MzE5OWM5ZTQwLi40MjczMDM1ZTg3OThjYmQ3YWJjYTdlZTJiODM2MDQ5 OTNhNGZlOTZmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTAtMDgtMjQgIE1hcnRpbiBSb2Jp bnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIEdUSzM6IEV2ZW50U2VuZGVyIGFuZCBBUEkgdGVz dHMgc2hvdWxkIHVzZSBnZGtfZXZlbnRfbmV3IHdoZW4gc3ludGhlc2l6aW5nIGV2ZW50cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDQ1MzQKKworICAg ICAgICBGaXggdHdvIGRvdWJsZS1mcmVlcyBpbnRyb2R1Y2VkIGluIG15IHByZXZpb3VzIGNvbW1p dC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5jcHA6CisgICAg ICAgIChjb250ZXh0Q2xpY2tDYWxsYmFjayk6IENvcHkgdGhlIGV2ZW50IGJlZm9yZSB1c2luZyBp dCBhZ2Fpbi4KKyAgICAgICAgKGtleURvd25DYWxsYmFjayk6IERpdHRvLgorCisyMDEwLTA4LTI0 ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKwogICAgICAgICBSZXZp ZXdlZCBieSBYYW4gTG9wZXouCiAKICAgICAgICAgW0dUS10gR1RLMzogRXZlbnRTZW5kZXIgYW5k IEFQSSB0ZXN0cyBzaG91bGQgdXNlIGdka19ldmVudF9uZXcgd2hlbiBzeW50aGVzaXppbmcgZXZl bnRzCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5k ZXIuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50U2VuZGVyLmNwcApp bmRleCAzOTlhNmNjNjc3OGIxNzg0NzRhYjdmMTNkMTRlZGM4ZGJjYTlmYzc5Li44MWNjZWRlYjMw YWIyZWE3YTc2NTJlMjliYWNhMjEyZDRlNjE2NmNhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9E dW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwCisrKyBiL1dlYktpdFRvb2xzL0R1bXBS ZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRlci5jcHAKQEAgLTE3NiwxMyArMTc2LDE0IEBAIGJvb2wg cHJlcGFyZU1vdXNlQnV0dG9uRXZlbnQoR2RrRXZlbnQqIGV2ZW50LCBpbnQgZXZlbnRTZW5kZXJC dXR0b25OdW1iZXIpCiAKIHN0YXRpYyBKU1ZhbHVlUmVmIGNvbnRleHRDbGlja0NhbGxiYWNrKEpT Q29udGV4dFJlZiBjb250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlNPYmplY3RSZWYgdGhp c09iamVjdCwgc2l6ZV90IGFyZ3VtZW50Q291bnQsIGNvbnN0IEpTVmFsdWVSZWYgYXJndW1lbnRz W10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikKIHsKLSAgICBHZGtFdmVudCogZXZlbnQgPSBnZGtf ZXZlbnRfbmV3KEdES19CVVRUT05fUFJFU1MpOwotICAgIGlmICghcHJlcGFyZU1vdXNlQnV0dG9u RXZlbnQoZXZlbnQsIDIpKQorICAgIEdka0V2ZW50KiBwcmVzc0V2ZW50ID0gZ2RrX2V2ZW50X25l dyhHREtfQlVUVE9OX1BSRVNTKTsKKyAgICBpZiAoIXByZXBhcmVNb3VzZUJ1dHRvbkV2ZW50KHBy ZXNzRXZlbnQsIDIpKQogICAgICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4 dCk7CiAKLSAgICBzZW5kT3JRdWV1ZUV2ZW50KGV2ZW50KTsKLSAgICBldmVudC0+dHlwZSA9IEdE S19CVVRUT05fUkVMRUFTRTsKLSAgICBzZW5kT3JRdWV1ZUV2ZW50KGV2ZW50KTsKKyAgICBHZGtF dmVudCogcmVsZWFzZUV2ZW50ID0gZ2RrX2V2ZW50X2NvcHkocHJlc3NFdmVudCk7CisgICAgc2Vu ZE9yUXVldWVFdmVudChwcmVzc0V2ZW50KTsKKyAgICByZWxlYXNlRXZlbnQtPnR5cGUgPSBHREtf QlVUVE9OX1JFTEVBU0U7CisgICAgc2VuZE9yUXVldWVFdmVudChyZWxlYXNlRXZlbnQpOwogCiAg ICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOwogfQpAQCAtNTUxLDI1ICs1 NTIsMjUgQEAgc3RhdGljIEpTVmFsdWVSZWYga2V5RG93bkNhbGxiYWNrKEpTQ29udGV4dFJlZiBj b250ZXh0LCBKU09iamVjdFJlZiBmdW5jdGlvbiwgSlMKICAgICAgICAgcmV0dXJuIEpTVmFsdWVN YWtlVW5kZWZpbmVkKGNvbnRleHQpOwogCiAgICAgLy8gY3JlYXRlIGFuZCBzZW5kIHRoZSBldmVu dAotICAgIEdka0V2ZW50KiBldmVudCA9IGdka19ldmVudF9uZXcoR0RLX0tFWV9QUkVTUyk7Ci0g ICAgZXZlbnQtPmtleS5rZXl2YWwgPSBnZGtLZXlTeW07Ci0gICAgZXZlbnQtPmtleS5zdGF0ZSA9 IHN0YXRlOwotICAgIGV2ZW50LT5rZXkud2luZG93ID0gZ3RrX3dpZGdldF9nZXRfd2luZG93KEdU S19XSURHRVQodmlldykpOwotICAgIGdfb2JqZWN0X3JlZihldmVudC0+a2V5LndpbmRvdyk7Cisg ICAgR2RrRXZlbnQqIHByZXNzRXZlbnQgPSBnZGtfZXZlbnRfbmV3KEdES19LRVlfUFJFU1MpOwor ICAgIHByZXNzRXZlbnQtPmtleS5rZXl2YWwgPSBnZGtLZXlTeW07CisgICAgcHJlc3NFdmVudC0+ a2V5LnN0YXRlID0gc3RhdGU7CisgICAgcHJlc3NFdmVudC0+a2V5LndpbmRvdyA9IGd0a193aWRn ZXRfZ2V0X3dpbmRvdyhHVEtfV0lER0VUKHZpZXcpKTsKKyAgICBnX29iamVjdF9yZWYocHJlc3NF dmVudC0+a2V5LndpbmRvdyk7CiAKICAgICAvLyBXaGVuIHN5bnRoZXNpemluZyBhbiBldmVudCwg YW4gaW52YWxpZCBoYXJkd2FyZV9rZXljb2RlIHZhbHVlCiAgICAgLy8gY2FuIGNhdXNlIGl0IHRv IGJlIGJhZGx5IHByb2Nlc3NlZCBieSBHdGsrLgogICAgIEdka0tleW1hcEtleSoga2V5czsKICAg ICBnaW50IG5fa2V5czsKICAgICBpZiAoZ2RrX2tleW1hcF9nZXRfZW50cmllc19mb3Jfa2V5dmFs KGdka19rZXltYXBfZ2V0X2RlZmF1bHQoKSwgZ2RrS2V5U3ltLCAma2V5cywgJm5fa2V5cykpIHsK LSAgICAgICAgZXZlbnQtPmtleS5oYXJkd2FyZV9rZXljb2RlID0ga2V5c1swXS5rZXljb2RlOwor ICAgICAgICBwcmVzc0V2ZW50LT5rZXkuaGFyZHdhcmVfa2V5Y29kZSA9IGtleXNbMF0ua2V5Y29k ZTsKICAgICAgICAgZ19mcmVlKGtleXMpOwogICAgIH0KIAotICAgIGRpc3BhdGNoRXZlbnQoZXZl bnQpOwotCi0gICAgZXZlbnQtPmtleS50eXBlID0gR0RLX0tFWV9SRUxFQVNFOwotICAgIGRpc3Bh dGNoRXZlbnQoZXZlbnQpOworICAgIEdka0V2ZW50KiByZWxlYXNlRXZlbnQgPSBnZGtfZXZlbnRf Y29weShwcmVzc0V2ZW50KTsKKyAgICBkaXNwYXRjaEV2ZW50KHByZXNzRXZlbnQpOworICAgIHJl bGVhc2VFdmVudC0+a2V5LnR5cGUgPSBHREtfS0VZX1JFTEVBU0U7CisgICAgZGlzcGF0Y2hFdmVu dChyZWxlYXNlRXZlbnQpOwogCiAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRl eHQpOwogfQo=