89595 2012-06-20 12:53:54 -0700 [BlackBerry] Input mode should adapt automatically to settings changes 2012-06-21 06:40:05 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mifenton mifenton tonikitoo webkit.review.bot oldest_to_newest 653794 0 mifenton 2012-06-20 12:53:54 -0700 Currently the input mode is overridden when being set based on settings, this should happen immediately and not wait for a set call to update. 653852 1 148648 mifenton 2012-06-20 13:45:28 -0700 Created attachment 148648 Patch 653859 2 148648 tonikitoo 2012-06-20 13:51:34 -0700 Comment on attachment 148648 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=148648&action=review I think I like the name isInputMethodEnabled more. Up to you... > Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp:435 > +bool InputHandler::inputModeEnabled() const? 654424 3 148776 mifenton 2012-06-21 05:56:09 -0700 Created attachment 148776 Updated patch based on suggestion. 654458 4 148776 webkit.review.bot 2012-06-21 06:40:01 -0700 Comment on attachment 148776 Updated patch based on suggestion. Clearing flags on attachment: 148776 Committed r120923: <http://trac.webkit.org/changeset/120923> 654459 5 webkit.review.bot 2012-06-21 06:40:05 -0700 All reviewed patches have been landed. Closing bug. 148648 2012-06-20 13:45:28 -0700 2012-06-21 05:56:09 -0700 Patch 0001-2012-06-20-Mike-Fenton-mifenton-rim.com.patch text/plain 10369 mifenton RnJvbSA0NWQzOWMxYjRkZDNkNDZkNThmMjkzMTIyNTRhNmIyNjhmMTMwNDY4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlmZW50b25AcmltLmNvbT4KRGF0ZTog V2VkLCAyMCBKdW4gMjAxMiAxNTowMTowMCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTItMDYt MjAgIE1pa2UgRmVudG9uICA8bWlmZW50b25AcmltLmNvbT4KCiAgICAgICAgUFIgMTY3NTQwLgoK ICAgICAgICBBZGQgaGVscGVyIGZ1bmN0aW9uIHRvIGNoZWNrIGlmIGlucHV0IGlzIGVuYWJsZWQg c28gdGhhdAogICAgICAgIHRoZSBvdmVycmlkZSBzZXR0aW5ncyBjYW4gYmUgYXBwbGllZCBhdCBh bnkgdGltZS4KCiAgICAgICAgUmV2aWV3ZWQgSW50ZXJuYWxseSBieSBHZW4gTWFrLgoKICAgICAg ICAqIEFwaS9XZWJQYWdlLmNwcDoKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQYWdl UHJpdmF0ZTo6c2V0TG9hZFN0YXRlKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQ YWdlUHJpdmF0ZTo6aGFuZGxlTW91c2VFdmVudCk6CiAgICAgICAgKiBXZWJLaXRTdXBwb3J0L0lu cHV0SGFuZGxlci5jcHA6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVy OjppbnB1dE1vZGVFbmFibGVkKToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhh bmRsZXI6OnNldElucHV0TW9kZUVuYWJsZWQpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6 OklucHV0SGFuZGxlcjo6c2V0RWxlbWVudEZvY3VzZWQpOgogICAgICAgIChCbGFja0JlcnJ5OjpX ZWJLaXQ6OklucHV0SGFuZGxlcjo6ZW5zdXJlRm9jdXNUZXh0RWxlbWVudFZpc2libGUpOgogICAg ICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6bm90aWZ5Q2xpZW50T2ZLZXli b2FyZFZpc2liaWxpdHlDaGFuZ2UpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0 SGFuZGxlcjo6aGFuZGxlS2V5Ym9hcmRJbnB1dCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5wdXRIYW5kbGVyOjpzZXRDb21wb3NpbmdUZXh0KToKICAgICAgICAqIFdlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmg6CiAgICAgICAgKiBXZWJLaXRTdXBwb3J0L1RvdWNoRXZlbnRIYW5k bGVyLmNwcDoKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpUb3VjaEV2ZW50SGFuZGxlcjo6 aGFuZGxlVG91Y2hQb2ludCk6Ci0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQ YWdlLmNwcCAgICAgICAgICAgfCAgICA0ICstLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDI5ICsrKysrKysrKysrKysrKysrCiAuLi4vYmxh Y2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5jcHAgICAgICB8ICAgMzMgKysrKysr KysrKy0tLS0tLS0tLS0KIC4uLi9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0 SGFuZGxlci5oIHwgICAgMyArLQogLi4uL2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ub3VjaEV2 ZW50SGFuZGxlci5jcHAgfCAgICAyICstCiA1IGZpbGVzIGNoYW5nZWQsIDUxIGluc2VydGlvbnMo KyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJy eS9BcGkvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu Y3BwCmluZGV4IGJhNjk4Y2UuLjNjMjlmOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxh Y2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlLmNwcApAQCAtOTk4LDcgKzk5OCw3IEBAIHZvaWQgV2ViUGFnZVByaXZhdGU6OnNl dExvYWRTdGF0ZShMb2FkU3RhdGUgc3RhdGUpCiAjZW5kaWYKIAogICAgICAgICAgICAgLy8gTm90 aWZ5IElucHV0SGFuZGxlciBvZiBzdGF0ZSBjaGFuZ2UuCi0gICAgICAgICAgICBtX2lucHV0SGFu ZGxlci0+ZW5hYmxlSW5wdXRNb2RlKGZhbHNlKTsKKyAgICAgICAgICAgIG1faW5wdXRIYW5kbGVy LT5zZXRJbnB1dE1vZGVFbmFibGVkKGZhbHNlKTsKIAogICAgICAgICAgICAgLy8gU2V0IHRoZSBz Y3JvbGwgdG8gb3JpZ2luIGhlcmUgYW5kIG5vdGlmeSB0aGUgY2xpZW50IHNpbmNlIHdlJ2xsIGJl CiAgICAgICAgICAgICAvLyB6b29taW5nIGJlbG93IHdpdGhvdXQgYW55IHJlYWwgY29udGVudHMg eWV0IHRodXMgdGhlIGNvbnRlbnRzIHNpemUKQEAgLTM5NDQsNyArMzk0NCw3IEBAIGJvb2wgV2Vi UGFnZVByaXZhdGU6OmhhbmRsZU1vdXNlRXZlbnQoUGxhdGZvcm1Nb3VzZUV2ZW50JiBtb3VzZUV2 ZW50KQogICAgIH0KIAogICAgIGlmIChtb3VzZUV2ZW50LnR5cGUoKSA9PSBXZWJDb3JlOjpQbGF0 Zm9ybUV2ZW50OjpNb3VzZVByZXNzZWQpIHsKLSAgICAgICAgbV9pbnB1dEhhbmRsZXItPmVuYWJs ZUlucHV0TW9kZSgpOworICAgICAgICBtX2lucHV0SGFuZGxlci0+c2V0SW5wdXRNb2RlRW5hYmxl ZCgpOwogICAgICAgICBpZiAobV9pbnB1dEhhbmRsZXItPndpbGxPcGVuUG9wdXBGb3JOb2RlKG5v ZGUpKSB7CiAgICAgICAgICAgICAvLyBEbyBub3QgYWxsb3cgYW55IGh1bWFuIGdlbmVyYXRlZCBt b3VzZSBvciBrZXlib2FyZCBldmVudHMgdG8gc2VsZWN0IDxvcHRpb24+cyBpbiB0aGUgbGlzdCBi b3gKICAgICAgICAgICAgIC8vIGJlY2F1c2Ugd2UgdXNlIGEgcG9wIHVwIGRpYWxvZyB0byBoYW5k bGUgdGhlIGFjdHVhbCBzZWxlY3Rpb25zLiBUaGlzIHByZXZlbnRzIG9wdGlvbnMgZnJvbQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKaW5kZXggNjI0NTRhZC4uNTY4OGExZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTItMDYtMjAgIE1pa2Ug RmVudG9uICA8bWlmZW50b25AcmltLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gSW5wdXQg bW9kZSBzaG91bGQgYWRhcHQgYXV0b21hdGljYWxseSB0byBzZXR0aW5ncyBjaGFuZ2VzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTU5NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBSIDE2NzU0MC4KKwor ICAgICAgICBBZGQgaGVscGVyIGZ1bmN0aW9uIHRvIGNoZWNrIGlmIGlucHV0IGlzIGVuYWJsZWQg c28gdGhhdAorICAgICAgICB0aGUgb3ZlcnJpZGUgc2V0dGluZ3MgY2FuIGJlIGFwcGxpZWQgYXQg YW55IHRpbWUuCisKKyAgICAgICAgUmV2aWV3ZWQgSW50ZXJuYWxseSBieSBHZW4gTWFrLgorCisg ICAgICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpX ZWJQYWdlUHJpdmF0ZTo6c2V0TG9hZFN0YXRlKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6V2ViUGFnZVByaXZhdGU6OmhhbmRsZU1vdXNlRXZlbnQpOgorICAgICAgICAqIFdlYktpdFN1 cHBvcnQvSW5wdXRIYW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5w dXRIYW5kbGVyOjppbnB1dE1vZGVFbmFibGVkKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5wdXRIYW5kbGVyOjpzZXRJbnB1dE1vZGVFbmFibGVkKToKKyAgICAgICAgKEJsYWNrQmVy cnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzZXRFbGVtZW50Rm9jdXNlZCk6CisgICAgICAgIChC bGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6ZW5zdXJlRm9jdXNUZXh0RWxlbWVudFZp c2libGUpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6Om5vdGlm eUNsaWVudE9mS2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKToKKyAgICAgICAgKEJsYWNrQmVycnk6 OldlYktpdDo6SW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KToKKyAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpzZXRDb21wb3NpbmdUZXh0KToKKyAgICAg ICAgKiBXZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oOgorICAgICAgICAqIFdlYktpdFN1cHBv cnQvVG91Y2hFdmVudEhhbmRsZXIuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpU b3VjaEV2ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hQb2ludCk6CisKIDIwMTItMDYtMjAgIEtvbnJh ZCBQaWFzY2lrICA8a3BpYXNjaWtAcmltLmNvbT4KIAogICAgICAgICBbQmxhY2tCZXJyeV0gRW5h YmxlIHNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdGb3JGaXhlZFBvc2l0aW9uRW5hYmxlZApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5k bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFu ZGxlci5jcHAKaW5kZXggYzU2M2FkMi4uMzhmODFlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwCkBAIC00MzIs MjEgKzQzMiwyMiBAQCB2b2lkIElucHV0SGFuZGxlcjo6c2V0RWxlbWVudFVuZm9jdXNlZChib29s IHJlZm9jdXNPY2N1cmluZykKICAgICBtX2N1cnJlbnRGb2N1c0VsZW1lbnRUeXBlID0gVGV4dEVk aXQ7CiB9CiAKLXZvaWQgSW5wdXRIYW5kbGVyOjplbmFibGVJbnB1dE1vZGUoYm9vbCBpbnB1dE1v ZGVBbGxvd2VkKQorYm9vbCBJbnB1dEhhbmRsZXI6OmlucHV0TW9kZUVuYWJsZWQoKQogewotICAg IEZvY3VzTG9nKExvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6ZW5hYmxlSW5wdXRNb2RlICcl cycsIG92ZXJyaWRlIGlzICclcyciCi0gICAgICAgICAgICAgLCBpbnB1dE1vZGVBbGxvd2VkID8g InRydWUiIDogImZhbHNlIgotICAgICAgICAgICAgICwgbV93ZWJQYWdlLT5tX2R1bXBSZW5kZXJU cmVlIHx8IFBsYXRmb3JtOjpTZXR0aW5nczo6Z2V0KCktPmFsd2F5c1Nob3dLZXlib2FyZE9uRm9j dXMoKSA/ICJ0cnVlIiA6ICJmYWxzZSIpOworICAgIC8vIElucHV0IG1vZGUgaXMgZW5hYmxlZCB3 aGVuIHNldCwgb3Igd2hlbiBkdW1wIHJlbmRlciB0cmVlIG9yIGFsd2F5cyBzaG93IGtleWJvYXJk IHNldHRpbmcgaXMgZW5hYmxlZC4KKyAgICByZXR1cm4gbV9pbnB1dE1vZGVFbmFibGVkIHx8IG1f d2ViUGFnZS0+bV9kdW1wUmVuZGVyVHJlZSB8fCBQbGF0Zm9ybTo6U2V0dGluZ3M6OmdldCgpLT5h bHdheXNTaG93S2V5Ym9hcmRPbkZvY3VzKCk7Cit9CiAKLSAgICBtX2lucHV0TW9kZUVuYWJsZWQg PSBpbnB1dE1vZGVBbGxvd2VkOwordm9pZCBJbnB1dEhhbmRsZXI6OnNldElucHV0TW9kZUVuYWJs ZWQoYm9vbCBhY3RpdmUpCit7CisgICAgRm9jdXNMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5k bGVyOjpzZXRJbnB1dE1vZGVFbmFibGVkICclcycsIG92ZXJyaWRlIGlzICclcyciCisgICAgICAg ICAgICAgLCBlbmFibGVkID8gInRydWUiIDogImZhbHNlIgorICAgICAgICAgICAgICwgbV93ZWJQ YWdlLT5tX2R1bXBSZW5kZXJUcmVlIHx8IFBsYXRmb3JtOjpTZXR0aW5nczo6Z2V0KCktPmFsd2F5 c1Nob3dLZXlib2FyZE9uRm9jdXMoKSA/ICJ0cnVlIiA6ICJmYWxzZSIpOwogCi0gICAgLy8gSWYg RFJUIGlzIHJ1bm5pbmcgb3IgYWx3YXlzIHNob3cga2V5Ym9hcmQgc2V0dGluZyBpcyBhY3RpdmUs IGRvIG5vdCBkZWxheQotICAgIC8vIHNob3dpbmcgdGhlIGtleWJvYXJkLgotICAgIGlmIChtX3dl YlBhZ2UtPm1fZHVtcFJlbmRlclRyZWUgfHwgUGxhdGZvcm06OlNldHRpbmdzOjpnZXQoKS0+YWx3 YXlzU2hvd0tleWJvYXJkT25Gb2N1cygpKQotICAgICAgICBtX2lucHV0TW9kZUVuYWJsZWQgPSB0 cnVlOworICAgIG1faW5wdXRNb2RlRW5hYmxlZCA9IGVuYWJsZWQ7CiAKICAgICAvLyBJZiB0aGUg ZnJhbWUgc2VsZWN0aW9uIGlzbid0IGZvY3VzZWQsIGZvY3VzIGl0LgotICAgIGlmIChtX2lucHV0 TW9kZUVuYWJsZWQgJiYgaXNBY3RpdmVUZXh0RWRpdCgpICYmICFtX2N1cnJlbnRGb2N1c0VsZW1l bnQtPmRvY3VtZW50KCktPmZyYW1lKCktPnNlbGVjdGlvbigpLT5pc0ZvY3VzZWQoKSkKKyAgICBp ZiAoaW5wdXRNb2RlRW5hYmxlZCgpICYmIGlzQWN0aXZlVGV4dEVkaXQoKSAmJiAhbV9jdXJyZW50 Rm9jdXNFbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgpLT5zZWxlY3Rpb24oKS0+aXNGb2N1c2Vk KCkpCiAgICAgICAgIG1fY3VycmVudEZvY3VzRWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+ c2VsZWN0aW9uKCktPnNldEZvY3VzZWQodHJ1ZSk7CiB9CiAKQEAgLTQ1NSw4ICs0NTYsOCBAQCB2 b2lkIElucHV0SGFuZGxlcjo6c2V0RWxlbWVudEZvY3VzZWQoRWxlbWVudCogZWxlbWVudCkKICAg ICBBU1NFUlQoRE9NU3VwcG9ydDo6aXNUZXh0QmFzZWRDb250ZW50RWRpdGFibGVFbGVtZW50KGVs ZW1lbnQpKTsKICAgICBBU1NFUlQoZWxlbWVudC0+ZG9jdW1lbnQoKSAmJiBlbGVtZW50LT5kb2N1 bWVudCgpLT5mcmFtZSgpKTsKIAotICAgIGlmIChlbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgp LT5zZWxlY3Rpb24oKS0+aXNGb2N1c2VkKCkgIT0gbV9pbnB1dE1vZGVFbmFibGVkKQotICAgICAg ICBlbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgpLT5zZWxlY3Rpb24oKS0+c2V0Rm9jdXNlZCht X2lucHV0TW9kZUVuYWJsZWQpOworICAgIGlmIChlbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgp LT5zZWxlY3Rpb24oKS0+aXNGb2N1c2VkKCkgIT0gaW5wdXRNb2RlRW5hYmxlZCgpKQorICAgICAg ICBlbGVtZW50LT5kb2N1bWVudCgpLT5mcmFtZSgpLT5zZWxlY3Rpb24oKS0+c2V0Rm9jdXNlZChp bnB1dE1vZGVFbmFibGVkKCkpOwogCiAgICAgLy8gQ2xlYXIgdGhlIGV4aXN0aW5nIGZvY3VzIG5v ZGUgZGV0YWlscy4KICAgICBzZXRFbGVtZW50VW5mb2N1c2VkKHRydWUgLypyZWZvY3VzT2NjdXJp bmcqLyk7CkBAIC01NTIsNyArNTUzLDcgQEAgV2ViQ29yZTo6SW50UmVjdCBJbnB1dEhhbmRsZXI6 OmJvdW5kaW5nQm94Rm9ySW5wdXRGaWVsZCgpCiAKIHZvaWQgSW5wdXRIYW5kbGVyOjplbnN1cmVG b2N1c1RleHRFbGVtZW50VmlzaWJsZShDYXJldFNjcm9sbFR5cGUgc2Nyb2xsVHlwZSkKIHsKLSAg ICBpZiAoIW1faW5wdXRNb2RlRW5hYmxlZCB8fCAhbV9jdXJyZW50Rm9jdXNFbGVtZW50IHx8ICFt X2N1cnJlbnRGb2N1c0VsZW1lbnQtPmRvY3VtZW50KCkpCisgICAgaWYgKCFpc0FjdGl2ZVRleHRF ZGl0KCkgfHwgIWlucHV0TW9kZUVuYWJsZWQoKSB8fCAhbV9jdXJyZW50Rm9jdXNFbGVtZW50LT5k b2N1bWVudCgpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIVBsYXRmb3JtOjpTZXR0aW5n czo6Z2V0KCktPmFsbG93Q2VudGVyU2Nyb2xsQWRqdXN0bWVudEZvcklucHV0RmllbGRzKCkgJiYg c2Nyb2xsVHlwZSAhPSBFZGdlSWZOZWVkZWQpCkBAIC03NzAsNyArNzcxLDcgQEAgdm9pZCBJbnB1 dEhhbmRsZXI6OnByb2Nlc3NQZW5kaW5nS2V5Ym9hcmRWaXNpYmlsaXR5Q2hhbmdlKCkKIHZvaWQg SW5wdXRIYW5kbGVyOjpub3RpZnlDbGllbnRPZktleWJvYXJkVmlzaWJpbGl0eUNoYW5nZShib29s IHZpc2libGUpCiB7CiAgICAgLy8gSWYgd2UgYXJlbid0IHJlYWR5IGZvciBpbnB1dCwga2V5Ym9h cmQgY2hhbmdlcyBzaG91bGQgYmUgaWdub3JlZC4KLSAgICBpZiAoIW1faW5wdXRNb2RlRW5hYmxl ZCAmJiB2aXNpYmxlKQorICAgIGlmICghaW5wdXRNb2RlRW5hYmxlZCgpICYmIHZpc2libGUpCiAg ICAgICAgIHJldHVybjsKIAogICAgIGlmICghbV9kZWxheUtleWJvYXJkVmlzaWJpbGl0eUNoYW5n ZSkgewpAQCAtOTI5LDcgKzkzMCw3IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2Fy ZElucHV0KGNvbnN0IFBsYXRmb3JtOjpLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2CiAgICAgSW5w dXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0IHJl Y2VpdmVkIGNoYXJhY3Rlcj0lbGMsIHR5cGU9JWQiLCBrZXlib2FyZEV2ZW50LmNoYXJhY3Rlcigp LCBrZXlib2FyZEV2ZW50LnR5cGUoKSk7CiAKICAgICAvLyBFbmFibGUgaW5wdXQgbW9kZSBpZiB3 ZSBhcmUgcHJvY2Vzc2luZyBhIGtleSBldmVudC4KLSAgICBlbmFibGVJbnB1dE1vZGUoKTsKKyAg ICBzZXRJbnB1dE1vZGVFbmFibGVkKCk7CiAKICAgICAvLyBJZiB3ZSBhcmVuJ3Qgc3BlY2lmaWNh bGx5IHBhcnQgb2YgYSBjb21wb3NpdGlvbiwgZmFpbCwgSU1GIHNob3VsZCBuZXZlciBzZW5kIGtl eSBpbnB1dAogICAgIC8vIHdoaWxlIGNvbXBvc2luZyB0ZXh0LiBJZiBJTUYgaGFzIGZhaWxlZCwg d2Ugc2hvdWxkIGhhdmUgYWxyZWFkeSBmaW5pc2hlZCB0aGUKQEAgLTE3MjUsNyArMTcyNiw3IEBA IGludDMyX3QgSW5wdXRIYW5kbGVyOjpzZXRDb21wb3NpbmdUZXh0KHNwYW5uYWJsZV9zdHJpbmdf dCogc3Bhbm5hYmxlU3RyaW5nLCBpbnQzCiAgICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5w dXRIYW5kbGVyOjpzZXRDb21wb3NpbmdUZXh0IGF0IHJlbGF0aXZlQ3Vyc29yUG9zaXRpb246ICVk IiwgcmVsYXRpdmVDdXJzb3JQb3NpdGlvbik7CiAKICAgICAvLyBFbmFibGUgaW5wdXQgbW9kZSBp ZiB3ZSBhcmUgcHJvY2Vzc2luZyBhIGtleSBldmVudC4KLSAgICBlbmFibGVJbnB1dE1vZGUoKTsK KyAgICBzZXRJbnB1dE1vZGVFbmFibGVkKCk7CiAKICAgICByZXR1cm4gc2V0U3Bhbm5hYmxlVGV4 dEFuZFJlbGF0aXZlQ3Vyc29yKHNwYW5uYWJsZVN0cmluZywgcmVsYXRpdmVDdXJzb3JQb3NpdGlv biwgdHJ1ZSAvKiBtYXJrVGV4dEFzQ29tcG9zaW5nICovKSA/IDAgOiAtMTsKIH0KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5o IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmgK aW5kZXggYzYzMzQ0Ny4uZDQxNmUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFj a2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmgKQEAgLTU3LDcgKzU3LDggQEAgcHVi bGljOgogICAgIGVudW0gRm9jdXNFbGVtZW50VHlwZSB7IFRleHRFZGl0LCBUZXh0UG9wdXAgLyog RGF0ZS9UaW1lICYgQ29sb3IgKi8sIFNlbGVjdFBvcHVwLCBQbHVnaW4gfTsKICAgICBlbnVtIENh cmV0U2Nyb2xsVHlwZSB7IENlbnRlckFsd2F5cywgQ2VudGVySWZOZWVkZWQsIEVkZ2VJZk5lZWRl ZCB9OwogCi0gICAgdm9pZCBlbmFibGVJbnB1dE1vZGUoYm9vbCBpbnB1dE1vZGVBbGxvd2VkID0g dHJ1ZSk7CisgICAgYm9vbCBpbnB1dE1vZGVFbmFibGVkKCk7CisgICAgdm9pZCBzZXRJbnB1dE1v ZGVFbmFibGVkKGJvb2wgYWN0aXZlID0gdHJ1ZSk7CiAKICAgICB2b2lkIGZvY3VzZWROb2RlQ2hh bmdlZCgpOwogICAgIHZvaWQgbm9kZVRleHRDaGFuZ2VkKGNvbnN0IFdlYkNvcmU6Ok5vZGUqKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNo RXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0 L1RvdWNoRXZlbnRIYW5kbGVyLmNwcAppbmRleCBhNzRhZjRiLi5mN2M3MzFkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ub3VjaEV2ZW50SGFuZGxl ci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvVG91Y2hF dmVudEhhbmRsZXIuY3BwCkBAIC0xNzEsNyArMTcxLDcgQEAgdm9pZCBUb3VjaEV2ZW50SGFuZGxl cjo6dG91Y2hIb2xkRXZlbnQoKQogYm9vbCBUb3VjaEV2ZW50SGFuZGxlcjo6aGFuZGxlVG91Y2hQ b2ludChQbGF0Zm9ybTo6VG91Y2hQb2ludCYgcG9pbnQpCiB7CiAgICAgLy8gRW5hYmxlIGlucHV0 IG1vZGUgb24gYW55IHRvdWNoIGV2ZW50LgotICAgIG1fd2ViUGFnZS0+bV9pbnB1dEhhbmRsZXIt PmVuYWJsZUlucHV0TW9kZSgpOworICAgIG1fd2ViUGFnZS0+bV9pbnB1dEhhbmRsZXItPnNldElu cHV0TW9kZUVuYWJsZWQoKTsKICAgICBib29sIHB1cmVXaXRoTW91c2VDb252ZXJzaW9uID0gbV93 ZWJQYWdlLT5tX3RvdWNoRXZlbnRNb2RlID09IFB1cmVUb3VjaEV2ZW50c1dpdGhNb3VzZUNvbnZl cnNpb247CiAKICAgICBzd2l0Y2ggKHBvaW50Lm1fc3RhdGUpIHsKLS0gCjEuNy45LjUKCg== 148776 2012-06-21 05:56:09 -0700 2012-06-21 06:40:01 -0700 Updated patch based on suggestion. 0001-2012-06-20-Mike-Fenton-mifenton-rim.com.patch text/plain 10359 mifenton RnJvbSBkZWUyZDc4ZWZmODk0NmU3N2NlMWNmYWEyNTRhYmE4MzI0M2JiZDJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIEZlbnRvbiA8bWlmZW50b25AcmltLmNvbT4KRGF0ZTog V2VkLCAyMCBKdW4gMjAxMiAxNTowMTowMCAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIDIwMTItMDYt MjAgIE1pa2UgRmVudG9uICA8bWlmZW50b25AcmltLmNvbT4KCiAgICAgICAgUFIgMTY3NTQwLgoK ICAgICAgICBBZGQgaGVscGVyIGZ1bmN0aW9uIHRvIGNoZWNrIGlmIGlucHV0IGlzIGVuYWJsZWQg c28gdGhhdAogICAgICAgIHRoZSBvdmVycmlkZSBzZXR0aW5ncyBjYW4gYmUgYXBwbGllZCBhdCBh bnkgdGltZS4KCiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgICog QXBpL1dlYlBhZ2UuY3BwOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2 YXRlOjpzZXRMb2FkU3RhdGUpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQ cml2YXRlOjpoYW5kbGVNb3VzZUV2ZW50KToKICAgICAgICAqIFdlYktpdFN1cHBvcnQvSW5wdXRI YW5kbGVyLmNwcDoKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6Omlu cHV0TW9kZUVuYWJsZWQpOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxl cjo6c2V0SW5wdXRNb2RlRW5hYmxlZCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5w dXRIYW5kbGVyOjpzZXRFbGVtZW50Rm9jdXNlZCk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktp dDo6SW5wdXRIYW5kbGVyOjplbnN1cmVGb2N1c1RleHRFbGVtZW50VmlzaWJsZSk6CiAgICAgICAg KEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjpub3RpZnlDbGllbnRPZktleWJvYXJk VmlzaWJpbGl0eUNoYW5nZSk6CiAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5k bGVyOjpoYW5kbGVLZXlib2FyZElucHV0KToKICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpJ bnB1dEhhbmRsZXI6OnNldENvbXBvc2luZ1RleHQpOgogICAgICAgICogV2ViS2l0U3VwcG9ydC9J bnB1dEhhbmRsZXIuaDoKICAgICAgICAqIFdlYktpdFN1cHBvcnQvVG91Y2hFdmVudEhhbmRsZXIu Y3BwOgogICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlRvdWNoRXZlbnRIYW5kbGVyOjpoYW5k bGVUb3VjaFBvaW50KToKLS0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2Uu Y3BwICAgICAgICAgICB8ICAgIDQgKy0tCiBTb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdl TG9nICAgICAgICAgICAgICAgICB8ICAgMjkgKysrKysrKysrKysrKysrKysKIC4uLi9ibGFja2Jl cnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcCAgICAgIHwgICAzMyArKysrKysrKysr LS0tLS0tLS0tLQogLi4uL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5k bGVyLmggfCAgICAzICstCiAuLi4vYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNoRXZlbnRI YW5kbGVyLmNwcCB8ICAgIDIgKy0KIDUgZmlsZXMgY2hhbmdlZCwgNTEgaW5zZXJ0aW9ucygrKSwg MjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0Fw aS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAK aW5kZXggYzgyNjBmMS4uNTE2YjJjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L0FwaS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dl YlBhZ2UuY3BwCkBAIC0xMDIxLDcgKzEwMjEsNyBAQCB2b2lkIFdlYlBhZ2VQcml2YXRlOjpzZXRM b2FkU3RhdGUoTG9hZFN0YXRlIHN0YXRlKQogI2VuZGlmCiAKICAgICAgICAgICAgIC8vIE5vdGlm eSBJbnB1dEhhbmRsZXIgb2Ygc3RhdGUgY2hhbmdlLgotICAgICAgICAgICAgbV9pbnB1dEhhbmRs ZXItPmVuYWJsZUlucHV0TW9kZShmYWxzZSk7CisgICAgICAgICAgICBtX2lucHV0SGFuZGxlci0+ c2V0SW5wdXRNb2RlRW5hYmxlZChmYWxzZSk7CiAKICAgICAgICAgICAgIC8vIFNldCB0aGUgc2Ny b2xsIHRvIG9yaWdpbiBoZXJlIGFuZCBub3RpZnkgdGhlIGNsaWVudCBzaW5jZSB3ZSdsbCBiZQog ICAgICAgICAgICAgLy8gem9vbWluZyBiZWxvdyB3aXRob3V0IGFueSByZWFsIGNvbnRlbnRzIHll dCB0aHVzIHRoZSBjb250ZW50cyBzaXplCkBAIC0zOTY3LDcgKzM5NjcsNyBAQCBib29sIFdlYlBh Z2VQcml2YXRlOjpoYW5kbGVNb3VzZUV2ZW50KFBsYXRmb3JtTW91c2VFdmVudCYgbW91c2VFdmVu dCkKICAgICB9CiAKICAgICBpZiAobW91c2VFdmVudC50eXBlKCkgPT0gV2ViQ29yZTo6UGxhdGZv cm1FdmVudDo6TW91c2VQcmVzc2VkKSB7Ci0gICAgICAgIG1faW5wdXRIYW5kbGVyLT5lbmFibGVJ bnB1dE1vZGUoKTsKKyAgICAgICAgbV9pbnB1dEhhbmRsZXItPnNldElucHV0TW9kZUVuYWJsZWQo KTsKICAgICAgICAgaWYgKG1faW5wdXRIYW5kbGVyLT53aWxsT3BlblBvcHVwRm9yTm9kZShub2Rl KSkgewogICAgICAgICAgICAgLy8gRG8gbm90IGFsbG93IGFueSBodW1hbiBnZW5lcmF0ZWQgbW91 c2Ugb3Iga2V5Ym9hcmQgZXZlbnRzIHRvIHNlbGVjdCA8b3B0aW9uPnMgaW4gdGhlIGxpc3QgYm94 CiAgICAgICAgICAgICAvLyBiZWNhdXNlIHdlIHVzZSBhIHBvcCB1cCBkaWFsb2cgdG8gaGFuZGxl IHRoZSBhY3R1YWwgc2VsZWN0aW9ucy4gVGhpcyBwcmV2ZW50cyBvcHRpb25zIGZyb20KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2JsYWNrYmVycnkvQ2hhbmdlTG9nCmluZGV4IGI4ZDY2NjMuLmExNzI4NWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA2LTIxICBNaWtlIEZl bnRvbiAgPG1pZmVudG9uQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIElucHV0IG1v ZGUgc2hvdWxkIGFkYXB0IGF1dG9tYXRpY2FsbHkgdG8gc2V0dGluZ3MgY2hhbmdlcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODk1OTUKKworICAgICAg ICBSZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgorCisgICAgICAgIFBSIDE2NzU0MC4KKworICAg ICAgICBBZGQgaGVscGVyIGZ1bmN0aW9uIHRvIGNoZWNrIGlmIGlucHV0IGlzIGVuYWJsZWQgc28g dGhhdAorICAgICAgICB0aGUgb3ZlcnJpZGUgc2V0dGluZ3MgY2FuIGJlIGFwcGxpZWQgYXQgYW55 IHRpbWUuCisKKyAgICAgICAgUmV2aWV3ZWQgSW50ZXJuYWxseSBieSBHZW4gTWFrLgorCisgICAg ICAgICogQXBpL1dlYlBhZ2UuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpXZWJQ YWdlUHJpdmF0ZTo6c2V0TG9hZFN0YXRlKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6 V2ViUGFnZVByaXZhdGU6OmhhbmRsZU1vdXNlRXZlbnQpOgorICAgICAgICAqIFdlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6SW5wdXRI YW5kbGVyOjppc0lucHV0TW9kZUVuYWJsZWQpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0 OjpJbnB1dEhhbmRsZXI6OnNldElucHV0TW9kZUVuYWJsZWQpOgorICAgICAgICAoQmxhY2tCZXJy eTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNldEVsZW1lbnRGb2N1c2VkKToKKyAgICAgICAgKEJs YWNrQmVycnk6OldlYktpdDo6SW5wdXRIYW5kbGVyOjplbnN1cmVGb2N1c1RleHRFbGVtZW50Vmlz aWJsZSk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OklucHV0SGFuZGxlcjo6bm90aWZ5 Q2xpZW50T2ZLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UpOgorICAgICAgICAoQmxhY2tCZXJyeTo6 V2ViS2l0OjpJbnB1dEhhbmRsZXI6OmhhbmRsZUtleWJvYXJkSW5wdXQpOgorICAgICAgICAoQmxh Y2tCZXJyeTo6V2ViS2l0OjpJbnB1dEhhbmRsZXI6OnNldENvbXBvc2luZ1RleHQpOgorICAgICAg ICAqIFdlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmg6CisgICAgICAgICogV2ViS2l0U3VwcG9y dC9Ub3VjaEV2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OlRv dWNoRXZlbnRIYW5kbGVyOjpoYW5kbGVUb3VjaFBvaW50KToKKwogMjAxMi0wNi0yMCAgSmFja3kg SmlhbmcgIDx6aGFqaWFuZ0ByaW0uY29tPgogCiAgICAgICAgIEFkZCBhICE9IG9wZXJhdG9yIHRv IFZpZXdwb3J0QXJndW1lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv V2ViS2l0U3VwcG9ydC9JbnB1dEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5 L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmNwcAppbmRleCBjNTYzYWQyLi5mZWM3NjU3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9JbnB1dEhh bmRsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lu cHV0SGFuZGxlci5jcHAKQEAgLTQzMiwyMSArNDMyLDIyIEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpz ZXRFbGVtZW50VW5mb2N1c2VkKGJvb2wgcmVmb2N1c09jY3VyaW5nKQogICAgIG1fY3VycmVudEZv Y3VzRWxlbWVudFR5cGUgPSBUZXh0RWRpdDsKIH0KIAotdm9pZCBJbnB1dEhhbmRsZXI6OmVuYWJs ZUlucHV0TW9kZShib29sIGlucHV0TW9kZUFsbG93ZWQpCitib29sIElucHV0SGFuZGxlcjo6aXNJ bnB1dE1vZGVFbmFibGVkKCkgY29uc3QKIHsKLSAgICBGb2N1c0xvZyhMb2dMZXZlbEluZm8sICJJ bnB1dEhhbmRsZXI6OmVuYWJsZUlucHV0TW9kZSAnJXMnLCBvdmVycmlkZSBpcyAnJXMnIgotICAg ICAgICAgICAgICwgaW5wdXRNb2RlQWxsb3dlZCA/ICJ0cnVlIiA6ICJmYWxzZSIKLSAgICAgICAg ICAgICAsIG1fd2ViUGFnZS0+bV9kdW1wUmVuZGVyVHJlZSB8fCBQbGF0Zm9ybTo6U2V0dGluZ3M6 OmdldCgpLT5hbHdheXNTaG93S2V5Ym9hcmRPbkZvY3VzKCkgPyAidHJ1ZSIgOiAiZmFsc2UiKTsK KyAgICAvLyBJbnB1dCBtb2RlIGlzIGVuYWJsZWQgd2hlbiBzZXQsIG9yIHdoZW4gZHVtcCByZW5k ZXIgdHJlZSBvciBhbHdheXMgc2hvdyBrZXlib2FyZCBzZXR0aW5nIGlzIGVuYWJsZWQuCisgICAg cmV0dXJuIG1faW5wdXRNb2RlRW5hYmxlZCB8fCBtX3dlYlBhZ2UtPm1fZHVtcFJlbmRlclRyZWUg fHwgUGxhdGZvcm06OlNldHRpbmdzOjpnZXQoKS0+YWx3YXlzU2hvd0tleWJvYXJkT25Gb2N1cygp OworfQogCi0gICAgbV9pbnB1dE1vZGVFbmFibGVkID0gaW5wdXRNb2RlQWxsb3dlZDsKK3ZvaWQg SW5wdXRIYW5kbGVyOjpzZXRJbnB1dE1vZGVFbmFibGVkKGJvb2wgYWN0aXZlKQoreworICAgIEZv Y3VzTG9nKExvZ0xldmVsSW5mbywgIklucHV0SGFuZGxlcjo6c2V0SW5wdXRNb2RlRW5hYmxlZCAn JXMnLCBvdmVycmlkZSBpcyAnJXMnIgorICAgICAgICAgICAgICwgYWN0aXZlID8gInRydWUiIDog ImZhbHNlIgorICAgICAgICAgICAgICwgbV93ZWJQYWdlLT5tX2R1bXBSZW5kZXJUcmVlIHx8IFBs YXRmb3JtOjpTZXR0aW5nczo6Z2V0KCktPmFsd2F5c1Nob3dLZXlib2FyZE9uRm9jdXMoKSA/ICJ0 cnVlIiA6ICJmYWxzZSIpOwogCi0gICAgLy8gSWYgRFJUIGlzIHJ1bm5pbmcgb3IgYWx3YXlzIHNo b3cga2V5Ym9hcmQgc2V0dGluZyBpcyBhY3RpdmUsIGRvIG5vdCBkZWxheQotICAgIC8vIHNob3dp bmcgdGhlIGtleWJvYXJkLgotICAgIGlmIChtX3dlYlBhZ2UtPm1fZHVtcFJlbmRlclRyZWUgfHwg UGxhdGZvcm06OlNldHRpbmdzOjpnZXQoKS0+YWx3YXlzU2hvd0tleWJvYXJkT25Gb2N1cygpKQot ICAgICAgICBtX2lucHV0TW9kZUVuYWJsZWQgPSB0cnVlOworICAgIG1faW5wdXRNb2RlRW5hYmxl ZCA9IGFjdGl2ZTsKIAogICAgIC8vIElmIHRoZSBmcmFtZSBzZWxlY3Rpb24gaXNuJ3QgZm9jdXNl ZCwgZm9jdXMgaXQuCi0gICAgaWYgKG1faW5wdXRNb2RlRW5hYmxlZCAmJiBpc0FjdGl2ZVRleHRF ZGl0KCkgJiYgIW1fY3VycmVudEZvY3VzRWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2Vs ZWN0aW9uKCktPmlzRm9jdXNlZCgpKQorICAgIGlmIChpc0lucHV0TW9kZUVuYWJsZWQoKSAmJiBp c0FjdGl2ZVRleHRFZGl0KCkgJiYgIW1fY3VycmVudEZvY3VzRWxlbWVudC0+ZG9jdW1lbnQoKS0+ ZnJhbWUoKS0+c2VsZWN0aW9uKCktPmlzRm9jdXNlZCgpKQogICAgICAgICBtX2N1cnJlbnRGb2N1 c0VsZW1lbnQtPmRvY3VtZW50KCktPmZyYW1lKCktPnNlbGVjdGlvbigpLT5zZXRGb2N1c2VkKHRy dWUpOwogfQogCkBAIC00NTUsOCArNDU2LDggQEAgdm9pZCBJbnB1dEhhbmRsZXI6OnNldEVsZW1l bnRGb2N1c2VkKEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgQVNTRVJUKERPTVN1cHBvcnQ6OmlzVGV4 dEJhc2VkQ29udGVudEVkaXRhYmxlRWxlbWVudChlbGVtZW50KSk7CiAgICAgQVNTRVJUKGVsZW1l bnQtPmRvY3VtZW50KCkgJiYgZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSk7CiAKLSAgICBp ZiAoZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPmlzRm9jdXNlZCgp ICE9IG1faW5wdXRNb2RlRW5hYmxlZCkKLSAgICAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJh bWUoKS0+c2VsZWN0aW9uKCktPnNldEZvY3VzZWQobV9pbnB1dE1vZGVFbmFibGVkKTsKKyAgICBp ZiAoZWxlbWVudC0+ZG9jdW1lbnQoKS0+ZnJhbWUoKS0+c2VsZWN0aW9uKCktPmlzRm9jdXNlZCgp ICE9IGlzSW5wdXRNb2RlRW5hYmxlZCgpKQorICAgICAgICBlbGVtZW50LT5kb2N1bWVudCgpLT5m cmFtZSgpLT5zZWxlY3Rpb24oKS0+c2V0Rm9jdXNlZChpc0lucHV0TW9kZUVuYWJsZWQoKSk7CiAK ICAgICAvLyBDbGVhciB0aGUgZXhpc3RpbmcgZm9jdXMgbm9kZSBkZXRhaWxzLgogICAgIHNldEVs ZW1lbnRVbmZvY3VzZWQodHJ1ZSAvKnJlZm9jdXNPY2N1cmluZyovKTsKQEAgLTU1Miw3ICs1NTMs NyBAQCBXZWJDb3JlOjpJbnRSZWN0IElucHV0SGFuZGxlcjo6Ym91bmRpbmdCb3hGb3JJbnB1dEZp ZWxkKCkKIAogdm9pZCBJbnB1dEhhbmRsZXI6OmVuc3VyZUZvY3VzVGV4dEVsZW1lbnRWaXNpYmxl KENhcmV0U2Nyb2xsVHlwZSBzY3JvbGxUeXBlKQogewotICAgIGlmICghbV9pbnB1dE1vZGVFbmFi bGVkIHx8ICFtX2N1cnJlbnRGb2N1c0VsZW1lbnQgfHwgIW1fY3VycmVudEZvY3VzRWxlbWVudC0+ ZG9jdW1lbnQoKSkKKyAgICBpZiAoIWlzQWN0aXZlVGV4dEVkaXQoKSB8fCAhaXNJbnB1dE1vZGVF bmFibGVkKCkgfHwgIW1fY3VycmVudEZvY3VzRWxlbWVudC0+ZG9jdW1lbnQoKSkKICAgICAgICAg cmV0dXJuOwogCiAgICAgaWYgKCFQbGF0Zm9ybTo6U2V0dGluZ3M6OmdldCgpLT5hbGxvd0NlbnRl clNjcm9sbEFkanVzdG1lbnRGb3JJbnB1dEZpZWxkcygpICYmIHNjcm9sbFR5cGUgIT0gRWRnZUlm TmVlZGVkKQpAQCAtNzcwLDcgKzc3MSw3IEBAIHZvaWQgSW5wdXRIYW5kbGVyOjpwcm9jZXNzUGVu ZGluZ0tleWJvYXJkVmlzaWJpbGl0eUNoYW5nZSgpCiB2b2lkIElucHV0SGFuZGxlcjo6bm90aWZ5 Q2xpZW50T2ZLZXlib2FyZFZpc2liaWxpdHlDaGFuZ2UoYm9vbCB2aXNpYmxlKQogewogICAgIC8v IElmIHdlIGFyZW4ndCByZWFkeSBmb3IgaW5wdXQsIGtleWJvYXJkIGNoYW5nZXMgc2hvdWxkIGJl IGlnbm9yZWQuCi0gICAgaWYgKCFtX2lucHV0TW9kZUVuYWJsZWQgJiYgdmlzaWJsZSkKKyAgICBp ZiAoIWlzSW5wdXRNb2RlRW5hYmxlZCgpICYmIHZpc2libGUpCiAgICAgICAgIHJldHVybjsKIAog ICAgIGlmICghbV9kZWxheUtleWJvYXJkVmlzaWJpbGl0eUNoYW5nZSkgewpAQCAtOTI5LDcgKzkz MCw3IEBAIGJvb2wgSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0KGNvbnN0IFBsYXRm b3JtOjpLZXlib2FyZEV2ZW50JiBrZXlib2FyZEV2CiAgICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZv LCAiSW5wdXRIYW5kbGVyOjpoYW5kbGVLZXlib2FyZElucHV0IHJlY2VpdmVkIGNoYXJhY3Rlcj0l bGMsIHR5cGU9JWQiLCBrZXlib2FyZEV2ZW50LmNoYXJhY3RlcigpLCBrZXlib2FyZEV2ZW50LnR5 cGUoKSk7CiAKICAgICAvLyBFbmFibGUgaW5wdXQgbW9kZSBpZiB3ZSBhcmUgcHJvY2Vzc2luZyBh IGtleSBldmVudC4KLSAgICBlbmFibGVJbnB1dE1vZGUoKTsKKyAgICBzZXRJbnB1dE1vZGVFbmFi bGVkKCk7CiAKICAgICAvLyBJZiB3ZSBhcmVuJ3Qgc3BlY2lmaWNhbGx5IHBhcnQgb2YgYSBjb21w b3NpdGlvbiwgZmFpbCwgSU1GIHNob3VsZCBuZXZlciBzZW5kIGtleSBpbnB1dAogICAgIC8vIHdo aWxlIGNvbXBvc2luZyB0ZXh0LiBJZiBJTUYgaGFzIGZhaWxlZCwgd2Ugc2hvdWxkIGhhdmUgYWxy ZWFkeSBmaW5pc2hlZCB0aGUKQEAgLTE3MjUsNyArMTcyNiw3IEBAIGludDMyX3QgSW5wdXRIYW5k bGVyOjpzZXRDb21wb3NpbmdUZXh0KHNwYW5uYWJsZV9zdHJpbmdfdCogc3Bhbm5hYmxlU3RyaW5n LCBpbnQzCiAgICAgSW5wdXRMb2coTG9nTGV2ZWxJbmZvLCAiSW5wdXRIYW5kbGVyOjpzZXRDb21w b3NpbmdUZXh0IGF0IHJlbGF0aXZlQ3Vyc29yUG9zaXRpb246ICVkIiwgcmVsYXRpdmVDdXJzb3JQ b3NpdGlvbik7CiAKICAgICAvLyBFbmFibGUgaW5wdXQgbW9kZSBpZiB3ZSBhcmUgcHJvY2Vzc2lu ZyBhIGtleSBldmVudC4KLSAgICBlbmFibGVJbnB1dE1vZGUoKTsKKyAgICBzZXRJbnB1dE1vZGVF bmFibGVkKCk7CiAKICAgICByZXR1cm4gc2V0U3Bhbm5hYmxlVGV4dEFuZFJlbGF0aXZlQ3Vyc29y KHNwYW5uYWJsZVN0cmluZywgcmVsYXRpdmVDdXJzb3JQb3NpdGlvbiwgdHJ1ZSAvKiBtYXJrVGV4 dEFzQ29tcG9zaW5nICovKSA/IDAgOiAtMTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L0lucHV0SGFuZGxlci5oIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvSW5wdXRIYW5kbGVyLmgKaW5kZXggYzYzMzQ0Ny4uZTM0 MTI2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQv SW5wdXRIYW5kbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBv cnQvSW5wdXRIYW5kbGVyLmgKQEAgLTU3LDcgKzU3LDggQEAgcHVibGljOgogICAgIGVudW0gRm9j dXNFbGVtZW50VHlwZSB7IFRleHRFZGl0LCBUZXh0UG9wdXAgLyogRGF0ZS9UaW1lICYgQ29sb3Ig Ki8sIFNlbGVjdFBvcHVwLCBQbHVnaW4gfTsKICAgICBlbnVtIENhcmV0U2Nyb2xsVHlwZSB7IENl bnRlckFsd2F5cywgQ2VudGVySWZOZWVkZWQsIEVkZ2VJZk5lZWRlZCB9OwogCi0gICAgdm9pZCBl bmFibGVJbnB1dE1vZGUoYm9vbCBpbnB1dE1vZGVBbGxvd2VkID0gdHJ1ZSk7CisgICAgYm9vbCBp c0lucHV0TW9kZUVuYWJsZWQoKSBjb25zdDsKKyAgICB2b2lkIHNldElucHV0TW9kZUVuYWJsZWQo Ym9vbCBhY3RpdmUgPSB0cnVlKTsKIAogICAgIHZvaWQgZm9jdXNlZE5vZGVDaGFuZ2VkKCk7CiAg ICAgdm9pZCBub2RlVGV4dENoYW5nZWQoY29uc3QgV2ViQ29yZTo6Tm9kZSopOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvVG91Y2hFdmVudEhhbmRs ZXIuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYktpdFN1cHBvcnQvVG91Y2hFdmVu dEhhbmRsZXIuY3BwCmluZGV4IGE3NGFmNGIuLmY3YzczMWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJLaXRTdXBwb3J0L1RvdWNoRXZlbnRIYW5kbGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViS2l0U3VwcG9ydC9Ub3VjaEV2ZW50SGFuZGxl ci5jcHAKQEAgLTE3MSw3ICsxNzEsNyBAQCB2b2lkIFRvdWNoRXZlbnRIYW5kbGVyOjp0b3VjaEhv bGRFdmVudCgpCiBib29sIFRvdWNoRXZlbnRIYW5kbGVyOjpoYW5kbGVUb3VjaFBvaW50KFBsYXRm b3JtOjpUb3VjaFBvaW50JiBwb2ludCkKIHsKICAgICAvLyBFbmFibGUgaW5wdXQgbW9kZSBvbiBh bnkgdG91Y2ggZXZlbnQuCi0gICAgbV93ZWJQYWdlLT5tX2lucHV0SGFuZGxlci0+ZW5hYmxlSW5w dXRNb2RlKCk7CisgICAgbV93ZWJQYWdlLT5tX2lucHV0SGFuZGxlci0+c2V0SW5wdXRNb2RlRW5h YmxlZCgpOwogICAgIGJvb2wgcHVyZVdpdGhNb3VzZUNvbnZlcnNpb24gPSBtX3dlYlBhZ2UtPm1f dG91Y2hFdmVudE1vZGUgPT0gUHVyZVRvdWNoRXZlbnRzV2l0aE1vdXNlQ29udmVyc2lvbjsKIAog ICAgIHN3aXRjaCAocG9pbnQubV9zdGF0ZSkgewotLSAKMS43LjkuNQoK