Henri Verbeet : ddraw: Avoid LPD3DMATERIAL.
Alexandre Julliard
julliard at winehq.org
Wed Jan 9 13:30:37 CST 2013
Module: wine
Branch: master
Commit: caa7e42ed4ff8a6c93fcfc6b2aef0168369b6224
URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa7e42ed4ff8a6c93fcfc6b2aef0168369b6224
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jan 9 11:27:13 2013 +0100
ddraw: Avoid LPD3DMATERIAL.
---
include/d3d.h | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/d3d.h b/include/d3d.h
index 8678560..9e4ccf2 100644
--- a/include/d3d.h
+++ b/include/d3d.h
@@ -448,8 +448,8 @@ DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown)
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDirect3DMaterial methods ***/
STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE;
- STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
- STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL *data) PURE;
+ STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL *data) PURE;
STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DMATERIALHANDLE *handle) PURE;
STDMETHOD(Reserve)(THIS) PURE;
STDMETHOD(Unreserve)(THIS) PURE;
@@ -494,8 +494,8 @@ DECLARE_INTERFACE_(IDirect3DMaterial2,IUnknown)
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDirect3DMaterial2 methods ***/
- STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
- STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL *data) PURE;
+ STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL *data) PURE;
STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle) PURE;
};
#undef INTERFACE
@@ -532,8 +532,8 @@ DECLARE_INTERFACE_(IDirect3DMaterial3,IUnknown)
STDMETHOD_(ULONG,AddRef)(THIS) PURE;
STDMETHOD_(ULONG,Release)(THIS) PURE;
/*** IDirect3DMaterial3 methods ***/
- STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
- STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE;
+ STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL *data) PURE;
+ STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL *data) PURE;
STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice3 *device, D3DMATERIALHANDLE *handle) PURE;
};
#undef INTERFACE
More information about the wine-cvs
mailing list