Module: wine Branch: master Commit: 0a7e2accc4844e34334d9f58a7e4c2057eeb910d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7e2accc4844e34334d9f58a7...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Mon Nov 19 22:04:11 2012 +0100
d3drm: Avoid LPDIRECTDRAWCLIPPER.
---
dlls/d3drm/d3drm.c | 20 ++++++++++---------- dlls/d3drm/device.c | 10 ++++------ dlls/d3drm/tests/d3drm.c | 4 ++-- include/d3drm.h | 12 ++++++------ include/d3drmobj.h | 6 +++--- 5 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index cadfd70..e90ce30 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -260,7 +260,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LP 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);
@@ -638,10 +640,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); }
-static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2* iface, - LPDIRECTDRAWCLIPPER pDDClipper, - LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromClipper(IDirect3DRM2 *iface, + IDirectDrawClipper *pDDClipper, GUID *pGUID, int width, int height, + IDirect3DRMDevice2 **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
@@ -1083,14 +1084,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3* iface, return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); }
-static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromClipper(IDirect3DRM3* iface, - LPDIRECTDRAWCLIPPER clipper, - LPGUID GUID, int width, int height, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromClipper(IDirect3DRM3 *iface, + IDirectDrawClipper *clipper, GUID *guid, int width, int height, + IDirect3DRMDevice3 **device) { 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);
return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index c43c27c..05ca080 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -223,9 +223,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2* ifa return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2* iface, - LPDIRECTDRAWCLIPPER lpDDClipper, - LPGUID lpGUID, int width, int height) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromClipper(IDirect3DRMDevice2 *iface, + IDirectDrawClipper *lpDDClipper, GUID *lpGUID, int width, int height) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface);
@@ -652,9 +651,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* ifa return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3* iface, - LPDIRECTDRAWCLIPPER lpDDClipper, - LPGUID lpGUID, int width, int height) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromClipper(IDirect3DRMDevice3 *iface, + IDirectDrawClipper *lpDDClipper, GUID *lpGUID, int width, int height) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface);
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index cde1577..7fee3e1 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -944,9 +944,9 @@ static void test_Frame(void)
static void test_Viewport(void) { + IDirectDrawClipper *pClipper; HRESULT hr; LPDIRECT3DRM pD3DRM; - LPDIRECTDRAWCLIPPER pClipper; LPDIRECT3DRMDEVICE pDevice; LPDIRECT3DRMFRAME pFrame; LPDIRECT3DRMVIEWPORT pViewport; @@ -1177,9 +1177,9 @@ static void test_Texture(void)
static void test_Device(void) { + IDirectDrawClipper *pClipper; HRESULT hr; LPDIRECT3DRM pD3DRM; - LPDIRECTDRAWCLIPPER pClipper; LPDIRECT3DRMDEVICE pDevice; LPDIRECT3DRMWINDEVICE pWinDevice; GUID driver; diff --git a/include/d3drm.h b/include/d3drm.h index b228400..3ec1183 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -72,8 +72,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture **texture) PURE; 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, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture2 **texture) PURE; 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, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE; - STDMETHOD(CreateDeviceFromClipper)(THIS_ LPDIRECTDRAWCLIPPER pDDClipper, LPGUID pGUID, int width, int height, - LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, + int width, int height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index c0ec232..3bafd9d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -377,7 +377,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) 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(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -504,7 +504,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) 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(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -649,7 +649,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) 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(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; STDMETHOD(DeleteUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE;