ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Add _mbctohira implementation.

This commit is contained in:
Akihiro Sagawa 2015-03-16 21:48:46 +09:00 committed by Alexandre Julliard
parent a2149ba7ba
commit b6ab2b6268
10 changed files with 51 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcr100/msvcr100.spec
View File

@ -1082,7 +1082,7 @@
@ stub _mbcjmstojis_l
@ cdecl _mbclen(ptr)
@ stub _mbclen_l
@ stub _mbctohira(long)
@ cdecl _mbctohira(long)
@ stub _mbctohira_l
@ stub _mbctokata(long)
@ stub _mbctokata_l

2
dlls/msvcr110/msvcr110.spec
View File

@ -1440,7 +1440,7 @@
@ stub _mbcjmstojis_l
@ cdecl _mbclen(ptr)
@ stub _mbclen_l
@ stub _mbctohira(long)
@ cdecl _mbctohira(long)
@ stub _mbctohira_l
@ stub _mbctokata(long)
@ stub _mbctokata_l

2
dlls/msvcr120/msvcr120.spec
View File

@ -1448,7 +1448,7 @@
@ stub _mbcjmstojis_l
@ cdecl _mbclen(ptr)
@ stub _mbclen_l
@ stub _mbctohira(long)
@ cdecl _mbctohira(long)
@ stub _mbctohira_l
@ stub _mbctokata(long)
@ stub _mbctokata_l

2
dlls/msvcr70/msvcr70.spec
View File

@ -423,7 +423,7 @@
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbclen(ptr)
@ stub _mbctohira(long)
@ cdecl _mbctohira(long)
@ stub _mbctokata(long)
@ cdecl _mbctolower(long)
@ cdecl _mbctombb(long)

2
dlls/msvcr71/msvcr71.spec
View File

@ -418,7 +418,7 @@
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbclen(ptr)
@ stub _mbctohira(long)
@ cdecl _mbctohira(long)
@ stub _mbctokata(long)
@ cdecl _mbctolower(long)
@ cdecl _mbctombb(long)

2
dlls/msvcr80/msvcr80.spec
View File

@ -755,7 +755,7 @@
@ stub _mbcjmstojis_l
@ cdecl _mbclen(ptr)
@ stub _mbclen_l
@ stub _mbctohira(long)
@ cdecl _mbctohira(long)
@ stub _mbctohira_l
@ stub _mbctokata(long)
@ stub _mbctokata_l

2
dlls/msvcr90/msvcr90.spec
View File

@ -732,7 +732,7 @@
@ stub _mbcjmstojis_l
@ cdecl _mbclen(ptr)
@ stub _mbclen_l
@ stub _mbctohira(long)
@ cdecl _mbctohira(long)
@ stub _mbctohira_l
@ stub _mbctokata(long)
@ stub _mbctokata_l

12
dlls/msvcrt/mbcs.c
View File

@ -2276,3 +2276,15 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr,
return ret;
}
/*********************************************************************
* _mbctohira (MSVCRT.@)
*
* Converts a sjis katakana character to hiragana.
*/
unsigned int CDECL _mbctohira(unsigned int c)
{
if(_ismbckata(c) && c <= 0x8393)
return (c - 0x8340 - (c >= 0x837f ? 1 : 0)) + 0x829f;
return c;
}

2
dlls/msvcrt/msvcrt.spec
View File

@ -698,7 +698,7 @@
# stub _mbcjmstojis_l(long ptr)
@ cdecl _mbclen(ptr)
# stub _mbclen_l(ptr ptr)
@ stub _mbctohira(long)
@ cdecl _mbctohira(long)
# stub _mbctohira_l(long ptr)
@ stub _mbctokata(long)
# stub _mbctokata_l(long ptr)

31
dlls/msvcrt/tests/string.c
View File

@ -1142,6 +1142,36 @@ static void test_mbcjmsjis(void)
_setmbcp(prev_cp);
}
static void test_mbctohira(void)
{
static const unsigned int mbchira_932[][2] = {
{0x8152, 0x8152}, {0x8153, 0x8153}, {0x8154, 0x8154}, {0x8155, 0x8155},
{0x82a0, 0x82a0}, {0x833f, 0x833f}, {0x8340, 0x829f}, {0x837e, 0x82dd},
{0x837f, 0x837f}, {0x8380, 0x82de}, {0x8393, 0x82f1}, {0x8394, 0x8394},
{0x8396, 0x8396}, {0x8397, 0x8397},
{0xa5, 0xa5}, {0xb0, 0xb0}, {0xdd, 0xdd} };
unsigned int i;
unsigned int prev_cp = _getmbcp();
_setmbcp(_MB_CP_SBCS);
for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++)
{
int ret, exp = mbchira_932[i][0];
ret = _mbctohira(mbchira_932[i][0]);
ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret);
}
_setmbcp(932);
for (i = 0; i < sizeof(mbchira_932)/sizeof(mbchira_932[0]); i++)
{
unsigned int ret, exp;
ret = _mbctohira(mbchira_932[i][0]);
exp = mbchira_932[i][1];
ok(ret == exp, "Expected 0x%x, got 0x%x\n", exp, ret);
}
_setmbcp(prev_cp);
}
static void test_mbbtombc(void)
{
static const unsigned int mbbmbc[][2] = {
@ -2888,6 +2918,7 @@ START_TEST(string)
test__mbscpy_s();
test_mbcjisjms();
test_mbcjmsjis();
test_mbctohira();
test_mbbtombc();
test_mbctombb();
test_ismbckata();