96633 2012-09-13 04:48:32 -0700 [Qt] Fix build of Qt WTR/MiniBrowser with MSVC and nmake 2012-09-13 08:03:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76776 1 hausmann hausmann webkit.review.bot oldest_to_newest 719343 0 hausmann 2012-09-13 04:48:32 -0700 [Qt] Fix build of Qt WTR/MiniBrowser with MSVC and nmake 719370 1 163846 hausmann 2012-09-13 05:32:02 -0700 Created attachment 163846 Patch 719469 2 163846 ossy 2012-09-13 07:45:43 -0700 Comment on attachment 163846 Patch r=me 719489 3 hausmann 2012-09-13 08:03:12 -0700 Committed r128461: <http://trac.webkit.org/changeset/128461> 163846 2012-09-13 05:32:02 -0700 2012-09-13 07:45:43 -0700 Patch bug-96633-20120913143349.patch text/plain 15417 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NDM1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjI4MWJmOTBjOTZkODg5ZDVkZjExMGFlZDZjNDNjYjMx ZGQyMjk5YS4uYTMyNzY1ZmNjYzZiZDczNTMxODViYWRmYmE4OWVmYjZjZjViMzU3ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3 IEBACiAyMDEyLTA5LTEzICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQG5va2lhLmNv bT4KIAorICAgICAgICBbUXRdIEZpeCBidWlsZCBvZiBRdCBXVFIvTWluaUJyb3dzZXIgd2l0aCBN U1ZDIGFuZCBubWFrZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9OTY2MzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXVFIgYW5kIE1pbmlCcm93c2VyIGJvdGggaGF2ZSBEUlQgaW4gdGhlaXIgaW5jbHVkZSBw YXRoIChmb3IgdGhlIHNoYXJlZCBmb250IHN0dWZmKS4gQmF0Y2gKKyAgICAgICAgYnVpbGRzIHdp dGggTVNWQyBhbmQgbm1ha2UgcmVzdWx0IGluIG5tYWtlIHBpY2tpbmcgdXAgbWFpbi5jcHAgZnJv bSB0aGUgd3JvbmcgZGlyZWN0b3J5LgorICAgICAgICBJdCdzIHRoZSB1c3VhbCBwcm9ibGVtIGFu ZCB0aGUgdXN1YWwgc29sdXRpb24gaXMgdG8gcmVuYW1lIG9uZSBvZiB0aGUgY29uZmxpY3Rpbmcg ZmlsZXMuCisgICAgICAgIFRoaXMgcGF0Y2ggY2hvb3NlcyB0byByZW5hbWUgRFJUIGluc3RlYWQg b2YgV1RSIGFuZCBNQlIuCisKKyAgICAgICAgRml4ZWQgaW5jbHVkZSBvcmRlciBhdCB0aGUgc2Ft ZSB0aW1lIHRvIG1hdGNoIHN0eWxlIGd1aWRlLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUv cXQvRHVtcFJlbmRlclRyZWUucHJvOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBS ZW5kZXJUcmVlTWFpbi5jcHA6IFJlbmFtZWQgZnJvbSBUb29scy9EdW1wUmVuZGVyVHJlZS9xdC9t YWluLmNwcC4KKyAgICAgICAgKG1lc3NhZ2VIYW5kbGVyKToKKyAgICAgICAgKGlzT3B0aW9uKToK KyAgICAgICAgKHRha2VPcHRpb25WYWx1ZSk6CisgICAgICAgIChwcmludFVzYWdlKToKKyAgICAg ICAgKG1haW4pOgorCisyMDEyLTA5LTEzICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5u QG5va2lhLmNvbT4KKwogICAgICAgICBbUXRdW1dpbl0gRW5hYmxlIFVTRSgzRF9HUkFQSElDUykK ICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwODc5CiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLnBybyBi L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlLnBybwppbmRleCAwMzk1NGIx MDRhYzkxZGZmZDdjNTg0MWU2YmM1NWNhZjhhZjM0MzVkLi5kZDNhMjIyNzUzMjBkYmQ4MjZlNDE0 NTRmYmRjY2Y0YzExMTRmMzUyIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9E dW1wUmVuZGVyVHJlZS5wcm8KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRl clRyZWUucHJvCkBAIC00Nyw3ICs0Nyw3IEBAIFNPVVJDRVMgKz0gXAogICAgIEdDQ29udHJvbGxl clF0LmNwcCBcCiAgICAgUXRJbml0aWFsaXplVGVzdEZvbnRzLmNwcCBcCiAgICAgdGVzdHBsdWdp bi5jcHAgXAotICAgIG1haW4uY3BwCisgICAgRHVtcFJlbmRlclRyZWVNYWluLmNwcAogCiB3aW5j ZSo6IHsKICAgICBJTkNMVURFUEFUSCArPSAkJFFULmNvcmUuc291cmNlcy8uLi8zcmRwYXJ0eS9j ZS1jb21wYXQgJCRXQ0VDT01QQVQvaW5jbHVkZQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRl clRyZWUvcXQvRHVtcFJlbmRlclRyZWVNYWluLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0R1bXBSZW5kZXJUcmVlTWFpbi5jcHAKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjVlN2ZjMTU5ZTAxZWYxMGQ3Njc4 MzBlMmViOTk2YzljZDg5MzllOQotLS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0R1bXBSZW5kZXJUcmVlTWFpbi5jcHAKQEAgLTAsMCArMSwxOTYgQEAKKy8qCisgKiBD b3B5cmlnaHQgKEMpIDIwMDYgTmlrb2xhcyBaaW1tZXJtYW5uIDx6aW1tZXJtYW5uQGtkZS5vcmc+ CisgKiBDb3B5cmlnaHQgKEMpIDIwMDggTm9raWEgQ29ycG9yYXRpb24gYW5kL29yIGl0cyBzdWJz aWRpYXJ5KC1pZXMpCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKgorICogMS4gIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9u cyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gIFJlZGlzdHJpYnV0aW9ucyBp biBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICAg bm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFp bWVyIGluIHRoZQorICogICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBw cm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKiAzLiAgTmVpdGhlciB0aGUgbmFtZSBv ZiBBcHBsZSBDb21wdXRlciwgSW5jLiAoIkFwcGxlIikgbm9yIHRoZSBuYW1lcyBvZgorICogICAg IGl0cyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1 Y3RzIGRlcml2ZWQKKyAqICAgICBmcm9tIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBw cmlvciB3cml0dGVuIHBlcm1pc3Npb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURF RCBCWSBBUFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKKyAqIEVYUFJF U1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg VEhFIElNUExJRUQKKyAqIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNT IEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUKKyAqIERJU0NMQUlNRUQuIElOIE5PIEVWRU5U IFNIQUxMIEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkKKyAqIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VR VUVOVElBTCBEQU1BR0VTCisgKiAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7CisgKiBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQKKyAqIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNU LCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKKyAqIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCisgKi8KKworI2luY2x1ZGUgIkR1bXBSZW5kZXJUcmVlUXQuaCIKKworI2luY2x1ZGUgIlF0 SW5pdGlhbGl6ZVRlc3RGb250cy5oIgorCisjaW5jbHVkZSA8cWFwcGxpY2F0aW9uLmg+CisjaW5j bHVkZSA8cWRlYnVnLmg+CisjaW5jbHVkZSA8cWRpci5oPgorI2luY2x1ZGUgPHFmb250Lmg+Cisj aW5jbHVkZSA8cXN0cmluZ2xpc3QuaD4KKyNpbmNsdWRlIDxxdGltZXIuaD4KKyNpbmNsdWRlIDxx dXJsLmg+CisjaW5jbHVkZSA8cXdlYmRhdGFiYXNlLmg+CisjaW5jbHVkZSA8cXdpbmRvd3NzdHls ZS5oPgorCisjaW5jbHVkZSA8d3RmL0Fsd2F5c0lubGluZS5oPgorI2luY2x1ZGUgPHd0Zi9FeHBv cnRNYWNyb3MuaD4KKworI2lmZGVmIFFfV1NfWDExCisjaW5jbHVkZSA8cXgxMWluZm9feDExLmg+ CisjZW5kaWYKKworI2lmZGVmIFFfT1NfV0lOCisjaW5jbHVkZSA8ZmNudGwuaD4KKyNpbmNsdWRl IDxpby5oPgorI2VuZGlmCisKKyNpbmNsdWRlIDxsaW1pdHMuaD4KKworI2luY2x1ZGUgPHd0Zi9B c3NlcnRpb25zLmg+CisKK3ZvaWQgbWVzc2FnZUhhbmRsZXIoUXRNc2dUeXBlIHR5cGUsIGNvbnN0 IGNoYXIgKm1lc3NhZ2UpCit7CisgICAgaWYgKHR5cGUgPT0gUXRDcml0aWNhbE1zZykgeworICAg ICAgICBmcHJpbnRmKHN0ZGVyciwgIiVzXG4iLCBtZXNzYWdlKTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKyAgICAvLyBkbyBub3RoaW5nCit9CisKKy8vIFdlIG9ubHkgc3VwcG9ydCAtdiBvciAt LXN0ZG91dCBvciAtLXN0ZGVyciBvciAtLCBhbGwgdGhlIG90aGVycyB3aWxsIGJlCisvLyBwYXNz IGFzIHRlc3QgY2FzZSBuYW1lIChldmVuIC1hYmMuaHRtbCBpcyBhIHZhbGlkIHRlc3QgY2FzZSBu YW1lKQorYm9vbCBpc09wdGlvbihjb25zdCBRU3RyaW5nJiBzdHIpCit7CisgICAgcmV0dXJuIHN0 ciA9PSBRU3RyaW5nKCItdiIpCisgICAgICAgICAgIHx8IHN0ciA9PSBRU3RyaW5nKCItLXN0ZG91 dCIpIHx8IHN0ciA9PSBRU3RyaW5nKCItLXN0ZGVyciIpCisgICAgICAgICAgIHx8IHN0ciA9PSBR U3RyaW5nKCItLXRpbWVvdXQiKSB8fCBzdHIgPT0gUVN0cmluZygiLS1uby10aW1lb3V0IikKKyAg ICAgICAgICAgfHwgc3RyID09IFFTdHJpbmcoIi0iKTsKK30KKworUVN0cmluZyB0YWtlT3B0aW9u VmFsdWUoUVN0cmluZ0xpc3QmIGFyZ3VtZW50cywgaW50IGluZGV4KQoreworICAgIFFTdHJpbmcg cmVzdWx0OworCisgICAgaWYgKGluZGV4ICsgMSA8IGFyZ3VtZW50cy5jb3VudCgpICYmICFpc09w dGlvbihhcmd1bWVudHMuYXQoaW5kZXggKyAxKSkpCisgICAgICAgIHJlc3VsdCA9IGFyZ3VtZW50 cy50YWtlQXQoaW5kZXggKyAxKTsKKyAgICBhcmd1bWVudHMucmVtb3ZlQXQoaW5kZXgpOworCisg ICAgcmV0dXJuIHJlc3VsdDsKK30KKwordm9pZCBwcmludFVzYWdlKCkKK3sKKyAgICBmcHJpbnRm KHN0ZGVyciwgIlVzYWdlOiBEdW1wUmVuZGVyVHJlZSBbLXZdIFstLXN0ZG91dCBvdXRwdXRfZmls ZW5hbWVdIFstc3RkZXJyIGVycm9yX2ZpbGVuYW1lXSBbLS1uby10aW1lb3V0XSBbLS10aW1lb3V0 IHRpbWVvdXRfTVNdIGZpbGVuYW1lIFtmaWxlbmFtZTIuLm5dXG4iKTsKKyAgICBmcHJpbnRmKHN0 ZGVyciwgIk9yIGZvbGRlciBjb250YWluaW5nIHRlc3QgZmlsZXM6IER1bXBSZW5kZXJUcmVlIFst dl0gZGlycGF0aFxuIik7CisgICAgZmZsdXNoKHN0ZGVycik7Cit9CisKK2ludCBtYWluKGludCBh cmdjLCBjaGFyKiBhcmd2W10pCit7CisjaWZkZWYgUV9PU19XSU4KKyAgICBfc2V0bW9kZSgxLCBf T19CSU5BUlkpOworICAgIF9zZXRtb2RlKDIsIF9PX0JJTkFSWSk7CisjZW5kaWYKKworICAgIC8v IFN1cHByZXNzIGRlYnVnIG91dHB1dCBmcm9tIFF0IGlmIG5vdCBzdGFydGVkIHdpdGggLXYKKyAg ICBib29sIHN1cHByZXNzUXREZWJ1Z091dHB1dCA9IHRydWU7CisgICAgZm9yIChpbnQgaSA9IDE7 IGkgPCBhcmdjOyArK2kpIHsKKyAgICAgICAgaWYgKCFxc3RyY21wKGFyZ3ZbaV0sICItdiIpKSB7 CisgICAgICAgICAgICBzdXBwcmVzc1F0RGVidWdPdXRwdXQgPSBmYWxzZTsKKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICB9CisgICAgfQorCisgICAgLy8gSGFzIHRvIGJlIGRvbmUgYmVmb3Jl IFFBcHBsaWNhdGlvbiBpcyBjb25zdHJ1Y3RlZCBpbiBjYXNlCisgICAgLy8gUUFwcGxpY2F0aW9u IGl0c2VsZiBwcm9kdWNlcyBkZWJ1ZyBvdXRwdXQuCisgICAgaWYgKHN1cHByZXNzUXREZWJ1Z091 dHB1dCkKKyAgICAgICAgcUluc3RhbGxNc2dIYW5kbGVyKG1lc3NhZ2VIYW5kbGVyKTsKKworICAg IFdlYktpdDo6aW5pdGlhbGl6ZVRlc3RGb250cygpOworCisgICAgUUFwcGxpY2F0aW9uOjpzZXRT dHlsZShuZXcgUVdpbmRvd3NTdHlsZSk7CisgICAgUUFwcGxpY2F0aW9uOjpzZXREZXNrdG9wU2V0 dGluZ3NBd2FyZShmYWxzZSk7CisKKyAgICBRQXBwbGljYXRpb24gYXBwKGFyZ2MsIGFyZ3YpOwor ICAgIGFwcC5zZXRRdWl0T25MYXN0V2luZG93Q2xvc2VkKGZhbHNlKTsKKworICAgIFFDb3JlQXBw bGljYXRpb246OnNldEF0dHJpYnV0ZShRdDo6QUFfVXNlOTZEcGksIHRydWUpOworCisgICAgV1RG SW5zdGFsbFJlcG9ydEJhY2t0cmFjZU9uQ3Jhc2hIb29rKCk7CisKKyAgICBRU3RyaW5nTGlzdCBh cmdzID0gYXBwLmFyZ3VtZW50cygpOworICAgIGlmIChhcmdzLmNvdW50KCkgPCAoIXN1cHByZXNz UXREZWJ1Z091dHB1dCA/IDMgOiAyKSkgeworICAgICAgICBwcmludFVzYWdlKCk7CisgICAgICAg IGV4aXQoMSk7CisgICAgfQorCisgICAgLy8gUmVtb3ZlIHRoZSBmaXJzdCBhcmd1bWVudHMsIGl0 IGlzIGFwcGxpY2F0aW9uIG5hbWUgaXRzZWxmCisgICAgYXJncy5yZW1vdmVBdCgwKTsKKworICAg IFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlIGR1bXBlcjsKKworICAgIGludCBpbmRleCA9IGFyZ3Mu aW5kZXhPZihRTGF0aW4xU3RyaW5nKCItLXN0ZG91dCIpKTsKKyAgICBpZiAoaW5kZXggIT0gLTEp IHsKKyAgICAgICAgUVN0cmluZyBmaWxlTmFtZSA9IHRha2VPcHRpb25WYWx1ZShhcmdzLCBpbmRl eCk7CisgICAgICAgIGR1bXBlci5zZXRSZWRpcmVjdE91dHB1dEZpbGVOYW1lKGZpbGVOYW1lKTsK KyAgICAgICAgaWYgKGZpbGVOYW1lLmlzRW1wdHkoKSB8fCAhZnJlb3BlbihxUHJpbnRhYmxlKGZp bGVOYW1lKSwgInciLCBzdGRvdXQpKSB7CisgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIlNU RE9VVCByZWRpcmVjdGlvbiBmYWlsZWQuIik7CisgICAgICAgICAgICBleGl0KDEpOworICAgICAg ICB9CisgICAgfQorICAgIGluZGV4ID0gYXJncy5pbmRleE9mKFFMYXRpbjFTdHJpbmcoIi0tc3Rk ZXJyIikpOworICAgIGlmIChpbmRleCAhPSAtMSkgeworICAgICAgICBRU3RyaW5nIGZpbGVOYW1l ID0gdGFrZU9wdGlvblZhbHVlKGFyZ3MsIGluZGV4KTsKKyAgICAgICAgZHVtcGVyLnNldFJlZGly ZWN0RXJyb3JGaWxlTmFtZShmaWxlTmFtZSk7CisgICAgICAgIGlmICghZnJlb3BlbihxUHJpbnRh YmxlKGZpbGVOYW1lKSwgInciLCBzdGRlcnIpKSB7CisgICAgICAgICAgICBmcHJpbnRmKHN0ZGVy ciwgIlNUREVSUiByZWRpcmVjdGlvbiBmYWlsZWQuIik7CisgICAgICAgICAgICBleGl0KDEpOwor ICAgICAgICB9CisgICAgfQorICAgIFFXZWJEYXRhYmFzZTo6cmVtb3ZlQWxsRGF0YWJhc2VzKCk7 CisKKyAgICBpbmRleCA9IGFyZ3MuaW5kZXhPZihRTGF0aW4xU3RyaW5nKCItLXRpbWVvdXQiKSk7 CisgICAgaWYgKGluZGV4ICE9IC0xKSB7CisgICAgICAgIGludCB0aW1lb3V0ID0gdGFrZU9wdGlv blZhbHVlKGFyZ3MsIGluZGV4KS50b0ludCgpOworICAgICAgICBkdW1wZXIuc2V0VGltZW91dCh0 aW1lb3V0KTsKKyAgICB9CisKKyAgICBpbmRleCA9IGFyZ3MuaW5kZXhPZihRTGF0aW4xU3RyaW5n KCItLW5vLXRpbWVvdXQiKSk7CisgICAgaWYgKGluZGV4ICE9IC0xKSB7CisgICAgICAgIGR1bXBl ci5zZXRTaG91bGRUaW1lb3V0KGZhbHNlKTsKKyAgICAgICAgYXJncy5yZW1vdmVBdChpbmRleCk7 CisgICAgfQorCisgICAgaW5kZXggPSBhcmdzLmluZGV4T2YoUUxhdGluMVN0cmluZygiLSIpKTsK KyAgICBpZiAoaW5kZXggIT0gLTEpIHsKKyAgICAgICAgYXJncy5yZW1vdmVBdChpbmRleCk7CisK KyAgICAgICAgLy8gQ29udGludWUgd2FpdGluZyBpbiBTVERJTiBmb3IgbW9yZSB0ZXN0IGNhc2Ug YWZ0ZXIgcHJvY2VzcyBvbmUgdGVzdCBjYXNlCisgICAgICAgIFFPYmplY3Q6OmNvbm5lY3QoJmR1 bXBlciwgU0lHTkFMKHJlYWR5KCkpLCAmZHVtcGVyLCBTTE9UKHJlYWRMaW5lKCkpLCBRdDo6UXVl dWVkQ29ubmVjdGlvbik7ICAgCisKKyAgICAgICAgLy8gUmVhZCBhbmQgb25seSByZWFkIHRoZSBm aXJzdCB0ZXN0IGNhc2UsIGlnbm9yZSB0aGUgb3RoZXJzIAorICAgICAgICBpZiAoYXJncy5zaXpl KCkgPiAwKSB7IAorICAgICAgICAgICAgLy8gUHJvY2VzcyB0aGUgYXJndW1lbnQgZmlyc3QKKyAg ICAgICAgICAgIGR1bXBlci5wcm9jZXNzTGluZShhcmdzWzBdKTsKKyAgICAgICAgfSBlbHNlCisg ICAgICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCgwLCAmZHVtcGVyLCBTTE9UKHJlYWRMaW5lKCkp KTsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyBHbyBpbnRvIHN0YW5kYWxvbmUgbW9kZQorICAg ICAgICAvLyBTdGFuZGFsb25lIG1vZGUgbmVlZCBhdCBsZWFzdCBvbmUgdGVzdCBjYXNlCisgICAg ICAgIGlmIChhcmdzLmNvdW50KCkgPCAxKSB7CisgICAgICAgICAgICBwcmludFVzYWdlKCk7Cisg ICAgICAgICAgICBleGl0KDEpOworICAgICAgICB9CisgICAgICAgIGR1bXBlci5wcm9jZXNzQXJn c0xpbmUoYXJncyk7CisgICAgfQorICAgIHJldHVybiBhcHAuZXhlYygpOworfQpkaWZmIC0tZ2l0 IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvbWFpbi5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9xdC9tYWluLmNwcApkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggZjI0NjlkMjEzNWJj MjY5YmUwZDI3MGU2MDhmM2E3YWE2Mzk5NjQ3My4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9tYWluLmNwcAorKysg L2Rldi9udWxsCkBAIC0xLDE5NiArMCwwIEBACi0vKgotICogQ29weXJpZ2h0IChDKSAyMDA2IE5p a29sYXMgWmltbWVybWFubiA8emltbWVybWFubkBrZGUub3JnPgotICogQ29weXJpZ2h0IChDKSAy MDA4IE5va2lhIENvcnBvcmF0aW9uIGFuZC9vciBpdHMgc3Vic2lkaWFyeSgtaWVzKQotICoKLSAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICoKLSAqIDEuICBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAot ICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lci4KLSAqIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCBy ZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSAqICAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgotICogMy4gIE5laXRoZXIgdGhlIG5hbWUgb2YgQXBwbGUgQ29tcHV0ZXIsIElu Yy4gKCJBcHBsZSIpIG5vciB0aGUgbmFtZXMgb2YKLSAqICAgICBpdHMgY29udHJpYnV0b3JzIG1h eSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVkCi0gKiAgICAg ZnJvbSB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJtaXNz aW9uLgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgQU5EIElUUyBD T05UUklCVVRPUlMgIkFTIElTIiBBTkQgQU5ZCi0gKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFO VElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRSBJTVBMSUVECi0gKiBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UgQVJFCi0gKiBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBPUiBJVFMg Q09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZCi0gKiBESVJFQ1QsIElORElSRUNULCBJTkNJ REVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUwotICog KElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRF IEdPT0RTIE9SIFNFUlZJQ0VTOwotICogTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9S IEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5ECi0gKiBPTiBBTlkgVEhF T1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwg T1IgVE9SVAotICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJ TiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GCi0gKiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotICovCi0KLSNpbmNsdWRl ICJEdW1wUmVuZGVyVHJlZVF0LmgiCi0KLSNpbmNsdWRlICJRdEluaXRpYWxpemVUZXN0Rm9udHMu aCIKLQotI2luY2x1ZGUgPHd0Zi9BbHdheXNJbmxpbmUuaD4KLQotI2luY2x1ZGUgPHFzdHJpbmds aXN0Lmg+Ci0jaW5jbHVkZSA8cWFwcGxpY2F0aW9uLmg+Ci0jaW5jbHVkZSA8cXVybC5oPgotI2lu Y2x1ZGUgPHFkaXIuaD4KLSNpbmNsdWRlIDxxZGVidWcuaD4KLSNpbmNsdWRlIDxxZm9udC5oPgot I2luY2x1ZGUgPHF3ZWJkYXRhYmFzZS5oPgotI2luY2x1ZGUgPHF0aW1lci5oPgotI2luY2x1ZGUg PHF3aW5kb3dzc3R5bGUuaD4KLQotI2lmZGVmIFFfV1NfWDExCi0jaW5jbHVkZSA8cXgxMWluZm9f eDExLmg+Ci0jZW5kaWYKLQotI2lmZGVmIFFfT1NfV0lOCi0jaW5jbHVkZSA8aW8uaD4KLSNpbmNs dWRlIDxmY250bC5oPgotI2VuZGlmCi0KLSNpbmNsdWRlIDxsaW1pdHMuaD4KLQotI2luY2x1ZGUg PHd0Zi9FeHBvcnRNYWNyb3MuaD4KLSNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgotCi12b2lk IG1lc3NhZ2VIYW5kbGVyKFF0TXNnVHlwZSB0eXBlLCBjb25zdCBjaGFyICptZXNzYWdlKQotewot ICAgIGlmICh0eXBlID09IFF0Q3JpdGljYWxNc2cpIHsKLSAgICAgICAgZnByaW50ZihzdGRlcnIs ICIlc1xuIiwgbWVzc2FnZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgLy8gZG8gbm90 aGluZwotfQotCi0vLyBXZSBvbmx5IHN1cHBvcnQgLXYgb3IgLS1zdGRvdXQgb3IgLS1zdGRlcnIg b3IgLSwgYWxsIHRoZSBvdGhlcnMgd2lsbCBiZQotLy8gcGFzcyBhcyB0ZXN0IGNhc2UgbmFtZSAo ZXZlbiAtYWJjLmh0bWwgaXMgYSB2YWxpZCB0ZXN0IGNhc2UgbmFtZSkKLWJvb2wgaXNPcHRpb24o Y29uc3QgUVN0cmluZyYgc3RyKQotewotICAgIHJldHVybiBzdHIgPT0gUVN0cmluZygiLXYiKQot ICAgICAgICAgICB8fCBzdHIgPT0gUVN0cmluZygiLS1zdGRvdXQiKSB8fCBzdHIgPT0gUVN0cmlu ZygiLS1zdGRlcnIiKQotICAgICAgICAgICB8fCBzdHIgPT0gUVN0cmluZygiLS10aW1lb3V0Iikg fHwgc3RyID09IFFTdHJpbmcoIi0tbm8tdGltZW91dCIpCi0gICAgICAgICAgIHx8IHN0ciA9PSBR U3RyaW5nKCItIik7Ci19Ci0KLVFTdHJpbmcgdGFrZU9wdGlvblZhbHVlKFFTdHJpbmdMaXN0JiBh cmd1bWVudHMsIGludCBpbmRleCkKLXsKLSAgICBRU3RyaW5nIHJlc3VsdDsKLQotICAgIGlmIChp bmRleCArIDEgPCBhcmd1bWVudHMuY291bnQoKSAmJiAhaXNPcHRpb24oYXJndW1lbnRzLmF0KGlu ZGV4ICsgMSkpKQotICAgICAgICByZXN1bHQgPSBhcmd1bWVudHMudGFrZUF0KGluZGV4ICsgMSk7 Ci0gICAgYXJndW1lbnRzLnJlbW92ZUF0KGluZGV4KTsKLQotICAgIHJldHVybiByZXN1bHQ7Ci19 Ci0KLXZvaWQgcHJpbnRVc2FnZSgpCi17Ci0gICAgZnByaW50ZihzdGRlcnIsICJVc2FnZTogRHVt cFJlbmRlclRyZWUgWy12XSBbLS1zdGRvdXQgb3V0cHV0X2ZpbGVuYW1lXSBbLXN0ZGVyciBlcnJv cl9maWxlbmFtZV0gWy0tbm8tdGltZW91dF0gWy0tdGltZW91dCB0aW1lb3V0X01TXSBmaWxlbmFt ZSBbZmlsZW5hbWUyLi5uXVxuIik7Ci0gICAgZnByaW50ZihzdGRlcnIsICJPciBmb2xkZXIgY29u dGFpbmluZyB0ZXN0IGZpbGVzOiBEdW1wUmVuZGVyVHJlZSBbLXZdIGRpcnBhdGhcbiIpOwotICAg IGZmbHVzaChzdGRlcnIpOwotfQotCi1pbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQot ewotI2lmZGVmIFFfT1NfV0lOCi0gICAgX3NldG1vZGUoMSwgX09fQklOQVJZKTsKLSAgICBfc2V0 bW9kZSgyLCBfT19CSU5BUlkpOwotI2VuZGlmCi0KLSAgICAvLyBTdXBwcmVzcyBkZWJ1ZyBvdXRw dXQgZnJvbSBRdCBpZiBub3Qgc3RhcnRlZCB3aXRoIC12Ci0gICAgYm9vbCBzdXBwcmVzc1F0RGVi dWdPdXRwdXQgPSB0cnVlOwotICAgIGZvciAoaW50IGkgPSAxOyBpIDwgYXJnYzsgKytpKSB7Ci0g ICAgICAgIGlmICghcXN0cmNtcChhcmd2W2ldLCAiLXYiKSkgewotICAgICAgICAgICAgc3VwcHJl c3NRdERlYnVnT3V0cHV0ID0gZmFsc2U7Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgfQot ICAgIH0KLQotICAgIC8vIEhhcyB0byBiZSBkb25lIGJlZm9yZSBRQXBwbGljYXRpb24gaXMgY29u c3RydWN0ZWQgaW4gY2FzZQotICAgIC8vIFFBcHBsaWNhdGlvbiBpdHNlbGYgcHJvZHVjZXMgZGVi dWcgb3V0cHV0LgotICAgIGlmIChzdXBwcmVzc1F0RGVidWdPdXRwdXQpCi0gICAgICAgIHFJbnN0 YWxsTXNnSGFuZGxlcihtZXNzYWdlSGFuZGxlcik7Ci0KLSAgICBXZWJLaXQ6OmluaXRpYWxpemVU ZXN0Rm9udHMoKTsKLQotICAgIFFBcHBsaWNhdGlvbjo6c2V0U3R5bGUobmV3IFFXaW5kb3dzU3R5 bGUpOwotICAgIFFBcHBsaWNhdGlvbjo6c2V0RGVza3RvcFNldHRpbmdzQXdhcmUoZmFsc2UpOwot Ci0gICAgUUFwcGxpY2F0aW9uIGFwcChhcmdjLCBhcmd2KTsKLSAgICBhcHAuc2V0UXVpdE9uTGFz dFdpbmRvd0Nsb3NlZChmYWxzZSk7Ci0KLSAgICBRQ29yZUFwcGxpY2F0aW9uOjpzZXRBdHRyaWJ1 dGUoUXQ6OkFBX1VzZTk2RHBpLCB0cnVlKTsKLQotICAgIFdURkluc3RhbGxSZXBvcnRCYWNrdHJh Y2VPbkNyYXNoSG9vaygpOwotCi0gICAgUVN0cmluZ0xpc3QgYXJncyA9IGFwcC5hcmd1bWVudHMo KTsKLSAgICBpZiAoYXJncy5jb3VudCgpIDwgKCFzdXBwcmVzc1F0RGVidWdPdXRwdXQgPyAzIDog MikpIHsKLSAgICAgICAgcHJpbnRVc2FnZSgpOwotICAgICAgICBleGl0KDEpOwotICAgIH0KLQot ICAgIC8vIFJlbW92ZSB0aGUgZmlyc3QgYXJndW1lbnRzLCBpdCBpcyBhcHBsaWNhdGlvbiBuYW1l IGl0c2VsZgotICAgIGFyZ3MucmVtb3ZlQXQoMCk7Ci0KLSAgICBXZWJDb3JlOjpEdW1wUmVuZGVy VHJlZSBkdW1wZXI7Ci0KLSAgICBpbnQgaW5kZXggPSBhcmdzLmluZGV4T2YoUUxhdGluMVN0cmlu ZygiLS1zdGRvdXQiKSk7Ci0gICAgaWYgKGluZGV4ICE9IC0xKSB7Ci0gICAgICAgIFFTdHJpbmcg ZmlsZU5hbWUgPSB0YWtlT3B0aW9uVmFsdWUoYXJncywgaW5kZXgpOwotICAgICAgICBkdW1wZXIu c2V0UmVkaXJlY3RPdXRwdXRGaWxlTmFtZShmaWxlTmFtZSk7Ci0gICAgICAgIGlmIChmaWxlTmFt ZS5pc0VtcHR5KCkgfHwgIWZyZW9wZW4ocVByaW50YWJsZShmaWxlTmFtZSksICJ3Iiwgc3Rkb3V0 KSkgewotICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJTVERPVVQgcmVkaXJlY3Rpb24gZmFp bGVkLiIpOwotICAgICAgICAgICAgZXhpdCgxKTsKLSAgICAgICAgfQotICAgIH0KLSAgICBpbmRl eCA9IGFyZ3MuaW5kZXhPZihRTGF0aW4xU3RyaW5nKCItLXN0ZGVyciIpKTsKLSAgICBpZiAoaW5k ZXggIT0gLTEpIHsKLSAgICAgICAgUVN0cmluZyBmaWxlTmFtZSA9IHRha2VPcHRpb25WYWx1ZShh cmdzLCBpbmRleCk7Ci0gICAgICAgIGR1bXBlci5zZXRSZWRpcmVjdEVycm9yRmlsZU5hbWUoZmls ZU5hbWUpOwotICAgICAgICBpZiAoIWZyZW9wZW4ocVByaW50YWJsZShmaWxlTmFtZSksICJ3Iiwg c3RkZXJyKSkgewotICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJTVERFUlIgcmVkaXJlY3Rp b24gZmFpbGVkLiIpOwotICAgICAgICAgICAgZXhpdCgxKTsKLSAgICAgICAgfQotICAgIH0KLSAg ICBRV2ViRGF0YWJhc2U6OnJlbW92ZUFsbERhdGFiYXNlcygpOwotCi0gICAgaW5kZXggPSBhcmdz LmluZGV4T2YoUUxhdGluMVN0cmluZygiLS10aW1lb3V0IikpOwotICAgIGlmIChpbmRleCAhPSAt MSkgewotICAgICAgICBpbnQgdGltZW91dCA9IHRha2VPcHRpb25WYWx1ZShhcmdzLCBpbmRleCku dG9JbnQoKTsKLSAgICAgICAgZHVtcGVyLnNldFRpbWVvdXQodGltZW91dCk7Ci0gICAgfQotCi0g ICAgaW5kZXggPSBhcmdzLmluZGV4T2YoUUxhdGluMVN0cmluZygiLS1uby10aW1lb3V0IikpOwot ICAgIGlmIChpbmRleCAhPSAtMSkgewotICAgICAgICBkdW1wZXIuc2V0U2hvdWxkVGltZW91dChm YWxzZSk7Ci0gICAgICAgIGFyZ3MucmVtb3ZlQXQoaW5kZXgpOwotICAgIH0KLQotICAgIGluZGV4 ID0gYXJncy5pbmRleE9mKFFMYXRpbjFTdHJpbmcoIi0iKSk7Ci0gICAgaWYgKGluZGV4ICE9IC0x KSB7Ci0gICAgICAgIGFyZ3MucmVtb3ZlQXQoaW5kZXgpOwotCi0gICAgICAgIC8vIENvbnRpbnVl IHdhaXRpbmcgaW4gU1RESU4gZm9yIG1vcmUgdGVzdCBjYXNlIGFmdGVyIHByb2Nlc3Mgb25lIHRl c3QgY2FzZQotICAgICAgICBRT2JqZWN0Ojpjb25uZWN0KCZkdW1wZXIsIFNJR05BTChyZWFkeSgp KSwgJmR1bXBlciwgU0xPVChyZWFkTGluZSgpKSwgUXQ6OlF1ZXVlZENvbm5lY3Rpb24pOyAgIAot Ci0gICAgICAgIC8vIFJlYWQgYW5kIG9ubHkgcmVhZCB0aGUgZmlyc3QgdGVzdCBjYXNlLCBpZ25v cmUgdGhlIG90aGVycyAKLSAgICAgICAgaWYgKGFyZ3Muc2l6ZSgpID4gMCkgeyAKLSAgICAgICAg ICAgIC8vIFByb2Nlc3MgdGhlIGFyZ3VtZW50IGZpcnN0Ci0gICAgICAgICAgICBkdW1wZXIucHJv Y2Vzc0xpbmUoYXJnc1swXSk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICBRVGltZXI6OnNp bmdsZVNob3QoMCwgJmR1bXBlciwgU0xPVChyZWFkTGluZSgpKSk7Ci0gICAgfSBlbHNlIHsKLSAg ICAgICAgLy8gR28gaW50byBzdGFuZGFsb25lIG1vZGUKLSAgICAgICAgLy8gU3RhbmRhbG9uZSBt b2RlIG5lZWQgYXQgbGVhc3Qgb25lIHRlc3QgY2FzZQotICAgICAgICBpZiAoYXJncy5jb3VudCgp IDwgMSkgewotICAgICAgICAgICAgcHJpbnRVc2FnZSgpOwotICAgICAgICAgICAgZXhpdCgxKTsK LSAgICAgICAgfQotICAgICAgICBkdW1wZXIucHJvY2Vzc0FyZ3NMaW5lKGFyZ3MpOwotICAgIH0K LSAgICByZXR1cm4gYXBwLmV4ZWMoKTsKLX0K