marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw: Avoid LPD3DDEVICEDESC7.

oldstable
Henri Verbeet 2012-12-11 22:27:29 +01:00 committed by Alexandre Julliard
parent 725ec0323e
commit 99dcfdf0ce
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/ddraw/tests/d3d.c
View File

@ -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;

2
include/d3d.h
View File

@ -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;

2
include/d3dcaps.h
View File

@ -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