[PATCH v2 0/2] MR6920: msvcp60: Fix NULL dst argument handling in wcsrtombs.
-- v2: msvcp60/tests: Add wcsrtombs tests. msvcp60: Improve wcsrtombs implementation. https://gitlab.winehq.org/wine/wine/-/merge_requests/6920
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1f826ac485f..192ee8b98ef 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -12802,18 +12802,27 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s char buffer[MB_LEN_MAX]; size_t ret = 0; + if (state) *state = 0; src = *pstr; while (!dst || n > ret) { int len = _Wcrtomb( buffer, *src, state, NULL ); if (len <= 0) return -1; - if (n < ret + len) break; - memcpy( dst + ret, buffer, len ); + if (dst) + { + if (n < ret + len) break; + memcpy( dst + ret, buffer, len ); + } + if (!buffer[0]) + { + src = NULL; + break; + } ret += len; - if (!buffer[0]) break; src++; } + if (dst) *pstr = src; return ret; } #endif -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6920
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp60/tests/string.c | 89 ++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index ca6b05d6627..1d2183e366e 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -18,6 +18,8 @@ #include <stdio.h> #include <limits.h> +#include <locale.h> +#include <wchar.h> #include <windef.h> #include <winbase.h> @@ -120,6 +122,8 @@ static logic_error* (__thiscall *p_logic_error_ctor_bstr)(logic_error*, const ba static void (__thiscall *p_logic_error_dtor)(logic_error*); static const char *(__thiscall *p_logic_error_what)(logic_error*); +size_t (__cdecl *p_wcsrtombs)(char*, const wchar_t**, size_t, mbstate_t*); + /* Emulate a __thiscall */ #ifdef __i386__ @@ -366,6 +370,8 @@ static BOOL init(void) "?what(a)logic_error@std@@UBEPBDXZ"); } + SET(p_wcsrtombs, "wcsrtombs"); + init_thiscall_thunk(); return TRUE; } @@ -756,6 +762,87 @@ static void test_basic_string_wchar_swap(void) { call_func1(p_basic_string_wchar_dtor, &str2); } +static void test_wcsrtombs(void) +{ + const wchar_t test_str1[] = L"\x3042"; + const wchar_t test_str2[] = L"\x3042\x3043"; + const wchar_t *wstr; + mbstate_t state; + char buf[16]; + size_t ret; + + if (!setlocale(LC_ALL, "Japanese_Japan.932")) + { + win_skip("wcrtomb tests\n"); + return; + } + + wstr = test_str1; + ret = p_wcsrtombs(NULL, &wstr, 0, NULL); + ok(ret == 2, "wcsrtomb returned %Id\n", ret); + ok(wstr == test_str1, "wstr = %p, expected %p\n", wstr, test_str1); + + wstr = test_str1; + state = 0xdeadbeef; + ret = p_wcsrtombs(NULL, &wstr, 0, &state); + ok(ret == 2, "wcsrtomb returned %Id\n", ret); + ok(!state, "state = %d\n", state); + ok(wstr == test_str1, "wstr = %p, expected %p\n", wstr, test_str1); + + buf[0] = 'x'; + ret = p_wcsrtombs(buf, &wstr, 0, &state); + ok(!ret, "wcsrtomb returned %Id\n", ret); + ok(!state, "state = %d\n", state); + ok(buf[0] == 'x', "buf[0] = %x\n", buf[0]); + + ret = p_wcsrtombs(buf, &wstr, 1, &state); + ok(!ret, "wcsrtomb returned %Id\n", ret); + ok(!state, "state = %d\n", state); + ok(buf[0] == 'x', "buf[0] = %x\n", buf[0]); + + ret = p_wcsrtombs(buf, &wstr, 2, &state); + ok(ret == 2, "wcsrtomb returned %Id\n", ret); + ok(!memcmp(buf, "\x82\xa0", 2), "buf = %s\n", debugstr_an(buf, 2)); + ok(!state, "state = %d\n", state); + ok(wstr == test_str1 + 1, "wstr = %p, expected %p\n", wstr, test_str1 + 1); + + wstr = test_str2; + state = 0xdeadbeef; + ret = p_wcsrtombs(NULL, &wstr, 0, &state); + ok(ret == 4, "wcsrtomb returned %Id\n", ret); + ok(!state, "state = %d\n", state); + ok(wstr == test_str2, "wstr = %p, expected %p\n", wstr, test_str2); + + buf[0] = 'x'; + ret = p_wcsrtombs(buf, &wstr, 1, &state); + ok(!ret, "wcsrtomb returned %Id\n", ret); + ok(!state, "state = %d\n", state); + ok(buf[0] == 'x', "buf[0] = %x\n", buf[0]); + + ret = p_wcsrtombs(buf, &wstr, 2, &state); + ok(ret == 2, "wcsrtomb returned %Id\n", ret); + ok(!memcmp(buf, "\x82\xa0", 2), "buf = %s\n", debugstr_an(buf, 2)); + ok(!state, "state = %d\n", state); + ok(wstr == test_str2 + 1, "wstr = %p, expected %p\n", wstr, test_str2 + 1); + + wstr = test_str2; + ret = p_wcsrtombs(buf, &wstr, 4, &state); + ok(ret == 4, "wcsrtomb returned %Id\n", ret); + ok(!memcmp(buf, "\x82\xa0\x82\xa1", 4), "buf = %s\n", debugstr_an(buf, 4)); + ok(!state, "state = %d\n", state); + ok(wstr == test_str2 + 2, "wstr = %p, expected %p\n", wstr, test_str2 + 2); + + buf[5] = 'x'; + wstr = test_str2; + ret = p_wcsrtombs(buf, &wstr, 16, &state); + ok(ret == 4, "wcsrtomb returned %Id\n", ret); + ok(!memcmp(buf, "\x82\xa0\x82\xa1", 5), "buf = %s\n", debugstr_an(buf, 5)); + ok(!state, "state = %d\n", state); + ok(!wstr, "wstr = %p, expected NULL\n", wstr); + + setlocale(LC_ALL, "C"); +} + static void test_exception(void) { const char *name = "test"; @@ -824,7 +911,7 @@ START_TEST(string) test_basic_string_char_replace(); test_basic_string_wchar(); test_basic_string_wchar_swap(); - + test_wcsrtombs(); test_exception(); FreeLibrary(msvcp); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6920
On Fri Nov 29 12:17:54 2024 +0000, Fabian Maurer wrote:
Looks correct to me, but IMHO a test would be useful. We also still seem to have an off-my-one error in that function, I noticed while testing your changes. If you want, I'd offer to create a bunch of tests, in hopes of saving you the work? I've pushed new version with additional fixes and tests. Thank you.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/6920#note_89221
participants (2)
-
Piotr Caban -
Piotr Caban (＠piotr)