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

Timestamp:

Jul 20, 2012 3:26:51 PM (13 years ago)

Author:

vboxsync

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

79336

Message:

Enabled the W8 display miniport driver. Cleaned up some mess.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (7 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
+ ifdef VBOX_WITH_WDDM_W8
 DRIVER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxVideoW8.sys \
@@ -148 +148 @@
 DRIVER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
-  ifdef VBOX_WDDM_WIN8
+  ifdef VBOX_WITH_WDDM_W8
 DRIVER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxVideoW8.cat
@@ -193 +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_WITH_WDDM_W8=$(if $(VBOX_WITH_WDDM_W8),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

@@ -138 +138 @@
   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
   
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
   ; WDDM Video driver for Win8
   SetOutPath "$0\VBoxVideoW8"
@@ -178 +178 @@
       !endif ; $%VBOX_WITH_CROGL% == "1"
     !endif ; $%BUILD_TARGET_ARCH% == "amd64"
-  !endif ; $%VBOX_WDDM_WIN8% == "1"
+  !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 !endif ; $%VBOX_WITH_WDDM% == "1"
 

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

@@ -210 +210 @@
     SetOutPath "$INSTDIR"
 
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
     ${If} $g_strWinVersion == "8"
       !ifdef VBOX_SIGN_ADDITIONS
@@ -224 +224 @@
       FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
       FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
     ${EndIf}
   !endif
@@ -373 +373 @@
   ${If} $g_bNoVideoDrv == "false"
     ${If} $g_bWithWDDM == "true"
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
       ${If} $g_strWinVersion == "8"
         DetailPrint "Installing WDDM video driver for Windows 8..."
@@ -381 +381 @@
         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"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
       ${EndIf}
   !endif
@@ -529 +529 @@
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
@@ -596 +596 @@
 !if $%VBOX_WITH_WDDM% == "1"
 
-  !if $%VBOX_WDDM_WIN8% == "1"
+  !if $%VBOX_WITH_WDDM_W8% == "1"
   DetailPrint "Uninstalling WDDM video driver for Windows 8..."
   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" driver uninstall "$INSTDIR\VBoxVideoW8.inf"'
@@ -606 +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\VBoxVideoW8.sys"
-  !endif ; $%VBOX_WDDM_WIN8% == "1"
+  !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 
   DetailPrint "Uninstalling WDDM video driver for Windows Vista and 7..."