125353 2013-12-06 10:04:23 -0800 [Win] Support compiling WebKit with VS2013 2013-12-06 14:57:33 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 125192 1 bfulgham bfulgham andersca benjamin bfulgham cmarcelo commit-queue japhet roger_fong oldest_to_newest 957278 0 bfulgham 2013-12-06 10:04:23 -0800 Visual Studio 2013 provides a number of important new compiler features, as well as conflicting with various STL work-arounds we had implemented previously to support older version of the compiler. This bug lands a number of updates that allow VS2013 to compile WebKit. 957394 1 218624 bfulgham 2013-12-06 14:15:43 -0800 Created attachment 218624 Patch 957409 2 bfulgham 2013-12-06 14:57:33 -0800 Committed r160254: <http://trac.webkit.org/changeset/160254> 218624 2013-12-06 14:15:43 -0800 2013-12-06 14:17:52 -0800 Patch bug-125353-20131206141543.patch text/plain 13277 bfulgham SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYwMjQzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDEzLTEyLTA2ICBSb2dlciBGb25nIDxyb2dlcl9mb25nQGFwcGxlLmNvbT4gYW5kIEJyZW50 IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dpbl0gU3VwcG9ydCBj b21waWxpbmcgd2l0aCBWUzIwMTMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyNTM1MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogQVBJL3Rlc3RzL3Rlc3RhcGkuYzogVXNlIEM5OSBkZWZpbmVzIGlmIGF2 YWlsYWJsZS4KKyAgICAgICAgKiBqaXQvSklUT3BlcmF0aW9ucy5jcHA6IERvbid0IGF0dGVtcHQg dG8gZGVmaW5lIEMgbGlua2FnZSB3aGVuCisgICAgICAgIHJldHVybmluZyBhIEMrKyBvYmplY3Qu CisKIDIwMTMtMTItMDYgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAg ICBGVEwgc2hvdWxkIHN1cHBvcnQgYWxsIG9mIFZhbHVlVG9JbnQzMgpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLmMKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL0FQSS90ZXN0cy90ZXN0YXBpLmMJKHJldmlzaW9uIDE2MDE4MCkKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvdGVzdHMvdGVzdGFwaS5jCSh3b3JraW5nIGNvcHkpCkBA IC00NSw2ICs0NSw3IEBACiAKICNpZiBDT01QSUxFUihNU1ZDKQogCisjaWYgX01TQ19WRVIgPCAx ODAwCiAjaW5jbHVkZSA8d3RmL01hdGhFeHRyYXMuaD4KIAogc3RhdGljIGRvdWJsZSBuYW4oY29u c3QgY2hhciopCkBAIC01NCw2ICs1NSw3IEBAIHN0YXRpYyBkb3VibGUgbmFuKGNvbnN0IGNoYXIq KQogCiB1c2luZyBzdGQ6OmlzaW5mOwogdXNpbmcgc3RkOjppc25hbjsKKyNlbmRpZgogCiAjZW5k aWYKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3Bw CShyZXZpc2lvbiAxNjAxODApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJh dGlvbnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzYzLDYgKzEzNjMsOCBAQCBFbmNvZGVkSlNW YWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkdlCiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29k ZShiYXNlVmFsdWUuZ2V0KGV4ZWMsIGlkZW50LCBzbG90KSk7CiB9CiAKK30KKwogc3RhdGljIEpT VmFsdWUgZ2V0QnlWYWwoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGJhc2VWYWx1ZSwgSlNWYWx1 ZSBzdWJzY3JpcHQsIFJldHVybkFkZHJlc3NQdHIgcmV0dXJuQWRkcmVzcykKIHsKICAgICBpZiAo TElLRUxZKGJhc2VWYWx1ZS5pc0NlbGwoKSAmJiBzdWJzY3JpcHQuaXNTdHJpbmcoKSkpIHsKQEAg LTEzODYsNiArMTM4OCw4IEBAIHN0YXRpYyBKU1ZhbHVlIGdldEJ5VmFsKEV4ZWNTdGF0ZSogZXhl YywKICAgICByZXR1cm4gYmFzZVZhbHVlLmdldChleGVjLCBwcm9wZXJ0eSk7CiB9CiAKK2V4dGVy biAiQyIgeworICAgIAogRW5jb2RlZEpTVmFsdWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25HZXRC eVZhbEdlbmVyaWMoRXhlY1N0YXRlKiBleGVjLCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkQmFzZSwg RW5jb2RlZEpTVmFsdWUgZW5jb2RlZFN1YnNjcmlwdCkKIHsKICAgICBWTSYgdm0gPSBleGVjLT52 bSgpOwpJbmRleDogU291cmNlL1dURi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dU Ri9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDI0MykKKysrIFNvdXJjZS9XVEYvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTMtMTItMDYgIFJvZ2VyIEZvbmcgPHJv Z2VyX2ZvbmdAYXBwbGUuY29tPiBhbmQgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNv bT4KKworICAgICAgICBbV2luXSBTdXBwb3J0IGNvbXBpbGluZyB3aXRoIFZTMjAxMworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MzUzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3dGYvQ29tcGlsZXIu aDogU2hvdyBwcm9wZXIgZmVhdHVyZXMgZm9yIFZTMjAxMiBhbmQgVlMyMDEzLgorICAgICAgICAq IHd0Zi9NYXRoRXh0cmFzLmg6IERvbid0IGltcGxlbWVudCBjb21tb24gQzk5IHJvdXRpbmVzIHdo ZW4KKyAgICAgICAgdGhleSBhcmUgYXZhaWxhYmxlIHRocm91Z2ggdGhlIHJ1bnRpbWUgbGlicmFy aWVzLgorICAgICAgICAqIHd0Zi9SZXRhaW5QdHIuaDoKKyAgICAgICAgKFdURjo6UmV0YWluUHRy OjpvcGVyYXRvciBib29sKTogQWRkZWQuCisgICAgICAgICogd3RmL1N0ZExpYkV4dHJhcy5oOiBV c2UgTWljcm9zb2Z0J3MgdmVyc2lvbiBvZiBtYWtlX3VuaXF1ZQorICAgICAgICB3aGVuIGl0IGV4 aXN0cy4KKwogMjAxMy0xMi0wNiAgTGFzemxvIFZpZGFjcyAgPGxhY0BpbmYudS1zemVnZWQuaHU+ CiAKICAgICAgICAgRGVmaW5lIFNIQTEgaGFzaCBzaXplIGluIFNIQTEuaCBhbmQgdXNlIGl0IGF0 IHZhcmlvdXMgcGxhY2VzLgpJbmRleDogU291cmNlL1dURi93dGYvQ29tcGlsZXIuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9Db21waWxlci5oCShyZXZpc2lvbiAxNjAxODApCisrKyBT b3VyY2UvV1RGL3d0Zi9Db21waWxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC03OSw4ICs3OSwxMCBA QAogCiAjaWYgIUNPTVBJTEVSKENMQU5HKQogI2RlZmluZSBXVEZfQ09NUElMRVJfU1VQUE9SVFNf Q1hYX09WRVJSSURFX0NPTlRST0wgMQorI2lmICFkZWZpbmVkKF9NU0NfVkVSKSB8fCBfTVNDX1ZF UiA8IDE4MDAKICNkZWZpbmUgV1RGX0NPTVBJTEVSX1FVSVJLX0ZJTkFMX0lTX0NBTExFRF9TRUFM RUQgMQogI2VuZGlmCisjZW5kaWYKIAogLyogQ2hlY2sgZm9yIFZTMjAxMCBvciBuZXdlciAqLwog I2lmIF9NU0NfVkVSID49IDE2MDAKQEAgLTg5LDYgKzkxLDE4IEBACiAjZGVmaW5lIFdURl9DT01Q SUxFUl9TVVBQT1JUU19DWFhfQVVUT19UWVBFIDEKICNlbmRpZgogCisjaWYgX01TQ19WRVIgPj0g MTcwMAorI2RlZmluZSBXVEZfQ09NUElMRVJfU1VQUE9SVFNfQ1hYX1NUUk9OR19FTlVNUyAxCisj ZGVmaW5lIFdURl9DT01QSUxFUl9TVVBQT1JUU19DWFhfT1ZFUlJJREVfQ09OVFJPTCAxCisjZW5k aWYKKworI2lmIF9NU0NfVkVSID49IDE4MDAKKyNkZWZpbmUgV1RGX0NPTVBJTEVSX1NVUFBPUlRT X0NYWF9ERUxFVEVEX0ZVTkNUSU9OUyAxCisjZGVmaW5lIFdURl9DT01QSUxFUl9TVVBQT1JUU19D WFhfRVhQTElDSVRfQ09OVkVSU0lPTlMgMQorI2RlZmluZSBXVEZfQ09NUElMRVJfU1VQUE9SVFNf Q1hYX0dFTkVSQUxJWkVEX0lOSVRJQUxJWkVSUyAxCisjZGVmaW5lIFdURl9DT01QSUxFUl9TVVBQ T1JUU19DWFhfVkFSSUFESUNfVEVNUExBVEVTIDEKKyNlbmRpZgorCiAjZW5kaWYgLyogZGVmaW5l ZChfTVNDX1ZFUikgKi8KIAogLyogQ09NUElMRVIoUlZDVCkgLSBBUk0gUmVhbFZpZXcgQ29tcGls YXRpb24gVG9vbHMgKi8KSW5kZXg6IFNvdXJjZS9XVEYvd3RmL01hdGhFeHRyYXMuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9NYXRoRXh0cmFzLmgJKHJldmlzaW9uIDE2MDE4MCkKKysr IFNvdXJjZS9XVEYvd3RmL01hdGhFeHRyYXMuaAkod29ya2luZyBjb3B5KQpAQCAtMTIzLDYgKzEy Myw3IEBAIGlubGluZSBib29sIHNpZ25iaXQoZG91YmxlIHgpIHsgc3RydWN0IGkKIAogI2lmIENP TVBJTEVSKE1TVkMpCiAKKyNpZiBfTVNDX1ZFUiA8IDE4MDAKIC8vIFdlIG11c3Qgbm90IGRvICdu dW0gKyAwLjUnIG9yICdudW0gLSAwLjUnIGJlY2F1c2UgdGhleSBjYW4gY2F1c2UgcHJlY2lzaW9u IGxvc3MuCiBzdGF0aWMgZG91YmxlIHJvdW5kKGRvdWJsZSBudW0pCiB7CkBAIC0xMzgsMTQgKzEz OSwxMyBAQCBzdGF0aWMgZmxvYXQgcm91bmRmKGZsb2F0IG51bSkKICAgICAgICAgcmV0dXJuIGlu dGVnZXIgLSBudW0gPiAwLjVmID8gaW50ZWdlciAtIDEuMGYgOiBpbnRlZ2VyOwogICAgIHJldHVy biBpbnRlZ2VyIC0gbnVtID49IDAuNWYgPyBpbnRlZ2VyIC0gMS4wZiA6IGludGVnZXI7CiB9CisK IGlubGluZSBsb25nIGxvbmcgbGxyb3VuZChkb3VibGUgbnVtKSB7IHJldHVybiBzdGF0aWNfY2Fz dDxsb25nIGxvbmc+KHJvdW5kKG51bSkpOyB9CiBpbmxpbmUgbG9uZyBsb25nIGxscm91bmRmKGZs b2F0IG51bSkgeyByZXR1cm4gc3RhdGljX2Nhc3Q8bG9uZyBsb25nPihyb3VuZGYobnVtKSk7IH0K IGlubGluZSBsb25nIGxyb3VuZChkb3VibGUgbnVtKSB7IHJldHVybiBzdGF0aWNfY2FzdDxsb25n Pihyb3VuZChudW0pKTsgfQogaW5saW5lIGxvbmcgbHJvdW5kZihmbG9hdCBudW0pIHsgcmV0dXJu IHN0YXRpY19jYXN0PGxvbmc+KHJvdW5kZihudW0pKTsgfQogaW5saW5lIGRvdWJsZSB0cnVuYyhk b3VibGUgbnVtKSB7IHJldHVybiBudW0gPiAwID8gZmxvb3IobnVtKSA6IGNlaWwobnVtKTsgfQog Ci0jaWYgX01TQ19WRVIgPCAxODAwCi0KIGlubGluZSBkb3VibGUgcmVtYWluZGVyKGRvdWJsZSBu dW1lcmF0b3IsIGRvdWJsZSBkZW5vbWluYXRvcikKIHsKICAgICBkb3VibGUgcmVzdWx0ID0gZm1v ZChudW1lcmF0b3IsIGRlbm9taW5hdG9yKTsKQEAgLTE1NSw4ICsxNTUsNiBAQCBpbmxpbmUgZG91 YmxlIHJlbWFpbmRlcihkb3VibGUgbnVtZXJhdG9yCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAot I2VuZGlmCi0KIGlubGluZSBkb3VibGUgYXNpbmgoZG91YmxlIGQpCiB7CiAgICAgcmV0dXJuIGxv ZyhkICsgc3FydChkICogZCArIDEuMCkpOwpAQCAtMTg5LDYgKzE4Nyw4IEBAIGlubGluZSBkb3Vi bGUgY2JydChkb3VibGUgZCkKIAogI2VuZGlmCiAKKyNlbmRpZgorCiAjaWYgQ09NUElMRVIoR0ND KSAmJiBPUyhRTlgpCiAvLyBUaGUgc3RkbGliIG9uIFFOWCBkb2Vzbid0IGNvbnRhaW4gbG9uZyBh YnMobG9uZykuIFNlZSBQUiAjMTA0NjY2LgogaW5saW5lIGxvbmcgbG9uZyBhYnMobG9uZyBudW0p IHsgcmV0dXJuIGxhYnMobnVtKTsgfQpAQCAtMjE1LDYgKzIxNSw4IEBAIGlubGluZSBmbG9hdCBs b2cyZihmbG9hdCBudW0pCiBpbmxpbmUgbG9uZyBsb25nIGFicyhsb25nIGxvbmcgbnVtKSB7IHJl dHVybiBfYWJzNjQobnVtKTsgfQogI2VuZGlmCiAKKyNpZiBfTVNDX1ZFUiA8IDE4MDAKKwogbmFt ZXNwYWNlIHN0ZCB7CiAKIGlubGluZSBib29sIGlzaW5mKGRvdWJsZSBudW0pIHsgcmV0dXJuICFf ZmluaXRlKG51bSkgJiYgIV9pc25hbihudW0pOyB9CkBAIC0yMjQsNiArMjI2LDggQEAgaW5saW5l IGJvb2wgc2lnbmJpdChkb3VibGUgbnVtKSB7IHJldHVybgogCiB9IC8vIG5hbWVzcGFjZSBzdGQK IAorI2VuZGlmCisKIGlubGluZSBkb3VibGUgbmV4dGFmdGVyKGRvdWJsZSB4LCBkb3VibGUgeSkg eyByZXR1cm4gX25leHRhZnRlcih4LCB5KTsgfQogaW5saW5lIGZsb2F0IG5leHRhZnRlcmYoZmxv YXQgeCwgZmxvYXQgeSkgeyByZXR1cm4geCA+IHkgPyB4IC0gRkxUX0VQU0lMT04gOiB4ICsgRkxU X0VQU0lMT047IH0KIApJbmRleDogU291cmNlL1dURi93dGYvUmV0YWluUHRyLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dURi93dGYvUmV0YWluUHRyLmgJKHJldmlzaW9uIDE2MDE4MCkKKysrIFNv dXJjZS9XVEYvd3RmL1JldGFpblB0ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTksNiArMTE5LDcg QEAgbmFtZXNwYWNlIFdURiB7CiAgICAgICAgIFB0clR5cGUgb3BlcmF0b3ItPigpIGNvbnN0IHsg cmV0dXJuIGZyb21TdG9yYWdlVHlwZShtX3B0cik7IH0KICNpZiBDT01QSUxFUl9TVVBQT1JUUyhD WFhfRVhQTElDSVRfQ09OVkVSU0lPTlMpCiAgICAgICAgIGV4cGxpY2l0IG9wZXJhdG9yIFB0clR5 cGUoKSBjb25zdCB7IHJldHVybiBmcm9tU3RvcmFnZVR5cGUobV9wdHIpOyB9CisgICAgICAgIGV4 cGxpY2l0IG9wZXJhdG9yIGJvb2woKSBjb25zdCB7IHJldHVybiBtX3B0cjsgfQogI2VuZGlmCiAK ICAgICAgICAgYm9vbCBvcGVyYXRvciEoKSBjb25zdCB7IHJldHVybiAhbV9wdHI7IH0KSW5kZXg6 IFNvdXJjZS9XVEYvd3RmL1N0ZExpYkV4dHJhcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYv d3RmL1N0ZExpYkV4dHJhcy5oCShyZXZpc2lvbiAxNjAxODApCisrKyBTb3VyY2UvV1RGL3d0Zi9T dGRMaWJFeHRyYXMuaAkod29ya2luZyBjb3B5KQpAQCAtMzM1LDExICszMzUsMTMgQEAgbmFtZXNw YWNlIHN0ZCB7CiAgICAgfTsKIAogI2lmIENPTVBJTEVSX1NVUFBPUlRTKENYWF9WQVJJQURJQ19U RU1QTEFURVMpCisjaWYgIWRlZmluZWQoX01TQ19WRVIpIHx8IF9NU0NfVkVSIDwgMTgwMAogICAg IHRlbXBsYXRlPGNsYXNzIFQsIGNsYXNzLi4uIEFyZ3M+IGlubGluZSB0eXBlbmFtZSBfVW5pcXVl X2lmPFQ+OjpfU2luZ2xlX29iamVjdAogICAgIG1ha2VfdW5pcXVlKEFyZ3MmJi4uLiBhcmdzKQog ICAgIHsKICAgICAgICAgcmV0dXJuIHVuaXF1ZV9wdHI8VD4obmV3IFQoc3RkOjpmb3J3YXJkPEFy Z3M+KGFyZ3MpLi4uKSk7CiAgICAgfQorI2VuZGlmCiAjZWxzZQogICAgIHRlbXBsYXRlPGNsYXNz IFQ+IGlubGluZSB0eXBlbmFtZSBfVW5pcXVlX2lmPFQ+OjpfU2luZ2xlX29iamVjdAogICAgIG1h a2VfdW5pcXVlKCkKQEAgLTQwOCwxMiArNDEwLDE0IEBAIG5hbWVzcGFjZSBzdGQgewogICAgIH0K ICNlbmRpZgogCisjaWYgIWRlZmluZWQoX01TQ19WRVIpIHx8IF9NU0NfVkVSIDwgMTgwMAogICAg IHRlbXBsYXRlPGNsYXNzIFQ+IGlubGluZSB0eXBlbmFtZSBfVW5pcXVlX2lmPFQ+OjpfVW5rbm93 bl9ib3VuZAogICAgIG1ha2VfdW5pcXVlKHNpemVfdCBuKQogICAgIHsKICAgICAgICAgdHlwZWRl ZiB0eXBlbmFtZSByZW1vdmVfZXh0ZW50PFQ+Ojp0eXBlIFU7CiAgICAgICAgIHJldHVybiB1bmlx dWVfcHRyPFQ+KG5ldyBVW25dKCkpOwogICAgIH0KKyNlbmRpZgogICAgIAogI2lmIENPTVBJTEVS X1NVUFBPUlRTKENYWF9WQVJJQURJQ19URU1QTEFURVMpCiAgICAgdGVtcGxhdGU8Y2xhc3MgVCwg Y2xhc3MuLi4gQXJncz4gdHlwZW5hbWUgX1VuaXF1ZV9pZjxUPjo6X0tub3duX2JvdW5kCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCShyZXZpc2lvbiAxNjAyNDMpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMy0xMi0wNiAgUm9nZXIgRm9uZyA8 cm9nZXJfZm9uZ0BhcHBsZS5jb20+IGFuZCBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUu Y29tPgorCisgICAgICAgIFtXaW5dIFN1cHBvcnQgY29tcGlsaW5nIHdpdGggVlMyMDEzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjUzNTMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxvYWRlci9hcmNo aXZlL2NmL0xlZ2FjeVdlYkFyY2hpdmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGVnYWN5V2Vi QXJjaGl2ZTo6Y3JlYXRlKTogVXNlIG51bGxwdHIKKyAgICAgICAgKFdlYkNvcmU6OkxlZ2FjeVdl YkFyY2hpdmU6OmNyZWF0ZUZyb21TZWxlY3Rpb24pOiBEaXR0bworCiAyMDEzLTEyLTA2ICBSb2Ig QnVpcyAgPHJvYi5idWlzQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtDU1MgU2hhcGVzXSBTaGFw ZU91dHNpZGVJbmZvIG5lZWRzIHRvIHVzZSB0aGUgcGFyZW50J3Mgd3JpdGluZyBtb2RlIHdoZW4g Y2FsY3VsYXRpbmcgb2Zmc2V0cwpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUv Y2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9h ZGVyL2FyY2hpdmUvY2YvTGVnYWN5V2ViQXJjaGl2ZS5jcHAJKHJldmlzaW9uIDE2MDE4MCkKKysr IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNoaXZlL2NmL0xlZ2FjeVdlYkFyY2hpdmUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC00OTQsNyArNDk0LDcgQEAgUGFzc1JlZlB0cjxMZWdhY3lXZWJBcmNo aXZlPiBMZWdhY3lXZWJBcgogICAgIFZlY3RvcjxOb2RlKj4gbm9kZUxpc3Q7CiAgICAgU3RyaW5n IG1hcmt1cFN0cmluZyA9IGRvY3VtZW50VHlwZVN0cmluZyhkb2N1bWVudCkgKyBjcmVhdGVNYXJr dXAoKnJhbmdlLCAmbm9kZUxpc3QsIEFubm90YXRlRm9ySW50ZXJjaGFuZ2UpOwogCi0gICAgcmV0 dXJuIGNyZWF0ZShtYXJrdXBTdHJpbmcsIGZyYW1lLCBub2RlTGlzdCwgMCk7CisgICAgcmV0dXJu IGNyZWF0ZShtYXJrdXBTdHJpbmcsIGZyYW1lLCBub2RlTGlzdCwgbnVsbHB0cik7CiB9CiAKIFBh c3NSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gTGVnYWN5V2ViQXJjaGl2ZTo6Y3JlYXRlKGNvbnN0 IFN0cmluZyYgbWFya3VwU3RyaW5nLCBGcmFtZSogZnJhbWUsIGNvbnN0IFZlY3RvcjxOb2RlKj4m IG5vZGVzLCBzdGQ6OmZ1bmN0aW9uPGJvb2wgKEZyYW1lJik+IGZyYW1lRmlsdGVyKQpAQCAtNjAx LDcgKzYwMSw3IEBAIFBhc3NSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gTGVnYWN5V2ViQXIKICAg ICAgICAgYnVpbGRlci5hcHBlbmQoY3JlYXRlTWFya3VwKCpzZWxlY3Rpb25SYW5nZSwgJm5vZGVM aXN0LCBBbm5vdGF0ZUZvckludGVyY2hhbmdlKSk7CiAKICAgICBTdHJpbmcgbWFya3VwU3RyaW5n ID0gYnVpbGRlci50b1N0cmluZygpOwotICAgIFJlZlB0cjxMZWdhY3lXZWJBcmNoaXZlPiBhcmNo aXZlID0gY3JlYXRlKG1hcmt1cFN0cmluZywgZnJhbWUsIG5vZGVMaXN0LCAwKTsKKyAgICBSZWZQ dHI8TGVnYWN5V2ViQXJjaGl2ZT4gYXJjaGl2ZSA9IGNyZWF0ZShtYXJrdXBTdHJpbmcsIGZyYW1l LCBub2RlTGlzdCwgbnVsbHB0cik7CiAgICAgCiAgICAgaWYgKCFkb2N1bWVudC0+aXNGcmFtZVNl dCgpKQogICAgICAgICByZXR1cm4gYXJjaGl2ZS5yZWxlYXNlKCk7CkluZGV4OiBTb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2 aXNpb24gMTYwMjQzKQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxMyBAQAorMjAxMy0xMi0wNiAgUm9nZXIgRm9uZyA8cm9nZXJfZm9uZ0BhcHBs ZS5jb20+IGFuZCBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAg IFtXaW5dIFN1cHBvcnQgY29tcGlsaW5nIHdpdGggVlMyMDEzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1MzUzCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXQudmN4cHJvai9XZWJLaXRFeHBv cnRHZW5lcmF0b3IvV2ViS2l0RXhwb3J0cy5kZWYuaW46IFByb3ZpZGUKKyAgICAgICAgcHJvcGVy IGV4cG9ydHMgZm9yIFZTMjAxMyBidWlsZC4KKwogMjAxMy0xMi0wNiAgRMOhbmllbCBCw6F0eWFp ICA8QmF0eWFpLkRhbmllbEBzdHVkLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIEJ1aWxkIGZpeCBh ZnRlciByMTYwMjA3LCByZW1vdmUgdGhlIEJpdG1hcEltYWdlOjpkZWNvZGVTaXplIHN5bWJvbCBl eHBvcnQKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViS2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2Vu ZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQv V2ViS2l0LnZjeHByb2ovV2ViS2l0RXhwb3J0R2VuZXJhdG9yL1dlYktpdEV4cG9ydHMuZGVmLmlu CShyZXZpc2lvbiAxNjAxODApCisrKyBTb3VyY2UvV2ViS2l0L1dlYktpdC52Y3hwcm9qL1dlYktp dEV4cG9ydEdlbmVyYXRvci9XZWJLaXRFeHBvcnRzLmRlZi5pbgkod29ya2luZyBjb3B5KQpAQCAt MzQ2LDcgKzM0NiwxMiBAQCBFWFBPUlRTCiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9wYWdl U2l6ZUFuZE1hcmdpbnNJblBpeGVsc0BQcmludENvbnRleHRAV2ViQ29yZUBAU0E/QVZTdHJpbmdA V1RGQEBQQVZGcmFtZUAyQEhISEhISEhAWiwgP3BhZ2VTaXplQW5kTWFyZ2luc0luUGl4ZWxzQFBy aW50Q29udGV4dEBXZWJDb3JlQEBTQT9BVlN0cmluZ0BXVEZAQFBFQVZGcmFtZUAyQEhISEhISEhA WikKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2Nsb3NlQERPTVdpbmRvd0BXZWJDb3JlQEBR QUVYUEFWU2NyaXB0RXhlY3V0aW9uQ29udGV4dEAyQEBaLCA/Y2xvc2VARE9NV2luZG93QFdlYkNv cmVAQFFFQUFYUEVBVlNjcmlwdEV4ZWN1dGlvbkNvbnRleHRAMkBAWikKICAgICAgICAgc3ltYm9s V2l0aFBvaW50ZXIoP2RvY3VtZW50QERPTVdpbmRvd0BXZWJDb3JlQEBRQkVQQVZEb2N1bWVudEAy QFhaLCA/ZG9jdW1lbnRARE9NV2luZG93QFdlYkNvcmVAQFFFQkFQRUFWRG9jdW1lbnRAMkBYWikK KyNpZiBfTVNDX1ZFUiA8IDE4MDAKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP29wZW5ARE9N V2luZG93QFdlYkNvcmVAQFFBRT9BVj8kUGFzc1JlZlB0ckBWRE9NV2luZG93QFdlYkNvcmVAQEBX VEZAQEFCVlN0cmluZ0A0QEFCVkF0b21pY1N0cmluZ0A0QDBQQVYxMkAyQFosID9vcGVuQERPTVdp bmRvd0BXZWJDb3JlQEBRRUFBP0FWPyRQYXNzUmVmUHRyQFZET01XaW5kb3dAV2ViQ29yZUBAQFdU RkBAQUVCVlN0cmluZ0A0QEFFQlZBdG9taWNTdHJpbmdANEAwUEVBVjEyQDJAWikKKyNlbHNlCisg ICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9vcGVuQERPTVdpbmRvd0BXZWJDb3JlQEBRQUU/QVY/ JFBhc3NSZWZQdHJAVkRPTVdpbmRvd0BXZWJDb3JlQEBAV1RGQEBBQlZTdHJpbmdANEBBQlZBdG9t aWNTdHJpbmdANEAwQUFWMTJAMkBaLCA/b3BlbkBET01XaW5kb3dAV2ViQ29yZUBAUUVBQT9BVj8k UGFzc1JlZlB0ckBWRE9NV2luZG93QFdlYkNvcmVAQEBXVEZAQEFFQlZTdHJpbmdANEBBRUJWQXRv bWljU3RyaW5nQDRAMEFFQVYxMkAyQFopCisKKyNlbmRpZgogICAgICAgICBzeW1ib2xXaXRoUG9p bnRlcig/dG9KU0BXZWJDb3JlQEBZQT9BVkpTVmFsdWVASlNDQEBQQVZFeGVjU3RhdGVAM0BQQVZK U0RPTUdsb2JhbE9iamVjdEAxQFBBVkRPTVdpbmRvd0AxQEBaLCA/dG9KU0BXZWJDb3JlQEBZQT9B VkpTVmFsdWVASlNDQEBQRUFWRXhlY1N0YXRlQDNAUEVBVkpTRE9NR2xvYmFsT2JqZWN0QDFAUEVB VkRPTVdpbmRvd0AxQEBaKQogICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/bGF5ZXJUcmVlQXNU ZXh0QEZyYW1lQFdlYkNvcmVAQFFCRT9BVlN0cmluZ0BXVEZAQElAWiwgP2xheWVyVHJlZUFzVGV4 dEBGcmFtZUBXZWJDb3JlQEBRRUJBP0FWU3RyaW5nQFdURkBASUBaKQogICAgICAgICBzeW1ib2xX aXRoUG9pbnRlcig/dHJhY2tlZFJlcGFpbnRSZWN0c0FzVGV4dEBGcmFtZUBXZWJDb3JlQEBRQkU/ QVZTdHJpbmdAV1RGQEBYWiwgP3RyYWNrZWRSZXBhaW50UmVjdHNBc1RleHRARnJhbWVAV2ViQ29y ZUBAUUVCQT9BVlN0cmluZ0BXVEZAQFhaKQpAQCAtNDYwLDMgKzQ2NSw4IEBAIEVYUE9SVFMKICAg ICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP2NhY2hlU3RvcmFnZUBXZWJDb3JlQEBZQUFBVkFwcGxp Y2F0aW9uQ2FjaGVTdG9yYWdlQDFAWFosID9jYWNoZVN0b3JhZ2VAV2ViQ29yZUBAWUFBRUFWQXBw bGljYXRpb25DYWNoZVN0b3JhZ2VAMUBYWikKICAgICAgICAgc3ltYm9sV2l0aFBvaW50ZXIoP3Nl dERlZmF1bHRPcmlnaW5RdW90YUBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZUBXZWJDb3JlQEBRQUVY X0pAWiwgP3NldERlZmF1bHRPcmlnaW5RdW90YUBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZUBXZWJD b3JlQEBRRUFBWF9KQFopCiAgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD92bUBTY3JpcHRFeGVj dXRpb25Db250ZXh0QFdlYkNvcmVAQFFBRVBBVlZNQEpTQ0BAWFosID92bUBTY3JpcHRFeGVjdXRp b25Db250ZXh0QFdlYkNvcmVAQFFFQUFQRUFWVk1ASlNDQEBYWikKKyNpZiBfTVNDX1ZFUiA+PSAx ODAwCisgICAgICAgIHN5bWJvbFdpdGhQb2ludGVyKD9jb21wbGV0ZVVSTEBEb2N1bWVudEBXZWJD b3JlQEBVQkU/QVZVUkxAMkBBQlZTdHJpbmdAV1RGQEBAWiwgP2NvbXBsZXRlVVJMQERvY3VtZW50 QFdlYkNvcmVAQFVCRT9BVlVSTEAyQEFCVlN0cmluZ0BXVEZAQEBaKQorICAgICAgICBzeW1ib2xX aXRoUG9pbnRlcig/PzFET01XaW5kb3dAV2ViQ29yZUBAVUFFQFhaLCA/PzFET01XaW5kb3dAV2Vi Q29yZUBAVUFFQFhaKQorICAgICAgICBzeW1ib2xXaXRoUG9pbnRlcig/dmlzaWJsZUNvbnRlbnRS ZWN0QFNjcm9sbFZpZXdAV2ViQ29yZUBAVUJFP0FWSW50UmVjdEAyQFc0VmlzaWJsZUNvbnRlbnRS ZWN0SW5jbHVkZXNTY3JvbGxiYXJzQFNjcm9sbGFibGVBcmVhQDJAQFosID92aXNpYmxlQ29udGVu dFJlY3RAU2Nyb2xsVmlld0BXZWJDb3JlQEBVQkU/QVZJbnRSZWN0QDJAVzRWaXNpYmxlQ29udGVu dFJlY3RJbmNsdWRlc1Njcm9sbGJhcnNAU2Nyb2xsYWJsZUFyZWFAMkBAWikKKyNlbmRpZgo=