Changeset 32683 in vbox for trunk/src/VBox

Timestamp:

Sep 22, 2010 7:08:52 AM (14 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: More WDDM cleanup.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (7 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)
• VBoxGuestAdditionsW2KXP.nsh (modified) (6 diffs)

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

@@ -181 +181 @@
 Var g_bWithAutoLogon    ; Cmd line: Install VBoxGINA / VBoxCredProv for auto logon support
 Var g_bWithD3D          ; Cmd line: Install Direct3D support
+Var g_bWithWDDM         ; Install the WDDM driver instead of the normal one
 Var g_bOnlyExtract      ; Cmd line: Only extract all files, do *not* install them. Only valid with param "/D" (target directory)
-Var g_bInstallWDDM      ; WDDM mode
+Var g_bCapWDDM          ; Capability: Is the guest able to handle/use our WDDM driver?
 
 ; Platform parts of this installer
@@ -697 +698 @@
 
 !if $%VBOX_WITH_WDDM% == "1"
-  ${If} $g_bInstallWDDM == "true"
+  ${If} $g_bWithWDDM == "true"
     ; All D3D components are installed with WDDM driver package, nothing to be done here
     Return
@@ -896 +897 @@
   ${If} $0 == ${SF_SELECTED}
 
-!if $%VBOX_WITH_WDDM% == "1"
-  !if $%BUILD_TARGET_ARCH% == "x86"
-    ; If we're on a 32-bit Windows Vista / 7 also install the WDDM bits
-    ${If} $g_strWinVersion == "Vista"
-    ${OrIf} $g_strWinVersion == "7"
-      StrCpy $g_bInstallWDDM "true"
+    ; If we're able to use the WDDM driver just use it instead of the replaced
+    ; D3D components below
+    ${If} $g_bCapWDDM == "true"
+      StrCpy $g_bWithWDDM "true"
+      Goto exit
     ${EndIf}
-  !endif
-!endif
 
     ${If} $g_bForceInstall != "true"
@@ -922 +920 @@
     ${EndIf}
   ${EndIf}
-
   Goto exit
 
@@ -979 +976 @@
   StrCpy $g_bWithD3D "false"
   StrCpy $g_bOnlyExtract "false"
-  StrCpy $g_bInstallWDDM "false"
+  StrCpy $g_bWithWDDM "false"
+  StrCpy $g_bCapWDDM "false"
 
   SetErrorLevel 0
@@ -991 +989 @@
   ; Retrieve Windows version and store result in $g_strWinVersion
   Call GetWindowsVer
+
+  ; Retrieve capabilities
+  Call CheckForCapabilities
 
   ; Retrieve system mode and store result in
@@ -1129 +1130 @@
   Call un.GetWindowsVer
 
+  ; Retrieve capabilities
+  Call un.CheckForCapabilities
+
 FunctionEnd
 

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

@@ -412 +412 @@
 !insertmacro AbortShutdown ""
 !insertmacro AbortShutdown "un."
+
+!macro CheckForWDDMCapability un
+Function ${un}CheckForWDDMCapability
+
+  ; Note: This is done early at startup of the installer, so
+  ;       DetailPrint and friends won't work here!
+
+!if $%BUILD_TARGET_ARCH% == "x86"
+  ; If we're on a 32-bit Windows Vista / 7 we can use the WDDM driver
+  ${If} $g_strWinVersion == "Vista"
+  ${OrIf} $g_strWinVersion == "7"
+    StrCpy $g_bCapWDDM "true"
+  ${EndIf}
+!endif
+
+FunctionEnd
+!macroend
+
+; Insert function as an installer and uninstaller function.
+!insertmacro CheckForWDDMCapability ""
+!insertmacro CheckForWDDMCapability "un."
+
+!macro CheckForCapabilities un
+Function ${un}CheckForCapabilities
+
+    Call ${un}CheckForWDDMCapability
+
+FunctionEnd
+!macroend
+
+; Insert function as an installer and uninstaller function.
+!insertmacro CheckForCapabilities ""
+!insertmacro CheckForCapabilities "un."
+

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

@@ -186 +186 @@
 !if $%VBOX_WITH_CROGL% == "1"
   !if $%VBOX_WITH_WDDM% == "1"
-    !if $%BUILD_TARGET_ARCH% == "x86"
-      ${If} $g_bInstallWDDM == "true"
-        SetOutPath "$INSTDIR"
-        ; WDDM Video driver
-        FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
-        FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-        FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
-        FILE "$%PATH_OUT%\bin\additions\libWine.dll"
-        FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
-        FILE "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
-        SetOutPath $g_strSystemDir
-        Goto doneCr
-      ${EndIf}
-    !endif
+    ${If} $g_bWithWDDM == "true"
+      SetOutPath "$INSTDIR"
+      ; WDDM Video driver
+      FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
+      FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
+      FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
+      FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
+      FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
+      FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
+      FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
+      FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
+      FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
+      FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
+      FILE "$%PATH_OUT%\bin\additions\libWine.dll"
+      FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
+      FILE "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
+      SetOutPath $g_strSystemDir
+      Goto doneCr
+    ${EndIf}
   !endif
   ; crOpenGL
@@ -288 +286 @@
   StrCmp $g_bNoVideoDrv "true" drv_guest
   SetOutPath "$INSTDIR"
-  DetailPrint "Installing video driver ..."
-  ${If} $g_bInstallWDDM == "true"
-    DetailPrint "WDDM Driver being installed ..."
+  ${If} $g_bWithWDDM == "true"
+    DetailPrint "Installing WDDM video driver ..."
     nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /i "PCI\VEN_80EE&DEV_BEEF&SUBSYS_00000000&REV_00" "$INSTDIR\VBoxVideoWddm.inf" "Display"'
   ${Else}
+    DetailPrint "Installing video driver ..."
     nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /i "PCI\VEN_80EE&DEV_BEEF&SUBSYS_00000000&REV_00" "$INSTDIR\VBoxVideo.inf" "Display"'
   ${EndIf}
@@ -356 +354 @@
 !if $%VBOX_WITH_CROGL% == "1"
 cropengl:
-  ${If} $g_bInstallWDDM == "true"
+  ${If} $g_bWithWDDM == "true"
+    ; Nothing to do here
   ${Else}
     DetailPrint "Installing 3D OpenGL support ..."
@@ -363 +362 @@
     WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Flags" 1
     WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Dll" "VBoxOGL.dll"
-
 !if $%BUILD_TARGET_ARCH% == "amd64"
     ; Write additional keys required for Windows XP, Vista and 7 64-bit (but for 32-bit stuff)
-    ${If} $g_strWinVersion   == '7'   
+    ${If} $g_strWinVersion   == '7'
     ${OrIf} $g_strWinVersion == 'Vista'
     ${OrIf} $g_strWinVersion == 'XP'
@@ -455 +453 @@
   Pop $0    ; Ret value
   ${If} $0 == "0"
-    DetailPrint "WDDM Driver is installed"
-    StrCpy $g_bInstallWDDM "true"
+    DetailPrint "WDDM display driver is installed"
+    StrCpy $g_bWithWDDM "true"
   ${ElseIf} $0 == "4"
-    DetailPrint "Non-WDDM Driver is installed"
+    DetailPrint "Non-WDDM display driver is installed"
   ${Else}
     DetailPrint "Error occured"
@@ -477 +475 @@
 
   ; Remove video driver
-  ${If} $g_bInstallWDDM == "true"
+  ${If} $g_bWithWDDM == "true"
     nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideoWddm'
     Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoWddm.sys"