Module: wine Branch: master Commit: cf3053f504b0946791c61af4c79abcde6524177a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf3053f504b0946791c61af4c7...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Aug 13 08:51:47 2013 +0200
d3drm: Avoid LPDIRECT3DRMPICKEDARRAY.
---
dlls/d3drm/viewport.c | 16 ++++++---------- include/d3drmobj.h | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 49cceb0..ee4cbb3 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -341,12 +341,10 @@ static HRESULT WINAPI IDirect3DRMViewportImpl_GetPlane(IDirect3DRMViewport* ifac return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMViewportImpl_Pick(IDirect3DRMViewport* iface, LONG x, LONG y, - LPDIRECT3DRMPICKEDARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMViewportImpl_Pick(IDirect3DRMViewport *iface, + LONG x, LONG y, IDirect3DRMPickedArray **visuals) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport(iface); - - FIXME("(%p/%p)->(%u, %u, %p): stub\n", iface, This, x, y, return_visuals); + FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals);
return E_NOTIMPL; } @@ -760,12 +758,10 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetPlane(IDirect3DRMViewport2* if return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMViewport2Impl_Pick(IDirect3DRMViewport2* iface, LONG x, LONG y, - LPDIRECT3DRMPICKEDARRAY *return_visuals) +static HRESULT WINAPI IDirect3DRMViewport2Impl_Pick(IDirect3DRMViewport2 *iface, + LONG x, LONG y, IDirect3DRMPickedArray **visuals) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%u, %u, %p): stub\n", iface, This, x, y, return_visuals); + FIXME("iface %p, x %d, y %d, visuals %p stub!\n", iface, x, y, visuals);
return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 0253b89..7bae278 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -826,7 +826,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) STDMETHOD(GetCamera)(THIS_ struct IDirect3DRMFrame **camera) PURE; STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; - STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; + STDMETHOD(Pick)(THIS_ LONG x, LONG y, struct IDirect3DRMPickedArray **visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE; STDMETHOD_(LONG, GetX)(THIS) PURE; STDMETHOD_(LONG, GetY)(THIS) PURE; @@ -966,7 +966,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(GetCamera)(THIS_ struct IDirect3DRMFrame3 **camera) PURE; STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice3 **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; - STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; + STDMETHOD(Pick)(THIS_ LONG x, LONG y, struct IDirect3DRMPickedArray **visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE; STDMETHOD_(LONG, GetX)(THIS) PURE; STDMETHOD_(LONG, GetY)(THIS) PURE;