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

Alexandre Julliard : msvcrt/tests: Add tests for Unicode spaces in wcstol().
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: bf48e86add972345d958b4949eeaaf77715bf4a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf48e86add972345d958b494… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 09:28:59 2020 +0100 msvcrt/tests: Add tests for Unicode spaces in wcstol(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 29a8958b81..05aa747f84 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3307,6 +3307,8 @@ static void test__wcstoi64(void) { L"9", 9, 9, 10 }, { L" ", 0, 0 }, { L"-1234", -1234, -1234 }, + { L"\x09\x0a\x0b\x0c\x0d -123", -123, -123 }, + { L"\xa0\x2002\x2003\x2028\x3000 +44", 44, 44 }, { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */ @@ -3373,6 +3375,8 @@ static void test__wcstol(void) { L"9", 9, 9, 10 }, { L" ", 0, 0 }, { L"-1234", -1234, -1234 }, + { L"\x09\x0a\x0b\x0c\x0d -123", -123, -123 }, + { L"\xa0\x2002\x2003\x2028\x3000 +44", 44, 44 }, { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */

1 0

Alexandre Julliard : ntdll/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: a1659db87f1892322b640591e9305011d22e542c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1659db87f1892322b640591… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 14:27:03 2020 +0100 ntdll/tests: Remove some workarounds for older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 296 +++++++++++++++++++++------------------------- 1 file changed, 135 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1659db87f1892322b64…

1 0

Alexandre Julliard : ntdll: Use the NLS case mapping table for towlower/towupper.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 0d6802dcc5332faf4e6883cfd50d258a1741169d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d6802dcc5332faf4e6883cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 14:30:42 2020 +0100 ntdll: Use the NLS case mapping table for towlower/towupper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 19 +++++++++++++++++++ dlls/ntdll/tests/string.c | 15 +++++++++++++++ dlls/ntdll/wcstring.c | 18 ------------------ 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 8833cfa712..8334de172d 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1572,6 +1572,25 @@ NTSTATUS WINAPI RtlUpcaseUnicodeToOemN( char *dst, DWORD dstlen, DWORD *reslen, } +/********************************************************************* + * towlower (NTDLL.@) + */ +WCHAR __cdecl NTDLL_towlower( WCHAR ch ) +{ + if (ch >= 0x100) return ch; + return casemap( nls_info.LowerCaseTable, ch ); +} + + +/********************************************************************* + * towupper (NTDLL.@) + */ +WCHAR __cdecl NTDLL_towupper( WCHAR ch ) +{ + return casemap( nls_info.UpperCaseTable, ch ); +} + + /****************************************************************** * RtlLocaleNameToLcid (NTDLL.@) */ diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 548c84fb1d..b9dfda7c19 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -33,6 +33,7 @@ static NTSTATUS (WINAPI *pRtlUnicodeStringToAnsiString)(STRING *, const UNICODE_ static VOID (WINAPI *pRtlFreeAnsiString)(PSTRING); static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING,LPCSTR); static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); static int (__cdecl *patoi)(const char *); static LONG (__cdecl *patol)(const char *); @@ -54,6 +55,8 @@ static LPWSTR (__cdecl *p_ui64tow)(ULONGLONG, LPWSTR, INT); static LPWSTR (__cdecl *p_wcslwr)(LPWSTR); static LPWSTR (__cdecl *p_wcsupr)(LPWSTR); +static WCHAR (__cdecl *ptowlower)(WCHAR); +static WCHAR (__cdecl *ptowupper)(WCHAR); static LPWSTR (__cdecl *pwcschr)(LPCWSTR, WCHAR); static LPWSTR (__cdecl *pwcsrchr)(LPCWSTR, WCHAR); @@ -78,6 +81,7 @@ static void InitFunctionPtrs(void) X(RtlFreeAnsiString); X(RtlCreateUnicodeStringFromAsciiz); X(RtlFreeUnicodeString); + X(RtlUpcaseUnicodeChar); X(atoi); X(atol); X(_atoi64); @@ -96,6 +100,8 @@ static void InitFunctionPtrs(void) X(_ui64tow); X(_wcslwr); X(_wcsupr); + X(towlower); + X(towupper); X(wcschr); X(wcsrchr); X(qsort); @@ -1151,6 +1157,7 @@ static void test_wcslwrupr(void) static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; static WCHAR emptyW[] = {0}; static const WCHAR constemptyW[] = {0}; + int i; if (0) /* crashes on native */ { @@ -1166,6 +1173,14 @@ static void test_wcslwrupr(void) ok(p_wcsupr(emptyW) == emptyW, "p_wcsupr returned different string\n"); ok(p_wcslwr((LPWSTR)constemptyW) == constemptyW, "p_wcslwr returned different string\n"); ok(p_wcsupr((LPWSTR)constemptyW) == constemptyW, "p_wcsupr returned different string\n"); + + for (i = 0; i < 65536; i++) + { + WCHAR lwr = ((i >= 'A' && i <= 'Z') || (i >= 0xc0 && i <= 0xd6) || (i >= 0xd8 && i <= 0xde)) ? i + 32 : i; + WCHAR upr = pRtlUpcaseUnicodeChar( i ); + ok( ptowlower( i ) == lwr, "%04x: towlower got %04x expected %04x\n", i, ptowlower( i ), lwr ); + ok( ptowupper( i ) == upr, "%04x: towupper got %04x expected %04x\n", i, ptowupper( i ), upr ); + } } static int __cdecl intcomparefunc(const void *a, const void *b) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index acdb33ac24..fe18af7170 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -69,24 +69,6 @@ LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ) } -/********************************************************************* - * towlower (NTDLL.@) - */ -WCHAR __cdecl NTDLL_towlower( WCHAR ch ) -{ - return tolowerW(ch); -} - - -/********************************************************************* - * towupper (NTDLL.@) - */ -WCHAR __cdecl NTDLL_towupper( WCHAR ch ) -{ - return toupperW(ch); -} - - /*********************************************************************** * wcscat (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Don't handle the full Unicode character range in wcslwr/wcsupr.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 5a4cc97a3bcbae46e5645deb2231f464fd553ed7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a4cc97a3bcbae46e5645deb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 14:32:37 2020 +0100 ntdll: Don't handle the full Unicode character range in wcslwr/wcsupr. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 13 +++++++++++++ dlls/ntdll/wcstring.c | 20 ++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index b9dfda7c19..1ec5f3a278 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1157,6 +1157,7 @@ static void test_wcslwrupr(void) static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; static WCHAR emptyW[] = {0}; static const WCHAR constemptyW[] = {0}; + WCHAR buffer[65536]; int i; if (0) /* crashes on native */ @@ -1181,6 +1182,18 @@ static void test_wcslwrupr(void) ok( ptowlower( i ) == lwr, "%04x: towlower got %04x expected %04x\n", i, ptowlower( i ), lwr ); ok( ptowupper( i ) == upr, "%04x: towupper got %04x expected %04x\n", i, ptowupper( i ), upr ); } + + for (i = 1; i < 65536; i++) buffer[i - 1] = i; + buffer[65535] = 0; + p_wcslwr( buffer ); + for (i = 1; i < 65536; i++) + ok( buffer[i - 1] == (i >= 'A' && i <= 'Z' ? i + 32 : i), "%04x: got %04x\n", i, buffer[i-1] ); + + for (i = 1; i < 65536; i++) buffer[i - 1] = i; + buffer[65535] = 0; + p_wcsupr( buffer ); + for (i = 1; i < 65536; i++) + ok( buffer[i - 1] == (i >= 'a' && i <= 'z' ? i - 32 : i), "%04x: got %04x\n", i, buffer[i-1] ); } static int __cdecl intcomparefunc(const void *a, const void *b) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index fe18af7170..15a6a15531 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -47,7 +47,15 @@ INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ) */ LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str ) { - return strlwrW( str ); + WCHAR *ret = str; + + while (*str) + { + WCHAR ch = *str; + if (ch >= 'A' && ch <= 'Z') ch += 32; + *str++ = ch; + } + return ret; } @@ -65,7 +73,15 @@ INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) */ LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ) { - return struprW( str ); + WCHAR *ret = str; + + while (*str) + { + WCHAR ch = *str; + if (ch >= 'a' && ch <= 'z') ch -= 32; + *str++ = ch; + } + return ret; }

1 0

Alexandre Julliard : ntdll: Don't handle the full Unicode character range in wcsicmp/wcsnicmp.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 19863285434484b5adf75b9f4d1be77a0967b9d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19863285434484b5adf75b9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 20:04:20 2020 +0100 ntdll: Don't handle the full Unicode character range in wcsicmp/wcsnicmp. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 18 ++++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 1ec5f3a278..dcccb5a55f 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -57,6 +57,8 @@ static LPWSTR (__cdecl *p_wcslwr)(LPWSTR); static LPWSTR (__cdecl *p_wcsupr)(LPWSTR); static WCHAR (__cdecl *ptowlower)(WCHAR); static WCHAR (__cdecl *ptowupper)(WCHAR); +static int (__cdecl *p_wcsicmp)(LPCWSTR,LPCWSTR); +static int (__cdecl *p_wcsnicmp)(LPCWSTR,LPCWSTR,int); static LPWSTR (__cdecl *pwcschr)(LPCWSTR, WCHAR); static LPWSTR (__cdecl *pwcsrchr)(LPCWSTR, WCHAR); @@ -102,6 +104,8 @@ static void InitFunctionPtrs(void) X(_wcsupr); X(towlower); X(towupper); + X(_wcsicmp); + X(_wcsnicmp); X(wcschr); X(wcsrchr); X(qsort); @@ -1196,6 +1200,28 @@ static void test_wcslwrupr(void) ok( buffer[i - 1] == (i >= 'a' && i <= 'z' ? i - 32 : i), "%04x: got %04x\n", i, buffer[i-1] ); } +static void test_wcsicmp(void) +{ + WCHAR buf_a[2], buf_b[2]; + int i, j, ret; + + buf_a[1] = buf_b[1] = 0; + for (i = 0; i < 0x300; i++) + { + int lwr_a = (i >= 'A' && i <= 'Z') ? i + 32 : i; + buf_a[0] = i; + for (j = 0; j < 0x300; j++) + { + int lwr_b = (j >= 'A' && j <= 'Z') ? j + 32 : j; + buf_b[0] = j; + ret = p_wcsicmp( buf_a, buf_b ); + ok( ret == lwr_a - lwr_b, "%04x:%04x: strings differ %d\n", i, j, ret ); + ret = p_wcsnicmp( buf_a, buf_b, 2 ); + ok( ret == lwr_a - lwr_b, "%04x:%04x: strings differ %d\n", i, j, ret ); + } + } +} + static int __cdecl intcomparefunc(const void *a, const void *b) { const int *p = a, *q = b; @@ -1567,5 +1593,6 @@ START_TEST(string) test_tolower(); test_toupper(); test__strnicmp(); + test_wcsicmp(); test_sscanf(); } diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 15a6a15531..58fc0715a7 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -38,7 +38,14 @@ */ INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ) { - return strcmpiW( str1, str2 ); + for (;;) + { + WCHAR ch1 = (*str1 >= 'A' && *str1 <= 'Z') ? *str1 + 32 : *str1; + WCHAR ch2 = (*str2 >= 'A' && *str2 <= 'Z') ? *str2 + 32 : *str2; + if (ch1 != ch2 || !*str1) return ch1 - ch2; + str1++; + str2++; + } } @@ -64,7 +71,14 @@ LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str ) */ INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) { - return strncmpiW( str1, str2, n ); + int ret = 0; + for ( ; n > 0; n--, str1++, str2++) + { + WCHAR ch1 = (*str1 >= 'A' && *str1 <= 'Z') ? *str1 + 32 : *str1; + WCHAR ch2 = (*str2 >= 'A' && *str2 <= 'Z') ? *str2 + 32 : *str2; + if ((ret = ch1 - ch2) || !*str1) break; + } + return ret; }

1 0

Alexandre Julliard : ntdll: Don't handle the full Unicode character range in isw* functions.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 650c8e14347a19688c11242742c0d2ec207b695e URL: https://source.winehq.org/git/wine.git/?a=commit;h=650c8e14347a19688c112427… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 20:54:50 2020 +0100 ntdll: Don't handle the full Unicode character range in isw* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/wcstring.c | 87 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 159 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=650c8e14347a19688c11…

1 0

Alexandre Julliard : ntdll: Reimplement wcstol/wcstoul using the msvcrt code.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 295660b98595a4e8a54124a51ff95f058a115366 URL: https://source.winehq.org/git/wine.git/?a=commit;h=295660b98595a4e8a54124a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 09:29:24 2020 +0100 ntdll: Reimplement wcstol/wcstoul using the msvcrt code. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 72 +++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 130 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 183 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index d6de1b2909..8280942db5 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -22,6 +22,7 @@ */ #include <stdlib.h> +#include <limits.h> #include "ntdll_test.h" #include "winnls.h" @@ -47,6 +48,8 @@ static LPSTR (__cdecl *p_ui64toa)(ULONGLONG, LPSTR, INT); static int (__cdecl *p_wtoi)(LPCWSTR); static LONG (__cdecl *p_wtol)(LPCWSTR); static LONGLONG (__cdecl *p_wtoi64)(LPCWSTR); +static LONG (__cdecl *pwcstol)(LPCWSTR,LPWSTR*,INT); +static ULONG (__cdecl *pwcstoul)(LPCWSTR,LPWSTR*,INT); static LPWSTR (__cdecl *p_itow)(int, LPWSTR, int); static LPWSTR (__cdecl *p_ltow)(LONG, LPWSTR, INT); static LPWSTR (__cdecl *p_ultow)(ULONG, LPWSTR, INT); @@ -102,6 +105,8 @@ static void InitFunctionPtrs(void) X(_wtoi); X(_wtol); X(_wtoi64); + X(wcstol); + X(wcstoul); X(_itow); X(_ltow); X(_ultow); @@ -1153,6 +1158,72 @@ static void test_wtoi64(void) ok( result == 0, "got %s\n", wine_dbgstr_longlong(result) ); } +static void test_wcstol(void) +{ + static const struct { WCHAR str[24]; LONG res; ULONG ures; int base; } tests[] = + { + { L"9", 9, 9, 10 }, + { L" ", 0, 0 }, + { L"-1234", -1234, -1234 }, + { L"\x09\x0a\x0b\x0c\x0d -123", -123, -123 }, + { L"\xa0 +44", 44, 44 }, + { L"\x2002\x2003 +55", 0, 0 }, + { L"\x3000 +66", 0, 0 }, + { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ + { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ + { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */ + { { 0x0e59 }, 9, 9 }, /* THAI DIGIT NINE */ + { { 0xff19 }, 9, 9 }, /* FULLWIDTH DIGIT NINE */ + { { 0x00b9 }, 0, 0 }, /* SUPERSCRIPT ONE */ + { { '-',0x0e50,'x',0xff19,'1' }, -0x91, -0x91 }, + { { '+',0x0e50,0xff17,'1' }, 071, 071 }, + { { 0xff19,'f',0x0e59,0xff46 }, 0x9f9, 0x9f9, 16 }, + { L"2147483647", 2147483647, 2147483647 }, + { L"2147483648", LONG_MAX, 2147483648 }, + { L"4294967295", LONG_MAX, 4294967295 }, + { L"4294967296", LONG_MAX, ULONG_MAX }, + { L"9223372036854775807", LONG_MAX, ULONG_MAX }, + { L"-2147483647", -2147483647, -2147483647 }, + { L"-2147483648", LONG_MIN, LONG_MIN }, + { L"-4294967295", LONG_MIN, 1 }, + { L"-4294967296", LONG_MIN, 1 }, + { L"-9223372036854775807", LONG_MIN, 1 }, + }; + static const WCHAR zeros[] = + { + 0x0660, 0x06f0, 0x0966, 0x09e6, 0x0a66, 0x0ae6, 0x0b66, 0x0c66, 0x0ce6, + 0x0d66, 0x0e50, 0x0ed0, 0x0f20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + unsigned int i; + LONG res; + ULONG ures; + WCHAR *endpos; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + res = pwcstol( tests[i].str, &endpos, tests[i].base ); + ok( res == tests[i].res, "%u: %s res %08x\n", i, wine_dbgstr_w(tests[i].str), res ); + if (!res) ok( endpos == tests[i].str, "%u: wrong endpos %p/%p\n", i, endpos, tests[i].str ); + ures = pwcstoul( tests[i].str, &endpos, tests[i].base ); + ok( ures == tests[i].ures, "%u: %s res %08x\n", i, wine_dbgstr_w(tests[i].str), ures ); + } + + /* Test various unicode digits */ + for (i = 0; i < ARRAY_SIZE(zeros); ++i) + { + WCHAR tmp[] = { zeros[i] + 4, zeros[i], zeros[i] + 5, 0 }; + res = pwcstol(tmp, NULL, 0); + ok(res == 405, "with zero = U+%04X: got %d, expected 405\n", zeros[i], res); + ures = pwcstoul(tmp, NULL, 0); + ok(ures == 405, "with zero = U+%04X: got %u, expected 405\n", zeros[i], ures); + tmp[1] = zeros[i] + 10; + res = pwcstol(tmp, NULL, 16); + ok(res == 4, "with zero = U+%04X: got %d, expected 4\n", zeros[i], res); + ures = pwcstoul(tmp, NULL, 16); + ok(ures == 4, "with zero = U+%04X: got %u, expected 4\n", zeros[i], ures); + } +} + static void test_wcschr(void) { static const WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; @@ -1670,6 +1741,7 @@ START_TEST(string) test_wtoi(); test_wtol(); test_wtoi64(); + test_wcstol(); test_wcschr(); test_wcsrchr(); test_wcslwrupr(); diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 0acad184f9..01c4bd0296 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -23,7 +23,6 @@ #include "config.h" #include <ctype.h> -#include <limits.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -340,24 +339,6 @@ INT __cdecl NTDLL_mbstowcs( LPWSTR dst, LPCSTR src, INT n ) } -/********************************************************************* - * wcstol (NTDLL.@) - */ -LONG __cdecl NTDLL_wcstol(LPCWSTR s, LPWSTR *end, INT base) -{ - return strtolW( s, end, base ); -} - - -/********************************************************************* - * wcstoul (NTDLL.@) - */ -ULONG __cdecl NTDLL_wcstoul(LPCWSTR s, LPWSTR *end, INT base) -{ - return strtoulW( s, end, base ); -} - - /********************************************************************* * iswctype (NTDLL.@) */ @@ -442,6 +423,117 @@ INT __cdecl NTDLL_iswxdigit( WCHAR wc ) } +static int wctoint( WCHAR c ) +{ + /* NOTE: MAP_FOLDDIGITS supports too many things. */ + /* Unicode points that contain digits 0-9; keep this sorted! */ + static const WCHAR zeros[] = + { + 0x0660, 0x06f0, 0x0966, 0x09e6, 0x0a66, 0x0ae6, 0x0b66, 0x0c66, 0x0ce6, + 0x0d66, 0x0e50, 0x0ed0, 0x0f20, 0x1040, 0x17e0, 0x1810, 0xff10 + }; + int i; + + if ('0' <= c && c <= '9') return c - '0'; + if ('A' <= c && c <= 'Z') return c - 'A' + 10; + if ('a' <= c && c <= 'z') return c - 'a' + 10; + for (i = 0; i < ARRAY_SIZE(zeros) && c >= zeros[i]; i++) + if (zeros[i] <= c && c <= zeros[i] + 9) return c - zeros[i]; + + return -1; +} + +/********************************************************************* + * wcstol (NTDLL.@) + */ +LONG __cdecl NTDLL_wcstol(LPCWSTR s, LPWSTR *end, INT base) +{ + BOOL negative = FALSE, empty = TRUE; + LONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (NTDLL_iswspace(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && !wctoint( *s ) && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = wctoint( *s ) ? 10 : 8; + + while (*s) + { + int v = wctoint( *s ); + if (v < 0 || v >= base) break; + if (negative) v = -v; + s++; + empty = FALSE; + + if (!negative && (ret > MAXLONG / base || ret * base > MAXLONG - v)) + ret = MAXLONG; + else if (negative && (ret < (LONG)MINLONG / base || ret * base < (LONG)(MINLONG - v))) + ret = MINLONG; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return ret; +} + + +/********************************************************************* + * wcstoul (NTDLL.@) + */ +ULONG __cdecl NTDLL_wcstoul(LPCWSTR s, LPWSTR *end, INT base) +{ + BOOL negative = FALSE, empty = TRUE; + ULONG ret = 0; + + if (base < 0 || base == 1 || base > 36) return 0; + if (end) *end = (WCHAR *)s; + while (NTDLL_iswspace(*s)) s++; + + if (*s == '-') + { + negative = TRUE; + s++; + } + else if (*s == '+') s++; + + if ((base == 0 || base == 16) && !wctoint( *s ) && (s[1] == 'x' || s[1] == 'X')) + { + base = 16; + s += 2; + } + if (base == 0) base = wctoint( *s ) ? 10 : 8; + + while (*s) + { + int v = wctoint( *s ); + if (v < 0 || v >= base) break; + s++; + empty = FALSE; + + if (ret > MAXDWORD / base || ret * base > MAXDWORD - v) + ret = MAXDWORD; + else + ret = ret * base + v; + } + + if (end && !empty) *end = (WCHAR *)s; + return negative ? -ret : ret; +} + + /********************************************************************* * _ultow (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Reimplement remaining string functions to avoid depending on wine/unicode.h.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 982f99d3d9740a3d0c7f390e9e614e9d67ec48cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=982f99d3d9740a3d0c7f390e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 09:30:49 2020 +0100 ntdll: Reimplement remaining string functions to avoid depending on wine/unicode.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/wcstring.c | 84 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 54 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 01c4bd0296..858c6fc538 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -29,8 +29,9 @@ #include <stdio.h> #include "windef.h" +#include "winbase.h" +#include "winnls.h" #include "winternl.h" -#include "wine/unicode.h" static const unsigned short wctypes[256] = { @@ -152,56 +153,65 @@ LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ) /*********************************************************************** - * wcscat (NTDLL.@) + * wcscpy (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcscat( LPWSTR dst, LPCWSTR src ) +LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src ) { - return strcatW( dst, src ); + WCHAR *p = dst; + while ((*p++ = *src++)); + return dst; } -/********************************************************************* - * wcschr (NTDLL.@) +/*********************************************************************** + * wcslen (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch ) +INT __cdecl NTDLL_wcslen( LPCWSTR str ) { - return strchrW( str, ch ); + const WCHAR *s = str; + while (*s) s++; + return s - str; } -/********************************************************************* - * wcscmp (NTDLL.@) +/*********************************************************************** + * wcscat (NTDLL.@) */ -INT __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 ) +LPWSTR __cdecl NTDLL_wcscat( LPWSTR dst, LPCWSTR src ) { - return strcmpW( str1, str2 ); + NTDLL_wcscpy( dst + NTDLL_wcslen(dst), src ); + return dst; } -/*********************************************************************** - * wcscpy (NTDLL.@) +/********************************************************************* + * wcschr (NTDLL.@) */ -LPWSTR __cdecl NTDLL_wcscpy( LPWSTR dst, LPCWSTR src ) +LPWSTR __cdecl NTDLL_wcschr( LPCWSTR str, WCHAR ch ) { - return strcpyW( dst, src ); + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; } /********************************************************************* - * wcscspn (NTDLL.@) + * wcscmp (NTDLL.@) */ -INT __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject ) +INT __cdecl NTDLL_wcscmp( LPCWSTR str1, LPCWSTR str2 ) { - return strcspnW( str, reject ); + while (*str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; } -/*********************************************************************** - * wcslen (NTDLL.@) +/********************************************************************* + * wcscspn (NTDLL.@) */ -INT __cdecl NTDLL_wcslen( LPCWSTR str ) +INT __cdecl NTDLL_wcscspn( LPCWSTR str, LPCWSTR reject ) { - return strlenW( str ); + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (NTDLL_wcschr( reject, *ptr )) break; + return ptr - str; } @@ -223,7 +233,9 @@ LPWSTR __cdecl NTDLL_wcsncat( LPWSTR s1, LPCWSTR s2, INT n ) */ INT __cdecl NTDLL_wcsncmp( LPCWSTR str1, LPCWSTR str2, INT n ) { - return strncmpW( str1, str2, n ); + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; } @@ -244,7 +256,8 @@ LPWSTR __cdecl NTDLL_wcsncpy( LPWSTR s1, LPCWSTR s2, INT n ) */ LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept ) { - return strpbrkW( str, accept ); + for ( ; *str; str++) if (NTDLL_wcschr( accept, *str )) return (WCHAR *)(ULONG_PTR)str; + return NULL; } @@ -253,7 +266,9 @@ LPWSTR __cdecl NTDLL_wcspbrk( LPCWSTR str, LPCWSTR accept ) */ LPWSTR __cdecl NTDLL_wcsrchr( LPWSTR str, WCHAR ch ) { - return strrchrW( str, ch ); + WCHAR *ret = NULL; + do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); + return ret; } @@ -262,7 +277,9 @@ LPWSTR __cdecl NTDLL_wcsrchr( LPWSTR str, WCHAR ch ) */ INT __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept ) { - return strspnW( str, accept ); + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (!NTDLL_wcschr( accept, *ptr )) break; + return ptr - str; } @@ -271,7 +288,14 @@ INT __cdecl NTDLL_wcsspn( LPCWSTR str, LPCWSTR accept ) */ LPWSTR __cdecl NTDLL_wcsstr( LPCWSTR str, LPCWSTR sub ) { - return strstrW( str, sub ); + while (*str) + { + const WCHAR *p1 = str, *p2 = sub; + while (*p1 && *p2 && *p1 == *p2) { p1++; p2++; } + if (!*p2) return (WCHAR *)str; + str++; + } + return NULL; } @@ -305,13 +329,13 @@ INT __cdecl NTDLL_wcstombs( LPSTR dst, LPCWSTR src, INT n ) if (!dst) { - RtlUnicodeToMultiByteSize( &len, src, strlenW(src)*sizeof(WCHAR) ); + RtlUnicodeToMultiByteSize( &len, src, NTDLL_wcslen(src) * sizeof(WCHAR) ); return len; } else { if (n <= 0) return 0; - RtlUnicodeToMultiByteN( dst, n, &len, src, strlenW(src)*sizeof(WCHAR) ); + RtlUnicodeToMultiByteN( dst, n, &len, src, NTDLL_wcslen(src) * sizeof(WCHAR) ); if (len < n) dst[len] = 0; } return len;

1 0

Francois Gouget : testbot/UpdateTaskLogs: Fix the detection of Wine test reports.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: tools Branch: master Commit: 4711c9d740b2e06e96d91c729f0d9cfc8e4551dc URL: https://source.winehq.org/git/tools.git/?a=commit;h=4711c9d740b2e06e96d91c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:53:32 2020 +0100 testbot/UpdateTaskLogs: Fix the detection of Wine test reports. We know a report come from a Wine test if the job was created for a patch. But the step that references the patch is not necessarily the task's parent step: it could also be the build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 94adf42..e50e449 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -286,9 +286,9 @@ sub MoveRefReport($$;$) return 0; } -sub ProcessTaskLogs($$$) +sub ProcessTaskLogs($$$$) { - my ($Step, $Task, $CollectOnly) = @_; + my ($Step, $Task, $IsWineTest, $CollectOnly) = @_; my $Rc = 0; my $ReportNames; @@ -418,12 +418,11 @@ sub ProcessTaskLogs($$$) { # And (re)build the .errors files, even if Status != 'completed' for # task.log and testbot.log. - my ($IsWineTest, $TaskTimedOut); + my $TaskTimedOut; if ($Task->Started and $Task->Ended) { my $Duration = $Task->Ended - $Task->Started; $TaskTimedOut = $Duration > $Task->Timeout; - $IsWineTest = ($Step->Type eq "patch" or $Step->Type eq "suite"); } foreach my $LogName (@{GetLogFileNames($TaskDir, "+old")}) { @@ -564,11 +563,14 @@ my $Jobs = CreateJobs(); foreach my $Task (sort { ($a->Ended || 0) <=> ($b->Ended || 0) } @AllTasks) { my ($JobId, $StepNo, $TaskNo) = @{$Task->GetMasterKey()}; - my $Step = $Jobs->GetItem($JobId)->Steps->GetItem($StepNo); + my $Steps = $Jobs->GetItem($JobId)->Steps; + my $Step = $Steps->GetItem($StepNo); + my $IsWineTest = $Step->FileType eq "patch" || + $Steps->GetItem(1)->FileType eq "patch"; my $CollectOnly = ((defined $OptJobId and $OptJobId ne $JobId) or (defined $OptStepNo and $OptStepNo ne $StepNo) or (defined $OptTaskNo and $OptTaskNo ne $TaskNo)); - $Rc += ProcessTaskLogs($Step, $Task, $CollectOnly); + $Rc += ProcessTaskLogs($Step, $Task, $IsWineTest, $CollectOnly); } exit $Rc ? 1 : 0;

1 0

Francois Gouget : testbot/PatchUtils: Detect when make_errors needs to be run.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: tools Branch: master Commit: 74397efc8963baed242aad9c9cc59fb5539d8945 URL: https://source.winehq.org/git/tools.git/?a=commit;h=74397efc8963baed242aad9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:53:56 2020 +0100 testbot/PatchUtils: Detect when make_errors needs to be run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 13f9699..cc61e31 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -137,6 +137,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeErrors}) + { + InfoMsg "\nRunning make_errors\n"; + system("cd '$DataDir/$Dir/' && set -x && ./dlls/ntdll/make_errors"); + if ($? != 0) + { + LogMsg "make_errors failed\n"; + return undef; + } + } if ($Impacts->{MakeOpenGL}) { InfoMsg "\nRunning make_opengl\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 49bf101..f55dc4b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) + { + $Impacts->{MakeErrors} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1;

1 0