Changeset 42536 in vbox

Timestamp:

Aug 2, 2012 1:20:42 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL/wddm: WOW64 fix

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/load.c (modified) (2 diffs)
• Additions/common/crOpenGL/pack/packspu_init.c (modified) (1 diff)
• GuestHost/OpenGL/include/chromium.h (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -1025 +1025 @@
     PeekMessage(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE);
 # ifdef VBOX_WITH_WDDM
-    hVBoxD3D = GetModuleHandle("VBoxDispD3D");
+    hVBoxD3D = GetModuleHandle(VBOX_MODNAME_DISPD3D);
     if (hVBoxD3D)
     {
-        hVBoxD3D = LoadLibrary("VBoxDispD3D");
+        hVBoxD3D = LoadLibrary(VBOX_MODNAME_DISPD3D);
     }
 
@@ -1051 +1051 @@
                 else
                 {
-                    crDebug("running with VBoxDispD3D");
+                    crDebug("running with " VBOX_MODNAME_DISPD3D);
                     stub.trackWindowVisibleRgn = 0;
                     stub.bRunningUnderWDDM = true;

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c

@@ -48 +48 @@
 
 #if defined(WINDOWS) && defined(VBOX_WITH_WDDM)
-    pack_spu.bRunningUnderWDDM = !!GetModuleHandle("VBoxDispD3D");
+    pack_spu.bRunningUnderWDDM = !!GetModuleHandle(VBOX_MODNAME_DISPD3D);
 #endif
 

trunk/src/VBox/GuestHost/OpenGL/include/chromium.h

@@ -80 +80 @@
 /* to shut up gcc warning for struct VBOXUHGSMI * parameters */
 struct VBOXUHGSMI;
+
+#if defined(IN_GUEST) && (WINDOWS) && defined(VBOX_WITH_WDDM)
+# ifdef VBOX_WDDM_WOW64
+#  define VBOX_MODNAME_DISPD3D "VBoxDispD3D-x86"
+# else
+#  define VBOX_MODNAME_DISPD3D "VBoxDispD3D"
+# endif
+#endif
 
 #ifndef APIENTRY