From: Steve Dower <steve.dower@microsoft.com>
Date: Wed, 8 Jul 2015 03:47:28 +0000 (-0700)
Subject: Closes 24584: Windows installer incorrectly detects CRT version on Windows 10
X-Git-Tag: v3.5.0b4~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b257eed0431d1a74b064cb357b0be9ed45636b34;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
index 1917937f6bf5..585f66cd5bfa 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;
         }