[Python-checkins] cpython (merge 3.5 -> default): Closes 24584: Windows installer incorrectly detects CRT version on Windows 10

[steve.dower]

https://hg.python.org/cpython/rev/877f47ca3b79
changeset:   96880:877f47ca3b79
parent:      96878:648c9fb3bdf5
parent:      96879:60eb61d6fdb4
user:        Steve Dower <steve.dower at microsoft.com>
date:        Tue Jul 07 20:47:49 2015 -0700
summary:
  Closes 24584: Windows installer incorrectly detects CRT version on Windows 10

files:
  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
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -2399,10 +2399,10 @@
             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 @@
         BOOL result = FALSE;
 
         if (VerQueryValueW(pData, L"\\", (LPVOID*)&ffi, &cb) &&
-            ffi->dwFileVersionMS == 0x000A0000 && ffi->dwFileVersionLS >= 0x26C40000) {
+            ffi->dwFileVersionMS == 0x000A0000 && ffi->dwFileVersionLS >= 0x27990000) {
             result = TRUE;
         }
         

-- 
Repository URL: https://hg.python.org/cpython