From c654e8f6a8ff2d38ee864a19a45165ec9dc29516 Mon Sep 17 00:00:00 2001 From: SeaHOH Date: Tue, 22 Oct 2019 14:49:42 +0800 Subject: [PATCH 1/2] Relpace wrong KB number reference in whatsnew --- Doc/whatsnew/3.8.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index db40ce756287fa..009a1c62478a5b 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -1895,7 +1895,7 @@ Changes in the Python API resolution. If your application relies on these mechanisms, you should check for :func:`~os.add_dll_directory` and if it exists, use it to add your DLLs directory while loading your library. Note that Windows 7 users will need to - ensure that Windows Update KB2533625 has been installed (this is also verified + ensure that Windows Update KB2533623 has been installed (this is also verified by the installer). (Contributed by Steve Dower in :issue:`36085`.) From e76b8d727f9e7f2618d096b458f9be7431e2ec83 Mon Sep 17 00:00:00 2001 From: SeaHOH Date: Tue, 22 Oct 2019 14:57:48 +0800 Subject: [PATCH 2/2] Relpace wrong KB number references in installer --- .../bundle/bootstrap/PythonBootstrapperApplication.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index 570798de1aafa8..fbdf7b6424d617 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -3013,8 +3013,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { } else if (IsWindowsVersionOrGreater(6, 1, 1)) { HMODULE hKernel32 = GetModuleHandleW(L"kernel32"); if (hKernel32 && !GetProcAddress(hKernel32, "AddDllDirectory")) { - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows Server 2008 R2 without KB2533625"); - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "KB2533625 update is required to continue."); + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows Server 2008 R2 without KB2533623"); + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "KB2533623 update is required to continue."); /* The "MissingSP1" error also specifies updates are required */ LocGetString(_wixLoc, L"#(loc.FailureWS2K8R2MissingSP1)", &pLocString); } else { @@ -3044,8 +3044,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { } else if (IsWindows7SP1OrGreater()) { HMODULE hKernel32 = GetModuleHandleW(L"kernel32"); if (hKernel32 && !GetProcAddress(hKernel32, "AddDllDirectory")) { - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows 7 SP1 without KB2533625"); - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "KB2533625 update is required to continue."); + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Detected Windows 7 SP1 without KB2533623"); + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "KB2533623 update is required to continue."); /* The "MissingSP1" error also specifies updates are required */ LocGetString(_wixLoc, L"#(loc.FailureWin7MissingSP1)", &pLocString); } else {