30256 2009-10-09 11:20:37 -0700 ~96 regression tests fail when using QuickTime 7.6 (they pass with QuickTime 7.3) 2009-12-03 14:22:10 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Windows XP RESOLVED FIXED InRadar, PlatformOnly P2 Normal --- 1 bweinstein webkit-unassigned aroben eric.carlson webkit.review.bot oldest_to_newest 153725 0 bweinstein 2009-10-09 11:20:37 -0700 When the Windows buildbots were updated to Quicktime 7.6, ~100 media tests started failing. These were media tests and other tests that depended on media attributes (some of the fast/js tests were failing because they couldn't find an Audio object, for example). When researching, I noticed the Quicktime SDK is only at version 7.3, which could have something to do with it. 153726 1 bweinstein 2009-10-09 11:23:28 -0700 <rdar://problem/7290966> 168426 2 44247 eric.carlson 2009-12-03 09:01:45 -0800 Created attachment 44247 Proposed patch 168428 3 webkit.review.bot 2009-12-03 09:03:47 -0800 Attachment 44247 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp:216: Tab found; better to use spaces [whitespace/tab] [1] Total errors found: 1 168429 4 44248 eric.carlson 2009-12-03 09:08:58 -0800 Created attachment 44248 Patch, without tabs this time. 168430 5 webkit.review.bot 2009-12-03 09:14:16 -0800 style-queue ran check-webkit-style on attachment 44248 without any errors. 168432 6 44248 aroben 2009-12-03 09:25:31 -0800 Comment on attachment 44248 Patch, without tabs this time. > +static void addQTDirToPATH() > +{ > + static LPCWSTR pathEnvironmentVariable = L"PATH"; > + static LPCWSTR quickTimeKeyName = L"Software\\Apple Computer, Inc.\\QuickTime"; > + static LPCWSTR quickTimeSysDir = L"QTSysDir"; > + static bool initialized; > + > + if (initialized) > + return; > + initialized = true; > + > + // Get the QuickTime dll directory from the registry. The key can be in either HKLM or HKCU. > + HKEY hKey; > + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, quickTimeKeyName, 0, KEY_READ, &hKey)) { > + if (RegOpenKeyEx(HKEY_CURRENT_USER, quickTimeKeyName, 0, KEY_READ, &hKey)) > + return; > + } I think (throughout this function) it would be better to compare with ERROR_SUCCESS. > + DWORD type; > + DWORD bufferSize; > + LONG err = RegQueryValueEx(hKey, quickTimeSysDir, 0, &type, 0, &bufferSize); > + if (err || !bufferSize || type != REG_SZ) { > + RegCloseKey(hKey); > + return; > + } > + > + Vector<TCHAR> qtDir(bufferSize); > + err = RegQueryValueEx(hKey, quickTimeSysDir, 0, 0, (LPBYTE)qtDir.data(), &bufferSize); > + RegCloseKey(hKey); > + if (err || !bufferSize) > + return; Can we use SHGetValue instead? That would be a lot simpler. > + > + // Read the current PATH > + DWORD pathSize = GetEnvironmentVariable(pathEnvironmentVariable, 0, 0); > + Vector<TCHAR> oldPath(pathSize); > + if (!GetEnvironmentVariable(pathEnvironmentVariable, oldPath.data(), oldPath.size())) > + return; > + > + // And add the QuickTime dll. > + wstring newPath; > + newPath.append(qtDir.data(), qtDir.size() - 1); > + newPath.append(L";"); > + newPath.append(oldPath.data(), oldPath.size()); > + SetEnvironmentVariable(pathEnvironmentVariable, newPath.c_str()); > +} There's a strange mix of TCHAR and WCHAR here. I'd just always use WCHAR and call the *W versions of the APIs (e.g., SetEnvironmentVariableW). > @@ -263,6 +309,8 @@ static void initialize() > for (int i = 0; i < ARRAYSIZE(fontsToInstall); ++i) > textRenderer->registerPrivateFont(wstring(resourcesPath + fontsToInstall[i]).c_str()); > > + addQTDirToPATH(); I think it's worth adding a comment explaining why this is necessary. r=me, but you should consider these comments. 168530 7 44267 eric.carlson 2009-12-03 13:41:47 -0800 Created attachment 44267 Simplified patch. 168531 8 webkit.review.bot 2009-12-03 13:42:29 -0800 style-queue ran check-webkit-style on attachment 44267 without any errors. 168533 9 44267 aroben 2009-12-03 13:47:23 -0800 Comment on attachment 44267 Simplified patch. > + // Read the current PATH. > + DWORD pathSize = GetEnvironmentVariableW(pathEnvironmentVariable, 0, 0); > + Vector<TCHAR> oldPath(pathSize); > + if (!GetEnvironmentVariable(pathEnvironmentVariable, oldPath.data(), oldPath.size())) > + return; That should be Vector<WCHAR>. r=me 168545 10 eric.carlson 2009-12-03 14:22:10 -0800 http://trac.webkit.org/changeset/51663 and http://trac.webkit.org/changeset/51664 44247 2009-12-03 09:01:45 -0800 2009-12-03 09:08:58 -0800 Proposed patch patch_3.txt text/plain 3036 eric.carlson SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDUxNjM2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTItMDMgIEVyaWMgQ2FybHNvbiAgPGVy aWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgfjk2IHJlZ3Jlc3Npb24gdGVzdHMgZmFpbCB3aGVuIHVzaW5nIFF1aWNr VGltZSA3LjYgKHRoZXkgcGFzcyB3aXRoIFF1aWNrVGltZSA3LjMpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDI1NgorCisgICAgICAgIEFkZCB0aGUg UXVpY2tUaW1lIGRsbCBkaXJlY3RvcnkgdG8gdGhlIFBBVEggZW52aXJvbm1lbnQgdmFyaWFibGUg c28KKyAgICAgICAgaW5pYWxpemF0aW9uIGNhbiBzdWNjZWVkLgorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGFkZFFURGlyVG9QQVRI KToKKyAgICAgICAgKGluaXRpYWxpemUpOgorCiAyMDA5LTEyLTAzICBBbmRyYXMgQmVjc2kgIDxh YmVjc2lAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1 bXBSZW5kZXJUcmVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCShyZXZpc2lvbiA1MTYzNikKKysrIFdlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIwMSw2ICsyMDEsNTIgQEAgc3RhdGljIGNvbnN0IHdzdHJpbmcmIGZvbnRzUGF0aCgpCiAgICAg cmV0dXJuIHBhdGg7CiB9CiAKK3N0YXRpYyB2b2lkIGFkZFFURGlyVG9QQVRIKCkKK3sKKyAgICBz dGF0aWMgTFBDV1NUUiBwYXRoRW52aXJvbm1lbnRWYXJpYWJsZSA9IEwiUEFUSCI7CisgICAgc3Rh dGljIExQQ1dTVFIgcXVpY2tUaW1lS2V5TmFtZSA9IEwiU29mdHdhcmVcXEFwcGxlIENvbXB1dGVy LCBJbmMuXFxRdWlja1RpbWUiOworICAgIHN0YXRpYyBMUENXU1RSIHF1aWNrVGltZVN5c0RpciA9 IEwiUVRTeXNEaXIiOworICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVkOworCisgICAgaWYgKGlu aXRpYWxpemVkKQorICAgICAgICByZXR1cm47CisgICAgaW5pdGlhbGl6ZWQgPSB0cnVlOworCisg ICAgLy8gR2V0IHRoZSBRdWlja1RpbWUgZGxsIGRpcmVjdG9yeSBmcm9tIHRoZSByZWdpc3RyeS4g VGhlIGtleSBjYW4gYmUgaW4gZWl0aGVyIEhLTE0gb3IgSEtDVS4KKwlIS0VZIGhLZXk7CisgICAg aWYgKFJlZ09wZW5LZXlFeChIS0VZX0xPQ0FMX01BQ0hJTkUsIHF1aWNrVGltZUtleU5hbWUsIDAs IEtFWV9SRUFELCAmaEtleSkpIHsKKyAgICAgICAgaWYgKFJlZ09wZW5LZXlFeChIS0VZX0NVUlJF TlRfVVNFUiwgcXVpY2tUaW1lS2V5TmFtZSwgMCwgS0VZX1JFQUQsICZoS2V5KSkKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBEV09SRCB0eXBlOworICAgIERXT1JEIGJ1ZmZlclNp emU7CisgICAgTE9ORyBlcnIgPSBSZWdRdWVyeVZhbHVlRXgoaEtleSwgcXVpY2tUaW1lU3lzRGly LCAwLCAmdHlwZSwgMCwgJmJ1ZmZlclNpemUpOworICAgIGlmIChlcnIgfHwgIWJ1ZmZlclNpemUg fHwgdHlwZSAhPSBSRUdfU1opIHsKKyAgICAgICAgUmVnQ2xvc2VLZXkoaEtleSk7CisgICAgICAg IHJldHVybjsKKyAgICB9CisKKyAgICBWZWN0b3I8VENIQVI+IHF0RGlyKGJ1ZmZlclNpemUpOwor ICAgIGVyciA9IFJlZ1F1ZXJ5VmFsdWVFeChoS2V5LCBxdWlja1RpbWVTeXNEaXIsIDAsIDAsIChM UEJZVEUpcXREaXIuZGF0YSgpLCAmYnVmZmVyU2l6ZSk7CisgICAgUmVnQ2xvc2VLZXkoaEtleSk7 CisgICAgaWYgKGVyciB8fCAhYnVmZmVyU2l6ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8g UmVhZCB0aGUgY3VycmVudCBQQVRICisgICAgRFdPUkQgcGF0aFNpemUgPSBHZXRFbnZpcm9ubWVu dFZhcmlhYmxlKHBhdGhFbnZpcm9ubWVudFZhcmlhYmxlLCAwLCAwKTsKKyAgICBWZWN0b3I8VENI QVI+IG9sZFBhdGgocGF0aFNpemUpOworICAgIGlmICghR2V0RW52aXJvbm1lbnRWYXJpYWJsZShw YXRoRW52aXJvbm1lbnRWYXJpYWJsZSwgb2xkUGF0aC5kYXRhKCksIG9sZFBhdGguc2l6ZSgpKSkK KyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQW5kIGFkZCB0aGUgUXVpY2tUaW1lIGRsbC4KKyAg ICB3c3RyaW5nIG5ld1BhdGg7CisgICAgbmV3UGF0aC5hcHBlbmQocXREaXIuZGF0YSgpLCBxdERp ci5zaXplKCkgLSAxKTsKKyAgICBuZXdQYXRoLmFwcGVuZChMIjsiKTsKKyAgICBuZXdQYXRoLmFw cGVuZChvbGRQYXRoLmRhdGEoKSwgb2xkUGF0aC5zaXplKCkpOworICAgIFNldEVudmlyb25tZW50 VmFyaWFibGUocGF0aEVudmlyb25tZW50VmFyaWFibGUsIG5ld1BhdGguY19zdHIoKSk7Cit9CisK ICNpZmRlZiBERUJVR19BTEwKICNkZWZpbmUgV0VCS0lURExMIFRFWFQoIldlYktpdF9kZWJ1Zy5k bGwiKQogI2Vsc2UKQEAgLTI2Myw2ICszMDksOCBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXplKCkK ICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBBUlJBWVNJWkUoZm9udHNUb0luc3RhbGwpOyAr K2kpCiAgICAgICAgICAgICB0ZXh0UmVuZGVyZXItPnJlZ2lzdGVyUHJpdmF0ZUZvbnQod3N0cmlu ZyhyZXNvdXJjZXNQYXRoICsgZm9udHNUb0luc3RhbGxbaV0pLmNfc3RyKCkpOwogCisgICAgYWRk UVREaXJUb1BBVEgoKTsKKwogICAgIC8vIFJlZ2lzdGVyIGEgaG9zdCB3aW5kb3cKICAgICBXTkRD TEFTU0VYIHdjZXg7CiAK 44248 2009-12-03 09:08:58 -0800 2009-12-03 13:41:47 -0800 Patch, without tabs this time. patch_3.txt text/plain 3039 eric.carlson SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDUxNjM2KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTItMDMgIEVyaWMgQ2FybHNvbiAgPGVy aWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgfjk2IHJlZ3Jlc3Npb24gdGVzdHMgZmFpbCB3aGVuIHVzaW5nIFF1aWNr VGltZSA3LjYgKHRoZXkgcGFzcyB3aXRoIFF1aWNrVGltZSA3LjMpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDI1NgorCisgICAgICAgIEFkZCB0aGUg UXVpY2tUaW1lIGRsbCBkaXJlY3RvcnkgdG8gdGhlIFBBVEggZW52aXJvbm1lbnQgdmFyaWFibGUg c28KKyAgICAgICAgaW5pYWxpemF0aW9uIGNhbiBzdWNjZWVkLgorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGFkZFFURGlyVG9QQVRI KToKKyAgICAgICAgKGluaXRpYWxpemUpOgorCiAyMDA5LTEyLTAzICBBbmRyYXMgQmVjc2kgIDxh YmVjc2lAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9o ZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1 bXBSZW5kZXJUcmVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCShyZXZpc2lvbiA1MTYzNikKKysrIFdlYktpdFRvb2xz L0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIwMSw2ICsyMDEsNTIgQEAgc3RhdGljIGNvbnN0IHdzdHJpbmcmIGZvbnRzUGF0aCgpCiAgICAg cmV0dXJuIHBhdGg7CiB9CiAKK3N0YXRpYyB2b2lkIGFkZFFURGlyVG9QQVRIKCkKK3sKKyAgICBz dGF0aWMgTFBDV1NUUiBwYXRoRW52aXJvbm1lbnRWYXJpYWJsZSA9IEwiUEFUSCI7CisgICAgc3Rh dGljIExQQ1dTVFIgcXVpY2tUaW1lS2V5TmFtZSA9IEwiU29mdHdhcmVcXEFwcGxlIENvbXB1dGVy LCBJbmMuXFxRdWlja1RpbWUiOworICAgIHN0YXRpYyBMUENXU1RSIHF1aWNrVGltZVN5c0RpciA9 IEwiUVRTeXNEaXIiOworICAgIHN0YXRpYyBib29sIGluaXRpYWxpemVkOworCisgICAgaWYgKGlu aXRpYWxpemVkKQorICAgICAgICByZXR1cm47CisgICAgaW5pdGlhbGl6ZWQgPSB0cnVlOworCisg ICAgLy8gR2V0IHRoZSBRdWlja1RpbWUgZGxsIGRpcmVjdG9yeSBmcm9tIHRoZSByZWdpc3RyeS4g VGhlIGtleSBjYW4gYmUgaW4gZWl0aGVyIEhLTE0gb3IgSEtDVS4KKyAgICBIS0VZIGhLZXk7Cisg ICAgaWYgKFJlZ09wZW5LZXlFeChIS0VZX0xPQ0FMX01BQ0hJTkUsIHF1aWNrVGltZUtleU5hbWUs IDAsIEtFWV9SRUFELCAmaEtleSkpIHsKKyAgICAgICAgaWYgKFJlZ09wZW5LZXlFeChIS0VZX0NV UlJFTlRfVVNFUiwgcXVpY2tUaW1lS2V5TmFtZSwgMCwgS0VZX1JFQUQsICZoS2V5KSkKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBEV09SRCB0eXBlOworICAgIERXT1JEIGJ1ZmZl clNpemU7CisgICAgTE9ORyBlcnIgPSBSZWdRdWVyeVZhbHVlRXgoaEtleSwgcXVpY2tUaW1lU3lz RGlyLCAwLCAmdHlwZSwgMCwgJmJ1ZmZlclNpemUpOworICAgIGlmIChlcnIgfHwgIWJ1ZmZlclNp emUgfHwgdHlwZSAhPSBSRUdfU1opIHsKKyAgICAgICAgUmVnQ2xvc2VLZXkoaEtleSk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBWZWN0b3I8VENIQVI+IHF0RGlyKGJ1ZmZlclNpemUp OworICAgIGVyciA9IFJlZ1F1ZXJ5VmFsdWVFeChoS2V5LCBxdWlja1RpbWVTeXNEaXIsIDAsIDAs IChMUEJZVEUpcXREaXIuZGF0YSgpLCAmYnVmZmVyU2l6ZSk7CisgICAgUmVnQ2xvc2VLZXkoaEtl eSk7CisgICAgaWYgKGVyciB8fCAhYnVmZmVyU2l6ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAg Ly8gUmVhZCB0aGUgY3VycmVudCBQQVRICisgICAgRFdPUkQgcGF0aFNpemUgPSBHZXRFbnZpcm9u bWVudFZhcmlhYmxlKHBhdGhFbnZpcm9ubWVudFZhcmlhYmxlLCAwLCAwKTsKKyAgICBWZWN0b3I8 VENIQVI+IG9sZFBhdGgocGF0aFNpemUpOworICAgIGlmICghR2V0RW52aXJvbm1lbnRWYXJpYWJs ZShwYXRoRW52aXJvbm1lbnRWYXJpYWJsZSwgb2xkUGF0aC5kYXRhKCksIG9sZFBhdGguc2l6ZSgp KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gQW5kIGFkZCB0aGUgUXVpY2tUaW1lIGRsbC4K KyAgICB3c3RyaW5nIG5ld1BhdGg7CisgICAgbmV3UGF0aC5hcHBlbmQocXREaXIuZGF0YSgpLCBx dERpci5zaXplKCkgLSAxKTsKKyAgICBuZXdQYXRoLmFwcGVuZChMIjsiKTsKKyAgICBuZXdQYXRo LmFwcGVuZChvbGRQYXRoLmRhdGEoKSwgb2xkUGF0aC5zaXplKCkpOworICAgIFNldEVudmlyb25t ZW50VmFyaWFibGUocGF0aEVudmlyb25tZW50VmFyaWFibGUsIG5ld1BhdGguY19zdHIoKSk7Cit9 CisKICNpZmRlZiBERUJVR19BTEwKICNkZWZpbmUgV0VCS0lURExMIFRFWFQoIldlYktpdF9kZWJ1 Zy5kbGwiKQogI2Vsc2UKQEAgLTI2Myw2ICszMDksOCBAQCBzdGF0aWMgdm9pZCBpbml0aWFsaXpl KCkKICAgICAgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBBUlJBWVNJWkUoZm9udHNUb0luc3RhbGwp OyArK2kpCiAgICAgICAgICAgICB0ZXh0UmVuZGVyZXItPnJlZ2lzdGVyUHJpdmF0ZUZvbnQod3N0 cmluZyhyZXNvdXJjZXNQYXRoICsgZm9udHNUb0luc3RhbGxbaV0pLmNfc3RyKCkpOwogCisgICAg YWRkUVREaXJUb1BBVEgoKTsKKwogICAgIC8vIFJlZ2lzdGVyIGEgaG9zdCB3aW5kb3cKICAgICBX TkRDTEFTU0VYIHdjZXg7CiAK 44267 2009-12-03 13:41:47 -0800 2009-12-03 13:47:22 -0800 Simplified patch. patch_5.txt text/plain 3094 eric.carlson SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDUxNjQyKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTItMDMgIEVyaWMgQ2FybHNvbiAgPGVy aWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgfjk2IHJlZ3Jlc3Npb24gdGVzdHMgZmFpbCB3aGVuIHVzaW5nIFF1aWNr VGltZSA3LjYgKHRoZXkgcGFzcyB3aXRoIFF1aWNrVGltZSA3LjMpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDI1NgorCisgICAgICAgIEFkZCB0aGUg UXVpY2tUaW1lIGRsbCBkaXJlY3RvcnkgdG8gdGhlIFBBVEggZW52aXJvbm1lbnQgdmFyaWFibGUg c28KKyAgICAgICAgaW5pYWxpemF0aW9uIGNhbiBzdWNjZWVkLgorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKGFkZFFURGlyVG9QQVRI KToKKyAgICAgICAgKGluaXRpYWxpemUpOgorCiAyMDA5LTEyLTAzICBBbmRyYXMgQmVjc2kgIDxh YmVjc2lAaW5mLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgpJ bmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRy ZWUuY3BwCShyZXZpc2lvbiA1MTYzNikKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dp bi9EdW1wUmVuZGVyVHJlZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMSw2ICsyMDEsNDMgQEAg c3RhdGljIGNvbnN0IHdzdHJpbmcmIGZvbnRzUGF0aCgpCiAgICAgcmV0dXJuIHBhdGg7CiB9CiAK K3N0YXRpYyB2b2lkIGFkZFFURGlyVG9QQVRIKCkKK3sKKyAgICBzdGF0aWMgTFBDV1NUUiBwYXRo RW52aXJvbm1lbnRWYXJpYWJsZSA9IEwiUEFUSCI7CisgICAgc3RhdGljIExQQ1dTVFIgcXVpY2tU aW1lS2V5TmFtZSA9IEwiU29mdHdhcmVcXEFwcGxlIENvbXB1dGVyLCBJbmMuXFxRdWlja1RpbWUi OworICAgIHN0YXRpYyBMUENXU1RSIHF1aWNrVGltZVN5c0RpciA9IEwiUVRTeXNEaXIiOworICAg IHN0YXRpYyBib29sIGluaXRpYWxpemVkOworCisgICAgaWYgKGluaXRpYWxpemVkKQorICAgICAg ICByZXR1cm47CisgICAgaW5pdGlhbGl6ZWQgPSB0cnVlOworCisgICAgLy8gR2V0IHRoZSBRdWlj a1RpbWUgZGxsIGRpcmVjdG9yeSBmcm9tIHRoZSByZWdpc3RyeS4gVGhlIGtleSBjYW4gYmUgaW4g ZWl0aGVyIEhLTE0gb3IgSEtDVS4KKyAgICBXQ0hBUiBxdFBhdGhbTUFYX1BBVEhdOworICAgIERX T1JEIHF0UGF0aEJ1ZmZlckxlbiA9IHNpemVvZihxdFBhdGgpOworICAgIERXT1JEIGtleVR5cGU7 CisgICAgSFJFU1VMVCByZXN1bHQgPSBTSEdldFZhbHVlKEhLRVlfTE9DQUxfTUFDSElORSwgcXVp Y2tUaW1lS2V5TmFtZSwgcXVpY2tUaW1lU3lzRGlyLCAma2V5VHlwZSwgKExQVk9JRClxdFBhdGgs ICZxdFBhdGhCdWZmZXJMZW4pOworICAgIGlmIChyZXN1bHQgIT0gRVJST1JfU1VDQ0VTUyB8fCAh cXRQYXRoQnVmZmVyTGVuIHx8IGtleVR5cGUgIT0gUkVHX1NaKSB7CisgICAgICAgIHF0UGF0aEJ1 ZmZlckxlbiA9IHNpemVvZihxdFBhdGgpOworICAgICAgICByZXN1bHQgPSBTSEdldFZhbHVlKEhL RVlfQ1VSUkVOVF9VU0VSLCBxdWlja1RpbWVLZXlOYW1lLCBxdWlja1RpbWVTeXNEaXIsICZrZXlU eXBlLCAoTFBWT0lEKXF0UGF0aCwgJnF0UGF0aEJ1ZmZlckxlbik7CisgICAgICAgIGlmIChyZXN1 bHQgIT0gRVJST1JfU1VDQ0VTUyB8fCAhcXRQYXRoQnVmZmVyTGVuIHx8IGtleVR5cGUgIT0gUkVH X1NaKQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIC8vIFJlYWQgdGhlIGN1cnJl bnQgUEFUSC4KKyAgICBEV09SRCBwYXRoU2l6ZSA9IEdldEVudmlyb25tZW50VmFyaWFibGVXKHBh dGhFbnZpcm9ubWVudFZhcmlhYmxlLCAwLCAwKTsKKyAgICBWZWN0b3I8VENIQVI+IG9sZFBhdGgo cGF0aFNpemUpOworICAgIGlmICghR2V0RW52aXJvbm1lbnRWYXJpYWJsZShwYXRoRW52aXJvbm1l bnRWYXJpYWJsZSwgb2xkUGF0aC5kYXRhKCksIG9sZFBhdGguc2l6ZSgpKSkKKyAgICAgICAgcmV0 dXJuOworCisgICAgLy8gQW5kIGFkZCB0aGUgUXVpY2tUaW1lIGRsbC4KKyAgICB3c3RyaW5nIG5l d1BhdGg7CisgICAgbmV3UGF0aC5hcHBlbmQocXRQYXRoKTsKKyAgICBuZXdQYXRoLmFwcGVuZChM IjsiKTsKKyAgICBuZXdQYXRoLmFwcGVuZChvbGRQYXRoLmRhdGEoKSwgb2xkUGF0aC5zaXplKCkp OworICAgIFNldEVudmlyb25tZW50VmFyaWFibGVXKHBhdGhFbnZpcm9ubWVudFZhcmlhYmxlLCBu ZXdQYXRoLmRhdGEoKSk7Cit9CisKICNpZmRlZiBERUJVR19BTEwKICNkZWZpbmUgV0VCS0lURExM IFRFWFQoIldlYktpdF9kZWJ1Zy5kbGwiKQogI2Vsc2UKQEAgLTI2Myw2ICszMDAsMTAgQEAgc3Rh dGljIHZvaWQgaW5pdGlhbGl6ZSgpCiAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgQVJSQVlT SVpFKGZvbnRzVG9JbnN0YWxsKTsgKytpKQogICAgICAgICAgICAgdGV4dFJlbmRlcmVyLT5yZWdp c3RlclByaXZhdGVGb250KHdzdHJpbmcocmVzb3VyY2VzUGF0aCArIGZvbnRzVG9JbnN0YWxsW2ld KS5jX3N0cigpKTsKIAorICAgIC8vIEFkZCB0aGUgUXVpY2tUaW1lIGRsbCBkaXJlY3RvcnkgdG8g UEFUSCBvciBRVCA3LjYgd2lsbCBmYWlsIHRvIGluaXRpYWxpemUgb24gc3lzdGVtcworICAgIC8v IGxpbmtlZCB3aXRoIG9sZGVyIHZlcnNpb25zIG9mIHF0bWxjbGllbnRsaWIuZGxsLgorICAgIGFk ZFFURGlyVG9QQVRIKCk7CisKICAgICAvLyBSZWdpc3RlciBhIGhvc3Qgd2luZG93CiAgICAgV05E Q0xBU1NFWCB3Y2V4OwogCg==