- Wine-Devel - list.winehq.org

[PATCH 4/4] winapi_test: Add a blank line between common and specific headers.
by Serge Gautherie July 21, 2020

July 21, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/tests.dat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 10693a1..070e939 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -11,6 +11,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + wingdi.h %include @@ -472,6 +473,7 @@ basetsd.h winnt.h windef.h winbase.h + timezoneapi.h %include @@ -1054,6 +1056,7 @@ winnt.h windef.h wtypes.h guiddef.h + shellapi.h shtypes.h shlobj.h @@ -1266,6 +1269,7 @@ Unit tests for data structure packing winnt.h windef.h guiddef.h + urlmon.h %include @@ -1323,6 +1327,7 @@ basetsd.h winnt.h windef.h winbase.h + wingdi.h winuser.h @@ -1738,6 +1743,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h + mmsystem.h digitalv.h -- 2.10.0.windows.1

2 1

[PATCH 3/4] winapi_test: Remove useless winbase.h for wininet test.
by Serge Gautherie July 21, 2020

July 21, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/tests.dat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 84296ac..10693a1 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1596,7 +1596,7 @@ Unit tests for data structure packing basetsd.h winnt.h windef.h -winbase.h + wininet.h %include -- 2.10.0.windows.1

2 1

[PATCH 2/4] winapi_test: Remove useless common headers for shlwapi test.
by Serge Gautherie July 21, 2020

July 21, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to b3da4abc5771a7542409412c41b3356255f248b2. --- tools/winapi/tests.dat | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 67d853a..84296ac 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -1230,10 +1230,8 @@ Unit tests for data structure packing %header -basetsd.h winnt.h -windef.h -wtypes.h + shlwapi.h %include -- 2.10.0.windows.1

2 1

[PATCH 1/4] winapi_test: Add common headers for rpcrt4 test.
by Serge Gautherie July 21, 2020

July 21, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to 02236f06a813a42a08fda5e40a97ba07fae9a712. --- tools/winapi/tests.dat | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 57a65e1..67d853a 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -928,6 +928,10 @@ Unit tests for data structure packing %header +basetsd.h +winnt.h +windef.h + rpc.h rpcdce.h rpcdcep.h -- 2.10.0.windows.1

2 1

[PATCH] winapi_test: Fix a verifying loop on headers, which never finds any type name.
by Serge Gautherie July 21, 2020

July 21, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- tools/winapi/winapi_test | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 48c29f8..784b4c4 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -859,8 +859,7 @@ foreach my $test_dir (@test_dirs) { foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { $output->prefix("$header: "); - $header =~ s%^include/%%; - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; + my $type_name2type = $file2types{$pointer_size}{$header}; foreach my $_type_name (sort(keys(%$type_name2type))) { my $type_name = $_type_name; @@ -874,10 +873,10 @@ $output->prefix("$winapi_dir/tests.dat: "); foreach my $type_name (sort(keys(%type_names_used))) { my $found = 0; foreach my $header (sort(keys(%{$file2types{$pointer_size}}))) { - my $type_name2type = $file2types{$pointer_size}{"include/$header"}; - if (exists($type_name2type{$type_name})) { - $found = 1; - } + if (exists($file2types{$pointer_size}{$header}{$type_name})) { + $found = 1; + last; + } } if (!$found) { -- 2.10.0.windows.1

2 1

[PATCH] winapi_test: Remove leftover PUUID_VECTOR from tests.dat.
by Serge Gautherie July 21, 2020

July 21, 2020

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- Addendum to 02236f06a813a42a08fda5e40a97ba07fae9a712. --- tools/winapi/tests.dat | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 3f470d4..659fc41 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -999,7 +999,6 @@ PRPC_STUB_FUNCTION PRPC_SYNTAX_IDENTIFIER PSCONTEXT_QUEUE PXMIT_ROUTINE_QUINTUPLE -PUUID_VECTOR RPC_AUTH_IDENTITY_HANDLE RPC_AUTH_KEY_RETRIEVAL_FN RPC_AUTHZ_HANDLE -- 2.10.0.windows.1

2 1

[PATCH 2/5] user32: Trace EnumDisplaySettingsExW() results.
by Zhiyi Zhang July 21, 2020

July 21, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 61cd06f6911..14d3778a535 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3440,8 +3440,9 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, LPDEVMODEW lpDevMode, DWORD dwFlags) { WCHAR primary_adapter[CCHDEVICENAME]; + BOOL ret; - TRACE("%s %u %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); + TRACE("%s %#x %p %#x\n", wine_dbgstr_w(lpszDeviceName), iModeNum, lpDevMode, dwFlags); if (!lpszDeviceName) { @@ -3451,7 +3452,16 @@ BOOL WINAPI EnumDisplaySettingsExW(LPCWSTR lpszDeviceName, DWORD iModeNum, lpszDeviceName = primary_adapter; } - return USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); + ret = USER_Driver->pEnumDisplaySettingsEx(lpszDeviceName, iModeNum, lpDevMode, dwFlags); + if (ret) + TRACE("device:%s mode index:%#x position:(%d,%d) resolution:%ux%u frequency:%uHz " + "depth:%ubits orientation:%#x.\n", wine_dbgstr_w(lpszDeviceName), iModeNum, + lpDevMode->u1.s2.dmPosition.x, lpDevMode->u1.s2.dmPosition.y, lpDevMode->dmPelsWidth, + lpDevMode->dmPelsHeight, lpDevMode->dmDisplayFrequency, lpDevMode->dmBitsPerPel, + lpDevMode->u1.s2.dmDisplayOrientation); + else + WARN("Failed to query %s display settings.\n", wine_dbgstr_w(lpszDeviceName)); + return ret; } -- 2.25.1

2 1

[PATCH 1/5] user32: Trace ChangeDisplaySettingsExW() results.
by Zhiyi Zhang July 21, 2020

July 21, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6c0c3e76db7..61cd06f6911 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3310,12 +3310,18 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND WCHAR primary_adapter[CCHDEVICENAME]; BOOL def_mode = TRUE; DEVMODEW dm; + LONG ret; TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); TRACE("flags=%s\n", _CDS_flags(flags)); if (!devname && !devmode) - return USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + { + ret = USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Restoring all displays to their registry settings returned %d.\n", ret); + return ret; + } if (!devname && devmode) { @@ -3359,7 +3365,10 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND return DISP_CHANGE_BADMODE; } - return USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); + ret = USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Changing %s display settings returned %d.\n", wine_dbgstr_w(devname), ret); + return ret; } -- 2.25.1

2 1

[PATCH 4/5] user32/tests: Add more ChangeDisplaySettings() tests.
by Zhiyi Zhang July 21, 2020

July 21, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 63 ++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5d7069591b7..fe763e46b48 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -351,7 +351,7 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te static void test_ChangeDisplaySettingsEx(void) { DPI_AWARENESS_CONTEXT context = NULL; - UINT primary, device, side, mode; + UINT primary, device, test, mode; UINT device_size, device_count; struct device_info *devices; INT count, old_count; @@ -362,6 +362,21 @@ static void test_ChangeDisplaySettingsEx(void) LONG res; int i; + /* Test invalid device names */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + + res = ChangeDisplaySettingsExA("invalid", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + + res = ChangeDisplaySettingsExA("\\\\.\\DISPLAY0", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + + res = ChangeDisplaySettingsExA("\\\\.\\DISPLAY1\\Monitor0", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + /* Test dmDriverExtra */ memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -795,43 +810,63 @@ static void test_ChangeDisplaySettingsEx(void) expect_dm(dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */ - for (side = 0; side < 4; ++side) + for (test = 0; test < 8; ++test) { - switch (side) + switch (test) { - /* Bottom */ + /* Bottom side with x offset */ case 0: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth / 2; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; + break; + /* Left side with y offset */ + case 1: + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight / 2; + break; + /* Top side with x offset */ + case 2: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth / 2; + dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; + break; + /* Right side with y offset */ + case 3: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight / 2; + break; + /* Bottom side with the same x */ + case 4: dm2.dmPosition.x = dm.dmPosition.x; dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; break; - /* Left */ - case 1: + /* Left side with the same y */ + case 5: dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; dm2.dmPosition.y = dm.dmPosition.y; break; - /* Top */ - case 2: + /* Top side with the same x */ + case 6: dm2.dmPosition.x = dm.dmPosition.x; dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; break; - /* Right */ - case 3: + /* Right side with the same y */ + case 7: dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; dm2.dmPosition.y = dm.dmPosition.y; break; } res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s side %d returned unexpected %d\n", - devices[1].name, side, res); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s test %d returned unexpected %d\n", + devices[1].name, test, res); if (res != DISP_CHANGE_SUCCESSFUL) { - win_skip("ChangeDisplaySettingsExA %s side %d returned unexpected %d.\n", devices[1].name, side, res); + win_skip("ChangeDisplaySettingsExA %s test %d returned unexpected %d.\n", devices[1].name, test, res); continue; } flush_events(); - expect_dm(dm2, devices[1].name, side); + expect_dm(dm2, devices[1].name, test); } /* Test automatic position update when other adapters change resolution */ -- 2.25.1

1 0

[PATCH 3/5] user32/tests: Test that EnumDisplayMonitors() doesn't set error codes.
by Zhiyi Zhang July 21, 2020

July 21, 2020

ERROR_INVALID_HANDLE or ERROR_INVALID_MONITOR_HANDLE is from GetMonitorInfo(), not EnumDisplayMonitor(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 6e8c9a275d7..5d7069591b7 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1199,6 +1199,7 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor { MONITORINFOEXA mi, mi2; DEVMODEA old_dm, dm; + DWORD error; INT count; LONG ret; @@ -1235,13 +1236,18 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor if (GetSystemMetrics(SM_CMONITORS) != count - 1) { skip("Failed to detach %s.\n", mi.szDevice); + SetLastError(0xdeadbeef); return TRUE; } /* The monitor handle should be invalid now */ mi2.cbSize = sizeof(mi2); + SetLastError(0xdeadbeef); ret = GetMonitorInfoA(monitor, (MONITORINFO *)&mi2); ok(!ret, "GetMonitorInfoA succeeded.\n"); + error = GetLastError(); + ok(error == ERROR_INVALID_MONITOR_HANDLE || error == ERROR_INVALID_HANDLE, + "Expected error %#x, got %#x.\n", ERROR_INVALID_MONITOR_HANDLE, error); /* Restore the original display settings */ ret = ChangeDisplaySettingsExA(mi.szDevice, &old_dm, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, @@ -1253,6 +1259,7 @@ static BOOL CALLBACK test_EnumDisplayMonitors_invalid_handle_cb(HMONITOR monitor mi.szDevice, ret); } + SetLastError(0xdeadbeef); return TRUE; } @@ -1276,16 +1283,10 @@ static void test_EnumDisplayMonitors(void) 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); - } + ok(error == 0xdeadbeef, "Expected error %#x, got %#x.\n", 0xdeadbeef, error); } static void test_QueryDisplayConfig_result(UINT32 flags, -- 2.25.1

1 0