17576 2008-02-27 14:45:03 -0800 Convert RenderThemeWin to use SOFT_LINK 2008-02-28 12:25:04 -0800 1 1 1 Unclassified WebKit WebKit Misc. 523.x (Safari 3) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned oldest_to_newest 72186 0 bfulgham 2008-02-27 14:45:03 -0800 Modify the RenderThemeWin logic to use SOFT_LINK rather than the hand-coded load library commands. 72195 1 19412 bfulgham 2008-02-27 15:19:59 -0800 Created attachment 19412 Patch to modify the Split off from Issue #17483. Changed RenderThemeWin to use SOFT_LINK utility. 72260 2 19412 aroben 2008-02-28 08:48:47 -0800 Comment on attachment 19412 Patch to modify the r=me 72287 3 dev+webkit 2008-02-28 12:25:04 -0800 Committed revision 30648. 19412 2008-02-27 15:19:59 -0800 2008-02-28 08:48:47 -0800 Patch to modify the RenderThemeWin_SOFT_LINK.patch text/plain 10303 bfulgham SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMDYzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDItMjcgIEJyZW50IEZ1bGdoYW0gPGJmdWxnaGFtQGdtYWls LmNvbT4KKworICAgICAgICBodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzU3NgorICAgICAgICBNb2RpZnkgUmVuZGVyVGhlbWVXaW4gdG8gdXNlIFNPRlRfTElOSworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdBUk5JTkc6IE5P IFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRoZW1lV2luLmg6ICBSZW1vdmUgdW5uZWVkZWQgbGlicmFyeSBoYW5kbGUKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uY3BwOiAgQ2hhbmdlIHRvIHVzZSBTT0ZUX0xJTksKKyAg ICAgICAgICByYXRoZXIgdGhhbiBoYW5kLWNvZGVkIGxvYWQgbGlicmFyeSBjYWxscy4KKwogMjAw OC0wMi0yNyAgSnVsaWVuIENoYWZmcmFpeCA8anVsaWVuLmNoYWZmcmFpeEBnbWFpbC5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5LgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVXaW4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lV2luLmNwcAkocmV2aXNpb24gMzA2MjUpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJU aGVtZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3LDEyICsyNywxNCBAQAogI2luY2x1ZGUg IkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0LmgiCiAjaW5jbHVkZSAiUGxh dGZvcm1TdHJpbmcuaCIKKyNpbmNsdWRlICJTb2Z0TGlua2luZy5oIgorCiAjaW5jbHVkZSA8Y2Fp cm8td2luMzIuaD4KIAogLyogCiAgKiBUaGUgZm9sbG93aW5nIGNvbnN0YW50cyBhcmUgdXNlZCB0 byBkZXRlcm1pbmUgaG93IGEgd2lkZ2V0IGlzIGRyYXduIHVzaW5nCiAgKiBXaW5kb3dzJyBUaGVt ZSBBUEkuIEZvciBtb3JlIGluZm9ybWF0aW9uIG9uIHRoZW1lIHBhcnRzIGFuZCBzdGF0ZXMgc2Vl Ci0gKiBodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tL2xpYnJhcnkvZGVmYXVsdC5hc3A/dXJsPS9s aWJyYXJ5L2VuLXVzL3NoZWxsY2MvcGxhdGZvcm0vY29tbWN0bHMvdXNlcmV4L3RvcGljcy9wYXJ0 c2FuZHN0YXRlcy5hc3AKKyAqIGh0dHA6Ly9tc2RuMi5taWNyb3NvZnQuY29tL2VuLXVzL2xpYnJh cnkvYmI3NzMyMTAoVlMuODUpLmFzcHgKICAqLwogI2RlZmluZSBUSEVNRV9DT0xPUiAyMDQKICNk ZWZpbmUgVEhFTUVfRk9OVCAgMjEwCkBAIC01NiwzMyArNTgsMTUgQEAKIC8vIENvbWJvYm94IGNv bnN0YW50cwogI2RlZmluZSBDUF9EUk9QRE9XTkJVVFRPTiAxCiAKLXR5cGVkZWYgSEFORExFIChX SU5BUEkqb3BlblRoZW1lRGF0YVB0cikoSFdORCBod25kLCBMUENXU1RSIHBzekNsYXNzTGlzdCk7 Ci10eXBlZGVmIEhSRVNVTFQgKFdJTkFQSSpjbG9zZVRoZW1lRGF0YVB0cikoSEFORExFIGhUaGVt ZSk7Ci10eXBlZGVmIEhSRVNVTFQgKFdJTkFQSSpkcmF3VGhlbWVCYWNrZ3JvdW5kUHRyKShIQU5E TEUgaFRoZW1lLCBIREMgaGRjLCBpbnQgaVBhcnRJZCwgCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnQgaVN0YXRlSWQsIGNvbnN0IFJFQ1QgKnBSZWN0LAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUkVDVCogcENsaXBS ZWN0KTsKLXR5cGVkZWYgSFJFU1VMVCAoV0lOQVBJKmRyYXdUaGVtZUVkZ2VQdHIpKEhBTkRMRSBo VGhlbWUsIEhEQyBoZGMsIGludCBpUGFydElkLCAKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGludCBpU3RhdGVJZCwgY29uc3QgUkVDVCAqcFJlY3QsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCB1RWRnZSwgdW5zaWdu ZWQgdUZsYWdzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgUkVDVCogcENsaXBSZWN0KTsKLXR5cGVkZWYgSFJFU1VMVCAoV0lOQVBJKmdldFRoZW1lQ29u dGVudFJlY3RQdHIpKEhBTkRMRSBoVGhlbWUsIEhEQyBoZGMsIGludCBpUGFydElkLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50IGlTdGF0ZUlkLCBjb25zdCBS RUNUKiBwUmVjdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFJF Q1QqIHBDb250ZW50UmVjdCk7Ci10eXBlZGVmIEhSRVNVTFQgKFdJTkFQSSpnZXRUaGVtZVBhcnRT aXplUHRyKShIQU5ETEUgaFRoZW1lLCBIREMgaGRjLCBpbnQgaVBhcnRJZCwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCBpU3RhdGVJZCwgUkVDVCogcHJjLCBpbnQg dHMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBTSVpFKiBwc3opOwot dHlwZWRlZiBIUkVTVUxUIChXSU5BUEkqZ2V0VGhlbWVTeXNGb250UHRyKShIQU5ETEUgaFRoZW1l LCBpbnQgaUZvbnRJZCwgT1VUIExPR0ZPTlQqIHBGb250KTsKLXR5cGVkZWYgSFJFU1VMVCAoV0lO QVBJKmdldFRoZW1lQ29sb3JQdHIpKEhBTkRMRSBoVGhlbWUsIEhEQyBoZGMsIGludCBpUGFydElk LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgaVN0YXRlSWQsIGludCBp UHJvcElkLCBPVVQgQ09MT1JSRUYqIHBGb250KTsKLQotc3RhdGljIG9wZW5UaGVtZURhdGFQdHIg b3BlblRoZW1lID0gMDsKLXN0YXRpYyBjbG9zZVRoZW1lRGF0YVB0ciBjbG9zZVRoZW1lID0gMDsK LXN0YXRpYyBkcmF3VGhlbWVCYWNrZ3JvdW5kUHRyIGRyYXdUaGVtZUJHID0gMDsKLXN0YXRpYyBk cmF3VGhlbWVFZGdlUHRyIGRyYXdUaGVtZUVkZ2UgPSAwOwotc3RhdGljIGdldFRoZW1lQ29udGVu dFJlY3RQdHIgZ2V0VGhlbWVDb250ZW50UmVjdCA9IDA7Ci1zdGF0aWMgZ2V0VGhlbWVQYXJ0U2l6 ZVB0ciBnZXRUaGVtZVBhcnRTaXplID0gMDsKLXN0YXRpYyBnZXRUaGVtZVN5c0ZvbnRQdHIgZ2V0 VGhlbWVTeXNGb250ID0gMDsKLXN0YXRpYyBnZXRUaGVtZUNvbG9yUHRyIGdldFRoZW1lQ29sb3Ig PSAwOworU09GVF9MSU5LX0xJQlJBUlkodXh0aGVtZSkKK1NPRlRfTElOSyh1eHRoZW1lLCBPcGVu VGhlbWVEYXRhLCBIQU5ETEUsIFdJTkFQSSwgKEhXTkQgaHduZCwgTFBDV1NUUiBwc3pDbGFzc0xp c3QpLCAoaHduZCwgcHN6Q2xhc3NMaXN0KSkKK1NPRlRfTElOSyh1eHRoZW1lLCBDbG9zZVRoZW1l RGF0YSwgSFJFU1VMVCwgV0lOQVBJLCAoSEFORExFIGhUaGVtZSksIChoVGhlbWUpKQorU09GVF9M SU5LKHV4dGhlbWUsIERyYXdUaGVtZUJhY2tncm91bmQsIEhSRVNVTFQsIFdJTkFQSSwgKEhBTkRM RSBoVGhlbWUsIEhEQyBoZGMsIGludCBpUGFydElkLCBpbnQgaVN0YXRlSWQsIGNvbnN0IFJFQ1Qq IHBSZWN0LCBjb25zdCBSRUNUKiBwQ2xpcFJlY3QpLCAoaFRoZW1lLCBoZGMsIGlQYXJ0SWQsIGlT dGF0ZUlkLCBwUmVjdCwgcENsaXBSZWN0KSkKK1NPRlRfTElOSyh1eHRoZW1lLCBEcmF3VGhlbWVF ZGdlLCBIUkVTVUxULCBXSU5BUEksIChIQU5ETEUgaFRoZW1lLCBIREMgaGRjLCBpbnQgaVBhcnRJ ZCwgaW50IGlTdGF0ZUlkLCBjb25zdCBSRUNUKiBwUmVjdCwgdW5zaWduZWQgdUVkZ2UsIHVuc2ln bmVkIHVGbGFncywgY29uc3QgUkVDVCogcENsaXBSZWN0KSwgKGhUaGVtZSwgaGRjLCBpUGFydElk LCBpU3RhdGVJZCwgcFJlY3QsIHVFZGdlLCB1RmxhZ3MsIHBDbGlwUmVjdCkpCitTT0ZUX0xJTkso dXh0aGVtZSwgR2V0VGhlbWVDb250ZW50UmVjdCwgSFJFU1VMVCwgV0lOQVBJLCAoSEFORExFIGhU aGVtZSwgSERDIGhkYywgaW50IGlQYXJ0SWQsIGludCBpU3RhdGVJZCwgY29uc3QgUkVDVCogcFJl Y3QsIGNvbnN0IFJFQ1QqIHBDb250ZW50UmVjdCksIChoVGhlbWUsIGhkYywgaVBhcnRJZCwgaVN0 YXRlSWQsIHBSZWN0LCBwQ29udGVudFJlY3QpKQorU09GVF9MSU5LKHV4dGhlbWUsIEdldFRoZW1l UGFydFNpemUsIEhSRVNVTFQsIFdJTkFQSSwgKEhBTkRMRSBoVGhlbWUsIEhEQyBoZGMsIGludCBp UGFydElkLCBpbnQgaVN0YXRlSWQsIFJFQ1QqIHBSZWN0LCBpbnQgdHMsIFNJWkUqIHBzeiksICho VGhlbWUsIGhkYywgaVBhcnRJZCwgaVN0YXRlSWQsIHBSZWN0LCB0cywgcHN6KSkKK1NPRlRfTElO Syh1eHRoZW1lLCBHZXRUaGVtZVN5c0ZvbnQsIEhSRVNVTFQsIFdJTkFQSSwgKEhBTkRMRSBoVGhl bWUsIGludCBpRm9udElkLCBPVVQgTE9HRk9OVCogcEZvbnQpLCAoaFRoZW1lLCBpRm9udElkLCBw Rm9udCkpCitTT0ZUX0xJTksodXh0aGVtZSwgR2V0VGhlbWVDb2xvciwgSFJFU1VMVCwgV0lOQVBJ LCAoSEFORExFIGhUaGVtZSwgSERDIGhkYywgaW50IGlQYXJ0SWQsIGludCBpU3RhdGVJZCwgaW50 IGlQcm9wSWQsIE9VVCBDT0xPUlJFRiogcENvbG9yKSwgKGhUaGVtZSwgaGRjLCBpUGFydElkLCBp U3RhdGVJZCwgaVByb3BJZCwgcENvbG9yKSkKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC05 Myw0MCArNzcsMjkgQEAgUmVuZGVyVGhlbWUqIHRoZW1lKCkKIH0KIAogUmVuZGVyVGhlbWVXaW46 OlJlbmRlclRoZW1lV2luKCkKLTptX3RoZW1lRExMKDApLCBtX2J1dHRvblRoZW1lKDApLCBtX3Rl eHRGaWVsZFRoZW1lKDApLCBtX21lbnVMaXN0VGhlbWUoMCkKKyAgICA6IG1fYnV0dG9uVGhlbWUo MCkKKyAgICAsIG1fdGV4dEZpZWxkVGhlbWUoMCkKKyAgICAsIG1fbWVudUxpc3RUaGVtZSgwKQog ewotICAgIG1fdGhlbWVETEwgPSA6OkxvYWRMaWJyYXJ5KEwidXh0aGVtZS5kbGwiKTsKLSAgICBp ZiAobV90aGVtZURMTCkgewotICAgICAgICBvcGVuVGhlbWUgPSAob3BlblRoZW1lRGF0YVB0cilH ZXRQcm9jQWRkcmVzcyhtX3RoZW1lRExMLCAiT3BlblRoZW1lRGF0YSIpOwotICAgICAgICBjbG9z ZVRoZW1lID0gKGNsb3NlVGhlbWVEYXRhUHRyKUdldFByb2NBZGRyZXNzKG1fdGhlbWVETEwsICJD bG9zZVRoZW1lRGF0YSIpOwotICAgICAgICBkcmF3VGhlbWVCRyA9IChkcmF3VGhlbWVCYWNrZ3Jv dW5kUHRyKUdldFByb2NBZGRyZXNzKG1fdGhlbWVETEwsICJEcmF3VGhlbWVCYWNrZ3JvdW5kIik7 Ci0gICAgICAgIGRyYXdUaGVtZUVkZ2UgPSAoZHJhd1RoZW1lRWRnZVB0cilHZXRQcm9jQWRkcmVz cyhtX3RoZW1lRExMLCAiRHJhd1RoZW1lRWRnZSIpOwotICAgICAgICBnZXRUaGVtZUNvbnRlbnRS ZWN0ID0gKGdldFRoZW1lQ29udGVudFJlY3RQdHIpR2V0UHJvY0FkZHJlc3MobV90aGVtZURMTCwg IkdldFRoZW1lQmFja2dyb3VuZENvbnRlbnRSZWN0Iik7Ci0gICAgICAgIGdldFRoZW1lUGFydFNp emUgPSAoZ2V0VGhlbWVQYXJ0U2l6ZVB0cilHZXRQcm9jQWRkcmVzcyhtX3RoZW1lRExMLCAiR2V0 VGhlbWVQYXJ0U2l6ZSIpOwotICAgICAgICBnZXRUaGVtZVN5c0ZvbnQgPSAoZ2V0VGhlbWVTeXNG b250UHRyKUdldFByb2NBZGRyZXNzKG1fdGhlbWVETEwsICJHZXRUaGVtZVN5c0ZvbnQiKTsKLSAg ICAgICAgZ2V0VGhlbWVDb2xvciA9IChnZXRUaGVtZUNvbG9yUHRyKUdldFByb2NBZGRyZXNzKG1f dGhlbWVETEwsICJHZXRUaGVtZUNvbG9yIik7Ci0gICAgfQogfQogCiBSZW5kZXJUaGVtZVdpbjo6 flJlbmRlclRoZW1lV2luKCkKIHsKLSAgICBpZiAoIW1fdGhlbWVETEwpCisgICAgaWYgKCF1eHRo ZW1lTGlicmFyeSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBjbG9zZSgpOwotCi0gICAgOjpG cmVlTGlicmFyeShtX3RoZW1lRExMKTsKIH0KIAogdm9pZCBSZW5kZXJUaGVtZVdpbjo6Y2xvc2Uo KQogewogICAgIC8vIFRoaXMgbWV0aG9kIHdpbGwgbmVlZCB0byBiZSBjYWxsZWQgd2hlbiB0aGUg T1MgdGhlbWUgY2hhbmdlcyB0byBmbHVzaCBvdXIgY2FjaGVkIHRoZW1lcy4KICAgICBpZiAobV9i dXR0b25UaGVtZSkKLSAgICAgICAgY2xvc2VUaGVtZShtX2J1dHRvblRoZW1lKTsKKyAgICAgICAg Q2xvc2VUaGVtZURhdGEobV9idXR0b25UaGVtZSk7CiAgICAgaWYgKG1fdGV4dEZpZWxkVGhlbWUp Ci0gICAgICAgIGNsb3NlVGhlbWUobV90ZXh0RmllbGRUaGVtZSk7CisgICAgICAgIENsb3NlVGhl bWVEYXRhKG1fdGV4dEZpZWxkVGhlbWUpOwogICAgIGlmIChtX21lbnVMaXN0VGhlbWUpCi0gICAg ICAgIGNsb3NlVGhlbWUobV9tZW51TGlzdFRoZW1lKTsKKyAgICAgICAgQ2xvc2VUaGVtZURhdGEo bV9tZW51TGlzdFRoZW1lKTsKICAgICBtX2J1dHRvblRoZW1lID0gbV90ZXh0RmllbGRUaGVtZSA9 IG1fbWVudUxpc3RUaGVtZSA9IDA7CiB9CiAKQEAgLTE2NCw4ICsxMzcsNiBAQCBib29sIFJlbmRl clRoZW1lV2luOjpzdXBwb3J0c0ZvY3VzKEVBcHBlCiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQotCi0gICAgcmV0dXJuIGZhbHNlOwogfQogCiB1bnNp Z25lZCBSZW5kZXJUaGVtZVdpbjo6ZGV0ZXJtaW5lU3RhdGUoUmVuZGVyT2JqZWN0KiBvKQpAQCAt MjUwLDExICsyMjEsMTEgQEAgYm9vbCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRCdXR0b24oUmVuZGVy TwogICAgIC8vIE5vdyBwYWludCB0aGUgYnV0dG9uLgogICAgIEhEQyBoZGMgPSBwcmVwYXJlRm9y RHJhd2luZyhpLmNvbnRleHQsIHIpOyAgCiAgICAgUkVDVCB3aWRnZXRSZWN0ID0gcjsKLSAgICBp ZiAobV90aGVtZURMTCAmJiAhbV9idXR0b25UaGVtZSkKLSAgICAgICAgbV9idXR0b25UaGVtZSA9 IG9wZW5UaGVtZSgwLCBMIkJ1dHRvbiIpOwotICAgIGlmIChtX2J1dHRvblRoZW1lICYmIGRyYXdU aGVtZUJHKSB7Ci0gICAgICAgIGRyYXdUaGVtZUJHKG1fYnV0dG9uVGhlbWUsIGhkYywgdGhlbWVE YXRhLm1fcGFydCwgdGhlbWVEYXRhLm1fc3RhdGUsICZ3aWRnZXRSZWN0LCBOVUxMKTsKLSAgICB9 IGVsc2UgeworICAgIGlmICh1eHRoZW1lTGlicmFyeSgpICYmICFtX2J1dHRvblRoZW1lKQorICAg ICAgICBtX2J1dHRvblRoZW1lID0gT3BlblRoZW1lRGF0YSgwLCBMIkJ1dHRvbiIpOworICAgIGlm IChtX2J1dHRvblRoZW1lKQorICAgICAgICBEcmF3VGhlbWVCYWNrZ3JvdW5kKG1fYnV0dG9uVGhl bWUsIGhkYywgdGhlbWVEYXRhLm1fcGFydCwgdGhlbWVEYXRhLm1fc3RhdGUsICZ3aWRnZXRSZWN0 LCBOVUxMKTsKKyAgICBlbHNlIHsKICAgICAgICAgaWYgKCh0aGVtZURhdGEubV9wYXJ0ID09IEJQ X0JVVFRPTikgJiYgaXNGb2N1c2VkKG8pKSB7CiAgICAgICAgICAgICAvLyBEcmF3IGJsYWNrIGZv Y3VzIHJlY3QgYXJvdW5kIGJ1dHRvbiBvdXRlciBlZGdlCiAgICAgICAgICAgICBIQlJVU0ggYnJ1 c2ggPSBHZXRTeXNDb2xvckJydXNoKENPTE9SXzNEREtTSEFET1cpOwpAQCAtMjY0LDkgKzIzNSw4 IEBAIGJvb2wgUmVuZGVyVGhlbWVXaW46OnBhaW50QnV0dG9uKFJlbmRlck8KICAgICAgICAgICAg IH0KICAgICAgICAgfQogICAgICAgICBEcmF3RnJhbWVDb250cm9sKGhkYywgJndpZGdldFJlY3Qs IERGQ19CVVRUT04sIHRoZW1lRGF0YS5tX2NsYXNzaWNTdGF0ZSk7Ci0gICAgICAgIGlmICgodGhl bWVEYXRhLm1fcGFydCAhPSBCUF9CVVRUT04pICYmIGlzRm9jdXNlZChvKSkgeworICAgICAgICBp ZiAoKHRoZW1lRGF0YS5tX3BhcnQgIT0gQlBfQlVUVE9OKSAmJiBpc0ZvY3VzZWQobykpCiAgICAg ICAgICAgICBEcmF3Rm9jdXNSZWN0KGhkYywgJndpZGdldFJlY3QpOwotICAgICAgICB9CiAgICAg fQogICAgIGRvbmVEcmF3aW5nKGkuY29udGV4dCwgaGRjLCByKTsKIApAQCAtMjk3LDExICsyNjcs MTEgQEAgYm9vbCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRUZXh0RmllbGQoUmVuZAogICAgIC8vIE5v dyBwYWludCB0aGUgdGV4dCBmaWVsZC4KICAgICBIREMgaGRjID0gcHJlcGFyZUZvckRyYXdpbmco aS5jb250ZXh0LCByKTsKICAgICBSRUNUIHdpZGdldFJlY3QgPSByOwotICAgIGlmIChtX3RoZW1l RExMICYmICFtX3RleHRGaWVsZFRoZW1lKQotICAgICAgICBtX3RleHRGaWVsZFRoZW1lID0gb3Bl blRoZW1lKDAsIEwiRWRpdCIpOwotICAgIGlmIChtX3RleHRGaWVsZFRoZW1lICYmIGRyYXdUaGVt ZUJHKSB7Ci0gICAgICAgIGRyYXdUaGVtZUJHKG1fdGV4dEZpZWxkVGhlbWUsIGhkYywgdGhlbWVE YXRhLm1fcGFydCwgdGhlbWVEYXRhLm1fc3RhdGUsICZ3aWRnZXRSZWN0LCBOVUxMKTsKLSAgICB9 IGVsc2UgeworICAgIGlmICh1eHRoZW1lTGlicmFyeSgpICYmICFtX3RleHRGaWVsZFRoZW1lKQor ICAgICAgICBtX3RleHRGaWVsZFRoZW1lID0gT3BlblRoZW1lRGF0YSgwLCBMIkVkaXQiKTsKKyAg ICBpZiAobV90ZXh0RmllbGRUaGVtZSkKKyAgICAgICAgRHJhd1RoZW1lQmFja2dyb3VuZChtX3Rl eHRGaWVsZFRoZW1lLCBoZGMsIHRoZW1lRGF0YS5tX3BhcnQsIHRoZW1lRGF0YS5tX3N0YXRlLCAm d2lkZ2V0UmVjdCwgTlVMTCk7CisgICAgZWxzZSB7CiAgICAgICAgIERyYXdFZGdlKGhkYywgJndp ZGdldFJlY3QsIEVER0VfU1VOS0VOLCBCRl9SRUNUIHwgQkZfQURKVVNUKTsKICAgICAgICAgRmls bFJlY3QoaGRjLCAmd2lkZ2V0UmVjdCwgcmVpbnRlcnByZXRfY2FzdDxIQlJVU0g+KCgodGhlbWVE YXRhLm1fY2xhc3NpY1N0YXRlICYgREZDU19JTkFDVElWRSkgPyBDT0xPUl9CVE5GQUNFIDogQ09M T1JfV0lORE9XKSArIDEpKTsKICAgICB9CkBAIC0zNDUsMTAgKzMxNSwxMCBAQCBib29sIFJlbmRl clRoZW1lV2luOjpwYWludE1lbnVMaXN0QnV0dG9uCiB7CiAgICAgSERDIGhkYyA9IHByZXBhcmVG b3JEcmF3aW5nKGkuY29udGV4dCwgcik7CiAgICAgUkVDVCB3aWRnZXRSZWN0ID0gcjsKLSAgICBp ZiAobV90aGVtZURMTCAmJiAhbV9tZW51TGlzdFRoZW1lKQotICAgICAgICBtX21lbnVMaXN0VGhl bWUgPSBvcGVuVGhlbWUoMCwgTCJDb21ib2JveCIpOwotICAgIGlmIChtX21lbnVMaXN0VGhlbWUg JiYgZHJhd1RoZW1lQkcpCi0gICAgICAgIGRyYXdUaGVtZUJHKG1fbWVudUxpc3RUaGVtZSwgaGRj LCBDUF9EUk9QRE9XTkJVVFRPTiwgZGV0ZXJtaW5lU3RhdGUobyksICZ3aWRnZXRSZWN0LCBOVUxM KTsKKyAgICBpZiAodXh0aGVtZUxpYnJhcnkoKSAmJiAhbV9tZW51TGlzdFRoZW1lKQorICAgICAg ICBtX21lbnVMaXN0VGhlbWUgPSBPcGVuVGhlbWVEYXRhKDAsIEwiQ29tYm9ib3giKTsKKyAgICBp ZiAobV9tZW51TGlzdFRoZW1lKQorICAgICAgICBEcmF3VGhlbWVCYWNrZ3JvdW5kKG1fbWVudUxp c3RUaGVtZSwgaGRjLCBDUF9EUk9QRE9XTkJVVFRPTiwgZGV0ZXJtaW5lU3RhdGUobyksICZ3aWRn ZXRSZWN0LCBOVUxMKTsKICAgICBlbHNlCiAgICAgICAgIERyYXdGcmFtZUNvbnRyb2woaGRjLCAm d2lkZ2V0UmVjdCwgREZDX1NDUk9MTCwgREZDU19TQ1JPTExDT01CT0JPWCB8IGRldGVybWluZUNs YXNzaWNTdGF0ZShvKSk7CiAgICAgZG9uZURyYXdpbmcoaS5jb250ZXh0LCBoZGMsIHIpOwpJbmRl eDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW4uaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5oCShyZXZpc2lvbiAzMDYyNSkKKysrIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNyArMSw3 IEBACiAvKgogICogVGhpcyBmaWxlIGlzIHBhcnQgb2YgdGhlIFdlYktpdCBwcm9qZWN0LgogICoK LSAqIENvcHlyaWdodCAoQykgMjAwNiBBcHBsZSBDb21wdXRlciwgSW5jLgorICogQ29weXJpZ2h0 IChDKSAyMDA2LCAyMDA4IEFwcGxlIENvbXB1dGVyLCBJbmMuCiAgKgogICogVGhpcyBsaWJyYXJ5 IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogbW9k aWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMK QEAgLTg4LDcgKzg4LDYgQEAgcHJpdmF0ZToKIAogICAgIFRoZW1lRGF0YSBnZXRUaGVtZURhdGEo UmVuZGVyT2JqZWN0Kik7CiAgICAgCi0gICAgSE1PRFVMRSBtX3RoZW1lRExMOwogICAgIG11dGFi bGUgSEFORExFIG1fYnV0dG9uVGhlbWU7CiAgICAgbXV0YWJsZSBIQU5ETEUgbV90ZXh0RmllbGRU aGVtZTsKICAgICBtdXRhYmxlIEhBTkRMRSBtX21lbnVMaXN0VGhlbWU7Cg==