Changeset 37815 in vbox for trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

Timestamp:

Jul 7, 2011 11:27:46 AM (13 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Fixed file typos which might have caused trouble restoring original d3d*.dlls.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -804 +804 @@
   !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\dllcache\d3d9.dll" "$TEMP"
 
-  ; Save original DLLs ...
+  ; Save original DLLs (only if msd3d*.dll does not exist) ...
   SetOutPath $g_strSystemDir
   IfFileExists "$g_strSystemDir\msd3d8.dll" +1
     CopyFiles /SILENT "$g_strSystemDir\d3d8.dll" "$g_strSystemDir\msd3d8.dll"
-  IfFileExists "$g_strSystemDir\msd3d8.dll" +1
+  IfFileExists "$g_strSystemDir\msd3d9.dll" +1
     CopyFiles /SILENT "$g_strSystemDir\d3d9.dll" "$g_strSystemDir\msd3d9.dll"
 
@@ -857 +857 @@
     !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSDIR\dllcache\d3d9.dll" "$TEMP"
 
-    ; Save original DLLs ...
+    ; Save original DLLs (only if msd3d*.dll does not exist) ...
     SetOutPath $SYSDIR
     IfFileExists "$SYSDIR\dllcache\msd3d8.dll" +1