Henri Verbeet : d3drm: Avoid LPDIRECT3DRMANIMATIONSET.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 78afa17fbe95a77c5dad9c0a9f4860716f885006
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=78afa17fbe95a77c5dad9c0a9f...

Author: Henri Verbeet 
Date:   Thu May 30 22:34:18 2013 +0200

d3drm: Avoid LPDIRECT3DRMANIMATIONSET.

---

dlls/d3drm/d3drm.c |   13 ++++---------
 include/d3drm.h    |    4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 07b4a46..de6945b 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -175,11 +175,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateAnimation(IDirect3DRM *iface, IDirec
     return E_NOTIMPL;
 }

-static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM* iface, LPDIRECT3DRMANIMATIONSET * ppAnimationSet)
+static HRESULT WINAPI IDirect3DRMImpl_CreateAnimationSet(IDirect3DRM *iface, IDirect3DRMAnimationSet **set)
 {
-    IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
-
-    FIXME("(%p/%p)->(%p): stub\n", iface, This, ppAnimationSet);
+    FIXME("iface %p, set %p stub!\n", iface, set);

return E_NOTIMPL;
 }
@@ -549,12 +547,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimation(IDirect3DRM2 *iface, IDir
     return E_NOTIMPL;
 }

-static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2* iface,
-                                                          LPDIRECT3DRMANIMATIONSET * ppAnimationSet)
+static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimationSet(IDirect3DRM2 *iface, IDirect3DRMAnimationSet **set)
 {
-    IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
-
-    FIXME("(%p/%p)->(%p): stub\n", iface, This, ppAnimationSet);
+    FIXME("iface %p, set %p stub!\n", iface, set);

return E_NOTIMPL;
 }
diff --git a/include/d3drm.h b/include/d3drm.h
index b3b120e..e33a67b 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -63,7 +63,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown)
     STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE;
     STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE;
     STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation **animation) PURE;
-    STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;
+    STDMETHOD(CreateAnimationSet)(THIS_ IDirect3DRMAnimationSet **set) PURE;
     STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE;
     STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE;
     STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE type, D3DVALUE r, D3DVALUE g, D3DVALUE b,
@@ -202,7 +202,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
     STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE;
     STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE;
     STDMETHOD(CreateAnimation)(THIS_ IDirect3DRMAnimation **animation) PURE;
-    STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;
+    STDMETHOD(CreateAnimationSet)(THIS_ IDirect3DRMAnimationSet **set) PURE;
     STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE;
     STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE type, D3DCOLOR color, IDirect3DRMLight **light) PURE;
     STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE type, D3DVALUE r, D3DVALUE g, D3DVALUE b,