system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 06:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcrt: Add support for multi-byte characters in _mbctoupper_l.

Browse source
This commit is contained in:
Piotr Caban 2022-10-19 13:16:17 +02:00 committed by Alexandre Julliard
parent 3861c1e36a
commit 71144728cf
2 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dlls/msvcrt/mbcs.c
View file

@ -494,12 +494,34 @@ unsigned int CDECL _mbctolower(unsigned int c)
*/
unsigned int CDECL _mbctoupper_l(unsigned int c, _locale_t locale)
{
if (_ismbblead_l(c, locale))
unsigned char str[2], ret[2];
pthreadmbcinfo mbcinfo;
if(!locale)
mbcinfo = get_mbcinfo();
else
mbcinfo = locale->mbcinfo;
if (c > 0xff)
{
FIXME("Handle MBC chars\n");
return c;
if (!_ismbblead_l((c >> 8) & 0xff, locale))
return c;
str[0] = c >> 8;
str[1] = c;
switch(__crtLCMapStringA(mbcinfo->mblcid, LCMAP_UPPERCASE,
(char*)str, 2, (char*)ret, 2, mbcinfo->mbcodepage, 0))
{
case 0:
return c;
case 1:
return ret[0];
default:
return ret[1] + (ret[0] << 8);
}
}
return _toupper_l(c, locale); /* ASCII CP or SB char */
return mbcinfo->mbctype[c + 1] & _SBLOW ? mbcinfo->mbcasemap[c] : c;
}
/*********************************************************************

8
dlls/msvcrt/tests/string.c
View file

@ -2839,6 +2839,7 @@ static void test__mbsupr_s(void)
{
errno_t ret;
unsigned char buffer[20];
int cp = _getmbcp();
if (!p_mbsupr_s)
{
@ -2890,6 +2891,13 @@ static void test__mbsupr_s(void)
"Expected the output buffer to be \"ABCDEFGH\\0ijklmnop\", got \"%s\"\n",
buffer);
_setmbcp(936);
memcpy(buffer, "\xa2\xa1\xa2\xa2q", sizeof("\xa2\xa1\xa2\xa2q"));
ret = p_mbsupr_s(buffer, sizeof(buffer));
ok(ret == 0, "Expected _mbsupr_s to return 0, got %d\n", ret);
ok(!memcmp(buffer, "\xa2\xf1\xa2\xf2Q", sizeof("\xa2\xf1\xa2\xf2Q")),
"got %s\n", debugstr_a((char*)buffer));
_setmbcp(cp);
}
static void test__mbslwr_s(void)