Changeset 85006 in vbox for trunk/src/VBox/Additions/WINNT/Installer

Timestamp:

Jun 30, 2020 11:15:18 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138904

Message:

GA/Installer/WinNT: Prevent a repeated recovery of d3d9.dll, bugref:9725

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

@@ -723 +723 @@
   Call ${un}VerifyFile
   Pop $0
+
+  Push "${Architecture}"
+  Push "Oracle Corporation"
+  Push "${FileDest}"
+  Call ${un}VerifyFile
+  Pop $0
+
   ${If} $0 == "0"
     ${LogVerbose} "Copying verified file $\"${FileSrc}$\" to $\"${FileDest}$\" ..."
@@ -812 +819 @@
   Call ${un}SetAppMode64
 
-  ; Note: Not finding a file (like *d3d8.dll) on Windows Vista/7 is fine;
-  ;       it simply is not present there.
-
-  ; Note 2: On 64-bit systems there are no 64-bit *d3d8 DLLs, only 32-bit ones
-  ;         in SysWOW64 (or in system32 on 32-bit systems).
-
   ${LogVerbose} "Restoring original D3D files ..."
-!if $%KBUILD_TARGET_ARCH% == "x86"
   ${CopyFileEx} "${un}" "$SYSDIR\msd3d8.dll" "$SYSDIR\d3d8.dll" "Microsoft Corporation" "$%KBUILD_TARGET_ARCH%"
-!endif
   ${CopyFileEx} "${un}" "$SYSDIR\msd3d9.dll" "$SYSDIR\d3d9.dll" "Microsoft Corporation" "$%KBUILD_TARGET_ARCH%"
 
   ${If} $g_bCapDllCache == "true"
-!if $%KBUILD_TARGET_ARCH% == "x86"
     ${CopyFileEx} "${un}" "$SYSDIR\dllcache\msd3d8.dll" "$SYSDIR\dllcache\d3d8.dll" "Microsoft Corporation" "$%KBUILD_TARGET_ARCH%"
-!endif
     ${CopyFileEx} "${un}" "$SYSDIR\dllcache\msd3d9.dll" "$SYSDIR\dllcache\d3d9.dll" "Microsoft Corporation" "$%KBUILD_TARGET_ARCH%"
   ${EndIf}