Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESHBUILDER2.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Tue Apr 23 13:21:33 2013 +0200

d3drm: Avoid LPDIRECT3DRMMESHBUILDER2.

---

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

diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index eba40c8..3e9e777 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -533,14 +533,11 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2 *iface, IDirect3D
     return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh);
 }

-static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2* iface,
-                                                         LPDIRECT3DRMMESHBUILDER2 * ppMeshBuilder)
+static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2 *iface, IDirect3DRMMeshBuilder2 **mesh_builder)
 {
-    IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
-
-    TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder);
+    TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder);

-    return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown**)ppMeshBuilder);
+    return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown **)mesh_builder);
 }

static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2* iface, LPDIRECT3DRMFACE * ppFace)
diff --git a/include/d3drm.h b/include/d3drm.h
index 1f62756..d4d21eb 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -198,7 +198,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
     STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE;
     STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE;
     STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE;
-    STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER2 *) PURE;
+    STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE;
     STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE;
     STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE;
     STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;