[PATCH 6/7] dxgi: Return DXGI_STATUS_OCCLUDED for minimised windows in d3d11_swapchain_present().

[Henri Verbeet]

From: Zhiyi Zhang

Signed-off-by: Zhiyi Zhang 
Signed-off-by: Henri Verbeet 
---
This supersedes patch 166452.

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

diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 1bc59f48e90..8dbbfab805d 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -306,6 +306,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain,
         return DXGI_ERROR_INVALID_CALL;
     }

+    if (IsIconic(d3d11_swapchain_get_hwnd(swapchain)))
+        return DXGI_STATUS_OCCLUDED;
+
     if (flags & ~DXGI_PRESENT_TEST)
         FIXME("Unimplemented flags %#x.\n", flags);
     if (flags & DXGI_PRESENT_TEST)
diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c
index 51ff4405b4e..f5c16a779ab 100644
--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -4073,8 +4073,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12)
         /* Minimised window. */
         ShowWindow(swapchain_desc.OutputWindow, SW_MINIMIZE);
         hr = IDXGISwapChain_Present(swapchain, 0, flags[i]);
-        todo_wine_if(!is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED),
-                "Test %u: Got unexpected hr %#x.\n", i, hr);
+        ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Test %u: Got unexpected hr %#x.\n", i, hr);
         ShowWindow(swapchain_desc.OutputWindow, SW_NORMAL);

/* Hidden window. */