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

[PATCH 05/10 v2] msvcrt: Copy wcslen implementation from ntdll.
by Piotr Caban 21 Jul '20

21 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[PATCH 04/10 v2] msvcrt: Don't use get_char_typeW in _iswctype_l.
by Piotr Caban 21 Jul '20

21 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 14 ++++++++++++-- dlls/ucrtbase/tests/misc.c | 10 ++++------ 3 files changed, 17 insertions(+), 8 deletions(-)

1 0

[PATCH 03/10 v2] msvcrt: Export _pwctype table.
by Piotr Caban 21 Jul '20

21 Jul '20

1 0

[PATCH 02/10 v2] msvcrt: Add _wctype table.
by Piotr Caban 21 Jul '20

21 Jul '20

1 0

[PATCH 01/10 v2] comctl32: Fix non printable characters handling in SB_SETTEXT.
by Piotr Caban 21 Jul '20

21 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix comctl32 test failure, the test was failing because of a difference between msvcrt.dll and ucrtbase.dll, it turns out that iswprint should not be used at all - make the _wctype table compatible with all versions of C runtime dlls/comctl32/status.c | 2 +- dlls/comctl32/tests/status.c | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)

1 0

[PATCH 5/5] user32: Check invalid device names in ChangeDisplaySettingsExW().
by Zhiyi Zhang 21 Jul '20

21 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 16 +++++++++++++++- dlls/user32/tests/monitor.c | 6 +++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 14d3778a535..d4462e589e8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3307,7 +3307,8 @@ static BOOL is_detached_mode(const DEVMODEW *mode) LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND hwnd, DWORD flags, LPVOID lparam ) { - WCHAR primary_adapter[CCHDEVICENAME]; + WCHAR primary_adapter[CCHDEVICENAME], *end; + long int display_idx; BOOL def_mode = TRUE; DEVMODEW dm; LONG ret; @@ -3331,6 +3332,19 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND devname = primary_adapter; } + if (strncmpiW(devname, ADAPTER_PREFIX, ARRAY_SIZE(ADAPTER_PREFIX))) + { + ERR("Invalid device name %s.\n", wine_dbgstr_w(devname)); + return DISP_CHANGE_BADPARAM; + } + + display_idx = strtolW(devname + ARRAY_SIZE(ADAPTER_PREFIX), &end, 10); + if (*end || display_idx < 1) + { + ERR("Invalid device name %s.\n", wine_dbgstr_w(devname)); + return DISP_CHANGE_BADPARAM; + } + if (devmode) { trace_devmode(devmode); diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index fe763e46b48..badbfdaacf3 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -369,13 +369,13 @@ static void test_ChangeDisplaySettingsEx(void) 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); + 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); + 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); + ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); /* Test dmDriverExtra */ memset(&dm, 0, sizeof(dm)); -- 2.25.1

2 1

[PATCH 4/4] winapi_test: Add a blank line between common and specific headers.
by Serge Gautherie 21 Jul '20

21 Jul '20

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 21 Jul '20

21 Jul '20

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 21 Jul '20

21 Jul '20

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 21 Jul '20

21 Jul '20

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