57275 2011-03-28 15:01:47 -0700 REGRESSION: Can't enter pasted with context or Edit menu text in search or address field in the browser 2011-03-28 17:15:33 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica andersca sam oldest_to_newest 374815 0 enrica 2011-03-28 15:01:47 -0700 * STEPS TO REPRODUCE 1. Launch Safari on Windows and copy some text in clipboard 2. Click on the search field in the browser and select Edit>Paste or choose paste from the context menu 3. Press Return * RESULTS nothing happens and a beep sounds. 374820 1 enrica 2011-03-28 15:11:22 -0700 <rdar://problem/8246691> 374843 2 87224 enrica 2011-03-28 15:42:59 -0700 Created attachment 87224 Patch 374881 3 87224 sam 2011-03-28 16:30:32 -0700 Comment on attachment 87224 Patch I think it would be better to do this at the Editor command level, and change context menu code to call editor()->command("Cut").execute() and editor()->command("Paste").execute() 374902 4 87241 enrica 2011-03-28 17:00:28 -0700 Created attachment 87241 Patch2 Updated patch per Sam's feedback. 374909 5 enrica 2011-03-28 17:15:33 -0700 http://trac.webkit.org/changeset/82176 87224 2011-03-28 15:42:59 -0700 2011-03-28 17:00:28 -0700 Patch contextmenu.txt text/plain 4290 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMTY1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDMtMjggIEVucmljYSBD YXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9OOiBDYW4ndCBlbnRlciBwYXN0ZWQgd2l0aCBj b250ZXh0IG9yIEVkaXQgbWVudSB0ZXh0IGluIHNlYXJjaCBvciBhZGRyZXNzIGZpZWxkIGluIHRo ZSBicm93c2VyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTcyNzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgyNDY2OTE+CisKKyAgICAgICAgV2Ug bmVlZCB0byBjbGFzc2lmeSBjdXQgYW5kIHBhc3RlIGFjdGlvbnMgYXMgdXNlciB0eXBpbmcgYWN0 aW9ucyB0bworICAgICAgICBhbGxvdyB0aGUgcHJvcGFnYXRpb24gb2YgdGhlIHRleHREaWRDaGFu Z2VJblRleHRGaWVsZCBldmVudC4gVGhpcyBwb3J0aW9uCisgICAgICAgIG9mIHRoZSBmaXggaXMg cmVsYXRpdmUgdG8gdGhlIGNvbnRleHQgbWVudS4KKworICAgICAgICAqIHBhZ2UvQ29udGV4dE1l bnVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Q29udHJvbGxl cjo6Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQpOiBNb2RpZmllZCB0byBhZGQKKyAgICAgICAgZGVj bGFyYXRpb24gb2YgdGhlIFVzZXJUeXBpbmdHZXN0dXJlSW5kaWNhdG9yLgorCiAyMDExLTAzLTI4 ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVu dUNvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4 dE1lbnVDb250cm9sbGVyLmNwcAkocmV2aXNpb24gODIwMDgpCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYzLDYgKzYz LDcgQEAKICNpbmNsdWRlICJTZWxlY3Rpb25Db250cm9sbGVyLmgiCiAjaW5jbHVkZSAiU2V0dGlu Z3MuaCIKICNpbmNsdWRlICJUZXh0SXRlcmF0b3IuaCIKKyNpbmNsdWRlICJVc2VyVHlwaW5nR2Vz dHVyZUluZGljYXRvci5oIgogI2luY2x1ZGUgIldpbmRvd0ZlYXR1cmVzLmgiCiAjaW5jbHVkZSAi bWFya3VwLmgiCiAjaW5jbHVkZSA8d3RmL3VuaWNvZGUvVW5pY29kZS5oPgpAQCAtMjU4LDEyICsy NTksMTYgQEAgdm9pZCBDb250ZXh0TWVudUNvbnRyb2xsZXI6OmNvbnRleHRNZW51SQogICAgIGNh c2UgQ29udGV4dE1lbnVJdGVtVGFnUmVsb2FkOgogICAgICAgICBmcmFtZS0+bG9hZGVyKCktPnJl bG9hZCgpOwogICAgICAgICBicmVhazsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0N1dDoK KyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0N1dDogeworICAgICAgICBVc2VyVHlwaW5nR2Vz dHVyZUluZGljYXRvciB0eXBpbmdHZXN0dXJlSW5kaWNhdG9yKGZyYW1lKTsKICAgICAgICAgZnJh bWUtPmVkaXRvcigpLT5jdXQoKTsKICAgICAgICAgYnJlYWs7Ci0gICAgY2FzZSBDb250ZXh0TWVu dUl0ZW1UYWdQYXN0ZToKKyAgICB9CisgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdQYXN0ZTog eworICAgICAgICBVc2VyVHlwaW5nR2VzdHVyZUluZGljYXRvciB0eXBpbmdHZXN0dXJlSW5kaWNh dG9yKGZyYW1lKTsKICAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5wYXN0ZSgpOwogICAgICAgICBi cmVhazsKKyAgICB9CiAjaWYgUExBVEZPUk0oR1RLKQogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVt VGFnRGVsZXRlOgogICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPnBlcmZvcm1EZWxldGUoKTsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0L3dpbi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMTY1KQorKysgU291cmNlL1dlYktpdC93aW4v Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMjggIEVu cmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9OOiBDYW4ndCBlbnRlciBwYXN0ZWQg d2l0aCBjb250ZXh0IG9yIEVkaXQgbWVudSB0ZXh0IGluIHNlYXJjaCBvciBhZGRyZXNzIGZpZWxk IGluIHRoZSBicm93c2VyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTcyNzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgyNDY2OTE+CisKKyAgICAg ICAgV2UgbmVlZCB0byBjbGFzc2lmeSBjdXQgYW5kIHBhc3RlIGFjdGlvbnMgYXMgdXNlciB0eXBp bmcgYWN0aW9ucyB0bworICAgICAgICBhbGxvdyB0aGUgcHJvcGFnYXRpb24gb2YgdGhlIHRleHRE aWRDaGFuZ2VJblRleHRGaWVsZCBldmVudC4KKyAgICAgICAgCisgICAgICAgICogV2ViVmlldy5j cHA6CisgICAgICAgIChXZWJWaWV3OjpjdXQpOiBNb2RpZmllZCB0byBhZGQgZGVjbGFyYXRpb24g b2YgdGhlIFVzZXJUeXBpbmdHZXN0dXJlSW5kaWNhdG9yLgorICAgICAgICAoV2ViVmlldzo6cGFz dGUpOiBTYW1lIGFzIGFib3ZlLgorCiAyMDExLTAzLTI4ICBBZGVsZSBQZXRlcnNvbiAgPGFkZWxl QGFwcGxlLmNvbT4KIAogICAgICAgICBCdWlsZCBmaXguCkluZGV4OiBTb3VyY2UvV2ViS2l0L3dp bi9XZWJWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNw cAkocmV2aXNpb24gODIwMDgpCisrKyBTb3VyY2UvV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkZ1bGxzY3JlZW5WaWRlb0Nv bnRyb2xsZXIuaCIKICNpbmNsdWRlICJNYXJzaGFsbGluZ0hlbHBlcnMuaCIKICNpbmNsdWRlICJT b2Z0TGlua2luZy5oIgorI2luY2x1ZGUgIlVzZXJUeXBpbmdHZXN0dXJlSW5kaWNhdG9yLmgiCiAj aW5jbHVkZSAiV2ViQmFja0ZvcndhcmRMaXN0LmgiCiAjaW5jbHVkZSAiV2ViQ2hyb21lQ2xpZW50 LmgiCiAjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVDbGllbnQuaCIKQEAgLTQyNzEsMTQgKzQyNzIs MTggQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3Ojpjb3B5KAogSFJFU1VMVCBT VERNRVRIT0RDQUxMVFlQRSBXZWJWaWV3OjpjdXQoIAogICAgICAgICAvKiBbaW5dICovIElVbmtu b3duKiAvKnNlbmRlciovKQogewotICAgIG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3Vz ZWRPck1haW5GcmFtZSgpLT5lZGl0b3IoKS0+Y29tbWFuZCgiQ3V0IikuZXhlY3V0ZSgpOworICAg IEZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5G cmFtZSgpOworICAgIFVzZXJUeXBpbmdHZXN0dXJlSW5kaWNhdG9yIHR5cGluZ0dlc3R1cmVJbmRp Y2F0b3IoZnJhbWUpOworICAgIGZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZCgiQ3V0IikuZXhlY3V0 ZSgpOwogICAgIHJldHVybiBTX09LOwogfQogCiBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdl YlZpZXc6OnBhc3RlKCAKICAgICAgICAgLyogW2luXSAqLyBJVW5rbm93biogLypzZW5kZXIqLykK IHsKLSAgICBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JNYWluRnJhbWUoKS0+ ZWRpdG9yKCktPmNvbW1hbmQoIlBhc3RlIikuZXhlY3V0ZSgpOworICAgIEZyYW1lKiBmcmFtZSA9 IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCktPmZvY3VzZWRPck1haW5GcmFtZSgpOworICAgIFVz ZXJUeXBpbmdHZXN0dXJlSW5kaWNhdG9yIHR5cGluZ0dlc3R1cmVJbmRpY2F0b3IoZnJhbWUpOwor ICAgIGZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZCgiUGFzdGUiKS5leGVjdXRlKCk7CiAgICAgcmV0 dXJuIFNfT0s7CiB9CiAK 87241 2011-03-28 17:00:28 -0700 2011-03-28 17:13:47 -0700 Patch2 contextmenu.txt text/plain 5448 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMTczKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTEtMDMtMjggIEVucmljYSBD YXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSRUdSRVNTSU9OOiBDYW4ndCBlbnRlciBwYXN0ZWQgd2l0aCBj b250ZXh0IG9yIEVkaXQgbWVudSB0ZXh0IGluIHNlYXJjaCBvciBhZGRyZXNzIGZpZWxkIGluIHRo ZSBicm93c2VyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTcyNzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzgyNDY2OTE+CisKKyAgICAgICAgV2Ug bmVlZCB0byBjbGFzc2lmeSBjdXQgYW5kIHBhc3RlIGFjdGlvbnMgYXMgdXNlciB0eXBpbmcgYWN0 aW9ucyBldmVuIHdoZW4KKyAgICAgICAgdGhlIGFjdGlvbiBpcyB0cmlnZ2VyZWQgYnkgYSBjb250 ZXh0IG1lbnUgc2VsZWN0aW9uIHRvCisgICAgICAgIGFsbG93IHRoZSBwcm9wYWdhdGlvbiBvZiB0 aGUgdGV4dERpZENoYW5nZUluVGV4dEZpZWxkIGV2ZW50LgorCisgICAgICAgICogZWRpdGluZy9F ZGl0b3JDb21tYW5kLmNwcDoKKyAgICAgICAgVGhlIGZvbGxvd2luZyBtZXRob2RzIGhhdmUgYmVl biBtb2RpZmllZCB0byBwcm9wZXJseSBzZXQgdXAKKyAgICAgICAgdGhlIFVzZXJUeXBpbmdHZXN0 dXJlQWN0aW9uIHdoZW4gdGhlIGNvbW1hbmQgc291cmNlIGlzIHRoZQorICAgICAgICBtZW51IG9y IGEga2V5IGJpbmRpbmcgc2VxdWVuY2UuCisgICAgICAgIChXZWJDb3JlOjpleGVjdXRlQ3V0KToK KyAgICAgICAgKFdlYkNvcmU6OmV4ZWN1dGVQYXN0ZSk6CisgICAgICAgIChXZWJDb3JlOjpleGVj dXRlUGFzdGVBbmRNYXRjaFN0eWxlKToKKyAgICAgICAgKFdlYkNvcmU6OmV4ZWN1dGVQYXN0ZUFz UGxhaW5UZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OmV4ZWN1dGVEZWxldGUpOgorICAgICAgICAq IHBhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl eHRNZW51Q29udHJvbGxlcjo6Y29udGV4dE1lbnVJdGVtU2VsZWN0ZWQpOiBDaGFuZ2VkIHRvCisg ICAgICAgIGNhbGwgZXhlY3V0ZSBjb21tYW5kIGluc3RlYWQgb2YgcmVmZXJyaW5nIHRvIHRoZSBz cGVjaWZpYyBtZXRob2QgaW4KKyAgICAgICAgdGhlIGVkaXRvciBjbGFzcy4KKwogMjAxMS0wMy0y OCAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEdlb2ZmcmV5IEdhcmVuLgpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3JDb21t YW5kLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvckNvbW1h bmQuY3BwCShyZXZpc2lvbiA4MjAwOCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9y Q29tbWFuZC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU2LDYgKzU2LDcgQEAKICNpbmNsdWRlICJT b3VuZC5oIgogI2luY2x1ZGUgIlR5cGluZ0NvbW1hbmQuaCIKICNpbmNsdWRlICJVbmxpbmtDb21t YW5kLmgiCisjaW5jbHVkZSAiVXNlclR5cGluZ0dlc3R1cmVJbmRpY2F0b3IuaCIKICNpbmNsdWRl ICJodG1sZWRpdGluZy5oIgogI2luY2x1ZGUgIm1hcmt1cC5oIgogI2luY2x1ZGUgPHd0Zi90ZXh0 L0F0b21pY1N0cmluZy5oPgpAQCAtMjk0LDE5ICsyOTUsMjUgQEAgc3RhdGljIGJvb2wgZXhlY3V0 ZUNyZWF0ZUxpbmsoRnJhbWUqIGZyYQogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgYm9v bCBleGVjdXRlQ3V0KEZyYW1lKiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JDb21tYW5kU291cmNlLCBj b25zdCBTdHJpbmcmKQorc3RhdGljIGJvb2wgZXhlY3V0ZUN1dChGcmFtZSogZnJhbWUsIEV2ZW50 KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSBzb3VyY2UsIGNvbnN0IFN0cmluZyYpCiB7Ci0gICAgZnJh bWUtPmVkaXRvcigpLT5jdXQoKTsKKyAgICBpZiAoc291cmNlID09IENvbW1hbmRGcm9tTWVudU9y S2V5QmluZGluZykgeworICAgICAgICBVc2VyVHlwaW5nR2VzdHVyZUluZGljYXRvciB0eXBpbmdH ZXN0dXJlSW5kaWNhdG9yKGZyYW1lKTsKKyAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5jdXQoKTsK KyAgICB9IGVsc2UKKyAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5jdXQoKTsKICAgICByZXR1cm4g dHJ1ZTsKIH0KIAogc3RhdGljIGJvb2wgZXhlY3V0ZURlbGV0ZShGcmFtZSogZnJhbWUsIEV2ZW50 KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSBzb3VyY2UsIGNvbnN0IFN0cmluZyYpCiB7CiAgICAgc3dp dGNoIChzb3VyY2UpIHsKLSAgICBjYXNlIENvbW1hbmRGcm9tTWVudU9yS2V5QmluZGluZzoKKyAg ICBjYXNlIENvbW1hbmRGcm9tTWVudU9yS2V5QmluZGluZzogewogICAgICAgICAvLyBEb2Vzbid0 IG1vZGlmeSB0aGUgdGV4dCBpZiB0aGUgY3VycmVudCBzZWxlY3Rpb24gaXNuJ3QgYSByYW5nZS4K KyAgICAgICAgVXNlclR5cGluZ0dlc3R1cmVJbmRpY2F0b3IgdHlwaW5nR2VzdHVyZUluZGljYXRv cihmcmFtZSk7CiAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+cGVyZm9ybURlbGV0ZSgpOwogICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CiAgICAgY2FzZSBDb21tYW5kRnJvbURPTToKICAgICBj YXNlIENvbW1hbmRGcm9tRE9NV2l0aFVzZXJJbnRlcmZhY2U6CiAgICAgICAgIC8vIElmIHRoZSBj dXJyZW50IHNlbGVjdGlvbiBpcyBhIGNhcmV0LCBkZWxldGUgdGhlIHByZWNlZGluZyBjaGFyYWN0 ZXIuIElFIHBlcmZvcm1zIGZvcndhcmREZWxldGUsIGJ1dCB3ZSBjdXJyZW50bHkgc2lkZSB3aXRo IEZpcmVmb3guCkBAIC04ODMsMjEgKzg5MCwzMyBAQCBzdGF0aWMgYm9vbCBleGVjdXRlT3V0ZGVu dChGcmFtZSogZnJhbWUsCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBib29sIGV4ZWN1 dGVQYXN0ZShGcmFtZSogZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSwgY29uc3Qg U3RyaW5nJikKK3N0YXRpYyBib29sIGV4ZWN1dGVQYXN0ZShGcmFtZSogZnJhbWUsIEV2ZW50Kiwg RWRpdG9yQ29tbWFuZFNvdXJjZSBzb3VyY2UsIGNvbnN0IFN0cmluZyYpCiB7Ci0gICAgZnJhbWUt PmVkaXRvcigpLT5wYXN0ZSgpOworICAgIGlmIChzb3VyY2UgPT0gQ29tbWFuZEZyb21NZW51T3JL ZXlCaW5kaW5nKSB7CisgICAgICAgIFVzZXJUeXBpbmdHZXN0dXJlSW5kaWNhdG9yIHR5cGluZ0dl c3R1cmVJbmRpY2F0b3IoZnJhbWUpOworICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPnBhc3RlKCk7 CisgICAgfSBlbHNlCisgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+cGFzdGUoKTsKICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgZXhlY3V0ZVBhc3RlQW5kTWF0Y2hTdHlsZShGcmFt ZSogZnJhbWUsIEV2ZW50KiwgRWRpdG9yQ29tbWFuZFNvdXJjZSwgY29uc3QgU3RyaW5nJikKK3N0 YXRpYyBib29sIGV4ZWN1dGVQYXN0ZUFuZE1hdGNoU3R5bGUoRnJhbWUqIGZyYW1lLCBFdmVudCos IEVkaXRvckNvbW1hbmRTb3VyY2Ugc291cmNlLCBjb25zdCBTdHJpbmcmKQogewotICAgIGZyYW1l LT5lZGl0b3IoKS0+cGFzdGVBc1BsYWluVGV4dCgpOworICAgIGlmIChzb3VyY2UgPT0gQ29tbWFu ZEZyb21NZW51T3JLZXlCaW5kaW5nKSB7CisgICAgICAgIFVzZXJUeXBpbmdHZXN0dXJlSW5kaWNh dG9yIHR5cGluZ0dlc3R1cmVJbmRpY2F0b3IoZnJhbWUpOworICAgICAgICBmcmFtZS0+ZWRpdG9y KCktPnBhc3RlQXNQbGFpblRleHQoKTsKKyAgICB9IGVsc2UKKyAgICAgICAgZnJhbWUtPmVkaXRv cigpLT5wYXN0ZUFzUGxhaW5UZXh0KCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBi b29sIGV4ZWN1dGVQYXN0ZUFzUGxhaW5UZXh0KEZyYW1lKiBmcmFtZSwgRXZlbnQqLCBFZGl0b3JD b21tYW5kU291cmNlLCBjb25zdCBTdHJpbmcmKQorc3RhdGljIGJvb2wgZXhlY3V0ZVBhc3RlQXNQ bGFpblRleHQoRnJhbWUqIGZyYW1lLCBFdmVudCosIEVkaXRvckNvbW1hbmRTb3VyY2Ugc291cmNl LCBjb25zdCBTdHJpbmcmKQogewotICAgIGZyYW1lLT5lZGl0b3IoKS0+cGFzdGVBc1BsYWluVGV4 dCgpOworICAgIGlmIChzb3VyY2UgPT0gQ29tbWFuZEZyb21NZW51T3JLZXlCaW5kaW5nKSB7Cisg ICAgICAgIFVzZXJUeXBpbmdHZXN0dXJlSW5kaWNhdG9yIHR5cGluZ0dlc3R1cmVJbmRpY2F0b3Io ZnJhbWUpOworICAgICAgICBmcmFtZS0+ZWRpdG9yKCktPnBhc3RlQXNQbGFpblRleHQoKTsKKyAg ICB9IGVsc2UKKyAgICAgICAgZnJhbWUtPmVkaXRvcigpLT5wYXN0ZUFzUGxhaW5UZXh0KCk7CiAg ICAgcmV0dXJuIHRydWU7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1l bnVDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl eHRNZW51Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDgyMDA4KQorKysgU291cmNlL1dlYkNvcmUv cGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Myw2ICs2 Myw3IEBACiAjaW5jbHVkZSAiU2VsZWN0aW9uQ29udHJvbGxlci5oIgogI2luY2x1ZGUgIlNldHRp bmdzLmgiCiAjaW5jbHVkZSAiVGV4dEl0ZXJhdG9yLmgiCisjaW5jbHVkZSAiVXNlclR5cGluZ0dl c3R1cmVJbmRpY2F0b3IuaCIKICNpbmNsdWRlICJXaW5kb3dGZWF0dXJlcy5oIgogI2luY2x1ZGUg Im1hcmt1cC5oIgogI2luY2x1ZGUgPHd0Zi91bmljb2RlL1VuaWNvZGUuaD4KQEAgLTI1OSwxMCAr MjYwLDEwIEBAIHZvaWQgQ29udGV4dE1lbnVDb250cm9sbGVyOjpjb250ZXh0TWVudUkKICAgICAg ICAgZnJhbWUtPmxvYWRlcigpLT5yZWxvYWQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBD b250ZXh0TWVudUl0ZW1UYWdDdXQ6Ci0gICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+Y3V0KCk7Cisg ICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZCgiQ3V0IikuZXhlY3V0ZSgpOwogICAgICAg ICBicmVhazsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1Bhc3RlOgotICAgICAgICBmcmFt ZS0+ZWRpdG9yKCktPnBhc3RlKCk7CisgICAgICAgIGZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZCgi UGFzdGUiKS5leGVjdXRlKCk7CiAgICAgICAgIGJyZWFrOwogI2lmIFBMQVRGT1JNKEdUSykKICAg ICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0RlbGV0ZToK