May 2020 - Wine-devel - list.winehq.org

[PATCH 6/6] d3d9/tests: Add more get display mode tests.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 115 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 114 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 620ee8e8d6f..41cfc1519c1 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13549,14 +13549,21 @@ static void test_vertex_buffer_read_write(void) static void test_get_display_mode(void) { + static const DWORD creation_flags[] = {0, CREATE_DEVICE_FULLSCREEN}; + unsigned int adapter_idx, adapter_count, mode_idx, test_idx; IDirect3DSwapChain9 *swapchain; + RECT previous_monitor_rect; + unsigned int width, height; IDirect3DDevice9 *device; + MONITORINFO monitor_info; struct device_desc desc; D3DDISPLAYMODE mode; + HMONITOR monitor; IDirect3D9 *d3d; ULONG refcount; HWND window; HRESULT hr; + BOOL ret; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); @@ -13620,8 +13627,114 @@ static void test_get_display_mode(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D9_Release(d3d); DestroyWindow(window); + + /* D3D9 uses adapter indices to determine which adapter to use to get the display mode */ + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + if (!adapter_idx) + { + desc.width = 640; + desc.height = 480; + } + else + { + /* Find a mode different than that of the previous adapter, so that tests can be sure + * that they are comparing to the current adapter display mode */ + monitor = IDirect3D9_GetAdapterMonitor(d3d, adapter_idx - 1); + ok(!!monitor, "Adapter %u: GetAdapterMonitor failed.\n", adapter_idx - 1); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx - 1, + GetLastError()); + previous_monitor_rect = monitor_info.rcMonitor; + + desc.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + desc.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + for (mode_idx = 0; SUCCEEDED(IDirect3D9_EnumAdapterModes(d3d, adapter_idx, + D3DFMT_X8R8G8B8, mode_idx, &mode)); ++mode_idx) + { + if (mode.Width < 640 || mode.Height < 480) + continue; + if (mode.Width != desc.width && mode.Height != desc.height) + break; + } + ok(mode.Width != desc.width && mode.Height != desc.height, + "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, + desc.width, desc.height); + desc.width = mode.Width; + desc.height = mode.Height; + } + + for (test_idx = 0; test_idx < ARRAY_SIZE(creation_flags); ++test_idx) + { + window = create_window(); + desc.adapter_ordinal = adapter_idx; + desc.device_window = window; + desc.flags = creation_flags[test_idx]; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Adapter %u test %u: Failed to create a D3D device.\n", adapter_idx, test_idx); + DestroyWindow(window); + continue; + } + + monitor = IDirect3D9_GetAdapterMonitor(d3d, adapter_idx); + ok(!!monitor, "Adapter %u test %u: GetAdapterMonitor failed.\n", adapter_idx, test_idx); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u test %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx, + test_idx, GetLastError()); + width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + + if (adapter_idx) + { + /* Move the device window to the previous monitor to test that the device window + * position doesn't affect which adapter to use to get the display mode */ + ret = SetWindowPos(window, 0, previous_monitor_rect.left, previous_monitor_rect.top, + 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u test %u: SetWindowPos failed, error %#x.\n", adapter_idx, + test_idx, GetLastError()); + } + + hr = IDirect3D9_GetAdapterDisplayMode(d3d, adapter_idx, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetAdapterDisplayMode failed, hr %#x.\n", + adapter_idx, test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + + hr = IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetDisplayMode failed, hr %#x.\n", adapter_idx, + test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Adapter %u test %u: GetSwapChain failed, hr %#x.\n", adapter_idx, + test_idx, hr); + hr = IDirect3DSwapChain9_GetDisplayMode(swapchain, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetDisplayMode failed, hr %#x.\n", adapter_idx, + test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + IDirect3DSwapChain9_Release(swapchain); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Adapter %u test %u: Device has %u references left.\n", adapter_idx, + test_idx, refcount); + DestroyWindow(window); + } + } + + IDirect3D9_Release(d3d); } static void test_multi_adapter(void) -- 2.25.1

2 1

[PATCH 5/6] d3d8/tests: Add more get display mode tests.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 105 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fdec30c681f..4c567a47603 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9881,13 +9881,20 @@ static void test_draw_primitive(void) static void test_get_display_mode(void) { + static const DWORD creation_flags[] = {0, CREATE_DEVICE_FULLSCREEN}; + unsigned int adapter_idx, adapter_count, mode_idx, test_idx; + RECT previous_monitor_rect; + unsigned int width, height; IDirect3DDevice8 *device; + MONITORINFO monitor_info; struct device_desc desc; D3DDISPLAYMODE mode; + HMONITOR monitor; IDirect3D8 *d3d; ULONG refcount; HWND window; HRESULT hr; + BOOL ret; window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); @@ -9937,8 +9944,104 @@ static void test_get_display_mode(void) refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - IDirect3D8_Release(d3d); DestroyWindow(window); + + /* D3D8 uses adapter indices to determine which adapter to use to get the display mode */ + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + if (!adapter_idx) + { + desc.width = 640; + desc.height = 480; + } + else + { + /* Find a mode different than that of the previous adapter, so that tests can be sure + * that they are comparing to the current adapter display mode */ + monitor = IDirect3D8_GetAdapterMonitor(d3d, adapter_idx - 1); + ok(!!monitor, "Adapter %u: GetAdapterMonitor failed.\n", adapter_idx - 1); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx - 1, + GetLastError()); + previous_monitor_rect = monitor_info.rcMonitor; + + desc.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + desc.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + for (mode_idx = 0; SUCCEEDED(IDirect3D8_EnumAdapterModes(d3d, adapter_idx, mode_idx, + &mode)); ++mode_idx) + { + if (mode.Format != D3DFMT_X8R8G8B8) + continue; + if (mode.Width < 640 || mode.Height < 480) + continue; + if (mode.Width != desc.width && mode.Height != desc.height) + break; + } + ok(mode.Width != desc.width && mode.Height != desc.height, + "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, + desc.width, desc.height); + desc.width = mode.Width; + desc.height = mode.Height; + } + + for (test_idx = 0; test_idx < ARRAY_SIZE(creation_flags); ++test_idx) + { + window = create_window(); + desc.adapter_ordinal = adapter_idx; + desc.device_window = window; + desc.flags = creation_flags[test_idx]; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Adapter %u test %u: Failed to create a D3D device.\n", adapter_idx, test_idx); + DestroyWindow(window); + continue; + } + + monitor = IDirect3D8_GetAdapterMonitor(d3d, adapter_idx); + ok(!!monitor, "Adapter %u test %u: GetAdapterMonitor failed.\n", adapter_idx, test_idx); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u test %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx, + test_idx, GetLastError()); + width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + + if (adapter_idx) + { + /* Move the device window to the previous monitor to test that the device window + * position doesn't affect which adapter to use to get the display mode */ + ret = SetWindowPos(window, 0, previous_monitor_rect.left, previous_monitor_rect.top, + 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u test %u: SetWindowPos failed, error %#x.\n", adapter_idx, + test_idx, GetLastError()); + } + + hr = IDirect3D8_GetAdapterDisplayMode(d3d, adapter_idx, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetAdapterDisplayMode failed, hr %#x.\n", + adapter_idx, test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + + hr = IDirect3DDevice8_GetDisplayMode(device, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetDisplayMode failed, hr %#x.\n", adapter_idx, + test_idx, hr); + ok(mode.Width == width, "Adapter %u test %u: Expect width %u, got %u.\n", adapter_idx, + test_idx, width, mode.Width); + ok(mode.Height == height, "Adapter %u test %u: Expect height %u, got %u.\n", + adapter_idx, test_idx, height, mode.Height); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Adapter %u test %u: Device has %u references left.\n", adapter_idx, + test_idx, refcount); + DestroyWindow(window); + } + } + + IDirect3D8_Release(d3d); } static void test_multi_adapter(void) -- 2.25.1

3 2

[PATCH 4/6] ddraw/tests: Add get display mode tests.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 49223cde289..82d8e94b5fc 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13694,6 +13694,43 @@ static void test_window_position(void) EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); } +static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + DDSURFACEDESC surface_desc; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + /* Test that DirectDraw doesn't use the device window to determine which monitor to use */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Expect width %d, got %d.\n", + GetSystemMetrics(SM_CXSCREEN), surface_desc.dwWidth); + ok(surface_desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Expect height %d, got %d.\n", + GetSystemMetrics(SM_CYSCREEN), surface_desc.dwHeight); + + DestroyWindow(window); + IDirectDraw_Release(ddraw); + return TRUE; +} + +static void test_get_display_mode(void) +{ + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -13809,4 +13846,5 @@ START_TEST(ddraw1) test_cursor_clipping(); test_vtbl_protection(); test_window_position(); + test_get_display_mode(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index c4549d95e7c..25cbe8fa921 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14466,6 +14466,43 @@ static void test_window_position(void) EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); } +static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + DDSURFACEDESC surface_desc; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + /* Test that DirectDraw doesn't use the device window to determine which monitor to use */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Expect width %d, got %d.\n", + GetSystemMetrics(SM_CXSCREEN), surface_desc.dwWidth); + ok(surface_desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Expect height %d, got %d.\n", + GetSystemMetrics(SM_CYSCREEN), surface_desc.dwHeight); + + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return TRUE; +} + +static void test_get_display_mode(void) +{ + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -14587,4 +14624,5 @@ START_TEST(ddraw2) test_d32_support(); test_cursor_clipping(); test_window_position(); + test_get_display_mode(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 09fe7e1e92b..5dc2b4e7e52 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17493,6 +17493,43 @@ static void test_window_position(void) EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); } +static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + DDSURFACEDESC2 surface_desc; + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + /* Test that DirectDraw doesn't use the device window to determine which monitor to use */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Expect width %d, got %d.\n", + GetSystemMetrics(SM_CXSCREEN), surface_desc.dwWidth); + ok(surface_desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Expect height %d, got %d.\n", + GetSystemMetrics(SM_CYSCREEN), surface_desc.dwHeight); + + DestroyWindow(window); + IDirectDraw4_Release(ddraw); + return TRUE; +} + +static void test_get_display_mode(void) +{ + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -17630,4 +17667,5 @@ START_TEST(ddraw4) test_surface_format_conversion_alpha(); test_cursor_clipping(); test_window_position(); + test_get_display_mode(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5cf197998eb..53e47250e3d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17728,6 +17728,43 @@ static void test_window_position(void) EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); } +static BOOL CALLBACK test_get_display_mode_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + /* Test that DirectDraw doesn't use the device window to determine which monitor to use */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); + ok(hr == DD_OK, "GetDisplayMode failed, hr %#x.\n", hr); + ok(surface_desc.dwWidth == GetSystemMetrics(SM_CXSCREEN), "Expect width %d, got %d.\n", + GetSystemMetrics(SM_CXSCREEN), surface_desc.dwWidth); + ok(surface_desc.dwHeight == GetSystemMetrics(SM_CYSCREEN), "Expect height %d, got %d.\n", + GetSystemMetrics(SM_CYSCREEN), surface_desc.dwHeight); + + DestroyWindow(window); + IDirectDraw7_Release(ddraw); + return TRUE; +} + +static void test_get_display_mode(void) +{ + EnumDisplayMonitors(NULL, NULL, test_get_display_mode_cb, 0); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -17880,4 +17917,5 @@ START_TEST(ddraw7) test_compressed_surface_stretch(); test_cursor_clipping(); test_window_position(); + test_get_display_mode(); } -- 2.25.1

3 2

[PATCH 3/6] d3d9/tests: Test window position.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 82 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c65f0cd04da..620ee8e8d6f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13909,6 +13909,87 @@ static void test_cursor_clipping(void) DestroyWindow(window); } +static void test_window_position(void) +{ + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; + IDirect3DDevice9 *device; + MONITORINFO monitor_info; + HMONITOR monitor; + RECT window_rect; + IDirect3D9 *d3d; + HWND window; + HRESULT hr; + BOOL ret; + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + monitor = IDirect3D9_GetAdapterMonitor(d3d, adapter_idx); + ok(!!monitor, "Adapter %u: GetAdapterMonitor failed.\n", adapter_idx); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx, GetLastError()); + + window = create_window(); + device_desc.adapter_ordinal = adapter_idx; + device_desc.device_window = window; + device_desc.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + device_desc.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device, skipping tests.\n", adapter_idx); + DestroyWindow(window); + continue; + } + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + 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)); + + /* Device resets should restore the window rectangle to fit the whole monitor */ + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Adapter %u: Failed to reset device, hr %#x.\n", adapter_idx, hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + 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)); + + /* Window activation should restore the window rectangle to fit the whole monitor */ + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Adapter %u: SetForegroundWindow failed, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Adapter %u: Failed to restore window, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "Adapter %u: SetForegroundWindow failed, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + 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)); + + IDirect3DDevice9_Release(device); + DestroyWindow(window); + } + + IDirect3D9_Release(d3d); +} + START_TEST(device) { HMODULE d3d9_handle = GetModuleHandleA("d3d9.dll"); @@ -14043,6 +14124,7 @@ START_TEST(device) test_shader_validator(); test_creation_parameters(); test_cursor_clipping(); + test_window_position(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); } -- 2.25.1

2 1

[PATCH 2/6] d3d8/tests: Test window position.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 82 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b9d838e5cd4..fdec30c681f 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10168,6 +10168,87 @@ static void test_cursor_clipping(void) DestroyWindow(window); } +static void test_window_position(void) +{ + unsigned int adapter_idx, adapter_count; + struct device_desc device_desc; + IDirect3DDevice8 *device; + MONITORINFO monitor_info; + HMONITOR monitor; + RECT window_rect; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + BOOL ret; + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + monitor = IDirect3D8_GetAdapterMonitor(d3d, adapter_idx); + ok(!!monitor, "Adapter %u: GetAdapterMonitor failed.\n", adapter_idx); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, &monitor_info); + ok(ret, "Adapter %u: GetMonitorInfoW failed, error %#x.\n", adapter_idx, GetLastError()); + + window = create_window(); + device_desc.adapter_ordinal = adapter_idx; + device_desc.device_window = window; + device_desc.width = monitor_info.rcMonitor.right - monitor_info.rcMonitor.left; + device_desc.height = monitor_info.rcMonitor.bottom - monitor_info.rcMonitor.top; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device, skipping tests.\n", adapter_idx); + DestroyWindow(window); + continue; + } + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + 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)); + + /* Device resets should restore the window rectangle to fit the whole monitor */ + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Adapter %u: Failed to reset device, hr %#x.\n", adapter_idx, hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + 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)); + + /* Window activation should restore the window rectangle to fit the whole monitor */ + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "Adapter %u: SetWindowPos failed, error %#x.\n", adapter_idx, GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Adapter %u: SetForegroundWindow failed, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Adapter %u: Failed to restore window, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "Adapter %u: SetForegroundWindow failed, error %#x.\n", adapter_idx, GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "Adapter %u: GetWindowRect failed, error %#x.\n", adapter_idx, GetLastError()); + 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)); + + IDirect3DDevice8_Release(device); + DestroyWindow(window); + } + + IDirect3D8_Release(d3d); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -10287,6 +10368,7 @@ START_TEST(device) test_multi_adapter(); test_creation_parameters(); test_cursor_clipping(); + test_window_position(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); } -- 2.25.1

2 1

[PATCH 1/6] ddraw/tests: Test window position.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 62 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 248 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index f74d12d9fda..49223cde289 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13633,6 +13633,67 @@ static void test_vtbl_protection(void) DestroyWindow(window); } +static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + RECT primary_rect, window_rect; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left, + monitor_rect->top, monitor_rect->right - monitor_rect->left, + monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + flush_events(); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window to fit the whole primary monitor */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window, error %#x.\n", GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "SetForegroundWindow failed, error %#x.\n", GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + DestroyWindow(window); + IDirectDraw_Release(ddraw); + return TRUE; +} + +static void test_window_position(void) +{ + EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -13747,4 +13808,5 @@ START_TEST(ddraw1) test_d32_support(); test_cursor_clipping(); test_vtbl_protection(); + test_window_position(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index d4e681c0164..c4549d95e7c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14405,6 +14405,67 @@ done: DestroyWindow(window); } +static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + RECT primary_rect, window_rect; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left, + monitor_rect->top, monitor_rect->right - monitor_rect->left, + monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + flush_events(); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window to fit the whole primary monitor */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window, error %#x.\n", GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "SetForegroundWindow failed, error %#x.\n", GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + DestroyWindow(window); + IDirectDraw2_Release(ddraw); + return TRUE; +} + +static void test_window_position(void) +{ + EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -14525,4 +14586,5 @@ START_TEST(ddraw2) test_caps(); test_d32_support(); test_cursor_clipping(); + test_window_position(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f50fc1cb53b..09fe7e1e92b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17432,6 +17432,67 @@ done: DestroyWindow(window); } +static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + RECT primary_rect, window_rect; + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left, + monitor_rect->top, monitor_rect->right - monitor_rect->left, + monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + flush_events(); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window to fit the whole primary monitor */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window, error %#x.\n", GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "SetForegroundWindow failed, error %#x.\n", GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + DestroyWindow(window); + IDirectDraw4_Release(ddraw); + return TRUE; +} + +static void test_window_position(void) +{ + EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -17568,4 +17629,5 @@ START_TEST(ddraw4) test_d32_support(); test_surface_format_conversion_alpha(); test_cursor_clipping(); + test_window_position(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1ddd3cdb0e2..5cf197998eb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -17667,6 +17667,67 @@ done: DestroyWindow(window); } +static BOOL CALLBACK test_window_position_cb(HMONITOR monitor, HDC hdc, RECT *monitor_rect, + LPARAM lparam) +{ + RECT primary_rect, window_rect; + IDirectDraw7 *ddraw; + HWND window; + HRESULT hr; + BOOL ret; + + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + window = CreateWindowA("static", "ddraw_test", WS_POPUP | WS_VISIBLE, monitor_rect->left, + monitor_rect->top, monitor_rect->right - monitor_rect->left, + monitor_rect->bottom - monitor_rect->top, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create a window.\n"); + flush_events(); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + SetRect(&primary_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + /* Window activation should restore the window to fit the whole primary monitor */ + ret = SetWindowPos(window, 0, monitor_rect->left, monitor_rect->top, 0, 0, + SWP_NOZORDER | SWP_NOSIZE); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + flush_events(); + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "Failed to restore window, error %#x.\n", GetLastError()); + flush_events(); + ret = SetForegroundWindow(window); + ok(ret, "SetForegroundWindow failed, error %#x.\n", GetLastError()); + flush_events(); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); + ret = GetWindowRect(window, &window_rect); + ok(ret, "GetWindowRect failed, error %#x.\n", GetLastError()); + ok(EqualRect(&window_rect, &primary_rect), "Expect window rect %s, got %s.\n", + wine_dbgstr_rect(&primary_rect), wine_dbgstr_rect(&window_rect)); + + DestroyWindow(window); + IDirectDraw7_Release(ddraw); + return TRUE; +} + +static void test_window_position(void) +{ + EnumDisplayMonitors(NULL, NULL, test_window_position_cb, 0); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -17818,4 +17879,5 @@ START_TEST(ddraw7) test_surface_format_conversion_alpha(); test_compressed_surface_stretch(); test_cursor_clipping(); + test_window_position(); } -- 2.25.1

3 2

[PATCH] dxgi: Introduce helper to convert between dxgi and wined3d scanline ordering types.
by Gijs Vermeulen 11 May '20

11 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This fixes a Clang warning. dlls/dxgi/output.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 85bfed0598..5d31a0093c 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline DXGI_MODE_SCANLINE_ORDER dxgi_mode_scanline_order_from_wined3d(enum wined3d_scanline_ordering ordering) +{ + return (DXGI_MODE_SCANLINE_ORDER)ordering; +} + static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_display_mode *wined3d_mode) { mode->Width = wined3d_mode->width; @@ -30,7 +35,7 @@ static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_di mode->RefreshRate.Numerator = wined3d_mode->refresh_rate; mode->RefreshRate.Denominator = 1; mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id); - mode->ScanlineOrdering = wined3d_mode->scanline_ordering; + mode->ScanlineOrdering = dxgi_mode_scanline_order_from_wined3d(wined3d_mode->scanline_ordering); mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ } @@ -41,7 +46,7 @@ static void dxgi_mode1_from_wined3d(DXGI_MODE_DESC1 *mode, const struct wined3d_ mode->RefreshRate.Numerator = wined3d_mode->refresh_rate; mode->RefreshRate.Denominator = 1; mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id); - mode->ScanlineOrdering = wined3d_mode->scanline_ordering; + mode->ScanlineOrdering = dxgi_mode_scanline_order_from_wined3d(wined3d_mode->scanline_ordering); mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */ mode->Stereo = FALSE; /* FIXME */ } -- 2.21.1 (Apple Git-122.3)

2 1

[PATCH v2] dxgi: Search all adapters for the containing output of a swapchain.
by Zhiyi Zhang 11 May '20

11 May '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix a d3d12 test failure. Supersede 184920 dlls/dxgi/swapchain.c | 84 ++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f57183879d4..81ba50942ad 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -111,11 +111,13 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } -static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, IDXGIOutput **dxgi_output) +static HRESULT dxgi_get_output_from_window(IDXGIFactory *factory, HWND window, + IDXGIOutput **dxgi_output) { + unsigned int adapter_idx, output_idx; DXGI_OUTPUT_DESC desc; + IDXGIAdapter *adapter; IDXGIOutput *output; - unsigned int index; HMONITOR monitor; HRESULT hr; @@ -125,25 +127,32 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_INVALID_CALL; } - index = 0; - while ((hr = IDXGIAdapter_EnumOutputs(adapter, index, &output)) == S_OK) + for (adapter_idx = 0; SUCCEEDED(hr = IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + for (output_idx = 0; SUCCEEDED(hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, + &output)); ++output_idx) { - WARN("Failed to get output desc %u, hr %#x.\n", index, hr); - ++index; - continue; - } + if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + { + WARN("Adapter %u output %u: Failed to get output desc, hr %#x.\n", adapter_idx, + output_idx, hr); + IDXGIOutput_Release(output); + continue; + } - if (desc.Monitor == monitor) - { - *dxgi_output = output; - return S_OK; - } + if (desc.Monitor == monitor) + { + *dxgi_output = output; + IDXGIAdapter_Release(adapter); + return S_OK; + } - IDXGIOutput_Release(output); - ++index; + IDXGIOutput_Release(output); + } + IDXGIAdapter_Release(adapter); } + if (hr != DXGI_ERROR_NOT_FOUND) WARN("Failed to enumerate outputs, hr %#x.\n", hr); @@ -582,9 +591,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - IDXGIAdapter *adapter; - IDXGIDevice *device; - HRESULT hr; + HWND window; TRACE("iface %p, output %p.\n", iface, output); @@ -594,24 +601,14 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - if (SUCCEEDED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) + if (!swapchain->factory) { - hr = IDXGIDevice_GetAdapter(device, &adapter); - IDXGIDevice_Release(device); + ERR("Implicit swapchain does not store a reference to factory.\n"); + return E_NOINTERFACE; } - if (SUCCEEDED(hr)) - { - HWND hwnd = d3d11_swapchain_get_hwnd(swapchain); - hr = dxgi_get_output_from_window(adapter, hwnd, output); - IDXGIAdapter_Release(adapter); - } - else - { - WARN("Failed to get adapter, hr %#x.\n", hr); - } - - return hr; + window = d3d11_swapchain_get_hwnd(swapchain); + return dxgi_get_output_from_window(swapchain->factory, window, output); } static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapChain1 *iface, @@ -2423,6 +2420,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); IUnknown *device_parent; + IDXGIFactory *factory; IDXGIAdapter *adapter; HRESULT hr; @@ -2436,16 +2434,22 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh device_parent = vkd3d_get_device_parent(swapchain->device); - if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) - { - hr = dxgi_get_output_from_window(adapter, swapchain->window, output); - IDXGIAdapter_Release(adapter); - } - else + if (FAILED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) { WARN("Failed to get adapter, hr %#x.\n", hr); + return hr; } + if (FAILED(hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory))) + { + WARN("Failed to get factory, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + return hr; + } + + hr = dxgi_get_output_from_window(factory, swapchain->window, output); + IDXGIFactory_Release(factory); + IDXGIAdapter_Release(adapter); return hr; } -- 2.25.1

2 1

[v4 PATCH] dxgi: Translate DXGI_USAGE_UNORDERED_ACCESS to corresponding wined3d bind flag.
by Nikolay Sivov 11 May '20

11 May '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v4: added missing ok() test v3: using strictly level 11 device. dlls/dxgi/tests/dxgi.c | 77 +++++++++++++++++++++++++++++++++++++++++- dlls/dxgi/utils.c | 4 ++- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a9f9b71570..dd00be1e8c 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -44,6 +44,10 @@ static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECK static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *desc); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc); +static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); + static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; @@ -624,6 +628,39 @@ success: return dxgi_device; } +static IDXGIDevice *create_d3d11_device(void) +{ + static const D3D_FEATURE_LEVEL feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + }; + unsigned int feature_level_count = ARRAY_SIZE(feature_level); + IDXGIDevice *device = NULL; + ID3D11Device *d3d_device; + HRESULT hr; + + if (!pD3D11CreateDevice) + return NULL; + + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + if (FAILED(hr)) + hr = pD3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, feature_level_count, + D3D11_SDK_VERSION, &d3d_device, NULL, NULL); + + if (SUCCEEDED(hr)) + { + hr = ID3D11Device_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&device); + ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice.\n"); + ID3D11Device_Release(d3d_device); + } + + return device; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -1079,6 +1116,7 @@ static void test_check_interface_support(void) static void test_create_surface(void) { + ID3D11Texture2D *texture2d; DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; @@ -1109,6 +1147,40 @@ static void test_create_surface(void) IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* DXGI_USAGE_UNORDERED_ACCESS */ + if (!(device = create_d3d11_device())) + { + skip("Failed to create D3D11 device.\n"); + return; + } + + surface = NULL; + hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_UNORDERED_ACCESS, NULL, &surface); + ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); + + if (surface) + { + ID3D11UnorderedAccessView *uav; + ID3D11Device *d3d_device; + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture2d); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + + ID3D11Texture2D_GetDevice(texture2d, &d3d_device); + + hr = ID3D11Device_CreateUnorderedAccessView(d3d_device, (ID3D11Resource *)texture2d, NULL, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + + ID3D11Device_Release(d3d_device); + ID3D11Texture2D_Release(texture2d); + + IDXGISurface_Release(surface); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); } static void test_parents(void) @@ -6624,7 +6696,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { - HMODULE dxgi_module, d3d12_module, gdi32_module; + HMODULE dxgi_module, d3d11_module, d3d12_module, gdi32_module; BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; @@ -6639,6 +6711,9 @@ START_TEST(dxgi) pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32_module, "D3DKMTCloseAdapter"); pD3DKMTOpenAdapterFromGdiDisplayName = (void *)GetProcAddress(gdi32_module, "D3DKMTOpenAdapterFromGdiDisplayName"); + d3d11_module = LoadLibraryA("d3d11.dll"); + pD3D11CreateDevice = (void *)GetProcAddress(d3d11_module, "D3D11CreateDevice"); + registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index aece3a6af1..a32c7ee129 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -503,8 +503,10 @@ unsigned int wined3d_bind_flags_from_dxgi_usage(DXGI_USAGE dxgi_usage) wined3d_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) wined3d_bind_flags |= WINED3D_BIND_RENDER_TARGET; + if (dxgi_usage & DXGI_USAGE_UNORDERED_ACCESS) + wined3d_bind_flags |= WINED3D_BIND_UNORDERED_ACCESS; - dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_UNORDERED_ACCESS); if (dxgi_usage) FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); return wined3d_bind_flags; -- 2.26.2

2 1

[PATCH] dwrite: Set ret on unimplemented lookup in opentype_layout_apply_gsub_lookup.
by Gijs Vermeulen 11 May '20

11 May '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- This fixes a Clang warning. dlls/dwrite/opentype.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0feb2feadc..4fe3c32ff5 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4478,6 +4478,7 @@ static void opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont case GSUB_LOOKUP_LIGATURE_SUBST: case GSUB_LOOKUP_CONTEXTUAL_SUBST: case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: + ret = TRUE; WARN("Unimplemented lookup %d.\n", lookup_type); break; default: -- 2.26.2

2 1