Skip to content

W
wine-winehq
Commit ec1c18b6 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3drm: Avoid LPDIRECT3DRMMESHBUILDER.

parent 6fe9e0f0
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 18 deletions
dlls/d3drm/d3drm.c
View file @ ec1c18b6
...@@ -154,13 +154,11 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM *iface, IDirect3DRM ...@@ -154,13 +154,11 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM *iface, IDirect3DRM
return IDirect3DRM3_CreateMesh(&d3drm->IDirect3DRM3_iface, mesh); 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("iface %p, mesh_builder %p.\n", iface, mesh_builder);
TRACE("(%p/%p)->(%p)\n", iface, This, ppMeshBuilder);
return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown**)ppMeshBuilder); return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown **)mesh_builder);
} }
static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace) static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace)
......
dlls/d3drm/meshbuilder.c
View file @ ec1c18b6
...@@ -590,12 +590,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMesh(IDirect3DRMMeshBuilder ...@@ -590,12 +590,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMesh(IDirect3DRMMeshBuilder
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2* iface, static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddMeshBuilder(IDirect3DRMMeshBuilder2 *iface,
LPDIRECT3DRMMESHBUILDER pMeshBuilder) IDirect3DRMMeshBuilder *mesh_builder)
{ {
IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface); FIXME("iface %p, mesh_builder %p stub!\n", iface, mesh_builder);
FIXME("(%p)->(%p): stub\n", This, pMeshBuilder);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/d3drm/tests/d3drm.c
View file @ ec1c18b6
...@@ -226,7 +226,7 @@ static void test_MeshBuilder(void) ...@@ -226,7 +226,7 @@ static void test_MeshBuilder(void)
{ {
HRESULT hr; HRESULT hr;
IDirect3DRM *d3drm; IDirect3DRM *d3drm;
LPDIRECT3DRMMESHBUILDER pMeshBuilder; IDirect3DRMMeshBuilder *pMeshBuilder;
IDirect3DRMMesh *mesh; IDirect3DRMMesh *mesh;
D3DRMLOADMEMORY info; D3DRMLOADMEMORY info;
int val; int val;
...@@ -675,7 +675,7 @@ static void test_Frame(void) ...@@ -675,7 +675,7 @@ static void test_Frame(void)
IDirect3DRMFrame *pFrameP2; IDirect3DRMFrame *pFrameP2;
IDirect3DRMFrame *pFrameTmp; IDirect3DRMFrame *pFrameTmp;
LPDIRECT3DRMFRAMEARRAY pArray; LPDIRECT3DRMFRAMEARRAY pArray;
LPDIRECT3DRMMESHBUILDER pMeshBuilder; IDirect3DRMMeshBuilder *mesh_builder;
IDirect3DRMVisual *visual1; IDirect3DRMVisual *visual1;
IDirect3DRMVisual *visual_tmp; IDirect3DRMVisual *visual_tmp;
LPDIRECT3DRMVISUALARRAY pVisualArray; LPDIRECT3DRMVISUALARRAY pVisualArray;
...@@ -907,9 +907,9 @@ static void test_Frame(void) ...@@ -907,9 +907,9 @@ static void test_Frame(void)
CHECK_REFCOUNT(pFrameP1, 3); CHECK_REFCOUNT(pFrameP1, 3);
/* Create Visual */ /* 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); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder interface (hr = %x)\n", hr);
visual1 = (IDirect3DRMVisual *)pMeshBuilder; visual1 = (IDirect3DRMVisual *)mesh_builder;
/* Add Visual to first parent */ /* Add Visual to first parent */
hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1); hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1);
...@@ -935,7 +935,7 @@ static void test_Frame(void) ...@@ -935,7 +935,7 @@ static void test_Frame(void)
hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1); hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1);
ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr);
CHECK_REFCOUNT(pFrameP1, 3); CHECK_REFCOUNT(pFrameP1, 3);
IDirect3DRMMeshBuilder_Release(pMeshBuilder); IDirect3DRMMeshBuilder_Release(mesh_builder);
/* [Add/Delete]Light with NULL pointer */ /* [Add/Delete]Light with NULL pointer */
hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL);
......
include/d3drm.h
View file @ ec1c18b6
...@@ -60,7 +60,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) ...@@ -60,7 +60,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown)
STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; STDMETHOD(CreateObject)(THIS_ REFCLSID rclsid, LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE;
STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE; STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE;
STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) 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(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE;
STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE;
STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;
......
include/d3drmobj.h
View file @ ec1c18b6
...@@ -2510,7 +2510,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual) ...@@ -2510,7 +2510,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual)
STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD(GenerateNormals)(THIS) PURE;
STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE;
STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) 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(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE;
STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE;
STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,
...@@ -2681,7 +2681,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder) ...@@ -2681,7 +2681,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder)
STDMETHOD(GenerateNormals)(THIS) PURE; STDMETHOD(GenerateNormals)(THIS) PURE;
STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE; STDMETHOD_(D3DRMCOLORSOURCE, GetColorSource)(THIS) PURE;
STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) 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(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE;
STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE; STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE;
STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment