Changeset 53304 in vbox

Timestamp:

Nov 11, 2014 3:00:41 PM (10 years ago)

Author:

vboxsync

Message:

VBoxDD: Dynamically resolve Direct3DCreate9Ex and make sure other d3d9.dll imports are loaded in a delayed fashion.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA3d-win.cpp (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win.cpp

@@ -503 +503 @@
     AssertReturn(pState->pD3D9, VERR_INTERNAL_ERROR);
 #else
-    hr = Direct3DCreate9Ex(D3D_SDK_VERSION, &pState->pD3D9);
+    /* Direct3DCreate9Ex was introduced in Vista, so resolve it dynamically. */
+    typedef HRESULT (WINAPI *PFNDIRECT3DCREATE9EX)(UINT, IDirect3D9Ex **);
+    PFNDIRECT3DCREATE9EX pfnDirect3dCreate9Ex = (PFNDIRECT3DCREATE9EX)RTLdrGetSystemSymbol("d3d9.dll", "Direct3DCreate9Ex");
+    if (!pfnDirect3dCreate9Ex)
+        return PDMDevHlpVMSetError(pThis->CTX_SUFF(pDevIns), VERR_SYMBOL_NOT_FOUND, RT_SRC_POS,
+                                   "vmsvga3d: Unable to locate Direct3DCreate9Ex. This feature requires Vista and later.");
+    hr = pfnDirect3dCreate9Ex(D3D_SDK_VERSION, &pState->pD3D9);
     AssertReturn(hr == D3D_OK, VERR_INTERNAL_ERROR);
 #endif

trunk/src/VBox/Devices/Makefile.kmk

@@ -244 +244 @@
   ifeq ($(KBUILD_TARGET),win) # (Disable this to work with OpenGL on Windows.)
    VBoxDD_SOURCES       += Graphics/DevVGA-SVGA3d-win.cpp
-   VBoxDD_LIBS.win      += d3d9.lib
+   VBoxDD_LIBS.win      += d3d9.lib $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
+   VBoxDD_LDFLAGS.win   += /DELAYLOAD:d3d9.dll
   else
    VBoxDD_SOURCES       += Graphics/DevVGA-SVGA3d-ogl.cpp