Changeset 32281 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine

Timestamp:

Sep 7, 2010 12:02:49 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: basics for early d3d device creation (needed for win7), wine/d3d: stub for device settings update

Location:

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

Files:

• d3d9/device.c (modified) (3 diffs)
• vbox/VBoxWineEx.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c

@@ -714 +714 @@
 
 #ifdef VBOXWDDM
-#pragma comment(linker, "/export:VBoxWineExD3DDev9Flush=_VBoxWineExD3DDev9Flush@4")
+//#pragma comment(linker, "/export:VBoxWineExD3DDev9Flush=_VBoxWineExD3DDev9Flush@4")
 
 VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9Flush(IDirect3DDevice9Ex *iface)
@@ -730 +730 @@
 }
 
-#pragma comment(linker, "/export:VBoxWineExD3DDev9CreateTexture=_VBoxWineExD3DDev9CreateTexture@40")
+//#pragma comment(linker, "/export:VBoxWineExD3DDev9CreateTexture=_VBoxWineExD3DDev9CreateTexture@40")
 
 VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9CreateTexture(IDirect3DDevice9Ex *iface,
@@ -768 +768 @@
     return D3D_OK;
 }
+
+VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9Update(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS * pParams, IDirect3DDevice9Ex **outIface)
+{
+    IDirect3DDevice9_AddRef(iface);
+    *outIface = iface;
+    return D3D_OK;
+}
+
 #endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxWineEx.h

@@ -31 +31 @@
 typedef FNVBOXWINEEXD3DDEV9_FLUSH *PFNVBOXWINEEXD3DDEV9_FLUSH;
 
+typedef VBOXWINEEX_DECL(HRESULT) FNVBOXWINEEXD3DDEV9_UPDATE(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS * pParams, IDirect3DDevice9Ex **outIface);
+typedef FNVBOXWINEEXD3DDEV9_UPDATE *PFNVBOXWINEEXD3DDEV9_UPDATE;
+
 #ifdef __cplusplus
 extern "C"
@@ -42 +45 @@
 
 VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9Flush(IDirect3DDevice9Ex *iface); /* perform glFlush */
+
+VBOXWINEEX_DECL(HRESULT) VBoxWineExD3DDev9Update(IDirect3DDevice9Ex *iface, D3DPRESENT_PARAMETERS * pParams,
+                                                    IDirect3DDevice9Ex **outIface); /* update device parameters */
 #ifdef __cplusplus
 }