111552 2013-03-06 03:15:35 -0800 [WK2] Add new callbacks and a function for WebKit2 context menu API 2013-04-15 02:01:11 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109698 113582 1 mpakulavelrutka mpakulavelrutka andersca ap benjamin cgarcia commit-queue gustavo gyuyoung.kim kenneth mrobinson rakuco sam webkit.review.bot oldest_to_newest 848680 0 mpakulavelrutka 2013-03-06 03:15:35 -0800 This patch will add two callbacks for showing and hiding context menus and an API function for selecting context menu items. 848682 1 191704 mpakulavelrutka 2013-03-06 03:28:12 -0800 Created attachment 191704 proposed patch 848684 2 webkit.review.bot 2013-03-06 03:30:37 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 859274 3 191704 kenneth 2013-03-20 04:59:06 -0700 Comment on attachment 191704 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=191704&action=review > Source/WebKit2/UIProcess/API/C/WKPage.cpp:871 > +void WKPageContextMenuItemSelected(WKPageRef page, WKContextMenuItemRef item) the name gives me the idea that it will return a bool (Selected). Should this be called WKPageSelectContextMenuItem( ?? 859275 4 kenneth 2013-03-20 04:59:56 -0700 Cc'ing some owners who might have comments 862264 5 mpakulavelrutka 2013-03-23 16:09:53 -0700 (In reply to comment #3) > (From update of attachment 191704 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=191704&action=review > > > Source/WebKit2/UIProcess/API/C/WKPage.cpp:871 > > +void WKPageContextMenuItemSelected(WKPageRef page, WKContextMenuItemRef item) > > the name gives me the idea that it will return a bool (Selected). Should this be called WKPageSelectContextMenuItem( ?? OK, I will change it to WKPageSelectContextMenuItem 862709 6 194844 mpakulavelrutka 2013-03-25 06:42:49 -0700 Created attachment 194844 fixes 864481 7 195303 mpakulavelrutka 2013-03-27 06:40:30 -0700 Created attachment 195303 fixes fixed conditional in WebPagProxy 864605 8 195303 buildbot 2013-03-27 09:15:05 -0700 Comment on attachment 195303 fixes Attachment 195303 did not pass win-ews (win): Output: http://webkit-commit-queue.appspot.com/results/17221833 864944 9 mpakulavelrutka 2013-03-27 15:57:33 -0700 (In reply to comment #8) > (From update of attachment 195303 [details]) > Attachment 195303 [details] did not pass win-ews (win): > Output: http://webkit-commit-queue.appspot.com/results/17221833 The patch does not change WebKit1 code, so this is a false positive error. 868773 10 195303 cgarcia 2013-04-03 10:09:07 -0700 Comment on attachment 195303 fixes This looks good to me. What port does need this? Callbacks are unimplemented in both EFL and GTK+, or is it implemented in a another patch? 868779 11 mpakulavelrutka 2013-04-03 10:19:40 -0700 (In reply to comment #10) > (From update of attachment 195303 [details]) > This looks good to me. What port does need this? Callbacks are unimplemented in both EFL and GTK+, or is it implemented in a another patch? They are implemented in EFL port in https://bugs.webkit.org/show_bug.cgi?id=109698. 874563 12 195303 andersca 2013-04-12 06:29:26 -0700 Comment on attachment 195303 fixes View in context: https://bugs.webkit.org/attachment.cgi?id=195303&action=review > Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp:107 > + menuItems.append(WebContextMenuItem::create(menuItemsVector[i]).get()); This should be uncheckedAppend. 874700 13 197846 mpakulavelrutka 2013-04-12 07:07:52 -0700 Created attachment 197846 applied andersca's comment 875518 14 197846 commit-queue 2013-04-15 02:01:03 -0700 Comment on attachment 197846 applied andersca's comment Clearing flags on attachment: 197846 Committed r148420: <http://trac.webkit.org/changeset/148420> 875519 15 commit-queue 2013-04-15 02:01:11 -0700 All reviewed patches have been landed. Closing bug. 191704 2013-03-06 03:28:12 -0800 2013-03-25 06:42:49 -0700 proposed patch c-api-contextmenubezwk.diff text/plain 9290 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlZmUyZjE3Li44NDExODk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzIg QEAKKzIwMTMtMDMtMDYgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbV0syXSBBZGQgbmV3IGNhbGxiYWNrcyBhbmQgYSBmdW5jdGlv biBmb3IgV2ViS2l0MiBjb250ZXh0IG1lbnUgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY29udGV4dE1lbnVIaWRlIGFuZCBjb250ZXh0TWVu dVNob3cgY2FsbGJhY2tzIHRvIFdLUGFnZUNvbnRleHRNZW51Q2xpZW50CisgICAgICAgIGFuZCBX S1BhZ2VDb250ZXh0TWVudVNlbGVjdGVkIEFQSSBzbyBjb250ZXh0IG1lbnVzIGNhbiBiZSBoYW5k bGVkIG91dHNpZGUKKyAgICAgICAgV2ViS2l0LiBBUEkgdmVyc2lvbiBvZiB0aGlzIGNsaWVudCB3 YXMgYnVtcGVkIHNvIG9sZGVyIGNsaWVudCB2ZXJzaW9uIHN0aWxsCisgICAgICAgIGNhbiBiZSB1 c2VkLgorCisgICAgICAgICogU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5jcHA6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAqIFNoYXJlZC9BUElDbGllbnRUcmFpdHMuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAgICAgICAgKFdLUGFnZUNvbnRleHRNZW51SXRl bVNlbGVjdGVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmg6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwOgorICAgICAg ICAoYXR0YWNoQ29udGV4dE1lbnVDbGllbnRUb1ZpZXcpOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ29u dGV4dE1lbnVDbGllbnQ6OnNob3dDb250ZXh0TWVudSk6CisgICAgICAgIChXZWJLaXQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6OmhpZGVDb250ZXh0TWVudSk6 CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5oOgorICAgICAg ICAoV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL0Nv bnRleHRNZW51Q2xpZW50RWZsLmNwcDoKKyAgICAgICAgKENvbnRleHRNZW51Q2xpZW50RWZsOjpD b250ZXh0TWVudUNsaWVudEVmbCk6CisKIDIwMTMtMDMtMDYgIEh1YW5nIERvbmdzdW5nICA8bHV4 dGVsbGFAY29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgW0VGTF1bV0syXSBDb252ZXJ0IGZyb20g ZGV2aWNlIHZpZXcgc2l6ZSB0byBVSSB2aWV3IHNpemUgb25seSBpbiBFd2tWaWV3LgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmNwcAppbmRleCBjOTk3ZjNlLi4zMzViMDY2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmNwcApAQCAtNTcsNiAr NTcsNyBAQCBjb25zdCBzaXplX3QgQVBJQ2xpZW50VHJhaXRzPFdLQnVuZGxlUGFnZUZ1bGxTY3Jl ZW5DbGllbnQ+OjppbnRlcmZhY2VTaXplc0J5VmVycwogY29uc3Qgc2l6ZV90IEFQSUNsaWVudFRy YWl0czxXS1BhZ2VDb250ZXh0TWVudUNsaWVudD46OmludGVyZmFjZVNpemVzQnlWZXJzaW9uW10g PSB7CiAgICAgb2Zmc2V0b2YoV0tQYWdlQ29udGV4dE1lbnVDbGllbnQsIGNvbnRleHRNZW51RGlz bWlzc2VkKSwKICAgICBvZmZzZXRvZihXS1BhZ2VDb250ZXh0TWVudUNsaWVudCwgZ2V0Q29udGV4 dE1lbnVGcm9tUHJvcG9zZWRNZW51KSwKKyAgICBvZmZzZXRvZihXS1BhZ2VDb250ZXh0TWVudUNs aWVudCwgc2hvd0NvbnRleHRNZW51KSwKICAgICBzaXplb2YoV0tQYWdlQ29udGV4dE1lbnVDbGll bnQpCiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJh aXRzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmgKaW5kZXggZDM5 MTJjOS4uZTcwMmVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVu dFRyYWl0cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUElDbGllbnRUcmFpdHMuaApA QCAtNjAsNyArNjAsNyBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBBUElDbGllbnRUcmFpdHM8V0tCdW5k bGVQYWdlVUlDbGllbnQ+IHsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFQSUNsaWVudFRyYWl0 czxXS1BhZ2VDb250ZXh0TWVudUNsaWVudD4gewotICAgIHN0YXRpYyBjb25zdCBzaXplX3QgaW50 ZXJmYWNlU2l6ZXNCeVZlcnNpb25bM107CisgICAgc3RhdGljIGNvbnN0IHNpemVfdCBpbnRlcmZh Y2VTaXplc0J5VmVyc2lvbls0XTsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFQSUNsaWVudFRy YWl0czxXS1BhZ2VMb2FkZXJDbGllbnQ+IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUGFnZS5jcHAKaW5kZXggZWYyN2JlNS4uNGIxMDM4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAgLTQwLDYgKzQwLDEwIEBACiAjaW5jbHVkZSA8Qmxv Y2suaD4KICNlbmRpZgogCisjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCisjaW5jbHVkZSAiV2Vi Q29udGV4dE1lbnVJdGVtLmgiCisjZW5kaWYKKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1 c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCkBAIC04NjMsMyArODY3LDEwIEBAIFdLU3RyaW5nUmVm IFdLUGFnZUdldFBsdWdpbkluZm9ybWF0aW9uUGx1Z2luVVJMS2V5KCkKICAgICBzdGF0aWMgV2Vi U3RyaW5nKiBrZXkgPSBXZWJTdHJpbmc6OmNyZWF0ZShXZWJQYWdlUHJveHk6OnBsdWdpbkluZm9y bWF0aW9uUGx1Z2luVVJMS2V5KCkpLmxlYWtSZWYoKTsKICAgICByZXR1cm4gdG9BUEkoa2V5KTsK IH0KKwordm9pZCBXS1BhZ2VDb250ZXh0TWVudUl0ZW1TZWxlY3RlZChXS1BhZ2VSZWYgcGFnZSwg V0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSkKK3sKKyNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykK KyAgICB0b0ltcGwocGFnZSktPmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKCoodG9JbXBsKGl0ZW0p LT5kYXRhKCkpKTsKKyNlbmRpZgorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUGFnZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5oCmluZGV4IGIxMzNlMTguLjVmYzEyODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmgKQEAgLTMyNCw2ICszMjQsOCBAQCBlbnVtIHsga1dLUGFnZUZpbmRNYXRjaGVz Q2xpZW50Q3VycmVudFZlcnNpb24gPSAwIH07CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VHZXRDb250 ZXh0TWVudUZyb21Qcm9wb3NlZENvbnRleHRNZW51Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBX S0FycmF5UmVmIHByb3Bvc2VkTWVudSwgV0tBcnJheVJlZiogbmV3TWVudSwgV0tIaXRUZXN0UmVz dWx0UmVmIGhpdFRlc3RSZXN1bHQsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xp ZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VDdXN0b21Db250ZXh0TWVudUl0ZW1TZWxl Y3RlZENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tDb250ZXh0TWVudUl0ZW1SZWYgY29udGV4 dE1lbnVJdGVtLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFn ZUNvbnRleHRNZW51RGlzbWlzc2VkQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lk KiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCAoKldLUGFnZVNob3dDb250ZXh0TWVudUNhbGxi YWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tQb2ludCBtZW51TG9jYXRpb24sIFdLQXJyYXlSZWYgbWVu dUl0ZW1zLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCAoKldLUGFnZUhp ZGVDb250ZXh0TWVudUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbyk7CiAKIC8vIERlcHJlY2F0ZWQKIHR5cGVkZWYgdm9pZCAoKldLUGFnZUdldENvbnRleHRN ZW51RnJvbVByb3Bvc2VkQ29udGV4dE1lbnVDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFYw KShXS1BhZ2VSZWYgcGFnZSwgV0tBcnJheVJlZiBwcm9wb3NlZE1lbnUsIFdLQXJyYXlSZWYqIG5l d01lbnUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CkBAIC0z NDAsMTAgKzM0MiwxNCBAQCBzdHJ1Y3QgV0tQYWdlQ29udGV4dE1lbnVDbGllbnQgewogCiAgICAg Ly8gVmVyc2lvbiAyCiAgICAgV0tQYWdlR2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRDb250ZXh0 TWVudUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICBnZXRDb250ZXh0TWVudUZyb21Q cm9wb3NlZE1lbnU7CisKKyAgICAvLyBWZXJzaW9uIDMKKyAgICBXS1BhZ2VTaG93Q29udGV4dE1l bnVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNob3dDb250ZXh0TWVudTsKKyAgICBXS1BhZ2VIaWRlQ29udGV4dE1lbnVDYWxsYmFjayAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhpZGVDb250ZXh0TWVu dTsKIH07CiB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VDb250ZXh0TWVudUNsaWVudCBXS1BhZ2VDb250 ZXh0TWVudUNsaWVudDsKIAotZW51bSB7IGtXS1BhZ2VDb250ZXh0TWVudUNsaWVudEN1cnJlbnRW ZXJzaW9uID0gMiB9OworZW51bSB7IGtXS1BhZ2VDb250ZXh0TWVudUNsaWVudEN1cnJlbnRWZXJz aW9uID0gMyB9OwogCiBXS19FWFBPUlQgV0tUeXBlSUQgV0tQYWdlR2V0VHlwZUlEKCk7CiAKQEAg LTU0Nyw2ICs1NTMsOCBAQCBXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tQYWdlR2V0UGx1Z2luSW5m b3JtYXRpb25QbHVnaW5zcGFnZUF0dHJpYnV0ZVVSTEtleSgpOwogLyogVmFsdWUgdHlwZTogV0tV UkxSZWYgKi8KIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS1BhZ2VHZXRQbHVnaW5JbmZvcm1hdGlv blBsdWdpblVSTEtleSgpOwogCitXS19FWFBPUlQgdm9pZCBXS1BhZ2VDb250ZXh0TWVudUl0ZW1T ZWxlY3RlZChXS1BhZ2VSZWYgcGFnZSwgV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSk7CisKIAog I2lmZGVmIF9fY3BsdXNwbHVzCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5jcHAKaW5kZXggNDJmOTBi OC4uZjUwYzUyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv V2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtNDAsNiArNDAsOCBAQCB2 b2lkIGF0dGFjaENvbnRleHRNZW51Q2xpZW50VG9WaWV3KFdlYktpdFdlYlZpZXcqIHdlYlZpZXcp CiAgICAgICAgIDAsIC8vIGN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVkCiAgICAgICAgIDAs IC8vIGNvbnRleHRNZW51RGlzbWlzc2VkCiAgICAgICAgIGdldENvbnRleHRNZW51RnJvbVByb3Bv c2VkTWVudSwKKyAgICAgICAgMCwgLy8gc2hvd0NvbnRleHRNZW51CisgICAgICAgIDAsIC8vIGhp ZGVDb250ZXh0TWVudQogICAgIH07CiAgICAgV0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHdlYmtp dFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpOwogICAg IFdLUGFnZVNldFBhZ2VDb250ZXh0TWVudUNsaWVudCh3a1BhZ2UsICZ3a0NvbnRleHRNZW51Q2xp ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4 dE1lbnVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0 TWVudUNsaWVudC5jcHAKaW5kZXggOGExMWViYi4uZWIzNmVkMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5jcHAKQEAgLTkz LDUgKzkzLDI5IEBAIHZvaWQgV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50Ojpjb250ZXh0TWVudURp c21pc3NlZChXZWJQYWdlUHJveHkqIHBhZ2UpCiAgICAgbV9jbGllbnQuY29udGV4dE1lbnVEaXNt aXNzZWQodG9BUEkocGFnZSksIG1fY2xpZW50LmNsaWVudEluZm8pOwogfQogCit2b2lkIFdlYlBh Z2VDb250ZXh0TWVudUNsaWVudDo6c2hvd0NvbnRleHRNZW51KFdlYlBhZ2VQcm94eSogcGFnZSwg Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29uc3QgVmVjdG9yPFdlYkNv bnRleHRNZW51SXRlbURhdGE+JiBtZW51SXRlbXNWZWN0b3IpCit7CisgICAgaWYgKCFtX2NsaWVu dC5zaG93Q29udGV4dE1lbnUpCisgICAgICAgIHJldHVybjsKKworICAgIHVuc2lnbmVkIHNpemUg PSBtZW51SXRlbXNWZWN0b3Iuc2l6ZSgpOworCisgICAgVmVjdG9yPFJlZlB0cjxBUElPYmplY3Q+ ID4gbWVudUl0ZW1zOworICAgIG1lbnVJdGVtcy5yZXNlcnZlQ2FwYWNpdHkoc2l6ZSk7CisKKyAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2l6ZTsgKytpKQorICAgICAgICBtZW51SXRlbXMu YXBwZW5kKFdlYkNvbnRleHRNZW51SXRlbTo6Y3JlYXRlKG1lbnVJdGVtc1ZlY3RvcltpXSkuZ2V0 KCkpOworCisgICAgbV9jbGllbnQuc2hvd0NvbnRleHRNZW51KHRvQVBJKHBhZ2UpLCB0b0FQSSht ZW51TG9jYXRpb24pLCB0b0FQSShJbW11dGFibGVBcnJheTo6YWRvcHQobWVudUl0ZW1zKS5nZXQo KSksIG1fY2xpZW50LmNsaWVudEluZm8pOworfQorCit2b2lkIFdlYlBhZ2VDb250ZXh0TWVudUNs aWVudDo6aGlkZUNvbnRleHRNZW51KFdlYlBhZ2VQcm94eSogcGFnZSkKK3sKKyAgICBpZiAoIW1f Y2xpZW50LmhpZGVDb250ZXh0TWVudSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9jbGllbnQu aGlkZUNvbnRleHRNZW51KHRvQVBJKHBhZ2UpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAjZW5kaWYgLy8gRU5BQkxFKENPTlRFWFRfTUVOVVMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUNvbnRleHRNZW51Q2xp ZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50 LmgKaW5kZXggZGZmOTAxOS4uZjdjOTY5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuaApAQCAtMzEsNiArMzEsNyBAQAogI2lu Y2x1ZGUgIkFQSUNsaWVudC5oIgogI2luY2x1ZGUgIldlYkhpdFRlc3RSZXN1bHQuaCIKICNpbmNs dWRlICJXS1BhZ2UuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL0ludFBvaW50Lmg+CiAjaW5jbHVkZSA8 d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQ0LDYgKzQ1LDggQEAgcHVi bGljOgogICAgIGJvb2wgZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KFdlYlBhZ2VQcm94 eSosIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYgcHJvcG9zZWRNZW51LCBW ZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mIGN1c3RvbU1lbnUsIGNvbnN0IFdlYkhpdFRl c3RSZXN1bHQ6OkRhdGEmLCBBUElPYmplY3QqIHVzZXJEYXRhKTsKICAgICB2b2lkIGN1c3RvbUNv bnRleHRNZW51SXRlbVNlbGVjdGVkKFdlYlBhZ2VQcm94eSosIGNvbnN0IFdlYkNvbnRleHRNZW51 SXRlbURhdGEmKTsKICAgICB2b2lkIGNvbnRleHRNZW51RGlzbWlzc2VkKFdlYlBhZ2VQcm94eSop OworICAgIHZvaWQgc2hvd0NvbnRleHRNZW51KFdlYlBhZ2VQcm94eSosIGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiwgY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+Jik7CisgICAg dm9pZCBoaWRlQ29udGV4dE1lbnUoV2ViUGFnZVByb3h5Kik7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4 dE1lbnVDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Db250ZXh0 TWVudUNsaWVudEVmbC5jcHAKaW5kZXggOTEyM2QyOC4uY2M1M2FjYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAKQEAg LTU0LDYgKzU0LDggQEAgQ29udGV4dE1lbnVDbGllbnRFZmw6OkNvbnRleHRNZW51Q2xpZW50RWZs KEV3a1ZpZXcqIHZpZXcpCiAgICAgY29udGV4dE1lbnVDbGllbnQuY3VzdG9tQ29udGV4dE1lbnVJ dGVtU2VsZWN0ZWQgPSAwOwogICAgIGNvbnRleHRNZW51Q2xpZW50LmNvbnRleHRNZW51RGlzbWlz c2VkID0gMDsKICAgICBjb250ZXh0TWVudUNsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3Nl ZE1lbnUgPSAwOworICAgIGNvbnRleHRNZW51Q2xpZW50LnNob3dDb250ZXh0TWVudSA9IDA7Cisg ICAgY29udGV4dE1lbnVDbGllbnQuaGlkZUNvbnRleHRNZW51ID0gMDsKIAogICAgIFdLUGFnZVNl dFBhZ2VDb250ZXh0TWVudUNsaWVudChwYWdlUmVmLCAmY29udGV4dE1lbnVDbGllbnQpOwogfQo= 194844 2013-03-25 06:42:49 -0700 2013-03-27 06:40:30 -0700 fixes c-api-contextmenu.diff text/plain 12043 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlNDZmZTYyLi5kZDE3ZWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTMtMDMtMjUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbV0syXSBBZGQgbmV3IGNhbGxiYWNrcyBhbmQgYSBmdW5jdGlv biBmb3IgV2ViS2l0MiBjb250ZXh0IG1lbnUgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY29udGV4dE1lbnVIaWRlIGFuZCBjb250ZXh0TWVu dVNob3cgY2FsbGJhY2tzIHRvIFdLUGFnZUNvbnRleHRNZW51Q2xpZW50CisgICAgICAgIGFuZCBX S1BhZ2VDb250ZXh0TWVudVNlbGVjdGVkIEFQSSBzbyBjb250ZXh0IG1lbnVzIGNhbiBiZSBoYW5k bGVkIG91dHNpZGUKKyAgICAgICAgV2ViS2l0LiBBUEkgdmVyc2lvbiBvZiB0aGlzIGNsaWVudCB3 YXMgYnVtcGVkIHNvIG9sZGVyIGNsaWVudCB2ZXJzaW9uIHN0aWxsCisgICAgICAgIGNhbiBiZSB1 c2VkLgorCisgICAgICAgICogU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5jcHA6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAqIFNoYXJlZC9BUElDbGllbnRUcmFpdHMuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAgICAgICAgKFdLUGFnZVNlbGVjdENvbnRleHRN ZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAg KGF0dGFjaENvbnRleHRNZW51Q2xpZW50VG9WaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNvbnRl eHRNZW51Q2xpZW50OjpnZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6OnNob3dDb250ZXh0TWVudSk6CisgICAg ICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6 OmhpZGVDb250ZXh0TWVudSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVu dUNsaWVudC5oOgorICAgICAgICAoV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50KToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9D b250ZXh0TWVudUNsaWVudEVmbC5jcHA6CisgICAgICAgIChDb250ZXh0TWVudUNsaWVudEVmbDo6 Q29udGV4dE1lbnVDbGllbnRFZmwpOgorCiAyMDEzLTAzLTIzICBHZW9mZnJleSBHYXJlbiAgPGdn YXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkZWQgYSBzZXR0aW5nIGZvciB3aGV0aGVyIEph dmFTY3JpcHQgbWFya3VwIGlzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1No YXJlZC9BUElDbGllbnRUcmFpdHMuY3BwIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVu dFRyYWl0cy5jcHAKaW5kZXggYjE3NWVlNy4uNThjNWI0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL0FQSUNsaWVudFRyYWl0cy5jcHAKQEAgLTU3LDYgKzU3LDcgQEAgY29uc3Qgc2l6ZV90IEFQ SUNsaWVudFRyYWl0czxXS0J1bmRsZVBhZ2VGdWxsU2NyZWVuQ2xpZW50Pjo6aW50ZXJmYWNlU2l6 ZXNCeVZlcnMKIGNvbnN0IHNpemVfdCBBUElDbGllbnRUcmFpdHM8V0tQYWdlQ29udGV4dE1lbnVD bGllbnQ+OjppbnRlcmZhY2VTaXplc0J5VmVyc2lvbltdID0gewogICAgIG9mZnNldG9mKFdLUGFn ZUNvbnRleHRNZW51Q2xpZW50LCBjb250ZXh0TWVudURpc21pc3NlZCksCiAgICAgb2Zmc2V0b2Yo V0tQYWdlQ29udGV4dE1lbnVDbGllbnQsIGdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSks CisgICAgb2Zmc2V0b2YoV0tQYWdlQ29udGV4dE1lbnVDbGllbnQsIHNob3dDb250ZXh0TWVudSks CiAgICAgc2l6ZW9mKFdLUGFnZUNvbnRleHRNZW51Q2xpZW50KQogfTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5oIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL0FQSUNsaWVudFRyYWl0cy5oCmluZGV4IGY0ZjRhNzEuLmViNTRiZjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUElDbGllbnRUcmFpdHMuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmgKQEAgLTYwLDcgKzYwLDcgQEAgdGVtcGxh dGU8PiBzdHJ1Y3QgQVBJQ2xpZW50VHJhaXRzPFdLQnVuZGxlUGFnZVVJQ2xpZW50PiB7CiB9Owog CiB0ZW1wbGF0ZTw+IHN0cnVjdCBBUElDbGllbnRUcmFpdHM8V0tQYWdlQ29udGV4dE1lbnVDbGll bnQ+IHsKLSAgICBzdGF0aWMgY29uc3Qgc2l6ZV90IGludGVyZmFjZVNpemVzQnlWZXJzaW9uWzNd OworICAgIHN0YXRpYyBjb25zdCBzaXplX3QgaW50ZXJmYWNlU2l6ZXNCeVZlcnNpb25bNF07CiB9 OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBBUElDbGllbnRUcmFpdHM8V0tQYWdlTG9hZGVyQ2xpZW50 PiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwCmluZGV4IGU0Zjli YjEuLjkxMzg4YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S1BhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3Bw CkBAIC00MCw2ICs0MCwxMCBAQAogI2luY2x1ZGUgPEJsb2NrLmg+CiAjZW5kaWYKIAorI2lmIEVO QUJMRShDT05URVhUX01FTlVTKQorI2luY2x1ZGUgIldlYkNvbnRleHRNZW51SXRlbS5oIgorI2Vu ZGlmCisKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsK IApAQCAtODczLDMgKzg3NywxMCBAQCBib29sIFdLUGFnZUdldE92ZXJyaWRlUHJpdmF0ZUJyb3dz aW5nRW5hYmxlZChXS1BhZ2VSZWYgcGFnZVJlZikKIHsKICAgICByZXR1cm4gdG9JbXBsKHBhZ2VS ZWYpLT5vdmVycmlkZVByaXZhdGVCcm93c2luZ0VuYWJsZWQoKTsKIH0KKwordm9pZCBXS1BhZ2VT ZWxlY3RDb250ZXh0TWVudUl0ZW0oV0tQYWdlUmVmIHBhZ2UsIFdLQ29udGV4dE1lbnVJdGVtUmVm IGl0ZW0pCit7CisjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCisgICAgdG9JbXBsKHBhZ2UpLT5j b250ZXh0TWVudUl0ZW1TZWxlY3RlZCgqKHRvSW1wbChpdGVtKS0+ZGF0YSgpKSk7CisjZW5kaWYK K30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAppbmRleCBiMTMzZTE4Li45 ZTUzYTY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdl LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCkBAIC0zMjQs NiArMzI0LDggQEAgZW51bSB7IGtXS1BhZ2VGaW5kTWF0Y2hlc0NsaWVudEN1cnJlbnRWZXJzaW9u ID0gMCB9OwogdHlwZWRlZiB2b2lkICgqV0tQYWdlR2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRD b250ZXh0TWVudUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tBcnJheVJlZiBwcm9wb3NlZE1l bnUsIFdLQXJyYXlSZWYqIG5ld01lbnUsIFdLSGl0VGVzdFJlc3VsdFJlZiBoaXRUZXN0UmVzdWx0 LCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogdHlwZWRlZiB2 b2lkICgqV0tQYWdlQ3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWRDYWxsYmFjaykoV0tQYWdl UmVmIHBhZ2UsIFdLQ29udGV4dE1lbnVJdGVtUmVmIGNvbnRleHRNZW51SXRlbSwgY29uc3Qgdm9p ZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VDb250ZXh0TWVudURpc21pc3Nl ZENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Cit0eXBl ZGVmIHZvaWQgKCpXS1BhZ2VTaG93Q29udGV4dE1lbnVDYWxsYmFjaykoV0tQYWdlUmVmIHBhZ2Us IFdLUG9pbnQgbWVudUxvY2F0aW9uLCBXS0FycmF5UmVmIG1lbnVJdGVtcywgY29uc3Qgdm9pZCog Y2xpZW50SW5mbyk7Cit0eXBlZGVmIHZvaWQgKCpXS1BhZ2VIaWRlQ29udGV4dE1lbnVDYWxsYmFj aykoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwogCiAvLyBEZXByZWNh dGVkCiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VHZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZENvbnRl eHRNZW51Q2FsbGJhY2tfZGVwcmVjYXRlZEZvclVzZVdpdGhWMCkoV0tQYWdlUmVmIHBhZ2UsIFdL QXJyYXlSZWYgcHJvcG9zZWRNZW51LCBXS0FycmF5UmVmKiBuZXdNZW51LCBXS1R5cGVSZWYgdXNl ckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwpAQCAtMzQwLDEwICszNDIsMTQgQEAgc3Ry dWN0IFdLUGFnZUNvbnRleHRNZW51Q2xpZW50IHsKIAogICAgIC8vIFZlcnNpb24gMgogICAgIFdL UGFnZUdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkQ29udGV4dE1lbnVDYWxsYmFjayAgICAgICAg ICAgICAgICAgICAgICAgICAgZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51OworCisgICAg Ly8gVmVyc2lvbiAzCisgICAgV0tQYWdlU2hvd0NvbnRleHRNZW51Q2FsbGJhY2sgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaG93Q29udGV4dE1lbnU7Cisg ICAgV0tQYWdlSGlkZUNvbnRleHRNZW51Q2FsbGJhY2sgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBoaWRlQ29udGV4dE1lbnU7CiB9OwogdHlwZWRlZiBzdHJ1 Y3QgV0tQYWdlQ29udGV4dE1lbnVDbGllbnQgV0tQYWdlQ29udGV4dE1lbnVDbGllbnQ7CiAKLWVu dW0geyBrV0tQYWdlQ29udGV4dE1lbnVDbGllbnRDdXJyZW50VmVyc2lvbiA9IDIgfTsKK2VudW0g eyBrV0tQYWdlQ29udGV4dE1lbnVDbGllbnRDdXJyZW50VmVyc2lvbiA9IDMgfTsKIAogV0tfRVhQ T1JUIFdLVHlwZUlEIFdLUGFnZUdldFR5cGVJRCgpOwogCkBAIC01NDcsNiArNTUzLDggQEAgV0tf RVhQT1JUIFdLU3RyaW5nUmVmIFdLUGFnZUdldFBsdWdpbkluZm9ybWF0aW9uUGx1Z2luc3BhZ2VB dHRyaWJ1dGVVUkxLZXkoKTsKIC8qIFZhbHVlIHR5cGU6IFdLVVJMUmVmICovCiBXS19FWFBPUlQg V0tTdHJpbmdSZWYgV0tQYWdlR2V0UGx1Z2luSW5mb3JtYXRpb25QbHVnaW5VUkxLZXkoKTsKIAor V0tfRVhQT1JUIHZvaWQgV0tQYWdlU2VsZWN0Q29udGV4dE1lbnVJdGVtKFdLUGFnZVJlZiBwYWdl LCBXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVtKTsKKwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRl eHRNZW51Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dENvbnRleHRNZW51Q2xpZW50LmNwcAppbmRleCA0MmY5MGI4Li5mNTBjNTJhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUNsaWVu dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4 dE1lbnVDbGllbnQuY3BwCkBAIC00MCw2ICs0MCw4IEBAIHZvaWQgYXR0YWNoQ29udGV4dE1lbnVD bGllbnRUb1ZpZXcoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICAgICAgMCwgLy8gY3VzdG9t Q29udGV4dE1lbnVJdGVtU2VsZWN0ZWQKICAgICAgICAgMCwgLy8gY29udGV4dE1lbnVEaXNtaXNz ZWQKICAgICAgICAgZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51LAorICAgICAgICAwLCAv LyBzaG93Q29udGV4dE1lbnUKKyAgICAgICAgMCwgLy8gaGlkZUNvbnRleHRNZW51CiAgICAgfTsK ICAgICBXS1BhZ2VSZWYgd2tQYWdlID0gdG9BUEkod2Via2l0V2ViVmlld0Jhc2VHZXRQYWdlKFdF QktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKSk7CiAgICAgV0tQYWdlU2V0UGFnZUNvbnRleHRN ZW51Q2xpZW50KHdrUGFnZSwgJndrQ29udGV4dE1lbnVDbGllbnQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcAppbmRleCA4 YTExZWJiLi5iMDQ4YWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcApAQCAtNDIsNyArNDIsNyBAQCBib29sIFdlYlBh Z2VDb250ZXh0TWVudUNsaWVudDo6Z2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KFdlYlBh Z2VQcm94eSogcGFnZQogICAgIGlmICghbV9jbGllbnQuZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9z ZWRNZW51ICYmICFtX2NsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnVfZGVwcmVj YXRlZEZvclVzZVdpdGhWMCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgaWYgKG1fY2xp ZW50LnZlcnNpb24gPT0ga1dLUGFnZUNvbnRleHRNZW51Q2xpZW50Q3VycmVudFZlcnNpb24gJiYg IW1fY2xpZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSkKKyAgICBpZiAobV9jbGll bnQudmVyc2lvbiA+PSAyICYmICFtX2NsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1l bnUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHVuc2lnbmVkIHNpemUgPSBwcm9wb3Nl ZE1lbnVWZWN0b3Iuc2l6ZSgpOwpAQCAtNTIsNyArNTIsNyBAQCBib29sIFdlYlBhZ2VDb250ZXh0 TWVudUNsaWVudDo6Z2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KFdlYlBhZ2VQcm94eSog cGFnZQogICAgICAgICBwcm9wb3NlZE1lbnUtPmFwcGVuZChXZWJDb250ZXh0TWVudUl0ZW06OmNy ZWF0ZShwcm9wb3NlZE1lbnVWZWN0b3JbaV0pLmdldCgpKTsKICAgICAgICAgCiAgICAgV0tBcnJh eVJlZiBuZXdNZW51ID0gMDsKLSAgICBpZiAobV9jbGllbnQudmVyc2lvbiA9PSBrV0tQYWdlQ29u dGV4dE1lbnVDbGllbnRDdXJyZW50VmVyc2lvbikgeworICAgIGlmIChtX2NsaWVudC52ZXJzaW9u ID49IDIpIHsKICAgICAgICAgUmVmUHRyPFdlYkhpdFRlc3RSZXN1bHQ+IHdlYkhpdFRlc3RSZXN1 bHQgPSBXZWJIaXRUZXN0UmVzdWx0OjpjcmVhdGUoaGl0VGVzdFJlc3VsdERhdGEpOwogICAgICAg ICBtX2NsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUodG9BUEkocGFnZSksIHRv QVBJKHByb3Bvc2VkTWVudS5nZXQoKSksICZuZXdNZW51LCB0b0FQSSh3ZWJIaXRUZXN0UmVzdWx0 LmdldCgpKSwgdG9BUEkodXNlckRhdGEpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsKICAgICB9IGVs c2UKQEAgLTkzLDUgKzkzLDMzIEBAIHZvaWQgV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50Ojpjb250 ZXh0TWVudURpc21pc3NlZChXZWJQYWdlUHJveHkqIHBhZ2UpCiAgICAgbV9jbGllbnQuY29udGV4 dE1lbnVEaXNtaXNzZWQodG9BUEkocGFnZSksIG1fY2xpZW50LmNsaWVudEluZm8pOwogfQogCiti b29sIFdlYlBhZ2VDb250ZXh0TWVudUNsaWVudDo6c2hvd0NvbnRleHRNZW51KFdlYlBhZ2VQcm94 eSogcGFnZSwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29uc3QgVmVj dG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiBtZW51SXRlbXNWZWN0b3IpCit7CisgICAgaWYg KCFtX2NsaWVudC5zaG93Q29udGV4dE1lbnUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg IHVuc2lnbmVkIHNpemUgPSBtZW51SXRlbXNWZWN0b3Iuc2l6ZSgpOworCisgICAgVmVjdG9yPFJl ZlB0cjxBUElPYmplY3Q+ID4gbWVudUl0ZW1zOworICAgIG1lbnVJdGVtcy5yZXNlcnZlQ2FwYWNp dHkoc2l6ZSk7CisKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2l6ZTsgKytpKQorICAg ICAgICBtZW51SXRlbXMuYXBwZW5kKFdlYkNvbnRleHRNZW51SXRlbTo6Y3JlYXRlKG1lbnVJdGVt c1ZlY3RvcltpXSkuZ2V0KCkpOworCisgICAgbV9jbGllbnQuc2hvd0NvbnRleHRNZW51KHRvQVBJ KHBhZ2UpLCB0b0FQSShtZW51TG9jYXRpb24pLCB0b0FQSShJbW11dGFibGVBcnJheTo6YWRvcHQo bWVudUl0ZW1zKS5nZXQoKSksIG1fY2xpZW50LmNsaWVudEluZm8pOworCisgICAgcmV0dXJuIHRy dWU7Cit9CisKK2Jvb2wgV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50OjpoaWRlQ29udGV4dE1lbnUo V2ViUGFnZVByb3h5KiBwYWdlKQoreworICAgIGlmICghbV9jbGllbnQuaGlkZUNvbnRleHRNZW51 KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBtX2NsaWVudC5oaWRlQ29udGV4dE1lbnUo dG9BUEkocGFnZSksIG1fY2xpZW50LmNsaWVudEluZm8pOworCisgICAgcmV0dXJuIHRydWU7Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogI2VuZGlmIC8vIEVOQUJMRShDT05URVhUX01FTlVT KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVu dUNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNs aWVudC5oCmluZGV4IGRmZjkwMTkuLjQ0MmEwNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmgKQEAgLTMxLDYgKzMxLDcgQEAK ICNpbmNsdWRlICJBUElDbGllbnQuaCIKICNpbmNsdWRlICJXZWJIaXRUZXN0UmVzdWx0LmgiCiAj aW5jbHVkZSAiV0tQYWdlLmgiCisjaW5jbHVkZSA8V2ViQ29yZS9JbnRQb2ludC5oPgogI2luY2x1 ZGUgPHd0Zi9WZWN0b3IuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC00NCw2ICs0NSw4IEBA IHB1YmxpYzoKICAgICBib29sIGdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudShXZWJQYWdl UHJveHkqLCBjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mIHByb3Bvc2VkTWVu dSwgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiBjdXN0b21NZW51LCBjb25zdCBXZWJI aXRUZXN0UmVzdWx0OjpEYXRhJiwgQVBJT2JqZWN0KiB1c2VyRGF0YSk7CiAgICAgdm9pZCBjdXN0 b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZChXZWJQYWdlUHJveHkqLCBjb25zdCBXZWJDb250ZXh0 TWVudUl0ZW1EYXRhJik7CiAgICAgdm9pZCBjb250ZXh0TWVudURpc21pc3NlZChXZWJQYWdlUHJv eHkqKTsKKyAgICBib29sIHNob3dDb250ZXh0TWVudShXZWJQYWdlUHJveHkqLCBjb25zdCBXZWJD b3JlOjpJbnRQb2ludCYsIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYpOwor ICAgIGJvb2wgaGlkZUNvbnRleHRNZW51KFdlYlBhZ2VQcm94eSopOwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmlu ZGV4IDg1MTczNDAuLjI2MzgxOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCkBAIC0zMjQ3LDcgKzMyNDcsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW50ZXJu YWxTaG93Q29udGV4dE1lbnUoY29uc3QgSW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29uc3QgVwog CiAgICAgbV9hY3RpdmVDb250ZXh0TWVudUhpdFRlc3RSZXN1bHREYXRhID0gaGl0VGVzdFJlc3Vs dERhdGE7CiAKLSAgICBpZiAobV9hY3RpdmVDb250ZXh0TWVudSkgeworICAgIGlmICghbV9jb250 ZXh0TWVudUNsaWVudC5oaWRlQ29udGV4dE1lbnUodGhpcykgJiYgbV9hY3RpdmVDb250ZXh0TWVu dSkgewogICAgICAgICBtX2FjdGl2ZUNvbnRleHRNZW51LT5oaWRlQ29udGV4dE1lbnUoKTsKICAg ICAgICAgbV9hY3RpdmVDb250ZXh0TWVudSA9IDA7CiAgICAgfQpAQCAtMzI2MSw5ICszMjYxLDEx IEBAIHZvaWQgV2ViUGFnZVByb3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBJbnRQ b2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBXCiAKICAgICAvLyBHaXZlIHRoZSBQYWdlQ29udGV4 dE1lbnVDbGllbnQgb25lIGxhc3Qgc3dpcGUgYXQgY2hhbmdpbmcgdGhlIG1lbnUuCiAgICAgVmVj dG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+IGl0ZW1zOwotICAgIGlmICghbV9jb250ZXh0TWVu dUNsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUodGhpcywgcHJvcG9zZWRJdGVt cywgaXRlbXMsIGhpdFRlc3RSZXN1bHREYXRhLCB1c2VyRGF0YS5nZXQoKSkpCisgICAgYm9vbCBj b250ZXh0TWVudUN1c3RvbWl6ZWQgPSBtX2NvbnRleHRNZW51Q2xpZW50LmdldENvbnRleHRNZW51 RnJvbVByb3Bvc2VkTWVudSh0aGlzLCBwcm9wb3NlZEl0ZW1zLCBpdGVtcywgaGl0VGVzdFJlc3Vs dERhdGEsIHVzZXJEYXRhLmdldCgpKTsKKworICAgIGlmIChjb250ZXh0TWVudUN1c3RvbWl6ZWQg JiYgIW1fY29udGV4dE1lbnVDbGllbnQuc2hvd0NvbnRleHRNZW51KHRoaXMsIG1lbnVMb2NhdGlv biwgcHJvcG9zZWRJdGVtcykpCiAgICAgICAgIG1fYWN0aXZlQ29udGV4dE1lbnUtPnNob3dDb250 ZXh0TWVudShtZW51TG9jYXRpb24sIHByb3Bvc2VkSXRlbXMpOwotICAgIGVsc2UKKyAgICBlbHNl IGlmICghbV9jb250ZXh0TWVudUNsaWVudC5zaG93Q29udGV4dE1lbnUodGhpcywgbWVudUxvY2F0 aW9uLCBpdGVtcykpCiAgICAgICAgIG1fYWN0aXZlQ29udGV4dE1lbnUtPnNob3dDb250ZXh0TWVu dShtZW51TG9jYXRpb24sIGl0ZW1zKTsKICAgICAKICAgICBtX2NvbnRleHRNZW51Q2xpZW50LmNv bnRleHRNZW51RGlzbWlzc2VkKHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcAppbmRleCA5MTIzZDI4Li5jYzUzYWNj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xp ZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51 Q2xpZW50RWZsLmNwcApAQCAtNTQsNiArNTQsOCBAQCBDb250ZXh0TWVudUNsaWVudEVmbDo6Q29u dGV4dE1lbnVDbGllbnRFZmwoRXdrVmlldyogdmlldykKICAgICBjb250ZXh0TWVudUNsaWVudC5j dXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZCA9IDA7CiAgICAgY29udGV4dE1lbnVDbGllbnQu Y29udGV4dE1lbnVEaXNtaXNzZWQgPSAwOwogICAgIGNvbnRleHRNZW51Q2xpZW50LmdldENvbnRl eHRNZW51RnJvbVByb3Bvc2VkTWVudSA9IDA7CisgICAgY29udGV4dE1lbnVDbGllbnQuc2hvd0Nv bnRleHRNZW51ID0gMDsKKyAgICBjb250ZXh0TWVudUNsaWVudC5oaWRlQ29udGV4dE1lbnUgPSAw OwogCiAgICAgV0tQYWdlU2V0UGFnZUNvbnRleHRNZW51Q2xpZW50KHBhZ2VSZWYsICZjb250ZXh0 TWVudUNsaWVudCk7CiB9Cg== 195303 2013-03-27 06:40:30 -0700 2013-04-12 07:07:52 -0700 fixes c-api-contextmenu2.diff text/plain 12100 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmNmFkY2UwLi4zYThmMTcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTMtMDMtMjcgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbV0syXSBBZGQgbmV3IGNhbGxiYWNrcyBhbmQgYSBmdW5jdGlv biBmb3IgV2ViS2l0MiBjb250ZXh0IG1lbnUgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY29udGV4dE1lbnVIaWRlIGFuZCBjb250ZXh0TWVu dVNob3cgY2FsbGJhY2tzIHRvIFdLUGFnZUNvbnRleHRNZW51Q2xpZW50CisgICAgICAgIGFuZCBX S1BhZ2VDb250ZXh0TWVudVNlbGVjdGVkIEFQSSBzbyBjb250ZXh0IG1lbnVzIGNhbiBiZSBoYW5k bGVkIG91dHNpZGUKKyAgICAgICAgV2ViS2l0LiBBUEkgdmVyc2lvbiBvZiB0aGlzIGNsaWVudCB3 YXMgYnVtcGVkIHNvIG9sZGVyIGNsaWVudCB2ZXJzaW9uIHN0aWxsCisgICAgICAgIGNhbiBiZSB1 c2VkLgorCisgICAgICAgICogU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5jcHA6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAqIFNoYXJlZC9BUElDbGllbnRUcmFpdHMuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAgICAgICAgKFdLUGFnZVNlbGVjdENvbnRleHRN ZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAg KGF0dGFjaENvbnRleHRNZW51Q2xpZW50VG9WaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNvbnRl eHRNZW51Q2xpZW50OjpnZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6OnNob3dDb250ZXh0TWVudSk6CisgICAg ICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6 OmhpZGVDb250ZXh0TWVudSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVu dUNsaWVudC5oOgorICAgICAgICAoV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50KToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9D b250ZXh0TWVudUNsaWVudEVmbC5jcHA6CisgICAgICAgIChDb250ZXh0TWVudUNsaWVudEVmbDo6 Q29udGV4dE1lbnVDbGllbnRFZmwpOgorCiAyMDEzLTAzLTI3ICBLb25kYXBhbGx5IEthbHlhbiAg PGthbHlhbi5rb25kYXBhbGx5QGludGVsLmNvbT4KIAogICAgICAgICBbQ29vcmRHZnhdIFN1cHBv cnQgdG8gc2hhcmUgR3JhcGhpY3NTdXJmYWNlIGZsYWdzIHdpdGggY2xpZW50LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmNwcAppbmRleCBiMTc1ZWU3Li41OGM1YjRmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmNwcApAQCAtNTcsNiArNTcs NyBAQCBjb25zdCBzaXplX3QgQVBJQ2xpZW50VHJhaXRzPFdLQnVuZGxlUGFnZUZ1bGxTY3JlZW5D bGllbnQ+OjppbnRlcmZhY2VTaXplc0J5VmVycwogY29uc3Qgc2l6ZV90IEFQSUNsaWVudFRyYWl0 czxXS1BhZ2VDb250ZXh0TWVudUNsaWVudD46OmludGVyZmFjZVNpemVzQnlWZXJzaW9uW10gPSB7 CiAgICAgb2Zmc2V0b2YoV0tQYWdlQ29udGV4dE1lbnVDbGllbnQsIGNvbnRleHRNZW51RGlzbWlz c2VkKSwKICAgICBvZmZzZXRvZihXS1BhZ2VDb250ZXh0TWVudUNsaWVudCwgZ2V0Q29udGV4dE1l bnVGcm9tUHJvcG9zZWRNZW51KSwKKyAgICBvZmZzZXRvZihXS1BhZ2VDb250ZXh0TWVudUNsaWVu dCwgc2hvd0NvbnRleHRNZW51KSwKICAgICBzaXplb2YoV0tQYWdlQ29udGV4dE1lbnVDbGllbnQp CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRz LmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmgKaW5kZXggZjRmNGE3 MS4uZWI1NGJmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVudFRy YWl0cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUElDbGllbnRUcmFpdHMuaApAQCAt NjAsNyArNjAsNyBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBBUElDbGllbnRUcmFpdHM8V0tCdW5kbGVQ YWdlVUlDbGllbnQ+IHsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFQSUNsaWVudFRyYWl0czxX S1BhZ2VDb250ZXh0TWVudUNsaWVudD4gewotICAgIHN0YXRpYyBjb25zdCBzaXplX3QgaW50ZXJm YWNlU2l6ZXNCeVZlcnNpb25bM107CisgICAgc3RhdGljIGNvbnN0IHNpemVfdCBpbnRlcmZhY2VT aXplc0J5VmVyc2lvbls0XTsKIH07CiAKIHRlbXBsYXRlPD4gc3RydWN0IEFQSUNsaWVudFRyYWl0 czxXS1BhZ2VMb2FkZXJDbGllbnQ+IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL UGFnZS5jcHAKaW5kZXggZTRmOWJiMS4uOTEzODhiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAgLTQwLDYgKzQwLDEwIEBACiAjaW5jbHVkZSA8QmxvY2su aD4KICNlbmRpZgogCisjaWYgRU5BQkxFKENPTlRFWFRfTUVOVVMpCisjaW5jbHVkZSAiV2ViQ29u dGV4dE1lbnVJdGVtLmgiCisjZW5kaWYKKwogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiB1c2lu ZyBuYW1lc3BhY2UgV2ViS2l0OwogCkBAIC04NzMsMyArODc3LDEwIEBAIGJvb2wgV0tQYWdlR2V0 T3ZlcnJpZGVQcml2YXRlQnJvd3NpbmdFbmFibGVkKFdLUGFnZVJlZiBwYWdlUmVmKQogewogICAg IHJldHVybiB0b0ltcGwocGFnZVJlZiktPm92ZXJyaWRlUHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgp OwogfQorCit2b2lkIFdLUGFnZVNlbGVjdENvbnRleHRNZW51SXRlbShXS1BhZ2VSZWYgcGFnZSwg V0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSkKK3sKKyNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykK KyAgICB0b0ltcGwocGFnZSktPmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKCoodG9JbXBsKGl0ZW0p LT5kYXRhKCkpKTsKKyNlbmRpZgorfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUGFnZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFn ZS5oCmluZGV4IGIxMzNlMTguLjllNTNhNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQYWdlLmgKQEAgLTMyNCw2ICszMjQsOCBAQCBlbnVtIHsga1dLUGFnZUZpbmRNYXRjaGVz Q2xpZW50Q3VycmVudFZlcnNpb24gPSAwIH07CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VHZXRDb250 ZXh0TWVudUZyb21Qcm9wb3NlZENvbnRleHRNZW51Q2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBX S0FycmF5UmVmIHByb3Bvc2VkTWVudSwgV0tBcnJheVJlZiogbmV3TWVudSwgV0tIaXRUZXN0UmVz dWx0UmVmIGhpdFRlc3RSZXN1bHQsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xp ZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VDdXN0b21Db250ZXh0TWVudUl0ZW1TZWxl Y3RlZENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tDb250ZXh0TWVudUl0ZW1SZWYgY29udGV4 dE1lbnVJdGVtLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKIHR5cGVkZWYgdm9pZCAoKldLUGFn ZUNvbnRleHRNZW51RGlzbWlzc2VkQ2FsbGJhY2spKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lk KiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCAoKldLUGFnZVNob3dDb250ZXh0TWVudUNhbGxi YWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tQb2ludCBtZW51TG9jYXRpb24sIFdLQXJyYXlSZWYgbWVu dUl0ZW1zLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCAoKldLUGFnZUhp ZGVDb250ZXh0TWVudUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbyk7CiAKIC8vIERlcHJlY2F0ZWQKIHR5cGVkZWYgdm9pZCAoKldLUGFnZUdldENvbnRleHRN ZW51RnJvbVByb3Bvc2VkQ29udGV4dE1lbnVDYWxsYmFja19kZXByZWNhdGVkRm9yVXNlV2l0aFYw KShXS1BhZ2VSZWYgcGFnZSwgV0tBcnJheVJlZiBwcm9wb3NlZE1lbnUsIFdLQXJyYXlSZWYqIG5l d01lbnUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CkBAIC0z NDAsMTAgKzM0MiwxNCBAQCBzdHJ1Y3QgV0tQYWdlQ29udGV4dE1lbnVDbGllbnQgewogCiAgICAg Ly8gVmVyc2lvbiAyCiAgICAgV0tQYWdlR2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRDb250ZXh0 TWVudUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAgICAgICBnZXRDb250ZXh0TWVudUZyb21Q cm9wb3NlZE1lbnU7CisKKyAgICAvLyBWZXJzaW9uIDMKKyAgICBXS1BhZ2VTaG93Q29udGV4dE1l bnVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHNob3dDb250ZXh0TWVudTsKKyAgICBXS1BhZ2VIaWRlQ29udGV4dE1lbnVDYWxsYmFjayAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhpZGVDb250ZXh0TWVu dTsKIH07CiB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VDb250ZXh0TWVudUNsaWVudCBXS1BhZ2VDb250 ZXh0TWVudUNsaWVudDsKIAotZW51bSB7IGtXS1BhZ2VDb250ZXh0TWVudUNsaWVudEN1cnJlbnRW ZXJzaW9uID0gMiB9OworZW51bSB7IGtXS1BhZ2VDb250ZXh0TWVudUNsaWVudEN1cnJlbnRWZXJz aW9uID0gMyB9OwogCiBXS19FWFBPUlQgV0tUeXBlSUQgV0tQYWdlR2V0VHlwZUlEKCk7CiAKQEAg LTU0Nyw2ICs1NTMsOCBAQCBXS19FWFBPUlQgV0tTdHJpbmdSZWYgV0tQYWdlR2V0UGx1Z2luSW5m b3JtYXRpb25QbHVnaW5zcGFnZUF0dHJpYnV0ZVVSTEtleSgpOwogLyogVmFsdWUgdHlwZTogV0tV UkxSZWYgKi8KIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS1BhZ2VHZXRQbHVnaW5JbmZvcm1hdGlv blBsdWdpblVSTEtleSgpOwogCitXS19FWFBPUlQgdm9pZCBXS1BhZ2VTZWxlY3RDb250ZXh0TWVu dUl0ZW0oV0tQYWdlUmVmIHBhZ2UsIFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0pOworCiAKICNp ZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQuY3BwCmluZGV4IDQyZjkwYjgu LmY1MGM1MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdENvbnRleHRNZW51Q2xpZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5jcHAKQEAgLTQwLDYgKzQwLDggQEAgdm9p ZCBhdHRhY2hDb250ZXh0TWVudUNsaWVudFRvVmlldyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQog ICAgICAgICAwLCAvLyBjdXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZAogICAgICAgICAwLCAv LyBjb250ZXh0TWVudURpc21pc3NlZAogICAgICAgICBnZXRDb250ZXh0TWVudUZyb21Qcm9wb3Nl ZE1lbnUsCisgICAgICAgIDAsIC8vIHNob3dDb250ZXh0TWVudQorICAgICAgICAwLCAvLyBoaWRl Q29udGV4dE1lbnUKICAgICB9OwogICAgIFdLUGFnZVJlZiB3a1BhZ2UgPSB0b0FQSSh3ZWJraXRX ZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2ViVmlldykpKTsKICAgICBX S1BhZ2VTZXRQYWdlQ29udGV4dE1lbnVDbGllbnQod2tQYWdlLCAmd2tDb250ZXh0TWVudUNsaWVu dCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUNvbnRleHRN ZW51Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1l bnVDbGllbnQuY3BwCmluZGV4IDhhMTFlYmIuLmIwNDhhZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuY3BwCkBAIC00Miw3 ICs0Miw3IEBAIGJvb2wgV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50OjpnZXRDb250ZXh0TWVudUZy b21Qcm9wb3NlZE1lbnUoV2ViUGFnZVByb3h5KiBwYWdlCiAgICAgaWYgKCFtX2NsaWVudC5nZXRD b250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUgJiYgIW1fY2xpZW50LmdldENvbnRleHRNZW51RnJv bVByb3Bvc2VkTWVudV9kZXByZWNhdGVkRm9yVXNlV2l0aFYwKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKLSAgICBpZiAobV9jbGllbnQudmVyc2lvbiA9PSBrV0tQYWdlQ29udGV4dE1lbnVDbGll bnRDdXJyZW50VmVyc2lvbiAmJiAhbV9jbGllbnQuZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRN ZW51KQorICAgIGlmIChtX2NsaWVudC52ZXJzaW9uID49IDIgJiYgIW1fY2xpZW50LmdldENvbnRl eHRNZW51RnJvbVByb3Bvc2VkTWVudSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgdW5z aWduZWQgc2l6ZSA9IHByb3Bvc2VkTWVudVZlY3Rvci5zaXplKCk7CkBAIC01Miw3ICs1Miw3IEBA IGJvb2wgV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50OjpnZXRDb250ZXh0TWVudUZyb21Qcm9wb3Nl ZE1lbnUoV2ViUGFnZVByb3h5KiBwYWdlCiAgICAgICAgIHByb3Bvc2VkTWVudS0+YXBwZW5kKFdl YkNvbnRleHRNZW51SXRlbTo6Y3JlYXRlKHByb3Bvc2VkTWVudVZlY3RvcltpXSkuZ2V0KCkpOwog ICAgICAgICAKICAgICBXS0FycmF5UmVmIG5ld01lbnUgPSAwOwotICAgIGlmIChtX2NsaWVudC52 ZXJzaW9uID09IGtXS1BhZ2VDb250ZXh0TWVudUNsaWVudEN1cnJlbnRWZXJzaW9uKSB7CisgICAg aWYgKG1fY2xpZW50LnZlcnNpb24gPj0gMikgewogICAgICAgICBSZWZQdHI8V2ViSGl0VGVzdFJl c3VsdD4gd2ViSGl0VGVzdFJlc3VsdCA9IFdlYkhpdFRlc3RSZXN1bHQ6OmNyZWF0ZShoaXRUZXN0 UmVzdWx0RGF0YSk7CiAgICAgICAgIG1fY2xpZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2Vk TWVudSh0b0FQSShwYWdlKSwgdG9BUEkocHJvcG9zZWRNZW51LmdldCgpKSwgJm5ld01lbnUsIHRv QVBJKHdlYkhpdFRlc3RSZXN1bHQuZ2V0KCkpLCB0b0FQSSh1c2VyRGF0YSksIG1fY2xpZW50LmNs aWVudEluZm8pOwogICAgIH0gZWxzZQpAQCAtOTMsNSArOTMsMzMgQEAgdm9pZCBXZWJQYWdlQ29u dGV4dE1lbnVDbGllbnQ6OmNvbnRleHRNZW51RGlzbWlzc2VkKFdlYlBhZ2VQcm94eSogcGFnZSkK ICAgICBtX2NsaWVudC5jb250ZXh0TWVudURpc21pc3NlZCh0b0FQSShwYWdlKSwgbV9jbGllbnQu Y2xpZW50SW5mbyk7CiB9CiAKK2Jvb2wgV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50OjpzaG93Q29u dGV4dE1lbnUoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYgbWVu dUxvY2F0aW9uLCBjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mIG1lbnVJdGVt c1ZlY3RvcikKK3sKKyAgICBpZiAoIW1fY2xpZW50LnNob3dDb250ZXh0TWVudSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgdW5zaWduZWQgc2l6ZSA9IG1lbnVJdGVtc1ZlY3Rvci5zaXpl KCk7CisKKyAgICBWZWN0b3I8UmVmUHRyPEFQSU9iamVjdD4gPiBtZW51SXRlbXM7CisgICAgbWVu dUl0ZW1zLnJlc2VydmVDYXBhY2l0eShzaXplKTsKKworICAgIGZvciAodW5zaWduZWQgaSA9IDA7 IGkgPCBzaXplOyArK2kpCisgICAgICAgIG1lbnVJdGVtcy5hcHBlbmQoV2ViQ29udGV4dE1lbnVJ dGVtOjpjcmVhdGUobWVudUl0ZW1zVmVjdG9yW2ldKS5nZXQoKSk7CisKKyAgICBtX2NsaWVudC5z aG93Q29udGV4dE1lbnUodG9BUEkocGFnZSksIHRvQVBJKG1lbnVMb2NhdGlvbiksIHRvQVBJKElt bXV0YWJsZUFycmF5OjphZG9wdChtZW51SXRlbXMpLmdldCgpKSwgbV9jbGllbnQuY2xpZW50SW5m byk7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworYm9vbCBXZWJQYWdlQ29udGV4dE1lbnVDbGll bnQ6OmhpZGVDb250ZXh0TWVudShXZWJQYWdlUHJveHkqIHBhZ2UpCit7CisgICAgaWYgKCFtX2Ns aWVudC5oaWRlQ29udGV4dE1lbnUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIG1fY2xp ZW50LmhpZGVDb250ZXh0TWVudSh0b0FQSShwYWdlKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisK KyAgICByZXR1cm4gdHJ1ZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAjZW5kaWYgLy8g RU5BQkxFKENPTlRFWFRfTUVOVVMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmgKaW5kZXggZGZmOTAxOS4uNDQyYTA3NiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQu aApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUgIkFQSUNsaWVudC5oIgogI2luY2x1ZGUgIldl YkhpdFRlc3RSZXN1bHQuaCIKICNpbmNsdWRlICJXS1BhZ2UuaCIKKyNpbmNsdWRlIDxXZWJDb3Jl L0ludFBvaW50Lmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKQEAgLTQ0LDYgKzQ1LDggQEAgcHVibGljOgogICAgIGJvb2wgZ2V0Q29udGV4dE1lbnVGcm9t UHJvcG9zZWRNZW51KFdlYlBhZ2VQcm94eSosIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0 ZW1EYXRhPiYgcHJvcG9zZWRNZW51LCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mIGN1 c3RvbU1lbnUsIGNvbnN0IFdlYkhpdFRlc3RSZXN1bHQ6OkRhdGEmLCBBUElPYmplY3QqIHVzZXJE YXRhKTsKICAgICB2b2lkIGN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVkKFdlYlBhZ2VQcm94 eSosIGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbURhdGEmKTsKICAgICB2b2lkIGNvbnRleHRNZW51 RGlzbWlzc2VkKFdlYlBhZ2VQcm94eSopOworICAgIGJvb2wgc2hvd0NvbnRleHRNZW51KFdlYlBh Z2VQcm94eSosIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiwgY29uc3QgVmVjdG9yPFdlYkNvbnRl eHRNZW51SXRlbURhdGE+Jik7CisgICAgYm9vbCBoaWRlQ29udGV4dE1lbnUoV2ViUGFnZVByb3h5 Kik7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggODUxNzM0MC4uODc1ZmI2MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTMyNDcsNyArMzI0Nyw3IEBAIHZvaWQg V2ViUGFnZVByb3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBJbnRQb2ludCYgbWVu dUxvY2F0aW9uLCBjb25zdCBXCiAKICAgICBtX2FjdGl2ZUNvbnRleHRNZW51SGl0VGVzdFJlc3Vs dERhdGEgPSBoaXRUZXN0UmVzdWx0RGF0YTsKIAotICAgIGlmIChtX2FjdGl2ZUNvbnRleHRNZW51 KSB7CisgICAgaWYgKCFtX2NvbnRleHRNZW51Q2xpZW50LmhpZGVDb250ZXh0TWVudSh0aGlzKSAm JiBtX2FjdGl2ZUNvbnRleHRNZW51KSB7CiAgICAgICAgIG1fYWN0aXZlQ29udGV4dE1lbnUtPmhp ZGVDb250ZXh0TWVudSgpOwogICAgICAgICBtX2FjdGl2ZUNvbnRleHRNZW51ID0gMDsKICAgICB9 CkBAIC0zMjYxLDkgKzMyNjEsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0Nv bnRleHRNZW51KGNvbnN0IEludFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0IFcKIAogICAgIC8v IEdpdmUgdGhlIFBhZ2VDb250ZXh0TWVudUNsaWVudCBvbmUgbGFzdCBzd2lwZSBhdCBjaGFuZ2lu ZyB0aGUgbWVudS4KICAgICBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4gaXRlbXM7Ci0g ICAgaWYgKCFtX2NvbnRleHRNZW51Q2xpZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVu dSh0aGlzLCBwcm9wb3NlZEl0ZW1zLCBpdGVtcywgaGl0VGVzdFJlc3VsdERhdGEsIHVzZXJEYXRh LmdldCgpKSkKLSAgICAgICAgbV9hY3RpdmVDb250ZXh0TWVudS0+c2hvd0NvbnRleHRNZW51KG1l bnVMb2NhdGlvbiwgcHJvcG9zZWRJdGVtcyk7Ci0gICAgZWxzZQorICAgIGlmICghbV9jb250ZXh0 TWVudUNsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUodGhpcywgcHJvcG9zZWRJ dGVtcywgaXRlbXMsIGhpdFRlc3RSZXN1bHREYXRhLCB1c2VyRGF0YS5nZXQoKSkpIHsKKyAgICAg ICAgaWYgKCFtX2NvbnRleHRNZW51Q2xpZW50LnNob3dDb250ZXh0TWVudSh0aGlzLCBtZW51TG9j YXRpb24sIHByb3Bvc2VkSXRlbXMpKQorICAgICAgICAgICAgbV9hY3RpdmVDb250ZXh0TWVudS0+ c2hvd0NvbnRleHRNZW51KG1lbnVMb2NhdGlvbiwgcHJvcG9zZWRJdGVtcyk7CisgICAgfSBlbHNl IGlmICghbV9jb250ZXh0TWVudUNsaWVudC5zaG93Q29udGV4dE1lbnUodGhpcywgbWVudUxvY2F0 aW9uLCBpdGVtcykpCiAgICAgICAgIG1fYWN0aXZlQ29udGV4dE1lbnUtPnNob3dDb250ZXh0TWVu dShtZW51TG9jYXRpb24sIGl0ZW1zKTsKICAgICAKICAgICBtX2NvbnRleHRNZW51Q2xpZW50LmNv bnRleHRNZW51RGlzbWlzc2VkKHRoaXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcAppbmRleCA5MTIzZDI4Li5jYzUzYWNj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xp ZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51 Q2xpZW50RWZsLmNwcApAQCAtNTQsNiArNTQsOCBAQCBDb250ZXh0TWVudUNsaWVudEVmbDo6Q29u dGV4dE1lbnVDbGllbnRFZmwoRXdrVmlldyogdmlldykKICAgICBjb250ZXh0TWVudUNsaWVudC5j dXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZCA9IDA7CiAgICAgY29udGV4dE1lbnVDbGllbnQu Y29udGV4dE1lbnVEaXNtaXNzZWQgPSAwOwogICAgIGNvbnRleHRNZW51Q2xpZW50LmdldENvbnRl eHRNZW51RnJvbVByb3Bvc2VkTWVudSA9IDA7CisgICAgY29udGV4dE1lbnVDbGllbnQuc2hvd0Nv bnRleHRNZW51ID0gMDsKKyAgICBjb250ZXh0TWVudUNsaWVudC5oaWRlQ29udGV4dE1lbnUgPSAw OwogCiAgICAgV0tQYWdlU2V0UGFnZUNvbnRleHRNZW51Q2xpZW50KHBhZ2VSZWYsICZjb250ZXh0 TWVudUNsaWVudCk7CiB9Cg== 197846 2013-04-12 07:07:52 -0700 2013-04-15 02:01:03 -0700 applied andersca's comment c-api-contextmenu3.diff text/plain 12133 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjYzY5NDBjLi5lZTI3YmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUg QEAKKzIwMTMtMDQtMTIgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbV0syXSBBZGQgbmV3IGNhbGxiYWNrcyBhbmQgYSBmdW5jdGlv biBmb3IgV2ViS2l0MiBjb250ZXh0IG1lbnUgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgY29udGV4dE1lbnVIaWRlIGFuZCBjb250ZXh0TWVu dVNob3cgY2FsbGJhY2tzIHRvIFdLUGFnZUNvbnRleHRNZW51Q2xpZW50CisgICAgICAgIGFuZCBX S1BhZ2VDb250ZXh0TWVudVNlbGVjdGVkIEFQSSBzbyBjb250ZXh0IG1lbnVzIGNhbiBiZSBoYW5k bGVkIG91dHNpZGUKKyAgICAgICAgV2ViS2l0LiBBUEkgdmVyc2lvbiBvZiB0aGlzIGNsaWVudCB3 YXMgYnVtcGVkIHNvIG9sZGVyIGNsaWVudCB2ZXJzaW9uIHN0aWxsCisgICAgICAgICBjYW4gYmUg dXNlZAorCisgICAgICAgICogU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5jcHA6CisgICAgICAgIChX ZWJLaXQpOgorICAgICAgICAqIFNoYXJlZC9BUElDbGllbnRUcmFpdHMuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0MvV0tQYWdlLmNwcDoKKyAgICAgICAgKFdLUGFnZVNlbGVjdENvbnRleHRN ZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oOgorICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAg KGF0dGFjaENvbnRleHRNZW51Q2xpZW50VG9WaWV3KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZUNvbnRl eHRNZW51Q2xpZW50OjpnZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6OnNob3dDb250ZXh0TWVudSk6CisgICAg ICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6 OmhpZGVDb250ZXh0TWVudSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVu dUNsaWVudC5oOgorICAgICAgICAoV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50KToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9D b250ZXh0TWVudUNsaWVudEVmbC5jcHA6CisgICAgICAgIChDb250ZXh0TWVudUNsaWVudEVmbDo6 Q29udGV4dE1lbnVDbGllbnRFZmwpOgorCiAyMDEzLTA0LTEyICBNaWtoYWlsIFBvemRueWFrb3Yg IDxtaWtoYWlsLnBvemRueWFrb3ZAaW50ZWwuY29tPgogCiAgICAgICAgIFtXSzJdW0VGTF0gV2Vi VmlldzogQWRkIGNhbGxiYWNrcyB0byB0aGUgV0tWaWV3Q2xpZW50IHRvIGhhbmRsZSBwYWdlIHZp ZXdwb3J0IHVwZGF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSUNsaWVu dFRyYWl0cy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmNwcApp bmRleCA1MTA4OWFhLi5hNWNlZWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv QVBJQ2xpZW50VHJhaXRzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xpZW50 VHJhaXRzLmNwcApAQCAtNTgsNiArNTgsNyBAQCBjb25zdCBzaXplX3QgQVBJQ2xpZW50VHJhaXRz PFdLQnVuZGxlUGFnZUZ1bGxTY3JlZW5DbGllbnQ+OjppbnRlcmZhY2VTaXplc0J5VmVycwogY29u c3Qgc2l6ZV90IEFQSUNsaWVudFRyYWl0czxXS1BhZ2VDb250ZXh0TWVudUNsaWVudD46OmludGVy ZmFjZVNpemVzQnlWZXJzaW9uW10gPSB7CiAgICAgb2Zmc2V0b2YoV0tQYWdlQ29udGV4dE1lbnVD bGllbnQsIGNvbnRleHRNZW51RGlzbWlzc2VkKSwKICAgICBvZmZzZXRvZihXS1BhZ2VDb250ZXh0 TWVudUNsaWVudCwgZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KSwKKyAgICBvZmZzZXRv ZihXS1BhZ2VDb250ZXh0TWVudUNsaWVudCwgc2hvd0NvbnRleHRNZW51KSwKICAgICBzaXplb2Yo V0tQYWdlQ29udGV4dE1lbnVDbGllbnQpCiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvQVBJQ2xpZW50VHJhaXRzLmggYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJQ2xp ZW50VHJhaXRzLmgKaW5kZXggZWQyMGE3MC4uM2JiYjZmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvU2hhcmVkL0FQSUNsaWVudFRyYWl0cy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJl ZC9BUElDbGllbnRUcmFpdHMuaApAQCAtNjAsNyArNjAsNyBAQCB0ZW1wbGF0ZTw+IHN0cnVjdCBB UElDbGllbnRUcmFpdHM8V0tCdW5kbGVQYWdlVUlDbGllbnQ+IHsKIH07CiAKIHRlbXBsYXRlPD4g c3RydWN0IEFQSUNsaWVudFRyYWl0czxXS1BhZ2VDb250ZXh0TWVudUNsaWVudD4gewotICAgIHN0 YXRpYyBjb25zdCBzaXplX3QgaW50ZXJmYWNlU2l6ZXNCeVZlcnNpb25bM107CisgICAgc3RhdGlj IGNvbnN0IHNpemVfdCBpbnRlcmZhY2VTaXplc0J5VmVyc2lvbls0XTsKIH07CiAKIHRlbXBsYXRl PD4gc3RydWN0IEFQSUNsaWVudFRyYWl0czxXS1BhZ2VMb2FkZXJDbGllbnQ+IHsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKaW5kZXggZTJlZjM1Ny4uZGRkZTk5NyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5jcHAKQEAgLTQwLDYgKzQw LDEwIEBACiAjaW5jbHVkZSA8QmxvY2suaD4KICNlbmRpZgogCisjaWYgRU5BQkxFKENPTlRFWFRf TUVOVVMpCisjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVtLmgiCisjZW5kaWYKKwogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogCkBAIC04NzksMyAr ODgzLDEwIEBAIGJvb2wgV0tQYWdlR2V0T3ZlcnJpZGVQcml2YXRlQnJvd3NpbmdFbmFibGVkKFdL UGFnZVJlZiBwYWdlUmVmKQogewogICAgIHJldHVybiB0b0ltcGwocGFnZVJlZiktPm92ZXJyaWRl UHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpOwogfQorCit2b2lkIFdLUGFnZVNlbGVjdENvbnRleHRN ZW51SXRlbShXS1BhZ2VSZWYgcGFnZSwgV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSkKK3sKKyNp ZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykKKyAgICB0b0ltcGwocGFnZSktPmNvbnRleHRNZW51SXRl bVNlbGVjdGVkKCoodG9JbXBsKGl0ZW0pLT5kYXRhKCkpKTsKKyNlbmRpZgorfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZS5oCmluZGV4IDYzNDUzNzIuLjFhZjIzNGUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2UuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlLmgKQEAgLTMyNCw2ICszMjQsOCBAQCBl bnVtIHsga1dLUGFnZUZpbmRNYXRjaGVzQ2xpZW50Q3VycmVudFZlcnNpb24gPSAwIH07CiB0eXBl ZGVmIHZvaWQgKCpXS1BhZ2VHZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZENvbnRleHRNZW51Q2Fs bGJhY2spKFdLUGFnZVJlZiBwYWdlLCBXS0FycmF5UmVmIHByb3Bvc2VkTWVudSwgV0tBcnJheVJl ZiogbmV3TWVudSwgV0tIaXRUZXN0UmVzdWx0UmVmIGhpdFRlc3RSZXN1bHQsIFdLVHlwZVJlZiB1 c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiB0eXBlZGVmIHZvaWQgKCpXS1BhZ2VD dXN0b21Db250ZXh0TWVudUl0ZW1TZWxlY3RlZENhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tD b250ZXh0TWVudUl0ZW1SZWYgY29udGV4dE1lbnVJdGVtLCBjb25zdCB2b2lkKiBjbGllbnRJbmZv KTsKIHR5cGVkZWYgdm9pZCAoKldLUGFnZUNvbnRleHRNZW51RGlzbWlzc2VkQ2FsbGJhY2spKFdL UGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKK3R5cGVkZWYgdm9pZCAoKldL UGFnZVNob3dDb250ZXh0TWVudUNhbGxiYWNrKShXS1BhZ2VSZWYgcGFnZSwgV0tQb2ludCBtZW51 TG9jYXRpb24sIFdLQXJyYXlSZWYgbWVudUl0ZW1zLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsK K3R5cGVkZWYgdm9pZCAoKldLUGFnZUhpZGVDb250ZXh0TWVudUNhbGxiYWNrKShXS1BhZ2VSZWYg cGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7CiAKIC8vIERlcHJlY2F0ZWQKIHR5cGVkZWYg dm9pZCAoKldLUGFnZUdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkQ29udGV4dE1lbnVDYWxsYmFj a19kZXByZWNhdGVkRm9yVXNlV2l0aFYwKShXS1BhZ2VSZWYgcGFnZSwgV0tBcnJheVJlZiBwcm9w b3NlZE1lbnUsIFdLQXJyYXlSZWYqIG5ld01lbnUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qg dm9pZCogY2xpZW50SW5mbyk7CkBAIC0zNDAsMTAgKzM0MiwxNCBAQCBzdHJ1Y3QgV0tQYWdlQ29u dGV4dE1lbnVDbGllbnQgewogCiAgICAgLy8gVmVyc2lvbiAyCiAgICAgV0tQYWdlR2V0Q29udGV4 dE1lbnVGcm9tUHJvcG9zZWRDb250ZXh0TWVudUNhbGxiYWNrICAgICAgICAgICAgICAgICAgICAg ICAgICBnZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnU7CisKKyAgICAvLyBWZXJzaW9uIDMK KyAgICBXS1BhZ2VTaG93Q29udGV4dE1lbnVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHNob3dDb250ZXh0TWVudTsKKyAgICBXS1BhZ2VIaWRl Q29udGV4dE1lbnVDYWxsYmFjayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGhpZGVDb250ZXh0TWVudTsKIH07CiB0eXBlZGVmIHN0cnVjdCBXS1BhZ2VDb250 ZXh0TWVudUNsaWVudCBXS1BhZ2VDb250ZXh0TWVudUNsaWVudDsKIAotZW51bSB7IGtXS1BhZ2VD b250ZXh0TWVudUNsaWVudEN1cnJlbnRWZXJzaW9uID0gMiB9OworZW51bSB7IGtXS1BhZ2VDb250 ZXh0TWVudUNsaWVudEN1cnJlbnRWZXJzaW9uID0gMyB9OwogCiBXS19FWFBPUlQgV0tUeXBlSUQg V0tQYWdlR2V0VHlwZUlEKCk7CiAKQEAgLTU0OCw2ICs1NTQsOCBAQCBXS19FWFBPUlQgV0tTdHJp bmdSZWYgV0tQYWdlR2V0UGx1Z2luSW5mb3JtYXRpb25QbHVnaW5zcGFnZUF0dHJpYnV0ZVVSTEtl eSgpOwogLyogVmFsdWUgdHlwZTogV0tVUkxSZWYgKi8KIFdLX0VYUE9SVCBXS1N0cmluZ1JlZiBX S1BhZ2VHZXRQbHVnaW5JbmZvcm1hdGlvblBsdWdpblVSTEtleSgpOwogCitXS19FWFBPUlQgdm9p ZCBXS1BhZ2VTZWxlY3RDb250ZXh0TWVudUl0ZW0oV0tQYWdlUmVmIHBhZ2UsIFdLQ29udGV4dE1l bnVJdGVtUmVmIGl0ZW0pOworCiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVDbGllbnQu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVD bGllbnQuY3BwCmluZGV4IDQyZjkwYjguLmY1MGM1MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51Q2xpZW50LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUNsaWVudC5j cHAKQEAgLTQwLDYgKzQwLDggQEAgdm9pZCBhdHRhY2hDb250ZXh0TWVudUNsaWVudFRvVmlldyhX ZWJLaXRXZWJWaWV3KiB3ZWJWaWV3KQogICAgICAgICAwLCAvLyBjdXN0b21Db250ZXh0TWVudUl0 ZW1TZWxlY3RlZAogICAgICAgICAwLCAvLyBjb250ZXh0TWVudURpc21pc3NlZAogICAgICAgICBn ZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUsCisgICAgICAgIDAsIC8vIHNob3dDb250ZXh0 TWVudQorICAgICAgICAwLCAvLyBoaWRlQ29udGV4dE1lbnUKICAgICB9OwogICAgIFdLUGFnZVJl ZiB3a1BhZ2UgPSB0b0FQSSh3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVX X0JBU0Uod2ViVmlldykpKTsKICAgICBXS1BhZ2VTZXRQYWdlQ29udGV4dE1lbnVDbGllbnQod2tQ YWdlLCAmd2tDb250ZXh0TWVudUNsaWVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuY3BwCmluZGV4IDhhMTFlYmIuLjk2Mjc1 NzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1l bnVDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlQ29udGV4 dE1lbnVDbGllbnQuY3BwCkBAIC00Miw3ICs0Miw3IEBAIGJvb2wgV2ViUGFnZUNvbnRleHRNZW51 Q2xpZW50OjpnZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUoV2ViUGFnZVByb3h5KiBwYWdl CiAgICAgaWYgKCFtX2NsaWVudC5nZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUgJiYgIW1f Y2xpZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudV9kZXByZWNhdGVkRm9yVXNlV2l0 aFYwKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBpZiAobV9jbGllbnQudmVyc2lvbiA9 PSBrV0tQYWdlQ29udGV4dE1lbnVDbGllbnRDdXJyZW50VmVyc2lvbiAmJiAhbV9jbGllbnQuZ2V0 Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KQorICAgIGlmIChtX2NsaWVudC52ZXJzaW9uID49 IDIgJiYgIW1fY2xpZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwogCiAgICAgdW5zaWduZWQgc2l6ZSA9IHByb3Bvc2VkTWVudVZlY3Rvci5z aXplKCk7CkBAIC01Miw3ICs1Miw3IEBAIGJvb2wgV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50Ojpn ZXRDb250ZXh0TWVudUZyb21Qcm9wb3NlZE1lbnUoV2ViUGFnZVByb3h5KiBwYWdlCiAgICAgICAg IHByb3Bvc2VkTWVudS0+YXBwZW5kKFdlYkNvbnRleHRNZW51SXRlbTo6Y3JlYXRlKHByb3Bvc2Vk TWVudVZlY3RvcltpXSkuZ2V0KCkpOwogICAgICAgICAKICAgICBXS0FycmF5UmVmIG5ld01lbnUg PSAwOwotICAgIGlmIChtX2NsaWVudC52ZXJzaW9uID09IGtXS1BhZ2VDb250ZXh0TWVudUNsaWVu dEN1cnJlbnRWZXJzaW9uKSB7CisgICAgaWYgKG1fY2xpZW50LnZlcnNpb24gPj0gMikgewogICAg ICAgICBSZWZQdHI8V2ViSGl0VGVzdFJlc3VsdD4gd2ViSGl0VGVzdFJlc3VsdCA9IFdlYkhpdFRl c3RSZXN1bHQ6OmNyZWF0ZShoaXRUZXN0UmVzdWx0RGF0YSk7CiAgICAgICAgIG1fY2xpZW50Lmdl dENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSh0b0FQSShwYWdlKSwgdG9BUEkocHJvcG9zZWRN ZW51LmdldCgpKSwgJm5ld01lbnUsIHRvQVBJKHdlYkhpdFRlc3RSZXN1bHQuZ2V0KCkpLCB0b0FQ SSh1c2VyRGF0YSksIG1fY2xpZW50LmNsaWVudEluZm8pOwogICAgIH0gZWxzZQpAQCAtOTMsNSAr OTMsMzMgQEAgdm9pZCBXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6OmNvbnRleHRNZW51RGlzbWlz c2VkKFdlYlBhZ2VQcm94eSogcGFnZSkKICAgICBtX2NsaWVudC5jb250ZXh0TWVudURpc21pc3Nl ZCh0b0FQSShwYWdlKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAKK2Jvb2wgV2ViUGFnZUNv bnRleHRNZW51Q2xpZW50OjpzaG93Q29udGV4dE1lbnUoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25z dCBXZWJDb3JlOjpJbnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBWZWN0b3I8V2ViQ29udGV4 dE1lbnVJdGVtRGF0YT4mIG1lbnVJdGVtc1ZlY3RvcikKK3sKKyAgICBpZiAoIW1fY2xpZW50LnNo b3dDb250ZXh0TWVudSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgdW5zaWduZWQgc2l6 ZSA9IG1lbnVJdGVtc1ZlY3Rvci5zaXplKCk7CisKKyAgICBWZWN0b3I8UmVmUHRyPEFQSU9iamVj dD4gPiBtZW51SXRlbXM7CisgICAgbWVudUl0ZW1zLnJlc2VydmVDYXBhY2l0eShzaXplKTsKKwor ICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzaXplOyArK2kpCisgICAgICAgIG1lbnVJdGVt cy51bmNoZWNrZWRBcHBlbmQoV2ViQ29udGV4dE1lbnVJdGVtOjpjcmVhdGUobWVudUl0ZW1zVmVj dG9yW2ldKS5nZXQoKSk7CisKKyAgICBtX2NsaWVudC5zaG93Q29udGV4dE1lbnUodG9BUEkocGFn ZSksIHRvQVBJKG1lbnVMb2NhdGlvbiksIHRvQVBJKEltbXV0YWJsZUFycmF5OjphZG9wdChtZW51 SXRlbXMpLmdldCgpKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisKKyAgICByZXR1cm4gdHJ1ZTsK K30KKworYm9vbCBXZWJQYWdlQ29udGV4dE1lbnVDbGllbnQ6OmhpZGVDb250ZXh0TWVudShXZWJQ YWdlUHJveHkqIHBhZ2UpCit7CisgICAgaWYgKCFtX2NsaWVudC5oaWRlQ29udGV4dE1lbnUpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIG1fY2xpZW50LmhpZGVDb250ZXh0TWVudSh0b0FQ SShwYWdlKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CisKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAjZW5kaWYgLy8gRU5BQkxFKENPTlRFWFRfTUVOVVMpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUNvbnRleHRNZW51Q2xp ZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUNvbnRleHRNZW51Q2xpZW50 LmgKaW5kZXggZGZmOTAxOS4uNDQyYTA3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VDb250ZXh0TWVudUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlQ29udGV4dE1lbnVDbGllbnQuaApAQCAtMzEsNiArMzEsNyBAQAogI2lu Y2x1ZGUgIkFQSUNsaWVudC5oIgogI2luY2x1ZGUgIldlYkhpdFRlc3RSZXN1bHQuaCIKICNpbmNs dWRlICJXS1BhZ2UuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL0ludFBvaW50Lmg+CiAjaW5jbHVkZSA8 d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTQ0LDYgKzQ1LDggQEAgcHVi bGljOgogICAgIGJvb2wgZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51KFdlYlBhZ2VQcm94 eSosIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYgcHJvcG9zZWRNZW51LCBW ZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mIGN1c3RvbU1lbnUsIGNvbnN0IFdlYkhpdFRl c3RSZXN1bHQ6OkRhdGEmLCBBUElPYmplY3QqIHVzZXJEYXRhKTsKICAgICB2b2lkIGN1c3RvbUNv bnRleHRNZW51SXRlbVNlbGVjdGVkKFdlYlBhZ2VQcm94eSosIGNvbnN0IFdlYkNvbnRleHRNZW51 SXRlbURhdGEmKTsKICAgICB2b2lkIGNvbnRleHRNZW51RGlzbWlzc2VkKFdlYlBhZ2VQcm94eSop OworICAgIGJvb2wgc2hvd0NvbnRleHRNZW51KFdlYlBhZ2VQcm94eSosIGNvbnN0IFdlYkNvcmU6 OkludFBvaW50JiwgY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+Jik7CisgICAg Ym9vbCBoaWRlQ29udGV4dE1lbnUoV2ViUGFnZVByb3h5Kik7CiB9OwogCiB9IC8vIG5hbWVzcGFj ZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXgg ODUxNzM0MC4uODc1ZmI2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKQEAgLTMyNDcsNyArMzI0Nyw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjppbnRlcm5hbFNo b3dDb250ZXh0TWVudShjb25zdCBJbnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBXCiAKICAg ICBtX2FjdGl2ZUNvbnRleHRNZW51SGl0VGVzdFJlc3VsdERhdGEgPSBoaXRUZXN0UmVzdWx0RGF0 YTsKIAotICAgIGlmIChtX2FjdGl2ZUNvbnRleHRNZW51KSB7CisgICAgaWYgKCFtX2NvbnRleHRN ZW51Q2xpZW50LmhpZGVDb250ZXh0TWVudSh0aGlzKSAmJiBtX2FjdGl2ZUNvbnRleHRNZW51KSB7 CiAgICAgICAgIG1fYWN0aXZlQ29udGV4dE1lbnUtPmhpZGVDb250ZXh0TWVudSgpOwogICAgICAg ICBtX2FjdGl2ZUNvbnRleHRNZW51ID0gMDsKICAgICB9CkBAIC0zMjYxLDkgKzMyNjEsMTAgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0NvbnRleHRNZW51KGNvbnN0IEludFBvaW50 JiBtZW51TG9jYXRpb24sIGNvbnN0IFcKIAogICAgIC8vIEdpdmUgdGhlIFBhZ2VDb250ZXh0TWVu dUNsaWVudCBvbmUgbGFzdCBzd2lwZSBhdCBjaGFuZ2luZyB0aGUgbWVudS4KICAgICBWZWN0b3I8 V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4gaXRlbXM7Ci0gICAgaWYgKCFtX2NvbnRleHRNZW51Q2xp ZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSh0aGlzLCBwcm9wb3NlZEl0ZW1zLCBp dGVtcywgaGl0VGVzdFJlc3VsdERhdGEsIHVzZXJEYXRhLmdldCgpKSkKLSAgICAgICAgbV9hY3Rp dmVDb250ZXh0TWVudS0+c2hvd0NvbnRleHRNZW51KG1lbnVMb2NhdGlvbiwgcHJvcG9zZWRJdGVt cyk7Ci0gICAgZWxzZQorICAgIGlmICghbV9jb250ZXh0TWVudUNsaWVudC5nZXRDb250ZXh0TWVu dUZyb21Qcm9wb3NlZE1lbnUodGhpcywgcHJvcG9zZWRJdGVtcywgaXRlbXMsIGhpdFRlc3RSZXN1 bHREYXRhLCB1c2VyRGF0YS5nZXQoKSkpIHsKKyAgICAgICAgaWYgKCFtX2NvbnRleHRNZW51Q2xp ZW50LnNob3dDb250ZXh0TWVudSh0aGlzLCBtZW51TG9jYXRpb24sIHByb3Bvc2VkSXRlbXMpKQor ICAgICAgICAgICAgbV9hY3RpdmVDb250ZXh0TWVudS0+c2hvd0NvbnRleHRNZW51KG1lbnVMb2Nh dGlvbiwgcHJvcG9zZWRJdGVtcyk7CisgICAgfSBlbHNlIGlmICghbV9jb250ZXh0TWVudUNsaWVu dC5zaG93Q29udGV4dE1lbnUodGhpcywgbWVudUxvY2F0aW9uLCBpdGVtcykpCiAgICAgICAgIG1f YWN0aXZlQ29udGV4dE1lbnUtPnNob3dDb250ZXh0TWVudShtZW51TG9jYXRpb24sIGl0ZW1zKTsK ICAgICAKICAgICBtX2NvbnRleHRNZW51Q2xpZW50LmNvbnRleHRNZW51RGlzbWlzc2VkKHRoaXMp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Db250ZXh0TWVudUNs aWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xp ZW50RWZsLmNwcAppbmRleCA5MTIzZDI4Li5jYzUzYWNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcApAQCAtNTQsNiAr NTQsOCBAQCBDb250ZXh0TWVudUNsaWVudEVmbDo6Q29udGV4dE1lbnVDbGllbnRFZmwoRXdrVmll dyogdmlldykKICAgICBjb250ZXh0TWVudUNsaWVudC5jdXN0b21Db250ZXh0TWVudUl0ZW1TZWxl Y3RlZCA9IDA7CiAgICAgY29udGV4dE1lbnVDbGllbnQuY29udGV4dE1lbnVEaXNtaXNzZWQgPSAw OwogICAgIGNvbnRleHRNZW51Q2xpZW50LmdldENvbnRleHRNZW51RnJvbVByb3Bvc2VkTWVudSA9 IDA7CisgICAgY29udGV4dE1lbnVDbGllbnQuc2hvd0NvbnRleHRNZW51ID0gMDsKKyAgICBjb250 ZXh0TWVudUNsaWVudC5oaWRlQ29udGV4dE1lbnUgPSAwOwogCiAgICAgV0tQYWdlU2V0UGFnZUNv bnRleHRNZW51Q2xpZW50KHBhZ2VSZWYsICZjb250ZXh0TWVudUNsaWVudCk7CiB9Cg==