152672 2016-01-03 15:47:01 -0800 [GTK] Rename _WebKitWebContextPrivate.context to _WebKitWebContextPrivate.processPool 2016-01-04 08:14:01 -0800 1 1 1 Unclassified WebKit WebKitGTK Other PC Linux RESOLVED FIXED P2 Trivial --- 1 mcatanzaro mcatanzaro berto bugs-noreply cgarcia commit-queue gustavo mcatanzaro mrobinson oldest_to_newest 1152169 0 mcatanzaro 2016-01-03 15:47:01 -0800 Rename _WebKitWebContextPrivate.context to _WebKitWebContextPrivate.processPool. Been meaning to do this since r177692. 1152170 1 268151 mcatanzaro 2016-01-03 15:54:13 -0800 Created attachment 268151 Patch 1152171 2 commit-queue 2016-01-03 15:56:55 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1152270 3 268151 cgarcia 2016-01-04 00:41:17 -0800 Comment on attachment 268151 Patch I don't see the point, but it's obviously ok. 1152318 4 268151 commit-queue 2016-01-04 08:13:57 -0800 Comment on attachment 268151 Patch Clearing flags on attachment: 268151 Committed r194532: <http://trac.webkit.org/changeset/194532> 1152319 5 commit-queue 2016-01-04 08:14:01 -0800 All reviewed patches have been landed. Closing bug. 268151 2016-01-03 15:54:13 -0800 2016-01-04 08:13:57 -0800 Patch bug-152672-20160103175339.patch text/plain 19871 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTY4OGY0MjcyM2ZlM2I2 OGQ2N2Y2NWY4YmYzYTNkNTMzZmYxZWM0ZC4uMTllMTQ1YjEzYmI3ZGZlMDUzNzNmNTU1OTcxZjll OTJmYWYyODdlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE2LTAxLTAzICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBS ZW5hbWUgX1dlYktpdFdlYkNvbnRleHRQcml2YXRlLmNvbnRleHQgdG8gX1dlYktpdFdlYkNvbnRl eHRQcml2YXRlLnByb2Nlc3NQb29sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTI2NzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdERvd25sb2FkQ2xpZW50LmNw cDoKKyAgICAgICAgKGF0dGFjaERvd25sb2FkQ2xpZW50VG9Db250ZXh0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRJbmplY3RlZEJ1bmRsZUNsaWVudC5jcHA6CisgICAgICAg IChhdHRhY2hJbmplY3RlZEJ1bmRsZUNsaWVudFRvQ29udGV4dCk6CisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0U2VjdXJpdHlNYW5hZ2VyLmNwcDoKKyAgICAgICAgKHJlZ2lzdGVy U2VjdXJpdHlQb2xpY3lGb3JVUklTY2hlbWUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYkNvbnRleHQuY3BwOgorICAgICAgICAod2Via2l0V2ViQ29udGV4dENvbnN0cnVj dGVkKToKKyAgICAgICAgKHdlYmtpdFdlYkNvbnRleHREaXNwb3NlKToKKyAgICAgICAgKHdlYmtp dF93ZWJfY29udGV4dF9zZXRfY2FjaGVfbW9kZWwpOgorICAgICAgICAod2Via2l0X3dlYl9jb250 ZXh0X2dldF9jYWNoZV9tb2RlbCk6CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfY2xlYXJf Y2FjaGUpOgorICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0X2dldF9jb29raWVfbWFuYWdlcik6 CisgICAgICAgIChlbnN1cmVGYXZpY29uRGF0YWJhc2UpOgorICAgICAgICAod2Via2l0X3dlYl9j b250ZXh0X3NldF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeSk6CisgICAgICAgICh3ZWJraXRf d2ViX2NvbnRleHRfc2V0X2FkZGl0aW9uYWxfcGx1Z2luc19kaXJlY3RvcnkpOgorICAgICAgICAo d2Via2l0V2ViQ29udGV4dEdldFBsdWdpblRocmVhZCk6CisgICAgICAgICh3ZWJraXRfd2ViX2Nv bnRleHRfc2V0X3Rsc19lcnJvcnNfcG9saWN5KToKKyAgICAgICAgKHdlYmtpdF93ZWJfY29udGV4 dF9zZXRfZGlza19jYWNoZV9kaXJlY3RvcnkpOgorICAgICAgICAod2Via2l0X3dlYl9jb250ZXh0 X3ByZWZldGNoX2Rucyk6CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfYWxsb3dfdGxzX2Nl cnRpZmljYXRlX2Zvcl9ob3N0KToKKyAgICAgICAgKHdlYmtpdF93ZWJfY29udGV4dF9zZXRfcHJv Y2Vzc19tb2RlbCk6CisgICAgICAgICh3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3dlYl9wcm9jZXNz X2NvdW50X2xpbWl0KToKKyAgICAgICAgKHdlYmtpdFdlYkNvbnRleHRTdGFydERvd25sb2FkKToK KyAgICAgICAgKHdlYmtpdFdlYkNvbnRleHRHZXRQcm9jZXNzUG9vbCk6CisgICAgICAgICh3ZWJr aXRXZWJDb250ZXh0Q3JlYXRlUGFnZUZvcldlYlZpZXcpOgorICAgICAgICAod2Via2l0V2ViQ29u dGV4dEdldENvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYkNvbnRleHRQcml2YXRlLmg6CisKIDIwMTYtMDEtMDMgIFNpbW9uIEZyYXNlciAgPHNp bW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIHNjcm9sbFBvc2l0aW9uKFNj cm9sbGJhciopIHRvIHNjcm9sbE9mZnNldChTY3JvbGxiYXJPcmllbnRhdGlvbikKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdERvd25sb2FkQ2xpZW50 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdERvd25sb2FkQ2xp ZW50LmNwcAppbmRleCBjYzcyMDgxNzJiNTRhZDJlMTk1NzFhNDBiN2RmZTI1NzQ5ZTQyMjg0Li4w MmFiZjY2NDI5Y2Q2ZWY4YzhjZjM3NTExMmQ4NWIxOTdlMjVhZjMyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXREb3dubG9hZENsaWVudC5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0RG93bmxvYWRDbGllbnQu Y3BwCkBAIC0xMTEsNiArMTExLDYgQEAgdm9pZCBhdHRhY2hEb3dubG9hZENsaWVudFRvQ29udGV4 dChXZWJLaXRXZWJDb250ZXh0KiB3ZWJDb250ZXh0KQogICAgICAgICBkaWRDYW5jZWwsCiAgICAg ICAgIDAsIC8vIHByb2Nlc3NEaWRDcmFzaAogICAgIH07Ci0gICAgV0tDb250ZXh0U2V0RG93bmxv YWRDbGllbnQodG9BUEkod2Via2l0V2ViQ29udGV4dEdldENvbnRleHQod2ViQ29udGV4dCkpLCAm d2tEb3dubG9hZENsaWVudC5iYXNlKTsKKyAgICBXS0NvbnRleHRTZXREb3dubG9hZENsaWVudCh0 b0FQSSh3ZWJraXRXZWJDb250ZXh0R2V0UHJvY2Vzc1Bvb2wod2ViQ29udGV4dCkpLCAmd2tEb3du bG9hZENsaWVudC5iYXNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0SW5qZWN0ZWRCdW5kbGVDbGllbnQuY3BwCmluZGV4 IDcyMDVmMGFlMDM5NzkwMWQ2YzJhNjkwMGNjMDdkZWQ0MWVjZTY2YTkuLmYzMDRkMmY4YWEyMTY0 ZjY4YjcxOWNjYWJiYTNjNjcyZDFhMDhiNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL1dlYktpdEluamVjdGVkQnVuZGxlQ2xpZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRJbmplY3RlZEJ1bmRsZUNsaWVudC5j cHAKQEAgLTE0MCw1ICsxNDAsNSBAQCB2b2lkIGF0dGFjaEluamVjdGVkQnVuZGxlQ2xpZW50VG9D b250ZXh0KFdlYktpdFdlYkNvbnRleHQqIHdlYkNvbnRleHQpCiAgICAgICAgIDAsIC8vIGRpZFJl Y2VpdmVTeW5jaHJvbm91c01lc3NhZ2VGcm9tSW5qZWN0ZWRCdW5kbGUKICAgICAgICAgZ2V0SW5q ZWN0ZWRCdW5kbGVJbml0aWFsaXphdGlvblVzZXJEYXRhCiAgICAgfTsKLSAgICBXS0NvbnRleHRT ZXRJbmplY3RlZEJ1bmRsZUNsaWVudCh0b0FQSSh3ZWJraXRXZWJDb250ZXh0R2V0Q29udGV4dCh3 ZWJDb250ZXh0KSksICZ3a0luamVjdGVkQnVuZGxlQ2xpZW50LmJhc2UpOworICAgIFdLQ29udGV4 dFNldEluamVjdGVkQnVuZGxlQ2xpZW50KHRvQVBJKHdlYmtpdFdlYkNvbnRleHRHZXRQcm9jZXNz UG9vbCh3ZWJDb250ZXh0KSksICZ3a0luamVjdGVkQnVuZGxlQ2xpZW50LmJhc2UpOwogfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2VjdXJpdHlN YW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNlY3Vy aXR5TWFuYWdlci5jcHAKaW5kZXggMGExY2E4NjgxNDk1NGRjMGJmNzk5NDc3MDdiNWM2NDY2MDVh YmIwOC4uZWUzNjI2ZmJlN2UxZTlmZjk4NjRkNjI5ZjRmNTZlMmJmMzBjZDdiZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2VjdXJpdHlNYW5hZ2Vy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZWN1cml0 eU1hbmFnZXIuY3BwCkBAIC02OSw3ICs2OSw3IEBAIFdlYktpdFNlY3VyaXR5TWFuYWdlciogd2Vi a2l0U2VjdXJpdHlNYW5hZ2VyQ3JlYXRlKFdlYktpdFdlYkNvbnRleHQqIHdlYkNvbnRleHQpCiBz dGF0aWMgdm9pZCByZWdpc3RlclNlY3VyaXR5UG9saWN5Rm9yVVJJU2NoZW1lKFdlYktpdFNlY3Vy aXR5TWFuYWdlciogbWFuYWdlciwgY29uc3QgY2hhciogc2NoZW1lLCBTZWN1cml0eVBvbGljeSBw b2xpY3kpCiB7CiAgICAgU3RyaW5nIHVybFNjaGVtZSA9IFN0cmluZzo6ZnJvbVVURjgoc2NoZW1l KTsKLSAgICBXZWJQcm9jZXNzUG9vbCogd2ViQ29udGV4dCA9IHdlYmtpdFdlYkNvbnRleHRHZXRD b250ZXh0KG1hbmFnZXItPnByaXYtPndlYkNvbnRleHQpOworICAgIFdlYlByb2Nlc3NQb29sKiBw cm9jZXNzUG9vbCA9IHdlYmtpdFdlYkNvbnRleHRHZXRQcm9jZXNzUG9vbChtYW5hZ2VyLT5wcml2 LT53ZWJDb250ZXh0KTsKIAogICAgIC8vIFdlIGtlZXAgdGhlIFdlYkNvcmU6OlNjaGVtZVJlZ2lz dHJ5IG9mIHRoZSBVSSBwcm9jZXNzIGluIHN5bmMgd2l0aCB0aGUKICAgICAvLyB3ZWIgcHJvY2Vz cyBvbmUsIHNvIHRoYXQgd2UgY2FuIHJldHVybiB0aGUgU2VjdXJpdHlQb2xpY3kgZm9yCkBAIC03 NywyNyArNzcsMjcgQEAgc3RhdGljIHZvaWQgcmVnaXN0ZXJTZWN1cml0eVBvbGljeUZvclVSSVNj aGVtZShXZWJLaXRTZWN1cml0eU1hbmFnZXIqIG1hbmFnZXIsIGMKICAgICBzd2l0Y2ggKHBvbGlj eSkgewogICAgIGNhc2UgU2VjdXJpdHlQb2xpY3lMb2NhbDoKICAgICAgICAgV2ViQ29yZTo6U2No ZW1lUmVnaXN0cnk6OnJlZ2lzdGVyVVJMU2NoZW1lQXNMb2NhbCh1cmxTY2hlbWUpOwotICAgICAg ICB3ZWJDb250ZXh0LT5yZWdpc3RlclVSTFNjaGVtZUFzTG9jYWwodXJsU2NoZW1lKTsKKyAgICAg ICAgcHJvY2Vzc1Bvb2wtPnJlZ2lzdGVyVVJMU2NoZW1lQXNMb2NhbCh1cmxTY2hlbWUpOwogICAg ICAgICBicmVhazsKICAgICBjYXNlIFNlY3VyaXR5UG9saWN5Tm9BY2Nlc3M6CiAgICAgICAgIFdl YkNvcmU6OlNjaGVtZVJlZ2lzdHJ5OjpyZWdpc3RlclVSTFNjaGVtZUFzTm9BY2Nlc3ModXJsU2No ZW1lKTsKLSAgICAgICAgd2ViQ29udGV4dC0+cmVnaXN0ZXJVUkxTY2hlbWVBc05vQWNjZXNzKHVy bFNjaGVtZSk7CisgICAgICAgIHByb2Nlc3NQb29sLT5yZWdpc3RlclVSTFNjaGVtZUFzTm9BY2Nl c3ModXJsU2NoZW1lKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBTZWN1cml0eVBvbGljeURp c3BsYXlJc29sYXRlZDoKICAgICAgICAgV2ViQ29yZTo6U2NoZW1lUmVnaXN0cnk6OnJlZ2lzdGVy VVJMU2NoZW1lQXNEaXNwbGF5SXNvbGF0ZWQodXJsU2NoZW1lKTsKLSAgICAgICAgd2ViQ29udGV4 dC0+cmVnaXN0ZXJVUkxTY2hlbWVBc0Rpc3BsYXlJc29sYXRlZCh1cmxTY2hlbWUpOworICAgICAg ICBwcm9jZXNzUG9vbC0+cmVnaXN0ZXJVUkxTY2hlbWVBc0Rpc3BsYXlJc29sYXRlZCh1cmxTY2hl bWUpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFNlY3VyaXR5UG9saWN5U2VjdXJlOgogICAg ICAgICBXZWJDb3JlOjpTY2hlbWVSZWdpc3RyeTo6cmVnaXN0ZXJVUkxTY2hlbWVBc1NlY3VyZSh1 cmxTY2hlbWUpOwotICAgICAgICB3ZWJDb250ZXh0LT5yZWdpc3RlclVSTFNjaGVtZUFzU2VjdXJl KHVybFNjaGVtZSk7CisgICAgICAgIHByb2Nlc3NQb29sLT5yZWdpc3RlclVSTFNjaGVtZUFzU2Vj dXJlKHVybFNjaGVtZSk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgU2VjdXJpdHlQb2xpY3lD T1JTRW5hYmxlZDoKICAgICAgICAgV2ViQ29yZTo6U2NoZW1lUmVnaXN0cnk6OnJlZ2lzdGVyVVJM U2NoZW1lQXNDT1JTRW5hYmxlZCh1cmxTY2hlbWUpOwotICAgICAgICB3ZWJDb250ZXh0LT5yZWdp c3RlclVSTFNjaGVtZUFzQ09SU0VuYWJsZWQodXJsU2NoZW1lKTsKKyAgICAgICAgcHJvY2Vzc1Bv b2wtPnJlZ2lzdGVyVVJMU2NoZW1lQXNDT1JTRW5hYmxlZCh1cmxTY2hlbWUpOwogICAgICAgICBi cmVhazsKICAgICBjYXNlIFNlY3VyaXR5UG9saWN5RW1wdHlEb2N1bWVudDoKICAgICAgICAgV2Vi Q29yZTo6U2NoZW1lUmVnaXN0cnk6OnJlZ2lzdGVyVVJMU2NoZW1lQXNFbXB0eURvY3VtZW50KHVy bFNjaGVtZSk7Ci0gICAgICAgIHdlYkNvbnRleHQtPnJlZ2lzdGVyVVJMU2NoZW1lQXNFbXB0eURv Y3VtZW50KHVybFNjaGVtZSk7CisgICAgICAgIHByb2Nlc3NQb29sLT5yZWdpc3RlclVSTFNjaGVt ZUFzRW1wdHlEb2N1bWVudCh1cmxTY2hlbWUpOwogICAgICAgICBicmVhazsKICAgICB9CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250 ZXh0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRl eHQuY3BwCmluZGV4IDY0NzA5MWJmMzM4NTdhMmI5ODJkZDY3MTUyNjA3ZDQ3NWViOGE1YTEuLmQ2 ZjVlMTM4NWU1ZDg5ZTM0MGVjNDI3MDE0MjQwNjNlNWFjOTE5NWEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHQuY3BwCkBAIC0x NTcsNyArMTU3LDcgQEAgdHlwZWRlZiBIYXNoTWFwPFN0cmluZywgUmVmUHRyPFdlYktpdFVSSVNj aGVtZUhhbmRsZXI+ID4gVVJJU2NoZW1lSGFuZGxlck1hcDsKIHR5cGVkZWYgSGFzaE1hcDx1aW50 NjRfdCwgR1JlZlB0cjxXZWJLaXRVUklTY2hlbWVSZXF1ZXN0PiA+IFVSSVNjaGVtZVJlcXVlc3RN YXA7CiAKIHN0cnVjdCBfV2ViS2l0V2ViQ29udGV4dFByaXZhdGUgewotICAgIFJlZlB0cjxXZWJQ cm9jZXNzUG9vbD4gY29udGV4dDsKKyAgICBSZWZQdHI8V2ViUHJvY2Vzc1Bvb2w+IHByb2Nlc3NQ b29sOwogICAgIGJvb2wgY2xpZW50c0RldGFjaGVkOwogCiAgICAgR1JlZlB0cjxXZWJLaXRDb29r aWVNYW5hZ2VyPiBjb29raWVNYW5hZ2VyOwpAQCAtMjczLDI4ICsyNzMsMjggQEAgc3RhdGljIHZv aWQgd2Via2l0V2ViQ29udGV4dENvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKICAgICB9IGVs c2UgaWYgKCFwcml2LT5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkuaXNOdWxsKCkpCiAgICAgICAgIGNv bmZpZ3VyYXRpb24uc2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5KFdlYkNvcmU6OmZpbGVuYW1lVG9T dHJpbmcocHJpdi0+bG9jYWxTdG9yYWdlRGlyZWN0b3J5LmRhdGEoKSkpOwogCi0gICAgcHJpdi0+ Y29udGV4dCA9IFdlYlByb2Nlc3NQb29sOjpjcmVhdGUoY29uZmlndXJhdGlvbik7CisgICAgcHJp di0+cHJvY2Vzc1Bvb2wgPSBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlKGNvbmZpZ3VyYXRpb24pOwog CiAgICAgaWYgKCFwcml2LT53ZWJzaXRlRGF0YU1hbmFnZXIpCiAgICAgICAgIHByaXYtPndlYnNp dGVEYXRhTWFuYWdlciA9IHdlYmtpdFdlYnNpdGVEYXRhTWFuYWdlckNyZWF0ZSh3ZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbkZvcldlYlByb2Nlc3NQb29sQ29uZmlndXJhdGlvbihjb25maWd1 cmF0aW9uKSk7CiAKLSAgICBwcml2LT5yZXF1ZXN0TWFuYWdlciA9IHByaXYtPmNvbnRleHQtPnN1 cHBsZW1lbnQ8V2ViU291cEN1c3RvbVByb3RvY29sUmVxdWVzdE1hbmFnZXI+KCk7CisgICAgcHJp di0+cmVxdWVzdE1hbmFnZXIgPSBwcml2LT5wcm9jZXNzUG9vbC0+c3VwcGxlbWVudDxXZWJTb3Vw Q3VzdG9tUHJvdG9jb2xSZXF1ZXN0TWFuYWdlcj4oKTsKIAogICAgIHByaXYtPnRsc0Vycm9yc1Bv bGljeSA9IFdFQktJVF9UTFNfRVJST1JTX1BPTElDWV9GQUlMOwotICAgIHByaXYtPmNvbnRleHQt PnNldElnbm9yZVRMU0Vycm9ycyhmYWxzZSk7CisgICAgcHJpdi0+cHJvY2Vzc1Bvb2wtPnNldEln bm9yZVRMU0Vycm9ycyhmYWxzZSk7CiAKICAgICBhdHRhY2hJbmplY3RlZEJ1bmRsZUNsaWVudFRv Q29udGV4dCh3ZWJDb250ZXh0KTsKICAgICBhdHRhY2hEb3dubG9hZENsaWVudFRvQ29udGV4dCh3 ZWJDb250ZXh0KTsKICAgICBhdHRhY2hSZXF1ZXN0TWFuYWdlckNsaWVudFRvQ29udGV4dCh3ZWJD b250ZXh0KTsKIAogI2lmIEVOQUJMRShHRU9MT0NBVElPTikKLSAgICBwcml2LT5nZW9sb2NhdGlv blByb3ZpZGVyID0gV2ViS2l0R2VvbG9jYXRpb25Qcm92aWRlcjo6Y3JlYXRlKHByaXYtPmNvbnRl eHQtPnN1cHBsZW1lbnQ8V2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHk+KCkpOworICAgIHByaXYt Pmdlb2xvY2F0aW9uUHJvdmlkZXIgPSBXZWJLaXRHZW9sb2NhdGlvblByb3ZpZGVyOjpjcmVhdGUo cHJpdi0+cHJvY2Vzc1Bvb2wtPnN1cHBsZW1lbnQ8V2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHk+ KCkpOwogI2VuZGlmCiAjaWYgRU5BQkxFKEJBVFRFUllfU1RBVFVTKQotICAgIHByaXYtPmJhdHRl cnlQcm92aWRlciA9IFdlYktpdEJhdHRlcnlQcm92aWRlcjo6Y3JlYXRlKHByaXYtPmNvbnRleHQt PnN1cHBsZW1lbnQ8V2ViQmF0dGVyeU1hbmFnZXJQcm94eT4oKSk7CisgICAgcHJpdi0+YmF0dGVy eVByb3ZpZGVyID0gV2ViS2l0QmF0dGVyeVByb3ZpZGVyOjpjcmVhdGUocHJpdi0+cHJvY2Vzc1Bv b2wtPnN1cHBsZW1lbnQ8V2ViQmF0dGVyeU1hbmFnZXJQcm94eT4oKSk7CiAjZW5kaWYKICNpZiBF TkFCTEUoTk9USUZJQ0FUSU9OUykKLSAgICBwcml2LT5ub3RpZmljYXRpb25Qcm92aWRlciA9IFdl YktpdE5vdGlmaWNhdGlvblByb3ZpZGVyOjpjcmVhdGUocHJpdi0+Y29udGV4dC0+c3VwcGxlbWVu dDxXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHk+KCkpOworICAgIHByaXYtPm5vdGlmaWNhdGlv blByb3ZpZGVyID0gV2ViS2l0Tm90aWZpY2F0aW9uUHJvdmlkZXI6OmNyZWF0ZShwcml2LT5wcm9j ZXNzUG9vbC0+c3VwcGxlbWVudDxXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHk+KCkpOwogI2Vu ZGlmCiB9CiAKQEAgLTMwMyw4ICszMDMsOCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJDb250ZXh0 RGlzcG9zZShHT2JqZWN0KiBvYmplY3QpCiAgICAgV2ViS2l0V2ViQ29udGV4dFByaXZhdGUqIHBy aXYgPSBXRUJLSVRfV0VCX0NPTlRFWFQob2JqZWN0KS0+cHJpdjsKICAgICBpZiAoIXByaXYtPmNs aWVudHNEZXRhY2hlZCkgewogICAgICAgICBwcml2LT5jbGllbnRzRGV0YWNoZWQgPSB0cnVlOwot ICAgICAgICBwcml2LT5jb250ZXh0LT5pbml0aWFsaXplSW5qZWN0ZWRCdW5kbGVDbGllbnQobnVs bHB0cik7Ci0gICAgICAgIHByaXYtPmNvbnRleHQtPnNldERvd25sb2FkQ2xpZW50KG51bGxwdHIp OworICAgICAgICBwcml2LT5wcm9jZXNzUG9vbC0+aW5pdGlhbGl6ZUluamVjdGVkQnVuZGxlQ2xp ZW50KG51bGxwdHIpOworICAgICAgICBwcml2LT5wcm9jZXNzUG9vbC0+c2V0RG93bmxvYWRDbGll bnQobnVsbHB0cik7CiAgICAgfQogCiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl9jb250 ZXh0X3BhcmVudF9jbGFzcyktPmRpc3Bvc2Uob2JqZWN0KTsKQEAgLTUwNyw4ICs1MDcsOCBAQCB2 b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfY2FjaGVfbW9kZWwoV2ViS2l0V2ViQ29udGV4dCog Y29udGV4dCwgV2ViS2l0Q2FjaGVNbwogICAgICAgICBnX2Fzc2VydF9ub3RfcmVhY2hlZCgpOwog ICAgIH0KIAotICAgIGlmIChjYWNoZU1vZGVsICE9IGNvbnRleHQtPnByaXYtPmNvbnRleHQtPmNh Y2hlTW9kZWwoKSkKLSAgICAgICAgY29udGV4dC0+cHJpdi0+Y29udGV4dC0+c2V0Q2FjaGVNb2Rl bChjYWNoZU1vZGVsKTsKKyAgICBpZiAoY2FjaGVNb2RlbCAhPSBjb250ZXh0LT5wcml2LT5wcm9j ZXNzUG9vbC0+Y2FjaGVNb2RlbCgpKQorICAgICAgICBjb250ZXh0LT5wcml2LT5wcm9jZXNzUG9v bC0+c2V0Q2FjaGVNb2RlbChjYWNoZU1vZGVsKTsKIH0KIAogLyoqCkBAIC01MjUsNyArNTI1LDcg QEAgV2ViS2l0Q2FjaGVNb2RlbCB3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2NhY2hlX21vZGVsKFdl YktpdFdlYkNvbnRleHQqIGNvbnRleHQpCiB7CiAgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VC S0lUX0lTX1dFQl9DT05URVhUKGNvbnRleHQpLCBXRUJLSVRfQ0FDSEVfTU9ERUxfV0VCX0JST1dT RVIpOwogCi0gICAgc3dpdGNoIChjb250ZXh0LT5wcml2LT5jb250ZXh0LT5jYWNoZU1vZGVsKCkp IHsKKyAgICBzd2l0Y2ggKGNvbnRleHQtPnByaXYtPnByb2Nlc3NQb29sLT5jYWNoZU1vZGVsKCkp IHsKICAgICBjYXNlIENhY2hlTW9kZWxEb2N1bWVudFZpZXdlcjoKICAgICAgICAgcmV0dXJuIFdF QktJVF9DQUNIRV9NT0RFTF9ET0NVTUVOVF9WSUVXRVI7CiAgICAgY2FzZSBDYWNoZU1vZGVsUHJp bWFyeVdlYkJyb3dzZXI6CkBAIC01NTEsNyArNTUxLDcgQEAgdm9pZCB3ZWJraXRfd2ViX2NvbnRl eHRfY2xlYXJfY2FjaGUoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCkKICAgICBnX3JldHVybl9p Zl9mYWlsKFdFQktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0KSk7CiAKICAgICAvLyBGSVhNRTog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjA0MQotICAgIC8vIGNv bnRleHQtPnByaXYtPmNvbnRleHQtPnN1cHBsZW1lbnQ8V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQ cm94eT4oKS0+Y2xlYXJDYWNoZUZvckFsbE9yaWdpbnMoQWxsUmVzb3VyY2VDYWNoZXMpOworICAg IC8vIGNvbnRleHQtPnByaXYtPnByb2Nlc3NQb29sLT5zdXBwbGVtZW50PFdlYlJlc291cmNlQ2Fj aGVNYW5hZ2VyUHJveHk+KCktPmNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKEFsbFJlc291cmNlQ2Fj aGVzKTsKIH0KIAogdHlwZWRlZiBIYXNoTWFwPERvd25sb2FkUHJveHkqLCBHUmVmUHRyPFdlYktp dERvd25sb2FkPiA+IERvd25sb2Fkc01hcDsKQEAgLTU5Nyw3ICs1OTcsNyBAQCBXZWJLaXRDb29r aWVNYW5hZ2VyKiB3ZWJraXRfd2ViX2NvbnRleHRfZ2V0X2Nvb2tpZV9tYW5hZ2VyKFdlYktpdFdl YkNvbnRleHQqIGNvbgogCiAgICAgV2ViS2l0V2ViQ29udGV4dFByaXZhdGUqIHByaXYgPSBjb250 ZXh0LT5wcml2OwogICAgIGlmICghcHJpdi0+Y29va2llTWFuYWdlcikKLSAgICAgICAgcHJpdi0+ Y29va2llTWFuYWdlciA9IGFkb3B0R1JlZih3ZWJraXRDb29raWVNYW5hZ2VyQ3JlYXRlKHByaXYt PmNvbnRleHQtPnN1cHBsZW1lbnQ8V2ViQ29va2llTWFuYWdlclByb3h5PigpKSk7CisgICAgICAg IHByaXYtPmNvb2tpZU1hbmFnZXIgPSBhZG9wdEdSZWYod2Via2l0Q29va2llTWFuYWdlckNyZWF0 ZShwcml2LT5wcm9jZXNzUG9vbC0+c3VwcGxlbWVudDxXZWJDb29raWVNYW5hZ2VyUHJveHk+KCkp KTsKIAogICAgIHJldHVybiBwcml2LT5jb29raWVNYW5hZ2VyLmdldCgpOwogfQpAQCAtNjA4LDcg KzYwOCw3IEBAIHN0YXRpYyB2b2lkIGVuc3VyZUZhdmljb25EYXRhYmFzZShXZWJLaXRXZWJDb250 ZXh0KiBjb250ZXh0KQogICAgIGlmIChwcml2LT5mYXZpY29uRGF0YWJhc2UpCiAgICAgICAgIHJl dHVybjsKIAotICAgIHByaXYtPmZhdmljb25EYXRhYmFzZSA9IGFkb3B0R1JlZih3ZWJraXRGYXZp Y29uRGF0YWJhc2VDcmVhdGUocHJpdi0+Y29udGV4dC0+aWNvbkRhdGFiYXNlKCkpKTsKKyAgICBw cml2LT5mYXZpY29uRGF0YWJhc2UgPSBhZG9wdEdSZWYod2Via2l0RmF2aWNvbkRhdGFiYXNlQ3Jl YXRlKHByaXYtPnByb2Nlc3NQb29sLT5pY29uRGF0YWJhc2UoKSkpOwogfQogCiAvKioKQEAgLTYz MSw3ICs2MzEsNyBAQCB2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfZmF2aWNvbl9kYXRhYmFz ZV9kaXJlY3RvcnkoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dAogICAgIGdfcmV0dXJuX2lmX2Zh aWwoV0VCS0lUX0lTX1dFQl9DT05URVhUKGNvbnRleHQpKTsKIAogICAgIFdlYktpdFdlYkNvbnRl eHRQcml2YXRlKiBwcml2ID0gY29udGV4dC0+cHJpdjsKLSAgICBXZWJJY29uRGF0YWJhc2UqIGlj b25EYXRhYmFzZSA9IHByaXYtPmNvbnRleHQtPmljb25EYXRhYmFzZSgpOworICAgIFdlYkljb25E YXRhYmFzZSogaWNvbkRhdGFiYXNlID0gcHJpdi0+cHJvY2Vzc1Bvb2wtPmljb25EYXRhYmFzZSgp OwogICAgIGlmIChpY29uRGF0YWJhc2UtPmlzT3BlbigpKQogICAgICAgICByZXR1cm47CiAKQEAg LTY0MCw3ICs2NDAsNyBAQCB2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfZmF2aWNvbl9kYXRh YmFzZV9kaXJlY3RvcnkoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dAogICAgIC8vIFVzZSBkZWZh dWx0IGlmIDAgaXMgcGFzc2VkIGFzIHBhcmFtZXRlci4KICAgICBTdHJpbmcgZGlyZWN0b3J5UGF0 aCA9IFdlYkNvcmU6OmZpbGVuYW1lVG9TdHJpbmcocGF0aCk7CiAgICAgcHJpdi0+ZmF2aWNvbkRh dGFiYXNlRGlyZWN0b3J5ID0gZGlyZWN0b3J5UGF0aC5pc0VtcHR5KCkKLSAgICAgICAgPyBwcml2 LT5jb250ZXh0LT5pY29uRGF0YWJhc2VQYXRoKCkudXRmOCgpCisgICAgICAgID8gcHJpdi0+cHJv Y2Vzc1Bvb2wtPmljb25EYXRhYmFzZVBhdGgoKS51dGY4KCkKICAgICAgICAgOiBkaXJlY3RvcnlQ YXRoLnV0ZjgoKTsKIAogICAgIC8vIEJ1aWxkIHRoZSBmdWxsIHBhdGggdG8gdGhlIGljb24gZGF0 YWJhc2UgZmlsZSBvbiBkaXNrLgpAQCAtNjQ4LDcgKzY0OCw3IEBAIHZvaWQgd2Via2l0X3dlYl9j b250ZXh0X3NldF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeShXZWJLaXRXZWJDb250ZXh0KiBj b250ZXh0CiAgICAgICAgIFdlYkNvcmU6Okljb25EYXRhYmFzZTo6ZGVmYXVsdERhdGFiYXNlRmls ZW5hbWUoKS51dGY4KCkuZGF0YSgpLCBudWxscHRyKSk7CiAKICAgICAvLyBTZXR0aW5nIHRoZSBw YXRoIHdpbGwgY2F1c2UgdGhlIGljb24gZGF0YWJhc2UgdG8gYmUgb3BlbmVkLgotICAgIHByaXYt PmNvbnRleHQtPnNldEljb25EYXRhYmFzZVBhdGgoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhm YXZpY29uRGF0YWJhc2VQYXRoLmdldCgpKSk7CisgICAgcHJpdi0+cHJvY2Vzc1Bvb2wtPnNldElj b25EYXRhYmFzZVBhdGgoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhmYXZpY29uRGF0YWJhc2VQ YXRoLmdldCgpKSk7CiB9CiAKIC8qKgpAQCAtNzI5LDcgKzcyOSw3IEBAIHZvaWQgd2Via2l0X3dl Yl9jb250ZXh0X3NldF9hZGRpdGlvbmFsX3BsdWdpbnNfZGlyZWN0b3J5KFdlYktpdFdlYkNvbnRl eHQqIGNvbnRlCiAgICAgZ19yZXR1cm5faWZfZmFpbChkaXJlY3RvcnkpOwogCiAjaWYgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpCi0gICAgY29udGV4dC0+cHJpdi0+Y29udGV4dC0+c2V0QWRk aXRpb25hbFBsdWdpbnNEaXJlY3RvcnkoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhkaXJlY3Rv cnkpKTsKKyAgICBjb250ZXh0LT5wcml2LT5wcm9jZXNzUG9vbC0+c2V0QWRkaXRpb25hbFBsdWdp bnNEaXJlY3RvcnkoV2ViQ29yZTo6ZmlsZW5hbWVUb1N0cmluZyhkaXJlY3RvcnkpKTsKICNlbmRp ZgogfQogCkBAIC03NDIsNyArNzQyLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0V2ViQ29udGV4dEdl dFBsdWdpblRocmVhZChHVGFzayogdGFzaywgZ3BvaW50ZXIgb2JqZWN0LCBncG9pbnQKIHsKICAg ICBHTGlzdCogcmV0dXJuVmFsdWUgPSAwOwogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJ KQotICAgIFZlY3RvcjxQbHVnaW5Nb2R1bGVJbmZvPiBwbHVnaW5zID0gV0VCS0lUX1dFQl9DT05U RVhUKG9iamVjdCktPnByaXYtPmNvbnRleHQtPnBsdWdpbkluZm9TdG9yZSgpLnBsdWdpbnMoKTsK KyAgICBWZWN0b3I8UGx1Z2luTW9kdWxlSW5mbz4gcGx1Z2lucyA9IFdFQktJVF9XRUJfQ09OVEVY VChvYmplY3QpLT5wcml2LT5wcm9jZXNzUG9vbC0+cGx1Z2luSW5mb1N0b3JlKCkucGx1Z2lucygp OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgcGx1Z2lucy5zaXplKCk7ICsraSkKICAgICAg ICAgcmV0dXJuVmFsdWUgPSBnX2xpc3RfcHJlcGVuZChyZXR1cm5WYWx1ZSwgd2Via2l0UGx1Z2lu Q3JlYXRlKHBsdWdpbnNbaV0pKTsKICNlbmRpZgpAQCAtOTkwLDggKzk5MCw4IEBAIHZvaWQgd2Vi a2l0X3dlYl9jb250ZXh0X3NldF90bHNfZXJyb3JzX3BvbGljeShXZWJLaXRXZWJDb250ZXh0KiBj b250ZXh0LCBXZWJLaXRUCiAKICAgICBjb250ZXh0LT5wcml2LT50bHNFcnJvcnNQb2xpY3kgPSBw b2xpY3k7CiAgICAgYm9vbCBpZ25vcmVUTFNFcnJvcnMgPSBwb2xpY3kgPT0gV0VCS0lUX1RMU19F UlJPUlNfUE9MSUNZX0lHTk9SRTsKLSAgICBpZiAoY29udGV4dC0+cHJpdi0+Y29udGV4dC0+aWdu b3JlVExTRXJyb3JzKCkgIT0gaWdub3JlVExTRXJyb3JzKQotICAgICAgICBjb250ZXh0LT5wcml2 LT5jb250ZXh0LT5zZXRJZ25vcmVUTFNFcnJvcnMoaWdub3JlVExTRXJyb3JzKTsKKyAgICBpZiAo Y29udGV4dC0+cHJpdi0+cHJvY2Vzc1Bvb2wtPmlnbm9yZVRMU0Vycm9ycygpICE9IGlnbm9yZVRM U0Vycm9ycykKKyAgICAgICAgY29udGV4dC0+cHJpdi0+cHJvY2Vzc1Bvb2wtPnNldElnbm9yZVRM U0Vycm9ycyhpZ25vcmVUTFNFcnJvcnMpOwogfQogCiAvKioKQEAgLTEwNzEsNyArMTA3MSw3IEBA IHZvaWQgd2Via2l0X3dlYl9jb250ZXh0X3NldF9kaXNrX2NhY2hlX2RpcmVjdG9yeShXZWJLaXRX ZWJDb250ZXh0KiBjb250ZXh0LCBjb25zCiAgICAgZ19yZXR1cm5faWZfZmFpbChXRUJLSVRfSVNf V0VCX0NPTlRFWFQoY29udGV4dCkpOwogICAgIGdfcmV0dXJuX2lmX2ZhaWwoZGlyZWN0b3J5KTsK IAotICAgIGNvbnRleHQtPnByaXYtPmNvbnRleHQtPmNvbmZpZ3VyYXRpb24oKS5zZXREaXNrQ2Fj aGVEaXJlY3RvcnkoV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KFdlYkNvcmU6OmZp bGVuYW1lVG9TdHJpbmcoZGlyZWN0b3J5KSwgbmV0d29ya0NhY2hlU3ViZGlyZWN0b3J5KSk7Cisg ICAgY29udGV4dC0+cHJpdi0+cHJvY2Vzc1Bvb2wtPmNvbmZpZ3VyYXRpb24oKS5zZXREaXNrQ2Fj aGVEaXJlY3RvcnkoV2ViQ29yZTo6cGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KFdlYkNvcmU6OmZp bGVuYW1lVG9TdHJpbmcoZGlyZWN0b3J5KSwgbmV0d29ya0NhY2hlU3ViZGlyZWN0b3J5KSk7CiB9 CiAKIC8qKgpAQCAtMTA4OSw3ICsxMDg5LDcgQEAgdm9pZCB3ZWJraXRfd2ViX2NvbnRleHRfcHJl ZmV0Y2hfZG5zKFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIGNvbnN0IGNoYXIqIGhvc3QKIAog ICAgIEFQSTo6RGljdGlvbmFyeTo6TWFwVHlwZSBtZXNzYWdlOwogICAgIG1lc3NhZ2Uuc2V0KFN0 cmluZzo6ZnJvbVVURjgoIkhvc3RuYW1lIiksIEFQSTo6U3RyaW5nOjpjcmVhdGUoU3RyaW5nOjpm cm9tVVRGOChob3N0bmFtZSkpKTsKLSAgICBjb250ZXh0LT5wcml2LT5jb250ZXh0LT5wb3N0TWVz c2FnZVRvSW5qZWN0ZWRCdW5kbGUoU3RyaW5nOjpmcm9tVVRGOCgiUHJlZmV0Y2hETlMiKSwgQVBJ OjpEaWN0aW9uYXJ5OjpjcmVhdGUoV1RGTW92ZShtZXNzYWdlKSkucHRyKCkpOworICAgIGNvbnRl eHQtPnByaXYtPnByb2Nlc3NQb29sLT5wb3N0TWVzc2FnZVRvSW5qZWN0ZWRCdW5kbGUoU3RyaW5n Ojpmcm9tVVRGOCgiUHJlZmV0Y2hETlMiKSwgQVBJOjpEaWN0aW9uYXJ5OjpjcmVhdGUoV1RGTW92 ZShtZXNzYWdlKSkucHRyKCkpOwogfQogCiAvKioKQEAgLTExMDksNyArMTEwOSw3IEBAIHZvaWQg d2Via2l0X3dlYl9jb250ZXh0X2FsbG93X3Rsc19jZXJ0aWZpY2F0ZV9mb3JfaG9zdChXZWJLaXRX ZWJDb250ZXh0KiBjb250ZXh0CiAgICAgZ19yZXR1cm5faWZfZmFpbChob3N0KTsKIAogICAgIFJl ZlB0cjxXZWJDZXJ0aWZpY2F0ZUluZm8+IHdlYkNlcnRpZmljYXRlSW5mbyA9IFdlYkNlcnRpZmlj YXRlSW5mbzo6Y3JlYXRlKFdlYkNvcmU6OkNlcnRpZmljYXRlSW5mbyhjZXJ0aWZpY2F0ZSwgc3Rh dGljX2Nhc3Q8R1Rsc0NlcnRpZmljYXRlRmxhZ3M+KDApKSk7Ci0gICAgY29udGV4dC0+cHJpdi0+ Y29udGV4dC0+YWxsb3dTcGVjaWZpY0hUVFBTQ2VydGlmaWNhdGVGb3JIb3N0KHdlYkNlcnRpZmlj YXRlSW5mby5nZXQoKSwgU3RyaW5nOjpmcm9tVVRGOChob3N0KSk7CisgICAgY29udGV4dC0+cHJp di0+cHJvY2Vzc1Bvb2wtPmFsbG93U3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9ySG9zdCh3ZWJD ZXJ0aWZpY2F0ZUluZm8uZ2V0KCksIFN0cmluZzo6ZnJvbVVURjgoaG9zdCkpOwogfQogCiAvKioK QEAgLTExNDksMTAgKzExNDksMTAgQEAgdm9pZCB3ZWJraXRfd2ViX2NvbnRleHRfc2V0X3Byb2Nl c3NfbW9kZWwoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgV2ViS2l0UHJvY2UKICAgICBjb250 ZXh0LT5wcml2LT5wcm9jZXNzTW9kZWwgPSBwcm9jZXNzTW9kZWw7CiAgICAgc3dpdGNoIChjb250 ZXh0LT5wcml2LT5wcm9jZXNzTW9kZWwpIHsKICAgICBjYXNlIFdFQktJVF9QUk9DRVNTX01PREVM X1NIQVJFRF9TRUNPTkRBUllfUFJPQ0VTUzoKLSAgICAgICAgY29udGV4dC0+cHJpdi0+Y29udGV4 dC0+c2V0TWF4aW11bU51bWJlck9mUHJvY2Vzc2VzKDEpOworICAgICAgICBjb250ZXh0LT5wcml2 LT5wcm9jZXNzUG9vbC0+c2V0TWF4aW11bU51bWJlck9mUHJvY2Vzc2VzKDEpOwogICAgICAgICBi cmVhazsKICAgICBjYXNlIFdFQktJVF9QUk9DRVNTX01PREVMX01VTFRJUExFX1NFQ09OREFSWV9Q Uk9DRVNTRVM6Ci0gICAgICAgIGNvbnRleHQtPnByaXYtPmNvbnRleHQtPnNldE1heGltdW1OdW1i ZXJPZlByb2Nlc3Nlcyhjb250ZXh0LT5wcml2LT5wcm9jZXNzQ291bnRMaW1pdCk7CisgICAgICAg IGNvbnRleHQtPnByaXYtPnByb2Nlc3NQb29sLT5zZXRNYXhpbXVtTnVtYmVyT2ZQcm9jZXNzZXMo Y29udGV4dC0+cHJpdi0+cHJvY2Vzc0NvdW50TGltaXQpOwogICAgICAgICBicmVhazsKICAgICB9 CiB9CkBAIC0xMTk4LDcgKzExOTgsNyBAQCB2b2lkIHdlYmtpdF93ZWJfY29udGV4dF9zZXRfd2Vi X3Byb2Nlc3NfY291bnRfbGltaXQoV2ViS2l0V2ViQ29udGV4dCogY29udGV4dCwgZwogCiAgICAg Y29udGV4dC0+cHJpdi0+cHJvY2Vzc0NvdW50TGltaXQgPSBsaW1pdDsKICAgICBpZiAoY29udGV4 dC0+cHJpdi0+cHJvY2Vzc01vZGVsICE9IFdFQktJVF9QUk9DRVNTX01PREVMX1NIQVJFRF9TRUNP TkRBUllfUFJPQ0VTUykKLSAgICAgICAgY29udGV4dC0+cHJpdi0+Y29udGV4dC0+c2V0TWF4aW11 bU51bWJlck9mUHJvY2Vzc2VzKGxpbWl0KTsKKyAgICAgICAgY29udGV4dC0+cHJpdi0+cHJvY2Vz c1Bvb2wtPnNldE1heGltdW1OdW1iZXJPZlByb2Nlc3NlcyhsaW1pdCk7CiB9CiAKIC8qKgpAQCAt MTIzMiw3ICsxMjMyLDcgQEAgV2ViS2l0RG93bmxvYWQqIHdlYmtpdFdlYkNvbnRleHRHZXRPckNy ZWF0ZURvd25sb2FkKERvd25sb2FkUHJveHkqIGRvd25sb2FkUHJveHkKIFdlYktpdERvd25sb2Fk KiB3ZWJraXRXZWJDb250ZXh0U3RhcnREb3dubG9hZChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0 LCBjb25zdCBjaGFyKiB1cmksIFdlYlBhZ2VQcm94eSogaW5pdGlhdGluZ1BhZ2UpCiB7CiAgICAg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QoU3RyaW5nOjpmcm9tVVRGOCh1cmkpKTsK LSAgICBEb3dubG9hZFByb3h5KiBkb3dubG9hZFByb3h5ID0gY29udGV4dC0+cHJpdi0+Y29udGV4 dC0+ZG93bmxvYWQoaW5pdGlhdGluZ1BhZ2UsIHJlcXVlc3QpOworICAgIERvd25sb2FkUHJveHkq IGRvd25sb2FkUHJveHkgPSBjb250ZXh0LT5wcml2LT5wcm9jZXNzUG9vbC0+ZG93bmxvYWQoaW5p dGlhdGluZ1BhZ2UsIHJlcXVlc3QpOwogICAgIFdlYktpdERvd25sb2FkKiBkb3dubG9hZCA9IHdl YmtpdERvd25sb2FkQ3JlYXRlRm9yUmVxdWVzdChkb3dubG9hZFByb3h5LCByZXF1ZXN0KTsKICAg ICBkb3dubG9hZHNNYXAoKS5zZXQoZG93bmxvYWRQcm94eSwgZG93bmxvYWQpOwogICAgIHJldHVy biBkb3dubG9hZDsKQEAgLTEyNTYsMTEgKzEyNTYsMTEgQEAgR1ZhcmlhbnQqIHdlYmtpdFdlYkNv bnRleHRJbml0aWFsaXplV2ViRXh0ZW5zaW9ucyhXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0KQog ICAgICAgICBjb250ZXh0LT5wcml2LT53ZWJFeHRlbnNpb25zSW5pdGlhbGl6YXRpb25Vc2VyRGF0 YS5nZXQoKSk7CiB9CiAKLVdlYlByb2Nlc3NQb29sKiB3ZWJraXRXZWJDb250ZXh0R2V0Q29udGV4 dChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0KQorV2ViUHJvY2Vzc1Bvb2wqIHdlYmtpdFdlYkNv bnRleHRHZXRQcm9jZXNzUG9vbChXZWJLaXRXZWJDb250ZXh0KiBjb250ZXh0KQogewogICAgIGdf YXNzZXJ0KFdFQktJVF9JU19XRUJfQ09OVEVYVChjb250ZXh0KSk7CiAKLSAgICByZXR1cm4gY29u dGV4dC0+cHJpdi0+Y29udGV4dC5nZXQoKTsKKyAgICByZXR1cm4gY29udGV4dC0+cHJpdi0+cHJv Y2Vzc1Bvb2wuZ2V0KCk7CiB9CiAKIFdlYlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2Vy KiB3ZWJraXRXZWJDb250ZXh0R2V0UmVxdWVzdE1hbmFnZXIoV2ViS2l0V2ViQ29udGV4dCogY29u dGV4dCkKQEAgLTEzMDQsNyArMTMwNCw3IEBAIHZvaWQgd2Via2l0V2ViQ29udGV4dENyZWF0ZVBh Z2VGb3JXZWJWaWV3KFdlYktpdFdlYkNvbnRleHQqIGNvbnRleHQsIFdlYktpdFdlYlZpCiAgICAg V2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlID0gV0VCS0lUX1dFQl9WSUVXX0JBU0Uod2Vi Vmlldyk7CiAKICAgICBhdXRvIHBhZ2VDb25maWd1cmF0aW9uID0gQVBJOjpQYWdlQ29uZmlndXJh dGlvbjo6Y3JlYXRlKCk7Ci0gICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNldFByb2Nlc3NQb29sKGNv bnRleHQtPnByaXYtPmNvbnRleHQuZ2V0KCkpOworICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRQ cm9jZXNzUG9vbChjb250ZXh0LT5wcml2LT5wcm9jZXNzUG9vbC5nZXQoKSk7CiAgICAgcGFnZUNv bmZpZ3VyYXRpb24tPnNldFByZWZlcmVuY2VzKHdlYmtpdFNldHRpbmdzR2V0UHJlZmVyZW5jZXMo d2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyh3ZWJWaWV3KSkpOwogICAgIHBhZ2VDb25maWd1 cmF0aW9uLT5zZXRSZWxhdGVkUGFnZShyZWxhdGVkVmlldyA/IHdlYmtpdFdlYlZpZXdCYXNlR2V0 UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRShyZWxhdGVkVmlldykpIDogbnVsbHB0cik7CiAgICAg cGFnZUNvbmZpZ3VyYXRpb24tPnNldFVzZXJDb250ZW50Q29udHJvbGxlcih1c2VyQ29udGVudE1h bmFnZXIgPyB3ZWJraXRVc2VyQ29udGVudE1hbmFnZXJHZXRVc2VyQ29udGVudENvbnRyb2xsZXJQ cm94eSh1c2VyQ29udGVudE1hbmFnZXIpIDogbnVsbHB0cik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0UHJpdmF0ZS5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViQ29udGV4dFByaXZhdGUuaApp bmRleCAyOTlmMTAxOTcyYTNlOWJmMWVkMmU1OThkMjk2ZjVmMDlhOTY2ODE3Li43ZWU5NmIxOTk1 NDBjZWM3OGIzYjQ1NjA5YzNmMzAzYzY4ZTdmZTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJDb250ZXh0UHJpdmF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYkNvbnRleHRQcml2YXRlLmgKQEAg LTMzLDcgKzMzLDcgQEAKICNpbmNsdWRlICJXZWJQcm9jZXNzUG9vbC5oIgogI2luY2x1ZGUgIldl YlNvdXBDdXN0b21Qcm90b2NvbFJlcXVlc3RNYW5hZ2VyLmgiCiAKLVdlYktpdDo6V2ViUHJvY2Vz c1Bvb2wqIHdlYmtpdFdlYkNvbnRleHRHZXRDb250ZXh0KFdlYktpdFdlYkNvbnRleHQqKTsKK1dl YktpdDo6V2ViUHJvY2Vzc1Bvb2wqIHdlYmtpdFdlYkNvbnRleHRHZXRQcm9jZXNzUG9vbChXZWJL aXRXZWJDb250ZXh0Kik7CiBXZWJLaXREb3dubG9hZCogd2Via2l0V2ViQ29udGV4dEdldE9yQ3Jl YXRlRG93bmxvYWQoV2ViS2l0OjpEb3dubG9hZFByb3h5Kik7CiBXZWJLaXREb3dubG9hZCogd2Vi a2l0V2ViQ29udGV4dFN0YXJ0RG93bmxvYWQoV2ViS2l0V2ViQ29udGV4dCosIGNvbnN0IGNoYXIq IHVyaSwgV2ViS2l0OjpXZWJQYWdlUHJveHkqKTsKIHZvaWQgd2Via2l0V2ViQ29udGV4dFJlbW92 ZURvd25sb2FkKFdlYktpdDo6RG93bmxvYWRQcm94eSopOwo=