[PATCH 2/5] ddraw: Avoid LPDIRECT3DDEVICE7.

Henri Verbeet hverbeet at codeweavers.com
Tue Nov 13 14:24:20 CST 2012


---
 dlls/ddraw/tests/d3d.c |    2 +-
 include/d3d.h          |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index 7968b09..73317a8 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -33,7 +33,7 @@ static IDirectDraw7 *lpDD;
 static LPDIRECT3D7             lpD3D = NULL;
 static IDirectDrawSurface7 *lpDDS;
 static IDirectDrawSurface7 *lpDDSdepth;
-static LPDIRECT3DDEVICE7       lpD3DDevice = NULL;
+static IDirect3DDevice7 *lpD3DDevice;
 static IDirect3DVertexBuffer7 *lpVBufSrc;
 
 static IDirectDraw *DirectDraw1 = NULL;
diff --git a/include/d3d.h b/include/d3d.h
index 7911497..9cab6f7 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -1517,8 +1517,9 @@ DECLARE_INTERFACE_(IDirect3DVertexBuffer7,IUnknown)
             IDirect3DVertexBuffer7 *src_buffer, DWORD src_idx,
             IDirect3DDevice7 *device, DWORD flags) PURE;
     STDMETHOD(GetVertexBufferDesc)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertexBufferDesc) PURE;
-    STDMETHOD(Optimize)(THIS_ LPDIRECT3DDEVICE7  lpD3DDevice,DWORD dwFlags) PURE;
-    STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD dwVertexOp,DWORD dwDestIndex,DWORD dwCount,LPD3DDRAWPRIMITIVESTRIDEDDATA lpStrideData,DWORD dwVertexTypeDesc,LPDIRECT3DDEVICE7 lpD3DDevice,DWORD dwFlags) PURE;
+    STDMETHOD(Optimize)(THIS_ IDirect3DDevice7 *device, DWORD flags) PURE;
+    STDMETHOD(ProcessVerticesStrided)(THIS_ DWORD vertex_op, DWORD dst_idx, DWORD count,
+            D3DDRAWPRIMITIVESTRIDEDDATA *data, DWORD fvf, IDirect3DDevice7 *device, DWORD flags) PURE;
 };
 #undef INTERFACE
 
-- 
1.7.8.6




More information about the wine-patches mailing list