Nikolay Sivov : dxgi: Add IDXGIAdapter4 stub.

Alexandre Julliard julliard at winehq.org
Wed Oct 24 15:13:53 CDT 2018


Module: wine
Branch: master
Commit: 7e7d03ed590af0c3379875bbfe7f717d87224da7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7e7d03ed590af0c3379875bbfe7f717d87224da7

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Oct 24 08:22:02 2018 +0300

dxgi: Add IDXGIAdapter4 stub.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d11/d3d11_private.h |  1 +
 dlls/dxgi/adapter.c        | 10 ++++++++++
 include/wine/winedxgi.idl  |  4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index 771e923..787fe87 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -30,6 +30,7 @@
 #include "winuser.h"
 #include "objbase.h"
 
+#include "dxgi1_6.h"
 #include "d3d11_4.h"
 #ifdef D3D11_INIT_GUID
 #include "initguid.h"
diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c
index 0079759..a913870 100644
--- a/dlls/dxgi/adapter.c
+++ b/dlls/dxgi/adapter.c
@@ -34,6 +34,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IWineDXGIAdapter *i
     TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out);
 
     if (IsEqualGUID(iid, &IID_IWineDXGIAdapter)
+            || IsEqualGUID(iid, &IID_IDXGIAdapter4)
             || IsEqualGUID(iid, &IID_IDXGIAdapter3)
             || IsEqualGUID(iid, &IID_IDXGIAdapter2)
             || IsEqualGUID(iid, &IID_IDXGIAdapter1)
@@ -301,6 +302,13 @@ static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNoti
     FIXME("iface %p, cookie %#x stub!\n", iface, cookie);
 }
 
+static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc)
+{
+    FIXME("iface %p, desc %p stub!\n", iface, desc);
+
+    return E_NOTIMPL;
+}
+
 static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl =
 {
     dxgi_adapter_QueryInterface,
@@ -325,6 +333,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl =
     dxgi_adapter_SetVideoMemoryReservation,
     dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent,
     dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification,
+    /* IDXGIAdapter4 methods */
+    dxgi_adapter_GetDesc3,
 };
 
 struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface)
diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl
index 3a1d6fa..fccf45d 100644
--- a/include/wine/winedxgi.idl
+++ b/include/wine/winedxgi.idl
@@ -18,7 +18,7 @@
 
 #pragma makedep header
 
-import "dxgi1_5.idl";
+import "dxgi1_6.idl";
 
 [
     object,
@@ -56,7 +56,7 @@ interface IWineDXGIDeviceParent : IUnknown
     local,
     uuid(17399d75-964e-4c03-99f8-9d4fd196dd62)
 ]
-interface IWineDXGIAdapter : IDXGIAdapter3
+interface IWineDXGIAdapter : IDXGIAdapter4
 {
 }
 




More information about the wine-cvs mailing list