102932 2012-11-21 06:09:31 -0800 [EFL][WK2] Implement context menu in MiniBrowser 2013-04-17 07:47:57 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 96200 107104 107510 1 gyuyoung.kim webkit-unassigned cdumez commit-queue lucas.de.marchi mpakulavelrutka rakuco webkit.review.bot yael oldest_to_newest 772860 0 gyuyoung.kim 2012-11-21 06:09:31 -0800 EFL MiniBrowser needs to support context menu. 812220 1 183799 mpakulavelrutka 2013-01-21 09:27:59 -0800 Created attachment 183799 proposed patch Elementary context popup after selecting an item, fires a callback which returns data set by user while creating an context popup item. Ewk context menu API when selecting an item, needs two pointers to be passed: a pointer to a menu and to an item. To make implementation easier I have added an API to receive Ewk_Context_Menu_Item's parent menu, so only Ewk_Context_Menu_Item have to be passed to a callback fired when context popup item was selected. 812268 2 183799 cdumez 2013-01-21 10:49:47 -0800 Comment on attachment 183799 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=183799&action=review I think it would be nicer to split WK2 API changes from MiniBrowser changes. > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:66 > + EwkContextMenu* parentMenu() const { return m_parentMenu; } WebKit coding style: The getter should not be const if it returns a non-const pointer. > Tools/MiniBrowser/efl/main.c:94 > + Evas_Object *context_popup; This should probably be initialized to NULL in window_create(). > Tools/MiniBrowser/efl/main.c:910 > + Ewk_Context_Menu_Item *ewk_item = (Ewk_Context_Menu_Item *)data; extra space after = > Tools/MiniBrowser/efl/main.c:1286 > + ewk_settings_continuous_spell_checking_enabled_set(EINA_TRUE); seems unrelated? 812617 3 183799 gyuyoung.kim 2013-01-21 22:34:04 -0800 Comment on attachment 183799 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=183799&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.h:273 > +EAPI Ewk_Context_Menu *ewk_context_menu_item_parent_menu_get(Ewk_Context_Menu_Item *o); Missing *const* keyword in parameter. > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:70 > + explicit EwkContextMenuItem(const WebKit::WebContextMenuItemData&, EwkContextMenu* parentMenu); Please remove explicit keyword. 812715 4 183799 mpakulavelrutka 2013-01-22 00:36:35 -0800 Comment on attachment 183799 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=183799&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.h:273 >> +EAPI Ewk_Context_Menu *ewk_context_menu_item_parent_menu_get(Ewk_Context_Menu_Item *o); > > Missing *const* keyword in parameter. Added. >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:66 >> + EwkContextMenu* parentMenu() const { return m_parentMenu; } > > WebKit coding style: The getter should not be const if it returns a non-const pointer. If I have added const to ewk_context_menu_item_parent_menu_get it has to be left here. >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:70 >> + explicit EwkContextMenuItem(const WebKit::WebContextMenuItemData&, EwkContextMenu* parentMenu); > > Please remove explicit keyword. Removed. >> Tools/MiniBrowser/efl/main.c:94 >> + Evas_Object *context_popup; > > This should probably be initialized to NULL in window_create(). Added. >> Tools/MiniBrowser/efl/main.c:910 >> + Ewk_Context_Menu_Item *ewk_item = (Ewk_Context_Menu_Item *)data; > > extra space after = OK >> Tools/MiniBrowser/efl/main.c:1286 >> + ewk_settings_continuous_spell_checking_enabled_set(EINA_TRUE); > > seems unrelated? I forgot to remove it after tests. 812725 5 183799 cdumez 2013-01-22 00:43:25 -0800 Comment on attachment 183799 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=183799&action=review >>> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:66 >>> + EwkContextMenu* parentMenu() const { return m_parentMenu; } >> >> WebKit coding style: The getter should not be const if it returns a non-const pointer. > > If I have added const to ewk_context_menu_item_parent_menu_get it has to be left here. No, you don't have to leave const here and you should not. Just use const cast in ewk_context_menu_item_parent_menu_get() if needed. 812746 6 183917 mpakulavelrutka 2013-01-22 01:06:42 -0800 Created attachment 183917 minibrowser-only patch I have split this patch into two: Minibrowser only and ewk context menu API: bug 107510. 812757 7 183919 mpakulavelrutka 2013-01-22 01:14:18 -0800 Created attachment 183919 minibrowser-only patch2 814706 8 183917 kenneth 2013-01-23 15:01:35 -0800 Comment on attachment 183917 minibrowser-only patch View in context: https://bugs.webkit.org/attachment.cgi?id=183917&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:153 > EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0); > > - return item->parentMenu(); > + return const_cast<Ewk_Context_Menu_Item*>(item)->parentMenu(); > } This code needs review by WebKit2 owner, so could it be in a separate opatch somehow? 815155 9 mpakulavelrutka 2013-01-23 23:55:33 -0800 (In reply to comment #8) > (From update of attachment 183917 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=183917&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item.cpp:153 > > EINA_SAFETY_ON_NULL_RETURN_VAL(item, 0); > > > > - return item->parentMenu(); > > + return const_cast<Ewk_Context_Menu_Item*>(item)->parentMenu(); > > } > > This code needs review by WebKit2 owner, so could it be in a separate opatch somehow? I posted this patch accidentally and it is obsolete, please take a look at 183919. This code is moved to bug 107510. 816484 10 184726 mpakulavelrutka 2013-01-25 04:37:38 -0800 Created attachment 184726 fixed patch added guard in on_context_menu_hide 825422 11 184726 eflews.bot 2013-02-05 06:00:00 -0800 Comment on attachment 184726 fixed patch Attachment 184726 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/16367762 876727 12 198392 mpakulavelrutka 2013-04-16 13:00:30 -0700 Created attachment 198392 rebased patch 876964 13 198392 gyuyoung.kim 2013-04-16 17:28:31 -0700 Comment on attachment 198392 rebased patch View in context: https://bugs.webkit.org/attachment.cgi?id=198392&action=review > Tools/MiniBrowser/efl/main.c:1107 > + Unneeded line. > Tools/MiniBrowser/efl/main.c:1123 > +fill_context_popup_items(Browser_Window *window, Ewk_Context_Menu *ewk_menu) verb is placed at the end of function in EFL coding style. See also, popup_menu_populate(...) in main.cp > Tools/MiniBrowser/efl/main.c:1157 > + if (!window || !menu) It would be good if you add a log using info(...). > Tools/MiniBrowser/efl/main.c:1178 > + if (!window || !window->context_popup) ditto ? 877059 14 198475 mpakulavelrutka 2013-04-17 00:43:52 -0700 Created attachment 198475 fixes after review changed fill_context_popup_items to context_popup_populate, added logs 877060 15 198475 gyuyoung.kim 2013-04-17 00:57:00 -0700 Comment on attachment 198475 fixes after review LGTM. But, someone might have a final look. 877150 16 198475 cdumez 2013-04-17 06:58:12 -0700 Comment on attachment 198475 fixes after review View in context: https://bugs.webkit.org/attachment.cgi?id=198475&action=review > Tools/MiniBrowser/efl/main.c:1389 > + window->context_popup = NULL; Please double check but I don't believe this is needed. If I remember correctly the window memory is calloc'd. 877156 17 198506 mpakulavelrutka 2013-04-17 07:19:01 -0700 Created attachment 198506 fixes 877157 18 198506 cdumez 2013-04-17 07:20:18 -0700 Comment on attachment 198506 fixes LGTM. 877168 19 198506 commit-queue 2013-04-17 07:47:53 -0700 Comment on attachment 198506 fixes Clearing flags on attachment: 198506 Committed r148609: <http://trac.webkit.org/changeset/148609> 877169 20 commit-queue 2013-04-17 07:47:57 -0700 All reviewed patches have been landed. Closing bug. 183799 2013-01-21 09:27:59 -0800 2013-01-22 01:06:42 -0800 proposed patch contextmenu.diff text/plain 17789 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAxMTBkNDg1Li5mNzkwM2JkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDEtMjEgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEltcGxlbWVudCBjb250ZXh0IG1lbnUgaW4g TWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwMjkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIHBhcmVudCBtZW51IHN1cHBvcnQgYW5kIEFQSSBmb3IgRXdrX0NvbnRleHRfTWVu dV9JdGVtLCB0bworICAgICAgICBhbGxvdyBzZWxlY3RpbmcgY29udGV4dCBtZW51cyB1c2luZyBF bGVtZW50YXJ5IHdpZGdldHMuCisgICAgICAgIENvbnRleHQgbWVudSB1bml0IHRlc3QgdXBkYXRl ZCB3aXRoIG5ldyBmdW5jdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19j b250ZXh0X21lbnUuY3BwOgorICAgICAgICAoRXdrQ29udGV4dE1lbnU6OkV3a0NvbnRleHRNZW51 KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3Bw OgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0pOgorICAg ICAgICAoZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldyk6CisgICAgICAgIChld2tfY29udGV4dF9t ZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0 ZW1fcGFyZW50X21lbnVfZ2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dF9tZW51X2l0ZW0uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dF9tZW51X2l0ZW1fcHJpdmF0ZS5oOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpjcmVh dGUpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpwYXJlbnRNZW51KToKKyAgICAgICAg KEV3a0NvbnRleHRNZW51SXRlbTo6c2V0UGFyZW50TWVudSk6CisgICAgICAgIChFd2tDb250ZXh0 TWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9j b250ZXh0X21lbnUuY3BwOgorICAgICAgICAoc2hvd0NvbnRleHRNZW51KToKKwogMjAxMy0wMS0y MSAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z25zQGdub21lLm9yZz4KIAogICAgICAgICBSRUdS RVNTSU9OIChyMTQwMjg1KTogR1RLIHVzZXMgV0tQYWdlUmVzb3VyY2VMb2FkQ2xpZW50IHdoaWNo IHdhcyByZW1vdmVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19jb250ZXh0X21lbnUuY3BwCmluZGV4IDBhNGU1NDcuLmMyMTU1YzkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnUuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnUuY3Bw CkBAIC00Myw3ICs0Myw3IEBAIEV3a0NvbnRleHRNZW51OjpFd2tDb250ZXh0TWVudShFd2tWaWV3 SW1wbCogdmlld0ltcGwsIFdlYkNvbnRleHRNZW51UHJveHlFZmwqIGNvCiB7CiAgICAgY29uc3Qg c2l6ZV90IHNpemUgPSBpdGVtcy5zaXplKCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBz aXplOyArK2kpCi0gICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQo bV9jb250ZXh0TWVudUl0ZW1zLCBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShpdGVtc1tp XSkubGVha1B0cigpKTsKKyAgICAgICAgbV9jb250ZXh0TWVudUl0ZW1zID0gZWluYV9saXN0X2Fw cGVuZChtX2NvbnRleHRNZW51SXRlbXMsIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKGl0 ZW1zW2ldLCB0aGlzKS5sZWFrUHRyKCkpOwogfQogCiBFd2tDb250ZXh0TWVudTo6RXdrQ29udGV4 dE1lbnUoKQpAQCAtNjAsOCArNjAsMTEgQEAgRXdrQ29udGV4dE1lbnU6OkV3a0NvbnRleHRNZW51 KEVpbmFfTGlzdCogaXRlbXMpCiB7CiAgICAgRWluYV9MaXN0KiBsOwogICAgIHZvaWQqIGRhdGE7 Ci0gICAgRUlOQV9MSVNUX0ZPUkVBQ0goaXRlbXMsIGwsIGRhdGEpCi0gICAgICAgIG1fY29udGV4 dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9jb250ZXh0TWVudUl0ZW1zLCBzdGF0aWNf Y2FzdDxFd2tDb250ZXh0TWVudUl0ZW0qPihkYXRhKSk7CisgICAgRUlOQV9MSVNUX0ZPUkVBQ0go aXRlbXMsIGwsIGRhdGEpIHsKKyAgICAgICAgRXdrQ29udGV4dE1lbnVJdGVtKiBpdGVtID0gc3Rh dGljX2Nhc3Q8RXdrQ29udGV4dE1lbnVJdGVtKj4oZGF0YSk7CisgICAgICAgIGl0ZW0tPnNldFBh cmVudE1lbnUodGhpcyk7CisgICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9h cHBlbmQobV9jb250ZXh0TWVudUl0ZW1zLCBpdGVtKTsKKyAgICB9CiB9CiAKIEV3a0NvbnRleHRN ZW51Ojp+RXdrQ29udGV4dE1lbnUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKaW5kZXggMWZmODY1Mi4u NzI4NDdiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2NvbnRleHRfbWVudV9pdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCkBAIC0zMywzNiArMzMsMzYgQEAKIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAotRXdrQ29udGV4 dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oY29uc3QgV2ViQ29udGV4dE1lbnVJdGVtRGF0 YSYgaXRlbSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKGNvbnN0IFdl YkNvbnRleHRNZW51SXRlbURhdGEmIGl0ZW0sIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KQog ICAgIDogbV90eXBlKHN0YXRpY19jYXN0PEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlPihpdGVt LnR5cGUoKSkpCiAgICAgLCBtX2FjdGlvbihzdGF0aWNfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0 ZW1fQWN0aW9uPihpdGVtLmFjdGlvbigpKSkKICAgICAsIG1fdGl0bGUoaXRlbS50aXRsZSgpLnV0 ZjgoKS5kYXRhKCkpCiAgICAgLCBtX2lzQ2hlY2tlZChpdGVtLmNoZWNrZWQoKSkKICAgICAsIG1f aXNFbmFibGVkKGl0ZW0uZW5hYmxlZCgpKQotICAgICwgbV9wYXJlbnRNZW51KDApCisgICAgLCBt X3BhcmVudE1lbnUocGFyZW50TWVudSkKICAgICAsIG1fc3ViTWVudSgwKQogewogfQogCi1Fd2tD b250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1f VHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hh ciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRl eHRfTWVudSogc3ViTWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVt KEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9B Y3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFf Qm9vbCBlbmFibGVkLCBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51LCBFd2tfQ29udGV4dF9NZW51 KiBwYXJlbnRNZW51KQogICAgIDogbV90eXBlKHR5cGUpCiAgICAgLCBtX2FjdGlvbihhY3Rpb24p CiAgICAgLCBtX3RpdGxlKHRpdGxlKQogICAgICwgbV9pc0NoZWNrZWQoY2hlY2tlZCkKICAgICAs IG1faXNFbmFibGVkKGVuYWJsZWQpCi0gICAgLCBtX3BhcmVudE1lbnUoMCkKKyAgICAsIG1fcGFy ZW50TWVudShwYXJlbnRNZW51KQogICAgICwgbV9zdWJNZW51KHN1Yk1lbnUpCiB7CiB9CiAKIEV3 a19Db250ZXh0X01lbnVfSXRlbSogZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldyhFd2tfQ29udGV4 dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlv biwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxl ZCkKIHsKLSAgICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwgYWN0 aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgMCkubGVha1B0cigpOworICAgIHJldHVybiBF d2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2Vk LCBlbmFibGVkLCAwLCAwKS5sZWFrUHRyKCk7CiB9CiAKIEV3a19Db250ZXh0X01lbnVfSXRlbSog ZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUoRXdrX0NvbnRleHRfTWVudV9J dGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0 IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19D b250ZXh0X01lbnUqIHN1Yk1lbnUpCiB7Ci0gICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRl bTo6Y3JlYXRlKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUp LmxlYWtQdHIoKTsKKyAgICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlw ZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVudSwgMCkubGVha1B0cigp OwogfQogCiBFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSBld2tfY29udGV4dF9tZW51X2l0ZW1f dHlwZV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBpdGVtKQpAQCAtMTQ1LDYgKzE0 NSwxMyBAQCBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KEV3a19D b250ZXh0X01lbnVfSXRlbSogaXRlbSwgRWluYV9CbwogICAgIHJldHVybiB0cnVlOwogfQogCitF d2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KEV3 a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKK3sKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JF VFVSTl9WQUwoaXRlbSwgMCk7CisKKyAgICByZXR1cm4gaXRlbS0+cGFyZW50TWVudSgpOworfQor CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdf Tk9fQUNUSU9OLCBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbik7CiBDT01QSUxF X0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1BFTl9MSU5L X0lOX05FV19XSU5ET1csIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdX aW5kb3cpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lU RU1fVEFHX0RPV05MT0FEX0xJTktfVE9fRElTSywgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFn RG93bmxvYWRMaW5rVG9EaXNrKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKaW5kZXggOTYxMmEyMS4uNWU3NmQ5 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRl eHRfbWVudV9pdGVtLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2NvbnRleHRfbWVudV9pdGVtLmgKQEAgLTI2Myw2ICsyNjMsMTUgQEAgRUFQSSBFaW5hX0Jvb2wg ZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVf SXRlbSAqbykKICAqLwogRUFQSSBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJs ZWRfc2V0KEV3a19Db250ZXh0X01lbnVfSXRlbSAqbywgRWluYV9Cb29sIGVuYWJsZWQpOwogCisv KioKKyAqIEdldHMgdGhlIHBhcmVudCBtZW51IGZvciB0aGUgaXRlbS4KKyAqCisgKiBAcGFyYW0g byBpdGVtIHRvIGdldCB0aGUgcGFyZW50CisgKgorICogQHJldHVybiB0aGUgcG9pbnRlciB0byBw YXJlbnQgbWVudSBvbiBzdWNjZXNzIG9yIEBjIE5VTEwgb24gZmFpbHVyZQorICovCitFQVBJIEV3 a19Db250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoRXdr X0NvbnRleHRfTWVudV9JdGVtICpvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X21lbnVfaXRlbV9wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCmluZGV4IDYyZjI3OTAuLjljMGU5ZTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21l bnVfaXRlbV9wcml2YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaApAQCAtMzgsMTQgKzM4LDE0IEBACiAgKi8K IGNsYXNzIEV3a0NvbnRleHRNZW51SXRlbSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25Q dHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoY29uc3QgV2ViS2l0OjpXZWJDb250ZXh0TWVu dUl0ZW1EYXRhJiBpdGVtKQorICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRl bT4gY3JlYXRlKGNvbnN0IFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtRGF0YSYgaXRlbSwgRXdr Q29udGV4dE1lbnUqIHBhcmVudE1lbnUpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRQdHIo bmV3IEV3a0NvbnRleHRNZW51SXRlbShpdGVtKSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihu ZXcgRXdrQ29udGV4dE1lbnVJdGVtKGl0ZW0sIHBhcmVudE1lbnUpKTsKICAgICB9CiAKLSAgICBz dGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNyZWF0ZShFd2tfQ29udGV4dF9N ZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwg Y29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwg RXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUpCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4 dE1lbnVJdGVtPiBjcmVhdGUoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0Nv bnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jv b2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51LCBF d2tDb250ZXh0TWVudSogcGFyZW50TWVudSkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0 cihuZXcgRXdrQ29udGV4dE1lbnVJdGVtKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVu YWJsZWQsIHN1Yk1lbnUpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0 TWVudUl0ZW0odHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVudSwg cGFyZW50TWVudSkpOwogICAgIH0KIAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24g YWN0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9hY3Rpb247IH0KQEAgLTYzLDkgKzYzLDEyIEBAIHB1 YmxpYzoKICAgICBib29sIGVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX2lzRW5hYmxlZDsgfQog ICAgIHZvaWQgc2V0RW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9pc0VuYWJsZWQgPSBlbmFibGVk OyB9CiAKKyAgICBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSgpIGNvbnN0IHsgcmV0dXJuIG1f cGFyZW50TWVudTsgfQorICAgIHZvaWQgc2V0UGFyZW50TWVudShFd2tDb250ZXh0TWVudSogcGFy ZW50TWVudSkgeyBtX3BhcmVudE1lbnUgPSBwYXJlbnRNZW51OyB9CisKIHByaXZhdGU6Ci0gICAg ZXhwbGljaXQgRXdrQ29udGV4dE1lbnVJdGVtKGNvbnN0IFdlYktpdDo6V2ViQ29udGV4dE1lbnVJ dGVtRGF0YSYpOwotICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1f VHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hh ciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4 dE1lbnUqIHN1Yk1lbnUpOworICAgIGV4cGxpY2l0IEV3a0NvbnRleHRNZW51SXRlbShjb25zdCBX ZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGEmLCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVu dSk7CisgICAgRXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5 cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRs ZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0TWVudSog c3ViTWVudSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpOwogCiAgICAgRXdrX0NvbnRleHRf TWVudV9JdGVtX1R5cGUgbV90eXBlOwogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24g bV9hY3Rpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUuY3BwCmluZGV4IDc4ODU4YWYu LjE4NjRlM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rl c3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUuY3BwCkBAIC00Niw2ICs0 Niw5IEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRNZW51KEV3a19WaWV3X1NtYXJ0X0Rh dGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVt KiBpdGVtID0gc3RhdGljX2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oZWluYV9saXN0X250 aChsaXN0LCAwKSk7CiAgICAgY2hlY2tCYXNpY0NvbnRleHRNZW51SXRlbShpdGVtLCBFV0tfQUNU SU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfR09fQkFDSywgIkdvIEJhY2siLCBm YWxzZSwgdHJ1ZSk7CiAKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hlbiBj b250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCBieSBXZWJLaXQuCisgICAgRVhQRUNUX0VR KGNvbnRleHRNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGl0ZW0p KTsKKwogICAgIGl0ZW0gPSBzdGF0aWNfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0ZW0qPihlaW5h X2xpc3RfbnRoKGxpc3QsIDEpKTsKICAgICBjaGVja0Jhc2ljQ29udGV4dE1lbnVJdGVtKGl0ZW0s IEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19HT19GT1JXQVJELCAi R28gRm9yd2FyZCIsIGZhbHNlLCB0cnVlKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fZW5h YmxlZF9zZXQoaXRlbSwgZmFsc2UpOwpAQCAtNjMsOCArNjYsMTMgQEAgc3RhdGljIEVpbmFfQm9v bCBzaG93Q29udGV4dE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBFdmFzX0Nv b3JkIHgsIEUKIAogICAgIC8vIE1ha2VzIG5ldyBjb250ZXh0IG1lbnUgaXRlbXMuCiAgICAgRXdr X0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldyhF V0tfQUNUSU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3Vz dG9tIEl0ZW0iLCBmYWxzZSwgdHJ1ZSk7CisgICAgLy8gQ2hlY2sgaWYgcGFyZW50IG1lbnUgZXF1 YWxzIDAgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCB1c2luZyBld2tfY29u dGV4dF9tZW51X2l0ZW1fbmV3LgorICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0 ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1f YXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtKTsKIAorICAgIC8vIENoZWNrIGlmIHBhcmVudCBt ZW51IGVxdWFscyB3aGVuIGNvbnRleHQgbWVudSBpdGVtcyB3aGVyZSBjcmVhdGVkIHVzaW5nIGV3 a19jb250ZXh0X21lbnVfaXRlbV9uZXcgYW5kIGFkZGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVf aXRlbV9hcHBlbmQuCisgICAgRVhQRUNUX0VRKGNvbnRleHRNZW51LCBld2tfY29udGV4dF9tZW51 X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKKwogICAgIEVpbmFfTGlzdCogc3ViTWVu dUl0ZW1MaXN0ID0gMDsKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIHN1Yk1lbnVJdGVtMSA9 IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9N RU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1lbnUgSXRlbSAxIiwgZmFsc2UsIHRydWUpOwog ICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogc3ViTWVudUl0ZW0yID0gZXdrX2NvbnRleHRfbWVu dV9pdGVtX25ldyhFV0tfQUNUSU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1RI RVIsICJOZXcgU3ViTWVudSBJdGVtIDIiLCBmYWxzZSwgdHJ1ZSk7CkBAIC03Myw5ICs4MSwxOCBA QCBzdGF0aWMgRWluYV9Cb29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBz bWFydERhdGEsIEV2YXNfQ29vcmQgeCwgRQogICAgIHN1Yk1lbnVJdGVtTGlzdCA9IGVpbmFfbGlz dF9hcHBlbmQoc3ViTWVudUl0ZW1MaXN0LCBzdWJNZW51SXRlbTIpOwogICAgIHN1Yk1lbnVJdGVt TGlzdCA9IGVpbmFfbGlzdF9hcHBlbmQoc3ViTWVudUl0ZW1MaXN0LCBzdWJNZW51SXRlbTMpOwog ICAgIEV3a19Db250ZXh0X01lbnUqIHN1Yk1lbnUgPSBld2tfY29udGV4dF9tZW51X25ld193aXRo X2l0ZW1zKHN1Yk1lbnVJdGVtTGlzdCk7CisKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBl cXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCB1c2luZyBld2tfY29u dGV4dF9tZW51X25ld193aXRoX2l0ZW1zCisgICAgRVhQRUNUX0VRKHN1Yk1lbnUsIGV3a19jb250 ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoc3ViTWVudUl0ZW0xKSk7CisKICAgICBFd2tf Q29udGV4dF9NZW51X0l0ZW0qIG5ld0l0ZW0yID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193 aXRoX3N1Ym1lbnUoRVdLX1NVQk1FTlVfVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19P VEhFUiwgIk5ldyBDdXN0b20gSXRlbSAyIiwgZmFsc2UsIHRydWUsIHN1Yk1lbnUpOworICAgIC8v IENoZWNrIGlmIHBhcmVudCBtZW51IGVxdWFscyAwIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdo ZXJlIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUu CisgICAgRVhQRUNUX0VRKDAsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQo bmV3SXRlbSkpOwogICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoY29udGV4dE1lbnUs IG5ld0l0ZW0yKTsKIAorICAgIC8vIENoZWNrIGlmIHBhcmVudCBtZW51IGVxdWFscyB3aGVuIGNv bnRleHQgbWVudSBpdGVtcyB3aGVyZSBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRl bV9uZXdfd2l0aF9zdWJtZW51IGFuZCBhZGRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1f YXBwZW5kLgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVt X3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CisKICAgICBFd2tfQ29udGV4dF9NZW51KiBzdWJN ZW51MiA9IGV3a19jb250ZXh0X21lbnVfbmV3KCk7CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVt KiBuZXdJdGVtMyA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19T VUJNRU5VX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9t IEl0ZW0gMyIsIGZhbHNlLCB0cnVlLCBzdWJNZW51Mik7CiAgICAgZXdrX2NvbnRleHRfbWVudV9p dGVtX2FwcGVuZChjb250ZXh0TWVudSwgbmV3SXRlbTMpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGYxZjMxYzAuLjQ2NzAyZjMgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBA QAorMjAxMy0wMS0yMSAgTWljaGHFgiBQYWt1xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1 bmcuY29tPgorCisgICAgICAgIFtFRkxdW1dLMl0gSW1wbGVtZW50IGNvbnRleHQgbWVudSBpbiBN aW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTAyOTMyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkZWQgY29udGV4dCBtZW51IHN1cHBvcnQgZm9yIEVGTCBwb3J0IHVzaW5nIEVsZW1lbnRh cnkgY29udGV4dCBwb3B1cC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6Cisg ICAgICAgIChfQnJvd3Nlcl9XaW5kb3cpOgorICAgICAgICAoY29udGV4dF9wb3B1cF9pdGVtX3Nl bGVjdGVkX2NiKToKKyAgICAgICAgKGZpbGxfY29udGV4dF9wb3B1cF9pdGVtcyk6CisgICAgICAg IChvbl9jb250ZXh0X21lbnVfc2hvdyk6CisgICAgICAgIChvbl9jb250ZXh0X21lbnVfaGlkZSk6 CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToKKwogMjAxMy0wMS0yMSAgR3VzdGF2byBOb3Jvbmhh IFNpbHZhICA8Z25zQGdub21lLm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTQwMjg1KTog R1RLIHVzZXMgV0tQYWdlUmVzb3VyY2VMb2FkQ2xpZW50IHdoaWNoIHdhcyByZW1vdmVkCmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIv ZWZsL21haW4uYwppbmRleCAzZmE1Yjc1Li40Yjk2ZmY5IDEwMDY0NAotLS0gYS9Ub29scy9NaW5p QnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAg LTkxLDYgKzkxLDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX0Jyb3dzZXJfV2luZG93IHsKICAgICBFdmFz X09iamVjdCAqZm9yd2FyZF9idXR0b247CiAgICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsgCiAg ICAgVG9vbHRpcF9JbmZvcm1hdGlvbiB0b29sdGlwOworICAgIEV2YXNfT2JqZWN0ICpjb250ZXh0 X3BvcHVwOwogfSBCcm93c2VyX1dpbmRvdzsKIAogdHlwZWRlZiBzdHJ1Y3QgX0ZpbGVfU2VsZWN0 b3JfRGF0YSB7CkBAIC04OTYsNiArODk3LDg3IEBAIG9uX3dpbmRvd19jbG9zZShFd2tfVmlld19T bWFydF9EYXRhICpzbWFydERhdGEpCiAgICAgd2luZG93X2Nsb3NlKHdpbmRvdyk7CiB9CiAKKwor c3RhdGljIHZvaWQKK2ZpbGxfY29udGV4dF9wb3B1cF9pdGVtcyhCcm93c2VyX1dpbmRvdyAqd2lu ZG93LCBFd2tfQ29udGV4dF9NZW51ICpld2tfbWVudSk7CisKK3N0YXRpYyB2b2lkCitjb250ZXh0 X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2Iodm9pZCAqZGF0YSwgRXZhc19PYmplY3QgKm9iaiwgdm9p ZCAqZXZlbnRfaW5mbykKK3sKKyAgICBpZiAoIWRhdGEpCisgICAgICAgIHJldHVybjsKKworICAg IEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdrX2l0ZW0gPSAgKEV3a19Db250ZXh0X01lbnVfSXRl bSAqKWRhdGE7CisgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX3NlbGVjdChld2tfY29udGV4dF9t ZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGV3a19pdGVtKSwgZXdrX2l0ZW0pOworICAgIGV3a19j b250ZXh0X21lbnVfaGlkZShld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGV3 a19pdGVtKSk7Cit9CisKK3N0YXRpYyB2b2lkCitmaWxsX2NvbnRleHRfcG9wdXBfaXRlbXMoQnJv d3Nlcl9XaW5kb3cgKndpbmRvdywgRXdrX0NvbnRleHRfTWVudSAqZXdrX21lbnUpCit7CisgICAg Y29uc3QgRWluYV9MaXN0ICpsaXN0ID0gZXdrX2NvbnRleHRfbWVudV9pdGVtc19nZXQoZXdrX21l bnUpOworICAgIGNvbnN0IEVpbmFfTGlzdCAqbDsKKyAgICB2b2lkICpkYXRhOworCisgICAgRXdr X0NvbnRleHRfTWVudV9JdGVtICpld2tfaXRlbTsKKyAgICBFbG1fT2JqZWN0X0l0ZW0gKmVsbV9w b3B1cF9pdGVtOworICAgIEV2YXNfT2JqZWN0ICplbG1fY2hlY2tfaXRlbTsKKworICAgIEVJTkFf TElTVF9GT1JFQUNIKGxpc3QsIGwsIGRhdGEpIHsKKyAgICAgICAgZXdrX2l0ZW0gPSAoRXdrX0Nv bnRleHRfTWVudV9JdGVtICopZGF0YTsKKyAgICAgICAgc3dpdGNoIChld2tfY29udGV4dF9tZW51 X2l0ZW1fdHlwZV9nZXQoZXdrX2l0ZW0pKSB7CisgICAgICAgIGNhc2UgRVdLX0FDVElPTl9UWVBF OgorICAgICAgICAgICAgZWxtX3BvcHVwX2l0ZW0gPSBlbG1fY3R4cG9wdXBfaXRlbV9hcHBlbmQo d2luZG93LT5jb250ZXh0X3BvcHVwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3 a19pdGVtKSwgTlVMTCwgY29udGV4dF9wb3B1cF9pdGVtX3NlbGVjdGVkX2NiLCBld2tfaXRlbSk7 CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBFV0tfQ0hFQ0tBQkxFX0FDVElPTl9U WVBFOgorICAgICAgICAgICAgZWxtX2NoZWNrX2l0ZW0gPSBlbG1fY2hlY2tfYWRkKHdpbmRvdy0+ Y29udGV4dF9wb3B1cCk7CisgICAgICAgICAgICBlbG1fcG9wdXBfaXRlbSA9IGVsbV9jdHhwb3B1 cF9pdGVtX2FwcGVuZCh3aW5kb3ctPmNvbnRleHRfcG9wdXAsIGV3a19jb250ZXh0X21lbnVfaXRl bV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBOVUxMLCBjb250ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRf Y2IsIGV3a19pdGVtKTsKKyAgICAgICAgICAgIGVsbV9vYmplY3RfaXRlbV9jb250ZW50X3NldChl bG1fcG9wdXBfaXRlbSwgZWxtX2NoZWNrX2l0ZW0pOworICAgICAgICAgICAgZWxtX2NoZWNrX3N0 YXRlX3NldChlbG1fY2hlY2tfaXRlbSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX2NoZWNrZWRfZ2V0 KGV3a19pdGVtKSk7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgZGVmYXVsdDoKKyAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIGVsbV9vYmplY3RfaXRlbV9kaXNh YmxlZF9zZXQoZWxtX3BvcHVwX2l0ZW0sICFld2tfY29udGV4dF9tZW51X2l0ZW1fZW5hYmxlZF9n ZXQoZXdrX2l0ZW0pKTsKKyAgICB9Cit9CisKK3N0YXRpYyBFaW5hX0Jvb2wKK29uX2NvbnRleHRf bWVudV9zaG93KEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBFdmFzX0Nvb3JkIHgsIEV2YXNfQ29v cmQgeSwgRXdrX0NvbnRleHRfTWVudSAqbWVudSkKK3sKKyAgICBCcm93c2VyX1dpbmRvdyAqd2lu ZG93ID0gd2luZG93X2ZpbmRfd2l0aF9ld2tfdmlldyhzZC0+c2VsZik7CisKKyAgICBpZiAoIXdp bmRvdyB8fCAhbWVudSkKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CisKKyAgICB3aW5kb3ct PmNvbnRleHRfcG9wdXAgPSBlbG1fY3R4cG9wdXBfYWRkKHdpbmRvdy0+ZWxtX3dpbmRvdyk7CisK KyAgICBpZiAoIXdpbmRvdy0+Y29udGV4dF9wb3B1cCkKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFM U0U7CisKKyAgICBmaWxsX2NvbnRleHRfcG9wdXBfaXRlbXMod2luZG93LCBtZW51KTsKKworICAg IGV2YXNfb2JqZWN0X21vdmUod2luZG93LT5jb250ZXh0X3BvcHVwLCB4LCB5KTsKKyAgICBldmFz X29iamVjdF9zaG93KHdpbmRvdy0+Y29udGV4dF9wb3B1cCk7CisKKyAgICByZXR1cm4gRUlOQV9U UlVFOworfQorCitzdGF0aWMgRWluYV9Cb29sCitvbl9jb250ZXh0X21lbnVfaGlkZShFd2tfVmll d19TbWFydF9EYXRhICpzZCkKK3sKKyAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93 X2ZpbmRfd2l0aF9ld2tfdmlldyhzZC0+c2VsZik7CisKKyAgICBpZiAoIXdpbmRvdy0+Y29udGV4 dF9wb3B1cCkKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CisKKyAgICBlbG1fY3R4cG9wdXBf ZGlzbWlzcyh3aW5kb3ctPmNvbnRleHRfcG9wdXApOworICAgIGV2YXNfb2JqZWN0X2RlbCh3aW5k b3ctPmNvbnRleHRfcG9wdXApOworICAgIHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9IE5VTEw7CisK KyAgICByZXR1cm4gRUlOQV9UUlVFOworfQorCiBzdGF0aWMgdm9pZAogYXV0aF9wb3B1cF9jbG9z ZShBdXRoX0RhdGEgKmF1dGhfZGF0YSkKIHsKQEAgLTExNzQsNiArMTI1Niw4IEBAIHN0YXRpYyBC cm93c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBj aGFyICp1cmwsIGludCB3CiAgICAgZXdrVmlld0NsYXNzLT5mdWxsc2NyZWVuX2V4aXQgPSBvbl9m dWxsc2NyZWVuX2V4aXQ7CiAgICAgZXdrVmlld0NsYXNzLT53aW5kb3dfY3JlYXRlID0gb25fd2lu ZG93X2NyZWF0ZTsKICAgICBld2tWaWV3Q2xhc3MtPndpbmRvd19jbG9zZSA9IG9uX3dpbmRvd19j bG9zZTsKKyAgICBld2tWaWV3Q2xhc3MtPmNvbnRleHRfbWVudV9zaG93ID0gb25fY29udGV4dF9t ZW51X3Nob3c7CisgICAgZXdrVmlld0NsYXNzLT5jb250ZXh0X21lbnVfaGlkZSA9IG9uX2NvbnRl eHRfbWVudV9oaWRlOwogCiAgICAgRXZhcyAqZXZhcyA9IGV2YXNfb2JqZWN0X2V2YXNfZ2V0KHdp bmRvdy0+ZWxtX3dpbmRvdyk7CiAgICAgaWYgKGxlZ2FjeV9iZWhhdmlvcl9lbmFibGVkKSB7CkBA IC0xMTk5LDYgKzEyODMsNyBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUo RXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQgdwogICAgIGluZm8oIkhU TUw1IGxvY2FsIHN0b3JhZ2UgaXMgJXMgZm9yIHRoaXMgdmlldy5cbiIsIGxvY2FsX3N0b3JhZ2Vf ZW5hYmxlZCA/ICJlbmFibGVkIiA6ICJkaXNhYmxlZCIpOwogICAgIGV3a19zZXR0aW5nc19kZXZl bG9wZXJfZXh0cmFzX2VuYWJsZWRfc2V0KHNldHRpbmdzLCBFSU5BX1RSVUUpOwogICAgIGV3a19z ZXR0aW5nc19wcmVmZXJyZWRfbWluaW11bV9jb250ZW50c193aWR0aF9zZXQoc2V0dGluZ3MsIDAp OworICAgIGV3a19zZXR0aW5nc19jb250aW51b3VzX3NwZWxsX2NoZWNraW5nX2VuYWJsZWRfc2V0 KEVJTkFfVFJVRSk7CiAKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQod2luZG93 LT5ld2tfdmlldywgImF1dGhlbnRpY2F0aW9uLHJlcXVlc3QiLCBvbl9hdXRoZW50aWNhdGlvbl9y ZXF1ZXN0LCB3aW5kb3cpOwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZCh3aW5k b3ctPmV3a192aWV3LCAiZG93bmxvYWQsZmFpbGVkIiwgb25fZG93bmxvYWRfZmFpbGVkLCB3aW5k b3cpOwo= 183917 2013-01-22 01:06:42 -0800 2013-01-23 15:01:35 -0800 minibrowser-only patch contextmenu-minibrowser.diff text/plain 6264 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X21lbnVfaXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dF9tZW51X2l0ZW0uY3BwCmluZGV4IGY5MDBlNzYuLjQ1YTE1ZDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9p dGVtLmNwcApAQCAtMTQ5LDcgKzE0OSw3IEBAIEV3a19Db250ZXh0X01lbnUqIGV3a19jb250ZXh0 X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9JCiB7CiAg ICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGl0ZW0sIDApOwogCi0gICAgcmV0dXJu IGl0ZW0tPnBhcmVudE1lbnUoKTsKKyAgICByZXR1cm4gY29uc3RfY2FzdDxFd2tfQ29udGV4dF9N ZW51X0l0ZW0qPihpdGVtKS0+cGFyZW50TWVudSgpOwogfQogCiBDT01QSUxFX0FTU0VSVF9NQVRD SElOR19FTlVNKEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfTk9fQUNUSU9OLCBXZWJDb3JlOjpD b250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUu aAppbmRleCAwNTRjZThiLi4zMjJhYWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRl LmgKQEAgLTYzLDcgKzYzLDcgQEAgcHVibGljOgogICAgIGJvb2wgZW5hYmxlZCgpIGNvbnN0IHsg cmV0dXJuIG1faXNFbmFibGVkOyB9CiAgICAgdm9pZCBzZXRFbmFibGVkKGJvb2wgZW5hYmxlZCkg eyBtX2lzRW5hYmxlZCA9IGVuYWJsZWQ7IH0KIAotICAgIEV3a0NvbnRleHRNZW51KiBwYXJlbnRN ZW51KCkgY29uc3QgeyByZXR1cm4gbV9wYXJlbnRNZW51OyB9CisgICAgRXdrQ29udGV4dE1lbnUq IHBhcmVudE1lbnUoKSB7IHJldHVybiBtX3BhcmVudE1lbnU7IH0KICAgICB2b2lkIHNldFBhcmVu dE1lbnUoRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpIHsgbV9wYXJlbnRNZW51ID0gcGFyZW50 TWVudTsgfQogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IDRiYmEyOGIuLjU2YzhiZjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMy0wMS0yMiAg TWljaGHFgiBQYWt1xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgorCisgICAg ICAgIFtFRkxdW1dLMl0gSW1wbGVtZW50IGNvbnRleHQgbWVudSBpbiBNaW5pQnJvd3NlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAyOTMyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgY29udGV4 dCBtZW51IHN1cHBvcnQgZm9yIEVGTCBwb3J0IHVzaW5nIEVsZW1lbnRhcnkgY29udGV4dCBwb3B1 cC4KKworICAgICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6CisgICAgICAgIChfQnJvd3Nl cl9XaW5kb3cpOgorICAgICAgICAoY29udGV4dF9wb3B1cF9pdGVtX3NlbGVjdGVkX2NiKToKKyAg ICAgICAgKGZpbGxfY29udGV4dF9wb3B1cF9pdGVtcyk6CisgICAgICAgIChvbl9jb250ZXh0X21l bnVfc2hvdyk6CisgICAgICAgIChvbl9jb250ZXh0X21lbnVfaGlkZSk6CisgICAgICAgICh3aW5k b3dfY3JlYXRlKToKKwogMjAxMy0wMS0yMiAgS3J6eXN6dG9mIEN6ZWNoICA8ay5jemVjaEBzYW1z dW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBBZGRzIEFjY2Vzc2liaWxpdHkgc3VwcG9ydCB0byB3 azEKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5p QnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDcxM2VkZDMuLjcwOTE4M2QgMTAwNjQ0Ci0tLSBhL1Rv b2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21h aW4uYwpAQCAtOTEsNiArOTEsNyBAQCB0eXBlZGVmIHN0cnVjdCBfQnJvd3Nlcl9XaW5kb3cgewog ICAgIEV2YXNfT2JqZWN0ICpmb3J3YXJkX2J1dHRvbjsKICAgICBpbnQgY3VycmVudF96b29tX2xl dmVsOyAKICAgICBUb29sdGlwX0luZm9ybWF0aW9uIHRvb2x0aXA7CisgICAgRXZhc19PYmplY3Qg KmNvbnRleHRfcG9wdXA7CiB9IEJyb3dzZXJfV2luZG93OwogCiB0eXBlZGVmIHN0cnVjdCBfRmls ZV9TZWxlY3Rvcl9EYXRhIHsKQEAgLTkwMCw2ICs5MDEsODcgQEAgb25fd2luZG93X2Nsb3NlKEV3 a19WaWV3X1NtYXJ0X0RhdGEgKnNtYXJ0RGF0YSkKICAgICB3aW5kb3dfY2xvc2Uod2luZG93KTsK IH0KIAorCitzdGF0aWMgdm9pZAorZmlsbF9jb250ZXh0X3BvcHVwX2l0ZW1zKEJyb3dzZXJfV2lu ZG93ICp3aW5kb3csIEV3a19Db250ZXh0X01lbnUgKmV3a19tZW51KTsKKworc3RhdGljIHZvaWQK K2NvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYih2b2lkICpkYXRhLCBFdmFzX09iamVjdCAq b2JqLCB2b2lkICpldmVudF9pbmZvKQoreworICAgIGlmICghZGF0YSkKKyAgICAgICAgcmV0dXJu OworCisgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtICpld2tfaXRlbSA9IChFd2tfQ29udGV4dF9N ZW51X0l0ZW0gKilkYXRhOworICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9zZWxlY3QoZXdrX2Nv bnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChld2tfaXRlbSksIGV3a19pdGVtKTsKKyAg ICBld2tfY29udGV4dF9tZW51X2hpZGUoZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51 X2dldChld2tfaXRlbSkpOworfQorCitzdGF0aWMgdm9pZAorZmlsbF9jb250ZXh0X3BvcHVwX2l0 ZW1zKEJyb3dzZXJfV2luZG93ICp3aW5kb3csIEV3a19Db250ZXh0X01lbnUgKmV3a19tZW51KQor eworICAgIGNvbnN0IEVpbmFfTGlzdCAqbGlzdCA9IGV3a19jb250ZXh0X21lbnVfaXRlbXNfZ2V0 KGV3a19tZW51KTsKKyAgICBjb25zdCBFaW5hX0xpc3QgKmw7CisgICAgdm9pZCAqZGF0YTsKKwor ICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdrX2l0ZW07CisgICAgRWxtX09iamVjdF9JdGVt ICplbG1fcG9wdXBfaXRlbTsKKyAgICBFdmFzX09iamVjdCAqZWxtX2NoZWNrX2l0ZW07CisKKyAg ICBFSU5BX0xJU1RfRk9SRUFDSChsaXN0LCBsLCBkYXRhKSB7CisgICAgICAgIGV3a19pdGVtID0g KEV3a19Db250ZXh0X01lbnVfSXRlbSAqKWRhdGE7CisgICAgICAgIHN3aXRjaCAoZXdrX2NvbnRl eHRfbWVudV9pdGVtX3R5cGVfZ2V0KGV3a19pdGVtKSkgeworICAgICAgICBjYXNlIEVXS19BQ1RJ T05fVFlQRToKKyAgICAgICAgICAgIGVsbV9wb3B1cF9pdGVtID0gZWxtX2N0eHBvcHVwX2l0ZW1f YXBwZW5kKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxl X2dldChld2tfaXRlbSksIE5VTEwsIGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdr X2l0ZW0pOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgRVdLX0NIRUNLQUJMRV9B Q1RJT05fVFlQRToKKyAgICAgICAgICAgIGVsbV9jaGVja19pdGVtID0gZWxtX2NoZWNrX2FkZCh3 aW5kb3ctPmNvbnRleHRfcG9wdXApOworICAgICAgICAgICAgZWxtX3BvcHVwX2l0ZW0gPSBlbG1f Y3R4cG9wdXBfaXRlbV9hcHBlbmQod2luZG93LT5jb250ZXh0X3BvcHVwLCBld2tfY29udGV4dF9t ZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgTlVMTCwgY29udGV4dF9wb3B1cF9pdGVtX3Nl bGVjdGVkX2NiLCBld2tfaXRlbSk7CisgICAgICAgICAgICBlbG1fb2JqZWN0X2l0ZW1fY29udGVu dF9zZXQoZWxtX3BvcHVwX2l0ZW0sIGVsbV9jaGVja19pdGVtKTsKKyAgICAgICAgICAgIGVsbV9j aGVja19zdGF0ZV9zZXQoZWxtX2NoZWNrX2l0ZW0sIGV3a19jb250ZXh0X21lbnVfaXRlbV9jaGVj a2VkX2dldChld2tfaXRlbSkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6 CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBlbG1fb2JqZWN0X2l0 ZW1fZGlzYWJsZWRfc2V0KGVsbV9wb3B1cF9pdGVtLCAhZXdrX2NvbnRleHRfbWVudV9pdGVtX2Vu YWJsZWRfZ2V0KGV3a19pdGVtKSk7CisgICAgfQorfQorCitzdGF0aWMgRWluYV9Cb29sCitvbl9j b250ZXh0X21lbnVfc2hvdyhFd2tfVmlld19TbWFydF9EYXRhICpzZCwgRXZhc19Db29yZCB4LCBF dmFzX0Nvb3JkIHksIEV3a19Db250ZXh0X01lbnUgKm1lbnUpCit7CisgICAgQnJvd3Nlcl9XaW5k b3cgKndpbmRvdyA9IHdpbmRvd19maW5kX3dpdGhfZXdrX3ZpZXcoc2QtPnNlbGYpOworCisgICAg aWYgKCF3aW5kb3cgfHwgIW1lbnUpCisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworCisgICAg d2luZG93LT5jb250ZXh0X3BvcHVwID0gZWxtX2N0eHBvcHVwX2FkZCh3aW5kb3ctPmVsbV93aW5k b3cpOworCisgICAgaWYgKCF3aW5kb3ctPmNvbnRleHRfcG9wdXApCisgICAgICAgIHJldHVybiBF SU5BX0ZBTFNFOworCisgICAgZmlsbF9jb250ZXh0X3BvcHVwX2l0ZW1zKHdpbmRvdywgbWVudSk7 CisKKyAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgeCwgeSk7Cisg ICAgZXZhc19vYmplY3Rfc2hvdyh3aW5kb3ctPmNvbnRleHRfcG9wdXApOworCisgICAgcmV0dXJu IEVJTkFfVFJVRTsKK30KKworc3RhdGljIEVpbmFfQm9vbAorb25fY29udGV4dF9tZW51X2hpZGUo RXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QpCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9 IHdpbmRvd19maW5kX3dpdGhfZXdrX3ZpZXcoc2QtPnNlbGYpOworCisgICAgaWYgKCF3aW5kb3ct PmNvbnRleHRfcG9wdXApCisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworCisgICAgZWxtX2N0 eHBvcHVwX2Rpc21pc3Mod2luZG93LT5jb250ZXh0X3BvcHVwKTsKKyAgICBldmFzX29iamVjdF9k ZWwod2luZG93LT5jb250ZXh0X3BvcHVwKTsKKyAgICB3aW5kb3ctPmNvbnRleHRfcG9wdXAgPSBO VUxMOworCisgICAgcmV0dXJuIEVJTkFfVFJVRTsKK30KKwogc3RhdGljIHZvaWQKIGF1dGhfcG9w dXBfY2xvc2UoQXV0aF9EYXRhICphdXRoX2RhdGEpCiB7CkBAIC0xMDkyLDYgKzExNzQsOCBAQCBz dGF0aWMgQnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwg Y29uc3QgY2hhciAqdXJsLCBpbnQgdwogICAgIHdpbmRvdy0+dG9vbHRpcC50ZXh0X3NldCA9IEVJ TkFfRkFMU0U7CiAgICAgd2luZG93LT50b29sdGlwLnNob3duID0gRUlOQV9GQUxTRTsKIAorICAg IHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9IE5VTEw7CisKICAgICAvKiBDcmVhdGUgd2luZG93ICov CiAgICAgd2luZG93LT5lbG1fd2luZG93ID0gZWxtX3dpbl9hZGQoTlVMTCwgIm1pbmlicm93c2Vy LXdpbmRvdyIsIEVMTV9XSU5fQkFTSUMpOwogICAgIGVsbV93aW5fdGl0bGVfc2V0KHdpbmRvdy0+ ZWxtX3dpbmRvdywgQVBQX05BTUUpOwpAQCAtMTE3OCw2ICsxMjYyLDggQEAgc3RhdGljIEJyb3dz ZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIg KnVybCwgaW50IHcKICAgICBld2tWaWV3Q2xhc3MtPmZ1bGxzY3JlZW5fZXhpdCA9IG9uX2Z1bGxz Y3JlZW5fZXhpdDsKICAgICBld2tWaWV3Q2xhc3MtPndpbmRvd19jcmVhdGUgPSBvbl93aW5kb3df Y3JlYXRlOwogICAgIGV3a1ZpZXdDbGFzcy0+d2luZG93X2Nsb3NlID0gb25fd2luZG93X2Nsb3Nl OworICAgIGV3a1ZpZXdDbGFzcy0+Y29udGV4dF9tZW51X3Nob3cgPSBvbl9jb250ZXh0X21lbnVf c2hvdzsKKyAgICBld2tWaWV3Q2xhc3MtPmNvbnRleHRfbWVudV9oaWRlID0gb25fY29udGV4dF9t ZW51X2hpZGU7CiAKICAgICBFdmFzICpldmFzID0gZXZhc19vYmplY3RfZXZhc19nZXQod2luZG93 LT5lbG1fd2luZG93KTsKICAgICBpZiAobGVnYWN5X2JlaGF2aW9yX2VuYWJsZWQpIHsK 183919 2013-01-22 01:14:18 -0800 2013-01-25 04:37:38 -0800 minibrowser-only patch2 contextmenu-minibrowser.diff text/plain 4933 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0YmJh MjhiLi41NmM4YmYxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDEtMjIgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEltcGxl bWVudCBjb250ZXh0IG1lbnUgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGNvbnRleHQgbWVudSBzdXBwb3J0IGZvciBF RkwgcG9ydCB1c2luZyBFbGVtZW50YXJ5IGNvbnRleHQgcG9wdXAuCisKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAoX0Jyb3dzZXJfV2luZG93KToKKyAgICAgICAg KGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYik6CisgICAgICAgIChmaWxsX2NvbnRleHRf cG9wdXBfaXRlbXMpOgorICAgICAgICAob25fY29udGV4dF9tZW51X3Nob3cpOgorICAgICAgICAo b25fY29udGV4dF9tZW51X2hpZGUpOgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisKIDIwMTMt MDEtMjIgIEtyenlzenRvZiBDemVjaCAgPGsuY3plY2hAc2Ftc3VuZy5jb20+CiAKICAgICAgICAg W0VGTF0gQWRkcyBBY2Nlc3NpYmlsaXR5IHN1cHBvcnQgdG8gd2sxCmRpZmYgLS1naXQgYS9Ub29s cy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpp bmRleCA3MTNlZGQzLi43MDkxODNkIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwv bWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTkxLDYgKzkxLDcg QEAgdHlwZWRlZiBzdHJ1Y3QgX0Jyb3dzZXJfV2luZG93IHsKICAgICBFdmFzX09iamVjdCAqZm9y d2FyZF9idXR0b247CiAgICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsgCiAgICAgVG9vbHRpcF9J bmZvcm1hdGlvbiB0b29sdGlwOworICAgIEV2YXNfT2JqZWN0ICpjb250ZXh0X3BvcHVwOwogfSBC cm93c2VyX1dpbmRvdzsKIAogdHlwZWRlZiBzdHJ1Y3QgX0ZpbGVfU2VsZWN0b3JfRGF0YSB7CkBA IC05MDAsNiArOTAxLDg3IEBAIG9uX3dpbmRvd19jbG9zZShFd2tfVmlld19TbWFydF9EYXRhICpz bWFydERhdGEpCiAgICAgd2luZG93X2Nsb3NlKHdpbmRvdyk7CiB9CiAKKworc3RhdGljIHZvaWQK K2ZpbGxfY29udGV4dF9wb3B1cF9pdGVtcyhCcm93c2VyX1dpbmRvdyAqd2luZG93LCBFd2tfQ29u dGV4dF9NZW51ICpld2tfbWVudSk7CisKK3N0YXRpYyB2b2lkCitjb250ZXh0X3BvcHVwX2l0ZW1f c2VsZWN0ZWRfY2Iodm9pZCAqZGF0YSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5m bykKK3sKKyAgICBpZiAoIWRhdGEpCisgICAgICAgIHJldHVybjsKKworICAgIEV3a19Db250ZXh0 X01lbnVfSXRlbSAqZXdrX2l0ZW0gPSAoRXdrX0NvbnRleHRfTWVudV9JdGVtICopZGF0YTsKKyAg ICBld2tfY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0KGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJl bnRfbWVudV9nZXQoZXdrX2l0ZW0pLCBld2tfaXRlbSk7CisgICAgZXdrX2NvbnRleHRfbWVudV9o aWRlKGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoZXdrX2l0ZW0pKTsKK30K Kworc3RhdGljIHZvaWQKK2ZpbGxfY29udGV4dF9wb3B1cF9pdGVtcyhCcm93c2VyX1dpbmRvdyAq d2luZG93LCBFd2tfQ29udGV4dF9NZW51ICpld2tfbWVudSkKK3sKKyAgICBjb25zdCBFaW5hX0xp c3QgKmxpc3QgPSBld2tfY29udGV4dF9tZW51X2l0ZW1zX2dldChld2tfbWVudSk7CisgICAgY29u c3QgRWluYV9MaXN0ICpsOworICAgIHZvaWQgKmRhdGE7CisKKyAgICBFd2tfQ29udGV4dF9NZW51 X0l0ZW0gKmV3a19pdGVtOworICAgIEVsbV9PYmplY3RfSXRlbSAqZWxtX3BvcHVwX2l0ZW07Cisg ICAgRXZhc19PYmplY3QgKmVsbV9jaGVja19pdGVtOworCisgICAgRUlOQV9MSVNUX0ZPUkVBQ0go bGlzdCwgbCwgZGF0YSkgeworICAgICAgICBld2tfaXRlbSA9IChFd2tfQ29udGV4dF9NZW51X0l0 ZW0gKilkYXRhOworICAgICAgICBzd2l0Y2ggKGV3a19jb250ZXh0X21lbnVfaXRlbV90eXBlX2dl dChld2tfaXRlbSkpIHsKKyAgICAgICAgY2FzZSBFV0tfQUNUSU9OX1RZUEU6CisgICAgICAgICAg ICBlbG1fcG9wdXBfaXRlbSA9IGVsbV9jdHhwb3B1cF9pdGVtX2FwcGVuZCh3aW5kb3ctPmNvbnRl eHRfcG9wdXAsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBOVUxM LCBjb250ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2IsIGV3a19pdGVtKTsKKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICBjYXNlIEVXS19DSEVDS0FCTEVfQUNUSU9OX1RZUEU6CisgICAgICAg ICAgICBlbG1fY2hlY2tfaXRlbSA9IGVsbV9jaGVja19hZGQod2luZG93LT5jb250ZXh0X3BvcHVw KTsKKyAgICAgICAgICAgIGVsbV9wb3B1cF9pdGVtID0gZWxtX2N0eHBvcHVwX2l0ZW1fYXBwZW5k KHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChl d2tfaXRlbSksIE5VTEwsIGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0ZW0p OworICAgICAgICAgICAgZWxtX29iamVjdF9pdGVtX2NvbnRlbnRfc2V0KGVsbV9wb3B1cF9pdGVt LCBlbG1fY2hlY2tfaXRlbSk7CisgICAgICAgICAgICBlbG1fY2hlY2tfc3RhdGVfc2V0KGVsbV9j aGVja19pdGVtLCBld2tfY29udGV4dF9tZW51X2l0ZW1fY2hlY2tlZF9nZXQoZXdrX2l0ZW0pKTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgY29udGlu dWU7CisgICAgICAgIH0KKyAgICAgICAgZWxtX29iamVjdF9pdGVtX2Rpc2FibGVkX3NldChlbG1f cG9wdXBfaXRlbSwgIWV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX2dldChld2tfaXRlbSkp OworICAgIH0KK30KKworc3RhdGljIEVpbmFfQm9vbAorb25fY29udGV4dF9tZW51X3Nob3coRXdr X1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFd2tfQ29u dGV4dF9NZW51ICptZW51KQoreworICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3df ZmluZF93aXRoX2V3a192aWV3KHNkLT5zZWxmKTsKKworICAgIGlmICghd2luZG93IHx8ICFtZW51 KQorICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKworICAgIHdpbmRvdy0+Y29udGV4dF9wb3B1 cCA9IGVsbV9jdHhwb3B1cF9hZGQod2luZG93LT5lbG1fd2luZG93KTsKKworICAgIGlmICghd2lu ZG93LT5jb250ZXh0X3BvcHVwKQorICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKworICAgIGZp bGxfY29udGV4dF9wb3B1cF9pdGVtcyh3aW5kb3csIG1lbnUpOworCisgICAgZXZhc19vYmplY3Rf bW92ZSh3aW5kb3ctPmNvbnRleHRfcG9wdXAsIHgsIHkpOworICAgIGV2YXNfb2JqZWN0X3Nob3co d2luZG93LT5jb250ZXh0X3BvcHVwKTsKKworICAgIHJldHVybiBFSU5BX1RSVUU7Cit9CisKK3N0 YXRpYyBFaW5hX0Jvb2wKK29uX2NvbnRleHRfbWVudV9oaWRlKEV3a19WaWV3X1NtYXJ0X0RhdGEg KnNkKQoreworICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfZmluZF93aXRoX2V3 a192aWV3KHNkLT5zZWxmKTsKKworICAgIGlmICghd2luZG93LT5jb250ZXh0X3BvcHVwKQorICAg ICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKworICAgIGVsbV9jdHhwb3B1cF9kaXNtaXNzKHdpbmRv dy0+Y29udGV4dF9wb3B1cCk7CisgICAgZXZhc19vYmplY3RfZGVsKHdpbmRvdy0+Y29udGV4dF9w b3B1cCk7CisgICAgd2luZG93LT5jb250ZXh0X3BvcHVwID0gTlVMTDsKKworICAgIHJldHVybiBF SU5BX1RSVUU7Cit9CisKIHN0YXRpYyB2b2lkCiBhdXRoX3BvcHVwX2Nsb3NlKEF1dGhfRGF0YSAq YXV0aF9kYXRhKQogewpAQCAtMTA5Miw2ICsxMTc0LDggQEAgc3RhdGljIEJyb3dzZXJfV2luZG93 ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50 IHcKICAgICB3aW5kb3ctPnRvb2x0aXAudGV4dF9zZXQgPSBFSU5BX0ZBTFNFOwogICAgIHdpbmRv dy0+dG9vbHRpcC5zaG93biA9IEVJTkFfRkFMU0U7CiAKKyAgICB3aW5kb3ctPmNvbnRleHRfcG9w dXAgPSBOVUxMOworCiAgICAgLyogQ3JlYXRlIHdpbmRvdyAqLwogICAgIHdpbmRvdy0+ZWxtX3dp bmRvdyA9IGVsbV93aW5fYWRkKE5VTEwsICJtaW5pYnJvd3Nlci13aW5kb3ciLCBFTE1fV0lOX0JB U0lDKTsKICAgICBlbG1fd2luX3RpdGxlX3NldCh3aW5kb3ctPmVsbV93aW5kb3csIEFQUF9OQU1F KTsKQEAgLTExNzgsNiArMTI2Miw4IEBAIHN0YXRpYyBCcm93c2VyX1dpbmRvdyAqd2luZG93X2Ny ZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFyICp1cmwsIGludCB3CiAgICAgZXdr Vmlld0NsYXNzLT5mdWxsc2NyZWVuX2V4aXQgPSBvbl9mdWxsc2NyZWVuX2V4aXQ7CiAgICAgZXdr Vmlld0NsYXNzLT53aW5kb3dfY3JlYXRlID0gb25fd2luZG93X2NyZWF0ZTsKICAgICBld2tWaWV3 Q2xhc3MtPndpbmRvd19jbG9zZSA9IG9uX3dpbmRvd19jbG9zZTsKKyAgICBld2tWaWV3Q2xhc3Mt PmNvbnRleHRfbWVudV9zaG93ID0gb25fY29udGV4dF9tZW51X3Nob3c7CisgICAgZXdrVmlld0Ns YXNzLT5jb250ZXh0X21lbnVfaGlkZSA9IG9uX2NvbnRleHRfbWVudV9oaWRlOwogCiAgICAgRXZh cyAqZXZhcyA9IGV2YXNfb2JqZWN0X2V2YXNfZ2V0KHdpbmRvdy0+ZWxtX3dpbmRvdyk7CiAgICAg aWYgKGxlZ2FjeV9iZWhhdmlvcl9lbmFibGVkKSB7Cg== 184726 2013-01-25 04:37:38 -0800 2013-04-16 13:00:30 -0700 fixed patch contextmenu-minibrowser2.diff text/plain 4941 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmODgw NDA5Li42NDVkMDExIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDEtMjUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEltcGxl bWVudCBjb250ZXh0IG1lbnUgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGNvbnRleHQgbWVudSBzdXBwb3J0IGZvciBF RkwgcG9ydCB1c2luZyBFbGVtZW50YXJ5IGNvbnRleHQgcG9wdXAuCisKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAoX0Jyb3dzZXJfV2luZG93KToKKyAgICAgICAg KGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYik6CisgICAgICAgIChmaWxsX2NvbnRleHRf cG9wdXBfaXRlbXMpOgorICAgICAgICAob25fY29udGV4dF9tZW51X3Nob3cpOgorICAgICAgICAo b25fY29udGV4dF9tZW51X2hpZGUpOgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisKIDIwMTMt MDEtMjUgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNDA3NzQuCmRpZmYgLS1naXQgYS9Ub29scy9N aW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRl eCA3MTNlZGQzLi41NjY3MjA3IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFp bi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTkxLDYgKzkxLDcgQEAg dHlwZWRlZiBzdHJ1Y3QgX0Jyb3dzZXJfV2luZG93IHsKICAgICBFdmFzX09iamVjdCAqZm9yd2Fy ZF9idXR0b247CiAgICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsgCiAgICAgVG9vbHRpcF9JbmZv cm1hdGlvbiB0b29sdGlwOworICAgIEV2YXNfT2JqZWN0ICpjb250ZXh0X3BvcHVwOwogfSBCcm93 c2VyX1dpbmRvdzsKIAogdHlwZWRlZiBzdHJ1Y3QgX0ZpbGVfU2VsZWN0b3JfRGF0YSB7CkBAIC05 MDAsNiArOTAxLDg3IEBAIG9uX3dpbmRvd19jbG9zZShFd2tfVmlld19TbWFydF9EYXRhICpzbWFy dERhdGEpCiAgICAgd2luZG93X2Nsb3NlKHdpbmRvdyk7CiB9CiAKKworc3RhdGljIHZvaWQKK2Zp bGxfY29udGV4dF9wb3B1cF9pdGVtcyhCcm93c2VyX1dpbmRvdyAqd2luZG93LCBFd2tfQ29udGV4 dF9NZW51ICpld2tfbWVudSk7CisKK3N0YXRpYyB2b2lkCitjb250ZXh0X3BvcHVwX2l0ZW1fc2Vs ZWN0ZWRfY2Iodm9pZCAqZGF0YSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykK K3sKKyAgICBpZiAoIWRhdGEpCisgICAgICAgIHJldHVybjsKKworICAgIEV3a19Db250ZXh0X01l bnVfSXRlbSAqZXdrX2l0ZW0gPSAoRXdrX0NvbnRleHRfTWVudV9JdGVtICopZGF0YTsKKyAgICBl d2tfY29udGV4dF9tZW51X2l0ZW1fc2VsZWN0KGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRf bWVudV9nZXQoZXdrX2l0ZW0pLCBld2tfaXRlbSk7CisgICAgZXdrX2NvbnRleHRfbWVudV9oaWRl KGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoZXdrX2l0ZW0pKTsKK30KKwor c3RhdGljIHZvaWQKK2ZpbGxfY29udGV4dF9wb3B1cF9pdGVtcyhCcm93c2VyX1dpbmRvdyAqd2lu ZG93LCBFd2tfQ29udGV4dF9NZW51ICpld2tfbWVudSkKK3sKKyAgICBjb25zdCBFaW5hX0xpc3Qg Kmxpc3QgPSBld2tfY29udGV4dF9tZW51X2l0ZW1zX2dldChld2tfbWVudSk7CisgICAgY29uc3Qg RWluYV9MaXN0ICpsOworICAgIHZvaWQgKmRhdGE7CisKKyAgICBFd2tfQ29udGV4dF9NZW51X0l0 ZW0gKmV3a19pdGVtOworICAgIEVsbV9PYmplY3RfSXRlbSAqZWxtX3BvcHVwX2l0ZW07CisgICAg RXZhc19PYmplY3QgKmVsbV9jaGVja19pdGVtOworCisgICAgRUlOQV9MSVNUX0ZPUkVBQ0gobGlz dCwgbCwgZGF0YSkgeworICAgICAgICBld2tfaXRlbSA9IChFd2tfQ29udGV4dF9NZW51X0l0ZW0g KilkYXRhOworICAgICAgICBzd2l0Y2ggKGV3a19jb250ZXh0X21lbnVfaXRlbV90eXBlX2dldChl d2tfaXRlbSkpIHsKKyAgICAgICAgY2FzZSBFV0tfQUNUSU9OX1RZUEU6CisgICAgICAgICAgICBl bG1fcG9wdXBfaXRlbSA9IGVsbV9jdHhwb3B1cF9pdGVtX2FwcGVuZCh3aW5kb3ctPmNvbnRleHRf cG9wdXAsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBOVUxMLCBj b250ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2IsIGV3a19pdGVtKTsKKyAgICAgICAgICAgIGJy ZWFrOworICAgICAgICBjYXNlIEVXS19DSEVDS0FCTEVfQUNUSU9OX1RZUEU6CisgICAgICAgICAg ICBlbG1fY2hlY2tfaXRlbSA9IGVsbV9jaGVja19hZGQod2luZG93LT5jb250ZXh0X3BvcHVwKTsK KyAgICAgICAgICAgIGVsbV9wb3B1cF9pdGVtID0gZWxtX2N0eHBvcHVwX2l0ZW1fYXBwZW5kKHdp bmRvdy0+Y29udGV4dF9wb3B1cCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tf aXRlbSksIE5VTEwsIGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0ZW0pOwor ICAgICAgICAgICAgZWxtX29iamVjdF9pdGVtX2NvbnRlbnRfc2V0KGVsbV9wb3B1cF9pdGVtLCBl bG1fY2hlY2tfaXRlbSk7CisgICAgICAgICAgICBlbG1fY2hlY2tfc3RhdGVfc2V0KGVsbV9jaGVj a19pdGVtLCBld2tfY29udGV4dF9tZW51X2l0ZW1fY2hlY2tlZF9nZXQoZXdrX2l0ZW0pKTsKKyAg ICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgY29udGludWU7 CisgICAgICAgIH0KKyAgICAgICAgZWxtX29iamVjdF9pdGVtX2Rpc2FibGVkX3NldChlbG1fcG9w dXBfaXRlbSwgIWV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX2dldChld2tfaXRlbSkpOwor ICAgIH0KK30KKworc3RhdGljIEVpbmFfQm9vbAorb25fY29udGV4dF9tZW51X3Nob3coRXdrX1Zp ZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFd2tfQ29udGV4 dF9NZW51ICptZW51KQoreworICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfZmlu ZF93aXRoX2V3a192aWV3KHNkLT5zZWxmKTsKKworICAgIGlmICghd2luZG93IHx8ICFtZW51KQor ICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKworICAgIHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9 IGVsbV9jdHhwb3B1cF9hZGQod2luZG93LT5lbG1fd2luZG93KTsKKworICAgIGlmICghd2luZG93 LT5jb250ZXh0X3BvcHVwKQorICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKworICAgIGZpbGxf Y29udGV4dF9wb3B1cF9pdGVtcyh3aW5kb3csIG1lbnUpOworCisgICAgZXZhc19vYmplY3RfbW92 ZSh3aW5kb3ctPmNvbnRleHRfcG9wdXAsIHgsIHkpOworICAgIGV2YXNfb2JqZWN0X3Nob3cod2lu ZG93LT5jb250ZXh0X3BvcHVwKTsKKworICAgIHJldHVybiBFSU5BX1RSVUU7Cit9CisKK3N0YXRp YyBFaW5hX0Jvb2wKK29uX2NvbnRleHRfbWVudV9oaWRlKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNk KQoreworICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5kb3dfZmluZF93aXRoX2V3a192 aWV3KHNkLT5zZWxmKTsKKworICAgIGlmICghd2luZG93IHx8ICF3aW5kb3ctPmNvbnRleHRfcG9w dXApCisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworCisgICAgZWxtX2N0eHBvcHVwX2Rpc21p c3Mod2luZG93LT5jb250ZXh0X3BvcHVwKTsKKyAgICBldmFzX29iamVjdF9kZWwod2luZG93LT5j b250ZXh0X3BvcHVwKTsKKyAgICB3aW5kb3ctPmNvbnRleHRfcG9wdXAgPSBOVUxMOworCisgICAg cmV0dXJuIEVJTkFfVFJVRTsKK30KKwogc3RhdGljIHZvaWQKIGF1dGhfcG9wdXBfY2xvc2UoQXV0 aF9EYXRhICphdXRoX2RhdGEpCiB7CkBAIC0xMDkyLDYgKzExNzQsOCBAQCBzdGF0aWMgQnJvd3Nl cl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAq dXJsLCBpbnQgdwogICAgIHdpbmRvdy0+dG9vbHRpcC50ZXh0X3NldCA9IEVJTkFfRkFMU0U7CiAg ICAgd2luZG93LT50b29sdGlwLnNob3duID0gRUlOQV9GQUxTRTsKIAorICAgIHdpbmRvdy0+Y29u dGV4dF9wb3B1cCA9IE5VTEw7CisKICAgICAvKiBDcmVhdGUgd2luZG93ICovCiAgICAgd2luZG93 LT5lbG1fd2luZG93ID0gZWxtX3dpbl9hZGQoTlVMTCwgIm1pbmlicm93c2VyLXdpbmRvdyIsIEVM TV9XSU5fQkFTSUMpOwogICAgIGVsbV93aW5fdGl0bGVfc2V0KHdpbmRvdy0+ZWxtX3dpbmRvdywg QVBQX05BTUUpOwpAQCAtMTE3OCw2ICsxMjYyLDggQEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3 aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHcK ICAgICBld2tWaWV3Q2xhc3MtPmZ1bGxzY3JlZW5fZXhpdCA9IG9uX2Z1bGxzY3JlZW5fZXhpdDsK ICAgICBld2tWaWV3Q2xhc3MtPndpbmRvd19jcmVhdGUgPSBvbl93aW5kb3dfY3JlYXRlOwogICAg IGV3a1ZpZXdDbGFzcy0+d2luZG93X2Nsb3NlID0gb25fd2luZG93X2Nsb3NlOworICAgIGV3a1Zp ZXdDbGFzcy0+Y29udGV4dF9tZW51X3Nob3cgPSBvbl9jb250ZXh0X21lbnVfc2hvdzsKKyAgICBl d2tWaWV3Q2xhc3MtPmNvbnRleHRfbWVudV9oaWRlID0gb25fY29udGV4dF9tZW51X2hpZGU7CiAK ICAgICBFdmFzICpldmFzID0gZXZhc19vYmplY3RfZXZhc19nZXQod2luZG93LT5lbG1fd2luZG93 KTsKICAgICBpZiAobGVnYWN5X2JlaGF2aW9yX2VuYWJsZWQpIHsK 198392 2013-04-16 13:00:30 -0700 2013-04-17 00:43:52 -0700 rebased patch contextmenu-minibrowser3.diff text/plain 4947 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjZDc0 NWYwLi5lMTlmYmIyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDQtMTYgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEltcGxl bWVudCBjb250ZXh0IG1lbnUgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGNvbnRleHQgbWVudSBzdXBwb3J0IGZvciBF RkwgcG9ydCB1c2luZyBFbGVtZW50YXJ5IGNvbnRleHQgcG9wdXAuCisKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAoX0Jyb3dzZXJfV2luZG93KToKKyAgICAgICAg KGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYik6CisgICAgICAgIChmaWxsX2NvbnRleHRf cG9wdXBfaXRlbXMpOgorICAgICAgICAob25fY29udGV4dF9tZW51X3Nob3cpOgorICAgICAgICAo b25fY29udGV4dF9tZW51X2hpZGUpOgorICAgICAgICAod2luZG93X2NyZWF0ZSk6CisKIDIwMTMt MDQtMTMgIFJvZ2VyIEZvbmcgIDxyb2dlcl9mb25nQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJl dmlld2VkLiBEaXNhYmxlIFdpbkVXUyB0ZXN0cywgc2ltcGx5IG5vdCBlbm91Z2ggYm90cy4KZGlm ZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nl ci9lZmwvbWFpbi5jCmluZGV4IDgwMmQ1MTguLjQ2ZjFjZGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpA QCAtMTA4LDYgKzEwOCw3IEBAIHR5cGVkZWYgc3RydWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAg fSBzZWFyY2g7CiAgICAgaW50IGN1cnJlbnRfem9vbV9sZXZlbDsgCiAgICAgVG9vbHRpcF9JbmZv cm1hdGlvbiB0b29sdGlwOworICAgIEV2YXNfT2JqZWN0ICpjb250ZXh0X3BvcHVwOwogfSBCcm93 c2VyX1dpbmRvdzsKIAogdHlwZWRlZiBzdHJ1Y3QgX0ZpbGVfU2VsZWN0b3JfRGF0YSB7CkBAIC0x MTAzLDYgKzExMDQsODcgQEAgb25fd2luZG93X2Nsb3NlKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNt YXJ0RGF0YSkKICAgICB3aW5kb3dfY2xvc2Uod2luZG93KTsKIH0KIAorCitzdGF0aWMgdm9pZAor ZmlsbF9jb250ZXh0X3BvcHVwX2l0ZW1zKEJyb3dzZXJfV2luZG93ICp3aW5kb3csIEV3a19Db250 ZXh0X01lbnUgKmV3a19tZW51KTsKKworc3RhdGljIHZvaWQKK2NvbnRleHRfcG9wdXBfaXRlbV9z ZWxlY3RlZF9jYih2b2lkICpkYXRhLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZv KQoreworICAgIGlmICghZGF0YSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRXdrX0NvbnRleHRf TWVudV9JdGVtICpld2tfaXRlbSA9IChFd2tfQ29udGV4dF9NZW51X0l0ZW0gKilkYXRhOworICAg IGV3a19jb250ZXh0X21lbnVfaXRlbV9zZWxlY3QoZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVu dF9tZW51X2dldChld2tfaXRlbSksIGV3a19pdGVtKTsKKyAgICBld2tfY29udGV4dF9tZW51X2hp ZGUoZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChld2tfaXRlbSkpOworfQor CitzdGF0aWMgdm9pZAorZmlsbF9jb250ZXh0X3BvcHVwX2l0ZW1zKEJyb3dzZXJfV2luZG93ICp3 aW5kb3csIEV3a19Db250ZXh0X01lbnUgKmV3a19tZW51KQoreworICAgIGNvbnN0IEVpbmFfTGlz dCAqbGlzdCA9IGV3a19jb250ZXh0X21lbnVfaXRlbXNfZ2V0KGV3a19tZW51KTsKKyAgICBjb25z dCBFaW5hX0xpc3QgKmw7CisgICAgdm9pZCAqZGF0YTsKKworICAgIEV3a19Db250ZXh0X01lbnVf SXRlbSAqZXdrX2l0ZW07CisgICAgRWxtX09iamVjdF9JdGVtICplbG1fcG9wdXBfaXRlbTsKKyAg ICBFdmFzX09iamVjdCAqZWxtX2NoZWNrX2l0ZW07CisKKyAgICBFSU5BX0xJU1RfRk9SRUFDSChs aXN0LCBsLCBkYXRhKSB7CisgICAgICAgIGV3a19pdGVtID0gKEV3a19Db250ZXh0X01lbnVfSXRl bSAqKWRhdGE7CisgICAgICAgIHN3aXRjaCAoZXdrX2NvbnRleHRfbWVudV9pdGVtX3R5cGVfZ2V0 KGV3a19pdGVtKSkgeworICAgICAgICBjYXNlIEVXS19BQ1RJT05fVFlQRToKKyAgICAgICAgICAg IGVsbV9wb3B1cF9pdGVtID0gZWxtX2N0eHBvcHVwX2l0ZW1fYXBwZW5kKHdpbmRvdy0+Y29udGV4 dF9wb3B1cCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tfaXRlbSksIE5VTEws IGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0ZW0pOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIGNhc2UgRVdLX0NIRUNLQUJMRV9BQ1RJT05fVFlQRToKKyAgICAgICAg ICAgIGVsbV9jaGVja19pdGVtID0gZWxtX2NoZWNrX2FkZCh3aW5kb3ctPmNvbnRleHRfcG9wdXAp OworICAgICAgICAgICAgZWxtX3BvcHVwX2l0ZW0gPSBlbG1fY3R4cG9wdXBfaXRlbV9hcHBlbmQo d2luZG93LT5jb250ZXh0X3BvcHVwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3 a19pdGVtKSwgTlVMTCwgY29udGV4dF9wb3B1cF9pdGVtX3NlbGVjdGVkX2NiLCBld2tfaXRlbSk7 CisgICAgICAgICAgICBlbG1fb2JqZWN0X2l0ZW1fY29udGVudF9zZXQoZWxtX3BvcHVwX2l0ZW0s IGVsbV9jaGVja19pdGVtKTsKKyAgICAgICAgICAgIGVsbV9jaGVja19zdGF0ZV9zZXQoZWxtX2No ZWNrX2l0ZW0sIGV3a19jb250ZXh0X21lbnVfaXRlbV9jaGVja2VkX2dldChld2tfaXRlbSkpOwor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgfQorICAgICAgICBlbG1fb2JqZWN0X2l0ZW1fZGlzYWJsZWRfc2V0KGVsbV9w b3B1cF9pdGVtLCAhZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfZ2V0KGV3a19pdGVtKSk7 CisgICAgfQorfQorCitzdGF0aWMgRWluYV9Cb29sCitvbl9jb250ZXh0X21lbnVfc2hvdyhFd2tf Vmlld19TbWFydF9EYXRhICpzZCwgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV3a19Db250 ZXh0X01lbnUgKm1lbnUpCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19m aW5kX3dpdGhfZXdrX3ZpZXcoc2QtPnNlbGYpOworCisgICAgaWYgKCF3aW5kb3cgfHwgIW1lbnUp CisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworCisgICAgd2luZG93LT5jb250ZXh0X3BvcHVw ID0gZWxtX2N0eHBvcHVwX2FkZCh3aW5kb3ctPmVsbV93aW5kb3cpOworCisgICAgaWYgKCF3aW5k b3ctPmNvbnRleHRfcG9wdXApCisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworCisgICAgZmls bF9jb250ZXh0X3BvcHVwX2l0ZW1zKHdpbmRvdywgbWVudSk7CisKKyAgICBldmFzX29iamVjdF9t b3ZlKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgeCwgeSk7CisgICAgZXZhc19vYmplY3Rfc2hvdyh3 aW5kb3ctPmNvbnRleHRfcG9wdXApOworCisgICAgcmV0dXJuIEVJTkFfVFJVRTsKK30KKworc3Rh dGljIEVpbmFfQm9vbAorb25fY29udGV4dF9tZW51X2hpZGUoRXdrX1ZpZXdfU21hcnRfRGF0YSAq c2QpCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19maW5kX3dpdGhfZXdr X3ZpZXcoc2QtPnNlbGYpOworCisgICAgaWYgKCF3aW5kb3cgfHwgIXdpbmRvdy0+Y29udGV4dF9w b3B1cCkKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFMU0U7CisKKyAgICBlbG1fY3R4cG9wdXBfZGlz bWlzcyh3aW5kb3ctPmNvbnRleHRfcG9wdXApOworICAgIGV2YXNfb2JqZWN0X2RlbCh3aW5kb3ct PmNvbnRleHRfcG9wdXApOworICAgIHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9IE5VTEw7CisKKyAg ICByZXR1cm4gRUlOQV9UUlVFOworfQorCiBzdGF0aWMgdm9pZAogYXV0aF9wb3B1cF9jbG9zZShB dXRoX0RhdGEgKmF1dGhfZGF0YSkKIHsKQEAgLTEyOTUsNiArMTM3Nyw4IEBAIHN0YXRpYyBCcm93 c2VyX1dpbmRvdyAqd2luZG93X2NyZWF0ZShFdmFzX09iamVjdCAqb3BlbmVyLCBjb25zdCBjaGFy ICp1cmwsIGludCB3CiAgICAgd2luZG93LT50b29sdGlwLnRleHRfc2V0ID0gRUlOQV9GQUxTRTsK ICAgICB3aW5kb3ctPnRvb2x0aXAuc2hvd24gPSBFSU5BX0ZBTFNFOwogCisgICAgd2luZG93LT5j b250ZXh0X3BvcHVwID0gTlVMTDsKKwogICAgIC8qIENyZWF0ZSB3aW5kb3cgKi8KICAgICB3aW5k b3ctPmVsbV93aW5kb3cgPSBlbG1fd2luX2FkZChOVUxMLCAibWluaWJyb3dzZXItd2luZG93Iiwg RUxNX1dJTl9CQVNJQyk7CiAgICAgZWxtX3dpbl90aXRsZV9zZXQod2luZG93LT5lbG1fd2luZG93 LCBBUFBfTkFNRSk7CkBAIC0xNDIzLDYgKzE1MDcsOCBAQCBzdGF0aWMgQnJvd3Nlcl9XaW5kb3cg KndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3QgY2hhciAqdXJsLCBpbnQg dwogICAgIGV3a1ZpZXdDbGFzcy0+d2luZG93X2Nsb3NlID0gb25fd2luZG93X2Nsb3NlOwogICAg IGV3a1ZpZXdDbGFzcy0+cG9wdXBfbWVudV9zaG93ID0gb25fcG9wdXBfbWVudV9zaG93OwogICAg IGV3a1ZpZXdDbGFzcy0+cG9wdXBfbWVudV9oaWRlID0gb25fcG9wdXBfbWVudV9oaWRlOworICAg IGV3a1ZpZXdDbGFzcy0+Y29udGV4dF9tZW51X3Nob3cgPSBvbl9jb250ZXh0X21lbnVfc2hvdzsK KyAgICBld2tWaWV3Q2xhc3MtPmNvbnRleHRfbWVudV9oaWRlID0gb25fY29udGV4dF9tZW51X2hp ZGU7CiAKICAgICBFdmFzICpldmFzID0gZXZhc19vYmplY3RfZXZhc19nZXQod2luZG93LT5lbG1f d2luZG93KTsKICAgICBpZiAobGVnYWN5X2JlaGF2aW9yX2VuYWJsZWQpIHsK 198475 2013-04-17 00:43:52 -0700 2013-04-17 07:19:01 -0700 fixes after review contextmenu-minibrowser4.diff text/plain 5350 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkMzhi ZmIxLi4wZGEzZDNmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDQtMTcgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEltcGxl bWVudCBjb250ZXh0IG1lbnUgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVkIGNvbnRleHQgbWVudSBzdXBwb3J0IGZvciBF RkwgcG9ydCB1c2luZyBFbGVtZW50YXJ5IGNvbnRleHQgcG9wdXAuCisKKyAgICAgICAgKiBNaW5p QnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAoX0Jyb3dzZXJfV2luZG93KToKKyAgICAgICAg KGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYik6CisgICAgICAgIChjb250ZXh0X3BvcHVw X3BvcHVsYXRlKToKKyAgICAgICAgKG9uX2NvbnRleHRfbWVudV9zaG93KToKKyAgICAgICAgKG9u X2NvbnRleHRfbWVudV9oaWRlKToKKyAgICAgICAgKHdpbmRvd19jcmVhdGUpOgorCiAyMDEzLTA0 LTE2ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CiAKICAgICAgICAg QWRkIEVmbCBXZWJLaXQyIEVXUyBib3QKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2Vm bC9tYWluLmMgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCmluZGV4IDgwMmQ1MTguLjcx ZmY2YTkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKKysrIGIvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpAQCAtMTA4LDYgKzEwOCw3IEBAIHR5cGVkZWYgc3Ry dWN0IF9Ccm93c2VyX1dpbmRvdyB7CiAgICAgfSBzZWFyY2g7CiAgICAgaW50IGN1cnJlbnRfem9v bV9sZXZlbDsgCiAgICAgVG9vbHRpcF9JbmZvcm1hdGlvbiB0b29sdGlwOworICAgIEV2YXNfT2Jq ZWN0ICpjb250ZXh0X3BvcHVwOwogfSBCcm93c2VyX1dpbmRvdzsKIAogdHlwZWRlZiBzdHJ1Y3Qg X0ZpbGVfU2VsZWN0b3JfRGF0YSB7CkBAIC0xMTA0LDYgKzExMDUsOTYgQEAgb25fd2luZG93X2Ns b3NlKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNtYXJ0RGF0YSkKIH0KIAogc3RhdGljIHZvaWQKK2Nv bnRleHRfcG9wdXBfcG9wdWxhdGUoQnJvd3Nlcl9XaW5kb3cgKndpbmRvdywgRXdrX0NvbnRleHRf TWVudSAqZXdrX21lbnUpOworCitzdGF0aWMgdm9pZAorY29udGV4dF9wb3B1cF9pdGVtX3NlbGVj dGVkX2NiKHZvaWQgKmRhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCit7 CisgICAgaWYgKCFkYXRhKSB7CisgICAgICAgIGluZm8oIkVSUk9SOiBjb250ZXh0IHBvcHVwIGNh bGxiYWNrIGRhdGEgaXMgTlVMTC5cbiIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAg RXdrX0NvbnRleHRfTWVudV9JdGVtICpld2tfaXRlbSA9IChFd2tfQ29udGV4dF9NZW51X0l0ZW0g KilkYXRhOworICAgIGluZm8oIlNlbGVjdGVkIGNvbnRleHQgcG9wdXAgaXRlbTogJXMuXG4iLCBl d2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSk7CisgICAgZXdrX2NvbnRl eHRfbWVudV9pdGVtX3NlbGVjdChld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0 KGV3a19pdGVtKSwgZXdrX2l0ZW0pOworICAgIGV3a19jb250ZXh0X21lbnVfaGlkZShld2tfY29u dGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGV3a19pdGVtKSk7Cit9CisKK3N0YXRpYyB2 b2lkCitjb250ZXh0X3BvcHVwX3BvcHVsYXRlKEJyb3dzZXJfV2luZG93ICp3aW5kb3csIEV3a19D b250ZXh0X01lbnUgKmV3a19tZW51KQoreworICAgIGNvbnN0IEVpbmFfTGlzdCAqbGlzdCA9IGV3 a19jb250ZXh0X21lbnVfaXRlbXNfZ2V0KGV3a19tZW51KTsKKyAgICBjb25zdCBFaW5hX0xpc3Qg Kmw7CisgICAgdm9pZCAqZGF0YTsKKworICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdrX2l0 ZW07CisgICAgRWxtX09iamVjdF9JdGVtICplbG1fcG9wdXBfaXRlbTsKKyAgICBFdmFzX09iamVj dCAqZWxtX2NoZWNrX2l0ZW07CisKKyAgICBFSU5BX0xJU1RfRk9SRUFDSChsaXN0LCBsLCBkYXRh KSB7CisgICAgICAgIGV3a19pdGVtID0gKEV3a19Db250ZXh0X01lbnVfSXRlbSAqKWRhdGE7Cisg ICAgICAgIHN3aXRjaCAoZXdrX2NvbnRleHRfbWVudV9pdGVtX3R5cGVfZ2V0KGV3a19pdGVtKSkg eworICAgICAgICBjYXNlIEVXS19BQ1RJT05fVFlQRToKKyAgICAgICAgICAgIGVsbV9wb3B1cF9p dGVtID0gZWxtX2N0eHBvcHVwX2l0ZW1fYXBwZW5kKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgZXdr X2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tfaXRlbSksIE5VTEwsIGNvbnRleHRfcG9w dXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0ZW0pOworICAgICAgICAgICAgYnJlYWs7CisgICAg ICAgIGNhc2UgRVdLX0NIRUNLQUJMRV9BQ1RJT05fVFlQRToKKyAgICAgICAgICAgIGVsbV9jaGVj a19pdGVtID0gZWxtX2NoZWNrX2FkZCh3aW5kb3ctPmNvbnRleHRfcG9wdXApOworICAgICAgICAg ICAgZWxtX3BvcHVwX2l0ZW0gPSBlbG1fY3R4cG9wdXBfaXRlbV9hcHBlbmQod2luZG93LT5jb250 ZXh0X3BvcHVwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGV3a19pdGVtKSwgTlVM TCwgY29udGV4dF9wb3B1cF9pdGVtX3NlbGVjdGVkX2NiLCBld2tfaXRlbSk7CisgICAgICAgICAg ICBlbG1fb2JqZWN0X2l0ZW1fY29udGVudF9zZXQoZWxtX3BvcHVwX2l0ZW0sIGVsbV9jaGVja19p dGVtKTsKKyAgICAgICAgICAgIGVsbV9jaGVja19zdGF0ZV9zZXQoZWxtX2NoZWNrX2l0ZW0sIGV3 a19jb250ZXh0X21lbnVfaXRlbV9jaGVja2VkX2dldChld2tfaXRlbSkpOworICAgICAgICAgICAg YnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg fQorICAgICAgICBlbG1fb2JqZWN0X2l0ZW1fZGlzYWJsZWRfc2V0KGVsbV9wb3B1cF9pdGVtLCAh ZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfZ2V0KGV3a19pdGVtKSk7CisgICAgfQorfQor CitzdGF0aWMgRWluYV9Cb29sCitvbl9jb250ZXh0X21lbnVfc2hvdyhFd2tfVmlld19TbWFydF9E YXRhICpzZCwgRXZhc19Db29yZCB4LCBFdmFzX0Nvb3JkIHksIEV3a19Db250ZXh0X01lbnUgKm1l bnUpCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRvdyA9IHdpbmRvd19maW5kX3dpdGhfZXdr X3ZpZXcoc2QtPnNlbGYpOworCisgICAgaWYgKCF3aW5kb3cgfHwgIW1lbnUpIHsKKyAgICAgICAg aW5mbygiRVJST1I6IG5lY2Vzc2FyeSBvYmplY3RzIGFyZSBOVUxMLlxuIik7CisgICAgICAgIHJl dHVybiBFSU5BX0ZBTFNFOworICAgIH0KKworICAgIHdpbmRvdy0+Y29udGV4dF9wb3B1cCA9IGVs bV9jdHhwb3B1cF9hZGQod2luZG93LT5lbG1fd2luZG93KTsKKworICAgIGlmICghd2luZG93LT5j b250ZXh0X3BvcHVwKSB7CisgICAgICAgIGluZm8oIkVSUk9SOiBjb3VsZCBub3QgY3JlYXRlIGNv bnRleHQgcG9wdXAgd2lkZ2V0LlxuIik7CisgICAgICAgIHJldHVybiBFSU5BX0ZBTFNFOworICAg IH0KKworICAgIGNvbnRleHRfcG9wdXBfcG9wdWxhdGUod2luZG93LCBtZW51KTsKKworICAgIGlu Zm8oIlNob3dpbmcgY29udGV4dCBwb3B1cCBhdCAoJWQsICVkKS5cbiIsIHgsIHkpOworICAgIGV2 YXNfb2JqZWN0X21vdmUod2luZG93LT5jb250ZXh0X3BvcHVwLCB4LCB5KTsKKyAgICBldmFzX29i amVjdF9zaG93KHdpbmRvdy0+Y29udGV4dF9wb3B1cCk7CisKKyAgICByZXR1cm4gRUlOQV9UUlVF OworfQorCitzdGF0aWMgRWluYV9Cb29sCitvbl9jb250ZXh0X21lbnVfaGlkZShFd2tfVmlld19T bWFydF9EYXRhICpzZCkKK3sKKyAgICBCcm93c2VyX1dpbmRvdyAqd2luZG93ID0gd2luZG93X2Zp bmRfd2l0aF9ld2tfdmlldyhzZC0+c2VsZik7CisKKyAgICBpZiAoIXdpbmRvdyB8fCAhd2luZG93 LT5jb250ZXh0X3BvcHVwKSB7CisgICAgICAgIGluZm8oIkVSUk9SOiBuZWNlc3Nhcnkgb2JqZWN0 cyBhcmUgTlVMTC5cbiIpOworICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKyAgICB9CisKKyAg ICBlbG1fY3R4cG9wdXBfZGlzbWlzcyh3aW5kb3ctPmNvbnRleHRfcG9wdXApOworICAgIGV2YXNf b2JqZWN0X2RlbCh3aW5kb3ctPmNvbnRleHRfcG9wdXApOworICAgIHdpbmRvdy0+Y29udGV4dF9w b3B1cCA9IE5VTEw7CisKKyAgICByZXR1cm4gRUlOQV9UUlVFOworfQorCitzdGF0aWMgdm9pZAog YXV0aF9wb3B1cF9jbG9zZShBdXRoX0RhdGEgKmF1dGhfZGF0YSkKIHsKICAgICBld2tfb2JqZWN0 X3VucmVmKGF1dGhfZGF0YS0+cmVxdWVzdCk7CkBAIC0xMjk1LDYgKzEzODYsOCBAQCBzdGF0aWMg QnJvd3Nlcl9XaW5kb3cgKndpbmRvd19jcmVhdGUoRXZhc19PYmplY3QgKm9wZW5lciwgY29uc3Qg Y2hhciAqdXJsLCBpbnQgdwogICAgIHdpbmRvdy0+dG9vbHRpcC50ZXh0X3NldCA9IEVJTkFfRkFM U0U7CiAgICAgd2luZG93LT50b29sdGlwLnNob3duID0gRUlOQV9GQUxTRTsKIAorICAgIHdpbmRv dy0+Y29udGV4dF9wb3B1cCA9IE5VTEw7CisKICAgICAvKiBDcmVhdGUgd2luZG93ICovCiAgICAg d2luZG93LT5lbG1fd2luZG93ID0gZWxtX3dpbl9hZGQoTlVMTCwgIm1pbmlicm93c2VyLXdpbmRv dyIsIEVMTV9XSU5fQkFTSUMpOwogICAgIGVsbV93aW5fdGl0bGVfc2V0KHdpbmRvdy0+ZWxtX3dp bmRvdywgQVBQX05BTUUpOwpAQCAtMTQyMyw2ICsxNTE2LDggQEAgc3RhdGljIEJyb3dzZXJfV2lu ZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwg aW50IHcKICAgICBld2tWaWV3Q2xhc3MtPndpbmRvd19jbG9zZSA9IG9uX3dpbmRvd19jbG9zZTsK ICAgICBld2tWaWV3Q2xhc3MtPnBvcHVwX21lbnVfc2hvdyA9IG9uX3BvcHVwX21lbnVfc2hvdzsK ICAgICBld2tWaWV3Q2xhc3MtPnBvcHVwX21lbnVfaGlkZSA9IG9uX3BvcHVwX21lbnVfaGlkZTsK KyAgICBld2tWaWV3Q2xhc3MtPmNvbnRleHRfbWVudV9zaG93ID0gb25fY29udGV4dF9tZW51X3No b3c7CisgICAgZXdrVmlld0NsYXNzLT5jb250ZXh0X21lbnVfaGlkZSA9IG9uX2NvbnRleHRfbWVu dV9oaWRlOwogCiAgICAgRXZhcyAqZXZhcyA9IGV2YXNfb2JqZWN0X2V2YXNfZ2V0KHdpbmRvdy0+ ZWxtX3dpbmRvdyk7CiAgICAgaWYgKGxlZ2FjeV9iZWhhdmlvcl9lbmFibGVkKSB7Cg== 198506 2013-04-17 07:19:01 -0700 2013-04-17 07:47:53 -0700 fixes contextmenu-minibrowser5.diff text/plain 4978 mpakulavelrutka ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlNzQy NDBkLi5mNjU5MzU5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTMtMDQtMTcgIE1pY2hhxYIgUGFrdcWCYSB2ZWwg UnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEltcGxl bWVudCBjb250ZXh0IG1lbnUgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjkzMgorCisgICAgICAgIFJldmlld2VkIGJ5IEd5 dXlvdW5nIEtpbS4KKworICAgICAgICBBZGRlZCBjb250ZXh0IG1lbnUgc3VwcG9ydCBmb3IgRUZM IHBvcnQgdXNpbmcgRWxlbWVudGFyeSBjb250ZXh0IHBvcHVwLgorCisgICAgICAgICogTWluaUJy b3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKF9Ccm93c2VyX1dpbmRvdyk6CisgICAgICAgIChj b250ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2IpOgorICAgICAgICAoY29udGV4dF9wb3B1cF9w b3B1bGF0ZSk6CisgICAgICAgIChvbl9jb250ZXh0X21lbnVfc2hvdyk6CisgICAgICAgIChvbl9j b250ZXh0X21lbnVfaGlkZSk6CisgICAgICAgICh3aW5kb3dfY3JlYXRlKToKKwogMjAxMy0wNC0x NyAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JF U1NJT04ocjE0ODU4OCk6IEl0IGJyb2tlIHRoZSBRdCBXSzIgRVdTCmRpZmYgLS1naXQgYS9Ub29s cy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwpp bmRleCA4MDJkNTE4Li4wYzJkOTU3IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwv bWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTEwOCw2ICsxMDgs NyBAQCB0eXBlZGVmIHN0cnVjdCBfQnJvd3Nlcl9XaW5kb3cgewogICAgIH0gc2VhcmNoOwogICAg IGludCBjdXJyZW50X3pvb21fbGV2ZWw7IAogICAgIFRvb2x0aXBfSW5mb3JtYXRpb24gdG9vbHRp cDsKKyAgICBFdmFzX09iamVjdCAqY29udGV4dF9wb3B1cDsKIH0gQnJvd3Nlcl9XaW5kb3c7CiAK IHR5cGVkZWYgc3RydWN0IF9GaWxlX1NlbGVjdG9yX0RhdGEgewpAQCAtMTEwNCw2ICsxMTA1LDk2 IEBAIG9uX3dpbmRvd19jbG9zZShFd2tfVmlld19TbWFydF9EYXRhICpzbWFydERhdGEpCiB9CiAK IHN0YXRpYyB2b2lkCitjb250ZXh0X3BvcHVwX3BvcHVsYXRlKEJyb3dzZXJfV2luZG93ICp3aW5k b3csIEV3a19Db250ZXh0X01lbnUgKmV3a19tZW51KTsKKworc3RhdGljIHZvaWQKK2NvbnRleHRf cG9wdXBfaXRlbV9zZWxlY3RlZF9jYih2b2lkICpkYXRhLCBFdmFzX09iamVjdCAqb2JqLCB2b2lk ICpldmVudF9pbmZvKQoreworICAgIGlmICghZGF0YSkgeworICAgICAgICBpbmZvKCJFUlJPUjog Y29udGV4dCBwb3B1cCBjYWxsYmFjayBkYXRhIGlzIE5VTEwuXG4iKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKworICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSAqZXdrX2l0ZW0gPSAoRXdrX0Nv bnRleHRfTWVudV9JdGVtICopZGF0YTsKKyAgICBpbmZvKCJTZWxlY3RlZCBjb250ZXh0IHBvcHVw IGl0ZW06ICVzLlxuIiwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChld2tfaXRlbSkp OworICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9zZWxlY3QoZXdrX2NvbnRleHRfbWVudV9pdGVt X3BhcmVudF9tZW51X2dldChld2tfaXRlbSksIGV3a19pdGVtKTsKKyAgICBld2tfY29udGV4dF9t ZW51X2hpZGUoZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChld2tfaXRlbSkp OworfQorCitzdGF0aWMgdm9pZAorY29udGV4dF9wb3B1cF9wb3B1bGF0ZShCcm93c2VyX1dpbmRv dyAqd2luZG93LCBFd2tfQ29udGV4dF9NZW51ICpld2tfbWVudSkKK3sKKyAgICBjb25zdCBFaW5h X0xpc3QgKmxpc3QgPSBld2tfY29udGV4dF9tZW51X2l0ZW1zX2dldChld2tfbWVudSk7CisgICAg Y29uc3QgRWluYV9MaXN0ICpsOworICAgIHZvaWQgKmRhdGE7CisKKyAgICBFd2tfQ29udGV4dF9N ZW51X0l0ZW0gKmV3a19pdGVtOworICAgIEVsbV9PYmplY3RfSXRlbSAqZWxtX3BvcHVwX2l0ZW07 CisgICAgRXZhc19PYmplY3QgKmVsbV9jaGVja19pdGVtOworCisgICAgRUlOQV9MSVNUX0ZPUkVB Q0gobGlzdCwgbCwgZGF0YSkgeworICAgICAgICBld2tfaXRlbSA9IChFd2tfQ29udGV4dF9NZW51 X0l0ZW0gKilkYXRhOworICAgICAgICBzd2l0Y2ggKGV3a19jb250ZXh0X21lbnVfaXRlbV90eXBl X2dldChld2tfaXRlbSkpIHsKKyAgICAgICAgY2FzZSBFV0tfQUNUSU9OX1RZUEU6CisgICAgICAg ICAgICBlbG1fcG9wdXBfaXRlbSA9IGVsbV9jdHhwb3B1cF9pdGVtX2FwcGVuZCh3aW5kb3ctPmNv bnRleHRfcG9wdXAsIGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoZXdrX2l0ZW0pLCBO VUxMLCBjb250ZXh0X3BvcHVwX2l0ZW1fc2VsZWN0ZWRfY2IsIGV3a19pdGVtKTsKKyAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBjYXNlIEVXS19DSEVDS0FCTEVfQUNUSU9OX1RZUEU6CisgICAg ICAgICAgICBlbG1fY2hlY2tfaXRlbSA9IGVsbV9jaGVja19hZGQod2luZG93LT5jb250ZXh0X3Bv cHVwKTsKKyAgICAgICAgICAgIGVsbV9wb3B1cF9pdGVtID0gZWxtX2N0eHBvcHVwX2l0ZW1fYXBw ZW5kKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dl dChld2tfaXRlbSksIE5VTEwsIGNvbnRleHRfcG9wdXBfaXRlbV9zZWxlY3RlZF9jYiwgZXdrX2l0 ZW0pOworICAgICAgICAgICAgZWxtX29iamVjdF9pdGVtX2NvbnRlbnRfc2V0KGVsbV9wb3B1cF9p dGVtLCBlbG1fY2hlY2tfaXRlbSk7CisgICAgICAgICAgICBlbG1fY2hlY2tfc3RhdGVfc2V0KGVs bV9jaGVja19pdGVtLCBld2tfY29udGV4dF9tZW51X2l0ZW1fY2hlY2tlZF9nZXQoZXdrX2l0ZW0p KTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgIH0KKyAgICAgICAgZWxtX29iamVjdF9pdGVtX2Rpc2FibGVkX3NldChl bG1fcG9wdXBfaXRlbSwgIWV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX2dldChld2tfaXRl bSkpOworICAgIH0KK30KKworc3RhdGljIEVpbmFfQm9vbAorb25fY29udGV4dF9tZW51X3Nob3co RXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QsIEV2YXNfQ29vcmQgeCwgRXZhc19Db29yZCB5LCBFd2tf Q29udGV4dF9NZW51ICptZW51KQoreworICAgIEJyb3dzZXJfV2luZG93ICp3aW5kb3cgPSB3aW5k b3dfZmluZF93aXRoX2V3a192aWV3KHNkLT5zZWxmKTsKKworICAgIGlmICghd2luZG93IHx8ICFt ZW51KSB7CisgICAgICAgIGluZm8oIkVSUk9SOiBuZWNlc3Nhcnkgb2JqZWN0cyBhcmUgTlVMTC5c biIpOworICAgICAgICByZXR1cm4gRUlOQV9GQUxTRTsKKyAgICB9CisKKyAgICB3aW5kb3ctPmNv bnRleHRfcG9wdXAgPSBlbG1fY3R4cG9wdXBfYWRkKHdpbmRvdy0+ZWxtX3dpbmRvdyk7CisKKyAg ICBpZiAoIXdpbmRvdy0+Y29udGV4dF9wb3B1cCkgeworICAgICAgICBpbmZvKCJFUlJPUjogY291 bGQgbm90IGNyZWF0ZSBjb250ZXh0IHBvcHVwIHdpZGdldC5cbiIpOworICAgICAgICByZXR1cm4g RUlOQV9GQUxTRTsKKyAgICB9CisKKyAgICBjb250ZXh0X3BvcHVwX3BvcHVsYXRlKHdpbmRvdywg bWVudSk7CisKKyAgICBpbmZvKCJTaG93aW5nIGNvbnRleHQgcG9wdXAgYXQgKCVkLCAlZCkuXG4i LCB4LCB5KTsKKyAgICBldmFzX29iamVjdF9tb3ZlKHdpbmRvdy0+Y29udGV4dF9wb3B1cCwgeCwg eSk7CisgICAgZXZhc19vYmplY3Rfc2hvdyh3aW5kb3ctPmNvbnRleHRfcG9wdXApOworCisgICAg cmV0dXJuIEVJTkFfVFJVRTsKK30KKworc3RhdGljIEVpbmFfQm9vbAorb25fY29udGV4dF9tZW51 X2hpZGUoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QpCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndp bmRvdyA9IHdpbmRvd19maW5kX3dpdGhfZXdrX3ZpZXcoc2QtPnNlbGYpOworCisgICAgaWYgKCF3 aW5kb3cgfHwgIXdpbmRvdy0+Y29udGV4dF9wb3B1cCkgeworICAgICAgICBpbmZvKCJFUlJPUjog bmVjZXNzYXJ5IG9iamVjdHMgYXJlIE5VTEwuXG4iKTsKKyAgICAgICAgcmV0dXJuIEVJTkFfRkFM U0U7CisgICAgfQorCisgICAgZWxtX2N0eHBvcHVwX2Rpc21pc3Mod2luZG93LT5jb250ZXh0X3Bv cHVwKTsKKyAgICBldmFzX29iamVjdF9kZWwod2luZG93LT5jb250ZXh0X3BvcHVwKTsKKyAgICB3 aW5kb3ctPmNvbnRleHRfcG9wdXAgPSBOVUxMOworCisgICAgcmV0dXJuIEVJTkFfVFJVRTsKK30K Kworc3RhdGljIHZvaWQKIGF1dGhfcG9wdXBfY2xvc2UoQXV0aF9EYXRhICphdXRoX2RhdGEpCiB7 CiAgICAgZXdrX29iamVjdF91bnJlZihhdXRoX2RhdGEtPnJlcXVlc3QpOwpAQCAtMTQyMyw2ICsx NTE0LDggQEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3JlYXRlKEV2YXNfT2JqZWN0 ICpvcGVuZXIsIGNvbnN0IGNoYXIgKnVybCwgaW50IHcKICAgICBld2tWaWV3Q2xhc3MtPndpbmRv d19jbG9zZSA9IG9uX3dpbmRvd19jbG9zZTsKICAgICBld2tWaWV3Q2xhc3MtPnBvcHVwX21lbnVf c2hvdyA9IG9uX3BvcHVwX21lbnVfc2hvdzsKICAgICBld2tWaWV3Q2xhc3MtPnBvcHVwX21lbnVf aGlkZSA9IG9uX3BvcHVwX21lbnVfaGlkZTsKKyAgICBld2tWaWV3Q2xhc3MtPmNvbnRleHRfbWVu dV9zaG93ID0gb25fY29udGV4dF9tZW51X3Nob3c7CisgICAgZXdrVmlld0NsYXNzLT5jb250ZXh0 X21lbnVfaGlkZSA9IG9uX2NvbnRleHRfbWVudV9oaWRlOwogCiAgICAgRXZhcyAqZXZhcyA9IGV2 YXNfb2JqZWN0X2V2YXNfZ2V0KHdpbmRvdy0+ZWxtX3dpbmRvdyk7CiAgICAgaWYgKGxlZ2FjeV9i ZWhhdmlvcl9lbmFibGVkKSB7Cg==