From 68c4f61dc5d9a6abb8471ed748821e40323ecb59 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Tue, 23 Apr 2013 13:21:34 +0200
Subject: [PATCH] d3drm: Avoid LPDIRECT3DRMMESHBUILDER3.

---
 dlls/d3drm/d3drm.c       | 9 +++------
 dlls/d3drm/meshbuilder.c | 9 +++------
 dlls/d3drm/tests/d3drm.c | 2 +-
 include/d3drm.h          | 2 +-
 include/d3drmobj.h       | 2 +-
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 3e9e777189e..ff7ea71c0fc 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -929,14 +929,11 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3 *iface, IDirect3D
     return Direct3DRMMesh_create(mesh);
 }
 
-static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3* iface,
-                                                         LPDIRECT3DRMMESHBUILDER3* ppMeshBuilder)
+static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3 *iface, IDirect3DRMMeshBuilder3 **mesh_builder)
 {
-    IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
+    TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder);
 
-    TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder);
-
-    return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown**)ppMeshBuilder);
+    return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown **)mesh_builder);
 }
 
 static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3* iface, LPDIRECT3DRMFACE2* Face)
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 46785938c70..40e23de12c7 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -1750,13 +1750,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMesh(IDirect3DRMMeshBuilder
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMeshBuilder(IDirect3DRMMeshBuilder3* iface,
-                                                                 LPDIRECT3DRMMESHBUILDER3 MeshBuilder,
-                                                                 DWORD flags)
+static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddMeshBuilder(IDirect3DRMMeshBuilder3 *iface,
+        IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags)
 {
-    IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface);
-
-    FIXME("(%p)->(%p,%u): stub\n", This, MeshBuilder, flags);
+    FIXME("iface %p, mesh_builder %p, flags %#x stub!\n", iface, mesh_builder, flags);
 
     return E_NOTIMPL;
 }
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 13177776bf7..be8509844af 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -528,7 +528,7 @@ static void test_MeshBuilder3(void)
     HRESULT hr;
     IDirect3DRM *d3drm;
     IDirect3DRM3 *d3drm3;
-    LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3;
+    IDirect3DRMMeshBuilder3 *pMeshBuilder3;
     D3DRMLOADMEMORY info;
     int val;
     DWORD val1;
diff --git a/include/d3drm.h b/include/d3drm.h
index d4d21ebddd9..f1e5c4e0ed8 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -339,7 +339,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown)
     STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE;
     STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE;
     STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE;
-    STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER3 *) PURE;
+    STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE;
     STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE;
     STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE;
     STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE;
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index 51790027972..71244a19d18 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -2861,7 +2861,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual)
     STDMETHOD(GenerateNormals)(THIS_ D3DVALUE crease, DWORD flags) PURE;
     STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE;
     STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE;
-    STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER3, DWORD flags) PURE;
+    STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE;
     STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE;
     STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE2) PURE;
     STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,