dxgi: Support IID_IDXGIDevice in dxgi_adapter_CheckInterfaceSupport().

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

dxgi: Support IID_IDXGIDevice in dxgi_adapter_CheckInterfaceSupport().
2ea796ad · Nikolay Sivov · Alexandre Julliard · ab9dccda · 2ea796ad · 2ea796ad
Commit 2ea796ad authored Oct 22, 2018 by Nikolay Sivov Committed by Alexandre Julliard Oct 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

adapter.c dlls/dxgi/adapter.c +2 -1

dxgi.c dlls/dxgi/tests/dxgi.c +4 -0

No files found.
--- a/dlls/dxgi/adapter.c
+++ b/dlls/dxgi/adapter.c
@@ -218,7 +218,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_CheckInterfaceSupport(IWineDXGIAda
    TRACE("iface %p, guid %s, umd_version %p.\n", iface, debugstr_guid(guid), umd_version);

    /* This method works only for D3D10 interfaces. */
-    if (!(IsEqualGUID(guid, &IID_ID3D10Device)
+    if (!(IsEqualGUID(guid, &IID_IDXGIDevice)
+            || IsEqualGUID(guid, &IID_ID3D10Device)
            || IsEqualGUID(guid, &IID_ID3D10Device1)))
    {
        WARN("Returning DXGI_ERROR_UNSUPPORTED for %s.\n", debugstr_guid(guid));

--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -838,6 +838,10 @@ static void test_check_interface_support(void)
    hr = IDXGIDevice_GetAdapter(device, &adapter);
    ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr);

+    hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, NULL);
+    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+    hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_IDXGIDevice, &driver_version);
+    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
    hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, NULL);
    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
    hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D10Device, &driver_version);