Module: wine Branch: master Commit: 1013b54915c3191dfbfa685b54e9280c494dd7a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1013b54915c3191dfbfa685b54...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Apr 25 09:59:45 2013 +0200
d3drm: Avoid LPDIRECT3DRMFACE2.
---
dlls/d3drm/d3drm.c | 6 ++---- dlls/d3drm/meshbuilder.c | 29 +++++++++-------------------- include/d3drm.h | 2 +- include/d3drmobj.h | 8 ++++---- 4 files changed, 16 insertions(+), 29 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 425fd36..f3cb6ff 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -932,11 +932,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3 *iface, ID return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder3, (IUnknown **)mesh_builder); }
-static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3* iface, LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3 *iface, IDirect3DRMFace2 **face) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, Face); + FIXME("iface %p, face %p stub!\n", iface, face);
return E_NOTIMPL; } diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index a6018d3..81078dc 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1757,12 +1757,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFrame(IDirect3DRMMeshBuilde return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2 Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_AddFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 *face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face);
return E_NOTIMPL; } @@ -2003,12 +2000,9 @@ static int WINAPI IDirect3DRMMeshBuilder3Impl_AddNormal(IDirect3DRMMeshBuilder3* return 0; }
-static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face);
return E_NOTIMPL; } @@ -2192,12 +2186,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil return D3DRM_OK; }
-static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFace(IDirect3DRMMeshBuilder3* iface, - DWORD index, LPDIRECT3DRMFACE2* Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetFace(IDirect3DRMMeshBuilder3 *iface, + DWORD index, IDirect3DRMFace2 **face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%u,%p): stub\n", This, index, Face); + FIXME("iface %p, index %u, face %p stub!\n", iface, index, face);
return E_NOTIMPL; } @@ -2242,12 +2234,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteNormals(IDirect3DRMMeshB return E_NOTIMPL; }
-static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteFace(IDirect3DRMMeshBuilder3* iface, - LPDIRECT3DRMFACE2 Face) +static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_DeleteFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 *face) { - IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - - FIXME("(%p)->(%p): stub\n", This, Face); + FIXME("iface %p, face %p stub!\n", iface, face);
return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index ff02438..1619534 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -340,7 +340,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame3 *parent, IDirect3DRMFrame3 **frame) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 **mesh_builder) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2 *) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace2 **face) PURE; STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION2 *) PURE; STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET2 *) PURE; STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 182013d..218fa47 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2863,7 +2863,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE; STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder3 *mesh_builder, DWORD flags) PURE; STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame3 *frame) PURE; - STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE2) PURE; + STDMETHOD(AddFace)(THIS_ IDirect3DRMFace2 *face) PURE; STDMETHOD(AddFaces)(THIS_ DWORD vcount, D3DVECTOR *vertices, DWORD ncount, D3DVECTOR *normals, DWORD *data, LPDIRECT3DRMFACEARRAY*) PURE; STDMETHOD(ReserveSpace)(THIS_ DWORD vertex_Count, DWORD normal_count, DWORD face_count) PURE; @@ -2885,19 +2885,19 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder3,IDirect3DRMVisual) STDMETHOD(GetTextureCoordinates)(THIS_ DWORD index, D3DVALUE *u, D3DVALUE *v) PURE; STDMETHOD_(int, AddVertex)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; STDMETHOD_(int, AddNormal)(THIS_ D3DVALUE x, D3DVALUE y, D3DVALUE z) PURE; - STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE2*) PURE; + STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace2 **face) PURE; STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(BOOL, GetPerspective)(THIS) PURE; STDMETHOD_(int, GetFaceCount)(THIS) PURE; STDMETHOD_(int, GetVertexCount)(THIS) PURE; STDMETHOD_(D3DCOLOR, GetVertexColor)(THIS_ DWORD index) PURE; STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(GetFace)(THIS_ DWORD index, LPDIRECT3DRMFACE2 *) PURE; + STDMETHOD(GetFace)(THIS_ DWORD index, IDirect3DRMFace2 **face) PURE; STDMETHOD(GetVertex)(THIS_ DWORD index, D3DVECTOR *vector) PURE; STDMETHOD(GetNormal)(THIS_ DWORD index, D3DVECTOR *vector) PURE; STDMETHOD(DeleteVertices)(THIS_ DWORD IndexFirst, DWORD count) PURE; STDMETHOD(DeleteNormals)(THIS_ DWORD IndexFirst, DWORD count) PURE; - STDMETHOD(DeleteFace)(THIS_ LPDIRECT3DRMFACE2) PURE; + STDMETHOD(DeleteFace)(THIS_ IDirect3DRMFace2 *face) PURE; STDMETHOD(Empty)(THIS_ DWORD flags) PURE; STDMETHOD(Optimize)(THIS_ DWORD flags) PURE; STDMETHOD(AddFacesIndexed)(THIS_ DWORD flags, DWORD *pvIndices, DWORD *pIndexFirst, DWORD *pCount) PURE;