From 99dcfdf0cea1af0a9c605c8b9ea8126189c3a182 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 11 Dec 2012 22:27:29 +0100 Subject: [PATCH] ddraw: Avoid LPD3DDEVICEDESC7. --- dlls/ddraw/tests/d3d.c | 9 ++++++--- include/d3d.h | 2 +- include/d3dcaps.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 6f4416c7adf..b170b2935c7 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -624,7 +624,8 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS return DDENUMRET_OK; } -static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesCallbackTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ETest *d3d7et = Context; if(IsEqualGUID(&lpdd7->deviceGUID, &IID_IDirect3DRGBDevice)) @@ -641,7 +642,8 @@ static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR De return DDENUMRET_OK; } -static HRESULT WINAPI enumDevicesCancelTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesCancelTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ECancelTest *d3d7et = Context; @@ -650,7 +652,8 @@ static HRESULT WINAPI enumDevicesCancelTest7(LPSTR DeviceDescription, LPSTR Devi return d3d7et->desired_ret; } -static HRESULT WINAPI enumDevicesLifetimeTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesLifetimeTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ELifetimeTest *ctx = Context; diff --git a/include/d3d.h b/include/d3d.h index 811474cb7fd..f74cd19861a 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1295,7 +1295,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice7 methods ***/ - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC7 lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC7 *desc) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; diff --git a/include/d3dcaps.h b/include/d3dcaps.h index d8d4b88369e..bde09e86e64 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -349,7 +349,7 @@ typedef struct _D3DDeviceDesc7 { typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK)(GUID *guid, char *description, char *name, D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc, void *ctx); -typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC7, LPVOID); +typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(char *description, char *name, D3DDEVICEDESC7 *desc, void *ctx); #define D3DFDS_COLORMODEL 0x00000001 #define D3DFDS_GUID 0x00000002