Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFACE.
Alexandre Julliard
julliard at winehq.org
Thu Apr 25 14:25:18 CDT 2013
Module: wine
Branch: master
Commit: 589eea0ca0aebfd9de236a07d6a4b778dd26604c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=589eea0ca0aebfd9de236a07d6a4b778dd26604c
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu Apr 25 09:59:44 2013 +0200
d3drm: Avoid LPDIRECT3DRMFACE.
---
dlls/d3drm/d3drm.c | 12 ++++--------
dlls/d3drm/meshbuilder.c | 22 +++++++---------------
include/d3drm.h | 4 ++--
include/d3drmobj.h | 12 ++++++------
4 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index ff7ea71..425fd36 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -161,11 +161,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM *iface, IDir
return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder, (IUnknown **)mesh_builder);
}
-static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, LPDIRECT3DRMFACE * ppFace)
+static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, IDirect3DRMFace **face)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface);
-
- FIXME("(%p/%p)->(%p): stub\n", iface, This, ppFace);
+ FIXME("iface %p, face %p stub!\n", iface, face);
return E_NOTIMPL;
}
@@ -540,11 +538,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2 *iface, ID
return Direct3DRMMeshBuilder_create(&IID_IDirect3DRMMeshBuilder2, (IUnknown **)mesh_builder);
}
-static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2* iface, LPDIRECT3DRMFACE * ppFace)
+static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2 *iface, IDirect3DRMFace **face)
{
- IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface);
-
- FIXME("(%p/%p)->(%p): stub\n", iface, This, ppFace);
+ 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 40e23de..a6018d3 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -605,12 +605,9 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFrame(IDirect3DRMMeshBuilde
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFace(IDirect3DRMMeshBuilder2* iface,
- LPDIRECT3DRMFACE pFace)
+static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_AddFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace *face)
{
- IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface);
-
- FIXME("(%p)->(%p): stub\n", This, pFace);
+ FIXME("iface %p, face %p stub!\n", iface, face);
return E_NOTIMPL;
}
@@ -849,12 +846,9 @@ static int WINAPI IDirect3DRMMeshBuilder2Impl_AddNormal(IDirect3DRMMeshBuilder2*
return 0;
}
-static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateFace(IDirect3DRMMeshBuilder2* iface,
- LPDIRECT3DRMFACE* ppFace)
+static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace **face)
{
- IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface);
-
- FIXME("(%p)->(%p): stub\n", This, ppFace);
+ FIXME("iface %p, face %p stub!\n", iface, face);
return E_NOTIMPL;
}
@@ -924,12 +918,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GenerateNormals2(IDirect3DRMMe
return E_NOTIMPL;
}
-static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFace(IDirect3DRMMeshBuilder2* iface,
- DWORD index, LPDIRECT3DRMFACE* ppFace)
+static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetFace(IDirect3DRMMeshBuilder2 *iface,
+ DWORD index, IDirect3DRMFace **face)
{
- IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder2(iface);
-
- FIXME("(%p)->(%u,%p): stub\n", This, index, ppFace);
+ FIXME("iface %p, index %u, face %p stub!\n", iface, index, face);
return E_NOTIMPL;
}
diff --git a/include/d3drm.h b/include/d3drm.h
index f1e5c4e..ff02438 100644
--- a/include/d3drm.h
+++ b/include/d3drm.h
@@ -61,7 +61,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown)
STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame **frame) PURE;
STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE;
STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder **mesh_builder) PURE;
- STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE;
+ STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE;
STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE;
STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;
STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture **texture) PURE;
@@ -199,7 +199,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown)
STDMETHOD(CreateFrame)(THIS_ IDirect3DRMFrame *parent, IDirect3DRMFrame2 **frame) PURE;
STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE;
STDMETHOD(CreateMeshBuilder)(THIS_ IDirect3DRMMeshBuilder2 **mesh_builder) PURE;
- STDMETHOD(CreateFace)(THIS_ LPDIRECT3DRMFACE *) PURE;
+ STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE;
STDMETHOD(CreateAnimation)(THIS_ LPDIRECT3DRMANIMATION *) PURE;
STDMETHOD(CreateAnimationSet)(THIS_ LPDIRECT3DRMANIMATIONSET *) PURE;
STDMETHOD(CreateTexture)(THIS_ D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) PURE;
diff --git a/include/d3drmobj.h b/include/d3drmobj.h
index 71244a1..182013d 100644
--- a/include/d3drmobj.h
+++ b/include/d3drmobj.h
@@ -2512,7 +2512,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,IDirect3DRMVisual)
STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE;
STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE;
STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE;
- STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE;
+ STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *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;
@@ -2534,7 +2534,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder,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_ LPDIRECT3DRMFACE*) PURE;
+ STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE;
STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE;
STDMETHOD_(BOOL, GetPerspective)(THIS) PURE;
STDMETHOD_(int, GetFaceCount)(THIS) PURE;
@@ -2683,7 +2683,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder)
STDMETHOD(AddMesh)(THIS_ IDirect3DRMMesh *mesh) PURE;
STDMETHOD(AddMeshBuilder)(THIS_ IDirect3DRMMeshBuilder *mesh_builder) PURE;
STDMETHOD(AddFrame)(THIS_ IDirect3DRMFrame *frame) PURE;
- STDMETHOD(AddFace)(THIS_ LPDIRECT3DRMFACE) PURE;
+ STDMETHOD(AddFace)(THIS_ IDirect3DRMFace *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;
@@ -2705,7 +2705,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder)
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_ LPDIRECT3DRMFACE*) PURE;
+ STDMETHOD(CreateFace)(THIS_ IDirect3DRMFace **face) PURE;
STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE;
STDMETHOD_(BOOL, GetPerspective)(THIS) PURE;
STDMETHOD_(int, GetFaceCount)(THIS) PURE;
@@ -2714,7 +2714,7 @@ DECLARE_INTERFACE_(IDirect3DRMMeshBuilder2,IDirect3DRMMeshBuilder)
STDMETHOD(CreateMesh)(THIS_ IDirect3DRMMesh **mesh) PURE;
/*** IDirect3DRMMeshBuilder2 methods ***/
STDMETHOD(GenerateNormals2)(THIS_ D3DVALUE crease, DWORD flags) PURE;
- STDMETHOD(GetFace)(THIS_ DWORD index, LPDIRECT3DRMFACE*) PURE;
+ STDMETHOD(GetFace)(THIS_ DWORD index, IDirect3DRMFace **face) PURE;
};
#undef INTERFACE
@@ -4481,7 +4481,7 @@ DECLARE_INTERFACE_(IDirect3DRMFaceArray, IDirect3DRMArray)
/*** IDirect3DRMArray methods ***/
STDMETHOD_(DWORD, GetSize)(THIS) PURE;
/*** IDirect3DRMFaceArray methods ***/
- STDMETHOD(GetElement)(THIS_ DWORD index, LPDIRECT3DRMFACE *) PURE;
+ STDMETHOD(GetElement)(THIS_ DWORD index, IDirect3DRMFace **element) PURE;
};
#undef INTERFACE
More information about the wine-cvs
mailing list