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

Zhiyi Zhang : user32: Trace EnumDisplaySettingsExW() results.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 0503b17962ab109a5eff219a4b1f2dc055b50c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0503b17962ab109a5eff219a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:49:40 2020 +0800 user32: Trace EnumDisplaySettingsExW() results. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 61cd06f691..14d3778a53 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; }

1 0

Zhiyi Zhang : user32/tests: Test that EnumDisplayMonitors() doesn't set error codes.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 7b5dac2fe17c1dd17e3ac7ab72f368e9546db82d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b5dac2fe17c1dd17e3ac7ab… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:49:49 2020 +0800 user32/tests: Test that EnumDisplayMonitors() doesn't set error codes. ERROR_INVALID_HANDLE or ERROR_INVALID_MONITOR_HANDLE is from GetMonitorInfo(), not EnumDisplayMonitor(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 6e8c9a275d..5d7069591b 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,

1 0

Zhiyi Zhang : user32/tests: Add more ChangeDisplaySettings() tests.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: dcf8bd769bef3a793ce0c1e29a501bcb03e16029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf8bd769bef3a793ce0c1e2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:50:05 2020 +0800 user32/tests: Add more ChangeDisplaySettings() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 5d7069591b..fe763e46b4 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; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth / 2; dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; break; - /* Left */ + /* Left side with y offset */ case 1: dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; - dm2.dmPosition.y = dm.dmPosition.y; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight / 2; break; - /* Top */ + /* Top side with x offset */ case 2: - dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth / 2; dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; break; - /* Right */ + /* 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 side with the same y */ + case 5: + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y; + break; + /* Top side with the same x */ + case 6: + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; + break; + /* 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 */

1 0

Zhiyi Zhang : user32: Check invalid device names in ChangeDisplaySettingsExW().
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: a599d645e33a128fae2d6fbfd7fdc07a8cefda95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a599d645e33a128fae2d6fbf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:50:19 2020 +0800 user32: Check invalid device names in ChangeDisplaySettingsExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 14d3778a53..d4462e589e 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 fe763e46b4..badbfdaacf 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));

1 0

Piotr Caban : msvcrt: Copy wcscat implementation from ntdll.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 2c5bf68a5e7525ae9c50ee0dfc6d819da79c4861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c5bf68a5e7525ae9c50ee0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:39 2020 +0200 msvcrt: Copy wcscat implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 45491455d0..aae66d828c 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -504,7 +504,7 @@ @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e37c0dbe5e..68d1ee3f0f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1854,7 +1854,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8f1d9f9397..13abe6ad64 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2212,7 +2212,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 731e001ac2..7181184938 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2447,7 +2447,7 @@ @ stub vwscanf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2aa111cab5..d4114a24fe 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -850,7 +850,7 @@ @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index da6827789e..c1b1c68f1f 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -846,7 +846,7 @@ @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1847a93c71..916245cb26 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1534,7 +1534,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8a53cf47a5..b2967858bc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1507,7 +1507,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7e854704b1..7449cbb2de 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1210,6 +1210,7 @@ int __cdecl MSVCRT__iswlower_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswupper_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswprint_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswpunct_l(MSVCRT_wchar_t, MSVCRT__locale_t); +MSVCRT_size_t __cdecl MSVCRT_wcslen(const MSVCRT_wchar_t*); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ac1269c53f..51ecb095db 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1481,7 +1481,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b553f27d27..31ec0dd33f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2255,6 +2255,15 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_ return MSVCRT_ERANGE; } +/*********************************************************************** + * wcscat (MSVCRT.@) + */ +MSVCRT_wchar_t* __cdecl MSVCRT_wcscat( MSVCRT_wchar_t *dst, const MSVCRT_wchar_t *src ) +{ + MSVCRT_wcscpy( dst + MSVCRT_wcslen(dst), src ); + return dst; +} + /********************************************************************* * wcsncat_s (MSVCRT.@) * diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 0f6af7cce7..8c775c61a4 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -802,7 +802,7 @@ @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2367e5a08d..2577649421 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2554,7 +2554,7 @@ @ cdecl ungetwc(long ptr) MSVCRT_ungetwc @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp

1 0

Piotr Caban : msvcrt: Copy wcschr implementation from ntdll.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 5d9d0b84655c8a400a9f7339c404842b194aa9f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d9d0b84655c8a400a9f7339… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:45 2020 +0200 msvcrt: Copy wcschr implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 31ec0dd33f..e193c08593 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2663,7 +2663,8 @@ int CDECL MSVCRT_towupper(MSVCRT_wint_t c) */ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) { - return strchrW(str, ch); + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Copy wcsrchr implementation from ntdll.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: b34b7e171e086a54f47b327bfaad2bb29b560d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34b7e171e086a54f47b327b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:51 2020 +0200 msvcrt: Copy wcsrchr implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e193c08593..bce1e89aeb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2672,7 +2672,9 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch */ MSVCRT_wchar_t* CDECL MSVCRT_wcsrchr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) { - return strrchrW(str, ch); + WCHAR *ret = NULL; + do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); + return ret; } /***********************************************************************

1 0

Piotr Caban : msvcrt: Don't use wine/unicode.h header.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 536be09b8449537925ad4635a06ae45283075c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=536be09b8449537925ad4635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:59 2020 +0200 msvcrt: Don't use wine/unicode.h header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/ctype.c | 1 - dlls/msvcrt/data.c | 16 ++++++++-------- dlls/msvcrt/dir.c | 33 ++++++++++++++++----------------- dlls/msvcrt/environ.c | 15 +++++++-------- dlls/msvcrt/errno.c | 4 ++-- dlls/msvcrt/file.c | 9 ++++----- dlls/msvcrt/locale.c | 17 ++++++++--------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/process.c | 45 +++++++++++++++++++++++---------------------- dlls/msvcrt/time.c | 1 - dlls/msvcrt/wcs.c | 19 +++++++++---------- 14 files changed, 83 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=536be09b8449537925ad…

1 0

Nikolay Sivov : comctl32/listview: Do no alter custom draw text colors between notification stages.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: c32720349cd4a6f4c32fdcff6a4cce054fbfe33e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32720349cd4a6f4c32fdcff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:00:18 2020 +0300 comctl32/listview: Do no alter custom draw text colors between notification stages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 23 +++++++++-------------- dlls/comctl32/tests/listview.c | 14 ++++---------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6cee291dd6..dba16d13a4 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1055,31 +1055,31 @@ static inline DWORD notify_customdraw (const LISTVIEW_INFO *infoPtr, DWORD dwDra return result; } -static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd, BOOL SubItem) +static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, const NMLVCUSTOMDRAW *cd, BOOL SubItem) { COLORREF backcolor, textcolor; + backcolor = cd->clrTextBk; + textcolor = cd->clrText; + /* apparently, for selected items, we have to override the returned values */ if (!SubItem) { - if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) + if (cd->nmcd.uItemState & CDIS_SELECTED) { if (infoPtr->bFocus) { - lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; - lpnmlvcd->clrText = comctl32_color.clrHighlightText; + backcolor = comctl32_color.clrHighlight; + textcolor = comctl32_color.clrHighlightText; } else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) { - lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; - lpnmlvcd->clrText = comctl32_color.clrBtnText; + backcolor = comctl32_color.clr3dFace; + textcolor = comctl32_color.clrBtnText; } } } - backcolor = lpnmlvcd->clrTextBk; - textcolor = lpnmlvcd->clrText; - if (backcolor == CLR_DEFAULT) backcolor = comctl32_color.clrWindow; if (textcolor == CLR_DEFAULT) @@ -4812,11 +4812,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); - else - { - nmlvcd.clrTextBk = infoPtr->clrTextBk; - nmlvcd.clrText = infoPtr->clrText; - } if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c19de7f03f..a9b853eda8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1941,11 +1941,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM return CDRF_NOTIFYSUBITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine_if(showsel_always && is_selected && nmlvcd->iSubItem) - { - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background %#x.\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "Unexpected text color %#x.\n", nmlvcd->clrText); - } + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "Unexpected text color %#x.\n", nmlvcd->clrText); if (showsel_always && is_selected && nmlvcd->iSubItem) ok(clr == GetSysColor(COLOR_3DFACE), "Unexpected background color %#x.\n", clr); else @@ -1962,11 +1959,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM ok(clr == c0ffee, "Unexpected background color %#x.\n", clr); } - todo_wine_if(showsel_always) - { - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background color %#x.\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); - } + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background color %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); return CDRF_DODEFAULT; } return CDRF_DODEFAULT;

1 0

Nikolay Sivov : sxs/tests: Use wide string literal constants.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 077e2a8e70aa2aecc69bd79b03d5e0e3c9f4a967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=077e2a8e70aa2aecc69bd79b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:03:27 2020 +0300 sxs/tests: Use wide string literal constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/tests/sxs.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 6b1a9952f3..4215c5045b 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -85,9 +85,6 @@ static void run_test(void) SIZE_T buffer_size; BOOL ret; SXS_GUID_INFORMATION_CLR *info; - WCHAR expected_type_name[] = {'D','L','L','.','T','e','s','t',0}; - WCHAR expected_runtime_version[] = {'v','4','.','0','.','0','.','0',0}; - WCHAR expected_assembly_identity[] = {'c','o','m','t','e','s','t',',','t','y','p','e','=','"','w','i','n','3','2','"',',','v','e','r','s','i','o','n','=','"','1','.','0','.','0','.','0','"',0}; ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(ret == FALSE, "Got %d\n", ret); @@ -99,12 +96,11 @@ static void run_test(void) ok(GetLastError() == 0, "Got %d\n", GetLastError()); ok(info->dwFlags == SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS, "Got %d\n", info->dwFlags); - ok(lstrcmpW(info->pcwszTypeName, expected_type_name) == 0, "Got %s\n", - wine_dbgstr_w(info->pcwszTypeName)); - ok(lstrcmpW(info->pcwszAssemblyIdentity, expected_assembly_identity) == 0, "Got %s\n", - wine_dbgstr_w(info->pcwszAssemblyIdentity)); - ok(lstrcmpW(info->pcwszRuntimeVersion, expected_runtime_version) == 0, "Got %s\n", - wine_dbgstr_w(info->pcwszRuntimeVersion)); + ok(!lstrcmpW(info->pcwszTypeName, L"DLL.Test"), "Unexpected typename %s.\n", wine_dbgstr_w(info->pcwszTypeName)); + ok(!lstrcmpW(info->pcwszAssemblyIdentity, L"comtest,type=\"win32\",version=\"1.0.0.0\""), + "Unexpected assembly identity %s.\n", wine_dbgstr_w(info->pcwszAssemblyIdentity)); + ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.0"), "Unexpected runtime version %s.\n", + wine_dbgstr_w(info->pcwszRuntimeVersion)); heap_free(info); }

1 0