diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-24 21:20:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-24 21:20:37 +0000 |
| commit | 0b8dc9dc465f6c396d96be1fa4c42121129beb6c (patch) | |
| tree | 28c0af5aaa0e44265d1503302ee3ae17dd3b5fcf /xorg-server/installer | |
| parent | 8b9c08bcad5fb49daa0348468a25b37793dfe1b9 (diff) | |
| download | vcxsrv-0b8dc9dc465f6c396d96be1fa4c42121129beb6c.tar.gz vcxsrv-0b8dc9dc465f6c396d96be1fa4c42121129beb6c.tar.bz2 vcxsrv-0b8dc9dc465f6c396d96be1fa4c42121129beb6c.zip | |
Do not uninstall the c runtime, cause it sometimes remove the dlls from the winsxs directory although other applications are still using them.
Diffstat (limited to 'xorg-server/installer')
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 1d92d7442..ca007c0a6 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -224,32 +224,34 @@ Section "Uninstall" RMDir "$SMPROGRAMS\VcXsrv"
RMDir "$INSTDIR"
- DetailPrint "Removing CRT assembly..."
- System::Call "sxs::CreateAssemblyCache(*i .r0, i 0) i.r1"
- StrCmp $1 0 0 fail
- System::Call "*(i 32, i 0, i 2364391957, i 1217113163, i 178634899, i 3090139977, w 'nsissxs', w '') i.s"
- Pop $2
- System::Call "$0->3(i 0, w 'Microsoft.VC90.CRT,version=$\"9.0.${MSVC_VERSION}$\",type=$\"win32$\",processorArchitecture=$\"x86$\",publicKeyToken=$\"${MSVC_PUBLICTOKEN}$\"', i r2, *i . r3) i.r1"
- StrCmp $1 0 0 failcrt
- System::Call "$0->3(i 0, w 'Microsoft.VC90.DebugCRT,version=$\"9.0.${MSVC_VERSION_D}$\",type=$\"win32$\",processorArchitecture=$\"x86$\",publicKeyToken=$\"${MSVC_PUBLICTOKEN}$\"', i r2, *i . r3) i.r1"
- StrCmp $1 0 0 faildebugcrt
- DetailPrint "Disposition returned is $3"
- System::Free $2
- System::Call "$0->2()"
- Goto end
- fail:
- DetailPrint "CreateAssemblyCache failed."
- DetailPrint $1
- Goto end
- failcrt:
- DetailPrint "UninstallAssembly CRT failed."
- DetailPrint $1
- Goto end
- faildebugcrt:
- DetailPrint "UninstallAssembly Debug CRT failed."
- DetailPrint $1
- Goto end
-end:
+; Currently disable uninstalling the run-time; because sometimes it is removing
+; the run-time although other applications are using them
+; DetailPrint "Removing CRT assembly..."
+; System::Call "sxs::CreateAssemblyCache(*i .r0, i 0) i.r1"
+; StrCmp $1 0 0 fail
+; System::Call "*(i 32, i 0, i 2364391957, i 1217113163, i 178634899, i 3090139977, w 'nsissxs', w '') i.s"
+; Pop $2
+; System::Call "$0->3(i 0, w 'Microsoft.VC90.CRT,version=$\"9.0.${MSVC_VERSION}$\",type=$\"win32$\",processorArchitecture=$\"x86$\",publicKeyToken=$\"${MSVC_PUBLICTOKEN}$\"', i r2, *i . r3) i.r1"
+; StrCmp $1 0 0 failcrt
+; System::Call "$0->3(i 0, w 'Microsoft.VC90.DebugCRT,version=$\"9.0.${MSVC_VERSION_D}$\",type=$\"win32$\",processorArchitecture=$\"x86$\",publicKeyToken=$\"${MSVC_PUBLICTOKEN}$\"', i r2, *i . r3) i.r1"
+; StrCmp $1 0 0 faildebugcrt
+; DetailPrint "Disposition returned is $3"
+; System::Free $2
+; System::Call "$0->2()"
+; Goto end
+; fail:
+; DetailPrint "CreateAssemblyCache failed."
+; DetailPrint $1
+; Goto end
+; failcrt:
+; DetailPrint "UninstallAssembly CRT failed."
+; DetailPrint $1
+; Goto end
+; faildebugcrt:
+; DetailPrint "UninstallAssembly Debug CRT failed."
+; DetailPrint $1
+; Goto end
+;end:
SectionEnd
|