41479 2010-07-01 12:31:36 -0700 Change the CoreIPC connection identifier to be a HANDLE on Windows 2010-07-01 13:04:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 245482 0 andersca 2010-07-01 12:31:36 -0700 Change the CoreIPC connection identifier to be a HANDLE on Windows 245488 1 60273 andersca 2010-07-01 12:36:59 -0700 Created attachment 60273 Patch 245490 2 webkit.review.bot 2010-07-01 12:39:25 -0700 Attachment 60273 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKit2/WebProcess/win/WebProcessMain.cpp:31: Alphabetical sorting problem. [build/include_order] [4] WebKit2/WebProcess/win/WebProcessMain.cpp:64: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 245506 3 andersca 2010-07-01 13:04:37 -0700 Committed r62290: <http://trac.webkit.org/changeset/62290> 60273 2010-07-01 12:36:59 -0700 2010-07-01 12:59:47 -0700 Patch bug-41479-20100701123658.patch text/plain 13844 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ZDFjMDU4M2U3ZTMxYmZjZDE3OWI0OTk3N2JiYjkwZDRkNDZlOGI0ZS4uOWQxYjJjNDUyYzAxZDYy ZDY0OWM4NTgyM2Y2MGY2NmQzN2ZmYmZlYiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMC0wNy0wMSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSB0aGUgQ29yZUlQQyBjb25uZWN0aW9u IGlkZW50aWZpZXIgdG8gYmUgYSBIQU5ETEUgb24gV2luZG93cworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDE0NzkKKworICAgICAgICAqIFBsYXRmb3Jt L0NvcmVJUEMvQ29ubmVjdGlvbi5oOgorICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvd2luL0Nv bm5lY3Rpb25XaW4uY3BwOgorICAgICAgICAoQ29yZUlQQzo6Q29ubmVjdGlvbjo6Y3JlYXRlU2Vy dmVyQW5kQ2xpZW50SWRlbnRpZmllcnMpOgorICAgICAgICBOZXcgZnVuY3Rpb24gdGhhdCBjcmVh dGVzIGEgc2VydmVyIGFuZCBjbGllbnQgSEFORExFLgorCisgICAgICAgIChDb3JlSVBDOjpDb25u ZWN0aW9uOjpwbGF0Zm9ybUluaXRpYWxpemUpOgorICAgICAgICBEb24ndCBvcGVuIHRoZSBjb25u ZWN0aW9ucyBoZXJlLgorCisgICAgICAgIChDb3JlSVBDOjpDb25uZWN0aW9uOjpyZWFkRXZlbnRI YW5kbGVyKToKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246Om9wZW4pOgorICAgICAgICAK KyAgICAgICAgKiBVSVByb2Nlc3MvTGF1bmNoZXIvd2luL1dlYlByb2Nlc3NMYXVuY2hlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OndlYlRocmVhZEJvZHkpOgorICAgICAgICBHZXQgdGhlIGhhbmRs ZSBmcm9tIHRoZSB0aHJlYWQuCisKKyAgICAgICAgKFdlYktpdDo6bGF1bmNoV2ViUHJvY2Vzcyk6 CisgICAgICAgIE1hcmsgdGhlIGNsaWVudCBpZGVudGlmaWVyIGFzIGluaGVyaXRhYmxlIGFuZCBw YXNzIGl0IGFsb25nIHRvIHRoZSB3ZWIgcHJvY2Vzcy4KKworICAgICAgICAqIFdlYlByb2Nlc3Mv d2luL1dlYlByb2Nlc3NNYWluLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q29tbWFuZExpbmU6OkNv bW1hbmRMaW5lKToKKyAgICAgICAgKFdlYktpdDo6Q29tbWFuZExpbmU6OnBhcnNlKToKKyAgICAg ICAgKFdlYktpdDo6Q29tbWFuZExpbmU6Om9wZXJhdG9yW10pOgorICAgICAgICBBZGQgc2ltcGxl IGNvbW1hbmQgbGluZSBwYXJzZXIuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc01haW4p OgorICAgICAgICBHZXQgdGhlIGhhbmRsZSBpZGVudGlmaWVyIGZyb20gdGhlIGNvbW1hbmQgbGlu ZS4KKworICAgICAgICAqIFdlYlByb2Nlc3Mvd2luL1dlYlByb2Nlc3NNYWluLmg6CisKIDIwMTAt MDctMDEgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI2MjI2Ny4KZGlmZiAtLWdpdCBhL1dlYktpdDIv UGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmggYi9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMv Q29ubmVjdGlvbi5oCmluZGV4IGFlMjFkZjU0MzdlMmViNTNkNzljNTg0MzIzOTEwMjA4OWQ4NGE1 YzQuLjc1NWVkY2I2ZWM0MzYxOGI4NzkyN2ZjYWJmZjJjYzM5ZmM1NTJmZDAgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmgKKysrIGIvV2ViS2l0Mi9QbGF0 Zm9ybS9Db3JlSVBDL0Nvbm5lY3Rpb24uaApAQCAtNjgsNyArNjgsOCBAQCBwdWJsaWM6CiAjaWYg UExBVEZPUk0oTUFDKQogICAgIHR5cGVkZWYgbWFjaF9wb3J0X3QgSWRlbnRpZmllcjsKICNlbGlm IFBMQVRGT1JNKFdJTikKLSAgICB0eXBlZGVmIGNvbnN0IHN0ZDo6d3N0cmluZyYgSWRlbnRpZmll cjsKKyAgICB0eXBlZGVmIEhBTkRMRSBJZGVudGlmaWVyOworICAgIHN0YXRpYyBib29sIGNyZWF0 ZVNlcnZlckFuZENsaWVudElkZW50aWZpZXJzKElkZW50aWZpZXImIHNlcnZlcklkZW50aWZpZXIs IElkZW50aWZpZXImIGNsaWVudElkZW50aWZpZXIpOwogI2VsaWYgUExBVEZPUk0oUVQpCiAgICAg dHlwZWRlZiBjb25zdCBRU3RyaW5nIElkZW50aWZpZXI7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1dl YktpdDIvUGxhdGZvcm0vQ29yZUlQQy93aW4vQ29ubmVjdGlvbldpbi5jcHAgYi9XZWJLaXQyL1Bs YXRmb3JtL0NvcmVJUEMvd2luL0Nvbm5lY3Rpb25XaW4uY3BwCmluZGV4IDMwOTNkNGQyZDNhYWE2 ZjQyZmM0ZjZjNmQwYjA2MWYwZTk4NWUyMjkuLmUxZjBkM2U4MzllN2Q0NWZjZDFkZjMzOWJhOTFk OTE2MmM0OWJmZjUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy93aW4vQ29u bmVjdGlvbldpbi5jcHAKKysrIGIvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL3dpbi9Db25uZWN0 aW9uV2luLmNwcApAQCAtMjcsNDIgKzI3LDY0IEBACiAKICNpbmNsdWRlICJBcmd1bWVudEVuY29k ZXIuaCIKICNpbmNsdWRlICJXb3JrSXRlbS5oIgorI2luY2x1ZGUgPHd0Zi9SYW5kb21OdW1iZXIu aD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogdXNpbmcgbmFtZXNwYWNlIHN0 ZDsKLQorLy8gV2UgZXhwbGljaXRseSBkb24ndCB1c2UgdGhlIFdlYkNvcmUgbmFtZXNwYWNlIGhl cmUgYmVjYXVzZSBDb3JlSVBDIHNob3VsZCBvbmx5IHVzZSBXVEYgdHlwZXMgYW5kCisvLyBXZWJD b3JlOjpTdHJpbmcgaXMgcmVhbGx5IGluIFdURi4KK3VzaW5nIFdlYkNvcmU6OlN0cmluZzsKKyAK IG5hbWVzcGFjZSBDb3JlSVBDIHsKIAogLy8gRklYTUU6IFJlbmFtZSB0aGlzIG9yIHVzZSBhIGRp ZmZlcmVudCBjb25zdGFudCBvbiB3aW5kb3dzLgogc3RhdGljIGNvbnN0IHNpemVfdCBpbmxpbmVN ZXNzYWdlTWF4U2l6ZSA9IDQwOTY7CiAKLXZvaWQgQ29ubmVjdGlvbjo6cGxhdGZvcm1Jbml0aWFs aXplKElkZW50aWZpZXIgaWRlbnRpZmllcikKK2Jvb2wgQ29ubmVjdGlvbjo6Y3JlYXRlU2VydmVy QW5kQ2xpZW50SWRlbnRpZmllcnMoSEFORExFJiBzZXJ2ZXJJZGVudGlmaWVyLCBIQU5ETEUmIGNs aWVudElkZW50aWZpZXIpCiB7Ci0gICAgbWVtc2V0KCZtX3JlYWRTdGF0ZSwgMCwgc2l6ZW9mKG1f cmVhZFN0YXRlKSk7Ci0gICAgbV9yZWFkU3RhdGUuaEV2ZW50ID0gOjpDcmVhdGVFdmVudFcoMCwg ZmFsc2UsIGZhbHNlLCAwKTsKLQotICAgIHN0ZDo6d3N0cmluZyBwaXBlTmFtZSA9IEwiXFxcXC5c XHBpcGVcXFdlYktpdC0iICsgaWRlbnRpZmllcjsKKyAgICBTdHJpbmcgcGlwZU5hbWU7CiAKLSAg ICBpZiAobV9pc1NlcnZlcikgewotICAgICAgICAvLyBDcmVhdGUgb3VyIG5hbWVkIHBpcGUuCi0g ICAgICAgIC8vIEZJWE1FOiBNYXliZSB3ZSBzaG91bGQgZG8gdGhpcyBpbiBvcGVuPwotICAgICAg ICBtX2Nvbm5lY3Rpb25QaXBlID0gOjpDcmVhdGVOYW1lZFBpcGVXKHBpcGVOYW1lLmNfc3RyKCks IAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBJUEVfQUND RVNTX0RVUExFWCB8IEZJTEVfRkxBR19GSVJTVF9QSVBFX0lOU1RBTkNFIHwgRklMRV9GTEFHX09W RVJMQVBQRUQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UElQRV9UWVBFX01FU1NBR0UgfCBQSVBFX1JFQURNT0RFX01FU1NBR0UsIDEsIGlubGluZU1lc3Nh Z2VNYXhTaXplLCBpbmxpbmVNZXNzYWdlTWF4U2l6ZSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAwLCAwKTsKLSAgICB9IGVsc2UgewotICAgICAgICAvLyBD b25uZWN0IHRvIG91ciBuYW1lZCBwaXBlLgotICAgICAgICAvLyBGSVhNRTogQ2hlY2sgdGhlIHNl Y3VyaXR5IGZsYWdzIGhlcmUuCi0gICAgICAgIG1fY29ubmVjdGlvblBpcGUgPSA6OkNyZWF0ZUZp bGVXKHBpcGVOYW1lLmNfc3RyKCksIEdFTkVSSUNfUkVBRCB8IEdFTkVSSUNfV1JJVEUsIDAsIDAs IE9QRU5fRVhJU1RJTkcsIEZJTEVfRkxBR19PVkVSTEFQUEVELCAwKTsKLSAgICAgICAgaWYgKG1f Y29ubmVjdGlvblBpcGUgIT0gSU5WQUxJRF9IQU5ETEVfVkFMVUUpIHsKLSAgICAgICAgICAgIC8v IFNldCB0aGUgcmVhZCBtb2RlLgotICAgICAgICAgICAgRFdPUkQgbW9kZSA9IFBJUEVfUkVBRE1P REVfTUVTU0FHRTsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBDaGVjayByZXR1cm4gdmFsdWUuCi0g ICAgICAgICAgICA6OlNldE5hbWVkUGlwZUhhbmRsZVN0YXRlKG1fY29ubmVjdGlvblBpcGUsICZt b2RlLCAwLCAwKTsKLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIERXT1JEIGVycm9yID0g OjpHZXRMYXN0RXJyb3IoKTsKKyAgICB3aGlsZSAodHJ1ZSkgeworICAgICAgICB1bnNpZ25lZCB1 bmlxdWVJRCA9IHJhbmRvbU51bWJlcigpICogc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46 Om1heCgpOworICAgICAgICBwaXBlTmFtZSA9IFN0cmluZzo6Zm9ybWF0KCJcXFxcLlxccGlwZVxc Y29tLmFwcGxlLldlYktpdC4leCIsIHVuaXF1ZUlEKTsKKworICAgICAgICBzZXJ2ZXJJZGVudGlm aWVyID0gOjpDcmVhdGVOYW1lZFBpcGUocGlwZU5hbWUuY2hhcmFjdGVyc1dpdGhOdWxsVGVybWlu YXRpb24oKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBJ UEVfQUNDRVNTX0RVUExFWCB8IEZJTEVfRkxBR19GSVJTVF9QSVBFX0lOU1RBTkNFIHwgRklMRV9G TEFHX09WRVJMQVBQRUQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBQSVBFX1RZUEVfTUVTU0FHRSB8IFBJUEVfUkVBRE1PREVfTUVTU0FHRSwgMSwgaW5saW5l TWVzc2FnZU1heFNpemUsIGlubGluZU1lc3NhZ2VNYXhTaXplLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgMCk7CisgICAgICAgIGlmICghc2VydmVySWRl bnRpZmllciAmJiA6OkdldExhc3RFcnJvcigpID09IEVSUk9SX1BJUEVfQlVTWSkgeworICAgICAg ICAgICAgLy8gVGhlcmUgd2FzIGFscmVhZHkgYSBwaXBlIHdpdGggdGhpcyBuYW1lLCB0cnkgYWdh aW4uCisgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQorCisgICAgICAgIGJyZWFrOwor ICAgIH0KKworICAgIGlmICghc2VydmVySWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJuIGZhbHNl OworCisgICAgY2xpZW50SWRlbnRpZmllciA9IDo6Q3JlYXRlRmlsZVcocGlwZU5hbWUuY2hhcmFj dGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgR0VORVJJQ19SRUFEIHwgR0VORVJJQ19XUklURSwg MCwgMCwgT1BFTl9FWElTVElORywgRklMRV9GTEFHX09WRVJMQVBQRUQsIDApOworICAgIGlmICgh Y2xpZW50SWRlbnRpZmllcikgeworICAgICAgICA6OkNsb3NlSGFuZGxlKHNlcnZlcklkZW50aWZp ZXIpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAgRFdPUkQgbW9kZSA9IFBJ UEVfUkVBRE1PREVfTUVTU0FHRTsKKyAgICBpZiAoITo6U2V0TmFtZWRQaXBlSGFuZGxlU3RhdGUo Y2xpZW50SWRlbnRpZmllciwgJm1vZGUsIDAsIDApKSB7CisgICAgICAgIDo6Q2xvc2VIYW5kbGUo c2VydmVySWRlbnRpZmllcik7CisgICAgICAgIDo6Q2xvc2VIYW5kbGUoY2xpZW50SWRlbnRpZmll cik7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKKyAgICByZXR1cm4gdHJ1ZTsKK30K Kwordm9pZCBDb25uZWN0aW9uOjpwbGF0Zm9ybUluaXRpYWxpemUoSWRlbnRpZmllciBpZGVudGlm aWVyKQoreworICAgIG1lbXNldCgmbV9yZWFkU3RhdGUsIDAsIHNpemVvZihtX3JlYWRTdGF0ZSkp OworICAgIG1fcmVhZFN0YXRlLmhFdmVudCA9IDo6Q3JlYXRlRXZlbnRXKDAsIGZhbHNlLCBmYWxz ZSwgMCk7CisKKyAgICBtX2Nvbm5lY3Rpb25QaXBlID0gaWRlbnRpZmllcjsKIH0KIAogdm9pZCBD b25uZWN0aW9uOjpwbGF0Zm9ybUludmFsaWRhdGUoKQpAQCAtOTYsNiArMTE4LDEwIEBAIHZvaWQg Q29ubmVjdGlvbjo6cmVhZEV2ZW50SGFuZGxlcigpCiAgICAgICAgICAgICBjYXNlIEVSUk9SX0JS T0tFTl9QSVBFOgogICAgICAgICAgICAgICAgIGNvbm5lY3Rpb25EaWRDbG9zZSgpOwogICAgICAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBmaWd1 cmUgb3V0IHdoeSB3ZSdyZSBnZXR0aW5nIHRoaXMgZXJyb3IuCisgICAgICAgICAgICBjYXNlIEVS Uk9SX0lPX0lOQ09NUExFVEU6CisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBk ZWZhdWx0OgogICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAg ICAgfQpAQCAtMTUxLDcgKzE3Nyw2IEBAIGJvb2wgQ29ubmVjdGlvbjo6b3BlbigpCiAgICAgICAg ICAgICBEV09SRCBlcnJvciA9IDo6R2V0TGFzdEVycm9yKCk7CiAgICAgICAgICAgICBpZiAoZXJy b3IgPT0gRVJST1JfUElQRV9DT05ORUNURUQpIHsKICAgICAgICAgICAgICAgICAvLyBUaGUgY2xp ZW50IGNvbm5lY3RlZCB0byB0aGUgbmFtZWQgcGlwZSBiZWZvcmUgd2Ugb3BlbmVkIHRoZSBjb25u ZWN0aW9uLgotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGlzIHdlaXJkIC0gd2Ugc2hv dWxkIHByb2JhYmx5IHRyeSB0byBjcmVhdGUgdGhlIHBpcGVzIGluIG9wZW4oKS4KICAgICAgICAg ICAgICAgICBtX2lzQ29ubmVjdGVkID0gdHJ1ZTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoZXJy b3IgIT0gRVJST1JfSU9fUEVORElORykgewogICAgICAgICAgICAgICAgIC8vIFNvbWV0aGluZyB3 ZW50IHdyb25nLgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvd2luL1dl YlByb2Nlc3NMYXVuY2hlci5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci93aW4vV2Vi UHJvY2Vzc0xhdW5jaGVyLmNwcAppbmRleCBlM2U5Mzk4MDM0NWRhMmU5MWRhM2E1MDczZmZhMzNh MjRjNjdkM2U4Li4yODhmN2MzYTMyNWIwMTE5ZjQxODI4YmM4ZGRhZmI3YjU0ODY2N2JiIDEwMDY0 NAotLS0gYS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci93aW4vV2ViUHJvY2Vzc0xhdW5jaGVy LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci93aW4vV2ViUHJvY2Vzc0xhdW5j aGVyLmNwcApAQCAtMzgsMTYgKzM4LDE1IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIAotLy8gRklYTUU6IFdlIG5lZWQgdG8gdXNlIGEgYmV0dGVyIGNv bm5lY3Rpb24gaWRlbnRpZmllci4KLXN0YXRpYyBjb25zdCB3Y2hhcl90KiBzZXJ2ZXJOYW1lID0g TCJVSVByb2Nlc3MiOwotCi1zdGF0aWMgdm9pZCogd2ViVGhyZWFkQm9keSh2b2lkKikKK3N0YXRp YyB2b2lkKiB3ZWJUaHJlYWRCb2R5KHZvaWQqIGNvbnRleHQpCiB7CisgICAgSEFORExFIGNsaWVu dElkZW50aWZpZXIgPSByZWludGVycHJldF9jYXN0PEhBTkRMRT4oY29udGV4dCk7CisKICAgICAv LyBJbml0aWFsaXphdGlvbgogICAgIEpTQzo6aW5pdGlhbGl6ZVRocmVhZGluZygpOwogICAgIFdU Rjo6aW5pdGlhbGl6ZU1haW5UaHJlYWQoKTsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmlu aXRpYWxpemUoc2VydmVyTmFtZSwgUnVuTG9vcDo6Y3VycmVudCgpKTsKKyAgICBXZWJQcm9jZXNz OjpzaGFyZWQoKS5pbml0aWFsaXplKGNsaWVudElkZW50aWZpZXIsIFJ1bkxvb3A6OmN1cnJlbnQo KSk7CiAgICAgUnVuTG9vcDo6cnVuKCk7CiAKICAgICByZXR1cm4gMDsKQEAgLTU1LDE4ICs1NCwy OCBAQCBzdGF0aWMgdm9pZCogd2ViVGhyZWFkQm9keSh2b2lkKikKIAogUHJvY2Vzc0luZm8gbGF1 bmNoV2ViUHJvY2VzcyhDb3JlSVBDOjpDb25uZWN0aW9uOjpDbGllbnQqIGNsaWVudCwgYm9vbCB1 c2VUaHJlYWQpCiB7Ci0gICAgUHJvY2Vzc0luZm8gaW5mbyA9IHsgMCwgMCB9OworICAgIC8vIEZp cnN0LCBjcmVhdGUgdGhlIHNlcnZlciBhbmQgY2xpZW50IGlkZW50aWZpZXJzLgorICAgIEhBTkRM RSBzZXJ2ZXJJZGVudGlmaWVyLCBjbGllbnRJZGVudGlmaWVyOworICAgIGlmICghQ29yZUlQQzo6 Q29ubmVjdGlvbjo6Y3JlYXRlU2VydmVyQW5kQ2xpZW50SWRlbnRpZmllcnMoc2VydmVySWRlbnRp ZmllciwgY2xpZW50SWRlbnRpZmllcikpIHsKKyAgICAgICAgLy8gRklYTUU6IFdoYXQgc2hvdWxk IHdlIGRvIGhlcmU/CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIH0KIAotICAg IGluZm8uY29ubmVjdGlvbiA9IENvcmVJUEM6OkNvbm5lY3Rpb246OmNyZWF0ZVNlcnZlckNvbm5l Y3Rpb24oc2VydmVyTmFtZSwgY2xpZW50LCBSdW5Mb29wOjptYWluKCkpOwotICAgIGluZm8uY29u bmVjdGlvbi0+b3BlbigpOworICAgIFByb2Nlc3NJbmZvIGluZm8gPSB7IDAsIDAgfTsKIAogICAg IGlmICh1c2VUaHJlYWQpIHsKLSAgICAgICAgLy8gRklYTUU6IFBhc3MgdGhlIGhhbmRsZS4KICAg ICAgICAgaWYgKGNyZWF0ZVRocmVhZCh3ZWJUaHJlYWRCb2R5LCAwLCAiV2ViS2l0MjogV2ViVGhy ZWFkIikpIHsKKyAgICAgICAgICAgIGluZm8uY29ubmVjdGlvbiA9IENvcmVJUEM6OkNvbm5lY3Rp b246OmNyZWF0ZVNlcnZlckNvbm5lY3Rpb24oc2VydmVySWRlbnRpZmllciwgY2xpZW50LCBSdW5M b29wOjptYWluKCkpOworICAgICAgICAgICAgaW5mby5jb25uZWN0aW9uLT5vcGVuKCk7CiAgICAg ICAgICAgICBpbmZvLnByb2Nlc3NJZGVudGlmaWVyID0gOjpHZXRDdXJyZW50UHJvY2VzcygpOwog ICAgICAgICAgICAgcmV0dXJuIGluZm87CiAgICAgICAgIH0KICAgICB9IGVsc2UgeworICAgICAg ICAvLyBFbnN1cmUgdGhhdCB0aGUgY2hpbGQgcHJvY2VzcyBpbmhlcml0cyB0aGUgY2xpZW50IGlk ZW50aWZpZXIuCisgICAgICAgIDo6U2V0SGFuZGxlSW5mb3JtYXRpb24oY2xpZW50SWRlbnRpZmll ciwgSEFORExFX0ZMQUdfSU5IRVJJVCwgSEFORExFX0ZMQUdfSU5IRVJJVCk7CisgICAgICAgIAor ICAgICAgICBWZWN0b3I8VUNoYXI+IGNvbW1hbmRMaW5lVmVjdG9yOworCiAgICAgICAgIC8vIEZJ WE1FOiBXZSB3b3VsZCBsaWtlIHRvIHBhc3MgYSBmdWxsIHBhdGggdG8gdGhlIC5leGUgaGVyZS4K ICNpZm5kZWYgREVCVUdfQUxMCiAgICAgICAgIFN0cmluZyBjb21tYW5kTGluZShMIldlYktpdDJX ZWJQcm9jZXNzLmV4ZSIpOwpAQCAtNzQsMTcgKzgzLDI5IEBAIFByb2Nlc3NJbmZvIGxhdW5jaFdl YlByb2Nlc3MoQ29yZUlQQzo6Q29ubmVjdGlvbjo6Q2xpZW50KiBjbGllbnQsIGJvb2wgdXNlVGhy ZWFkCiAgICAgICAgIFN0cmluZyBjb21tYW5kTGluZShMIldlYktpdDJXZWJQcm9jZXNzX2RlYnVn LmV4ZSIpOwogI2VuZGlmCiAKKyAgICAgICAgYXBwZW5kKGNvbW1hbmRMaW5lVmVjdG9yLCBjb21t YW5kTGluZSk7CisgICAgICAgIGFwcGVuZChjb21tYW5kTGluZVZlY3RvciwgIiAtY2xpZW50SWRl bnRpZmllciAiKTsKKyAgICAgICAgYXBwZW5kKGNvbW1hbmRMaW5lVmVjdG9yLCBTdHJpbmc6Om51 bWJlcihyZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oY2xpZW50SWRlbnRpZmllcikpKTsKKyAg ICAgICAgY29tbWFuZExpbmVWZWN0b3IuYXBwZW5kKCdcMCcpOworCiAgICAgICAgIFNUQVJUVVBJ TkZPIHN0YXJ0dXBJbmZvID0geyAwIH07CiAgICAgICAgIHN0YXJ0dXBJbmZvLmNiID0gc2l6ZW9m KHN0YXJ0dXBJbmZvKTsKICAgICAgICAgUFJPQ0VTU19JTkZPUk1BVElPTiBwcm9jZXNzSW5mb3Jt YXRpb24gPSB7IDAgfTsKLSAgICAgICAgQk9PTCByZXN1bHQgPSA6OkNyZWF0ZVByb2Nlc3NXKDAs IChMUFdTVFIpY29tbWFuZExpbmUuY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAsIDAsIGZhbHNlLCAwLCAwLCAw LCAmc3RhcnR1cEluZm8sICZwcm9jZXNzSW5mb3JtYXRpb24pOworICAgICAgICBCT09MIHJlc3Vs dCA9IDo6Q3JlYXRlUHJvY2Vzc1coMCwgY29tbWFuZExpbmVWZWN0b3IuZGF0YSgpLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgMCwgdHJ1ZSwgMCwgMCwgMCwgJnN0 YXJ0dXBJbmZvLCAmcHJvY2Vzc0luZm9ybWF0aW9uKTsKKworICAgICAgICAvLyBXZSBjYW4gbm93 IGNsb3NlIHRoZSBjbGllbnQgaWRlbnRpZmllciBoYW5kbGUuCisgICAgICAgIDo6Q2xvc2VIYW5k bGUoY2xpZW50SWRlbnRpZmllcik7CisKICAgICAgICAgaWYgKCFyZXN1bHQpIHsKICAgICAgICAg ICAgIC8vIEZJWE1FOiBXaGF0IHNob3VsZCB3ZSBkbyBoZXJlPwogICAgICAgICAgICAgRFdPUkQg ZXJyb3IgPSA6OkdldExhc3RFcnJvcigpOwogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CiAgICAgICAgIH0KIAorICAgICAgICBpbmZvLmNvbm5lY3Rpb24gPSBDb3JlSVBDOjpDb25u ZWN0aW9uOjpjcmVhdGVTZXJ2ZXJDb25uZWN0aW9uKHNlcnZlcklkZW50aWZpZXIsIGNsaWVudCwg UnVuTG9vcDo6bWFpbigpKTsKKyAgICAgICAgaW5mby5jb25uZWN0aW9uLT5vcGVuKCk7CisKICAg ICAgICAgLy8gRG9uJ3QgbGVhayB0aGUgdGhyZWFkIGhhbmRsZS4KICAgICAgICAgOjpDbG9zZUhh bmRsZShwcm9jZXNzSW5mb3JtYXRpb24uaFRocmVhZCk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIv V2ViUHJvY2Vzcy93aW4vV2ViUHJvY2Vzc01haW4uY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL3dp bi9XZWJQcm9jZXNzTWFpbi5jcHAKaW5kZXggNWFjNGUzYzMwNWE0MDI5ZDZhNmI5MjNhM2VhOWM0 NDM1OWE2MjRkZS4uNjA5ZWVmMGY0MGY3MGYwMmMzN2VlOTQwMDY3YzU3Y2I1Y2QwMDI2MCAxMDA2 NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL3dpbi9XZWJQcm9jZXNzTWFpbi5jcHAKKysrIGIv V2ViS2l0Mi9XZWJQcm9jZXNzL3dpbi9XZWJQcm9jZXNzTWFpbi5jcHAKQEAgLTI4LDIyICsyOCw4 MyBAQAogI2luY2x1ZGUgIlJ1bkxvb3AuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzLmgiCiAjaW5j bHVkZSA8cnVudGltZS9Jbml0aWFsaXplVGhyZWFkaW5nLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9Q bGF0Zm9ybVN0cmluZy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvU3RyaW5nSGFzaC5oPgogI2luY2x1 ZGUgPHd0Zi9UaHJlYWRpbmcuaD4KIAordXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CisKIG5hbWVz cGFjZSBXZWJLaXQgewogCi1pbnQgV2ViUHJvY2Vzc01haW4oSElOU1RBTkNFIGhJbnN0YW5jZSwg TFBUU1RSIGxwc3RyQ21kTGluZSkKKy8vIEZJWE1FOiBJZiB0aGUgTWFjIHBvcnQgaXMgZ29pbmcg dG8gbmVlZCB0aGlzIHdlIHNob3VsZCBjb25zaWRlciBtb3ZpbmcgaXQgdG8gUGxhdGZvcm0gb3Ig U2hhcmVkLgorY2xhc3MgQ29tbWFuZExpbmUgeworcHVibGljOgorICAgIENvbW1hbmRMaW5lKCkg eyB9CisgICAgYm9vbCBwYXJzZShMUFRTVFIgY29tbWFuZExpbmVTdHJpbmcpOworCisgICAgU3Ry aW5nIG9wZXJhdG9yW10oY29uc3QgU3RyaW5nJikgY29uc3Q7CisKK3ByaXZhdGU6CisgICAgSGFz aE1hcDxTdHJpbmcsIFN0cmluZz4gbV9hcmdzOworfTsKKworYm9vbCBDb21tYW5kTGluZTo6cGFy c2UoTFBUU1RSIGNvbW1hbmRMaW5lU3RyaW5nKQoreworICAgIG1fYXJncy5jbGVhcigpOworCisg ICAgLy8gQ2hlY2sgaWYgdGhpcyBpcyBhbiBlbXB0eSBjb21tYW5kIGxpbmUuCisgICAgaWYgKCFj b21tYW5kTGluZVN0cmluZyB8fCAhY29tbWFuZExpbmVTdHJpbmdbMF0pCisgICAgICAgIHJldHVy biB0cnVlOworCisgICAgaW50IGFyZ3VtZW50Q291bnQ7CisgICAgTFBXU1RSKiBjb21tYW5kTGlu ZUFyZ3MgPSA6OkNvbW1hbmRMaW5lVG9Bcmd2Vyhjb21tYW5kTGluZVN0cmluZywgJmFyZ3VtZW50 Q291bnQpOworICAgIGlmICghY29tbWFuZExpbmVBcmdzKQorICAgICAgICByZXR1cm4gZmFsc2U7 CisKKyAgICBpZiAoYXJndW1lbnRDb3VudCAlIDIgIT0gMCkgeworICAgICAgICA6OkxvY2FsRnJl ZShjb21tYW5kTGluZUFyZ3MpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCisgICAg Zm9yIChpbnQgaSA9IDA7IGkgPCBhcmd1bWVudENvdW50IC8gMjsgKytpKSB7CisgICAgICAgIExQ V1NUUiBrZXkgPSBjb21tYW5kTGluZUFyZ3NbaSAqIDJdOworCisgICAgICAgIGlmIChrZXlbMF0g IT0gJy0nKSB7CisgICAgICAgICAgICA6OkxvY2FsRnJlZShjb21tYW5kTGluZUFyZ3MpOworICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9CisKKyAgICAgICAgbV9hcmdzLnNldCgm a2V5WzFdLCBjb21tYW5kTGluZUFyZ3NbaSAqMiArIDFdKTsKKyAgICB9CisKKyAgICA6OkxvY2Fs RnJlZShjb21tYW5kTGluZUFyZ3MpOworICAgIHJldHVybiB0cnVlOworfQorCitTdHJpbmcgQ29t bWFuZExpbmU6Om9wZXJhdG9yW10oY29uc3QgU3RyaW5nJiBrZXkpIGNvbnN0Cit7CisgICAgcmV0 dXJuIG1fYXJncy5nZXQoa2V5KTsKK30KKworaW50IFdlYlByb2Nlc3NNYWluKEhJTlNUQU5DRSBo SW5zdGFuY2UsIExQV1NUUiBjb21tYW5kTGluZVN0cmluZykKIHsKKyAgICBDb21tYW5kTGluZSBj b21tYW5kTGluZTsKKworICAgIC8vIEZJWE1FOiBTaG91bGQgd2UgcmV0dXJuIGFuIGVycm9yIGhl cmU/CisgICAgaWYgKCFjb21tYW5kTGluZS5wYXJzZShjb21tYW5kTGluZVN0cmluZykpCisgICAg ICAgIHJldHVybiAwOworCiAgICAgT2xlSW5pdGlhbGl6ZSgwKTsKIAogICAgIEpTQzo6aW5pdGlh bGl6ZVRocmVhZGluZygpOwogICAgIFdURjo6aW5pdGlhbGl6ZU1haW5UaHJlYWQoKTsKICAgICBS dW5Mb29wOjppbml0aWFsaXplTWFpblJ1bkxvb3AoKTsKIAotICAgIC8vIEZJWE1FOiBUaGlzIHNo b3VsZCBjb21lIGZyb20gdGhlIGNvbW1hbmQgbGluZSBzdHJpbmcuCi0gICAgY29uc3Qgd2NoYXJf dCogdWlQcm9jZXNzTmFtZSA9IEwiVUlQcm9jZXNzIjsKKyAgICBjb25zdCBTdHJpbmcmIGlkZW50 aWZpZXJTdHJpbmcgPSBjb21tYW5kTGluZVsiY2xpZW50SWRlbnRpZmllciJdOworCisgICAgSEFO RExFIGNsaWVudElkZW50aWZpZXIgPSByZWludGVycHJldF9jYXN0PEhBTkRMRT4oaWRlbnRpZmll clN0cmluZy50b1VJbnQ2NFN0cmljdCgpKTsKIAotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmlu aXRpYWxpemUodWlQcm9jZXNzTmFtZSwgUnVuTG9vcDo6bWFpbigpKTsKKyAgICBXZWJQcm9jZXNz OjpzaGFyZWQoKS5pbml0aWFsaXplKGNsaWVudElkZW50aWZpZXIsIFJ1bkxvb3A6Om1haW4oKSk7 CiAgICAgUnVuTG9vcDo6cnVuKCk7CiAKICAgICByZXR1cm4gMDsKZGlmZiAtLWdpdCBhL1dlYktp dDIvV2ViUHJvY2Vzcy93aW4vV2ViUHJvY2Vzc01haW4uaCBiL1dlYktpdDIvV2ViUHJvY2Vzcy93 aW4vV2ViUHJvY2Vzc01haW4uaAppbmRleCBiZGU2Mzk2MThkYzU4MjJhY2I4OThlMDNhNzZjNmE5 ZmViMzU3NTNiLi5mMWJhMGVlNjkzNGQ3MTAyNzY1YTAwZmE2ODYwZjE0MDFkODU4YjJiIDEwMDY0 NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3Mvd2luL1dlYlByb2Nlc3NNYWluLmgKKysrIGIvV2Vi S2l0Mi9XZWJQcm9jZXNzL3dpbi9XZWJQcm9jZXNzTWFpbi5oCkBAIC0zNyw3ICszNyw3IEBAIG5h bWVzcGFjZSBXZWJLaXQgewogI2VuZGlmCiAKIC8vIFRoaXMgaXMgY2FsbGVkIG9ubHkgZnJvbSB0 aGUgX3RXaW5NYWluIGZ1bmN0aW9uIG9mIHRoZSBXZWJQcm9jZXNzLgotRExMX0VYUE9SVCBpbnQg V2ViUHJvY2Vzc01haW4oSElOU1RBTkNFIGhJbnN0YW5jZSwgTFBUU1RSIGxwc3RyQ21kTGluZSk7 CitETExfRVhQT1JUIGludCBXZWJQcm9jZXNzTWFpbihISU5TVEFOQ0UgaEluc3RhbmNlLCBMUFdT VFIgY29tbWFuZExpbmVTdHJpbmcpOwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAo=