Zhiyi Zhang : d3d9/tests: Restore display modes at the end of test_wndproc().

Alexandre Julliard julliard at winehq.org
Fri Oct 30 16:18:45 CDT 2020


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

Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date:   Fri Oct 30 14:45:15 2020 +0800

d3d9/tests: Restore display modes at the end of test_wndproc().

test_wndproc() makes a series of ChangeDisplaySettings() calls that could make the current display
mode no longer match the registry display mode. Restore display modes at the end of test_wndproc()
so that other tests are not affected.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d3d9/tests/device.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 53a83ad887b..2efb6ddc2e5 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -4435,6 +4435,8 @@ done:
     CloseHandle(thread_params.test_finished);
     CloseHandle(thread_params.window_created);
     UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL));
+    change_ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL);
+    ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret);
 }
 
 static void test_wndproc_windowed(void)




More information about the wine-cvs mailing list