Commit 78533e9e authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard

d3d9/tests: Add more tests for fullscreen window size reset.

parent 0f16aa18
...@@ -14572,10 +14572,10 @@ static void test_window_position(void) ...@@ -14572,10 +14572,10 @@ static void test_window_position(void)
{ {
unsigned int adapter_idx, adapter_count; unsigned int adapter_idx, adapter_count;
struct device_desc device_desc; struct device_desc device_desc;
RECT window_rect, new_rect;
IDirect3DDevice9 *device; IDirect3DDevice9 *device;
MONITORINFO monitor_info; MONITORINFO monitor_info;
HMONITOR monitor; HMONITOR monitor;
RECT window_rect;
IDirect3D9 *d3d; IDirect3D9 *d3d;
HWND window; HWND window;
HRESULT hr; HRESULT hr;
...@@ -14612,6 +14612,42 @@ static void test_window_position(void) ...@@ -14612,6 +14612,42 @@ static void test_window_position(void)
"Adapter %u: Expect window rect %s, got %s.\n", adapter_idx, "Adapter %u: Expect window rect %s, got %s.\n", adapter_idx,
wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect)); wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect));
new_rect = window_rect;
--new_rect.right;
--new_rect.bottom;
ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left,
new_rect.bottom - new_rect.top, TRUE);
ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx);
ret = GetWindowRect(window, &window_rect);
ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx);
ok(EqualRect(&window_rect, &new_rect),
"Adapter %u: Expect window rect %s, got %s.\n", adapter_idx,
wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect));
/* After processing window events window rectangle gets restored. But only once, the size set
* on the second resize remains. */
flush_events();
ret = GetWindowRect(window, &window_rect);
ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx);
todo_wine ok(EqualRect(&window_rect, &monitor_info.rcMonitor),
"Adapter %u: Expect window rect %s, got %s.\n", adapter_idx,
wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect));
ret = MoveWindow(window, new_rect.left, new_rect.top, new_rect.right - new_rect.left,
new_rect.bottom - new_rect.top, TRUE);
ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx);
ret = GetWindowRect(window, &window_rect);
ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx);
ok(EqualRect(&window_rect, &new_rect),
"Adapter %u: Expect window rect %s, got %s.\n", adapter_idx,
wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect));
flush_events();
ret = GetWindowRect(window, &window_rect);
ok(ret, "Got unexpected ret %#x, error %#x, Adapter %u.\n", ret, GetLastError(), adapter_idx);
ok(EqualRect(&window_rect, &new_rect),
"Adapter %u: Expect window rect %s, got %s.\n", adapter_idx,
wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&window_rect));
/* Device resets should restore the window rectangle to fit the whole monitor */ /* Device resets should restore the window rectangle to fit the whole monitor */
ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError());
......
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