59959 2011-05-02 13:51:23 -0700 Handle DispatchOnConnectionQueue for asynchronous messages 2011-05-02 14:05:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 396624 0 andersca 2011-05-02 13:51:23 -0700 Handle DispatchOnConnectionQueue for asynchronous messages 396628 1 91975 andersca 2011-05-02 13:54:35 -0700 Created attachment 91975 Patch 396635 2 91975 aroben 2011-05-02 13:58:49 -0700 Comment on attachment 91975 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91975&action=review > Source/WebKit2/ChangeLog:11 > + * Scripts/webkit2/messages.py: Some function-level comments here would be nice. > Source/WebKit2/Scripts/webkit2/messages.py:84 > - match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\)(?:\s+(.*))?)?', line) > + match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\))?(?:\s+(.*))?', line) Please explain this change in the ChangeLog. > Source/WebKit2/Scripts/webkit2/messages.py:578 > + sync_dispatch_on_connection_queue_messages = [] Why don't we do anything with this list? I think this is why the GetPlugins and TestMultipleAttributes messages disappeared from the expected output. 396640 3 andersca 2011-05-02 14:03:44 -0700 (In reply to comment #2) > (From update of attachment 91975 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=91975&action=review > > > Source/WebKit2/ChangeLog:11 > > + * Scripts/webkit2/messages.py: > > Some function-level comments here would be nice. Done. > > > Source/WebKit2/Scripts/webkit2/messages.py:84 > > - match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\)(?:\s+(.*))?)?', line) > > + match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\))?(?:\s+(.*))?', line) > > Please explain this change in the ChangeLog. Done. > > > Source/WebKit2/Scripts/webkit2/messages.py:578 > > + sync_dispatch_on_connection_queue_messages = [] > > Why don't we do anything with this list? I think this is why the GetPlugins and TestMultipleAttributes messages disappeared from the expected output. Yup. We don't handle synchronous messages with the DispatchOnConnectionQueue attribute. I'm not sure if we actually need that. 396641 4 91978 andersca 2011-05-02 14:04:05 -0700 Created attachment 91978 Patch 396644 5 andersca 2011-05-02 14:05:02 -0700 Committed r85519: <http://trac.webkit.org/changeset/85519> 91975 2011-05-02 13:54:35 -0700 2011-05-02 14:04:02 -0700 Patch bug-59959-20110502135434.patch text/plain 7986 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1NTE3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDUtMDIgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBIYW5kbGUgRGlzcGF0Y2hPbkNvbm5lY3Rpb25RdWV1ZSBm b3IgYXN5bmNocm9ub3VzIG1lc3NhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01OTk1OQorCisgICAgICAgIElmIGFueSBhc3luY2hyb25vdXMgbWVz c2FnZXMgaGF2ZSB0aGUgRGlzcGF0Y2hPbkNvbm5lY3Rpb25RdWV1ZSBhdHRyaWJ1dGUsIAorICAg ICAgICBjcmVhdGUgYSBuZXcgd2lsbFByb2Nlc3N7UmVjZWl2ZXJ9TWVzc2FnZU9uQ2xpZW50UnVu TG9vcC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5pdHRlc3QucHk6CisKIDIwMTEtMDUtMDIgIEFk YW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZp ZCBMZXZpbi4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMu cHkJKHJldmlzaW9uIDg1NTA5KQorKysgU291cmNlL1dlYktpdDIvU2NyaXB0cy93ZWJraXQyL21l c3NhZ2VzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC04MSw3ICs4MSw3IEBAIGNsYXNzIE1lc3NhZ2VS ZWNlaXZlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIGVsaWYgbGluZS5zdGFydHN3aXRoKCcj ZW5kaWYnKToKICAgICAgICAgICAgICAgICAgICAgY29uZGl0aW9uID0gTm9uZQogICAgICAgICAg ICAgICAgIGNvbnRpbnVlCi0gICAgICAgICAgICBtYXRjaCA9IHJlLnNlYXJjaChyJyhbQS1aYS16 XzAtOV0rKVwoKC4qPylcKSg/Oig/OlxzKy0+XHMrKVwoKC4qPylcKSg/OlxzKyguKikpPyk/Jywg bGluZSkKKyAgICAgICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKHInKFtBLVphLXpfMC05XSspXCgo Lio/KVwpKD86KD86XHMrLT5ccyspXCgoLio/KVwpKT8oPzpccysoLiopKT8nLCBsaW5lKQogICAg ICAgICAgICAgaWYgbWF0Y2g6CiAgICAgICAgICAgICAgICAgbmFtZSwgcGFyYW1ldGVyc19zdHJp bmcsIHJlcGx5X3BhcmFtZXRlcnNfc3RyaW5nLCBhdHRyaWJ1dGVzX3N0cmluZyA9IG1hdGNoLmdy b3VwcygpCiAgICAgICAgICAgICAgICAgaWYgcGFyYW1ldGVyc19zdHJpbmc6CkBAIC0zNzUsNyAr Mzc1LDcgQEAgZGVmIGhhbmRsZXJfZnVuY3Rpb24ocmVjZWl2ZXIsIG1lc3NhZ2UpOgogICAgIHJl dHVybiAnJXM6OiVzJyAlIChyZWNlaXZlci5uYW1lLCBtZXNzYWdlLm5hbWVbMF0ubG93ZXIoKSAr IG1lc3NhZ2UubmFtZVsxOl0pCiAKIAotZGVmIGFzeW5jX2Nhc2Vfc3RhdGVtZW50KHJlY2VpdmVy LCBtZXNzYWdlKToKK2RlZiBhc3luY19jYXNlX3N0YXRlbWVudChyZWNlaXZlciwgbWVzc2FnZSwg cmV0dXJuX3ZhbHVlPU5vbmUpOgogICAgIGRpc3BhdGNoX2Z1bmN0aW9uID0gJ2hhbmRsZU1lc3Nh Z2UnCiAgICAgaWYgbWVzc2FnZS5pc192YXJpYWRpYzoKICAgICAgICAgZGlzcGF0Y2hfZnVuY3Rp b24gKz0gJ1ZhcmlhZGljJwpAQCAtMzgzLDcgKzM4MywxMCBAQCBkZWYgYXN5bmNfY2FzZV9zdGF0 ZW1lbnQocmVjZWl2ZXIsIG1lc3NhCiAgICAgcmVzdWx0ID0gW10KICAgICByZXN1bHQuYXBwZW5k KCcgICAgY2FzZSBNZXNzYWdlczo6JXM6OiVzOlxuJyAlIChyZWNlaXZlci5uYW1lLCBtZXNzYWdl LmlkKCkpKQogICAgIHJlc3VsdC5hcHBlbmQoJyAgICAgICAgQ29yZUlQQzo6JXM8TWVzc2FnZXM6 OiVzOjolcz4oYXJndW1lbnRzLCB0aGlzLCAmJXMpO1xuJyAlIChkaXNwYXRjaF9mdW5jdGlvbiwg cmVjZWl2ZXIubmFtZSwgbWVzc2FnZS5uYW1lLCBoYW5kbGVyX2Z1bmN0aW9uKHJlY2VpdmVyLCBt ZXNzYWdlKSkpCi0gICAgcmVzdWx0LmFwcGVuZCgnICAgICAgICByZXR1cm47XG4nKQorICAgIGlm IHJldHVybl92YWx1ZToKKyAgICAgICAgcmVzdWx0LmFwcGVuZCgnICAgICAgICByZXR1cm4gJXM7 XG4nICUgcmV0dXJuX3ZhbHVlKQorICAgIGVsc2U6CisgICAgICAgIHJlc3VsdC5hcHBlbmQoJyAg ICAgICAgcmV0dXJuO1xuJykKICAgICByZXR1cm4gc3Vycm91bmRfaW5fY29uZGl0aW9uKCcnLmpv aW4ocmVzdWx0KSwgbWVzc2FnZS5jb25kaXRpb24pCiAKIApAQCAtNTcxLDEzICs1NzQsMzEgQEAg ZGVmIGdlbmVyYXRlX21lc3NhZ2VfaGFuZGxlcihmaWxlKToKIAogICAgIHJlc3VsdC5hcHBlbmQo J25hbWVzcGFjZSBXZWJLaXQge1xuXG4nKQogCisgICAgYXN5bmNfZGlzcGF0Y2hfb25fY29ubmVj dGlvbl9xdWV1ZV9tZXNzYWdlcyA9IFtdCisgICAgc3luY19kaXNwYXRjaF9vbl9jb25uZWN0aW9u X3F1ZXVlX21lc3NhZ2VzID0gW10KICAgICBhc3luY19tZXNzYWdlcyA9IFtdCiAgICAgc3luY19t ZXNzYWdlcyA9IFtdCiAgICAgZm9yIG1lc3NhZ2UgaW4gcmVjZWl2ZXIubWVzc2FnZXM6CiAgICAg ICAgIGlmIG1lc3NhZ2UucmVwbHlfcGFyYW1ldGVycyBpcyBub3QgTm9uZToKLSAgICAgICAgICAg IHN5bmNfbWVzc2FnZXMuYXBwZW5kKG1lc3NhZ2UpCisgICAgICAgICAgICBpZiBtZXNzYWdlLmRp c3BhdGNoX29uX2Nvbm5lY3Rpb25fcXVldWU6CisgICAgICAgICAgICAgICAgc3luY19kaXNwYXRj aF9vbl9jb25uZWN0aW9uX3F1ZXVlX21lc3NhZ2VzLmFwcGVuZChtZXNzYWdlKQorICAgICAgICAg ICAgZWxzZToKKyAgICAgICAgICAgICAgICBzeW5jX21lc3NhZ2VzLmFwcGVuZChtZXNzYWdlKQog ICAgICAgICBlbHNlOgotICAgICAgICAgICAgYXN5bmNfbWVzc2FnZXMuYXBwZW5kKG1lc3NhZ2Up CisgICAgICAgICAgICBpZiBtZXNzYWdlLmRpc3BhdGNoX29uX2Nvbm5lY3Rpb25fcXVldWU6Cisg ICAgICAgICAgICAgICAgYXN5bmNfZGlzcGF0Y2hfb25fY29ubmVjdGlvbl9xdWV1ZV9tZXNzYWdl cy5hcHBlbmQobWVzc2FnZSkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgYXN5 bmNfbWVzc2FnZXMuYXBwZW5kKG1lc3NhZ2UpCisKKyAgICBpZiBhc3luY19kaXNwYXRjaF9vbl9j b25uZWN0aW9uX3F1ZXVlX21lc3NhZ2VzOgorICAgICAgICByZXN1bHQuYXBwZW5kKCdib29sICVz Ojp3aWxsUHJvY2VzcyVzTWVzc2FnZU9uQ2xpZW50UnVuTG9vcChDb3JlSVBDOjpDb25uZWN0aW9u KiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVy KiBhcmd1bWVudHMpXG4nICUgKHJlY2VpdmVyLm5hbWUsIHJlY2VpdmVyLm5hbWUpKQorICAgICAg ICByZXN1bHQuYXBwZW5kKCd7XG4nKQorICAgICAgICByZXN1bHQuYXBwZW5kKCcgICAgc3dpdGNo IChtZXNzYWdlSUQuZ2V0PE1lc3NhZ2VzOjolczo6S2luZD4oKSkge1xuJyAlIHJlY2VpdmVyLm5h bWUpCisgICAgICAgIHJlc3VsdCArPSBbYXN5bmNfY2FzZV9zdGF0ZW1lbnQocmVjZWl2ZXIsIG1l c3NhZ2UsICdmYWxzZScpIGZvciBtZXNzYWdlIGluIGFzeW5jX2Rpc3BhdGNoX29uX2Nvbm5lY3Rp b25fcXVldWVfbWVzc2FnZXNdCisgICAgICAgIHJlc3VsdC5hcHBlbmQoJyAgICBkZWZhdWx0Olxu JykKKyAgICAgICAgcmVzdWx0LmFwcGVuZCgnICAgICAgICByZXR1cm4gdHJ1ZTtcbicpCisgICAg ICAgIHJlc3VsdC5hcHBlbmQoJyAgICB9XG4nKQorICAgICAgICByZXN1bHQuYXBwZW5kKCd9XG5c bicpCiAKICAgICBpZiBhc3luY19tZXNzYWdlczoKICAgICAgICAgcmVzdWx0LmFwcGVuZCgndm9p ZCAlczo6ZGlkUmVjZWl2ZSVzTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6 TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMp XG4nICUgKHJlY2VpdmVyLm5hbWUsIHJlY2VpdmVyLm5hbWUpKQpJbmRleDogU291cmNlL1dlYktp dDIvU2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlc191bml0dGVzdC5weQkocmV2aXNp b24gODU1MDkpCisrKyBTb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTY5LDYgKzY5LDcgQEAgbWVzc2FnZXMgLT4gV2Vi UGFnZSB7CiAgICAgR2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb24oV1RGOjpTdHJpbmcgcGx1Z2lu UGF0aCkgLT4gKENvcmVJUEM6OkNvbm5lY3Rpb246OkhhbmRsZSBjb25uZWN0aW9uSGFuZGxlKSBE ZWxheWVkCiAKICAgICBUZXN0TXVsdGlwbGVBdHRyaWJ1dGVzKCkgLT4gKCkgRGlzcGF0Y2hPbkNv bm5lY3Rpb25RdWV1ZSBEZWxheWVkCisgICAgVGVzdENvbm5lY3Rpb25RdWV1ZSh1aW50NjRfdCBw bHVnaW5JRCkgRGlzcGF0Y2hPbkNvbm5lY3Rpb25RdWV1ZQogCiAjaWYgUExBVEZPUk0oTUFDKQog ICAgIERpZENyZWF0ZVdlYlByb2Nlc3NDb25uZWN0aW9uKENvcmVJUEM6Ok1hY2hQb3J0IGNvbm5l Y3Rpb25JZGVudGlmaWVyKQpAQCAtMTg3LDYgKzE4OCwxMyBAQCBfZXhwZWN0ZWRfcmVzdWx0cyA9 IHsKICAgICAgICAgICAgICdjb25kaXRpb24nOiBOb25lLAogICAgICAgICB9LAogICAgICAgICB7 CisgICAgICAgICAgICAnbmFtZSc6ICdUZXN0Q29ubmVjdGlvblF1ZXVlJywKKyAgICAgICAgICAg ICdwYXJhbWV0ZXJzJzogKAorICAgICAgICAgICAgICAgICgndWludDY0X3QnLCAncGx1Z2luSUQn KSwKKyAgICAgICAgICAgICksCisgICAgICAgICAgICAnY29uZGl0aW9uJzogTm9uZSwKKyAgICAg ICAgfSwKKyAgICAgICAgewogICAgICAgICAgICAgJ25hbWUnOiAnRGlkQ3JlYXRlV2ViUHJvY2Vz c0Nvbm5lY3Rpb24nLAogICAgICAgICAgICAgJ3BhcmFtZXRlcnMnOiAoCiAgICAgICAgICAgICAg ICAgKCdDb3JlSVBDOjpNYWNoUG9ydCcsICdjb25uZWN0aW9uSWRlbnRpZmllcicpLApAQCAtMzA3 LDYgKzMxNSw3IEBAIGVudW0gS2luZCB7CiAgICAgR2V0UGx1Z2luc0lELAogICAgIEdldFBsdWdp blByb2Nlc3NDb25uZWN0aW9uSUQsCiAgICAgVGVzdE11bHRpcGxlQXR0cmlidXRlc0lELAorICAg IFRlc3RDb25uZWN0aW9uUXVldWVJRCwKICNpZiBQTEFURk9STShNQUMpCiAgICAgRGlkQ3JlYXRl V2ViUHJvY2Vzc0Nvbm5lY3Rpb25JRCwKICNlbmRpZgpAQCAtNDQ0LDYgKzQ1MywxNSBAQCBzdHJ1 Y3QgVGVzdE11bHRpcGxlQXR0cmlidXRlcyA6IENvcmVJUEM6CiAgICAgdHlwZWRlZiBDb3JlSVBD OjpBcmd1bWVudHMwIERlY29kZVR5cGU7CiB9OwogCitzdHJ1Y3QgVGVzdENvbm5lY3Rpb25RdWV1 ZSA6IENvcmVJUEM6OkFyZ3VtZW50czE8dWludDY0X3Q+IHsKKyAgICBzdGF0aWMgY29uc3QgS2lu ZCBtZXNzYWdlSUQgPSBUZXN0Q29ubmVjdGlvblF1ZXVlSUQ7CisgICAgdHlwZWRlZiBDb3JlSVBD OjpBcmd1bWVudHMxPHVpbnQ2NF90PiBEZWNvZGVUeXBlOworICAgIGV4cGxpY2l0IFRlc3RDb25u ZWN0aW9uUXVldWUodWludDY0X3QgcGx1Z2luSUQpCisgICAgICAgIDogQ29yZUlQQzo6QXJndW1l bnRzMTx1aW50NjRfdD4ocGx1Z2luSUQpCisgICAgeworICAgIH0KK307CisKICNpZiBQTEFURk9S TShNQUMpCiBzdHJ1Y3QgRGlkQ3JlYXRlV2ViUHJvY2Vzc0Nvbm5lY3Rpb24gOiBDb3JlSVBDOjpB cmd1bWVudHMxPGNvbnN0IENvcmVJUEM6Ok1hY2hQb3J0Jj4gewogICAgIHN0YXRpYyBjb25zdCBL aW5kIG1lc3NhZ2VJRCA9IERpZENyZWF0ZVdlYlByb2Nlc3NDb25uZWN0aW9uSUQ7CkBAIC01ODIs NiArNjAwLDE3IEBAIGJvb2wgVGVzdE11bHRpcGxlQXR0cmlidXRlczo6RGVsYXllZFJlcGwKIAog bmFtZXNwYWNlIFdlYktpdCB7CiAKK2Jvb2wgV2ViUGFnZTo6d2lsbFByb2Nlc3NXZWJQYWdlTWVz c2FnZU9uQ2xpZW50UnVuTG9vcChDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2Fn ZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMpCit7Cisg ICAgc3dpdGNoIChtZXNzYWdlSUQuZ2V0PE1lc3NhZ2VzOjpXZWJQYWdlOjpLaW5kPigpKSB7Cisg ICAgY2FzZSBNZXNzYWdlczo6V2ViUGFnZTo6VGVzdENvbm5lY3Rpb25RdWV1ZUlEOgorICAgICAg ICBDb3JlSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlOjpUZXN0Q29ubmVjdGlv blF1ZXVlPihhcmd1bWVudHMsIHRoaXMsICZXZWJQYWdlOjp0ZXN0Q29ubmVjdGlvblF1ZXVlKTsK KyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGRlZmF1bHQ6CisgICAgICAgIHJldHVybiB0cnVl OworICAgIH0KK30KKwogdm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlV2ViUGFnZU1lc3NhZ2UoQ29y ZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6 OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzKQogewogICAgIHN3aXRjaCAobWVzc2FnZUlELmdl dDxNZXNzYWdlczo6V2ViUGFnZTo6S2luZD4oKSkgewpAQCAtNjI5LDE1ICs2NTgsOSBAQCBDb3Jl SVBDOjpTeW5jUmVwbHlNb2RlIFdlYlBhZ2U6OmRpZFJlY2VpCiAgICAgY2FzZSBNZXNzYWdlczo6 V2ViUGFnZTo6UnVuSmF2YVNjcmlwdEFsZXJ0SUQ6CiAgICAgICAgIENvcmVJUEM6OmhhbmRsZU1l c3NhZ2U8TWVzc2FnZXM6OldlYlBhZ2U6OlJ1bkphdmFTY3JpcHRBbGVydD4oYXJndW1lbnRzLCBy ZXBseSwgdGhpcywgJldlYlBhZ2U6OnJ1bkphdmFTY3JpcHRBbGVydCk7CiAgICAgICAgIHJldHVy biBDb3JlSVBDOjpBdXRvbWF0aWNSZXBseTsKLSAgICBjYXNlIE1lc3NhZ2VzOjpXZWJQYWdlOjpH ZXRQbHVnaW5zSUQ6Ci0gICAgICAgIENvcmVJUEM6OmhhbmRsZU1lc3NhZ2U8TWVzc2FnZXM6Oldl YlBhZ2U6OkdldFBsdWdpbnM+KGFyZ3VtZW50cywgcmVwbHksIHRoaXMsICZXZWJQYWdlOjpnZXRQ bHVnaW5zKTsKLSAgICAgICAgcmV0dXJuIENvcmVJUEM6OkF1dG9tYXRpY1JlcGx5OwogICAgIGNh c2UgTWVzc2FnZXM6OldlYlBhZ2U6OkdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uSUQ6CiAgICAg ICAgIENvcmVJUEM6OmhhbmRsZU1lc3NhZ2VEZWxheWVkPE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRQ bHVnaW5Qcm9jZXNzQ29ubmVjdGlvbj4oY29ubmVjdGlvbiwgYXJndW1lbnRzLCByZXBseSwgdGhp cywgJldlYlBhZ2U6OmdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKTsKICAgICAgICAgcmV0dXJu IENvcmVJUEM6Ok1hbnVhbFJlcGx5OwotICAgIGNhc2UgTWVzc2FnZXM6OldlYlBhZ2U6OlRlc3RN dWx0aXBsZUF0dHJpYnV0ZXNJRDoKLSAgICAgICAgQ29yZUlQQzo6aGFuZGxlTWVzc2FnZURlbGF5 ZWQ8TWVzc2FnZXM6OldlYlBhZ2U6OlRlc3RNdWx0aXBsZUF0dHJpYnV0ZXM+KGNvbm5lY3Rpb24s IGFyZ3VtZW50cywgcmVwbHksIHRoaXMsICZXZWJQYWdlOjp0ZXN0TXVsdGlwbGVBdHRyaWJ1dGVz KTsKLSAgICAgICAgcmV0dXJuIENvcmVJUEM6Ok1hbnVhbFJlcGx5OwogI2lmIFBMQVRGT1JNKE1B QykKICAgICBjYXNlIE1lc3NhZ2VzOjpXZWJQYWdlOjpJbnRlcnByZXRLZXlFdmVudElEOgogICAg ICAgICBDb3JlSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlOjpJbnRlcnByZXRL ZXlFdmVudD4oYXJndW1lbnRzLCByZXBseSwgdGhpcywgJldlYlBhZ2U6OmludGVycHJldEtleUV2 ZW50KTsK 91978 2011-05-02 14:04:05 -0700 2011-05-02 14:04:47 -0700 Patch bug-59959-20110502140404.patch text/plain 8305 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1NTE3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDUtMDIgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBIYW5kbGUgRGlzcGF0Y2hPbkNvbm5lY3Rpb25RdWV1ZSBm b3IgYXN5bmNocm9ub3VzIG1lc3NhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01OTk1OQorCisgICAgICAgIElmIGFueSBhc3luY2hyb25vdXMgbWVz c2FnZXMgaGF2ZSB0aGUgRGlzcGF0Y2hPbkNvbm5lY3Rpb25RdWV1ZSBhdHRyaWJ1dGUsIAorICAg ICAgICBjcmVhdGUgYSBuZXcgd2lsbFByb2Nlc3N7UmVjZWl2ZXJ9TWVzc2FnZU9uQ2xpZW50UnVu TG9vcC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weToKKyAgICAgICAg LSBGaXggYSByZWdleCBidWcgd2hlcmUgd2Ugd291bGQgb25seSBwYXJzZSBhdHRyaWJ1dGVzIG9u IHN5bmNocm9ub3VzIG1lc3NhZ2VzLgorICAgICAgICAtIENvbGxlY3QgbWVzc2FnZXMgd2l0aCB0 aGUgZGlzcGF0Y2hfb25fY29ubmVjdGlvbl9xdWV1ZSBmbGFnIHNldC4gV2Ugb25seSBoYW5kbGUK KyAgICAgICAgICBhc3luY2hyb25vdXMgbWVzc2FnZXMgY3VycmVudGx5OyBzeW5jIG1lc3NhZ2Ug c3VwcG9ydCB3aWxsIGJlIGFkZGVkIHdoZW4vaWYgdGhlCisgICAgICAgICAgbmVlZCBhcmlzZXMu CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXNfdW5pdHRlc3QucHk6CisgICAg ICAgIFVwZGF0ZSB0ZXN0LgorCiAyMDExLTA1LTAyICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvU2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5CShyZXZpc2lvbiA4NTUwOSkKKysr IFNvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weQkod29ya2luZyBjb3B5 KQpAQCAtODEsNyArODEsNyBAQCBjbGFzcyBNZXNzYWdlUmVjZWl2ZXIob2JqZWN0KToKICAgICAg ICAgICAgICAgICBlbGlmIGxpbmUuc3RhcnRzd2l0aCgnI2VuZGlmJyk6CiAgICAgICAgICAgICAg ICAgICAgIGNvbmRpdGlvbiA9IE5vbmUKICAgICAgICAgICAgICAgICBjb250aW51ZQotICAgICAg ICAgICAgbWF0Y2ggPSByZS5zZWFyY2gocicoW0EtWmEtel8wLTldKylcKCguKj8pXCkoPzooPzpc cystPlxzKylcKCguKj8pXCkoPzpccysoLiopKT8pPycsIGxpbmUpCisgICAgICAgICAgICBtYXRj aCA9IHJlLnNlYXJjaChyJyhbQS1aYS16XzAtOV0rKVwoKC4qPylcKSg/Oig/OlxzKy0+XHMrKVwo KC4qPylcKSk/KD86XHMrKC4qKSk/JywgbGluZSkKICAgICAgICAgICAgIGlmIG1hdGNoOgogICAg ICAgICAgICAgICAgIG5hbWUsIHBhcmFtZXRlcnNfc3RyaW5nLCByZXBseV9wYXJhbWV0ZXJzX3N0 cmluZywgYXR0cmlidXRlc19zdHJpbmcgPSBtYXRjaC5ncm91cHMoKQogICAgICAgICAgICAgICAg IGlmIHBhcmFtZXRlcnNfc3RyaW5nOgpAQCAtMzc1LDcgKzM3NSw3IEBAIGRlZiBoYW5kbGVyX2Z1 bmN0aW9uKHJlY2VpdmVyLCBtZXNzYWdlKToKICAgICByZXR1cm4gJyVzOjolcycgJSAocmVjZWl2 ZXIubmFtZSwgbWVzc2FnZS5uYW1lWzBdLmxvd2VyKCkgKyBtZXNzYWdlLm5hbWVbMTpdKQogCiAK LWRlZiBhc3luY19jYXNlX3N0YXRlbWVudChyZWNlaXZlciwgbWVzc2FnZSk6CitkZWYgYXN5bmNf Y2FzZV9zdGF0ZW1lbnQocmVjZWl2ZXIsIG1lc3NhZ2UsIHJldHVybl92YWx1ZT1Ob25lKToKICAg ICBkaXNwYXRjaF9mdW5jdGlvbiA9ICdoYW5kbGVNZXNzYWdlJwogICAgIGlmIG1lc3NhZ2UuaXNf dmFyaWFkaWM6CiAgICAgICAgIGRpc3BhdGNoX2Z1bmN0aW9uICs9ICdWYXJpYWRpYycKQEAgLTM4 Myw3ICszODMsMTAgQEAgZGVmIGFzeW5jX2Nhc2Vfc3RhdGVtZW50KHJlY2VpdmVyLCBtZXNzYQog ICAgIHJlc3VsdCA9IFtdCiAgICAgcmVzdWx0LmFwcGVuZCgnICAgIGNhc2UgTWVzc2FnZXM6OiVz OjolczpcbicgJSAocmVjZWl2ZXIubmFtZSwgbWVzc2FnZS5pZCgpKSkKICAgICByZXN1bHQuYXBw ZW5kKCcgICAgICAgIENvcmVJUEM6OiVzPE1lc3NhZ2VzOjolczo6JXM+KGFyZ3VtZW50cywgdGhp cywgJiVzKTtcbicgJSAoZGlzcGF0Y2hfZnVuY3Rpb24sIHJlY2VpdmVyLm5hbWUsIG1lc3NhZ2Uu bmFtZSwgaGFuZGxlcl9mdW5jdGlvbihyZWNlaXZlciwgbWVzc2FnZSkpKQotICAgIHJlc3VsdC5h cHBlbmQoJyAgICAgICAgcmV0dXJuO1xuJykKKyAgICBpZiByZXR1cm5fdmFsdWU6CisgICAgICAg IHJlc3VsdC5hcHBlbmQoJyAgICAgICAgcmV0dXJuICVzO1xuJyAlIHJldHVybl92YWx1ZSkKKyAg ICBlbHNlOgorICAgICAgICByZXN1bHQuYXBwZW5kKCcgICAgICAgIHJldHVybjtcbicpCiAgICAg cmV0dXJuIHN1cnJvdW5kX2luX2NvbmRpdGlvbignJy5qb2luKHJlc3VsdCksIG1lc3NhZ2UuY29u ZGl0aW9uKQogCiAKQEAgLTU3MSwxMyArNTc0LDMxIEBAIGRlZiBnZW5lcmF0ZV9tZXNzYWdlX2hh bmRsZXIoZmlsZSk6CiAKICAgICByZXN1bHQuYXBwZW5kKCduYW1lc3BhY2UgV2ViS2l0IHtcblxu JykKIAorICAgIGFzeW5jX2Rpc3BhdGNoX29uX2Nvbm5lY3Rpb25fcXVldWVfbWVzc2FnZXMgPSBb XQorICAgIHN5bmNfZGlzcGF0Y2hfb25fY29ubmVjdGlvbl9xdWV1ZV9tZXNzYWdlcyA9IFtdCiAg ICAgYXN5bmNfbWVzc2FnZXMgPSBbXQogICAgIHN5bmNfbWVzc2FnZXMgPSBbXQogICAgIGZvciBt ZXNzYWdlIGluIHJlY2VpdmVyLm1lc3NhZ2VzOgogICAgICAgICBpZiBtZXNzYWdlLnJlcGx5X3Bh cmFtZXRlcnMgaXMgbm90IE5vbmU6Ci0gICAgICAgICAgICBzeW5jX21lc3NhZ2VzLmFwcGVuZCht ZXNzYWdlKQorICAgICAgICAgICAgaWYgbWVzc2FnZS5kaXNwYXRjaF9vbl9jb25uZWN0aW9uX3F1 ZXVlOgorICAgICAgICAgICAgICAgIHN5bmNfZGlzcGF0Y2hfb25fY29ubmVjdGlvbl9xdWV1ZV9t ZXNzYWdlcy5hcHBlbmQobWVzc2FnZSkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAg ICAgc3luY19tZXNzYWdlcy5hcHBlbmQobWVzc2FnZSkKICAgICAgICAgZWxzZToKLSAgICAgICAg ICAgIGFzeW5jX21lc3NhZ2VzLmFwcGVuZChtZXNzYWdlKQorICAgICAgICAgICAgaWYgbWVzc2Fn ZS5kaXNwYXRjaF9vbl9jb25uZWN0aW9uX3F1ZXVlOgorICAgICAgICAgICAgICAgIGFzeW5jX2Rp c3BhdGNoX29uX2Nvbm5lY3Rpb25fcXVldWVfbWVzc2FnZXMuYXBwZW5kKG1lc3NhZ2UpCisgICAg ICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgIGFzeW5jX21lc3NhZ2VzLmFwcGVuZChtZXNz YWdlKQorCisgICAgaWYgYXN5bmNfZGlzcGF0Y2hfb25fY29ubmVjdGlvbl9xdWV1ZV9tZXNzYWdl czoKKyAgICAgICAgcmVzdWx0LmFwcGVuZCgnYm9vbCAlczo6d2lsbFByb2Nlc3Mlc01lc3NhZ2VP bkNsaWVudFJ1bkxvb3AoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCBt ZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzKVxuJyAlIChyZWNl aXZlci5uYW1lLCByZWNlaXZlci5uYW1lKSkKKyAgICAgICAgcmVzdWx0LmFwcGVuZCgne1xuJykK KyAgICAgICAgcmVzdWx0LmFwcGVuZCgnICAgIHN3aXRjaCAobWVzc2FnZUlELmdldDxNZXNzYWdl czo6JXM6OktpbmQ+KCkpIHtcbicgJSByZWNlaXZlci5uYW1lKQorICAgICAgICByZXN1bHQgKz0g W2FzeW5jX2Nhc2Vfc3RhdGVtZW50KHJlY2VpdmVyLCBtZXNzYWdlLCAnZmFsc2UnKSBmb3IgbWVz c2FnZSBpbiBhc3luY19kaXNwYXRjaF9vbl9jb25uZWN0aW9uX3F1ZXVlX21lc3NhZ2VzXQorICAg ICAgICByZXN1bHQuYXBwZW5kKCcgICAgZGVmYXVsdDpcbicpCisgICAgICAgIHJlc3VsdC5hcHBl bmQoJyAgICAgICAgcmV0dXJuIHRydWU7XG4nKQorICAgICAgICByZXN1bHQuYXBwZW5kKCcgICAg fVxuJykKKyAgICAgICAgcmVzdWx0LmFwcGVuZCgnfVxuXG4nKQogCiAgICAgaWYgYXN5bmNfbWVz c2FnZXM6CiAgICAgICAgIHJlc3VsdC5hcHBlbmQoJ3ZvaWQgJXM6OmRpZFJlY2VpdmUlc01lc3Nh Z2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENv cmVJUEM6OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzKVxuJyAlIChyZWNlaXZlci5uYW1lLCBy ZWNlaXZlci5uYW1lKSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNz YWdlc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dl YmtpdDIvbWVzc2FnZXNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDg1NTA5KQorKysgU291cmNlL1dl YktpdDIvU2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkp CkBAIC02OSw2ICs2OSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogICAgIEdldFBsdWdpblBy b2Nlc3NDb25uZWN0aW9uKFdURjo6U3RyaW5nIHBsdWdpblBhdGgpIC0+IChDb3JlSVBDOjpDb25u ZWN0aW9uOjpIYW5kbGUgY29ubmVjdGlvbkhhbmRsZSkgRGVsYXllZAogCiAgICAgVGVzdE11bHRp cGxlQXR0cmlidXRlcygpIC0+ICgpIERpc3BhdGNoT25Db25uZWN0aW9uUXVldWUgRGVsYXllZAor ICAgIFRlc3RDb25uZWN0aW9uUXVldWUodWludDY0X3QgcGx1Z2luSUQpIERpc3BhdGNoT25Db25u ZWN0aW9uUXVldWUKIAogI2lmIFBMQVRGT1JNKE1BQykKICAgICBEaWRDcmVhdGVXZWJQcm9jZXNz Q29ubmVjdGlvbihDb3JlSVBDOjpNYWNoUG9ydCBjb25uZWN0aW9uSWRlbnRpZmllcikKQEAgLTE4 Nyw2ICsxODgsMTMgQEAgX2V4cGVjdGVkX3Jlc3VsdHMgPSB7CiAgICAgICAgICAgICAnY29uZGl0 aW9uJzogTm9uZSwKICAgICAgICAgfSwKICAgICAgICAgeworICAgICAgICAgICAgJ25hbWUnOiAn VGVzdENvbm5lY3Rpb25RdWV1ZScsCisgICAgICAgICAgICAncGFyYW1ldGVycyc6ICgKKyAgICAg ICAgICAgICAgICAoJ3VpbnQ2NF90JywgJ3BsdWdpbklEJyksCisgICAgICAgICAgICApLAorICAg ICAgICAgICAgJ2NvbmRpdGlvbic6IE5vbmUsCisgICAgICAgIH0sCisgICAgICAgIHsKICAgICAg ICAgICAgICduYW1lJzogJ0RpZENyZWF0ZVdlYlByb2Nlc3NDb25uZWN0aW9uJywKICAgICAgICAg ICAgICdwYXJhbWV0ZXJzJzogKAogICAgICAgICAgICAgICAgICgnQ29yZUlQQzo6TWFjaFBvcnQn LCAnY29ubmVjdGlvbklkZW50aWZpZXInKSwKQEAgLTMwNyw2ICszMTUsNyBAQCBlbnVtIEtpbmQg ewogICAgIEdldFBsdWdpbnNJRCwKICAgICBHZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbklELAog ICAgIFRlc3RNdWx0aXBsZUF0dHJpYnV0ZXNJRCwKKyAgICBUZXN0Q29ubmVjdGlvblF1ZXVlSUQs CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIERpZENyZWF0ZVdlYlByb2Nlc3NDb25uZWN0aW9uSUQs CiAjZW5kaWYKQEAgLTQ0NCw2ICs0NTMsMTUgQEAgc3RydWN0IFRlc3RNdWx0aXBsZUF0dHJpYnV0 ZXMgOiBDb3JlSVBDOgogICAgIHR5cGVkZWYgQ29yZUlQQzo6QXJndW1lbnRzMCBEZWNvZGVUeXBl OwogfTsKIAorc3RydWN0IFRlc3RDb25uZWN0aW9uUXVldWUgOiBDb3JlSVBDOjpBcmd1bWVudHMx PHVpbnQ2NF90PiB7CisgICAgc3RhdGljIGNvbnN0IEtpbmQgbWVzc2FnZUlEID0gVGVzdENvbm5l Y3Rpb25RdWV1ZUlEOworICAgIHR5cGVkZWYgQ29yZUlQQzo6QXJndW1lbnRzMTx1aW50NjRfdD4g RGVjb2RlVHlwZTsKKyAgICBleHBsaWNpdCBUZXN0Q29ubmVjdGlvblF1ZXVlKHVpbnQ2NF90IHBs dWdpbklEKQorICAgICAgICA6IENvcmVJUEM6OkFyZ3VtZW50czE8dWludDY0X3Q+KHBsdWdpbklE KQorICAgIHsKKyAgICB9Cit9OworCiAjaWYgUExBVEZPUk0oTUFDKQogc3RydWN0IERpZENyZWF0 ZVdlYlByb2Nlc3NDb25uZWN0aW9uIDogQ29yZUlQQzo6QXJndW1lbnRzMTxjb25zdCBDb3JlSVBD OjpNYWNoUG9ydCY+IHsKICAgICBzdGF0aWMgY29uc3QgS2luZCBtZXNzYWdlSUQgPSBEaWRDcmVh dGVXZWJQcm9jZXNzQ29ubmVjdGlvbklEOwpAQCAtNTgyLDYgKzYwMCwxNyBAQCBib29sIFRlc3RN dWx0aXBsZUF0dHJpYnV0ZXM6OkRlbGF5ZWRSZXBsCiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCiti b29sIFdlYlBhZ2U6OndpbGxQcm9jZXNzV2ViUGFnZU1lc3NhZ2VPbkNsaWVudFJ1bkxvb3AoQ29y ZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6 OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzKQoreworICAgIHN3aXRjaCAobWVzc2FnZUlELmdl dDxNZXNzYWdlczo6V2ViUGFnZTo6S2luZD4oKSkgeworICAgIGNhc2UgTWVzc2FnZXM6OldlYlBh Z2U6OlRlc3RDb25uZWN0aW9uUXVldWVJRDoKKyAgICAgICAgQ29yZUlQQzo6aGFuZGxlTWVzc2Fn ZTxNZXNzYWdlczo6V2ViUGFnZTo6VGVzdENvbm5lY3Rpb25RdWV1ZT4oYXJndW1lbnRzLCB0aGlz LCAmV2ViUGFnZTo6dGVzdENvbm5lY3Rpb25RdWV1ZSk7CisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICBkZWZhdWx0OgorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9Cit9CisKIHZvaWQgV2Vi UGFnZTo6ZGlkUmVjZWl2ZVdlYlBhZ2VNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3Jl SVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3Vt ZW50cykKIHsKICAgICBzd2l0Y2ggKG1lc3NhZ2VJRC5nZXQ8TWVzc2FnZXM6OldlYlBhZ2U6Oktp bmQ+KCkpIHsKQEAgLTYyOSwxNSArNjU4LDkgQEAgQ29yZUlQQzo6U3luY1JlcGx5TW9kZSBXZWJQ YWdlOjpkaWRSZWNlaQogICAgIGNhc2UgTWVzc2FnZXM6OldlYlBhZ2U6OlJ1bkphdmFTY3JpcHRB bGVydElEOgogICAgICAgICBDb3JlSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdl OjpSdW5KYXZhU2NyaXB0QWxlcnQ+KGFyZ3VtZW50cywgcmVwbHksIHRoaXMsICZXZWJQYWdlOjpy dW5KYXZhU2NyaXB0QWxlcnQpOwogICAgICAgICByZXR1cm4gQ29yZUlQQzo6QXV0b21hdGljUmVw bHk7Ci0gICAgY2FzZSBNZXNzYWdlczo6V2ViUGFnZTo6R2V0UGx1Z2luc0lEOgotICAgICAgICBD b3JlSVBDOjpoYW5kbGVNZXNzYWdlPE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRQbHVnaW5zPihhcmd1 bWVudHMsIHJlcGx5LCB0aGlzLCAmV2ViUGFnZTo6Z2V0UGx1Z2lucyk7Ci0gICAgICAgIHJldHVy biBDb3JlSVBDOjpBdXRvbWF0aWNSZXBseTsKICAgICBjYXNlIE1lc3NhZ2VzOjpXZWJQYWdlOjpH ZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbklEOgogICAgICAgICBDb3JlSVBDOjpoYW5kbGVNZXNz YWdlRGVsYXllZDxNZXNzYWdlczo6V2ViUGFnZTo6R2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb24+ KGNvbm5lY3Rpb24sIGFyZ3VtZW50cywgcmVwbHksIHRoaXMsICZXZWJQYWdlOjpnZXRQbHVnaW5Q cm9jZXNzQ29ubmVjdGlvbik7CiAgICAgICAgIHJldHVybiBDb3JlSVBDOjpNYW51YWxSZXBseTsK LSAgICBjYXNlIE1lc3NhZ2VzOjpXZWJQYWdlOjpUZXN0TXVsdGlwbGVBdHRyaWJ1dGVzSUQ6Ci0g ICAgICAgIENvcmVJUEM6OmhhbmRsZU1lc3NhZ2VEZWxheWVkPE1lc3NhZ2VzOjpXZWJQYWdlOjpU ZXN0TXVsdGlwbGVBdHRyaWJ1dGVzPihjb25uZWN0aW9uLCBhcmd1bWVudHMsIHJlcGx5LCB0aGlz LCAmV2ViUGFnZTo6dGVzdE11bHRpcGxlQXR0cmlidXRlcyk7Ci0gICAgICAgIHJldHVybiBDb3Jl SVBDOjpNYW51YWxSZXBseTsKICNpZiBQTEFURk9STShNQUMpCiAgICAgY2FzZSBNZXNzYWdlczo6 V2ViUGFnZTo6SW50ZXJwcmV0S2V5RXZlbnRJRDoKICAgICAgICAgQ29yZUlQQzo6aGFuZGxlTWVz c2FnZTxNZXNzYWdlczo6V2ViUGFnZTo6SW50ZXJwcmV0S2V5RXZlbnQ+KGFyZ3VtZW50cywgcmVw bHksIHRoaXMsICZXZWJQYWdlOjppbnRlcnByZXRLZXlFdmVudCk7Cg==