diff options
author | Steve Dower <steve.dower@microsoft.com> | 2015-07-07 20:47:28 -0700 |
---|---|---|
committer | Steve Dower <steve.dower@microsoft.com> | 2015-07-07 20:47:28 -0700 |
commit | b257eed0431d1a74b064cb357b0be9ed45636b34 (patch) | |
tree | 545678778446975125bc3172e643535275e29c25 /Tools | |
parent | 80d0651117342845b5816d506fa55bac2c2b3f95 (diff) | |
download | cpython-git-b257eed0431d1a74b064cb357b0be9ed45636b34.tar.gz |
Closes 24584: Windows installer incorrectly detects CRT version on Windows 10
Diffstat (limited to 'Tools')
-rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 1917937f6b..585f66cd5b 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -2399,10 +2399,10 @@ private: return FALSE; } - // Check whether at least CRT v10.0.9924.0 is available. + // Check whether at least CRT v10.0.10137.0 is available. // It should only be installed as a Windows Update package, which means // we don't need to worry about 32-bit/64-bit. - LPCWSTR crtFile = L"api-ms-win-crt-runtime-l1-1-0.dll"; + LPCWSTR crtFile = L"ucrtbase.dll"; DWORD cbVer = GetFileVersionInfoSizeW(crtFile, nullptr); if (!cbVer) { @@ -2427,7 +2427,7 @@ private: BOOL result = FALSE; if (VerQueryValueW(pData, L"\\", (LPVOID*)&ffi, &cb) && - ffi->dwFileVersionMS == 0x000A0000 && ffi->dwFileVersionLS >= 0x26C40000) { + ffi->dwFileVersionMS == 0x000A0000 && ffi->dwFileVersionLS >= 0x27990000) { result = TRUE; } |