Changeset 84433 in vbox

Timestamp:

May 21, 2020 1:48:09 PM (5 years ago)

Author:

vboxsync

Message:

GA/Installer/WinNT: Do not touch original d3d9.dll if XPDM driver type is not supported, bugref:9725

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (2 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (3 diffs)

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

@@ -223 +223 @@
 Var g_bLogEnable                        ; Do logging when installing? "true" or "false"
 Var g_bCapDllCache                      ; Capability: Does the (Windows) guest have have a DLL cache which needs to be taken care of?
+Var g_bCapXPDM                          ; Capability: Is the guest able to handle/use our XPDM driver?
 Var g_bCapWDDM                          ; Capability: Is the guest able to handle/use our WDDM driver?
 
@@ -945 +946 @@
   StrCpy $g_bWithWDDM "false"
   StrCpy $g_bCapDllCache "false"
+  StrCpy $g_bCapXPDM "false"
   StrCpy $g_bCapWDDM "false"
   StrCpy $g_bPostInstallStatus "false"

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

@@ -434 +434 @@
 !insertmacro AbortShutdown "un."
 
-!macro CheckForWDDMCapability un
-Function ${un}CheckForWDDMCapability
+!macro CheckForCapabilities un
+Function ${un}CheckForCapabilities
+
+  Push $0
+
+  ; Retrieve system mode and store result in
+  System::Call 'user32::GetSystemMetrics(i ${SM_CLEANBOOT}) i .r0'
+  StrCpy $g_iSystemMode $0
+
+  ; Does the guest have a DLL cache?
+  ${If}   $g_strWinVersion == "NT4"
+  ${OrIf} $g_strWinVersion == "2000"
+  ${OrIf} $g_strWinVersion == "XP"
+    StrCpy $g_bCapDllCache "true"
+    ${LogVerbose}  "OS has a DLL cache"
+  ${EndIf}
+
+  ${If}   $g_strWinVersion == "2000"
+  ${OrIf} $g_strWinVersion == "XP"
+  ${OrIf} $g_strWinVersion == "2003"
+  ${OrIf} $g_strWinVersion == "Vista"
+  ${OrIf} $g_strWinVersion == "7"
+    StrCpy $g_bCapXPDM "true"
+    ${LogVerbose} "OS is XPDM driver capable"
+  ${EndIf}
 
 !if $%VBOX_WITH_WDDM% == "1"
@@ -449 +472 @@
   ${EndIf}
 !endif
-
-FunctionEnd
-!macroend
-!insertmacro CheckForWDDMCapability ""
-!insertmacro CheckForWDDMCapability "un."
-
-!macro CheckForCapabilities un
-Function ${un}CheckForCapabilities
-
-  Push $0
-
-  ; Retrieve system mode and store result in
-  System::Call 'user32::GetSystemMetrics(i ${SM_CLEANBOOT}) i .r0'
-  StrCpy $g_iSystemMode $0
-
-  ; Does the guest have a DLL cache?
-  ${If}   $g_strWinVersion == "NT4"
-  ${OrIf} $g_strWinVersion == "2000"
-  ${OrIf} $g_strWinVersion == "XP"
-    StrCpy $g_bCapDllCache "true"
-    ${LogVerbose}  "OS has a DLL cache"
-  ${EndIf}
-
-  ; Check whether this OS is capable of handling WDDM drivers
-  Call ${un}CheckForWDDMCapability
 
   Pop $0
@@ -862 +860 @@
 !macro RestoreFilesDirect3D un
 Function ${un}RestoreFilesDirect3D
+  ${If}  $g_bCapXPDM != "true"
+      ${LogVerbose} "RestoreFilesDirect3D: XPDM is not supported"
+      Return
+  ${EndIf}
 
   Push $0