marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3drm: Avoid LPDIRECT3DRMMESHBUILDER3.

oldstable
Henri Verbeet 2013-04-23 13:21:34 +02:00 committed by Alexandre Julliard
parent 5c442f8dc8
commit 68c4f61dc5
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/d3drm/d3drm.c
View File

@ -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)

9
dlls/d3drm/meshbuilder.c
View File

@ -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;
}

2
dlls/d3drm/tests/d3drm.c
View File

@ -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;

2
include/d3drm.h
View File

@ -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;

2
include/d3drmobj.h
View File

@ -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,