173469 2017-06-16 07:34:20 -0700 [GTK] Rename WebContextMenuItemGtk as WebContextMenuItemGlib 2017-06-17 00:21:14 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply mcatanzaro oldest_to_newest 1319947 0 cgarcia 2017-06-16 07:34:20 -0700 Now that we switched to GAction this is actually a glib implementation, we keep the GtkAction support only for backwards compatibility. We could rename the file and make the GtkAction action conditional to the GTK+ port. 1319949 1 313074 cgarcia 2017-06-16 07:38:22 -0700 Created attachment 313074 Patch 1320356 2 cgarcia 2017-06-17 00:21:14 -0700 Committed r218445: <http://trac.webkit.org/changeset/218445> 313074 2017-06-16 07:38:22 -0700 2017-06-16 14:09:10 -0700 Patch wk2-context-menu-item-glib.diff text/plain 27296 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA1ZTk2NTc3MGEzOC4uNmI0NWNhMDRjMjkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NyBAQAogMjAxNy0wNi0xNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGln YWxpYS5jb20+CiAKKyAgICAgICAgW0dUS10gUmVuYW1lIFdlYkNvbnRleHRNZW51SXRlbUd0ayBh cyBXZWJDb250ZXh0TWVudUl0ZW1HbGliCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNzM0NjkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBOb3cgdGhhdCB3ZSBzd2l0Y2hlZCB0byBHQWN0aW9uIHRoaXMgaXMg YWN0dWFsbHkgYSBnbGliIGltcGxlbWVudGF0aW9uLCB3ZSBrZWVwIHRoZSBHdGtBY3Rpb24gc3Vw cG9ydCBvbmx5IGZvcgorICAgICAgICBiYWNrd2FyZHMgY29tcGF0aWJpbGl0eS4gV2UgY291bGQg cmVuYW1lIHRoZSBmaWxlIGFuZCBtYWtlIHRoZSBHdGtBY3Rpb24gYWN0aW9uIGNvbmRpdGlvbmFs IHRvIHRoZSBHVEsrIHBvcnQuCisKKyAgICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKyAgICAg ICAgKiBTaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0ZW1HbGliLmNwcDogUmVuYW1lZCBmcm9t IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvV2ViQ29udGV4dE1lbnVJdGVtR3RrLmNwcC4KKyAg ICAgICAgKFdlYktpdDo6Z3RrU3RvY2tJREZyb21Db250ZXh0TWVudUFjdGlvbik6CisgICAgICAg IChXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbUdsaWI6OldlYkNvbnRleHRNZW51SXRlbUdsaWIp OgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW1HbGliOjp+V2ViQ29udGV4dE1l bnVJdGVtR2xpYik6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbUdsaWI6OmJ1 aWxkQWN0aW9uTmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbUdsaWI6 OmNyZWF0ZUFjdGlvbklmTmVlZGVkKToKKyAgICAgICAgKiBTaGFyZWQvZ2xpYi9XZWJDb250ZXh0 TWVudUl0ZW1HbGliLmg6IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1dl YkNvbnRleHRNZW51SXRlbUd0ay5oLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dENvbnRleHRNZW51LmNwcDoKKyAgICAgICAgKHdlYmtpdENvbnRleHRNZW51UG9wdWxhdGUpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51QWN0aW9ucy5jcHA6 CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUFjdGlvbkdldEZvckNvbnRleHRNZW51SXRlbSk6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVBY3Rpb25zUHJp dmF0ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51SXRl bS5jcHA6CisgICAgICAgICh3ZWJraXRDb250ZXh0TWVudUl0ZW1DcmVhdGUpOgorICAgICAgICAo d2Via2l0Q29udGV4dE1lbnVJdGVtVG9XZWJDb250ZXh0TWVudUl0ZW1HbGliKToKKyAgICAgICAg KHdlYmtpdF9jb250ZXh0X21lbnVfaXRlbV9uZXcpOgorICAgICAgICAod2Via2l0X2NvbnRleHRf bWVudV9pdGVtX25ld19mcm9tX2dhY3Rpb24pOgorICAgICAgICAod2Via2l0X2NvbnRleHRfbWVu dV9pdGVtX25ld19mcm9tX3N0b2NrX2FjdGlvbik6CisgICAgICAgICh3ZWJraXRfY29udGV4dF9t ZW51X2l0ZW1fbmV3X2Zyb21fc3RvY2tfYWN0aW9uX3dpdGhfbGFiZWwpOgorICAgICAgICAod2Vi a2l0X2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUpOgorICAgICAgICAod2Via2l0 X2NvbnRleHRfbWVudV9pdGVtX25ld19zZXBhcmF0b3IpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdENvbnRleHRNZW51SXRlbVByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudVByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdQb3B1 bGF0ZUNvbnRleHRNZW51KToKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51 UHJveHlHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjph cHBlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjpidWlsZE1l bnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5R3RrOjpwb3B1bGF0ZSk6 CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmg6CisKKzIw MTctMDYtMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAg ICAgICAgIFtHVEtdW1dQRV0gUmVtb3ZlIFdLQ29va2llTWFuYWdlclNvdXAKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MzQ2NwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdUSy5jbWFrZSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRm b3JtR1RLLmNtYWtlCmluZGV4IGYyMWZiMGNjZmZjLi42NzMwMzg2NWI4NyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYktpdDIvUGxh dGZvcm1HVEsuY21ha2UKQEAgLTc0LDYgKzc0LDcgQEAgbGlzdChBUFBFTkQgV2ViS2l0Ml9TT1VS Q0VTCiAKICAgICBTaGFyZWQvY2Fpcm8vU2hhcmVhYmxlQml0bWFwQ2Fpcm8uY3BwCiAKKyAgICBT aGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0ZW1HbGliLmNwcAogICAgIFNoYXJlZC9nbGliL1dl YkVycm9yc0dsaWIuY3BwCiAKICAgICBTaGFyZWQvZ3RrL0FyZ3VtZW50Q29kZXJzR3RrLmNwcApA QCAtODMsNyArODQsNiBAQCBsaXN0KEFQUEVORCBXZWJLaXQyX1NPVVJDRVMKICAgICBTaGFyZWQv Z3RrL05hdGl2ZVdlYldoZWVsRXZlbnRHdGsuY3BwCiAgICAgU2hhcmVkL2d0ay9QcmludEluZm9H dGsuY3BwCiAgICAgU2hhcmVkL2d0ay9Qcm9jZXNzRXhlY3V0YWJsZVBhdGhHdGsuY3BwCi0gICAg U2hhcmVkL2d0ay9XZWJDb250ZXh0TWVudUl0ZW1HdGsuY3BwCiAgICAgU2hhcmVkL2d0ay9XZWJF cnJvcnNHdGsuY3BwCiAgICAgU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCiAgICAgU2hh cmVkL2d0ay9XZWJTZWxlY3Rpb25EYXRhLmNwcApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv U2hhcmVkL2d0ay9XZWJDb250ZXh0TWVudUl0ZW1HdGsuY3BwIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL2dsaWIvV2ViQ29udGV4dE1lbnVJdGVtR2xpYi5jcHAKc2ltaWxhcml0eSBpbmRleCA4NSUK cmVuYW1lIGZyb20gU291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9XZWJDb250ZXh0TWVudUl0ZW1H dGsuY3BwCnJlbmFtZSB0byBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVu dUl0ZW1HbGliLmNwcAppbmRleCBhNjEwMDUwNTQ0MC4uMGQ2YmUzMjVkOWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvV2ViQ29udGV4dE1lbnVJdGVtR3RrLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0ZW1HbGliLmNwcApA QCAtMjQsMTUgKzI0LDIwIEBACiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgotI2luY2x1ZGUg IldlYkNvbnRleHRNZW51SXRlbUd0ay5oIgorI2luY2x1ZGUgIldlYkNvbnRleHRNZW51SXRlbUds aWIuaCIKIAorI2luY2x1ZGUgIkFQSU9iamVjdC5oIgorI2luY2x1ZGUgPGdpby9naW8uaD4KKwor I2lmIFBMQVRGT1JNKEdUSykKICNpbmNsdWRlIDxndGsvZ3RrLmg+Ci0jaW5jbHVkZSA8d3RmL2ds aWIvR1VuaXF1ZVB0ci5oPgorI2VuZGlmCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAorI2lmIFBMQVRGT1JNKEdUSykKIHN0YXRpYyBjb25zdCBjaGFy KiBndGtTdG9ja0lERnJvbUNvbnRleHRNZW51QWN0aW9uKENvbnRleHRNZW51QWN0aW9uIGFjdGlv bikKIHsKICAgICBzd2l0Y2ggKGFjdGlvbikgewpAQCAtNjYsNyArNzEsNyBAQCBzdGF0aWMgY29u c3QgY2hhciogZ3RrU3RvY2tJREZyb21Db250ZXh0TWVudUFjdGlvbihDb250ZXh0TWVudUFjdGlv biBhY3Rpb24pCiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdTZWxlY3RBbGw6CiAgICAgICAg IHJldHVybiBHVEtfU1RPQ0tfU0VMRUNUX0FMTDsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRh Z1NwZWxsaW5nR3Vlc3M6Ci0gICAgICAgIHJldHVybiAwOworICAgICAgICByZXR1cm4gbnVsbHB0 cjsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0lnbm9yZVNwZWxsaW5nOgogICAgICAgICBy ZXR1cm4gR1RLX1NUT0NLX05POwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnTGVhcm5TcGVs bGluZzoKQEAgLTExMCw0MSArMTE1LDM2IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBndGtTdG9ja0lE RnJvbUNvbnRleHRNZW51QWN0aW9uKENvbnRleHRNZW51QWN0aW9uIGFjdGlvbikKICAgICBjYXNl IENvbnRleHRNZW51SXRlbVRhZ1RvZ2dsZU1lZGlhTG9vcDoKICAgICBjYXNlIENvbnRleHRNZW51 SXRlbVRhZ0NvcHlJbWFnZVVybFRvQ2xpcGJvYXJkOgogICAgICAgICAvLyBObyBpY29uIGZvciB0 aGlzLgotICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgY2Fz ZSBDb250ZXh0TWVudUl0ZW1UYWdFbnRlclZpZGVvRnVsbHNjcmVlbjoKICAgICAgICAgcmV0dXJu IEdUS19TVE9DS19GVUxMU0NSRUVOOwogICAgIGRlZmF1bHQ6Ci0gICAgICAgIHJldHVybiAwOwor ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiB9CisjZW5kaWYgLy8gUExBVEZPUk0oR1RL KQogCi1XZWJDb250ZXh0TWVudUl0ZW1HdGs6OldlYkNvbnRleHRNZW51SXRlbUd0ayhDb250ZXh0 TWVudUl0ZW1UeXBlIHR5cGUsIENvbnRleHRNZW51QWN0aW9uIGFjdGlvbiwgY29uc3QgU3RyaW5n JiB0aXRsZSwgYm9vbCBlbmFibGVkLCBib29sIGNoZWNrZWQpCitXZWJDb250ZXh0TWVudUl0ZW1H bGliOjpXZWJDb250ZXh0TWVudUl0ZW1HbGliKENvbnRleHRNZW51SXRlbVR5cGUgdHlwZSwgQ29u dGV4dE1lbnVBY3Rpb24gYWN0aW9uLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBib29sIGVuYWJsZWQs IGJvb2wgY2hlY2tlZCkKICAgICA6IFdlYkNvbnRleHRNZW51SXRlbURhdGEodHlwZSwgYWN0aW9u LCB0aXRsZSwgZW5hYmxlZCwgY2hlY2tlZCkKIHsKICAgICBBU1NFUlQodHlwZSAhPSBTdWJtZW51 VHlwZSk7CiAgICAgY3JlYXRlQWN0aW9uSWZOZWVkZWQoKTsKIH0KIAotV2ViQ29udGV4dE1lbnVJ dGVtR3RrOjpXZWJDb250ZXh0TWVudUl0ZW1HdGsoY29uc3QgV2ViQ29udGV4dE1lbnVJdGVtRGF0 YSYgZGF0YSkKK1dlYkNvbnRleHRNZW51SXRlbUdsaWI6OldlYkNvbnRleHRNZW51SXRlbUdsaWIo Y29uc3QgV2ViQ29udGV4dE1lbnVJdGVtRGF0YSYgZGF0YSkKICAgICA6IFdlYkNvbnRleHRNZW51 SXRlbURhdGEoZGF0YS50eXBlKCkgPT0gU3VibWVudVR5cGUgPyBBY3Rpb25UeXBlIDogZGF0YS50 eXBlKCksIGRhdGEuYWN0aW9uKCksIGRhdGEudGl0bGUoKSwgZGF0YS5lbmFibGVkKCksIGRhdGEu Y2hlY2tlZCgpKQogewogICAgIGNyZWF0ZUFjdGlvbklmTmVlZGVkKCk7CiB9CiAKLVdlYkNvbnRl eHRNZW51SXRlbUd0azo6V2ViQ29udGV4dE1lbnVJdGVtR3RrKGNvbnN0IFdlYkNvbnRleHRNZW51 SXRlbUd0ayYgZGF0YSwgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbUd0az4mJiBzdWJtZW51KQor V2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6V2ViQ29udGV4dE1lbnVJdGVtR2xpYihjb25zdCBXZWJD b250ZXh0TWVudUl0ZW1HbGliJiBkYXRhLCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtR2xpYj4m JiBzdWJtZW51KQogICAgIDogV2ViQ29udGV4dE1lbnVJdGVtRGF0YShBY3Rpb25UeXBlLCBkYXRh LmFjdGlvbigpLCBkYXRhLnRpdGxlKCksIGRhdGEuZW5hYmxlZCgpLCBmYWxzZSkKIHsKICAgICBt X2dBY3Rpb24gPSBkYXRhLmdBY3Rpb24oKTsKLSAgICBtX2d0a0FjdGlvbiA9IGRhdGEuZ3RrQWN0 aW9uKCk7CiAgICAgbV9zdWJtZW51SXRlbXMgPSBXVEZNb3ZlKHN1Ym1lbnUpOwotfQotCi1XZWJD b250ZXh0TWVudUl0ZW1HdGs6OldlYkNvbnRleHRNZW51SXRlbUd0ayhHdGtBY3Rpb24qIGFjdGlv bikKLSAgICA6IFdlYkNvbnRleHRNZW51SXRlbURhdGEoR1RLX0lTX1RPR0dMRV9BQ1RJT04oYWN0 aW9uKSA/IENoZWNrYWJsZUFjdGlvblR5cGUgOiBBY3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1C YXNlQXBwbGljYXRpb25UYWcsIFN0cmluZzo6ZnJvbVVURjgoZ3RrX2FjdGlvbl9nZXRfbGFiZWwo YWN0aW9uKSksIGd0a19hY3Rpb25fZ2V0X3NlbnNpdGl2ZShhY3Rpb24pLCBHVEtfSVNfVE9HR0xF X0FDVElPTihhY3Rpb24pID8gZ3RrX3RvZ2dsZV9hY3Rpb25fZ2V0X2FjdGl2ZShHVEtfVE9HR0xF X0FDVElPTihhY3Rpb24pKSA6IGZhbHNlKQotewotICAgIG1fZ3RrQWN0aW9uID0gYWN0aW9uOwot ICAgIGNyZWF0ZUFjdGlvbklmTmVlZGVkKCk7Ci0gICAgZ19vYmplY3Rfc2V0X2RhdGFfZnVsbChH X09CSkVDVChtX2dBY3Rpb24uZ2V0KCkpLCAid2Via2l0LWd0ay1hY3Rpb24iLCBnX29iamVjdF9y ZWYobV9ndGtBY3Rpb24pLCBnX29iamVjdF91bnJlZik7CisjaWYgUExBVEZPUk0oR1RLKQorICAg IG1fZ3RrQWN0aW9uID0gZGF0YS5ndGtBY3Rpb24oKTsKKyNlbmRpZgogfQogCiBzdGF0aWMgYm9v bCBpc0dBY3Rpb25DaGVja2VkKEdBY3Rpb24qIGFjdGlvbikKQEAgLTE1Nyw3ICsxNTcsNyBAQCBz dGF0aWMgYm9vbCBpc0dBY3Rpb25DaGVja2VkKEdBY3Rpb24qIGFjdGlvbikKICAgICByZXR1cm4g Z192YXJpYW50X2dldF9ib29sZWFuKHN0YXRlLmdldCgpKTsKIH0KIAotV2ViQ29udGV4dE1lbnVJ dGVtR3RrOjpXZWJDb250ZXh0TWVudUl0ZW1HdGsoR0FjdGlvbiogYWN0aW9uLCBjb25zdCBTdHJp bmcmIHRpdGxlLCBHVmFyaWFudCogdGFyZ2V0KQorV2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6V2Vi Q29udGV4dE1lbnVJdGVtR2xpYihHQWN0aW9uKiBhY3Rpb24sIGNvbnN0IFN0cmluZyYgdGl0bGUs IEdWYXJpYW50KiB0YXJnZXQpCiAgICAgOiBXZWJDb250ZXh0TWVudUl0ZW1EYXRhKGdfYWN0aW9u X2dldF9zdGF0ZV90eXBlKGFjdGlvbikgPyBDaGVja2FibGVBY3Rpb25UeXBlIDogQWN0aW9uVHlw ZSwgQ29udGV4dE1lbnVJdGVtQmFzZUFwcGxpY2F0aW9uVGFnLCB0aXRsZSwgZ19hY3Rpb25fZ2V0 X2VuYWJsZWQoYWN0aW9uKSwgaXNHQWN0aW9uQ2hlY2tlZChhY3Rpb24pKQogICAgICwgbV9nQWN0 aW9uKGFjdGlvbikKICAgICAsIG1fZ0FjdGlvblRhcmdldCh0YXJnZXQpCkBAIC0xNjUsMjIgKzE2 NSwzOCBAQCBXZWJDb250ZXh0TWVudUl0ZW1HdGs6OldlYkNvbnRleHRNZW51SXRlbUd0ayhHQWN0 aW9uKiBhY3Rpb24sIGNvbnN0IFN0cmluZyYgdGl0bAogICAgIGNyZWF0ZUFjdGlvbklmTmVlZGVk KCk7CiB9CiAKLVdlYkNvbnRleHRNZW51SXRlbUd0azo6fldlYkNvbnRleHRNZW51SXRlbUd0aygp CisjaWYgUExBVEZPUk0oR1RLKQorV2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6V2ViQ29udGV4dE1l bnVJdGVtR2xpYihHdGtBY3Rpb24qIGFjdGlvbikKKyAgICA6IFdlYkNvbnRleHRNZW51SXRlbURh dGEoR1RLX0lTX1RPR0dMRV9BQ1RJT04oYWN0aW9uKSA/IENoZWNrYWJsZUFjdGlvblR5cGUgOiBB Y3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1CYXNlQXBwbGljYXRpb25UYWcsIFN0cmluZzo6ZnJv bVVURjgoZ3RrX2FjdGlvbl9nZXRfbGFiZWwoYWN0aW9uKSksIGd0a19hY3Rpb25fZ2V0X3NlbnNp dGl2ZShhY3Rpb24pLCBHVEtfSVNfVE9HR0xFX0FDVElPTihhY3Rpb24pID8gZ3RrX3RvZ2dsZV9h Y3Rpb25fZ2V0X2FjdGl2ZShHVEtfVE9HR0xFX0FDVElPTihhY3Rpb24pKSA6IGZhbHNlKQorewor ICAgIG1fZ3RrQWN0aW9uID0gYWN0aW9uOworICAgIGNyZWF0ZUFjdGlvbklmTmVlZGVkKCk7Cisg ICAgZ19vYmplY3Rfc2V0X2RhdGFfZnVsbChHX09CSkVDVChtX2dBY3Rpb24uZ2V0KCkpLCAid2Vi a2l0LWd0ay1hY3Rpb24iLCBnX29iamVjdF9yZWYobV9ndGtBY3Rpb24pLCBnX29iamVjdF91bnJl Zik7Cit9CisjZW5kaWYKKworV2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6fldlYkNvbnRleHRNZW51 SXRlbUdsaWIoKQoreworfQorCitHVW5pcXVlUHRyPGNoYXI+IFdlYkNvbnRleHRNZW51SXRlbUds aWI6OmJ1aWxkQWN0aW9uTmFtZSgpIGNvbnN0CiB7CisjaWYgUExBVEZPUk0oR1RLKQorICAgIGlm IChtX2d0a0FjdGlvbikKKyAgICAgICAgcmV0dXJuIEdVbmlxdWVQdHI8Y2hhcj4oZ19zdHJkdXAo Z3RrX2FjdGlvbl9nZXRfbmFtZShtX2d0a0FjdGlvbikpKTsKKyNlbmRpZgorCisgICAgc3RhdGlj IHVpbnQ2NF90IGFjdGlvbklEID0gMDsKKyAgICByZXR1cm4gR1VuaXF1ZVB0cjxjaGFyPihnX3N0 cmR1cF9wcmludGYoImFjdGlvbi0lIiBQUkl1NjQsICsrYWN0aW9uSUQpKTsKIH0KIAotdm9pZCBX ZWJDb250ZXh0TWVudUl0ZW1HdGs6OmNyZWF0ZUFjdGlvbklmTmVlZGVkKCkKK3ZvaWQgV2ViQ29u dGV4dE1lbnVJdGVtR2xpYjo6Y3JlYXRlQWN0aW9uSWZOZWVkZWQoKQogewogICAgIGlmICh0eXBl KCkgPT0gU2VwYXJhdG9yVHlwZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc3RhdGljIHVpbnQ2 NF90IGFjdGlvbklEID0gMDsKICAgICBpZiAoIW1fZ0FjdGlvbikgewotICAgICAgICBHVW5pcXVl UHRyPGNoYXI+IGFjdGlvbk5hbWU7Ci0gICAgICAgIGlmIChtX2d0a0FjdGlvbikKLSAgICAgICAg ICAgIGFjdGlvbk5hbWUucmVzZXQoZ19zdHJkdXAoZ3RrX2FjdGlvbl9nZXRfbmFtZShtX2d0a0Fj dGlvbikpKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgYWN0aW9uTmFtZS5yZXNldChnX3N0 cmR1cF9wcmludGYoImFjdGlvbi0lIiBQUkl1NjQsICsrYWN0aW9uSUQpKTsKKyAgICAgICAgYXV0 byBhY3Rpb25OYW1lID0gYnVpbGRBY3Rpb25OYW1lKCk7CiAgICAgICAgIGlmICh0eXBlKCkgPT0g Q2hlY2thYmxlQWN0aW9uVHlwZSkKICAgICAgICAgICAgIG1fZ0FjdGlvbiA9IGFkb3B0R1JlZihH X0FDVElPTihnX3NpbXBsZV9hY3Rpb25fbmV3X3N0YXRlZnVsKGFjdGlvbk5hbWUuZ2V0KCksIG51 bGxwdHIsIGdfdmFyaWFudF9uZXdfYm9vbGVhbihjaGVja2VkKCkpKSkpOwogICAgICAgICBlbHNl CkBAIC0xODgsNiArMjA0LDcgQEAgdm9pZCBXZWJDb250ZXh0TWVudUl0ZW1HdGs6OmNyZWF0ZUFj dGlvbklmTmVlZGVkKCkKICAgICAgICAgZ19zaW1wbGVfYWN0aW9uX3NldF9lbmFibGVkKEdfU0lN UExFX0FDVElPTihtX2dBY3Rpb24uZ2V0KCkpLCBlbmFibGVkKCkpOwogICAgIH0KIAorI2lmIFBM QVRGT1JNKEdUSykKICAgICAvLyBDcmVhdGUgdGhlIEd0a0FjdGlvbiBmb3IgYmFja3dhcmRzIGNv bXBhdGliaWxpdHkgb25seS4KICAgICBpZiAoIW1fZ3RrQWN0aW9uKSB7CiAgICAgICAgIGlmICh0 eXBlKCkgPT0gQ2hlY2thYmxlQWN0aW9uVHlwZSkgewpAQCAtMjAwLDYgKzIxNyw3IEBAIHZvaWQg V2ViQ29udGV4dE1lbnVJdGVtR3RrOjpjcmVhdGVBY3Rpb25JZk5lZWRlZCgpCiAgICAgfQogCiAg ICAgZ19zaWduYWxfY29ubmVjdF9vYmplY3QobV9nQWN0aW9uLmdldCgpLCAiYWN0aXZhdGUiLCBH X0NBTExCQUNLKGd0a19hY3Rpb25fYWN0aXZhdGUpLCBtX2d0a0FjdGlvbiwgR19DT05ORUNUX1NX QVBQRUQpOworI2VuZGlmCiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvU2hhcmVkL2d0ay9XZWJDb250ZXh0TWVudUl0ZW1HdGsuaCBiL1NvdXJj ZS9XZWJLaXQyL1NoYXJlZC9nbGliL1dlYkNvbnRleHRNZW51SXRlbUdsaWIuaApzaW1pbGFyaXR5 IGluZGV4IDcxJQpyZW5hbWUgZnJvbSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1dlYkNvbnRl eHRNZW51SXRlbUd0ay5oCnJlbmFtZSB0byBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ2xpYi9XZWJD b250ZXh0TWVudUl0ZW1HbGliLmgKaW5kZXggODZiNWU2NzQ1MjguLjVmZmU2YWIzMjQxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvZ3RrL1dlYkNvbnRleHRNZW51SXRlbUd0ay5o CisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9nbGliL1dlYkNvbnRleHRNZW51SXRlbUdsaWIu aApAQCAtMjMsNDQgKzIzLDQ5IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CiAgKi8KIAotI2lmbmRlZiBXZWJDb250ZXh0TWVudUl0ZW1HdGtfaAotI2RlZmluZSBXZWJDb250 ZXh0TWVudUl0ZW1HdGtfaAorI3ByYWdtYSBvbmNlCiAKLSNpbmNsdWRlICJBUElPYmplY3QuaCIK ICNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW1EYXRhLmgiCiAjaW5jbHVkZSA8d3RmL2dsaWIv R1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9nbGliL0dVbmlxdWVQdHIuaD4KIAogdHlwZWRlZiBz dHJ1Y3QgX0d0a0FjdGlvbiBHdGtBY3Rpb247CiB0eXBlZGVmIHN0cnVjdCBfR0FjdGlvbiBHQWN0 aW9uOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotY2xhc3MgV2ViQ29udGV4dE1lbnVJdGVtR3Rr IDogcHVibGljIFdlYkNvbnRleHRNZW51SXRlbURhdGEgeworY2xhc3MgV2ViQ29udGV4dE1lbnVJ dGVtR2xpYiBmaW5hbCA6IHB1YmxpYyBXZWJDb250ZXh0TWVudUl0ZW1EYXRhIHsKICAgICBXVEZf TUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAgICBXZWJDb250ZXh0TWVudUl0ZW1HdGso V2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtVHlwZSwgV2ViQ29yZTo6Q29udGV4dE1lbnVBY3Rpb24s IGNvbnN0IFN0cmluZyYgdGl0bGUsIGJvb2wgZW5hYmxlZCA9IHRydWUsIGJvb2wgY2hlY2tlZCA9 IGZhbHNlKTsKLSAgICBXZWJDb250ZXh0TWVudUl0ZW1HdGsoY29uc3QgV2ViQ29udGV4dE1lbnVJ dGVtRGF0YSYpOwotICAgIFdlYkNvbnRleHRNZW51SXRlbUd0ayhjb25zdCBXZWJDb250ZXh0TWVu dUl0ZW1HdGsmLCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtR3RrPiYmIHN1Ym1lbnUpOwotICAg IFdlYkNvbnRleHRNZW51SXRlbUd0ayhHdGtBY3Rpb24qKTsKLSAgICBXZWJDb250ZXh0TWVudUl0 ZW1HdGsoR0FjdGlvbiosIGNvbnN0IFN0cmluZyYgdGl0bGUsIEdWYXJpYW50KiB0YXJnZXQgPSBu dWxscHRyKTsKLSAgICB+V2ViQ29udGV4dE1lbnVJdGVtR3RrKCk7CisgICAgV2ViQ29udGV4dE1l bnVJdGVtR2xpYihXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UeXBlLCBXZWJDb3JlOjpDb250ZXh0 TWVudUFjdGlvbiwgY29uc3QgU3RyaW5nJiB0aXRsZSwgYm9vbCBlbmFibGVkID0gdHJ1ZSwgYm9v bCBjaGVja2VkID0gZmFsc2UpOworICAgIFdlYkNvbnRleHRNZW51SXRlbUdsaWIoY29uc3QgV2Vi Q29udGV4dE1lbnVJdGVtRGF0YSYpOworICAgIFdlYkNvbnRleHRNZW51SXRlbUdsaWIoY29uc3Qg V2ViQ29udGV4dE1lbnVJdGVtR2xpYiYsIFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1HbGliPiYm IHN1Ym1lbnUpOworICAgIFdlYkNvbnRleHRNZW51SXRlbUdsaWIoR0FjdGlvbiosIGNvbnN0IFN0 cmluZyYgdGl0bGUsIEdWYXJpYW50KiB0YXJnZXQgPSBudWxscHRyKTsKKyNpZiBQTEFURk9STShH VEspCisgICAgV2ViQ29udGV4dE1lbnVJdGVtR2xpYihHdGtBY3Rpb24qKTsKKyNlbmRpZgorICAg IH5XZWJDb250ZXh0TWVudUl0ZW1HbGliKCk7CiAKICAgICAvLyBXZSBkb24ndCB1c2UgdGhlIFN1 Ym1lbnVUeXBlIGludGVybmFsbHksIHNvIGNoZWNrIGlmIHdlIGhhdmUgc3VibWVudSBpdGVtcy4K ICAgICBXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW1UeXBlIHR5cGUoKSBjb25zdCB7IHJldHVybiBt X3N1Ym1lbnVJdGVtcy5pc0VtcHR5KCkgPyBXZWJDb250ZXh0TWVudUl0ZW1EYXRhOjp0eXBlKCkg OiBXZWJDb3JlOjpTdWJtZW51VHlwZTsgfQotICAgIEd0a0FjdGlvbiogZ3RrQWN0aW9uKCkgY29u c3QgeyByZXR1cm4gbV9ndGtBY3Rpb247IH0KICAgICBHQWN0aW9uKiBnQWN0aW9uKCkgY29uc3Qg eyByZXR1cm4gbV9nQWN0aW9uLmdldCgpOyB9CiAgICAgR1ZhcmlhbnQqIGdBY3Rpb25UYXJnZXQo KSBjb25zdCB7IHJldHVybiBtX2dBY3Rpb25UYXJnZXQuZ2V0KCk7IH0KLSAgICBjb25zdCBWZWN0 b3I8V2ViQ29udGV4dE1lbnVJdGVtR3RrPiYgc3VibWVudUl0ZW1zKCkgY29uc3QgeyByZXR1cm4g bV9zdWJtZW51SXRlbXM7IH0KKyAgICBjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtR2xp Yj4mIHN1Ym1lbnVJdGVtcygpIGNvbnN0IHsgcmV0dXJuIG1fc3VibWVudUl0ZW1zOyB9CisKKyNp ZiBQTEFURk9STShHVEspCisgICAgR3RrQWN0aW9uKiBndGtBY3Rpb24oKSBjb25zdCB7IHJldHVy biBtX2d0a0FjdGlvbjsgfQorI2VuZGlmCiAKIHByaXZhdGU6CisgICAgR1VuaXF1ZVB0cjxjaGFy PiBidWlsZEFjdGlvbk5hbWUoKSBjb25zdDsKICAgICB2b2lkIGNyZWF0ZUFjdGlvbklmTmVlZGVk KCk7CiAKICAgICBHUmVmUHRyPEdBY3Rpb24+IG1fZ0FjdGlvbjsKICAgICBHUmVmUHRyPEdWYXJp YW50PiBtX2dBY3Rpb25UYXJnZXQ7CisgICAgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbUdsaWI+ IG1fc3VibWVudUl0ZW1zOworI2lmIFBMQVRGT1JNKEdUSykKICAgICBHdGtBY3Rpb24qIG1fZ3Rr QWN0aW9uIHsgbnVsbHB0ciB9OwotICAgIFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1HdGs+IG1f c3VibWVudUl0ZW1zOworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKLQotI2Vu ZGlmIC8vIFdlYkNvbnRleHRNZW51SXRlbUd0a19oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudS5jcHAKaW5kZXggYzQzMDY3YWUz NTUuLjVjYTEwYWY4ZGZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRDb250ZXh0TWVudS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnUuY3BwCkBAIC03NywxMSArNzcsMTEgQEAgdm9pZCB3 ZWJraXRDb250ZXh0TWVudVBvcHVsYXRlKFdlYktpdENvbnRleHRNZW51KiBtZW51LCBWZWN0b3I8 V2ViQ29udGV4dE1lbnVJdGUKICAgICB9CiB9CiAKLXZvaWQgd2Via2l0Q29udGV4dE1lbnVQb3B1 bGF0ZShXZWJLaXRDb250ZXh0TWVudSogbWVudSwgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbUd0 az4mIGNvbnRleHRNZW51SXRlbXMpCit2b2lkIHdlYmtpdENvbnRleHRNZW51UG9wdWxhdGUoV2Vi S2l0Q29udGV4dE1lbnUqIG1lbnUsIFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1HbGliPiYgY29u dGV4dE1lbnVJdGVtcykKIHsKICAgICBmb3IgKEdMaXN0KiBpdGVtID0gbWVudS0+cHJpdi0+aXRl bXM7IGl0ZW07IGl0ZW0gPSBnX2xpc3RfbmV4dChpdGVtKSkgewogICAgICAgICBXZWJLaXRDb250 ZXh0TWVudUl0ZW0qIG1lbnVJdGVtID0gV0VCS0lUX0NPTlRFWFRfTUVOVV9JVEVNKGl0ZW0tPmRh dGEpOwotICAgICAgICBjb250ZXh0TWVudUl0ZW1zLmFwcGVuZCh3ZWJraXRDb250ZXh0TWVudUl0 ZW1Ub1dlYkNvbnRleHRNZW51SXRlbUd0ayhtZW51SXRlbSkpOworICAgICAgICBjb250ZXh0TWVu dUl0ZW1zLmFwcGVuZCh3ZWJraXRDb250ZXh0TWVudUl0ZW1Ub1dlYkNvbnRleHRNZW51SXRlbUds aWIobWVudUl0ZW0pKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51QWN0aW9ucy5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUFjdGlvbnMuY3BwCmluZGV4 IGNmMWRkZjk1NTEwLi4xY2JiZTU1ZDg4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVBY3Rpb25zLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUFjdGlvbnMuY3BwCkBA IC0xMzUsNyArMTM1LDcgQEAgQ29udGV4dE1lbnVBY3Rpb24gd2Via2l0Q29udGV4dE1lbnVBY3Rp b25HZXRBY3Rpb25UYWcoV2ViS2l0Q29udGV4dE1lbnVBY3Rpb24gYWMKICAgICByZXR1cm4gQ29u dGV4dE1lbnVJdGVtQmFzZUFwcGxpY2F0aW9uVGFnOwogfQogCi1XZWJLaXRDb250ZXh0TWVudUFj dGlvbiB3ZWJraXRDb250ZXh0TWVudUFjdGlvbkdldEZvckNvbnRleHRNZW51SXRlbShjb25zdCBX ZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbUd0ayYgbWVudUl0ZW0pCitXZWJLaXRDb250ZXh0TWVu dUFjdGlvbiB3ZWJraXRDb250ZXh0TWVudUFjdGlvbkdldEZvckNvbnRleHRNZW51SXRlbShjb25z dCBXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbUdsaWImIG1lbnVJdGVtKQogewogICAgIHN3aXRj aCAobWVudUl0ZW0uYWN0aW9uKCkpIHsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ05vQWN0 aW9uOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 Q29udGV4dE1lbnVBY3Rpb25zUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0Q29udGV4dE1lbnVBY3Rpb25zUHJpdmF0ZS5oCmluZGV4IGUwMGI4ZTJkZjg4 Li5kZDdlM2YwNzc3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvV2ViS2l0Q29udGV4dE1lbnVBY3Rpb25zUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51QWN0aW9uc1ByaXZhdGUuaApAQCAt MTcsMTUgKzE3LDEyIEBACiAgKiBCb3N0b24sIE1BIDAyMTEwLTEzMDEsIFVTQS4KICAqLwogCi0j aWZuZGVmIFdlYktpdENvbnRleHRNZW51QWN0aW9uc1ByaXZhdGVfaAotI2RlZmluZSBXZWJLaXRD b250ZXh0TWVudUFjdGlvbnNQcml2YXRlX2gKKyNwcmFnbWEgb25jZQogCi0jaW5jbHVkZSAiV2Vi Q29udGV4dE1lbnVJdGVtR3RrLmgiCisjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVtR2xpYi5o IgogI2luY2x1ZGUgIldlYktpdENvbnRleHRNZW51QWN0aW9ucy5oIgogCiBib29sIHdlYmtpdENv bnRleHRNZW51QWN0aW9uSXNDaGVja2FibGUoV2ViS2l0Q29udGV4dE1lbnVBY3Rpb24pOwogV2Vi Q29yZTo6Q29udGV4dE1lbnVBY3Rpb24gd2Via2l0Q29udGV4dE1lbnVBY3Rpb25HZXRBY3Rpb25U YWcoV2ViS2l0Q29udGV4dE1lbnVBY3Rpb24pOwotV2ViS2l0Q29udGV4dE1lbnVBY3Rpb24gd2Vi a2l0Q29udGV4dE1lbnVBY3Rpb25HZXRGb3JDb250ZXh0TWVudUl0ZW0oY29uc3QgV2ViS2l0OjpX ZWJDb250ZXh0TWVudUl0ZW1HdGsmKTsKK1dlYktpdENvbnRleHRNZW51QWN0aW9uIHdlYmtpdENv bnRleHRNZW51QWN0aW9uR2V0Rm9yQ29udGV4dE1lbnVJdGVtKGNvbnN0IFdlYktpdDo6V2ViQ29u dGV4dE1lbnVJdGVtR2xpYiYpOwogU3RyaW5nIHdlYmtpdENvbnRleHRNZW51QWN0aW9uR2V0TGFi ZWwoV2ViS2l0Q29udGV4dE1lbnVBY3Rpb24pOwotCi0jZW5kaWYgLy8gV2ViS2l0UHJpbnRPcGVy YXRpb25Qcml2YXRlX2gKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdENvbnRleHRNZW51SXRlbS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUl0ZW0uY3BwCmluZGV4IDM5ZTNmYjQ1ZjI2Li45NDRk MDQ2ZGNhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0Q29udGV4dE1lbnVJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRDb250ZXh0TWVudUl0ZW0uY3BwCkBAIC0yMiw3ICsyMiw3IEBACiAKICNpbmNs dWRlICJBUElBcnJheS5oIgogI2luY2x1ZGUgIldlYkNvbnRleHRNZW51SXRlbS5oIgotI2luY2x1 ZGUgIldlYkNvbnRleHRNZW51SXRlbUd0ay5oIgorI2luY2x1ZGUgIldlYkNvbnRleHRNZW51SXRl bUdsaWIuaCIKICNpbmNsdWRlICJXZWJLaXRDb250ZXh0TWVudUFjdGlvbnNQcml2YXRlLmgiCiAj aW5jbHVkZSAiV2ViS2l0Q29udGV4dE1lbnVJdGVtUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYktp dENvbnRleHRNZW51UHJpdmF0ZS5oIgpAQCAtNTcsNyArNTcsNyBAQCBzdHJ1Y3QgX1dlYktpdENv bnRleHRNZW51SXRlbVByaXZhdGUgewogICAgICAgICAgICAgd2Via2l0Q29udGV4dE1lbnVTZXRQ YXJlbnRJdGVtKHN1Yk1lbnUuZ2V0KCksIDApOwogICAgIH0KIAotICAgIHN0ZDo6dW5pcXVlX3B0 cjxXZWJDb250ZXh0TWVudUl0ZW1HdGs+IG1lbnVJdGVtOworICAgIHN0ZDo6dW5pcXVlX3B0cjxX ZWJDb250ZXh0TWVudUl0ZW1HbGliPiBtZW51SXRlbTsKICAgICBHUmVmUHRyPFdlYktpdENvbnRl eHRNZW51PiBzdWJNZW51OwogfTsKIApAQCAtOTUsNyArOTUsNyBAQCBXZWJLaXRDb250ZXh0TWVu dUl0ZW0qIHdlYmtpdENvbnRleHRNZW51SXRlbUNyZWF0ZShjb25zdCBXZWJDb250ZXh0TWVudUl0 ZW1EYXRhJgogewogICAgIFdlYktpdENvbnRleHRNZW51SXRlbSogaXRlbSA9IFdFQktJVF9DT05U RVhUX01FTlVfSVRFTShnX29iamVjdF9uZXcoV0VCS0lUX1RZUEVfQ09OVEVYVF9NRU5VX0lURU0s IE5VTEwpKTsKIAotICAgIGl0ZW0tPnByaXYtPm1lbnVJdGVtID0gc3RkOjptYWtlX3VuaXF1ZTxX ZWJDb250ZXh0TWVudUl0ZW1HdGs+KGl0ZW1EYXRhKTsKKyAgICBpdGVtLT5wcml2LT5tZW51SXRl bSA9IHN0ZDo6bWFrZV91bmlxdWU8V2ViQ29udGV4dE1lbnVJdGVtR2xpYj4oaXRlbURhdGEpOwog ICAgIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYgc3ViTWVudSA9IGl0ZW1E YXRhLnN1Ym1lbnUoKTsKICAgICBpZiAoIXN1Yk1lbnUuaXNFbXB0eSgpKQogICAgICAgICB3ZWJr aXRDb250ZXh0TWVudUl0ZW1TZXRTdWJNZW51KGl0ZW0sIGFkb3B0R1JlZih3ZWJraXRDb250ZXh0 TWVudUNyZWF0ZShzdWJNZW51KSkpOwpAQCAtMTAzLDEyICsxMDMsMTIgQEAgV2ViS2l0Q29udGV4 dE1lbnVJdGVtKiB3ZWJraXRDb250ZXh0TWVudUl0ZW1DcmVhdGUoY29uc3QgV2ViQ29udGV4dE1l bnVJdGVtRGF0YSYKICAgICByZXR1cm4gaXRlbTsKIH0KIAotV2ViQ29udGV4dE1lbnVJdGVtR3Rr IHdlYmtpdENvbnRleHRNZW51SXRlbVRvV2ViQ29udGV4dE1lbnVJdGVtR3RrKFdlYktpdENvbnRl eHRNZW51SXRlbSogaXRlbSkKK1dlYkNvbnRleHRNZW51SXRlbUdsaWIgd2Via2l0Q29udGV4dE1l bnVJdGVtVG9XZWJDb250ZXh0TWVudUl0ZW1HbGliKFdlYktpdENvbnRleHRNZW51SXRlbSogaXRl bSkKIHsKICAgICBpZiAoaXRlbS0+cHJpdi0+c3ViTWVudSkgewotICAgICAgICBWZWN0b3I8V2Vi Q29udGV4dE1lbnVJdGVtR3RrPiBzdWJNZW51SXRlbXM7CisgICAgICAgIFZlY3RvcjxXZWJDb250 ZXh0TWVudUl0ZW1HbGliPiBzdWJNZW51SXRlbXM7CiAgICAgICAgIHdlYmtpdENvbnRleHRNZW51 UG9wdWxhdGUoaXRlbS0+cHJpdi0+c3ViTWVudS5nZXQoKSwgc3ViTWVudUl0ZW1zKTsKLSAgICAg ICAgcmV0dXJuIFdlYkNvbnRleHRNZW51SXRlbUd0aygqaXRlbS0+cHJpdi0+bWVudUl0ZW0sIFdU Rk1vdmUoc3ViTWVudUl0ZW1zKSk7CisgICAgICAgIHJldHVybiBXZWJDb250ZXh0TWVudUl0ZW1H bGliKCppdGVtLT5wcml2LT5tZW51SXRlbSwgV1RGTW92ZShzdWJNZW51SXRlbXMpKTsKICAgICB9 CiAKICAgICByZXR1cm4gKml0ZW0tPnByaXYtPm1lbnVJdGVtOwpAQCAtMTQwLDcgKzE0MCw3IEBA IFdlYktpdENvbnRleHRNZW51SXRlbSogd2Via2l0X2NvbnRleHRfbWVudV9pdGVtX25ldyhHdGtB Y3Rpb24qIGFjdGlvbikKICAgICBnX3JldHVybl92YWxfaWZfZmFpbChHVEtfSVNfQUNUSU9OKGFj dGlvbiksIG51bGxwdHIpOwogCiAgICAgV2ViS2l0Q29udGV4dE1lbnVJdGVtKiBpdGVtID0gV0VC S0lUX0NPTlRFWFRfTUVOVV9JVEVNKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9DT05URVhUX01F TlVfSVRFTSwgbnVsbHB0cikpOwotICAgIGl0ZW0tPnByaXYtPm1lbnVJdGVtID0gc3RkOjptYWtl X3VuaXF1ZTxXZWJDb250ZXh0TWVudUl0ZW1HdGs+KGFjdGlvbik7CisgICAgaXRlbS0+cHJpdi0+ bWVudUl0ZW0gPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYkNvbnRleHRNZW51SXRlbUdsaWI+KGFjdGlv bik7CiAKICAgICByZXR1cm4gaXRlbTsKIH0KQEAgLTE2Niw3ICsxNjYsNyBAQCBXZWJLaXRDb250 ZXh0TWVudUl0ZW0qIHdlYmtpdF9jb250ZXh0X21lbnVfaXRlbV9uZXdfZnJvbV9nYWN0aW9uKEdB Y3Rpb24qIGFjdGlvbgogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKCF0YXJnZXQgfHwgZ192YXJp YW50X2lzX29mX3R5cGUodGFyZ2V0LCBnX2FjdGlvbl9nZXRfcGFyYW1ldGVyX3R5cGUoYWN0aW9u KSksIG51bGxwdHIpOwogCiAgICAgV2ViS2l0Q29udGV4dE1lbnVJdGVtKiBpdGVtID0gV0VCS0lU X0NPTlRFWFRfTUVOVV9JVEVNKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9DT05URVhUX01FTlVf SVRFTSwgbnVsbHB0cikpOwotICAgIGl0ZW0tPnByaXYtPm1lbnVJdGVtID0gc3RkOjptYWtlX3Vu aXF1ZTxXZWJDb250ZXh0TWVudUl0ZW1HdGs+KGFjdGlvbiwgU3RyaW5nOjpmcm9tVVRGOChsYWJl bCksIHRhcmdldCk7CisgICAgaXRlbS0+cHJpdi0+bWVudUl0ZW0gPSBzdGQ6Om1ha2VfdW5pcXVl PFdlYkNvbnRleHRNZW51SXRlbUdsaWI+KGFjdGlvbiwgU3RyaW5nOjpmcm9tVVRGOChsYWJlbCks IHRhcmdldCk7CiAKICAgICByZXR1cm4gaXRlbTsKIH0KQEAgLTE5Myw3ICsxOTMsNyBAQCBXZWJL aXRDb250ZXh0TWVudUl0ZW0qIHdlYmtpdF9jb250ZXh0X21lbnVfaXRlbV9uZXdfZnJvbV9zdG9j a19hY3Rpb24oV2ViS2l0Q29udAogCiAgICAgV2ViS2l0Q29udGV4dE1lbnVJdGVtKiBpdGVtID0g V0VCS0lUX0NPTlRFWFRfTUVOVV9JVEVNKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9DT05URVhU X01FTlVfSVRFTSwgbnVsbHB0cikpOwogICAgIENvbnRleHRNZW51SXRlbVR5cGUgdHlwZSA9IHdl YmtpdENvbnRleHRNZW51QWN0aW9uSXNDaGVja2FibGUoYWN0aW9uKSA/IENoZWNrYWJsZUFjdGlv blR5cGUgOiBBY3Rpb25UeXBlOwotICAgIGl0ZW0tPnByaXYtPm1lbnVJdGVtID0gc3RkOjptYWtl X3VuaXF1ZTxXZWJDb250ZXh0TWVudUl0ZW1HdGs+KHR5cGUsIHdlYmtpdENvbnRleHRNZW51QWN0 aW9uR2V0QWN0aW9uVGFnKGFjdGlvbiksIHdlYmtpdENvbnRleHRNZW51QWN0aW9uR2V0TGFiZWwo YWN0aW9uKSk7CisgICAgaXRlbS0+cHJpdi0+bWVudUl0ZW0gPSBzdGQ6Om1ha2VfdW5pcXVlPFdl YkNvbnRleHRNZW51SXRlbUdsaWI+KHR5cGUsIHdlYmtpdENvbnRleHRNZW51QWN0aW9uR2V0QWN0 aW9uVGFnKGFjdGlvbiksIHdlYmtpdENvbnRleHRNZW51QWN0aW9uR2V0TGFiZWwoYWN0aW9uKSk7 CiAKICAgICByZXR1cm4gaXRlbTsKIH0KQEAgLTIxNSw3ICsyMTUsNyBAQCBXZWJLaXRDb250ZXh0 TWVudUl0ZW0qIHdlYmtpdF9jb250ZXh0X21lbnVfaXRlbV9uZXdfZnJvbV9zdG9ja19hY3Rpb25f d2l0aF9sYWJlbAogCiAgICAgV2ViS2l0Q29udGV4dE1lbnVJdGVtKiBpdGVtID0gV0VCS0lUX0NP TlRFWFRfTUVOVV9JVEVNKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQRV9DT05URVhUX01FTlVfSVRF TSwgbnVsbHB0cikpOwogICAgIENvbnRleHRNZW51SXRlbVR5cGUgdHlwZSA9IHdlYmtpdENvbnRl eHRNZW51QWN0aW9uSXNDaGVja2FibGUoYWN0aW9uKSA/IENoZWNrYWJsZUFjdGlvblR5cGUgOiBB Y3Rpb25UeXBlOwotICAgIGl0ZW0tPnByaXYtPm1lbnVJdGVtID0gc3RkOjptYWtlX3VuaXF1ZTxX ZWJDb250ZXh0TWVudUl0ZW1HdGs+KHR5cGUsIHdlYmtpdENvbnRleHRNZW51QWN0aW9uR2V0QWN0 aW9uVGFnKGFjdGlvbiksIFN0cmluZzo6ZnJvbVVURjgobGFiZWwpKTsKKyAgICBpdGVtLT5wcml2 LT5tZW51SXRlbSA9IHN0ZDo6bWFrZV91bmlxdWU8V2ViQ29udGV4dE1lbnVJdGVtR2xpYj4odHlw ZSwgd2Via2l0Q29udGV4dE1lbnVBY3Rpb25HZXRBY3Rpb25UYWcoYWN0aW9uKSwgU3RyaW5nOjpm cm9tVVRGOChsYWJlbCkpOwogCiAgICAgcmV0dXJuIGl0ZW07CiB9CkBAIC0yMzgsNyArMjM4LDcg QEAgV2ViS2l0Q29udGV4dE1lbnVJdGVtKiB3ZWJraXRfY29udGV4dF9tZW51X2l0ZW1fbmV3X3dp dGhfc3VibWVudShjb25zdCBnY2hhciogbGEKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKICAg ICBXZWJLaXRDb250ZXh0TWVudUl0ZW0qIGl0ZW0gPSBXRUJLSVRfQ09OVEVYVF9NRU5VX0lURU0o Z19vYmplY3RfbmV3KFdFQktJVF9UWVBFX0NPTlRFWFRfTUVOVV9JVEVNLCBudWxscHRyKSk7Ci0g ICAgaXRlbS0+cHJpdi0+bWVudUl0ZW0gPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYkNvbnRleHRNZW51 SXRlbUd0az4oQWN0aW9uVHlwZSwgQ29udGV4dE1lbnVJdGVtQmFzZUFwcGxpY2F0aW9uVGFnLCBT dHJpbmc6OmZyb21VVEY4KGxhYmVsKSk7CisgICAgaXRlbS0+cHJpdi0+bWVudUl0ZW0gPSBzdGQ6 Om1ha2VfdW5pcXVlPFdlYkNvbnRleHRNZW51SXRlbUdsaWI+KEFjdGlvblR5cGUsIENvbnRleHRN ZW51SXRlbUJhc2VBcHBsaWNhdGlvblRhZywgU3RyaW5nOjpmcm9tVVRGOChsYWJlbCkpOwogICAg IGl0ZW0tPnByaXYtPnN1Yk1lbnUgPSBzdWJtZW51OwogICAgIHdlYmtpdENvbnRleHRNZW51U2V0 UGFyZW50SXRlbShzdWJtZW51LCBpdGVtKTsKIApAQCAtMjU1LDcgKzI1NSw3IEBAIFdlYktpdENv bnRleHRNZW51SXRlbSogd2Via2l0X2NvbnRleHRfbWVudV9pdGVtX25ld193aXRoX3N1Ym1lbnUo Y29uc3QgZ2NoYXIqIGxhCiBXZWJLaXRDb250ZXh0TWVudUl0ZW0qIHdlYmtpdF9jb250ZXh0X21l bnVfaXRlbV9uZXdfc2VwYXJhdG9yKHZvaWQpCiB7CiAgICAgV2ViS2l0Q29udGV4dE1lbnVJdGVt KiBpdGVtID0gV0VCS0lUX0NPTlRFWFRfTUVOVV9JVEVNKGdfb2JqZWN0X25ldyhXRUJLSVRfVFlQ RV9DT05URVhUX01FTlVfSVRFTSwgbnVsbHB0cikpOwotICAgIGl0ZW0tPnByaXYtPm1lbnVJdGVt ID0gc3RkOjptYWtlX3VuaXF1ZTxXZWJDb250ZXh0TWVudUl0ZW1HdGs+KFNlcGFyYXRvclR5cGUs IENvbnRleHRNZW51SXRlbVRhZ05vQWN0aW9uLCBTdHJpbmcoKSk7CisgICAgaXRlbS0+cHJpdi0+ bWVudUl0ZW0gPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYkNvbnRleHRNZW51SXRlbUdsaWI+KFNlcGFy YXRvclR5cGUsIENvbnRleHRNZW51SXRlbVRhZ05vQWN0aW9uLCBTdHJpbmcoKSk7CiAKICAgICBy ZXR1cm4gaXRlbTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL1dlYktpdENvbnRleHRNZW51SXRlbVByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51SXRlbVByaXZhdGUuaAppbmRleCBjNDlhOWNl MTU2YS4uNjNmNmEzNzZmN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdENvbnRleHRNZW51SXRlbVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudUl0ZW1Qcml2YXRlLmgKQEAgLTE5 LDkgKzE5LDkgQEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0 ZW1HdGsuaCIKKyNpbmNsdWRlICJXZWJDb250ZXh0TWVudUl0ZW1HbGliLmgiCiAjaW5jbHVkZSAi V2ViS2l0Q29udGV4dE1lbnVJdGVtLmgiCiAKIFdlYktpdENvbnRleHRNZW51SXRlbSogd2Via2l0 Q29udGV4dE1lbnVJdGVtQ3JlYXRlKGNvbnN0IFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtRGF0 YSYpOwotV2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW1HdGsgd2Via2l0Q29udGV4dE1lbnVJdGVt VG9XZWJDb250ZXh0TWVudUl0ZW1HdGsoV2ViS2l0Q29udGV4dE1lbnVJdGVtKik7CitXZWJLaXQ6 OldlYkNvbnRleHRNZW51SXRlbUdsaWIgd2Via2l0Q29udGV4dE1lbnVJdGVtVG9XZWJDb250ZXh0 TWVudUl0ZW1HbGliKFdlYktpdENvbnRleHRNZW51SXRlbSopOwogV2ViS2l0OjpXZWJDb250ZXh0 TWVudUl0ZW1EYXRhIHdlYmtpdENvbnRleHRNZW51SXRlbVRvV2ViQ29udGV4dE1lbnVJdGVtRGF0 YShXZWJLaXRDb250ZXh0TWVudUl0ZW0qKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdENvbnRleHRNZW51UHJpdmF0ZS5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0Q29udGV4dE1lbnVQcml2YXRlLmgKaW5kZXggZThm NjQ3ZjEzN2YuLmU5OTI2ZWNmNjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRDb250ZXh0TWVudVByaXZhdGUuaApAQCAtMTksMTEg KzE5LDExIEBACiAKICNwcmFnbWEgb25jZQogCi0jaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVt R3RrLmgiCisjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVtR2xpYi5oIgogI2luY2x1ZGUgIldl YktpdENvbnRleHRNZW51LmgiCiAKIFdlYktpdENvbnRleHRNZW51KiB3ZWJraXRDb250ZXh0TWVu dUNyZWF0ZShjb25zdCBWZWN0b3I8V2ViS2l0OjpXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYpOwot dm9pZCB3ZWJraXRDb250ZXh0TWVudVBvcHVsYXRlKFdlYktpdENvbnRleHRNZW51KiwgVmVjdG9y PFdlYktpdDo6V2ViQ29udGV4dE1lbnVJdGVtR3RrPiYpOwordm9pZCB3ZWJraXRDb250ZXh0TWVu dVBvcHVsYXRlKFdlYktpdENvbnRleHRNZW51KiwgVmVjdG9yPFdlYktpdDo6V2ViQ29udGV4dE1l bnVJdGVtR2xpYj4mKTsKIHZvaWQgd2Via2l0Q29udGV4dE1lbnVQb3B1bGF0ZShXZWJLaXRDb250 ZXh0TWVudSosIFZlY3RvcjxXZWJLaXQ6OldlYkNvbnRleHRNZW51SXRlbURhdGE+Jik7CiB2b2lk IHdlYmtpdENvbnRleHRNZW51U2V0UGFyZW50SXRlbShXZWJLaXRDb250ZXh0TWVudSosIFdlYktp dENvbnRleHRNZW51SXRlbSopOwogV2ViS2l0Q29udGV4dE1lbnVJdGVtKiB3ZWJraXRDb250ZXh0 TWVudUdldFBhcmVudEl0ZW0oV2ViS2l0Q29udGV4dE1lbnUqKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXggNjc4NmY0OThl ZDAuLjEwNjZmNzMyZjYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAtMjE4Miw3ICsyMTgyLDcgQEAgdm9pZCB3ZWJraXRX ZWJWaWV3UG9wdWxhdGVDb250ZXh0TWVudShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBjb25zdCBW ZWN0b3I8V2ViQ28KICAgICBpZiAocmV0dXJuVmFsdWUpCiAgICAgICAgIHJldHVybjsKIAotICAg IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1HdGs+IGNvbnRleHRNZW51SXRlbXM7CisgICAgVmVj dG9yPFdlYkNvbnRleHRNZW51SXRlbUdsaWI+IGNvbnRleHRNZW51SXRlbXM7CiAgICAgd2Via2l0 Q29udGV4dE1lbnVQb3B1bGF0ZShjb250ZXh0TWVudS5nZXQoKSwgY29udGV4dE1lbnVJdGVtcyk7 CiAgICAgY29udGV4dE1lbnVQcm94eS0+cG9wdWxhdGUoY29udGV4dE1lbnVJdGVtcyk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94 eUd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJv eHlHdGsuY3BwCmluZGV4IDA2Mzk4YmE5ZWE1Li41OWQzYTMwNDljYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuY3Bw CkBAIC02Miw3ICs2Miw3IEBAIHN0YXRpYyB2b2lkIGNvbnRleHRNZW51SXRlbUFjdGl2YXRlZENh bGxiYWNrKEdBY3Rpb24qIGFjdGlvbiwgR1ZhcmlhbnQqLCBXZWJQYWdlCiAgICAgcGFnZS0+Y29u dGV4dE1lbnVJdGVtU2VsZWN0ZWQoaXRlbSk7CiB9CiAKLXZvaWQgV2ViQ29udGV4dE1lbnVQcm94 eUd0azo6YXBwZW5kKEdNZW51KiBtZW51LCBjb25zdCBXZWJDb250ZXh0TWVudUl0ZW1HdGsmIG1l bnVJdGVtKQordm9pZCBXZWJDb250ZXh0TWVudVByb3h5R3RrOjphcHBlbmQoR01lbnUqIG1lbnUs IGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbUdsaWImIG1lbnVJdGVtKQogewogICAgIHVuc2lnbmVk IGxvbmcgc2lnbmFsSGFuZGxlcklkOwogICAgIEdSZWZQdHI8R01lbnVJdGVtPiBnTWVudUl0ZW07 CkBAIC0xMDIsNyArMTAyLDcgQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5R3RrOjphcHBlbmQo R01lbnUqIG1lbnUsIGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbUd0ayYgbWUKICAgICBnX21lbnVf YXBwZW5kX2l0ZW0obWVudSwgZ01lbnVJdGVtLmdldCgpKTsKIH0KIAotR1JlZlB0cjxHTWVudT4g V2ViQ29udGV4dE1lbnVQcm94eUd0azo6YnVpbGRNZW51KGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0 TWVudUl0ZW1HdGs+JiBpdGVtcykKK0dSZWZQdHI8R01lbnU+IFdlYkNvbnRleHRNZW51UHJveHlH dGs6OmJ1aWxkTWVudShjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtR2xpYj4mIGl0ZW1z KQogewogICAgIEdSZWZQdHI8R01lbnU+IG1lbnUgPSBhZG9wdEdSZWYoZ19tZW51X25ldygpKTsK ICAgICBHTWVudSogc2VjdGlvbk1lbnUgPSBtZW51LmdldCgpOwpAQCAtMTE4LDcgKzExOCw3IEBA IEdSZWZQdHI8R01lbnU+IFdlYkNvbnRleHRNZW51UHJveHlHdGs6OmJ1aWxkTWVudShjb25zdCBW ZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtCiAgICAgcmV0dXJuIG1lbnU7CiB9CiAKLXZvaWQgV2Vi Q29udGV4dE1lbnVQcm94eUd0azo6cG9wdWxhdGUoY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51 SXRlbUd0az4mIGl0ZW1zKQordm9pZCBXZWJDb250ZXh0TWVudVByb3h5R3RrOjpwb3B1bGF0ZShj b25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtR2xpYj4mIGl0ZW1zKQogewogICAgIEdSZWZQ dHI8R01lbnU+IG1lbnUgPSBidWlsZE1lbnUoaXRlbXMpOwogICAgIGd0a19tZW51X3NoZWxsX2Jp bmRfbW9kZWwoR1RLX01FTlVfU0hFTEwobV9tZW51KSwgR19NRU5VX01PREVMKG1lbnUuZ2V0KCkp LCBudWxscHRyLCBUUlVFKTsKQEAgLTEzNCw3ICsxMzQsNyBAQCB2b2lkIFdlYkNvbnRleHRNZW51 UHJveHlHdGs6OnBvcHVsYXRlKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJdGVt Pj4mCiAgICAgICAgICAgICBnX21lbnVfYXBwZW5kX3NlY3Rpb24obWVudS5nZXQoKSwgbnVsbHB0 ciwgR19NRU5VX01PREVMKHNlY3Rpb24uZ2V0KCkpKTsKICAgICAgICAgICAgIHNlY3Rpb25NZW51 ID0gc2VjdGlvbi5nZXQoKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIFdlYkNvbnRl eHRNZW51SXRlbUd0ayBtZW51aXRlbShpdGVtLT5kYXRhKCkpOworICAgICAgICAgICAgV2ViQ29u dGV4dE1lbnVJdGVtR2xpYiBtZW51aXRlbShpdGVtLT5kYXRhKCkpOwogICAgICAgICAgICAgYXBw ZW5kKHNlY3Rpb25NZW51LCBtZW51aXRlbSk7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZ3RrL1dlYkNvbnRleHRNZW51UHJveHlHdGsuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViQ29udGV4dE1lbnVQcm94eUd0ay5oCmlu ZGV4IDlmNDZiNWQ4NThhLi4zYTRmMzRkMjEyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2d0ay9XZWJDb250ZXh0TWVudVByb3h5R3RrLmgKQEAgLTI4LDcgKzI4LDcg QEAKIAogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQogCi0jaW5jbHVkZSAiV2ViQ29udGV4dE1l bnVJdGVtR3RrLmgiCisjaW5jbHVkZSAiV2ViQ29udGV4dE1lbnVJdGVtR2xpYi5oIgogI2luY2x1 ZGUgIldlYkNvbnRleHRNZW51UHJveHkuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0ludFBvaW50Lmg+ CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KQEAgLTUwLDE1ICs1MCwxNSBAQCBwdWJsaWM6CiAg ICAgfQogICAgIH5XZWJDb250ZXh0TWVudVByb3h5R3RrKCk7CiAKLSAgICB2b2lkIHBvcHVsYXRl KGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1HdGs+Jik7CisgICAgdm9pZCBwb3B1bGF0 ZShjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtR2xpYj4mKTsKICAgICBHdGtNZW51KiBn dGtNZW51KCkgY29uc3QgeyByZXR1cm4gbV9tZW51OyB9CiAKIHByaXZhdGU6CiAgICAgV2ViQ29u dGV4dE1lbnVQcm94eUd0ayhHdGtXaWRnZXQqLCBXZWJQYWdlUHJveHkmLCBjb25zdCBDb250ZXh0 TWVudUNvbnRleHREYXRhJiwgY29uc3QgVXNlckRhdGEmKTsKICAgICB2b2lkIHNob3coKSBvdmVy cmlkZTsKICAgICB2b2lkIHNob3dDb250ZXh0TWVudVdpdGhJdGVtcyhjb25zdCBWZWN0b3I8V2Vi Q29udGV4dE1lbnVJdGVtRGF0YT4mKSBvdmVycmlkZTsKLSAgICB2b2lkIGFwcGVuZChHTWVudSos IGNvbnN0IFdlYkNvbnRleHRNZW51SXRlbUd0ayYpOwotICAgIEdSZWZQdHI8R01lbnU+IGJ1aWxk TWVudShjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtR3RrPiYpOworICAgIHZvaWQgYXBw ZW5kKEdNZW51KiwgY29uc3QgV2ViQ29udGV4dE1lbnVJdGVtR2xpYiYpOworICAgIEdSZWZQdHI8 R01lbnU+IGJ1aWxkTWVudShjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtR2xpYj4mKTsK ICAgICB2b2lkIHBvcHVsYXRlKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJdGVt Pj4mKTsKICAgICBzdGF0aWMgdm9pZCBtZW51UG9zaXRpb25GdW5jdGlvbihHdGtNZW51KiwgZ2lu dCosIGdpbnQqLCBnYm9vbGVhbiosIFdlYkNvbnRleHRNZW51UHJveHlHdGsqKTsKIAo=