Skip to content

W
wine-winehq
Commit a7cc191a authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

ntdll: Fix estimated buffer sizes in RtlNormalizeString().

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent dcd195e0
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 58 deletions
dlls/kernel32/tests/locale.c
View file @ a7cc191a
......@@ -6032,7 +6032,7 @@ static void test_NormalizeString(void)
{
SetLastError(0xdeadbeef);
dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 );
ok( dstlen > 0, "%s:%d: wrong len %d / %d\n",
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",
......@@ -6064,7 +6064,7 @@ static void test_NormalizeString(void)
dstlen = 0;
status = pRtlNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), NULL, &dstlen );
ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status );
ok( dstlen > 0, "%s:%d: wrong len %d / %d\n",
ok( dstlen > lstrlenW(ptest->str), "%s:%d: wrong len %d / %d\n",
wine_dbgstr_w(ptest->str), i, dstlen, lstrlenW(ptest->str) );
memset(dst, 0, sizeof(dst));
status = pRtlNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), dst, &dstlen );
......@@ -6086,17 +6086,17 @@ static void test_NormalizeString(void)
SetLastError(0xdeadbeef);
dstlen = pNormalizeString( NormalizationD, part0_str1, -1, dst, 1 );
ok( dstlen <= 0, "wrong len %d\n", dstlen );
todo_wine 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 );
todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError());
ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError());
SetLastError(0xdeadbeef);
dstlen = pNormalizeString( NormalizationC, part0_str2, -1, NULL, 0 );
todo_wine ok( dstlen == 12, "wrong len %d\n", dstlen );
ok( dstlen == 12, "wrong len %d\n", dstlen );
todo_wine ok(GetLastError() == ERROR_SUCCESS, "got error %u\n", GetLastError());
SetLastError(0xdeadbeef);
......@@ -6124,13 +6124,13 @@ static void test_NormalizeString(void)
int expect = (i < 2) ? j * 3 : j * 18;
if (expect > 64) expect = max( 64, j + j / 8 );
dstlen = pNormalizeString( norm_forms[i], dst, j, NULL, 0 );
todo_wine ok( dstlen == expect, "%d: %d -> wrong len %d\n", i, j, dstlen );
ok( dstlen == expect, "%d: %d -> wrong len %d\n", i, j, dstlen );
if (pRtlNormalizeString)
{
dstlen = 0;
status = pRtlNormalizeString( norm_forms[i], dst, j, NULL, &dstlen );
ok( !status, "%d: failed %x\n", i, status );
todo_wine ok( dstlen == expect, "%d: %d -> wrong len %d\n", i, j, dstlen );
ok( dstlen == expect, "%d: %d -> wrong len %d\n", i, j, dstlen );
}
}
}
......@@ -6139,7 +6139,7 @@ static void test_NormalizeString(void)
int srclen = ARRAY_SIZE( composite_src );
int expect = max( 64, srclen + srclen / 8 );
dstlen = pNormalizeString( norm_forms[i], composite_src, srclen, NULL, 0 );
todo_wine ok( dstlen == expect, "%d: wrong len %d\n", i, dstlen );
ok( dstlen == expect, "%d: wrong len %d\n", i, dstlen );
dstlen = pNormalizeString( norm_forms[i], composite_src, srclen, dst, dstlen );
if (i == 0 || i == 2)
{
......@@ -6149,14 +6149,14 @@ static void test_NormalizeString(void)
else
{
todo_wine ok( dstlen < -expect, "%d: wrong len %d\n", i, dstlen );
todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError());
ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got error %u\n", GetLastError());
}
if (pRtlNormalizeString)
{
dstlen = 0;
status = pRtlNormalizeString( norm_forms[i], composite_src, srclen, NULL, &dstlen );
ok( !status, "%d: failed %x\n", i, status );
todo_wine ok( dstlen == expect, "%d: wrong len %d\n", i, dstlen );
ok( dstlen == expect, "%d: wrong len %d\n", i, dstlen );
status = pRtlNormalizeString( norm_forms[i], composite_src, srclen, dst, &dstlen );
if (i == 0 || i == 2)
{
......@@ -6165,7 +6165,7 @@ static void test_NormalizeString(void)
}
else
{
todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "%d: failed %x\n", i, status );
ok( status == STATUS_BUFFER_TOO_SMALL, "%d: failed %x\n", i, status );
ok( dstlen > expect, "%d: wrong len %d\n", i, dstlen );
}
}
......@@ -6223,13 +6223,13 @@ static void test_NormalizeString(void)
for (i = 0; i < 4; i++)
{
dstlen = pNormalizeString( norm_forms[i], L"AB\xd800Z", -1, NULL, 0 );
todo_wine ok( dstlen == (i < 2 ? 15 : 64), "%d: wrong len %d\n", i, dstlen );
ok( dstlen == (i < 2 ? 15 : 64), "%d: wrong len %d\n", i, dstlen );
SetLastError( 0xdeadbeef );
dstlen = pNormalizeString( norm_forms[i], L"AB\xd800Z", -1, dst, ARRAY_SIZE(dst) );
todo_wine ok( dstlen == -3, "%d: wrong len %d\n", i, dstlen );
todo_wine ok( GetLastError() == ERROR_NO_UNICODE_TRANSLATION, "%d: wrong error %d\n", i, GetLastError() );
dstlen = pNormalizeString( norm_forms[i], L"ABCD\xdc12Z", -1, NULL, 0 );
todo_wine ok( dstlen == (i < 2 ? 21 : 64), "%d: wrong len %d\n", i, dstlen );
ok( dstlen == (i < 2 ? 21 : 64), "%d: wrong len %d\n", i, dstlen );
SetLastError( 0xdeadbeef );
dstlen = pNormalizeString( norm_forms[i], L"ABCD\xdc12Z", -1, dst, ARRAY_SIZE(dst) );
todo_wine ok( dstlen == -4, "%d: wrong len %d\n", i, dstlen );
......@@ -6237,23 +6237,22 @@ static void test_NormalizeString(void)
SetLastError( 0xdeadbeef );
dstlen = pNormalizeString( norm_forms[i], L"ABCD\xdc12Z", -1, dst, 2 );
todo_wine ok( dstlen == (i < 2 ? -18 : -74), "%d: wrong len %d\n", i, dstlen );
todo_wine_if (i == 0 || i == 2)
ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "%d: wrong error %d\n", i, GetLastError() );
if (pRtlNormalizeString)
{
dstlen = 0;
status = pRtlNormalizeString( norm_forms[i], L"AB\xd800Z", -1, NULL, &dstlen );
ok( !status, "%d: failed %x\n", i, status );
todo_wine ok( dstlen == (i < 2 ? 15 : 64), "%d: wrong len %d\n", i, dstlen );
ok( dstlen == (i < 2 ? 15 : 64), "%d: wrong len %d\n", i, dstlen );
dstlen = ARRAY_SIZE(dst);
status = pRtlNormalizeString( norm_forms[i], L"AB\xd800Z", -1, dst, &dstlen );
todo_wine ok( status == STATUS_NO_UNICODE_TRANSLATION, "%d: failed %x\n", i, status );
todo_wine ok( dstlen == 3, "%d: wrong len %d\n", i, dstlen );
dstlen = 1;
status = pRtlNormalizeString( norm_forms[i], L"AB\xd800Z", -1, dst, &dstlen );
todo_wine_if (i == 0 || i == 2)
ok( status == STATUS_BUFFER_TOO_SMALL, "%d: failed %x\n", i, status );
todo_wine ok( dstlen == (i < 2 ? 14 : 73), "%d: wrong len %d\n", i, dstlen );
todo_wine_if (i != 3)
ok( dstlen == (i < 2 ? 14 : 73), "%d: wrong len %d\n", i, dstlen );
dstlen = 2;
status = pRtlNormalizeString( norm_forms[i], L"AB\xd800Z", -1, dst, &dstlen );
todo_wine ok( status == STATUS_NO_UNICODE_TRANSLATION, "%d: failed %x\n", i, status );
......
dlls/ntdll/locale.c
View file @ a7cc191a
......@@ -223,21 +223,25 @@ static void canonical_order_string( WCHAR *str, unsigned int len )
}
static unsigned int decompose_string( int flags, const WCHAR *src, unsigned int src_len,
WCHAR *dst, unsigned int dst_len )
static NTSTATUS decompose_string( int flags, const WCHAR *src, int src_len, WCHAR *dst, int *dst_len )
{
unsigned int src_pos, dst_pos = 0, decomp_len;
int src_pos, dst_pos = 0, decomp_len;
for (src_pos = 0; src_pos < src_len; src_pos++)
{
if (dst_pos == dst_len) return 0;
decomp_len = wine_decompose( flags, src[src_pos], dst + dst_pos, dst_len - dst_pos );
if (decomp_len == 0) return 0;
if (dst_pos == *dst_len) break;
decomp_len = wine_decompose( flags, src[src_pos], dst + dst_pos, *dst_len - dst_pos );
if (decomp_len == 0) break;
dst_pos += decomp_len;
}
if (flags & WINE_DECOMPOSE_REORDER) canonical_order_string( dst, dst_pos );
return dst_pos;
if (src_pos < src_len)
{
*dst_len += (src_len - src_pos) * (flags & WINE_DECOMPOSE_COMPAT ? 18 : 3);
return STATUS_BUFFER_TOO_SMALL;
}
canonical_order_string( dst, dst_pos );
*dst_len = dst_pos;
return STATUS_SUCCESS;
}
......@@ -1687,8 +1691,7 @@ 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, compat;
unsigned int res, buf_len;
int flags = 0, compose, compat, buf_len;
WCHAR *buf = NULL;
NTSTATUS status = STATUS_SUCCESS;
......@@ -1706,42 +1709,38 @@ NTSTATUS WINAPI RtlNormalizeString( ULONG form, const WCHAR *src, INT src_len, W
if (src_len == -1) src_len = strlenW(src) + 1;
if (compat) flags |= WINE_DECOMPOSE_COMPAT;
if (compose || *dst_len) flags |= WINE_DECOMPOSE_REORDER;
if (!compose && *dst_len)
if (!*dst_len)
{
res = decompose_string( flags, src, src_len, dst, *dst_len );
if (!res)
{
status = STATUS_BUFFER_TOO_SMALL;
goto done;
}
buf = dst;
*dst_len = compat ? src_len * 18 : src_len * 3;
if (*dst_len > 64) *dst_len = max( 64, src_len + src_len / 8 );
return STATUS_SUCCESS;
}
else if (src_len)
if (!src_len)
{
buf_len = src_len * 4;
for (;;)
{
buf = RtlAllocateHeap( GetProcessHeap(), 0, buf_len * sizeof(WCHAR) );
if (!buf) return STATUS_NO_MEMORY;
res = decompose_string( flags, src, src_len, buf, buf_len );
if (res) break;
buf_len *= 2;
RtlFreeHeap( GetProcessHeap(), 0, buf );
}
*dst_len = 0;
return STATUS_SUCCESS;
}
else res = 0;
if (compose)
if (compat) flags |= WINE_DECOMPOSE_COMPAT;
if (!compose) return decompose_string( flags, src, src_len, dst, dst_len );
buf_len = src_len * 4;
for (;;)
{
res = compose_string( buf, res );
if (*dst_len >= res) memcpy( dst, buf, res * sizeof(WCHAR) );
buf = RtlAllocateHeap( GetProcessHeap(), 0, buf_len * sizeof(WCHAR) );
if (!buf) return STATUS_NO_MEMORY;
status = decompose_string( flags, src, src_len, buf, &buf_len );
if (status != STATUS_BUFFER_TOO_SMALL) break;
RtlFreeHeap( GetProcessHeap(), 0, buf );
}
done:
if (buf != dst) RtlFreeHeap( GetProcessHeap(), 0, buf );
*dst_len = res;
if (!status)
{
buf_len = compose_string( buf, buf_len );
if (*dst_len >= buf_len) memcpy( dst, buf, buf_len * sizeof(WCHAR) );
else status = STATUS_BUFFER_TOO_SMALL;
}
RtlFreeHeap( GetProcessHeap(), 0, buf );
*dst_len = buf_len;
return status;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment