Module: wine Branch: master Commit: 0fa127b1fabee80a179508a21e83a95420697c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa127b1fabee80a179508a21e...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Nov 16 00:29:50 2012 +0100
ddraw: Avoid LPDIRECT3D7.
---
dlls/ddraw/tests/d3d.c | 2 +- include/d3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 73317a8..6f4416c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -30,7 +30,7 @@ #include "unknwn.h"
static IDirectDraw7 *lpDD; -static LPDIRECT3D7 lpD3D = NULL; +static IDirect3D7 *lpD3D; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth; static IDirect3DDevice7 *lpD3DDevice; diff --git a/include/d3d.h b/include/d3d.h index 4f1ffba..d321846 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1299,7 +1299,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D7 *lplpDirect3D3) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D7 **d3d) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,D3DCOLOR dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE;