114729 2013-04-17 02:27:46 -0700 [EFL][WK2] Support sub menu in ewk context menus 2013-05-17 06:46:05 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 116097 114728 1 mpakulavelrutka mpakulavelrutka cdumez commit-queue gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 877089 0 mpakulavelrutka 2013-04-17 02:27:46 -0700 SSIA 877749 1 198696 mpakulavelrutka 2013-04-18 02:05:12 -0700 Created attachment 198696 proposed patch 879676 2 198696 mikhail.pozdnyakov 2013-04-23 01:52:23 -0700 Comment on attachment 198696 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=198696&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:46 > + , m_subMenu() this should be omitted, default ctor will be invoked anyway. > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:62 > + m_subMenu = adoptPtr(subMenu); adopting of passing args in the ctor is opaque and error prone, argument is better to be PassOwnPtr<> and adopted on caller side. > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_private.h:61 > + EwkView* viewImpl() const { return m_viewImpl; } ewkView() is better. 879679 3 198696 mikhail.pozdnyakov 2013-04-23 01:55:37 -0700 Comment on attachment 198696 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=198696&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:70 > + EwkContextMenu* subMenu() const { return m_subMenu.get(); } don't think it should be const, you're returning class-owned data. 880353 4 199394 mpakulavelrutka 2013-04-23 23:58:24 -0700 Created attachment 199394 fixes 880428 5 199394 mikhail.pozdnyakov 2013-04-24 04:28:03 -0700 Comment on attachment 199394 fixes View in context: https://bugs.webkit.org/attachment.cgi?id=199394&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:49 > + return adoptPtr(new EwkContextMenuItem(type, action, title, checked, enabled, adoptPtr(subMenu), parentMenu)); who calls it? can create() function pass PassOwnPtr<EwkContextMenu> as well? 880439 6 199394 mpakulavelrutka 2013-04-24 05:08:13 -0700 Comment on attachment 199394 fixes View in context: https://bugs.webkit.org/attachment.cgi?id=199394&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:49 >> + return adoptPtr(new EwkContextMenuItem(type, action, title, checked, enabled, adoptPtr(subMenu), parentMenu)); > > who calls it? can create() function pass PassOwnPtr<EwkContextMenu> as well? This create() is called by API functions: ewk_context_menu_item_new or new_with_submenu. I can move adoption of subMenu there (http://trac.webkit.org/browser/trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp#L60). 881088 7 199620 mpakulavelrutka 2013-04-24 22:52:59 -0700 Created attachment 199620 fixes moved adoption of submenu pointer to ewk_context_menu_item.cpp 881275 8 199620 mikhail.pozdnyakov 2013-04-25 08:44:19 -0700 Comment on attachment 199620 fixes Agreed on IRC that menu is better to be shareable (ewk object) 881809 9 199812 mpakulavelrutka 2013-04-26 04:30:16 -0700 Created attachment 199812 changed EwkContextMenu to EwkObject 881810 10 199812 mikhail.pozdnyakov 2013-04-26 04:39:29 -0700 Comment on attachment 199812 changed EwkContextMenu to EwkObject View in context: https://bugs.webkit.org/attachment.cgi?id=199812&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:71 > + return Ewk_Context_Menu_Item::create(type, action, title, checked, enabled, adoptRef(subMenu)).leakPtr(); no need to adopt since it's shared now, right? 889242 11 201817 mpakulavelrutka 2013-05-15 04:37:59 -0700 Created attachment 201817 patch changing EwkContextMenu to EwkObject moved to patch 116097 890239 12 201817 mikhail.pozdnyakov 2013-05-17 01:27:50 -0700 Comment on attachment 201817 patch View in context: https://bugs.webkit.org/attachment.cgi?id=201817&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:66 > + return Ewk_Context_Menu_Item::create(type, action, title, checked, enabled, PassRefPtr<EwkContextMenu>()).leakPtr(); it's better to keep '0' > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:73 > + return Ewk_Context_Menu_Item::create(type, action, title, checked, enabled, PassRefPtr<EwkContextMenu>(subMenuImpl)).leakPtr(); should be simply subMenuImpl 890240 13 201817 mikhail.pozdnyakov 2013-05-17 01:37:48 -0700 Comment on attachment 201817 patch View in context: https://bugs.webkit.org/attachment.cgi?id=201817&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:167 > + return const_cast<Ewk_Context_Menu_Item*>(item)->subMenu(); maybe Ewk_Context_Menu_Item should also be an EwkObject? and we probably should get rid of "ewk_defines.h" file > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:86 > EwkContextMenu* m_parentMenu; shouldn't it be RefPtr also? 890243 14 201817 cdumez 2013-05-17 01:48:17 -0700 Comment on attachment 201817 patch View in context: https://bugs.webkit.org/attachment.cgi?id=201817&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:66 > + return Ewk_Context_Menu_Item::create(type, action, title, checked, enabled, PassRefPtr<EwkContextMenu>()).leakPtr(); I would prefer if we omit the submenu argument. > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:160 > return const_cast<Ewk_Context_Menu_Item*>(item)->parentMenu(); const_cast is not actually needed here. Do you mind fixing it at the same time? > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:49 > + static PassOwnPtr<EwkContextMenuItem> create(Ewk_Context_Menu_Item_Type type, Ewk_Context_Menu_Item_Action action, const char* title, Eina_Bool checked, Eina_Bool enabled, PassRefPtr<EwkContextMenu> subMenu, EwkContextMenu* parentMenu = 0) Could you add a default value for the subMenu argument? > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:72 > + EwkContextMenu* subMenu() { return m_subMenu.get(); } I would make this getter const. Mikhail won't like it but it is consistent with parentMenu() above and it avoids the const_cast() in the caller. 890276 15 201817 mpakulavelrutka 2013-05-17 04:00:13 -0700 Comment on attachment 201817 patch View in context: https://bugs.webkit.org/attachment.cgi?id=201817&action=review >>> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:66 >>> + return Ewk_Context_Menu_Item::create(type, action, title, checked, enabled, PassRefPtr<EwkContextMenu>()).leakPtr(); >> >> it's better to keep '0' > > I would prefer if we omit the submenu argument. I will change change ::create method, by adding default 0 value for submenu too. >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:73 >> + return Ewk_Context_Menu_Item::create(type, action, title, checked, enabled, PassRefPtr<EwkContextMenu>(subMenuImpl)).leakPtr(); > > should be simply subMenuImpl ok >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:160 >> return const_cast<Ewk_Context_Menu_Item*>(item)->parentMenu(); > > const_cast is not actually needed here. Do you mind fixing it at the same time? to be removed >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:167 >> + return const_cast<Ewk_Context_Menu_Item*>(item)->subMenu(); > > maybe Ewk_Context_Menu_Item should also be an EwkObject? and we probably should get rid of "ewk_defines.h" file Will be it okay to do it in the next patch? >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:72 >> + EwkContextMenu* subMenu() { return m_subMenu.get(); } > > I would make this getter const. Mikhail won't like it but it is consistent with parentMenu() above and it avoids the const_cast() in the caller. OK, I will change it to const and remove const_cast from both *menu_get functions. >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:86 >> EwkContextMenu* m_parentMenu; > > shouldn't it be RefPtr also? I will change it to RefPtr too. 890287 16 202061 mpakulavelrutka 2013-05-17 04:38:45 -0700 Created attachment 202061 fixes after review 890288 17 202061 cdumez 2013-05-17 04:54:07 -0700 Comment on attachment 202061 fixes after review Looks fine. r=me but please let Mikhail take a final look before landing. 890323 18 202061 mpakulavelrutka 2013-05-17 06:07:39 -0700 Comment on attachment 202061 fixes after review Mikhail could you take a look and set cq+ if the patch is good? 890340 19 202061 commit-queue 2013-05-17 06:46:01 -0700 Comment on attachment 202061 fixes after review Clearing flags on attachment: 202061 Committed r150254: <http://trac.webkit.org/changeset/150254> 890341 20 commit-queue 2013-05-17 06:46:05 -0700 All reviewed patches have been landed. Closing bug. 198696 2013-04-18 02:05:12 -0700 2013-04-23 23:58:24 -0700 proposed patch ewk-submenu.diff text/plain 6947 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5YjYyZDk4Li4yNjE4YjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTMtMDQtMTcgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN1cHBvcnQgc3ViIG1lbnUgaW4gZXdrIGNv bnRleHQgbWVudXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDcyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIHN1Ym1lbnUgc3VwcG9ydCBpbiBFd2tDb250ZXh0TWVudSBhbmQgYW4gQVBJIGZ1 bmN0aW9uIHRvIHJlY2VpdmUKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSBmcm9tIHN1YiBtZW51 IGNvbnRleHQgbWVudSBpdGVtLiBBIHRlc3QgY2FzZSB3YXMgYWRkZWQKKyAgICAgICAgZm9yIG5l dyBBUEkgZnVuY3Rpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dF9tZW51X2l0ZW0uY3BwOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0 TWVudUl0ZW0pOgorICAgICAgICAoZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5o OgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpzdWJNZW51KToKKyAgICAgICAgKEV3a0Nv bnRleHRNZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudV9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250ZXh0TWVudTo6dmlld0ltcGwpOgorICAg ICAgICAoRXdrQ29udGV4dE1lbnUpOgorCiAyMDEzLTA0LTE2ICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBBZGQgd2Via2l0X3dlYl9w YWdlX2dldF9pZCgpIHRvIFdlYktpdDIgR1RLKyBBUEkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCmluZGV4 IDliODViYTkuLjI1MjY2N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcApAQCAtMjcsNiArMjcsNyBA QAogI2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfaXRlbS5oIgogCiAjaW5jbHVkZSAiZXdrX2Nv bnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaCIKKyNpbmNsdWRlICJld2tfY29udGV4dF9tZW51X3By aXZhdGUuaCIKICNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgogI2luY2x1ZGUgPFdlYktpdDIvV0tD b250ZXh0TWVudUl0ZW1UeXBlcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KQEAg LTQyLDggKzQzLDEyIEBAIEV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKFdL Q29udGV4dE1lbnVJdGVtUmVmIGl0ZW0sIEV3a19Db250ZXh0X01lCiAgICAgLCBtX2lzQ2hlY2tl ZChXS0NvbnRleHRNZW51SXRlbUdldENoZWNrZWQoaXRlbSkpCiAgICAgLCBtX2lzRW5hYmxlZChX S0NvbnRleHRNZW51SXRlbUdldEVuYWJsZWQoaXRlbSkpCiAgICAgLCBtX3BhcmVudE1lbnUocGFy ZW50TWVudSkKLSAgICAsIG1fc3ViTWVudSgwKQorICAgICwgbV9zdWJNZW51KCkKIHsKKyAgICBp ZiAoV0tDb250ZXh0TWVudUl0ZW1HZXRUeXBlKGl0ZW0pID09IGtXS0NvbnRleHRNZW51SXRlbVR5 cGVTdWJtZW51KSB7CisgICAgICAgIFdLUmV0YWluUHRyPFdLQXJyYXlSZWY+IG1lbnVJdGVtcyA9 IGFkb3B0V0soV0tDb250ZXh0TWVudUNvcHlTdWJtZW51SXRlbXMoaXRlbSkpOworICAgICAgICBt X3N1Yk1lbnUgPSBFd2tDb250ZXh0TWVudTo6Y3JlYXRlKHBhcmVudE1lbnUtPnZpZXdJbXBsKCks IG1lbnVJdGVtcy5nZXQoKSk7CisgICAgfQogfQogCiBFd2tDb250ZXh0TWVudUl0ZW06OkV3a0Nv bnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4 dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBj aGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSwgRXdr X0NvbnRleHRfTWVudSogcGFyZW50TWVudSkKQEAgLTUzLDggKzU4LDggQEAgRXdrQ29udGV4dE1l bnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlw ZSwgRXdrX0NvbnQKICAgICAsIG1faXNDaGVja2VkKGNoZWNrZWQpCiAgICAgLCBtX2lzRW5hYmxl ZChlbmFibGVkKQogICAgICwgbV9wYXJlbnRNZW51KHBhcmVudE1lbnUpCi0gICAgLCBtX3N1Yk1l bnUoc3ViTWVudSkKIHsKKyAgICBtX3N1Yk1lbnUgPSBhZG9wdFB0cihzdWJNZW51KTsKIH0KIAog RXdrX0NvbnRleHRfTWVudV9JdGVtKiBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KEV3a19Db250 ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0 aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFi bGVkKQpAQCAtMTU0LDYgKzE1OSwxMyBAQCBFd2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9t ZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSQogICAgIHJl dHVybiBjb25zdF9jYXN0PEV3a19Db250ZXh0X01lbnVfSXRlbSo+KGl0ZW0pLT5wYXJlbnRNZW51 KCk7CiB9CiAKK0V3a19Db250ZXh0X01lbnUqIGV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51 X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0pCit7CisgICAgRUlOQV9TQUZF VFlfT05fTlVMTF9SRVRVUk5fVkFMKGl0ZW0sIDApOworCisgICAgcmV0dXJuIGl0ZW0tPnN1Yk1l bnUoKTsKK30KKwogc3RhdGljIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gZ2V0RXdrQWN0 aW9uRnJvbVdLVGFnKFdLQ29udGV4dE1lbnVJdGVtVGFnIGFjdGlvbikKIHsKICAgICBzd2l0Y2gg KGFjdGlvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfbWVudV9pdGVtLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaAppbmRleCAyMDhlMGFkLi5iMDE0Y2JjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0 ZW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9t ZW51X2l0ZW0uaApAQCAtMjY4LDYgKzI2OCwxNSBAQCBFQVBJIEVpbmFfQm9vbCBld2tfY29udGV4 dF9tZW51X2l0ZW1fZW5hYmxlZF9zZXQoRXdrX0NvbnRleHRfTWVudV9JdGVtICpvLCBFaW5hXwog ICovCiBFQVBJIEV3a19Db250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRf bWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9JdGVtICpvKTsKIAorLyoqCisgKiBHZXRz IHRoZSBzdWJtZW51IGZvciB0aGUgaXRlbS4KKyAqCisgKiBAcGFyYW0gbyBpdGVtIHRvIGdldCB0 aGUgc3VibWVudQorICoKKyAqIEByZXR1cm4gdGhlIHBvaW50ZXIgdG8gc3VibWVudSBvbiBzdWNj ZXNzIG9yIEBjIE5VTEwgb24gZmFpbHVyZQorICovCitFQVBJIEV3a19Db250ZXh0X01lbnUgKmV3 a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0 ZW0gKm8pOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZh dGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVf aXRlbV9wcml2YXRlLmgKaW5kZXggMjUxMTE4My4uMzI0Y2M5ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51 X2l0ZW1fcHJpdmF0ZS5oCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiV0tFaW5hU2hhcmVk U3RyaW5nLmgiCiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudS5oIgogI2luY2x1ZGUgImV3a19j b250ZXh0X21lbnVfaXRlbS5oIgorI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3 dGYvUGFzc093blB0ci5oPgogCiAvKioKQEAgLTY2LDYgKzY3LDggQEAgcHVibGljOgogICAgIEV3 a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KCkgY29uc3QgeyByZXR1cm4gbV9wYXJlbnRNZW51OyB9 CiAgICAgdm9pZCBzZXRQYXJlbnRNZW51KEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KSB7IG1f cGFyZW50TWVudSA9IHBhcmVudE1lbnU7IH0KIAorICAgIEV3a0NvbnRleHRNZW51KiBzdWJNZW51 KCkgY29uc3QgeyByZXR1cm4gbV9zdWJNZW51LmdldCgpOyB9CisKIHByaXZhdGU6CiAgICAgRXdr Q29udGV4dE1lbnVJdGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmLCBFd2tDb250ZXh0TWVudSogcGFy ZW50TWVudSk7CiAgICAgRXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9U eXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFy KiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0 TWVudSogc3ViTWVudSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpOwpAQCAtNzksNyArODIs NyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc0VuYWJsZWQ7CiAKICAgICBFd2tfQ29udGV4dF9N ZW51KiBtX3BhcmVudE1lbnU7Ci0gICAgRXdrX0NvbnRleHRfTWVudSogbV9zdWJNZW51OworICAg IE93blB0cjxFd2tfQ29udGV4dF9NZW51PiBtX3N1Yk1lbnU7CiB9OwogCiAjZW5kaWYgLy8gZXdr X2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaAppbmRleCBh NmNlYTJkLi5mZGVkMzU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaApAQCAtNTgsNiArNTgsOCBA QCBwdWJsaWM6CiAgICAgY29uc3QgRWluYV9MaXN0KiBpdGVtcygpIGNvbnN0IHsgcmV0dXJuIG1f Y29udGV4dE1lbnVJdGVtczsgfQogICAgIHZvaWQgY29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoV0tD b250ZXh0TWVudUl0ZW1SZWYgaXRlbSk7CiAKKyAgICBFd2tWaWV3KiB2aWV3SW1wbCgpIGNvbnN0 IHsgcmV0dXJuIG1fdmlld0ltcGw7IH0KKwogcHJpdmF0ZToKICAgICBFd2tDb250ZXh0TWVudSgp OwogICAgIEV3a0NvbnRleHRNZW51KEVpbmFfTGlzdCogaXRlbXMpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVu dS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf Y29udGV4dF9tZW51LmNwcAppbmRleCA3MzA2ZWI0Li42OWZhZDIyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3 azJfY29udGV4dF9tZW51LmNwcApAQCAtOTAsNiArOTAsOSBAQCBzdGF0aWMgRWluYV9Cb29sIHNo b3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29vcmQg eCwgRQogICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVf Z2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRN ZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDb250ZXh0IG1lbnUgcmVjZWl2ZWQgZnJvbSBld2tf Y29udGV4dF9tZW51X2l0ZW1fc3VibWVudV9nZXQgc2hvdWxkIGJlIHRoZSBzYW1lIGFzIG9uZSB1 c2VkIHRvIGNyZWF0ZSBzdWIgbWVudS4KKyAgICBFWFBFQ1RfRVEoc3ViTWVudSwgZXdrX2NvbnRl eHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KG5ld0l0ZW0yKSk7CisKICAgICAvLyBXaGVuIGNvbnRl eHQgbWVudSBpdGVtIGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193 aXRoX3N1Ym1lbnUgYW5kIGFkZGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQg aXQgc2hvdWxkIGhhdmUgcGFyZW50IG1lbnUuCiAgICAgRVhQRUNUX0VRKGNvbnRleHRNZW51LCBl d2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKIAo= 199394 2013-04-23 23:58:24 -0700 2013-04-24 22:52:59 -0700 fixes ewk-submenus2.diff text/plain 7700 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmNDU2MWUzLi5lYmZlMjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTMtMDQtMjMgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN1cHBvcnQgc3ViIG1lbnUgaW4gZXdrIGNv bnRleHQgbWVudXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDcyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIHN1Ym1lbnUgc3VwcG9ydCBpbiBFd2tDb250ZXh0TWVudSBhbmQgYW4gQVBJIGZ1 bmN0aW9uIHRvIHJlY2VpdmUKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSBmcm9tIHN1YiBtZW51 IGNvbnRleHQgbWVudSBpdGVtLiBBIHRlc3QgY2FzZSB3YXMgYWRkZWQKKyAgICAgICAgZm9yIG5l dyBBUEkgZnVuY3Rpb24uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dF9tZW51X2l0ZW0uY3BwOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0 TWVudUl0ZW0pOgorICAgICAgICAoZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5o OgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpzdWJNZW51KToKKyAgICAgICAgKEV3a0Nv bnRleHRNZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudV9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250ZXh0TWVudTo6dmlld0ltcGwpOgorICAg ICAgICAoRXdrQ29udGV4dE1lbnUpOgorCiAyMDEzLTA0LTIzICBOb2FtIFJvc2VudGhhbCAgPG5v YW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBbQ29vcmRpbmF0ZWQgR3JhcGhpY3NdIFJlbW92ZSB0 aGUgbG9ja0FuaW1hdGlvbnMgY29kZSBwYXRoCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcAppbmRleCA5Yjg1 YmE5Li40Zjc3MTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKQEAgLTI3LDYgKzI3LDcgQEAKICNp bmNsdWRlICJld2tfY29udGV4dF9tZW51X2l0ZW0uaCIKIAogI2luY2x1ZGUgImV3a19jb250ZXh0 X21lbnVfaXRlbV9wcml2YXRlLmgiCisjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9wcml2YXRl LmgiCiAjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKICNpbmNsdWRlIDxXZWJLaXQyL1dLQ29udGV4 dE1lbnVJdGVtVHlwZXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC00Miwx MSArNDMsMTQgQEAgRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oV0tDb250 ZXh0TWVudUl0ZW1SZWYgaXRlbSwgRXdrX0NvbnRleHRfTWUKICAgICAsIG1faXNDaGVja2VkKFdL Q29udGV4dE1lbnVJdGVtR2V0Q2hlY2tlZChpdGVtKSkKICAgICAsIG1faXNFbmFibGVkKFdLQ29u dGV4dE1lbnVJdGVtR2V0RW5hYmxlZChpdGVtKSkKICAgICAsIG1fcGFyZW50TWVudShwYXJlbnRN ZW51KQotICAgICwgbV9zdWJNZW51KDApCiB7CisgICAgaWYgKFdLQ29udGV4dE1lbnVJdGVtR2V0 VHlwZShpdGVtKSA9PSBrV0tDb250ZXh0TWVudUl0ZW1UeXBlU3VibWVudSkgeworICAgICAgICBX S1JldGFpblB0cjxXS0FycmF5UmVmPiBtZW51SXRlbXMgPSBhZG9wdFdLKFdLQ29udGV4dE1lbnVD b3B5U3VibWVudUl0ZW1zKGl0ZW0pKTsKKyAgICAgICAgbV9zdWJNZW51ID0gRXdrQ29udGV4dE1l bnU6OmNyZWF0ZShwYXJlbnRNZW51LT5ld2tWaWV3KCksIG1lbnVJdGVtcy5nZXQoKSk7CisgICAg fQogfQogCi1Fd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4 dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlv biwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxl ZCwgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSwgRXdrX0NvbnRleHRfTWVudSogcGFyZW50TWVu dSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01l bnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBj b25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBQ YXNzT3duUHRyPEV3a19Db250ZXh0X01lbnU+IHN1Yk1lbnUsIEV3a19Db250ZXh0X01lbnUqIHBh cmVudE1lbnUpCiAgICAgOiBtX3R5cGUodHlwZSkKICAgICAsIG1fYWN0aW9uKGFjdGlvbikKICAg ICAsIG1fdGl0bGUodGl0bGUpCkBAIC0xNTQsNiArMTU4LDEzIEBAIEV3a19Db250ZXh0X01lbnUq IGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRf TWVudV9JCiAgICAgcmV0dXJuIGNvbnN0X2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oaXRl bSktPnBhcmVudE1lbnUoKTsKIH0KIAorRXdrX0NvbnRleHRfTWVudSogZXdrX2NvbnRleHRfbWVu dV9pdGVtX3N1Ym1lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKK3sK KyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaXRlbSwgMCk7CisKKyAgICByZXR1 cm4gY29uc3RfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0ZW0qPihpdGVtKS0+c3ViTWVudSgpOwor fQorCiBzdGF0aWMgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBnZXRFd2tBY3Rpb25Gcm9t V0tUYWcoV0tDb250ZXh0TWVudUl0ZW1UYWcgYWN0aW9uKQogewogICAgIHN3aXRjaCAoYWN0aW9u KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dF9tZW51X2l0ZW0uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19j b250ZXh0X21lbnVfaXRlbS5oCmluZGV4IDIwOGUwYWQuLmIwMTRjYmMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRl bS5oCkBAIC0yNjgsNiArMjY4LDE1IEBAIEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVf aXRlbV9lbmFibGVkX3NldChFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8sIEVpbmFfCiAgKi8KIEVB UEkgRXdrX0NvbnRleHRfTWVudSAqZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dl dChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8pOwogCisvKioKKyAqIEdldHMgdGhlIHN1 Ym1lbnUgZm9yIHRoZSBpdGVtLgorICoKKyAqIEBwYXJhbSBvIGl0ZW0gdG8gZ2V0IHRoZSBzdWJt ZW51CisgKgorICogQHJldHVybiB0aGUgcG9pbnRlciB0byBzdWJtZW51IG9uIHN1Y2Nlc3Mgb3Ig QGMgTlVMTCBvbiBmYWlsdXJlCisgKi8KK0VBUEkgRXdrX0NvbnRleHRfTWVudSAqZXdrX2NvbnRl eHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSAqbyk7 CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3By aXZhdGUuaAppbmRleCAyNTExMTgzLi4xODg4ZTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9w cml2YXRlLmgKQEAgLTMwLDYgKzMwLDcgQEAKICNpbmNsdWRlICJXS0VpbmFTaGFyZWRTdHJpbmcu aCIKICNpbmNsdWRlICJld2tfY29udGV4dF9tZW51LmgiCiAjaW5jbHVkZSAiZXdrX2NvbnRleHRf bWVudV9pdGVtLmgiCisjaW5jbHVkZSA8d3RmL093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi9QYXNz T3duUHRyLmg+CiAKIC8qKgpAQCAtNDUsNyArNDYsNyBAQCBwdWJsaWM6CiAKICAgICBzdGF0aWMg UGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNyZWF0ZShFd2tfQ29udGV4dF9NZW51X0l0 ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3Qg Y2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29u dGV4dE1lbnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51ID0gMCkKICAgICB7 Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29udGV4dE1lbnVJdGVtKHR5cGUsIGFj dGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUsIHBhcmVudE1lbnUpKTsKKyAg ICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0odHlwZSwgYWN0aW9u LCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgYWRvcHRQdHIoc3ViTWVudSksIHBhcmVudE1lbnUp KTsKICAgICB9CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbigpIGNv bnN0IHsgcmV0dXJuIG1fYWN0aW9uOyB9CkBAIC02Niw5ICs2NywxMSBAQCBwdWJsaWM6CiAgICAg RXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudE1lbnU7 IH0KICAgICB2b2lkIHNldFBhcmVudE1lbnUoRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpIHsg bV9wYXJlbnRNZW51ID0gcGFyZW50TWVudTsgfQogCisgICAgRXdrQ29udGV4dE1lbnUqIHN1Yk1l bnUoKSB7IHJldHVybiBtX3N1Yk1lbnUuZ2V0KCk7IH0KKwogcHJpdmF0ZToKICAgICBFd2tDb250 ZXh0TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYsIEV3a0NvbnRleHRNZW51KiBwYXJlbnRN ZW51KTsKLSAgICBFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUg dHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRp dGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51 KiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSk7CisgICAgRXdrQ29udGV4dE1l bnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVf SXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQs IEVpbmFfQm9vbCBlbmFibGVkLCBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51LCBF d2tDb250ZXh0TWVudSogcGFyZW50TWVudSk7CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1f VHlwZSBtX3R5cGU7CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBtX2FjdGlvbjsK QEAgLTc5LDcgKzgyLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNFbmFibGVkOwogCiAgICAg RXdrX0NvbnRleHRfTWVudSogbV9wYXJlbnRNZW51OwotICAgIEV3a19Db250ZXh0X01lbnUqIG1f c3ViTWVudTsKKyAgICBPd25QdHI8RXdrX0NvbnRleHRfTWVudT4gbV9zdWJNZW51OwogfTsKIAog I2VuZGlmIC8vIGV3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlX2gKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfcHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2 YXRlLmgKaW5kZXggYTZjZWEyZC4uZGQ1MjY2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgKQEAg LTU4LDYgKzU4LDggQEAgcHVibGljOgogICAgIGNvbnN0IEVpbmFfTGlzdCogaXRlbXMoKSBjb25z dCB7IHJldHVybiBtX2NvbnRleHRNZW51SXRlbXM7IH0KICAgICB2b2lkIGNvbnRleHRNZW51SXRl bVNlbGVjdGVkKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0pOwogCisgICAgRXdrVmlldyogZXdr VmlldygpIGNvbnN0IHsgcmV0dXJuIG1fdmlld0ltcGw7IH0KKwogcHJpdmF0ZToKICAgICBFd2tD b250ZXh0TWVudSgpOwogICAgIEV3a0NvbnRleHRNZW51KEVpbmFfTGlzdCogaXRlbXMpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAppbmRleCA3MzA2ZWI0Li42OWZhZDIyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf Y29udGV4dF9tZW51LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcApAQCAtOTAsNiArOTAsOSBAQCBzdGF0aWMg RWluYV9Cb29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEs IEV2YXNfQ29vcmQgeCwgRQogICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0ZW1f cGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBw ZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDb250ZXh0IG1lbnUgcmVjZWl2 ZWQgZnJvbSBld2tfY29udGV4dF9tZW51X2l0ZW1fc3VibWVudV9nZXQgc2hvdWxkIGJlIHRoZSBz YW1lIGFzIG9uZSB1c2VkIHRvIGNyZWF0ZSBzdWIgbWVudS4KKyAgICBFWFBFQ1RfRVEoc3ViTWVu dSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KG5ld0l0ZW0yKSk7CisKICAgICAv LyBXaGVuIGNvbnRleHQgbWVudSBpdGVtIGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVu dV9pdGVtX25ld193aXRoX3N1Ym1lbnUgYW5kIGFkZGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVf aXRlbV9hcHBlbmQgaXQgc2hvdWxkIGhhdmUgcGFyZW50IG1lbnUuCiAgICAgRVhQRUNUX0VRKGNv bnRleHRNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0p KTsKIAo= 199620 2013-04-24 22:52:59 -0700 2013-04-26 04:30:16 -0700 fixes ewk-submenus3.diff text/plain 9074 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5NTI5NmRlLi41MDYzMDhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDQtMjQgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN1cHBvcnQgc3ViIG1lbnUgaW4gZXdrIGNv bnRleHQgbWVudXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDcyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIHN1Ym1lbnUgc3VwcG9ydCBpbiBFd2tDb250ZXh0TWVudSBhbmQgYW4gQVBJIGZ1 bmN0aW9uIHRvIHJlY2VpdmUKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSBmcm9tIHN1Ym1lbnUg Y29udGV4dCBtZW51IGl0ZW0uIEEgdGVzdCBjYXNlIHdhcyBhZGRlZAorICAgICAgICBmb3IgbmV3 IEFQSSBmdW5jdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X21lbnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRN ZW51SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KToKKyAgICAgICAg KGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKGV3a19j b250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a0NvbnRleHRNZW51 SXRlbTo6Y3JlYXRlKToKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRlbTo6c3ViTWVudSk6Cisg ICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L2V3a19jb250ZXh0X21lbnVfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29udGV4dE1lbnU6OmV3 a1ZpZXcpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUuY3BwOgorICAgICAgICAoc2hvd0Nv bnRleHRNZW51KToKKwogMjAxMy0wNC0yNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBQREZQbHVnaW46IEN1cnNvciBzaG91bGQgYmVjb21lIGFuIGkt YmVhbSB3aGVuIG92ZXIgc2VsZWN0YWJsZSB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcAppbmRleCA5 Yjg1YmE5Li41OGU4OTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKQEAgLTI3LDYgKzI3LDcgQEAK ICNpbmNsdWRlICJld2tfY29udGV4dF9tZW51X2l0ZW0uaCIKIAogI2luY2x1ZGUgImV3a19jb250 ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgiCisjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9wcml2 YXRlLmgiCiAjaW5jbHVkZSAiZXdrX3ByaXZhdGUuaCIKICNpbmNsdWRlIDxXZWJLaXQyL1dLQ29u dGV4dE1lbnVJdGVtVHlwZXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CkBAIC00 MiwxMSArNDMsMTQgQEAgRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oV0tD b250ZXh0TWVudUl0ZW1SZWYgaXRlbSwgRXdrX0NvbnRleHRfTWUKICAgICAsIG1faXNDaGVja2Vk KFdLQ29udGV4dE1lbnVJdGVtR2V0Q2hlY2tlZChpdGVtKSkKICAgICAsIG1faXNFbmFibGVkKFdL Q29udGV4dE1lbnVJdGVtR2V0RW5hYmxlZChpdGVtKSkKICAgICAsIG1fcGFyZW50TWVudShwYXJl bnRNZW51KQotICAgICwgbV9zdWJNZW51KDApCiB7CisgICAgaWYgKFdLQ29udGV4dE1lbnVJdGVt R2V0VHlwZShpdGVtKSA9PSBrV0tDb250ZXh0TWVudUl0ZW1UeXBlU3VibWVudSkgeworICAgICAg ICBXS1JldGFpblB0cjxXS0FycmF5UmVmPiBtZW51SXRlbXMgPSBhZG9wdFdLKFdLQ29udGV4dE1l bnVDb3B5U3VibWVudUl0ZW1zKGl0ZW0pKTsKKyAgICAgICAgbV9zdWJNZW51ID0gRXdrQ29udGV4 dE1lbnU6OmNyZWF0ZShwYXJlbnRNZW51LT5ld2tWaWV3KCksIG1lbnVJdGVtcy5nZXQoKSk7Cisg ICAgfQogfQogCi1Fd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29u dGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFj dGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5h YmxlZCwgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSwgRXdrX0NvbnRleHRfTWVudSogcGFyZW50 TWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0 X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9u LCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVk LCBQYXNzT3duUHRyPEV3a19Db250ZXh0X01lbnU+IHN1Yk1lbnUsIEV3a19Db250ZXh0X01lbnUq IHBhcmVudE1lbnUpCiAgICAgOiBtX3R5cGUodHlwZSkKICAgICAsIG1fYWN0aW9uKGFjdGlvbikK ICAgICAsIG1fdGl0bGUodGl0bGUpCkBAIC01OSwxMiArNjMsMTIgQEAgRXdrQ29udGV4dE1lbnVJ dGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwg RXdrX0NvbnQKIAogRXdrX0NvbnRleHRfTWVudV9JdGVtKiBld2tfY29udGV4dF9tZW51X2l0ZW1f bmV3KEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRl bV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVp bmFfQm9vbCBlbmFibGVkKQogewotICAgIHJldHVybiBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNy ZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCAwKS5sZWFrUHRyKCk7 CisgICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5cGUsIGFjdGlvbiwg dGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIG51bGxwdHIpLmxlYWtQdHIoKTsKIH0KIAogRXdrX0Nv bnRleHRfTWVudV9JdGVtKiBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudShF d2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0 aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jv b2wgZW5hYmxlZCwgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSkKIHsKLSAgICByZXR1cm4gRXdr X0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwg ZW5hYmxlZCwgc3ViTWVudSkubGVha1B0cigpOworICAgIHJldHVybiBFd2tfQ29udGV4dF9NZW51 X0l0ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCBhZG9w dFB0cihzdWJNZW51KSkubGVha1B0cigpOwogfQogCiBFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSBld2tfY29udGV4dF9tZW51X2l0ZW1fdHlwZV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9J dGVtKiBpdGVtKQpAQCAtMTU0LDYgKzE1OCwxMyBAQCBFd2tfQ29udGV4dF9NZW51KiBld2tfY29u dGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSQog ICAgIHJldHVybiBjb25zdF9jYXN0PEV3a19Db250ZXh0X01lbnVfSXRlbSo+KGl0ZW0pLT5wYXJl bnRNZW51KCk7CiB9CiAKK0V3a19Db250ZXh0X01lbnUqIGV3a19jb250ZXh0X21lbnVfaXRlbV9z dWJtZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0pCit7CisgICAgRUlO QV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGl0ZW0sIDApOworCisgICAgcmV0dXJuIGNvbnN0 X2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oaXRlbSktPnN1Yk1lbnUoKTsKK30KKwogc3Rh dGljIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gZ2V0RXdrQWN0aW9uRnJvbVdLVGFnKFdL Q29udGV4dE1lbnVJdGVtVGFnIGFjdGlvbikKIHsKICAgICBzd2l0Y2ggKGFjdGlvbikgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVu dV9pdGVtLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9t ZW51X2l0ZW0uaAppbmRleCAyMDhlMGFkLi5iMDE0Y2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaApAQCAt MjY4LDYgKzI2OCwxNSBAQCBFQVBJIEVpbmFfQm9vbCBld2tfY29udGV4dF9tZW51X2l0ZW1fZW5h YmxlZF9zZXQoRXdrX0NvbnRleHRfTWVudV9JdGVtICpvLCBFaW5hXwogICovCiBFQVBJIEV3a19D b250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoY29uc3Qg RXdrX0NvbnRleHRfTWVudV9JdGVtICpvKTsKIAorLyoqCisgKiBHZXRzIHRoZSBzdWJtZW51IGZv ciB0aGUgaXRlbS4KKyAqCisgKiBAcGFyYW0gbyBpdGVtIHRvIGdldCB0aGUgc3VibWVudQorICoK KyAqIEByZXR1cm4gdGhlIHBvaW50ZXIgdG8gc3VibWVudSBvbiBzdWNjZXNzIG9yIEBjIE5VTEwg b24gZmFpbHVyZQorICovCitFQVBJIEV3a19Db250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVf aXRlbV9zdWJtZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8pOworCiAjaWZk ZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgK aW5kZXggMjUxMTE4My4uYzQwNTBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5o CkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiV0tFaW5hU2hhcmVkU3RyaW5nLmgiCiAjaW5j bHVkZSAiZXdrX2NvbnRleHRfbWVudS5oIgogI2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfaXRl bS5oIgorI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5o PgogCiAvKioKQEAgLTQzLDcgKzQ0LDcgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gYWRvcHRQ dHIobmV3IEV3a0NvbnRleHRNZW51SXRlbShpdGVtLCBwYXJlbnRNZW51KSk7CiAgICAgfQogCi0g ICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoRXdrX0NvbnRl eHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rp b24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJs ZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSA9 IDApCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoRXdr X0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlv biBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29s IGVuYWJsZWQsIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnU+IHN1Yk1lbnUsIEV3a0NvbnRleHRN ZW51KiBwYXJlbnRNZW51ID0gMCkKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcg RXdrQ29udGV4dE1lbnVJdGVtKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQs IHN1Yk1lbnUsIHBhcmVudE1lbnUpKTsKICAgICB9CkBAIC02Niw5ICs2NywxMSBAQCBwdWJsaWM6 CiAgICAgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVu dE1lbnU7IH0KICAgICB2b2lkIHNldFBhcmVudE1lbnUoRXdrQ29udGV4dE1lbnUqIHBhcmVudE1l bnUpIHsgbV9wYXJlbnRNZW51ID0gcGFyZW50TWVudTsgfQogCisgICAgRXdrQ29udGV4dE1lbnUq IHN1Yk1lbnUoKSB7IHJldHVybiBtX3N1Yk1lbnUuZ2V0KCk7IH0KKwogcHJpdmF0ZToKICAgICBF d2tDb250ZXh0TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYsIEV3a0NvbnRleHRNZW51KiBw YXJlbnRNZW51KTsKLSAgICBFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVt X1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNo YXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a0NvbnRl eHRNZW51KiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSk7CisgICAgRXdrQ29u dGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0 X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNo ZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51PiBzdWJN ZW51LCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSk7CiAKICAgICBFd2tfQ29udGV4dF9NZW51 X0l0ZW1fVHlwZSBtX3R5cGU7CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBtX2Fj dGlvbjsKQEAgLTc5LDcgKzgyLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNFbmFibGVkOwog CiAgICAgRXdrX0NvbnRleHRfTWVudSogbV9wYXJlbnRNZW51OwotICAgIEV3a19Db250ZXh0X01l bnUqIG1fc3ViTWVudTsKKyAgICBPd25QdHI8RXdrX0NvbnRleHRfTWVudT4gbV9zdWJNZW51Owog fTsKIAogI2VuZGlmIC8vIGV3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlX2gKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfcHJp dmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVu dV9wcml2YXRlLmgKaW5kZXggYTZjZWEyZC4uZGQ1MjY2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRl LmgKQEAgLTU4LDYgKzU4LDggQEAgcHVibGljOgogICAgIGNvbnN0IEVpbmFfTGlzdCogaXRlbXMo KSBjb25zdCB7IHJldHVybiBtX2NvbnRleHRNZW51SXRlbXM7IH0KICAgICB2b2lkIGNvbnRleHRN ZW51SXRlbVNlbGVjdGVkKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0pOwogCisgICAgRXdrVmll dyogZXdrVmlldygpIGNvbnN0IHsgcmV0dXJuIG1fdmlld0ltcGw7IH0KKwogcHJpdmF0ZToKICAg ICBFd2tDb250ZXh0TWVudSgpOwogICAgIEV3a0NvbnRleHRNZW51KEVpbmFfTGlzdCogaXRlbXMp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVz dF9ld2syX2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAppbmRleCA3MzA2ZWI0Li42OWZhZDIy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfY29udGV4dF9tZW51LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcApAQCAtOTAsNiArOTAsOSBAQCBz dGF0aWMgRWluYV9Cb29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFy dERhdGEsIEV2YXNfQ29vcmQgeCwgRQogICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51 X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0 ZW1fYXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDb250ZXh0IG1lbnUg cmVjZWl2ZWQgZnJvbSBld2tfY29udGV4dF9tZW51X2l0ZW1fc3VibWVudV9nZXQgc2hvdWxkIGJl IHRoZSBzYW1lIGFzIG9uZSB1c2VkIHRvIGNyZWF0ZSBzdWIgbWVudS4KKyAgICBFWFBFQ1RfRVEo c3ViTWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KG5ld0l0ZW0yKSk7CisK ICAgICAvLyBXaGVuIGNvbnRleHQgbWVudSBpdGVtIGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRl eHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUgYW5kIGFkZGVkIHVzaW5nIGV3a19jb250ZXh0 X21lbnVfaXRlbV9hcHBlbmQgaXQgc2hvdWxkIGhhdmUgcGFyZW50IG1lbnUuCiAgICAgRVhQRUNU X0VRKGNvbnRleHRNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5l d0l0ZW0pKTsKIAo= 199812 2013-04-26 04:30:16 -0700 2013-05-15 04:37:59 -0700 changed EwkContextMenu to EwkObject ewk-submenus4.diff text/plain 12824 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxYzg4NDJiLi5jNGQ3MTRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzkg QEAKKzIwMTMtMDQtMjYgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN1cHBvcnQgc3ViIG1lbnUgaW4gZXdrIGNv bnRleHQgbWVudXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDcyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIHN1Ym1lbnUgc3VwcG9ydCBpbiBFd2tDb250ZXh0TWVudSBhbmQgYW4gQVBJIGZ1 bmN0aW9uIHRvIHJlY2VpdmUKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSBmcm9tIHN1Ym1lbnUg Y29udGV4dCBtZW51IGl0ZW0uIEEgdGVzdCBjYXNlIHdhcyBhZGRlZAorICAgICAgICBmb3IgbmV3 IEFQSSBmdW5jdGlvbi4KKyAgICAgICAgRXdrQ29udGV4dE1lbnUgaXMgbm93IGFuIEV3a09iamVj dCBhbGxvd2luZyBtdWx0aXBsZSBpbnN0YW5jZXMgb2Ygc3VibWVudQorICAgICAgICB0byBiZSB1 c2VkIGluIGRpZmZlcmVudCBzdWJtZW51IHR5cGUgY29udGV4dCBtZW51IGl0ZW1zLgorCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3Lmg6CisgICAgICAgIChFd2tWaWV3KToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNwcDoKKyAgICAg ICAgKGV3a19jb250ZXh0X21lbnVfbmV3KToKKyAgICAgICAgKGV3a19jb250ZXh0X21lbnVfbmV3 X3dpdGhfaXRlbXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21l bnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51 SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKGV3a19jb250 ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfbWVudV9pdGVtLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRl bTo6Y3JlYXRlKToKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRlbTo6c3ViTWVudSk6CisgICAg ICAgIChFd2tDb250ZXh0TWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnVfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29udGV4dE1lbnUpOgorICAg ICAgICAoRXdrQ29udGV4dE1lbnU6OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0TWVudTo6 ZXdrVmlldyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Nv bnRleHRfbWVudS5jcHA6CisgICAgICAgIChzaG93Q29udGV4dE1lbnUpOgorCiAyMDEzLTA0LTI1 ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBQ bHVnaW4gcHJvY2VzcyBicm9rZW4gZHVlIHRvIGEgbWlzc2luZyBzeW1ib2wKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaAppbmRleCBiMGYzZDNkLi5mMDRiNzQ2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCkBAIC0yNzUsNyAr Mjc1LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fdG91Y2hFdmVudHNFbmFibGVkOwogI2VuZGlm CiAgICAgV2ViQ29yZTo6VGltZXI8RXdrVmlldz4gbV9kaXNwbGF5VGltZXI7Ci0gICAgT3duUHRy PEV3a0NvbnRleHRNZW51PiBtX2NvbnRleHRNZW51OworICAgIFJlZlB0cjxFd2tDb250ZXh0TWVu dT4gbV9jb250ZXh0TWVudTsKICAgICBPd25QdHI8RXdrUG9wdXBNZW51PiBtX3BvcHVwTWVudTsK ICAgICBPd25QdHI8V2ViS2l0OjpJbnB1dE1ldGhvZENvbnRleHRFZmw+IG1faW5wdXRNZXRob2RD b250ZXh0OwogI2lmIEVOQUJMRShJTlBVVF9UWVBFX0NPTE9SKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNwcAppbmRleCBhNDgw YWQ1Li43YzcyN2ExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dF9tZW51LmNwcApAQCAtOTcsMTIgKzk3LDEyIEBAIHZvaWQgRXdrQ29u dGV4dE1lbnU6OmNvbnRleHRNZW51SXRlbVNlbGVjdGVkKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0 ZW0pCiAKIEV3a19Db250ZXh0X01lbnUqIGV3a19jb250ZXh0X21lbnVfbmV3KCkKIHsKLSAgICBy ZXR1cm4gRXdrQ29udGV4dE1lbnU6OmNyZWF0ZSgpLmxlYWtQdHIoKTsKKyAgICByZXR1cm4gRXdr Q29udGV4dE1lbnU6OmNyZWF0ZSgpLmxlYWtSZWYoKTsKIH0KIAogRXdrX0NvbnRleHRfTWVudSog ZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcyhFaW5hX0xpc3QqIGl0ZW1zKQogewotICAg IHJldHVybiBFd2tDb250ZXh0TWVudTo6Y3JlYXRlKGl0ZW1zKS5sZWFrUHRyKCk7CisgICAgcmV0 dXJuIEV3a0NvbnRleHRNZW51OjpjcmVhdGUoaXRlbXMpLmxlYWtSZWYoKTsKIH0KIAogRWluYV9C b29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoRXdrX0NvbnRleHRfTWVudSogbWVudSwg RXdrX0NvbnRleHRfTWVudV9JdGVtKiBpdGVtKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKaW5kZXggOWI4 NWJhOS4uNDA5ZjAyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAj aW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9pdGVtLmgiCiAKICNpbmNsdWRlICJld2tfY29udGV4 dF9tZW51X2l0ZW1fcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfcHJpdmF0 ZS5oIgogI2luY2x1ZGUgImV3a19wcml2YXRlLmgiCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0NvbnRl eHRNZW51SXRlbVR5cGVzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtNDIs MTEgKzQzLDE0IEBAIEV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKFdLQ29u dGV4dE1lbnVJdGVtUmVmIGl0ZW0sIEV3a19Db250ZXh0X01lCiAgICAgLCBtX2lzQ2hlY2tlZChX S0NvbnRleHRNZW51SXRlbUdldENoZWNrZWQoaXRlbSkpCiAgICAgLCBtX2lzRW5hYmxlZChXS0Nv bnRleHRNZW51SXRlbUdldEVuYWJsZWQoaXRlbSkpCiAgICAgLCBtX3BhcmVudE1lbnUocGFyZW50 TWVudSkKLSAgICAsIG1fc3ViTWVudSgwKQogeworICAgIGlmIChXS0NvbnRleHRNZW51SXRlbUdl dFR5cGUoaXRlbSkgPT0ga1dLQ29udGV4dE1lbnVJdGVtVHlwZVN1Ym1lbnUpIHsKKyAgICAgICAg V0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gbWVudUl0ZW1zID0gYWRvcHRXSyhXS0NvbnRleHRNZW51 Q29weVN1Ym1lbnVJdGVtcyhpdGVtKSk7CisgICAgICAgIG1fc3ViTWVudSA9IEV3a0NvbnRleHRN ZW51OjpjcmVhdGUocGFyZW50TWVudS0+ZXdrVmlldygpLCBtZW51SXRlbXMuZ2V0KCkpOworICAg IH0KIH0KIAotRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRl eHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rp b24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJs ZWQsIEV3a19Db250ZXh0X01lbnUqIHN1Yk1lbnUsIEV3a19Db250ZXh0X01lbnUqIHBhcmVudE1l bnUpCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9N ZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwg Y29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwg UGFzc1JlZlB0cjxFd2tfQ29udGV4dF9NZW51PiBzdWJNZW51LCBFd2tfQ29udGV4dF9NZW51KiBw YXJlbnRNZW51KQogICAgIDogbV90eXBlKHR5cGUpCiAgICAgLCBtX2FjdGlvbihhY3Rpb24pCiAg ICAgLCBtX3RpdGxlKHRpdGxlKQpAQCAtNTksMTIgKzYzLDEyIEBAIEV3a0NvbnRleHRNZW51SXRl bTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3 a19Db250CiAKIEV3a19Db250ZXh0X01lbnVfSXRlbSogZXdrX2NvbnRleHRfbWVudV9pdGVtX25l dyhFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1f QWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5h X0Jvb2wgZW5hYmxlZCkKIHsKLSAgICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVh dGUodHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgMCkubGVha1B0cigpOwor ICAgIHJldHVybiBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24sIHRp dGxlLCBjaGVja2VkLCBlbmFibGVkLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PigpKS5sZWFr UHRyKCk7CiB9CiAKIEV3a19Db250ZXh0X01lbnVfSXRlbSogZXdrX2NvbnRleHRfbWVudV9pdGVt X25ld193aXRoX3N1Ym1lbnUoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0Nv bnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jv b2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250ZXh0X01lbnUqIHN1Yk1lbnUp CiB7Ci0gICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5cGUsIGFjdGlv biwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUpLmxlYWtQdHIoKTsKKyAgICByZXR1 cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hl Y2tlZCwgZW5hYmxlZCwgYWRvcHRSZWYoc3ViTWVudSkpLmxlYWtQdHIoKTsKIH0KIAogRXdrX0Nv bnRleHRfTWVudV9JdGVtX1R5cGUgZXdrX2NvbnRleHRfbWVudV9pdGVtX3R5cGVfZ2V0KGNvbnN0 IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKQEAgLTE1NCw2ICsxNTgsMTMgQEAgRXdrX0Nv bnRleHRfTWVudSogZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChjb25zdCBF d2tfQ29udGV4dF9NZW51X0kKICAgICByZXR1cm4gY29uc3RfY2FzdDxFd2tfQ29udGV4dF9NZW51 X0l0ZW0qPihpdGVtKS0+cGFyZW50TWVudSgpOwogfQogCitFd2tfQ29udGV4dF9NZW51KiBld2tf Y29udGV4dF9tZW51X2l0ZW1fc3VibWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9JdGVt KiBpdGVtKQoreworICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChpdGVtLCAwKTsK KworICAgIHJldHVybiBjb25zdF9jYXN0PEV3a19Db250ZXh0X01lbnVfSXRlbSo+KGl0ZW0pLT5z dWJNZW51KCk7Cit9CisKIHN0YXRpYyBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGdldEV3 a0FjdGlvbkZyb21XS1RhZyhXS0NvbnRleHRNZW51SXRlbVRhZyBhY3Rpb24pCiB7CiAgICAgc3dp dGNoIChhY3Rpb24pIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKaW5kZXggMjA4ZTBhZC4uYjAxNGNiYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVu dV9pdGVtLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRl eHRfbWVudV9pdGVtLmgKQEAgLTI2OCw2ICsyNjgsMTUgQEAgRUFQSSBFaW5hX0Jvb2wgZXdrX2Nv bnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KEV3a19Db250ZXh0X01lbnVfSXRlbSAqbywgRWlu YV8KICAqLwogRUFQSSBFd2tfQ29udGV4dF9NZW51ICpld2tfY29udGV4dF9tZW51X2l0ZW1fcGFy ZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSAqbyk7CiAKKy8qKgorICog R2V0cyB0aGUgc3VibWVudSBmb3IgdGhlIGl0ZW0uCisgKgorICogQHBhcmFtIG8gaXRlbSB0byBn ZXQgdGhlIHN1Ym1lbnUKKyAqCisgKiBAcmV0dXJuIHRoZSBwb2ludGVyIHRvIHN1Ym1lbnUgb24g c3VjY2VzcyBvciBAYyBOVUxMIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFd2tfQ29udGV4dF9NZW51 ICpld2tfY29udGV4dF9tZW51X2l0ZW1fc3VibWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVu dV9JdGVtICpvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9w cml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9t ZW51X2l0ZW1fcHJpdmF0ZS5oCmluZGV4IDI1MTExODMuLmVlMmM2NTUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2 YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudV9pdGVtX3ByaXZhdGUuaApAQCAtMzAsNyArMzAsMTAgQEAKICNpbmNsdWRlICJXS0VpbmFT aGFyZWRTdHJpbmcuaCIKICNpbmNsdWRlICJld2tfY29udGV4dF9tZW51LmgiCiAjaW5jbHVkZSAi ZXdrX2NvbnRleHRfbWVudV9pdGVtLmgiCisjaW5jbHVkZSA8d3RmL093blB0ci5oPgogI2luY2x1 ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CisjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KKyNpbmNs dWRlIDx3dGYvUmVmUHRyLmg+CiAKIC8qKgogICogXHN0cnVjdCAgRXdrX0NvbnRleHRfTWVudV9J dGVtCkBAIC00Myw3ICs0Niw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5l dyBFd2tDb250ZXh0TWVudUl0ZW0oaXRlbSwgcGFyZW50TWVudSkpOwogICAgIH0KIAotICAgIHN0 YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKEV3a19Db250ZXh0X01l bnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBj b25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBF d2tDb250ZXh0TWVudSogc3ViTWVudSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUgPSAwKQor ICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKEV3a19Db250 ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0 aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFi bGVkLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSog cGFyZW50TWVudSA9IDApCiAgICAgewogICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEV3a0Nv bnRleHRNZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCBzdWJN ZW51LCBwYXJlbnRNZW51KSk7CiAgICAgfQpAQCAtNjYsOSArNjksMTEgQEAgcHVibGljOgogICAg IEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KCkgY29uc3QgeyByZXR1cm4gbV9wYXJlbnRNZW51 OyB9CiAgICAgdm9pZCBzZXRQYXJlbnRNZW51KEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KSB7 IG1fcGFyZW50TWVudSA9IHBhcmVudE1lbnU7IH0KIAorICAgIEV3a0NvbnRleHRNZW51KiBzdWJN ZW51KCkgeyByZXR1cm4gbV9zdWJNZW51LmdldCgpOyB9CisKIHByaXZhdGU6CiAgICAgRXdrQ29u dGV4dE1lbnVJdGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmLCBFd2tDb250ZXh0TWVudSogcGFyZW50 TWVudSk7Ci0gICAgRXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBl IHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0 aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0TWVu dSogc3ViTWVudSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpOworICAgIEV3a0NvbnRleHRN ZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51 X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2Vk LCBFaW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gc3ViTWVudSwg RXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpOwogCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVt X1R5cGUgbV90eXBlOwogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gbV9hY3Rpb247 CkBAIC03OSw3ICs4NCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzRW5hYmxlZDsKIAogICAg IEV3a19Db250ZXh0X01lbnUqIG1fcGFyZW50TWVudTsKLSAgICBFd2tfQ29udGV4dF9NZW51KiBt X3N1Yk1lbnU7CisgICAgUmVmUHRyPEV3a19Db250ZXh0X01lbnU+IG1fc3ViTWVudTsKIH07CiAK ICNlbmRpZiAvLyBld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZV9oCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfcHJp dmF0ZS5oCmluZGV4IGE2Y2VhMmQuLjQ5YjVmOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfcHJpdmF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfcHJpdmF0ZS5oCkBA IC0yNywyNiArMjcsMjkgQEAKICNkZWZpbmUgZXdrX2NvbnRleHRfbWVudV9wcml2YXRlX2gKIAog I2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfaXRlbS5oIgorI2luY2x1ZGUgImV3a19vYmplY3Rf cHJpdmF0ZS5oIgogI2luY2x1ZGUgPEVpbmEuaD4KLSNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5o PgorI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAKIGNsYXNzIEV3a1ZpZXc7CiAKLWNsYXNz IEV3a0NvbnRleHRNZW51IHsKK2NsYXNzIEV3a0NvbnRleHRNZW51IDogcHVibGljIEV3a09iamVj dCB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnU+IGNyZWF0 ZShFd2tWaWV3KiB2aWV3SW1wbCwgV0tBcnJheVJlZiBpdGVtcykKKyAgICBFV0tfT0JKRUNUX0RF Q0xBUkUoRXdrQ29udGV4dE1lbnUpCisKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxFd2tDb250ZXh0 TWVudT4gY3JlYXRlKEV3a1ZpZXcqIHZpZXdJbXBsLCBXS0FycmF5UmVmIGl0ZW1zKQogICAgIHsK LSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudSh2aWV3SW1wbCwgaXRl bXMpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tDb250ZXh0TWVudSh2aWV3SW1w bCwgaXRlbXMpKTsKICAgICB9CiAKLSAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVu dT4gY3JlYXRlKCkKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gY3JlYXRl KCkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29udGV4dE1lbnUoKSk7 CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgRXdrQ29udGV4dE1lbnUoKSk7CiAgICAgfQog Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnU+IGNyZWF0ZShFaW5hX0xpc3Qq IGl0ZW1zKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBjcmVhdGUoRWlu YV9MaXN0KiBpdGVtcykKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29u dGV4dE1lbnUoaXRlbXMpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBFd2tDb250ZXh0 TWVudShpdGVtcykpOwogICAgIH0KIAogICAgIH5Fd2tDb250ZXh0TWVudSgpOwpAQCAtNTgsNiAr NjEsOCBAQCBwdWJsaWM6CiAgICAgY29uc3QgRWluYV9MaXN0KiBpdGVtcygpIGNvbnN0IHsgcmV0 dXJuIG1fY29udGV4dE1lbnVJdGVtczsgfQogICAgIHZvaWQgY29udGV4dE1lbnVJdGVtU2VsZWN0 ZWQoV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSk7CiAKKyAgICBFd2tWaWV3KiBld2tWaWV3KCkg Y29uc3QgeyByZXR1cm4gbV92aWV3SW1wbDsgfQorCiBwcml2YXRlOgogICAgIEV3a0NvbnRleHRN ZW51KCk7CiAgICAgRXdrQ29udGV4dE1lbnUoRWluYV9MaXN0KiBpdGVtcyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4 dF9tZW51LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3Rf ZXdrMl9jb250ZXh0X21lbnUuY3BwCmluZGV4IDczMDZlYjQuLmJhMmM4ZGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0 X21lbnUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rl c3RfZXdrMl9jb250ZXh0X21lbnUuY3BwCkBAIC03Myw2ICs3Myw5IEBAIHN0YXRpYyBFaW5hX0Jv b2wgc2hvd0NvbnRleHRNZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19D b29yZCB4LCBFCiAgICAgLy8gV2hlbiBjb250ZXh0IG1lbnUgaXRlbSBpcyBhZGRlZCB0byBtZW51 IHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQsIGl0IHNob3VsZCBoYXZlIHBhcmVu dCBtZW51LgogICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVt X3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CiAKKyAgICAvLyBXaGVuIGNvbnRleHQgbWVudSBp dGVtIHdhcyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcsIHN1Ym1lbnUg c2hvdWxkIGJlIDAuCisgICAgRVhQRUNUX0VRKDAsIGV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJt ZW51X2dldChuZXdJdGVtKSk7CisKICAgICBFaW5hX0xpc3QqIHN1Yk1lbnVJdGVtTGlzdCA9IDA7 CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBzdWJNZW51SXRlbTEgPSBld2tfY29udGV4dF9t ZW51X2l0ZW1fbmV3KEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19P VEhFUiwgIk5ldyBTdWJNZW51IEl0ZW0gMSIsIGZhbHNlLCB0cnVlKTsKICAgICBFd2tfQ29udGV4 dF9NZW51X0l0ZW0qIHN1Yk1lbnVJdGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdL X0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1l bnUgSXRlbSAyIiwgZmFsc2UsIHRydWUpOwpAQCAtOTAsNiArOTMsOSBAQCBzdGF0aWMgRWluYV9C b29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNf Q29vcmQgeCwgRQogICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50 X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNv bnRleHRNZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDb250ZXh0IG1lbnUgcmVjZWl2ZWQgZnJv bSBld2tfY29udGV4dF9tZW51X2l0ZW1fc3VibWVudV9nZXQgc2hvdWxkIGJlIHRoZSBzYW1lIGFz IG9uZSB1c2VkIHRvIGNyZWF0ZSBzdWIgbWVudS4KKyAgICBFWFBFQ1RfRVEoc3ViTWVudSwgZXdr X2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KG5ld0l0ZW0yKSk7CisKICAgICAvLyBXaGVu IGNvbnRleHQgbWVudSBpdGVtIGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVt X25ld193aXRoX3N1Ym1lbnUgYW5kIGFkZGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9h cHBlbmQgaXQgc2hvdWxkIGhhdmUgcGFyZW50IG1lbnUuCiAgICAgRVhQRUNUX0VRKGNvbnRleHRN ZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKIAo= 201817 2013-05-15 04:37:59 -0700 2013-05-17 04:38:45 -0700 patch ewk-submenus5.diff text/plain 10440 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3Y2Q3OTRmLi40ZWE1YTVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsNDEg QEAKIDIwMTMtMDUtMTUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIFN1cHBvcnQgc3ViIG1lbnUgaW4gZXdrIGNv bnRleHQgbWVudXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDcyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIHN1Ym1lbnUgc3VwcG9ydCBpbiBFd2tDb250ZXh0TWVudSBhbmQgYW4gQVBJIGZ1 bmN0aW9uIHRvIHJlY2VpdmUKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSBmcm9tIHN1Ym1lbnUg Y29udGV4dCBtZW51IGl0ZW0uIEEgdGVzdCBjYXNlIHdhcyBhZGRlZAorICAgICAgICBmb3IgbmV3 IEFQSSBmdW5jdGlvbi4KKyAgICAgICAgRXdrQ29udGV4dE1lbnUgaXMgbm93IGFuIEV3a09iamVj dCBhbGxvd2luZyBtdWx0aXBsZSBpbnN0YW5jZXMgb2Ygc3VibWVudQorICAgICAgICB0byBiZSB1 c2VkIGluIGRpZmZlcmVudCBzdWJtZW51IHR5cGUgY29udGV4dCBtZW51IGl0ZW1zLgorCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3Lmg6CisgICAgICAgIChFd2tWaWV3KToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNwcDoKKyAgICAg ICAgKGV3a19jb250ZXh0X21lbnVfbmV3KToKKyAgICAgICAgKGV3a19jb250ZXh0X21lbnVfbmV3 X3dpdGhfaXRlbXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21l bnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51 SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKGV3a19jb250 ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfbWVudV9pdGVtLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaDoKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRl bTo6Y3JlYXRlKToKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRlbTo6c3ViTWVudSk6CisgICAg ICAgIChFd2tDb250ZXh0TWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnVfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29udGV4dE1lbnUpOgorICAg ICAgICAoRXdrQ29udGV4dE1lbnU6OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0TWVudTo6 ZXdrVmlldyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Nv bnRleHRfbWVudS5jcHA6CisgICAgICAgIChzaG93Q29udGV4dE1lbnUpOgorCisyMDEzLTA1LTE1 ICBNaWNoYcWCIFBha3XFgmEgdmVsIFJ1dGthICA8bS5wYWt1bGFAc2Ftc3VuZy5jb20+CisKICAg ICAgICAgW0VGTF1bV0syXSBNYWtlIEV3a19Db250ZXh0X01lbnUgRXdrX09iamVjdAogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE2MDk3CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVf aXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9t ZW51X2l0ZW0uY3BwCmluZGV4IDc4MDg1MGIuLmM0NDNhODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNw cApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfaXRlbS5oIgog CiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaCIKKyNpbmNsdWRlICJl d2tfY29udGV4dF9tZW51X3ByaXZhdGUuaCIKICNpbmNsdWRlICJld2tfcHJpdmF0ZS5oIgogI2lu Y2x1ZGUgPFdlYktpdDIvV0tDb250ZXh0TWVudUl0ZW1UeXBlcy5oPgogI2luY2x1ZGUgPHd0Zi90 ZXh0L0NTdHJpbmcuaD4KQEAgLTQyLDExICs0MywxNCBAQCBFd2tDb250ZXh0TWVudUl0ZW06OkV3 a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVtLCBFd2tDb250ZXh0TWVu dQogICAgICwgbV9pc0NoZWNrZWQoV0tDb250ZXh0TWVudUl0ZW1HZXRDaGVja2VkKGl0ZW0pKQog ICAgICwgbV9pc0VuYWJsZWQoV0tDb250ZXh0TWVudUl0ZW1HZXRFbmFibGVkKGl0ZW0pKQogICAg ICwgbV9wYXJlbnRNZW51KHBhcmVudE1lbnUpCi0gICAgLCBtX3N1Yk1lbnUoMCkKIHsKKyAgICBp ZiAoV0tDb250ZXh0TWVudUl0ZW1HZXRUeXBlKGl0ZW0pID09IGtXS0NvbnRleHRNZW51SXRlbVR5 cGVTdWJtZW51KSB7CisgICAgICAgIFdLUmV0YWluUHRyPFdLQXJyYXlSZWY+IG1lbnVJdGVtcyA9 IGFkb3B0V0soV0tDb250ZXh0TWVudUNvcHlTdWJtZW51SXRlbXMoaXRlbSkpOworICAgICAgICBt X3N1Yk1lbnUgPSBFd2tDb250ZXh0TWVudTo6Y3JlYXRlKHBhcmVudE1lbnUtPmV3a1ZpZXcoKSwg bWVudUl0ZW1zLmdldCgpKTsKKyAgICB9CiB9CiAKLUV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29u dGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0 X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNo ZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0TWVudSogc3ViTWVudSwgRXdrQ29u dGV4dE1lbnUqIHBhcmVudE1lbnUpCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51 SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0 ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBF aW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gc3ViTWVudSwgRXdr Q29udGV4dE1lbnUqIHBhcmVudE1lbnUpCiAgICAgOiBtX3R5cGUodHlwZSkKICAgICAsIG1fYWN0 aW9uKGFjdGlvbikKICAgICAsIG1fdGl0bGUodGl0bGUpCkBAIC01OSwxNCArNjMsMTQgQEAgRXdr Q29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVt X1R5cGUgdHlwZSwgRXdrX0NvbnQKIAogRXdrX0NvbnRleHRfTWVudV9JdGVtKiBld2tfY29udGV4 dF9tZW51X2l0ZW1fbmV3KEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250 ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29s IGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkKQogewotICAgIHJldHVybiBFd2tfQ29udGV4dF9N ZW51X0l0ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCAw KS5sZWFrUHRyKCk7CisgICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5 cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIFBhc3NSZWZQdHI8RXdrQ29udGV4 dE1lbnU+KCkpLmxlYWtQdHIoKTsKIH0KIAogRXdrX0NvbnRleHRfTWVudV9JdGVtKiBld2tfY29u dGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciog dGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRleHRf TWVudSogc3ViTWVudSkKIHsKICAgICBFV0tfT0JKX0dFVF9JTVBMX09SX1JFVFVSTihFd2tDb250 ZXh0TWVudSwgc3ViTWVudSwgc3ViTWVudUltcGwsIDApOwogCi0gICAgcmV0dXJuIEV3a19Db250 ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJs ZWQsIHN1Yk1lbnVJbXBsKS5sZWFrUHRyKCk7CisgICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVf SXRlbTo6Y3JlYXRlKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIFBhc3NS ZWZQdHI8RXdrQ29udGV4dE1lbnU+KHN1Yk1lbnVJbXBsKSkubGVha1B0cigpOwogfQogCiBFd2tf Q29udGV4dF9NZW51X0l0ZW1fVHlwZSBld2tfY29udGV4dF9tZW51X2l0ZW1fdHlwZV9nZXQoY29u c3QgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBpdGVtKQpAQCAtMTU2LDYgKzE2MCwxMyBAQCBFd2tf Q29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGNvbnN0 IEV3a19Db250ZXh0X01lbnVfSQogICAgIHJldHVybiBjb25zdF9jYXN0PEV3a19Db250ZXh0X01l bnVfSXRlbSo+KGl0ZW0pLT5wYXJlbnRNZW51KCk7CiB9CiAKK0V3a19Db250ZXh0X01lbnUqIGV3 a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0 ZW0qIGl0ZW0pCit7CisgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGl0ZW0sIDAp OworCisgICAgcmV0dXJuIGNvbnN0X2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oaXRlbSkt PnN1Yk1lbnUoKTsKK30KKwogc3RhdGljIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gZ2V0 RXdrQWN0aW9uRnJvbVdLVGFnKFdLQ29udGV4dE1lbnVJdGVtVGFnIGFjdGlvbikKIHsKICAgICBz d2l0Y2ggKGFjdGlvbikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaAppbmRleCAyMDhlMGFkLi5iMDE0Y2JjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9t ZW51X2l0ZW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dF9tZW51X2l0ZW0uaApAQCAtMjY4LDYgKzI2OCwxNSBAQCBFQVBJIEVpbmFfQm9vbCBld2tf Y29udGV4dF9tZW51X2l0ZW1fZW5hYmxlZF9zZXQoRXdrX0NvbnRleHRfTWVudV9JdGVtICpvLCBF aW5hXwogICovCiBFQVBJIEV3a19Db250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9w YXJlbnRfbWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9JdGVtICpvKTsKIAorLyoqCisg KiBHZXRzIHRoZSBzdWJtZW51IGZvciB0aGUgaXRlbS4KKyAqCisgKiBAcGFyYW0gbyBpdGVtIHRv IGdldCB0aGUgc3VibWVudQorICoKKyAqIEByZXR1cm4gdGhlIHBvaW50ZXIgdG8gc3VibWVudSBv biBzdWNjZXNzIG9yIEBjIE5VTEwgb24gZmFpbHVyZQorICovCitFQVBJIEV3a19Db250ZXh0X01l bnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9N ZW51X0l0ZW0gKm8pOworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVt X3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X21lbnVfaXRlbV9wcml2YXRlLmgKaW5kZXggZTljNDQ2ZS4uNjQzMTJiNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3By aXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCkBAIC0zMiw2ICszMiw4IEBACiAjaW5jbHVkZSAiZXdrX2Nv bnRleHRfbWVudV9pdGVtLmgiCiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgi CiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5o PgorI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAogLyoqCiAgKiBcc3RydWN0ICBFd2tfQ29udGV4 dF9NZW51X0l0ZW0KQEAgLTQ0LDcgKzQ2LDcgQEAgcHVibGljOgogICAgICAgICByZXR1cm4gYWRv cHRQdHIobmV3IEV3a0NvbnRleHRNZW51SXRlbShpdGVtLCBwYXJlbnRNZW51KSk7CiAgICAgfQog Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoRXdrX0Nv bnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBh Y3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVu YWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVu dSA9IDApCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUo RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0Fj dGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9C b29sIGVuYWJsZWQsIFBhc3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+IHN1Yk1lbnUsIEV3a0NvbnRl eHRNZW51KiBwYXJlbnRNZW51ID0gMCkKICAgICB7CiAgICAgICAgIHJldHVybiBhZG9wdFB0cihu ZXcgRXdrQ29udGV4dE1lbnVJdGVtKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJs ZWQsIHN1Yk1lbnUsIHBhcmVudE1lbnUpKTsKICAgICB9CkBAIC02Nyw5ICs2OSwxMSBAQCBwdWJs aWM6CiAgICAgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUoKSBjb25zdCB7IHJldHVybiBtX3Bh cmVudE1lbnU7IH0KICAgICB2b2lkIHNldFBhcmVudE1lbnUoRXdrQ29udGV4dE1lbnUqIHBhcmVu dE1lbnUpIHsgbV9wYXJlbnRNZW51ID0gcGFyZW50TWVudTsgfQogCisgICAgRXdrQ29udGV4dE1l bnUqIHN1Yk1lbnUoKSB7IHJldHVybiBtX3N1Yk1lbnUuZ2V0KCk7IH0KKwogcHJpdmF0ZToKICAg ICBFd2tDb250ZXh0TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYsIEV3a0NvbnRleHRNZW51 KiBwYXJlbnRNZW51KTsKLSAgICBFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9J dGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0 IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a0Nv bnRleHRNZW51KiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSk7CisgICAgRXdr Q29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250 ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29s IGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBz dWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSk7CiAKICAgICBFd2tfQ29udGV4dF9N ZW51X0l0ZW1fVHlwZSBtX3R5cGU7CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBt X2FjdGlvbjsKQEAgLTgwLDcgKzg0LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faXNFbmFibGVk OwogCiAgICAgRXdrQ29udGV4dE1lbnUqIG1fcGFyZW50TWVudTsKLSAgICBFd2tDb250ZXh0TWVu dSogbV9zdWJNZW51OworICAgIFJlZlB0cjxFd2tDb250ZXh0TWVudT4gbV9zdWJNZW51OwogfTsK IAogI2VuZGlmIC8vIGV3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlX2gKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfcHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9w cml2YXRlLmgKaW5kZXggOGZjM2QyZS4uNDliNWY5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgK QEAgLTYxLDYgKzYxLDggQEAgcHVibGljOgogICAgIGNvbnN0IEVpbmFfTGlzdCogaXRlbXMoKSBj b25zdCB7IHJldHVybiBtX2NvbnRleHRNZW51SXRlbXM7IH0KICAgICB2b2lkIGNvbnRleHRNZW51 SXRlbVNlbGVjdGVkKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0pOwogCisgICAgRXdrVmlldyog ZXdrVmlldygpIGNvbnN0IHsgcmV0dXJuIG1fdmlld0ltcGw7IH0KKwogcHJpdmF0ZToKICAgICBF d2tDb250ZXh0TWVudSgpOwogICAgIEV3a0NvbnRleHRNZW51KEVpbmFfTGlzdCogaXRlbXMpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9l d2syX2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAppbmRleCA3MzA2ZWI0Li5iYTJjOGRlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3 azJfY29udGV4dF9tZW51LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcApAQCAtNzMsNiArNzMsOSBAQCBzdGF0 aWMgRWluYV9Cb29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERh dGEsIEV2YXNfQ29vcmQgeCwgRQogICAgIC8vIFdoZW4gY29udGV4dCBtZW51IGl0ZW0gaXMgYWRk ZWQgdG8gbWVudSB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kLCBpdCBzaG91bGQg aGF2ZSBwYXJlbnQgbWVudS4KICAgICBFWFBFQ1RfRVEoY29udGV4dE1lbnUsIGV3a19jb250ZXh0 X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQobmV3SXRlbSkpOwogCisgICAgLy8gV2hlbiBjb250 ZXh0IG1lbnUgaXRlbSB3YXMgY3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3 LCBzdWJtZW51IHNob3VsZCBiZSAwLgorICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51 X2l0ZW1fc3VibWVudV9nZXQobmV3SXRlbSkpOworCiAgICAgRWluYV9MaXN0KiBzdWJNZW51SXRl bUxpc3QgPSAwOwogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogc3ViTWVudUl0ZW0xID0gZXdr X2NvbnRleHRfbWVudV9pdGVtX25ldyhFV0tfQUNUSU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVf SVRFTV9UQUdfT1RIRVIsICJOZXcgU3ViTWVudSBJdGVtIDEiLCBmYWxzZSwgdHJ1ZSk7CiAgICAg RXdrX0NvbnRleHRfTWVudV9JdGVtKiBzdWJNZW51SXRlbTIgPSBld2tfY29udGV4dF9tZW51X2l0 ZW1fbmV3KEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwg Ik5ldyBTdWJNZW51IEl0ZW0gMiIsIGZhbHNlLCB0cnVlKTsKQEAgLTkwLDYgKzkzLDkgQEAgc3Rh dGljIEVpbmFfQm9vbCBzaG93Q29udGV4dE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnRE YXRhLCBFdmFzX0Nvb3JkIHgsIEUKICAgICBFWFBFQ1RfRVEoMCwgZXdrX2NvbnRleHRfbWVudV9p dGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVt X2FwcGVuZChjb250ZXh0TWVudSwgbmV3SXRlbTIpOwogCisgICAgLy8gQ29udGV4dCBtZW51IHJl Y2VpdmVkIGZyb20gZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0IHNob3VsZCBiZSB0 aGUgc2FtZSBhcyBvbmUgdXNlZCB0byBjcmVhdGUgc3ViIG1lbnUuCisgICAgRVhQRUNUX0VRKHN1 Yk1lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dldChuZXdJdGVtMikpOworCiAg ICAgLy8gV2hlbiBjb250ZXh0IG1lbnUgaXRlbSBpcyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0 X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51IGFuZCBhZGRlZCB1c2luZyBld2tfY29udGV4dF9t ZW51X2l0ZW1fYXBwZW5kIGl0IHNob3VsZCBoYXZlIHBhcmVudCBtZW51LgogICAgIEVYUEVDVF9F UShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJ dGVtKSk7CiAK 202061 2013-05-17 04:38:45 -0700 2013-05-17 06:46:01 -0700 fixes after review ewk-submenus6.diff text/plain 10880 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzYTZhNzE0Li44MjE3OGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTMtMDUtMTcgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFN1cHBvcnQgc3ViIG1lbnUgaW4gZXdrIGNv bnRleHQgbWVudXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExNDcyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIHN1Ym1lbnUgc3VwcG9ydCBpbiBFd2tDb250ZXh0TWVudSBhbmQgYW4gQVBJIGZ1 bmN0aW9uIHRvIHJlY2VpdmUKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudSBmcm9tIHN1Ym1lbnUg Y29udGV4dCBtZW51IGl0ZW0uIEEgdGVzdCBjYXNlIHdhcyBhZGRlZAorICAgICAgICBmb3IgbmV3 IEFQSSBmdW5jdGlvbi4KKyAgICAgICAgRXdrQ29udGV4dE1lbnUgaXMgbm93IGFuIEV3a09iamVj dCBhbGxvd2luZyBtdWx0aXBsZSBpbnN0YW5jZXMgb2Ygc3VibWVudQorICAgICAgICB0byBiZSB1 c2VkIGluIGRpZmZlcmVudCBzdWJtZW51IHR5cGUgY29udGV4dCBtZW51IGl0ZW1zLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcDoKKyAgICAg ICAgKEV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9uZXcpOgorICAgICAgICAoZXdrX2NvbnRleHRfbWVudV9pdGVt X3BhcmVudF9tZW51X2dldCk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fc3VibWVu dV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRl bS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9w cml2YXRlLmg6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OmNyZWF0ZSk6CisgICAgICAg IChFd2tDb250ZXh0TWVudUl0ZW06OnBhcmVudE1lbnUpOgorICAgICAgICAoRXdrQ29udGV4dE1l bnVJdGVtOjpzdWJNZW51KToKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRlbSk6CisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmg6CisgICAgICAg IChFd2tDb250ZXh0TWVudTo6ZXdrVmlldyk6CisgICAgICAgIChFd2tDb250ZXh0TWVudSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5j cHA6CisgICAgICAgIChzaG93Q29udGV4dE1lbnUpOgorCiAyMDEzLTA1LTE2ICBCZXRoIERha2lu ICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgV0tCdW5kbGVQYWdlR2V0SGVh ZGVyTGF5ZXIvRm9vdGVyIFNQSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKaW5kZXggNzgwODUwYi4uNjJh ZmQ2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nv bnRleHRfbWVudV9pdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5jbHVkZSAi ZXdrX2NvbnRleHRfbWVudV9pdGVtLmgiCiAKICNpbmNsdWRlICJld2tfY29udGV4dF9tZW51X2l0 ZW1fcHJpdmF0ZS5oIgorI2luY2x1ZGUgImV3a19jb250ZXh0X21lbnVfcHJpdmF0ZS5oIgogI2lu Y2x1ZGUgImV3a19wcml2YXRlLmgiCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0NvbnRleHRNZW51SXRl bVR5cGVzLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgpAQCAtMzUsMTggKzM2LDIx IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIHN0YXRpYyBFd2tfQ29udGV4dF9NZW51X0l0 ZW1fQWN0aW9uIGdldEV3a0FjdGlvbkZyb21XS1RhZyhXS0NvbnRleHRNZW51SXRlbVRhZyBhY3Rp b24pOwogCi1Fd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRN ZW51SXRlbVJlZiBpdGVtLCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSkKK0V3a0NvbnRleHRN ZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0sIFBh c3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+IHBhcmVudE1lbnUpCiAgICAgOiBtX3R5cGUoc3RhdGlj X2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGU+KFdLQ29udGV4dE1lbnVJdGVtR2V0VHlw ZShpdGVtKSkpCiAgICAgLCBtX2FjdGlvbihnZXRFd2tBY3Rpb25Gcm9tV0tUYWcoKFdLQ29udGV4 dE1lbnVJdGVtR2V0VGFnKGl0ZW0pKSkpCiAgICAgLCBtX3RpdGxlKFdLRWluYVNoYXJlZFN0cmlu ZyhBZG9wdFdLLCBXS0NvbnRleHRNZW51SXRlbUNvcHlUaXRsZShpdGVtKSkpCiAgICAgLCBtX2lz Q2hlY2tlZChXS0NvbnRleHRNZW51SXRlbUdldENoZWNrZWQoaXRlbSkpCiAgICAgLCBtX2lzRW5h YmxlZChXS0NvbnRleHRNZW51SXRlbUdldEVuYWJsZWQoaXRlbSkpCiAgICAgLCBtX3BhcmVudE1l bnUocGFyZW50TWVudSkKLSAgICAsIG1fc3ViTWVudSgwKQogeworICAgIGlmIChXS0NvbnRleHRN ZW51SXRlbUdldFR5cGUoaXRlbSkgPT0ga1dLQ29udGV4dE1lbnVJdGVtVHlwZVN1Ym1lbnUpIHsK KyAgICAgICAgV0tSZXRhaW5QdHI8V0tBcnJheVJlZj4gbWVudUl0ZW1zID0gYWRvcHRXSyhXS0Nv bnRleHRNZW51Q29weVN1Ym1lbnVJdGVtcyhpdGVtKSk7CisgICAgICAgIG1fc3ViTWVudSA9IEV3 a0NvbnRleHRNZW51OjpjcmVhdGUocGFyZW50TWVudS0+ZXdrVmlldygpLCBtZW51SXRlbXMuZ2V0 KCkpOworICAgIH0KIH0KIAotRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0o RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0Fj dGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9C b29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51LCBFd2tDb250ZXh0TWVudSogcGFy ZW50TWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250 ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0 aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFi bGVkLCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBzdWJNZW51LCBQYXNzUmVmUHRyPEV3a0Nv bnRleHRNZW51PiBwYXJlbnRNZW51KQogICAgIDogbV90eXBlKHR5cGUpCiAgICAgLCBtX2FjdGlv bihhY3Rpb24pCiAgICAgLCBtX3RpdGxlKHRpdGxlKQpAQCAtNTksNyArNjMsNyBAQCBFd2tDb250 ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSB0eXBlLCBFd2tfQ29udAogCiBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21l bnVfaXRlbV9uZXcoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRf TWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hl Y2tlZCwgRWluYV9Cb29sIGVuYWJsZWQpCiB7Ci0gICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVf SXRlbTo6Y3JlYXRlKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIDApLmxl YWtQdHIoKTsKKyAgICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwg YWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCkubGVha1B0cigpOwogfQogCiBFd2tfQ29u dGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEV3 a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rp b24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9v bCBlbmFibGVkLCBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51KQpAQCAtMTUzLDcgKzE1NywxNCBA QCBFd2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0 KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVU VVJOX1ZBTChpdGVtLCAwKTsKIAotICAgIHJldHVybiBjb25zdF9jYXN0PEV3a19Db250ZXh0X01l bnVfSXRlbSo+KGl0ZW0pLT5wYXJlbnRNZW51KCk7CisgICAgcmV0dXJuIGl0ZW0tPnBhcmVudE1l bnUoKTsKK30KKworRXdrX0NvbnRleHRfTWVudSogZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1l bnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKK3sKKyAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaXRlbSwgMCk7CisKKyAgICByZXR1cm4gaXRlbS0+c3Vi TWVudSgpOwogfQogCiBzdGF0aWMgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBnZXRFd2tB Y3Rpb25Gcm9tV0tUYWcoV0tDb250ZXh0TWVudUl0ZW1UYWcgYWN0aW9uKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0u aAppbmRleCAyMDhlMGFkLi5iMDE0Y2JjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaApAQCAtMjY4LDYgKzI2 OCwxNSBAQCBFQVBJIEVpbmFfQm9vbCBld2tfY29udGV4dF9tZW51X2l0ZW1fZW5hYmxlZF9zZXQo RXdrX0NvbnRleHRfTWVudV9JdGVtICpvLCBFaW5hXwogICovCiBFQVBJIEV3a19Db250ZXh0X01l bnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoY29uc3QgRXdrX0NvbnRl eHRfTWVudV9JdGVtICpvKTsKIAorLyoqCisgKiBHZXRzIHRoZSBzdWJtZW51IGZvciB0aGUgaXRl bS4KKyAqCisgKiBAcGFyYW0gbyBpdGVtIHRvIGdldCB0aGUgc3VibWVudQorICoKKyAqIEByZXR1 cm4gdGhlIHBvaW50ZXIgdG8gc3VibWVudSBvbiBzdWNjZXNzIG9yIEBjIE5VTEwgb24gZmFpbHVy ZQorICovCitFQVBJIEV3a19Db250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJt ZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8pOworCiAjaWZkZWYgX19jcGx1 c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgKaW5kZXggZTlj NDQ2ZS4uMzI4N2QxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCkBAIC0zMiw2 ICszMiw4IEBACiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9pdGVtLmgiCiAjaW5jbHVkZSAi ZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmgiCiAjaW5jbHVkZSA8d3RmL1Bhc3NPd25QdHIuaD4K KyNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9SZWZQdHIuaD4KIAog LyoqCiAgKiBcc3RydWN0ICBFd2tfQ29udGV4dF9NZW51X0l0ZW0KQEAgLTM5LDEyICs0MSwxMiBA QAogICovCiBjbGFzcyBFd2tDb250ZXh0TWVudUl0ZW0gewogcHVibGljOgotICAgIHN0YXRpYyBQ YXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKFdLQ29udGV4dE1lbnVJdGVtUmVm IGl0ZW0sIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51ID0gMCkKKyAgICBzdGF0aWMgUGFzc093 blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNyZWF0ZShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVt LCBQYXNzUmVmUHRyPEV3a0NvbnRleHRNZW51PiBwYXJlbnRNZW51ID0gMCkKICAgICB7CiAgICAg ICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29udGV4dE1lbnVJdGVtKGl0ZW0sIHBhcmVudE1l bnUpKTsKICAgICB9CiAKLSAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+ IGNyZWF0ZShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51 X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2Vk LCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRN ZW51KiBwYXJlbnRNZW51ID0gMCkKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVu dUl0ZW0+IGNyZWF0ZShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4 dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBj aGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4gc3Vi TWVudSA9IDAsIFBhc3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+IHBhcmVudE1lbnUgPSAwKQogICAg IHsKICAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0odHlwZSwg YWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVudSwgcGFyZW50TWVudSkpOwog ICAgIH0KQEAgLTY0LDEyICs2NiwxNCBAQCBwdWJsaWM6CiAgICAgYm9vbCBlbmFibGVkKCkgY29u c3QgeyByZXR1cm4gbV9pc0VuYWJsZWQ7IH0KICAgICB2b2lkIHNldEVuYWJsZWQoYm9vbCBlbmFi bGVkKSB7IG1faXNFbmFibGVkID0gZW5hYmxlZDsgfQogCi0gICAgRXdrQ29udGV4dE1lbnUqIHBh cmVudE1lbnUoKSBjb25zdCB7IHJldHVybiBtX3BhcmVudE1lbnU7IH0KKyAgICBFd2tDb250ZXh0 TWVudSogcGFyZW50TWVudSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFyZW50TWVudS5nZXQoKTsgfQog ICAgIHZvaWQgc2V0UGFyZW50TWVudShFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSkgeyBtX3Bh cmVudE1lbnUgPSBwYXJlbnRNZW51OyB9CiAKKyAgICBFd2tDb250ZXh0TWVudSogc3ViTWVudSgp IGNvbnN0IHsgcmV0dXJuIG1fc3ViTWVudS5nZXQoKTsgfQorCiBwcml2YXRlOgotICAgIEV3a0Nv bnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiwgRXdrQ29udGV4dE1lbnUqIHBhcmVu dE1lbnUpOwotICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciog dGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1l bnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KTsKKyAgICBFd2tDb250ZXh0 TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYsIFBhc3NSZWZQdHI8RXdrQ29udGV4dE1lbnU+ IHBhcmVudE1lbnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0 ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3Qg Y2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgUGFzc1Jl ZlB0cjxFd2tDb250ZXh0TWVudT4gc3ViTWVudSwgUGFzc1JlZlB0cjxFd2tDb250ZXh0TWVudT4g cGFyZW50TWVudSk7CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSBtX3R5cGU7CiAg ICAgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBtX2FjdGlvbjsKQEAgLTc5LDggKzgzLDgg QEAgcHJpdmF0ZToKICAgICBib29sIG1faXNDaGVja2VkOwogICAgIGJvb2wgbV9pc0VuYWJsZWQ7 CiAKLSAgICBFd2tDb250ZXh0TWVudSogbV9wYXJlbnRNZW51OwotICAgIEV3a0NvbnRleHRNZW51 KiBtX3N1Yk1lbnU7CisgICAgUmVmUHRyPEV3a0NvbnRleHRNZW51PiBtX3BhcmVudE1lbnU7Cisg ICAgUmVmUHRyPEV3a0NvbnRleHRNZW51PiBtX3N1Yk1lbnU7CiB9OwogCiAjZW5kaWYgLy8gZXdr X2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGVfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9wcml2YXRlLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaAppbmRleCA4 ZmMzZDJlLi40OWI1Zjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X3ByaXZhdGUuaApAQCAtNjEsNiArNjEsOCBA QCBwdWJsaWM6CiAgICAgY29uc3QgRWluYV9MaXN0KiBpdGVtcygpIGNvbnN0IHsgcmV0dXJuIG1f Y29udGV4dE1lbnVJdGVtczsgfQogICAgIHZvaWQgY29udGV4dE1lbnVJdGVtU2VsZWN0ZWQoV0tD b250ZXh0TWVudUl0ZW1SZWYgaXRlbSk7CiAKKyAgICBFd2tWaWV3KiBld2tWaWV3KCkgY29uc3Qg eyByZXR1cm4gbV92aWV3SW1wbDsgfQorCiBwcml2YXRlOgogICAgIEV3a0NvbnRleHRNZW51KCk7 CiAgICAgRXdrQ29udGV4dE1lbnUoRWluYV9MaXN0KiBpdGVtcyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9j b250ZXh0X21lbnUuY3BwCmluZGV4IDczMDZlYjQuLmJhMmM4ZGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdr Ml9jb250ZXh0X21lbnUuY3BwCkBAIC03Myw2ICs3Myw5IEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hv d0NvbnRleHRNZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4 LCBFCiAgICAgLy8gV2hlbiBjb250ZXh0IG1lbnUgaXRlbSBpcyBhZGRlZCB0byBtZW51IHVzaW5n IGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQsIGl0IHNob3VsZCBoYXZlIHBhcmVudCBtZW51 LgogICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVu dF9tZW51X2dldChuZXdJdGVtKSk7CiAKKyAgICAvLyBXaGVuIGNvbnRleHQgbWVudSBpdGVtIHdh cyBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcsIHN1Ym1lbnUgc2hvdWxk IGJlIDAuCisgICAgRVhQRUNUX0VRKDAsIGV3a19jb250ZXh0X21lbnVfaXRlbV9zdWJtZW51X2dl dChuZXdJdGVtKSk7CisKICAgICBFaW5hX0xpc3QqIHN1Yk1lbnVJdGVtTGlzdCA9IDA7CiAgICAg RXdrX0NvbnRleHRfTWVudV9JdGVtKiBzdWJNZW51SXRlbTEgPSBld2tfY29udGV4dF9tZW51X2l0 ZW1fbmV3KEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwg Ik5ldyBTdWJNZW51IEl0ZW0gMSIsIGZhbHNlLCB0cnVlKTsKICAgICBFd2tfQ29udGV4dF9NZW51 X0l0ZW0qIHN1Yk1lbnVJdGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElP Tl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1lbnUgSXRl bSAyIiwgZmFsc2UsIHRydWUpOwpAQCAtOTAsNiArOTMsOSBAQCBzdGF0aWMgRWluYV9Cb29sIHNo b3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29vcmQg eCwgRQogICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVf Z2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRN ZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDb250ZXh0IG1lbnUgcmVjZWl2ZWQgZnJvbSBld2tf Y29udGV4dF9tZW51X2l0ZW1fc3VibWVudV9nZXQgc2hvdWxkIGJlIHRoZSBzYW1lIGFzIG9uZSB1 c2VkIHRvIGNyZWF0ZSBzdWIgbWVudS4KKyAgICBFWFBFQ1RfRVEoc3ViTWVudSwgZXdrX2NvbnRl eHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KG5ld0l0ZW0yKSk7CisKICAgICAvLyBXaGVuIGNvbnRl eHQgbWVudSBpdGVtIGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193 aXRoX3N1Ym1lbnUgYW5kIGFkZGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQg aXQgc2hvdWxkIGhhdmUgcGFyZW50IG1lbnUuCiAgICAgRVhQRUNUX0VRKGNvbnRleHRNZW51LCBl d2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKIAo=