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

Zebediah Figura : quartz/avidec: Reimplement the AVI decoder directly on top of strmbase_filter.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: ad13ce161a8c60ecf9bd95b6604c7578a1160d06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad13ce161a8c60ecf9bd95b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:29 2020 -0500 quartz/avidec: Reimplement the AVI decoder directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 378 ++++++++++++++++++++++++++++++++++----------- dlls/quartz/tests/avidec.c | 4 +- 2 files changed, 289 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ad13ce161a8c60ecf9bd…

1 0

Zebediah Figura : quartz/acmwrapper: Reimplement the ACM wrapper directly on top of strmbase_filter.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 1ac3fe36c20bb73d678b8811e34f26029dfaa3de URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ac3fe36c20bb73d678b8811… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:28 2020 -0500 quartz/acmwrapper: Reimplement the ACM wrapper directly on top of strmbase_filter. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/acmwrapper.c | 318 +++++++++++++++++++++++++++++++++++------ dlls/quartz/tests/acmwrapper.c | 20 +-- 2 files changed, 288 insertions(+), 50 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ac3fe36c20bb73d678b…

1 0

Zebediah Figura : wineqtdecoder: Fix compilation.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: b5448ca6ab4be369d4f38026398e5314d29c9fc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5448ca6ab4be369d4f38026… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:27 2020 -0500 wineqtdecoder: Fix compilation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index 6e0dd8c46b..435951ba93 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -146,7 +146,6 @@ static struct class_factory video_decoder_cf = {{&class_factory_vtbl}, video_dec HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) { struct class_factory *factory; - HRESULT hr; TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); @@ -193,7 +192,7 @@ static const REGFILTER2 reg_qt_splitter = .u.s2.rgPins2 = reg_qt_splitter_pins, }; -static const REGFILTERPINS2 reg_qt_splitter_pins[2] = +static const REGFILTERPINS2 reg_video_decoder_pins[2] = { { .nMediaTypes = 1,

1 0

Zebediah Figura : winegstreamer: Read into an existing buffer if requested.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: d61504f16b2751d754ea562f8d49fa86330cda43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d61504f16b2751d754ea562f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 10 15:06:20 2020 -0500 winegstreamer: Read into an existing buffer if requested. oggdemux needs this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a51354b13c..e9548e80e4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -896,9 +896,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 HRESULT hr; GstMapInfo info; - TRACE("%p %s %i %p\n", pad, wine_dbgstr_longlong(ofs), len, buf); + TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buf); - *buf = NULL; if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; if (ofs >= This->filesize) { @@ -909,7 +908,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 len = This->filesize - ofs; This->nextpullofs = ofs + len; - *buf = gst_buffer_new_and_alloc(len); + if (!*buf) + *buf = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); gst_buffer_unmap(*buf, &info);

1 0

Zhiyi Zhang : wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_format().
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: f2a850c8442fb174f91e1988c04855a4b7ea7720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a850c8442fb174f91e1988… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Mar 10 17:35:35 2020 +0800 wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_format(). 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/d3d11/device.c | 4 +++- dlls/d3d8/directx.c | 7 ++++--- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 1 + dlls/d3d9/directx.c | 4 ++-- dlls/d3d9/texture.c | 6 +++++- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- dlls/wined3d/directx.c | 18 +++++++----------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 7 ++++--- 12 files changed, 39 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2a850c8442fb174f91e…

1 0

Alexandre Julliard : ntdll: Reimplement remaining string functions to avoid depending on wine/unicode.h.
by Alexandre Julliard March 11, 2020

March 11, 2020

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

Alexandre Julliard : ntdll: Reimplement wcstol/wcstoul using the msvcrt code.
by Alexandre Julliard March 11, 2020

March 11, 2020

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: Don't handle the full Unicode character range in isw* functions.
by Alexandre Julliard March 11, 2020

March 11, 2020

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: Don't handle the full Unicode character range in wcsicmp/wcsnicmp.
by Alexandre Julliard March 11, 2020

March 11, 2020

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 : kernelbase: Don't use towlower() on the full Unicode character range.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 1a9ddc37590664b8710c19d487f92f86ded34dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9ddc37590664b8710c19d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 15:14:44 2020 +0100 kernelbase: Don't use towlower() on the full Unicode character range. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 17 +++++++---------- dlls/kernelbase/string.c | 8 +++++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 93446815f2..0e0c3f3dbd 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1652,7 +1652,7 @@ int WINAPI PathCommonPrefixW(const WCHAR *file1, const WCHAR *file2, WCHAR *path if ((!*iter1 || *iter1 == '\\') && (!*iter2 || *iter2 == '\\')) len = iter1 - file1; /* Common to this point */ - if (!*iter1 || (towlower(*iter1) != towlower(*iter2))) + if (!*iter1 || (towupper(*iter1) != towupper(*iter2))) break; /* Strings differ at this point */ iter1++; @@ -1813,8 +1813,6 @@ int WINAPI PathGetDriveNumberA(const char *path) int WINAPI PathGetDriveNumberW(const WCHAR *path) { - WCHAR drive; - TRACE("%s\n", wine_dbgstr_w(path)); if (!path) @@ -1822,11 +1820,10 @@ int WINAPI PathGetDriveNumberW(const WCHAR *path) if (!wcsncmp(path, L"\\\\?\\", 4)) path += 4; - drive = towlower(path[0]); - if (drive < 'a' || drive > 'z' || path[1] != ':') - return -1; - - return drive - 'a'; + if (!path[0] || path[1] != ':') return -1; + if (path[0] >= 'A' && path[0] <= 'Z') return path[0] - 'A'; + if (path[0] >= 'a' && path[0] <= 'z') return path[0] - 'a'; + return -1; } BOOL WINAPI PathIsFileSpecA(const char *path) @@ -4733,7 +4730,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co work = (LPWSTR)base.pszProtocol; for (i = 0; i < base.cchProtocol; ++i) - work[i] = towlower(work[i]); + work[i] = RtlDowncaseUnicodeChar(work[i]); /* mk is a special case */ if (base.nScheme == URL_SCHEME_MK) @@ -4871,7 +4868,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co { work = (LPWSTR)relative.pszProtocol; for (i = 0; i < relative.cchProtocol; ++i) - work[i] = towlower(work[i]); + work[i] = RtlDowncaseUnicodeChar(work[i]); } /* Handle cases where relative has scheme. */ diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 7c484e2858..75ee5b0512 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -924,7 +924,7 @@ BOOL WINAPI StrToInt64ExW(const WCHAR *str, DWORD flags, LONGLONG *ret) else if (*str == '+') str++; - if (flags & STIF_SUPPORT_HEX && *str == '0' && towlower(str[1]) == 'x') + if (flags & STIF_SUPPORT_HEX && *str == '0' && (str[1] == 'x' || str[1] == 'X')) { /* Read hex number */ str += 2; @@ -935,10 +935,12 @@ BOOL WINAPI StrToInt64ExW(const WCHAR *str, DWORD flags, LONGLONG *ret) while (iswxdigit(*str)) { value *= 16; - if (iswdigit(*str)) + if (*str >= '0' && *str <= '9') value += (*str - '0'); + else if (*str >= 'A' && *str <= 'Z') + value += 10 + (*str - 'A'); else - value += 10 + (towlower(*str) - 'a'); + value += 10 + (*str - 'a'); str++; }

1 0