55226 2011-02-25 09:35:35 -0800 Add appropriate UA string tags for running on Windows x64 2011-03-09 22:31:51 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 55979 54556 1 pkasting pkasting aroben dbates webkit.review.bot oldest_to_newest 357972 0 pkasting 2011-02-25 09:35:35 -0800 This matches IE and Firefox. 358007 1 pkasting 2011-02-25 10:21:49 -0800 Clarity: When running a 32-bit browser app (via WOW64): Add "WOW64" token after OS version When running a 64-bit browser app (natively): Add "Win64; x64" tokens after OS version I don't know if anyone is building 64-bit WebKit variants yet. 364981 2 85282 pkasting 2011-03-09 21:26:37 -0800 Created attachment 85282 Patch v1 364982 3 webkit.review.bot 2011-03-09 21:29:28 -0800 Attachment 85282 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/win/SystemInfo.cpp:149: system_info is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Source/WebCore/platform/win/SystemInfo.cpp:162: An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 364985 4 85282 rniwa 2011-03-09 21:38:27 -0800 Comment on attachment 85282 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=85282&action=review > Source/WebCore/platform/win/SystemInfo.cpp:123 > + HMODULE kernel32Module = GetModuleHandle(L"kernel32.dll"); So we always bind to 64-bit version of the API? Shouldn't we be using TEXT macro? > Source/WebCore/platform/win/SystemInfo.cpp:124 > + if (kernel32Module) { It seems like that an early exist will be cleaner. > Source/WebCore/platform/win/SystemInfo.cpp:145 > + if (kernel32Module) { Ditto about early exist. > Source/WebCore/platform/win/SystemInfo.cpp:164 > + else if (processorArchitecture() == PROCESSOR_ARCHITECTURE_AMD64) Nit: no else here. 364987 5 85284 pkasting 2011-03-09 21:50:09 -0800 Created attachment 85284 Patch v2 Fixes style errors and other problems. 364990 6 85284 rniwa 2011-03-09 22:03:42 -0800 Comment on attachment 85284 Patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=85284&action=review Looks sane to me! > Source/WebCore/platform/win/SystemInfo.cpp:122 > + if (!initialized) { > + initialized = true; Can't we exit early here instead? as in if (initialized) return wow64; But not strongly opinionated. > Source/WebCore/platform/win/SystemInfo.cpp:130 > + wow64 = ((*isWOW64Process)(GetCurrentProcess(), &result) && result); I'd prefer isWOW64Process(GetCurrentProcess(), &result) && result; but there doesn't seem to be an explicit rule stated anywhere. 364992 7 pkasting 2011-03-09 22:11:29 -0800 (In reply to comment #6) > > Source/WebCore/platform/win/SystemInfo.cpp:122 > > + if (!initialized) { > > + initialized = true; > > Can't we exit early here instead? as in > if (initialized) > return wow64; > But not strongly opinionated. After we chatted I'm leaving this alone. > > Source/WebCore/platform/win/SystemInfo.cpp:130 > > + wow64 = ((*isWOW64Process)(GetCurrentProcess(), &result) && result); > > I'd prefer isWOW64Process(GetCurrentProcess(), &result) && result; but there doesn't seem to be an explicit rule stated anywhere. Changed. Also changed function pointers to not use explicit-deref form ("(*ptr)(args)"). Will commit when bots are green. 364998 8 pkasting 2011-03-09 22:31:51 -0800 Fixed in r80693. 85282 2011-03-09 21:26:37 -0800 2011-03-09 21:50:09 -0800 Patch v1 patch text/plain 4071 pkasting SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNjkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMDkgIFBldGVyIEth c3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBVQSBzdHJpbmcgdGFncyBmb3IgV2luZG93cyA2NC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1MjI2CisK KyAgICAgICAgKiBTdHJpbmdzTm90VG9CZUxvY2FsaXplZC50eHQ6CisgICAgICAgICogcGxhdGZv cm0vd2luL1N5c3RlbUluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6b3NWZXJzaW9uRm9yVUFT dHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6aXNXT1c2NCk6CisgICAgICAgIChXZWJDb3JlOjpw cm9jZXNzb3JBcmNoaXRlY3R1cmUpOgorICAgICAgICAoV2ViQ29yZTo6YXJjaGl0ZWN0dXJlVG9r ZW5Gb3JVQVN0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjp3aW5kb3dzVmVyc2lvbkZvclVBU3Ry aW5nKToKKwogMjAxMS0wMy0wOSAgUGV0ZXIgS2FzdGluZyAgPHBrYXN0aW5nQGdvb2dsZS5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYXR0ZW1wdGVkIGJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL1N0cmluZ3NOb3RUb0JlTG9jYWxpemVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9TdHJpbmdzTm90VG9CZUxvY2FsaXplZC50eHQJKHJldmlzaW9uIDgwNjg4KQor KysgU291cmNlL1dlYkNvcmUvU3RyaW5nc05vdFRvQmVMb2NhbGl6ZWQudHh0CSh3b3JraW5nIGNv cHkpCkBAIC05OSw2ICs5OSw5IEBACiAiOi8vIgogIjovPyMiCiAiOyAiCisiOyBXT1c2NCIKKyI7 IFdpbjY0OyB4NjQiCisiOyBXaW42NDsgSUE2NCIKICI8ISIKICI8JUAgJUA+IgogIjw/IgpAQCAt NTExLDE1ICs1MTQsMTUgQEAKICJXZWJWaWV3V2luZG93Q2xhc3MiCiAiV2ViV29ya2Vyc1ByaXZh dGUiCiAiV2luZG93cyAiCi0iV2luZG93cyBDRSIKLSJXaW5kb3dzIENFICIKLSJXaW5kb3dzIENF IC5ORVQiCiAiV2luZG93cyAzLjEiCiAiV2luZG93cyA5NSIKICJXaW5kb3dzIDk4IgogIldpbmRv d3MgOTg7IFdpbiA5eCA0LjkwIgotIldpbk5UNC4wIgorIldpbmRvd3MgQ0UiCisiV2luZG93cyBD RSAiCisiV2luZG93cyBDRSAuTkVUIgogIldpbmRvd3MgTlQgIgorIldpbk5UNC4wIgogIldtdlBs dWdpbiIKICJYU0wiCiAiWFhYWFhYLSIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3dp bi9TeXN0ZW1JbmZvLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vU3lzdGVtSW5mby5jcHAJKHJldmlzaW9uIDgwNjg5KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vd2luL1N5c3RlbUluZm8uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04Niw3ICs4Niw3IEBA IFdpbmRvd3NWZXJzaW9uIHdpbmRvd3NWZXJzaW9uKGludCogbWFqb3IKICAgICByZXR1cm4gdmVy c2lvbjsKIH0KIAotU3RyaW5nIHdpbmRvd3NWZXJzaW9uRm9yVUFTdHJpbmcoKQorc3RhdGljIFN0 cmluZyBvc1ZlcnNpb25Gb3JVQVN0cmluZygpCiB7CiAgICAgaW50IG1ham9yLCBtaW5vcjsKICAg ICBXaW5kb3dzVmVyc2lvbiB2ZXJzaW9uID0gd2luZG93c1ZlcnNpb24oJm1ham9yLCAmbWlub3Ip OwpAQCAtMTEzLDQgKzExMyw2NSBAQCBTdHJpbmcgd2luZG93c1ZlcnNpb25Gb3JVQVN0cmluZygp CiAgICAgcmV0dXJuIG1ha2VTdHJpbmcoZmFtaWx5TmFtZSwgU3RyaW5nOjpudW1iZXIobWFqb3Ip LCAnLicsIFN0cmluZzo6bnVtYmVyKG1pbm9yKSk7CiB9CiAKK3N0YXRpYyBib29sIGlzV09XNjQo KQoreworICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVkID0gZmFsc2U7CisgICAgc3RhdGljIGJv b2wgd293NjQgPSBmYWxzZTsKKworICAgIGlmICghaW5pdGlhbGl6ZWQpIHsKKyAgICAgICAgaW5p dGlhbGl6ZWQgPSB0cnVlOworICAgICAgICBITU9EVUxFIGtlcm5lbDMyTW9kdWxlID0gR2V0TW9k dWxlSGFuZGxlKEwia2VybmVsMzIuZGxsIik7CisgICAgICAgIGlmIChrZXJuZWwzMk1vZHVsZSkg eworICAgICAgICAgICAgdHlwZWRlZiBCT09MIChXSU5BUEkqIElzV293NjRQcm9jZXNzRnVuYyko SEFORExFLCBQQk9PTCk7CisgICAgICAgICAgICBJc1dvdzY0UHJvY2Vzc0Z1bmMgaXNXT1c2NFBy b2Nlc3MgPSByZWludGVycHJldF9jYXN0PElzV293NjRQcm9jZXNzRnVuYz4oR2V0UHJvY0FkZHJl c3Moa2VybmVsMzJNb2R1bGUsICJJc1dvdzY0UHJvY2VzcyIpKTsKKyAgICAgICAgICAgIGlmIChp c1dPVzY0UHJvY2VzcykgeworICAgICAgICAgICAgICAgIEJPT0wgcmVzdWx0ID0gRkFMU0U7Cisg ICAgICAgICAgICAgICAgd293NjQgPSAoKCppc1dPVzY0UHJvY2VzcykoR2V0Q3VycmVudFByb2Nl c3MoKSwgJnJlc3VsdCkgJiYgcmVzdWx0KTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAg IH0KKworICAgIHJldHVybiB3b3c2NDsKK30KKworc3RhdGljIFdPUkQgcHJvY2Vzc29yQXJjaGl0 ZWN0dXJlKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOworICAgIHN0 YXRpYyBXT1JEIGFyY2hpdGVjdHVyZSA9IFBST0NFU1NPUl9BUkNISVRFQ1RVUkVfSU5URUw7CisK KyAgICBpZiAoIWluaXRpYWxpemVkKSB7CisgICAgICAgIGluaXRpYWxpemVkID0gdHJ1ZTsKKyAg ICAgICAgSE1PRFVMRSBrZXJuZWwzMk1vZHVsZSA9IEdldE1vZHVsZUhhbmRsZShMImtlcm5lbDMy LmRsbCIpOworICAgICAgICBpZiAoa2VybmVsMzJNb2R1bGUpIHsKKyAgICAgICAgICAgIHR5cGVk ZWYgVk9JRCAoV0lOQVBJKiBHZXROYXRpdmVTeXN0ZW1JbmZvRnVuYykoTFBTWVNURU1fSU5GTyk7 CisgICAgICAgICAgICBHZXROYXRpdmVTeXN0ZW1JbmZvRnVuYyBnZXROYXRpdmVTeXN0ZW1JbmZv ID0gcmVpbnRlcnByZXRfY2FzdDxHZXROYXRpdmVTeXN0ZW1JbmZvRnVuYz4oR2V0UHJvY0FkZHJl c3Moa2VybmVsMzJNb2R1bGUsICJHZXROYXRpdmVTeXN0ZW1JbmZvIikpOworICAgICAgICAgICAg aWYgKGdldE5hdGl2ZVN5c3RlbUluZm8pIHsKKyAgICAgICAgICAgICAgICBTWVNURU1fSU5GTyBz eXN0ZW1faW5mbyA9IHswfTsKKyAgICAgICAgICAgICAgICAoKmdldE5hdGl2ZVN5c3RlbUluZm8p KCZzeXN0ZW1faW5mbyk7CisgICAgICAgICAgICAgICAgYXJjaGl0ZWN0dXJlID0gc3lzdGVtX2lu Zm8ud1Byb2Nlc3NvckFyY2hpdGVjdHVyZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAg IH0KKworICAgIHJldHVybiBhcmNoaXRlY3R1cmU7Cit9CisKK3N0YXRpYyBTdHJpbmcgYXJjaGl0 ZWN0dXJlVG9rZW5Gb3JVQVN0cmluZygpCit7CisjaWYgIU9TKFdJTkNFKQorICAgIGlmIChpc1dP VzY0KCkpCisgICAgICAgIHJldHVybiAiOyBXT1c2NCI7CisgICAgZWxzZSBpZiAocHJvY2Vzc29y QXJjaGl0ZWN0dXJlKCkgPT0gUFJPQ0VTU09SX0FSQ0hJVEVDVFVSRV9BTUQ2NCkKKyAgICAgICAg cmV0dXJuICI7IFdpbjY0OyB4NjQiOworICAgIGVsc2UgaWYgKHByb2Nlc3NvckFyY2hpdGVjdHVy ZSgpID09IFBST0NFU1NPUl9BUkNISVRFQ1RVUkVfSUE2NCkKKyAgICAgICAgcmV0dXJuICI7IFdp bjY0OyBJQTY0IjsKKyNlbmRpZgorICAgIHJldHVybiBTdHJpbmcoKTsKK30KKworU3RyaW5nIHdp bmRvd3NWZXJzaW9uRm9yVUFTdHJpbmcoKQoreworICAgIHJldHVybiBtYWtlU3RyaW5nKG9zVmVy c2lvbkZvclVBU3RyaW5nKCksIGFyY2hpdGVjdHVyZVRva2VuRm9yVUFTdHJpbmcoKSk7Cit9CisK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 85284 2011-03-09 21:50:09 -0800 2011-03-09 22:03:42 -0800 Patch v2 patch text/plain 4158 pkasting SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNjkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDMtMDkgIFBldGVyIEth c3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBVQSBzdHJpbmcgdGFncyBmb3IgV2luZG93cyA2NC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1MjI2CisK KyAgICAgICAgKiBTdHJpbmdzTm90VG9CZUxvY2FsaXplZC50eHQ6CisgICAgICAgICogcGxhdGZv cm0vd2luL1N5c3RlbUluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6b3NWZXJzaW9uRm9yVUFT dHJpbmcpOgorICAgICAgICAoV2ViQ29yZTo6aXNXT1c2NCk6CisgICAgICAgIChXZWJDb3JlOjpw cm9jZXNzb3JBcmNoaXRlY3R1cmUpOgorICAgICAgICAoV2ViQ29yZTo6YXJjaGl0ZWN0dXJlVG9r ZW5Gb3JVQVN0cmluZyk6CisgICAgICAgIChXZWJDb3JlOjp3aW5kb3dzVmVyc2lvbkZvclVBU3Ry aW5nKToKKwogMjAxMS0wMy0wOSAgUGV0ZXIgS2FzdGluZyAgPHBrYXN0aW5nQGdvb2dsZS5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgYXR0ZW1wdGVkIGJ1aWxkIGZpeC4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL1N0cmluZ3NOb3RUb0JlTG9jYWxpemVkLnR4dAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9TdHJpbmdzTm90VG9CZUxvY2FsaXplZC50eHQJKHJldmlzaW9uIDgwNjg4KQor KysgU291cmNlL1dlYkNvcmUvU3RyaW5nc05vdFRvQmVMb2NhbGl6ZWQudHh0CSh3b3JraW5nIGNv cHkpCkBAIC05OSw2ICs5OSw5IEBACiAiOi8vIgogIjovPyMiCiAiOyAiCisiOyBXT1c2NCIKKyI7 IFdpbjY0OyB4NjQiCisiOyBXaW42NDsgSUE2NCIKICI8ISIKICI8JUAgJUA+IgogIjw/IgpAQCAt NTExLDE1ICs1MTQsMTUgQEAKICJXZWJWaWV3V2luZG93Q2xhc3MiCiAiV2ViV29ya2Vyc1ByaXZh dGUiCiAiV2luZG93cyAiCi0iV2luZG93cyBDRSIKLSJXaW5kb3dzIENFICIKLSJXaW5kb3dzIENF IC5ORVQiCiAiV2luZG93cyAzLjEiCiAiV2luZG93cyA5NSIKICJXaW5kb3dzIDk4IgogIldpbmRv d3MgOTg7IFdpbiA5eCA0LjkwIgotIldpbk5UNC4wIgorIldpbmRvd3MgQ0UiCisiV2luZG93cyBD RSAiCisiV2luZG93cyBDRSAuTkVUIgogIldpbmRvd3MgTlQgIgorIldpbk5UNC4wIgogIldtdlBs dWdpbiIKICJYU0wiCiAiWFhYWFhYLSIKQEAgLTY4Nyw2ICs2OTAsNyBAQAogImphdmFzY3JpcHQ6 IgogImpwZWciCiAianMiCisia2VybmVsMzIuZGxsIgogImtpb3NrbW9kZSIKICJrc19jXzU2MDEt MTk4NyIKICJrdW5nZm9vLnR2LmVjdG8iCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS93 aW4vU3lzdGVtSW5mby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v d2luL1N5c3RlbUluZm8uY3BwCShyZXZpc2lvbiA4MDY4OSkKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL3dpbi9TeXN0ZW1JbmZvLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODYsNyArODYsNyBA QCBXaW5kb3dzVmVyc2lvbiB3aW5kb3dzVmVyc2lvbihpbnQqIG1ham9yCiAgICAgcmV0dXJuIHZl cnNpb247CiB9CiAKLVN0cmluZyB3aW5kb3dzVmVyc2lvbkZvclVBU3RyaW5nKCkKK3N0YXRpYyBT dHJpbmcgb3NWZXJzaW9uRm9yVUFTdHJpbmcoKQogewogICAgIGludCBtYWpvciwgbWlub3I7CiAg ICAgV2luZG93c1ZlcnNpb24gdmVyc2lvbiA9IHdpbmRvd3NWZXJzaW9uKCZtYWpvciwgJm1pbm9y KTsKQEAgLTExMyw0ICsxMTMsNjUgQEAgU3RyaW5nIHdpbmRvd3NWZXJzaW9uRm9yVUFTdHJpbmco KQogICAgIHJldHVybiBtYWtlU3RyaW5nKGZhbWlseU5hbWUsIFN0cmluZzo6bnVtYmVyKG1ham9y KSwgJy4nLCBTdHJpbmc6Om51bWJlcihtaW5vcikpOwogfQogCitzdGF0aWMgYm9vbCBpc1dPVzY0 KCkKK3sKKyAgICBzdGF0aWMgYm9vbCBpbml0aWFsaXplZCA9IGZhbHNlOworICAgIHN0YXRpYyBi b29sIHdvdzY0ID0gZmFsc2U7CisKKyAgICBpZiAoIWluaXRpYWxpemVkKSB7CisgICAgICAgIGlu aXRpYWxpemVkID0gdHJ1ZTsKKyAgICAgICAgSE1PRFVMRSBrZXJuZWwzMk1vZHVsZSA9IEdldE1v ZHVsZUhhbmRsZUEoImtlcm5lbDMyLmRsbCIpOworICAgICAgICBpZiAoIWtlcm5lbDMyTW9kdWxl KQorICAgICAgICAgICAgcmV0dXJuIHdvdzY0OworICAgICAgICB0eXBlZGVmIEJPT0wgKFdJTkFQ SSogSXNXb3c2NFByb2Nlc3NGdW5jKShIQU5ETEUsIFBCT09MKTsKKyAgICAgICAgSXNXb3c2NFBy b2Nlc3NGdW5jIGlzV09XNjRQcm9jZXNzID0gcmVpbnRlcnByZXRfY2FzdDxJc1dvdzY0UHJvY2Vz c0Z1bmM+KEdldFByb2NBZGRyZXNzKGtlcm5lbDMyTW9kdWxlLCAiSXNXb3c2NFByb2Nlc3MiKSk7 CisgICAgICAgIGlmIChpc1dPVzY0UHJvY2VzcykgeworICAgICAgICAgICAgQk9PTCByZXN1bHQg PSBGQUxTRTsKKyAgICAgICAgICAgIHdvdzY0ID0gKCgqaXNXT1c2NFByb2Nlc3MpKEdldEN1cnJl bnRQcm9jZXNzKCksICZyZXN1bHQpICYmIHJlc3VsdCk7CisgICAgICAgIH0KKyAgICB9CisKKyAg ICByZXR1cm4gd293NjQ7Cit9CisKK3N0YXRpYyBXT1JEIHByb2Nlc3NvckFyY2hpdGVjdHVyZSgp Cit7CisgICAgc3RhdGljIGJvb2wgaW5pdGlhbGl6ZWQgPSBmYWxzZTsKKyAgICBzdGF0aWMgV09S RCBhcmNoaXRlY3R1cmUgPSBQUk9DRVNTT1JfQVJDSElURUNUVVJFX0lOVEVMOworCisgICAgaWYg KCFpbml0aWFsaXplZCkgeworICAgICAgICBpbml0aWFsaXplZCA9IHRydWU7CisgICAgICAgIEhN T0RVTEUga2VybmVsMzJNb2R1bGUgPSBHZXRNb2R1bGVIYW5kbGVBKCJrZXJuZWwzMi5kbGwiKTsK KyAgICAgICAgaWYgKCFrZXJuZWwzMk1vZHVsZSkKKyAgICAgICAgICAgIHJldHVybiBhcmNoaXRl Y3R1cmU7CisgICAgICAgIHR5cGVkZWYgVk9JRCAoV0lOQVBJKiBHZXROYXRpdmVTeXN0ZW1JbmZv RnVuYykoTFBTWVNURU1fSU5GTyk7CisgICAgICAgIEdldE5hdGl2ZVN5c3RlbUluZm9GdW5jIGdl dE5hdGl2ZVN5c3RlbUluZm8gPSByZWludGVycHJldF9jYXN0PEdldE5hdGl2ZVN5c3RlbUluZm9G dW5jPihHZXRQcm9jQWRkcmVzcyhrZXJuZWwzMk1vZHVsZSwgIkdldE5hdGl2ZVN5c3RlbUluZm8i KSk7CisgICAgICAgIGlmIChnZXROYXRpdmVTeXN0ZW1JbmZvKSB7CisgICAgICAgICAgICBTWVNU RU1fSU5GTyBzeXN0ZW1JbmZvID0gezB9OworICAgICAgICAgICAgKCpnZXROYXRpdmVTeXN0ZW1J bmZvKSgmc3lzdGVtSW5mbyk7CisgICAgICAgICAgICBhcmNoaXRlY3R1cmUgPSBzeXN0ZW1JbmZv LndQcm9jZXNzb3JBcmNoaXRlY3R1cmU7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4g YXJjaGl0ZWN0dXJlOworfQorCitzdGF0aWMgU3RyaW5nIGFyY2hpdGVjdHVyZVRva2VuRm9yVUFT dHJpbmcoKQoreworI2lmICFPUyhXSU5DRSkKKyAgICBpZiAoaXNXT1c2NCgpKQorICAgICAgICBy ZXR1cm4gIjsgV09XNjQiOworICAgIGlmIChwcm9jZXNzb3JBcmNoaXRlY3R1cmUoKSA9PSBQUk9D RVNTT1JfQVJDSElURUNUVVJFX0FNRDY0KQorICAgICAgICByZXR1cm4gIjsgV2luNjQ7IHg2NCI7 CisgICAgaWYgKHByb2Nlc3NvckFyY2hpdGVjdHVyZSgpID09IFBST0NFU1NPUl9BUkNISVRFQ1RV UkVfSUE2NCkKKyAgICAgICAgcmV0dXJuICI7IFdpbjY0OyBJQTY0IjsKKyNlbmRpZgorICAgIHJl dHVybiBTdHJpbmcoKTsKK30KKworU3RyaW5nIHdpbmRvd3NWZXJzaW9uRm9yVUFTdHJpbmcoKQor eworICAgIHJldHVybiBtYWtlU3RyaW5nKG9zVmVyc2lvbkZvclVBU3RyaW5nKCksIGFyY2hpdGVj dHVyZVRva2VuRm9yVUFTdHJpbmcoKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK