[PATCH 5/8] wined3d: Don't show the window if no window changes were requested.

[Henri Verbeet]

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>

Based on a patch by Rémi Bernon.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
This supersedes patch 188410.

 dlls/d3d9/tests/d3d9ex.c | 4 ++--
 dlls/d3d9/tests/device.c | 5 ++---
 dlls/wined3d/swapchain.c | 4 +++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c
index 76565c4ec2c..2836fdd5bef 100644
--- a/dlls/d3d9/tests/d3d9ex.c
+++ b/dlls/d3d9/tests/d3d9ex.c
@@ -3569,7 +3569,7 @@ static void test_window_style(void)
 
         style = GetWindowLongA(device_window, GWL_STYLE);
         expected_style = device_style;
-        todo_wine_if (!(tests[i].style_flags & WS_VISIBLE))
+        todo_wine_if (!(tests[i].style_flags & WS_VISIBLE) && !(tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES))
             ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n",
                     expected_style, style, i);
         style = GetWindowLongA(device_window, GWL_EXSTYLE);
@@ -3590,7 +3590,7 @@ static void test_window_style(void)
 
         style = GetWindowLongA(device_window, GWL_STYLE);
         expected_style = device_style;
-        todo_wine_if (!(tests[i].style_flags & WS_VISIBLE))
+        todo_wine_if (!(tests[i].style_flags & WS_VISIBLE) && !(tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES))
             ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n",
                     expected_style, style, i);
         style = GetWindowLongA(device_window, GWL_EXSTYLE);
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 14ca12ecd87..53a83ad887b 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -5020,9 +5020,8 @@ static void test_window_style(void)
 
         style = GetWindowLongA(device_window, GWL_STYLE);
         expected_style = device_style | tests[i].style;
-        todo_wine_if ((tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) && !(tests[i].create_style & WS_VISIBLE))
-            ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n",
-                    expected_style, style, i);
+        ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n",
+                expected_style, style, i);
         style = GetWindowLongA(device_window, GWL_EXSTYLE);
         expected_style = device_exstyle | tests[i].exstyle;
         todo_wine_if (!(tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) && (tests[i].create_style & WS_VISIBLE))
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 00d51d6f6d4..a51b934af02 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -2065,7 +2065,7 @@ static LONG fullscreen_exstyle(LONG exstyle)
 HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state,
         HWND window, int x, int y, int width, int height)
 {
-    unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE;
+    unsigned int window_pos_flags = SWP_FRAMECHANGED | SWP_NOACTIVATE;
     LONG style, exstyle;
     BOOL filter;
 
@@ -2085,6 +2085,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state
 
     if (state->desc.flags & WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES)
         window_pos_flags |= SWP_NOZORDER;
+    else
+        window_pos_flags |= SWP_SHOWWINDOW;
 
     state->style = GetWindowLongW(window, GWL_STYLE);
     state->exstyle = GetWindowLongW(window, GWL_EXSTYLE);
-- 
2.20.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=74970

Your paranoid android.


=== w1064v1809 (32 bit report) ===

d3d9:
device.c:5042: Test failed: Failed to set foreground window.
device.c:5066: Test failed: Failed to set foreground window.
device.c:5069: Test failed: Failed to reset device, hr 0x88760868.
device.c:5042: Test failed: Failed to set foreground window.
device.c:5066: Test failed: Failed to set foreground window.
device.c:11437: Test failed: Failed to set foreground window.
device.c:11439: Test failed: Got unexpected hr 0.
device.c:11441: Test failed: Got unexpected hr 0.
device.c:11446: Test failed: Failed to set foreground window.
device.c:11448: Test failed: Got unexpected hr 0.
device.c:11450: Test failed: Got unexpected hr 0.
device.c:11468: Test failed: Failed to set foreground window.
device.c:11477: Test failed: Failed to set foreground window.
device.c:11492: Test failed: Failed to set foreground window.
device.c:11494: Test failed: Got unexpected hr 0.
device.c:11498: Test failed: Failed to set foreground window.
device.c:14086: Test failed: Adapter 0: SetForegroundWindow failed, error 0.
device.c:14092: Test failed: Adapter 0: SetForegroundWindow failed, error 0.

=== debiant (32 bit report) ===

d3d9:
d3d9ex: Timeout
device: Timeout
stateblock: Timeout
visual: Timeout

=== debiant (build log) ===

0024:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0024:err:winediag:nodrv_CreateWindow The explorer process failed to start.
Task: WineTest did not produce the win32_fr_FR report

=== debiant (32 bit WoW report) ===

d3d9:
d3d9ex: Timeout
device: Timeout
stateblock: Timeout
visual: Timeout

=== debiant (build log) ===

0024:err:winediag:nodrv_CreateWindow Application tried to create a window, but no driver could be loaded.
0024:err:winediag:nodrv_CreateWindow The explorer process failed to start.
Task: WineTest did not produce the wow64 report