139932 2014-12-23 19:56:27 -0800 [EFL][WK2] Fix a lot of build break since r177692 2014-12-23 20:09:26 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 139909 1 gyuyoung.kim gyuyoung.kim lucas.de.marchi oldest_to_newest 1057739 0 gyuyoung.kim 2014-12-23 19:56:27 -0800 r177692 renamed WebContext with WebProcessPool. It caused a lot of build breaks on EFL and GTK ports. This patch only handles EFL port on WK2. 1057741 1 243724 gyuyoung.kim 2014-12-23 20:02:58 -0800 Created attachment 243724 Patch 1057743 2 243724 gyuyoung.kim 2014-12-23 20:09:19 -0800 Comment on attachment 243724 Patch Clearing flags on attachment: 243724 Committed r177716: <http://trac.webkit.org/changeset/177716> 1057744 3 gyuyoung.kim 2014-12-23 20:09:26 -0800 All reviewed patches have been landed. Closing bug. 243724 2014-12-23 20:02:58 -0800 2014-12-23 20:02:58 -0800 Patch bug-139932-20141224130257.patch text/plain 36100 gyuyoung.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NzA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODBjMmNiNzVlOTRlNjQ5 MDE2YjAzYmVmMWM3NGRjYzU5YjE0MzMxOC4uODg5MDljOWY0MzJiODU5YjVkNTFhMzM5OWUyOGQ1 M2IzZjgzZDUwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDgyIEBACisyMDE0LTEyLTIzICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF1bV0sy XSBGaXggYSBsb3Qgb2YgYnVpbGQgYnJlYWsgc2luY2UgcjE3NzY5MiAKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTkzMgorCisgICAgICAgIFVucmV2 aWV3ZWQgRUZMIGJ1aWxkIGZpeC4KKworICAgICAgICBSZW5hbWUgV2ViQ29udGV4dCB3aXRoIFdl YlByb2Nlc3NQb29sIGluIEVGTCBwb3J0IGZpbGVzLgorCisgICAgICAgICogQ01ha2VMaXN0cy50 eHQ6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHA6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9jb250ZXh0LmNwcDoKKyAgICAgICAgKFRFU1RfRik6Cisg ICAgICAgICogVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlZpZXc6OldlYlZpZXcpOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db29y ZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvTmV0d29yay9D dXN0b21Qcm90b2NvbHMvc291cC9DdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eVNvdXAuY3BwOgor ICAgICAgICAoV2ViS2l0OjpDdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eTo6Q3VzdG9tUHJvdG9j b2xNYW5hZ2VyUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpDdXN0b21Qcm90b2NvbE1hbmFnZXJQ cm94eTo6c3RhcnRMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xNYW5h Z2VyUHJveHk6OnN0b3BMb2FkaW5nKToKKyAgICAgICAgKiBVSVByb2Nlc3MvTmV0d29yay9DdXN0 b21Qcm90b2NvbHMvc291cC9XZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyOjpj cmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFu YWdlcjo6V2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXIpOgorICAgICAgICAoV2Vi S2l0OjpXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlcjo6cmVnaXN0ZXJTY2hlbWVG b3JDdXN0b21Qcm90b2NvbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlNvdXBDdXN0b21Qcm90b2Nv bFJlcXVlc3RNYW5hZ2VyOjp1bnJlZ2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2wpOgorICAg ICAgICAoV2ViS2l0OjpXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlcjo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6V2ViU291cEN1c3RvbVByb3RvY29sUmVx dWVzdE1hbmFnZXI6OmRpZExvYWREYXRhKToKKyAgICAgICAgKFdlYktpdDo6V2ViU291cEN1c3Rv bVByb3RvY29sUmVxdWVzdE1hbmFnZXI6OmRpZEZhaWxXaXRoRXJyb3IpOgorICAgICAgICAoV2Vi S2l0OjpXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlcjo6ZGlkRmluaXNoTG9hZGlu Zyk6CisgICAgICAgICogVUlQcm9jZXNzL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvV2Vi U291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViQmF0dGVyeU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkJhdHRlcnlN YW5hZ2VyUHJveHk6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkJhdHRlcnlNYW5hZ2Vy UHJveHk6OldlYkJhdHRlcnlNYW5hZ2VyUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJCYXR0 ZXJ5TWFuYWdlclByb3h5Ojpwcm92aWRlckRpZENoYW5nZUJhdHRlcnlTdGF0dXMpOgorICAgICAg ICAoV2ViS2l0OjpXZWJCYXR0ZXJ5TWFuYWdlclByb3h5Ojpwcm92aWRlclVwZGF0ZUJhdHRlcnlT dGF0dXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclByb3h5Lmg6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlRleHRDaGVja2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 dXBkYXRlU3RhdGVGb3JBbGxDb250ZXh0cyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlZpYnJh dGlvblByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmlicmF0aW9uUHJveHk6OldlYlZp YnJhdGlvblByb3h5KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlicmF0aW9uUHJveHk6On5XZWJW aWJyYXRpb25Qcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL2VmbC9SZXF1ZXN0TWFuYWdlckNs aWVudEVmbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybURlZmF1bHRBcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnBsYXRm b3JtSW5pdGlhbGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9v bDo6cGxhdGZvcm1JbnZhbGlkYXRlQ29udGV4dCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nl c3NQb29sOjpwbGF0Zm9ybURlZmF1bHRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeSk6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybURlZmF1bHRJbmRleGVkREJEYXRhYmFz ZURpcmVjdG9yeSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybURl ZmF1bHRJY29uRGF0YWJhc2VQYXRoKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6 OnBsYXRmb3JtRGVmYXVsdExvY2FsU3RvcmFnZURpcmVjdG9yeSk6CisgICAgICAgIChXZWJLaXQ6 OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybURlZmF1bHRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5 KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OnBsYXRmb3JtRGVmYXVsdERpc2tD YWNoZURpcmVjdG9yeSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9y bURlZmF1bHRDb29raWVTdG9yYWdlRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJv Y2Vzc1Bvb2w6OnNldElnbm9yZVRMU0Vycm9ycyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRl eHQ6OnBsYXRmb3JtRGVmYXVsdEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpOiBEZWxldGVkLgor ICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNz KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1JbnZhbGlk YXRlQ29udGV4dCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRm b3JtRGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rv cnkpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1 bHRJY29uRGF0YWJhc2VQYXRoKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4 dDo6cGxhdGZvcm1EZWZhdWx0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KTogRGVsZXRlZC4KKyAgICAg ICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cGxhdGZvcm1EZWZhdWx0TWVkaWFLZXlzU3RvcmFnZURp cmVjdG9yeSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3Jt RGVmYXVsdERpc2tDYWNoZURpcmVjdG9yeSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6Oldl YkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdENvb2tpZVN0b3JhZ2VEaXJlY3RvcnkpOiBEZWxldGVk LgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpzZXRJZ25vcmVUTFNFcnJvcnMpOiBEZWxl dGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvV2ViSW5zcGVjdG9yUHJveHlFZmwuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JQcm94eTo6cGxhdGZvcm1DcmVhdGVJbnNwZWN0 b3JQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYlZpZXdFZmwuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3OjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3RWZs OjpXZWJWaWV3RWZsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1dlYlZpZXdFZmwuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3Mvc291cC9XZWJDb250ZXh0U291cC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzcyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnBsYXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9j ZXNzKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3Mvc291cC9XZWJDb29raWVNYW5hZ2Vy UHJveHlTb3VwLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQ29va2llTWFuYWdlclByb3h5Ojpz ZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZSk6CisgICAgICAgICogVUlQcm9jZXNzL3NvdXAvV2Vi U291cFJlcXVlc3RNYW5hZ2VyUHJveHkuaDoKKwogMjAxNC0xMi0yMyAgQ2hyaXMgRHVtZXogIDxj ZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgaU9TIGJ1aWxkIGZpeCBhZnRl ciAxNzc2OTIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DTWFrZUxpc3RzLnR4dCBiL1Nv dXJjZS9XZWJLaXQyL0NNYWtlTGlzdHMudHh0CmluZGV4IDdmMmE2ZjdjY2M3OGQ2NzU4MmRlZDZh MzBhNWE4OWM0ZmU3YjUwNWUuLjRlZGEyN2Y1ZDVmMzQ3M2U0NmQzNTA3YjdiNDA5ZDUwNTgxOWI2 MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJj ZS9XZWJLaXQyL0NNYWtlTGlzdHMudHh0CkBAIC0xODYsNiArMTg2LDcgQEAgc2V0KFdlYktpdDJf U09VUkNFUwogCiAgICAgU2hhcmVkL0FQSS9BUElBcnJheS5jcHAKICAgICBTaGFyZWQvQVBJL0FQ SURhdGEuY3BwCisgICAgU2hhcmVkL0FQSS9BUElEaWN0aW9uYXJ5LmNwcAogICAgIFNoYXJlZC9B UEkvQVBJRXJyb3IuY3BwCiAgICAgU2hhcmVkL0FQSS9BUElGcmFtZUhhbmRsZS5jcHAKICAgICBT aGFyZWQvQVBJL0FQSUdlb21ldHJ5LmNwcApAQCAtMjA1LDkgKzIwNiw3IEBAIHNldChXZWJLaXQy X1NPVVJDRVMKICAgICBTaGFyZWQvRGljdGlvbmFyeVBvcHVwSW5mby5jcHAKICAgICBTaGFyZWQv RWRpdG9yU3RhdGUuY3BwCiAgICAgU2hhcmVkL0ZvbnRJbmZvLmNwcAotICAgIFNoYXJlZC9JbW11 dGFibGVEaWN0aW9uYXJ5LmNwcAogICAgIFNoYXJlZC9MYXllclRyZWVDb250ZXh0LmNwcAotICAg IFNoYXJlZC9NdXRhYmxlRGljdGlvbmFyeS5jcHAKICAgICBTaGFyZWQvTmF2aWdhdGlvbkFjdGlv bkRhdGEuY3BwCiAgICAgU2hhcmVkL09yaWdpbkFuZERhdGFiYXNlcy5jcHAKICAgICBTaGFyZWQv UGxhdGZvcm1Qb3B1cE1lbnVEYXRhLmNwcApAQCAtMjk2LDggKzI5NSw4IEBAIHNldChXZWJLaXQy X1NPVVJDRVMKICAgICBTaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbk1vZHVs ZU5vbmUuY3BwCiAgICAgU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvUGx1Z2luSW5mb3JtYXRpb24u Y3BwCiAKLSAgICBVSVByb2Nlc3MvQVBJQ29udGV4dENvbmZpZ3VyYXRpb24uY3BwCiAgICAgVUlQ cm9jZXNzL0FQSU5hdmlnYXRpb25EYXRhLmNwcAorICAgIFVJUHJvY2Vzcy9BUElQcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24uY3BwCiAgICAgVUlQcm9jZXNzL0FQSVNlc3Npb24uY3BwCiAgICAgVUlQ cm9jZXNzL0JhY2tpbmdTdG9yZS5jcHAKICAgICBVSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eS5j cHAKQEAgLTMyMCw3ICszMTksNyBAQCBzZXQoV2ViS2l0Ml9TT1VSQ0VTCiAgICAgVUlQcm9jZXNz L1dlYkJhdHRlcnlQcm92aWRlci5jcHAKICAgICBVSVByb2Nlc3MvV2ViQ29sb3JQaWNrZXIuY3Bw CiAgICAgVUlQcm9jZXNzL1dlYkNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCi0gICAgVUlQcm9j ZXNzL1dlYkNvbnRleHQuY3BwCisgICAgVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAogICAg IFVJUHJvY2Vzcy9XZWJDb250ZXh0Q2xpZW50LmNwcAogICAgIFVJUHJvY2Vzcy9XZWJDb250ZXh0 Q29ubmVjdGlvbkNsaWVudC5jcHAKICAgICBVSVByb2Nlc3MvV2ViQ29udGV4dEluamVjdGVkQnVu ZGxlQ2xpZW50LmNwcApAQCAtNjAwLDcgKzU5OSw3IEBAIHNldChXZWJLaXQyX01FU1NBR0VTX0lO X0ZJTEVTCiAgICAgVUlQcm9jZXNzL1Zpc2l0ZWRMaW5rUHJvdmlkZXIubWVzc2FnZXMuaW4KICAg ICBVSVByb2Nlc3MvV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eS5tZXNzYWdlcy5pbgog ICAgIFVJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclByb3h5Lm1lc3NhZ2VzLmluCi0gICAgVUlQ cm9jZXNzL1dlYkNvbnRleHQubWVzc2FnZXMuaW4KKyAgICBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bv b2wubWVzc2FnZXMuaW4KICAgICBVSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5Lm1lc3Nh Z2VzLmluCiAgICAgVUlQcm9jZXNzL1dlYkRhdGFiYXNlTWFuYWdlclByb3h5Lm1lc3NhZ2VzLmlu CiAgICAgVUlQcm9jZXNzL1dlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHkubWVzc2FnZXMuaW4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAKaW5kZXggZmY4MWQ0 ZmQ5NDAwYWMxODA5MmZlMGM0ZDA0M2I1NGI4ZGZlNDNjZC4uMTg3MWYyNmI0NTU0OGUzMzIzOGZi YjliYTFiNGJhMzU2Yjk2ZTU3MCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvRXdrVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlldy5jcHAKQEAgLTQ3LDExICs0NywxMSBAQAogI2luY2x1ZGUgIldLU3RyaW5nLmgi CiAjaW5jbHVkZSAiV0tWaWV3LmgiCiAjaW5jbHVkZSAiV0tWaWV3RWZsLmgiCi0jaW5jbHVkZSAi V2ViQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYkltYWdlLmgiCiAjaW5jbHVkZSAiV2ViUGFnZUdy b3VwLmgiCiAjaW5jbHVkZSAiV2ViUGFnZVByb3h5LmgiCiAjaW5jbHVkZSAiV2ViUHJlZmVyZW5j ZXMuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUG9vbC5oIgogI2luY2x1ZGUgImV3a19iYWNrX2Zv cndhcmRfbGlzdF9wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX2NvbG9yX3BpY2tlcl9wcml2YXRl LmgiCiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfbWVudV9pdGVtX3ByaXZhdGUuaCIKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcAppbmRleCA4MTQ5 NjIyMjFhNmVhYjY0NjgyMjM2OTk3NjBmZTE3MGRlYzg5NjAzLi45NTJiMzNlYmM0Nzk1ODE4OWRh M2NiZDVkNTkzZmEyMjNkMmIxYTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCkBAIC0zMCw4ICszMCw4IEBACiAjaW5jbHVkZSAiV0tD b250ZXh0U291cC5oIgogI2luY2x1ZGUgIldLTnVtYmVyLmgiCiAjaW5jbHVkZSAiV0tTdHJpbmcu aCIKLSNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViSWNvbkRhdGFiYXNlLmgi CisjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIKICNpbmNsdWRlICJld2tfYXBwbGljYXRpb25f Y2FjaGVfbWFuYWdlcl9wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX2NvbnRleHRfcHJpdmF0ZS5o IgogI2luY2x1ZGUgImV3a19jb29raWVfbWFuYWdlcl9wcml2YXRlLmgiCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29udGV4dC5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfY29u dGV4dC5jcHAKaW5kZXggZGJiNjg3ODllYWE3YjQxYjBhOGU1NWE2YmIwZjBkOTA0NWFiYjBmYS4u ZDU0MTkyMDg2MDBiMjQ0NzEyYmY2MmNjYTRjZDcyNmQ3YzBjNGQzYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2NvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9j b250ZXh0LmNwcApAQCAtMTkzLDggKzE5Myw4IEBAIFRFU1RfRihFV0syQ29udGV4dFRlc3QsIGV3 a19jb250ZXh0X25ldHdvcmtfcHJvY2Vzc19tb2RlbCkKIAogICAgIEFTU0VSVF9FUSh3ZWJWaWV3 MVdlYlByb2Nlc3NJRCwgd2ViVmlldzJXZWJQcm9jZXNzSUQpOwogCi0gICAgQVNTRVJUX1RSVUUo dG9JbXBsKEVXS1ZpZXdHZXRXS1ZpZXcod2ViVmlldzEpKS0+cGFnZSgpLT5wcm9jZXNzKCkuY29u dGV4dCgpLm5ldHdvcmtQcm9jZXNzKCkgPT0gbnVsbHB0cik7Ci0gICAgQVNTRVJUX1RSVUUodG9J bXBsKEVXS1ZpZXdHZXRXS1ZpZXcod2ViVmlldzIpKS0+cGFnZSgpLT5wcm9jZXNzKCkuY29udGV4 dCgpLm5ldHdvcmtQcm9jZXNzKCkgPT0gbnVsbHB0cik7CisgICAgQVNTRVJUX1RSVUUodG9JbXBs KEVXS1ZpZXdHZXRXS1ZpZXcod2ViVmlldzEpKS0+cGFnZSgpLT5wcm9jZXNzKCkucHJvY2Vzc1Bv b2woKS5uZXR3b3JrUHJvY2VzcygpID09IG51bGxwdHIpOworICAgIEFTU0VSVF9UUlVFKHRvSW1w bChFV0tWaWV3R2V0V0tWaWV3KHdlYlZpZXcyKSktPnBhZ2UoKS0+cHJvY2VzcygpLnByb2Nlc3NQ b29sKCkubmV0d29ya1Byb2Nlc3MoKSA9PSBudWxscHRyKTsKIH0KIAogCkBAIC0yMTMsOCArMjEz LDggQEAgVEVTVF9GKEVXSzJDb250ZXh0VGVzdE11bHRpcGxlUHJvY2Vzc2VzLCBld2tfY29udGV4 dF9uZXR3b3JrX3Byb2Nlc3NfbW9kZWwpCiAKICAgICBQbGF0Zm9ybVByb2Nlc3NJZGVudGlmaWVy IHdlYlZpZXcxV2ViUHJvY2Vzc0lEID0gdG9JbXBsKEVXS1ZpZXdHZXRXS1ZpZXcod2ViVmlldzEp KS0+cGFnZSgpLT5wcm9jZXNzKCkucHJvY2Vzc0lkZW50aWZpZXIoKTsKICAgICBQbGF0Zm9ybVBy b2Nlc3NJZGVudGlmaWVyIHdlYlZpZXcyV2ViUHJvY2Vzc0lEID0gdG9JbXBsKEVXS1ZpZXdHZXRX S1ZpZXcod2ViVmlldzIpKS0+cGFnZSgpLT5wcm9jZXNzKCkucHJvY2Vzc0lkZW50aWZpZXIoKTsK LSAgICBQbGF0Zm9ybVByb2Nlc3NJZGVudGlmaWVyIHdlYlZpZXcxTmV0d29ya1Byb2Nlc3NJRCA9 IHRvSW1wbChFV0tWaWV3R2V0V0tWaWV3KHdlYlZpZXcxKSktPnBhZ2UoKS0+cHJvY2VzcygpLmNv bnRleHQoKS5uZXR3b3JrUHJvY2VzcygpLT5wcm9jZXNzSWRlbnRpZmllcigpOwotICAgIFBsYXRm b3JtUHJvY2Vzc0lkZW50aWZpZXIgd2ViVmlldzJOZXR3b3JrUHJvY2Vzc0lEID0gdG9JbXBsKEVX S1ZpZXdHZXRXS1ZpZXcod2ViVmlldzIpKS0+cGFnZSgpLT5wcm9jZXNzKCkuY29udGV4dCgpLm5l dHdvcmtQcm9jZXNzKCktPnByb2Nlc3NJZGVudGlmaWVyKCk7CisgICAgUGxhdGZvcm1Qcm9jZXNz SWRlbnRpZmllciB3ZWJWaWV3MU5ldHdvcmtQcm9jZXNzSUQgPSB0b0ltcGwoRVdLVmlld0dldFdL Vmlldyh3ZWJWaWV3MSkpLT5wYWdlKCktPnByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLm5ldHdvcmtQ cm9jZXNzKCktPnByb2Nlc3NJZGVudGlmaWVyKCk7CisgICAgUGxhdGZvcm1Qcm9jZXNzSWRlbnRp ZmllciB3ZWJWaWV3Mk5ldHdvcmtQcm9jZXNzSUQgPSB0b0ltcGwoRVdLVmlld0dldFdLVmlldyh3 ZWJWaWV3MikpLT5wYWdlKCktPnByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLm5ldHdvcmtQcm9jZXNz KCktPnByb2Nlc3NJZGVudGlmaWVyKCk7CiAKICAgICBBU1NFUlRfTkUod2ViVmlldzFXZWJQcm9j ZXNzSUQsIHdlYlZpZXcyV2ViUHJvY2Vzc0lEKTsKICAgICBBU1NFUlRfTkUod2ViVmlldzFXZWJQ cm9jZXNzSUQsIHdlYlZpZXcxTmV0d29ya1Byb2Nlc3NJRCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwCmluZGV4 IGRmYzY3NTE5ZmRkMzE2OTM5ZWE2ODA0MjMzMTBiMzY2ZjA1MGQ2NjAuLmY5N2Q1Y2ExODk1YTc3 MTUzZmMzMjJhN2U1MTM3YzJkZTZmOTQ4YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwCkBAIC00Nyw3ICs0 Nyw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAot V2ViVmlldzo6V2ViVmlldyhXZWJDb250ZXh0KiBjb250ZXh0LCBXZWJQYWdlR3JvdXAqIHBhZ2VH cm91cCkKK1dlYlZpZXc6OldlYlZpZXcoV2ViUHJvY2Vzc1Bvb2wqIGNvbnRleHQsIFdlYlBhZ2VH cm91cCogcGFnZUdyb3VwKQogICAgIDogbV9mb2N1c2VkKGZhbHNlKQogICAgICwgbV92aXNpYmxl KGZhbHNlKQogICAgICwgbV9vcGFjaXR5KDEuMCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuaCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dlYlZpZXcuaAppbmRleCA0N2M5MTkxMWVi OWJiZDlhMTA1ZDgyMWEwMTAwM2UwZDYzZjkzZmRmLi40YjhjODg0YjVkOWFhYmI3YmExZjE3Y2Jj YjBiZDgwNjJkYjdjNGY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29v cmRpbmF0ZWRHcmFwaGljcy9XZWJWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5oCkBAIC0zMiwxMSArMzIsMTEgQEAKICNpbmNs dWRlICJBUElPYmplY3QuaCIKICNpbmNsdWRlICJEZWZhdWx0VW5kb0NvbnRyb2xsZXIuaCIKICNp bmNsdWRlICJQYWdlQ2xpZW50LmgiCi0jaW5jbHVkZSAiV2ViQ29udGV4dC5oIgogI2luY2x1ZGUg IldlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHkuaCIKICNpbmNsdWRlICJXZWJQYWdlR3JvdXAuaCIK ICNpbmNsdWRlICJXZWJQYWdlUHJveHkuaCIKICNpbmNsdWRlICJXZWJQcmVmZXJlbmNlcy5oIgor I2luY2x1ZGUgIldlYlByb2Nlc3NQb29sLmgiCiAjaW5jbHVkZSAiV2ViVmlld0NsaWVudC5oIgog I2luY2x1ZGUgPFdlYkNvcmUvVHJhbnNmb3JtYXRpb25NYXRyaXguaD4KIApAQCAtNTEsNyArNTEs NyBAQCBjbGFzcyBXZWJWaWV3IDogcHVibGljIEFQSTo6T2JqZWN0SW1wbDxBUEk6Ok9iamVjdDo6 VHlwZTo6Vmlldz4sIHB1YmxpYyBQYWdlQ2xpZQogcHVibGljOgogICAgIHZpcnR1YWwgfldlYlZp ZXcoKTsKIAotICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlZpZXc+IGNyZWF0ZShXZWJDb250ZXh0 KiwgV2ViUGFnZUdyb3VwKik7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViVmlldz4gY3JlYXRl KFdlYlByb2Nlc3NQb29sKiwgV2ViUGFnZUdyb3VwKik7CiAKICAgICB2b2lkIGluaXRpYWxpemUo KTsKIApAQCAtMTE0LDcgKzExNCw3IEBAIHB1YmxpYzoKICAgICBkb3VibGUgb3BhY2l0eSgpIGNv bnN0IHsgcmV0dXJuIG1fb3BhY2l0eTsgfQogCiBwcm90ZWN0ZWQ6Ci0gICAgV2ViVmlldyhXZWJD b250ZXh0KiwgV2ViUGFnZUdyb3VwKik7CisgICAgV2ViVmlldyhXZWJQcm9jZXNzUG9vbCosIFdl YlBhZ2VHcm91cCopOwogICAgIENvb3JkaW5hdGVkR3JhcGhpY3NTY2VuZSogY29vcmRpbmF0ZWRH cmFwaGljc1NjZW5lKCk7CiAKICAgICB2b2lkIHVwZGF0ZVZpZXdwb3J0U2l6ZSgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL3Nv dXAvQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHlTb3VwLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9OZXR3b3JrL0N1c3RvbVByb3RvY29scy9zb3VwL0N1c3RvbVByb3RvY29sTWFuYWdl clByb3h5U291cC5jcHAKaW5kZXggZjhiZjJmMzE4ZGY2ZWY4MWZhMWU5YTM2ZmVkNjU2MWZjNjAz NzBmZS4uYThmYWJiNjQwOWJmNDAzYmJjNDgxMmUwODM2OTJhZjM5MzhmZTBmMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL3NvdXAv Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHlTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvTmV0d29yay9DdXN0b21Qcm90b2NvbHMvc291cC9DdXN0b21Qcm90b2NvbE1hbmFn ZXJQcm94eVNvdXAuY3BwCkBAIC0yMywxNSArMjMsMTUgQEAKICNpbmNsdWRlICJDaGlsZFByb2Nl c3NQcm94eS5oIgogI2luY2x1ZGUgIkN1c3RvbVByb3RvY29sTWFuYWdlck1lc3NhZ2VzLmgiCiAj aW5jbHVkZSAiQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHlNZXNzYWdlcy5oIgotI2luY2x1ZGUg IldlYkNvbnRleHQuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUG9vbC5oIgogI2luY2x1ZGUgIldl YlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyLmgiCiAjaW5jbHVkZSA8V2ViQ29yZS9S ZXNvdXJjZVJlcXVlc3QuaD4KIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLUN1c3RvbVByb3RvY29s TWFuYWdlclByb3h5OjpDdXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eShDaGlsZFByb2Nlc3NQcm94 eSogY2hpbGRQcm9jZXNzUHJveHksIFdlYkNvbnRleHQmIHdlYkNvbnRleHQpCitDdXN0b21Qcm90 b2NvbE1hbmFnZXJQcm94eTo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHkoQ2hpbGRQcm9jZXNz UHJveHkqIGNoaWxkUHJvY2Vzc1Byb3h5LCBXZWJQcm9jZXNzUG9vbCYgcHJvY2Vzc1Bvb2wpCiAg ICAgOiBtX2NoaWxkUHJvY2Vzc1Byb3h5KGNoaWxkUHJvY2Vzc1Byb3h5KQotICAgICwgbV93ZWJD b250ZXh0KHdlYkNvbnRleHQpCisgICAgLCBtX3Byb2Nlc3NQb29sKHByb2Nlc3NQb29sKQogewog ICAgIEFTU0VSVChtX2NoaWxkUHJvY2Vzc1Byb3h5KTsKICAgICBtX2NoaWxkUHJvY2Vzc1Byb3h5 LT5hZGRNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OkN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5 OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksICp0aGlzKTsKQEAgLTM5LDEyICszOSwxMiBAQCBDdXN0 b21Qcm90b2NvbE1hbmFnZXJQcm94eTo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHkoQ2hpbGRQ cm9jZXNzUHJveHkqIGNoaWxkUAogCiB2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5Ojpz dGFydExvYWRpbmcodWludDY0X3QgY3VzdG9tUHJvdG9jb2xJRCwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQogewotICAgIG1fd2ViQ29udGV4dC5zdXBwbGVtZW50PFdl YlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyPigpLT5zdGFydExvYWRpbmcoY3VzdG9t UHJvdG9jb2xJRCwgcmVxdWVzdCk7CisgICAgbV9wcm9jZXNzUG9vbC5zdXBwbGVtZW50PFdlYlNv dXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyPigpLT5zdGFydExvYWRpbmcoY3VzdG9tUHJv dG9jb2xJRCwgcmVxdWVzdCk7CiB9CiAKIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHk6 OnN0b3BMb2FkaW5nKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQpCiB7Ci0gICAgbV93ZWJDb250 ZXh0LnN1cHBsZW1lbnQ8V2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXI+KCktPnN0 b3BMb2FkaW5nKGN1c3RvbVByb3RvY29sSUQpOworICAgIG1fcHJvY2Vzc1Bvb2wuc3VwcGxlbWVu dDxXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlcj4oKS0+c3RvcExvYWRpbmcoY3Vz dG9tUHJvdG9jb2xJRCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvV2Vi U291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvV2ViU291cEN1c3RvbVByb3RvY29s UmVxdWVzdE1hbmFnZXIuY3BwCmluZGV4IDU2MjFhODZiNjdhOGM5MzZlYmVjNDcwYjkxZjUwODg4 NjIwODdiNjAuLjRjYmYxMjg3YzNjNjMxMzVhOTkxMDMxZWNkOGRjYWEwZWU2MTdmNTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL0N1c3RvbVByb3RvY29scy9z b3VwL1dlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9DdXN0b21Qcm90b2NvbHMvc291cC9XZWJTb3VwQ3Vz dG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlci5jcHAKQEAgLTIyLDcgKzIyLDcgQEAKIAogI2luY2x1 ZGUgIkFQSURhdGEuaCIKICNpbmNsdWRlICJDdXN0b21Qcm90b2NvbE1hbmFnZXJNZXNzYWdlcy5o IgotI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNzUG9vbC5oIgog I2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VFcnJvci5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVz b3VyY2VSZXF1ZXN0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJlc3BvbnNlLmg+CkBA IC00MCwxMyArNDAsMTMgQEAgY29uc3QgY2hhciogV2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVz dE1hbmFnZXI6OnN1cHBsZW1lbnROYW1lKCkKICAgICByZXR1cm4gIldlYlNvdXBDdXN0b21Qcm90 b2NvbFJlcXVlc3RNYW5hZ2VyIjsKIH0KIAotUGFzc1JlZlB0cjxXZWJTb3VwQ3VzdG9tUHJvdG9j b2xSZXF1ZXN0TWFuYWdlcj4gV2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXI6OmNy ZWF0ZShXZWJDb250ZXh0KiBjb250ZXh0KQorUGFzc1JlZlB0cjxXZWJTb3VwQ3VzdG9tUHJvdG9j b2xSZXF1ZXN0TWFuYWdlcj4gV2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXI6OmNy ZWF0ZShXZWJQcm9jZXNzUG9vbCogcHJvY2Vzc1Bvb2wpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlcihjb250ZXh0KSk7CisgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlcihw cm9jZXNzUG9vbCkpOwogfQogCi1XZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlcjo6 V2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXIoV2ViQ29udGV4dCogY29udGV4dCkK LSAgICA6IFdlYkNvbnRleHRTdXBwbGVtZW50KGNvbnRleHQpCitXZWJTb3VwQ3VzdG9tUHJvdG9j b2xSZXF1ZXN0TWFuYWdlcjo6V2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXIoV2Vi UHJvY2Vzc1Bvb2wqIHByb2Nlc3NQb29sKQorICAgIDogV2ViQ29udGV4dFN1cHBsZW1lbnQocHJv Y2Vzc1Bvb2wpCiB7CiB9CiAKQEAgLTYwLDcgKzYwLDcgQEAgdm9pZCBXZWJTb3VwQ3VzdG9tUHJv dG9jb2xSZXF1ZXN0TWFuYWdlcjo6aW5pdGlhbGl6ZUNsaWVudChjb25zdCBXS1NvdXBDdXN0b21Q cm8KIH0KIAogLy8gV2ViQ29udGV4dFN1cHBsZW1lbnQKLXZvaWQgV2ViU291cEN1c3RvbVByb3Rv Y29sUmVxdWVzdE1hbmFnZXI6OmNvbnRleHREZXN0cm95ZWQoKQordm9pZCBXZWJTb3VwQ3VzdG9t UHJvdG9jb2xSZXF1ZXN0TWFuYWdlcjo6cHJvY2Vzc1Bvb2xEZXN0cm95ZWQoKQogewogfQogCkBA IC04MCwxMCArODAsMTAgQEAgdm9pZCBXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdl cjo6ZGVyZWZXZWJDb250ZXh0U3VwcGxlbWVudCgpCiAKIHZvaWQgV2ViU291cEN1c3RvbVByb3Rv Y29sUmVxdWVzdE1hbmFnZXI6OnJlZ2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2woY29uc3Qg U3RyaW5nJiBzY2hlbWUpCiB7Ci0gICAgaWYgKCFjb250ZXh0KCkpCisgICAgaWYgKCFwcm9jZXNz UG9vbCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBjb250ZXh0KCktPnJlZ2lzdGVyU2NoZW1l Rm9yQ3VzdG9tUHJvdG9jb2woc2NoZW1lKTsKKyAgICBwcm9jZXNzUG9vbCgpLT5yZWdpc3RlclNj aGVtZUZvckN1c3RvbVByb3RvY29sKHNjaGVtZSk7CiAKICAgICBBU1NFUlQoIW1fcmVnaXN0ZXJl ZFNjaGVtZXMuY29udGFpbnMoc2NoZW1lKSk7CiAgICAgbV9yZWdpc3RlcmVkU2NoZW1lcy5hcHBl bmQoc2NoZW1lKTsKQEAgLTkxLDEwICs5MSwxMCBAQCB2b2lkIFdlYlNvdXBDdXN0b21Qcm90b2Nv bFJlcXVlc3RNYW5hZ2VyOjpyZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sKGNvbnN0CiAK IHZvaWQgV2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXI6OnVucmVnaXN0ZXJTY2hl bWVGb3JDdXN0b21Qcm90b2NvbChjb25zdCBTdHJpbmcmIHNjaGVtZSkKIHsKLSAgICBpZiAoIWNv bnRleHQoKSkKKyAgICBpZiAoIXByb2Nlc3NQb29sKCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IGNvbnRleHQoKS0+dW5yZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sKHNjaGVtZSk7Cisg ICAgcHJvY2Vzc1Bvb2woKS0+dW5yZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sKHNjaGVt ZSk7CiAKICAgICBBU1NFUlQobV9yZWdpc3RlcmVkU2NoZW1lcy5jb250YWlucyhzY2hlbWUpKTsK ICAgICBtX3JlZ2lzdGVyZWRTY2hlbWVzLnJlbW92ZShtX3JlZ2lzdGVyZWRTY2hlbWVzLmZpbmQo c2NoZW1lKSk7CkBAIC0xMTMsMzQgKzExMywzNCBAQCB2b2lkIFdlYlNvdXBDdXN0b21Qcm90b2Nv bFJlcXVlc3RNYW5hZ2VyOjpzdG9wTG9hZGluZyh1aW50NjRfdCBjdXN0b21Qcm90b2NvbElEKQog CiB2b2lkIFdlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyOjpkaWRSZWNlaXZlUmVz cG9uc2UodWludDY0X3QgY3VzdG9tUHJvdG9jb2xJRCwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VS ZXNwb25zZSYgcmVzcG9uc2UpCiB7Ci0gICAgaWYgKCFjb250ZXh0KCkpCisgICAgaWYgKCFwcm9j ZXNzUG9vbCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBjb250ZXh0KCktPm5ldHdvcmtpbmdQ cm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpDdXN0b21Qcm90b2NvbE1hbmFnZXI6 OkRpZFJlY2VpdmVSZXNwb25zZShjdXN0b21Qcm90b2NvbElELCByZXNwb25zZSwgMCksIDApOwor ICAgIHByb2Nlc3NQb29sKCktPm5ldHdvcmtpbmdQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1l c3NhZ2VzOjpDdXN0b21Qcm90b2NvbE1hbmFnZXI6OkRpZFJlY2VpdmVSZXNwb25zZShjdXN0b21Q cm90b2NvbElELCByZXNwb25zZSwgMCksIDApOwogfQogCiB2b2lkIFdlYlNvdXBDdXN0b21Qcm90 b2NvbFJlcXVlc3RNYW5hZ2VyOjpkaWRMb2FkRGF0YSh1aW50NjRfdCBjdXN0b21Qcm90b2NvbElE LCBjb25zdCBBUEk6OkRhdGEqIGRhdGEpCiB7Ci0gICAgaWYgKCFjb250ZXh0KCkpCisgICAgaWYg KCFwcm9jZXNzUG9vbCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBjb250ZXh0KCktPm5ldHdv cmtpbmdQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpDdXN0b21Qcm90b2NvbE1h bmFnZXI6OkRpZExvYWREYXRhKGN1c3RvbVByb3RvY29sSUQsIGRhdGEtPmRhdGFSZWZlcmVuY2Uo KSksIDApOworICAgIHByb2Nlc3NQb29sKCktPm5ldHdvcmtpbmdQcm9jZXNzQ29ubmVjdGlvbigp LT5zZW5kKE1lc3NhZ2VzOjpDdXN0b21Qcm90b2NvbE1hbmFnZXI6OkRpZExvYWREYXRhKGN1c3Rv bVByb3RvY29sSUQsIGRhdGEtPmRhdGFSZWZlcmVuY2UoKSksIDApOwogfQogCiB2b2lkIFdlYlNv dXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyOjpkaWRGYWlsV2l0aEVycm9yKHVpbnQ2NF90 IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3ImIGVycm9yKQog ewotICAgIGlmICghY29udGV4dCgpKQorICAgIGlmICghcHJvY2Vzc1Bvb2woKSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgY29udGV4dCgpLT5uZXR3b3JraW5nUHJvY2Vzc0Nvbm5lY3Rpb24oKS0+ c2VuZChNZXNzYWdlczo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpEaWRGYWlsV2l0aEVycm9yKGN1 c3RvbVByb3RvY29sSUQsIGVycm9yKSwgMCk7CisgICAgcHJvY2Vzc1Bvb2woKS0+bmV0d29ya2lu Z1Byb2Nlc3NDb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OkN1c3RvbVByb3RvY29sTWFuYWdl cjo6RGlkRmFpbFdpdGhFcnJvcihjdXN0b21Qcm90b2NvbElELCBlcnJvciksIDApOwogfQogCiB2 b2lkIFdlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyOjpkaWRGaW5pc2hMb2FkaW5n KHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQpCiB7Ci0gICAgaWYgKCFjb250ZXh0KCkpCisgICAg aWYgKCFwcm9jZXNzUG9vbCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBjb250ZXh0KCktPm5l dHdvcmtpbmdQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpDdXN0b21Qcm90b2Nv bE1hbmFnZXI6OkRpZEZpbmlzaExvYWRpbmcoY3VzdG9tUHJvdG9jb2xJRCksIDApOworICAgIHBy b2Nlc3NQb29sKCktPm5ldHdvcmtpbmdQcm9jZXNzQ29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2Vz OjpDdXN0b21Qcm90b2NvbE1hbmFnZXI6OkRpZEZpbmlzaExvYWRpbmcoY3VzdG9tUHJvdG9jb2xJ RCksIDApOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL0N1c3RvbVByb3RvY29scy9zb3VwL1dlYlNvdXBDdXN0 b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0 d29yay9DdXN0b21Qcm90b2NvbHMvc291cC9XZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFu YWdlci5oCmluZGV4IDJlMWI5ZmFjYjk3OWIzMGQzNjM0YzZjZGIzMTc3MDQzNmZhNmY1YTAuLjRl Nzc5N2ZhMjIyYmJjN2U5NWM2Yzc5NzRmZWI5YjE5M2RlZTA2YzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL0N1c3RvbVByb3RvY29scy9zb3VwL1dlYlNvdXBD dXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL05ldHdvcmsvQ3VzdG9tUHJvdG9jb2xzL3NvdXAvV2ViU291cEN1c3RvbVByb3RvY29sUmVx dWVzdE1hbmFnZXIuaApAQCAtMzksMTMgKzM5LDEzIEBAIGNsYXNzIFJlc291cmNlUmVzcG9uc2U7 CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1jbGFzcyBXZWJDb250ZXh0OworY2xhc3MgV2ViUHJv Y2Vzc1Bvb2w7CiAKIGNsYXNzIFdlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyIDog cHVibGljIEFQSTo6T2JqZWN0SW1wbDxBUEk6Ok9iamVjdDo6VHlwZTo6U291cEN1c3RvbVByb3Rv Y29sUmVxdWVzdE1hbmFnZXI+LCBwdWJsaWMgV2ViQ29udGV4dFN1cHBsZW1lbnQgewogcHVibGlj OgogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBzdXBwbGVtZW50TmFtZSgpOwogCi0gICAgc3RhdGlj IFBhc3NSZWZQdHI8V2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXI+IGNyZWF0ZShX ZWJDb250ZXh0Kik7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViU291cEN1c3RvbVByb3RvY29s UmVxdWVzdE1hbmFnZXI+IGNyZWF0ZShXZWJQcm9jZXNzUG9vbCopOwogICAgIHZpcnR1YWwgfldl YlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyKCk7CiAKICAgICB2b2lkIGluaXRpYWxp emVDbGllbnQoY29uc3QgV0tTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlckNsaWVudEJh c2UqKTsKQEAgLTY3LDEwICs2NywxMCBAQCBwdWJsaWM6CiAgICAgdXNpbmcgQVBJOjpPYmplY3Q6 OmRlcmVmOwogCiBwcml2YXRlOgotICAgIFdlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5h Z2VyKFdlYkNvbnRleHQqKTsKKyAgICBXZWJTb3VwQ3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdl cihXZWJQcm9jZXNzUG9vbCopOwogCiAgICAgLy8gV2ViQ29udGV4dFN1cHBsZW1lbnQKLSAgICB2 aXJ0dWFsIHZvaWQgY29udGV4dERlc3Ryb3llZCgpIG92ZXJyaWRlOworICAgIHZpcnR1YWwgdm9p ZCBwcm9jZXNzUG9vbERlc3Ryb3llZCgpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBwcm9j ZXNzRGlkQ2xvc2UoV2ViUHJvY2Vzc1Byb3h5Kikgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lk IHJlZldlYkNvbnRleHRTdXBwbGVtZW50KCkgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGRl cmVmV2ViQ29udGV4dFN1cHBsZW1lbnQoKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJCYXR0ZXJ5TWFuYWdlclByb3h5LmNwcAppbmRleCA0ZGU0YTIxOWY5 NmFiZjNjMzJlNTM4MGU0N2UxNDQwODQwYjYyYWNlLi40Y2FhNzZlM2Y2MDI5ZjVmMTVjMjhjZTFi M2ZjZDMzMjZkMzc4YWIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi QmF0dGVyeU1hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkJhdHRlcnlNYW5hZ2VyUHJveHkuY3BwCkBAIC0zMCw3ICszMCw3IEBACiAKICNpbmNsdWRlICJX ZWJCYXR0ZXJ5TWFuYWdlck1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViQmF0dGVyeU1hbmFnZXJQ cm94eU1lc3NhZ2VzLmgiCi0jaW5jbHVkZSAiV2ViQ29udGV4dC5oIgorI2luY2x1ZGUgIldlYlBy b2Nlc3NQb29sLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBAIC0zOSwxNiArMzksMTYgQEAg Y29uc3QgY2hhciogV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6c3VwcGxlbWVudE5hbWUoKQogICAg IHJldHVybiAiV2ViQmF0dGVyeU1hbmFnZXJQcm94eSI7CiB9CiAKLVJlZjxXZWJCYXR0ZXJ5TWFu YWdlclByb3h5PiBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5OjpjcmVhdGUoV2ViQ29udGV4dCogY29u dGV4dCkKK1JlZjxXZWJCYXR0ZXJ5TWFuYWdlclByb3h5PiBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5 OjpjcmVhdGUoV2ViUHJvY2Vzc1Bvb2wqIHByb2Nlc3NQb29sKQogewotICAgIHJldHVybiBhZG9w dFJlZigqbmV3IFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkoY29udGV4dCkpOworICAgIHJldHVybiBh ZG9wdFJlZigqbmV3IFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkocHJvY2Vzc1Bvb2wpKTsKIH0KIAot V2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6V2ViQmF0dGVyeU1hbmFnZXJQcm94eShXZWJDb250ZXh0 KiBjb250ZXh0KQotICAgIDogV2ViQ29udGV4dFN1cHBsZW1lbnQoY29udGV4dCkKK1dlYkJhdHRl cnlNYW5hZ2VyUHJveHk6OldlYkJhdHRlcnlNYW5hZ2VyUHJveHkoV2ViUHJvY2Vzc1Bvb2wqIHBy b2Nlc3NQb29sKQorICAgIDogV2ViQ29udGV4dFN1cHBsZW1lbnQocHJvY2Vzc1Bvb2wpCiAgICAg LCBtX2lzVXBkYXRpbmcoZmFsc2UpCiB7Ci0gICAgV2ViQ29udGV4dFN1cHBsZW1lbnQ6OmNvbnRl eHQoKS0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJCYXR0ZXJ5TWFuYWdlclByb3h5 OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksICp0aGlzKTsKKyAgICBXZWJDb250ZXh0U3VwcGxlbWVu dDo6cHJvY2Vzc1Bvb2woKS0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJCYXR0ZXJ5 TWFuYWdlclByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksICp0aGlzKTsKIH0KIAogV2ViQmF0 dGVyeU1hbmFnZXJQcm94eTo6fldlYkJhdHRlcnlNYW5hZ2VyUHJveHkoKQpAQCAtNjMsMjMgKzYz LDIzIEBAIHZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6aW5pdGlhbGl6ZVByb3ZpZGVyKGNv bnN0IFdLQmF0dGVyeVByb3ZpZGVyQmFzZSogcHJvCiAKIHZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQ cm94eTo6cHJvdmlkZXJEaWRDaGFuZ2VCYXR0ZXJ5U3RhdHVzKGNvbnN0IFdURjo6QXRvbWljU3Ry aW5nJiBldmVudFR5cGUsIFdlYkJhdHRlcnlTdGF0dXMqIHN0YXR1cykKIHsKLSAgICBpZiAoIWNv bnRleHQoKSkKKyAgICBpZiAoIXByb2Nlc3NQb29sKCkpCiAgICAgICAgIHJldHVybjsKIAotICAg IGNvbnRleHQoKS0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJCYXR0ZXJ5TWFuYWdl cjo6RGlkQ2hhbmdlQmF0dGVyeVN0YXR1cyhldmVudFR5cGUsIHN0YXR1cy0+ZGF0YSgpKSk7Cisg ICAgcHJvY2Vzc1Bvb2woKS0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJCYXR0ZXJ5 TWFuYWdlcjo6RGlkQ2hhbmdlQmF0dGVyeVN0YXR1cyhldmVudFR5cGUsIHN0YXR1cy0+ZGF0YSgp KSk7CiB9CiAKIHZvaWQgV2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6cHJvdmlkZXJVcGRhdGVCYXR0 ZXJ5U3RhdHVzKFdlYkJhdHRlcnlTdGF0dXMqIHN0YXR1cykKIHsKLSAgICBpZiAoIWNvbnRleHQo KSkKKyAgICBpZiAoIXByb2Nlc3NQb29sKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGNvbnRl eHQoKS0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJCYXR0ZXJ5TWFuYWdlcjo6VXBk YXRlQmF0dGVyeVN0YXR1cyhzdGF0dXMtPmRhdGEoKSkpOworICAgIHByb2Nlc3NQb29sKCktPnNl bmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6V2ViQmF0dGVyeU1hbmFnZXI6OlVwZGF0ZUJhdHRl cnlTdGF0dXMoc3RhdHVzLT5kYXRhKCkpKTsKIH0KIAogLy8gV2ViQ29udGV4dFN1cHBsZW1lbnQK IAotdm9pZCBXZWJCYXR0ZXJ5TWFuYWdlclByb3h5Ojpjb250ZXh0RGVzdHJveWVkKCkKK3ZvaWQg V2ViQmF0dGVyeU1hbmFnZXJQcm94eTo6cHJvY2Vzc1Bvb2xEZXN0cm95ZWQoKQogewogICAgIHN0 b3BVcGRhdGluZygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkJhdHRlcnlNYW5hZ2VyUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYXR0 ZXJ5TWFuYWdlclByb3h5LmgKaW5kZXggMjllMTQ2ZDI0OWNkNGVjOGZmYmZkODU5NzgxNjgyN2Qw MTZmODM1OS4uNjQ3ZmUzMTE4YzAzN2FhNjZmZjA3MTc1MDU4MjI0MmRhZDhmMTM2ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkJhdHRlcnlNYW5hZ2VyUHJveHkuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQmF0dGVyeU1hbmFnZXJQcm94eS5oCkBA IC0zNiwxNCArMzYsMTQgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLWNsYXNzIFdlYkNvbnRl eHQ7CitjbGFzcyBXZWJQcm9jZXNzUG9vbDsKIGNsYXNzIFdlYkJhdHRlcnlTdGF0dXM7CiAKIGNs YXNzIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkgOiBwdWJsaWMgQVBJOjpPYmplY3RJbXBsPEFQSTo6 T2JqZWN0OjpUeXBlOjpCYXR0ZXJ5TWFuYWdlcj4sIHB1YmxpYyBXZWJDb250ZXh0U3VwcGxlbWVu dCwgcHJpdmF0ZSBJUEM6Ok1lc3NhZ2VSZWNlaXZlciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIGNv bnN0IGNoYXIqIHN1cHBsZW1lbnROYW1lKCk7CiAKLSAgICBzdGF0aWMgUmVmPFdlYkJhdHRlcnlN YW5hZ2VyUHJveHk+IGNyZWF0ZShXZWJDb250ZXh0Kik7CisgICAgc3RhdGljIFJlZjxXZWJCYXR0 ZXJ5TWFuYWdlclByb3h5PiBjcmVhdGUoV2ViUHJvY2Vzc1Bvb2wqKTsKICAgICB2aXJ0dWFsIH5X ZWJCYXR0ZXJ5TWFuYWdlclByb3h5KCk7CiAKICAgICB2b2lkIGluaXRpYWxpemVQcm92aWRlcihj b25zdCBXS0JhdHRlcnlQcm92aWRlckJhc2UqKTsKQEAgLTU1LDEwICs1NSwxMCBAQCBwdWJsaWM6 CiAgICAgdXNpbmcgQVBJOjpPYmplY3Q6OmRlcmVmOwogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0 IFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkoV2ViQ29udGV4dCopOworICAgIGV4cGxpY2l0IFdlYkJh dHRlcnlNYW5hZ2VyUHJveHkoV2ViUHJvY2Vzc1Bvb2wqKTsKIAogICAgIC8vIFdlYkNvbnRleHRT dXBwbGVtZW50Ci0gICAgdmlydHVhbCB2b2lkIGNvbnRleHREZXN0cm95ZWQoKSBvdmVycmlkZTsK KyAgICB2aXJ0dWFsIHZvaWQgcHJvY2Vzc1Bvb2xEZXN0cm95ZWQoKSBvdmVycmlkZTsKICAgICB2 aXJ0dWFsIHZvaWQgcHJvY2Vzc0RpZENsb3NlKFdlYlByb2Nlc3NQcm94eSopIG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgdm9pZCByZWZXZWJDb250ZXh0U3VwcGxlbWVudCgpIG92ZXJyaWRlOwogICAg IHZpcnR1YWwgdm9pZCBkZXJlZldlYkNvbnRleHRTdXBwbGVtZW50KCkgb3ZlcnJpZGU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVGV4dENoZWNrZXIuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlRleHRDaGVja2VyLmNwcAppbmRleCA5MzRjNTg5NDE1 NjYxMzA2YTMyZTFiZmNjNDc0ZWM1MTFhYTg3ZGFjLi5hZjQ1OWEzYjAzZTVmNWI4MWFlY2NjMDRi MDRlOGVjZTdiMjg3NjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi VGV4dENoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJUZXh0Q2hl Y2tlci5jcHAKQEAgLTI4LDcgKzI4LDcgQEAKIAogI2luY2x1ZGUgIlRleHRDaGVja2VyLmgiCiAj aW5jbHVkZSAiV0tBUElDYXN0LmgiCi0jaW5jbHVkZSAiV2ViQ29udGV4dC5oIgorI2luY2x1ZGUg IldlYlByb2Nlc3NQb29sLmgiCiAjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKQEAgLTUwLDcgKzUwLDcgQEAgdm9pZCBXZWJUZXh0Q2hlY2tlcjo6c2V0Q2xpZW50 KGNvbnN0IFdLVGV4dENoZWNrZXJDbGllbnRCYXNlKiBjbGllbnQpCiAKIHN0YXRpYyB2b2lkIHVw ZGF0ZVN0YXRlRm9yQWxsQ29udGV4dHMoKQogewotICAgIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0 Kj4mIGNvbnRleHRzID0gV2ViQ29udGV4dDo6YWxsQ29udGV4dHMoKTsKKyAgICBjb25zdCBWZWN0 b3I8V2ViUHJvY2Vzc1Bvb2wqPiYgY29udGV4dHMgPSBXZWJQcm9jZXNzUG9vbDo6YWxsUHJvY2Vz c1Bvb2xzKCk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBjb250ZXh0cy5zaXplKCk7ICsr aSkKICAgICAgICAgY29udGV4dHNbaV0tPnRleHRDaGVja2VyU3RhdGVDaGFuZ2VkKCk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVmlicmF0aW9uUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlZpYnJhdGlvblByb3h5LmNwcAppbmRleCAy ODIyNTdiMDM1NjJiMjA3YmNmOGUyY2NlZWQxNDA5ZWVlMjc0NDc1Li5hMTczMjQ3MTU1YmM1Nzky ZTViYjg1YmRhNDViM2MxN2YwNjM3ZTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViVmlicmF0aW9uUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJWaWJyYXRpb25Qcm94eS5jcHAKQEAgLTI4LDggKzI4LDggQEAKIAogI2lmIEVOQUJMRShW SUJSQVRJT04pCiAKLSNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViUGFnZVBy b3h5LmgiCisjaW5jbHVkZSAiV2ViUHJvY2Vzc1Bvb2wuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNz UHJveHkuaCIKICNpbmNsdWRlICJXZWJWaWJyYXRpb25Qcm94eU1lc3NhZ2VzLmgiCiAKQEAgLTQz LDEyICs0MywxMiBAQCBQYXNzUmVmUHRyPFdlYlZpYnJhdGlvblByb3h5PiBXZWJWaWJyYXRpb25Q cm94eTo6Y3JlYXRlKFdlYlBhZ2VQcm94eSogcGFnZSkKIFdlYlZpYnJhdGlvblByb3h5OjpXZWJW aWJyYXRpb25Qcm94eShXZWJQYWdlUHJveHkqIHBhZ2UpCiAgICAgOiBtX3BhZ2UocGFnZSkKIHsK LSAgICBtX3BhZ2UtPnByb2Nlc3MoKS5jb250ZXh0KCkuYWRkTWVzc2FnZVJlY2VpdmVyKE1lc3Nh Z2VzOjpXZWJWaWJyYXRpb25Qcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2UtPnBh Z2VJRCgpLCAqdGhpcyk7CisgICAgbV9wYWdlLT5wcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5hZGRN ZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlZpYnJhdGlvblByb3h5OjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCksIG1fcGFnZS0+cGFnZUlEKCksICp0aGlzKTsKIH0KIAogV2ViVmlicmF0aW9uUHJv eHk6On5XZWJWaWJyYXRpb25Qcm94eSgpCiB7Ci0gICAgbV9wYWdlLT5wcm9jZXNzKCkuY29udGV4 dCgpLnJlbW92ZU1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViVmlicmF0aW9uUHJveHk6Om1l c3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLT5wYWdlSUQoKSk7CisgICAgbV9wYWdlLT5wcm9j ZXNzKCkucHJvY2Vzc1Bvb2woKS5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6OldlYlZp YnJhdGlvblByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZS0+cGFnZUlEKCkpOwog fQogCiB2b2lkIFdlYlZpYnJhdGlvblByb3h5OjppbnZhbGlkYXRlKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUmVxdWVzdE1hbmFnZXJDbGllbnRFZmwuaAppbmRl eCBlYWJkNjdkNTgxOWVkYzkzZjQyYjRhNzEyYzliNjg5ZGUwZTVjZWUwLi44N2QzNjBlNmFjMjNl N2U2MWEyYzAwZDMyZTM0OGYzMjYzYjgyNWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZWZsL1JlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsLmgKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2VmbC9SZXF1ZXN0TWFuYWdlckNsaWVudEVmbC5oCkBAIC0yNiw3ICsyNiw3 IEBACiAjaWZuZGVmIFJlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsX2gKICNkZWZpbmUgUmVxdWVzdE1h bmFnZXJDbGllbnRFZmxfaAogCi0jaW5jbHVkZSAiV2ViQ29udGV4dC5oIgorI2luY2x1ZGUgIldl YlByb2Nlc3NQb29sLmgiCiAjaW5jbHVkZSAiV2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1h bmFnZXIuaCIKICNpbmNsdWRlICJld2tfY29udGV4dF9wcml2YXRlLmgiCiAjaW5jbHVkZSAiZXdr X3VybF9zY2hlbWVfcmVxdWVzdF9wcml2YXRlLmgiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9XZWJDb250ZXh0RWZsLmNwcAppbmRleCAxMDM5OTQyMzY4ZWQ5Mjk5ZmRjZDY5NWFk NjI2ZmE4ODRiNjI3NjZlLi5mNTg2OWIzMTAxNjlmNTFhZDg4MzI3MWQ3NGZhNGNiYjJkYzhhNGNl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYkNvbnRleHRFZmwu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViQ29udGV4dEVmbC5jcHAK QEAgLTI1LDcgKzI1LDcgQEAKIAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYkNv b2tpZU1hbmFnZXJQcm94eS5oIgotI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKKyNpbmNsdWRlICJX ZWJQcm9jZXNzUG9vbC5oIgogCiAjaW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIldlYklu c3BlY3RvclNlcnZlci5oIgpAQCAtODAsMTIgKzgwLDEyIEBAIHN0YXRpYyB2b2lkIGluaXRpYWxp emVJbnNwZWN0b3JTZXJ2ZXIoKQogI2VuZGlmCiB9CiAKLVN0cmluZyBXZWJDb250ZXh0OjpwbGF0 Zm9ybURlZmF1bHRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCkgY29uc3QKK1N0cmluZyBXZWJQ cm9jZXNzUG9vbDo6cGxhdGZvcm1EZWZhdWx0QXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSgpIGNv bnN0CiB7CiAgICAgcmV0dXJuIFN0cmluZzo6ZnJvbVVURjgoZWZyZWV0X2NhY2hlX2hvbWVfZ2V0 KCkpICsgIi9XZWJLaXRFZmwvQXBwbGljYXRpb25zIjsKIH0KIAotdm9pZCBXZWJDb250ZXh0Ojpw bGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMm IHBhcmFtZXRlcnMpCit2b2lkIFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQ cm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CiAgICAg aW5pdGlhbGl6ZUluc3BlY3RvclNlcnZlcigpOwogCkBAIC05NSw0OSArOTUsNDkgQEAgdm9pZCBX ZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlv blBhcmFtZXRlcnMmIHBhcmEKICAgICBwYXJhbWV0ZXJzLmlnbm9yZVRMU0Vycm9ycyA9IG1faWdu b3JlVExTRXJyb3JzOwogfQogCi12b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3JtSW52YWxpZGF0ZUNv bnRleHQoKQordm9pZCBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1JbnZhbGlkYXRlQ29udGV4dCgp CiB7CiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotU3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRm b3JtRGVmYXVsdFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCkKK1N0cmluZyBXZWJQcm9jZXNzUG9v bDo6cGxhdGZvcm1EZWZhdWx0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoKQogewogICAgIHJldHVy biBTdHJpbmc6OmZyb21VVEY4KGVmcmVldF9kYXRhX2hvbWVfZ2V0KCkpICsgIi9XZWJLaXRFZmwv RGF0YWJhc2VzIjsKIH0KIAotU3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdEluZGV4 ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkKK1N0cmluZyBXZWJQcm9jZXNzUG9vbDo6cGxhdGZvcm1E ZWZhdWx0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoKQogewogICAgIG5vdEltcGxlbWVudGVk KCk7CiAgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi1TdHJpbmcgV2ViQ29udGV4dDo6cGxhdGZv cm1EZWZhdWx0SWNvbkRhdGFiYXNlUGF0aCgpIGNvbnN0CitTdHJpbmcgV2ViUHJvY2Vzc1Bvb2w6 OnBsYXRmb3JtRGVmYXVsdEljb25EYXRhYmFzZVBhdGgoKSBjb25zdAogewogICAgIHJldHVybiBT dHJpbmc6OmZyb21VVEY4KGVmcmVldF9kYXRhX2hvbWVfZ2V0KCkpICsgIi9XZWJLaXRFZmwvSWNv bkRhdGFiYXNlLyIgKyBXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRlZmF1bHREYXRhYmFzZUZpbGVu YW1lKCk7CiB9CiAKLVN0cmluZyBXZWJDb250ZXh0OjpwbGF0Zm9ybURlZmF1bHRMb2NhbFN0b3Jh Z2VEaXJlY3RvcnkoKQorU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybURlZmF1bHRMb2Nh bFN0b3JhZ2VEaXJlY3RvcnkoKQogewogICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4KGVmcmVl dF9kYXRhX2hvbWVfZ2V0KCkpICsgIi9XZWJLaXRFZmwvTG9jYWxTdG9yYWdlIjsKIH0KIAotU3Ry aW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnko KQorU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpwbGF0Zm9ybURlZmF1bHRNZWRpYUtleXNTdG9yYWdl RGlyZWN0b3J5KCkKIHsKICAgICByZXR1cm4gU3RyaW5nOjpmcm9tVVRGOChlZnJlZXRfZGF0YV9o b21lX2dldCgpKSArICIvV2ViS2l0RWZsL01lZGlhS2V5cyI7CiB9CiAKLVN0cmluZyBXZWJDb250 ZXh0OjpwbGF0Zm9ybURlZmF1bHREaXNrQ2FjaGVEaXJlY3RvcnkoKSBjb25zdAorU3RyaW5nIFdl YlByb2Nlc3NQb29sOjpwbGF0Zm9ybURlZmF1bHREaXNrQ2FjaGVEaXJlY3RvcnkoKSBjb25zdAog ewogICAgIHJldHVybiBTdHJpbmc6OmZyb21VVEY4KGVmcmVldF9jYWNoZV9ob21lX2dldCgpKSAr ICIvV2ViS2l0RWZsIjsKIH0KIAotU3RyaW5nIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdENv b2tpZVN0b3JhZ2VEaXJlY3RvcnkoKSBjb25zdAorU3RyaW5nIFdlYlByb2Nlc3NQb29sOjpwbGF0 Zm9ybURlZmF1bHRDb29raWVTdG9yYWdlRGlyZWN0b3J5KCkgY29uc3QKIHsKICAgICBub3RJbXBs ZW1lbnRlZCgpOwogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIAotdm9pZCBXZWJDb250ZXh0Ojpz ZXRJZ25vcmVUTFNFcnJvcnMoYm9vbCBpZ25vcmVUTFNFcnJvcnMpCit2b2lkIFdlYlByb2Nlc3NQ b29sOjpzZXRJZ25vcmVUTFNFcnJvcnMoYm9vbCBpZ25vcmVUTFNFcnJvcnMpCiB7CiAgICAgbV9p Z25vcmVUTFNFcnJvcnMgPSBpZ25vcmVUTFNFcnJvcnM7CiAgICAgc2VuZFRvQWxsUHJvY2Vzc2Vz KE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpTZXRJZ25vcmVUTFNFcnJvcnMobV9pZ25vcmVUTFNFcnJv cnMpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViSW5zcGVj dG9yUHJveHlFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0 b3JQcm94eUVmbC5jcHAKaW5kZXggYzZiZjlkMjQwZTM5N2UzNmY4ZGMyMTA5MjA3OWMxYjcwZDdh ODBiNC4uYjZiM2MyODg5M2ZhYjYwMzFlZTVkMTVmOWVhY2YyYTliNjY2ODM0MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9XZWJJbnNwZWN0b3JQcm94eUVmbC5j cHAKQEAgLTEwNCw3ICsxMDQsNyBAQCBXZWJQYWdlUHJveHkqIFdlYkluc3BlY3RvclByb3h5Ojpw bGF0Zm9ybUNyZWF0ZUluc3BlY3RvclBhZ2UoKQogICAgIGlmICghbV9pbnNwZWN0b3JXaW5kb3cp CiAgICAgICAgIHJldHVybiAwOwogCi0gICAgV0tDb250ZXh0UmVmIHdrQ29udGV4dCA9IHRvQVBJ KCZpbnNwZWN0b3JDb250ZXh0KCkpOworICAgIFdLQ29udGV4dFJlZiB3a0NvbnRleHQgPSB0b0FQ SSgmaW5zcGVjdG9yUHJvY2Vzc1Bvb2woKSk7CiAgICAgV0tQYWdlR3JvdXBSZWYgd2tQYWdlR3Jv dXAgPSB0b0FQSShpbnNwZWN0b3JQYWdlR3JvdXAoKSk7CiAKICAgICBtX2luc3BlY3RvclZpZXcg PSBFV0tWaWV3Q3JlYXRlKHdrQ29udGV4dCwgd2tQYWdlR3JvdXAsIGVjb3JlX2V2YXNfZ2V0KG1f aW5zcGVjdG9yV2luZG93KSwgLyogc21hcnQgKi8gMCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXdFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9XZWJWaWV3RWZsLmNwcAppbmRleCBlZjMxYjkyZWM3YzI0MTRkMTkxOWY3MWZmYWI0 ZGZkOTdlYTZlYWYzLi41ZWJjMGYxNjgxMzc1YWZhMzgzYWQwM2YzNTkzMjdhMWY4NTFkZDQ5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1dlYlZpZXdFZmwuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlld0VmbC5jcHAKQEAgLTU0LDEz ICs1NCwxMyBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7 CiAKLVBhc3NSZWZQdHI8V2ViVmlldz4gV2ViVmlldzo6Y3JlYXRlKFdlYkNvbnRleHQqIGNvbnRl eHQsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwKQorUGFzc1JlZlB0cjxXZWJWaWV3PiBXZWJWaWV3 OjpjcmVhdGUoV2ViUHJvY2Vzc1Bvb2wqIHByb2Nlc3NQb29sLCBXZWJQYWdlR3JvdXAqIHBhZ2VH cm91cCkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlZpZXdFZmwoY29udGV4dCwgcGFn ZUdyb3VwKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJWaWV3RWZsKHByb2Nlc3NQb29s LCBwYWdlR3JvdXApKTsKIH0KIAotV2ViVmlld0VmbDo6V2ViVmlld0VmbChXZWJDb250ZXh0KiBj b250ZXh0LCBXZWJQYWdlR3JvdXAqIHBhZ2VHcm91cCkKLSAgICA6IFdlYlZpZXcoY29udGV4dCwg cGFnZUdyb3VwKQorV2ViVmlld0VmbDo6V2ViVmlld0VmbChXZWJQcm9jZXNzUG9vbCogcHJvY2Vz c1Bvb2wsIFdlYlBhZ2VHcm91cCogcGFnZUdyb3VwKQorICAgIDogV2ViVmlldyhwcm9jZXNzUG9v bCwgcGFnZUdyb3VwKQogICAgICwgbV9ld2tWaWV3KDApCiAgICAgLCBtX2hhc1JlcXVlc3RlZEZ1 bGxTY3JlZW4oZmFsc2UpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv ZWZsL1dlYlZpZXdFZmwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlld0Vm bC5oCmluZGV4IGM1MmFkOTViOTQzZTE0MGJlNWI1ZDEzNmU0NzUyYWYxMDcwNWU2MzMuLjM5OWYw N2VmOTk2M2RjZGQxY2RkZGEyMDBhYWEwZGRlOWVkYmQxMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9lZmwvV2ViVmlld0VmbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvV2ViVmlld0VmbC5oCkBAIC02Myw3ICs2Myw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIHNldFZpZXdCYWNrZ3JvdW5kQ29sb3IoY29uc3QgV2ViQ29yZTo6Q29sb3ImKTsKICAgICBX ZWJDb3JlOjpDb2xvciB2aWV3QmFja2dyb3VuZENvbG9yKCk7CiBwcml2YXRlOgotICAgIFdlYlZp ZXdFZmwoV2ViQ29udGV4dCosIFdlYlBhZ2VHcm91cCopOworICAgIFdlYlZpZXdFZmwoV2ViUHJv Y2Vzc1Bvb2wqLCBXZWJQYWdlR3JvdXAqKTsKIAogICAgIHZvaWQgc2V0Q3Vyc29yKGNvbnN0IFdl YkNvcmU6OkN1cnNvciYpIG92ZXJyaWRlOwogICAgIFBhc3NSZWZQdHI8V2ViUG9wdXBNZW51UHJv eHk+IGNyZWF0ZVBvcHVwTWVudVByb3h5KFdlYlBhZ2VQcm94eSopIG92ZXJyaWRlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NvdXAvV2ViQ29udGV4dFNvdXAuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NvdXAvV2ViQ29udGV4dFNvdXAuY3BwCmluZGV4IDdi MjIxMGQ0ZjM0MzkzNjhlNTExODVlNzEwYjYwODJhNTIwNzhiM2IuLjE2YjZkODcwNDQyOWI2NjJm ZDRiNzk2OWQ1OGYyZmYyMjg0YTlhODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9zb3VwL1dlYkNvbnRleHRTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3Mvc291cC9XZWJDb250ZXh0U291cC5jcHAKQEAgLTI1LDcgKzI1LDcgQEAKIAogI2luY2x1ZGUg ImNvbmZpZy5oIgogI2lmIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCi0jaW5jbHVkZSAiV2ViQ29u dGV4dC5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NQb29sLmgiCiAKICNpbmNsdWRlICJOZXR3b3Jr UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIgogI2luY2x1ZGUgIldlYkNvb2tpZU1hbmFnZXJQ cm94eS5oIgpAQCAtMzQsNyArMzQsNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBX ZWJDb250ZXh0OjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2VzcyhOZXR3b3JrUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKK3ZvaWQgV2ViUHJvY2Vzc1Bvb2w6OnBs YXRmb3JtSW5pdGlhbGl6ZU5ldHdvcmtQcm9jZXNzKE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJh bWV0ZXJzJiBwYXJhbWV0ZXJzKQogewogICAgIHN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdlclBy b3h5PigpLT5nZXRDb29raWVQZXJzaXN0ZW50U3RvcmFnZShwYXJhbWV0ZXJzLmNvb2tpZVBlcnNp c3RlbnRTdG9yYWdlUGF0aCwgcGFyYW1ldGVycy5jb29raWVQZXJzaXN0ZW50U3RvcmFnZVR5cGUp OwogICAgIHBhcmFtZXRlcnMuY29va2llQWNjZXB0UG9saWN5ID0gbV9pbml0aWFsSFRUUENvb2tp ZUFjY2VwdFBvbGljeTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9zb3Vw L1dlYkNvb2tpZU1hbmFnZXJQcm94eVNvdXAuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHAKaW5kZXggNDU3ZTAzNzBmODNkMmZi MjljNjgwNGZlZDNiOTFlNzJiY2M0MzJiZC4uYWY0NDNlY2E2OWQ4ZWI4NGJjYzE5MDFkYTM1NGM1 M2E4OTQxMmNlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NvdXAvV2Vi Q29va2llTWFuYWdlclByb3h5U291cC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3NvdXAvV2ViQ29va2llTWFuYWdlclByb3h5U291cC5jcHAKQEAgLTI2LDE0ICsyNiwxNCBAQAog I2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYkNvb2tpZU1hbmFnZXJQcm94eS5oIgog Ci0jaW5jbHVkZSAiV2ViQ29udGV4dC5oIgogI2luY2x1ZGUgIldlYkNvb2tpZU1hbmFnZXJNZXNz YWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NQb29sLmgiCiAKIG5hbWVzcGFjZSBXZWJLaXQg ewogCiB2b2lkIFdlYkNvb2tpZU1hbmFnZXJQcm94eTo6c2V0Q29va2llUGVyc2lzdGVudFN0b3Jh Z2UoY29uc3QgU3RyaW5nJiBzdG9yYWdlUGF0aCwgdWludDMyX3Qgc3RvcmFnZVR5cGUpCiB7Ci0g ICAgY29udGV4dCgpLT5zZW5kVG9OZXR3b3JraW5nUHJvY2Vzc1JlbGF1bmNoaW5nSWZOZWNlc3Nh cnkoTWVzc2FnZXM6OldlYkNvb2tpZU1hbmFnZXI6OlNldENvb2tpZVBlcnNpc3RlbnRTdG9yYWdl KHN0b3JhZ2VQYXRoLCBzdG9yYWdlVHlwZSkpOworICAgIHByb2Nlc3NQb29sKCktPnNlbmRUb05l dHdvcmtpbmdQcm9jZXNzUmVsYXVuY2hpbmdJZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViQ29va2ll TWFuYWdlcjo6U2V0Q29va2llUGVyc2lzdGVudFN0b3JhZ2Uoc3RvcmFnZVBhdGgsIHN0b3JhZ2VU eXBlKSk7CiAKICAgICBtX2Nvb2tpZVBlcnNpc3RlbnRTdG9yYWdlUGF0aCA9IHN0b3JhZ2VQYXRo OwogICAgIG1fY29va2llUGVyc2lzdGVudFN0b3JhZ2VUeXBlID0gc3RhdGljX2Nhc3Q8U291cENv b2tpZVBlcnNpc3RlbnRTdG9yYWdlVHlwZT4oc3RvcmFnZVR5cGUpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3NvdXAvV2ViU291cFJlcXVlc3RNYW5hZ2VyUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9zb3VwL1dlYlNvdXBSZXF1ZXN0TWFuYWdlclByb3h5 LmgKaW5kZXggMGQ5NmE0MjllYWZkYzYxNGVlOTliNWRkNWNhNTJhYTA0YzdlMThlMi4uODdjMThh NGM1YTEwMDYyODI0ZjU0YTUyZjg2NTVjODRlMDcxNjcwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3NvdXAvV2ViU291cFJlcXVlc3RNYW5hZ2VyUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mvc291cC9XZWJTb3VwUmVxdWVzdE1hbmFnZXJQcm94eS5o CkBAIC0zNSwxMyArMzUsMTMgQEAgY2xhc3MgRGF0YTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK LWNsYXNzIFdlYkNvbnRleHQ7CitjbGFzcyBXZWJQcm9jZXNzUG9vbDsKIAogY2xhc3MgV2ViU291 cFJlcXVlc3RNYW5hZ2VyUHJveHkgOiBwdWJsaWMgQVBJOjpPYmplY3RJbXBsPEFQSTo6T2JqZWN0 OjpUeXBlOjpTb3VwUmVxdWVzdE1hbmFnZXI+LCBwdWJsaWMgV2ViQ29udGV4dFN1cHBsZW1lbnQs IHByaXZhdGUgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgewogcHVibGljOgogICAgIHN0YXRpYyBjb25z dCBjaGFyKiBzdXBwbGVtZW50TmFtZSgpOwogCi0gICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViU291 cFJlcXVlc3RNYW5hZ2VyUHJveHk+IGNyZWF0ZShXZWJDb250ZXh0Kik7CisgICAgc3RhdGljIFBh c3NSZWZQdHI8V2ViU291cFJlcXVlc3RNYW5hZ2VyUHJveHk+IGNyZWF0ZShXZWJQcm9jZXNzUG9v bCopOwogICAgIHZpcnR1YWwgfldlYlNvdXBSZXF1ZXN0TWFuYWdlclByb3h5KCk7CiAKICAgICB2 b2lkIGluaXRpYWxpemVDbGllbnQoY29uc3QgV0tTb3VwUmVxdWVzdE1hbmFnZXJDbGllbnRCYXNl Kik7CkBAIC01OCw3ICs1OCw3IEBAIHB1YmxpYzoKICAgICB1c2luZyBBUEk6Ok9iamVjdDo6ZGVy ZWY7CiAKIHByaXZhdGU6Ci0gICAgV2ViU291cFJlcXVlc3RNYW5hZ2VyUHJveHkoV2ViQ29udGV4 dCopOworICAgIFdlYlNvdXBSZXF1ZXN0TWFuYWdlclByb3h5KFdlYlByb2Nlc3NQb29sKik7CiAK ICAgICAvLyBXZWJDb250ZXh0U3VwcGxlbWVudAogICAgIHZpcnR1YWwgdm9pZCBjb250ZXh0RGVz dHJveWVkKCkgb3ZlcnJpZGU7Cg==