From 3f73f116693578185738dc29c367b6d7c047f2a5 Mon Sep 17 00:00:00 2001
From: "SND\\air_max_cp" <SND\air_max_cp@9b283d60-5439-405e-af05-b73fd8c4d996>
Date: Mon, 26 Dec 2011 16:39:36 +0000
Subject: [PATCH] setup: 1.x fixed Visual C++ runtime dependency to VS 2008

git-svn-id: https://pykd.svn.codeplex.com/svn@72702 9b283d60-5439-405e-af05-b73fd8c4d996
---
 setup/pykd_setup_common.nsh | 18 +++++++++---------
 setup/pykd_setup_x64.nsi    |  3 ++-
 setup/pykd_setup_x86.nsi    |  3 ++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/setup/pykd_setup_common.nsh b/setup/pykd_setup_common.nsh
index fdd0095..8a8642a 100644
--- a/setup/pykd_setup_common.nsh
+++ b/setup/pykd_setup_common.nsh
@@ -134,8 +134,8 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"     "${PRODUCT_VERSION}"
 
 !macro _IsVcRuntimeInstalled _a _b _t _f
     !insertmacro _LOGICLIB_TEMP
-    Push 'msvcr80.dll'
-    Push 'Microsoft.VC80.CRT,version="8.0.50727.6195",type="win32",processorArchitecture="${ARCH}",publicKeyToken="1fc8b3b9a1e18e3b"'
+    Push 'msvcr90.dll'
+    Push 'Microsoft.VC90.CRT,version="9.0.21022.8",type="win32",processorArchitecture="${ARCH}",publicKeyToken="1fc8b3b9a1e18e3b"'
     ${WinSxS_HasAssembly}
     Pop $_LOGICLIB_TEMP
     !insertmacro _== $_LOGICLIB_TEMP 1 `${_t}` `${_f}`
@@ -227,8 +227,8 @@ Section "Python ${PYTHON_VERSION} ${PRODUCT_ARCH}" sec_python
     ${EndIf}
 SectionEnd
 
-Section "Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime" sec_vcruntime
-    DetailPrint "Installing Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library..."
+Section "Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime" sec_vcruntime
+    DetailPrint "Installing Microsoft Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime library..."
 
     SetOutPath "$TEMP"
     !if ${PRODUCT_ARCH} == "x64"
@@ -255,7 +255,7 @@ Section "Debug Interface Access (${PRODUCT_ARCH}) library" sec_msdia
         RegDLL "$COMMONFILES64\Microsoft Shared\VC\${MSDIA_DLL_NAME}"
     !else
         RegDLL "$COMMONFILES32\Microsoft Shared\VC\${MSDIA_DLL_NAME}"
-    !endif	 
+    !endif
     ${IfNot} ${Errors}
         DetailPrint "Successfully registered."
         ${SetRegView64}
@@ -338,7 +338,7 @@ FunctionEnd
 LangString DESC_sec_pykd      ${LANG_ENGLISH} "${PRODUCT_FULL_NAME}"
 LangString DESC_sec_snippets  ${LANG_ENGLISH} "Useful code snippets. Will be installed in $DOCUMENTS\${PRODUCT_SHORT_NAME}"
 LangString DESC_sec_python    ${LANG_ENGLISH} "Let installer download and setup Python ${PYTHON_VERSION} ${PRODUCT_ARCH}"
-LangString DESC_sec_vcruntime ${LANG_ENGLISH} "Let installer download and setup Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library"
+LangString DESC_sec_vcruntime ${LANG_ENGLISH} "Let installer download and setup Microsoft Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime library"
 LangString DESC_sec_msdia     ${LANG_ENGLISH} "Let installer register Debug Interface Access (${PRODUCT_ARCH}) library"
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -390,8 +390,8 @@ Section /o "un.Debug Interface Access (${PRODUCT_ARCH}) library" unsec_msdia
     UnRegDLL $R0
 SectionEnd
 
-Section /o "un.Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime" unsec_vcruntime
-    DetailPrint "Uninstalling Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library..."
+Section /o "un.Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime" unsec_vcruntime
+    DetailPrint "Uninstalling Microsoft Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime library..."
     ExecWait '"msiexec" /x ${VCRUNTIME_PRODUCT_CODE}'
 SectionEnd
 
@@ -456,7 +456,7 @@ FunctionEnd
 LangString DESC_unsec_pykd      ${LANG_ENGLISH} "${PRODUCT_FULL_NAME}"
 LangString DESC_unsec_python    ${LANG_ENGLISH} "Uninstall Python ${PYTHON_VERSION} ${PRODUCT_ARCH}"
 LangString DESC_unsec_msdia     ${LANG_ENGLISH} "Unregister Debug Interface Access (${PRODUCT_ARCH}) library"
-LangString DESC_unsec_vcruntime ${LANG_ENGLISH} "Uninstall Microsoft Visual C++ 2005 SP1 (${PRODUCT_ARCH}) runtime library"
+LangString DESC_unsec_vcruntime ${LANG_ENGLISH} "Uninstall Microsoft Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime library"
 
 !insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${unsec_pykd}      $(DESC_unsec_pykd)
diff --git a/setup/pykd_setup_x64.nsi b/setup/pykd_setup_x64.nsi
index 1226769..9e23cbe 100644
--- a/setup/pykd_setup_x64.nsi
+++ b/setup/pykd_setup_x64.nsi
@@ -10,7 +10,8 @@
 !define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E6}"
 
 # When changing VC runtime vesion don't forget to update ProductCode appropriately
-!define VCRUNTIME_PRODUCT_CODE "{ad8a2fa1-06e7-4b0d-927d-6e54b3d31028}"
+# VC9 (VS2008) SP1 + MFC Security Update
+!define VCRUNTIME_PRODUCT_CODE "{5FCE6D76-F5DC-37AB-B2B8-22AB8CEDB1D4}"
 
 !define MSDIA_DLL_NAME "msdia90.dll"
 !define CLSID_DiaSource "{4C41678E-887B-4365-A09E-925D28DB33C2}"
diff --git a/setup/pykd_setup_x86.nsi b/setup/pykd_setup_x86.nsi
index 971389b..11d3237 100644
--- a/setup/pykd_setup_x86.nsi
+++ b/setup/pykd_setup_x86.nsi
@@ -10,7 +10,8 @@
 !define PYTHON_PRODUCT_CODE "{6151CF20-0BD8-4023-A4A0-6A86DCFE58E5}"
 
 # When changing VC runtime vesion don't forget to update ProductCode appropriately
-!define VCRUNTIME_PRODUCT_CODE "{710f4c1c-cc18-4c49-8cbf-51240c89a1a2}"
+# VC9 (VS2008) SP1 + MFC Security Update
+!define VCRUNTIME_PRODUCT_CODE "{9BE518E6-ECC6-35A9-88E4-87755C07200F}"
 
 !define MSDIA_DLL_NAME "msdia90.dll"
 !define CLSID_DiaSource "{4C41678E-887B-4365-A09E-925D28DB33C2}"