Henri Verbeet : d3d10core: Add a stub ID3D10Query implementation.
Alexandre Julliard
julliard at winehq.org
Mon Dec 14 09:51:13 CST 2009
Module: wine
Branch: master
Commit: e4e1c279870b6b7f696a70ef7d4d0c27060ab15f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e1c279870b6b7f696a70ef7d4d0c27060ab15f
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Sun Dec 13 22:03:57 2009 +0100
d3d10core: Add a stub ID3D10Query implementation.
---
dlls/d3d10core/Makefile.in | 1 +
dlls/d3d10core/async.c | 166 ++++++++++++++++++++++++++++++++++++
dlls/d3d10core/d3d10core_private.h | 9 ++
dlls/d3d10core/device.c | 25 +++++-
4 files changed, 199 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in
index fe61293..935e83f 100644
--- a/dlls/d3d10core/Makefile.in
+++ b/dlls/d3d10core/Makefile.in
@@ -7,6 +7,7 @@ IMPORTLIB = d3d10core
IMPORTS = dxguid uuid dxgi kernel32
C_SRCS = \
+ async.c \
buffer.c \
d3d10core_main.c \
device.c \
diff --git a/dlls/d3d10core/async.c b/dlls/d3d10core/async.c
new file mode 100644
index 0000000..4efde85
--- /dev/null
+++ b/dlls/d3d10core/async.c
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2009 Henri Verbeet for CodeWeavers
+ *
+ * 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 "config.h"
+#include "wine/port.h"
+
+#include "d3d10core_private.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
+
+/* IUnknown methods */
+
+static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object)
+{
+ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
+
+ if (IsEqualGUID(riid, &IID_ID3D10Query)
+ || IsEqualGUID(riid, &IID_ID3D10Asynchronous)
+ || IsEqualGUID(riid, &IID_ID3D10DeviceChild)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
+ IUnknown_AddRef(iface);
+ *object = iface;
+ return S_OK;
+ }
+
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *object = NULL;
+ return E_NOINTERFACE;
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface)
+{
+ struct d3d10_query *This = (struct d3d10_query *)iface;
+ ULONG refcount = InterlockedIncrement(&This->refcount);
+
+ TRACE("%p increasing refcount to %u.\n", This, refcount);
+
+ return refcount;
+}
+
+static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface)
+{
+ struct d3d10_query *This = (struct d3d10_query *)iface;
+ ULONG refcount = InterlockedDecrement(&This->refcount);
+
+ TRACE("%p decreasing refcount to %u.\n", This, refcount);
+
+ if (!refcount)
+ {
+ HeapFree(GetProcessHeap(), 0, This);
+ }
+
+ return refcount;
+}
+
+/* ID3D10DeviceChild methods */
+
+static void STDMETHODCALLTYPE d3d10_query_GetDevice(ID3D10Query *iface, ID3D10Device **device)
+{
+ FIXME("iface %p, device %p stub!\n", iface, device);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_query_GetPrivateData(ID3D10Query *iface,
+ REFGUID guid, UINT *data_size, void *data)
+{
+ FIXME("iface %p, guid %s, data_size %p, data %p stub!\n",
+ iface, debugstr_guid(guid), data_size, data);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateData(ID3D10Query *iface,
+ REFGUID guid, UINT data_size, const void *data)
+{
+ FIXME("iface %p, guid %s, data_size %u, data %p stub!\n",
+ iface, debugstr_guid(guid), data_size, data);
+
+ return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_query_SetPrivateDataInterface(ID3D10Query *iface,
+ REFGUID guid, const IUnknown *data)
+{
+ FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data);
+
+ return E_NOTIMPL;
+}
+
+/* ID3D10Asynchronous methods */
+
+static void STDMETHODCALLTYPE d3d10_query_Begin(ID3D10Query *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+}
+
+static void STDMETHODCALLTYPE d3d10_query_End(ID3D10Query *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+}
+
+static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *data, UINT data_size, UINT flags)
+{
+ FIXME("iface %p, data %p, data_size %u, flags %#x stub!\n", iface, data, data_size, flags);
+
+ return E_NOTIMPL;
+}
+
+static UINT STDMETHODCALLTYPE d3d10_query_GetDataSize(ID3D10Query *iface)
+{
+ FIXME("iface %p stub!\n", iface);
+
+ return 0;
+}
+
+/* ID3D10Query methods */
+
+static void STDMETHODCALLTYPE d3d10_query_GetDesc(ID3D10Query *iface, D3D10_QUERY_DESC *desc)
+{
+ FIXME("iface %p, desc %p stub!\n", iface, desc);
+}
+
+static const struct ID3D10QueryVtbl d3d10_query_vtbl =
+{
+ /* IUnknown methods */
+ d3d10_query_QueryInterface,
+ d3d10_query_AddRef,
+ d3d10_query_Release,
+ /* ID3D10DeviceChild methods */
+ d3d10_query_GetDevice,
+ d3d10_query_GetPrivateData,
+ d3d10_query_SetPrivateData,
+ d3d10_query_SetPrivateDataInterface,
+ /* ID3D10Asynchronous methods */
+ d3d10_query_Begin,
+ d3d10_query_End,
+ d3d10_query_GetData,
+ d3d10_query_GetDataSize,
+ /* ID3D10Query methods */
+ d3d10_query_GetDesc,
+};
+
+HRESULT d3d10_query_init(struct d3d10_query *query)
+{
+ query->vtbl = &d3d10_query_vtbl;
+ query->refcount = 1;
+
+ return S_OK;
+}
diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h
index cc3029f..058d8dc 100644
--- a/dlls/d3d10core/d3d10core_private.h
+++ b/dlls/d3d10core/d3d10core_private.h
@@ -224,6 +224,15 @@ struct d3d10_sampler_state
HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) DECLSPEC_HIDDEN;
+/* ID3D10Query */
+struct d3d10_query
+{
+ const struct ID3D10QueryVtbl *vtbl;
+ LONG refcount;
+};
+
+HRESULT d3d10_query_init(struct d3d10_query *query) DECLSPEC_HIDDEN;
+
/* Layered device */
enum dxgi_device_layer_id
{
diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c
index cfc7dec..39be2ef 100644
--- a/dlls/d3d10core/device.c
+++ b/dlls/d3d10core/device.c
@@ -1036,9 +1036,30 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i
static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface,
const D3D10_QUERY_DESC *desc, ID3D10Query **query)
{
- FIXME("iface %p, desc %p, query %p stub!\n", iface, desc, query);
+ struct d3d10_query *object;
+ HRESULT hr;
- return E_NOTIMPL;
+ TRACE("iface %p, desc %p, query %p.\n", iface, desc, query);
+
+ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
+ if (!object)
+ {
+ ERR("Failed to allocate D3D10 query object memory.\n");
+ return E_OUTOFMEMORY;
+ }
+
+ hr = d3d10_query_init(object);
+ if (FAILED(hr))
+ {
+ WARN("Failed to initialize query, hr %#x.\n", hr);
+ HeapFree(GetProcessHeap(), 0, object);
+ return hr;
+ }
+
+ TRACE("Created query %p.\n", object);
+ *query = (ID3D10Query *)object;
+
+ return S_OK;
}
static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePredicate(ID3D10Device *iface,
More information about the wine-cvs
mailing list