[2/3] d3drm: Add IDirect3DRMFace2 interface
André Hentschel
nerv at dawncrow.de
Thu May 9 07:43:39 CDT 2013
---
dlls/d3drm/d3drm.c | 8 +-
dlls/d3drm/d3drm_private.h | 2 +-
dlls/d3drm/face.c | 359 ++++++++++++++++++++++++++++++++++++++++++--
dlls/d3drm/meshbuilder.c | 6 +-
4 files changed, 358 insertions(+), 17 deletions(-)
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 6d5be7c..8dfa4bb 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -165,7 +165,7 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, IDirect3DRM
{
TRACE("iface %p, face %p.\n", iface, face);
- return Direct3DRMFace_create((IUnknown **)face);
+ return Direct3DRMFace_create(&IID_IDirect3DRMFace, (IUnknown **)face);
}
static HRESULT WINAPI IDirect3DRMImpl_CreateAnimation(IDirect3DRM* iface, LPDIRECT3DRMANIMATION * ppAnimation)
@@ -544,7 +544,7 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2 *iface, IDirect3D
{
TRACE("iface %p, face %p.\n", iface, face);
- return Direct3DRMFace_create((IUnknown **)face);
+ return Direct3DRMFace_create(&IID_IDirect3DRMFace, (IUnknown **)face);
}
static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimation(IDirect3DRM2* iface,
@@ -936,9 +936,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMeshBuilder(IDirect3DRM3 *iface, ID
static HRESULT WINAPI IDirect3DRM3Impl_CreateFace(IDirect3DRM3 *iface, IDirect3DRMFace2 **face)
{
- FIXME("iface %p, face %p stub!\n", iface, face);
+ TRACE("iface %p, face %p.\n", iface, face);
- return E_NOTIMPL;
+ return Direct3DRMFace_create(&IID_IDirect3DRMFace2, (IUnknown **)face);
}
static HRESULT WINAPI IDirect3DRM3Impl_CreateAnimation(IDirect3DRM3* iface,
diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
index 7990411..d1f30be 100644
--- a/dlls/d3drm/d3drm_private.h
+++ b/dlls/d3drm/d3drm_private.h
@@ -25,7 +25,7 @@
#include "dxfile.h"
HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN;
-HRESULT Direct3DRMFace_create(IUnknown** ret_iface) DECLSPEC_HIDDEN;
+HRESULT Direct3DRMFace_create(REFIID riid, 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 Direct3DRMMesh_create(IDirect3DRMMesh** obj) DECLSPEC_HIDDEN;
diff --git a/dlls/d3drm/face.c b/dlls/d3drm/face.c
index 4e521f3..abd69ab 100644
--- a/dlls/d3drm/face.c
+++ b/dlls/d3drm/face.c
@@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm);
typedef struct {
IDirect3DRMFace IDirect3DRMFace_iface;
+ IDirect3DRMFace2 IDirect3DRMFace2_iface;
LONG ref;
} IDirect3DRMFaceImpl;
@@ -43,6 +44,11 @@ static inline IDirect3DRMFaceImpl *impl_from_IDirect3DRMFace(IDirect3DRMFace *if
return CONTAINING_RECORD(iface, IDirect3DRMFaceImpl, IDirect3DRMFace_iface);
}
+static inline IDirect3DRMFaceImpl *impl_from_IDirect3DRMFace2(IDirect3DRMFace2 *iface)
+{
+ return CONTAINING_RECORD(iface, IDirect3DRMFaceImpl, IDirect3DRMFace2_iface);
+}
+
/*** IUnknown methods ***/
static HRESULT WINAPI IDirect3DRMFaceImpl_QueryInterface(IDirect3DRMFace* iface,
REFIID riid, void** object)
@@ -58,6 +64,10 @@ static HRESULT WINAPI IDirect3DRMFaceImpl_QueryInterface(IDirect3DRMFace* iface,
{
*object = &This->IDirect3DRMFace_iface;
}
+ else if(IsEqualGUID(riid, &IID_IDirect3DRMFace2))
+ {
+ *object = &This->IDirect3DRMFace2_iface;
+ }
else
{
FIXME("interface %s not implemented\n", debugstr_guid(riid));
@@ -167,13 +177,7 @@ static HRESULT WINAPI IDirect3DRMFaceImpl_GetClassName(IDirect3DRMFace* iface,
TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name);
- if (!size || *size < strlen("Face") || !name)
- return E_INVALIDARG;
-
- strcpy(name, "Face");
- *size = sizeof("Face");
-
- return D3DRM_OK;
+ return IDirect3DRMFace2_GetClassName(&This->IDirect3DRMFace2_iface, size, name);
}
/*** IDirect3DRMFace methods ***/
@@ -400,7 +404,340 @@ static const struct IDirect3DRMFaceVtbl Direct3DRMFace_Vtbl =
IDirect3DRMFaceImpl_GetColor
};
-HRESULT Direct3DRMFace_create(IUnknown** ret_iface)
+
+/*** IUnknown methods ***/
+static HRESULT WINAPI IDirect3DRMFace2Impl_QueryInterface(IDirect3DRMFace2* iface,
+ REFIID riid, void** object)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+ return IDirect3DRMFace_QueryInterface(&This->IDirect3DRMFace_iface, riid, object);
+}
+
+static ULONG WINAPI IDirect3DRMFace2Impl_AddRef(IDirect3DRMFace2* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+ return IDirect3DRMFace_AddRef(&This->IDirect3DRMFace_iface);
+}
+
+static ULONG WINAPI IDirect3DRMFace2Impl_Release(IDirect3DRMFace2* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+ return IDirect3DRMFace_Release(&This->IDirect3DRMFace_iface);
+}
+
+/*** IDirect3DRMObject methods ***/
+static HRESULT WINAPI IDirect3DRMFace2Impl_Clone(IDirect3DRMFace2* iface,
+ LPUNKNOWN unkwn, REFIID riid,
+ LPVOID* object)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_AddDestroyCallback(IDirect3DRMFace2* iface,
+ D3DRMOBJECTCALLBACK cb,
+ LPVOID argument)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, cb, argument);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_DeleteDestroyCallback(IDirect3DRMFace2* iface,
+ D3DRMOBJECTCALLBACK cb,
+ LPVOID argument)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, cb, argument);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_SetAppData(IDirect3DRMFace2* iface, DWORD data)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%u): stub\n", iface, This, data);
+
+ return E_NOTIMPL;
+}
+
+static DWORD WINAPI IDirect3DRMFace2Impl_GetAppData(IDirect3DRMFace2* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(): stub\n", iface, This);
+
+ return 0;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_SetName(IDirect3DRMFace2* iface, LPCSTR name)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%s): stub\n", iface, This, name);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetName(IDirect3DRMFace2* iface,
+ LPDWORD size, LPSTR name)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetClassName(IDirect3DRMFace2* iface,
+ LPDWORD size, LPSTR name)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%p, %p)\n", iface, This, size, name);
+
+ if (!size || *size < strlen("Face") || !name)
+ return E_INVALIDARG;
+
+ strcpy(name, "Face");
+ *size = sizeof("Face");
+
+ return D3DRM_OK;
+}
+
+/*** IDirect3DRMFace2 methods ***/
+static HRESULT WINAPI IDirect3DRMFace2Impl_AddVertex(IDirect3DRMFace2* iface,
+ D3DVALUE x, D3DVALUE y, D3DVALUE z)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%f, %f, %f): stub\n", iface, This, x, y, z);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_AddVertexAndNormalIndexed(IDirect3DRMFace2* iface,
+ DWORD vertex, DWORD normal)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%u, %u): stub\n", iface, This, vertex, normal);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_SetColorRGB(IDirect3DRMFace2* iface,
+ D3DVALUE r, D3DVALUE g, D3DVALUE b)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%f, %f, %f): stub\n", iface, This, r, g, b);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_SetColor(IDirect3DRMFace2* iface, D3DCOLOR color)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ FIXME("(%p/%p)->(%u): stub\n", iface, This, color);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_SetTexture(IDirect3DRMFace2* iface,
+ IDirect3DRMTexture3 *texture)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, texture);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_SetTextureCoordinates(IDirect3DRMFace2* iface,
+ DWORD vertex,
+ D3DVALUE u, D3DVALUE v)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%u, %f, %f): stub\n", iface, This, vertex, u, v);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_SetMaterial(IDirect3DRMFace2* iface,
+ IDirect3DRMMaterial2 *material)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, material);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_SetTextureTopology(IDirect3DRMFace2* iface,
+ BOOL wrap_u, BOOL wrap_v)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%d, %d): stub\n", iface, This, wrap_u, wrap_v);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetVertex(IDirect3DRMFace2* iface, DWORD index,
+ D3DVECTOR *vertex, D3DVECTOR *normal)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%u, %p, %p): stub\n", iface, This, index, vertex, normal);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetVertices(IDirect3DRMFace2* iface, DWORD *vertex_count,
+ D3DVECTOR *coords, D3DVECTOR *normals)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%p, %p, %p): stub\n", iface, This, vertex_count, coords, normals);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetTextureCoordinates(IDirect3DRMFace2* iface,
+ DWORD vertex,
+ D3DVALUE *u, D3DVALUE *v)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%u, %p, %p): stub\n", iface, This, vertex, u, v);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetTextureTopology(IDirect3DRMFace2* iface,
+ BOOL *wrap_u, BOOL *wrap_v)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%p, %p): stub\n", iface, This, wrap_u, wrap_v);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetNormal(IDirect3DRMFace2* iface, D3DVECTOR *normal)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, normal);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetTexture(IDirect3DRMFace2* iface,
+ IDirect3DRMTexture3 **texture)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, texture);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFace2Impl_GetMaterial(IDirect3DRMFace2* iface,
+ IDirect3DRMMaterial2 **material)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, material);
+
+ return E_NOTIMPL;
+}
+
+static int WINAPI IDirect3DRMFace2Impl_GetVertexCount(IDirect3DRMFace2* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(): stub\n", iface, This);
+
+ return 0;
+}
+
+static int WINAPI IDirect3DRMFace2Impl_GetVertexIndex(IDirect3DRMFace2* iface, DWORD which)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%u): stub\n", iface, This, which);
+
+ return 0;
+}
+
+static int WINAPI IDirect3DRMFace2Impl_GetTextureCoordinateIndex(IDirect3DRMFace2* iface,
+ DWORD which)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(%u): stub\n", iface, This, which);
+
+ return 0;
+}
+
+static D3DCOLOR WINAPI IDirect3DRMFace2Impl_GetColor(IDirect3DRMFace2* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace2(iface);
+
+ TRACE("(%p/%p)->(): stub\n", iface, This);
+
+ return 0;
+}
+
+static const struct IDirect3DRMFace2Vtbl Direct3DRMFace2_Vtbl =
+{
+ /*** IUnknown methods ***/
+ IDirect3DRMFace2Impl_QueryInterface,
+ IDirect3DRMFace2Impl_AddRef,
+ IDirect3DRMFace2Impl_Release,
+ /*** IDirect3DRMObject methods ***/
+ IDirect3DRMFace2Impl_Clone,
+ IDirect3DRMFace2Impl_AddDestroyCallback,
+ IDirect3DRMFace2Impl_DeleteDestroyCallback,
+ IDirect3DRMFace2Impl_SetAppData,
+ IDirect3DRMFace2Impl_GetAppData,
+ IDirect3DRMFace2Impl_SetName,
+ IDirect3DRMFace2Impl_GetName,
+ IDirect3DRMFace2Impl_GetClassName,
+ /*** IDirect3DRMFace2 methods ***/
+ IDirect3DRMFace2Impl_AddVertex,
+ IDirect3DRMFace2Impl_AddVertexAndNormalIndexed,
+ IDirect3DRMFace2Impl_SetColorRGB,
+ IDirect3DRMFace2Impl_SetColor,
+ IDirect3DRMFace2Impl_SetTexture,
+ IDirect3DRMFace2Impl_SetTextureCoordinates,
+ IDirect3DRMFace2Impl_SetMaterial,
+ IDirect3DRMFace2Impl_SetTextureTopology,
+ IDirect3DRMFace2Impl_GetVertex,
+ IDirect3DRMFace2Impl_GetVertices,
+ IDirect3DRMFace2Impl_GetTextureCoordinates,
+ IDirect3DRMFace2Impl_GetTextureTopology,
+ IDirect3DRMFace2Impl_GetNormal,
+ IDirect3DRMFace2Impl_GetTexture,
+ IDirect3DRMFace2Impl_GetMaterial,
+ IDirect3DRMFace2Impl_GetVertexCount,
+ IDirect3DRMFace2Impl_GetVertexIndex,
+ IDirect3DRMFace2Impl_GetTextureCoordinateIndex,
+ IDirect3DRMFace2Impl_GetColor
+};
+
+HRESULT Direct3DRMFace_create(REFIID riid, IUnknown** ret_iface)
{
IDirect3DRMFaceImpl* object;
@@ -411,9 +748,13 @@ HRESULT Direct3DRMFace_create(IUnknown** ret_iface)
return E_OUTOFMEMORY;
object->IDirect3DRMFace_iface.lpVtbl = &Direct3DRMFace_Vtbl;
+ object->IDirect3DRMFace2_iface.lpVtbl = &Direct3DRMFace2_Vtbl;
object->ref = 1;
- *ret_iface = (IUnknown*)&object->IDirect3DRMFace_iface;
+ if (IsEqualGUID(riid, &IID_IDirect3DRMFace2))
+ *ret_iface = (IUnknown*)&object->IDirect3DRMFace2_iface;
+ else
+ *ret_iface = (IUnknown*)&object->IDirect3DRMFace_iface;
return S_OK;
}
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 6b8be20..07dc3fd 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -850,7 +850,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateFace(IDirect3DRMMeshBuil
{
TRACE("iface %p, face %p.\n", iface, face);
- return Direct3DRMFace_create((IUnknown **)face);
+ return Direct3DRMFace_create(&IID_IDirect3DRMFace, (IUnknown **)face);
}
static D3DRMRENDERQUALITY WINAPI IDirect3DRMMeshBuilder2Impl_GetQuality(IDirect3DRMMeshBuilder2* iface)
@@ -2002,9 +2002,9 @@ static int WINAPI IDirect3DRMMeshBuilder3Impl_AddNormal(IDirect3DRMMeshBuilder3*
static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateFace(IDirect3DRMMeshBuilder3 *iface, IDirect3DRMFace2 **face)
{
- FIXME("iface %p, face %p stub!\n", iface, face);
+ TRACE("iface %p, face %p.\n", iface, face);
- return E_NOTIMPL;
+ return Direct3DRMFace_create(&IID_IDirect3DRMFace2, (IUnknown **)face);
}
static D3DRMRENDERQUALITY WINAPI IDirect3DRMMeshBuilder3Impl_GetQuality(IDirect3DRMMeshBuilder3* iface)
--
1.7.10.4
More information about the wine-patches
mailing list