Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFACEARRAY.
Alexandre Julliard
julliard at winehq.org
Tue Jun 4 15:48:34 CDT 2013
Module: wine
Branch: master
Commit: d6ac5a4b88f852b1cb1fceddeb2b33dfc8c60e63
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ac5a4b88f852b1cb1fceddeb2b33dfc8c60e63
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Jun 4 09:57:10 2013 +0200
d3drm: Avoid LPDIRECT3DRMFACEARRAY.
---
dlls/d3drm/meshbuilder.c | 43 ++++++++++++++++---------------------------
include/d3drmobj.h | 18 +++++++++---------
2 files changed, 25 insertions(+), 36 deletions(-)
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 42a5a7e..136065c 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -612,15 +612,12 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFace(IDirect3DRMMeshBuilder
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFaces(IDirect3DRMMeshBuilder2* iface,
- DWORD vcount, D3DVECTOR *vertices,
- DWORD ncount, D3DVECTOR *normals,
- DWORD *data,
- LPDIRECT3DRMFACEARRAY* pFaceArray)
+static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFaces(IDirect3DRMMeshBuilder2 *iface,
+ DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals,
+ DWORD *face_data, IDirect3DRMFaceArray **array)
{
- IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface);
-
- FIXME("(%p)->(%d,%p,%d,%p,%p,%p): stub\n", This, vcount, vertices, ncount, normals, data, pFaceArray);
+ FIXME("iface %p, vertex_count %u, vertices %p, normal_count %u, normals %p, face_data %p, array %p stub!\n",
+ iface, vertex_count, vertices, normal_count, normals, face_data, array);
return E_NOTIMPL;
}
@@ -771,12 +768,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetVertexColorRGB(IDirect3DRMM
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFaces(IDirect3DRMMeshBuilder2* iface,
- LPDIRECT3DRMFACEARRAY* pFaceArray)
+static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFaces(IDirect3DRMMeshBuilder2 *iface,
+ IDirect3DRMFaceArray **array)
{
- IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface);
-
- FIXME("(%p)->(%p): stub\n", This, pFaceArray);
+ FIXME("iface %p, array %p stub!\n", iface, array);
return E_NOTIMPL;
}
@@ -1765,16 +1760,12 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFace(IDirect3DRMMeshBuilder
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFaces(IDirect3DRMMeshBuilder3* iface,
- DWORD vcount, D3DVECTOR* vertices,
- DWORD ncount, D3DVECTOR* normals,
- DWORD* data,
- LPDIRECT3DRMFACEARRAY* FaceArray)
+static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFaces(IDirect3DRMMeshBuilder3 *iface,
+ DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count, D3DVECTOR *normals,
+ DWORD *face_data, IDirect3DRMFaceArray **array)
{
- IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface);
-
- FIXME("(%p)->(%d,%p,%d,%p,%p,%p): stub\n", This, vcount, vertices, ncount,
- normals, data, FaceArray);
+ FIXME("iface %p, vertex_count %u, vertices %p, normal_count %u, normals %p, face_data %p array %p stub!\n",
+ iface, vertex_count, vertices, normal_count, normals, face_data, array);
return E_NOTIMPL;
}
@@ -1939,12 +1930,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetVertexColorRGB(IDirect3DRMM
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFaces(IDirect3DRMMeshBuilder3* iface,
- LPDIRECT3DRMFACEARRAY* FaceArray)
+static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFaces(IDirect3DRMMeshBuilder3 *iface,
+ IDirect3DRMFaceArray **array)
{
- IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface);
-
- FIXME("(%p)->(%p): stub\n", This, FaceArray);
+ FIXME("iface %p, array %p stub!\n", iface, array);
return E_NOTIMPL;
}
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index 5576701..a26427d 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -2513,8 +2513,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual)
STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE;
STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE;
STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *face) PURE;
- STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,
- LPDIRECT3DRMFACEARRAY*) PURE;
+ STDMETHOD(AddFaces)(THIS_ DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count,
+ D3DVECTOR *normals, DWORD *face_data, struct IDirect3DRMFaceArray **array) PURE;
STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE;
STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE;
@@ -2528,7 +2528,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual)
STDMETHOD(SetTextureCoordinates)(THIS_ DWORD index, D3DVALUE u, D3DVALUE v) PURE;
STDMETHOD(SetVertexColor)(THIS_ DWORD index, D3DCOLOR) PURE;
STDMETHOD(SetVertexColorRGB)(THIS_ DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
- STDMETHOD(GetFaces)(THIS_ LPDIRECT3DRMFACEARRAY*) PURE;
+ STDMETHOD(GetFaces)(THIS_ struct IDirect3DRMFaceArray **array) PURE;
STDMETHOD(GetVertices)(THIS_ DWORD *vcount, D3DVECTOR *vertices, DWORD *ncount, D3DVECTOR *normals,
DWORD *face_data_size, DWORD *face_data) PURE;
STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE;
@@ -2684,8 +2684,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder)
STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE;
STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE;
STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *face) PURE;
- STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,
- LPDIRECT3DRMFACEARRAY*) PURE;
+ STDMETHOD(AddFaces)(THIS_ DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count,
+ D3DVECTOR *normals, DWORD *face_data, struct IDirect3DRMFaceArray **array) PURE;
STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE;
STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE;
@@ -2699,7 +2699,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder)
STDMETHOD(SetTextureCoordinates)(THIS_ DWORD index, D3DVALUE u, D3DVALUE v) PURE;
STDMETHOD(SetVertexColor)(THIS_ DWORD index, D3DCOLOR) PURE;
STDMETHOD(SetVertexColorRGB)(THIS_ DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
- STDMETHOD(GetFaces)(THIS_ LPDIRECT3DRMFACEARRAY*) PURE;
+ STDMETHOD(GetFaces)(THIS_ struct IDirect3DRMFaceArray **array) PURE;
STDMETHOD(GetVertices)(THIS_ DWORD *vcount, D3DVECTOR *vertices, DWORD *ncount, D3DVECTOR *normals,
DWORD *face_data_size, DWORD *face_data) PURE;
STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE;
@@ -2864,8 +2864,8 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual)
STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE;
STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE;
STDMETHOD(AddFace)(THIS_ IDirect3DRMFace2 *face) PURE;
- STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data,
- LPDIRECT3DRMFACEARRAY*) PURE;
+ STDMETHOD(AddFaces)(THIS_ DWORD vertex_count, D3DVECTOR *vertices, DWORD normal_count,
+ D3DVECTOR *normals, DWORD *face_data, struct IDirect3DRMFaceArray **array) PURE;
STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE;
STDMETHOD(SetColorRGB)(THIS_ D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
STDMETHOD(SetColor)(THIS_ D3DCOLOR) PURE;
@@ -2879,7 +2879,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual)
STDMETHOD(SetTextureCoordinates)(THIS_ DWORD index, D3DVALUE u, D3DVALUE v) PURE;
STDMETHOD(SetVertexColor)(THIS_ DWORD index, D3DCOLOR) PURE;
STDMETHOD(SetVertexColorRGB)(THIS_ DWORD index, D3DVALUE red, D3DVALUE green, D3DVALUE blue) PURE;
- STDMETHOD(GetFaces)(THIS_ LPDIRECT3DRMFACEARRAY*) PURE;
+ STDMETHOD(GetFaces)(THIS_ struct IDirect3DRMFaceArray **array) PURE;
STDMETHOD(GetGeometry)(THIS_ DWORD *vcount, D3DVECTOR *vertices, DWORD *ncount, D3DVECTOR *normals,
DWORD *face_data_size, DWORD *face_data) PURE;
STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE;
More information about the wine-cvs
mailing list