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

zooba · zooba · commit b257eed0431d · 2015-07-07T20:47:28.000-07:00
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -2399,10 +2399,10 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
             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 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
         BOOL result = FALSE;
 
         if (VerQueryValueW(pData, L"\\", (LPVOID*)&ffi, &cb) &&
-            ffi->dwFileVersionMS == 0x000A0000 && ffi->dwFileVersionLS >= 0x26C40000) {
+            ffi->dwFileVersionMS == 0x000A0000 && ffi->dwFileVersionLS >= 0x27990000) {
             result = TRUE;
         }
         
