ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Do not clip the cursor after changing display modes. 

DirectDraw should clip the cursor to the primary monitor only when the
cooperative level is DDSCL_EXCLUSIVE. For Direct3D 8, 9 and DXGI,
changing display modes shouldn't clip the cursor as tests showed.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2020-04-09 15:33:05 +08:00 committed by Alexandre Julliard
parent 5a2e6f5e58
commit f91dd56ccd
10 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d8/tests/device.c
View File

@ -10152,7 +10152,6 @@ static void test_cursor_clipping(void)
get_virtual_rect(&virtual_rect);
ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx,
GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &virtual_rect))
ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n",
adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
@ -10161,7 +10160,6 @@ static void test_cursor_clipping(void)
get_virtual_rect(&virtual_rect);
ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx,
GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &virtual_rect))
ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n",
adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
}

2
dlls/d3d9/tests/device.c
View File

@ -13893,7 +13893,6 @@ static void test_cursor_clipping(void)
get_virtual_rect(&virtual_rect);
ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx,
GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &virtual_rect))
ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n",
adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
@ -13902,7 +13901,6 @@ static void test_cursor_clipping(void)
get_virtual_rect(&virtual_rect);
ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx,
GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &virtual_rect))
ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n",
adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
}

31
dlls/ddraw/ddraw.c
View File

@ -665,6 +665,8 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win
static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface)
{
struct ddraw *ddraw = impl_from_IDirectDraw7(iface);
struct wined3d_display_mode mode;
RECT clip_rect;
HRESULT hr;
TRACE("iface %p.\n", iface);
@ -684,7 +686,15 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface)
}
if (SUCCEEDED(hr = wined3d_output_set_display_mode(ddraw->wined3d_output, NULL)))
{
ddraw->flags &= ~DDRAW_RESTORE_MODE;
if (ddraw->cooperative_level & DDSCL_EXCLUSIVE &&
SUCCEEDED(hr = wined3d_output_get_display_mode(ddraw->wined3d_output, &mode, NULL)))
{
SetRect(&clip_rect, 0, 0, mode.width, mode.height);
ClipCursor(&clip_rect);
}
}
InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_NOT_RESTORED, DDRAW_DEVICE_STATE_OK);
@ -768,6 +778,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
struct wined3d_rendertarget_view *rtv = NULL, *dsv = NULL;
struct wined3d_stateblock *stateblock;
BOOL restore_state = FALSE;
RECT clip_rect;
HRESULT hr;
TRACE("ddraw %p, window %p, flags %#x, restore_mode_on_normal %x.\n", ddraw, window, cooplevel,
@ -942,12 +953,11 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
wined3d_stateblock_decref(stateblock);
}
if (!(cooplevel & DDSCL_EXCLUSIVE) && (ddraw->cooperative_level & DDSCL_EXCLUSIVE)
&& restore_mode_on_normal)
if (!(cooplevel & DDSCL_EXCLUSIVE) && (ddraw->cooperative_level & DDSCL_EXCLUSIVE))
{
hr = ddraw7_RestoreDisplayMode(&ddraw->IDirectDraw7_iface);
if (FAILED(hr))
if (restore_mode_on_normal && FAILED(ddraw7_RestoreDisplayMode(&ddraw->IDirectDraw7_iface)))
ERR("RestoreDisplayMode failed\n");
ClipCursor(NULL);
}
if ((ddraw->cooperative_level & DDSCL_EXCLUSIVE)
@ -965,6 +975,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window,
}
}
if (cooplevel & DDSCL_EXCLUSIVE)
{
SetRect(&clip_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
ClipCursor(&clip_rect);
}
/* Unhandled flags */
if (cooplevel & DDSCL_ALLOWREBOOT)
WARN("Unhandled flag DDSCL_ALLOWREBOOT, harmless\n");
@ -1059,6 +1075,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW
struct ddraw *ddraw = impl_from_IDirectDraw7(iface);
struct wined3d_display_mode mode;
enum wined3d_format_id format;
RECT clip_rect;
HRESULT hr;
TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n",
@ -1117,6 +1134,12 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW
ddrawformat_from_wined3dformat(&ddraw->primary->surface_desc.u4.ddpfPixelFormat, mode.format_id);
}
ddraw->flags |= DDRAW_RESTORE_MODE;
if (ddraw->cooperative_level & DDSCL_EXCLUSIVE)
{
SetRect(&clip_rect, 0, 0, width, height);
ClipCursor(&clip_rect);
}
}
InterlockedCompareExchange(&ddraw->device_state, DDRAW_DEVICE_STATE_NOT_RESTORED, DDRAW_DEVICE_STATE_OK);

3
dlls/ddraw/tests/ddraw1.c
View File

@ -13313,7 +13313,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &rect))
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));
@ -13322,7 +13321,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1)
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));
@ -13363,7 +13361,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1)
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));

3
dlls/ddraw/tests/ddraw2.c
View File

@ -14154,7 +14154,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &rect))
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));
@ -14163,7 +14162,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1)
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));
@ -14204,7 +14202,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1)
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));

3
dlls/ddraw/tests/ddraw4.c
View File

@ -17179,7 +17179,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &rect))
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));
@ -17188,7 +17187,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1)
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));
@ -17229,7 +17227,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1)
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));

3
dlls/ddraw/tests/ddraw7.c
View File

@ -17408,7 +17408,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &rect))
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));
@ -17417,7 +17416,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1)
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));
@ -17458,7 +17456,6 @@ static void test_cursor_clipping(void)
flush_events();
get_virtual_rect(&rect);
ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError());
todo_wine_if(GetSystemMetrics(SM_CMONITORS) > 1)
ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect),
wine_dbgstr_rect(&clip_rect));

2
dlls/dxgi/tests/dxgi.c
View File

@ -6118,7 +6118,6 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12)
ok(GetClipCursor(&clip_rect),
"Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx,
output_idx, GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &virtual_rect))
ok(EqualRect(&clip_rect, &virtual_rect),
"Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx,
wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));
@ -6139,7 +6138,6 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12)
ok(GetClipCursor(&clip_rect),
"Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx,
output_idx, GetLastError());
todo_wine_if(!EqualRect(&clip_rect, &virtual_rect))
ok(EqualRect(&clip_rect, &virtual_rect),
"Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx,
wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect));

5
dlls/wined3d/directx.c
View File

@ -1260,7 +1260,6 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output,
const struct wined3d_display_mode *mode)
{
DEVMODEW new_mode, current_mode;
RECT clip_rc;
LONG ret;
enum wined3d_format_id new_format_id;
@ -1341,10 +1340,6 @@ HRESULT CDECL wined3d_output_set_display_mode(struct wined3d_output *output,
/* Store the new values. */
output->screen_format = new_format_id;
/* And finally clip mouse to our screen. */
SetRect(&clip_rc, 0, 0, new_mode.dmPelsWidth, new_mode.dmPelsHeight);
ClipCursor(&clip_rc);
return WINED3D_OK;
}

1
dlls/wined3d/swapchain.c
View File

@ -1067,7 +1067,6 @@ err:
if (!output || FAILED(wined3d_output_set_display_mode(output,
&swapchain->state.original_mode)))
ERR("Failed to restore display mode.\n");
ClipCursor(NULL);
}
if (swapchain->back_buffers)