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

Timestamp:

Mar 14, 2018 2:05:32 PM (7 years ago)

Author:

vboxsync

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

121272

Message:

WDDM: build and use VBoxWddm.sys. bugref:9133

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

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

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

@@ -131 +131 @@
 ifdef VBOX_WITH_WDDM
 DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.sys \
-        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \
+        $(PATH_STAGE_BIN)/additions/VBoxWddm.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
         $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
-DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxVideoW8.sys \
-        $(PATH_STAGE_BIN)/additions/VBoxVideoW8.inf
  ifdef VBOX_WITH_CROGL
 DRIVER_FILES += \
@@ -144 +141 @@
  ifdef VBOX_SIGN_ADDITIONS
 DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
-DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxVideoW8.cat
+        $(PATH_STAGE_BIN)/additions/VBoxWddm.cat
  endif
  ifeq ($(KBUILD_TARGET_ARCH),amd64)

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

@@ -98 +98 @@
 
 !if $%VBOX_WITH_WDDM% == "1"
-  ; WDDM Video driver for Vista and 7
-  SetOutPath "$0\VBoxVideoWddm"
+  ; WDDM Video driver
+  SetOutPath "$0\VBoxWddm"
 
   !ifdef VBOX_SIGN_ADDITIONS
-    FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
+    FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
   !endif
-  FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
-  FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
+  FILE "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
+  FILE "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
   FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
 
@@ -137 +137 @@
     !endif ; $%VBOX_WITH_CROGL% == "1"
   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
-
-  ; 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_WITH_WDDM% == "1"
 

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

@@ -233 +233 @@
     SetOutPath "$INSTDIR"
 
-    ${If} $g_strWinVersion == "8"
-    ${OrIf} $g_strWinVersion == "8_1"
-    ${OrIf} $g_strWinVersion == "10"
-      !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}
-      !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"
-    ${EndIf}
+    !ifdef VBOX_SIGN_ADDITIONS
+      FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
+    !endif
+    FILE "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
+    FILE "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
 
     FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
@@ -391 +381 @@
   ${If} $g_bNoVideoDrv == "false"
     ${If} $g_bWithWDDM == "true"
-      ${If} $g_strWinVersion == "8"
-      ${OrIf} $g_strWinVersion == "8_1"
-      ${OrIf} $g_strWinVersion == "10"
-        ${LogVerbose} "Installing WDDM video driver for Windows 8 or newer..."
-        ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoW8.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
-      ${Else}
-        ${LogVerbose} "Installing WDDM video driver for Windows Vista and 7..."
-        ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoWddm.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
-      ${EndIf}
+      ${LogVerbose} "Installing WDDM video driver..."
+      ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxWddm.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
     ${Else}
       ${LogVerbose} "Installing video driver ..."
@@ -530 +513 @@
 
 !if $%VBOX_WITH_WDDM% == "1"
+  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
+  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
+  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
+  ; Obsolete files begin
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
@@ -536 +523 @@
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
+  ; Obsolete files end
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
 
@@ -596 +584 @@
 !if $%VBOX_WITH_WDDM% == "1"
 
+  ${LogVerbose} "Uninstalling WDDM video driver..."
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxWddm.inf$\"" "true"
+  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxWddm" "true"
+  ;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\VBoxWddm.sys"
+
+  ; Obsolete files begin
   ${LogVerbose} "Uninstalling WDDM video driver for Windows 8..."
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoW8.inf$\"" "true"
@@ -610 +606 @@
   ;       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\VBoxVideoWddm.sys"
+  ; Obsolete files end
+
   Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
 !endif ; $%VBOX_WITH_WDDM% == "1"