Module: wine Branch: master Commit: db3b97debf850e615658e63240acca355f320963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3b97debf850e615658e63240...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Wed Nov 14 23:05:58 2012 +0100
ddraw: Avoid LPDIRECT3DLIGHT.
---
include/d3d.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/d3d.h b/include/d3d.h index b9fdde9..4f1ffba 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -213,7 +213,7 @@ DECLARE_INTERFACE_(IDirect3D,IUnknown) /*** IDirect3D methods ***/ STDMETHOD(Initialize)(THIS_ REFIID riid) PURE; STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE; @@ -259,7 +259,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3D2 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport2 **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; @@ -307,7 +307,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3D3 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport3 **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; @@ -662,9 +662,9 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; }; #undef INTERFACE
@@ -730,9 +730,9 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; @@ -806,9 +806,9 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE;