Changeset 42142 in vbox

Timestamp:

Jul 13, 2012 11:38:14 AM (13 years ago)

Author:

vboxsync

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

79111

Message:

ga installer/win: integrate win8 wddm driver

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -135 +135 @@
         $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \
         $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
+ ifdef VBOX_WDDM_WIN8
+DRIVER_FILES += \
+        $(PATH_STAGE_BIN)/additions/VBoxVideoW8.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxVideoW8.inf
+ endif
  ifdef VBOX_WITH_CROGL
 DRIVER_FILES += \
@@ -143 +148 @@
 DRIVER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
+  ifdef VBOX_WDDM_WIN8
+DRIVER_FILES += \
+        $(PATH_STAGE_BIN)/additions/VBoxVideoW8.cat
+  endif
  endif
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
@@ -184 +193 @@
         -E 'VBOX_WITH_LICENSE_INSTALL_RTF=$(if $(VBOX_BRAND_LICENSE_RTF),1,0)' \
         -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \
+        -E 'VBOX_WDDM_WIN8=$(if $(VBOX_WDDM_WIN8),1,0)' \
         -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
         -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \

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

@@ -98 +98 @@
 
 !if $%VBOX_WITH_WDDM% == "1"
-  ; WDDM Video driver
+  ; WDDM Video driver for Vista and 7
   SetOutPath "$0\VBoxVideoWddm"
 
@@ -137 +137 @@
     !endif ; $%VBOX_WITH_CROGL% == "1"
   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
+  
+  !if $%VBOX_WDDM_WIN8% == "1"
+  ; WDDM Video driver for Win8
+  SetOutPath "$0\VBoxVideoW8"
+
+    !ifdef VBOX_SIGN_ADDITIONS
+      FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
+    !endif
+    FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
+    FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
+    FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
+
+    !if $%VBOX_WITH_CROGL% == "1"
+      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\VBoxD3D9wddm.dll"
+      FILE "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
+    !endif ; $%VBOX_WITH_CROGL% == "1"
+
+    !if $%BUILD_TARGET_ARCH% == "amd64"
+      FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
+
+      !if $%VBOX_WITH_CROGL% == "1"
+        FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
+        FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
+        FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
+        FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
+        FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
+        FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
+        FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
+
+        FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
+        FILE "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
+      !endif ; $%VBOX_WITH_CROGL% == "1"
+    !endif ; $%BUILD_TARGET_ARCH% == "amd64"
+  !endif ; $%VBOX_WDDM_WIN8% == "1"
 !endif ; $%VBOX_WITH_WDDM% == "1"
 

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

@@ -210 +210 @@
     SetOutPath "$INSTDIR"
 
-    !ifdef VBOX_SIGN_ADDITIONS
-      FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
-    !endif
-    FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
-    FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
+  !if $%VBOX_WDDM_WIN8% == "1"
+    ${If} $g_strWinVersion == "8"
+      !ifdef VBOX_SIGN_ADDITIONS
+        FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
+      !endif
+      FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
+      FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
+    ${Else}
+  !endif
+      !ifdef VBOX_SIGN_ADDITIONS
+        FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
+      !endif
+      FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
+      FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
+  !if $%VBOX_WDDM_WIN8% == "1"
+    ${EndIf}
+  !endif
+
     FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
 
@@ -360 +373 @@
   ${If} $g_bNoVideoDrv == "false"
     ${If} $g_bWithWDDM == "true"
-      DetailPrint "Installing WDDM video driver ..."
-      nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoWddm.inf" "$INSTDIR\install_drivers.log"'
+  !if $%VBOX_WDDM_WIN8% == "1"
+      ${If} $g_strWinVersion == "8"
+        DetailPrint "Installing WDDM video driver for Windows 8..."
+        nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoW8.inf" "$INSTDIR\install_drivers.log"'
+      ${Else}
+  !endif
+        DetailPrint "Installing WDDM video driver for Windows Vista and 7..."
+        nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver install "$INSTDIR\VBoxVideoWddm.inf" "$INSTDIR\install_drivers.log"'
+  !if $%VBOX_WDDM_WIN8% == "1"
+      ${EndIf}
+  !endif
     ${Else}
       DetailPrint "Installing video driver ..."
@@ -507 +529 @@
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
+  !if $%VBOX_WDDM_WIN8% == "1"
+  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
+  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
+  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
+  !endif
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
 
@@ -568 +595 @@
   ; Remove video driver
 !if $%VBOX_WITH_WDDM% == "1"
-  DetailPrint "Uninstalling WDDM video driver ..."
+
+  !if $%VBOX_WDDM_WIN8% == "1"
+  DetailPrint "Uninstalling WDDM video driver for Windows 8..."
+  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideoW8.inf"'
+  Pop $0 ; Ret value
+  ; Always try to remove both VBoxVideoW8 & VBoxVideoWddm services no matter what is installed currently
+  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxVideoW8'
+  Pop $0 ; Ret value
+  ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
+  ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
+  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoW8.sys"
+  !endif ; $%VBOX_WDDM_WIN8% == "1"
+
+  DetailPrint "Uninstalling WDDM video driver for Windows Vista and 7..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideoWddm.inf"'
   Pop $0 ; Ret value