ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3drm: Avoid LPDIRECTDRAWCLIPPER.

This commit is contained in:
Henri Verbeet 2012-11-19 22:04:11 +01:00 committed by Alexandre Julliard
parent 34dd6ff2e4
commit 0a7e2accc4
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/d3drm/d3drm.c
View File

@ -260,7 +260,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LP
return Direct3DRMDevice_create(&IID_IDirect3DRMDevice, (IUnknown**)ppDevice); return Direct3DRMDevice_create(&IID_IDirect3DRMDevice, (IUnknown**)ppDevice);
} }
static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM* iface, LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, LPDIRECT3DRMDEVICE * ppDevice) static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromClipper(IDirect3DRM *iface,
IDirectDrawClipper *pDDClipper, GUID *pGUID, int width, int height,
IDirect3DRMDevice **ppDevice)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
@ -638,10 +640,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface,
return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice);
} }
static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2* iface, static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2 *iface,
LPDIRECTDRAWCLIPPER pDDClipper, IDirectDrawClipper *pDDClipper, GUID *pGUID, int width, int height,
LPGUID pGUID, int width, int height, IDirect3DRMDevice2 **ppDevice)
LPDIRECT3DRMDEVICE2 * ppDevice)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
@ -1083,14 +1084,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3* iface,
return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device);
} }
static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromClipper(IDirect3DRM3* iface, static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromClipper(IDirect3DRM3 *iface,
LPDIRECTDRAWCLIPPER clipper, IDirectDrawClipper *clipper, GUID *guid, int width, int height,
LPGUID GUID, int width, int height, IDirect3DRMDevice3 **device)
LPDIRECT3DRMDEVICE3* device)
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
FIXME("(%p/%p)->(%p,%s,%d,%d,%p): partial stub\n", iface, This, clipper, debugstr_guid(GUID), FIXME("(%p/%p)->(%p,%s,%d,%d,%p): partial stub\n", iface, This, clipper, debugstr_guid(guid),
width, height, device); width, height, device);
return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device);

10
dlls/d3drm/device.c
View File

@ -223,9 +223,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2* ifa
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2* iface, static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2 *iface,
LPDIRECTDRAWCLIPPER lpDDClipper, IDirectDrawClipper *lpDDClipper, GUID *lpGUID, int width, int height)
LPGUID lpGUID, int width, int height)
{ {
IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface);
@ -652,9 +651,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* ifa
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3* iface, static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3 *iface,
LPDIRECTDRAWCLIPPER lpDDClipper, IDirectDrawClipper *lpDDClipper, GUID *lpGUID, int width, int height)
LPGUID lpGUID, int width, int height)
{ {
IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface);

4
dlls/d3drm/tests/d3drm.c
View File

@ -944,9 +944,9 @@ static void test_Frame(void)
static void test_Viewport(void) static void test_Viewport(void)
{ {
IDirectDrawClipper *pClipper;
HRESULT hr; HRESULT hr;
LPDIRECT3DRM pD3DRM; LPDIRECT3DRM pD3DRM;
LPDIRECTDRAWCLIPPER pClipper;
LPDIRECT3DRMDEVICE pDevice; LPDIRECT3DRMDEVICE pDevice;
LPDIRECT3DRMFRAME pFrame; LPDIRECT3DRMFRAME pFrame;
LPDIRECT3DRMVIEWPORT pViewport; LPDIRECT3DRMVIEWPORT pViewport;
@ -1177,9 +1177,9 @@ static void test_Texture(void)
static void test_Device(void) static void test_Device(void)
{ {
IDirectDrawClipper *pClipper;
HRESULT hr; HRESULT hr;
LPDIRECT3DRM pD3DRM; LPDIRECT3DRM pD3DRM;
LPDIRECTDRAWCLIPPER pClipper;
LPDIRECT3DRMDEVICE pDevice; LPDIRECT3DRMDEVICE pDevice;
LPDIRECT3DRMWINDEVICE pWinDevice; LPDIRECT3DRMWINDEVICE pWinDevice;
GUID driver; GUID driver;

12
include/d3drm.h
View File

@ -72,8 +72,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown)
STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw,
IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE; IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE;
STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE;
STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid,
LPDIRECT3DRMDEVICE *) PURE; int width, int height, IDirect3DRMDevice **device) PURE;
STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface,
IDirect3DRMTexture **texture) PURE; IDirect3DRMTexture **texture) PURE;
STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz,
@ -207,8 +207,8 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw,
IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE;
STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE;
STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid,
LPDIRECT3DRMDEVICE2 *) PURE; int width, int height, IDirect3DRMDevice2 **device) PURE;
STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface,
IDirect3DRMTexture2 **texture) PURE; IDirect3DRMTexture2 **texture) PURE;
STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, STDMETHOD(CreateShadow)(THIS_ LPDIRECT3DRMVISUAL, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz,
@ -345,8 +345,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw,
IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE;
STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE;
STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid,
LPDIRECT3DRMDEVICE3 *) PURE; int width, int height, IDirect3DRMDevice3 **device) PURE;
STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface,
IDirect3DRMTexture3 **texture) PURE; IDirect3DRMTexture3 **texture) PURE;
STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz,

6
include/d3drmobj.h
View File

@ -377,7 +377,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown)
/*** IDirect3DRMDevice methods ***/ /*** IDirect3DRMDevice methods ***/
STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE;
STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE;
STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE;
STDMETHOD(Update)(THIS) PURE; STDMETHOD(Update)(THIS) PURE;
STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;
STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;
@ -504,7 +504,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice)
/*** IDirect3DRMDevice methods ***/ /*** IDirect3DRMDevice methods ***/
STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE;
STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE;
STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE;
STDMETHOD(Update)(THIS) PURE; STDMETHOD(Update)(THIS) PURE;
STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;
STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;
@ -649,7 +649,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject)
/*** IDirect3DRMDevice methods ***/ /*** IDirect3DRMDevice methods ***/
STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE;
STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE;
STDMETHOD(InitFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE;
STDMETHOD(Update)(THIS) PURE; STDMETHOD(Update)(THIS) PURE;
STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;
STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;