[1/3] d3drm: Add IDirect3DRMFace interface
André Hentschel
nerv at dawncrow.de
Thu May 9 07:43:12 CDT 2013
This patchset will be needed for a IDirect3DRMFaceArray for http://bugs.winehq.org/show_bug.cgi?id=21670
---
dlls/d3drm/Makefile.in | 1 +
dlls/d3drm/d3drm.c | 8 +-
dlls/d3drm/d3drm_private.h | 1 +
dlls/d3drm/face.c | 419 ++++++++++++++++++++++++++++++++++++++++++++
dlls/d3drm/meshbuilder.c | 4 +-
5 files changed, 427 insertions(+), 6 deletions(-)
create mode 100644 dlls/d3drm/face.c
diff --git a/dlls/d3drm/Makefile.in b/dlls/d3drm/Makefile.in
index 0802430..e5cf188 100644
--- a/dlls/d3drm/Makefile.in
+++ b/dlls/d3drm/Makefile.in
@@ -6,6 +6,7 @@ C_SRCS = \
d3drm.c \
d3drm_main.c \
device.c \
+ face.c \
frame.c \
light.c \
material.c \
diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c
index 5d33402..6d5be7c 100644
--- a/dlls/d3drm/d3drm.c
+++ b/dlls/d3drm/d3drm.c
@@ -163,9 +163,9 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateMeshBuilder(IDirect3DRM *iface, IDir
static HRESULT WINAPI IDirect3DRMImpl_CreateFace(IDirect3DRM* iface, IDirect3DRMFace **face)
{
- FIXME("iface %p, face %p stub!\n", iface, face);
+ TRACE("iface %p, face %p.\n", iface, face);
- return E_NOTIMPL;
+ return Direct3DRMFace_create((IUnknown **)face);
}
static HRESULT WINAPI IDirect3DRMImpl_CreateAnimation(IDirect3DRM* iface, LPDIRECT3DRMANIMATION * ppAnimation)
@@ -542,9 +542,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMeshBuilder(IDirect3DRM2 *iface, ID
static HRESULT WINAPI IDirect3DRM2Impl_CreateFace(IDirect3DRM2 *iface, IDirect3DRMFace **face)
{
- FIXME("iface %p, face %p stub!\n", iface, face);
+ TRACE("iface %p, face %p.\n", iface, face);
- return E_NOTIMPL;
+ return Direct3DRMFace_create((IUnknown **)face);
}
static HRESULT WINAPI IDirect3DRM2Impl_CreateAnimation(IDirect3DRM2* iface,
diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h
index ce896a1..7990411 100644
--- a/dlls/d3drm/d3drm_private.h
+++ b/dlls/d3drm/d3drm_private.h
@@ -25,6 +25,7 @@
#include "dxfile.h"
HRESULT Direct3DRMDevice_create(REFIID riid, IUnknown** ppObj) DECLSPEC_HIDDEN;
+HRESULT Direct3DRMFace_create(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
new file mode 100644
index 0000000..4e521f3
--- /dev/null
+++ b/dlls/d3drm/face.c
@@ -0,0 +1,419 @@
+/*
+ * Implementation of IDirect3DRMFace Interface
+ *
+ * Copyright 2013 André Hentschel
+ *
+ * This file contains the (internal) driver registration functions,
+ * driver enumeration APIs and DirectDraw creation functions.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "wine/debug.h"
+
+#define COBJMACROS
+
+#include "winbase.h"
+#include "wingdi.h"
+
+#include "d3drm_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(d3drm);
+
+typedef struct {
+ IDirect3DRMFace IDirect3DRMFace_iface;
+ LONG ref;
+
+} IDirect3DRMFaceImpl;
+
+static inline IDirect3DRMFaceImpl *impl_from_IDirect3DRMFace(IDirect3DRMFace *iface)
+{
+ return CONTAINING_RECORD(iface, IDirect3DRMFaceImpl, IDirect3DRMFace_iface);
+}
+
+/*** IUnknown methods ***/
+static HRESULT WINAPI IDirect3DRMFaceImpl_QueryInterface(IDirect3DRMFace* iface,
+ REFIID riid, void** object)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_guid(riid), object);
+
+ *object = NULL;
+
+ if (IsEqualGUID(riid, &IID_IUnknown) ||
+ IsEqualGUID(riid, &IID_IDirect3DRMFace))
+ {
+ *object = &This->IDirect3DRMFace_iface;
+ }
+ else
+ {
+ FIXME("interface %s not implemented\n", debugstr_guid(riid));
+ return E_NOINTERFACE;
+ }
+
+ IDirect3DRMFace_AddRef(iface);
+ return S_OK;
+}
+
+static ULONG WINAPI IDirect3DRMFaceImpl_AddRef(IDirect3DRMFace* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+ ULONG ref = InterlockedIncrement(&This->ref);
+
+ TRACE("(%p)->(): new ref = %d\n", This, ref);
+
+ return ref;
+}
+
+static ULONG WINAPI IDirect3DRMFaceImpl_Release(IDirect3DRMFace* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+ ULONG ref = InterlockedDecrement(&This->ref);
+
+ TRACE("(%p)->(): new ref = %d\n", This, ref);
+
+ if (!ref)
+ HeapFree(GetProcessHeap(), 0, This);
+
+ return ref;
+}
+
+/*** IDirect3DRMObject methods ***/
+static HRESULT WINAPI IDirect3DRMFaceImpl_Clone(IDirect3DRMFace* iface,
+ LPUNKNOWN unkwn, REFIID riid, LPVOID* object)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%p, %s, %p): stub\n", iface, This, unkwn, debugstr_guid(riid), object);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_AddDestroyCallback(IDirect3DRMFace* iface,
+ D3DRMOBJECTCALLBACK cb,
+ LPVOID argument)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, cb, argument);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_DeleteDestroyCallback(IDirect3DRMFace* iface,
+ D3DRMOBJECTCALLBACK cb,
+ LPVOID argument)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, cb, argument);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_SetAppData(IDirect3DRMFace* iface, DWORD data)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%u): stub\n", iface, This, data);
+
+ return E_NOTIMPL;
+}
+
+static DWORD WINAPI IDirect3DRMFaceImpl_GetAppData(IDirect3DRMFace* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(): stub\n", iface, This);
+
+ return 0;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_SetName(IDirect3DRMFace* iface, LPCSTR name)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%s): stub\n", iface, This, name);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetName(IDirect3DRMFace* iface, LPDWORD size, LPSTR name)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%p, %p): stub\n", iface, This, size, name);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetClassName(IDirect3DRMFace* iface,
+ LPDWORD size, LPSTR name)
+{
+ IDirect3DRMFaceImpl *This = impl_from_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;
+}
+
+/*** IDirect3DRMFace methods ***/
+static HRESULT WINAPI IDirect3DRMFaceImpl_AddVertex(IDirect3DRMFace* iface,
+ D3DVALUE x, D3DVALUE y, D3DVALUE z)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%f, %f, %f): stub\n", iface, This, x, y, z);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_AddVertexAndNormalIndexed(IDirect3DRMFace* iface,
+ DWORD vertex, DWORD normal)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%u, %u): stub\n", iface, This, vertex, normal);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_SetColorRGB(IDirect3DRMFace* iface,
+ D3DVALUE r, D3DVALUE g, D3DVALUE b)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%f, %f, %f): stub\n", iface, This, r, g, b);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_SetColor(IDirect3DRMFace* iface, D3DCOLOR color)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ FIXME("(%p/%p)->(%u): stub\n", iface, This, color);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_SetTexture(IDirect3DRMFace* iface,
+ IDirect3DRMTexture *texture)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, texture);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_SetTextureCoordinates(IDirect3DRMFace* iface,
+ DWORD vertex,
+ D3DVALUE u, D3DVALUE v)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%u, %f, %f): stub\n", iface, This, vertex, u, v);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_SetMaterial(IDirect3DRMFace* iface,
+ IDirect3DRMMaterial *material)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, material);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_SetTextureTopology(IDirect3DRMFace* iface,
+ BOOL wrap_u, BOOL wrap_v)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%d, %d): stub\n", iface, This, wrap_u, wrap_v);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetVertex(IDirect3DRMFace* iface, DWORD index,
+ D3DVECTOR *vertex, D3DVECTOR *normal)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%u, %p, %p): stub\n", iface, This, index, vertex, normal);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetVertices(IDirect3DRMFace* iface, DWORD *vertex_count,
+ D3DVECTOR *coords, D3DVECTOR *normals)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%p, %p, %p): stub\n", iface, This, vertex_count, coords, normals);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetTextureCoordinates(IDirect3DRMFace* iface,
+ DWORD vertex,
+ D3DVALUE *u, D3DVALUE *v)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%u, %p, %p): stub\n", iface, This, vertex, u, v);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetTextureTopology(IDirect3DRMFace* iface,
+ BOOL *wrap_u, BOOL *wrap_v)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%p, %p): stub\n", iface, This, wrap_u, wrap_v);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetNormal(IDirect3DRMFace* iface, D3DVECTOR *normal)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, normal);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetTexture(IDirect3DRMFace* iface,
+ IDirect3DRMTexture **texture)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, texture);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI IDirect3DRMFaceImpl_GetMaterial(IDirect3DRMFace* iface,
+ IDirect3DRMMaterial **material)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%p): stub\n", iface, This, material);
+
+ return E_NOTIMPL;
+}
+
+static int WINAPI IDirect3DRMFaceImpl_GetVertexCount(IDirect3DRMFace* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(): stub\n", iface, This);
+
+ return 0;
+}
+
+static int WINAPI IDirect3DRMFaceImpl_GetVertexIndex(IDirect3DRMFace* iface, DWORD which)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%u): stub\n", iface, This, which);
+
+ return 0;
+}
+
+static int WINAPI IDirect3DRMFaceImpl_GetTextureCoordinateIndex(IDirect3DRMFace* iface, DWORD which)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(%u): stub\n", iface, This, which);
+
+ return 0;
+}
+
+static D3DCOLOR WINAPI IDirect3DRMFaceImpl_GetColor(IDirect3DRMFace* iface)
+{
+ IDirect3DRMFaceImpl *This = impl_from_IDirect3DRMFace(iface);
+
+ TRACE("(%p/%p)->(): stub\n", iface, This);
+
+ return 0;
+}
+
+static const struct IDirect3DRMFaceVtbl Direct3DRMFace_Vtbl =
+{
+ /*** IUnknown methods ***/
+ IDirect3DRMFaceImpl_QueryInterface,
+ IDirect3DRMFaceImpl_AddRef,
+ IDirect3DRMFaceImpl_Release,
+ /*** IDirect3DRMObject methods ***/
+ IDirect3DRMFaceImpl_Clone,
+ IDirect3DRMFaceImpl_AddDestroyCallback,
+ IDirect3DRMFaceImpl_DeleteDestroyCallback,
+ IDirect3DRMFaceImpl_SetAppData,
+ IDirect3DRMFaceImpl_GetAppData,
+ IDirect3DRMFaceImpl_SetName,
+ IDirect3DRMFaceImpl_GetName,
+ IDirect3DRMFaceImpl_GetClassName,
+ /*** IDirect3DRMFace methods ***/
+ IDirect3DRMFaceImpl_AddVertex,
+ IDirect3DRMFaceImpl_AddVertexAndNormalIndexed,
+ IDirect3DRMFaceImpl_SetColorRGB,
+ IDirect3DRMFaceImpl_SetColor,
+ IDirect3DRMFaceImpl_SetTexture,
+ IDirect3DRMFaceImpl_SetTextureCoordinates,
+ IDirect3DRMFaceImpl_SetMaterial,
+ IDirect3DRMFaceImpl_SetTextureTopology,
+ IDirect3DRMFaceImpl_GetVertex,
+ IDirect3DRMFaceImpl_GetVertices,
+ IDirect3DRMFaceImpl_GetTextureCoordinates,
+ IDirect3DRMFaceImpl_GetTextureTopology,
+ IDirect3DRMFaceImpl_GetNormal,
+ IDirect3DRMFaceImpl_GetTexture,
+ IDirect3DRMFaceImpl_GetMaterial,
+ IDirect3DRMFaceImpl_GetVertexCount,
+ IDirect3DRMFaceImpl_GetVertexIndex,
+ IDirect3DRMFaceImpl_GetTextureCoordinateIndex,
+ IDirect3DRMFaceImpl_GetColor
+};
+
+HRESULT Direct3DRMFace_create(IUnknown** ret_iface)
+{
+ IDirect3DRMFaceImpl* object;
+
+ TRACE("(%p)\n", ret_iface);
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFaceImpl));
+ if (!object)
+ return E_OUTOFMEMORY;
+
+ object->IDirect3DRMFace_iface.lpVtbl = &Direct3DRMFace_Vtbl;
+ object->ref = 1;
+
+ *ret_iface = (IUnknown*)&object->IDirect3DRMFace_iface;
+
+ return S_OK;
+}
diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 81078dc..6b8be20 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -848,9 +848,9 @@ static int WINAPI IDirect3DRMMeshBuilder2Impl_AddNormal(IDirect3DRMMeshBuilder2*
static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_CreateFace(IDirect3DRMMeshBuilder2 *iface, IDirect3DRMFace **face)
{
- FIXME("iface %p, face %p stub!\n", iface, face);
+ TRACE("iface %p, face %p.\n", iface, face);
- return E_NOTIMPL;
+ return Direct3DRMFace_create((IUnknown **)face);
}
static D3DRMRENDERQUALITY WINAPI IDirect3DRMMeshBuilder2Impl_GetQuality(IDirect3DRMMeshBuilder2* iface)
--
1.7.10.4
More information about the wine-patches
mailing list