From 5114cbd23cf95146cc6999fac61cb30b5f636cfb Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Thu, 24 Jan 2013 11:37:38 +0100 Subject: [PATCH] d3drm: Avoid LPD3DRMRAY. --- dlls/d3drm/frame.c | 6 ++---- include/d3drmobj.h | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 3f814bf79d..09dfea4b6f 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -2452,10 +2452,8 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_SetQuaternion(IDirect3DRMFrame3* ifa return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMFrame3Impl_RayPick(IDirect3DRMFrame3* iface, - LPDIRECT3DRMFRAME3 reference, LPD3DRMRAY ray, - DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMFrame3Impl_RayPick(IDirect3DRMFrame3 *iface, IDirect3DRMFrame3 *reference, + D3DRMRAY *ray, DWORD flags, IDirect3DRMPicked2Array **return_visuals) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 95690462f6..71bc005b0c 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -1401,8 +1401,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame2,IDirect3DRMFrame) STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL) PURE; STDMETHOD(SetQuaternion)(THIS_ LPDIRECT3DRMFRAME reference, D3DRMQUATERNION *q) PURE; - STDMETHOD(RayPick)(THIS_ LPDIRECT3DRMFRAME reference, LPD3DRMRAY ray, DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) PURE; + STDMETHOD(RayPick)(THIS_ IDirect3DRMFrame *reference, D3DRMRAY *ray, DWORD flags, + struct IDirect3DRMPicked2Array **return_visuals) PURE; STDMETHOD(Save)(THIS_ LPCSTR filename, D3DRMXOFFORMAT d3dFormat, D3DRMSAVEOPTIONS d3dSaveFlags); }; #undef INTERFACE @@ -1680,8 +1680,8 @@ DECLARE_INTERFACE_(IDirect3DRMFrame3,IDirect3DRMVisual) STDMETHOD(SetInheritAxes)(THIS_ BOOL inherit_from_parent); STDMETHOD(SetMaterial)(THIS_ LPDIRECT3DRMMATERIAL2) PURE; STDMETHOD(SetQuaternion)(THIS_ LPDIRECT3DRMFRAME3 reference, D3DRMQUATERNION *q) PURE; - STDMETHOD(RayPick)(THIS_ LPDIRECT3DRMFRAME3 reference, LPD3DRMRAY ray, DWORD flags, - LPDIRECT3DRMPICKED2ARRAY *return_visuals) PURE; + STDMETHOD(RayPick)(THIS_ IDirect3DRMFrame3 *reference, D3DRMRAY *ray, DWORD flags, + struct IDirect3DRMPicked2Array **return_visuals) PURE; STDMETHOD(Save)(THIS_ LPCSTR filename, D3DRMXOFFORMAT d3dFormat, D3DRMSAVEOPTIONS d3dSaveFlags); STDMETHOD(TransformVectors)(THIS_ IDirect3DRMFrame3 *reference, DWORD vector_count, D3DVECTOR *dst_vectors, D3DVECTOR *src_vectors) PURE; -- 2.32.0.93.g670b81a890