Changeset 40587 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Mar 23, 2012 9:08:44 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76988

Message:

wined3d/xpdm: gracefully handle missing msd3d dll

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher

Files:

• d3d8_main.c (modified) (1 diff)
• d3d9_main.c (modified) (2 diffs)
• switcher.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher/d3d8_main.c

@@ -25 +25 @@
 typedef HRESULT (WINAPI *ValidatePixelShaderProc)(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto);
 typedef HRESULT (WINAPI *ValidateVertexShaderProc)(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto);
+
+static HRESULT WINAPI vboxD3D8GetSWInfoStub(void)
+{
+    return E_FAIL;
+}
+
+static void WINAPI vboxDebugSetMuteStub(void)
+{
+
+}
+
+static IDirect3D8* WINAPI vboxDirect3DCreate8Stub(UINT SDKVersion)
+{
+    return NULL;
+}
+
+static HRESULT WINAPI vboxValidatePixelShaderStub(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto)
+{
+    return E_FAIL;
+}
+
+static HRESULT WINAPI vboxValidateVertexShaderStub(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto)
+{
+    return E_FAIL;
+}
 
 typedef struct _D3D8ExTag

trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher/d3d9_main.c

@@ -23 +23 @@
 typedef IDirect3D9* (WINAPI *Direct3DCreate9Proc)(UINT SDKVersion);
 typedef HRESULT (WINAPI *Direct3DCreate9ExProc)(UINT SDKVersion, IDirect3D9Ex **direct3d9ex);
+/* @todo: this does not return a value according to MSDN */
 typedef void* (WINAPI *Direct3DShaderValidatorCreate9Proc)(void);
 typedef int (WINAPI *D3DPERF_BeginEventProc)(D3DCOLOR color, LPCWSTR name);
@@ -31 +32 @@
 typedef void (WINAPI *D3DPERF_SetMarkerProc)(D3DCOLOR color, LPCWSTR name);
 typedef void (WINAPI *D3DPERF_SetRegionProc)(D3DCOLOR color, LPCWSTR name);
+
+static void WINAPI vboxDebugSetMuteStub(void)
+{
+}
+
+static IDirect3D9* WINAPI vboxDirect3DCreate9Stub(UINT SDKVersion)
+{
+    return NULL;
+}
+
+static HRESULT WINAPI vboxDirect3DCreate9ExStub(UINT SDKVersion, IDirect3D9Ex **direct3d9ex)
+{
+    if (direct3d9ex)
+        *direct3d9ex = NULL;
+    return E_FAIL;
+}
+
+static void* WINAPI vboxDirect3DShaderValidatorCreate9Stub(void)
+{
+    return NULL;
+}
+
+static int WINAPI vboxD3DPERF_BeginEventStub(D3DCOLOR color, LPCWSTR name)
+{
+    return 0;
+}
+
+static int WINAPI vboxD3DPERF_EndEventStub(void)
+{
+    return 0;
+}
+
+static DWORD WINAPI vboxD3DPERF_GetStatusStub(void)
+{
+    return 0;
+}
+
+static void WINAPI vboxD3DPERF_SetOptionsStub(DWORD options)
+{
+
+}
+
+static BOOL WINAPI vboxD3DPERF_QueryRepeatFrameStub(void)
+{
+    return 0;
+}
+
+static void WINAPI vboxD3DPERF_SetMarkerStub(D3DCOLOR color, LPCWSTR name)
+{
+
+}
+
+static void WINAPI vboxD3DPERF_SetRegionStub(D3DCOLOR color, LPCWSTR name)
+{
+
+}
+
 
 typedef struct _D3D9ExTag

trunk/src/VBox/Additions/WINNT/Graphics/Wine/switcher/switcher.h

@@ -23 +23 @@
 
 #define SW_FILLPROC(dispatch, hdll, name) \
-    dispatch.p##name = (name##Proc) GetProcAddress(hdll, #name);
+    dispatch.p##name = ((hdll) != NULL) ? (name##Proc) GetProcAddress((hdll), #name) : vbox##name##Stub;
 
 #define SW_DISPINIT(dispatch)                                   \