From: Paul Gofman pgofman@codeweavers.com
--- dlls/msvcp140/tests/msvcp140.c | 210 +++++++++++++++++++++++++++++++++ dlls/msvcp90/locale.c | 122 ++++++++++++++++++- 2 files changed, 330 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 3fb5570c6e6..35b10b6604e 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1895,6 +1895,11 @@ static void test__Fiopen(void)
static const char bom_header[] = { 0xef, 0xbb, 0xbf };
+static BOOL str_has_bom_header(const char *str) +{ + return !strncmp(str, bom_header, sizeof(bom_header)); +} + void test_codecvt_char16(void) { static const struct @@ -2082,6 +2087,183 @@ void test_codecvt_char16(void) ok(state.wchar == 0x7d, "got %#x.\n", state.wchar); }
+ strcpy(str, "abc"); + + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 3, (const char **)&str_ptr, str16, str16 + 2, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 2, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"ab"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 2, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 2, (const char **)&str_ptr, str16, str16 + 3, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 2, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"ab"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 2, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + strcpy(str, "\xf0\x92\x80\x92"); + + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 4, (const char **)&str_ptr, str16, str16 + 2, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 2, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xd808\xdc12"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 4, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 1, (const char **)&str_ptr, str16, str16 + 2, &str16_ptr); + ok(ret == CODECVT_partial, "got %d.\n", ret); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xd808\xdc12"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 0, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 2, (const char **)&str_ptr, str16, str16 + 2, &str16_ptr); + ok(ret == CODECVT_partial, "got %d.\n", ret); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xd808\xdc12"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 0, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 3, (const char **)&str_ptr, str16, str16 + 1, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xd808"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 3, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0xdc00, "got %#x.\n", state.wchar); + + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 4, (const char **)&str_ptr, str16, str16 , &str16_ptr); + ok(ret == CODECVT_partial, "got %d.\n", ret); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + ok(str_ptr - str == 0, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0, "got %#x.\n", state.wchar); + + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 4, (const char **)&str_ptr, str16, str16 + 1, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xd808"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 3, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0xdc00, "got %#x.\n", state.wchar); + + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 3, (const char **)&str_ptr, str16, str16 + 2, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xd808"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 3, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0xdc00, "got %#x.\n", state.wchar); + + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str + 3, str + 4, (const char **)&str_ptr, str16, str16 + 2, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xdc12"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 4, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + strcpy(str, "\xf0\x92\x80\x92"); + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 4, (const char **)&str_ptr, str16, str16 + 1, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xd808"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 3, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0xdc00, "got %#x.\n", state.wchar); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str + 3, str + 4, (const char **)&str_ptr, str16, str16 + 1, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xdc12"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 4, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + strcpy(str, "\xe0\xa1\x93"); + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 3, (const char **)&str_ptr, str16, str16 + 1, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\x0853"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 3, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + strcpy(str, "\xe0\xa1\x93"); + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 3, (const char **)&str_ptr, str16, str16, &str16_ptr); + ok(ret == CODECVT_partial, "got %d.\n", ret); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + ok(str_ptr - str == 0, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0, "got %#x.\n", state.wchar); + + strcpy(str, "\xe0\xa1\x93"); + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 2, (const char **)&str_ptr, str16, str16 + 2, &str16_ptr); + ok(ret == CODECVT_partial, "got %d.\n", ret); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + ok(str_ptr - str == 0, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0, "got %#x.\n", state.wchar); + + strcpy(str, "\xf0\xff\xff\xff"); + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 2, (const char **)&str_ptr, str16, str16 + 4, &str16_ptr); + ok(ret == CODECVT_partial, "got %d.\n", ret); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + ok(str_ptr - str == 0, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0, "got %#x.\n", state.wchar); + + strcpy(str, "\xf0\xff\xff\xff"); + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 3, (const char **)&str_ptr, str16, str16 + 4, &str16_ptr); + ok(ret == CODECVT_error, "got %d.\n", ret); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + ok(str_ptr - str == 1, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0, "got %#x.\n", state.wchar); + + strcpy(str, "\xf0\x82\x80\x92"); + + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 4, (const char **)&str_ptr, str16, str16 + 2, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\x2012"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 4, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + + strcpy(str, "\xf0\xff\xff\xff"); + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 4, (const char **)&str_ptr, str16, str16 + 4, &str16_ptr); + ok(ret == CODECVT_error, "got %d.\n", ret); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + ok(str_ptr - str == 1, "got %Id.\n", str_ptr - str); + ok(state.wchar == 0, "got %#x.\n", state.wchar); + + strcpy(str, "\xed\xa0\x80"); + memset(&state, 0, sizeof(state)); + memset(str16, 0, sizeof(str16)); + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + 3, (const char **)&str_ptr, str16, str16 + 4, &str16_ptr); + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str16_ptr - str16 == 1, "got %Id.\n", str16_ptr - str16); + ok(!wcscmp(str16, L"\xd800"), "got %s.\n", debugstr_w(str16)); + ok(str_ptr - str == 3, "got %Id.\n", str_ptr - str); + ok(state.wchar == 1, "got %#x.\n", state.wchar); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { winetest_push_context("test %u", i); @@ -2128,6 +2310,34 @@ void test_codecvt_char16(void) ok(str_ptr - str == 0, "got %Id, expected %u.\n", str_ptr - str, 0); } } + strcpy(str, tests[i].str); + memset(&state, 0, sizeof(state)); + + ret = (int)call_func8(p_codecvt_char16_do_in, this, &state, str, str + len, (const char **)&str_ptr, str16, str16 + wlen + 10, &str16_ptr); + if (test_flags[j] & consume_header && str_has_bom_header(str)) + { + if (strlen(str) == sizeof(bom_header)) + { + ok(ret == CODECVT_partial, "got %d.\n", ret); + ok(str_ptr - str == 0, "got %Id.\n", str_ptr - str); + ok(str16_ptr - str16 == 0, "got %Id.\n", str16_ptr - str16); + } + else + { + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str_ptr - str == len, "got %Id.\n", str_ptr - str); + ok(str16_ptr - str16 == wlen - 1, "got %Id.\n", str16_ptr - str16); + ok(!wcsncmp(str16, tests[i].wstr + 1, wlen - 1), "got %s, expected %s.\n", + debugstr_wn(str16, wlen), debugstr_wn(tests[i].wstr, wlen)); + } + } + else + { + ok(ret == CODECVT_ok, "got %d.\n", ret); + ok(str_ptr - str == len, "got %Id, expected %u.\n", str_ptr - str, len); + ok(str16_ptr - str16 == wlen, "got %Id, expected %u.\n", str16_ptr - str16, wlen); + ok(!wcsncmp(str16, tests[i].wstr, wlen), "got %s, expected %s.\n", debugstr_wn(str16, wlen), debugstr_wn(tests[i].wstr, wlen)); + }
winetest_pop_context(); } diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0eb47bd6ab5..66f7dae1400 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -4125,9 +4125,127 @@ int __thiscall codecvt_char16_do_in(const codecvt_char16 *this, _Mbstatet *state const char *from, const char *from_end, const char **from_next, char16_t *to, char16_t *to_end, char16_t **to_next) { - FIXME("(%p %p %p %p %p %p %p %p) stub\n", this, state, from, + static const char utf8_length[128] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x80-0x8f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x90-0x9f */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xa0-0xaf */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xb0-0xbf */ + 0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* 0xc0-0xcf */ + 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* 0xd0-0xdf */ + 3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, /* 0xe0-0xef */ + 4,4,4,4,4,0,0,0,0,0,0,0,0,0,0,0 /* 0xf0-0xff */ + }; + /* first byte mask depending on UTF-8 sequence length */ + static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; + + unsigned int res, len; + unsigned char ch; + const char *end; + BOOL fourbyte; + + TRACE("(%p %p %p %p %p %p %p %p)\n", this, state, from, from_end, from_next, to, to_end, to_next); - return 0; + + if (this->convert_mode & ~(generate_header | consume_header)) + FIXME("convert_mode %#x.\n", this->convert_mode); + + *from_next = from; + *to_next = to; + + while (*from_next != from_end && *to_next != to_end) + { + fourbyte = FALSE; + ch = **from_next; + if ((res = MBSTATET_TO_INT(state)) & ~1) + { + ch = ch ^ 0x80; + if (ch >= 0x40) + return CODECVT_error; + res |= ch; + ++*from_next; + MBSTATET_TO_INT(state) = 1; + } + else if (ch < 0x80) + { + res = ch; + ++*from_next; + } + else + { + if (!(len = utf8_length[ch - 0x80])) + { + ++*from_next; + return CODECVT_error; + } + + if (from_end - *from_next < min(len, 3)) + break; + ++*from_next; + res = ch & utf8_mask[len - 1]; + end = *from_next + len - 1; + switch (len) + { + case 4: + if ((ch = end[-3] ^ 0x80) >= 0x40) + return CODECVT_error; + res = (res << 6) | ch; + fourbyte = TRUE; + /* fallthrough */ + case 3: + if ((ch = end[-2] ^ 0x80) >= 0x40) + return CODECVT_error; + res = (res << 6) | ch; + ++*from_next; + /* fallthrough */ + case 2: + if (len == 4) + ch = 0; + else if ((ch = end[-1] ^ 0x80) >= 0x40) + return CODECVT_error; + res = (res << 6) | ch; + ++*from_next; + break; + } + } + + if (res > this->max_code) + return CODECVT_error; + + if (fourbyte) + { + if (res > 0x10000) + { + res -= 0x10000; + MBSTATET_TO_INT(state) = 0xdc00 | (res & 0x3ff); + res = 0xd800 | (res >> 10); + } + else + { + MBSTATET_TO_INT(state) = res; + continue; + } + } + if (!MBSTATET_TO_INT(state)) + { + MBSTATET_TO_INT(state) = 1; + if (this->convert_mode & consume_header && res == 0xfeff) + { + if (*from_next == from_end) + { + *from_next = from; + break; + } + continue; + } + } + *(*to_next)++ = res; + } + + if (*from_next != from) + return CODECVT_ok; + + return CODECVT_partial; }
/* ?in@?$codecvt@_SDU_Mbstatet@@@std@@QBAHAAU_Mbstatet@@PBD1AAPBDPA_S3AAPA_S@Z */