From ec1c18b65cb5ee721f28f3dbae6b2df7820759fc Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 23 Apr 2013 13:21:32 +0200 Subject: [PATCH] d3drm: Avoid LPDIRECT3DRMMESHBUILDER. --- dlls/d3drm/d3drm.c | 8 +++----- dlls/d3drm/meshbuilder.c | 8 +++----- dlls/d3drm/tests/d3drm.c | 10 +++++----- include/d3drm.h | 2 +- include/d3drmobj.h | 4 ++-- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4402cec08f2..eba40c89bad 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -154,13 +154,11 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM *iface, IDirect3DRM return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh); } -static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM* iface, LPDIRECT3DRMMESHBUILDER * ppMeshBuilder) +static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM *iface, IDirect3DRMMeshBuilder **mesh_builder) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); - - TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder); + TRACE("iface %p, mesh_builder %p.\n", iface, mesh_builder); - return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown**)ppMeshBuilder); + return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown **)mesh_builder); } static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c0e2f86e1ca..46785938c70 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -590,12 +590,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMesh(IDirect3DRMMeshBuilder return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2* iface, - LPDIRECT3DRMMESHBUILDER pMeshBuilder) +static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2 *iface, + IDirect3DRMMeshBuilder *mesh_builder) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); - - FIXME("(%p)->(%p): stub\n", This, pMeshBuilder); + FIXME("iface %p, mesh_builder %p stub!\n", iface, mesh_builder); return E_NOTIMPL; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7c527385777..13177776bf7 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -226,7 +226,7 @@ static void test_MeshBuilder(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRMMESHBUILDER pMeshBuilder; + IDirect3DRMMeshBuilder *pMeshBuilder; IDirect3DRMMesh *mesh; D3DRMLOADMEMORY info; int val; @@ -675,7 +675,7 @@ static void test_Frame(void) IDirect3DRMFrame *pFrameP2; IDirect3DRMFrame *pFrameTmp; LPDIRECT3DRMFRAMEARRAY pArray; - LPDIRECT3DRMMESHBUILDER pMeshBuilder; + IDirect3DRMMeshBuilder *mesh_builder; IDirect3DRMVisual *visual1; IDirect3DRMVisual *visual_tmp; LPDIRECT3DRMVISUALARRAY pVisualArray; @@ -907,9 +907,9 @@ static void test_Frame(void) CHECK_REFCOUNT(pFrameP1, 3); /* Create Visual */ - hr = IDirect3DRM_CreateMeshBuilder(d3drm, &pMeshBuilder); + hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr); - visual1 = (IDirect3DRMVisual *)pMeshBuilder; + visual1 = (IDirect3DRMVisual *)mesh_builder; /* Add Visual to first parent */ hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1); @@ -935,7 +935,7 @@ static void test_Frame(void) hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1); ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); CHECK_REFCOUNT(pFrameP1, 3); - IDirect3DRMMeshBuilder_Release(pMeshBuilder); + IDirect3DRMMeshBuilder_Release(mesh_builder); /* [Add/Delete]Light with NULL pointer */ hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); diff --git a/include/d3drm.h b/include/d3drm.h index f57a8548a7b..1f62756678c 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -60,7 +60,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(CreateMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER *) PURE; + STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE; STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 70fb2e9f2d0..51790027972 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2510,7 +2510,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, @@ -2681,7 +2681,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; - STDMETHOD(AddMeshBuilder)(THIS_ LPDIRECT3DRMMESHBUILDER) PURE; + STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, -- 2.11.4.GIT