Commit ac5b9323 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard

d3drm: Implement IDirect3DRMX_CreateMesh.

parent f503afd8
...@@ -150,9 +150,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM* iface, LPDIRECT3DR ...@@ -150,9 +150,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMesh(IDirect3DRM* iface, LPDIRECT3DR
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh); TRACE("(%p/%p)->(%p)\n", iface, This, ppMesh);
return E_NOTIMPL; return IDirect3DRM3_CreateMesh(&This->IDirect3DRM3_iface, ppMesh);
} }
static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM* iface, LPDIRECT3DRMMESHBUILDER * ppMeshBuilder) static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM* iface, LPDIRECT3DRMMESHBUILDER * ppMeshBuilder)
...@@ -518,9 +518,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2* iface, LPDIRECT3 ...@@ -518,9 +518,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMesh(IDirect3DRM2* iface, LPDIRECT3
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh); TRACE("(%p/%p)->(%p)\n", iface, This, ppMesh);
return E_NOTIMPL; return IDirect3DRM3_CreateMesh(&This->IDirect3DRM3_iface, ppMesh);
} }
static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2* iface, static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2* iface,
...@@ -943,9 +943,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3* iface, LPDIRECT3 ...@@ -943,9 +943,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMesh(IDirect3DRM3* iface, LPDIRECT3
{ {
IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface);
FIXME("(%p/%p)->(%p): stub\n", iface, This, Mesh); TRACE("(%p/%p)->(%p)\n", iface, This, Mesh);
return E_NOTIMPL; return Direct3DRMMesh_create(Mesh);
} }
static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3* iface, static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3* iface,
......
...@@ -30,6 +30,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN; ...@@ -30,6 +30,7 @@ HRESULT Direct3DRM_create(IUnknown** ppObj) DECLSPEC_HIDDEN;
HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN;
HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMFrame_create(REFIID riid, IUnknown* parent_frame, IUnknown** ret_iface) DECLSPEC_HIDDEN;
HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMLight_create(IUnknown** ppObj) DECLSPEC_HIDDEN;
HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN;
HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMMeshBuilder_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN;
HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN; HRESULT Direct3DRMViewport_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN;
HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN; HRESULT Direct3DRMMaterial_create(IDirect3DRMMaterial2** ret_iface) DECLSPEC_HIDDEN;
......
...@@ -34,8 +34,6 @@ ...@@ -34,8 +34,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3drm); WINE_DEFAULT_DEBUG_CHANNEL(d3drm);
static HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj);
typedef struct { typedef struct {
unsigned nb_vertices; unsigned nb_vertices;
D3DRMVERTEX* vertices; D3DRMVERTEX* vertices;
...@@ -2983,7 +2981,7 @@ static const struct IDirect3DRMMeshVtbl Direct3DRMMesh_Vtbl = ...@@ -2983,7 +2981,7 @@ static const struct IDirect3DRMMeshVtbl Direct3DRMMesh_Vtbl =
IDirect3DRMMeshImpl_GetGroupTexture IDirect3DRMMeshImpl_GetGroupTexture
}; };
static HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj) HRESULT Direct3DRMMesh_create(IDirect3DRMMesh** obj)
{ {
IDirect3DRMMeshImpl* object; IDirect3DRMMeshImpl* object;
......
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