Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/Makefile.kmk	(revision 34987)
@@ -72,5 +72,4 @@
 VBoxDispD3D_NOINST = true
  endif
-VBoxDispD3D_NAME.amd64 = VBoxDispD3D64
 VBoxDispD3D_TEMPLATE = VBOXGUESTR3DLL
 VBoxDispD3D_DEFS     = UNICODE _UNICODE VBOX_WITH_WDDM VBOXWDDMDISP LOG_TO_BACKDOOR
@@ -93,8 +92,4 @@
  VBoxDispD3D_DEFS   += VBOXWDDM_TEST_UHGSMI
 endif
-VBoxDispD3D_SOURCES.x86  = \
-	wddm/VBoxDispD3D.def
-VBoxDispD3D_SOURCES.amd64  = \
-	wddm/VBoxDispD3D64.def
 VBoxDispD3D_SOURCES  = \
 	wddm/VBoxDispD3D.cpp \
@@ -104,5 +99,6 @@
 	wddm/VBoxScreen.cpp \
 	wddm/VBoxDispMpTst.cpp \
-	wddm/VBoxDispD3D.rc
+	wddm/VBoxDispD3D.rc \
+	wddm/VBoxDispD3D.def
 #ifdef VBOX_WITH_CRHGSMI
 #VBoxDispD3D_SOURCES += \
@@ -123,5 +119,5 @@
 DLLS.amd64 += VBoxDispD3D-x86
 VBoxDispD3D-x86_EXTENDS = VBoxDispD3D
-VBoxDispD3D-x86_NAME = VBoxDispD3D
+VBoxDispD3D-x86_NAME = VBoxDispD3D32
 VBoxDispD3D-x86_BLD_TRG_ARCH = x86
 VBoxDispD3D-x86_LIBS = \
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.rc
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.rc	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.rc	(revision 34987)
@@ -38,7 +38,7 @@
          VALUE "FileDescription",  "VirtualBox Video Usermode D3D 64bit Driver\0"
          VALUE "FileVersion",      VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD "." VBOX_SVN_REV "\0"
-         VALUE "InternalName",     "VBoxDispD3D64\0"
+         VALUE "InternalName",     "VBoxDispD3D\0"
          VALUE "LegalCopyright",   VBOX_RC_LEGAL_COPYRIGHT
-         VALUE "OriginalFilename", "VBoxDispD3D64.dll\0"
+         VALUE "OriginalFilename", "VBoxDispD3D.dll\0"
          VALUE "ProductName",      VBOX_PRODUCT " Guest Additions\0"
          VALUE "ProductVersion",   VBOX_VERSION_MAJOR "." VBOX_VERSION_MINOR "." VBOX_VERSION_BUILD ".r" VBOX_SVN_REV "\0"
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxUhgsmiKmt.cpp	(revision 34987)
@@ -583,4 +583,6 @@
     memset(&DDev, 0, sizeof (DDev));
     DDev.cb = sizeof (DDev);
+
+    *phDc = NULL;
 
     for (int i = 0; ; ++i)
@@ -623,8 +625,8 @@
 {
     D3DKMT_OPENADAPTERFROMHDC OpenAdapterData = {0};
-    OpenAdapterData.hDc = GetWindowDC(NULL);
     HRESULT hr = vboxDispKmtAdpHdcCreate(&OpenAdapterData.hDc);
-    if (OpenAdapterData.hDc)
-    {
+    if (hr == S_OK)
+    {
+        Assert(OpenAdapterData.hDc);
         NTSTATUS Status = pCallbacks->pfnD3DKMTOpenAdapterFromHdc(&OpenAdapterData);
 #ifdef DEBUG_misha
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Makefile.kmk	(revision 34987)
@@ -23,7 +23,5 @@
 include $(PATH_SUB_CURRENT)/Display/Makefile.kmk
 ifdef VBOX_WITH_CROGL
- ifeq ($(KBUILD_TARGET_ARCH),x86)
-   include $(PATH_SUB_CURRENT)/Wine/Makefile.kmk
- endif
+ include $(PATH_SUB_CURRENT)/Wine/Makefile.kmk
 endif
 
@@ -90,5 +88,5 @@
  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
 VBoxVideoWddm-inf_SOURCES.amd64 += \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll
 endif
 
@@ -106,14 +104,14 @@
  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
 VBoxVideoWddm-inf_SOURCES.amd64 += \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D964.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine64.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll \
- $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu32.dll \
+ $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu32.dll
 endif
 
@@ -134,9 +132,9 @@
 
 ifdef VBOXWDDM_WITH_DISPD3D
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(TARGET_VBoxDispD3D$(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64",-x86,)) | $$(call DIRDEP,$$(@D))
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(TARGET_VBoxDispD3D) | $$(call DIRDEP,$$(@D))
 	$(INSTALL) -m 644 $< $(@D)
 
  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll: $$(TARGET_VBoxDispD3D) | $$(call DIRDEP,$$(@D))
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll: $$(TARGET_VBoxDispD3D-x86) | $$(call DIRDEP,$$(@D))
 	$(INSTALL) -m 644 $< $(@D)
  endif
@@ -181,5 +179,5 @@
 	$(INSTALL) -m 644 $< $(@D)
 
-$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll: $$(TARGET_wined3d64) | $$(call DIRDEP,$$(@D))
+$(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll: $$(TARGET_wined3dwddm32) | $$(call DIRDEP,$$(@D))
 	$(INSTALL) -m 644 $< $(@D)
 
@@ -211,5 +209,5 @@
 		$(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
 		$(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll, ) \
-		$(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D64.dll, ), ) \
+		$(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D32.dll, ), ) \
 		$(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
 					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
@@ -223,14 +221,14 @@
 					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll, ) \
 		$(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL64.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D964.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3d64.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine64.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu64.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil64.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu64.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu64.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu64.dll \
-					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu64.dll, ), )
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/libWine32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu32.dll \
+					   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu32.dll, ), )
 	$(call MSG_TOOL,Inf2Cat,VBoxVideoWddm-inf,$@,$<)
 	$(call VBOX_MAKE_CAT_FN, $(@D),$@)
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp	(revision 34987)
@@ -1259,6 +1259,5 @@
             DXGK_DRIVERCAPS *pCaps = (DXGK_DRIVERCAPS*)pQueryAdapterInfo->pOutputData;
 
-            pCaps->HighestAcceptableAddress.HighPart = 0x0;
-            pCaps->HighestAcceptableAddress.LowPart = 0xffffffffUL;
+            pCaps->HighestAcceptableAddress.QuadPart = ~((uintptr_t)0);
             pCaps->MaxAllocationListSlotId = 16;
             pCaps->ApertureSegmentCommitLimit = 0;
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.inf	(revision 34987)
@@ -49,13 +49,11 @@
 VBoxVideoWddm.sys
 
-;x86   [VBoxVideo.Display]
-;amd64 [VBoxVideo.Display_wow64]
+[VBoxVideo.Display]
 ;dispd3d VBoxDispD3D.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 
-;amd64 [VBoxVideo.Display]
-;amd64 ;dispd3d VBoxDispD3D64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 [VBoxVideo.Display_wow64]
+;amd64 ;dispd3d VBoxDispD3D32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 
-;x86   [VBoxVideo.GL]
-;amd64 [VBoxVideo.GL_wow64]
+[VBoxVideo.GL]
 ;gl VBoxOGL.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 ;gl VBoxD3D9wddm.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
@@ -69,25 +67,22 @@
 ;gl VBoxOGLpassthroughspu.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 
-;amd64 [VBoxVideo.GL]
-;amd64 ;gl VBoxOGL64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxD3D964.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl wined3d64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl libWine64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxOGLarrayspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxOGLcrutil64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxOGLerrorspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxOGLfeedbackspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxOGLpackspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
-;amd64 ;gl VBoxOGLpassthroughspu64.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 [VBoxVideo.GL_wow64]
+;amd64 ;gl VBoxOGL32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl VBoxD3D9wddm32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl wined3dwddm32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl libWine32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl VBoxOGLarrayspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl VBoxOGLcrutil32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl VBoxOGLerrorspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl VBoxOGLfeedbackspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl VBoxOGLpackspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
+;amd64 ;gl VBoxOGLpassthroughspu32.dll,,,0x00004000  ; COPYFLG_IN_USE_TRY_RENAME
 
 [VBoxVideo_SoftwareDeviceSettings]
-;x86   ;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D
-;x86   ;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D.dll
-;amd64 ;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D64 VBoxDispD3D
-;amd64 ;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D64.dll
-;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D.dll
-;x86   ;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
-;amd64 ;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL64.dll
-;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL.dll
+;dispd3d HKR,, InstalledDisplayDrivers, %REG_MULTI_SZ%, VBoxDispD3D
+;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D.dll
+;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D32.dll
+;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
+;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL32.dll
 ;gl        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
 ;amd64 ;gl HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
@@ -98,24 +93,24 @@
 [VBoxVideo_RegisterDlls]
 ;dispd3d 11,,VBoxDispD3D.dll,1
-;amd64 ;dispd3d 11,,VBoxDispD3D64.dll,1
-;amd64 ;gl 11,,VBoxOGL64.dll,1
+;amd64 ;dispd3d 11,,VBoxDispD3D32.dll,1
+;amd64 ;gl 11,,VBoxOGL32.dll,1
 ;gl 11,,VBoxOGL.dll,1
-;amd64 ;gl 11,,VBoxD3D964.dll,1
+;amd64 ;gl 11,,VBoxD3D9wddm32.dll,1
 ;gl 11,,VBoxD3D9wddm.dll,1
-;amd64 ;gl 11,,wined3d64.dll,1
+;amd64 ;gl 11,,wined3dwddm32.dll,1
 ;gl 11,,wined3dwddm.dll,1
-;amd64 ;gl 11,,libWine64.dll,1
+;amd64 ;gl 11,,libWine32.dll,1
 ;gl 11,,libWine.dll,1
-;amd64 ;gl 11,,VBoxOGLarrayspu64.dll,1
+;amd64 ;gl 11,,VBoxOGLarrayspu32.dll,1
 ;gl 11,,VBoxOGLarrayspu.dll,1
-;amd64 ;gl 11,,VBoxOGLcrutil64.dll,1
+;amd64 ;gl 11,,VBoxOGLcrutil32.dll,1
 ;gl 11,,VBoxOGLcrutil.dll,1
-;amd64 ;gl 11,,VBoxOGLerrorspu64.dll,1
+;amd64 ;gl 11,,VBoxOGLerrorspu32.dll,1
 ;gl 11,,VBoxOGLerrorspu.dll,1
-;amd64 ;gl 11,,VBoxOGLfeedbackspu64.dll,1
+;amd64 ;gl 11,,VBoxOGLfeedbackspu32.dll,1
 ;gl 11,,VBoxOGLfeedbackspu.dll,1
-;amd64 ;gl 11,,VBoxOGLpackspu64.dll,1
+;amd64 ;gl 11,,VBoxOGLpackspu32.dll,1
 ;gl 11,,VBoxOGLpackspu.dll,1
-;amd64 ;gl 11,,VBoxOGLpassthroughspu64.dll,1
+;amd64 ;gl 11,,VBoxOGLpassthroughspu32.dll,1
 ;gl 11,,VBoxOGLpassthroughspu.dll,1
 
@@ -143,25 +138,25 @@
 [SourceDisksFiles]
 VBoxVideoWddm.sys = 1
-;amd64 ;dispd3d VBoxDispD3D64.dll = 1
+;amd64 ;dispd3d VBoxDispD3D32.dll = 1
 ;dispd3d VBoxDispD3D.dll = 1
-;amd64 ;gl VBoxOGL64.dll = 1
+;amd64 ;gl VBoxOGL32.dll = 1
 ;gl VBoxOGL.dll = 1
-;amd64 ;gl VBoxD3D964.dll = 1
+;amd64 ;gl VBoxD3D9wddm32.dll = 1
 ;gl VBoxD3D9wddm.dll = 1
-;amd64 ;gl wined3d64.dll = 1
+;amd64 ;gl wined3dwddm32.dll = 1
 ;gl wined3dwddm.dll = 1
-;amd64 ;gl libWine64.dll = 1
+;amd64 ;gl libWine32.dll = 1
 ;gl libWine.dll = 1
-;amd64 ;gl VBoxOGLarrayspu64.dll = 1
+;amd64 ;gl VBoxOGLarrayspu32.dll = 1
 ;gl VBoxOGLarrayspu.dll = 1
-;amd64 ;gl VBoxOGLcrutil64.dll = 1
+;amd64 ;gl VBoxOGLcrutil32.dll = 1
 ;gl VBoxOGLcrutil.dll = 1
-;amd64 ;gl VBoxOGLerrorspu64.dll = 1
+;amd64 ;gl VBoxOGLerrorspu32.dll = 1
 ;gl VBoxOGLerrorspu.dll = 1
-;amd64 ;gl VBoxOGLfeedbackspu64.dll = 1
+;amd64 ;gl VBoxOGLfeedbackspu32.dll = 1
 ;gl VBoxOGLfeedbackspu.dll = 1
-;amd64 ;gl VBoxOGLpackspu64.dll = 1
+;amd64 ;gl VBoxOGLpackspu32.dll = 1
 ;gl VBoxOGLpackspu.dll = 1
-;amd64 ;gl VBoxOGLpassthroughspu64.dll = 1
+;amd64 ;gl VBoxOGLpassthroughspu32.dll = 1
 ;gl VBoxOGLpassthroughspu.dll = 1 
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk	(revision 34987)
@@ -20,5 +20,5 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-DLLS += libWine
+DLLS.x86 += libWine
 
 libWine_TEMPLATE     = VBOXGUESTR3NPDLL
@@ -118,5 +118,5 @@
     libWine/version.c
 
-DLLS += wined3d
+DLLS.x86 += wined3d
 
 wined3d_TEMPLATE     = VBOXGUESTR3NPDLL
@@ -129,5 +129,5 @@
     LIB_TO_DATADIR=\"\" \
     BIN_TO_DATADIR=\"\"
-if "$(KBUILD_TYPE)" != "debug" || defined(DEBUG_misha)
+if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
  wined3d_DEFS        += WINE_NO_DEBUG_MSGS
 endif
@@ -178,9 +178,21 @@
  wined3dwddm_NOINST.win.x86 = true
 endif
-wined3dwddm_DEFS    += $(wined3d_DEFS) VBOX_WITH_WDDM
+wined3dwddm_INCS     = vbox/libWineStub/include
+wined3dwddm_LIBS     = $(NO_SUCH_VARIABLE)
+wined3dwddm_DEFS     = $(subst __i386__,,$(wined3d_DEFS)) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE
 wined3dwddm_SOURCES  = $(subst wined3d.def,wined3dwddm.def,$(wined3d_SOURCES))
-endif
-
-DLLS += VBoxD3D8
+wined3dwddm_SOURCES += vbox/libWineStub/debug.c
+wined3dwddm_SDKS     = WINDDKWLH
+
+DLLS.amd64 += wined3dwddm-x86
+wined3dwddm-x86_EXTENDS = wined3dwddm
+wined3dwddm-x86_NAME = wined3dwddm32
+wined3dwddm-x86_BLD_TRG_ARCH = x86
+#wined3dwddm-x86_LIBS = \
+	$(VBOX_LIB_IPRT_GUEST_R3_X86) \
+	$(VBOX_LIB_VBGL_R3_X86)
+endif
+
+DLLS.x86 += VBoxD3D8
 
 VBoxD3D8_TEMPLATE     = VBOXGUESTR3NPDLL
@@ -193,5 +205,5 @@
     LIB_TO_DATADIR=\"\" \
     BIN_TO_DATADIR=\"\"
-if "$(KBUILD_TYPE)" != "debug" || defined(DEBUG_misha)
+if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
  VBoxD3D8_DEFS       += WINE_NO_DEBUG_MSGS
 endif
@@ -219,5 +231,5 @@
     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) \
     $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
-DLLS += VBoxD3D9
+DLLS.x86 += VBoxD3D9
 
 VBoxD3D9_TEMPLATE     = VBOXGUESTR3NPDLL
@@ -230,5 +242,5 @@
     LIB_TO_DATADIR=\"\" \
     BIN_TO_DATADIR=\"\"
-if "$(KBUILD_TYPE)" != "debug" || defined(DEBUG_misha)
+if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
  VBoxD3D9_DEFS       += WINE_NO_DEBUG_MSGS
 endif
@@ -262,10 +274,24 @@
  VBoxD3D9wddm_NOINST.win.x86 = true
 endif
-VBoxD3D9wddm_DEFS += $(VBoxD3D9_DEFS) VBOX_WITH_WDDM IN_VBOXWINEEX
+
+VBoxD3D9wddm_INCS     = vbox/libWineStub/include
+VBoxD3D9wddm_LIBS     = $(NO_SUCH_VARIABLE)
+VBoxD3D9wddm_DEFS += $(subst __i386__,,$(VBoxD3D9_DEFS)) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE IN_VBOXWINEEX
 VBoxD3D9wddm_SOURCES  = $(subst d3d9.def,d3d9wddm.def,$(VBoxD3D9_SOURCES))
-VBoxD3D9wddm_LIBS = $(subst wined3d$(VBOX_SUFF_LIB),wined3dwddm$(VBOX_SUFF_LIB),$(VBoxD3D9_LIBS))
-endif
-
-DLLS += d3d8
+VBoxD3D9wddm_SOURCES += vbox/libWineStub/debug.c
+VBoxD3D9wddm_LIBS = $(PATH_LIB)/wined3dwddm$(VBOX_SUFF_LIB)
+VBoxD3D9wddm_SDKS     = WINDDKWLH
+
+DLLS.amd64 += VBoxD3D9wddm-x86
+VBoxD3D9wddm-x86_EXTENDS = VBoxD3D9wddm
+VBoxD3D9wddm-x86_NAME = VBoxD3D9wddm32
+VBoxD3D9wddm-x86_BLD_TRG_ARCH = x86
+VBoxD3D9wddm-x86_LIBS = $(PATH_LIB)/wined3dwddm32$(VBOX_SUFF_LIB)
+#VBoxD3D9wddm-x86_LIBS += \
+	$(VBOX_LIB_IPRT_GUEST_R3_X86) \
+	$(VBOX_LIB_VBGL_R3_X86)
+endif
+
+DLLS.x86 += d3d8
 d3d8_TEMPLATE      = VBOXGUESTR3NPDLL
 d3d8_DEFS          = __i386__
@@ -277,5 +303,5 @@
     switcher/d3d8.rc
 
-DLLS += d3d9
+DLLS.x86 += d3d9
 d3d9_TEMPLATE      = VBOXGUESTR3NPDLL
 d3d9_DEFS          = __i386__
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vboxsharedrc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vboxsharedrc.h	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vboxsharedrc.h	(revision 34987)
@@ -37,5 +37,9 @@
 #ifdef DEBUG_misha
 /* just for simplicity */
+#ifdef RT_ARCH_X86
 #define AssertBreakpoint() do { __asm {int 3} } while (0)
+#else
+#define AssertBreakpoint() do { /* @todo */ } while (0)
+#endif
 #define Assert(_expr) do { \
         if (!(_expr)) AssertBreakpoint(); \
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h	(revision 34986)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h	(revision 34987)
@@ -40,4 +40,5 @@
 #define NONAMELESSSTRUCT
 #define COBJMACROS
+#ifndef VBOX_WINE_WITHOUT_LIBWINE
 #include "windef.h"
 #include "winbase.h"
@@ -45,8 +46,13 @@
 #include "wingdi.h"
 #include "winuser.h"
+#else
+#include <windows.h>
+#endif
 #include "wine/debug.h"
 #include "wine/unicode.h"
 
+#ifndef VBOX_WINE_WITHOUT_LIBWINE
 #include "objbase.h"
+#endif
 #include "wine/wined3d.h"
 #include "wined3d_gl.h"