Module: wine Branch: master Commit: eff68af5a0c40417c7c4bfbfca337a778a93dbcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff68af5a0c40417c7c4bfbfca...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu May 30 10:05:35 2013 +0200
d3drm: Avoid LPDIRECT3DRMANIMATION.
---
dlls/d3drm/d3drm.c | 13 ++++--------- include/d3drm.h | 4 ++-- include/d3drmobj.h | 4 ++-- 3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index cd65847..0ffee18 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -168,11 +168,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, IDirect3DRM return Direct3DRMFace_create(&IID_IDirect3DRMFace, (IUnknown **)face); }
-static HRESULT WINAPI IDirect3DRMImpl_CreateAnimation(IDirect3DRM* iface, LPDIRECT3DRMANIMATION * ppAnimation) +static HRESULT WINAPI IDirect3DRMImpl_CreateAnimation(IDirect3DRM *iface, IDirect3DRMAnimation **animation) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppAnimation); + FIXME("iface %p, animation %p stub!\n", iface, animation);
return E_NOTIMPL; } @@ -544,12 +542,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2 *iface, IDirect3D return Direct3DRMFace_create(&IID_IDirect3DRMFace, (IUnknown **)face); }
-static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimation(IDirect3DRM2* iface, - LPDIRECT3DRMANIMATION * ppAnimation) +static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimation(IDirect3DRM2 *iface, IDirect3DRMAnimation **animation) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppAnimation); + FIXME("iface %p, animation %p stub!\n", iface, animation);
return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index 24c2dbc..b3313fc 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -62,7 +62,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; - STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; + STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation **animation) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE; @@ -201,7 +201,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE; - STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; + STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation **animation) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE; STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 52f2b29..41d641c 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3963,10 +3963,10 @@ DECLARE_INTERFACE_(IDirect3DRMAnimationSet, IDirect3DRMObject) STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMAnimationSet methods ***/ - STDMETHOD(AddAnimation)(THIS_ LPDIRECT3DRMANIMATION aid) PURE; + STDMETHOD(AddAnimation)(THIS_ IDirect3DRMAnimation *animation) PURE; STDMETHOD(Load)(THIS_ void *filename, void *name, D3DRMLOADOPTIONS flags, D3DRMLOADTEXTURECALLBACK cb, void *ctx, IDirect3DRMFrame *parent)PURE; - STDMETHOD(DeleteAnimation)(THIS_ LPDIRECT3DRMANIMATION aid) PURE; + STDMETHOD(DeleteAnimation)(THIS_ IDirect3DRMAnimation *animation) PURE; STDMETHOD(SetTime)(THIS_ D3DVALUE time) PURE; }; #undef INTERFACE