mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Closes 24584: Windows installer incorrectly detects CRT version on Windows 10

Browse source
This commit is contained in:
Steve Dower 2015-07-07 20:47:28 -07:00
parent 80d0651117
commit b257eed043
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file

@ -2399,10 +2399,10 @@ private:
return FALSE; 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 // It should only be installed as a Windows Update package, which means
// we don't need to worry about 32-bit/64-bit. // 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); DWORD cbVer = GetFileVersionInfoSizeW(crtFile, nullptr);
if (!cbVer) { if (!cbVer) {
@ -2427,7 +2427,7 @@ private:
BOOL result = FALSE; BOOL result = FALSE;
if (VerQueryValueW(pData, L"\\", (LPVOID*)&ffi, &cb) && if (VerQueryValueW(pData, L"\\", (LPVOID*)&ffi, &cb) &&
ffi->dwFileVersionMS == 0x000A0000 && ffi->dwFileVersionLS >= 0x26C40000) { ffi->dwFileVersionMS == 0x000A0000 && ffi->dwFileVersionLS >= 0x27990000) {
result = TRUE; result = TRUE;
} }