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

Zhiyi Zhang : dxgi/tests: Do not run test_multi_adapter() in parallel with other tests.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: a304bfa97dfb8cddbb3c14efcd0e4a5283531b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a304bfa97dfb8cddbb3c14ef… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:06 2020 +0800 dxgi/tests: Do not run test_multi_adapter() in parallel with other tests. test_multi_adapter() tests detaching non-primary outputs, interferencing other tests when non-primary outputs are enumerated. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 4ca0b952f8..325a0bf07a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6505,7 +6505,6 @@ START_TEST(dxgi) queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); - queue_test(test_multi_adapter); queue_test(test_factory_check_feature_support); run_queued_tests(); @@ -6515,6 +6514,7 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); + test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles();

1 0

Zhiyi Zhang : dxgi/tests: Test IDXGISwapChain_ResizeTarget() with all outputs.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 9c7635c4ddf09c1941041ae815405e05d1f372fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c7635c4ddf09c1941041ae8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:19 2020 +0800 dxgi/tests: Test IDXGISwapChain_ResizeTarget() with all outputs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 170 ++++++++++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 72 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9c7635c4ddf09c194104…

1 0

Zhiyi Zhang : wined3d: Move device window to the correct output in wined3d_swapchain_state_resize_target().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 7ee8674ed27474d2559dcd06f3e3de526e03fe49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ee8674ed27474d2559dcd06… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:46:30 2020 +0800 wined3d: Move device window to the correct output in wined3d_swapchain_state_resize_target(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 86f8277a27..dd0419412a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1472,7 +1472,9 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta struct wined3d_output *output, const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; RECT original_window_rect, window_rect; + int x, y, width, height; HWND window; HRESULT hr; @@ -1488,37 +1490,42 @@ HRESULT CDECL wined3d_swapchain_state_resize_target(struct wined3d_swapchain_sta AdjustWindowRectEx(&window_rect, GetWindowLongW(window, GWL_STYLE), FALSE, GetWindowLongW(window, GWL_EXSTYLE)); - SetRect(&window_rect, 0, 0, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top); GetWindowRect(window, &original_window_rect); - OffsetRect(&window_rect, original_window_rect.left, original_window_rect.top); + + x = original_window_rect.left; + y = original_window_rect.top; + width = window_rect.right - window_rect.left; + height = window_rect.bottom - window_rect.top; } - else if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) + else { - actual_mode = *mode; - if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + if (state->desc.flags & WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH) { - wined3d_mutex_unlock(); - return hr; + actual_mode = *mode; + if (FAILED(hr = wined3d_swapchain_state_set_display_mode(state, output, &actual_mode))) + { + ERR("Failed to set display mode, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); - } - else - { - if (FAILED(hr = wined3d_output_get_display_mode(output, &actual_mode, NULL))) + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) { - ERR("Failed to get display mode, hr %#x.\n", hr); + ERR("Failed to get output description, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } - SetRect(&window_rect, 0, 0, actual_mode.width, actual_mode.height); + x = output_desc.desktop_rect.left; + y = output_desc.desktop_rect.top; + width = output_desc.desktop_rect.right - output_desc.desktop_rect.left; + height = output_desc.desktop_rect.bottom - output_desc.desktop_rect.top; } wined3d_mutex_unlock(); - MoveWindow(window, window_rect.left, window_rect.top, - window_rect.right - window_rect.left, window_rect.bottom - window_rect.top, TRUE); + MoveWindow(window, x, y, width, height, TRUE); return WINED3D_OK; }

1 0

Jacek Caban : wbemprox: Use __cpuid from intrin.h.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 8b6c86eb824d1f529dab7bbbbd09907f41c182d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6c86eb824d1f529dab7bbb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 5 02:52:56 2020 +0200 wbemprox: Use __cpuid from intrin.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 55 ++++++++++++------------------------------------- 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 24badb7bf9..5d39984d4c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -21,6 +21,7 @@ #define NONAMELESSSTRUCT #include <stdarg.h> +#include <intrin.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -3038,46 +3039,14 @@ done: return status; } -extern void do_cpuid( unsigned int ax, unsigned int *p ); -#if defined(_MSC_VER) -void do_cpuid( unsigned int ax, unsigned int *p ) +void do_cpuid( unsigned int ax, int *p ) { +#if defined(__i386__) || defined(__x86_64__) __cpuid( p, ax ); -} -#elif defined(__i386__) -__ASM_GLOBAL_FUNC( do_cpuid, - "pushl %esi\n\t" - "pushl %ebx\n\t" - "movl 12(%esp),%eax\n\t" - "movl 16(%esp),%esi\n\t" - "cpuid\n\t" - "movl %eax,(%esi)\n\t" - "movl %ebx,4(%esi)\n\t" - "movl %ecx,8(%esi)\n\t" - "movl %edx,12(%esi)\n\t" - "popl %ebx\n\t" - "popl %esi\n\t" - "ret" ) -#elif defined(__x86_64__) -__ASM_GLOBAL_FUNC( do_cpuid, - "pushq %rsi\n\t" - "pushq %rbx\n\t" - "movq %rcx,%rax\n\t" - "movq %rdx,%rsi\n\t" - "cpuid\n\t" - "movl %eax,(%rsi)\n\t" - "movl %ebx,4(%rsi)\n\t" - "movl %ecx,8(%rsi)\n\t" - "movl %edx,12(%rsi)\n\t" - "popq %rbx\n\t" - "popq %rsi\n\t" - "ret" ) #else -void do_cpuid( unsigned int ax, unsigned int *p ) -{ FIXME("\n"); -} #endif +} static unsigned int get_processor_model( unsigned int reg0, unsigned int *stepping, unsigned int *family ) { @@ -3093,7 +3062,7 @@ static unsigned int get_processor_model( unsigned int reg0, unsigned int *steppi *stepping = reg0 & 0x0f; return model; } -static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) +static void regs_to_str( int *regs, unsigned int len, WCHAR *buffer ) { unsigned int i; unsigned char *p = (unsigned char *)regs; @@ -3103,7 +3072,7 @@ static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) } static void get_processor_manufacturer( WCHAR *manufacturer, UINT len ) { - unsigned int tmp, regs[4] = {0, 0, 0, 0}; + int tmp, regs[4] = {0, 0, 0, 0}; do_cpuid( 0, regs ); tmp = regs[2]; /* swap edx and ecx */ @@ -3123,7 +3092,8 @@ static void get_processor_caption( WCHAR *caption, UINT len ) { const WCHAR *arch; WCHAR manufacturer[13]; - unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; + int regs[4] = {0, 0, 0, 0}; + unsigned int family, model, stepping; get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); if (!wcscmp( get_osarchitecture(), L"32-bit" )) arch = L"x86"; @@ -3137,7 +3107,8 @@ static void get_processor_caption( WCHAR *caption, UINT len ) } static void get_processor_version( WCHAR *version, UINT len ) { - unsigned int regs[4] = {0, 0, 0, 0}, model, stepping; + int regs[4] = {0, 0, 0, 0}; + unsigned int model, stepping; do_cpuid( 1, regs ); @@ -3146,20 +3117,20 @@ static void get_processor_version( WCHAR *version, UINT len ) } static UINT16 get_processor_revision(void) { - unsigned int regs[4] = {0, 0, 0, 0}; + int regs[4] = {0, 0, 0, 0}; do_cpuid( 1, regs ); return regs[0]; } static void get_processor_id( WCHAR *processor_id, UINT len ) { - unsigned int regs[4] = {0, 0, 0, 0}; + int regs[4] = {0, 0, 0, 0}; do_cpuid( 1, regs ); swprintf( processor_id, len, L"%08X%08X", regs[3], regs[0] ); } static void get_processor_name( WCHAR *name ) { - unsigned int regs[4] = {0, 0, 0, 0}; + int regs[4] = {0, 0, 0, 0}; int i; do_cpuid( 0x80000000, regs );

1 0

Zhiyi Zhang : user32/tests: Flush messages after mode changes.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 4369aaae5705092324576b6295799f37c60e6615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4369aaae5705092324576b62… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:07 2020 +0800 user32/tests: Flush messages after mode changes. test_ChangeDisplaySettingsEx() can generate so many posted messages for display change events that USERPostMessageLimit is reached and ERROR_NOT_ENOUGH_QUOTA is returned for PostMessage(). Call flush_events() after mode changes to limit message post rate. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48586 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 59 +++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index e669b2b82e..080f040c3f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -46,6 +46,23 @@ static void init_function_pointers(void) #undef GET_PROC } +static void flush_events(void) +{ + int diff = 1000; + DWORD time; + MSG msg; + + time = GetTickCount() + diff; + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, 200, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, LPARAM lparam) { @@ -290,12 +307,6 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te dm.dmSize = sizeof(dm); SetLastError(0xdeadbeef); ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); - /* On win10 TestBot, after many resolution changes, EnumDisplaySettingsA fails sometimes for unknown reasons */ - if (!ret) - { - win_skip_(__FILE__, line)("EnumDisplaySettingsA failed.\n"); - return; - } ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); ok(get_primary_adapter(primary_adapter), "Failed to get primary adapter name.\n"); @@ -649,6 +660,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm, devices[device].name, mode); } @@ -662,14 +674,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", - devices[device].name, GetLastError()); - if (!res) - { - win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - continue; - } + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); position.x = dm.dmPosition.x + dm.dmPelsWidth; } @@ -679,13 +684,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - if (!res) - { - win_skip("EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); - continue; - } + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[device].name, GetLastError()); /* Find a mode that's different from the current mode */ memset(&dm2, 0, sizeof(dm2)); @@ -714,6 +713,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm, devices[device].name, 0); } @@ -744,8 +744,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); res = EnumDisplaySettingsA(devices[0].name, ENUM_CURRENT_SETTINGS, &dm); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[0].name, GetLastError()); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[0].name, GetLastError()); if (res) { @@ -753,8 +752,7 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); } if (res) @@ -769,9 +767,8 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x || broken(!res), "Expect position change not applied.\n"); + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x, "Expect position change not applied.\n"); /* Test position with extra space. The extra space will be removed */ dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth - dm2.dmPelsWidth / 2; @@ -818,6 +815,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } + flush_events(); expect_dm(dm2, devices[1].name, side); } @@ -841,9 +839,8 @@ static void test_ChangeDisplaySettingsEx(void) memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); - /* After many resolution changes, EnumDisplaySettingsA may fail on win10 TestBot */ - ok(res || broken(!res), "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth || broken(!res), "Expect dmPosition.x %d, got %d\n", + ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); + todo_wine ok(dm2.dmPosition.x == dm.dmPelsWidth, "Expect dmPosition.x %d, got %d\n", dm.dmPelsWidth, dm2.dmPosition.x); } else

1 0

Zhiyi Zhang : user32/tests: Fix a ChangeDisplaySettings() test.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 1bb2b160424a14a1162b6ae3429e49693150f406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb2b160424a14a1162b6ae3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:19 2020 +0800 user32/tests: Fix a ChangeDisplaySettings() test. Overlapped monitor rectangles should be automatically adjusted to avoid overlaps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 080f040c3f..05e70c4b62 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -757,26 +757,35 @@ static void test_ChangeDisplaySettingsEx(void) if (res) { + /* The secondary adapter should be to the right of the primary adapter */ + todo_wine ok(dm2.dmPosition.x == dm.dmPosition.x + dm.dmPelsWidth, + "Expected dm2.dmPosition.x %d, got %d.\n", dm.dmPosition.x + dm.dmPelsWidth, + dm2.dmPosition.x); + ok(dm2.dmPosition.y == dm.dmPosition.y, "Expected dm2.dmPosition.y %d, got %d.\n", + dm.dmPosition.y, dm2.dmPosition.y); + /* Test position conflict */ - dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth + 1; dm2.dmPosition.y = dm.dmPosition.y; res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); - /* Position is not changed even if ChangeDisplaySettingsExA returned DISP_CHANGE_SUCCESSFUL */ + /* Position is changed and automatically moved */ memset(&dm2, 0, sizeof(dm2)); dm2.dmSize = sizeof(dm2); res = EnumDisplaySettingsA(devices[1].name, ENUM_CURRENT_SETTINGS, &dm2); ok(res, "EnumDisplaySettingsA %s failed, error %#x\n", devices[1].name, GetLastError()); - todo_wine ok(dm2.dmPosition.x != dm.dmPosition.x, "Expect position change not applied.\n"); + todo_wine ok((dm2.dmPosition.x == dm.dmPosition.x - dm2.dmPelsWidth), + "Expected dmPosition.x %d, got %d.\n", dm.dmPosition.x - dm2.dmPelsWidth, + dm2.dmPosition.x); /* Test position with extra space. The extra space will be removed */ - dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth - dm2.dmPelsWidth / 2; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth + 1; dm2.dmPosition.y = dm.dmPosition.y; res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); - dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; expect_dm(dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */

1 0

Zhiyi Zhang : user32/tests: Test EnumDisplayMonitors().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 065690be32e4b72fdf9418b82c2f1b02107abced URL: https://source.winehq.org/git/wine.git/?a=commit;h=065690be32e4b72fdf9418b8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:30 2020 +0800 user32/tests: Test EnumDisplayMonitors(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 116 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 05e70c4b62..63cbe5067c 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1154,11 +1154,127 @@ static void test_display_config(void) ok((modes == 0 || modes == 100) && paths == 0, "got %u, %u\n", modes, paths); } +static BOOL CALLBACK test_EnumDisplayMonitors_normal_cb(HMONITOR monitor, HDC hdc, LPRECT rect, + LPARAM lparam) +{ + MONITORINFO mi; + LONG ret; + + mi.cbSize = sizeof(mi); + ret = GetMonitorInfoA(monitor, &mi); + ok(ret, "GetMonitorInfoA failed, error %#x.\n", GetLastError()); + ok(EqualRect(rect, &mi.rcMonitor), "Expected rect %s, got %s.\n", + wine_dbgstr_rect(&mi.rcMonitor), wine_dbgstr_rect(rect)); + + return TRUE; +} + +static BOOL CALLBACK test_EnumDisplayMonitors_return_false_cb(HMONITOR monitor, HDC hdc, + LPRECT rect, LPARAM lparam) +{ + return FALSE; +} + +static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor, HDC hdc, + LPRECT rect, LPARAM lparam) +{ + MONITORINFOEXA mi, mi2; + DEVMODEA old_dm, dm; + INT count; + LONG ret; + + mi.cbSize = sizeof(mi); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi); + ok(ret, "GetMonitorInfoA failed, error %#x.\n", GetLastError()); + + /* Test that monitor handle is invalid after the monitor is detached */ + if (!(mi.dwFlags & MONITORINFOF_PRIMARY)) + { + count = GetSystemMetrics(SM_CMONITORS); + + /* Save current display settings */ + memset(&old_dm, 0, sizeof(old_dm)); + old_dm.dmSize = sizeof(old_dm); + ret = EnumDisplaySettingsA(mi.szDevice, ENUM_CURRENT_SETTINGS, &old_dm); + ok(ret, "EnumDisplaySettingsA %s failed, error %#x.\n", mi.szDevice, GetLastError()); + + /* Detach monitor */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + dm.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + dm.dmPosition.x = mi.rcMonitor.left; + dm.dmPosition.y = mi.rcMonitor.top; + ret = ChangeDisplaySettingsExA(mi.szDevice, &dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, + NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + ret = ChangeDisplaySettingsExA(mi.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + + /* Check if it's really detached */ + if (GetSystemMetrics(SM_CMONITORS) != count - 1) + { + skip("Failed to detach %s.\n", mi.szDevice); + return TRUE; + } + + /* The monitor handle should be invalid now */ + mi2.cbSize = sizeof(mi2); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi2); + ok(!ret, "GetMonitorInfoA succeeded.\n"); + + /* Restore the original display settings */ + ret = ChangeDisplaySettingsExA(mi.szDevice, &old_dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, + NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + ret = ChangeDisplaySettingsExA(mi.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d.\n", + mi.szDevice, ret); + } + + return TRUE; +} + +static void test_EnumDisplayMonitors(void) +{ + DWORD error; + INT count; + BOOL ret; + + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_normal_cb, 0); + ok(ret, "EnumDisplayMonitors failed, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_return_false_cb, 0); + error = GetLastError(); + ok(!ret, "EnumDisplayMonitors succeeded.\n"); + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); + + count = GetSystemMetrics(SM_CMONITORS); + SetLastError(0xdeadbeef); + ret = EnumDisplayMonitors(NULL, NULL, test_EnumDisplayMonitors_invalid_handle_cb, 0); + error = GetLastError(); + if (count >= 2) + { + todo_wine ok(!ret, "EnumDisplayMonitors succeeded.\n"); + todo_wine ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE, + "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error); + } + else + { + ok(ret, "EnumDisplayMonitors failed.\n"); + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); + } +} + START_TEST(monitor) { init_function_pointers(); test_enumdisplaydevices(); test_ChangeDisplaySettingsEx(); + test_EnumDisplayMonitors(); test_monitors(); test_work_area(); test_display_config();

1 0

Zhiyi Zhang : user32: Leave critical section before calling callbacks in EnumDisplayMonitors().
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 449ca2fbf9e44a40ff2cc6eedada8dd2f94c7adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=449ca2fbf9e44a40ff2cc6ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue May 5 20:30:39 2020 +0800 user32: Leave critical section before calling callbacks in EnumDisplayMonitors(). Previously, callbacks were called with a critical section held. It was intended that monitor handles passed to callbacks should always be valid. But it created a deadlock condition when callbacks call other functions which try to grab the critical section using a different thread. Tests also show that a monitor handle can be invalid after a display change. So do not hold the critical section when calling callbacks. Monitor handles will be checked when passed to GetMonitorInfo(), which is the sole function that consumes HMONITORs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index ab386a074e..043742a9bf 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -4126,28 +4126,34 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { - RECT default_rect = {0, 0, 640, 480}; - DWORD i; + RECT monitor_rect; + DWORD i = 0; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); if (update_monitor_cache()) { - EnterCriticalSection( &monitors_section ); - for (i = 0; i < monitor_count; i++) + while (TRUE) { - if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitors[i].rcMonitor, lp )) + EnterCriticalSection( &monitors_section ); + if (i >= monitor_count) { LeaveCriticalSection( &monitors_section ); - return FALSE; + return TRUE; } + monitor_rect = monitors[i].rcMonitor; + LeaveCriticalSection( &monitors_section ); + + if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitor_rect, lp )) + return FALSE; + + ++i; } - LeaveCriticalSection( &monitors_section ); - return TRUE; } /* Fallback to report one monitor if using SetupAPI failed */ - if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + SetRect( &monitor_rect, 0, 0, 640, 480 ); + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &monitor_rect, lp )) return FALSE; return TRUE; }

1 0

Brendan Shanks : include: Add additional DISPLAYCONFIG defines.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 6396546b0aec8cd0f7f05f5a375a2b6137372820 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6396546b0aec8cd0f7f05f5a… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:27 2020 -0700 include: Add additional DISPLAYCONFIG defines. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index 0a456f8230..de028f5212 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3293,6 +3293,9 @@ typedef enum { DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_BASE_TYPE = 6, DISPLAYCONFIG_DEVICE_INFO_GET_SUPPORT_VIRTUAL_RESOLUTION = 7, DISPLAYCONFIG_DEVICE_INFO_SET_SUPPORT_VIRTUAL_RESOLUTION = 8, + DISPLAYCONFIG_DEVICE_INFO_GET_ADVANCED_COLOR_INFO = 9, + DISPLAYCONFIG_DEVICE_INFO_SET_ADVANCED_COLOR_STATE = 10, + DISPLAYCONFIG_DEVICE_INFO_GET_SDR_WHITE_LEVEL = 11, DISPLAYCONFIG_DEVICE_INFO_FORCE_UINT32 = 0xffffffff } DISPLAYCONFIG_DEVICE_INFO_TYPE; @@ -3429,6 +3432,16 @@ typedef enum DISPLAYCONFIG_OUTPUT_TECHNOLOGY_FORCE_UINT32 = (int) 0xffffffff } DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY; +typedef enum +{ + DISPLAYCONFIG_COLOR_ENCODING_RGB = 0, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR444 = 1, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR422 = 2, + DISPLAYCONFIG_COLOR_ENCODING_YCBCR420 = 3, + DISPLAYCONFIG_COLOR_ENCODING_INTENSITY = 4, + DISPLAYCONFIG_COLOR_ENCODING_FORCE_UINT32 = 0xffffffff +} DISPLAYCONFIG_COLOR_ENCODING; + typedef struct DISPLAYCONFIG_2DREGION { UINT32 cx; @@ -3525,6 +3538,105 @@ typedef struct DISPLAYCONFIG_MODE_INFO } DUMMYUNIONNAME; } DISPLAYCONFIG_MODE_INFO; +typedef struct DISPLAYCONFIG_SOURCE_DEVICE_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + WCHAR viewGdiDeviceName[CCHDEVICENAME]; +} DISPLAYCONFIG_SOURCE_DEVICE_NAME; + +typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS { + union { + struct { + UINT32 friendlyNameFromEdid :1; + UINT32 friendlyNameForced :1; + UINT32 edidIdsValid :1; + UINT32 reserved :29; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS; + +typedef struct DISPLAYCONFIG_TARGET_DEVICE_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + DISPLAYCONFIG_TARGET_DEVICE_NAME_FLAGS flags; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY outputTechnology; + UINT16 edidManufactureId; + UINT16 edidProductCodeId; + UINT32 connectorInstance; + WCHAR monitorFriendlyDeviceName[64]; + WCHAR monitorDevicePath[128]; +} DISPLAYCONFIG_TARGET_DEVICE_NAME; + +typedef struct DISPLAYCONFIG_TARGET_PREFERRED_MODE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + UINT32 width; + UINT32 height; + DISPLAYCONFIG_TARGET_MODE targetMode; +} DISPLAYCONFIG_TARGET_PREFERRED_MODE; + +typedef struct DISPLAYCONFIG_ADAPTER_NAME { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + WCHAR adapterDevicePath[128]; +} DISPLAYCONFIG_ADAPTER_NAME; + +typedef struct DISPLAYCONFIG_SET_TARGET_PERSISTENCE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 bootPersistenceOn :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SET_TARGET_PERSISTENCE; + +typedef struct DISPLAYCONFIG_TARGET_BASE_TYPE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY baseOutputTechnology; +} DISPLAYCONFIG_TARGET_BASE_TYPE; + +typedef struct DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 disableMonitorVirtualResolution :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SUPPORT_VIRTUAL_RESOLUTION; + +typedef struct DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 advancedColorSupported :1; + UINT32 advancedColorEnabled :1; + UINT32 wideColorEnforced :1; + UINT32 advancedColorForceDisabled :1; + UINT32 reserved :28; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; + DISPLAYCONFIG_COLOR_ENCODING colorEncoding; + UINT32 bitsPerColorChannel; +} DISPLAYCONFIG_GET_ADVANCED_COLOR_INFO; + +typedef struct DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + union { + struct { + UINT32 enableAdvancedColor :1; + UINT32 reserved :31; + } DUMMYSTRUCTNAME; + UINT32 value; + } DUMMYUNIONNAME; +} DISPLAYCONFIG_SET_ADVANCED_COLOR_STATE; + +typedef struct DISPLAYCONFIG_SDR_WHITE_LEVEL { + DISPLAYCONFIG_DEVICE_INFO_HEADER header; + ULONG SDRWhiteLevel; +} DISPLAYCONFIG_SDR_WHITE_LEVEL; + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002

1 0

Brendan Shanks : user32: Move DisplayConfig stubs together into sysparams.c.
by Alexandre Julliard 05 May '20

05 May '20

Module: wine Branch: master Commit: 91cf6d716e09976ac1667f33499930d367c7479d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91cf6d716e09976ac1667f33… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 4 18:08:28 2020 -0700 user32: Move DisplayConfig stubs together into sysparams.c. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 26 -------------------------- dlls/user32/sysparams.c | 44 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bed5812a47..6e1f60612b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -240,17 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; } -/*********************************************************************** - * QueryDisplayConfig (USER32.@) - */ -LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, - UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, - DISPLAYCONFIG_TOPOLOGY_ID *topologyid) -{ - FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); - return ERROR_CALL_NOT_IMPLEMENTED; -} - /*********************************************************************** * RegisterSystemThread (USER32.@) */ @@ -545,21 +534,6 @@ BOOL WINAPI IsWindowRedirectedForPrint( HWND hwnd ) return FALSE; } -/********************************************************************** - * GetDisplayConfigBufferSizes [USER32.@] - */ -LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) -{ - FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); - - if (!num_path_info || !num_mode_info) - return ERROR_INVALID_PARAMETER; - - *num_path_info = 0; - *num_mode_info = 0; - return ERROR_NOT_SUPPORTED; -} - /********************************************************************** * RegisterPointerDeviceNotifications [USER32.@] */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 043742a9bf..c43720eca8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3345,15 +3345,6 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND } -/*********************************************************************** - * DisplayConfigGetDeviceInfo (USER32.@) - */ -LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) -{ - FIXME("stub: %p\n", packet); - return ERROR_NOT_SUPPORTED; -} - /*********************************************************************** * EnumDisplaySettingsW (USER32.@) * @@ -4494,3 +4485,38 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) { return TRUE; } + +/********************************************************************** + * GetDisplayConfigBufferSizes (USER32.@) + */ +LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) +{ + FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); + + if (!num_path_info || !num_mode_info) + return ERROR_INVALID_PARAMETER; + + *num_path_info = 0; + *num_mode_info = 0; + return ERROR_NOT_SUPPORTED; +} + +/*********************************************************************** + * QueryDisplayConfig (USER32.@) + */ +LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, + UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, + DISPLAYCONFIG_TOPOLOGY_ID *topologyid) +{ + FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DisplayConfigGetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) +{ + FIXME("stub: %p\n", packet); + return ERROR_NOT_SUPPORTED; +}

1 0