Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE7.
Alexandre Julliard
julliard at winehq.org
Wed Nov 14 13:17:16 CST 2012
Module: wine
Branch: master
Commit: a24d59a1dd619f8a7892fe00d75cc2ddde26bbbb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24d59a1dd619f8a7892fe00d75cc2ddde26bbbb
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Nov 13 21:24:20 2012 +0100
ddraw: Avoid LPDIRECT3DDEVICE7.
---
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
More information about the wine-cvs
mailing list