Skip to content

W
wine-winehq
Commit b2fed1c7 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard
Browse files
Options

d3d9: Use WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE if extended.

Signed-off-by: 's avatarGabriel Ivăncescu <gabrielopcode@gmail.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 0f024390
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
dlls/d3d9/device.c
View file @ b2fed1c7
...@@ -349,6 +349,8 @@ static BOOL wined3d_swapchain_desc_from_d3d9(struct wined3d_swapchain_desc *swap ...@@ -349,6 +349,8 @@ static BOOL wined3d_swapchain_desc_from_d3d9(struct wined3d_swapchain_desc *swap
= wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat);
swapchain_desc->flags swapchain_desc->flags
= (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH;
if (extended)
swapchain_desc->flags |= WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE;
if ((present_parameters->Flags & D3DPRESENTFLAG_LOCKABLE_BACKBUFFER) if ((present_parameters->Flags & D3DPRESENTFLAG_LOCKABLE_BACKBUFFER)
&& (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format) && (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format)
/* WINED3DFMT_UNKNOWN creates the swapchain with the current /* WINED3DFMT_UNKNOWN creates the swapchain with the current
......
dlls/d3d9/tests/d3d9ex.c
View file @ b2fed1c7
...@@ -3569,12 +3569,10 @@ static void test_window_style(void) ...@@ -3569,12 +3569,10 @@ static void test_window_style(void)
style = GetWindowLongA(device_window, GWL_STYLE); style = GetWindowLongA(device_window, GWL_STYLE);
expected_style = device_style; expected_style = device_style;
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",
ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i);
expected_style, style, i);
style = GetWindowLongA(device_window, GWL_EXSTYLE); style = GetWindowLongA(device_window, GWL_EXSTYLE);
expected_style = device_exstyle; expected_style = device_exstyle;
todo_wine_if (!(tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES))
ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n",
expected_style, style, i); expected_style, style, i);
...@@ -3590,12 +3588,10 @@ static void test_window_style(void) ...@@ -3590,12 +3588,10 @@ static void test_window_style(void)
style = GetWindowLongA(device_window, GWL_STYLE); style = GetWindowLongA(device_window, GWL_STYLE);
expected_style = device_style; expected_style = device_style;
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",
ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i);
expected_style, style, i);
style = GetWindowLongA(device_window, GWL_EXSTYLE); style = GetWindowLongA(device_window, GWL_EXSTYLE);
expected_style = device_exstyle; expected_style = device_exstyle;
todo_wine_if (!(tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES))
ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n",
expected_style, style, i); expected_style, style, i);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment