setup: fix DIA registration/unregistration for x64

setup: version increment


git-svn-id: https://pykd.svn.codeplex.com/svn@72756 9b283d60-5439-405e-af05-b73fd8c4d996
This commit is contained in:
SND\air_max_cp 2011-12-29 09:02:06 +00:00
parent bfc7292daf
commit 9a5801ab45

View File

@ -27,7 +27,7 @@ SetCompressor LZMA
!define PRODUCT_SHORT_NAME "pykd" !define PRODUCT_SHORT_NAME "pykd"
!define PRODUCT_FULL_NAME "Python extension for WinDbg" !define PRODUCT_FULL_NAME "Python extension for WinDbg"
!define PRODUCT_VERSION "0.0.1.2" !define PRODUCT_VERSION "0.1.0.3"
!define PRODUCT_URL "http://pykd.codeplex.com/" !define PRODUCT_URL "http://pykd.codeplex.com/"
!define PRODUCT_NAME_AND_VERSION "${PRODUCT_FULL_NAME} ${PRODUCT_ARCH} ${PRODUCT_VERSION}" !define PRODUCT_NAME_AND_VERSION "${PRODUCT_FULL_NAME} ${PRODUCT_ARCH} ${PRODUCT_VERSION}"
!define PRODUCT_MANUFACTURER "PyKd Team" !define PRODUCT_MANUFACTURER "PyKd Team"
@ -252,11 +252,16 @@ SectionEnd
Section "Debug Interface Access (${PRODUCT_ARCH}) library" sec_msdia Section "Debug Interface Access (${PRODUCT_ARCH}) library" sec_msdia
DetailPrint "Registering Debug Interface Access (${PRODUCT_ARCH}) library..." DetailPrint "Registering Debug Interface Access (${PRODUCT_ARCH}) library..."
!if ${PRODUCT_ARCH} == "x64" !if ${PRODUCT_ARCH} == "x64"
RegDLL "$COMMONFILES64\Microsoft Shared\VC\${MSDIA_DLL_NAME}" ${DisableX64FSRedirection}
ClearErrors
ExecWait '"$SYSDIR\regsvr32.exe" /s "$COMMONFILES64\Microsoft Shared\VC\${MSDIA_DLL_NAME}"'
${EnableX64FSRedirection}
!else !else
RegDLL "$COMMONFILES32\Microsoft Shared\VC\${MSDIA_DLL_NAME}" RegDLL "$COMMONFILES\Microsoft Shared\VC\${MSDIA_DLL_NAME}"
!endif !endif
${IfNot} ${Errors} ${IfNot} ${Errors}
DetailPrint "Successfully registered." DetailPrint "Successfully registered."
${SetRegView64} ${SetRegView64}
@ -388,7 +393,15 @@ Section /o "un.Debug Interface Access (${PRODUCT_ARCH}) library" unsec_msdia
${SetRegView64} ${SetRegView64}
ReadRegStr $R0 HKCR "CLSID\${CLSID_DiaSource}\InprocServer32" "" ReadRegStr $R0 HKCR "CLSID\${CLSID_DiaSource}\InprocServer32" ""
${SetRegView32} ${SetRegView32}
!if ${PRODUCT_ARCH} == "x64"
${DisableX64FSRedirection}
ClearErrors
ExecWait '"$SYSDIR\regsvr32.exe" /s /u "$R0"'
${EnableX64FSRedirection}
!else
UnRegDLL $R0 UnRegDLL $R0
!endif
SectionEnd SectionEnd
Section /o "un.Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime" unsec_vcruntime Section /o "un.Visual C++ 2008 SP1 (${PRODUCT_ARCH}) runtime" unsec_vcruntime