107510 2013-01-21 23:46:26 -0800 [EFL][WK2] Add an API for getting context menu item's parent menu 2013-04-16 08:35:53 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 109698 102932 1 mpakulavelrutka mpakulavelrutka buildbot commit-queue dglazkov gyuyoung.kim lucas.de.marchi rakuco rniwa webkit.review.bot oldest_to_newest 812664 0 mpakulavelrutka 2013-01-21 23:46:26 -0800 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. 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. 812688 1 183907 mpakulavelrutka 2013-01-22 00:11:59 -0800 Created attachment 183907 patch 812750 2 183907 webkit.review.bot 2013-01-22 01:08:27 -0800 Comment on attachment 183907 patch Attachment 183907 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16037465 New failing tests: inspector-protocol/debugger-terminate-dedicated-worker-while-paused.html 812763 3 183920 mpakulavelrutka 2013-01-22 01:20:40 -0800 Created attachment 183920 fixes removed const from parentMenu() in ewk_context_menu_item_private.h 812950 4 183920 buildbot 2013-01-22 05:25:50 -0800 Comment on attachment 183920 fixes Attachment 183920 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/16035583 New failing tests: svg/as-image/img-relative-height.html 816470 5 184723 mpakulavelrutka 2013-01-25 04:27:41 -0800 Created attachment 184723 fixed patch added guard in ewk_context_menu.cpp 833997 6 188564 mpakulavelrutka 2013-02-15 07:17:27 -0800 Created attachment 188564 rebased patch 834007 7 188564 mikhail.pozdnyakov 2013-02-15 07:30:12 -0800 Comment on attachment 188564 rebased patch View in context: https://bugs.webkit.org/attachment.cgi?id=188564&action=review > Source/WebKit2/UIProcess/API/efl/ewk_context_menu.cpp:66 > + m_contextMenuItems = eina_list_append(m_contextMenuItems, item); if (EwkContextMenuItem* item = static_cast<EwkContextMenuItem*>(data)) { ... } and "if (!data) continue;" could be skipped. > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:41 > + static PassOwnPtr<EwkContextMenuItem> create(WKContextMenuItemRef item, EwkContextMenu* parentMenu) if parentMenu can be null maybe it's worth making default value for it? 835326 8 188564 mpakulavelrutka 2013-02-18 04:18:14 -0800 Comment on attachment 188564 rebased patch View in context: https://bugs.webkit.org/attachment.cgi?id=188564&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu.cpp:66 >> + m_contextMenuItems = eina_list_append(m_contextMenuItems, item); > > if (EwkContextMenuItem* item = static_cast<EwkContextMenuItem*>(data)) { > ... > } and "if (!data) continue;" could be skipped. OK >> Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:41 >> + static PassOwnPtr<EwkContextMenuItem> create(WKContextMenuItemRef item, EwkContextMenu* parentMenu) > > if parentMenu can be null maybe it's worth making default value for it? OK, I will add default NULL value 835403 9 188865 mpakulavelrutka 2013-02-18 05:55:40 -0800 Created attachment 188865 fixes after review fixes after Mikhail's review 875782 10 198123 mpakulavelrutka 2013-04-15 07:09:46 -0700 Created attachment 198123 rebased patch 875801 11 198123 mikhail.pozdnyakov 2013-04-15 07:33:29 -0700 Comment on attachment 198123 rebased patch lgtm 876048 12 198123 benjamin 2013-04-15 13:55:35 -0700 Comment on attachment 198123 rebased patch View in context: https://bugs.webkit.org/attachment.cgi?id=198123&action=review Signed off by me for WebKit2 if fixed. The patch needs a review from a EFL reviewer. For all the comments in test_ewk2_context_menu.cpp: your comment should not explain the next line. Instead, it should say _why_ that particular value is expected. > Source/WebKit2/UIProcess/API/efl/ewk_context_menu_item_private.h:66 > + EwkContextMenu* parentMenu() { return m_parentMenu; } const > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:49 > + // Check if parent menu equals when context menu items where created by WebKit. where -> were > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:73 > + // Check if parent menu equals when context menu items where created using ewk_context_menu_item_new and added using ewk_context_menu_item_append. ? "Check if parent menu equals when" ? > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:85 > + // Check if parent menu equals when context menu items where created using ewk_context_menu_new_with_items Ditto. > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context_menu.cpp:93 > + // Check if parent menu equals when context menu items where created using ewk_context_menu_item_new_with_submenu and added using ewk_context_menu_item_append. Ditto. 876457 13 198296 mpakulavelrutka 2013-04-16 02:45:30 -0700 Created attachment 198296 fixes 876557 14 198296 commit-queue 2013-04-16 08:33:13 -0700 Comment on attachment 198296 fixes Clearing flags on attachment: 198296 Committed r148514: <http://trac.webkit.org/changeset/148514> 876558 15 commit-queue 2013-04-16 08:35:53 -0700 All reviewed patches have been landed. Closing bug. 183907 2013-01-22 00:11:59 -0800 2013-01-22 01:20:40 -0800 patch parentmenu.diff text/plain 12579 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5MmU0MDBhLi5iNmQwMjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDEtMjIgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBhbiBBUEkgZm9yIGdldHRpbmcgY29u dGV4dCBtZW51IGl0ZW0ncyBwYXJlbnQgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgcGFyZW50IG1lbnUgc3VwcG9ydCBhbmQgQVBJIGZv ciBFd2tfQ29udGV4dF9NZW51X0l0ZW0sIHRvCisgICAgICAgIGFsbG93IHNlbGVjdGluZyBjb250 ZXh0IG1lbnVzIHVzaW5nIEVsZW1lbnRhcnkgd2lkZ2V0cy4KKyAgICAgICAgQ29udGV4dCBtZW51 IHVuaXQgdGVzdCB1cGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVu dTo6RXdrQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRl eHRNZW51SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KToKKyAgICAg ICAgKGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250 ZXh0TWVudUl0ZW06OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OnBhcmVu dE1lbnUpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpzZXRQYXJlbnRNZW51KToKKyAg ICAgICAgKEV3a0NvbnRleHRNZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChzaG93Q29udGV4dE1l bnUpOgorCiAyMDEzLTAxLTIxICBEaXJrIFNjaHVsemUgIDxkc2NodWx6ZUBhZG9iZS5jb20+CiAK ICAgICAgICAgQWRkIGJ1aWxkIGZsYWcgZm9yIENhbnZhcydzIFBhdGggb2JqZWN0IChkaXNhYmxl ZCBieSBkZWZhdWx0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51LmNwcAppbmRleCAwYTRlNTQ3Li5jMjE1NWM5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNw cApAQCAtNDMsNyArNDMsNyBAQCBFd2tDb250ZXh0TWVudTo6RXdrQ29udGV4dE1lbnUoRXdrVmll d0ltcGwqIHZpZXdJbXBsLCBXZWJDb250ZXh0TWVudVByb3h5RWZsKiBjbwogewogICAgIGNvbnN0 IHNpemVfdCBzaXplID0gaXRlbXMuc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg c2l6ZTsgKytpKQotICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMgPSBlaW5hX2xpc3RfYXBwZW5k KG1fY29udGV4dE1lbnVJdGVtcywgRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUoaXRlbXNb aV0pLmxlYWtQdHIoKSk7CisgICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9h cHBlbmQobV9jb250ZXh0TWVudUl0ZW1zLCBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShp dGVtc1tpXSwgdGhpcykubGVha1B0cigpKTsKIH0KIAogRXdrQ29udGV4dE1lbnU6OkV3a0NvbnRl eHRNZW51KCkKQEAgLTYwLDggKzYwLDExIEBAIEV3a0NvbnRleHRNZW51OjpFd2tDb250ZXh0TWVu dShFaW5hX0xpc3QqIGl0ZW1zKQogewogICAgIEVpbmFfTGlzdCogbDsKICAgICB2b2lkKiBkYXRh OwotICAgIEVJTkFfTElTVF9GT1JFQUNIKGl0ZW1zLCBsLCBkYXRhKQotICAgICAgICBtX2NvbnRl eHRNZW51SXRlbXMgPSBlaW5hX2xpc3RfYXBwZW5kKG1fY29udGV4dE1lbnVJdGVtcywgc3RhdGlj X2Nhc3Q8RXdrQ29udGV4dE1lbnVJdGVtKj4oZGF0YSkpOworICAgIEVJTkFfTElTVF9GT1JFQUNI KGl0ZW1zLCBsLCBkYXRhKSB7CisgICAgICAgIEV3a0NvbnRleHRNZW51SXRlbSogaXRlbSA9IHN0 YXRpY19jYXN0PEV3a0NvbnRleHRNZW51SXRlbSo+KGRhdGEpOworICAgICAgICBpdGVtLT5zZXRQ YXJlbnRNZW51KHRoaXMpOworICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMgPSBlaW5hX2xpc3Rf YXBwZW5kKG1fY29udGV4dE1lbnVJdGVtcywgaXRlbSk7CisgICAgfQogfQogCiBFd2tDb250ZXh0 TWVudTo6fkV3a0NvbnRleHRNZW51KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCmluZGV4IDFmZjg2NTIu LmY5MDBlNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnVfaXRlbS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcApAQCAtMzMsMzYgKzMzLDM2IEBACiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKLUV3a0NvbnRl eHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbURh dGEmIGl0ZW0pCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShjb25zdCBX ZWJDb250ZXh0TWVudUl0ZW1EYXRhJiBpdGVtLCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSkK ICAgICA6IG1fdHlwZShzdGF0aWNfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZT4oaXRl bS50eXBlKCkpKQogICAgICwgbV9hY3Rpb24oc3RhdGljX2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9J dGVtX0FjdGlvbj4oaXRlbS5hY3Rpb24oKSkpCiAgICAgLCBtX3RpdGxlKGl0ZW0udGl0bGUoKS51 dGY4KCkuZGF0YSgpKQogICAgICwgbV9pc0NoZWNrZWQoaXRlbS5jaGVja2VkKCkpCiAgICAgLCBt X2lzRW5hYmxlZChpdGVtLmVuYWJsZWQoKSkKLSAgICAsIG1fcGFyZW50TWVudSgwKQorICAgICwg bV9wYXJlbnRNZW51KHBhcmVudE1lbnUpCiAgICAgLCBtX3N1Yk1lbnUoMCkKIHsKIH0KIAotRXdr Q29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVt X1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNo YXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250 ZXh0X01lbnUqIHN1Yk1lbnUpCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRl bShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1f QWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5h X0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSwgRXdrX0NvbnRleHRfTWVu dSogcGFyZW50TWVudSkKICAgICA6IG1fdHlwZSh0eXBlKQogICAgICwgbV9hY3Rpb24oYWN0aW9u KQogICAgICwgbV90aXRsZSh0aXRsZSkKICAgICAsIG1faXNDaGVja2VkKGNoZWNrZWQpCiAgICAg LCBtX2lzRW5hYmxlZChlbmFibGVkKQotICAgICwgbV9wYXJlbnRNZW51KDApCisgICAgLCBtX3Bh cmVudE1lbnUocGFyZW50TWVudSkKICAgICAsIG1fc3ViTWVudShzdWJNZW51KQogewogfQogCiBF d2tfQ29udGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRXdrX0NvbnRl eHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rp b24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJs ZWQpCiB7Ci0gICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5cGUsIGFj dGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIDApLmxlYWtQdHIoKTsKKyAgICByZXR1cm4g RXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tl ZCwgZW5hYmxlZCwgMCwgMCkubGVha1B0cigpOwogfQogCiBFd2tfQ29udGV4dF9NZW51X0l0ZW0q IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEV3a19Db250ZXh0X01lbnVf SXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25z dCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tf Q29udGV4dF9NZW51KiBzdWJNZW51KQogewotICAgIHJldHVybiBFd2tfQ29udGV4dF9NZW51X0l0 ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCBzdWJNZW51 KS5sZWFrUHRyKCk7CisgICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5 cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUsIDApLmxlYWtQdHIo KTsKIH0KIAogRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgZXdrX2NvbnRleHRfbWVudV9pdGVt X3R5cGVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKQEAgLTE0NSw2ICsx NDUsMTMgQEAgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX3NldChFd2tf Q29udGV4dF9NZW51X0l0ZW0qIGl0ZW0sIEVpbmFfQm8KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAor RXdrX0NvbnRleHRfTWVudSogZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChj b25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0pCit7CisgICAgRUlOQV9TQUZFVFlfT05f TlVMTF9SRVRVUk5fVkFMKGl0ZW0sIDApOworCisgICAgcmV0dXJuIGl0ZW0tPnBhcmVudE1lbnUo KTsKK30KKwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lU RU1fVEFHX05PX0FDVElPTiwgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnTm9BY3Rpb24pOwog Q09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09Q RU5fTElOS19JTl9ORVdfV0lORE9XLCBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlu a0luTmV3V2luZG93KTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPTlRFWFRf TUVOVV9JVEVNX1RBR19ET1dOTE9BRF9MSU5LX1RPX0RJU0ssIFdlYkNvcmU6OkNvbnRleHRNZW51 SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlzayk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCmluZGV4IDk2MTJhMjEu LmQxN2JhMzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnVfaXRlbS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCkBAIC0yNjMsNiArMjYzLDE1IEBAIEVBUEkgRWlu YV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX2dldChjb25zdCBFd2tfQ29udGV4 dF9NZW51X0l0ZW0gKm8pCiAgKi8KIEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRl bV9lbmFibGVkX3NldChFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8sIEVpbmFfQm9vbCBlbmFibGVk KTsKIAorLyoqCisgKiBHZXRzIHRoZSBwYXJlbnQgbWVudSBmb3IgdGhlIGl0ZW0uCisgKgorICog QHBhcmFtIG8gaXRlbSB0byBnZXQgdGhlIHBhcmVudAorICoKKyAqIEByZXR1cm4gdGhlIHBvaW50 ZXIgdG8gcGFyZW50IG1lbnUgb24gc3VjY2VzcyBvciBAYyBOVUxMIG9uIGZhaWx1cmUKKyAqLwor RUFQSSBFd2tfQ29udGV4dF9NZW51ICpld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVf Z2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSAqbyk7CisKICNpZmRlZiBfX2NwbHVzcGx1 cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaAppbmRleCA2MmYyNzkw Li4wNTRjZThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgKQEAgLTM4LDE0ICsz OCwxNCBAQAogICovCiBjbGFzcyBFd2tDb250ZXh0TWVudUl0ZW0gewogcHVibGljOgotICAgIHN0 YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKGNvbnN0IFdlYktpdDo6 V2ViQ29udGV4dE1lbnVJdGVtRGF0YSYgaXRlbSkKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tD b250ZXh0TWVudUl0ZW0+IGNyZWF0ZShjb25zdCBXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURh dGEmIGl0ZW0sIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KQogICAgIHsKLSAgICAgICAgcmV0 dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0oaXRlbSkpOworICAgICAgICByZXR1 cm4gYWRvcHRQdHIobmV3IEV3a0NvbnRleHRNZW51SXRlbShpdGVtLCBwYXJlbnRNZW51KSk7CiAg ICAgfQogCi0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUo RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0Fj dGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9C b29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51KQorICAgIHN0YXRpYyBQYXNzT3du UHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBl IHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0 aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0TWVu dSogc3ViTWVudSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpCiAgICAgewotICAgICAgICBy ZXR1cm4gYWRvcHRQdHIobmV3IEV3a0NvbnRleHRNZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxl LCBjaGVja2VkLCBlbmFibGVkLCBzdWJNZW51KSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihu ZXcgRXdrQ29udGV4dE1lbnVJdGVtKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJs ZWQsIHN1Yk1lbnUsIHBhcmVudE1lbnUpKTsKICAgICB9CiAKICAgICBFd2tfQ29udGV4dF9NZW51 X0l0ZW1fQWN0aW9uIGFjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fYWN0aW9uOyB9CkBAIC02Myw5 ICs2MywxMiBAQCBwdWJsaWM6CiAgICAgYm9vbCBlbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9p c0VuYWJsZWQ7IH0KICAgICB2b2lkIHNldEVuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1faXNFbmFi bGVkID0gZW5hYmxlZDsgfQogCisgICAgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUoKSBjb25z dCB7IHJldHVybiBtX3BhcmVudE1lbnU7IH0KKyAgICB2b2lkIHNldFBhcmVudE1lbnUoRXdrQ29u dGV4dE1lbnUqIHBhcmVudE1lbnUpIHsgbV9wYXJlbnRNZW51ID0gcGFyZW50TWVudTsgfQorCiBw cml2YXRlOgotICAgIGV4cGxpY2l0IEV3a0NvbnRleHRNZW51SXRlbShjb25zdCBXZWJLaXQ6Oldl YkNvbnRleHRNZW51SXRlbURhdGEmKTsKLSAgICBFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRl eHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rp b24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJs ZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51KTsKKyAgICBFd2tDb250ZXh0TWVudUl0ZW0oY29u c3QgV2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW1EYXRhJiwgRXdrQ29udGV4dE1lbnUqIHBhcmVu dE1lbnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciog dGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1l bnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KTsKIAogICAgIEV3a19Db250 ZXh0X01lbnVfSXRlbV9UeXBlIG1fdHlwZTsKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0 aW9uIG1fYWN0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAppbmRleCA3ODg1 OGFmLi4xODY0ZTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcApAQCAtNDYs NiArNDYsOSBAQCBzdGF0aWMgRWluYV9Cb29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFy dF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29vcmQgeCwgRQogICAgIEV3a19Db250ZXh0X01lbnVf SXRlbSogaXRlbSA9IHN0YXRpY19jYXN0PEV3a19Db250ZXh0X01lbnVfSXRlbSo+KGVpbmFfbGlz dF9udGgobGlzdCwgMCkpOwogICAgIGNoZWNrQmFzaWNDb250ZXh0TWVudUl0ZW0oaXRlbSwgRVdL X0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0dPX0JBQ0ssICJHbyBCYWNr IiwgZmFsc2UsIHRydWUpOwogCisgICAgLy8gQ2hlY2sgaWYgcGFyZW50IG1lbnUgZXF1YWxzIHdo ZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgYnkgV2ViS2l0LgorICAgIEVYUEVD VF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChp dGVtKSk7CisKICAgICBpdGVtID0gc3RhdGljX2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4o ZWluYV9saXN0X250aChsaXN0LCAxKSk7CiAgICAgY2hlY2tCYXNpY0NvbnRleHRNZW51SXRlbShp dGVtLCBFV0tfQUNUSU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfR09fRk9SV0FS RCwgIkdvIEZvcndhcmQiLCBmYWxzZSwgdHJ1ZSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVt X2VuYWJsZWRfc2V0KGl0ZW0sIGZhbHNlKTsKQEAgLTYzLDggKzY2LDEzIEBAIHN0YXRpYyBFaW5h X0Jvb2wgc2hvd0NvbnRleHRNZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZh c19Db29yZCB4LCBFCiAKICAgICAvLyBNYWtlcyBuZXcgY29udGV4dCBtZW51IGl0ZW1zLgogICAg IEV3a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbSA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9u ZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3 IEN1c3RvbSBJdGVtIiwgZmFsc2UsIHRydWUpOworICAgIC8vIENoZWNrIGlmIHBhcmVudCBtZW51 IGVxdWFscyAwIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgdXNpbmcgZXdr X2NvbnRleHRfbWVudV9pdGVtX25ldy4KKyAgICBFWFBFQ1RfRVEoMCwgZXdrX2NvbnRleHRfbWVu dV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9p dGVtX2FwcGVuZChjb250ZXh0TWVudSwgbmV3SXRlbSk7CiAKKyAgICAvLyBDaGVjayBpZiBwYXJl bnQgbWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCB1c2lu ZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3IGFuZCBhZGRlZCB1c2luZyBld2tfY29udGV4dF9t ZW51X2l0ZW1fYXBwZW5kLgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRf bWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CisKICAgICBFaW5hX0xpc3QqIHN1 Yk1lbnVJdGVtTGlzdCA9IDA7CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBzdWJNZW51SXRl bTEgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRF WFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5ldyBTdWJNZW51IEl0ZW0gMSIsIGZhbHNlLCB0cnVl KTsKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIHN1Yk1lbnVJdGVtMiA9IGV3a19jb250ZXh0 X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFH X09USEVSLCAiTmV3IFN1Yk1lbnUgSXRlbSAyIiwgZmFsc2UsIHRydWUpOwpAQCAtNzMsOSArODEs MTggQEAgc3RhdGljIEVpbmFfQm9vbCBzaG93Q29udGV4dE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0 YSogc21hcnREYXRhLCBFdmFzX0Nvb3JkIHgsIEUKICAgICBzdWJNZW51SXRlbUxpc3QgPSBlaW5h X2xpc3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlzdCwgc3ViTWVudUl0ZW0yKTsKICAgICBzdWJNZW51 SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlzdCwgc3ViTWVudUl0ZW0z KTsKICAgICBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51ID0gZXdrX2NvbnRleHRfbWVudV9uZXdf d2l0aF9pdGVtcyhzdWJNZW51SXRlbUxpc3QpOworCisgICAgLy8gQ2hlY2sgaWYgcGFyZW50IG1l bnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgdXNpbmcgZXdr X2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcworICAgIEVYUEVDVF9FUShzdWJNZW51LCBld2tf Y29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KHN1Yk1lbnVJdGVtMSkpOworCiAgICAg RXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9u ZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5VX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9U QUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMiIsIGZhbHNlLCB0cnVlLCBzdWJNZW51KTsKKyAg ICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgMCB3aGVuIGNvbnRleHQgbWVudSBpdGVt cyB3aGVyZSBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJt ZW51LgorICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVf Z2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRN ZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hl biBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51 X2l0ZW1fbmV3X3dpdGhfc3VibWVudSBhbmQgYWRkZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9p dGVtX2FwcGVuZC4KKyAgICBFWFBFQ1RfRVEoY29udGV4dE1lbnUsIGV3a19jb250ZXh0X21lbnVf aXRlbV9wYXJlbnRfbWVudV9nZXQobmV3SXRlbSkpOworCiAgICAgRXdrX0NvbnRleHRfTWVudSog c3ViTWVudTIgPSBld2tfY29udGV4dF9tZW51X25ldygpOwogICAgIEV3a19Db250ZXh0X01lbnVf SXRlbSogbmV3SXRlbTMgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudShF V0tfU1VCTUVOVV9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IEN1 c3RvbSBJdGVtIDMiLCBmYWxzZSwgdHJ1ZSwgc3ViTWVudTIpOwogICAgIGV3a19jb250ZXh0X21l bnVfaXRlbV9hcHBlbmQoY29udGV4dE1lbnUsIG5ld0l0ZW0zKTsK 183920 2013-01-22 01:20:40 -0800 2013-01-25 04:27:41 -0800 fixes parentmenu2.diff text/plain 12609 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5MmU0MDBhLi5iNmQwMjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDEtMjIgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBhbiBBUEkgZm9yIGdldHRpbmcgY29u dGV4dCBtZW51IGl0ZW0ncyBwYXJlbnQgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgcGFyZW50IG1lbnUgc3VwcG9ydCBhbmQgQVBJIGZv ciBFd2tfQ29udGV4dF9NZW51X0l0ZW0sIHRvCisgICAgICAgIGFsbG93IHNlbGVjdGluZyBjb250 ZXh0IG1lbnVzIHVzaW5nIEVsZW1lbnRhcnkgd2lkZ2V0cy4KKyAgICAgICAgQ29udGV4dCBtZW51 IHVuaXQgdGVzdCB1cGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVu dTo6RXdrQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRl eHRNZW51SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KToKKyAgICAg ICAgKGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250 ZXh0TWVudUl0ZW06OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OnBhcmVu dE1lbnUpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpzZXRQYXJlbnRNZW51KToKKyAg ICAgICAgKEV3a0NvbnRleHRNZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChzaG93Q29udGV4dE1l bnUpOgorCiAyMDEzLTAxLTIxICBEaXJrIFNjaHVsemUgIDxkc2NodWx6ZUBhZG9iZS5jb20+CiAK ICAgICAgICAgQWRkIGJ1aWxkIGZsYWcgZm9yIENhbnZhcydzIFBhdGggb2JqZWN0IChkaXNhYmxl ZCBieSBkZWZhdWx0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfY29udGV4dF9tZW51LmNwcAppbmRleCAwYTRlNTQ3Li5jMjE1NWM5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNw cApAQCAtNDMsNyArNDMsNyBAQCBFd2tDb250ZXh0TWVudTo6RXdrQ29udGV4dE1lbnUoRXdrVmll d0ltcGwqIHZpZXdJbXBsLCBXZWJDb250ZXh0TWVudVByb3h5RWZsKiBjbwogewogICAgIGNvbnN0 IHNpemVfdCBzaXplID0gaXRlbXMuc2l6ZSgpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg c2l6ZTsgKytpKQotICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMgPSBlaW5hX2xpc3RfYXBwZW5k KG1fY29udGV4dE1lbnVJdGVtcywgRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUoaXRlbXNb aV0pLmxlYWtQdHIoKSk7CisgICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9h cHBlbmQobV9jb250ZXh0TWVudUl0ZW1zLCBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShp dGVtc1tpXSwgdGhpcykubGVha1B0cigpKTsKIH0KIAogRXdrQ29udGV4dE1lbnU6OkV3a0NvbnRl eHRNZW51KCkKQEAgLTYwLDggKzYwLDExIEBAIEV3a0NvbnRleHRNZW51OjpFd2tDb250ZXh0TWVu dShFaW5hX0xpc3QqIGl0ZW1zKQogewogICAgIEVpbmFfTGlzdCogbDsKICAgICB2b2lkKiBkYXRh OwotICAgIEVJTkFfTElTVF9GT1JFQUNIKGl0ZW1zLCBsLCBkYXRhKQotICAgICAgICBtX2NvbnRl eHRNZW51SXRlbXMgPSBlaW5hX2xpc3RfYXBwZW5kKG1fY29udGV4dE1lbnVJdGVtcywgc3RhdGlj X2Nhc3Q8RXdrQ29udGV4dE1lbnVJdGVtKj4oZGF0YSkpOworICAgIEVJTkFfTElTVF9GT1JFQUNI KGl0ZW1zLCBsLCBkYXRhKSB7CisgICAgICAgIEV3a0NvbnRleHRNZW51SXRlbSogaXRlbSA9IHN0 YXRpY19jYXN0PEV3a0NvbnRleHRNZW51SXRlbSo+KGRhdGEpOworICAgICAgICBpdGVtLT5zZXRQ YXJlbnRNZW51KHRoaXMpOworICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMgPSBlaW5hX2xpc3Rf YXBwZW5kKG1fY29udGV4dE1lbnVJdGVtcywgaXRlbSk7CisgICAgfQogfQogCiBFd2tDb250ZXh0 TWVudTo6fkV3a0NvbnRleHRNZW51KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCmluZGV4IDFmZjg2NTIu LjQ1YTE1ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnVfaXRlbS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcApAQCAtMzMsMzYgKzMzLDM2IEBACiB1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKLUV3a0NvbnRl eHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbURh dGEmIGl0ZW0pCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShjb25zdCBX ZWJDb250ZXh0TWVudUl0ZW1EYXRhJiBpdGVtLCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSkK ICAgICA6IG1fdHlwZShzdGF0aWNfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZT4oaXRl bS50eXBlKCkpKQogICAgICwgbV9hY3Rpb24oc3RhdGljX2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9J dGVtX0FjdGlvbj4oaXRlbS5hY3Rpb24oKSkpCiAgICAgLCBtX3RpdGxlKGl0ZW0udGl0bGUoKS51 dGY4KCkuZGF0YSgpKQogICAgICwgbV9pc0NoZWNrZWQoaXRlbS5jaGVja2VkKCkpCiAgICAgLCBt X2lzRW5hYmxlZChpdGVtLmVuYWJsZWQoKSkKLSAgICAsIG1fcGFyZW50TWVudSgwKQorICAgICwg bV9wYXJlbnRNZW51KHBhcmVudE1lbnUpCiAgICAgLCBtX3N1Yk1lbnUoMCkKIHsKIH0KIAotRXdr Q29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVt X1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNo YXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250 ZXh0X01lbnUqIHN1Yk1lbnUpCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRl bShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1f QWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5h X0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSwgRXdrX0NvbnRleHRfTWVu dSogcGFyZW50TWVudSkKICAgICA6IG1fdHlwZSh0eXBlKQogICAgICwgbV9hY3Rpb24oYWN0aW9u KQogICAgICwgbV90aXRsZSh0aXRsZSkKICAgICAsIG1faXNDaGVja2VkKGNoZWNrZWQpCiAgICAg LCBtX2lzRW5hYmxlZChlbmFibGVkKQotICAgICwgbV9wYXJlbnRNZW51KDApCisgICAgLCBtX3Bh cmVudE1lbnUocGFyZW50TWVudSkKICAgICAsIG1fc3ViTWVudShzdWJNZW51KQogewogfQogCiBF d2tfQ29udGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRXdrX0NvbnRl eHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rp b24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJs ZWQpCiB7Ci0gICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5cGUsIGFj dGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIDApLmxlYWtQdHIoKTsKKyAgICByZXR1cm4g RXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tl ZCwgZW5hYmxlZCwgMCwgMCkubGVha1B0cigpOwogfQogCiBFd2tfQ29udGV4dF9NZW51X0l0ZW0q IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEV3a19Db250ZXh0X01lbnVf SXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25z dCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tf Q29udGV4dF9NZW51KiBzdWJNZW51KQogewotICAgIHJldHVybiBFd2tfQ29udGV4dF9NZW51X0l0 ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCBzdWJNZW51 KS5sZWFrUHRyKCk7CisgICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5 cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUsIDApLmxlYWtQdHIo KTsKIH0KIAogRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgZXdrX2NvbnRleHRfbWVudV9pdGVt X3R5cGVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKQEAgLTE0NSw2ICsx NDUsMTMgQEAgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX3NldChFd2tf Q29udGV4dF9NZW51X0l0ZW0qIGl0ZW0sIEVpbmFfQm8KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAor RXdrX0NvbnRleHRfTWVudSogZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChj b25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0pCit7CisgICAgRUlOQV9TQUZFVFlfT05f TlVMTF9SRVRVUk5fVkFMKGl0ZW0sIDApOworCisgICAgcmV0dXJuIGNvbnN0X2Nhc3Q8RXdrX0Nv bnRleHRfTWVudV9JdGVtKj4oaXRlbSktPnBhcmVudE1lbnUoKTsKK30KKwogQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX05PX0FDVElPTiwgV2Vi Q29yZTo6Q29udGV4dE1lbnVJdGVtVGFnTm9BY3Rpb24pOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJ TkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09QRU5fTElOS19JTl9ORVdfV0lORE9X LCBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93KTsKIENPTVBJ TEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19ET1dOTE9B RF9MSU5LX1RPX0RJU0ssIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1Rv RGlzayk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf Y29udGV4dF9tZW51X2l0ZW0uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnVfaXRlbS5oCmluZGV4IDk2MTJhMjEuLmQxN2JhMzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVf aXRlbS5oCkBAIC0yNjMsNiArMjYzLDE1IEBAIEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X21l bnVfaXRlbV9lbmFibGVkX2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8pCiAgKi8K IEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX3NldChFd2tfQ29u dGV4dF9NZW51X0l0ZW0gKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKIAorLyoqCisgKiBHZXRzIHRo ZSBwYXJlbnQgbWVudSBmb3IgdGhlIGl0ZW0uCisgKgorICogQHBhcmFtIG8gaXRlbSB0byBnZXQg dGhlIHBhcmVudAorICoKKyAqIEByZXR1cm4gdGhlIHBvaW50ZXIgdG8gcGFyZW50IG1lbnUgb24g c3VjY2VzcyBvciBAYyBOVUxMIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFd2tfQ29udGV4dF9NZW51 ICpld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0 X01lbnVfSXRlbSAqbyk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0 ZW1fcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRl eHRfbWVudV9pdGVtX3ByaXZhdGUuaAppbmRleCA2MmYyNzkwLi4zMjJhYWNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1f cHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgKQEAgLTM4LDE0ICszOCwxNCBAQAogICovCiBjbGFzcyBF d2tDb250ZXh0TWVudUl0ZW0gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0Nv bnRleHRNZW51SXRlbT4gY3JlYXRlKGNvbnN0IFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtRGF0 YSYgaXRlbSkKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNyZWF0 ZShjb25zdCBXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGEmIGl0ZW0sIEV3a0NvbnRleHRN ZW51KiBwYXJlbnRNZW51KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tD b250ZXh0TWVudUl0ZW0oaXRlbSkpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEV3a0Nv bnRleHRNZW51SXRlbShpdGVtLCBwYXJlbnRNZW51KSk7CiAgICAgfQogCi0gICAgc3RhdGljIFBh c3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoRXdrX0NvbnRleHRfTWVudV9JdGVt X1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNo YXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a0NvbnRl eHRNZW51KiBzdWJNZW51KQorICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRl bT4gY3JlYXRlKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01l bnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNr ZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0TWVudSogc3ViTWVudSwgRXdrQ29udGV4 dE1lbnUqIHBhcmVudE1lbnUpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEV3 a0NvbnRleHRNZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCBz dWJNZW51KSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29udGV4dE1lbnVJdGVt KHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUsIHBhcmVudE1l bnUpKTsKICAgICB9CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbigp IGNvbnN0IHsgcmV0dXJuIG1fYWN0aW9uOyB9CkBAIC02Myw5ICs2MywxMiBAQCBwdWJsaWM6CiAg ICAgYm9vbCBlbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0VuYWJsZWQ7IH0KICAgICB2b2lk IHNldEVuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1faXNFbmFibGVkID0gZW5hYmxlZDsgfQogCisg ICAgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUoKSB7IHJldHVybiBtX3BhcmVudE1lbnU7IH0K KyAgICB2b2lkIHNldFBhcmVudE1lbnUoRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpIHsgbV9w YXJlbnRNZW51ID0gcGFyZW50TWVudTsgfQorCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IEV3a0Nv bnRleHRNZW51SXRlbShjb25zdCBXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGEmKTsKLSAg ICBFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdr X0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5h X0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51 KTsKKyAgICBFd2tDb250ZXh0TWVudUl0ZW0oY29uc3QgV2ViS2l0OjpXZWJDb250ZXh0TWVudUl0 ZW1EYXRhJiwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpOworICAgIEV3a0NvbnRleHRNZW51 SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0 ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBF aW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51 KiBwYXJlbnRNZW51KTsKIAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIG1fdHlwZTsK ICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIG1fYWN0aW9uOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRf bWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3 azJfY29udGV4dF9tZW51LmNwcAppbmRleCA3ODg1OGFmLi4xODY0ZTNhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9t ZW51LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0 X2V3azJfY29udGV4dF9tZW51LmNwcApAQCAtNDYsNiArNDYsOSBAQCBzdGF0aWMgRWluYV9Cb29s IHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29v cmQgeCwgRQogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSA9IHN0YXRpY19jYXN0PEV3 a19Db250ZXh0X01lbnVfSXRlbSo+KGVpbmFfbGlzdF9udGgobGlzdCwgMCkpOwogICAgIGNoZWNr QmFzaWNDb250ZXh0TWVudUl0ZW0oaXRlbSwgRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9N RU5VX0lURU1fVEFHX0dPX0JBQ0ssICJHbyBCYWNrIiwgZmFsc2UsIHRydWUpOwogCisgICAgLy8g Q2hlY2sgaWYgcGFyZW50IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJl IGNyZWF0ZWQgYnkgV2ViS2l0LgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRl eHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChpdGVtKSk7CisKICAgICBpdGVtID0gc3RhdGlj X2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oZWluYV9saXN0X250aChsaXN0LCAxKSk7CiAg ICAgY2hlY2tCYXNpY0NvbnRleHRNZW51SXRlbShpdGVtLCBFV0tfQUNUSU9OX1RZUEUsIEVXS19D T05URVhUX01FTlVfSVRFTV9UQUdfR09fRk9SV0FSRCwgIkdvIEZvcndhcmQiLCBmYWxzZSwgdHJ1 ZSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KGl0ZW0sIGZhbHNlKTsK QEAgLTYzLDggKzY2LDEzIEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRNZW51KEV3a19W aWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAKICAgICAvLyBNYWtl cyBuZXcgY29udGV4dCBtZW51IGl0ZW1zLgogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogbmV3 SXRlbSA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09O VEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIiwgZmFsc2UsIHRydWUp OworICAgIC8vIENoZWNrIGlmIHBhcmVudCBtZW51IGVxdWFscyAwIHdoZW4gY29udGV4dCBtZW51 IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldy4KKyAg ICBFWFBFQ1RfRVEoMCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJ dGVtKSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZChjb250ZXh0TWVudSwgbmV3 SXRlbSk7CiAKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hlbiBjb250ZXh0 IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3 IGFuZCBhZGRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kLgorICAgIEVYUEVD VF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChu ZXdJdGVtKSk7CisKICAgICBFaW5hX0xpc3QqIHN1Yk1lbnVJdGVtTGlzdCA9IDA7CiAgICAgRXdr X0NvbnRleHRfTWVudV9JdGVtKiBzdWJNZW51SXRlbTEgPSBld2tfY29udGV4dF9tZW51X2l0ZW1f bmV3KEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5l dyBTdWJNZW51IEl0ZW0gMSIsIGZhbHNlLCB0cnVlKTsKICAgICBFd2tfQ29udGV4dF9NZW51X0l0 ZW0qIHN1Yk1lbnVJdGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9U WVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1lbnUgSXRlbSAy IiwgZmFsc2UsIHRydWUpOwpAQCAtNzMsOSArODEsMTggQEAgc3RhdGljIEVpbmFfQm9vbCBzaG93 Q29udGV4dE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBFdmFzX0Nvb3JkIHgs IEUKICAgICBzdWJNZW51SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlz dCwgc3ViTWVudUl0ZW0yKTsKICAgICBzdWJNZW51SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5k KHN1Yk1lbnVJdGVtTGlzdCwgc3ViTWVudUl0ZW0zKTsKICAgICBFd2tfQ29udGV4dF9NZW51KiBz dWJNZW51ID0gZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcyhzdWJNZW51SXRlbUxpc3Qp OworCisgICAgLy8gQ2hlY2sgaWYgcGFyZW50IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51 IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVt cworICAgIEVYUEVDVF9FUShzdWJNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21l bnVfZ2V0KHN1Yk1lbnVJdGVtMSkpOworCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJ dGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5V X1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0g MiIsIGZhbHNlLCB0cnVlLCBzdWJNZW51KTsKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBl cXVhbHMgMCB3aGVuIGNvbnRleHQgbWVudSBpdGVtcyB3aGVyZSBjcmVhdGVkIHVzaW5nIGV3a19j b250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51LgorICAgIEVYUEVDVF9FUSgwLCBld2tf Y29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29u dGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBD aGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUg Y3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudSBhbmQg YWRkZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZC4KKyAgICBFWFBFQ1RfRVEo Y29udGV4dE1lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQobmV3SXRl bSkpOworCiAgICAgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudTIgPSBld2tfY29udGV4dF9tZW51 X25ldygpOwogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbTMgPSBld2tfY29udGV4 dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudShFV0tfU1VCTUVOVV9UWVBFLCBFV0tfQ09OVEVY VF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIDMiLCBmYWxzZSwgdHJ1ZSwg c3ViTWVudTIpOwogICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoY29udGV4dE1lbnUs IG5ld0l0ZW0zKTsK 184723 2013-01-25 04:27:41 -0800 2013-02-15 07:17:27 -0800 fixed patch parentmenu3.diff text/plain 12618 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5YTZiOWY2Li4zMTQwZjYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDEtMjUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBhbiBBUEkgZm9yIGdldHRpbmcgY29u dGV4dCBtZW51IGl0ZW0ncyBwYXJlbnQgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgcGFyZW50IG1lbnUgc3VwcG9ydCBhbmQgQVBJIGZv ciBFd2tfQ29udGV4dF9NZW51X0l0ZW0sIHRvCisgICAgICAgIGFsbG93IHNlbGVjdGluZyBjb250 ZXh0IG1lbnVzIHVzaW5nIEVsZW1lbnRhcnkgd2lkZ2V0cy4KKyAgICAgICAgQ29udGV4dCBtZW51 IHVuaXQgdGVzdCB1cGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVu dTo6RXdrQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRl eHRNZW51SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KToKKyAgICAg ICAgKGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250 ZXh0TWVudUl0ZW06OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OnBhcmVu dE1lbnUpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpzZXRQYXJlbnRNZW51KToKKyAg ICAgICAgKEV3a0NvbnRleHRNZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChzaG93Q29udGV4dE1l bnUpOgorCiAyMDEzLTAxLTI1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkIEdUSyBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnUuY3BwCmluZGV4IDk4YTQz MWEuLmM2MTc3YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19jb250ZXh0X21lbnUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL2V3a19jb250ZXh0X21lbnUuY3BwCkBAIC00Myw3ICs0Myw3IEBAIEV3a0NvbnRleHRNZW51 OjpFd2tDb250ZXh0TWVudShFd2tWaWV3KiB2aWV3LCBXZWJDb250ZXh0TWVudVByb3h5RWZsKiBj b250ZXh0TWVuCiB7CiAgICAgY29uc3Qgc2l6ZV90IHNpemUgPSBpdGVtcy5zaXplKCk7CiAgICAg Zm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpCi0gICAgICAgIG1fY29udGV4dE1lbnVJ dGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9jb250ZXh0TWVudUl0ZW1zLCBFd2tfQ29udGV4dF9N ZW51X0l0ZW06OmNyZWF0ZShpdGVtc1tpXSkubGVha1B0cigpKTsKKyAgICAgICAgbV9jb250ZXh0 TWVudUl0ZW1zID0gZWluYV9saXN0X2FwcGVuZChtX2NvbnRleHRNZW51SXRlbXMsIEV3a19Db250 ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKGl0ZW1zW2ldLCB0aGlzKS5sZWFrUHRyKCkpOwogfQogCiBF d2tDb250ZXh0TWVudTo6RXdrQ29udGV4dE1lbnUoKQpAQCAtNjAsOCArNjAsMTMgQEAgRXdrQ29u dGV4dE1lbnU6OkV3a0NvbnRleHRNZW51KEVpbmFfTGlzdCogaXRlbXMpCiB7CiAgICAgRWluYV9M aXN0KiBsOwogICAgIHZvaWQqIGRhdGE7Ci0gICAgRUlOQV9MSVNUX0ZPUkVBQ0goaXRlbXMsIGws IGRhdGEpCi0gICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9j b250ZXh0TWVudUl0ZW1zLCBzdGF0aWNfY2FzdDxFd2tDb250ZXh0TWVudUl0ZW0qPihkYXRhKSk7 CisgICAgRUlOQV9MSVNUX0ZPUkVBQ0goaXRlbXMsIGwsIGRhdGEpIHsKKyAgICAgICAgaWYgKCFk YXRhKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIEV3a0NvbnRleHRNZW51SXRlbSog aXRlbSA9IHN0YXRpY19jYXN0PEV3a0NvbnRleHRNZW51SXRlbSo+KGRhdGEpOworICAgICAgICBp dGVtLT5zZXRQYXJlbnRNZW51KHRoaXMpOworICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMgPSBl aW5hX2xpc3RfYXBwZW5kKG1fY29udGV4dE1lbnVJdGVtcywgaXRlbSk7CisgICAgfQogfQogCiBF d2tDb250ZXh0TWVudTo6fkV3a0NvbnRleHRNZW51KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCmluZGV4 IDFmZjg2NTIuLjQ1YTE1ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcApAQCAtMzMsMzYgKzMzLDM2 IEBACiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAK LUV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKGNvbnN0IFdlYkNvbnRleHRN ZW51SXRlbURhdGEmIGl0ZW0pCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRl bShjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1EYXRhJiBpdGVtLCBFd2tDb250ZXh0TWVudSogcGFy ZW50TWVudSkKICAgICA6IG1fdHlwZShzdGF0aWNfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0ZW1f VHlwZT4oaXRlbS50eXBlKCkpKQogICAgICwgbV9hY3Rpb24oc3RhdGljX2Nhc3Q8RXdrX0NvbnRl eHRfTWVudV9JdGVtX0FjdGlvbj4oaXRlbS5hY3Rpb24oKSkpCiAgICAgLCBtX3RpdGxlKGl0ZW0u dGl0bGUoKS51dGY4KCkuZGF0YSgpKQogICAgICwgbV9pc0NoZWNrZWQoaXRlbS5jaGVja2VkKCkp CiAgICAgLCBtX2lzRW5hYmxlZChpdGVtLmVuYWJsZWQoKSkKLSAgICAsIG1fcGFyZW50TWVudSgw KQorICAgICwgbV9wYXJlbnRNZW51KHBhcmVudE1lbnUpCiAgICAgLCBtX3N1Yk1lbnUoMCkKIHsK IH0KIAotRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRf TWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24s IGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQs IEV3a19Db250ZXh0X01lbnUqIHN1Yk1lbnUpCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRl eHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9N ZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVj a2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSwgRXdrX0Nv bnRleHRfTWVudSogcGFyZW50TWVudSkKICAgICA6IG1fdHlwZSh0eXBlKQogICAgICwgbV9hY3Rp b24oYWN0aW9uKQogICAgICwgbV90aXRsZSh0aXRsZSkKICAgICAsIG1faXNDaGVja2VkKGNoZWNr ZWQpCiAgICAgLCBtX2lzRW5hYmxlZChlbmFibGVkKQotICAgICwgbV9wYXJlbnRNZW51KDApCisg ICAgLCBtX3BhcmVudE1lbnUocGFyZW50TWVudSkKICAgICAsIG1fc3ViTWVudShzdWJNZW51KQog ewogfQogCiBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXco RXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0Fj dGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9C b29sIGVuYWJsZWQpCiB7Ci0gICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6Y3JlYXRl KHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIDApLmxlYWtQdHIoKTsKKyAg ICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUodHlwZSwgYWN0aW9uLCB0aXRs ZSwgY2hlY2tlZCwgZW5hYmxlZCwgMCwgMCkubGVha1B0cigpOwogfQogCiBFd2tfQ29udGV4dF9N ZW51X0l0ZW0qIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEV3a19Db250 ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0 aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFi bGVkLCBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51KQogewotICAgIHJldHVybiBFd2tfQ29udGV4 dF9NZW51X0l0ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVk LCBzdWJNZW51KS5sZWFrUHRyKCk7CisgICAgcmV0dXJuIEV3a19Db250ZXh0X01lbnVfSXRlbTo6 Y3JlYXRlKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUsIDAp LmxlYWtQdHIoKTsKIH0KIAogRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgZXdrX2NvbnRleHRf bWVudV9pdGVtX3R5cGVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKQEAg LTE0NSw2ICsxNDUsMTMgQEAgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVk X3NldChFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0sIEVpbmFfQm8KICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAorRXdrX0NvbnRleHRfTWVudSogZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9t ZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0pCit7CisgICAgRUlOQV9T QUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGl0ZW0sIDApOworCisgICAgcmV0dXJuIGNvbnN0X2Nh c3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oaXRlbSktPnBhcmVudE1lbnUoKTsKK30KKwogQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX05PX0FD VElPTiwgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVGFnTm9BY3Rpb24pOwogQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09QRU5fTElOS19JTl9O RVdfV0lORE9XLCBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93 KTsKIENPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RB R19ET1dOTE9BRF9MSU5LX1RPX0RJU0ssIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbVRhZ0Rvd25s b2FkTGlua1RvRGlzayk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCmluZGV4IDk2MTJhMjEuLmQxN2JhMzYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21l bnVfaXRlbS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5oCkBAIC0yNjMsNiArMjYzLDE1IEBAIEVBUEkgRWluYV9Cb29sIGV3a19j b250ZXh0X21lbnVfaXRlbV9lbmFibGVkX2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0g Km8pCiAgKi8KIEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX3Nl dChFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKIAorLyoqCisg KiBHZXRzIHRoZSBwYXJlbnQgbWVudSBmb3IgdGhlIGl0ZW0uCisgKgorICogQHBhcmFtIG8gaXRl bSB0byBnZXQgdGhlIHBhcmVudAorICoKKyAqIEByZXR1cm4gdGhlIHBvaW50ZXIgdG8gcGFyZW50 IG1lbnUgb24gc3VjY2VzcyBvciBAYyBOVUxMIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFd2tfQ29u dGV4dF9NZW51ICpld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGNvbnN0IEV3 a19Db250ZXh0X01lbnVfSXRlbSAqbyk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dF9tZW51X2l0ZW1fcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaAppbmRleCA2MmYyNzkwLi4zMjJhYWNiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9t ZW51X2l0ZW1fcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgKQEAgLTM4LDE0ICszOCwxNCBAQAogICov CiBjbGFzcyBFd2tDb250ZXh0TWVudUl0ZW0gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3du UHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKGNvbnN0IFdlYktpdDo6V2ViQ29udGV4dE1l bnVJdGVtRGF0YSYgaXRlbSkKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0 ZW0+IGNyZWF0ZShjb25zdCBXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGEmIGl0ZW0sIEV3 a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRy KG5ldyBFd2tDb250ZXh0TWVudUl0ZW0oaXRlbSkpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIo bmV3IEV3a0NvbnRleHRNZW51SXRlbShpdGVtLCBwYXJlbnRNZW51KSk7CiAgICAgfQogCi0gICAg c3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoRXdrX0NvbnRleHRf TWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24s IGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQs IEV3a0NvbnRleHRNZW51KiBzdWJNZW51KQorICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRl eHRNZW51SXRlbT4gY3JlYXRlKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19D b250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9C b29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0TWVudSogc3ViTWVudSwg RXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRQ dHIobmV3IEV3a0NvbnRleHRNZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBl bmFibGVkLCBzdWJNZW51KSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29udGV4 dE1lbnVJdGVtKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUs IHBhcmVudE1lbnUpKTsKICAgICB9CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9u IGFjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fYWN0aW9uOyB9CkBAIC02Myw5ICs2MywxMiBAQCBw dWJsaWM6CiAgICAgYm9vbCBlbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0VuYWJsZWQ7IH0K ICAgICB2b2lkIHNldEVuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1faXNFbmFibGVkID0gZW5hYmxl ZDsgfQogCisgICAgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUoKSB7IHJldHVybiBtX3BhcmVu dE1lbnU7IH0KKyAgICB2b2lkIHNldFBhcmVudE1lbnUoRXdrQ29udGV4dE1lbnUqIHBhcmVudE1l bnUpIHsgbV9wYXJlbnRNZW51ID0gcGFyZW50TWVudTsgfQorCiBwcml2YXRlOgotICAgIGV4cGxp Y2l0IEV3a0NvbnRleHRNZW51SXRlbShjb25zdCBXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURh dGEmKTsKLSAgICBFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUg dHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRp dGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51 KiBzdWJNZW51KTsKKyAgICBFd2tDb250ZXh0TWVudUl0ZW0oY29uc3QgV2ViS2l0OjpXZWJDb250 ZXh0TWVudUl0ZW1EYXRhJiwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpOworICAgIEV3a0Nv bnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4 dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBj aGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUsIEV3a0Nv bnRleHRNZW51KiBwYXJlbnRNZW51KTsKIAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBl IG1fdHlwZTsKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIG1fYWN0aW9uOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2sy X2NvbnRleHRfbWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAppbmRleCA3ODg1OGFmLi4xODY0ZTNhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf Y29udGV4dF9tZW51LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90 ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcApAQCAtNDYsNiArNDYsOSBAQCBzdGF0aWMg RWluYV9Cb29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEs IEV2YXNfQ29vcmQgeCwgRQogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSA9IHN0YXRp Y19jYXN0PEV3a19Db250ZXh0X01lbnVfSXRlbSo+KGVpbmFfbGlzdF9udGgobGlzdCwgMCkpOwog ICAgIGNoZWNrQmFzaWNDb250ZXh0TWVudUl0ZW0oaXRlbSwgRVdLX0FDVElPTl9UWVBFLCBFV0tf Q09OVEVYVF9NRU5VX0lURU1fVEFHX0dPX0JBQ0ssICJHbyBCYWNrIiwgZmFsc2UsIHRydWUpOwog CisgICAgLy8gQ2hlY2sgaWYgcGFyZW50IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0 ZW1zIHdoZXJlIGNyZWF0ZWQgYnkgV2ViS2l0LgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwg ZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChpdGVtKSk7CisKICAgICBpdGVt ID0gc3RhdGljX2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oZWluYV9saXN0X250aChsaXN0 LCAxKSk7CiAgICAgY2hlY2tCYXNpY0NvbnRleHRNZW51SXRlbShpdGVtLCBFV0tfQUNUSU9OX1RZ UEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfR09fRk9SV0FSRCwgIkdvIEZvcndhcmQiLCBm YWxzZSwgdHJ1ZSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KGl0ZW0s IGZhbHNlKTsKQEAgLTYzLDggKzY2LDEzIEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRN ZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAKICAg ICAvLyBNYWtlcyBuZXcgY29udGV4dCBtZW51IGl0ZW1zLgogICAgIEV3a19Db250ZXh0X01lbnVf SXRlbSogbmV3SXRlbSA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBF LCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIiwgZmFs c2UsIHRydWUpOworICAgIC8vIENoZWNrIGlmIHBhcmVudCBtZW51IGVxdWFscyAwIHdoZW4gY29u dGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVt X25ldy4KKyAgICBFWFBFQ1RfRVEoMCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51 X2dldChuZXdJdGVtKSk7CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZChjb250ZXh0 TWVudSwgbmV3SXRlbSk7CiAKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hl biBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51 X2l0ZW1fbmV3IGFuZCBhZGRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kLgor ICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9t ZW51X2dldChuZXdJdGVtKSk7CisKICAgICBFaW5hX0xpc3QqIHN1Yk1lbnVJdGVtTGlzdCA9IDA7 CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBzdWJNZW51SXRlbTEgPSBld2tfY29udGV4dF9t ZW51X2l0ZW1fbmV3KEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19P VEhFUiwgIk5ldyBTdWJNZW51IEl0ZW0gMSIsIGZhbHNlLCB0cnVlKTsKICAgICBFd2tfQ29udGV4 dF9NZW51X0l0ZW0qIHN1Yk1lbnVJdGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdL X0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1l bnUgSXRlbSAyIiwgZmFsc2UsIHRydWUpOwpAQCAtNzMsOSArODEsMTggQEAgc3RhdGljIEVpbmFf Qm9vbCBzaG93Q29udGV4dE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBFdmFz X0Nvb3JkIHgsIEUKICAgICBzdWJNZW51SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1l bnVJdGVtTGlzdCwgc3ViTWVudUl0ZW0yKTsKICAgICBzdWJNZW51SXRlbUxpc3QgPSBlaW5hX2xp c3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlzdCwgc3ViTWVudUl0ZW0zKTsKICAgICBFd2tfQ29udGV4 dF9NZW51KiBzdWJNZW51ID0gZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcyhzdWJNZW51 SXRlbUxpc3QpOworCisgICAgLy8gQ2hlY2sgaWYgcGFyZW50IG1lbnUgZXF1YWxzIHdoZW4gY29u dGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9uZXdf d2l0aF9pdGVtcworICAgIEVYUEVDVF9FUShzdWJNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1f cGFyZW50X21lbnVfZ2V0KHN1Yk1lbnVJdGVtMSkpOworCiAgICAgRXdrX0NvbnRleHRfTWVudV9J dGVtKiBuZXdJdGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVX S19TVUJNRU5VX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3Vz dG9tIEl0ZW0gMiIsIGZhbHNlLCB0cnVlLCBzdWJNZW51KTsKKyAgICAvLyBDaGVjayBpZiBwYXJl bnQgbWVudSBlcXVhbHMgMCB3aGVuIGNvbnRleHQgbWVudSBpdGVtcyB3aGVyZSBjcmVhdGVkIHVz aW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51LgorICAgIEVYUEVDVF9F USgwLCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAg ICBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMik7CiAK KyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRl bXMgd2hlcmUgY3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3Vi bWVudSBhbmQgYWRkZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZC4KKyAgICBF WFBFQ1RfRVEoY29udGV4dE1lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9n ZXQobmV3SXRlbSkpOworCiAgICAgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudTIgPSBld2tfY29u dGV4dF9tZW51X25ldygpOwogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbTMgPSBl d2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudShFV0tfU1VCTUVOVV9UWVBFLCBF V0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIDMiLCBmYWxz ZSwgdHJ1ZSwgc3ViTWVudTIpOwogICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoY29u dGV4dE1lbnUsIG5ld0l0ZW0zKTsK 188564 2013-02-15 07:17:27 -0800 2013-02-18 05:55:40 -0800 rebased patch parentmenu4.diff text/plain 12594 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1ZGEyMWY0Li4yZTg1MTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDItMTUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBhbiBBUEkgZm9yIGdldHRpbmcgY29u dGV4dCBtZW51IGl0ZW0ncyBwYXJlbnQgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgcGFyZW50IG1lbnUgc3VwcG9ydCBhbmQgQVBJIGZv ciBFd2tfQ29udGV4dF9NZW51X0l0ZW0sIHRvCisgICAgICAgIGFsbG93IHNlbGVjdGluZyBjb250 ZXh0IG1lbnVzIHVzaW5nIEVsZW1lbnRhcnkgd2lkZ2V0cy4KKyAgICAgICAgQ29udGV4dCBtZW51 IHVuaXQgdGVzdCB1cGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVu dTo6RXdrQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRl eHRNZW51SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KToKKyAgICAg ICAgKGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250 ZXh0TWVudUl0ZW06OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OnBhcmVu dE1lbnUpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpzZXRQYXJlbnRNZW51KToKKyAg ICAgICAgKEV3a0NvbnRleHRNZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChzaG93Q29udGV4dE1l bnUpOgorCiAyMDEzLTAyLTE1ICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5A ZGlnaWEuY29tPgogCiAgICAgICAgIFNpbXBsaWZ5IGhpdFRlc3RSZXN1bHRBdFBvaW50IGFuZCBu b2Rlc0Zyb21SZWN0IEFQSXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHAKaW5kZXggNTkyOTk3Yi4uZGY5ZGMyMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVu dS5jcHAKQEAgLTQzLDcgKzQzLDcgQEAgRXdrQ29udGV4dE1lbnU6OkV3a0NvbnRleHRNZW51KEV3 a1ZpZXcqIHZpZXcsIFdLQXJyYXlSZWYgaXRlbXMpCiB7CiAgICAgY29uc3Qgc2l6ZV90IHNpemUg PSBXS0FycmF5R2V0U2l6ZShpdGVtcyk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXpl OyArK2kpCi0gICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9j b250ZXh0TWVudUl0ZW1zLCBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShzdGF0aWNfY2Fz dDxXS0NvbnRleHRNZW51SXRlbVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGl0ZW1zLCBpKSkp LmxlYWtQdHIoKSk7CisgICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBl bmQobV9jb250ZXh0TWVudUl0ZW1zLCBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShzdGF0 aWNfY2FzdDxXS0NvbnRleHRNZW51SXRlbVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGl0ZW1z LCBpKSksIHRoaXMpLmxlYWtQdHIoKSk7CiB9CiAKIEV3a0NvbnRleHRNZW51OjpFd2tDb250ZXh0 TWVudSgpCkBAIC01OCw4ICs1OCwxMyBAQCBFd2tDb250ZXh0TWVudTo6RXdrQ29udGV4dE1lbnUo RWluYV9MaXN0KiBpdGVtcykKIHsKICAgICBFaW5hX0xpc3QqIGw7CiAgICAgdm9pZCogZGF0YTsK LSAgICBFSU5BX0xJU1RfRk9SRUFDSChpdGVtcywgbCwgZGF0YSkKLSAgICAgICAgbV9jb250ZXh0 TWVudUl0ZW1zID0gZWluYV9saXN0X2FwcGVuZChtX2NvbnRleHRNZW51SXRlbXMsIHN0YXRpY19j YXN0PEV3a0NvbnRleHRNZW51SXRlbSo+KGRhdGEpKTsKKyAgICBFSU5BX0xJU1RfRk9SRUFDSChp dGVtcywgbCwgZGF0YSkgeworICAgICAgICBpZiAoIWRhdGEpCisgICAgICAgICAgICBjb250aW51 ZTsKKyAgICAgICAgRXdrQ29udGV4dE1lbnVJdGVtKiBpdGVtID0gc3RhdGljX2Nhc3Q8RXdrQ29u dGV4dE1lbnVJdGVtKj4oZGF0YSk7CisgICAgICAgIGl0ZW0tPnNldFBhcmVudE1lbnUodGhpcyk7 CisgICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9jb250ZXh0 TWVudUl0ZW1zLCBpdGVtKTsKKyAgICB9CiB9CiAKIEV3a0NvbnRleHRNZW51Ojp+RXdrQ29udGV4 dE1lbnUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2NvbnRleHRfbWVudV9pdGVtLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKaW5kZXggZWM2ZDEzOS4uMTdkY2U3NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9p dGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4 dF9tZW51X2l0ZW0uY3BwCkBAIC0zMyw3ICszMyw3IEBACiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJL aXQ7CiAKLUV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKFdLQ29udGV4dE1l bnVJdGVtUmVmIGl0ZW0pCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShX S0NvbnRleHRNZW51SXRlbVJlZiBpdGVtLCBFd2tfQ29udGV4dF9NZW51KiBwYXJlbnRNZW51KQog ICAgIDogbV90eXBlKHN0YXRpY19jYXN0PEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlPihXS0Nv bnRleHRNZW51SXRlbUdldFR5cGUoaXRlbSkpKQogICAgICwgbV9hY3Rpb24oc3RhdGljX2Nhc3Q8 RXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbj4oV0tDb250ZXh0TWVudUl0ZW1HZXRUYWcoaXRl bSkpKQogICAgICwgbV90aXRsZShXS0VpbmFTaGFyZWRTdHJpbmcoV0tDb250ZXh0TWVudUl0ZW1D b3B5VGl0bGUoaXRlbSkpKQpAQCAtNDQsNyArNDQsNyBAQCBFd2tDb250ZXh0TWVudUl0ZW06OkV3 a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVtKQogewogfQogCi1Fd2tD b250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1f VHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hh ciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRl eHRfTWVudSogc3ViTWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVt KEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9B Y3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFf Qm9vbCBlbmFibGVkLCBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51LCBFd2tfQ29udGV4dF9NZW51 KiBwYXJlbnRNZW51KQogICAgIDogbV90eXBlKHR5cGUpCiAgICAgLCBtX2FjdGlvbihhY3Rpb24p CiAgICAgLCBtX3RpdGxlKHRpdGxlKQpAQCAtNTcsMTIgKzU3LDEyIEBAIEV3a0NvbnRleHRNZW51 SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUs IEV3a19Db250CiAKIEV3a19Db250ZXh0X01lbnVfSXRlbSogZXdrX2NvbnRleHRfbWVudV9pdGVt X25ldyhFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0 ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBF aW5hX0Jvb2wgZW5hYmxlZCkKIHsKLSAgICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9JdGVtOjpj cmVhdGUodHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgMCkubGVha1B0cigp OworICAgIHJldHVybiBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZSh0eXBlLCBhY3Rpb24s IHRpdGxlLCBjaGVja2VkLCBlbmFibGVkLCAwLCAwKS5sZWFrUHRyKCk7CiB9CiAKIEV3a19Db250 ZXh0X01lbnVfSXRlbSogZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUoRXdr X0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlv biBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29s IGVuYWJsZWQsIEV3a19Db250ZXh0X01lbnUqIHN1Yk1lbnUpCiB7Ci0gICAgcmV0dXJuIEV3a19D b250ZXh0X01lbnVfSXRlbTo6Y3JlYXRlKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVu YWJsZWQsIHN1Yk1lbnUpLmxlYWtQdHIoKTsKKyAgICByZXR1cm4gRXdrX0NvbnRleHRfTWVudV9J dGVtOjpjcmVhdGUodHlwZSwgYWN0aW9uLCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVu dSwgMCkubGVha1B0cigpOwogfQogCiBFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSBld2tfY29u dGV4dF9tZW51X2l0ZW1fdHlwZV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBpdGVt KQpAQCAtMTQ1LDYgKzE0NSwxMyBAQCBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9pdGVtX2Vu YWJsZWRfc2V0KEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSwgRWluYV9CbwogICAgIHJldHVy biB0cnVlOwogfQogCitFd2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFy ZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKK3sKKyAgICBF SU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaXRlbSwgMCk7CisKKyAgICByZXR1cm4gY29u c3RfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0ZW0qPihpdGVtKS0+cGFyZW50TWVudSgpOworfQor CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdf Tk9fQUNUSU9OLCBrV0tDb250ZXh0TWVudUl0ZW1UYWdOb0FjdGlvbik7CiBDT01QSUxFX0FTU0VS VF9NQVRDSElOR19FTlVNKEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1BFTl9MSU5LX0lOX05F V19XSU5ET1csIGtXS0NvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3cpOwogQ09N UElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0RPV05M T0FEX0xJTktfVE9fRElTSywga1dLQ29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNr KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nv bnRleHRfbWVudV9pdGVtLmgKaW5kZXggYTI4ZjY4YS4uNzQ1MTViNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVt LmgKQEAgLTI3NCw2ICsyNzQsMTUgQEAgRUFQSSBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9p dGVtX2VuYWJsZWRfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSAqbykKICAqLwogRUFQ SSBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KEV3a19Db250ZXh0 X01lbnVfSXRlbSAqbywgRWluYV9Cb29sIGVuYWJsZWQpOwogCisvKioKKyAqIEdldHMgdGhlIHBh cmVudCBtZW51IGZvciB0aGUgaXRlbS4KKyAqCisgKiBAcGFyYW0gbyBpdGVtIHRvIGdldCB0aGUg cGFyZW50CisgKgorICogQHJldHVybiB0aGUgcG9pbnRlciB0byBwYXJlbnQgbWVudSBvbiBzdWNj ZXNzIG9yIEBjIE5VTEwgb24gZmFpbHVyZQorICovCitFQVBJIEV3a19Db250ZXh0X01lbnUgKmV3 a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVu dV9JdGVtICpvKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9w cml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9t ZW51X2l0ZW1fcHJpdmF0ZS5oCmluZGV4IDlmNzc4M2IuLjk5Yzk1M2IgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2 YXRlLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudV9pdGVtX3ByaXZhdGUuaApAQCAtMzgsMTQgKzM4LDE0IEBACiAgKi8KIGNsYXNzIEV3a0Nv bnRleHRNZW51SXRlbSB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4 dE1lbnVJdGVtPiBjcmVhdGUoV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSkKKyAgICBzdGF0aWMg UGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNyZWF0ZShXS0NvbnRleHRNZW51SXRlbVJl ZiBpdGVtLCBFd2tDb250ZXh0TWVudSogcGFyZW50TWVudSkKICAgICB7Ci0gICAgICAgIHJldHVy biBhZG9wdFB0cihuZXcgRXdrQ29udGV4dE1lbnVJdGVtKGl0ZW0pKTsKKyAgICAgICAgcmV0dXJu IGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0oaXRlbSwgcGFyZW50TWVudSkpOwogICAg IH0KIAotICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKEV3 a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rp b24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9v bCBlbmFibGVkLCBFd2tDb250ZXh0TWVudSogc3ViTWVudSkKKyAgICBzdGF0aWMgUGFzc093blB0 cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNyZWF0ZShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0 eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0 bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1lbnUq IHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KQogICAgIHsKLSAgICAgICAgcmV0 dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0odHlwZSwgYWN0aW9uLCB0aXRsZSwg Y2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVudSkpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3 IEV3a0NvbnRleHRNZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVk LCBzdWJNZW51LCBwYXJlbnRNZW51KSk7CiAgICAgfQogCiAgICAgRXdrX0NvbnRleHRfTWVudV9J dGVtX0FjdGlvbiBhY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX2FjdGlvbjsgfQpAQCAtNjMsOSAr NjMsMTIgQEAgcHVibGljOgogICAgIGJvb2wgZW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNF bmFibGVkOyB9CiAgICAgdm9pZCBzZXRFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBtX2lzRW5hYmxl ZCA9IGVuYWJsZWQ7IH0KIAorICAgIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KCkgeyByZXR1 cm4gbV9wYXJlbnRNZW51OyB9CisgICAgdm9pZCBzZXRQYXJlbnRNZW51KEV3a0NvbnRleHRNZW51 KiBwYXJlbnRNZW51KSB7IG1fcGFyZW50TWVudSA9IHBhcmVudE1lbnU7IH0KKwogcHJpdmF0ZToK LSAgICBleHBsaWNpdCBFd2tDb250ZXh0TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYpOwot ICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBF d2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVp bmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1l bnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiwgRXdrQ29u dGV4dE1lbnUqIHBhcmVudE1lbnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4 dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlv biwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxl ZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KTsK IAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIG1fdHlwZTsKICAgICBFd2tfQ29udGV4 dF9NZW51X0l0ZW1fQWN0aW9uIG1fYWN0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51 LmNwcAppbmRleCA3ODg1OGFmLi4xODY0ZTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9t ZW51LmNwcApAQCAtNDYsNiArNDYsOSBAQCBzdGF0aWMgRWluYV9Cb29sIHNob3dDb250ZXh0TWVu dShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29vcmQgeCwgRQogICAgIEV3 a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSA9IHN0YXRpY19jYXN0PEV3a19Db250ZXh0X01lbnVf SXRlbSo+KGVpbmFfbGlzdF9udGgobGlzdCwgMCkpOwogICAgIGNoZWNrQmFzaWNDb250ZXh0TWVu dUl0ZW0oaXRlbSwgRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0dP X0JBQ0ssICJHbyBCYWNrIiwgZmFsc2UsIHRydWUpOwogCisgICAgLy8gQ2hlY2sgaWYgcGFyZW50 IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgYnkgV2Vi S2l0LgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3Bh cmVudF9tZW51X2dldChpdGVtKSk7CisKICAgICBpdGVtID0gc3RhdGljX2Nhc3Q8RXdrX0NvbnRl eHRfTWVudV9JdGVtKj4oZWluYV9saXN0X250aChsaXN0LCAxKSk7CiAgICAgY2hlY2tCYXNpY0Nv bnRleHRNZW51SXRlbShpdGVtLCBFV0tfQUNUSU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRF TV9UQUdfR09fRk9SV0FSRCwgIkdvIEZvcndhcmQiLCBmYWxzZSwgdHJ1ZSk7CiAgICAgZXdrX2Nv bnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KGl0ZW0sIGZhbHNlKTsKQEAgLTYzLDggKzY2LDEz IEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRNZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEq IHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAKICAgICAvLyBNYWtlcyBuZXcgY29udGV4dCBt ZW51IGl0ZW1zLgogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbSA9IGV3a19jb250 ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1f VEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIiwgZmFsc2UsIHRydWUpOworICAgIC8vIENoZWNr IGlmIHBhcmVudCBtZW51IGVxdWFscyAwIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNy ZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldy4KKyAgICBFWFBFQ1RfRVEoMCwg ZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CiAgICAgZXdr X2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZChjb250ZXh0TWVudSwgbmV3SXRlbSk7CiAKKyAgICAv LyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hl cmUgY3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3IGFuZCBhZGRlZCB1c2lu ZyBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kLgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVu dSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CisKICAg ICBFaW5hX0xpc3QqIHN1Yk1lbnVJdGVtTGlzdCA9IDA7CiAgICAgRXdrX0NvbnRleHRfTWVudV9J dGVtKiBzdWJNZW51SXRlbTEgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KEVXS19BQ1RJT05f VFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5ldyBTdWJNZW51IEl0ZW0g MSIsIGZhbHNlLCB0cnVlKTsKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIHN1Yk1lbnVJdGVt MiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVY VF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1lbnUgSXRlbSAyIiwgZmFsc2UsIHRydWUp OwpAQCAtNzMsOSArODEsMTggQEAgc3RhdGljIEVpbmFfQm9vbCBzaG93Q29udGV4dE1lbnUoRXdr X1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBFdmFzX0Nvb3JkIHgsIEUKICAgICBzdWJNZW51 SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlzdCwgc3ViTWVudUl0ZW0y KTsKICAgICBzdWJNZW51SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlz dCwgc3ViTWVudUl0ZW0zKTsKICAgICBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51ID0gZXdrX2Nv bnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcyhzdWJNZW51SXRlbUxpc3QpOworCisgICAgLy8gQ2hl Y2sgaWYgcGFyZW50IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNy ZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcworICAgIEVYUEVDVF9F UShzdWJNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KHN1Yk1lbnVJ dGVtMSkpOworCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtMiA9IGV3a19jb250 ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5VX1RZUEUsIEVXS19DT05U RVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMiIsIGZhbHNlLCB0cnVl LCBzdWJNZW51KTsKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgMCB3aGVuIGNv bnRleHQgbWVudSBpdGVtcyB3aGVyZSBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRl bV9uZXdfd2l0aF9zdWJtZW51LgorICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0 ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1f YXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQg bWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCB1c2luZyBl d2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudSBhbmQgYWRkZWQgdXNpbmcgZXdr X2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZC4KKyAgICBFWFBFQ1RfRVEoY29udGV4dE1lbnUsIGV3 a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQobmV3SXRlbSkpOworCiAgICAgRXdr X0NvbnRleHRfTWVudSogc3ViTWVudTIgPSBld2tfY29udGV4dF9tZW51X25ldygpOwogICAgIEV3 a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbTMgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3 X3dpdGhfc3VibWVudShFV0tfU1VCTUVOVV9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFH X09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIDMiLCBmYWxzZSwgdHJ1ZSwgc3ViTWVudTIpOwogICAg IGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoY29udGV4dE1lbnUsIG5ld0l0ZW0zKTsK 188865 2013-02-18 05:55:40 -0800 2013-04-15 07:09:46 -0700 fixes after review parentmenu5.diff text/plain 11805 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBmMjRkZjA5Li41MmZmNTZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDItMTggIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBhbiBBUEkgZm9yIGdldHRpbmcgY29u dGV4dCBtZW51IGl0ZW0ncyBwYXJlbnQgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgcGFyZW50IG1lbnUgc3VwcG9ydCBhbmQgQVBJIGZv ciBFd2tfQ29udGV4dF9NZW51X0l0ZW0sIHRvCisgICAgICAgIGFsbG93IHNlbGVjdGluZyBjb250 ZXh0IG1lbnVzIHVzaW5nIEVsZW1lbnRhcnkgd2lkZ2V0cy4KKyAgICAgICAgQ29udGV4dCBtZW51 IHVuaXQgdGVzdCB1cGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVu dTo6RXdrQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRl eHRNZW51SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KToKKyAgICAg ICAgKGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KToKKyAgICAgICAgKGV3 a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmg6CisgICAgICAgIChFd2tDb250 ZXh0TWVudUl0ZW06OmNyZWF0ZSk6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OnBhcmVu dE1lbnUpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpzZXRQYXJlbnRNZW51KToKKyAg ICAgICAgKEV3a0NvbnRleHRNZW51SXRlbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwv dGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChzaG93Q29udGV4dE1l bnUpOgorCiAyMDEzLTAyLTE4ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2guZHVtZXpAc2lzYS5zYW1z dW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIERpc2FibGUgZmFpbGluZyBBUEkgdGVzdHMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X21lbnUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudS5jcHAKaW5kZXggNTkyOTk3Yi4uMzEzMDg0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHAKQEAgLTQzLDcgKzQz LDcgQEAgRXdrQ29udGV4dE1lbnU6OkV3a0NvbnRleHRNZW51KEV3a1ZpZXcqIHZpZXcsIFdLQXJy YXlSZWYgaXRlbXMpCiB7CiAgICAgY29uc3Qgc2l6ZV90IHNpemUgPSBXS0FycmF5R2V0U2l6ZShp dGVtcyk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpCi0gICAgICAgIG1f Y29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9jb250ZXh0TWVudUl0ZW1zLCBF d2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShzdGF0aWNfY2FzdDxXS0NvbnRleHRNZW51SXRl bVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGl0ZW1zLCBpKSkpLmxlYWtQdHIoKSk7CisgICAg ICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9jb250ZXh0TWVudUl0 ZW1zLCBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShzdGF0aWNfY2FzdDxXS0NvbnRleHRN ZW51SXRlbVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGl0ZW1zLCBpKSksIHRoaXMpLmxlYWtQ dHIoKSk7CiB9CiAKIEV3a0NvbnRleHRNZW51OjpFd2tDb250ZXh0TWVudSgpCkBAIC01OCw4ICs1 OCwxMiBAQCBFd2tDb250ZXh0TWVudTo6RXdrQ29udGV4dE1lbnUoRWluYV9MaXN0KiBpdGVtcykK IHsKICAgICBFaW5hX0xpc3QqIGw7CiAgICAgdm9pZCogZGF0YTsKLSAgICBFSU5BX0xJU1RfRk9S RUFDSChpdGVtcywgbCwgZGF0YSkKLSAgICAgICAgbV9jb250ZXh0TWVudUl0ZW1zID0gZWluYV9s aXN0X2FwcGVuZChtX2NvbnRleHRNZW51SXRlbXMsIHN0YXRpY19jYXN0PEV3a0NvbnRleHRNZW51 SXRlbSo+KGRhdGEpKTsKKyAgICBFSU5BX0xJU1RfRk9SRUFDSChpdGVtcywgbCwgZGF0YSkgewor ICAgICAgICBpZiAoRXdrQ29udGV4dE1lbnVJdGVtKiBpdGVtID0gc3RhdGljX2Nhc3Q8RXdrQ29u dGV4dE1lbnVJdGVtKj4oZGF0YSkpIHsKKyAgICAgICAgICAgIGl0ZW0tPnNldFBhcmVudE1lbnUo dGhpcyk7CisgICAgICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMgPSBlaW5hX2xpc3RfYXBwZW5k KG1fY29udGV4dE1lbnVJdGVtcywgaXRlbSk7CisgICAgICAgIH0KKyAgICB9CiB9CiAKIEV3a0Nv bnRleHRNZW51Ojp+RXdrQ29udGV4dE1lbnUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAKaW5kZXggZWM2 ZDEzOS4uMGUzNDc3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCkBAIC0zMywyNCArMzMsMjQgQEAK IAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAotRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250 ZXh0TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSkKK0V3a0NvbnRleHRNZW51SXRl bTo6RXdrQ29udGV4dE1lbnVJdGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0sIEV3a19Db250 ZXh0X01lbnUqIHBhcmVudE1lbnUpCiAgICAgOiBtX3R5cGUoc3RhdGljX2Nhc3Q8RXdrX0NvbnRl eHRfTWVudV9JdGVtX1R5cGU+KFdLQ29udGV4dE1lbnVJdGVtR2V0VHlwZShpdGVtKSkpCiAgICAg LCBtX2FjdGlvbihzdGF0aWNfY2FzdDxFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uPihXS0Nv bnRleHRNZW51SXRlbUdldFRhZyhpdGVtKSkpCiAgICAgLCBtX3RpdGxlKFdLRWluYVNoYXJlZFN0 cmluZyhXS0NvbnRleHRNZW51SXRlbUNvcHlUaXRsZShpdGVtKSkpCiAgICAgLCBtX2lzQ2hlY2tl ZChXS0NvbnRleHRNZW51SXRlbUdldENoZWNrZWQoaXRlbSkpCiAgICAgLCBtX2lzRW5hYmxlZChX S0NvbnRleHRNZW51SXRlbUdldEVuYWJsZWQoaXRlbSkpCi0gICAgLCBtX3BhcmVudE1lbnUoMCkK KyAgICAsIG1fcGFyZW50TWVudShwYXJlbnRNZW51KQogICAgICwgbV9zdWJNZW51KDApCiB7CiB9 CiAKLUV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01l bnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBj b25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBF d2tfQ29udGV4dF9NZW51KiBzdWJNZW51KQorRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0 TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVu dV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tl ZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250ZXh0X01lbnUqIHN1Yk1lbnUsIEV3a19Db250 ZXh0X01lbnUqIHBhcmVudE1lbnUpCiAgICAgOiBtX3R5cGUodHlwZSkKICAgICAsIG1fYWN0aW9u KGFjdGlvbikKICAgICAsIG1fdGl0bGUodGl0bGUpCiAgICAgLCBtX2lzQ2hlY2tlZChjaGVja2Vk KQogICAgICwgbV9pc0VuYWJsZWQoZW5hYmxlZCkKLSAgICAsIG1fcGFyZW50TWVudSgwKQorICAg ICwgbV9wYXJlbnRNZW51KHBhcmVudE1lbnUpCiAgICAgLCBtX3N1Yk1lbnUoc3ViTWVudSkKIHsK IH0KQEAgLTE0NSw2ICsxNDUsMTMgQEAgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9l bmFibGVkX3NldChFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0sIEVpbmFfQm8KICAgICByZXR1 cm4gdHJ1ZTsKIH0KIAorRXdrX0NvbnRleHRfTWVudSogZXdrX2NvbnRleHRfbWVudV9pdGVtX3Bh cmVudF9tZW51X2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0pCit7CisgICAg RUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGl0ZW0sIDApOworCisgICAgcmV0dXJuIGNv bnN0X2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oaXRlbSktPnBhcmVudE1lbnUoKTsKK30K KwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFH X05PX0FDVElPTiwga1dLQ29udGV4dE1lbnVJdGVtVGFnTm9BY3Rpb24pOwogQ09NUElMRV9BU1NF UlRfTUFUQ0hJTkdfRU5VTShFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09QRU5fTElOS19JTl9O RVdfV0lORE9XLCBrV0tDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGlua0luTmV3V2luZG93KTsKIENP TVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19ET1dO TE9BRF9MSU5LX1RPX0RJU0ssIGtXS0NvbnRleHRNZW51SXRlbVRhZ0Rvd25sb2FkTGlua1RvRGlz ayk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dF9tZW51X2l0ZW0uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19j b250ZXh0X21lbnVfaXRlbS5oCmluZGV4IGEyOGY2OGEuLjc0NTE1YjUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRl bS5oCkBAIC0yNzQsNiArMjc0LDE1IEBAIEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVf aXRlbV9lbmFibGVkX2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8pCiAgKi8KIEVB UEkgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX3NldChFd2tfQ29udGV4 dF9NZW51X0l0ZW0gKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKIAorLyoqCisgKiBHZXRzIHRoZSBw YXJlbnQgbWVudSBmb3IgdGhlIGl0ZW0uCisgKgorICogQHBhcmFtIG8gaXRlbSB0byBnZXQgdGhl IHBhcmVudAorICoKKyAqIEByZXR1cm4gdGhlIHBvaW50ZXIgdG8gcGFyZW50IG1lbnUgb24gc3Vj Y2VzcyBvciBAYyBOVUxMIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFd2tfQ29udGV4dF9NZW51ICpl d2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01l bnVfSXRlbSAqbyk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1f cHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudV9pdGVtX3ByaXZhdGUuaAppbmRleCA5Zjc3ODNiLi5kZmI3YjU3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJp dmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X21lbnVfaXRlbV9wcml2YXRlLmgKQEAgLTM4LDE0ICszOCwxNCBAQAogICovCiBjbGFzcyBFd2tD b250ZXh0TWVudUl0ZW0gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRl eHRNZW51SXRlbT4gY3JlYXRlKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0pCisgICAgc3RhdGlj IFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoV0tDb250ZXh0TWVudUl0ZW1S ZWYgaXRlbSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUgPSAwKQogICAgIHsKLSAgICAgICAg cmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0oaXRlbSkpOworICAgICAgICBy ZXR1cm4gYWRvcHRQdHIobmV3IEV3a0NvbnRleHRNZW51SXRlbShpdGVtLCBwYXJlbnRNZW51KSk7 CiAgICAgfQogCi0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVh dGUoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVt X0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWlu YV9Cb29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51KQorICAgIHN0YXRpYyBQYXNz T3duUHRyPEV3a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKEV3a19Db250ZXh0X01lbnVfSXRlbV9U eXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFy KiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0 TWVudSogc3ViTWVudSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUgPSAwKQogICAgIHsKLSAg ICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0odHlwZSwgYWN0aW9u LCB0aXRsZSwgY2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVudSkpOworICAgICAgICByZXR1cm4gYWRv cHRQdHIobmV3IEV3a0NvbnRleHRNZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2Vk LCBlbmFibGVkLCBzdWJNZW51LCBwYXJlbnRNZW51KSk7CiAgICAgfQogCiAgICAgRXdrX0NvbnRl eHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX2FjdGlvbjsgfQpA QCAtNjMsOSArNjMsMTIgQEAgcHVibGljOgogICAgIGJvb2wgZW5hYmxlZCgpIGNvbnN0IHsgcmV0 dXJuIG1faXNFbmFibGVkOyB9CiAgICAgdm9pZCBzZXRFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBt X2lzRW5hYmxlZCA9IGVuYWJsZWQ7IH0KIAorICAgIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51 KCkgeyByZXR1cm4gbV9wYXJlbnRNZW51OyB9CisgICAgdm9pZCBzZXRQYXJlbnRNZW51KEV3a0Nv bnRleHRNZW51KiBwYXJlbnRNZW51KSB7IG1fcGFyZW50TWVudSA9IHBhcmVudE1lbnU7IH0KKwog cHJpdmF0ZToKLSAgICBleHBsaWNpdCBFd2tDb250ZXh0TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0 ZW1SZWYpOwotICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlw ZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciog dGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1l bnUqIHN1Yk1lbnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJl ZiwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShF d2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0 aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jv b2wgZW5hYmxlZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51KiBwYXJl bnRNZW51KTsKIAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIG1fdHlwZTsKICAgICBF d2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIG1fYWN0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29u dGV4dF9tZW51LmNwcAppbmRleCA3ODg1OGFmLi4xODY0ZTNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJf Y29udGV4dF9tZW51LmNwcApAQCAtNDYsNiArNDYsOSBAQCBzdGF0aWMgRWluYV9Cb29sIHNob3dD b250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29vcmQgeCwg RQogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSA9IHN0YXRpY19jYXN0PEV3a19Db250 ZXh0X01lbnVfSXRlbSo+KGVpbmFfbGlzdF9udGgobGlzdCwgMCkpOwogICAgIGNoZWNrQmFzaWND b250ZXh0TWVudUl0ZW0oaXRlbSwgRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lU RU1fVEFHX0dPX0JBQ0ssICJHbyBCYWNrIiwgZmFsc2UsIHRydWUpOwogCisgICAgLy8gQ2hlY2sg aWYgcGFyZW50IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNyZWF0 ZWQgYnkgV2ViS2l0LgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVu dV9pdGVtX3BhcmVudF9tZW51X2dldChpdGVtKSk7CisKICAgICBpdGVtID0gc3RhdGljX2Nhc3Q8 RXdrX0NvbnRleHRfTWVudV9JdGVtKj4oZWluYV9saXN0X250aChsaXN0LCAxKSk7CiAgICAgY2hl Y2tCYXNpY0NvbnRleHRNZW51SXRlbShpdGVtLCBFV0tfQUNUSU9OX1RZUEUsIEVXS19DT05URVhU X01FTlVfSVRFTV9UQUdfR09fRk9SV0FSRCwgIkdvIEZvcndhcmQiLCBmYWxzZSwgdHJ1ZSk7CiAg ICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KGl0ZW0sIGZhbHNlKTsKQEAgLTYz LDggKzY2LDEzIEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRNZW51KEV3a19WaWV3X1Nt YXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAKICAgICAvLyBNYWtlcyBuZXcg Y29udGV4dCBtZW51IGl0ZW1zLgogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbSA9 IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9N RU5VX0lURU1fVEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIiwgZmFsc2UsIHRydWUpOworICAg IC8vIENoZWNrIGlmIHBhcmVudCBtZW51IGVxdWFscyAwIHdoZW4gY29udGV4dCBtZW51IGl0ZW1z IHdoZXJlIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldy4KKyAgICBFWFBF Q1RfRVEoMCwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7 CiAgICAgZXdrX2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZChjb250ZXh0TWVudSwgbmV3SXRlbSk7 CiAKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUg aXRlbXMgd2hlcmUgY3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3IGFuZCBh ZGRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kLgorICAgIEVYUEVDVF9FUShj b250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVt KSk7CisKICAgICBFaW5hX0xpc3QqIHN1Yk1lbnVJdGVtTGlzdCA9IDA7CiAgICAgRXdrX0NvbnRl eHRfTWVudV9JdGVtKiBzdWJNZW51SXRlbTEgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KEVX S19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5ldyBTdWJN ZW51IEl0ZW0gMSIsIGZhbHNlLCB0cnVlKTsKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIHN1 Yk1lbnVJdGVtMiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBF V0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1lbnUgSXRlbSAyIiwgZmFs c2UsIHRydWUpOwpAQCAtNzMsOSArODEsMTggQEAgc3RhdGljIEVpbmFfQm9vbCBzaG93Q29udGV4 dE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBFdmFzX0Nvb3JkIHgsIEUKICAg ICBzdWJNZW51SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlzdCwgc3Vi TWVudUl0ZW0yKTsKICAgICBzdWJNZW51SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1l bnVJdGVtTGlzdCwgc3ViTWVudUl0ZW0zKTsKICAgICBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51 ID0gZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcyhzdWJNZW51SXRlbUxpc3QpOworCisg ICAgLy8gQ2hlY2sgaWYgcGFyZW50IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0ZW1z IHdoZXJlIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcworICAg IEVYUEVDVF9FUShzdWJNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0 KHN1Yk1lbnVJdGVtMSkpOworCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtMiA9 IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5VX1RZUEUs IEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMiIsIGZh bHNlLCB0cnVlLCBzdWJNZW51KTsKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMg MCB3aGVuIGNvbnRleHQgbWVudSBpdGVtcyB3aGVyZSBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0 X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51LgorICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4 dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9t ZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDaGVjayBp ZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRl ZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudSBhbmQgYWRkZWQg dXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZC4KKyAgICBFWFBFQ1RfRVEoY29udGV4 dE1lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQobmV3SXRlbSkpOwor CiAgICAgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudTIgPSBld2tfY29udGV4dF9tZW51X25ldygp OwogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbTMgPSBld2tfY29udGV4dF9tZW51 X2l0ZW1fbmV3X3dpdGhfc3VibWVudShFV0tfU1VCTUVOVV9UWVBFLCBFV0tfQ09OVEVYVF9NRU5V X0lURU1fVEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIDMiLCBmYWxzZSwgdHJ1ZSwgc3ViTWVu dTIpOwogICAgIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoY29udGV4dE1lbnUsIG5ld0l0 ZW0zKTsK 198123 2013-04-15 07:09:46 -0700 2013-04-16 02:45:30 -0700 rebased patch parentmenu6.diff text/plain 11625 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhYTc3ZDYxLi4xZTRmMDU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzAg QEAKIDIwMTMtMDQtMTUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KIAorICAgICAgICBbRUZMXVtXSzJdIEFkZCBhbiBBUEkgZm9yIGdldHRpbmcgY29u dGV4dCBtZW51IGl0ZW0ncyBwYXJlbnQgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgcGFyZW50IG1lbnUgc3VwcG9ydCBhbmQgQVBJIGZv ciBFd2tfQ29udGV4dF9NZW51X0l0ZW0sIHRvCisgICAgICAgIGFsbG93IHNlbGVjdGluZyBjb250 ZXh0IG1lbnVzIHVzaW5nIEVsZW1lbnRhcnkgd2lkZ2V0cy4KKyAgICAgICAgQ29udGV4dCBtZW51 IHVuaXQgdGVzdCB1cGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVu dTo6RXdrQ29udGV4dE1lbnUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250 ZXh0X21lbnVfaXRlbS5jcHA6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRl eHRNZW51SXRlbSk6CisgICAgICAgIChld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVf Z2V0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJp dmF0ZS5oOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpjcmVhdGUpOgorICAgICAgICAo RXdrQ29udGV4dE1lbnVJdGVtOjpwYXJlbnRNZW51KToKKyAgICAgICAgKEV3a0NvbnRleHRNZW51 SXRlbTo6c2V0UGFyZW50TWVudSk6CisgICAgICAgIChFd2tDb250ZXh0TWVudUl0ZW0pOgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUuY3Bw OgorICAgICAgICAoc2hvd0NvbnRleHRNZW51KToKKworMjAxMy0wNC0xNSAgTWljaGHFgiBQYWt1 xYJhIHZlbCBSdXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgorCiAgICAgICAgIFtFRkxdW1dL Ml0gVXNlIEMgQVBJIGluIGV3a19jb250ZXh0X21lbnUKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTY5OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnUuY3BwCmluZGV4IGE1NGNiYmEu LmE0ODBhZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3 a19jb250ZXh0X21lbnUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19jb250ZXh0X21lbnUuY3BwCkBAIC00NSw3ICs0NSw3IEBAIEV3a0NvbnRleHRNZW51OjpF d2tDb250ZXh0TWVudShFd2tWaWV3KiB2aWV3LCBXS0FycmF5UmVmIGl0ZW1zKQogewogICAgIHNp emVfdCBzaXplID0gV0tBcnJheUdldFNpemUoaXRlbXMpOwogICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgc2l6ZTsgKytpKQotICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMgPSBlaW5hX2xpc3Rf YXBwZW5kKG1fY29udGV4dE1lbnVJdGVtcywgRXdrX0NvbnRleHRfTWVudV9JdGVtOjpjcmVhdGUo c3RhdGljX2Nhc3Q8V0tDb250ZXh0TWVudUl0ZW1SZWY+KFdLQXJyYXlHZXRJdGVtQXRJbmRleChp dGVtcywgaSkpKS5sZWFrUHRyKCkpOworICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMgPSBlaW5h X2xpc3RfYXBwZW5kKG1fY29udGV4dE1lbnVJdGVtcywgRXdrX0NvbnRleHRfTWVudV9JdGVtOjpj cmVhdGUoc3RhdGljX2Nhc3Q8V0tDb250ZXh0TWVudUl0ZW1SZWY+KFdLQXJyYXlHZXRJdGVtQXRJ bmRleChpdGVtcywgaSkpLCB0aGlzKS5sZWFrUHRyKCkpOwogfQogCiBFd2tDb250ZXh0TWVudTo6 RXdrQ29udGV4dE1lbnUoKQpAQCAtNjAsOCArNjAsMTIgQEAgRXdrQ29udGV4dE1lbnU6OkV3a0Nv bnRleHRNZW51KEVpbmFfTGlzdCogaXRlbXMpCiB7CiAgICAgRWluYV9MaXN0KiBsOwogICAgIHZv aWQqIGRhdGE7Ci0gICAgRUlOQV9MSVNUX0ZPUkVBQ0goaXRlbXMsIGwsIGRhdGEpCi0gICAgICAg IG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9jb250ZXh0TWVudUl0ZW1z LCBzdGF0aWNfY2FzdDxFd2tDb250ZXh0TWVudUl0ZW0qPihkYXRhKSk7CisgICAgRUlOQV9MSVNU X0ZPUkVBQ0goaXRlbXMsIGwsIGRhdGEpIHsKKyAgICAgICAgaWYgKEV3a0NvbnRleHRNZW51SXRl bSogaXRlbSA9IHN0YXRpY19jYXN0PEV3a0NvbnRleHRNZW51SXRlbSo+KGRhdGEpKSB7CisgICAg ICAgICAgICBpdGVtLT5zZXRQYXJlbnRNZW51KHRoaXMpOworICAgICAgICAgICAgbV9jb250ZXh0 TWVudUl0ZW1zID0gZWluYV9saXN0X2FwcGVuZChtX2NvbnRleHRNZW51SXRlbXMsIGl0ZW0pOwor ICAgICAgICB9CisgICAgfQogfQogCiBFd2tDb250ZXh0TWVudTo6fkV3a0NvbnRleHRNZW51KCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 X21lbnVfaXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dF9tZW51X2l0ZW0uY3BwCmluZGV4IGVkYjlmNDYuLjliODViYTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9p dGVtLmNwcApAQCAtMzUsMjQgKzM1LDI0IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKIHN0 YXRpYyBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGdldEV3a0FjdGlvbkZyb21XS1RhZyhX S0NvbnRleHRNZW51SXRlbVRhZyBhY3Rpb24pOwogCi1Fd2tDb250ZXh0TWVudUl0ZW06OkV3a0Nv bnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVtKQorRXdrQ29udGV4dE1lbnVJ dGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSwgRXdrX0Nv bnRleHRfTWVudSogcGFyZW50TWVudSkKICAgICA6IG1fdHlwZShzdGF0aWNfY2FzdDxFd2tfQ29u dGV4dF9NZW51X0l0ZW1fVHlwZT4oV0tDb250ZXh0TWVudUl0ZW1HZXRUeXBlKGl0ZW0pKSkKICAg ICAsIG1fYWN0aW9uKGdldEV3a0FjdGlvbkZyb21XS1RhZygoV0tDb250ZXh0TWVudUl0ZW1HZXRU YWcoaXRlbSkpKSkKICAgICAsIG1fdGl0bGUoV0tFaW5hU2hhcmVkU3RyaW5nKEFkb3B0V0ssIFdL Q29udGV4dE1lbnVJdGVtQ29weVRpdGxlKGl0ZW0pKSkKICAgICAsIG1faXNDaGVja2VkKFdLQ29u dGV4dE1lbnVJdGVtR2V0Q2hlY2tlZChpdGVtKSkKICAgICAsIG1faXNFbmFibGVkKFdLQ29udGV4 dE1lbnVJdGVtR2V0RW5hYmxlZChpdGVtKSkKLSAgICAsIG1fcGFyZW50TWVudSgwKQorICAgICwg bV9wYXJlbnRNZW51KHBhcmVudE1lbnUpCiAgICAgLCBtX3N1Yk1lbnUoMCkKIHsKIH0KIAotRXdr Q29udGV4dE1lbnVJdGVtOjpFd2tDb250ZXh0TWVudUl0ZW0oRXdrX0NvbnRleHRfTWVudV9JdGVt X1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNo YXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a19Db250 ZXh0X01lbnUqIHN1Yk1lbnUpCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0NvbnRleHRNZW51SXRl bShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1f QWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5h X0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSwgRXdrX0NvbnRleHRfTWVu dSogcGFyZW50TWVudSkKICAgICA6IG1fdHlwZSh0eXBlKQogICAgICwgbV9hY3Rpb24oYWN0aW9u KQogICAgICwgbV90aXRsZSh0aXRsZSkKICAgICAsIG1faXNDaGVja2VkKGNoZWNrZWQpCiAgICAg LCBtX2lzRW5hYmxlZChlbmFibGVkKQotICAgICwgbV9wYXJlbnRNZW51KDApCisgICAgLCBtX3Bh cmVudE1lbnUocGFyZW50TWVudSkKICAgICAsIG1fc3ViTWVudShzdWJNZW51KQogewogfQpAQCAt MTQ3LDYgKzE0NywxMyBAQCBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRf c2V0KEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSwgRWluYV9CbwogICAgIHJldHVybiB0cnVl OwogfQogCitFd2tfQ29udGV4dF9NZW51KiBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21l bnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSkKK3sKKyAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoaXRlbSwgMCk7CisKKyAgICByZXR1cm4gY29uc3RfY2Fz dDxFd2tfQ29udGV4dF9NZW51X0l0ZW0qPihpdGVtKS0+cGFyZW50TWVudSgpOworfQorCiBzdGF0 aWMgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBnZXRFd2tBY3Rpb25Gcm9tV0tUYWcoV0tD b250ZXh0TWVudUl0ZW1UYWcgYWN0aW9uKQogewogICAgIHN3aXRjaCAoYWN0aW9uKSB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51 X2l0ZW0uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21l bnVfaXRlbS5oCmluZGV4IDExYTkyODIuLjIwOGUwYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oCkBAIC0y NTksNiArMjU5LDE1IEBAIEVBUEkgRWluYV9Cb29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFi bGVkX2dldChjb25zdCBFd2tfQ29udGV4dF9NZW51X0l0ZW0gKm8pCiAgKi8KIEVBUEkgRWluYV9C b29sIGV3a19jb250ZXh0X21lbnVfaXRlbV9lbmFibGVkX3NldChFd2tfQ29udGV4dF9NZW51X0l0 ZW0gKm8sIEVpbmFfQm9vbCBlbmFibGVkKTsKIAorLyoqCisgKiBHZXRzIHRoZSBwYXJlbnQgbWVu dSBmb3IgdGhlIGl0ZW0uCisgKgorICogQHBhcmFtIG8gaXRlbSB0byBnZXQgdGhlIHBhcmVudAor ICoKKyAqIEByZXR1cm4gdGhlIHBvaW50ZXIgdG8gcGFyZW50IG1lbnUgb24gc3VjY2VzcyBvciBA YyBOVUxMIG9uIGZhaWx1cmUKKyAqLworRUFQSSBFd2tfQ29udGV4dF9NZW51ICpld2tfY29udGV4 dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KGNvbnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSAq byk7CisKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVt X3ByaXZhdGUuaAppbmRleCA5Zjc3ODNiLi5kZmI3YjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRl bV9wcml2YXRlLmgKQEAgLTM4LDE0ICszOCwxNCBAQAogICovCiBjbGFzcyBFd2tDb250ZXh0TWVu dUl0ZW0gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0NvbnRleHRNZW51SXRl bT4gY3JlYXRlKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0pCisgICAgc3RhdGljIFBhc3NPd25Q dHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoV0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSwg RXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUgPSAwKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFk b3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0oaXRlbSkpOworICAgICAgICByZXR1cm4gYWRv cHRQdHIobmV3IEV3a0NvbnRleHRNZW51SXRlbShpdGVtLCBwYXJlbnRNZW51KSk7CiAgICAgfQog Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUoRXdrX0Nv bnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRleHRfTWVudV9JdGVtX0FjdGlvbiBh Y3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wgY2hlY2tlZCwgRWluYV9Cb29sIGVu YWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51KQorICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3 a0NvbnRleHRNZW51SXRlbT4gY3JlYXRlKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUs IEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwg RWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0TWVudSogc3Vi TWVudSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUgPSAwKQogICAgIHsKLSAgICAgICAgcmV0 dXJuIGFkb3B0UHRyKG5ldyBFd2tDb250ZXh0TWVudUl0ZW0odHlwZSwgYWN0aW9uLCB0aXRsZSwg Y2hlY2tlZCwgZW5hYmxlZCwgc3ViTWVudSkpOworICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3 IEV3a0NvbnRleHRNZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBlbmFibGVk LCBzdWJNZW51LCBwYXJlbnRNZW51KSk7CiAgICAgfQogCiAgICAgRXdrX0NvbnRleHRfTWVudV9J dGVtX0FjdGlvbiBhY3Rpb24oKSBjb25zdCB7IHJldHVybiBtX2FjdGlvbjsgfQpAQCAtNjMsOSAr NjMsMTIgQEAgcHVibGljOgogICAgIGJvb2wgZW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNF bmFibGVkOyB9CiAgICAgdm9pZCBzZXRFbmFibGVkKGJvb2wgZW5hYmxlZCkgeyBtX2lzRW5hYmxl ZCA9IGVuYWJsZWQ7IH0KIAorICAgIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KCkgeyByZXR1 cm4gbV9wYXJlbnRNZW51OyB9CisgICAgdm9pZCBzZXRQYXJlbnRNZW51KEV3a0NvbnRleHRNZW51 KiBwYXJlbnRNZW51KSB7IG1fcGFyZW50TWVudSA9IHBhcmVudE1lbnU7IH0KKwogcHJpdmF0ZToK LSAgICBleHBsaWNpdCBFd2tDb250ZXh0TWVudUl0ZW0oV0tDb250ZXh0TWVudUl0ZW1SZWYpOwot ICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBF d2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUsIEVp bmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1l bnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiwgRXdrQ29u dGV4dE1lbnUqIHBhcmVudE1lbnUpOworICAgIEV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4 dF9NZW51X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlv biwgY29uc3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxl ZCwgRXdrQ29udGV4dE1lbnUqIHN1Yk1lbnUsIEV3a0NvbnRleHRNZW51KiBwYXJlbnRNZW51KTsK IAogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIG1fdHlwZTsKICAgICBFd2tfQ29udGV4 dF9NZW51X0l0ZW1fQWN0aW9uIG1fYWN0aW9uOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHRfbWVudS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51 LmNwcAppbmRleCA3ODg1OGFmLi4xODY0ZTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9t ZW51LmNwcApAQCAtNDYsNiArNDYsOSBAQCBzdGF0aWMgRWluYV9Cb29sIHNob3dDb250ZXh0TWVu dShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIEV2YXNfQ29vcmQgeCwgRQogICAgIEV3 a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSA9IHN0YXRpY19jYXN0PEV3a19Db250ZXh0X01lbnVf SXRlbSo+KGVpbmFfbGlzdF9udGgobGlzdCwgMCkpOwogICAgIGNoZWNrQmFzaWNDb250ZXh0TWVu dUl0ZW0oaXRlbSwgRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0dP X0JBQ0ssICJHbyBCYWNrIiwgZmFsc2UsIHRydWUpOwogCisgICAgLy8gQ2hlY2sgaWYgcGFyZW50 IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNyZWF0ZWQgYnkgV2Vi S2l0LgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVudSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3Bh cmVudF9tZW51X2dldChpdGVtKSk7CisKICAgICBpdGVtID0gc3RhdGljX2Nhc3Q8RXdrX0NvbnRl eHRfTWVudV9JdGVtKj4oZWluYV9saXN0X250aChsaXN0LCAxKSk7CiAgICAgY2hlY2tCYXNpY0Nv bnRleHRNZW51SXRlbShpdGVtLCBFV0tfQUNUSU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRF TV9UQUdfR09fRk9SV0FSRCwgIkdvIEZvcndhcmQiLCBmYWxzZSwgdHJ1ZSk7CiAgICAgZXdrX2Nv bnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KGl0ZW0sIGZhbHNlKTsKQEAgLTYzLDggKzY2LDEz IEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRNZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEq IHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAKICAgICAvLyBNYWtlcyBuZXcgY29udGV4dCBt ZW51IGl0ZW1zLgogICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbSA9IGV3a19jb250 ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1f VEFHX09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIiwgZmFsc2UsIHRydWUpOworICAgIC8vIENoZWNr IGlmIHBhcmVudCBtZW51IGVxdWFscyAwIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNy ZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldy4KKyAgICBFWFBFQ1RfRVEoMCwg ZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CiAgICAgZXdr X2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZChjb250ZXh0TWVudSwgbmV3SXRlbSk7CiAKKyAgICAv LyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hl cmUgY3JlYXRlZCB1c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3IGFuZCBhZGRlZCB1c2lu ZyBld2tfY29udGV4dF9tZW51X2l0ZW1fYXBwZW5kLgorICAgIEVYUEVDVF9FUShjb250ZXh0TWVu dSwgZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51X2dldChuZXdJdGVtKSk7CisKICAg ICBFaW5hX0xpc3QqIHN1Yk1lbnVJdGVtTGlzdCA9IDA7CiAgICAgRXdrX0NvbnRleHRfTWVudV9J dGVtKiBzdWJNZW51SXRlbTEgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KEVXS19BQ1RJT05f VFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5ldyBTdWJNZW51IEl0ZW0g MSIsIGZhbHNlLCB0cnVlKTsKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIHN1Yk1lbnVJdGVt MiA9IGV3a19jb250ZXh0X21lbnVfaXRlbV9uZXcoRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVY VF9NRU5VX0lURU1fVEFHX09USEVSLCAiTmV3IFN1Yk1lbnUgSXRlbSAyIiwgZmFsc2UsIHRydWUp OwpAQCAtNzMsOSArODEsMTggQEAgc3RhdGljIEVpbmFfQm9vbCBzaG93Q29udGV4dE1lbnUoRXdr X1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBFdmFzX0Nvb3JkIHgsIEUKICAgICBzdWJNZW51 SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlzdCwgc3ViTWVudUl0ZW0y KTsKICAgICBzdWJNZW51SXRlbUxpc3QgPSBlaW5hX2xpc3RfYXBwZW5kKHN1Yk1lbnVJdGVtTGlz dCwgc3ViTWVudUl0ZW0zKTsKICAgICBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51ID0gZXdrX2Nv bnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcyhzdWJNZW51SXRlbUxpc3QpOworCisgICAgLy8gQ2hl Y2sgaWYgcGFyZW50IG1lbnUgZXF1YWxzIHdoZW4gY29udGV4dCBtZW51IGl0ZW1zIHdoZXJlIGNy ZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9uZXdfd2l0aF9pdGVtcworICAgIEVYUEVDVF9F UShzdWJNZW51LCBld2tfY29udGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KHN1Yk1lbnVJ dGVtMSkpOworCiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBuZXdJdGVtMiA9IGV3a19jb250 ZXh0X21lbnVfaXRlbV9uZXdfd2l0aF9zdWJtZW51KEVXS19TVUJNRU5VX1RZUEUsIEVXS19DT05U RVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgQ3VzdG9tIEl0ZW0gMiIsIGZhbHNlLCB0cnVl LCBzdWJNZW51KTsKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQgbWVudSBlcXVhbHMgMCB3aGVuIGNv bnRleHQgbWVudSBpdGVtcyB3aGVyZSBjcmVhdGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRl bV9uZXdfd2l0aF9zdWJtZW51LgorICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0 ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1f YXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBDaGVjayBpZiBwYXJlbnQg bWVudSBlcXVhbHMgd2hlbiBjb250ZXh0IG1lbnUgaXRlbXMgd2hlcmUgY3JlYXRlZCB1c2luZyBl d2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudSBhbmQgYWRkZWQgdXNpbmcgZXdr X2NvbnRleHRfbWVudV9pdGVtX2FwcGVuZC4KKyAgICBFWFBFQ1RfRVEoY29udGV4dE1lbnUsIGV3 a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQobmV3SXRlbSkpOworCiAgICAgRXdr X0NvbnRleHRfTWVudSogc3ViTWVudTIgPSBld2tfY29udGV4dF9tZW51X25ldygpOwogICAgIEV3 a19Db250ZXh0X01lbnVfSXRlbSogbmV3SXRlbTMgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3 X3dpdGhfc3VibWVudShFV0tfU1VCTUVOVV9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFH X09USEVSLCAiTmV3IEN1c3RvbSBJdGVtIDMiLCBmYWxzZSwgdHJ1ZSwgc3ViTWVudTIpOwogICAg IGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQoY29udGV4dE1lbnUsIG5ld0l0ZW0zKTsK 198296 2013-04-16 02:45:30 -0700 2013-04-16 08:33:13 -0700 fixes parentmenu7.diff text/plain 11506 mpakulavelrutka ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA4ZjhlMThmLi4yNjE5YzllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTMtMDQtMTYgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1z dW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBhbiBBUEkgZm9yIGdldHRpbmcgY29u dGV4dCBtZW51IGl0ZW0ncyBwYXJlbnQgbWVudQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3NTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgcGFyZW50IG1lbnUgc3VwcG9ydCBhbmQgQVBJIGZv ciBFd2tfQ29udGV4dF9NZW51X0l0ZW0sIHRvCisgICAgICAgIGFsbG93IHNlbGVjdGluZyBjb250 ZXh0IG1lbnVzIHVzaW5nIEVsZW1lbnRhcnkgd2lkZ2V0cy4KKyAgICAgICAgQ29udGV4dCBtZW51 IHVuaXQgdGVzdCB1cGRhdGVkIHdpdGggbmV3IGZ1bmN0aW9uLiAKKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnUuY3BwOgorICAgICAgICAoRXdrQ29udGV4dE1l bnU6OkV3a0NvbnRleHRNZW51KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dF9tZW51X2l0ZW0uY3BwOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtOjpFd2tDb250 ZXh0TWVudUl0ZW0pOgorICAgICAgICAoZXdrX2NvbnRleHRfbWVudV9pdGVtX3BhcmVudF9tZW51 X2dldCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVt Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3By aXZhdGUuaDoKKyAgICAgICAgKEV3a0NvbnRleHRNZW51SXRlbTo6Y3JlYXRlKToKKyAgICAgICAg KEV3a0NvbnRleHRNZW51SXRlbTo6cGFyZW50TWVudSk6CisgICAgICAgIChFd2tDb250ZXh0TWVu dUl0ZW06OnNldFBhcmVudE1lbnUpOgorICAgICAgICAoRXdrQ29udGV4dE1lbnVJdGVtKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNw cDoKKyAgICAgICAgKHNob3dDb250ZXh0TWVudSk6CisKIDIwMTMtMDQtMTUgIERlYW4gSmFja3Nv biAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFBsdWdpbnMgdGhhdCByZXNpemUgbWlnaHQg bmVlZCB0byBiZSBzbmFwc2hvdHRlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudS5jcHAKaW5kZXggYTU0Y2JiYS4uYTQ4MGFkNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRf bWVudS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRl eHRfbWVudS5jcHAKQEAgLTQ1LDcgKzQ1LDcgQEAgRXdrQ29udGV4dE1lbnU6OkV3a0NvbnRleHRN ZW51KEV3a1ZpZXcqIHZpZXcsIFdLQXJyYXlSZWYgaXRlbXMpCiB7CiAgICAgc2l6ZV90IHNpemUg PSBXS0FycmF5R2V0U2l6ZShpdGVtcyk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBzaXpl OyArK2kpCi0gICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBlbmQobV9j b250ZXh0TWVudUl0ZW1zLCBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShzdGF0aWNfY2Fz dDxXS0NvbnRleHRNZW51SXRlbVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGl0ZW1zLCBpKSkp LmxlYWtQdHIoKSk7CisgICAgICAgIG1fY29udGV4dE1lbnVJdGVtcyA9IGVpbmFfbGlzdF9hcHBl bmQobV9jb250ZXh0TWVudUl0ZW1zLCBFd2tfQ29udGV4dF9NZW51X0l0ZW06OmNyZWF0ZShzdGF0 aWNfY2FzdDxXS0NvbnRleHRNZW51SXRlbVJlZj4oV0tBcnJheUdldEl0ZW1BdEluZGV4KGl0ZW1z LCBpKSksIHRoaXMpLmxlYWtQdHIoKSk7CiB9CiAKIEV3a0NvbnRleHRNZW51OjpFd2tDb250ZXh0 TWVudSgpCkBAIC02MCw4ICs2MCwxMiBAQCBFd2tDb250ZXh0TWVudTo6RXdrQ29udGV4dE1lbnUo RWluYV9MaXN0KiBpdGVtcykKIHsKICAgICBFaW5hX0xpc3QqIGw7CiAgICAgdm9pZCogZGF0YTsK LSAgICBFSU5BX0xJU1RfRk9SRUFDSChpdGVtcywgbCwgZGF0YSkKLSAgICAgICAgbV9jb250ZXh0 TWVudUl0ZW1zID0gZWluYV9saXN0X2FwcGVuZChtX2NvbnRleHRNZW51SXRlbXMsIHN0YXRpY19j YXN0PEV3a0NvbnRleHRNZW51SXRlbSo+KGRhdGEpKTsKKyAgICBFSU5BX0xJU1RfRk9SRUFDSChp dGVtcywgbCwgZGF0YSkgeworICAgICAgICBpZiAoRXdrQ29udGV4dE1lbnVJdGVtKiBpdGVtID0g c3RhdGljX2Nhc3Q8RXdrQ29udGV4dE1lbnVJdGVtKj4oZGF0YSkpIHsKKyAgICAgICAgICAgIGl0 ZW0tPnNldFBhcmVudE1lbnUodGhpcyk7CisgICAgICAgICAgICBtX2NvbnRleHRNZW51SXRlbXMg PSBlaW5hX2xpc3RfYXBwZW5kKG1fY29udGV4dE1lbnVJdGVtcywgaXRlbSk7CisgICAgICAgIH0K KyAgICB9CiB9CiAKIEV3a0NvbnRleHRNZW51Ojp+RXdrQ29udGV4dE1lbnUoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVt LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVf aXRlbS5jcHAKaW5kZXggZWRiOWY0Ni4uOWI4NWJhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW0uY3BwCkBA IC0zNSwyNCArMzUsMjQgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogc3RhdGljIEV3a19D b250ZXh0X01lbnVfSXRlbV9BY3Rpb24gZ2V0RXdrQWN0aW9uRnJvbVdLVGFnKFdLQ29udGV4dE1l bnVJdGVtVGFnIGFjdGlvbik7CiAKLUV3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJ dGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmIGl0ZW0pCitFd2tDb250ZXh0TWVudUl0ZW06OkV3a0Nv bnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVtLCBFd2tfQ29udGV4dF9NZW51 KiBwYXJlbnRNZW51KQogICAgIDogbV90eXBlKHN0YXRpY19jYXN0PEV3a19Db250ZXh0X01lbnVf SXRlbV9UeXBlPihXS0NvbnRleHRNZW51SXRlbUdldFR5cGUoaXRlbSkpKQogICAgICwgbV9hY3Rp b24oZ2V0RXdrQWN0aW9uRnJvbVdLVGFnKChXS0NvbnRleHRNZW51SXRlbUdldFRhZyhpdGVtKSkp KQogICAgICwgbV90aXRsZShXS0VpbmFTaGFyZWRTdHJpbmcoQWRvcHRXSywgV0tDb250ZXh0TWVu dUl0ZW1Db3B5VGl0bGUoaXRlbSkpKQogICAgICwgbV9pc0NoZWNrZWQoV0tDb250ZXh0TWVudUl0 ZW1HZXRDaGVja2VkKGl0ZW0pKQogICAgICwgbV9pc0VuYWJsZWQoV0tDb250ZXh0TWVudUl0ZW1H ZXRFbmFibGVkKGl0ZW0pKQotICAgICwgbV9wYXJlbnRNZW51KDApCisgICAgLCBtX3BhcmVudE1l bnUocGFyZW50TWVudSkKICAgICAsIG1fc3ViTWVudSgwKQogewogfQogCi1Fd2tDb250ZXh0TWVu dUl0ZW06OkV3a0NvbnRleHRNZW51SXRlbShFd2tfQ29udGV4dF9NZW51X0l0ZW1fVHlwZSB0eXBl LCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29uc3QgY2hhciogdGl0bGUs IEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdrX0NvbnRleHRfTWVudSog c3ViTWVudSkKK0V3a0NvbnRleHRNZW51SXRlbTo6RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250 ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0 aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFi bGVkLCBFd2tfQ29udGV4dF9NZW51KiBzdWJNZW51LCBFd2tfQ29udGV4dF9NZW51KiBwYXJlbnRN ZW51KQogICAgIDogbV90eXBlKHR5cGUpCiAgICAgLCBtX2FjdGlvbihhY3Rpb24pCiAgICAgLCBt X3RpdGxlKHRpdGxlKQogICAgICwgbV9pc0NoZWNrZWQoY2hlY2tlZCkKICAgICAsIG1faXNFbmFi bGVkKGVuYWJsZWQpCi0gICAgLCBtX3BhcmVudE1lbnUoMCkKKyAgICAsIG1fcGFyZW50TWVudShw YXJlbnRNZW51KQogICAgICwgbV9zdWJNZW51KHN1Yk1lbnUpCiB7CiB9CkBAIC0xNDcsNiArMTQ3 LDEzIEBAIEVpbmFfQm9vbCBld2tfY29udGV4dF9tZW51X2l0ZW1fZW5hYmxlZF9zZXQoRXdrX0Nv bnRleHRfTWVudV9JdGVtKiBpdGVtLCBFaW5hX0JvCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK0V3 a19Db250ZXh0X01lbnUqIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoY29u c3QgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBpdGVtKQoreworICAgIEVJTkFfU0FGRVRZX09OX05V TExfUkVUVVJOX1ZBTChpdGVtLCAwKTsKKworICAgIHJldHVybiBjb25zdF9jYXN0PEV3a19Db250 ZXh0X01lbnVfSXRlbSo+KGl0ZW0pLT5wYXJlbnRNZW51KCk7Cit9CisKIHN0YXRpYyBFd2tfQ29u dGV4dF9NZW51X0l0ZW1fQWN0aW9uIGdldEV3a0FjdGlvbkZyb21XS1RhZyhXS0NvbnRleHRNZW51 SXRlbVRhZyBhY3Rpb24pCiB7CiAgICAgc3dpdGNoIChhY3Rpb24pIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgK aW5kZXggMTFhOTI4Mi4uMjA4ZTBhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtLmgKQEAgLTI1OSw2ICsyNTks MTUgQEAgRUFQSSBFaW5hX0Jvb2wgZXdrX2NvbnRleHRfbWVudV9pdGVtX2VuYWJsZWRfZ2V0KGNv bnN0IEV3a19Db250ZXh0X01lbnVfSXRlbSAqbykKICAqLwogRUFQSSBFaW5hX0Jvb2wgZXdrX2Nv bnRleHRfbWVudV9pdGVtX2VuYWJsZWRfc2V0KEV3a19Db250ZXh0X01lbnVfSXRlbSAqbywgRWlu YV9Cb29sIGVuYWJsZWQpOwogCisvKioKKyAqIEdldHMgdGhlIHBhcmVudCBtZW51IGZvciB0aGUg aXRlbS4KKyAqCisgKiBAcGFyYW0gbyBpdGVtIHRvIGdldCB0aGUgcGFyZW50CisgKgorICogQHJl dHVybiB0aGUgcG9pbnRlciB0byBwYXJlbnQgbWVudSBvbiBzdWNjZXNzIG9yIEBjIE5VTEwgb24g ZmFpbHVyZQorICovCitFQVBJIEV3a19Db250ZXh0X01lbnUgKmV3a19jb250ZXh0X21lbnVfaXRl bV9wYXJlbnRfbWVudV9nZXQoY29uc3QgRXdrX0NvbnRleHRfTWVudV9JdGVtICpvKTsKKwogI2lm ZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9tZW51X2l0ZW1fcHJpdmF0ZS5o CmluZGV4IDlmNzc4M2IuLjI1MTExODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0X21lbnVfaXRlbV9wcml2YXRlLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUu aApAQCAtMzgsMTQgKzM4LDE0IEBACiAgKi8KIGNsYXNzIEV3a0NvbnRleHRNZW51SXRlbSB7CiBw dWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1lbnVJdGVtPiBjcmVhdGUo V0tDb250ZXh0TWVudUl0ZW1SZWYgaXRlbSkKKyAgICBzdGF0aWMgUGFzc093blB0cjxFd2tDb250 ZXh0TWVudUl0ZW0+IGNyZWF0ZShXS0NvbnRleHRNZW51SXRlbVJlZiBpdGVtLCBFd2tDb250ZXh0 TWVudSogcGFyZW50TWVudSA9IDApCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3 IEV3a0NvbnRleHRNZW51SXRlbShpdGVtKSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcg RXdrQ29udGV4dE1lbnVJdGVtKGl0ZW0sIHBhcmVudE1lbnUpKTsKICAgICB9CiAKLSAgICBzdGF0 aWMgUGFzc093blB0cjxFd2tDb250ZXh0TWVudUl0ZW0+IGNyZWF0ZShFd2tfQ29udGV4dF9NZW51 X0l0ZW1fVHlwZSB0eXBlLCBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9uIGFjdGlvbiwgY29u c3QgY2hhciogdGl0bGUsIEVpbmFfQm9vbCBjaGVja2VkLCBFaW5hX0Jvb2wgZW5hYmxlZCwgRXdr Q29udGV4dE1lbnUqIHN1Yk1lbnUpCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrQ29udGV4dE1l bnVJdGVtPiBjcmVhdGUoRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgdHlwZSwgRXdrX0NvbnRl eHRfTWVudV9JdGVtX0FjdGlvbiBhY3Rpb24sIGNvbnN0IGNoYXIqIHRpdGxlLCBFaW5hX0Jvb2wg Y2hlY2tlZCwgRWluYV9Cb29sIGVuYWJsZWQsIEV3a0NvbnRleHRNZW51KiBzdWJNZW51LCBFd2tD b250ZXh0TWVudSogcGFyZW50TWVudSA9IDApCiAgICAgewotICAgICAgICByZXR1cm4gYWRvcHRQ dHIobmV3IEV3a0NvbnRleHRNZW51SXRlbSh0eXBlLCBhY3Rpb24sIHRpdGxlLCBjaGVja2VkLCBl bmFibGVkLCBzdWJNZW51KSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrQ29udGV4 dE1lbnVJdGVtKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGNoZWNrZWQsIGVuYWJsZWQsIHN1Yk1lbnUs IHBhcmVudE1lbnUpKTsKICAgICB9CiAKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW1fQWN0aW9u IGFjdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fYWN0aW9uOyB9CkBAIC02Myw5ICs2MywxMiBAQCBw dWJsaWM6CiAgICAgYm9vbCBlbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0VuYWJsZWQ7IH0K ICAgICB2b2lkIHNldEVuYWJsZWQoYm9vbCBlbmFibGVkKSB7IG1faXNFbmFibGVkID0gZW5hYmxl ZDsgfQogCisgICAgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUoKSBjb25zdCB7IHJldHVybiBt X3BhcmVudE1lbnU7IH0KKyAgICB2b2lkIHNldFBhcmVudE1lbnUoRXdrQ29udGV4dE1lbnUqIHBh cmVudE1lbnUpIHsgbV9wYXJlbnRNZW51ID0gcGFyZW50TWVudTsgfQorCiBwcml2YXRlOgotICAg IGV4cGxpY2l0IEV3a0NvbnRleHRNZW51SXRlbShXS0NvbnRleHRNZW51SXRlbVJlZik7Ci0gICAg RXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01lbnVfSXRlbV9UeXBlIHR5cGUsIEV3a19D b250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBjb25zdCBjaGFyKiB0aXRsZSwgRWluYV9C b29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBFd2tDb250ZXh0TWVudSogc3ViTWVudSk7 CisgICAgRXdrQ29udGV4dE1lbnVJdGVtKFdLQ29udGV4dE1lbnVJdGVtUmVmLCBFd2tDb250ZXh0 TWVudSogcGFyZW50TWVudSk7CisgICAgRXdrQ29udGV4dE1lbnVJdGVtKEV3a19Db250ZXh0X01l bnVfSXRlbV9UeXBlIHR5cGUsIEV3a19Db250ZXh0X01lbnVfSXRlbV9BY3Rpb24gYWN0aW9uLCBj b25zdCBjaGFyKiB0aXRsZSwgRWluYV9Cb29sIGNoZWNrZWQsIEVpbmFfQm9vbCBlbmFibGVkLCBF d2tDb250ZXh0TWVudSogc3ViTWVudSwgRXdrQ29udGV4dE1lbnUqIHBhcmVudE1lbnUpOwogCiAg ICAgRXdrX0NvbnRleHRfTWVudV9JdGVtX1R5cGUgbV90eXBlOwogICAgIEV3a19Db250ZXh0X01l bnVfSXRlbV9BY3Rpb24gbV9hY3Rpb247CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dF9tZW51LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUuY3Bw CmluZGV4IDc4ODU4YWYuLjczMDZlYjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0X21lbnUu Y3BwCkBAIC00Niw2ICs0Niw5IEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRNZW51KEV3 a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAgICAgRXdrX0Nv bnRleHRfTWVudV9JdGVtKiBpdGVtID0gc3RhdGljX2Nhc3Q8RXdrX0NvbnRleHRfTWVudV9JdGVt Kj4oZWluYV9saXN0X250aChsaXN0LCAwKSk7CiAgICAgY2hlY2tCYXNpY0NvbnRleHRNZW51SXRl bShpdGVtLCBFV0tfQUNUSU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfR09fQkFD SywgIkdvIEJhY2siLCBmYWxzZSwgdHJ1ZSk7CiAKKyAgICAvLyBXaGVuIGNvbnRleHQgbWVudSBp cyBjcmVhdGVkIGJ5IFdlYktpdCwgYW4gaXRlbSBzaG91bGQgaGF2ZSBwYXJlbnQgbWVudS4KKyAg ICBFWFBFQ1RfRVEoY29udGV4dE1lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVu dV9nZXQoaXRlbSkpOworCiAgICAgaXRlbSA9IHN0YXRpY19jYXN0PEV3a19Db250ZXh0X01lbnVf SXRlbSo+KGVpbmFfbGlzdF9udGgobGlzdCwgMSkpOwogICAgIGNoZWNrQmFzaWNDb250ZXh0TWVu dUl0ZW0oaXRlbSwgRVdLX0FDVElPTl9UWVBFLCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0dP X0ZPUldBUkQsICJHbyBGb3J3YXJkIiwgZmFsc2UsIHRydWUpOwogICAgIGV3a19jb250ZXh0X21l bnVfaXRlbV9lbmFibGVkX3NldChpdGVtLCBmYWxzZSk7CkBAIC02Myw4ICs2NiwxMyBAQCBzdGF0 aWMgRWluYV9Cb29sIHNob3dDb250ZXh0TWVudShFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERh dGEsIEV2YXNfQ29vcmQgeCwgRQogCiAgICAgLy8gTWFrZXMgbmV3IGNvbnRleHQgbWVudSBpdGVt cy4KICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIG5ld0l0ZW0gPSBld2tfY29udGV4dF9tZW51 X2l0ZW1fbmV3KEVXS19BQ1RJT05fVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhF UiwgIk5ldyBDdXN0b20gSXRlbSIsIGZhbHNlLCB0cnVlKTsKKyAgICAvLyBXaGVuIGNvbnRleHQg bWVudSBpdGVtIGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldywgaXQg c2hvdWxkIG5vdCBoYXZlIHBhcmVudCBtZW51LgorICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4 dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9t ZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtKTsKIAorICAgIC8vIFdoZW4gY29u dGV4dCBtZW51IGl0ZW0gaXMgYWRkZWQgdG8gbWVudSB1c2luZyBld2tfY29udGV4dF9tZW51X2l0 ZW1fYXBwZW5kLCBpdCBzaG91bGQgaGF2ZSBwYXJlbnQgbWVudS4KKyAgICBFWFBFQ1RfRVEoY29u dGV4dE1lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQobmV3SXRlbSkp OworCiAgICAgRWluYV9MaXN0KiBzdWJNZW51SXRlbUxpc3QgPSAwOwogICAgIEV3a19Db250ZXh0 X01lbnVfSXRlbSogc3ViTWVudUl0ZW0xID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX25ldyhFV0tf QUNUSU9OX1RZUEUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfT1RIRVIsICJOZXcgU3ViTWVu dSBJdGVtIDEiLCBmYWxzZSwgdHJ1ZSk7CiAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBzdWJN ZW51SXRlbTIgPSBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3KEVXS19BQ1RJT05fVFlQRSwgRVdL X0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5ldyBTdWJNZW51IEl0ZW0gMiIsIGZhbHNl LCB0cnVlKTsKQEAgLTczLDkgKzgxLDE4IEBAIHN0YXRpYyBFaW5hX0Jvb2wgc2hvd0NvbnRleHRN ZW51KEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXZhc19Db29yZCB4LCBFCiAgICAg c3ViTWVudUl0ZW1MaXN0ID0gZWluYV9saXN0X2FwcGVuZChzdWJNZW51SXRlbUxpc3QsIHN1Yk1l bnVJdGVtMik7CiAgICAgc3ViTWVudUl0ZW1MaXN0ID0gZWluYV9saXN0X2FwcGVuZChzdWJNZW51 SXRlbUxpc3QsIHN1Yk1lbnVJdGVtMyk7CiAgICAgRXdrX0NvbnRleHRfTWVudSogc3ViTWVudSA9 IGV3a19jb250ZXh0X21lbnVfbmV3X3dpdGhfaXRlbXMoc3ViTWVudUl0ZW1MaXN0KTsKKworICAg IC8vIFdoZW4gY29udGV4dCBtZW51IGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9u ZXdfd2l0aF9pdGVtcywgaXRlbXMgc2hvdWxkIGhhdmUgcGFyZW50IG1lbnUuCisgICAgRVhQRUNU X0VRKHN1Yk1lbnUsIGV3a19jb250ZXh0X21lbnVfaXRlbV9wYXJlbnRfbWVudV9nZXQoc3ViTWVu dUl0ZW0xKSk7CisKICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIG5ld0l0ZW0yID0gZXdrX2Nv bnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUoRVdLX1NVQk1FTlVfVFlQRSwgRVdLX0NP TlRFWFRfTUVOVV9JVEVNX1RBR19PVEhFUiwgIk5ldyBDdXN0b20gSXRlbSAyIiwgZmFsc2UsIHRy dWUsIHN1Yk1lbnUpOworICAgIC8vIFdoZW4gY29udGV4dCBtZW51IGl0ZW0gaXMgY3JlYXRlZCB1 c2luZyBld2tfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dpdGhfc3VibWVudSwgaXQgc2hvdWxkIG5v dCBoYXZlIHBhcmVudCBtZW51LgorICAgIEVYUEVDVF9FUSgwLCBld2tfY29udGV4dF9tZW51X2l0 ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKICAgICBld2tfY29udGV4dF9tZW51X2l0ZW1f YXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMik7CiAKKyAgICAvLyBXaGVuIGNvbnRleHQgbWVu dSBpdGVtIGlzIGNyZWF0ZWQgdXNpbmcgZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1 Ym1lbnUgYW5kIGFkZGVkIHVzaW5nIGV3a19jb250ZXh0X21lbnVfaXRlbV9hcHBlbmQgaXQgc2hv dWxkIGhhdmUgcGFyZW50IG1lbnUuCisgICAgRVhQRUNUX0VRKGNvbnRleHRNZW51LCBld2tfY29u dGV4dF9tZW51X2l0ZW1fcGFyZW50X21lbnVfZ2V0KG5ld0l0ZW0pKTsKKwogICAgIEV3a19Db250 ZXh0X01lbnUqIHN1Yk1lbnUyID0gZXdrX2NvbnRleHRfbWVudV9uZXcoKTsKICAgICBFd2tfQ29u dGV4dF9NZW51X0l0ZW0qIG5ld0l0ZW0zID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX25ld193aXRo X3N1Ym1lbnUoRVdLX1NVQk1FTlVfVFlQRSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19PVEhF UiwgIk5ldyBDdXN0b20gSXRlbSAzIiwgZmFsc2UsIHRydWUsIHN1Yk1lbnUyKTsKICAgICBld2tf Y29udGV4dF9tZW51X2l0ZW1fYXBwZW5kKGNvbnRleHRNZW51LCBuZXdJdGVtMyk7Cg==