From 00393fd804f2a1afddcca9aeb1f3987ab35b29ee Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Thu, 18 Apr 2013 09:35:14 +0200 Subject: [PATCH] d3drm: Avoid LPDIRECT3DRMDEVICE2. --- dlls/d3drm/d3drm.c | 10 ++++------ include/d3drm.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 435604155f3..719a4383f58 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -606,14 +606,12 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVA return IDirect3DRM3_CreateMaterial(&This->IDirect3DRM3_iface, power, (LPDIRECT3DRMMATERIAL2*)material); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2* iface, DWORD width, DWORD height, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2 *iface, + DWORD width, DWORD height, IDirect3DRMDevice2 **device) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); + FIXME("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - FIXME("(%p/%p)->(%u,%u,%p): partial stub\n", iface, This, width, height, ppDevice); - - return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); + return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown **)device); } static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2 *iface, GUID *pGUID, diff --git a/include/d3drm.h b/include/d3drm.h index b5e6815ae1c..b140efb377e 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -204,7 +204,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; - STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDevice)(THIS_ DWORD width, DWORD height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device,