97828 2012-09-27 16:08:54 -0700 [WIN] Add WebCore::getRegistryValue() 2012-11-20 02:44:02 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 102787 1 paroga paroga bfulgham ossy webkit.review.bot oldest_to_newest 729970 0 paroga 2012-09-27 16:08:54 -0700 [WIN] Add WebCore::getRegistryValue() 729973 1 166088 paroga 2012-09-27 16:13:11 -0700 Created attachment 166088 Patch 771235 2 166088 bfulgham 2012-11-19 17:10:26 -0800 Comment on attachment 166088 Patch Another niceset of clean ups. Thanks! 771237 3 166088 bfulgham 2012-11-19 17:10:56 -0800 Comment on attachment 166088 Patch R=me 771277 4 166088 webkit.review.bot 2012-11-19 17:36:37 -0800 Comment on attachment 166088 Patch Clearing flags on attachment: 166088 Committed r135217: <http://trac.webkit.org/changeset/135217> 771278 5 webkit.review.bot 2012-11-19 17:36:40 -0800 All reviewed patches have been landed. Closing bug. 771599 6 ossy 2012-11-19 23:46:05 -0800 It broke the Qt Win build: C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1660) : error C2144: syntax error : 'int' should be preceded by ';' C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1660) : error C4430: missing type specifier - int assumed. Note: C++ does not support default-int C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1660) : error C2470: 'IQueryAssociations' : looks like a function definition, but there is no parameter list; skipping apparent body C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1860) : error C2146: syntax error : missing ';' before identifier 'IConnectionPoint' C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1860) : error C4430: missing type specifier - int assumed. Note: C++ does not support default-int C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1860) : error C2378: 'interface' : redefinition; symbol cannot be overloaded with a typedef C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1660) : see declaration of 'interface' C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1860) : error C2146: syntax error : missing ';' before identifier 'IConnectionPoint' C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1860) : error C4430: missing type specifier - int assumed. Note: C++ does not support default-int C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1860) : error C4430: missing type specifier - int assumed. Note: C++ does not support default-int C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1860) : error C2086: 'int IConnectionPoint' : redefinition C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1860) : see declaration of 'IConnectionPoint' C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include\shlwapi.h(1863) : error C2061: syntax error : identifier 'IConnectionPoint' 771613 7 ossy 2012-11-19 23:58:28 -0800 Speculative fix landed in http://trac.webkit.org/changeset/135259. Let's see if it works. 166088 2012-09-27 16:13:11 -0700 2012-11-19 17:36:37 -0800 Patch bug-97828.patch text/plain 9564 paroga ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwYTYwNmE4Li45ZGQ3MzMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDktMjcgIFBhdHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CisK KyAgICAgICAgW1dJTl0gQWRkIFdlYkNvcmU6OmdldFJlZ2lzdHJ5VmFsdWUoKQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc4MjgKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgbmV3IGZ1bmN0aW9uIGFk ZHMgYW4gYWJzdHJhY3Rpb24gdG8gU0hHZXRWYWx1ZSgpLCB3aGljaCBpc24ndCBhdmFpbGFibGUg b24gV2luQ0UuCisgICAgICAgIENoYW5naW5nIHRoZSBleGlzdGluZyBmaWxlcyBhbGxvd3MgdXMg dG8gc2hhcmUgbW9yZSBjb2RlIGJldHdlZW4gV2luQ0UgYW5kIFdpbk5UIGluIGEgbmV4dCBzdGVw LgorCisgICAgICAgICogcGxhdGZvcm0vd2luL01JTUVUeXBlUmVnaXN0cnlXaW4uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6bWltZVR5cGVGb3JFeHRlbnNpb24pOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgIChXZWJDb3JlOjpNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRQcmVmZXJyZWRFeHRlbnNp b25Gb3JNSU1FVHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vd2luL1dpbmRvd3NFeHRyYXMuaDoK KyAgICAgICAgKFdlYkNvcmU6OmdldFJlZ2lzdHJ5VmFsdWUpOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgICogcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwOgorICAgICAgICAo V2ViQ29yZTo6YWRkUGx1Z2luUGF0aHNGcm9tUmVnaXN0cnkpOgorICAgICAgICAoV2ViQ29yZTo6 YWRkV2luZG93c01lZGlhUGxheWVyUGx1Z2luRGlyZWN0b3J5KToKKyAgICAgICAgKFdlYkNvcmU6 OmFkZFF1aWNrVGltZVBsdWdpbkRpcmVjdG9yeSk6CisgICAgICAgIChXZWJDb3JlOjphZGRBZG9i ZUFjcm9iYXRQbHVnaW5EaXJlY3RvcnkpOgorICAgICAgICAoV2ViQ29yZTo6YWRkSmF2YVBsdWdp bkRpcmVjdG9yeSk6CisKIDIwMTItMDktMjcgIFlvc2hpZnVtaSBJbm91ZSAgPHlvc2luQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBbRm9ybXNdIEJhc2VNdWx0aXBsZUZpZWxkc0RhdGVBbmRUaW1l SW5wdXRUeXBlIGNsYXNzIHNob3VsZCBpbmhlcml0IERhdGVUaW1lRWRpdEVsZW1lbnQ6OkVkaXRD b250cm9sT3duZXIgcmF0aGVyIHRoYW4gY29udGFpbmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vd2luL01JTUVUeXBlUmVnaXN0cnlXaW4uY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vd2luL01JTUVUeXBlUmVnaXN0cnlXaW4uY3BwCmluZGV4IDk2MmUxMGIuLmVk N2I0MjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dpbi9NSU1FVHlwZVJl Z2lzdHJ5V2luLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vTUlNRVR5cGVS ZWdpc3RyeVdpbi5jcHAKQEAgLTI2LDEzICsyNiwxMiBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgog I2luY2x1ZGUgIk1JTUVUeXBlUmVnaXN0cnkuaCIKIAotI2luY2x1ZGUgPHNobHdhcGkuaD4KKyNp bmNsdWRlICJXaW5kb3dzRXh0cmFzLmgiCiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KICNp bmNsdWRlIDx3dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAKLW5h bWVzcGFjZSBXZWJDb3JlIAoteworbmFtZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgU3RyaW5n IG1pbWVUeXBlRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uKQogewpAQCAtNDEs MTQgKzQwLDE0IEBAIHN0YXRpYyBTdHJpbmcgbWltZVR5cGVGb3JFeHRlbnNpb24oY29uc3QgU3Ry aW5nJiBleHRlbnNpb24pCiAgICAgRFdPUkQgY29udGVudFR5cGVTdHJMZW4gPSBzaXplb2YoY29u dGVudFR5cGVTdHIpOwogICAgIERXT1JEIGtleVR5cGU7CiAKLSAgICBIUkVTVUxUIHJlc3VsdCA9 IFNIR2V0VmFsdWUoSEtFWV9DTEFTU0VTX1JPT1QsIGV4dC5jaGFyYWN0ZXJzV2l0aE51bGxUZXJt aW5hdGlvbigpLCBMIkNvbnRlbnQgVHlwZSIsICZrZXlUeXBlLCAoTFBWT0lEKWNvbnRlbnRUeXBl U3RyLCAmY29udGVudFR5cGVTdHJMZW4pOworICAgIEhSRVNVTFQgcmVzdWx0ID0gZ2V0UmVnaXN0 cnlWYWx1ZShIS0VZX0NMQVNTRVNfUk9PVCwgZXh0LmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0 aW9uKCksIEwiQ29udGVudCBUeXBlIiwgJmtleVR5cGUsIGNvbnRlbnRUeXBlU3RyLCAmY29udGVu dFR5cGVTdHJMZW4pOwogCi0gICAgaWYgKHJlc3VsdCA9PSBFUlJPUl9TVUNDRVNTICYmIGtleVR5 cGUgPT0gUkVHX1NaKSAKKyAgICBpZiAocmVzdWx0ID09IEVSUk9SX1NVQ0NFU1MgJiYga2V5VHlw ZSA9PSBSRUdfU1opCiAgICAgICAgIHJldHVybiBTdHJpbmcoY29udGVudFR5cGVTdHIsIGNvbnRl bnRUeXBlU3RyTGVuIC8gc2l6ZW9mKGNvbnRlbnRUeXBlU3RyWzBdKSAtIDEpOwogCiAgICAgcmV0 dXJuIFN0cmluZygpOwogfQotICAgCisKIFN0cmluZyBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRQcmVm ZXJyZWRFeHRlbnNpb25Gb3JNSU1FVHlwZShjb25zdCBTdHJpbmcmIHR5cGUpCiB7CiAgICAgU3Ry aW5nIHBhdGggPSAiTUlNRVxcRGF0YWJhc2VcXENvbnRlbnQgVHlwZVxcIiArIHR5cGU7CkBAIC01 Niw5ICs1NSw5IEBAIFN0cmluZyBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRQcmVmZXJyZWRFeHRlbnNp b25Gb3JNSU1FVHlwZShjb25zdCBTdHJpbmcmIHR5cGUpCiAgICAgRFdPUkQgZXh0U3RyTGVuID0g c2l6ZW9mKGV4dFN0cik7CiAgICAgRFdPUkQga2V5VHlwZTsKIAotICAgIEhSRVNVTFQgcmVzdWx0 ID0gU0hHZXRWYWx1ZVcoSEtFWV9DTEFTU0VTX1JPT1QsIHBhdGguY2hhcmFjdGVyc1dpdGhOdWxs VGVybWluYXRpb24oKSwgTCJFeHRlbnNpb24iLCAma2V5VHlwZSwgKExQVk9JRClleHRTdHIsICZl eHRTdHJMZW4pOworICAgIEhSRVNVTFQgcmVzdWx0ID0gZ2V0UmVnaXN0cnlWYWx1ZShIS0VZX0NM QVNTRVNfUk9PVCwgcGF0aC5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLCBMIkV4dGVu c2lvbiIsICZrZXlUeXBlLCBleHRTdHIsICZleHRTdHJMZW4pOwogCi0gICAgaWYgKHJlc3VsdCA9 PSBFUlJPUl9TVUNDRVNTICYmIGtleVR5cGUgPT0gUkVHX1NaKSAKKyAgICBpZiAocmVzdWx0ID09 IEVSUk9SX1NVQ0NFU1MgJiYga2V5VHlwZSA9PSBSRUdfU1opCiAgICAgICAgIHJldHVybiBTdHJp bmcoZXh0U3RyICsgMSwgZXh0U3RyTGVuIC8gc2l6ZW9mKGV4dFN0clswXSkgLSAyKTsKIAogICAg IHJldHVybiBTdHJpbmcoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dp bi9XaW5kb3dzRXh0cmFzLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93aW4vV2luZG93c0V4 dHJhcy5oCmluZGV4IGFiMWU4NTMuLjUwZGY0M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3dpbi9XaW5kb3dzRXh0cmFzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vd2luL1dpbmRvd3NFeHRyYXMuaApAQCAtMjUsNiArMjUsNyBAQAogI2lmbmRlZiBXaW5kb3dz RXh0cmFzX2gKICNkZWZpbmUgV2luZG93c0V4dHJhc19oCiAKKyNpbmNsdWRlIDxzaGx3YXBpLmg+ CiAjaW5jbHVkZSA8d2luZG93cy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC0zMyw2ICsz NCwyMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiBjb25zdCBIV05EIEhXTkRfTUVTU0FHRSA9IDA7 CiAjZW5kaWYKIAoraW5saW5lIEhSRVNVTFQgZ2V0UmVnaXN0cnlWYWx1ZShIS0VZIGhrZXksIExQ Q1dTVFIgcHN6U3ViS2V5LCBMUENXU1RSIHBzelZhbHVlLCBMUERXT1JEIHBkd1R5cGUsIExQVk9J RCBwdkRhdGEsIExQRFdPUkQgcGNiRGF0YSkKK3sKKyNpZiBPUyhXSU5DRSkKKyAgICBIS0VZIGtl eTsKKyAgICBpZiAoOjpSZWdPcGVuS2V5RXhXKGhrZXksIHBzelN1YktleSwgMCwgMCwgJmtleSkg IT0gRVJST1JfU1VDQ0VTUykKKyAgICAgICAgcmV0dXJuIEVSUk9SX0lOVkFMSURfTkFNRTsKKyAg ICBIUkVTVUxUIHJlc3VsdCA9IDo6UmVnUXVlcnlWYWx1ZUV4VyhrZXksIHBzelZhbHVlLCAwLCBw ZHdUeXBlLCBzdGF0aWNfY2FzdDxMUEJZVEU+KHB2RGF0YSksIHBjYkRhdGEpOworICAgIDo6UmVn Q2xvc2VLZXkoa2V5KTsKKyAgICByZXR1cm4gcmVzdWx0OworI2Vsc2UKKyAgICByZXR1cm4gOjpT SEdldFZhbHVlVyhoa2V5LCBwc3pTdWJLZXksIHBzelZhbHVlLCBwZHdUeXBlLCBwdkRhdGEsIHBj YkRhdGEpOworI2VuZGlmCit9CisKIGlubGluZSB2b2lkKiBnZXRXaW5kb3dQb2ludGVyKEhXTkQg aFduZCwgaW50IGluZGV4KQogewogI2lmIE9TKFdJTkNFKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwIGIvU291cmNlL1dlYkNvcmUv cGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4uY3BwCmluZGV4IGZmYjQyMWE0Li4yMGI4YWYz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL3dpbi9QbHVnaW5EYXRhYmFzZVdp bi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy93aW4vUGx1Z2luRGF0YWJhc2VXaW4u Y3BwCkBAIC0zMSw4ICszMSw3IEBACiAjaW5jbHVkZSAiRnJhbWUuaCIKICNpbmNsdWRlICJLVVJM LmgiCiAjaW5jbHVkZSAiUGx1Z2luUGFja2FnZS5oIgotI2luY2x1ZGUgPHdpbmRvd3MuaD4KLSNp bmNsdWRlIDxzaGx3YXBpLmg+CisjaW5jbHVkZSAiV2luZG93c0V4dHJhcy5oIgogCiAjaWYgT1Mo V0lOQ0UpCiAvLyBXSU5DRSBkb2Vzbid0IHN1cHBvcnQgUmVnaXN0cnkgS2V5IEFjY2VzcyBSaWdo dHMuIFRoZSBwYXJhbWV0ZXIgc2hvdWxkIGFsd2F5cyBiZSAwCkBAIC00MCwxNyArMzksNiBAQAog I2RlZmluZSBLRVlfRU5VTUVSQVRFX1NVQl9LRVlTIDAKICNlbmRpZgogCi1EV09SRCBTSEdldFZh bHVlKEhLRVkgaGtleSwgTFBDV1NUUiBwc3pTdWJLZXksIExQQ1dTVFIgcHN6VmFsdWUsIExQRFdP UkQgcGR3VHlwZSwgTFBWT0lEIHB2RGF0YSwgTFBEV09SRCBwY2JEYXRhKQotewotICAgIEhLRVkg a2V5OwotICAgIGlmIChSZWdPcGVuS2V5RXgoaGtleSwgcHN6U3ViS2V5LCAwLCAwLCAma2V5KSA9 PSBFUlJPUl9TVUNDRVNTKSB7Ci0gICAgICAgIERXT1JEIHJlc3VsdCA9IFJlZ1F1ZXJ5VmFsdWVF eChrZXksIHBzelZhbHVlLCAwLCBwZHdUeXBlLCAoTFBCWVRFKXB2RGF0YSwgcGNiRGF0YSk7Ci0g ICAgICAgIFJlZ0Nsb3NlS2V5KGtleSk7Ci0gICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAgfQot ICAgIHJldHVybiBFUlJPUl9JTlZBTElEX05BTUU7Ci19Ci0KIEJPT0wgUGF0aFJlbW92ZUZpbGVT cGVjKExQV1NUUiBtb2R1bGVGaWxlTmFtZVN0cikKIHsKICAgICBpZiAoISptb2R1bGVGaWxlTmFt ZVN0cikKQEAgLTEwMiw3ICs5MCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRQbHVnaW5QYXRo c0Zyb21SZWdpc3RyeShIS0VZIHJvb3RLZXksIEhhc2hTZXQ8U3RyaW5nPiYgcGF0CiAgICAgICAg IERXT1JEIHBhdGhTdHJTaXplID0gc2l6ZW9mKHBhdGhTdHIpOwogICAgICAgICBEV09SRCB0eXBl OwogCi0gICAgICAgIHJlc3VsdCA9IFNIR2V0VmFsdWUoa2V5LCBuYW1lLCBURVhUKCJQYXRoIiks ICZ0eXBlLCAoTFBCWVRFKXBhdGhTdHIsICZwYXRoU3RyU2l6ZSk7CisgICAgICAgIHJlc3VsdCA9 IGdldFJlZ2lzdHJ5VmFsdWUoa2V5LCBuYW1lLCBMIlBhdGgiLCAmdHlwZSwgcGF0aFN0ciwgJnBh dGhTdHJTaXplKTsKICAgICAgICAgaWYgKHJlc3VsdCAhPSBFUlJPUl9TVUNDRVNTIHx8IHR5cGUg IT0gUkVHX1NaKQogICAgICAgICAgICAgY29udGludWU7CiAKQEAgLTI2Myw3ICsyNTEsNyBAQCBz dGF0aWMgaW5saW5lIHZvaWQgYWRkV2luZG93c01lZGlhUGxheWVyUGx1Z2luRGlyZWN0b3J5KFZl Y3RvcjxTdHJpbmc+JiBkaXJlY3RvcgogICAgIFdDSEFSIGluc3RhbGxhdGlvbkRpcmVjdG9yeVN0 cltfTUFYX1BBVEhdOwogICAgIERXT1JEIGluc3RhbGxhdGlvbkRpcmVjdG9yeVNpemUgPSBzaXpl b2YoaW5zdGFsbGF0aW9uRGlyZWN0b3J5U3RyKTsKIAotICAgIEhSRVNVTFQgcmVzdWx0ID0gU0hH ZXRWYWx1ZShIS0VZX0xPQ0FMX01BQ0hJTkUsIFRFWFQoIlNvZnR3YXJlXFxNaWNyb3NvZnRcXE1l ZGlhUGxheWVyIiksIFRFWFQoIkluc3RhbGxhdGlvbiBEaXJlY3RvcnkiKSwgJnR5cGUsIChMUEJZ VEUpJmluc3RhbGxhdGlvbkRpcmVjdG9yeVN0ciwgJmluc3RhbGxhdGlvbkRpcmVjdG9yeVNpemUp OworICAgIEhSRVNVTFQgcmVzdWx0ID0gZ2V0UmVnaXN0cnlWYWx1ZShIS0VZX0xPQ0FMX01BQ0hJ TkUsIEwiU29mdHdhcmVcXE1pY3Jvc29mdFxcTWVkaWFQbGF5ZXIiLCBMIkluc3RhbGxhdGlvbiBE aXJlY3RvcnkiLCAmdHlwZSwgJmluc3RhbGxhdGlvbkRpcmVjdG9yeVN0ciwgJmluc3RhbGxhdGlv bkRpcmVjdG9yeVNpemUpOwogCiAgICAgaWYgKHJlc3VsdCA9PSBFUlJPUl9TVUNDRVNTICYmIHR5 cGUgPT0gUkVHX1NaKQogICAgICAgICBkaXJlY3Rvcmllcy5hcHBlbmQoU3RyaW5nKGluc3RhbGxh dGlvbkRpcmVjdG9yeVN0ciwgaW5zdGFsbGF0aW9uRGlyZWN0b3J5U2l6ZSAvIHNpemVvZihXQ0hB UikgLSAxKSk7CkBAIC0yNzUsNyArMjYzLDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGFkZFF1aWNr VGltZVBsdWdpbkRpcmVjdG9yeShWZWN0b3I8U3RyaW5nPiYgZGlyZWN0b3JpZXMpCiAgICAgV0NI QVIgaW5zdGFsbGF0aW9uRGlyZWN0b3J5U3RyW19NQVhfUEFUSF07CiAgICAgRFdPUkQgaW5zdGFs bGF0aW9uRGlyZWN0b3J5U2l6ZSA9IHNpemVvZihpbnN0YWxsYXRpb25EaXJlY3RvcnlTdHIpOwog Ci0gICAgSFJFU1VMVCByZXN1bHQgPSBTSEdldFZhbHVlKEhLRVlfTE9DQUxfTUFDSElORSwgVEVY VCgiU29mdHdhcmVcXEFwcGxlIENvbXB1dGVyLCBJbmMuXFxRdWlja1RpbWUiKSwgVEVYVCgiSW5z dGFsbERpciIpLCAmdHlwZSwgKExQQllURSkmaW5zdGFsbGF0aW9uRGlyZWN0b3J5U3RyLCAmaW5z dGFsbGF0aW9uRGlyZWN0b3J5U2l6ZSk7CisgICAgSFJFU1VMVCByZXN1bHQgPSBnZXRSZWdpc3Ry eVZhbHVlKEhLRVlfTE9DQUxfTUFDSElORSwgTCJTb2Z0d2FyZVxcQXBwbGUgQ29tcHV0ZXIsIElu Yy5cXFF1aWNrVGltZSIsIEwiSW5zdGFsbERpciIsICZ0eXBlLCAmaW5zdGFsbGF0aW9uRGlyZWN0 b3J5U3RyLCAmaW5zdGFsbGF0aW9uRGlyZWN0b3J5U2l6ZSk7CiAKICAgICBpZiAocmVzdWx0ID09 IEVSUk9SX1NVQ0NFU1MgJiYgdHlwZSA9PSBSRUdfU1opIHsKICAgICAgICAgU3RyaW5nIHBsdWdp bkRpciA9IFN0cmluZyhpbnN0YWxsYXRpb25EaXJlY3RvcnlTdHIsIGluc3RhbGxhdGlvbkRpcmVj dG9yeVNpemUgLyBzaXplb2YoV0NIQVIpIC0gMSkgKyAiXFxwbHVnaW5zIjsKQEAgLTMxNyw3ICsz MDUsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgYWRkQWRvYmVBY3JvYmF0UGx1Z2luRGlyZWN0b3J5 KFZlY3RvcjxTdHJpbmc+JiBkaXJlY3RvcmllcykKICAgICAgICAgRFdPUkQgYWNyb2JhdEluc3Rh bGxQYXRoU2l6ZSA9IHNpemVvZihhY3JvYmF0SW5zdGFsbFBhdGhTdHIpOwogCiAgICAgICAgIFN0 cmluZyBhY3JvYmF0UGx1Z2luS2V5UGF0aCA9ICJTb2Z0d2FyZVxcQWRvYmVcXEFjcm9iYXQgUmVh ZGVyXFwiICsgbGF0ZXN0QWNyb2JhdFZlcnNpb25TdHJpbmcgKyAiXFxJbnN0YWxsUGF0aCI7Ci0g ICAgICAgIHJlc3VsdCA9IFNIR2V0VmFsdWUoSEtFWV9MT0NBTF9NQUNISU5FLCBhY3JvYmF0UGx1 Z2luS2V5UGF0aC5jaGFyYWN0ZXJzV2l0aE51bGxUZXJtaW5hdGlvbigpLCAwLCAmdHlwZSwgKExQ QllURSlhY3JvYmF0SW5zdGFsbFBhdGhTdHIsICZhY3JvYmF0SW5zdGFsbFBhdGhTaXplKTsKKyAg ICAgICAgcmVzdWx0ID0gZ2V0UmVnaXN0cnlWYWx1ZShIS0VZX0xPQ0FMX01BQ0hJTkUsIGFjcm9i YXRQbHVnaW5LZXlQYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCksIDAsICZ0eXBl LCBhY3JvYmF0SW5zdGFsbFBhdGhTdHIsICZhY3JvYmF0SW5zdGFsbFBhdGhTaXplKTsKIAogICAg ICAgICBpZiAocmVzdWx0ID09IEVSUk9SX1NVQ0NFU1MpIHsKICAgICAgICAgICAgIFN0cmluZyBh Y3JvYmF0UGx1Z2luRGlyZWN0b3J5ID0gU3RyaW5nKGFjcm9iYXRJbnN0YWxsUGF0aFN0ciwgYWNy b2JhdEluc3RhbGxQYXRoU2l6ZSAvIHNpemVvZihXQ0hBUikgLSAxKSArICJcXGJyb3dzZXIiOwpA QCAtMzY0LDEwICszNTIsMTAgQEAgc3RhdGljIGlubGluZSB2b2lkIGFkZEphdmFQbHVnaW5EaXJl Y3RvcnkoVmVjdG9yPFN0cmluZz4mIGRpcmVjdG9yaWVzKQogICAgICAgICBEV09SRCB1c2VOZXdQ bHVnaW5TaXplOwogCiAgICAgICAgIFN0cmluZyBqYXZhUGx1Z2luS2V5UGF0aCA9ICJTb2Z0d2Fy ZVxcSmF2YVNvZnRcXEphdmEgUGx1Zy1pblxcIiArIGxhdGVzdEphdmFWZXJzaW9uU3RyaW5nOwot ICAgICAgICByZXN1bHQgPSBTSEdldFZhbHVlKEhLRVlfTE9DQUxfTUFDSElORSwgamF2YVBsdWdp bktleVBhdGguY2hhcmFjdGVyc1dpdGhOdWxsVGVybWluYXRpb24oKSwgVEVYVCgiVXNlTmV3SmF2 YVBsdWdpbiIpLCAmdHlwZSwgKExQVk9JRCkmdXNlTmV3UGx1Z2luVmFsdWUsICZ1c2VOZXdQbHVn aW5TaXplKTsKKyAgICAgICAgcmVzdWx0ID0gZ2V0UmVnaXN0cnlWYWx1ZShIS0VZX0xPQ0FMX01B Q0hJTkUsIGphdmFQbHVnaW5LZXlQYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCks IEwiVXNlTmV3SmF2YVBsdWdpbiIsICZ0eXBlLCAmdXNlTmV3UGx1Z2luVmFsdWUsICZ1c2VOZXdQ bHVnaW5TaXplKTsKIAogICAgICAgICBpZiAocmVzdWx0ID09IEVSUk9SX1NVQ0NFU1MgJiYgdXNl TmV3UGx1Z2luVmFsdWUgPT0gMSkgewotICAgICAgICAgICAgcmVzdWx0ID0gU0hHZXRWYWx1ZShI S0VZX0xPQ0FMX01BQ0hJTkUsIGphdmFQbHVnaW5LZXlQYXRoLmNoYXJhY3RlcnNXaXRoTnVsbFRl cm1pbmF0aW9uKCksIFRFWFQoIkphdmFIb21lIiksICZ0eXBlLCAoTFBCWVRFKWphdmFJbnN0YWxs UGF0aFN0ciwgJmphdmFJbnN0YWxsUGF0aFNpemUpOworICAgICAgICAgICAgcmVzdWx0ID0gZ2V0 UmVnaXN0cnlWYWx1ZShIS0VZX0xPQ0FMX01BQ0hJTkUsIGphdmFQbHVnaW5LZXlQYXRoLmNoYXJh Y3RlcnNXaXRoTnVsbFRlcm1pbmF0aW9uKCksIEwiSmF2YUhvbWUiLCAmdHlwZSwgamF2YUluc3Rh bGxQYXRoU3RyLCAmamF2YUluc3RhbGxQYXRoU2l6ZSk7CiAgICAgICAgICAgICBpZiAocmVzdWx0 ID09IEVSUk9SX1NVQ0NFU1MpIHsKICAgICAgICAgICAgICAgICBTdHJpbmcgamF2YVBsdWdpbkRp cmVjdG9yeSA9IFN0cmluZyhqYXZhSW5zdGFsbFBhdGhTdHIsIGphdmFJbnN0YWxsUGF0aFNpemUg LyBzaXplb2YoV0NIQVIpIC0gMSkgKyAiXFxiaW5cXG5ld19wbHVnaW4iOwogICAgICAgICAgICAg ICAgIGRpcmVjdG9yaWVzLmFwcGVuZChqYXZhUGx1Z2luRGlyZWN0b3J5KTsK