From 31f9cae2bdc74e00a5883d080e63902728063cde Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 5 Jun 2013 11:06:13 +0200 Subject: [PATCH] d3drm: Avoid LPDIRECT3DRMVIEWPORTARRAY. --- dlls/d3drm/device.c | 14 ++++---------- include/d3drmobj.h | 6 +++--- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index e6e0d71ae49..c2458ac3e0f 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -319,12 +319,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetTextureQuality(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetViewports(IDirect3DRMDevice2* iface, - LPDIRECT3DRMVIEWPORTARRAY *return_views) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetViewports(IDirect3DRMDevice2 *iface, IDirect3DRMViewportArray **array) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, return_views); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } @@ -751,12 +748,9 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetTextureQuality(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetViewports(IDirect3DRMDevice3* iface, - LPDIRECT3DRMVIEWPORTARRAY *return_views) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetViewports(IDirect3DRMDevice3 *iface, IDirect3DRMViewportArray **array) { - IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, return_views); + FIXME("iface %p, array %p stub!\n", iface, array); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index a26427de1eb..ea85d7609a6 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -388,7 +388,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE; @@ -515,7 +515,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE; @@ -660,7 +660,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetQuality)(THIS_ D3DRMRENDERQUALITY) PURE; STDMETHOD(SetTextureQuality)(THIS_ D3DRMTEXTUREQUALITY) PURE; - STDMETHOD(GetViewports)(THIS_ LPDIRECT3DRMVIEWPORTARRAY *return_views) PURE; + STDMETHOD(GetViewports)(THIS_ struct IDirect3DRMViewportArray **array) PURE; STDMETHOD_(BOOL, GetDither)(THIS) PURE; STDMETHOD_(DWORD, GetShades)(THIS) PURE; STDMETHOD_(DWORD, GetHeight)(THIS) PURE;