14763 2007-07-25 08:09:32 -0700 [S60] Fixes for menu API 2008-04-09 11:39:39 -0700 1 1 1 Unclassified WebKit Layout and Rendering 417.x S60 Emulator S60 3rd edition CLOSED FIXED P2 Blocker --- 1 sriram.yadavalli webkit-unassigned oldest_to_newest 3739 0 sriram.yadavalli 2007-07-25 08:09:32 -0700 fix: - window.menu does not work - cascaded menu not working - remove setScrollbar API 3737 1 15681 sriram.yadavalli 2007-07-25 08:12:55 -0700 Created attachment 15681 Fix for menu API 3722 2 15686 sriram.yadavalli 2007-07-25 15:10:40 -0700 Created attachment 15686 Fix for 3.2 menuitem.setDimmed(true) is not working. Corresponding CCM task is 16000 3613 3 15686 zalan 2007-07-27 07:03:50 -0700 Comment on attachment 15686 Fix for 3.2 r=me 3614 4 zalan 2007-07-27 07:04:21 -0700 r24736 3254 5 15766 sriram.yadavalli 2007-07-31 15:19:47 -0700 Created attachment 15766 Patch for 3.1 TSW Error ID: KNOD-75FTZC 3342 6 15766 zalan 2007-08-01 12:55:53 -0700 Comment on attachment 15766 Patch for 3.1 r=me 3343 7 zalan 2007-08-01 12:56:35 -0700 3.1->r24807 76952 8 bradley.morrison 2008-04-09 11:39:39 -0700 Bulk closing of all s60 platform bugs. Sorry for the noise! 15681 2007-07-25 08:12:55 -0700 2007-07-25 15:10:40 -0700 Fix for menu API MenuFixes32.patch text/plain 21948 sriram.yadavalli SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDI0NjE5KQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDE0IEBADQoreWFkYXZhbGwsIHJldmlld2VkIGJ5IDxaYWxhbj4NCisgREVT QzogRml4ZXMgZm9yIHdpZGdldCBtZW51IEFQSQ0KKyBodHRwOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDc2Mw0KKw0KKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBB RERFRCBPUiBDSEFOR0VEDQorDQorICAgICAgICAqIGtodG1sL2VjbWEva2pzX3dpbmRvdy5jcHA6 DQorICAgICAgICAoV2luZG93OjpnZXQpOg0KKyAgICAgICAgKiBraHRtbC9lY21hL2tqc193aW5k b3cubHV0Lmg6DQorICAgICAgICAoS0pTOjopOg0KKw0KIDIwMDctMDctMjAgdm1hbGFpeWEsIDx2 aWtyYW0ubWFsYWl5YUBub2tpYS5jb20+DQogICAgICAgICBSZXZpZXdlZCBieSBZb25nanVuDQog ICAgICAgICBERVNDOiBKUEtOLTZaMzhFNSAtIEJyb3dzZXIgY3Jhc2hlcyBhbmQgcHJvYmxlbXMg d2l0aCBtZW1vcnkgbG93IG5vdGUuDQpJbmRleDogV2ViQ29yZS9raHRtbC9lY21hL2tqc193aW5k b3cuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tqc193aW5kb3cuY3Bw CShyZXZpc2lvbiAyNDYxOSkNCisrKyBXZWJDb3JlL2todG1sL2VjbWEva2pzX3dpbmRvdy5jcHAJ KHdvcmtpbmcgY29weSkNCkBAIC0zMTIsNyArMzEyLDcgQEAgY29uc3QgQ2xhc3NJbmZvIFdpbmRv dzo6aW5mbyA9IHsgIldpbmRvdw0KICAgZnJhbWVFbGVtZW50ICBXaW5kb3c6OkZyYW1lRWxlbWVu dCAgICBEb250RGVsZXRlfFJlYWRPbmx5DQogICBzaG93TW9kYWxEaWFsb2cgV2luZG93OjpTaG93 TW9kYWxEaWFsb2cgICAgRG9udERlbGV0ZXxGdW5jdGlvbiAxDQogICB3aWRnZXQgV2luZG93Ojpf V2lkZ2V0IERvbnREZWxldGV8RnVuY3Rpb24gMA0KLSAgTWVudSBXaW5kb3c6Ok1lbnUgRG9udERl bGV0ZXxSZWFkT25seQ0KKyAgbWVudSBXaW5kb3c6Ok1lbnUgRG9udERlbGV0ZXxSZWFkT25seQ0K ICAgTWVudUl0ZW0gV2luZG93OjpNZW51SXRlbSBEb250RGVsZXRlfFJlYWRPbmx5DQogQGVuZA0K ICovDQpAQCAtODIzLDI1ICs4MjMsMTMgQEAgVmFsdWUgV2luZG93OjpnZXQoRXhlY1N0YXRlICpl eGVjLCBjb25zdA0KICAgICAgICAgcmV0dXJuICggKChjb25zdF9jYXN0PFdpbmRvdyo+KHRoaXMp LT5tX3dpZGdldCA9IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRPYmplY3QoZXhlYykpKT8NCiAg ICAgICAgICAgVmFsdWUoY29uc3RfY2FzdDxXaW5kb3cqPih0aGlzKS0+bV93aWRnZXQpOiBVbmRl ZmluZWQoKSk7DQogICAgIGNhc2UgTWVudToNCi0gICAgICBpZiAoICFtX3dpZGdldCApDQotICAg ICAgICAoY29uc3RfY2FzdDxXaW5kb3cqPih0aGlzKS0+bV93aWRnZXQgPSBLV1EobV9wYXJ0KS0+ Y3JlYXRlV2lkZ2V0T2JqZWN0KGV4ZWMpKTsgICAgICAgIA0KLSAgICAgIGlmICghKGNvbnN0X2Nh c3Q8V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0KSkNCi0gICAgICAgIHJldHVybiBVbmRlZmluZWQo KTsNCiAgICAgICBpZiAoIG1fd2lkZ2V0TWVudSApDQogICAgICAgICByZXR1cm4gVmFsdWUobV93 aWRnZXRNZW51KTsNCiAgICAgICBlbHNlDQogICAgICAgICByZXR1cm4gKCAoKGNvbnN0X2Nhc3Q8 V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0TWVudSA9IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRN ZW51T2JqZWN0KGV4ZWMpKSk/DQogICAgICAgICAgIFZhbHVlKGNvbnN0X2Nhc3Q8V2luZG93Kj4o dGhpcyktPm1fd2lkZ2V0TWVudSk6IFVuZGVmaW5lZCgpKTsNCiAgICAgY2FzZSBNZW51SXRlbToN Ci0gICAgICBpZiAoICFtX3dpZGdldCApDQotICAgICAgICAoY29uc3RfY2FzdDxXaW5kb3cqPih0 aGlzKS0+bV93aWRnZXQgPSBLV1EobV9wYXJ0KS0+Y3JlYXRlV2lkZ2V0T2JqZWN0KGV4ZWMpKTsg ICAgICAgIA0KLSAgICAgIGlmICghKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0 KSkNCi0gICAgICAgIHJldHVybiBVbmRlZmluZWQoKTsNCi0gICAgICBpZiAoICFtX3dpZGdldE1l bnUgKQ0KLSAgICAgICAgKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0TWVudSA9 IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRNZW51T2JqZWN0KGV4ZWMpKTsgICAgICAgIA0KLSAg ICAgIGlmICghKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0TWVudSkpDQotICAg ICAgICByZXR1cm4gVW5kZWZpbmVkKCk7DQotICAgICAgcmV0dXJuIEtXUShtX3BhcnQpLT5jcmVh dGVXaWRnZXRNZW51SXRlbU9iamVjdChleGVjKSA/IFZhbHVlKEtXUShtX3BhcnQpLT5jcmVhdGVX aWRnZXRNZW51SXRlbU9iamVjdChleGVjKSk6VW5kZWZpbmVkKCk7ICAgDQorICAgICAgcmV0dXJu IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRNZW51SXRlbU9iamVjdChleGVjKSA/IFZhbHVlKEtX UShtX3BhcnQpLT5jcmVhdGVXaWRnZXRNZW51SXRlbU9iamVjdChleGVjKSk6VW5kZWZpbmVkKCk7 DQogICAgIGNhc2UgTWVudWJhcjoNCiAgICAgICByZXR1cm4gVmFsdWUobWVudWJhcihleGVjKSk7 DQogICAgIGNhc2UgT2Zmc2NyZWVuQnVmZmVyaW5nOg0KSW5kZXg6IFdlYkNvcmUva2h0bWwvZWNt YS9ranNfd2luZG93Lmx1dC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tq c193aW5kb3cubHV0LmgJKHJldmlzaW9uIDI0NjE5KQ0KKysrIFdlYkNvcmUva2h0bWwvZWNtYS9r anNfd2luZG93Lmx1dC5oCSh3b3JraW5nIGNvcHkpDQpAQCAtMSw0ICsxLDQgQEANCi0vKiBBdXRv bWF0aWNhbGx5IGdlbmVyYXRlZCBmcm9tIGtqc193aW5kb3cuY3BwIHVzaW5nIGNyZWF0ZV9oYXNo X3RhYmxlLiBETyBOT1QgRURJVCAhICovDQorLyogQXV0b21hdGljYWxseSBnZW5lcmF0ZWQgZnJv bSBranNfd2luZG93LmNwcCB1c2luZyBuOlxTNjBcbXdcd2ViXFdlYkVuZ2luZVxPc3NXZWJFbmdp bmVcSmF2YVNjcmlwdENvcmVca2pzXGNyZWF0ZV9oYXNoX3RhYmxlLiBETyBOT1QgRURJVCAhICov DQogDQogbmFtZXNwYWNlIEtKUyB7DQogDQpAQCAtNjMsNyArNjMsNyBAQCBjb25zdCBzdHJ1Y3Qg SGFzaEVudHJ5IFdpbmRvd1RhYmxlRW50cmllDQogICAgeyAiUmFuZ2UiLCBXaW5kb3c6OlJhbmdl LCBEb250RGVsZXRlLCAwLCAmV2luZG93VGFibGVFbnRyaWVzWzkxXSB9LA0KICAgIHsgInN0YXR1 cyIsIFdpbmRvdzo6U3RhdHVzLCBEb250RGVsZXRlLCAwLCAwIH0sDQogICAgeyAib25yZXNldCIs IFdpbmRvdzo6T25yZXNldCwgRG9udERlbGV0ZSwgMCwgMCB9LA0KLSAgIHsgIk1lbnUiLCBXaW5k b3c6Ok1lbnUsIERvbnREZWxldGV8UmVhZE9ubHksIDAsIDAgfSwNCisgICB7IDAsIDAsIDAsIDAs IDAgfSwNCiAgICB7ICJvbnNlbGVjdCIsIFdpbmRvdzo6T25zZWxlY3QsIERvbnREZWxldGUsIDAs IDAgfSwNCiAgICB7IDAsIDAsIDAsIDAsIDAgfSwNCiAgICB7ICJkb2N1bWVudCIsIFdpbmRvdzo6 RG9jdW1lbnQsIERvbnREZWxldGV8UmVhZE9ubHksIDAsICZXaW5kb3dUYWJsZUVudHJpZXNbMTE1 XSB9LA0KQEAgLTk1LDcgKzk1LDcgQEAgY29uc3Qgc3RydWN0IEhhc2hFbnRyeSBXaW5kb3dUYWJs ZUVudHJpZQ0KICAgIHsgIm91dGVyV2lkdGgiLCBXaW5kb3c6Ok91dGVyV2lkdGgsIERvbnREZWxl dGV8UmVhZE9ubHksIDAsICZXaW5kb3dUYWJsZUVudHJpZXNbMTA2XSB9LA0KICAgIHsgImdldFNl bGVjdGlvbiIsIFdpbmRvdzo6R2V0U2VsZWN0aW9uLCBEb250RGVsZXRlfEZ1bmN0aW9uLCAwLCAm V2luZG93VGFibGVFbnRyaWVzWzExNl0gfSwNCiAgICB7IDAsIDAsIDAsIDAsIDAgfSwNCi0gICB7 ICJibHVyIiwgV2luZG93OjpCbHVyLCBEb250RGVsZXRlfEZ1bmN0aW9uLCAwLCAwIH0sDQorICAg eyAiYmx1ciIsIFdpbmRvdzo6Qmx1ciwgRG9udERlbGV0ZXxGdW5jdGlvbiwgMCwgJldpbmRvd1Rh YmxlRW50cmllc1sxMjhdIH0sDQogICAgeyAibG9jYXRpb25iYXIiLCBXaW5kb3c6OkxvY2F0aW9u YmFyLCBEb250RGVsZXRlLCAwLCAmV2luZG93VGFibGVFbnRyaWVzWzEwN10gfSwNCiAgICB7ICJE T01FeGNlcHRpb24iLCBXaW5kb3c6OkRPTUV4Y2VwdGlvbiwgRG9udERlbGV0ZSwgMCwgJldpbmRv d1RhYmxlRW50cmllc1s5Nl0gfSwNCiAgICB7ICJNZW51SXRlbSIsIFdpbmRvdzo6TWVudUl0ZW0s IERvbnREZWxldGV8UmVhZE9ubHksIDAsIDAgfSwNCkBAIC0xNDksMTAgKzE0OSwxMSBAQCBjb25z dCBzdHJ1Y3QgSGFzaEVudHJ5IFdpbmRvd1RhYmxlRW50cmllDQogICAgeyAib25tb3ZlIiwgV2lu ZG93OjpPbm1vdmUsIERvbnREZWxldGUsIDAsIDAgfSwNCiAgICB7ICJvbnN1Ym1pdCIsIFdpbmRv dzo6T25zdWJtaXQsIERvbnREZWxldGUsIDAsIDAgfSwNCiAgICB7ICJvbmJlZm9yZXVubG9hZCIs IFdpbmRvdzo6T25iZWZvcmV1bmxvYWQsIERvbnREZWxldGUsIDAsIDAgfSwNCi0gICB7ICJzaG93 TW9kYWxEaWFsb2ciLCBXaW5kb3c6OlNob3dNb2RhbERpYWxvZywgRG9udERlbGV0ZXxGdW5jdGlv biwgMSwgMCB9DQorICAgeyAic2hvd01vZGFsRGlhbG9nIiwgV2luZG93OjpTaG93TW9kYWxEaWFs b2csIERvbnREZWxldGV8RnVuY3Rpb24sIDEsIDAgfSwNCisgICB7ICJtZW51IiwgV2luZG93OjpN ZW51LCBEb250RGVsZXRlfFJlYWRPbmx5LCAwLCAwIH0NCiB9Ow0KIA0KLWNvbnN0IHN0cnVjdCBI YXNoVGFibGUgV2luZG93VGFibGUgPSB7IDIsIDEyOCwgV2luZG93VGFibGVFbnRyaWVzLCA5MSB9 Ow0KK2NvbnN0IHN0cnVjdCBIYXNoVGFibGUgV2luZG93VGFibGUgPSB7IDIsIDEyOSwgV2luZG93 VGFibGVFbnRyaWVzLCA5MSB9Ow0KIA0KIH0gLy8gbmFtZXNwYWNlDQogDQpJbmRleDogV2ViS2l0 L0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0 NjE5KQ0KKysrIFdlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkNCkBAIC0xLDMgKzEsMjEg QEANCit5YWRhdmFsbCwgcmV2aWV3ZWQgYnkgPFphbGFuPg0KKyBERVNDOiBGaXhlcyBmb3Igd2lk Z2V0IG1lbnUgQVBJDQorIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NzYzDQorDQorICAgICAgICAqIEJyb3dzZXJWaWV3L2luYy9XaWRnZXRFeHRlbnNpb24uaDoNCisg ICAgICAgIChDTWVudUl0ZW06OlRleHQpOg0KKyAgICAgICAgKENNZW51SXRlbTo6U2V0VGV4dCk6 DQorICAgICAgICAqIEJyb3dzZXJWaWV3L3NyYy9XaWRnZXRFeHRlbnNpb24uY3BwOg0KKyAgICAg ICAgKENXaWRnZXRFeHRlbnNpb246OkFkZE1lbnVJdGVtKToNCisgICAgICAgIChDV2lkZ2V0RXh0 ZW5zaW9uOjpBZGRPcHRpb25zTWVudUl0ZW0pOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246 OkFwcGVuZCk6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6RGVsZXRlTWVudUl0ZW0pOg0K KyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246OlJlcGxhY2VNZW51SXRlbSk6DQorICAgICAgICAo Q1dpZGdldEV4dGVuc2lvbjo6R2V0RnJvbU1lbnVJdGVtQ29sbGVjdGlvbik6DQorICAgICAgICAo Q1dpZGdldEV4dGVuc2lvbjo6U2V0RGltbWVkKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9u OjpTZXRNZW51SXRlbU9ic2VydmVyKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpNZW51 SXRlbU9ic2VydmVyKToNCisNCiBob25nemhhbywgcmV2aWV3ZWQgYnkgPFNhY2hpbj4NCiAgREVT QzogW1M2MF0gUlNTLWxpbmtzIGRvZXMgbm90IHdvcmsgYW55bW9yZSBpZiBzb21lIGFydGljbGUg d2FzIGRvd25sb2FkZWQgZnJvbSB3ZWIgZmVlZHMuDQogIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE0NjEzDQpJbmRleDogV2ViS2l0L0Jyb3dzZXJWaWV3L2luYy9XaWRn ZXRFeHRlbnNpb24uaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9Ccm93c2VyVmlldy9pbmMvV2lk Z2V0RXh0ZW5zaW9uLmgJKHJldmlzaW9uIDI0NjE5KQ0KKysrIFdlYktpdC9Ccm93c2VyVmlldy9p bmMvV2lkZ2V0RXh0ZW5zaW9uLmgJKHdvcmtpbmcgY29weSkNCkBAIC0xOTYsNyArMTk2LDcgQEAg Y2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgLyoqDQog ICAgICAgICAqIE1ldGhvZCBTZXRSaWdodFNvZnRLZXlMYWJlbA0KICAgICAgICAgKiBAc2luY2Ug My4yDQotICAgICAgICAqIEBwYXJhbSB0ZXh0IGJ1ZmZlciB0byBiZSBzZXQgYXMgcmlnaHQgc29m dCBrZXkgbGFiZWwgDQorICAgICAgICAqIEBwYXJhbSB0ZXh0IGJ1ZmZlciB0byBiZSBzZXQgYXMg cmlnaHQgc29mdCBrZXkgbGFiZWwNCiAgICAgICAgICogQHJldHVybiBub25lDQogICAgICAgICAq Lw0KICAgICAgICAgdm9pZCBTZXRSaWdodFNvZnRLZXlMYWJlbCggY29uc3QgVERlc0MmIGFUZXh0 ICk7DQpAQCAtMjA4LDcgKzIwOCw3IEBAIGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBD QmFzZSwgcHUNCiAgICAgICAgICogQHJldHVybiBub25lDQogICAgICAgICAqLw0KICAgICAgICAg dm9pZCBEZWxldGVNZW51SXRlbSggVEludCBhQ21kSWQgKTsNCi0gICAgICAgIA0KKw0KICAgICAg ICAgLyoqDQogICAgICAgICAqIE1ldGhvZCBDbGVhck1lbnVJdGVtcw0KICAgICAgICAgKiBAc2lu Y2UgMy4yDQpAQCAtMjI2LDcgKzIyNiw3IEBAIGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1Ymxp YyBDQmFzZSwgcHUNCiAgICAgICAgICogQHBhcmFtIGRpbW1lZCBzdGF0dXMNCiAgICAgICAgICog QHJldHVybiBFcnJvciBjb2RlDQogICAgICAgICAqLw0KLSAgICAgICAgVEludCBSZXBsYWNlTWVu dUl0ZW0oIFRJbnQgb2xkQ21kSWQsIGNvbnN0IFREZXNDJiBuZXdUZXh0LCANCisgICAgICAgIFRJ bnQgUmVwbGFjZU1lbnVJdGVtKCBUSW50IG9sZENtZElkLCBjb25zdCBURGVzQyYgbmV3VGV4dCwN CiAgICAgICAgICAgICBUSW50IG5ld0NtZElkLCBUSW50IG5ld0RpbW1lZCApOw0KIA0KICAgICAg ICAgLyoqDQpAQCAtMjU1LDcgKzI1NSw3IEBAIGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1Ymxp YyBDQmFzZSwgcHUNCiAgICAgICAgICogQHBhcmFtIGNhbGxiYWNrIGZ1bmN0aW9uDQogICAgICAg ICAqIEByZXR1cm4gbm9uZQ0KICAgICAgICAgKi8NCi0gICAgICAgIHZvaWQgU2V0TWVudUl0ZW1P YnNlcnZlciggDQorICAgICAgICB2b2lkIFNldE1lbnVJdGVtT2JzZXJ2ZXIoDQogICAgICAgICAg ICAgVEludCBhQ21kSWQsIFdpZGdldEV2ZW50SGFuZGxlciogYU9uU2VsZWN0Q2FsbGJhY2sgKTsN CiANCiAgICAgICAgIC8qKg0KQEAgLTI3Nyw3ICsyNzcsNyBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5z aW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogICAgICAgICAvKioNCiAgICAgICAgICogTWV0aG9kIEdl dE1lbnVPYnNlcnZlcg0KICAgICAgICAgKiBAc2luY2UgMy4yDQotICAgICAgICAqIEBwYXJhbSAN CisgICAgICAgICogQHBhcmFtDQogICAgICAgICAqIEByZXR1cm4gY2FsbGJhY2sgZnVuY3Rpb24N CiAgICAgICAgICovDQogICAgICAgICBXaWRnZXRFdmVudEhhbmRsZXIqIE1lbnVPYnNlcnZlcigp Ow0KQEAgLTI4OSwxMSArMjg5LDExIEBAIGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBD QmFzZSwgcHUNCiAgICAgICAgICogQHJldHVybiBub25lDQogICAgICAgICAqLw0KICAgICAgICAg dm9pZCBTZXRSaWdodEtleU9ic2VydmVyKCBXaWRnZXRFdmVudEhhbmRsZXIqIGFNZW51Q2FsbGJh Y2sgKTsNCi0gICAgICAgIA0KKw0KICAgICAgICAgLyoqDQogICAgICAgICAqIE1ldGhvZCBHZXRN ZW51T2JzZXJ2ZXINCiAgICAgICAgICogQHNpbmNlIDMuMg0KLSAgICAgICAgKiBAcGFyYW0gDQor ICAgICAgICAqIEBwYXJhbQ0KICAgICAgICAgKiBAcmV0dXJuIGNhbGxiYWNrIGZ1bmN0aW9uDQog ICAgICAgICAqLw0KICAgICAgICAgV2lkZ2V0RXZlbnRIYW5kbGVyKiBSaWdodEtleU9ic2VydmVy KCk7DQpAQCAtMzA2LDE0ICszMDYsNiBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJsaWMg Q0Jhc2UsIHB1DQogICAgICAgICBURGVzQyYgR2V0V2lkZ2V0QnVuZGxlSWQoKSB7IHJldHVybiAq aVdpZGdldEJ1bmRsZUlkOyB9DQogDQogICAgICAgICAvKioNCi0gICAgICAgICogTWV0aG9kIFNl dFNjcm9sbEJhcg0KLSAgICAgICAgKiBAc2luY2UgMy4yDQotICAgICAgICAqIEBwYXJhbSBUQm9v bCB2aXNpYmxlDQotICAgICAgICAqIEByZXR1cm4gdm9pZA0KLSAgICAgICAgKi8NCi0gICAgICAg IHZvaWQgU2V0U2Nyb2xsQmFyKCBUQm9vbCBhVmlzaWJsZSApOw0KLQ0KLSAgICAgICAgLyoqDQog ICAgICAgICAqIE1ldGhvZCBTZXROYXZpZ2F0aW9uRW5hYmxlZA0KICAgICAgICAgKiBAc2luY2Ug My4yDQogICAgICAgICAqIEBwYXJhbSBUQm9vbCBlbmFibGVkDQpAQCAtMzUyLDcgKzM0NCw3IEBA IGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHJl dHVybiB2b2lkDQogICAgICAgICAqLw0KICAgICAgICAgdm9pZCBTZXRPblNob3dMaXN0ZW5lcigg V2lkZ2V0RXZlbnRIYW5kbGVyKiBhQ2FsbGJhY2sgKTsNCi0gICAgICAgIA0KKw0KICAgICAgICAg LyoqDQogICAgICAgICAqIE1ldGhvZCBHZXRGcm9tTWVudUl0ZW1Db2xsZWN0aW9uDQogICAgICAg ICAqIEBzaW5jZSAzLjINCkBAIC0zNjAsNyArMzUyLDcgQEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lv bjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcmV0dXJuIHZvaWQqDQogICAgICAgICAq Lw0KICAgICAgICAgdm9pZCogR2V0RnJvbU1lbnVJdGVtQ29sbGVjdGlvbiggY29uc3QgVERlc0Mm IHRleHRWYWwgKTsNCi0gICAgICAgIA0KKw0KICAgICAgICAgLyoqDQogICAgICAgICAqIE1ldGhv ZCBHZXRGcm9tTWVudUl0ZW1Db2xsZWN0aW9uDQogICAgICAgICAqIEBzaW5jZSAzLjINCkBAIC00 MTEsNyArNDAzLDcgQEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0K ICAgICAgICAgKiBAc2luY2UgMy4yDQogICAgICAgICAqIEByZXR1cm4gd2lkZ2V0IGVuZ2luZSBi cmlkZ2UNCiAgICAgICAgICovDQotICAgICAgICBNV2lkZ2V0RW5naW5lQnJpZGdlJiBXaWRnZXRF bmdpbmVCcmlkZ2UoKSBjb25zdCB7IA0KKyAgICAgICAgTVdpZGdldEVuZ2luZUJyaWRnZSYgV2lk Z2V0RW5naW5lQnJpZGdlKCkgY29uc3Qgew0KICAgICAgICAgICAgIHJldHVybiAqaVdpZGdldEVu Z2luZUJyaWRnZTsgfQ0KIA0KICAgICAgICAgLyoqDQpAQCAtNDUxLDcgKzQ0Myw3IEBAIGNsYXNz IENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHBhcmFtIFRo ZSB2YWx1ZSBmb3IgdGhlIHBhcmFtYXRlcg0KICAgICAgICAgKiBAcmV0dXJuIHZvaWQNCiAgICAg ICAgICovDQotICAgICAgICB2b2lkIFNldFBhcmFtTCggDQorICAgICAgICB2b2lkIFNldFBhcmFt TCgNCiAgICAgICAgICAgICBUQnJDdGxEZWZzOjpUQnJDdGxXaWRnZXRQYXJhbXMgYVBhcmFtLCBj b25zdCBURGVzQyYgYVZhbHVlICk7DQogDQogICAgICAgICAvKioNCkBAIC01MDIsNyArNDk0LDcg QEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBA cmV0dXJuIHZvaWQNCiAgICAgICAgICovDQogICAgICAgICB2b2lkIExvYWRXaWRnZXRFbmdpbmVE bGxMKCk7DQotICAgICAgICANCisNCiAgICAgICAgIC8qDQogICAgICAgICAqIE1ldGhvZCBMYXVu Y2hBcHBsaWNhdGlvbkwNCiAgICAgICAgICogQHNpbmNlIDMuMg0KQEAgLTUzMyw3ICs1MjUsNyBA QCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogICAgIHByaXZhdGU6 DQogICAgICAgICBDV2ViS2l0VmlldyogICAgICAgICAgICBpV2ViS2l0VmlldzsvL25vdCBvd25l ZA0KICAgICAgICAgQ1dpZGdldFByZWZlcmVuY2VzKiAgICAgaVByZWZlcmVuY2VzOw0KLSAgICAg ICAgVFdpZGdldFJlbmRlcmVyKiAgICAgICAgaVdpZGdldFJlbmRlcmVyOyAgICAgICANCisgICAg ICAgIFRXaWRnZXRSZW5kZXJlciogICAgICAgIGlXaWRnZXRSZW5kZXJlcjsNCiAgICAgICAgIFRJ bnQgICAgICAgICAgICAgICAgICAgIGlXaWRnZXRJZDsNCiAgICAgICAgIFRCb29sICAgICAgICAg ICAgICAgICAgIGlOYXZpZ2F0aW9uRW5hYmxlZDsNCiAgICAgICAgIFRCb29sICAgICAgICAgICAg ICAgICAgIGlQYWdlU2NhbGVyV2FzRW5hYmxlZDsNCkBAIC01ODcsNyArNTc5LDcgQEAgY2xhc3Mg Q1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBNZXRob2QgRmlu ZE5vZGVCeUlkDQogICAgICAgICAqIEBzaW5jZSAzLjINCiAgICAgICAgICogQHBhcmFtIHJvb3Qg b2YgdGhlIHRyZWUNCi0gICAgICAgICogQHBhcmFtIGNvbW1hbmQgaWQgb2YgdGhlIG1lbnUgaXRl bSANCisgICAgICAgICogQHBhcmFtIGNvbW1hbmQgaWQgb2YgdGhlIG1lbnUgaXRlbQ0KICAgICAg ICAgKiBAcmV0dXJuIENNZW51SXRlbSoNCiAgICAgICAgICovDQogICAgICAgICBDTWVudUl0ZW0q IEZpbmROb2RlQnlJZCggQ01lbnVJdGVtKiBub2RlLCBUSW50IGFDbWRJZCApOw0KQEAgLTU5Niw3 ICs1ODgsNyBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogICAg ICAgICAqIE1ldGhvZCBGaW5kTm9kZUJ5VGV4dA0KICAgICAgICAgKiBAc2luY2UgMy4yDQogICAg ICAgICAqIEBwYXJhbSByb290IG9mIHRoZSB0cmVlDQotICAgICAgICAqIEBwYXJhbSB0ZXh0IG9m IHRoZSBtZW51IGl0ZW0gDQorICAgICAgICAqIEBwYXJhbSB0ZXh0IG9mIHRoZSBtZW51IGl0ZW0N CiAgICAgICAgICogQHJldHVybiBDTWVudUl0ZW0qDQogICAgICAgICAqLw0KICAgICAgICAgQ01l bnVJdGVtKiBGaW5kTm9kZUJ5VGV4dCggQ01lbnVJdGVtKiBub2RlLCBjb25zdCBURGVzQyYgYVRl eHQgKTsNCkBAIC02MDUsMTIgKzU5NywxMiBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJs aWMgQ0Jhc2UsIHB1DQogDQogDQogY2xhc3MgQ01lbnVJdGVtIDogcHVibGljIENCYXNlDQotICAg IHsgICAgDQorICAgIHsNCiAgICAgcHVibGljOg0KICAgICAgICAgLyoqDQotICAgICAgICAqIENv bnN0cnVjdG9yICAgICAgIA0KKyAgICAgICAgKiBDb25zdHJ1Y3Rvcg0KICAgICAgICAgKi8NCi0g ICAgICAgIHN0YXRpYyBDTWVudUl0ZW0qIE5ld0woIGNvbnN0IFREZXNDMTYmIGFUZXh0LCBUSW50 IGFDbWRJZCwgDQorICAgICAgICBzdGF0aWMgQ01lbnVJdGVtKiBOZXdMKCBjb25zdCBURGVzQzE2 JiBhVGV4dCwgVEludCBhQ21kSWQsDQogICAgICAgICAgICAgQ01lbnVJdGVtKiBhUGFyZW50ID0g TlVMTCwgdm9pZCogYU9iaiA9IE5VTEwgKTsNCiANCiAgICAgICAgIC8qKg0KQEAgLTYyOCw3ICs2 MjAsNyBAQCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAgICAgICogQysrIGNv bnN0cnVjdG9yLg0KICAgICAgICAgKi8NCiAgICAgICAgIENNZW51SXRlbSggY29uc3QgVERlc0Mx NiYgYVRleHQsIFRJbnQgYUNtZElkLCBDTWVudUl0ZW0qIGFQYXJlbnQgPSBOVUxMLA0KLSAgICAg ICAgICAgIHZvaWQqIGFPYmogPSBOVUxMICk7ICAgICAgIA0KKyAgICAgICAgICAgIHZvaWQqIGFP YmogPSBOVUxMICk7DQogDQogICAgIHB1YmxpYzoNCiANCkBAIC02MzgsOCArNjMwLDggQEAgY2xh c3MgQ01lbnVJdGVtIDogcHVibGljIENCYXNlDQogICAgICAgICAqIEBwYXJhbSBub25lDQogICAg ICAgICAqIEByZXR1cm4gdGV4dCBvZiBtZW51IGl0ZW0NCiAgICAgICAgICovDQotICAgICAgICBj b25zdCBURGVzQyYgVGV4dCgpIA0KLSAgICAgICAgICAgIHsgDQorICAgICAgICBjb25zdCBURGVz QyYgVGV4dCgpDQorICAgICAgICAgICAgew0KICAgICAgICAgICAgIGlmICggaVRleHQgKSByZXR1 cm4gKmlUZXh0Ow0KICAgICAgICAgICAgIGVsc2UgcmV0dXJuIEtOdWxsRGVzQygpOw0KICAgICAg ICAgICAgIH0NCkBAIC02NjcsNyArNjU5LDcgQEAgY2xhc3MgQ01lbnVJdGVtIDogcHVibGljIENC YXNlDQogICAgICAgICAqIEByZXR1cm4gbmV4dCBzaWJsaW5nIG9mIG1lbnUgaXRlbQ0KICAgICAg ICAgKi8NCiAgICAgICAgIENNZW51SXRlbSogTmV4dFNpYmxpbmcoKSB7IHJldHVybiBpTmV4dFNp Ymxpbmc7IH0NCi0gICAgICAgIA0KKw0KICAgICAgICAgLyoNCiAgICAgICAgICogTWV0aG9kIERp bW1lZCgpDQogICAgICAgICAqIEBzaW5jZSAzLjINCkBAIC03MDYsMTIgKzY5OCwxMiBAQCBjbGFz cyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAgICAgICogQHBhcmFtIHRleHQgb2YgbWVu dSBpdGVtDQogICAgICAgICAqIEByZXR1cm4gbm9uZQ0KICAgICAgICAgKi8NCi0gICAgICAgIHZv aWQgU2V0VGV4dCggY29uc3QgVERlc0MmIGFUZXh0ICkgDQotICAgICAgICAgICAgeyANCisgICAg ICAgIHZvaWQgU2V0VGV4dCggY29uc3QgVERlc0MmIGFUZXh0ICkNCisgICAgICAgICAgICB7DQog ICAgICAgICAgICAgSEJ1ZkMqIHRtcFRleHQgPSBIQnVmQzo6TmV3TCggYVRleHQuTGVuZ3RoKCkg KTsNCiAgICAgICAgICAgICB0bXBUZXh0LT5EZXMoKS5BcHBlbmQoIGFUZXh0ICk7DQogICAgICAg ICAgICAgZGVsZXRlIGlUZXh0Ow0KLSAgICAgICAgICAgIGlUZXh0ID0gdG1wVGV4dDsgICAgDQor ICAgICAgICAgICAgaVRleHQgPSB0bXBUZXh0Ow0KICAgICAgICAgICAgIH0NCiANCiAgICAgICAg IC8qDQpAQCAtNzI5LDcgKzcyMSw3IEBAIGNsYXNzIENNZW51SXRlbSA6IHB1YmxpYyBDQmFzZQ0K ICAgICAgICAgKiBAcmV0dXJuIG5vbmUNCiAgICAgICAgICovDQogICAgICAgICB2b2lkIFNldEZp cnN0Q2hpbGQoIENNZW51SXRlbSogYUZpcnN0Q2hpbGQgKSB7IGlGaXJzdENoaWxkID0gYUZpcnN0 Q2hpbGQ7IH0NCi0gICAgICAgIA0KKw0KICAgICAgICAgLyoNCiAgICAgICAgICogTWV0aG9kIFNl dE5leHRTaWJsaW5nKCkNCiAgICAgICAgICogQHNpbmNlIDMuMg0KQEAgLTczNyw3ICs3MjksNyBA QCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAgICAgICogQHJldHVybiBub25l DQogICAgICAgICAqLw0KICAgICAgICAgdm9pZCBTZXROZXh0U2libGluZyggQ01lbnVJdGVtKiBh TmV4dFNpYmxpbmcgKSB7IGlOZXh0U2libGluZyA9IGFOZXh0U2libGluZzsgfQ0KLSAgICAgICAg DQorDQogICAgICAgICAvKg0KICAgICAgICAgKiBNZXRob2QgU2V0RGltbWVkKCkNCiAgICAgICAg ICogQHNpbmNlIDMuMg0KQEAgLTc2OCw3ICs3NjAsNyBAQCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJs aWMgQ0Jhc2UNCiAgICAgICAgIENNZW51SXRlbSogICAgICAgICAgICAgIGlQYXJlbnQ7Ly9kYXRh DQogICAgICAgICBDTWVudUl0ZW0qICAgICAgICAgICAgICBpRmlyc3RDaGlsZDsvL2xlZnQgbm9k ZQ0KICAgICAgICAgQ01lbnVJdGVtKiAgICAgICAgICAgICAgaU5leHRTaWJsaW5nOy8vcmlnaHQg bm9kZQ0KLSAgICAgICAgVEJvb2wgICAgICAgICAgICAgICAgICAgaURpbW1lZDsvL0VUcnVlIHRv IGRpbSB0aGlzIG1lbnUgaXRlbS4gRUZhbHNlIHRvIHVuLWRpbSB0aGlzIG1lbnUgaXRlbS4gDQor ICAgICAgICBUQm9vbCAgICAgICAgICAgICAgICAgICBpRGltbWVkOy8vRVRydWUgdG8gZGltIHRo aXMgbWVudSBpdGVtLiBFRmFsc2UgdG8gdW4tZGltIHRoaXMgbWVudSBpdGVtLg0KICAgICAgICAg V2lkZ2V0RXZlbnRIYW5kbGVyKiAgICAgaUNhbGxiYWNrOw0KICAgICAgICAgdm9pZCogICAgICAg ICAgICAgICAgICAgaU9iajsNCiAgICAgfTsNCkluZGV4OiBXZWJLaXQvQnJvd3NlclZpZXcvc3Jj L1dpZGdldEV4dGVuc2lvbi5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQnJvd3NlclZpZXcv c3JjL1dpZGdldEV4dGVuc2lvbi5jcHAJKHJldmlzaW9uIDI0NjE5KQ0KKysrIFdlYktpdC9Ccm93 c2VyVmlldy9zcmMvV2lkZ2V0RXh0ZW5zaW9uLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTMwMiwx NyArMzAyLDYgQEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRQcmVmZXJlbmNlRm9ySw0KICAg ICB9DQogDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KLS8vIENXaWRnZXRFeHRlbnNpb246OlNl dFNjcm9sbEJhcg0KLS8vDQotLy8NCi0vLw0KLS8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCi0vLw0K LXZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0U2Nyb2xsQmFyKCBUQm9vbCAvKmFWaXNpYmxlKi8g KQ0KLSAgICB7DQotICAgIH0NCi0NCi0vLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8gQ1dpZGdl dEV4dGVuc2lvbjo6U2V0TmF2aWdhdGlvbkVuYWJsZWQNCiAvLw0KIC8vDQpAQCAtNDcxLDEyICs0 NjAsMTIgQEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpBZGRNZW51SXRlbSggQ0Vpaw0KICAgICAg ICAgZWxzZQ0KICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICBtZW51RGF0YS5pQ2FzY2FkZUlk ID0gaVJlc291cmNlSWQ7DQotICAgICAgICAgICAgfSAgICAgICAgICAgIA0KKyAgICAgICAgICAg IH0NCiAgICAgICAgIH0NCiAgICAgZWxzZQ0KICAgICAgICAgew0KICAgICAgICAgbWVudURhdGEu aUNhc2NhZGVJZCA9IDA7DQotICAgICAgICB9ICAgICAgICANCisgICAgICAgIH0NCiANCiAgICAg bWVudURhdGEuaUZsYWdzID0gMDsNCiAgICAgbWVudURhdGEuaVRleHQgPSBhTm9kZS0+VGV4dCgp Ow0KQEAgLTQ4Niw3ICs0NzUsNyBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OkFkZE1lbnVJdGVt KCBDRWlrDQogICAgIGVudHJ5LnBhcmVudENtZElkID0gYU5vZGUtPkNtZElkKCk7DQogICAgIGlD YXNjYWRlQXJyLkFwcGVuZCggZW50cnkgKTsNCiANCi0gICAgYU1lbnVQYW5lLkluc2VydE1lbnVJ dGVtTCggbWVudURhdGEsIGFNZW51UGFuZS5OdW1iZXJPZkl0ZW1zSW5QYW5lKCktMSApOw0KKyAg ICBhTWVudVBhbmUuSW5zZXJ0TWVudUl0ZW1MKCBtZW51RGF0YSwgTWF4KGFNZW51UGFuZS5OdW1i ZXJPZkl0ZW1zSW5QYW5lKCktMSwwKSApOw0KICAgICBhTWVudVBhbmUuU2V0SXRlbURpbW1lZCgg YU5vZGUtPkNtZElkKCkrS01lbnVJdGVtQ29tbWFuZElkQmFzZSwgYU5vZGUtPkRpbW1lZCgpICk7 DQogICAgIH0NCiANCkBAIC02NjUsMTQgKzY1NCwxNCBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246 OlNldFBhcmFtTCgNCiAvLw0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8NCi1USW50IENX aWRnZXRFeHRlbnNpb246OkFkZE9wdGlvbnNNZW51SXRlbSggDQorVEludCBDV2lkZ2V0RXh0ZW5z aW9uOjpBZGRPcHRpb25zTWVudUl0ZW0oDQogICAgIGNvbnN0IFREZXNDJiBhVGV4dCwgVEludCBh Q21kSWQsIFRJbnQgYVBhcmVudElkLCB2b2lkKiBhT2JqICkNCi0gICAgeyAgIA0KLSAgICBpZiAo ICFpTWVudVJvb3QgKSANCi0gICAgICAgIHsgDQorICAgIHsNCisgICAgaWYgKCAhaU1lbnVSb290 ICkNCisgICAgICAgIHsNCiAgICAgICAgIGlNZW51Um9vdCA9IENNZW51SXRlbTo6TmV3TCggX0wo IiIpLCAtMSApOw0KLSAgICAgICAgfSAgICANCi0gICAgICAgIA0KKyAgICAgICAgfQ0KKw0KICAg ICBpZiAoIGFUZXh0Lkxlbmd0aCgpID4gMCApDQogICAgICAgICB7DQogICAgICAgICBDTWVudUl0 ZW0qIHBhcmVudCA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290LCBhUGFyZW50SWQgKTsNCkBAIC02 ODAsMjUgKzY2OSwyNSBAQCBUSW50IENXaWRnZXRFeHRlbnNpb246OkFkZE9wdGlvbnNNZW51SXRl DQogICAgICAgICAgICAgew0KICAgICAgICAgICAgIHJldHVybiBLRXJyR2VuZXJhbDsNCiAgICAg ICAgICAgICB9DQotICAgICAgICANCisNCiAgICAgICAgIENNZW51SXRlbSogaXRlbSA9IE5VTEw7 DQotICAgICAgICBpdGVtID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGFDbWRJZCApOyAgICAg ICAgDQorICAgICAgICBpdGVtID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGFDbWRJZCApOw0K ICAgICAgICAgaWYgKCBpdGVtICkNCiAgICAgICAgICAgICB7DQogICAgICAgICAgICAgcmV0dXJu IEtFcnJBbHJlYWR5RXhpc3RzOw0KICAgICAgICAgICAgIH0NCi0gICAgICAgICAgICAgICAgICAg IA0KKw0KICAgICAgICAgaXRlbSA9IEZpbmROb2RlQnlUZXh0KCBpTWVudVJvb3QsIGFUZXh0ICk7 DQogICAgICAgICBpZiAoIGl0ZW0gKQ0KICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICByZXR1 cm4gS0VyckFscmVhZHlFeGlzdHM7DQogICAgICAgICAgICAgfQ0KLSAgICAgICAgICAgICAgICAg ICAgDQotICAgICAgICBpdGVtID0gQ01lbnVJdGVtOjpOZXdMKCBhVGV4dCwgYUNtZElkLCBwYXJl bnQsIGFPYmogKTsgDQotICAgICAgICByZXR1cm4gQXBwZW5kKCBwYXJlbnQsIGl0ZW0gKTsgICAg DQorDQorICAgICAgICBpdGVtID0gQ01lbnVJdGVtOjpOZXdMKCBhVGV4dCwgYUNtZElkLCBwYXJl bnQsIGFPYmogKTsNCisgICAgICAgIHJldHVybiBBcHBlbmQoIHBhcmVudCwgaXRlbSApOw0KICAg ICAgICAgfQ0KLSAgICAgICAgDQotICAgIHJldHVybiBLRXJyR2VuZXJhbDsgICAgICAgICAgICAg ICAgDQorDQorICAgIHJldHVybiBLRXJyR2VuZXJhbDsNCiAgICAgfQ0KIA0KIC8vIC0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tDQpAQCAtNzI0LDkgKzcxMyw5IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6 U2V0UmlnaHRTb2Z0S2V5TGENCiAvLw0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8NCi1U SW50IENXaWRnZXRFeHRlbnNpb246OkFwcGVuZCggDQorVEludCBDV2lkZ2V0RXh0ZW5zaW9uOjpB cHBlbmQoDQogICAgIENNZW51SXRlbSogYVBhcmVudCwgQ01lbnVJdGVtKiBhSXRlbSApDQotICAg IHsgIA0KKyAgICB7DQogICAgIGlmICggIWFQYXJlbnQgKQ0KICAgICAgICAgew0KICAgICAgICAg cmV0dXJuIEtFcnJHZW5lcmFsOw0KQEAgLTc0MCw4ICs3MjksOCBAQCBUSW50IENXaWRnZXRFeHRl bnNpb246OkFwcGVuZCggDQogICAgICAgICB7DQogICAgICAgICBBcHBlbmRTaWJsaW5nKCBhUGFy ZW50LT5GaXJzdENoaWxkKCksIGFJdGVtICk7DQogICAgICAgICB9DQotICAgIHJldHVybiBLRXJy Tm9uZTsgICAgICAgICAgICANCi0gICAgfSANCisgICAgcmV0dXJuIEtFcnJOb25lOw0KKyAgICB9 DQogDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAvLyBDV2lkZ2V0RXh0ZW5zaW9uOjpBcHBl bmRTaWJsaW5nDQpAQCAtODAxLDcgKzc5MCw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6RGVs ZXRlTWVudUl0ZW0oIFQNCiAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICBpdGVt ID0gcHJldi0+TmV4dFNpYmxpbmcoKTsNCiAgICAgICAgICAgICAgICAgfQ0KLSAgICAgICAgICAg ICAgICANCisNCiAgICAgICAgICAgICB3aGlsZSggaXRlbSApDQogICAgICAgICAgICAgICAgIHsN CiAgICAgICAgICAgICAgICAgaWYgKCBpdGVtLT5DbWRJZCgpID09IGFDbWRJZCApDQpAQCAtODM3 LDQxICs4MjYsNDEgQEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpDbGVhck1lbnVJdGVtcygpDQog Ly8NCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8NCi1USW50IENXaWRnZXRFeHRlbnNpb246 OlJlcGxhY2VNZW51SXRlbSggDQotICAgIFRJbnQgb2xkSXRlbUNtZElkLCANCi0gICAgY29uc3Qg VERlc0MmIG5ld0l0ZW1UZXh0LCANCi0gICAgVEludCBuZXdJdGVtQ21kSWQsIA0KK1RJbnQgQ1dp ZGdldEV4dGVuc2lvbjo6UmVwbGFjZU1lbnVJdGVtKA0KKyAgICBUSW50IG9sZEl0ZW1DbWRJZCwN CisgICAgY29uc3QgVERlc0MmIG5ld0l0ZW1UZXh0LA0KKyAgICBUSW50IG5ld0l0ZW1DbWRJZCwN CiAgICAgVEludCBuZXdJdGVtRGltbWVkICkNCiAgICAgew0KICAgICBDTWVudUl0ZW0qIG5ld0l0 ZW0gPSBOVUxMOw0KICAgICBDTWVudUl0ZW0qIG9sZEl0ZW0gPSBOVUxMOw0KLSAgICANCi0gICAg Ly8gY2hlY2sgaWYgdGhlcmUgaXMgYW5vdGhlciBub2RlIGluIHRoZSB0cmVlIHdpdGggdGhlIHNh bWUgSWQgYXMgdGhhdCBvZiANCisNCisgICAgLy8gY2hlY2sgaWYgdGhlcmUgaXMgYW5vdGhlciBu b2RlIGluIHRoZSB0cmVlIHdpdGggdGhlIHNhbWUgSWQgYXMgdGhhdCBvZg0KICAgICAvLyBuZXdJ dGVtIGJ1dCBhbGxvdyBhIHJlcGxhY2Ugb2Ygb2xkSXRlbSB3aXRoIHRoZSBzYW1lIElkIGFzIHRo ZSBuZXdJdGVtDQotICAgIG5ld0l0ZW0gPSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9vdCwgbmV3SXRl bUNtZElkICk7ICAgIA0KKyAgICBuZXdJdGVtID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIG5l d0l0ZW1DbWRJZCApOw0KICAgICBpZiAoIG5ld0l0ZW0gJiYgbmV3SXRlbS0+Q21kSWQoKSAhPSBv bGRJdGVtQ21kSWQgKQ0KICAgICAgICAgew0KICAgICAgICAgcmV0dXJuIEtFcnJBbHJlYWR5RXhp c3RzOw0KICAgICAgICAgfQ0KLSAgICANCi0gICAgLy8gY2hlY2sgaWYgdGhlcmUgaXMgYW5vdGhl ciBub2RlIGluIHRoZSB0cmVlIHdpdGggdGhlIHNhbWUgdGV4dCBhcyB0aGF0IG9mIA0KKw0KKyAg ICAvLyBjaGVjayBpZiB0aGVyZSBpcyBhbm90aGVyIG5vZGUgaW4gdGhlIHRyZWUgd2l0aCB0aGUg c2FtZSB0ZXh0IGFzIHRoYXQgb2YNCiAgICAgLy8gbmV3SXRlbSBidXQgYWxsb3cgYSByZXBsYWNl IG9mIG9sZEl0ZW0gd2l0aCB0aGUgc2FtZSB0ZXh0IGFzIHRoZSBuZXdJdGVtDQogICAgIG5ld0l0 ZW0gPSBGaW5kTm9kZUJ5VGV4dCggaU1lbnVSb290LCBuZXdJdGVtVGV4dCApOw0KLSAgICBvbGRJ dGVtID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIG9sZEl0ZW1DbWRJZCApOyAgDQorICAgIG9s ZEl0ZW0gPSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9vdCwgb2xkSXRlbUNtZElkICk7DQogICAgIGlm ICggbmV3SXRlbSAmJiBvbGRJdGVtICYmIG5ld0l0ZW0tPlRleHQoKS5Db21wYXJlKG9sZEl0ZW0t PlRleHQoKSkgIT0gMCApDQogICAgICAgICB7DQogICAgICAgICByZXR1cm4gS0VyckFscmVhZHlF eGlzdHM7DQogICAgICAgICB9DQotICAgICAgDQorDQogICAgIGlmICggb2xkSXRlbSApDQogICAg ICAgICB7DQotICAgICAgICBvbGRJdGVtLT5TZXRUZXh0KCBuZXdJdGVtVGV4dCApOyAgICANCi0g ICAgICAgIG9sZEl0ZW0tPlNldENtZElkKCBuZXdJdGVtQ21kSWQgKTsgICANCisgICAgICAgIG9s ZEl0ZW0tPlNldFRleHQoIG5ld0l0ZW1UZXh0ICk7DQorICAgICAgICBvbGRJdGVtLT5TZXRDbWRJ ZCggbmV3SXRlbUNtZElkICk7DQogICAgICAgICBvbGRJdGVtLT5TZXREaW1tZWQoIG5ld0l0ZW1E aW1tZWQgKTsNCiAgICAgICAgIHJldHVybiBLRXJyTm9uZTsNCiAgICAgICAgIH0NCi0gICAgICAg IA0KLSAgICByZXR1cm4gS0VyckdlbmVyYWw7ICAgICAgICANCisNCisgICAgcmV0dXJuIEtFcnJH ZW5lcmFsOw0KICAgICB9DQogDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KQEAgLTkyMSw3ICs5 MTAsNyBAQCB2b2lkKiBDV2lkZ2V0RXh0ZW5zaW9uOjpHZXRGcm9tTWVudUl0ZW1DDQogICAgIGVs c2UNCiAgICAgICAgIHsNCiAgICAgICAgIHJldHVybiBOVUxMOw0KLSAgICAgICAgfSAgICAgICAg DQorICAgICAgICB9DQogICAgIH0NCiANCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQpAQCAtOTM2 LDcgKzkyNSw3IEBAIHZvaWQqIENXaWRnZXRFeHRlbnNpb246OkdldEZyb21NZW51SXRlbUMNCiAg ICAgQ01lbnVJdGVtKiBub2RlID0gTlVMTDsNCiANCiAgICAgbm9kZSA9IEZpbmROb2RlQnlJZCgg aU1lbnVSb290LCBjbWRJZCApOw0KLSAgICANCisNCiAgICAgaWYgKCBub2RlICkNCiAgICAgICAg IHsNCiAgICAgICAgIHJldHVybiBub2RlLT5PYmooKTsNCkBAIC05NDQsNyArOTMzLDcgQEAgdm9p ZCogQ1dpZGdldEV4dGVuc2lvbjo6R2V0RnJvbU1lbnVJdGVtQw0KICAgICBlbHNlDQogICAgICAg ICB7DQogICAgICAgICByZXR1cm4gTlVMTDsNCi0gICAgICAgIH0gICAgICAgIA0KKyAgICAgICAg fQ0KICAgICB9DQogDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KQEAgLTk1OCw3ICs5NDcsNyBA QCB2b2lkIENXaWRnZXRFeHRlbnNpb246OlNldERpbW1lZCggVEludCBhDQogICAgIHsNCiAgICAg Q01lbnVJdGVtKiBub2RlID0gTlVMTDsNCiAgICAgbm9kZSA9IEZpbmROb2RlQnlJZCggaU1lbnVS b290LCBhQ21kSWQgKTsNCi0gICAgDQorDQogICAgIGlmICggbm9kZSApDQogICAgICAgICB7DQog ICAgICAgICBub2RlLT5TZXREaW1tZWQoIGFWYWx1ZSApOw0KQEAgLTk3Nyw3ICs5NjYsNyBAQCB2 b2lkIENXaWRnZXRFeHRlbnNpb246OlNldE1lbnVJdGVtT2JzZXJ2DQogICAgIHsNCiAgICAgQ01l bnVJdGVtKiBub2RlID0gTlVMTDsNCiAgICAgbm9kZSA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290 LCBhQ21kSWQgKTsNCi0gICAgDQorDQogICAgIGlmICggbm9kZSApDQogICAgICAgICB7DQogICAg ICAgICBub2RlLT5TZXRDYWxsYmFjayggYU9uU2VsZWN0Q2FsbGJhY2sgKTsNCkBAIC05OTUsNyAr OTg0LDcgQEAgV2lkZ2V0RXZlbnRIYW5kbGVyKiBDV2lkZ2V0RXh0ZW5zaW9uOjpNZQ0KICAgICB7 DQogICAgIENNZW51SXRlbSogbm9kZSA9IE5VTEw7DQogICAgIG5vZGUgPSBGaW5kTm9kZUJ5SWQo IGlNZW51Um9vdCwgYUNtZElkICk7DQotICAgIA0KKw0KICAgICBpZiAoIG5vZGUgKQ0KICAgICAg ICAgew0KICAgICAgICAgcmV0dXJuIG5vZGUtPkNhbGxiYWNrKCk7DQpAQCAtMTAwMyw3ICs5OTIs NyBAQCBXaWRnZXRFdmVudEhhbmRsZXIqIENXaWRnZXRFeHRlbnNpb246Ok1lDQogICAgIGVsc2UN CiAgICAgICAgIHsNCiAgICAgICAgIHJldHVybiBOVUxMOw0KLSAgICAgICAgfSAgICAgICAgDQor ICAgICAgICB9DQogICAgIH0NCiANCiANCkBAIC0xMTU1LDcgKzExNDQsNyBAQCB2b2lkIENXaWRn ZXRFeHRlbnNpb246OkhpZGVTb2Z0a2V5cyggKQ0KICAgICB7DQogICAgIGlXaWRnZXRDYWxsYmFj ay0+U2V0U29mdGtleXNWaXNpYmxlKEVGYWxzZSk7DQogICAgIH0NCi0gICAgDQorDQogLy8gLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0NCiAvLyBDV2lkZ2V0RXh0ZW5zaW9uOjpTaG93U29mdGtleXMNCiAv Lw0K 15686 2007-07-25 15:10:40 -0700 2007-07-27 07:03:50 -0700 Fix for 3.2 MenuPatch32.patch text/plain 23790 sriram.yadavalli SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDI0NjMzKQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDE0IEBADQoreWFkYXZhbGwsIHJldmlld2VkIGJ5IDxaYWxhbj4NCisgREVT QzogRml4ZXMgZm9yIHdpZGdldCBtZW51IEFQSQ0KKyBodHRwOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDc2Mw0KKw0KKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBB RERFRCBPUiBDSEFOR0VEDQorDQorICAgICAgICAqIGtodG1sL2VjbWEva2pzX3dpbmRvdy5jcHA6 DQorICAgICAgICAoV2luZG93OjpnZXQpOg0KKyAgICAgICAgKiBraHRtbC9lY21hL2tqc193aW5k b3cubHV0Lmg6DQorICAgICAgICAoS0pTOjopOg0KKw0KIDIwMDctMDctMjAgdm1hbGFpeWEsIDx2 aWtyYW0ubWFsYWl5YUBub2tpYS5jb20+DQogICAgICAgICBSZXZpZXdlZCBieSBZb25nanVuDQog ICAgICAgICBERVNDOiBKUEtOLTZaMzhFNSAtIEJyb3dzZXIgY3Jhc2hlcyBhbmQgcHJvYmxlbXMg d2l0aCBtZW1vcnkgbG93IG5vdGUuDQpJbmRleDogV2ViQ29yZS9raHRtbC9lY21hL2tqc193aW5k b3cuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tqc193aW5kb3cuY3Bw CShyZXZpc2lvbiAyNDYxOSkNCisrKyBXZWJDb3JlL2todG1sL2VjbWEva2pzX3dpbmRvdy5jcHAJ KHdvcmtpbmcgY29weSkNCkBAIC0zMTIsNyArMzEyLDcgQEAgY29uc3QgQ2xhc3NJbmZvIFdpbmRv dzo6aW5mbyA9IHsgIldpbmRvdw0KICAgZnJhbWVFbGVtZW50ICBXaW5kb3c6OkZyYW1lRWxlbWVu dCAgICBEb250RGVsZXRlfFJlYWRPbmx5DQogICBzaG93TW9kYWxEaWFsb2cgV2luZG93OjpTaG93 TW9kYWxEaWFsb2cgICAgRG9udERlbGV0ZXxGdW5jdGlvbiAxDQogICB3aWRnZXQgV2luZG93Ojpf V2lkZ2V0IERvbnREZWxldGV8RnVuY3Rpb24gMA0KLSAgTWVudSBXaW5kb3c6Ok1lbnUgRG9udERl bGV0ZXxSZWFkT25seQ0KKyAgbWVudSBXaW5kb3c6Ok1lbnUgRG9udERlbGV0ZXxSZWFkT25seQ0K ICAgTWVudUl0ZW0gV2luZG93OjpNZW51SXRlbSBEb250RGVsZXRlfFJlYWRPbmx5DQogQGVuZA0K ICovDQpAQCAtODIzLDI1ICs4MjMsMTMgQEAgVmFsdWUgV2luZG93OjpnZXQoRXhlY1N0YXRlICpl eGVjLCBjb25zdA0KICAgICAgICAgcmV0dXJuICggKChjb25zdF9jYXN0PFdpbmRvdyo+KHRoaXMp LT5tX3dpZGdldCA9IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRPYmplY3QoZXhlYykpKT8NCiAg ICAgICAgICAgVmFsdWUoY29uc3RfY2FzdDxXaW5kb3cqPih0aGlzKS0+bV93aWRnZXQpOiBVbmRl ZmluZWQoKSk7DQogICAgIGNhc2UgTWVudToNCi0gICAgICBpZiAoICFtX3dpZGdldCApDQotICAg ICAgICAoY29uc3RfY2FzdDxXaW5kb3cqPih0aGlzKS0+bV93aWRnZXQgPSBLV1EobV9wYXJ0KS0+ Y3JlYXRlV2lkZ2V0T2JqZWN0KGV4ZWMpKTsgICAgICAgIA0KLSAgICAgIGlmICghKGNvbnN0X2Nh c3Q8V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0KSkNCi0gICAgICAgIHJldHVybiBVbmRlZmluZWQo KTsNCiAgICAgICBpZiAoIG1fd2lkZ2V0TWVudSApDQogICAgICAgICByZXR1cm4gVmFsdWUobV93 aWRnZXRNZW51KTsNCiAgICAgICBlbHNlDQogICAgICAgICByZXR1cm4gKCAoKGNvbnN0X2Nhc3Q8 V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0TWVudSA9IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRN ZW51T2JqZWN0KGV4ZWMpKSk/DQogICAgICAgICAgIFZhbHVlKGNvbnN0X2Nhc3Q8V2luZG93Kj4o dGhpcyktPm1fd2lkZ2V0TWVudSk6IFVuZGVmaW5lZCgpKTsNCiAgICAgY2FzZSBNZW51SXRlbToN Ci0gICAgICBpZiAoICFtX3dpZGdldCApDQotICAgICAgICAoY29uc3RfY2FzdDxXaW5kb3cqPih0 aGlzKS0+bV93aWRnZXQgPSBLV1EobV9wYXJ0KS0+Y3JlYXRlV2lkZ2V0T2JqZWN0KGV4ZWMpKTsg ICAgICAgIA0KLSAgICAgIGlmICghKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0 KSkNCi0gICAgICAgIHJldHVybiBVbmRlZmluZWQoKTsNCi0gICAgICBpZiAoICFtX3dpZGdldE1l bnUgKQ0KLSAgICAgICAgKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0TWVudSA9 IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRNZW51T2JqZWN0KGV4ZWMpKTsgICAgICAgIA0KLSAg ICAgIGlmICghKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcyktPm1fd2lkZ2V0TWVudSkpDQotICAg ICAgICByZXR1cm4gVW5kZWZpbmVkKCk7DQotICAgICAgcmV0dXJuIEtXUShtX3BhcnQpLT5jcmVh dGVXaWRnZXRNZW51SXRlbU9iamVjdChleGVjKSA/IFZhbHVlKEtXUShtX3BhcnQpLT5jcmVhdGVX aWRnZXRNZW51SXRlbU9iamVjdChleGVjKSk6VW5kZWZpbmVkKCk7ICAgDQorICAgICAgcmV0dXJu IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRNZW51SXRlbU9iamVjdChleGVjKSA/IFZhbHVlKEtX UShtX3BhcnQpLT5jcmVhdGVXaWRnZXRNZW51SXRlbU9iamVjdChleGVjKSk6VW5kZWZpbmVkKCk7 DQogICAgIGNhc2UgTWVudWJhcjoNCiAgICAgICByZXR1cm4gVmFsdWUobWVudWJhcihleGVjKSk7 DQogICAgIGNhc2UgT2Zmc2NyZWVuQnVmZmVyaW5nOg0KSW5kZXg6IFdlYkNvcmUva2h0bWwvZWNt YS9ranNfd2luZG93Lmx1dC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9raHRtbC9lY21hL2tq c193aW5kb3cubHV0LmgJKHJldmlzaW9uIDI0NjE5KQ0KKysrIFdlYkNvcmUva2h0bWwvZWNtYS9r anNfd2luZG93Lmx1dC5oCSh3b3JraW5nIGNvcHkpDQpAQCAtMSw0ICsxLDQgQEANCi0vKiBBdXRv bWF0aWNhbGx5IGdlbmVyYXRlZCBmcm9tIGtqc193aW5kb3cuY3BwIHVzaW5nIGNyZWF0ZV9oYXNo X3RhYmxlLiBETyBOT1QgRURJVCAhICovDQorLyogQXV0b21hdGljYWxseSBnZW5lcmF0ZWQgZnJv bSBranNfd2luZG93LmNwcCB1c2luZyBuOlxTNjBcbXdcd2ViXFdlYkVuZ2luZVxPc3NXZWJFbmdp bmVcSmF2YVNjcmlwdENvcmVca2pzXGNyZWF0ZV9oYXNoX3RhYmxlLiBETyBOT1QgRURJVCAhICov DQogDQogbmFtZXNwYWNlIEtKUyB7DQogDQpAQCAtNjMsNyArNjMsNyBAQCBjb25zdCBzdHJ1Y3Qg SGFzaEVudHJ5IFdpbmRvd1RhYmxlRW50cmllDQogICAgeyAiUmFuZ2UiLCBXaW5kb3c6OlJhbmdl LCBEb250RGVsZXRlLCAwLCAmV2luZG93VGFibGVFbnRyaWVzWzkxXSB9LA0KICAgIHsgInN0YXR1 cyIsIFdpbmRvdzo6U3RhdHVzLCBEb250RGVsZXRlLCAwLCAwIH0sDQogICAgeyAib25yZXNldCIs IFdpbmRvdzo6T25yZXNldCwgRG9udERlbGV0ZSwgMCwgMCB9LA0KLSAgIHsgIk1lbnUiLCBXaW5k b3c6Ok1lbnUsIERvbnREZWxldGV8UmVhZE9ubHksIDAsIDAgfSwNCisgICB7IDAsIDAsIDAsIDAs IDAgfSwNCiAgICB7ICJvbnNlbGVjdCIsIFdpbmRvdzo6T25zZWxlY3QsIERvbnREZWxldGUsIDAs IDAgfSwNCiAgICB7IDAsIDAsIDAsIDAsIDAgfSwNCiAgICB7ICJkb2N1bWVudCIsIFdpbmRvdzo6 RG9jdW1lbnQsIERvbnREZWxldGV8UmVhZE9ubHksIDAsICZXaW5kb3dUYWJsZUVudHJpZXNbMTE1 XSB9LA0KQEAgLTk1LDcgKzk1LDcgQEAgY29uc3Qgc3RydWN0IEhhc2hFbnRyeSBXaW5kb3dUYWJs ZUVudHJpZQ0KICAgIHsgIm91dGVyV2lkdGgiLCBXaW5kb3c6Ok91dGVyV2lkdGgsIERvbnREZWxl dGV8UmVhZE9ubHksIDAsICZXaW5kb3dUYWJsZUVudHJpZXNbMTA2XSB9LA0KICAgIHsgImdldFNl bGVjdGlvbiIsIFdpbmRvdzo6R2V0U2VsZWN0aW9uLCBEb250RGVsZXRlfEZ1bmN0aW9uLCAwLCAm V2luZG93VGFibGVFbnRyaWVzWzExNl0gfSwNCiAgICB7IDAsIDAsIDAsIDAsIDAgfSwNCi0gICB7 ICJibHVyIiwgV2luZG93OjpCbHVyLCBEb250RGVsZXRlfEZ1bmN0aW9uLCAwLCAwIH0sDQorICAg eyAiYmx1ciIsIFdpbmRvdzo6Qmx1ciwgRG9udERlbGV0ZXxGdW5jdGlvbiwgMCwgJldpbmRvd1Rh YmxlRW50cmllc1sxMjhdIH0sDQogICAgeyAibG9jYXRpb25iYXIiLCBXaW5kb3c6OkxvY2F0aW9u YmFyLCBEb250RGVsZXRlLCAwLCAmV2luZG93VGFibGVFbnRyaWVzWzEwN10gfSwNCiAgICB7ICJE T01FeGNlcHRpb24iLCBXaW5kb3c6OkRPTUV4Y2VwdGlvbiwgRG9udERlbGV0ZSwgMCwgJldpbmRv d1RhYmxlRW50cmllc1s5Nl0gfSwNCiAgICB7ICJNZW51SXRlbSIsIFdpbmRvdzo6TWVudUl0ZW0s IERvbnREZWxldGV8UmVhZE9ubHksIDAsIDAgfSwNCkBAIC0xNDksMTAgKzE0OSwxMSBAQCBjb25z dCBzdHJ1Y3QgSGFzaEVudHJ5IFdpbmRvd1RhYmxlRW50cmllDQogICAgeyAib25tb3ZlIiwgV2lu ZG93OjpPbm1vdmUsIERvbnREZWxldGUsIDAsIDAgfSwNCiAgICB7ICJvbnN1Ym1pdCIsIFdpbmRv dzo6T25zdWJtaXQsIERvbnREZWxldGUsIDAsIDAgfSwNCiAgICB7ICJvbmJlZm9yZXVubG9hZCIs IFdpbmRvdzo6T25iZWZvcmV1bmxvYWQsIERvbnREZWxldGUsIDAsIDAgfSwNCi0gICB7ICJzaG93 TW9kYWxEaWFsb2ciLCBXaW5kb3c6OlNob3dNb2RhbERpYWxvZywgRG9udERlbGV0ZXxGdW5jdGlv biwgMSwgMCB9DQorICAgeyAic2hvd01vZGFsRGlhbG9nIiwgV2luZG93OjpTaG93TW9kYWxEaWFs b2csIERvbnREZWxldGV8RnVuY3Rpb24sIDEsIDAgfSwNCisgICB7ICJtZW51IiwgV2luZG93OjpN ZW51LCBEb250RGVsZXRlfFJlYWRPbmx5LCAwLCAwIH0NCiB9Ow0KIA0KLWNvbnN0IHN0cnVjdCBI YXNoVGFibGUgV2luZG93VGFibGUgPSB7IDIsIDEyOCwgV2luZG93VGFibGVFbnRyaWVzLCA5MSB9 Ow0KK2NvbnN0IHN0cnVjdCBIYXNoVGFibGUgV2luZG93VGFibGUgPSB7IDIsIDEyOSwgV2luZG93 VGFibGVFbnRyaWVzLCA5MSB9Ow0KIA0KIH0gLy8gbmFtZXNwYWNlDQogDQpJbmRleDogV2ViS2l0 L0NoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0 NjMzKQ0KKysrIFdlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkNCkBAIC0xLDMgKzEsMjMg QEANCit5YWRhdmFsbCwgcmV2aWV3ZWQgYnkgPFphbGFuPg0KKyBERVNDOiBGaXhlcyBmb3Igd2lk Z2V0IG1lbnUgQVBJDQorIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 NzYzDQorDQorICAgICAgICAqIEJyb3dzZXJWaWV3L2luYy9XaWRnZXRFeHRlbnNpb24uaDoNCisg ICAgICAgIChDTWVudUl0ZW06OlRleHQpOg0KKyAgICAgICAgKENNZW51SXRlbTo6U2V0VGV4dCk6 DQorICAgICAgICAqIEJyb3dzZXJWaWV3L3NyYy9XaWRnZXRFeHRlbnNpb24uY3BwOg0KKyAgICAg ICAgKENXaWRnZXRFeHRlbnNpb246OkFkZE1lbnVJdGVtKToNCisgICAgICAgIChDV2lkZ2V0RXh0 ZW5zaW9uOjpBZGRPcHRpb25zTWVudUl0ZW0pOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246 OkFwcGVuZCk6DQorICAgICAgICAoQ1dpZGdldEV4dGVuc2lvbjo6RGVsZXRlTWVudUl0ZW0pOg0K KyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246OlJlcGxhY2VNZW51SXRlbSk6DQorICAgICAgICAo Q1dpZGdldEV4dGVuc2lvbjo6R2V0RnJvbU1lbnVJdGVtQ29sbGVjdGlvbik6DQorICAgICAgICAo Q1dpZGdldEV4dGVuc2lvbjo6U2V0RGltbWVkKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9u OjpTZXRNZW51SXRlbU9ic2VydmVyKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpNZW51 SXRlbU9ic2VydmVyKToNCisgICAgICAgIChDTWVudUl0ZW06Ok5ld0wpOg0KKyAgICAgICAgKGlE aW1tZWQpOg0KKw0KIGhvbmd6aGFvLCByZXZpZXdlZCBieSA8U2FjaGluPg0KICBERVNDOiBbUzYw XSBSU1MtbGlua3MgZG9lcyBub3Qgd29yayBhbnltb3JlIGlmIHNvbWUgYXJ0aWNsZSB3YXMgZG93 bmxvYWRlZCBmcm9tIHdlYiBmZWVkcy4NCiAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTQ2MTMNCkluZGV4OiBXZWJLaXQvQnJvd3NlclZpZXcvaW5jL1dpZGdldEV4dGVu c2lvbi5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L0Jyb3dzZXJWaWV3L2luYy9XaWRnZXRFeHRl bnNpb24uaAkocmV2aXNpb24gMjQ2MTkpDQorKysgV2ViS2l0L0Jyb3dzZXJWaWV3L2luYy9XaWRn ZXRFeHRlbnNpb24uaAkod29ya2luZyBjb3B5KQ0KQEAgLTE5MSwxMiArMTkxLDEyIEBAIGNsYXNz IENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogQHBhcmFtIGNv bW1hbmQgSUQgb2YgdGhlIHBhcmVudCBtZW51IGl0ZW0NCiAgICAgICAgICogQHJldHVybiBFcnJv ciBjb2RlDQogICAgICAgICAqLw0KLSAgICAgICAgVEludCBBZGRPcHRpb25zTWVudUl0ZW0oIGNv bnN0IFREZXNDJiBhVGV4dCwgVEludCBhQ21kSWQsIFRJbnQgYVBhcmVudENtZElkLCB2b2lkKiBv YmogKTsNCisgICAgICAgIFRJbnQgQWRkT3B0aW9uc01lbnVJdGVtKCBjb25zdCBURGVzQyYgYVRl eHQsIFRJbnQgYUNtZElkLCBUQm9vbCBhRGltbWVkLCBUSW50IGFQYXJlbnRDbWRJZCwgdm9pZCog b2JqICk7DQogDQogICAgICAgICAvKioNCiAgICAgICAgICogTWV0aG9kIFNldFJpZ2h0U29mdEtl eUxhYmVsDQogICAgICAgICAqIEBzaW5jZSAzLjINCi0gICAgICAgICogQHBhcmFtIHRleHQgYnVm ZmVyIHRvIGJlIHNldCBhcyByaWdodCBzb2Z0IGtleSBsYWJlbCANCisgICAgICAgICogQHBhcmFt IHRleHQgYnVmZmVyIHRvIGJlIHNldCBhcyByaWdodCBzb2Z0IGtleSBsYWJlbA0KICAgICAgICAg KiBAcmV0dXJuIG5vbmUNCiAgICAgICAgICovDQogICAgICAgICB2b2lkIFNldFJpZ2h0U29mdEtl eUxhYmVsKCBjb25zdCBURGVzQyYgYVRleHQgKTsNCkBAIC0yMDgsNyArMjA4LDcgQEAgY2xhc3Mg Q1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcmV0dXJuIG5v bmUNCiAgICAgICAgICovDQogICAgICAgICB2b2lkIERlbGV0ZU1lbnVJdGVtKCBUSW50IGFDbWRJ ZCApOw0KLSAgICAgICAgDQorDQogICAgICAgICAvKioNCiAgICAgICAgICogTWV0aG9kIENsZWFy TWVudUl0ZW1zDQogICAgICAgICAqIEBzaW5jZSAzLjINCkBAIC0yMjYsNyArMjI2LDcgQEAgY2xh c3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcGFyYW0g ZGltbWVkIHN0YXR1cw0KICAgICAgICAgKiBAcmV0dXJuIEVycm9yIGNvZGUNCiAgICAgICAgICov DQotICAgICAgICBUSW50IFJlcGxhY2VNZW51SXRlbSggVEludCBvbGRDbWRJZCwgY29uc3QgVERl c0MmIG5ld1RleHQsIA0KKyAgICAgICAgVEludCBSZXBsYWNlTWVudUl0ZW0oIFRJbnQgb2xkQ21k SWQsIGNvbnN0IFREZXNDJiBuZXdUZXh0LA0KICAgICAgICAgICAgIFRJbnQgbmV3Q21kSWQsIFRJ bnQgbmV3RGltbWVkICk7DQogDQogICAgICAgICAvKioNCkBAIC0yNTUsNyArMjU1LDcgQEAgY2xh c3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcGFyYW0g Y2FsbGJhY2sgZnVuY3Rpb24NCiAgICAgICAgICogQHJldHVybiBub25lDQogICAgICAgICAqLw0K LSAgICAgICAgdm9pZCBTZXRNZW51SXRlbU9ic2VydmVyKCANCisgICAgICAgIHZvaWQgU2V0TWVu dUl0ZW1PYnNlcnZlcigNCiAgICAgICAgICAgICBUSW50IGFDbWRJZCwgV2lkZ2V0RXZlbnRIYW5k bGVyKiBhT25TZWxlY3RDYWxsYmFjayApOw0KIA0KICAgICAgICAgLyoqDQpAQCAtMjc3LDcgKzI3 Nyw3IEBAIGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAg IC8qKg0KICAgICAgICAgKiBNZXRob2QgR2V0TWVudU9ic2VydmVyDQogICAgICAgICAqIEBzaW5j ZSAzLjINCi0gICAgICAgICogQHBhcmFtIA0KKyAgICAgICAgKiBAcGFyYW0NCiAgICAgICAgICog QHJldHVybiBjYWxsYmFjayBmdW5jdGlvbg0KICAgICAgICAgKi8NCiAgICAgICAgIFdpZGdldEV2 ZW50SGFuZGxlciogTWVudU9ic2VydmVyKCk7DQpAQCAtMjg5LDExICsyODksMTEgQEAgY2xhc3Mg Q1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcmV0dXJuIG5v bmUNCiAgICAgICAgICovDQogICAgICAgICB2b2lkIFNldFJpZ2h0S2V5T2JzZXJ2ZXIoIFdpZGdl dEV2ZW50SGFuZGxlciogYU1lbnVDYWxsYmFjayApOw0KLSAgICAgICAgDQorDQogICAgICAgICAv KioNCiAgICAgICAgICogTWV0aG9kIEdldE1lbnVPYnNlcnZlcg0KICAgICAgICAgKiBAc2luY2Ug My4yDQotICAgICAgICAqIEBwYXJhbSANCisgICAgICAgICogQHBhcmFtDQogICAgICAgICAqIEBy ZXR1cm4gY2FsbGJhY2sgZnVuY3Rpb24NCiAgICAgICAgICovDQogICAgICAgICBXaWRnZXRFdmVu dEhhbmRsZXIqIFJpZ2h0S2V5T2JzZXJ2ZXIoKTsNCkBAIC0zMDYsMTQgKzMwNiw2IEBAIGNsYXNz IENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgIFREZXNDJiBHZXRX aWRnZXRCdW5kbGVJZCgpIHsgcmV0dXJuICppV2lkZ2V0QnVuZGxlSWQ7IH0NCiANCiAgICAgICAg IC8qKg0KLSAgICAgICAgKiBNZXRob2QgU2V0U2Nyb2xsQmFyDQotICAgICAgICAqIEBzaW5jZSAz LjINCi0gICAgICAgICogQHBhcmFtIFRCb29sIHZpc2libGUNCi0gICAgICAgICogQHJldHVybiB2 b2lkDQotICAgICAgICAqLw0KLSAgICAgICAgdm9pZCBTZXRTY3JvbGxCYXIoIFRCb29sIGFWaXNp YmxlICk7DQotDQotICAgICAgICAvKioNCiAgICAgICAgICogTWV0aG9kIFNldE5hdmlnYXRpb25F bmFibGVkDQogICAgICAgICAqIEBzaW5jZSAzLjINCiAgICAgICAgICogQHBhcmFtIFRCb29sIGVu YWJsZWQNCkBAIC0zNTIsNyArMzQ0LDcgQEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGlj IENCYXNlLCBwdQ0KICAgICAgICAgKiBAcmV0dXJuIHZvaWQNCiAgICAgICAgICovDQogICAgICAg ICB2b2lkIFNldE9uU2hvd0xpc3RlbmVyKCBXaWRnZXRFdmVudEhhbmRsZXIqIGFDYWxsYmFjayAp Ow0KLSAgICAgICAgDQorDQogICAgICAgICAvKioNCiAgICAgICAgICogTWV0aG9kIEdldEZyb21N ZW51SXRlbUNvbGxlY3Rpb24NCiAgICAgICAgICogQHNpbmNlIDMuMg0KQEAgLTM2MCw3ICszNTIs NyBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogICAgICAgICAq IEByZXR1cm4gdm9pZCoNCiAgICAgICAgICovDQogICAgICAgICB2b2lkKiBHZXRGcm9tTWVudUl0 ZW1Db2xsZWN0aW9uKCBjb25zdCBURGVzQyYgdGV4dFZhbCApOw0KLSAgICAgICAgDQorDQogICAg ICAgICAvKioNCiAgICAgICAgICogTWV0aG9kIEdldEZyb21NZW51SXRlbUNvbGxlY3Rpb24NCiAg ICAgICAgICogQHNpbmNlIDMuMg0KQEAgLTQxMSw3ICs0MDMsNyBAQCBjbGFzcyBDV2lkZ2V0RXh0 ZW5zaW9uOiBwdWJsaWMgQ0Jhc2UsIHB1DQogICAgICAgICAqIEBzaW5jZSAzLjINCiAgICAgICAg ICogQHJldHVybiB3aWRnZXQgZW5naW5lIGJyaWRnZQ0KICAgICAgICAgKi8NCi0gICAgICAgIE1X aWRnZXRFbmdpbmVCcmlkZ2UmIFdpZGdldEVuZ2luZUJyaWRnZSgpIGNvbnN0IHsgDQorICAgICAg ICBNV2lkZ2V0RW5naW5lQnJpZGdlJiBXaWRnZXRFbmdpbmVCcmlkZ2UoKSBjb25zdCB7DQogICAg ICAgICAgICAgcmV0dXJuICppV2lkZ2V0RW5naW5lQnJpZGdlOyB9DQogDQogICAgICAgICAvKioN CkBAIC00NTEsNyArNDQzLDcgQEAgY2xhc3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNl LCBwdQ0KICAgICAgICAgKiBAcGFyYW0gVGhlIHZhbHVlIGZvciB0aGUgcGFyYW1hdGVyDQogICAg ICAgICAqIEByZXR1cm4gdm9pZA0KICAgICAgICAgKi8NCi0gICAgICAgIHZvaWQgU2V0UGFyYW1M KCANCisgICAgICAgIHZvaWQgU2V0UGFyYW1MKA0KICAgICAgICAgICAgIFRCckN0bERlZnM6OlRC ckN0bFdpZGdldFBhcmFtcyBhUGFyYW0sIGNvbnN0IFREZXNDJiBhVmFsdWUgKTsNCiANCiAgICAg ICAgIC8qKg0KQEAgLTUwMiw3ICs0OTQsNyBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJs aWMgQ0Jhc2UsIHB1DQogICAgICAgICAqIEByZXR1cm4gdm9pZA0KICAgICAgICAgKi8NCiAgICAg ICAgIHZvaWQgTG9hZFdpZGdldEVuZ2luZURsbEwoKTsNCi0gICAgICAgIA0KKw0KICAgICAgICAg LyoNCiAgICAgICAgICogTWV0aG9kIExhdW5jaEFwcGxpY2F0aW9uTA0KICAgICAgICAgKiBAc2lu Y2UgMy4yDQpAQCAtNTMzLDcgKzUyNSw3IEBAIGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1Ymxp YyBDQmFzZSwgcHUNCiAgICAgcHJpdmF0ZToNCiAgICAgICAgIENXZWJLaXRWaWV3KiAgICAgICAg ICAgIGlXZWJLaXRWaWV3Oy8vbm90IG93bmVkDQogICAgICAgICBDV2lkZ2V0UHJlZmVyZW5jZXMq ICAgICBpUHJlZmVyZW5jZXM7DQotICAgICAgICBUV2lkZ2V0UmVuZGVyZXIqICAgICAgICBpV2lk Z2V0UmVuZGVyZXI7ICAgICAgIA0KKyAgICAgICAgVFdpZGdldFJlbmRlcmVyKiAgICAgICAgaVdp ZGdldFJlbmRlcmVyOw0KICAgICAgICAgVEludCAgICAgICAgICAgICAgICAgICAgaVdpZGdldElk Ow0KICAgICAgICAgVEJvb2wgICAgICAgICAgICAgICAgICAgaU5hdmlnYXRpb25FbmFibGVkOw0K ICAgICAgICAgVEJvb2wgICAgICAgICAgICAgICAgICAgaVBhZ2VTY2FsZXJXYXNFbmFibGVkOw0K QEAgLTU4Nyw3ICs1NzksNyBAQCBjbGFzcyBDV2lkZ2V0RXh0ZW5zaW9uOiBwdWJsaWMgQ0Jhc2Us IHB1DQogICAgICAgICAqIE1ldGhvZCBGaW5kTm9kZUJ5SWQNCiAgICAgICAgICogQHNpbmNlIDMu Mg0KICAgICAgICAgKiBAcGFyYW0gcm9vdCBvZiB0aGUgdHJlZQ0KLSAgICAgICAgKiBAcGFyYW0g Y29tbWFuZCBpZCBvZiB0aGUgbWVudSBpdGVtIA0KKyAgICAgICAgKiBAcGFyYW0gY29tbWFuZCBp ZCBvZiB0aGUgbWVudSBpdGVtDQogICAgICAgICAqIEByZXR1cm4gQ01lbnVJdGVtKg0KICAgICAg ICAgKi8NCiAgICAgICAgIENNZW51SXRlbSogRmluZE5vZGVCeUlkKCBDTWVudUl0ZW0qIG5vZGUs IFRJbnQgYUNtZElkICk7DQpAQCAtNTk2LDcgKzU4OCw3IEBAIGNsYXNzIENXaWRnZXRFeHRlbnNp b246IHB1YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICogTWV0aG9kIEZpbmROb2RlQnlUZXh0DQog ICAgICAgICAqIEBzaW5jZSAzLjINCiAgICAgICAgICogQHBhcmFtIHJvb3Qgb2YgdGhlIHRyZWUN Ci0gICAgICAgICogQHBhcmFtIHRleHQgb2YgdGhlIG1lbnUgaXRlbSANCisgICAgICAgICogQHBh cmFtIHRleHQgb2YgdGhlIG1lbnUgaXRlbQ0KICAgICAgICAgKiBAcmV0dXJuIENNZW51SXRlbSoN CiAgICAgICAgICovDQogICAgICAgICBDTWVudUl0ZW0qIEZpbmROb2RlQnlUZXh0KCBDTWVudUl0 ZW0qIG5vZGUsIGNvbnN0IFREZXNDJiBhVGV4dCApOw0KQEAgLTYwNSwxMiArNTk3LDEyIEBAIGNs YXNzIENXaWRnZXRFeHRlbnNpb246IHB1YmxpYyBDQmFzZSwgcHUNCiANCiANCiBjbGFzcyBDTWVu dUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCi0gICAgeyAgICANCisgICAgew0KICAgICBwdWJsaWM6DQog ICAgICAgICAvKioNCi0gICAgICAgICogQ29uc3RydWN0b3IgICAgICAgDQorICAgICAgICAqIENv bnN0cnVjdG9yDQogICAgICAgICAqLw0KLSAgICAgICAgc3RhdGljIENNZW51SXRlbSogTmV3TCgg Y29uc3QgVERlc0MxNiYgYVRleHQsIFRJbnQgYUNtZElkLCANCisgICAgICAgIHN0YXRpYyBDTWVu dUl0ZW0qIE5ld0woIGNvbnN0IFREZXNDMTYmIGFUZXh0LCBUSW50IGFDbWRJZCwgVEJvb2wgYURp bW1lZCA9IEVGYWxzZSwNCiAgICAgICAgICAgICBDTWVudUl0ZW0qIGFQYXJlbnQgPSBOVUxMLCB2 b2lkKiBhT2JqID0gTlVMTCApOw0KIA0KICAgICAgICAgLyoqDQpAQCAtNjI3LDggKzYxOSw4IEBA IGNsYXNzIENNZW51SXRlbSA6IHB1YmxpYyBDQmFzZQ0KICAgICAgICAgLyoqDQogICAgICAgICAq IEMrKyBjb25zdHJ1Y3Rvci4NCiAgICAgICAgICovDQotICAgICAgICBDTWVudUl0ZW0oIGNvbnN0 IFREZXNDMTYmIGFUZXh0LCBUSW50IGFDbWRJZCwgQ01lbnVJdGVtKiBhUGFyZW50ID0gTlVMTCwN Ci0gICAgICAgICAgICB2b2lkKiBhT2JqID0gTlVMTCApOyAgICAgICANCisgICAgICAgIENNZW51 SXRlbSggY29uc3QgVERlc0MxNiYgYVRleHQsIFRJbnQgYUNtZElkLCBUQm9vbCBhRGltbWVkLCBD TWVudUl0ZW0qIGFQYXJlbnQgPSBOVUxMLA0KKyAgICAgICAgICAgIHZvaWQqIGFPYmogPSBOVUxM ICk7DQogDQogICAgIHB1YmxpYzoNCiANCkBAIC02MzgsOCArNjMwLDggQEAgY2xhc3MgQ01lbnVJ dGVtIDogcHVibGljIENCYXNlDQogICAgICAgICAqIEBwYXJhbSBub25lDQogICAgICAgICAqIEBy ZXR1cm4gdGV4dCBvZiBtZW51IGl0ZW0NCiAgICAgICAgICovDQotICAgICAgICBjb25zdCBURGVz QyYgVGV4dCgpIA0KLSAgICAgICAgICAgIHsgDQorICAgICAgICBjb25zdCBURGVzQyYgVGV4dCgp DQorICAgICAgICAgICAgew0KICAgICAgICAgICAgIGlmICggaVRleHQgKSByZXR1cm4gKmlUZXh0 Ow0KICAgICAgICAgICAgIGVsc2UgcmV0dXJuIEtOdWxsRGVzQygpOw0KICAgICAgICAgICAgIH0N CkBAIC02NjcsNyArNjU5LDcgQEAgY2xhc3MgQ01lbnVJdGVtIDogcHVibGljIENCYXNlDQogICAg ICAgICAqIEByZXR1cm4gbmV4dCBzaWJsaW5nIG9mIG1lbnUgaXRlbQ0KICAgICAgICAgKi8NCiAg ICAgICAgIENNZW51SXRlbSogTmV4dFNpYmxpbmcoKSB7IHJldHVybiBpTmV4dFNpYmxpbmc7IH0N Ci0gICAgICAgIA0KKw0KICAgICAgICAgLyoNCiAgICAgICAgICogTWV0aG9kIERpbW1lZCgpDQog ICAgICAgICAqIEBzaW5jZSAzLjINCkBAIC03MDYsMTIgKzY5OCwxMiBAQCBjbGFzcyBDTWVudUl0 ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAgICAgICogQHBhcmFtIHRleHQgb2YgbWVudSBpdGVtDQog ICAgICAgICAqIEByZXR1cm4gbm9uZQ0KICAgICAgICAgKi8NCi0gICAgICAgIHZvaWQgU2V0VGV4 dCggY29uc3QgVERlc0MmIGFUZXh0ICkgDQotICAgICAgICAgICAgeyANCisgICAgICAgIHZvaWQg U2V0VGV4dCggY29uc3QgVERlc0MmIGFUZXh0ICkNCisgICAgICAgICAgICB7DQogICAgICAgICAg ICAgSEJ1ZkMqIHRtcFRleHQgPSBIQnVmQzo6TmV3TCggYVRleHQuTGVuZ3RoKCkgKTsNCiAgICAg ICAgICAgICB0bXBUZXh0LT5EZXMoKS5BcHBlbmQoIGFUZXh0ICk7DQogICAgICAgICAgICAgZGVs ZXRlIGlUZXh0Ow0KLSAgICAgICAgICAgIGlUZXh0ID0gdG1wVGV4dDsgICAgDQorICAgICAgICAg ICAgaVRleHQgPSB0bXBUZXh0Ow0KICAgICAgICAgICAgIH0NCiANCiAgICAgICAgIC8qDQpAQCAt NzI5LDcgKzcyMSw3IEBAIGNsYXNzIENNZW51SXRlbSA6IHB1YmxpYyBDQmFzZQ0KICAgICAgICAg KiBAcmV0dXJuIG5vbmUNCiAgICAgICAgICovDQogICAgICAgICB2b2lkIFNldEZpcnN0Q2hpbGQo IENNZW51SXRlbSogYUZpcnN0Q2hpbGQgKSB7IGlGaXJzdENoaWxkID0gYUZpcnN0Q2hpbGQ7IH0N Ci0gICAgICAgIA0KKw0KICAgICAgICAgLyoNCiAgICAgICAgICogTWV0aG9kIFNldE5leHRTaWJs aW5nKCkNCiAgICAgICAgICogQHNpbmNlIDMuMg0KQEAgLTczNyw3ICs3MjksNyBAQCBjbGFzcyBD TWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAgICAgICogQHJldHVybiBub25lDQogICAgICAg ICAqLw0KICAgICAgICAgdm9pZCBTZXROZXh0U2libGluZyggQ01lbnVJdGVtKiBhTmV4dFNpYmxp bmcgKSB7IGlOZXh0U2libGluZyA9IGFOZXh0U2libGluZzsgfQ0KLSAgICAgICAgDQorDQogICAg ICAgICAvKg0KICAgICAgICAgKiBNZXRob2QgU2V0RGltbWVkKCkNCiAgICAgICAgICogQHNpbmNl IDMuMg0KQEAgLTc2OCw3ICs3NjAsNyBAQCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UN CiAgICAgICAgIENNZW51SXRlbSogICAgICAgICAgICAgIGlQYXJlbnQ7Ly9kYXRhDQogICAgICAg ICBDTWVudUl0ZW0qICAgICAgICAgICAgICBpRmlyc3RDaGlsZDsvL2xlZnQgbm9kZQ0KICAgICAg ICAgQ01lbnVJdGVtKiAgICAgICAgICAgICAgaU5leHRTaWJsaW5nOy8vcmlnaHQgbm9kZQ0KLSAg ICAgICAgVEJvb2wgICAgICAgICAgICAgICAgICAgaURpbW1lZDsvL0VUcnVlIHRvIGRpbSB0aGlz IG1lbnUgaXRlbS4gRUZhbHNlIHRvIHVuLWRpbSB0aGlzIG1lbnUgaXRlbS4gDQorICAgICAgICBU Qm9vbCAgICAgICAgICAgICAgICAgICBpRGltbWVkOy8vRVRydWUgdG8gZGltIHRoaXMgbWVudSBp dGVtLiBFRmFsc2UgdG8gdW4tZGltIHRoaXMgbWVudSBpdGVtLg0KICAgICAgICAgV2lkZ2V0RXZl bnRIYW5kbGVyKiAgICAgaUNhbGxiYWNrOw0KICAgICAgICAgdm9pZCogICAgICAgICAgICAgICAg ICAgaU9iajsNCiAgICAgfTsNCkluZGV4OiBXZWJLaXQvQnJvd3NlclZpZXcvc3JjL1dpZGdldEV4 dGVuc2lvbi5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQnJvd3NlclZpZXcvc3JjL1dpZGdl dEV4dGVuc2lvbi5jcHAJKHJldmlzaW9uIDI0NjE5KQ0KKysrIFdlYktpdC9Ccm93c2VyVmlldy9z cmMvV2lkZ2V0RXh0ZW5zaW9uLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTMwMiwxNyArMzAyLDYg QEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRQcmVmZXJlbmNlRm9ySw0KICAgICB9DQogDQog Ly8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KLS8vIENXaWRnZXRFeHRlbnNpb246OlNldFNjcm9sbEJh cg0KLS8vDQotLy8NCi0vLw0KLS8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCi0vLw0KLXZvaWQgQ1dp ZGdldEV4dGVuc2lvbjo6U2V0U2Nyb2xsQmFyKCBUQm9vbCAvKmFWaXNpYmxlKi8gKQ0KLSAgICB7 DQotICAgIH0NCi0NCi0vLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8gQ1dpZGdldEV4dGVuc2lv bjo6U2V0TmF2aWdhdGlvbkVuYWJsZWQNCiAvLw0KIC8vDQpAQCAtNDcxLDEyICs0NjAsMTIgQEAg dm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpBZGRNZW51SXRlbSggQ0Vpaw0KICAgICAgICAgZWxzZQ0K ICAgICAgICAgICAgIHsNCiAgICAgICAgICAgICBtZW51RGF0YS5pQ2FzY2FkZUlkID0gaVJlc291 cmNlSWQ7DQotICAgICAgICAgICAgfSAgICAgICAgICAgIA0KKyAgICAgICAgICAgIH0NCiAgICAg ICAgIH0NCiAgICAgZWxzZQ0KICAgICAgICAgew0KICAgICAgICAgbWVudURhdGEuaUNhc2NhZGVJ ZCA9IDA7DQotICAgICAgICB9ICAgICAgICANCisgICAgICAgIH0NCiANCiAgICAgbWVudURhdGEu aUZsYWdzID0gMDsNCiAgICAgbWVudURhdGEuaVRleHQgPSBhTm9kZS0+VGV4dCgpOw0KQEAgLTQ4 Niw3ICs0NzUsNyBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OkFkZE1lbnVJdGVtKCBDRWlrDQog ICAgIGVudHJ5LnBhcmVudENtZElkID0gYU5vZGUtPkNtZElkKCk7DQogICAgIGlDYXNjYWRlQXJy LkFwcGVuZCggZW50cnkgKTsNCiANCi0gICAgYU1lbnVQYW5lLkluc2VydE1lbnVJdGVtTCggbWVu dURhdGEsIGFNZW51UGFuZS5OdW1iZXJPZkl0ZW1zSW5QYW5lKCktMSApOw0KKyAgICBhTWVudVBh bmUuSW5zZXJ0TWVudUl0ZW1MKCBtZW51RGF0YSwgTWF4KGFNZW51UGFuZS5OdW1iZXJPZkl0ZW1z SW5QYW5lKCktMSwwKSApOw0KICAgICBhTWVudVBhbmUuU2V0SXRlbURpbW1lZCggYU5vZGUtPkNt ZElkKCkrS01lbnVJdGVtQ29tbWFuZElkQmFzZSwgYU5vZGUtPkRpbW1lZCgpICk7DQogICAgIH0N CiANCkBAIC02NjUsMTQgKzY1NCwxNCBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OlNldFBhcmFt TCgNCiAvLw0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8NCi1USW50IENXaWRnZXRFeHRl bnNpb246OkFkZE9wdGlvbnNNZW51SXRlbSggDQotICAgIGNvbnN0IFREZXNDJiBhVGV4dCwgVElu dCBhQ21kSWQsIFRJbnQgYVBhcmVudElkLCB2b2lkKiBhT2JqICkNCi0gICAgeyAgIA0KLSAgICBp ZiAoICFpTWVudVJvb3QgKSANCi0gICAgICAgIHsgDQorVEludCBDV2lkZ2V0RXh0ZW5zaW9uOjpB ZGRPcHRpb25zTWVudUl0ZW0oDQorICAgIGNvbnN0IFREZXNDJiBhVGV4dCwgVEludCBhQ21kSWQs IFRCb29sIGFEaW1tZWQsIFRJbnQgYVBhcmVudElkLCB2b2lkKiBhT2JqICkNCisgICAgew0KKyAg ICBpZiAoICFpTWVudVJvb3QgKQ0KKyAgICAgICAgew0KICAgICAgICAgaU1lbnVSb290ID0gQ01l bnVJdGVtOjpOZXdMKCBfTCgiIiksIC0xICk7DQotICAgICAgICB9ICAgIA0KLSAgICAgICAgDQor ICAgICAgICB9DQorDQogICAgIGlmICggYVRleHQuTGVuZ3RoKCkgPiAwICkNCiAgICAgICAgIHsN CiAgICAgICAgIENNZW51SXRlbSogcGFyZW50ID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGFQ YXJlbnRJZCApOw0KQEAgLTY4MCwyNSArNjY5LDI1IEBAIFRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6 QWRkT3B0aW9uc01lbnVJdGUNCiAgICAgICAgICAgICB7DQogICAgICAgICAgICAgcmV0dXJuIEtF cnJHZW5lcmFsOw0KICAgICAgICAgICAgIH0NCi0gICAgICAgIA0KKw0KICAgICAgICAgQ01lbnVJ dGVtKiBpdGVtID0gTlVMTDsNCi0gICAgICAgIGl0ZW0gPSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9v dCwgYUNtZElkICk7ICAgICAgICANCisgICAgICAgIGl0ZW0gPSBGaW5kTm9kZUJ5SWQoIGlNZW51 Um9vdCwgYUNtZElkICk7DQogICAgICAgICBpZiAoIGl0ZW0gKQ0KICAgICAgICAgICAgIHsNCiAg ICAgICAgICAgICByZXR1cm4gS0VyckFscmVhZHlFeGlzdHM7DQogICAgICAgICAgICAgfQ0KLSAg ICAgICAgICAgICAgICAgICAgDQorDQogICAgICAgICBpdGVtID0gRmluZE5vZGVCeVRleHQoIGlN ZW51Um9vdCwgYVRleHQgKTsNCiAgICAgICAgIGlmICggaXRlbSApDQogICAgICAgICAgICAgew0K ICAgICAgICAgICAgIHJldHVybiBLRXJyQWxyZWFkeUV4aXN0czsNCiAgICAgICAgICAgICB9DQot ICAgICAgICAgICAgICAgICAgICANCi0gICAgICAgIGl0ZW0gPSBDTWVudUl0ZW06Ok5ld0woIGFU ZXh0LCBhQ21kSWQsIHBhcmVudCwgYU9iaiApOyANCi0gICAgICAgIHJldHVybiBBcHBlbmQoIHBh cmVudCwgaXRlbSApOyAgICANCisNCisgICAgICAgIGl0ZW0gPSBDTWVudUl0ZW06Ok5ld0woIGFU ZXh0LCBhQ21kSWQsIGFEaW1tZWQsIHBhcmVudCwgYU9iaiApOw0KKyAgICAgICAgcmV0dXJuIEFw cGVuZCggcGFyZW50LCBpdGVtICk7DQogICAgICAgICB9DQotICAgICAgICANCi0gICAgcmV0dXJu IEtFcnJHZW5lcmFsOyAgICAgICAgICAgICAgICANCisNCisgICAgcmV0dXJuIEtFcnJHZW5lcmFs Ow0KICAgICB9DQogDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCkBAIC03MjQsOSArNzEzLDkg QEAgdm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpTZXRSaWdodFNvZnRLZXlMYQ0KIC8vDQogLy8gLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0NCiAvLw0KLVRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6QXBwZW5kKCAN CitUSW50IENXaWRnZXRFeHRlbnNpb246OkFwcGVuZCgNCiAgICAgQ01lbnVJdGVtKiBhUGFyZW50 LCBDTWVudUl0ZW0qIGFJdGVtICkNCi0gICAgeyAgDQorICAgIHsNCiAgICAgaWYgKCAhYVBhcmVu dCApDQogICAgICAgICB7DQogICAgICAgICByZXR1cm4gS0VyckdlbmVyYWw7DQpAQCAtNzQwLDgg KzcyOSw4IEBAIFRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6QXBwZW5kKCANCiAgICAgICAgIHsNCiAg ICAgICAgIEFwcGVuZFNpYmxpbmcoIGFQYXJlbnQtPkZpcnN0Q2hpbGQoKSwgYUl0ZW0gKTsNCiAg ICAgICAgIH0NCi0gICAgcmV0dXJuIEtFcnJOb25lOyAgICAgICAgICAgIA0KLSAgICB9IA0KKyAg ICByZXR1cm4gS0Vyck5vbmU7DQorICAgIH0NCiANCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0K IC8vIENXaWRnZXRFeHRlbnNpb246OkFwcGVuZFNpYmxpbmcNCkBAIC04MDEsNyArNzkwLDcgQEAg dm9pZCBDV2lkZ2V0RXh0ZW5zaW9uOjpEZWxldGVNZW51SXRlbSggVA0KICAgICAgICAgICAgICAg ICB7DQogICAgICAgICAgICAgICAgIGl0ZW0gPSBwcmV2LT5OZXh0U2libGluZygpOw0KICAgICAg ICAgICAgICAgICB9DQotICAgICAgICAgICAgICAgIA0KKw0KICAgICAgICAgICAgIHdoaWxlKCBp dGVtICkNCiAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAgICAgICBpZiAoIGl0ZW0tPkNt ZElkKCkgPT0gYUNtZElkICkNCkBAIC04MzcsNDEgKzgyNiw0MSBAQCB2b2lkIENXaWRnZXRFeHRl bnNpb246OkNsZWFyTWVudUl0ZW1zKCkNCiAvLw0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiAv Lw0KLVRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6UmVwbGFjZU1lbnVJdGVtKCANCi0gICAgVEludCBv bGRJdGVtQ21kSWQsIA0KLSAgICBjb25zdCBURGVzQyYgbmV3SXRlbVRleHQsIA0KLSAgICBUSW50 IG5ld0l0ZW1DbWRJZCwgDQorVEludCBDV2lkZ2V0RXh0ZW5zaW9uOjpSZXBsYWNlTWVudUl0ZW0o DQorICAgIFRJbnQgb2xkSXRlbUNtZElkLA0KKyAgICBjb25zdCBURGVzQyYgbmV3SXRlbVRleHQs DQorICAgIFRJbnQgbmV3SXRlbUNtZElkLA0KICAgICBUSW50IG5ld0l0ZW1EaW1tZWQgKQ0KICAg ICB7DQogICAgIENNZW51SXRlbSogbmV3SXRlbSA9IE5VTEw7DQogICAgIENNZW51SXRlbSogb2xk SXRlbSA9IE5VTEw7DQotICAgIA0KLSAgICAvLyBjaGVjayBpZiB0aGVyZSBpcyBhbm90aGVyIG5v ZGUgaW4gdGhlIHRyZWUgd2l0aCB0aGUgc2FtZSBJZCBhcyB0aGF0IG9mIA0KKw0KKyAgICAvLyBj aGVjayBpZiB0aGVyZSBpcyBhbm90aGVyIG5vZGUgaW4gdGhlIHRyZWUgd2l0aCB0aGUgc2FtZSBJ ZCBhcyB0aGF0IG9mDQogICAgIC8vIG5ld0l0ZW0gYnV0IGFsbG93IGEgcmVwbGFjZSBvZiBvbGRJ dGVtIHdpdGggdGhlIHNhbWUgSWQgYXMgdGhlIG5ld0l0ZW0NCi0gICAgbmV3SXRlbSA9IEZpbmRO b2RlQnlJZCggaU1lbnVSb290LCBuZXdJdGVtQ21kSWQgKTsgICAgDQorICAgIG5ld0l0ZW0gPSBG aW5kTm9kZUJ5SWQoIGlNZW51Um9vdCwgbmV3SXRlbUNtZElkICk7DQogICAgIGlmICggbmV3SXRl bSAmJiBuZXdJdGVtLT5DbWRJZCgpICE9IG9sZEl0ZW1DbWRJZCApDQogICAgICAgICB7DQogICAg ICAgICByZXR1cm4gS0VyckFscmVhZHlFeGlzdHM7DQogICAgICAgICB9DQotICAgIA0KLSAgICAv LyBjaGVjayBpZiB0aGVyZSBpcyBhbm90aGVyIG5vZGUgaW4gdGhlIHRyZWUgd2l0aCB0aGUgc2Ft ZSB0ZXh0IGFzIHRoYXQgb2YgDQorDQorICAgIC8vIGNoZWNrIGlmIHRoZXJlIGlzIGFub3RoZXIg bm9kZSBpbiB0aGUgdHJlZSB3aXRoIHRoZSBzYW1lIHRleHQgYXMgdGhhdCBvZg0KICAgICAvLyBu ZXdJdGVtIGJ1dCBhbGxvdyBhIHJlcGxhY2Ugb2Ygb2xkSXRlbSB3aXRoIHRoZSBzYW1lIHRleHQg YXMgdGhlIG5ld0l0ZW0NCiAgICAgbmV3SXRlbSA9IEZpbmROb2RlQnlUZXh0KCBpTWVudVJvb3Qs IG5ld0l0ZW1UZXh0ICk7DQotICAgIG9sZEl0ZW0gPSBGaW5kTm9kZUJ5SWQoIGlNZW51Um9vdCwg b2xkSXRlbUNtZElkICk7ICANCisgICAgb2xkSXRlbSA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290 LCBvbGRJdGVtQ21kSWQgKTsNCiAgICAgaWYgKCBuZXdJdGVtICYmIG9sZEl0ZW0gJiYgbmV3SXRl bS0+VGV4dCgpLkNvbXBhcmUob2xkSXRlbS0+VGV4dCgpKSAhPSAwICkNCiAgICAgICAgIHsNCiAg ICAgICAgIHJldHVybiBLRXJyQWxyZWFkeUV4aXN0czsNCiAgICAgICAgIH0NCi0gICAgICANCisN CiAgICAgaWYgKCBvbGRJdGVtICkNCiAgICAgICAgIHsNCi0gICAgICAgIG9sZEl0ZW0tPlNldFRl eHQoIG5ld0l0ZW1UZXh0ICk7ICAgIA0KLSAgICAgICAgb2xkSXRlbS0+U2V0Q21kSWQoIG5ld0l0 ZW1DbWRJZCApOyAgIA0KKyAgICAgICAgb2xkSXRlbS0+U2V0VGV4dCggbmV3SXRlbVRleHQgKTsN CisgICAgICAgIG9sZEl0ZW0tPlNldENtZElkKCBuZXdJdGVtQ21kSWQgKTsNCiAgICAgICAgIG9s ZEl0ZW0tPlNldERpbW1lZCggbmV3SXRlbURpbW1lZCApOw0KICAgICAgICAgcmV0dXJuIEtFcnJO b25lOw0KICAgICAgICAgfQ0KLSAgICAgICAgDQotICAgIHJldHVybiBLRXJyR2VuZXJhbDsgICAg ICAgIA0KKw0KKyAgICByZXR1cm4gS0VyckdlbmVyYWw7DQogICAgIH0NCiANCiAvLyAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tDQpAQCAtOTIxLDcgKzkxMCw3IEBAIHZvaWQqIENXaWRnZXRFeHRlbnNpb246 OkdldEZyb21NZW51SXRlbUMNCiAgICAgZWxzZQ0KICAgICAgICAgew0KICAgICAgICAgcmV0dXJu IE5VTEw7DQotICAgICAgICB9ICAgICAgICANCisgICAgICAgIH0NCiAgICAgfQ0KIA0KIC8vIC0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0NCkBAIC05MzYsNyArOTI1LDcgQEAgdm9pZCogQ1dpZGdldEV4dGVu c2lvbjo6R2V0RnJvbU1lbnVJdGVtQw0KICAgICBDTWVudUl0ZW0qIG5vZGUgPSBOVUxMOw0KIA0K ICAgICBub2RlID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGNtZElkICk7DQotICAgIA0KKw0K ICAgICBpZiAoIG5vZGUgKQ0KICAgICAgICAgew0KICAgICAgICAgcmV0dXJuIG5vZGUtPk9iaigp Ow0KQEAgLTk0NCw3ICs5MzMsNyBAQCB2b2lkKiBDV2lkZ2V0RXh0ZW5zaW9uOjpHZXRGcm9tTWVu dUl0ZW1DDQogICAgIGVsc2UNCiAgICAgICAgIHsNCiAgICAgICAgIHJldHVybiBOVUxMOw0KLSAg ICAgICAgfSAgICAgICAgDQorICAgICAgICB9DQogICAgIH0NCiANCiAvLyAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tDQpAQCAtOTU4LDcgKzk0Nyw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0RGlt bWVkKCBUSW50IGENCiAgICAgew0KICAgICBDTWVudUl0ZW0qIG5vZGUgPSBOVUxMOw0KICAgICBu b2RlID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGFDbWRJZCApOw0KLSAgICANCisNCiAgICAg aWYgKCBub2RlICkNCiAgICAgICAgIHsNCiAgICAgICAgIG5vZGUtPlNldERpbW1lZCggYVZhbHVl ICk7DQpAQCAtOTc3LDcgKzk2Niw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0TWVudUl0 ZW1PYnNlcnYNCiAgICAgew0KICAgICBDTWVudUl0ZW0qIG5vZGUgPSBOVUxMOw0KICAgICBub2Rl ID0gRmluZE5vZGVCeUlkKCBpTWVudVJvb3QsIGFDbWRJZCApOw0KLSAgICANCisNCiAgICAgaWYg KCBub2RlICkNCiAgICAgICAgIHsNCiAgICAgICAgIG5vZGUtPlNldENhbGxiYWNrKCBhT25TZWxl Y3RDYWxsYmFjayApOw0KQEAgLTk5NSw3ICs5ODQsNyBAQCBXaWRnZXRFdmVudEhhbmRsZXIqIENX aWRnZXRFeHRlbnNpb246Ok1lDQogICAgIHsNCiAgICAgQ01lbnVJdGVtKiBub2RlID0gTlVMTDsN CiAgICAgbm9kZSA9IEZpbmROb2RlQnlJZCggaU1lbnVSb290LCBhQ21kSWQgKTsNCi0gICAgDQor DQogICAgIGlmICggbm9kZSApDQogICAgICAgICB7DQogICAgICAgICByZXR1cm4gbm9kZS0+Q2Fs bGJhY2soKTsNCkBAIC0xMDAzLDcgKzk5Miw3IEBAIFdpZGdldEV2ZW50SGFuZGxlciogQ1dpZGdl dEV4dGVuc2lvbjo6TWUNCiAgICAgZWxzZQ0KICAgICAgICAgew0KICAgICAgICAgcmV0dXJuIE5V TEw7DQotICAgICAgICB9ICAgICAgICANCisgICAgICAgIH0NCiAgICAgfQ0KIA0KIA0KQEAgLTEx NTUsNyArMTE0NCw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6SGlkZVNvZnRrZXlzKCApDQog ICAgIHsNCiAgICAgaVdpZGdldENhbGxiYWNrLT5TZXRTb2Z0a2V5c1Zpc2libGUoRUZhbHNlKTsN CiAgICAgfQ0KLSAgICANCisNCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vIENXaWRnZXRF eHRlbnNpb246OlNob3dTb2Z0a2V5cw0KIC8vDQpAQCAtMTIwMCw5ICsxMTg5LDkgQEAgdm9pZCBD V2lkZ2V0RXh0ZW5zaW9uOjpTZXREaXNwbGF5UG9ydHJhaQ0KIC8vIC0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0NCiAvLw0KIENNZW51SXRlbSogQ01lbnVJdGVtOjpOZXdMKA0KLSAgICBjb25zdCBURGVzQzE2 JiBhVGV4dCwgVEludCBhQ21kSWQsIENNZW51SXRlbSogYVBhcmVudCwgdm9pZCogYU9iaiApDQor ICAgIGNvbnN0IFREZXNDMTYmIGFUZXh0LCBUSW50IGFDbWRJZCwgVEJvb2wgYURpbW1lZCwgQ01l bnVJdGVtKiBhUGFyZW50LCB2b2lkKiBhT2JqICkNCiAgICAgew0KLSAgICBDTWVudUl0ZW0qIHNl bGYgPSBuZXcgKCBFTGVhdmUgKSBDTWVudUl0ZW0oIGFUZXh0LCBhQ21kSWQsIGFQYXJlbnQsIGFP YmogKTsNCisgICAgQ01lbnVJdGVtKiBzZWxmID0gbmV3ICggRUxlYXZlICkgQ01lbnVJdGVtKCBh VGV4dCwgYUNtZElkLCBhRGltbWVkLCBhUGFyZW50LCBhT2JqICk7DQogICAgIENsZWFudXBTdGFj azo6UHVzaEwoIHNlbGYgKTsNCiAgICAgc2VsZi0+Q29uc3RydWN0TCgpOw0KICAgICBDbGVhbnVw U3RhY2s6OlBvcCgpOw0KQEAgLTEyMTcsMTEgKzEyMDYsMTMgQEAgQ01lbnVJdGVtKiBDTWVudUl0 ZW06Ok5ld0woDQogLy8gLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vDQogQ01lbnVJdGVtOjpDTWVu dUl0ZW0oDQotICAgIGNvbnN0IFREZXNDMTYmIGFUZXh0LCBUSW50IGFDbWRJZCwgQ01lbnVJdGVt KiBhUGFyZW50LCB2b2lkKiBhT2JqICkNCi0gICAgOmlDbWRJZCggYUNtZElkICksIGlQYXJlbnQo IGFQYXJlbnQgKSwgaU9iaiggYU9iaiApDQorICAgIGNvbnN0IFREZXNDMTYmIGFUZXh0LCBUSW50 IGFDbWRJZCwgVEJvb2wgYURpbW1lZCwgQ01lbnVJdGVtKiBhUGFyZW50LCB2b2lkKiBhT2JqICkN CisgICAgOmlDbWRJZCggYUNtZElkICksDQorICAgIGlQYXJlbnQoIGFQYXJlbnQgKSwNCisgICAg aU9iaiggYU9iaiApLA0KKyAgICBpRGltbWVkKGFEaW1tZWQpDQogICAgIHsNCiAgICAgaVRleHQg PSBhVGV4dC5BbGxvYygpOw0KLSAgICBpRGltbWVkID0gRUZhbHNlOw0KICAgICB9DQogDQogLy8g LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLQ0K 15766 2007-07-31 15:19:47 -0700 2007-08-01 12:55:53 -0700 Patch for 3.1 MenuPatch31.patch text/plain 10426 sriram.yadavalli SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDI0Nzk5KQ0KKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp DQpAQCAtMSwzICsxLDE2IEBADQorMjAwNy0wNy0zMSAgeWFkYXZhbGwgIDxzcmlyYW0ueWFkYXZh bGxpQG5va2lhLmNvbT4NCisNCisgICAgICAgIFJldmlld2VkIGJ5IFphbGFuIEJ1anRhcyAoemJ1 anRhc0BnbWFpbC5jb20pLg0KKyAgICAgICAgREVTQzogRml4ZXMgZm9yIE1lbnUgQVBJDQorICAg ICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0NCisNCisgICAgICAg IFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRA0KKw0KKyAgICAgICAgKiBr aHRtbC9lY21hL2tqc193aW5kb3cuY3BwOg0KKyAgICAgICAgKFdpbmRvdzo6Z2V0KToNCisgICAg ICAgICoga2h0bWwvZWNtYS9ranNfd2luZG93Lmx1dC5oOg0KKyAgICAgICAgKEtKUzo6KToNCisN CiAyMDA3LTA3LTIwIHZtYWxhaXlhLCA8dmlrcmFtLm1hbGFpeWFAbm9raWEuY29tPg0KICAgICAg ICAgUmV2aWV3ZWQgYnkgWW9uZ2p1bg0KICAgICAgICAgREVTQzogSlBLTi02WjM4RTUgLSBCcm93 c2VyIGNyYXNoZXMgYW5kIHByb2JsZW1zIHdpdGggbWVtb3J5IGxvdyBub3RlLg0KSW5kZXg6IFdl YkNvcmUva2h0bWwvZWNtYS9ranNfd2luZG93LmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUv a2h0bWwvZWNtYS9ranNfd2luZG93LmNwcAkocmV2aXNpb24gMjQ3OTMpDQorKysgV2ViQ29yZS9r aHRtbC9lY21hL2tqc193aW5kb3cuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMzEyLDcgKzMxMiw3 IEBAIGNvbnN0IENsYXNzSW5mbyBXaW5kb3c6OmluZm8gPSB7ICJXaW5kb3cNCiAgIGZyYW1lRWxl bWVudCAgV2luZG93OjpGcmFtZUVsZW1lbnQgICAgRG9udERlbGV0ZXxSZWFkT25seQ0KICAgc2hv d01vZGFsRGlhbG9nIFdpbmRvdzo6U2hvd01vZGFsRGlhbG9nICAgIERvbnREZWxldGV8RnVuY3Rp b24gMQ0KICAgd2lkZ2V0IFdpbmRvdzo6X1dpZGdldCBEb250RGVsZXRlfEZ1bmN0aW9uIDANCi0g IE1lbnUgV2luZG93OjpNZW51IERvbnREZWxldGV8UmVhZE9ubHkNCisgIG1lbnUgV2luZG93OjpN ZW51IERvbnREZWxldGV8UmVhZE9ubHkNCiAgIE1lbnVJdGVtIFdpbmRvdzo6TWVudUl0ZW0gRG9u dERlbGV0ZXxSZWFkT25seQ0KIEBlbmQNCiAqLw0KQEAgLTgyMywyNCArODIzLDEyIEBAIFZhbHVl IFdpbmRvdzo6Z2V0KEV4ZWNTdGF0ZSAqZXhlYywgY29uc3QNCiAgICAgICAgIHJldHVybiAoICgo Y29uc3RfY2FzdDxXaW5kb3cqPih0aGlzKS0+bV93aWRnZXQgPSBLV1EobV9wYXJ0KS0+Y3JlYXRl V2lkZ2V0T2JqZWN0KGV4ZWMpKSk/DQogICAgICAgICAgIFZhbHVlKGNvbnN0X2Nhc3Q8V2luZG93 Kj4odGhpcyktPm1fd2lkZ2V0KTogVW5kZWZpbmVkKCkpOw0KICAgICBjYXNlIE1lbnU6DQotICAg ICAgaWYgKCAhbV93aWRnZXQgKQ0KLSAgICAgICAgKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcykt Pm1fd2lkZ2V0ID0gS1dRKG1fcGFydCktPmNyZWF0ZVdpZGdldE9iamVjdChleGVjKSk7DQotICAg ICAgaWYgKCEoY29uc3RfY2FzdDxXaW5kb3cqPih0aGlzKS0+bV93aWRnZXQpKQ0KLSAgICAgICAg cmV0dXJuIFVuZGVmaW5lZCgpOw0KICAgICAgIGlmICggbV93aWRnZXRNZW51ICkNCiAgICAgICAg IHJldHVybiBWYWx1ZShtX3dpZGdldE1lbnUpOw0KICAgICAgIGVsc2UNCiAgICAgICAgIHJldHVy biAoICgoY29uc3RfY2FzdDxXaW5kb3cqPih0aGlzKS0+bV93aWRnZXRNZW51ID0gS1dRKG1fcGFy dCktPmNyZWF0ZVdpZGdldE1lbnVPYmplY3QoZXhlYykpKT8NCiAgICAgICAgICAgVmFsdWUoY29u c3RfY2FzdDxXaW5kb3cqPih0aGlzKS0+bV93aWRnZXRNZW51KTogVW5kZWZpbmVkKCkpOw0KICAg ICBjYXNlIE1lbnVJdGVtOg0KLSAgICAgIGlmICggIW1fd2lkZ2V0ICkNCi0gICAgICAgIChjb25z dF9jYXN0PFdpbmRvdyo+KHRoaXMpLT5tX3dpZGdldCA9IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRn ZXRPYmplY3QoZXhlYykpOw0KLSAgICAgIGlmICghKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcykt Pm1fd2lkZ2V0KSkNCi0gICAgICAgIHJldHVybiBVbmRlZmluZWQoKTsNCi0gICAgICBpZiAoICFt X3dpZGdldE1lbnUgKQ0KLSAgICAgICAgKGNvbnN0X2Nhc3Q8V2luZG93Kj4odGhpcyktPm1fd2lk Z2V0TWVudSA9IEtXUShtX3BhcnQpLT5jcmVhdGVXaWRnZXRNZW51T2JqZWN0KGV4ZWMpKTsNCi0g ICAgICBpZiAoIShjb25zdF9jYXN0PFdpbmRvdyo+KHRoaXMpLT5tX3dpZGdldE1lbnUpKQ0KLSAg ICAgICAgcmV0dXJuIFVuZGVmaW5lZCgpOw0KICAgICAgIHJldHVybiBLV1EobV9wYXJ0KS0+Y3Jl YXRlV2lkZ2V0TWVudUl0ZW1PYmplY3QoZXhlYykgPyBWYWx1ZShLV1EobV9wYXJ0KS0+Y3JlYXRl V2lkZ2V0TWVudUl0ZW1PYmplY3QoZXhlYykpOlVuZGVmaW5lZCgpOw0KICAgICBjYXNlIE1lbnVi YXI6DQogICAgICAgcmV0dXJuIFZhbHVlKG1lbnViYXIoZXhlYykpOw0KSW5kZXg6IFdlYkNvcmUv a2h0bWwvZWNtYS9ranNfd2luZG93Lmx1dC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9raHRt bC9lY21hL2tqc193aW5kb3cubHV0LmgJKHJldmlzaW9uIDI0NzkzKQ0KKysrIFdlYkNvcmUva2h0 bWwvZWNtYS9ranNfd2luZG93Lmx1dC5oCSh3b3JraW5nIGNvcHkpDQpAQCAtMSw0ICsxLDQgQEAN Ci0vKiBBdXRvbWF0aWNhbGx5IGdlbmVyYXRlZCBmcm9tIGtqc193aW5kb3cuY3BwIHVzaW5nIGNy ZWF0ZV9oYXNoX3RhYmxlLiBETyBOT1QgRURJVCAhICovDQorLyogQXV0b21hdGljYWxseSBnZW5l cmF0ZWQgZnJvbSBranNfd2luZG93LmNwcCB1c2luZyB5OlxTNjBcbXdcd2ViXFdlYkVuZ2luZVwz LjFtXEphdmFTY3JpcHRDb3JlXGtqc1xjcmVhdGVfaGFzaF90YWJsZS4gRE8gTk9UIEVESVQgISAq Lw0KIA0KIG5hbWVzcGFjZSBLSlMgew0KIA0KQEAgLTYzLDcgKzYzLDcgQEAgY29uc3Qgc3RydWN0 IEhhc2hFbnRyeSBXaW5kb3dUYWJsZUVudHJpZQ0KICAgIHsgIlJhbmdlIiwgV2luZG93OjpSYW5n ZSwgRG9udERlbGV0ZSwgMCwgJldpbmRvd1RhYmxlRW50cmllc1s5MV0gfSwNCiAgICB7ICJzdGF0 dXMiLCBXaW5kb3c6OlN0YXR1cywgRG9udERlbGV0ZSwgMCwgMCB9LA0KICAgIHsgIm9ucmVzZXQi LCBXaW5kb3c6Ok9ucmVzZXQsIERvbnREZWxldGUsIDAsIDAgfSwNCi0gICB7ICJNZW51IiwgV2lu ZG93OjpNZW51LCBEb250RGVsZXRlfFJlYWRPbmx5LCAwLCAwIH0sDQorICAgeyAwLCAwLCAwLCAw LCAwIH0sDQogICAgeyAib25zZWxlY3QiLCBXaW5kb3c6Ok9uc2VsZWN0LCBEb250RGVsZXRlLCAw LCAwIH0sDQogICAgeyAwLCAwLCAwLCAwLCAwIH0sDQogICAgeyAiZG9jdW1lbnQiLCBXaW5kb3c6 OkRvY3VtZW50LCBEb250RGVsZXRlfFJlYWRPbmx5LCAwLCAmV2luZG93VGFibGVFbnRyaWVzWzEx NV0gfSwNCkBAIC05NSw3ICs5NSw3IEBAIGNvbnN0IHN0cnVjdCBIYXNoRW50cnkgV2luZG93VGFi bGVFbnRyaWUNCiAgICB7ICJvdXRlcldpZHRoIiwgV2luZG93OjpPdXRlcldpZHRoLCBEb250RGVs ZXRlfFJlYWRPbmx5LCAwLCAmV2luZG93VGFibGVFbnRyaWVzWzEwNl0gfSwNCiAgICB7ICJnZXRT ZWxlY3Rpb24iLCBXaW5kb3c6OkdldFNlbGVjdGlvbiwgRG9udERlbGV0ZXxGdW5jdGlvbiwgMCwg JldpbmRvd1RhYmxlRW50cmllc1sxMTZdIH0sDQogICAgeyAwLCAwLCAwLCAwLCAwIH0sDQotICAg eyAiYmx1ciIsIFdpbmRvdzo6Qmx1ciwgRG9udERlbGV0ZXxGdW5jdGlvbiwgMCwgMCB9LA0KKyAg IHsgImJsdXIiLCBXaW5kb3c6OkJsdXIsIERvbnREZWxldGV8RnVuY3Rpb24sIDAsICZXaW5kb3dU YWJsZUVudHJpZXNbMTI4XSB9LA0KICAgIHsgImxvY2F0aW9uYmFyIiwgV2luZG93OjpMb2NhdGlv bmJhciwgRG9udERlbGV0ZSwgMCwgJldpbmRvd1RhYmxlRW50cmllc1sxMDddIH0sDQogICAgeyAi RE9NRXhjZXB0aW9uIiwgV2luZG93OjpET01FeGNlcHRpb24sIERvbnREZWxldGUsIDAsICZXaW5k b3dUYWJsZUVudHJpZXNbOTZdIH0sDQogICAgeyAiTWVudUl0ZW0iLCBXaW5kb3c6Ok1lbnVJdGVt LCBEb250RGVsZXRlfFJlYWRPbmx5LCAwLCAwIH0sDQpAQCAtMTQ5LDEwICsxNDksMTEgQEAgY29u c3Qgc3RydWN0IEhhc2hFbnRyeSBXaW5kb3dUYWJsZUVudHJpZQ0KICAgIHsgIm9ubW92ZSIsIFdp bmRvdzo6T25tb3ZlLCBEb250RGVsZXRlLCAwLCAwIH0sDQogICAgeyAib25zdWJtaXQiLCBXaW5k b3c6Ok9uc3VibWl0LCBEb250RGVsZXRlLCAwLCAwIH0sDQogICAgeyAib25iZWZvcmV1bmxvYWQi LCBXaW5kb3c6Ok9uYmVmb3JldW5sb2FkLCBEb250RGVsZXRlLCAwLCAwIH0sDQotICAgeyAic2hv d01vZGFsRGlhbG9nIiwgV2luZG93OjpTaG93TW9kYWxEaWFsb2csIERvbnREZWxldGV8RnVuY3Rp b24sIDEsIDAgfQ0KKyAgIHsgInNob3dNb2RhbERpYWxvZyIsIFdpbmRvdzo6U2hvd01vZGFsRGlh bG9nLCBEb250RGVsZXRlfEZ1bmN0aW9uLCAxLCAwIH0sDQorICAgeyAibWVudSIsIFdpbmRvdzo6 TWVudSwgRG9udERlbGV0ZXxSZWFkT25seSwgMCwgMCB9DQogfTsNCiANCi1jb25zdCBzdHJ1Y3Qg SGFzaFRhYmxlIFdpbmRvd1RhYmxlID0geyAyLCAxMjgsIFdpbmRvd1RhYmxlRW50cmllcywgOTEg fTsNCitjb25zdCBzdHJ1Y3QgSGFzaFRhYmxlIFdpbmRvd1RhYmxlID0geyAyLCAxMjksIFdpbmRv d1RhYmxlRW50cmllcywgOTEgfTsNCiANCiB9IC8vIG5hbWVzcGFjZQ0KIA0KSW5kZXg6IFdlYktp dC9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAy NDc5OSkNCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpDQpAQCAtMSwzICsxLDE2 IEBADQorMjAwNy0wNy0zMSAgeWFkYXZhbGwgIDxzcmlyYW0ueWFkYXZhbGxpQG5va2lhLmNvbT4N CisNCisgICAgICAgIFJldmlld2VkIGJ5IFphbGFuIEJ1anRhcyAoemJ1anRhc0BnbWFpbC5jb20p Lg0KKyAgICAgICAgREVTQzogRml4ZXMgZm9yIE1lbnUgQVBJDQorICAgICAgICBodHRwOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDc2Mw0KKw0KKyAgICAgICAgKiBCcm93c2Vy Vmlldy9pbmMvV2lkZ2V0RXh0ZW5zaW9uLmg6DQorICAgICAgICAqIEJyb3dzZXJWaWV3L3NyYy9X aWRnZXRFeHRlbnNpb24uY3BwOg0KKyAgICAgICAgKENXaWRnZXRFeHRlbnNpb246OkFkZE1lbnVJ dGVtKToNCisgICAgICAgIChDV2lkZ2V0RXh0ZW5zaW9uOjpBZGRPcHRpb25zTWVudUl0ZW0pOg0K KyAgICAgICAgKENNZW51SXRlbTo6TmV3TCk6DQorICAgICAgICAoaURpbW1lZCk6DQorDQogMjAw Ny0wNy0xOSAgaG9uZ3poYW8gIDxob25nLmEuemhhb0Bub2tpYS5jb20+DQogDQogICAgICAgICBS ZXZpZXdlZCBieSBTYWNoaW4uDQpJbmRleDogV2ViS2l0L0Jyb3dzZXJWaWV3L2luYy9XaWRnZXRF eHRlbnNpb24uaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9Ccm93c2VyVmlldy9pbmMvV2lkZ2V0 RXh0ZW5zaW9uLmgJKHJldmlzaW9uIDI0NzkzKQ0KKysrIFdlYktpdC9Ccm93c2VyVmlldy9pbmMv V2lkZ2V0RXh0ZW5zaW9uLmgJKHdvcmtpbmcgY29weSkNCkBAIC0xOTEsNyArMTkxLDcgQEAgY2xh c3MgQ1dpZGdldEV4dGVuc2lvbjogcHVibGljIENCYXNlLCBwdQ0KICAgICAgICAgKiBAcGFyYW0g Y29tbWFuZCBJRCBvZiB0aGUgcGFyZW50IG1lbnUgaXRlbQ0KICAgICAgICAgKiBAcmV0dXJuIEVy cm9yIGNvZGUNCiAgICAgICAgICovDQotICAgICAgICBUSW50IEFkZE9wdGlvbnNNZW51SXRlbSgg Y29uc3QgVERlc0MmIGFUZXh0LCBUSW50IGFDbWRJZCwgVEludCBhUGFyZW50Q21kSWQsIHZvaWQq IG9iaiApOw0KKyAgICAgICAgVEludCBBZGRPcHRpb25zTWVudUl0ZW0oIGNvbnN0IFREZXNDJiBh VGV4dCwgVEludCBhQ21kSWQsIFRCb29sIGFEaW1tZWQsIFRJbnQgYVBhcmVudENtZElkLCB2b2lk KiBvYmogKTsNCiANCiAgICAgICAgIC8qKg0KICAgICAgICAgKiBNZXRob2QgU2V0UmlnaHRTb2Z0 S2V5TGFiZWwNCkBAIC0zMDUsMTMgKzMwNSw2IEBAIGNsYXNzIENXaWRnZXRFeHRlbnNpb246IHB1 YmxpYyBDQmFzZSwgcHUNCiAgICAgICAgICovDQogICAgICAgICBURGVzQyYgR2V0V2lkZ2V0QnVu ZGxlSWQoKSB7IHJldHVybiAqaVdpZGdldEJ1bmRsZUlkOyB9DQogDQotICAgICAgICAvKioNCi0g ICAgICAgICogTWV0aG9kIFNldFNjcm9sbEJhcg0KLSAgICAgICAgKiBAc2luY2UgMy4yDQotICAg ICAgICAqIEBwYXJhbSBUQm9vbCB2aXNpYmxlDQotICAgICAgICAqIEByZXR1cm4gdm9pZA0KLSAg ICAgICAgKi8NCi0gICAgICAgIHZvaWQgU2V0U2Nyb2xsQmFyKCBUQm9vbCBhVmlzaWJsZSApOw0K IA0KICAgICAgICAgLyoqDQogICAgICAgICAqIE1ldGhvZCBTZXROYXZpZ2F0aW9uRW5hYmxlZA0K QEAgLTYxMCw3ICs2MDMsNyBAQCBjbGFzcyBDTWVudUl0ZW0gOiBwdWJsaWMgQ0Jhc2UNCiAgICAg ICAgIC8qKg0KICAgICAgICAgKiBDb25zdHJ1Y3RvciAgICAgICANCiAgICAgICAgICovDQotICAg ICAgICBzdGF0aWMgQ01lbnVJdGVtKiBOZXdMKCBjb25zdCBURGVzQzE2JiBhVGV4dCwgVEludCBh Q21kSWQsIA0KKyAgICAgICAgc3RhdGljIENNZW51SXRlbSogTmV3TCggY29uc3QgVERlc0MxNiYg YVRleHQsIFRJbnQgYUNtZElkLCBUQm9vbCBhRGltbWVkID0gRUZhbHNlLA0KICAgICAgICAgICAg IENNZW51SXRlbSogYVBhcmVudCA9IE5VTEwsIHZvaWQqIGFPYmogPSBOVUxMICk7DQogDQogICAg ICAgICAvKioNCkBAIC02MjcsNyArNjIwLDcgQEAgY2xhc3MgQ01lbnVJdGVtIDogcHVibGljIENC YXNlDQogICAgICAgICAvKioNCiAgICAgICAgICogQysrIGNvbnN0cnVjdG9yLg0KICAgICAgICAg Ki8NCi0gICAgICAgIENNZW51SXRlbSggY29uc3QgVERlc0MxNiYgYVRleHQsIFRJbnQgYUNtZElk LCBDTWVudUl0ZW0qIGFQYXJlbnQgPSBOVUxMLA0KKyAgICAgICAgQ01lbnVJdGVtKCBjb25zdCBU RGVzQzE2JiBhVGV4dCwgVEludCBhQ21kSWQsIFRCb29sIGFEaW1tZWQsIENNZW51SXRlbSogYVBh cmVudCA9IE5VTEwsDQogICAgICAgICAgICAgdm9pZCogYU9iaiA9IE5VTEwgKTsgICAgICAgDQog DQogICAgIHB1YmxpYzoNCkluZGV4OiBXZWJLaXQvQnJvd3NlclZpZXcvc3JjL1dpZGdldEV4dGVu c2lvbi5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvQnJvd3NlclZpZXcvc3JjL1dpZGdldEV4 dGVuc2lvbi5jcHAJKHJldmlzaW9uIDI0NzkzKQ0KKysrIFdlYktpdC9Ccm93c2VyVmlldy9zcmMv V2lkZ2V0RXh0ZW5zaW9uLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTMwOCw5ICszMDgsNiBAQCB2 b2lkIENXaWRnZXRFeHRlbnNpb246OlNldFByZWZlcmVuY2VGb3JLDQogLy8NCiAvLyAtLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tDQogLy8NCi12b2lkIENXaWRnZXRFeHRlbnNpb246OlNldFNjcm9sbEJhcigg VEJvb2wgLyphVmlzaWJsZSovICkNCi0gICAgew0KLSAgICB9DQogDQogLy8gLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLQ0KIC8vIENXaWRnZXRFeHRlbnNpb246OlNldE5hdmlnYXRpb25FbmFibGVkDQpAQCAt NDg2LDcgKzQ4Myw3IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6QWRkTWVudUl0ZW0oIENFaWsN CiAgICAgZW50cnkucGFyZW50Q21kSWQgPSBhTm9kZS0+Q21kSWQoKTsNCiAgICAgaUNhc2NhZGVB cnIuQXBwZW5kKCBlbnRyeSApOw0KIA0KLSAgICBhTWVudVBhbmUuSW5zZXJ0TWVudUl0ZW1MKCBt ZW51RGF0YSwgYU1lbnVQYW5lLk51bWJlck9mSXRlbXNJblBhbmUoKS0xICk7DQorICAgIGFNZW51 UGFuZS5JbnNlcnRNZW51SXRlbUwoIG1lbnVEYXRhLCBNYXgoYU1lbnVQYW5lLk51bWJlck9mSXRl bXNJblBhbmUoKS0xLDApICk7DQogICAgIGFNZW51UGFuZS5TZXRJdGVtRGltbWVkKCBhTm9kZS0+ Q21kSWQoKStLTWVudUl0ZW1Db21tYW5kSWRCYXNlLCBhTm9kZS0+RGltbWVkKCkgKTsNCiAgICAg fQ0KIA0KQEAgLTY2Niw3ICs2NjMsNyBAQCB2b2lkIENXaWRnZXRFeHRlbnNpb246OlNldFBhcmFt TCgNCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KIC8vDQogVEludCBDV2lkZ2V0RXh0ZW5zaW9u OjpBZGRPcHRpb25zTWVudUl0ZW0oIA0KLSAgICBjb25zdCBURGVzQyYgYVRleHQsIFRJbnQgYUNt ZElkLCBUSW50IGFQYXJlbnRJZCwgdm9pZCogYU9iaiApDQorICAgIGNvbnN0IFREZXNDJiBhVGV4 dCwgVEludCBhQ21kSWQsIFRCb29sIGFEaW1tZWQsIFRJbnQgYVBhcmVudElkLCB2b2lkKiBhT2Jq ICkNCiAgICAgeyAgIA0KICAgICBpZiAoICFpTWVudVJvb3QgKSANCiAgICAgICAgIHsgDQpAQCAt Njk0LDcgKzY5MSw3IEBAIFRJbnQgQ1dpZGdldEV4dGVuc2lvbjo6QWRkT3B0aW9uc01lbnVJdGUN CiAgICAgICAgICAgICByZXR1cm4gS0VyckFscmVhZHlFeGlzdHM7DQogICAgICAgICAgICAgfQ0K ICAgICAgICAgICAgICAgICAgICAgDQotICAgICAgICBpdGVtID0gQ01lbnVJdGVtOjpOZXdMKCBh VGV4dCwgYUNtZElkLCBwYXJlbnQsIGFPYmogKTsgDQorICAgICAgICBpdGVtID0gQ01lbnVJdGVt OjpOZXdMKCBhVGV4dCwgYUNtZElkLCBhRGltbWVkLCBwYXJlbnQsIGFPYmogKTsNCiAgICAgICAg IHJldHVybiBBcHBlbmQoIHBhcmVudCwgaXRlbSApOyAgICANCiAgICAgICAgIH0NCiAgICAgICAg IA0KQEAgLTEyMDAsOSArMTE5Nyw5IEBAIHZvaWQgQ1dpZGdldEV4dGVuc2lvbjo6U2V0RGlzcGxh eVBvcnRyYWkNCiAvLyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQogLy8NCiBDTWVudUl0ZW0qIENNZW51 SXRlbTo6TmV3TCgNCi0gICAgY29uc3QgVERlc0MxNiYgYVRleHQsIFRJbnQgYUNtZElkLCBDTWVu dUl0ZW0qIGFQYXJlbnQsIHZvaWQqIGFPYmogKQ0KKyAgICBjb25zdCBURGVzQzE2JiBhVGV4dCwg VEludCBhQ21kSWQsIFRCb29sIGFEaW1tZWQsIENNZW51SXRlbSogYVBhcmVudCwgdm9pZCogYU9i aiApDQogICAgIHsNCi0gICAgQ01lbnVJdGVtKiBzZWxmID0gbmV3ICggRUxlYXZlICkgQ01lbnVJ dGVtKCBhVGV4dCwgYUNtZElkLCBhUGFyZW50LCBhT2JqICk7DQorICAgIENNZW51SXRlbSogc2Vs ZiA9IG5ldyAoIEVMZWF2ZSApIENNZW51SXRlbSggYVRleHQsIGFDbWRJZCwgYURpbW1lZCwgYVBh cmVudCwgYU9iaiApOw0KICAgICBDbGVhbnVwU3RhY2s6OlB1c2hMKCBzZWxmICk7DQogICAgIHNl bGYtPkNvbnN0cnVjdEwoKTsNCiAgICAgQ2xlYW51cFN0YWNrOjpQb3AoKTsNCkBAIC0xMjE3LDEx ICsxMjE0LDEzIEBAIENNZW51SXRlbSogQ01lbnVJdGVtOjpOZXdMKA0KIC8vIC0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0NCiAvLw0KIENNZW51SXRlbTo6Q01lbnVJdGVtKA0KLSAgICBjb25zdCBURGVzQzE2 JiBhVGV4dCwgVEludCBhQ21kSWQsIENNZW51SXRlbSogYVBhcmVudCwgdm9pZCogYU9iaiApDQot ICAgIDppQ21kSWQoIGFDbWRJZCApLCBpUGFyZW50KCBhUGFyZW50ICksIGlPYmooIGFPYmogKQ0K KyAgICBjb25zdCBURGVzQzE2JiBhVGV4dCwgVEludCBhQ21kSWQsIFRCb29sIGFEaW1tZWQsIENN ZW51SXRlbSogYVBhcmVudCwgdm9pZCogYU9iaiApDQorICAgIDppQ21kSWQoIGFDbWRJZCApLA0K KyAgICBpUGFyZW50KCBhUGFyZW50ICksDQorICAgIGlPYmooIGFPYmogKSwNCisgICAgaURpbW1l ZChhRGltbWVkKQ0KICAgICB7DQogICAgIGlUZXh0ID0gYVRleHQuQWxsb2MoKTsNCi0gICAgaURp bW1lZCA9IEVGYWxzZTsNCiAgICAgfQ0KIA0KIC8vIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCg==