Henri Verbeet : dxgi: Add an ordinal field to dxgi_adapter.

Alexandre Julliard julliard at winehq.org
Mon Nov 17 09:14:26 CST 2008


Module: wine
Branch: master
Commit: 20b042027c0c257c24d9f92426cfa7f1c7ae0dee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=20b042027c0c257c24d9f92426cfa7f1c7ae0dee

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Nov 17 12:16:04 2008 +0100

dxgi: Add an ordinal field to dxgi_adapter.

---

 dlls/dxgi/adapter.c                  |   39 +++++++++++++++++++++++----------
 dlls/dxgi/dxgi_private.h             |    5 ++-
 dlls/dxgi/dxgi_private_interface.idl |   10 ++++++++
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c
index 1d6169f..54e5143 100644
--- a/dlls/dxgi/adapter.c
+++ b/dlls/dxgi/adapter.c
@@ -26,13 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi);
 
 /* IUnknown methods */
 
-static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter *iface, REFIID riid, void **object)
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *iface, REFIID riid, void **object)
 {
     TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object);
 
     if (IsEqualGUID(riid, &IID_IUnknown)
             || IsEqualGUID(riid, &IID_IDXGIObject)
-            || IsEqualGUID(riid, &IID_IDXGIAdapter))
+            || IsEqualGUID(riid, &IID_IDXGIAdapter)
+            || IsEqualGUID(riid, &IID_IWineDXGIAdapter))
     {
         IUnknown_AddRef(iface);
         *object = iface;
@@ -45,7 +46,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter *iface
     return E_NOINTERFACE;
 }
 
-static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IDXGIAdapter *iface)
+static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IWineDXGIAdapter *iface)
 {
     struct dxgi_adapter *This = (struct dxgi_adapter *)iface;
     ULONG refcount = InterlockedIncrement(&This->refcount);
@@ -55,7 +56,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_AddRef(IDXGIAdapter *iface)
     return refcount;
 }
 
-static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter *iface)
+static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface)
 {
     struct dxgi_adapter *This = (struct dxgi_adapter *)iface;
     ULONG refcount = InterlockedDecrement(&This->refcount);
@@ -72,7 +73,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IDXGIAdapter *iface)
 
 /* IDXGIObject methods */
 
-static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter *iface,
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IWineDXGIAdapter *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);
@@ -80,7 +81,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateData(IDXGIAdapter *iface
     return E_NOTIMPL;
 }
 
-static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapter *iface,
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IWineDXGIAdapter *iface,
         REFGUID guid, const IUnknown *object)
 {
     FIXME("iface %p, guid %s, object %p stub!\n", iface, debugstr_guid(guid), object);
@@ -88,7 +89,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetPrivateDataInterface(IDXGIAdapt
     return E_NOTIMPL;
 }
 
-static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter *iface,
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IWineDXGIAdapter *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);
@@ -96,7 +97,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetPrivateData(IDXGIAdapter *iface
     return E_NOTIMPL;
 }
 
-static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter *iface, REFIID riid, void **parent)
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IWineDXGIAdapter *iface, REFIID riid, void **parent)
 {
     FIXME("iface %p, riid %s, parent %p stub!\n", iface, debugstr_guid(riid), parent);
 
@@ -105,21 +106,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetParent(IDXGIAdapter *iface, REF
 
 /* IDXGIAdapter methods */
 
-static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IDXGIAdapter *iface, UINT output_idx, IDXGIOutput **output)
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_EnumOutputs(IWineDXGIAdapter *iface,
+        UINT output_idx, IDXGIOutput **output)
 {
     FIXME("iface %p, output_idx %u, output %p stub!\n", iface, output_idx, output);
 
     return E_NOTIMPL;
 }
 
-static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc)
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC *desc)
 {
     FIXME("iface %p, desc %p stub!\n", iface, desc);
 
     return E_NOTIMPL;
 }
 
-static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter *iface,
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAdapter *iface,
         REFGUID guid, LARGE_INTEGER *umd_version)
 {
     FIXME("iface %p, guid %s, umd_version %p stub!\n", iface, debugstr_guid(guid), umd_version);
@@ -127,7 +129,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IDXGIAdapter
     return E_NOTIMPL;
 }
 
-const struct IDXGIAdapterVtbl dxgi_adapter_vtbl =
+/* IWineDXGIAdapter methods */
+
+static UINT STDMETHODCALLTYPE dxgi_adapter_get_ordinal(IWineDXGIAdapter *iface)
+{
+    struct dxgi_adapter *This = (struct dxgi_adapter *)iface;
+
+    TRACE("iface %p, returning %u\n", iface, This->ordinal);
+
+    return This->ordinal;
+}
+
+const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl =
 {
     /* IUnknown methods */
     dxgi_adapter_QueryInterface,
@@ -142,4 +155,6 @@ const struct IDXGIAdapterVtbl dxgi_adapter_vtbl =
     dxgi_adapter_EnumOutputs,
     dxgi_adapter_GetDesc,
     dxgi_adapter_CheckInterfaceSupport,
+    /* IWineDXGIAdapter methods */
+    dxgi_adapter_get_ordinal,
 };
diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h
index ae44204..7ebf2e2 100644
--- a/dlls/dxgi/dxgi_private.h
+++ b/dlls/dxgi/dxgi_private.h
@@ -58,11 +58,12 @@ struct dxgi_device
 };
 
 /* IDXGIAdapter */
-extern const struct IDXGIAdapterVtbl dxgi_adapter_vtbl;
+extern const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl;
 struct dxgi_adapter
 {
-    const struct IDXGIAdapterVtbl *vtbl;
+    const struct IWineDXGIAdapterVtbl *vtbl;
     LONG refcount;
+    UINT ordinal;
 };
 
 /* IDXGISwapChain */
diff --git a/dlls/dxgi/dxgi_private_interface.idl b/dlls/dxgi/dxgi_private_interface.idl
index bbdc25e..2bb8b43 100644
--- a/dlls/dxgi/dxgi_private_interface.idl
+++ b/dlls/dxgi/dxgi_private_interface.idl
@@ -27,3 +27,13 @@ interface IWineDXGIFactory : IDXGIFactory
 {
     struct IWineD3D *get_wined3d();
 }
+
+[
+    object,
+    local,
+    uuid(ab1de34c-2963-4ffd-8493-40f580e510e5)
+]
+interface IWineDXGIAdapter : IDXGIAdapter
+{
+    UINT get_ordinal();
+}




More information about the wine-cvs mailing list