d3d9/tests: Work around focus-follows-mouse test failures.

Removing WS_VISIBLE without updating the window state with
SWP_FRAMECHANGED is enough to trigger d3d9's hidden window codepath
(native and in Wine), but doesn't actually hide the window. This
prevents unpredictable focus changes on focus follows mouse WMs.

Signed-off-by: Stefan Dösinger <stefan@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Stefan Dösinger 2017-12-18 21:39:28 +01:00 committed by Alexandre Julliard
parent 749e280df7
commit 1437317819
2 changed files with 10 additions and 2 deletions

View File

@ -2954,7 +2954,11 @@ static void test_wndproc(void)
hr = reset_device(device, &device_desc);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
ShowWindow(device_window, SW_HIDE);
/* Remove the WS_VISIBLE flag to test hidden windows. This is enough to trigger d3d's hidden
* window codepath, but does not actually hide the window without a SetWindowPos(SWP_FRAMECHANGED)
* call. This way we avoid focus changes and random failures on focus follows mouse WMs. */
device_style = GetWindowLongA(device_window, GWL_STYLE);
SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE);
flush_events();
expect_messages = focus_loss_messages_hidden;

View File

@ -3906,7 +3906,11 @@ static void test_wndproc(void)
hr = reset_device(device, &device_desc);
ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr);
ShowWindow(device_window, SW_HIDE);
/* Remove the WS_VISIBLE flag to test hidden windows. This is enough to trigger d3d's hidden
* window codepath, but does not actually hide the window without a SetWindowPos(SWP_FRAMECHANGED)
* call. This way we avoid focus changes and random failures on focus follows mouse WMs. */
device_style = GetWindowLongA(device_window, GWL_STYLE);
SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE);
flush_events();
expect_messages = focus_loss_messages_hidden;