WDDM, Config.kmk: removed VBOX_WITH_WDDM_W8, it is always enabled now.

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@71200 cfe28804-0f27-0410-a406-dd0f0b0b656f

7 files changed, 11 insertions, 39 deletions

diff --git a/Config.kmk b/Config.kmk
index 7954a3dfe1f..8277ac3ae7b 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -487,8 +487,6 @@ if1of ($(KBUILD_TARGET), darwin linux win freebsd)
 endif
 # Enable Wddm Video driver for Vista+ guests.
 VBOX_WITH_WDDM = 1
-# Enable Wddm Video driver for Windows 8 guests.
-VBOX_WITH_WDDM_W8 = 1
 # Lazy developer!!
 VBOXWDDM_WITH_VBVA = 1
 # Lazy developer!!
diff --git a/configure.vbs b/configure.vbs
index e82d3f1e0cc..bff182de7c1 100644
--- a/configure.vbs
+++ b/configure.vbs
@@ -2278,7 +2278,6 @@ Sub Main
    CheckSourcePath

    CheckForkBuild strOptkBuild

    CheckForWinDDK strOptDDK

-   CfgPrint "VBOX_WITH_WDDM_W8     := " '' @todo look for WinDDKv8

    CheckForVisualCPP strOptVC, strOptVCCommon, blnOptVCExpressEdition

    CheckForPlatformSDK strOptSDK

    CheckForMidl

diff --git a/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
index d697a2f1a78..cb7a7e18edd 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk
@@ -221,7 +221,6 @@ ifdef VBOX_WITH_WDDM
 	$(call MSG_TOOL,Inf2Cat,VBoxVideoWddm-inf,$@,$<)
 	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
 
- ifdef VBOX_WITH_WDDM_W8
   VBOXWDDMW8_WITH_DISPD3D = 1
   ifdef VBOX_WITH_CROGL
    VBOXWDDMW8_WITH_GL = 1
@@ -411,7 +410,6 @@ ifdef VBOX_WITH_WDDM
 	$(call MSG_TOOL,Inf2Cat,VBoxVideoW8-inf,$@,$<)
 	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
 
- endif # VBOX_WITH_WDDM_W8
 endif # VBOX_WITH_WDDM
 
 include $(FILE_KBUILD_SUB_FOOTER)
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
index a00db16e599..c11f804e6ea 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk
@@ -160,17 +160,15 @@ ifdef VBOX_WITH_WDDM
  	$(VBOX_LIB_IPRT_GUEST_R0) \
  	$(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
 
- ifdef VBOX_WITH_WDDM_W8
-  #
-  # VBoxVideoW8 - Windows Guest Additions WDDM 1.2 Miniport Video Driver for Win8
-  #
-  SYSMODS += VBoxVideoW8
-  VBoxVideoW8_EXTENDS    = VBoxVideoWddm
-  VBoxVideoW8_TEMPLATE   = VBOXGUESTR0
-  VBoxVideoW8_DEFS       = $(VBoxVideoWddm_DEFS) VBOX_WDDM_WIN8
-  VBoxVideoW8_SOURCES    = $(subst VBoxMPWddm.rc,VBoxMPW8.rc,$(VBoxVideoWddm_SOURCES))
-  VBoxVideoW8_LIBS       = $(VBoxVideoWddm_LIBS)
- endif # VBOX_WITH_WDDM_W8
+ #
+ # VBoxVideoW8 - Windows Guest Additions WDDM 1.2 Miniport Video Driver for Win8
+ #
+ SYSMODS += VBoxVideoW8
+ VBoxVideoW8_EXTENDS    = VBoxVideoWddm
+ VBoxVideoW8_TEMPLATE   = VBOXGUESTR0
+ VBoxVideoW8_DEFS       = $(VBoxVideoWddm_DEFS) VBOX_WDDM_WIN8
+ VBoxVideoW8_SOURCES    = $(subst VBoxMPWddm.rc,VBoxMPW8.rc,$(VBoxVideoWddm_SOURCES))
+ VBoxVideoW8_LIBS       = $(VBoxVideoWddm_LIBS)
 
 endif # VBOX_WITH_WDDM
 
@@ -184,10 +182,8 @@ ifdef VBOX_SIGN_ADDITIONS
  ifdef VBOX_WITH_WDDM
   VBoxVideoWddm_INSTTYPE       = none
   VBoxVideoWddm_DEBUG_INSTTYPE = both
-  ifdef VBOX_WITH_WDDM_W8
-   VBoxVideoW8_INSTTYPE        = none
-   VBoxVideoW8_DEBUG_INSTTYPE  = both
-  endif
+  VBoxVideoW8_INSTTYPE         = none
+  VBoxVideoW8_DEBUG_INSTTYPE   = both
  endif
 endif # VBOX_SIGN_ADDITIONS
 
diff --git a/src/VBox/Additions/WINNT/Installer/Makefile.kmk b/src/VBox/Additions/WINNT/Installer/Makefile.kmk
index 24d7189e07e..df57b25e568 100644
--- a/src/VBox/Additions/WINNT/Installer/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Installer/Makefile.kmk
@@ -133,11 +133,9 @@ DRIVER_FILES += \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoWddm.sys \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \
 	$(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
- ifdef VBOX_WITH_WDDM_W8
 DRIVER_FILES += \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoW8.sys \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoW8.inf
- endif
  ifdef VBOX_WITH_CROGL
 DRIVER_FILES += \
 	$(PATH_STAGE_BIN)/additions/wined3dwddm.dll \
@@ -146,10 +144,8 @@ DRIVER_FILES += \
  ifdef VBOX_SIGN_ADDITIONS
 DRIVER_FILES += \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
-  ifdef VBOX_WITH_WDDM_W8
 DRIVER_FILES += \
 	$(PATH_STAGE_BIN)/additions/VBoxVideoW8.cat
-  endif
  endif
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
 DRIVER_FILES += \
@@ -192,7 +188,6 @@ VB_WIN_ADD_NSIS_ENV := \
 	-E 'VBOX_WITH_GUEST_INSTALL_HELPER=$(if $(VBOX_WITH_GUEST_INSTALL_HELPER),1,0)' \
 	-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_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))' \
 	$(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),-E 'VBOX_BRAND_$(lang)_LICENSE_RTF=$(VBOX_BRAND_$(lang)_LICENSE_RTF)') \
diff --git a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
index c8dfbe3d1a7..8de78541ba7 100644
--- a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
+++ b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh
@@ -137,7 +137,6 @@ Function ExtractFiles
     !endif ; $%VBOX_WITH_CROGL% == "1"
   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
 
-  !if $%VBOX_WITH_WDDM_W8% == "1"
   ; WDDM Video driver for Win8
   SetOutPath "$0\VBoxVideoW8"
 
@@ -177,7 +176,6 @@ Function ExtractFiles
         FILE "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
       !endif ; $%VBOX_WITH_CROGL% == "1"
     !endif ; $%BUILD_TARGET_ARCH% == "amd64"
-  !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 !endif ; $%VBOX_WITH_WDDM% == "1"
 
   ; Mouse driver
diff --git a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh
index cac10e7986a..65d6c15e194 100644
--- a/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh
+++ b/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh
@@ -232,7 +232,6 @@ Function W2K_CopyFiles
     ; WDDM Video driver
     SetOutPath "$INSTDIR"
 
-  !if $%VBOX_WITH_WDDM_W8% == "1"
     ${If} $g_strWinVersion == "8"
     ${OrIf} $g_strWinVersion == "8_1"
     ${OrIf} $g_strWinVersion == "10"
@@ -242,15 +241,12 @@ Function W2K_CopyFiles
       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_WITH_WDDM_W8% == "1"
     ${EndIf}
-  !endif
 
     FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
 
@@ -394,19 +390,15 @@ Function W2K_InstallFiles
 
   ${If} $g_bNoVideoDrv == "false"
     ${If} $g_bWithWDDM == "true"
-  !if $%VBOX_WITH_WDDM_W8% == "1"
       ${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}
-  !endif
         ${LogVerbose} "Installing WDDM video driver for Windows Vista and 7..."
         ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoWddm.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
-  !if $%VBOX_WITH_WDDM_W8% == "1"
       ${EndIf}
-  !endif
     ${Else}
       ${LogVerbose} "Installing video driver ..."
       ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideo.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
@@ -540,11 +532,9 @@ Function ${un}W2K_UninstallInstDir
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-  !if $%VBOX_WITH_WDDM_W8% == "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"
 
     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
@@ -605,14 +595,12 @@ Function ${un}W2K_Uninstall
   ; Remove video driver
 !if $%VBOX_WITH_WDDM% == "1"
 
-  !if $%VBOX_WITH_WDDM_W8% == "1"
   ${LogVerbose} "Uninstalling WDDM video driver for Windows 8..."
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoW8.inf$\"" "true"
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxVideoW8" "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\VBoxVideoW8.sys"
-  !endif ; $%VBOX_WITH_WDDM_W8% == "1"
 
   ${LogVerbose} "Uninstalling WDDM video driver for Windows Vista and 7..."
   ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoWddm.inf$\"" "true"