[PATCH v2 1/2] dxgi/tests: Test output after using Alt+Enter to switch fullscreen.

Zhiyi Zhang zzhang at codeweavers.com
Mon Jul 8 09:15:59 CDT 2019


Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
v2: Add a loop number to trace and fix a typo. Supersede 167618~167619

 dlls/dxgi/tests/dxgi.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c
index ab65725ccf..3d81cec9ca 100644
--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -5305,6 +5305,7 @@ static void test_window_association(void)
     LONG_PTR original_wndproc, wndproc;
     IDXGIFactory *factory, *factory2;
     IDXGISwapChain *swapchain;
+    IDXGIOutput *output;
     IDXGIAdapter *adapter;
     IDXGIDevice *device;
     HWND hwnd, hwnd2;
@@ -5448,14 +5449,18 @@ static void test_window_association(void)
             PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN,
                     (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001);
             flush_events();
-            hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL);
+            output = NULL;
+            hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output);
             ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
             ok(fullscreen == tests[i].expect_fullscreen
                     || broken(tests[i].broken_d3d10 && fullscreen),
                     "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen);
+            todo_wine_if(fullscreen) ok(fullscreen ? !!output : !output, "Test %u: Got wrong output.\n", i);
+            if (output)
+                IDXGIOutput_Release(output);
 
             wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC);
-            ok(wndproc == original_wndproc, "Text %u: Got unexpected wndproc %#lx, expected %#lx.\n",
+            ok(wndproc == original_wndproc, "Test %u: Got unexpected wndproc %#lx, expected %#lx.\n",
                     i, wndproc, original_wndproc);
         }
     }
-- 
2.20.1





More information about the wine-devel mailing list