18704 2008-04-23 15:30:46 -0700 [gtk] cannot type letters with dead keys in textarea 2008-05-28 11:05:19 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 a.renevier webkit-unassigned alp ap oldest_to_newest 78709 0 a.renevier 2008-04-23 15:30:46 -0700 Hi, I'm using some dead keys to type french letters. For exemple, I have a key mapped to dead_acute. I type that key + e to get é. That works fine in <input> fields, but in <textarea>s, I cannot get accentuated letters. For <input>s, keydown events are passed to document()->frame()->doTextFieldCommandFromEvent() but not in textarea. That function will then call gtk_im_context_filter_keypress with gtk frontend. I'll attach a patch to call that function also for <textearea>s. That seems to fix the problem on gtk. That may also enable other input method on textareas. 78710 1 20780 a.renevier 2008-04-23 15:35:51 -0700 Created attachment 20780 calls doTextFieldCommandFromEvent on keydown for textareas 81695 2 alp 2008-05-27 22:50:53 -0700 Upgrading to P1. ap, any thoughts on whether this patch is correct? 81700 3 20780 ap 2008-05-28 01:38:57 -0700 Comment on attachment 20780 calls doTextFieldCommandFromEvent on keydown for textareas WebEditorClient::doTextFieldCommandFromEvent() is really only about text fields, which textareas are not. Invoking it for text areas would break Safari on the Mac, besides not being true to its name. We could of course add another client method just for textareas, but processing dead keys in element default handlers doesn't seem right to me in general, it is a much lower level task. Perhaps WebEditorClient::handleKeyboardEvent() would be more appropriate. 81747 4 21390 alp 2008-05-28 09:51:10 -0700 Created attachment 21390 Input method fixes 81750 5 21390 ap 2008-05-28 10:01:41 -0700 Comment on attachment 21390 Input method fixes Obviously, I'm not an expert at GTK input methods, but this looks absolutely reasonable, r=me. I would expect that this doesn't dispatch text input events in a manner compatible with IE and Safari though. 81765 6 alp 2008-05-28 11:05:19 -0700 Fix landed in r34176. Thanks 20780 2008-04-23 15:35:51 -0700 2008-05-28 01:38:57 -0700 calls doTextFieldCommandFromEvent on keydown for textareas patch text/plain 1525 a.renevier ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50LmNwcCBiL1dlYkNv cmUvaHRtbC9IVE1MVGV4dEFyZWFFbGVtZW50LmNwcAppbmRleCBkZTE2NWIzLi5kZGI3ZjE1IDEw MDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRleHRBcmVhRWxlbWVudC5jcHAKKysrIGIvV2Vi Q29yZS9odG1sL0hUTUxUZXh0QXJlYUVsZW1lbnQuY3BwCkBAIC0yMCwxNiArMjAsMTggQEAKICAq IGFsb25nIHdpdGggdGhpcyBsaWJyYXJ5OyBzZWUgdGhlIGZpbGUgQ09QWUlORy5MSUIuICBJZiBu b3QsIHdyaXRlIHRvCiAgKiB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBG cmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAogICogQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBV U0EuCiAgKgogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJIVE1MVGV4dEFy ZWFFbGVtZW50LmgiCisjaW5jbHVkZSAiS2V5Ym9hcmRFdmVudC5oIgorCiAKICNpbmNsdWRlICJE b2N1bWVudC5oIgogI2luY2x1ZGUgIkV2ZW50LmgiCiAjaW5jbHVkZSAiRXZlbnROYW1lcy5oIgog I2luY2x1ZGUgIkZvY3VzQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIkZvcm1EYXRhTGlzdC5oIgog I2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCkBAIC0yMzEsMTYgKzIz MywyMiBAQCB2b2lkIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OnVwZGF0ZUZvY3VzQXBwZWFyYW5jZShi b29sIHJlc3RvcmVQcmV2aW91c1NlbGVjdGlvbikKICAgICAgICAgZG9jdW1lbnQoKS0+ZnJhbWUo KS0+cmV2ZWFsU2VsZWN0aW9uKCk7CiB9CiAKIHZvaWQgSFRNTFRleHRBcmVhRWxlbWVudDo6ZGVm YXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiB7CiAgICAgaWYgKHJlbmRlcmVyKCkgJiYg KGV2ZW50LT5pc01vdXNlRXZlbnQoKSB8fCBldmVudC0+aXNEcmFnRXZlbnQoKSB8fCBldmVudC0+ aXNXaGVlbEV2ZW50KCkgfHwgZXZlbnQtPnR5cGUoKSA9PSBibHVyRXZlbnQpKQogICAgICAgICBz dGF0aWNfY2FzdDxSZW5kZXJUZXh0Q29udHJvbCo+KHJlbmRlcmVyKCkpLT5mb3J3YXJkRXZlbnQo ZXZlbnQpOwogCisgICAgaWYgKGV2ZW50LT50eXBlKCkgPT0ga2V5ZG93bkV2ZW50ICYmIGV2ZW50 LT5pc0tleWJvYXJkRXZlbnQoKSAmJiBmb2N1c2VkKCkgJiYgZG9jdW1lbnQoKS0+ZnJhbWUoKQor ICAgICAgICAgICAgICAgICYmIGRvY3VtZW50KCktPmZyYW1lKCktPmRvVGV4dEZpZWxkQ29tbWFu ZEZyb21FdmVudCh0aGlzLCBzdGF0aWNfY2FzdDxLZXlib2FyZEV2ZW50Kj4oZXZlbnQpKSkgewor ICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgcmV0dXJuOworICAg IH0KKwogICAgIEhUTUxGb3JtQ29udHJvbEVsZW1lbnRXaXRoU3RhdGU6OmRlZmF1bHRFdmVudEhh bmRsZXIoZXZlbnQpOwogfQogCiB2b2lkIEhUTUxUZXh0QXJlYUVsZW1lbnQ6OnJlbmRlcmVyV2ls bEJlRGVzdHJveWVkKCkKIHsKICAgICB1cGRhdGVWYWx1ZSgpOwogfQogCg== 21390 2008-05-28 09:51:10 -0700 2008-05-28 10:01:41 -0700 Input method fixes nuanti-inputmethod.patch text/plain 8793 alp SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiAzNDE3MykKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMDgtMDUtMjggIEFscCBUb2tlciAgPGFscEBudWFu dGkuY29tPgorCisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4NzA0CisgICAgICAgIFtndGtdIGNhbm5vdCB0eXBlIGxldHRlcnMgd2l0aCBkZWFkIGtleXMg aW4gdGV4dGFyZWEKKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDEyMAorICAgICAgICBbR0RLXSBTdXBwb3J0IGlucHV0IG1ldGhvZHMKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3Ig aW5wdXQgbWV0aG9kIGNvbXBvc2l0aW9uLgorCisgICAgICAgIFJlbW92ZSBzb21lIG9sZCBoYWNr cyBzbyB3ZSBoYW5kbGUgaW5wdXQgbWV0aG9kIGV2ZW50cyBtb3JlCisgICAgICAgIGNvbnNpc3Rl bnRseS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0ay5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OmltQ29udGV4dENvbW1pdHRlZCk6CisgICAgICAgIChXZWJLaXQ6Omlt Q29udGV4dFByZWVkaXRDaGFuZ2VkKToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50Ojpz ZXRJbnB1dE1ldGhvZFN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50OjpyZXNw b25kVG9DaGFuZ2VkU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50Ojpo YW5kbGVJbnB1dE1ldGhvZEtleWRvd24pOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JDbGllbnQ6 OkVkaXRvckNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVudDo6fkVkaXRvckNs aWVudCk6CisgICAgICAgIChXZWJLaXQ6OkVkaXRvckNsaWVudDo6dGV4dEZpZWxkRGlkQmVnaW5F ZGl0aW5nKToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50Ojp0ZXh0RmllbGREaWRFbmRF ZGl0aW5nKToKKyAgICAgICAgKFdlYktpdDo6RWRpdG9yQ2xpZW50Ojp0ZXh0RGlkQ2hhbmdlSW5U ZXh0RmllbGQpOgorICAgICAgICAoV2ViS2l0OjpFZGl0b3JDbGllbnQ6OmRvVGV4dEZpZWxkQ29t bWFuZEZyb21FdmVudCk6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorCiAy MDA4LTA1LTI1ICBBbHAgVG9rZXIgIDxhbHBAbnVhbnRpLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBOaWtvLgpJbmRleDogV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRH dGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xp ZW50R3RrLmNwcAkocmV2aXNpb24gMzQxNzApCisrKyBXZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0 L0VkaXRvckNsaWVudEd0ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw2IEBACiAvKgog ICogIENvcHlyaWdodCAoQykgMjAwNyBBbHAgVG9rZXIgPGFscEBhdG9rZXIuY29tPgorICogIENv cHlyaWdodCAoQykgMjAwOCBOdWFudGkgTHRkLgogICoKICAqICBUaGlzIGxpYnJhcnkgaXMgZnJl ZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCiAgKiAgbW9kaWZ5IGl0 IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExlc3NlciBHZW5lcmFsIFB1YmxpYwpAQCAtMzQs MTAgKzM1LDU2IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKIAotc3RhdGljIHZvaWQgaW1Db250ZXh0Q29tbWl0dGVkKEd0a0lNQ29udGV4dCogY29udGV4 dCwgY29uc3QgY2hhciogc3RyLCBFZGl0b3JDbGllbnQqIGNsaWVudCkKK3N0YXRpYyB2b2lkIGlt Q29udGV4dENvbW1pdHRlZChHdGtJTUNvbnRleHQqIGNvbnRleHQsIGNvbnN0IGdjaGFyKiBzdHIs IEVkaXRvckNsaWVudCogY2xpZW50KQoreworICAgIEZyYW1lKiB0YXJnZXRGcmFtZSA9IGNvcmUo Y2xpZW50LT5tX3dlYlZpZXcpLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNlZE9yTWFpbkZyYW1l KCk7CisKKyAgICBpZiAoIXRhcmdldEZyYW1lIHx8ICF0YXJnZXRGcmFtZS0+ZWRpdG9yKCktPmNh bkVkaXQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRWRpdG9yKiBlZGl0b3IgPSB0YXJnZXRG cmFtZS0+ZWRpdG9yKCk7CisKKyAgICBTdHJpbmcgY29tbWl0U3RyaW5nID0gU3RyaW5nOjpmcm9t VVRGOChzdHIpOworICAgIGVkaXRvci0+Y29uZmlybUNvbXBvc2l0aW9uKGNvbW1pdFN0cmluZyk7 Cit9CisKK3N0YXRpYyB2b2lkIGltQ29udGV4dFByZWVkaXRDaGFuZ2VkKEd0a0lNQ29udGV4dCog Y29udGV4dCwgRWRpdG9yQ2xpZW50KiBjbGllbnQpCiB7CiAgICAgRnJhbWUqIGZyYW1lID0gY29y ZShjbGllbnQtPm1fd2ViVmlldyktPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJh bWUoKTsKLSAgICBmcmFtZS0+ZWRpdG9yKCktPmluc2VydFRleHRXaXRob3V0U2VuZGluZ1RleHRF dmVudChTdHJpbmc6OmZyb21VVEY4KHN0ciksIGZhbHNlLCAwKTsKKyAgICBFZGl0b3IqIGVkaXRv ciA9IGZyYW1lLT5lZGl0b3IoKTsKKworICAgIGdjaGFyKiBwcmVlZGl0ID0gTlVMTDsKKyAgICBn aW50IGN1cnNvclBvcyA9IDA7CisgICAgLy8gV2UgaWdub3JlIHRoZSBwcm92aWRlZCBQYW5nb0F0 dHJMaXN0IGZvciBub3cuCisgICAgZ3RrX2ltX2NvbnRleHRfZ2V0X3ByZWVkaXRfc3RyaW5nKGNv bnRleHQsICZwcmVlZGl0LCBOVUxMLCAmY3Vyc29yUG9zKTsKKyAgICBTdHJpbmcgcHJlZWRpdFN0 cmluZyA9IFN0cmluZzo6ZnJvbVVURjgocHJlZWRpdCk7CisgICAgZ19mcmVlKHByZWVkaXQpOwor CisgICAgLy8gc2V0Q29tcG9zaXRpb24oKSB3aWxsIHJlcGxhY2UgdGhlIHVzZXIgc2VsZWN0aW9u IGlmIHBhc3NlZCBhbiBlbXB0eQorICAgIC8vIHByZWVkaXQuIFdlIGRvbid0IHdhbnQgdGhpcyB0 byBoYXBwZW4uCisgICAgaWYgKHByZWVkaXRTdHJpbmcuaXNFbXB0eSgpICYmICFlZGl0b3ItPmhh c0NvbXBvc2l0aW9uKCkpCisgICAgICAgIHJldHVybjsKKworICAgIFZlY3RvcjxDb21wb3NpdGlv blVuZGVybGluZT4gdW5kZXJsaW5lczsKKyAgICB1bmRlcmxpbmVzLmFwcGVuZChDb21wb3NpdGlv blVuZGVybGluZSgwLCBwcmVlZGl0U3RyaW5nLmxlbmd0aCgpLCBDb2xvcigwLCAwLCAwKSwgZmFs c2UpKTsKKyAgICBlZGl0b3ItPnNldENvbXBvc2l0aW9uKHByZWVkaXRTdHJpbmcsIHVuZGVybGlu ZXMsIGN1cnNvclBvcywgMCk7Cit9CisKK3ZvaWQgRWRpdG9yQ2xpZW50OjpzZXRJbnB1dE1ldGhv ZFN0YXRlKGJvb2wgYWN0aXZlKQoreworICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0g bV93ZWJWaWV3LT5wcml2OworCisgICAgaWYgKGFjdGl2ZSkKKyAgICAgICAgZ3RrX2ltX2NvbnRl eHRfZm9jdXNfaW4ocHJpdi0+aW1Db250ZXh0KTsKKyAgICBlbHNlCisgICAgICAgIGd0a19pbV9j b250ZXh0X2ZvY3VzX291dChwcml2LT5pbUNvbnRleHQpOworCisjaWZkZWYgTUFFTU9fQ0hBTkdF UworICAgIGlmIChhY3RpdmUpCisgICAgICAgIGhpbGRvbl9ndGtfaW1fY29udGV4dF9zaG93KHBy aXYtPmltQ29udGV4dCk7CisgICAgZWxzZQorICAgICAgICBoaWxkb25fZ3RrX2ltX2NvbnRleHRf aGlkZShwcml2LT5pbUNvbnRleHQpOworI2VuZGlmCiB9CiAKIGJvb2wgRWRpdG9yQ2xpZW50Ojpz aG91bGREZWxldGVSYW5nZShSYW5nZSopCkBAIC0xMTgsNyArMTY1LDIyIEBAIHZvaWQgRWRpdG9y Q2xpZW50OjpyZXNwb25kVG9DaGFuZ2VkQ29udGUKIAogdm9pZCBFZGl0b3JDbGllbnQ6OnJlc3Bv bmRUb0NoYW5nZWRTZWxlY3Rpb24oKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgV2Vi S2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBtX3dlYlZpZXctPnByaXY7CisKKyAgICBGcmFtZSog dGFyZ2V0RnJhbWUgPSBjb3JlKG1fd2ViVmlldyktPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2Vk T3JNYWluRnJhbWUoKTsKKyAgICBpZiAoIXRhcmdldEZyYW1lIHx8ICF0YXJnZXRGcmFtZS0+ZWRp dG9yKCktPmhhc0NvbXBvc2l0aW9uKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICh0YXJn ZXRGcmFtZS0+ZWRpdG9yKCktPmlnbm9yZUNvbXBvc2l0aW9uU2VsZWN0aW9uQ2hhbmdlKCkpCisg ICAgICAgIHJldHVybjsKKworICAgIHVuc2lnbmVkIHN0YXJ0OworICAgIHVuc2lnbmVkIGVuZDsK KyAgICBpZiAoIXRhcmdldEZyYW1lLT5lZGl0b3IoKS0+Z2V0Q29tcG9zaXRpb25TZWxlY3Rpb24o c3RhcnQsIGVuZCkpIHsKKyAgICAgICAgLy8gZ3RrX2ltX2NvbnRleHRfcmVzZXQoKSBjbGVhcnMg dGhlIGNvbXBvc2l0aW9uIGZvciB1cy4KKyAgICAgICAgZ3RrX2ltX2NvbnRleHRfcmVzZXQocHJp di0+aW1Db250ZXh0KTsKKyAgICAgICAgdGFyZ2V0RnJhbWUtPmVkaXRvcigpLT5jb25maXJtQ29t cG9zaXRpb25XaXRob3V0RGlzdHVyYmluZ1NlbGVjdGlvbigpOworICAgIH0KIH0KIAogdm9pZCBF ZGl0b3JDbGllbnQ6OmRpZEVuZEVkaXRpbmcoKQpAQCAtMzQzLDEwICs0MDUsMTIgQEAgdm9pZCBF ZGl0b3JDbGllbnQ6OmhhbmRsZUtleWJvYXJkRXZlbnQoSwogICAgIGV2ZW50LT5zZXREZWZhdWx0 SGFuZGxlZCgpOwogfQogCi0KLXZvaWQgRWRpdG9yQ2xpZW50OjpoYW5kbGVJbnB1dE1ldGhvZEtl eWRvd24oS2V5Ym9hcmRFdmVudCopCit2b2lkIEVkaXRvckNsaWVudDo6aGFuZGxlSW5wdXRNZXRo b2RLZXlkb3duKEtleWJvYXJkRXZlbnQqIGV2ZW50KQogewotICAgIG5vdEltcGxlbWVudGVkKCk7 CisgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBtX3dlYlZpZXctPnByaXY7CisKKyAg ICBpZiAoZ3RrX2ltX2NvbnRleHRfZmlsdGVyX2tleXByZXNzKHByaXYtPmltQ29udGV4dCwgZXZl bnQtPmtleUV2ZW50KCktPmdka0V2ZW50S2V5KCkpKQorICAgICAgICBldmVudC0+c2V0RGVmYXVs dEhhbmRsZWQoKTsKIH0KIAogRWRpdG9yQ2xpZW50OjpFZGl0b3JDbGllbnQoV2ViS2l0V2ViVmll dyogd2ViVmlldykKQEAgLTM1NCwzOCArNDE4LDMxIEBAIEVkaXRvckNsaWVudDo6RWRpdG9yQ2xp ZW50KFdlYktpdFdlYlZpZXcKIHsKICAgICBXZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IG1f d2ViVmlldy0+cHJpdjsKICAgICBnX3NpZ25hbF9jb25uZWN0KHByaXYtPmltQ29udGV4dCwgImNv bW1pdCIsIEdfQ0FMTEJBQ0soaW1Db250ZXh0Q29tbWl0dGVkKSwgdGhpcyk7CisgICAgZ19zaWdu YWxfY29ubmVjdChwcml2LT5pbUNvbnRleHQsICJwcmVlZGl0LWNoYW5nZWQiLCBHX0NBTExCQUNL KGltQ29udGV4dFByZWVkaXRDaGFuZ2VkKSwgdGhpcyk7CiB9CiAKIEVkaXRvckNsaWVudDo6fkVk aXRvckNsaWVudCgpCiB7CiAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBtX3dlYlZp ZXctPnByaXY7CiAgICAgZ19zaWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHByaXYt PmltQ29udGV4dCwgKGdwb2ludGVyKWltQ29udGV4dENvbW1pdHRlZCwgdGhpcyk7CisgICAgZ19z aWduYWxfaGFuZGxlcnNfZGlzY29ubmVjdF9ieV9mdW5jKHByaXYtPmltQ29udGV4dCwgKGdwb2lu dGVyKWltQ29udGV4dFByZWVkaXRDaGFuZ2VkLCB0aGlzKTsKIH0KIAogdm9pZCBFZGl0b3JDbGll bnQ6OnRleHRGaWVsZERpZEJlZ2luRWRpdGluZyhFbGVtZW50KikKIHsKLSAgICBndGtfaW1fY29u dGV4dF9mb2N1c19pbihXRUJLSVRfV0VCX1ZJRVdfR0VUX1BSSVZBVEUobV93ZWJWaWV3KS0+aW1D b250ZXh0KTsKIH0KIAogdm9pZCBFZGl0b3JDbGllbnQ6OnRleHRGaWVsZERpZEVuZEVkaXRpbmco RWxlbWVudCopCiB7Ci0gICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSBtX3dlYlZpZXct PnByaXY7Ci0KLSAgICBndGtfaW1fY29udGV4dF9mb2N1c19vdXQocHJpdi0+aW1Db250ZXh0KTsK LSNpZmRlZiBNQUVNT19DSEFOR0VTCi0gICAgaGlsZG9uX2d0a19pbV9jb250ZXh0X2hpZGUocHJp di0+aW1Db250ZXh0KTsKLSNlbmRpZgogfQogCiB2b2lkIEVkaXRvckNsaWVudDo6dGV4dERpZENo YW5nZUluVGV4dEZpZWxkKEVsZW1lbnQqKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAK LWJvb2wgRWRpdG9yQ2xpZW50Ojpkb1RleHRGaWVsZENvbW1hbmRGcm9tRXZlbnQoRWxlbWVudCog ZWxlbWVudCwgS2V5Ym9hcmRFdmVudCogZXZlbnQpCitib29sIEVkaXRvckNsaWVudDo6ZG9UZXh0 RmllbGRDb21tYW5kRnJvbUV2ZW50KEVsZW1lbnQqLCBLZXlib2FyZEV2ZW50KikKIHsKLSAgICBX ZWJLaXRXZWJWaWV3UHJpdmF0ZSogcHJpdiA9IG1fd2ViVmlldy0+cHJpdjsKLSAgICByZXR1cm4g Z3RrX2ltX2NvbnRleHRfZmlsdGVyX2tleXByZXNzKHByaXYtPmltQ29udGV4dCwgZXZlbnQtPmtl eUV2ZW50KCktPmdka0V2ZW50S2V5KCkpOworICAgIHJldHVybiBmYWxzZTsKIH0KIAogdm9pZCBF ZGl0b3JDbGllbnQ6OnRleHRXaWxsQmVEZWxldGVkSW5UZXh0RmllbGQoRWxlbWVudCopCkBAIC00 NDQsOCArNTAxLDQgQEAgdm9pZCBFZGl0b3JDbGllbnQ6OmdldEd1ZXNzZXNGb3JXb3JkKGNvbgog ICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXZvaWQgRWRpdG9yQ2xpZW50OjpzZXRJbnB1dE1l dGhvZFN0YXRlKGJvb2wpCi17Ci19Ci0KIH0KSW5kZXg6IFdlYktpdC9ndGsvd2Via2l0L3dlYmtp dHdlYnZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwCShyZXZpc2lvbiAzNDE3MCkKKysrIFdlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZp ZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzAsMTYgKzM3MCwxMyBAQCBzdGF0aWMgZ2Jvb2xl YW4gd2Via2l0X3dlYl92aWV3X2J1dHRvbl9wCiBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92 aWV3X2J1dHRvbl9yZWxlYXNlX2V2ZW50KEd0a1dpZGdldCogd2lkZ2V0LCBHZGtFdmVudEJ1dHRv biogZXZlbnQpCiB7CiAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklF Vyh3aWRnZXQpOwotICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJp djsKIAogICAgIEZyYW1lKiBmb2N1c2VkRnJhbWUgPSBjb3JlKHdlYlZpZXcpLT5mb2N1c0NvbnRy b2xsZXIoKS0+Zm9jdXNlZEZyYW1lKCk7CiAKICAgICBpZiAoZm9jdXNlZEZyYW1lICYmIGZvY3Vz ZWRGcmFtZS0+ZWRpdG9yKCktPmNhbkVkaXQoKSkgewotICAgICAgICBHZGtXaW5kb3cqIHdpbmRv dyA9IGd0a193aWRnZXRfZ2V0X3BhcmVudF93aW5kb3cod2lkZ2V0KTsKLSAgICAgICAgZ3RrX2lt X2NvbnRleHRfc2V0X2NsaWVudF93aW5kb3cocHJpdi0+aW1Db250ZXh0LCB3aW5kb3cpOwogI2lm ZGVmIE1BRU1PX0NIQU5HRVMKKyAgICAgICAgV2ViS2l0V2ViVmlld1ByaXZhdGUqIHByaXYgPSB3 ZWJWaWV3LT5wcml2OwogICAgICAgICBoaWxkb25fZ3RrX2ltX2NvbnRleHRfZmlsdGVyX2V2ZW50 KHByaXYtPmltQ29udGV4dCwgKEdka0V2ZW50KilldmVudCk7Ci0gICAgICAgIGhpbGRvbl9ndGtf aW1fY29udGV4dF9zaG93KHByaXYtPmltQ29udGV4dCk7CiAjZW5kaWYKICAgICB9CiAKQEAgLTQ0 NSw5ICs0NDIsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2ZvY3VzX2luCiBz dGF0aWMgZ2Jvb2xlYW4gd2Via2l0X3dlYl92aWV3X2ZvY3VzX291dF9ldmVudChHdGtXaWRnZXQq IHdpZGdldCwgR2RrRXZlbnRGb2N1cyogZXZlbnQpCiB7CiAgICAgV2ViS2l0V2ViVmlldyogd2Vi VmlldyA9IFdFQktJVF9XRUJfVklFVyh3aWRnZXQpOwotICAgIFdlYktpdFdlYlZpZXdQcml2YXRl KiBwcml2ID0gd2ViVmlldy0+cHJpdjsKIAotICAgIGd0a19pbV9jb250ZXh0X2ZvY3VzX291dChw cml2LT5pbUNvbnRleHQpOwogICAgIGNvcmUod2ViVmlldyktPmZvY3VzQ29udHJvbGxlcigpLT5z ZXRBY3RpdmUoZmFsc2UpOwogCiAgICAgcmV0dXJuIEdUS19XSURHRVRfQ0xBU1Mod2Via2l0X3dl Yl92aWV3X3BhcmVudF9jbGFzcyktPmZvY3VzX291dF9ldmVudCh3aWRnZXQsIGV2ZW50KTsKQEAg LTQ4NCw2ICs0NzksMTAgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3JlYWxpemUoR3Rr VwogCiAgICAgd2lkZ2V0LT5zdHlsZSA9IGd0a19zdHlsZV9hdHRhY2god2lkZ2V0LT5zdHlsZSwg d2lkZ2V0LT53aW5kb3cpOwogICAgIGdka193aW5kb3dfc2V0X2JhY2tncm91bmQod2lkZ2V0LT53 aW5kb3csICZ3aWRnZXQtPnN0eWxlLT5iYXNlW0dUS19XSURHRVRfU1RBVEUod2lkZ2V0KV0pOwor CisgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdFQktJVF9XRUJfVklFVyh3aWRnZXQpOwor ICAgIFdlYktpdFdlYlZpZXdQcml2YXRlKiBwcml2ID0gd2ViVmlldy0+cHJpdjsKKyAgICBndGtf aW1fY29udGV4dF9zZXRfY2xpZW50X3dpbmRvdyhwcml2LT5pbUNvbnRleHQsIHdpZGdldC0+d2lu ZG93KTsKIH0KIAogc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF9zY3JvbGxfYWRqdXN0 bWVudHMoV2ViS2l0V2ViVmlldyogd2ViVmlldywgR3RrQWRqdXN0bWVudCogaGFkaiwgR3RrQWRq dXN0bWVudCogdmFkaikK