Józef Kucia : dxgi: Forbid creating D3D12 swapchains on desktop window.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Mon Jun 24 11:26:31 2019 +0200

dxgi: Forbid creating D3D12 swapchains on desktop window.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3d12/tests/d3d12.c | 4 ++--
 dlls/dxgi/swapchain.c    | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c
index d23aba9..54eec6b 100644
--- a/dlls/d3d12/tests/d3d12.c
+++ b/dlls/d3d12/tests/d3d12.c
@@ -1404,12 +1404,12 @@ static void test_desktop_window(void)
     swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED;
     swapchain_desc.Flags = 0;
     hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain);
-    todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr);
+    ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr);
 
     swapchain_desc.Width = rect.right;
     swapchain_desc.Height = rect.bottom;
     hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &swapchain_desc, NULL, NULL, &swapchain);
-    todo_wine ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr);
+    ok(hr == E_ACCESSDENIED, "Got unexpected hr %#x.\n", hr);
 
     IDXGIFactory4_Release(factory);
     destroy_test_context(&context);
diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 4f01d9c..1bc59f4 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -2683,6 +2683,12 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI
     VkResult vr;
     HRESULT hr;
 
+    if (window == GetDesktopWindow())
+    {
+        WARN("D3D12 swapchain cannot be created on desktop window.\n");
+        return E_ACCESSDENIED;
+    }
+
     swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl;
     swapchain->refcount = 1;