Index: trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk	(revision 70801)
+++ trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk	(revision 70802)
@@ -89,5 +89,5 @@
 #
 DLLS += VBoxDispD3D
-VBoxDispD3D_TEMPLATE = VBoxGuestR3Dll
+VBoxDispD3D_TEMPLATE = VBoxGuestR3DllMinVista
 VBoxDispD3D_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
 VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP LOG_TO_BACKDOOR LOG_TO_BACKDOOR_DRV VBOX_WITH_HGCM D3D_UMD_INTERFACE_VERSION=0x000C
Index: trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk
===================================================================
--- trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk	(revision 70801)
+++ trunk/src/VBox/Additions/WINNT/Graphics/Wine_new/Makefile.kmk	(revision 70802)
@@ -57,4 +57,16 @@
  TEMPLATE_VBoxGuestWineDLL_CFLAGS += -wd4005 -wd4133
 endif
+TEMPLATE_VBoxGuestWineDLL_LDFLAGS.win.x86 = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBoxGuestR3Dll_LDFLAGS.win.x86))
+TEMPLATE_VBoxGuestWineDLL_POST_CMDS.win.x86 = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --w2k,$(TEMPLATE_VBoxGuestR3Dll_POST_CMDS.win.x86))
+
+#
+# WDDM version of VBoxGuestWineDll.
+#
+TEMPLATE_VBoxGuestWineWddmDLL = WDDM version of VBoxGuestWineDLL.
+TEMPLATE_VBoxGuestWineWddmDLL_EXTENDS = VBoxGuestWineDLL
+TEMPLATE_VBoxGuestWineWddmDLL_POST_CMDS.win.x86 = $(subst $(VBOX_PE_SET_VERSION) --w2k, $(VBOX_PE_SET_VERSION) --vista,$(TEMPLATE_VBoxGuestWineDLL_POST_CMDS.win.x86))
+TEMPLATE_VBoxGuestWineWddmDLL_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) --vista $(out)$$(NLTAB)$(TEMPLATE_VBoxGuestWineDLL_POST_CMDS))
+TEMPLATE_VBoxGuestWineWddmDLL_LNK_DEPS  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION)) $(TEMPLATE_VBoxGuestWineDLL_LNK_DEPS)
+
 
 #
@@ -63,17 +75,19 @@
 TEMPLATE_VBoxGuestWineD3DxDLL = Template for building the D3D8/9 stuff.
 TEMPLATE_VBoxGuestWineD3DxDLL_EXTENDS    = VBoxGuestR3Dll
-TEMPLATE_VBoxGuestWineD3DxDLL_EXTENDS_BY = appending
-TEMPLATE_VBoxGuestWineD3DxDLL_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
-TEMPLATE_VBoxGuestWineD3DxDLL_DEFS = VBOX_USING_WINDDK_W7_OR_LATER
-TEMPLATE_VBoxGuestWineD3DxDLL_DEFS.x86   = __i386__
-#TEMPLATE_VBoxGuestWineD3DxDLL_INCS.x86   = vbox/libWineStub/include
-TEMPLATE_VBoxGuestWineD3DxDLL_DEFS = VBOX_WINE_WITH_IPRT
-TEMPLATE_VBoxGuestWineD3DxDLL_CFLAGS = -wd4100  -wd4204 -wd4245 -wd4305
+TEMPLATE_VBoxGuestWineD3DxDLL_SDKS = $(TEMPLATE_VBoxGuestR3Dll_SDKS) ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
+TEMPLATE_VBoxGuestWineD3DxDLL_DEFS = $(TEMPLATE_VBoxGuestR3Dll_DEFS) VBOX_USING_WINDDK_W7_OR_LATER ## @todo TODO FIXME BUGBUG! THIS LINE IS NOT USED!!
+TEMPLATE_VBoxGuestWineD3DxDLL_DEFS.x86   = $(TEMPLATE_VBoxGuestR3Dll_DEFS.x86) __i386__
+#TEMPLATE_VBoxGuestWineD3DxDLL_INCS.x86   = $(TEMPLATE_VBoxGuestR3Dll_INCS.x86) vbox/libWineStub/include
+TEMPLATE_VBoxGuestWineD3DxDLL_DEFS = $(TEMPLATE_VBoxGuestR3Dll_DEFS) VBOX_WINE_WITH_IPRT
+TEMPLATE_VBoxGuestWineD3DxDLL_CFLAGS = $(TEMPLATE_VBoxGuestR3Dll_CFLAGS) -wd4100  -wd4204 -wd4245 -wd4305
 if1of ($(VBOX_VCC_TOOL_STEM), VCC120)
  TEMPLATE_VBoxGuestWineD3DxDLL_CFLAGS += -wd4005
 endif
-TEMPLATE_VBoxGuestWineD3DxDLL_LIBS = \
+TEMPLATE_VBoxGuestWineD3DxDLL_LDFLAGS.win.x86 = $(filter-out -Section:.bss$(COMMA)RW!K,$(TEMPLATE_VBoxGuestR3Dll_LDFLAGS.win.x86))
+TEMPLATE_VBoxGuestWineD3DxDLL_POST_CMDS.win.x86 = $(subst $(VBOX_PE_SET_VERSION), $(VBOX_PE_SET_VERSION) --w2k,$(TEMPLATE_VBoxGuestR3Dll_POST_CMDS.win.x86))
+TEMPLATE_VBoxGuestWineD3DxDLL_LIBS = $(TEMPLATE_VBoxGuestR3Dll_LIBS)  \
  	$(VBOX_LIB_IPRT_GUEST_R3) \
  	$(VBOX_LIB_VBGL_R3)
+
 
 
@@ -248,4 +262,5 @@
  DLLS += wined3dwddm
  wined3dwddm_EXTENDS        = wined3d
+ wined3dwddm_TEMPLATE       = VBoxGuestWineWddmDLL
  if defined(VBOX_SIGNING_MODE)
   wined3dwddm_INSTTYPE.win  = none
@@ -365,4 +380,5 @@
  DLLS += VBoxD3D9wddm
  VBoxD3D9wddm_EXTENDS  = VBoxD3D9
+ VBoxD3D9wddm_TEMPLATE = VBoxGuestWineWddmDLL
  if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
   VBoxD3D9wddm_INSTTYPE = none
