February 2020 - Wine-commits

Nikolay Sivov : dwrite: Fix potential strings object leak (Coverity).
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 9f1dd9fc3ef11e6343ef96512ed1632a705164d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f1dd9fc3ef11e6343ef9651… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 3 10:32:14 2020 +0300 dwrite: Fix potential strings object leak (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0aa1b10460..9813676ab0 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2166,10 +2166,6 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc *ret = NULL; - hr = create_localizedstrings(&strings); - if (FAILED(hr)) - return hr; - switch (id) { case DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG: @@ -2183,6 +2179,9 @@ static HRESULT opentype_get_font_strings_from_meta(const struct file_stream_desc return S_OK; } + if (FAILED(hr = create_localizedstrings(&strings))) + return hr; + opentype_get_font_table(stream_desc, MS_META_TAG, &meta); if (meta.data)

1 0

Francois Gouget : tests: Don't initialize static variables to 0.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: f818bbf61a6a8a39b8d34a6eafa13b075abe41cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f818bbf61a6a8a39b8d34a6e… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 3 02:04:05 2020 +0100 tests: Don't initialize static variables to 0. Static variables are initialized to 0 by default anyway. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index a919ce81d6..5c3b432a9a 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -498,7 +498,6 @@ static int run_test( const char *name ) printf( "Fatal: test '%s' does not exist.\n", name ); exit_process(1); } - successes = failures = todo_successes = todo_failures = 0; tls_index=TlsAlloc(); current_test = test; test->func();

1 0

Francois Gouget : configure: Fix a typo in a comment.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 32785e0ce07a4b7bf33e0e9fda26d7deca82b105 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32785e0ce07a4b7bf33e0e9f… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 3 04:07:13 2020 +0100 configure: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 36f65378a4..f9ca95ce49 100644 --- a/configure.ac +++ b/configure.ac @@ -1686,7 +1686,7 @@ fi WINE_NOTICE_WITH(udev,[test "x$UDEV_LIBS" = "x"], [libudev ${notice_platform}development files not found, plug and play won't be supported.]) -dnl **** Check for libuwind **** +dnl **** Check for libunwind **** if test "x$with_unwind" != xno then WINE_PACKAGE_FLAGS(UNWIND,[libunwind],[-lunwind],,,

1 0

Alexandre Julliard : kernelbase: Use RtlNormalizeString() directly in FoldStringW().
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: f0a82c3a2aa324d410d0d706aad80da430a0cb21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0a82c3a2aa324d410d0d706… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 16:31:08 2020 +0100 kernelbase: Use RtlNormalizeString() directly in FoldStringW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 163 +++++++++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 61 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 9953bf7e1a..c697da16eb 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -836,9 +836,10 @@ static const WCHAR *get_ligature( WCHAR wc ) } -static int expand_ligatures( const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +static NTSTATUS expand_ligatures( const WCHAR *src, int srclen, WCHAR *dst, int *dstlen ) { int i, len, pos = 0; + NTSTATUS ret = STATUS_SUCCESS; const WCHAR *expand; for (i = 0; i < srclen; i++) @@ -850,30 +851,93 @@ static int expand_ligatures( const WCHAR *src, int srclen, WCHAR *dst, int dstle } else len = lstrlenW( expand ); - if (dstlen) + if (*dstlen && ret == STATUS_SUCCESS) { - if (pos + len > dstlen) break; - memcpy( dst + pos, expand, len * sizeof(WCHAR) ); + if (pos + len <= *dstlen) memcpy( dst + pos, expand, len * sizeof(WCHAR) ); + else ret = STATUS_BUFFER_TOO_SMALL; } pos += len; } - return pos; + *dstlen = pos; + return ret; } -static int fold_digits( const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +static NTSTATUS fold_digits( const WCHAR *src, int srclen, WCHAR *dst, int *dstlen ) { extern const WCHAR wine_digitmap[] DECLSPEC_HIDDEN; - int i; + int i, len = *dstlen; - if (!dstlen) return srclen; - if (srclen > dstlen) return 0; + *dstlen = srclen; + if (!len) return STATUS_SUCCESS; + if (srclen > len) return STATUS_BUFFER_TOO_SMALL; for (i = 0; i < srclen; i++) { WCHAR digit = get_table_entry( wine_digitmap, src[i] ); dst[i] = digit ? digit : src[i]; } - return srclen; + return STATUS_SUCCESS; +} + + +static NTSTATUS fold_string( DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int *dstlen ) +{ + NTSTATUS ret; + WCHAR *tmp; + + switch (flags) + { + case MAP_PRECOMPOSED: + return RtlNormalizeString( NormalizationC, src, srclen, dst, dstlen ); + case MAP_FOLDCZONE: + case MAP_PRECOMPOSED | MAP_FOLDCZONE: + return RtlNormalizeString( NormalizationKC, src, srclen, dst, dstlen ); + case MAP_COMPOSITE: + return RtlNormalizeString( NormalizationD, src, srclen, dst, dstlen ); + case MAP_COMPOSITE | MAP_FOLDCZONE: + return RtlNormalizeString( NormalizationKD, src, srclen, dst, dstlen ); + case MAP_FOLDDIGITS: + return fold_digits( src, srclen, dst, dstlen ); + case MAP_EXPAND_LIGATURES: + case MAP_EXPAND_LIGATURES | MAP_FOLDCZONE: + return expand_ligatures( src, srclen, dst, dstlen ); + case MAP_FOLDDIGITS | MAP_PRECOMPOSED: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = RtlNormalizeString( NormalizationC, tmp, srclen, dst, dstlen ); + break; + case MAP_FOLDDIGITS | MAP_FOLDCZONE: + case MAP_FOLDDIGITS | MAP_PRECOMPOSED | MAP_FOLDCZONE: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = RtlNormalizeString( NormalizationKC, tmp, srclen, dst, dstlen ); + break; + case MAP_FOLDDIGITS | MAP_COMPOSITE: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = RtlNormalizeString( NormalizationD, tmp, srclen, dst, dstlen ); + break; + case MAP_FOLDDIGITS | MAP_COMPOSITE | MAP_FOLDCZONE: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = RtlNormalizeString( NormalizationKD, tmp, srclen, dst, dstlen ); + break; + case MAP_EXPAND_LIGATURES | MAP_FOLDDIGITS: + case MAP_EXPAND_LIGATURES | MAP_FOLDDIGITS | MAP_FOLDCZONE: + if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) + return STATUS_NO_MEMORY; + fold_digits( src, srclen, tmp, &srclen ); + ret = expand_ligatures( tmp, srclen, dst, dstlen ); + break; + default: + return STATUS_INVALID_PARAMETER_1; + } + RtlFreeHeap( GetProcessHeap(), 0, tmp ); + return ret; } @@ -3280,8 +3344,9 @@ INT WINAPI DECLSPEC_HOTPATCH FindStringOrdinal( DWORD flag, const WCHAR *src, IN */ INT WINAPI DECLSPEC_HOTPATCH FoldStringW( DWORD flags, LPCWSTR src, INT srclen, LPWSTR dst, INT dstlen ) { - WCHAR *tmp; - int ret; + NTSTATUS status; + WCHAR *buf = dst; + int len = dstlen; if (!src || !srclen || dstlen < 0 || (dstlen && !dst) || src == dst) { @@ -3290,60 +3355,36 @@ INT WINAPI DECLSPEC_HOTPATCH FoldStringW( DWORD flags, LPCWSTR src, INT srclen, } if (srclen == -1) srclen = lstrlenW(src) + 1; - switch (flags) + if (!dstlen && (flags & (MAP_PRECOMPOSED | MAP_FOLDCZONE | MAP_COMPOSITE))) { - case MAP_PRECOMPOSED: - return NormalizeString( NormalizationC, src, srclen, dst, dstlen ); - case MAP_FOLDCZONE: - case MAP_PRECOMPOSED | MAP_FOLDCZONE: - return NormalizeString( NormalizationKC, src, srclen, dst, dstlen ); - case MAP_COMPOSITE: - return NormalizeString( NormalizationD, src, srclen, dst, dstlen ); - case MAP_COMPOSITE | MAP_FOLDCZONE: - return NormalizeString( NormalizationKD, src, srclen, dst, dstlen ); - case MAP_FOLDDIGITS: - return fold_digits( src, srclen, dst, dstlen ); - case MAP_EXPAND_LIGATURES: - case MAP_EXPAND_LIGATURES | MAP_FOLDCZONE: - return expand_ligatures( src, srclen, dst, dstlen ); - case MAP_FOLDDIGITS | MAP_PRECOMPOSED: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = NormalizeString( NormalizationC, tmp, srclen, dst, dstlen ); - break; - case MAP_FOLDDIGITS | MAP_FOLDCZONE: - case MAP_FOLDDIGITS | MAP_PRECOMPOSED | MAP_FOLDCZONE: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = NormalizeString( NormalizationKC, tmp, srclen, dst, dstlen ); - break; - case MAP_FOLDDIGITS | MAP_COMPOSITE: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = NormalizeString( NormalizationD, tmp, srclen, dst, dstlen ); - break; - case MAP_FOLDDIGITS | MAP_COMPOSITE | MAP_FOLDCZONE: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = NormalizeString( NormalizationKD, tmp, srclen, dst, dstlen ); - break; - case MAP_EXPAND_LIGATURES | MAP_FOLDDIGITS: - case MAP_EXPAND_LIGATURES | MAP_FOLDDIGITS | MAP_FOLDCZONE: - if (!(tmp = RtlAllocateHeap( GetProcessHeap(), 0, srclen * sizeof(WCHAR) ))) break; - if (!(ret = fold_digits( src, srclen, tmp, srclen ))) break; - ret = expand_ligatures( tmp, srclen, dst, dstlen ); - break; - default: - SetLastError( ERROR_INVALID_FLAGS ); - return 0; + len = srclen * 4; + if (!(buf = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return 0; + } } - if (!tmp) + + for (;;) { - SetLastError( ERROR_OUTOFMEMORY ); + status = fold_string( flags, src, srclen, buf, &len ); + if (buf != dst) RtlFreeHeap( GetProcessHeap(), 0, buf ); + if (status != STATUS_BUFFER_TOO_SMALL) break; + if (!(buf = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return 0; + } + } + if (status == STATUS_INVALID_PARAMETER_1) + { + SetLastError( ERROR_INVALID_FLAGS ); return 0; } - RtlFreeHeap( GetProcessHeap(), 0, tmp ); - return ret; + if (!set_ntstatus( status )) return 0; + + if (dstlen && dstlen < len) SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return len; }

1 0

Alexandre Julliard : libport: Move Unicode normalization implementation to ntdll.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: cc300a20b3847d510f0b8aa54b08fb15ac9e6cb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc300a20b3847d510f0b8aa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 13:15:07 2020 +0100 libport: Move Unicode normalization implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++-- include/wine/unicode.h | 2 - libs/port/Makefile.in | 1 - libs/port/normalize.c | 141 ------------------------------------------------- 4 files changed, 134 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc300a20b3847d510f0b…

1 0

Alexandre Julliard : kernel32/tests: Add some NormalizeString() tests.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 77f58afd3baabdc82f4e699a549598b4abaeb806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f58afd3baabdc82f4e699a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 13:23:38 2020 +0100 kernel32/tests: Add some NormalizeString() tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 241 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 215 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77f58afd3baabdc82f4e…

1 0

Alexandre Julliard : ntdll: Add parameter checking in RtlNormalizeString().
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: dcd195e0f159ed7203d7073d81373d8e878e943b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd195e0f159ed7203d7073d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 13:29:55 2020 +0100 ntdll: Add parameter checking in RtlNormalizeString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 11 +++++++---- dlls/ntdll/locale.c | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 751b508e83..ea591d851c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6184,12 +6184,14 @@ static void test_NormalizeString(void) case NormalizationKC: case NormalizationKD: case 13: /* Idn */ + todo_wine_if (i == 13) ok( dstlen > 0, "%d: wrong len %d\n", i, dstlen ); todo_wine ok( GetLastError() == ERROR_SUCCESS, "%d: got error %u\n", i, GetLastError()); break; default: - todo_wine ok( dstlen <= 0, "%d: wrong len %d\n", i, dstlen ); - todo_wine ok( GetLastError() == ERROR_INVALID_PARAMETER, "%d: got error %u\n", i, GetLastError()); + ok( dstlen <= 0, "%d: wrong len %d\n", i, dstlen ); + todo_wine_if (i) + ok( GetLastError() == ERROR_INVALID_PARAMETER, "%d: got error %u\n", i, GetLastError()); break; } if (pRtlNormalizeString) @@ -6199,17 +6201,18 @@ static void test_NormalizeString(void) switch (i) { case 0: - todo_wine ok( status == STATUS_INVALID_PARAMETER, "%d: failed %x\n", i, status ); + ok( status == STATUS_INVALID_PARAMETER, "%d: failed %x\n", i, status ); break; case NormalizationC: case NormalizationD: case NormalizationKC: case NormalizationKD: case 13: /* Idn */ + todo_wine_if (i == 13) ok( status == STATUS_SUCCESS, "%d: failed %x\n", i, status ); break; default: - todo_wine ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%d: failed %x\n", i, status ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%d: failed %x\n", i, status ); break; } } diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index dfd48eb0f8..f9d65e47fd 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1687,17 +1687,26 @@ NTSTATUS WINAPI RtlIsNormalizedString( ULONG form, const WCHAR *str, INT len, BO */ NTSTATUS WINAPI RtlNormalizeString( ULONG form, const WCHAR *src, INT src_len, WCHAR *dst, INT *dst_len ) { - int flags = 0, compose = 0; + int flags = 0, compose, compat; unsigned int res, buf_len; WCHAR *buf = NULL; NTSTATUS status = STATUS_SUCCESS; TRACE( "%x %s %d %p %d\n", form, debugstr_wn(src, src_len), src_len, dst, *dst_len ); + switch (form) + { + case NormalizationC: compose = 1; compat = 0; break; + case NormalizationD: compose = 0; compat = 0; break; + case NormalizationKC: compose = 1; compat = 1; break; + case NormalizationKD: compose = 0; compat = 1; break; + case 0: return STATUS_INVALID_PARAMETER; + default: return STATUS_OBJECT_NAME_NOT_FOUND; + } + if (src_len == -1) src_len = strlenW(src) + 1; - if (form == NormalizationKC || form == NormalizationKD) flags |= WINE_DECOMPOSE_COMPAT; - if (form == NormalizationC || form == NormalizationKC) compose = 1; + if (compat) flags |= WINE_DECOMPOSE_COMPAT; if (compose || *dst_len) flags |= WINE_DECOMPOSE_REORDER; if (!compose && *dst_len)

1 0

Alexandre Julliard : ntdll: Fix estimated buffer sizes in RtlNormalizeString().
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: a7cc191aa89fbcad05064eeb6f6c05226f496ad1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7cc191aa89fbcad05064eeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 16:30:56 2020 +0100 ntdll: Fix estimated buffer sizes in RtlNormalizeString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 33 +++++++++--------- dlls/ntdll/locale.c | 81 ++++++++++++++++++++++---------------------- 2 files changed, 56 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a7cc191aa89fbcad0506…

1 0

Alexandre Julliard : kernelbase: Fix NormalizeString() return value and last error.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: wine Branch: master Commit: 8d11c0871e1d1eafddc1505c7a11045083c37936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d11c0871e1d1eafddc1505c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 3 18:39:15 2020 +0100 kernelbase: Fix NormalizeString() return value and last error. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 23 +++++++++++------------ dlls/kernelbase/locale.c | 14 +++++++++++++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 3ac3ee5de5..76a993e6c3 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6034,12 +6034,10 @@ static void test_NormalizeString(void) dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 ); ok( dstlen > lstrlenW(ptest->str), "%s:%d: wrong len %d / %d\n", wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW(ptest->str) ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "%s:%d: got error %u\n", wine_dbgstr_w(ptest->str), i, GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "%s:%d: got error %u\n", wine_dbgstr_w(ptest->str), i, GetLastError()); ok(dstlen == lstrlenW( dst )+1, "%s:%d: Copied length differed: was %d, should be %d\n", @@ -6086,33 +6084,33 @@ static void test_NormalizeString(void) SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationD, part0_str1, -1, dst, 1 ); - todo_wine ok( dstlen <= 0, "wrong len %d\n", dstlen ); + ok( dstlen <= 0, "wrong len %d\n", dstlen ); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, -1, dst, 1 ); - todo_wine ok( dstlen <= 0, "wrong len %d\n", dstlen ); + ok( dstlen <= 0, "wrong len %d\n", dstlen ); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, -1, NULL, 0 ); ok( dstlen == 12, "wrong len %d\n", dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, -1, dst, 3 ); ok( dstlen == 3, "wrong len %d\n", dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, 0, NULL, 0 ); ok( dstlen == 0, "wrong len %d\n", dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); dstlen = pNormalizeString( NormalizationC, part0_str2, 0, dst, 3 ); ok( dstlen == 0, "wrong len %d\n", dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); /* size estimations */ @@ -6144,11 +6142,11 @@ static void test_NormalizeString(void) if (i == 0 || i == 2) { ok( dstlen == srclen, "%d: wrong len %d\n", i, dstlen ); - todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError()); } else { - todo_wine ok( dstlen < -expect, "%d: wrong len %d\n", i, dstlen ); + ok( dstlen < -expect, "%d: wrong len %d\n", i, dstlen ); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError()); } if (pRtlNormalizeString) @@ -6185,12 +6183,13 @@ static void test_NormalizeString(void) case NormalizationKD: case 13: /* Idn */ todo_wine_if (i == 13) + { ok( dstlen > 0, "%d: wrong len %d\n", i, dstlen ); - todo_wine ok( GetLastError() == ERROR_SUCCESS, "%d: got error %u\n", i, GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, "%d: got error %u\n", i, GetLastError()); + } break; default: ok( dstlen <= 0, "%d: wrong len %d\n", i, dstlen ); - todo_wine_if (i) ok( GetLastError() == ERROR_INVALID_PARAMETER, "%d: got error %u\n", i, GetLastError()); break; } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c697da16eb..a2d4735c30 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4923,7 +4923,19 @@ INT WINAPI DECLSPEC_HOTPATCH MultiByteToWideChar( UINT codepage, DWORD flags, co INT WINAPI DECLSPEC_HOTPATCH NormalizeString(NORM_FORM form, const WCHAR *src, INT src_len, WCHAR *dst, INT dst_len) { - set_ntstatus( RtlNormalizeString( form, src, src_len, dst, &dst_len )); + NTSTATUS status = RtlNormalizeString( form, src, src_len, dst, &dst_len ); + + switch (status) + { + case STATUS_OBJECT_NAME_NOT_FOUND: + status = STATUS_INVALID_PARAMETER; + break; + case STATUS_BUFFER_TOO_SMALL: + case STATUS_NO_UNICODE_TRANSLATION: + dst_len = -dst_len; + break; + } + SetLastError( RtlNtStatusToDosError( status )); return dst_len; }

1 0

Francois Gouget : testbot/UpdateTaskLogs: Don't rebuild .err files in --delete mode.
by Alexandre Julliard 03 Feb '20

03 Feb '20

Module: tools Branch: master Commit: 4eaa59e8e201f8f2eb9968281657b371ff4b2879 URL: https://source.winehq.org/git/tools.git/?a=commit;h=4eaa59e8e201f8f2eb99682… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jan 31 13:15:14 2020 +0100 testbot/UpdateTaskLogs: Don't rebuild .err files in --delete mode. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 93b6504..d9369d8 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -271,7 +271,7 @@ sub ProcessTaskLogs($$$) if (-f $RefReportPath or -f "$RefReportPath.err") { - if (!-f "$RefReportPath.err") + if (!$OptDelete and !-f "$RefReportPath.err") { # (Re)Build the .err file before adding the reference report to # latest/.

1 0