44656 2010-08-25 18:08:50 -0700 wxWebView editing APIs update 2010-08-26 09:00:19 -0700 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 robin webkit-unassigned kevino oldest_to_newest 269649 0 robin 2010-08-25 18:08:50 -0700 A few tweaks to the wxWebView editing APIs after addition of DOM bindings. 269650 1 65509 robin 2010-08-25 18:09:40 -0700 Created attachment 65509 patch containing the tweaks 269917 2 kevino 2010-08-26 09:00:19 -0700 Landed in r66107, thanks! 65509 2010-08-25 18:09:40 -0700 2010-08-25 18:50:03 -0700 patch containing the tweaks editing_tweaks.patch text/plain 17622 robin SW5kZXg6IFdlYktpdC93eC9XZWJLaXRTdXBwb3J0L0VkaXRvckNsaWVudFd4LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJLaXQvd3gvV2ViS2l0U3VwcG9ydC9FZGl0b3JDbGllbnRXeC5jcHAJKHJldmlz aW9uIDY1NDQzKQorKysgV2ViS2l0L3d4L1dlYktpdFN1cHBvcnQvRWRpdG9yQ2xpZW50V3guY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNjIsNyArMjYyLDE1IEBACiAKIHZvaWQgRWRpdG9yQ2xpZW50 V3g6OnJlc3BvbmRUb0NoYW5nZWRDb250ZW50cygpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsK KyAgICBGcmFtZSogZnJhbWUgPSBtX3BhZ2UtPmZvY3VzQ29udHJvbGxlcigpLT5mb2N1c2VkT3JN YWluRnJhbWUoKTsKKyAgICAKKyAgICBpZiAoZnJhbWUpIHsKKyAgICAgICAgd3hXZWJWaWV3KiB3 ZWJLaXRXaW4gPSBkeW5hbWljX2Nhc3Q8d3hXZWJWaWV3Kj4oZnJhbWUtPnZpZXcoKS0+aG9zdFdp bmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSk7CisgICAgICAgIGlmICh3ZWJLaXRXaW4pIHsK KyAgICAgICAgICAgIHd4V2ViVmlld0NvbnRlbnRzQ2hhbmdlZEV2ZW50IHdrRXZlbnQod2ViS2l0 V2luKTsKKyAgICAgICAgICAgIHdlYktpdFdpbi0+R2V0RXZlbnRIYW5kbGVyKCktPlByb2Nlc3NF dmVudCh3a0V2ZW50KTsKKyAgICAgICAgfQorICAgIH0KIH0KIAogdm9pZCBFZGl0b3JDbGllbnRX eDo6ZGlkRW5kRWRpdGluZygpCkBAIC00ODMsNyArNDkxLDE0IEBACiAKIHZvaWQgRWRpdG9yQ2xp ZW50V3g6OnJlc3BvbmRUb0NoYW5nZWRTZWxlY3Rpb24oKQogewotICAgIG5vdEltcGxlbWVudGVk KCk7CisgICAgRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+Zm9jdXNl ZE9yTWFpbkZyYW1lKCk7CisgICAgaWYgKGZyYW1lKSB7CisgICAgICAgIHd4V2ViVmlldyogd2Vi S2l0V2luID0gZHluYW1pY19jYXN0PHd4V2ViVmlldyo+KGZyYW1lLT52aWV3KCktPmhvc3RXaW5k b3coKS0+cGxhdGZvcm1QYWdlQ2xpZW50KCkpOworICAgICAgICBpZiAod2ViS2l0V2luKSB7Cisg ICAgICAgICAgICB3eFdlYlZpZXdTZWxlY3Rpb25DaGFuZ2VkRXZlbnQgd2tFdmVudCh3ZWJLaXRX aW4pOworICAgICAgICAgICAgd2ViS2l0V2luLT5HZXRFdmVudEhhbmRsZXIoKS0+UHJvY2Vzc0V2 ZW50KHdrRXZlbnQpOworICAgICAgICB9CisgICAgfQogfQogCiB2b2lkIEVkaXRvckNsaWVudFd4 OjppZ25vcmVXb3JkSW5TcGVsbERvY3VtZW50KGNvbnN0IFN0cmluZyYpIApJbmRleDogV2ViS2l0 L3d4L1dlYlNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3d4L1dlYlNldHRpbmdzLmgJ KHJldmlzaW9uIDY1NDQzKQorKysgV2ViS2l0L3d4L1dlYlNldHRpbmdzLmgJKHdvcmtpbmcgY29w eSkKQEAgLTY2LDYgKzY2LDggQEAKICAgICB7fQogICAgIAogICAgIHd4V2ViU2V0dGluZ3MoKSA6 IHd4T2JqZWN0KCkge30KKyAgICAKKyAgICB2aXJ0dWFsIH53eFdlYlNldHRpbmdzKCkgeyB9CiAK ICAgICAvKioKICAgICAgICAgU2V0cyB0aGUgZGVmYXVsdCBmb250IHNpemUgZm9yIGZpeGVkIGZv bnRzLgpJbmRleDogV2ViS2l0L3d4L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd3gv Q2hhbmdlTG9nCShyZXZpc2lvbiA2NjA1OSkKKysrIFdlYktpdC93eC9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwzNyBAQAorMjAxMC0wOC0yNSAgUm9iaW4gRHVubiAgPHJvYmlu QGFsbGR1bm4uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEEgZmV3IHR3ZWFrcyB0byB0aGUgd3hXZWJWaWV3IGVkaXRpbmcgQVBJcyBhZnRlciBh ZGRpdGlvbiBvZiBET00gYmluZGluZ3MuCisgICAgICAgIAorICAgICAgICAxLiBhZG9wdFJlZiBm aXggZm9yIFdlYkNvcmU6OkVkaXRDb21tYW5kIHdyYXBwZXIgQVBJLgorICAgICAgICAyLiBBZGQg dGhlIG1pbWV0eXBlIGFzIGFuIGFyZ3VtZW50IHRvIFNldFBhZ2VTb3VyY2UgdG8gYWxsb3cgWEhU TUwgZG9jdW1lbnRzIHRvIGJlIGxvYWRlZC4KKyAgICAgICAgMy4gQWRkIG5vdGlmaWNhdGlvbiBl dmVudHMgZm9yIGNvbnRlbnRzIC8gc2VsZWN0aW9uIGNoYW5nZWQgZWRpdGluZyBldmVudHMuCisg ICAgICAgIDQuIEltcHJvdmVkIHd4UHl0aG9uIGJpbmRpbmcgdHlwZW1hcHMgc3VwcG9ydCBmb3Ig RE9NIEFQSXMuCisgICAgICAgIAorICAgICAgICAqIFdlYkVkaXQuY3BwOgorICAgICAgICAoV2Vi Q29yZUVkaXRDb21tYW5kUHJpdmF0ZTo6V2ViQ29yZUVkaXRDb21tYW5kUHJpdmF0ZSk6CisgICAg ICAgIChXZWJDb3JlRWRpdENvbW1hbmRQcml2YXRlOjp+V2ViQ29yZUVkaXRDb21tYW5kUHJpdmF0 ZSk6CisgICAgICAgIChXZWJDb3JlRWRpdENvbW1hbmRQcml2YXRlOjpjb21tYW5kKToKKyAgICAg ICAgKHd4V2ViRWRpdENvbW1hbmQ6Ond4V2ViRWRpdENvbW1hbmQpOgorICAgICAgICAod3hXZWJF ZGl0Q29tbWFuZDo6fnd4V2ViRWRpdENvbW1hbmQpOgorICAgICAgICAod3hXZWJFZGl0Q29tbWFu ZDo6U2V0Tm9kZUF0dHJpYnV0ZSk6CisgICAgICAgICh3eFdlYkVkaXRDb21tYW5kOjpBcHBseSk6 CisgICAgICAgICogV2ViRWRpdC5oOgorICAgICAgICAqIFdlYkZyYW1lLmNwcDoKKyAgICAgICAg KHd4V2ViRnJhbWU6OlNldFBhZ2VTb3VyY2UpOgorICAgICAgICAqIFdlYkZyYW1lLmg6CisgICAg ICAgICogV2ViS2l0U3VwcG9ydC9FZGl0b3JDbGllbnRXeC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpFZGl0b3JDbGllbnRXeDo6cmVzcG9uZFRvQ2hhbmdlZENvbnRlbnRzKToKKyAgICAgICAgKFdl YkNvcmU6OkVkaXRvckNsaWVudFd4OjpyZXNwb25kVG9DaGFuZ2VkU2VsZWN0aW9uKToKKyAgICAg ICAgKiBXZWJTZXR0aW5ncy5oOgorICAgICAgICAqIFdlYlZpZXcuY3BwOgorICAgICAgICAod3hX ZWJWaWV3Q29udGVudHNDaGFuZ2VkRXZlbnQ6Ond4V2ViVmlld0NvbnRlbnRzQ2hhbmdlZEV2ZW50 KToKKyAgICAgICAgKHd4V2ViVmlld1NlbGVjdGlvbkNoYW5nZWRFdmVudDo6d3hXZWJWaWV3U2Vs ZWN0aW9uQ2hhbmdlZEV2ZW50KToKKyAgICAgICAgKHd4V2ViVmlldzo6U2V0UGFnZVNvdXJjZSk6 CisgICAgICAgICogV2ViVmlldy5oOgorICAgICAgICAqIGJpbmRpbmdzL3B5dGhvbi93ZWJ2aWV3 Lmk6CisKIDIwMTAtMDgtMTYgIEtldmluIE9sbGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5j b20+CiAKICAgICAgICAgW3d4XSBCdWlsZCBmaXgsIGRvIG5vdCBidWlsZCBXZWJDb3JlIGFzIGEg Y29udmVuaWVuY2UgbGlicmFyeSBhcyB0aGlzIGxlYWRzIHRvCkluZGV4OiBXZWJLaXQvd3gvV2Vi Vmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3d4L1dlYlZpZXcuY3BwCShyZXZpc2lvbiA2 NTQ0MykKKysrIFdlYktpdC93eC9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI2LDcg KzIyNiwzMCBAQAogICAgICAgICBTZXRJZCh3aW4tPkdldElkKCkpOwogfQogCitJTVBMRU1FTlRf RFlOQU1JQ19DTEFTUyh3eFdlYlZpZXdDb250ZW50c0NoYW5nZWRFdmVudCwgd3hDb21tYW5kRXZl bnQpCiAKK0RFRklORV9FVkVOVF9UWVBFKHd4RVZUX1dFQlZJRVdfQ09OVEVOVFNfQ0hBTkdFRCkK Kword3hXZWJWaWV3Q29udGVudHNDaGFuZ2VkRXZlbnQ6Ond4V2ViVmlld0NvbnRlbnRzQ2hhbmdl ZEV2ZW50KHd4V2luZG93KiB3aW4pCit7CisgICAgU2V0RXZlbnRUeXBlKHd4RVZUX1dFQlZJRVdf Q09OVEVOVFNfQ0hBTkdFRCk7CisgICAgU2V0RXZlbnRPYmplY3Qod2luKTsKKyAgICBpZiAod2lu KQorICAgICAgICBTZXRJZCh3aW4tPkdldElkKCkpOworfQorCitJTVBMRU1FTlRfRFlOQU1JQ19D TEFTUyh3eFdlYlZpZXdTZWxlY3Rpb25DaGFuZ2VkRXZlbnQsIHd4Q29tbWFuZEV2ZW50KQorCitE RUZJTkVfRVZFTlRfVFlQRSh3eEVWVF9XRUJWSUVXX1NFTEVDVElPTl9DSEFOR0VEKQorCit3eFdl YlZpZXdTZWxlY3Rpb25DaGFuZ2VkRXZlbnQ6Ond4V2ViVmlld1NlbGVjdGlvbkNoYW5nZWRFdmVu dCh3eFdpbmRvdyogd2luKQoreworICAgIFNldEV2ZW50VHlwZSh3eEVWVF9XRUJWSUVXX1NFTEVD VElPTl9DSEFOR0VEKTsKKyAgICBTZXRFdmVudE9iamVjdCh3aW4pOworICAgIGlmICh3aW4pCisg ICAgICAgIFNldElkKHdpbi0+R2V0SWQoKSk7Cit9CisKIC8vLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAvLyBET00gRWxlbWVudCBpbmZv IGRhdGEgdHlwZQogLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0KQEAgLTQzOCwxMCArNDYxLDEwIEBACiAgICAgcmV0dXJuIHd4RW1wdHlT dHJpbmc7CiB9CiAKLXZvaWQgd3hXZWJWaWV3OjpTZXRQYWdlU291cmNlKGNvbnN0IHd4U3RyaW5n JiBzb3VyY2UsIGNvbnN0IHd4U3RyaW5nJiBiYXNlVXJsKQordm9pZCB3eFdlYlZpZXc6OlNldFBh Z2VTb3VyY2UoY29uc3Qgd3hTdHJpbmcmIHNvdXJjZSwgY29uc3Qgd3hTdHJpbmcmIGJhc2VVcmws IGNvbnN0IHd4U3RyaW5nJiBtaW1ldHlwZSkKIHsKICAgICBpZiAobV9tYWluRnJhbWUpCi0gICAg ICAgIG1fbWFpbkZyYW1lLT5TZXRQYWdlU291cmNlKHNvdXJjZSwgYmFzZVVybCk7CisgICAgICAg IG1fbWFpbkZyYW1lLT5TZXRQYWdlU291cmNlKHNvdXJjZSwgYmFzZVVybCwgbWltZXR5cGUpOwog fQogCiB3eFN0cmluZyB3eFdlYlZpZXc6OkdldElubmVyVGV4dCgpCkluZGV4OiBXZWJLaXQvd3gv YmluZGluZ3MvcHl0aG9uL3dlYnZpZXcuaQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd3gvYmluZGlu Z3MvcHl0aG9uL3dlYnZpZXcuaQkocmV2aXNpb24gNjU0NDMpCisrKyBXZWJLaXQvd3gvYmluZGlu Z3MvcHl0aG9uL3dlYnZpZXcuaQkod29ya2luZyBjb3B5KQpAQCAtNTEsNyArNTEsNyBAQAogI2lu Y2x1ZGUgIldlYkRPTVJhbmdlLmgiCiAKICNpZm5kZWYgX19XWE1TV19fCi1QeU9iamVjdCogY3Jl YXRlRE9NTm9kZVN1YnR5cGUoV2ViRE9NTm9kZSogcHRyLCBib29sIHNldFRoaXNPd24pCitQeU9i amVjdCogY3JlYXRlRE9NTm9kZVN1YnR5cGUoV2ViRE9NTm9kZSogcHRyLCBib29sIHNldFRoaXNP d24sIGJvb2wgaXNWYWx1ZU9iamVjdCkKIHsKICAgICAvL3N0YXRpYyB3eFB5VHlwZUluZm9IYXNo TWFwKiB0eXBlSW5mb0NhY2hlID0gTlVMTDsKIApAQCAtNzMsOSArNzMsMTMgQEAKICAgICAgICAg ICAgICAgICBuYW1lID0gIldlYkRPTU5vZGUqIjsKICAgICAgICAgfQogICAgICAgICBzd2lnVHlw ZSA9IFNXSUdfVHlwZVF1ZXJ5KG5hbWUpOwotICAgICAgICBpZiAoc3dpZ1R5cGUpCisgICAgICAg IGlmIChzd2lnVHlwZSkgeworICAgICAgICAgICAgaWYgKGlzVmFsdWVPYmplY3QpIHsKKyAgICAg ICAgICAgICAgICByZXR1cm4gU1dJR19QeXRob25fTmV3UG9pbnRlck9iaihuZXcgV2ViRE9NTm9k ZSgqcHRyKSwgc3dpZ1R5cGUsIHNldFRoaXNPd24pOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgCiAgICAgICAgICAgICByZXR1cm4gU1dJR19QeXRob25fTmV3UG9pbnRlck9iaihwdHIsIHN3 aWdUeXBlLCBzZXRUaGlzT3duKTsKLSAgICAgICAgCisgICAgICAgIH0KICAgICAgICAgLy8gaWYg aXQgc3RpbGwgd2Fzbid0IGZvdW5kLCB0cnkgbG9va2luZyBmb3IgYSBtYXBwZWQgbmFtZQogICAg ICAgICAvL2lmIChzd2lnVHlwZSkgewogICAgICAgICAgICAgLy8gYW5kIGFkZCBpdCB0byB0aGUg bWFwIGlmIGZvdW5kCkBAIC04Nyw4ICs5MSwzNCBAQAogICAgIAogICAgIHJldHVybiBQeV9Ob25l OwogfQorCitXZWJET01TdHJpbmcqIGNyZWF0ZVdlYkRPTVN0cmluZyhQeU9iamVjdCogc291cmNl KQoreworICAgIGlmICghUHlTdHJpbmdfQ2hlY2soc291cmNlKSAmJiAhUHlVbmljb2RlX0NoZWNr KHNvdXJjZSkpIHsKKyAgICAgICAgUHlFcnJfU2V0U3RyaW5nKFB5RXhjX1R5cGVFcnJvciwgIlN0 cmluZyBvciBVbmljb2RlIHR5cGUgcmVxdWlyZWQiKTsKKyAgICAgICAgcmV0dXJuIG5ldyBXZWJE T01TdHJpbmcoKTsKKyAgICB9CisgICAgCisgICAgY2hhciogdG1wUHRyOworICAgIFB5X3NzaXpl X3QgdG1wU2l6ZTsKKyAgICAKKyAgICBpZiAoUHlTdHJpbmdfQ2hlY2soc291cmNlKSkKKyAgICAg ICAgUHlTdHJpbmdfQXNTdHJpbmdBbmRTaXplKHNvdXJjZSwgJnRtcFB0ciwgJnRtcFNpemUpOwor ICAgIGVsc2UgeworICAgICAgICBQeU9iamVjdCogc3RyID0gUHlVbmljb2RlX0FzVVRGOFN0cmlu Zyhzb3VyY2UpOworICAgICAgICBQeVN0cmluZ19Bc1N0cmluZ0FuZFNpemUoc3RyLCAmdG1wUHRy LCAmdG1wU2l6ZSk7CisgICAgICAgIFB5X0RFQ1JFRihzdHIpOworICAgIH0KKyAgICAKKyAgICBX ZWJET01TdHJpbmcgdGVtcCA9IFdlYkRPTVN0cmluZzo6ZnJvbVVURjgodG1wUHRyKTsKKyAgICAK KyAgICByZXR1cm4gbmV3IFdlYkRPTVN0cmluZyh0ZW1wKTsKK30KKwogI2VuZGlmCiAKKworCiAl fQogLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIApAQCAtOTYsMTAgKzEyNiwxMyBAQAogJWltcG9ydCB3 aW5kb3dzLmkKIAogI2lmbmRlZiBfX1dYTVNXX18KLSV0eXBlbWFwKG91dCkgV2ViRE9NTm9kZSog ICAgICAgICAgICAgeyAkcmVzdWx0ID0gY3JlYXRlRE9NTm9kZVN1YnR5cGUoJDEsIChib29sKSRv d25lcik7IH0KLSV0eXBlbWFwKG91dCkgV2ViRE9NRWxlbWVudCogICAgICAgICAgICAgeyAkcmVz dWx0ID0gY3JlYXRlRE9NTm9kZVN1YnR5cGUoJDEsIChib29sKSRvd25lcik7IH0KLSV0eXBlbWFw KG91dCkgV2ViRE9NTm9kZSAgICAgICAgICAgICB7ICRyZXN1bHQgPSBjcmVhdGVET01Ob2RlU3Vi dHlwZSgmJDEsIChib29sKSRvd25lcik7IH0KLSV0eXBlbWFwKG91dCkgV2ViRE9NRWxlbWVudCAg ICAgICAgICAgICB7ICRyZXN1bHQgPSBjcmVhdGVET01Ob2RlU3VidHlwZSgmJDEsIChib29sKSRv d25lcik7IH0KKyV0eXBlbWFwKG91dCkgV2ViRE9NTm9kZSogICAgICAgICAgICAgeyAkcmVzdWx0 ID0gY3JlYXRlRE9NTm9kZVN1YnR5cGUoJDEsIChib29sKSRvd25lciwgMCk7IH0KKyV0eXBlbWFw KG91dCkgV2ViRE9NRWxlbWVudCogICAgICAgICAgICAgeyAkcmVzdWx0ID0gY3JlYXRlRE9NTm9k ZVN1YnR5cGUoJDEsIChib29sKSRvd25lciwgMCk7IH0KKyV0eXBlbWFwKG91dCkgV2ViRE9NTm9k ZSAgICAgICAgICAgICB7ICRyZXN1bHQgPSBjcmVhdGVET01Ob2RlU3VidHlwZSgmJDEsIChib29s KSRvd25lciwgMSk7IH0KKyV0eXBlbWFwKG91dCkgV2ViRE9NRWxlbWVudCAgICAgICAgICAgICB7 ICRyZXN1bHQgPSBjcmVhdGVET01Ob2RlU3VidHlwZSgmJDEsIChib29sKSRvd25lciwgMSk7IH0K KyV0eXBlbWFwKGluKSBXZWJET01TdHJpbmcmICAgICAgICAgICAgeyAkMSA9IGNyZWF0ZVdlYkRP TVN0cmluZygkaW5wdXQpOyB9CisldHlwZW1hcChvdXQpIFdlYkRPTVN0cmluZyAgICAgICAgICAg eyAkcmVzdWx0ID0gUHlVbmljb2RlX0RlY29kZVVURjgoJDEudXRmOCgpLmRhdGEoKSwgJDEudXRm OCgpLmxlbmd0aCgpLCBOVUxMKTsgfQorJXR5cGVtYXAob3V0KSBXZWJET01TdHJpbmcmICAgICAg ICAgICB7ICRyZXN1bHQgPSBQeVVuaWNvZGVfRGVjb2RlVVRGOCgkMS51dGY4KCkuZGF0YSgpLCAk MS51dGY4KCkubGVuZ3RoKCksIE5VTEwpOyB9CiAjZW5kaWYKIAogTUFLRV9DT05TVF9XWFNUUklO RyhXZWJWaWV3TmFtZVN0cik7CkBAIC0xMzQsNiArMTY3LDggQEAKICVjb25zdGFudCB3eEV2ZW50 VHlwZSB3eEVWVF9XRUJWSUVXX1JJR0hUX0NMSUNLOwogJWNvbnN0YW50IHd4RXZlbnRUeXBlIHd4 RVZUX1dFQlZJRVdfQ09OU09MRV9NRVNTQUdFOwogJWNvbnN0YW50IHd4RXZlbnRUeXBlIHd4RVZU X1dFQlZJRVdfUkVDRUlWRURfVElUTEU7CislY29uc3RhbnQgd3hFdmVudFR5cGUgd3hFVlRfV0VC VklFV19DT05URU5UU19DSEFOR0VEOworJWNvbnN0YW50IHd4RXZlbnRUeXBlIHd4RVZUX1dFQlZJ RVdfU0VMRUNUSU9OX0NIQU5HRUQ7CiAKICVweXRob25jb2RlIHsKIEVWVF9XRUJWSUVXX0JFRk9S RV9MT0FEID0gd3guUHlFdmVudEJpbmRlciggd3hFVlRfV0VCVklFV19CRUZPUkVfTE9BRCwgMSAp CkBAIC0xNDEsNSArMTc2LDcgQEAKIEVWVF9XRUJWSUVXX05FV19XSU5ET1cgPSB3eC5QeUV2ZW50 QmluZGVyKCB3eEVWVF9XRUJWSUVXX05FV19XSU5ET1csIDEgKQogRVZUX1dFQlZJRVdfUklHSFRf Q0xJQ0sgPSB3eC5QeUV2ZW50QmluZGVyKCB3eEVWVF9XRUJWSUVXX1JJR0hUX0NMSUNLLCAxICkK IEVWVF9XRUJWSUVXX0NPTlNPTEVfTUVTU0FHRSA9IHd4LlB5RXZlbnRCaW5kZXIoIHd4RVZUX1dF QlZJRVdfQ09OU09MRV9NRVNTQUdFLCAxICkKLUVWVF9XRUJWSUVXX1JFQ0VJVkVEX1RJVExFID0g d3guUHlFdmVudEJpbmRlciggd3hFVlRfV0VCVklFV19SRUNFSVZFRF9USVRMRSwgMSApICAgIAor RVZUX1dFQlZJRVdfUkVDRUlWRURfVElUTEUgPSB3eC5QeUV2ZW50QmluZGVyKCB3eEVWVF9XRUJW SUVXX1JFQ0VJVkVEX1RJVExFLCAxICkKK0VWVF9XRUJWSUVXX0NPTlRFTlRTX0NIQU5HRUQgPSB3 eC5QeUV2ZW50QmluZGVyKCB3eEVWVF9XRUJWSUVXX0NPTlRFTlRTX0NIQU5HRUQsIDEgKQorRVZU X1dFQlZJRVdfU0VMRUNUSU9OX0NIQU5HRUQgPSB3eC5QeUV2ZW50QmluZGVyKCB3eEVWVF9XRUJW SUVXX1NFTEVDVElPTl9DSEFOR0VELCAxICkKIH0KSW5kZXg6IFdlYktpdC93eC9XZWJWaWV3LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L3d4L1dlYlZpZXcuaAkocmV2aXNpb24gNjU0NDMpCisrKyBX ZWJLaXQvd3gvV2ViVmlldy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNTYsNyArMTU2LDcgQEAKICAg ICAKICAgICAvL2Jvb2wgQ2FuR2V0UGFnZVNvdXJjZSgpOwogICAgIHd4U3RyaW5nIEdldFBhZ2VT b3VyY2UoKTsKLSAgICB2b2lkIFNldFBhZ2VTb3VyY2UoY29uc3Qgd3hTdHJpbmcmIHNvdXJjZSwg Y29uc3Qgd3hTdHJpbmcmIGJhc2VVcmwgPSB3eEVtcHR5U3RyaW5nKTsKKyAgICB2b2lkIFNldFBh Z2VTb3VyY2UoY29uc3Qgd3hTdHJpbmcmIHNvdXJjZSwgY29uc3Qgd3hTdHJpbmcmIGJhc2VVcmwg PSB3eEVtcHR5U3RyaW5nLCBjb25zdCB3eFN0cmluZyYgbWltZXR5cGUgPSB3eFQoInRleHQvaHRt bCIpKTsKICAgICAKICAgICB3eFN0cmluZyBHZXRJbm5lclRleHQoKTsKICAgICB3eFN0cmluZyBH ZXRBc01hcmt1cCgpOwpAQCAtNTI1LDYgKzUyNSwyNiBAQAogICAgIEpTT2JqZWN0UmVmIG1fd2lu ZG93T2JqZWN0OwogfTsKIAorY2xhc3MgV1hETExJTVBFWFBfV0VCS0lUIHd4V2ViVmlld0NvbnRl bnRzQ2hhbmdlZEV2ZW50IDogcHVibGljIHd4Q29tbWFuZEV2ZW50IHsKKyNpZm5kZWYgU1dJRwor ICAgIERFQ0xBUkVfRFlOQU1JQ19DTEFTUyh3eFdlYlZpZXdDb250ZW50c0NoYW5nZWRFdmVudCkK KyNlbmRpZgorCitwdWJsaWM6CisgICAgd3hXZWJWaWV3Q29udGVudHNDaGFuZ2VkRXZlbnQod3hX aW5kb3cqIHdpbiA9IHN0YXRpY19jYXN0PHd4V2luZG93Kj4oMCkpOworICAgIHd4RXZlbnQgKkNs b25lKHZvaWQpIGNvbnN0IHsgcmV0dXJuIG5ldyB3eFdlYlZpZXdDb250ZW50c0NoYW5nZWRFdmVu dCgqdGhpcyk7IH0KK307CisKK2NsYXNzIFdYRExMSU1QRVhQX1dFQktJVCB3eFdlYlZpZXdTZWxl Y3Rpb25DaGFuZ2VkRXZlbnQgOiBwdWJsaWMgd3hDb21tYW5kRXZlbnQgeworI2lmbmRlZiBTV0lH CisgICAgREVDTEFSRV9EWU5BTUlDX0NMQVNTKHd4V2ViVmlld1NlbGVjdGlvbkNoYW5nZWRFdmVu dCkKKyNlbmRpZgorCitwdWJsaWM6CisgICAgd3hXZWJWaWV3U2VsZWN0aW9uQ2hhbmdlZEV2ZW50 KHd4V2luZG93KiB3aW4gPSBzdGF0aWNfY2FzdDx3eFdpbmRvdyo+KDApKTsKKyAgICB3eEV2ZW50 ICpDbG9uZSh2b2lkKSBjb25zdCB7IHJldHVybiBuZXcgd3hXZWJWaWV3U2VsZWN0aW9uQ2hhbmdl ZEV2ZW50KCp0aGlzKTsgfQorfTsKKwogdHlwZWRlZiB2b2lkICh3eEV2dEhhbmRsZXI6Oip3eFdl YlZpZXdMb2FkRXZlbnRGdW5jdGlvbikod3hXZWJWaWV3TG9hZEV2ZW50Jik7CiB0eXBlZGVmIHZv aWQgKHd4RXZ0SGFuZGxlcjo6Knd4V2ViVmlld0JlZm9yZUxvYWRFdmVudEZ1bmN0aW9uKSh3eFdl YlZpZXdCZWZvcmVMb2FkRXZlbnQmKTsKIHR5cGVkZWYgdm9pZCAod3hFdnRIYW5kbGVyOjoqd3hX ZWJWaWV3TmV3V2luZG93RXZlbnRGdW5jdGlvbikod3hXZWJWaWV3TmV3V2luZG93RXZlbnQmKTsK QEAgLTUzNSw2ICs1NTUsOCBAQAogdHlwZWRlZiB2b2lkICh3eEV2dEhhbmRsZXI6Oip3eFdlYlZp ZXdQcm9tcHRFdmVudEZ1bmN0aW9uKSh3eFdlYlZpZXdQcm9tcHRFdmVudCYpOwogdHlwZWRlZiB2 b2lkICh3eEV2dEhhbmRsZXI6Oip3eFdlYlZpZXdSZWNlaXZlZFRpdGxlRXZlbnRGdW5jdGlvbiko d3hXZWJWaWV3UmVjZWl2ZWRUaXRsZUV2ZW50Jik7CiB0eXBlZGVmIHZvaWQgKHd4RXZ0SGFuZGxl cjo6Knd4V2ViVmlld1dpbmRvd09iamVjdENsZWFyZWRGdW5jdGlvbikod3hXZWJWaWV3V2luZG93 T2JqZWN0Q2xlYXJlZEV2ZW50Jik7Cit0eXBlZGVmIHZvaWQgKHd4RXZ0SGFuZGxlcjo6Knd4V2Vi Vmlld0NvbnRlbnRzQ2hhbmdlZEZ1bmN0aW9uKSh3eFdlYlZpZXdDb250ZW50c0NoYW5nZWRFdmVu dCYpOwordHlwZWRlZiB2b2lkICh3eEV2dEhhbmRsZXI6Oip3eFdlYlZpZXdTZWxlY3Rpb25DaGFu Z2VkRnVuY3Rpb24pKHd4V2ViVmlld1NlbGVjdGlvbkNoYW5nZWRFdmVudCYpOwogCiAjZGVmaW5l IHd4V2ViVmlld0xvYWRFdmVudEhhbmRsZXIoZnVuYykgXAogICAgICh3eE9iamVjdEV2ZW50RnVu Y3Rpb24pKHd4RXZlbnRGdW5jdGlvbil3eFN0YXRpY0Nhc3RFdmVudCh3eFdlYlZpZXdMb2FkRXZl bnRGdW5jdGlvbiwgJmZ1bmMpCkBAIC01NTYsNyArNTc4LDExIEBACiAgICAgKHd4T2JqZWN0RXZl bnRGdW5jdGlvbikod3hFdmVudEZ1bmN0aW9uKXd4U3RhdGljQ2FzdEV2ZW50KHd4V2ViVmlld1Jl Y2VpdmVkVGl0bGVFdmVudEZ1bmN0aW9uLCAmZnVuYykKICNkZWZpbmUgd3hXZWJWaWV3V2luZG93 T2JqZWN0Q2xlYXJlZEV2ZW50SGFuZGxlcihmdW5jKSBcCiAgICAgKHd4T2JqZWN0RXZlbnRGdW5j dGlvbikod3hFdmVudEZ1bmN0aW9uKXd4U3RhdGljQ2FzdEV2ZW50KHd4V2ViVmlld1dpbmRvd09i amVjdENsZWFyZWRGdW5jdGlvbiwgJmZ1bmMpCi0KKyNkZWZpbmUgd3hXZWJWaWV3Q29udGVudHND aGFuZ2VkRXZlbnRIYW5kbGVyKGZ1bmMpIFwKKyAgICAod3hPYmplY3RFdmVudEZ1bmN0aW9uKSh3 eEV2ZW50RnVuY3Rpb24pd3hTdGF0aWNDYXN0RXZlbnQod3hXZWJWaWV3Q29udGVudHNDaGFuZ2Vk RXZlbnRGdW5jdGlvbiwgJmZ1bmMpCisjZGVmaW5lIHd4V2ViVmlld1NlbGVjdGlvbkNoYW5nZWRF dmVudEhhbmRsZXIoZnVuYykgXAorICAgICh3eE9iamVjdEV2ZW50RnVuY3Rpb24pKHd4RXZlbnRG dW5jdGlvbil3eFN0YXRpY0Nhc3RFdmVudCh3eFdlYlZpZXdTZWxlY3Rpb25DaGFuZ2VkRXZlbnRG dW5jdGlvbiwgJmZ1bmMpCisgICAgCiAjaWZuZGVmIFNXSUcKIEJFR0lOX0RFQ0xBUkVfRVZFTlRf VFlQRVMoKQogICAgIERFQ0xBUkVfRVhQT1JURURfRVZFTlRfVFlQRShXWERMTElNUEVYUF9XRUJL SVQsIHd4RVZUX1dFQlZJRVdfQkVGT1JFX0xPQUQsIHd4SURfQU5ZKQpAQCAtNTY5LDYgKzU5NSw4 IEBACiAgICAgREVDTEFSRV9FWFBPUlRFRF9FVkVOVF9UWVBFKFdYRExMSU1QRVhQX1dFQktJVCwg d3hFVlRfV0VCVklFV19KU19QUk9NUFQsIHd4SURfQU5ZKQogICAgIERFQ0xBUkVfRVhQT1JURURf RVZFTlRfVFlQRShXWERMTElNUEVYUF9XRUJLSVQsIHd4RVZUX1dFQlZJRVdfUkVDRUlWRURfVElU TEUsIHd4SURfQU5ZKQogICAgIERFQ0xBUkVfRVhQT1JURURfRVZFTlRfVFlQRShXWERMTElNUEVY UF9XRUJLSVQsIHd4RVZUX1dFQlZJRVdfV0lORE9XX09CSkVDVF9DTEVBUkVELCB3eElEX0FOWSkK KyAgICBERUNMQVJFX0VYUE9SVEVEX0VWRU5UX1RZUEUoV1hETExJTVBFWFBfV0VCS0lULCB3eEVW VF9XRUJWSUVXX0NPTlRFTlRTX0NIQU5HRUQsIHd4SURfQU5ZKQorICAgIERFQ0xBUkVfRVhQT1JU RURfRVZFTlRfVFlQRShXWERMTElNUEVYUF9XRUJLSVQsIHd4RVZUX1dFQlZJRVdfU0VMRUNUSU9O X0NIQU5HRUQsIHd4SURfQU5ZKQogRU5EX0RFQ0xBUkVfRVZFTlRfVFlQRVMoKQogI2VuZGlmCiAK QEAgLTY1Miw0ICs2ODAsMjEgQEAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAod3hXZWJW aWV3V2luZG93T2JqZWN0Q2xlYXJlZEZ1bmN0aW9uKSAmIGZ1bmMsIFwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzdGF0aWNfY2FzdDx3eE9iamVjdCo+KE5VTEwpKSwKIAorI2RlZmluZSBF VlRfV0VCVklFV19DT05URU5UU19DSEFOR0VEKHdpbmlkLCBmdW5jKSAgICAgICAgICAgICAgICAg ICAgICAgXAorICAgICAgICAgICAgREVDTEFSRV9FVkVOVF9UQUJMRV9FTlRSWSh3eEVWVF9XRUJW SUVXX0NPTlRFTlRTX0NIQU5HRUQsIFwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB3aW5p ZCwgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHd4SURfQU5ZLCBcCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHd4T2JqZWN0RXZlbnRGdW5jdGlvbikgICBcCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgKHd4V2ViVmlld0NvbnRlbnRzQ2hhbmdlZEV2ZW50RnVuY3Rpb24p ICYgZnVuYywgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PHd4T2Jq ZWN0Kj4oMCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIAorI2RlZmluZSBFVlRfV0VC VklFV19TRUxFQ1RJT05fQ0hBTkdFRCh3aW5pZCwgZnVuYykgICAgICAgICAgICAgICAgICAgICAg IFwKKyAgICAgICAgICAgIERFQ0xBUkVfRVZFTlRfVEFCTEVfRU5UUlkod3hFVlRfV0VCVklFV19T RUxFQ1RJT05fQ0hBTkdFRCwgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpbmlkLCBc CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgd3hJRF9BTlksIFwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAod3hPYmplY3RFdmVudEZ1bmN0aW9uKSAgIFwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAod3hXZWJWaWV3U2VsZWN0aW9uQ2hhbmdlZEV2ZW50RnVuY3Rpb24pICYg ZnVuYywgXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXRpY19jYXN0PHd4T2JqZWN0 Kj4oMCkpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIAogI2VuZGlmIC8vIGlmbmRlZiBXWFdFQlZJRVdfSApJbmRleDogV2ViS2l0L3d4 L1dlYkVkaXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJFZGl0LmNwcAkocmV2aXNp b24gNjU0NDMpCisrKyBXZWJLaXQvd3gvV2ViRWRpdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0 LDMyICszNCw0NyBAQAogCiB9CiAKK2NsYXNzIFdlYkNvcmVFZGl0Q29tbWFuZFByaXZhdGUgewor cHVibGljOgorICAgIFdlYkNvcmVFZGl0Q29tbWFuZFByaXZhdGUoKQorICAgICAgICA6IG1fcHRy KDApCisgICAgeyB9CisgICAgCisgICAgV2ViQ29yZUVkaXRDb21tYW5kUHJpdmF0ZShXZWJDb3Jl OjpXZWJDb3JlRWRpdENvbW1hbmQqIHB0cikKKyAgICAgICAgOiBtX3B0cihhZG9wdFJlZihwdHIp KQorICAgIHsgfQorICAgIAorICAgIH5XZWJDb3JlRWRpdENvbW1hbmRQcml2YXRlKCkgeyB9Cisg ICAgCisgICAgV2ViQ29yZTo6V2ViQ29yZUVkaXRDb21tYW5kKiBjb21tYW5kKCkgeyByZXR1cm4g bV9wdHIuZ2V0KCk7IH0KKyAgICAgICAgCisgICAgUmVmUHRyPFdlYkNvcmU6OldlYkNvcmVFZGl0 Q29tbWFuZD4gbV9wdHI7Cit9OworCiB3eFdlYkVkaXRDb21tYW5kOjp3eFdlYkVkaXRDb21tYW5k KHd4V2ViRnJhbWUqIHdlYmZyYW1lKQogewogICAgIGlmICh3ZWJmcmFtZSkgewogICAgICAgICBX ZWJDb3JlOjpGcmFtZSogZnJhbWUgPSB3ZWJmcmFtZS0+R2V0RnJhbWUoKTsKICAgICAgICAgaWYg KGZyYW1lICYmIGZyYW1lLT5kb2N1bWVudCgpKQotICAgICAgICAgICAgbV9pbXBsID0gbmV3IFdl YkNvcmU6OldlYkNvcmVFZGl0Q29tbWFuZChmcmFtZS0+ZG9jdW1lbnQoKSk7Ci0gICAgICAgICAg ICBtX2ltcGwtPnJlZigpOworICAgICAgICAgICAgbV9pbXBsID0gbmV3IFdlYkNvcmVFZGl0Q29t bWFuZFByaXZhdGUobmV3IFdlYkNvcmU6OldlYkNvcmVFZGl0Q29tbWFuZChmcmFtZS0+ZG9jdW1l bnQoKSkpOwogICAgIH0KIH0KIAogd3hXZWJFZGl0Q29tbWFuZDo6fnd4V2ViRWRpdENvbW1hbmQo KQogewogICAgIC8vIHRoZSBpbXBsLiBpcyByZWYtY291bnRlZCwgc28gZG9uJ3QgZGVsZXRlIGl0 IGFzIGl0IG1heSBiZSBpbiBhbiB1bmRvL3JlZG8gc3RhY2sKLSAgICBpZiAobV9pbXBsKQotICAg ICAgICBtX2ltcGwtPmRlcmVmKCk7CisgICAgZGVsZXRlIG1faW1wbDsKICAgICBtX2ltcGwgPSAw OwogfQogCiB2b2lkIHd4V2ViRWRpdENvbW1hbmQ6OlNldE5vZGVBdHRyaWJ1dGUoV2ViRE9NRWxl bWVudCogZWxlbWVudCwgY29uc3Qgd3hTdHJpbmcmIG5hbWUsIGNvbnN0IHd4U3RyaW5nJiB2YWx1 ZSkKIHsKLSAgICBpZiAobV9pbXBsKQotICAgICAgICBtX2ltcGwtPnNldEVsZW1lbnRBdHRyaWJ1 dGUoZWxlbWVudC0+aW1wbCgpLCBXZWJDb3JlOjpRdWFsaWZpZWROYW1lKFdURjo6bnVsbEF0b20s IFdURjo6U3RyaW5nKG5hbWUpLCBXVEY6Om51bGxBdG9tKSwgV1RGOjpTdHJpbmcodmFsdWUpKTsK KyAgICBpZiAobV9pbXBsICYmIG1faW1wbC0+Y29tbWFuZCgpKQorICAgICAgICBtX2ltcGwtPmNv bW1hbmQoKS0+c2V0RWxlbWVudEF0dHJpYnV0ZShlbGVtZW50LT5pbXBsKCksIFdlYkNvcmU6OlF1 YWxpZmllZE5hbWUoV1RGOjpudWxsQXRvbSwgV1RGOjpTdHJpbmcobmFtZSksIFdURjo6bnVsbEF0 b20pLCBXVEY6OlN0cmluZyh2YWx1ZSkpOwogfQogCiB2b2lkIHd4V2ViRWRpdENvbW1hbmQ6OkFw cGx5KCkKIHsKLSAgICBpZiAobV9pbXBsKQotICAgICAgICBtX2ltcGwtPmFwcGx5KCk7Ci19Clwg Tm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorICAgIGlmIChtX2ltcGwgJiYgbV9pbXBsLT5jb21t YW5kKCkpCisgICAgICAgIG1faW1wbC0+Y29tbWFuZCgpLT5hcHBseSgpOworfQpJbmRleDogV2Vi S2l0L3d4L1dlYkZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd3gvV2ViRnJhbWUuY3Bw CShyZXZpc2lvbiA2NTQ0MykKKysrIFdlYktpdC93eC9XZWJGcmFtZS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE1NSw3ICsxNTUsNyBAQAogICAgIHJldHVybiB3eEVtcHR5U3RyaW5nOwogfQogCi12 b2lkIHd4V2ViRnJhbWU6OlNldFBhZ2VTb3VyY2UoY29uc3Qgd3hTdHJpbmcmIHNvdXJjZSwgY29u c3Qgd3hTdHJpbmcmIGJhc2VVcmwpCit2b2lkIHd4V2ViRnJhbWU6OlNldFBhZ2VTb3VyY2UoY29u c3Qgd3hTdHJpbmcmIHNvdXJjZSwgY29uc3Qgd3hTdHJpbmcmIGJhc2VVcmwsIGNvbnN0IHd4U3Ry aW5nJiBtaW1ldHlwZSkKIHsKICAgICBpZiAobV9pbXBsLT5mcmFtZSAmJiBtX2ltcGwtPmZyYW1l LT5sb2FkZXIoKSkgewogICAgICAgICBXZWJDb3JlOjpLVVJMIHVybChXZWJDb3JlOjpLVVJMKCks IGJhc2VVcmwpOwpAQCAtMTY0LDcgKzE2NCw3IEBACiAgICAgICAgIGNvbnN0IGNoYXIqIGNvbnRl bnRzID0gY2hhckJ1ZmZlcjsKIAogICAgICAgICBXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6U2hh cmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIgPSBXZWJDb3JlOjpTaGFyZWRCdWZmZXI6OmNyZWF0ZShj b250ZW50cywgc3RybGVuKGNvbnRlbnRzKSk7Ci0gICAgICAgIFdlYkNvcmU6OlN1YnN0aXR1dGVE YXRhIHN1YnN0aXR1dGVEYXRhKHNoYXJlZEJ1ZmZlciwgV1RGOjpTdHJpbmcoInRleHQvaHRtbCIp LCBXVEY6OlN0cmluZygiVVRGLTgiKSwgV2ViQ29yZTo6YmxhbmtVUkwoKSwgdXJsKTsKKyAgICAg ICAgV2ViQ29yZTo6U3Vic3RpdHV0ZURhdGEgc3Vic3RpdHV0ZURhdGEoc2hhcmVkQnVmZmVyLCBt aW1ldHlwZSwgV1RGOjpTdHJpbmcoIlVURi04IiksIFdlYkNvcmU6OmJsYW5rVVJMKCksIHVybCk7 CiAKICAgICAgICAgbV9pbXBsLT5mcmFtZS0+bG9hZGVyKCktPnN0b3AoKTsKICAgICAgICAgbV9p bXBsLT5mcmFtZS0+bG9hZGVyKCktPmxvYWQoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0KHVybCks IHN1YnN0aXR1dGVEYXRhLCBmYWxzZSk7CkluZGV4OiBXZWJLaXQvd3gvV2ViRWRpdC5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC93eC9XZWJFZGl0LmgJKHJldmlzaW9uIDY1NDQzKQorKysgV2ViS2l0 L3d4L1dlYkVkaXQuaAkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEsNyBAQAogfQogCiBjbGFz cyBXZWJET01FbGVtZW50OworY2xhc3MgV2ViQ29yZUVkaXRDb21tYW5kUHJpdmF0ZTsKIGNsYXNz IHd4V2ViRnJhbWU7CiAKIGNsYXNzIFdYRExMSU1QRVhQX1dFQktJVCB3eFdlYkVkaXRDb21tYW5k CkBAIC01Niw3ICs1Nyw3IEBACiAgICAgdm9pZCBBcHBseSgpOwogICAgIAogcHJpdmF0ZToKLSAg ICBXZWJDb3JlOjpXZWJDb3JlRWRpdENvbW1hbmQqIG1faW1wbDsKKyAgICBXZWJDb3JlRWRpdENv bW1hbmRQcml2YXRlKiBtX2ltcGw7CiB9OwogCiAjZW5kaWYKSW5kZXg6IFdlYktpdC93eC9XZWJG cmFtZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93eC9XZWJGcmFtZS5oCShyZXZpc2lvbiA2NTQ0 MykKKysrIFdlYktpdC93eC9XZWJGcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzQsNyArMTM0 LDcgQEAKICAgICB2b2lkIFJlZG8oKTsKICAgICAKICAgICB3eFN0cmluZyBHZXRQYWdlU291cmNl KCk7Ci0gICAgdm9pZCBTZXRQYWdlU291cmNlKGNvbnN0IHd4U3RyaW5nJiBzb3VyY2UsIGNvbnN0 IHd4U3RyaW5nJiBiYXNlVXJsID0gd3hFbXB0eVN0cmluZyk7CisgICAgdm9pZCBTZXRQYWdlU291 cmNlKGNvbnN0IHd4U3RyaW5nJiBzb3VyY2UsIGNvbnN0IHd4U3RyaW5nJiBiYXNlVXJsID0gd3hF bXB0eVN0cmluZywgY29uc3Qgd3hTdHJpbmcmIG1pbWV0eXBlID0gd3hUKCJ0ZXh0L2h0bWwiKSk7 CiAgICAgCiAgICAgd3hTdHJpbmcgR2V0SW5uZXJUZXh0KCk7CiAgICAgd3hTdHJpbmcgR2V0QXNN YXJrdXAoKTsK