Henri Verbeet : d3drm: Avoid LPDIRECT3DRMPROGRESSIVEMESH.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Fri Aug 16 09:12:32 2013 +0200

d3drm: Avoid LPDIRECT3DRMPROGRESSIVEMESH.

---

dlls/d3drm/d3drm.c |   14 ++++----------
 include/d3drm.h    |    4 ++--
 include/d3drmobj.h |    2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index bd7155d..3b653de 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -803,12 +803,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_Tick(IDirect3DRM2* iface, D3DVALUE tick)
     return E_NOTIMPL;
 }

-static HRESULT WINAPI IDirect3DRM2Impl_CreateProgressiveMesh(IDirect3DRM2* iface,
-                                                             LPDIRECT3DRMPROGRESSIVEMESH * ppMesh)
+static HRESULT WINAPI IDirect3DRM2Impl_CreateProgressiveMesh(IDirect3DRM2 *iface, IDirect3DRMProgressiveMesh **mesh)
 {
-    IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
-
-    FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh);
+    FIXME("iface %p, mesh %p stub!\n", iface, mesh);

return E_NOTIMPL;
 }
@@ -1478,12 +1475,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_Tick(IDirect3DRM3* iface, D3DVALUE tick)
     return E_NOTIMPL;
 }

-static HRESULT WINAPI IDirect3DRM3Impl_CreateProgressiveMesh(IDirect3DRM3* iface,
-                                                             LPDIRECT3DRMPROGRESSIVEMESH Mesh)
+static HRESULT WINAPI IDirect3DRM3Impl_CreateProgressiveMesh(IDirect3DRM3 *iface, IDirect3DRMProgressiveMesh **mesh)
 {
-    IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
-
-    FIXME("(%p/%p)->(%p): stub\n", iface, This, Mesh);
+    FIXME("iface %p, mesh %p stub!\n", iface, mesh);

return E_NOTIMPL;
 }
diff --git a/include/d3drm.h b/include/d3drm.h
index 7427d32..5633326 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -241,7 +241,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
             D3DRMLOADCALLBACK load_cb, void *load_ctx, D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx,
             IDirect3DRMFrame *parent_frame) PURE;
     STDMETHOD(Tick)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(CreateProgressiveMesh)(THIS_ LPDIRECT3DRMPROGRESSIVEMESH *) PURE;
+    STDMETHOD(CreateProgressiveMesh)(THIS_ IDirect3DRMProgressiveMesh **mesh) PURE;
 };
 #undef INTERFACE

@@ -384,7 +384,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
             D3DRMLOADCALLBACK load_cb, void *load_ctx, D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx,
             IDirect3DRMFrame3 *parent_frame) PURE;
     STDMETHOD(Tick)(THIS_ D3DVALUE) PURE;
-    STDMETHOD(CreateProgressiveMesh)(THIS_ LPDIRECT3DRMPROGRESSIVEMESH) PURE;
+    STDMETHOD(CreateProgressiveMesh)(THIS_ IDirect3DRMProgressiveMesh **mesh) PURE;
     STDMETHOD(RegisterClient)(THIS_ REFGUID rguid, LPDWORD lpdwID) PURE;
     STDMETHOD(UnregisterClient)(THIS_ REFGUID rguid) PURE;
     STDMETHOD(CreateClippedVisual)(THIS_ IDirect3DRMVisual *visual, IDirect3DRMClippedVisual **clipped_visual) PURE;
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index e1c2da9..dfce54a 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -2039,7 +2039,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual)
     STDMETHOD(SetDetail) (THIS_ D3DVALUE d3dVal) PURE;
     STDMETHOD(RegisterEvents) (THIS_ HANDLE event, DWORD flags, DWORD reserved) PURE;
     STDMETHOD(CreateMesh) (THIS_ IDirect3DRMMesh **mesh) PURE;
-    STDMETHOD(Duplicate) (THIS_ LPDIRECT3DRMPROGRESSIVEMESH *ppD3DRMPMesh) PURE;
+    STDMETHOD(Duplicate) (THIS_ IDirect3DRMProgressiveMesh **mesh) PURE;
     STDMETHOD(GetBox) (THIS_ D3DRMBOX *box) PURE;
     STDMETHOD(SetQuality) (THIS_ D3DRMRENDERQUALITY quality) PURE;
     STDMETHOD(GetQuality) (THIS_ D3DRMRENDERQUALITY *quality) PURE;