forked from Mirrors/wine-wine
msvcrt: Add _mbctohira implementation.
parent
a2149ba7ba
commit
b6ab2b6268
|
@ -1082,7 +1082,7 @@
|
||||||
@ stub _mbcjmstojis_l
|
@ stub _mbcjmstojis_l
|
||||||
@ cdecl _mbclen(ptr)
|
@ cdecl _mbclen(ptr)
|
||||||
@ stub _mbclen_l
|
@ stub _mbclen_l
|
||||||
@ stub _mbctohira(long)
|
@ cdecl _mbctohira(long)
|
||||||
@ stub _mbctohira_l
|
@ stub _mbctohira_l
|
||||||
@ stub _mbctokata(long)
|
@ stub _mbctokata(long)
|
||||||
@ stub _mbctokata_l
|
@ stub _mbctokata_l
|
||||||
|
|
|
@ -1440,7 +1440,7 @@
|
||||||
@ stub _mbcjmstojis_l
|
@ stub _mbcjmstojis_l
|
||||||
@ cdecl _mbclen(ptr)
|
@ cdecl _mbclen(ptr)
|
||||||
@ stub _mbclen_l
|
@ stub _mbclen_l
|
||||||
@ stub _mbctohira(long)
|
@ cdecl _mbctohira(long)
|
||||||
@ stub _mbctohira_l
|
@ stub _mbctohira_l
|
||||||
@ stub _mbctokata(long)
|
@ stub _mbctokata(long)
|
||||||
@ stub _mbctokata_l
|
@ stub _mbctokata_l
|
||||||
|
|
|
@ -1448,7 +1448,7 @@
|
||||||
@ stub _mbcjmstojis_l
|
@ stub _mbcjmstojis_l
|
||||||
@ cdecl _mbclen(ptr)
|
@ cdecl _mbclen(ptr)
|
||||||
@ stub _mbclen_l
|
@ stub _mbclen_l
|
||||||
@ stub _mbctohira(long)
|
@ cdecl _mbctohira(long)
|
||||||
@ stub _mbctohira_l
|
@ stub _mbctohira_l
|
||||||
@ stub _mbctokata(long)
|
@ stub _mbctokata(long)
|
||||||
@ stub _mbctokata_l
|
@ stub _mbctokata_l
|
||||||
|
|
|
@ -423,7 +423,7 @@
|
||||||
@ cdecl _mbcjistojms(long)
|
@ cdecl _mbcjistojms(long)
|
||||||
@ cdecl _mbcjmstojis(long)
|
@ cdecl _mbcjmstojis(long)
|
||||||
@ cdecl _mbclen(ptr)
|
@ cdecl _mbclen(ptr)
|
||||||
@ stub _mbctohira(long)
|
@ cdecl _mbctohira(long)
|
||||||
@ stub _mbctokata(long)
|
@ stub _mbctokata(long)
|
||||||
@ cdecl _mbctolower(long)
|
@ cdecl _mbctolower(long)
|
||||||
@ cdecl _mbctombb(long)
|
@ cdecl _mbctombb(long)
|
||||||
|
|
|
@ -418,7 +418,7 @@
|
||||||
@ cdecl _mbcjistojms(long)
|
@ cdecl _mbcjistojms(long)
|
||||||
@ cdecl _mbcjmstojis(long)
|
@ cdecl _mbcjmstojis(long)
|
||||||
@ cdecl _mbclen(ptr)
|
@ cdecl _mbclen(ptr)
|
||||||
@ stub _mbctohira(long)
|
@ cdecl _mbctohira(long)
|
||||||
@ stub _mbctokata(long)
|
@ stub _mbctokata(long)
|
||||||
@ cdecl _mbctolower(long)
|
@ cdecl _mbctolower(long)
|
||||||
@ cdecl _mbctombb(long)
|
@ cdecl _mbctombb(long)
|
||||||
|
|
|
@ -755,7 +755,7 @@
|
||||||
@ stub _mbcjmstojis_l
|
@ stub _mbcjmstojis_l
|
||||||
@ cdecl _mbclen(ptr)
|
@ cdecl _mbclen(ptr)
|
||||||
@ stub _mbclen_l
|
@ stub _mbclen_l
|
||||||
@ stub _mbctohira(long)
|
@ cdecl _mbctohira(long)
|
||||||
@ stub _mbctohira_l
|
@ stub _mbctohira_l
|
||||||
@ stub _mbctokata(long)
|
@ stub _mbctokata(long)
|
||||||
@ stub _mbctokata_l
|
@ stub _mbctokata_l
|
||||||
|
|
|
@ -732,7 +732,7 @@
|
||||||
@ stub _mbcjmstojis_l
|
@ stub _mbcjmstojis_l
|
||||||
@ cdecl _mbclen(ptr)
|
@ cdecl _mbclen(ptr)
|
||||||
@ stub _mbclen_l
|
@ stub _mbclen_l
|
||||||
@ stub _mbctohira(long)
|
@ cdecl _mbctohira(long)
|
||||||
@ stub _mbctohira_l
|
@ stub _mbctohira_l
|
||||||
@ stub _mbctokata(long)
|
@ stub _mbctokata(long)
|
||||||
@ stub _mbctokata_l
|
@ stub _mbctokata_l
|
||||||
|
|
|
@ -2276,3 +2276,15 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr,
|
||||||
|
|
||||||
return ret;
|
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;
|
||||||
|
}
|
||||||
|
|
|
@ -698,7 +698,7 @@
|
||||||
# stub _mbcjmstojis_l(long ptr)
|
# stub _mbcjmstojis_l(long ptr)
|
||||||
@ cdecl _mbclen(ptr)
|
@ cdecl _mbclen(ptr)
|
||||||
# stub _mbclen_l(ptr ptr)
|
# stub _mbclen_l(ptr ptr)
|
||||||
@ stub _mbctohira(long)
|
@ cdecl _mbctohira(long)
|
||||||
# stub _mbctohira_l(long ptr)
|
# stub _mbctohira_l(long ptr)
|
||||||
@ stub _mbctokata(long)
|
@ stub _mbctokata(long)
|
||||||
# stub _mbctokata_l(long ptr)
|
# stub _mbctokata_l(long ptr)
|
||||||
|
|
|
@ -1142,6 +1142,36 @@ static void test_mbcjmsjis(void)
|
||||||
_setmbcp(prev_cp);
|
_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 void test_mbbtombc(void)
|
||||||
{
|
{
|
||||||
static const unsigned int mbbmbc[][2] = {
|
static const unsigned int mbbmbc[][2] = {
|
||||||
|
@ -2888,6 +2918,7 @@ START_TEST(string)
|
||||||
test__mbscpy_s();
|
test__mbscpy_s();
|
||||||
test_mbcjisjms();
|
test_mbcjisjms();
|
||||||
test_mbcjmsjis();
|
test_mbcjmsjis();
|
||||||
|
test_mbctohira();
|
||||||
test_mbbtombc();
|
test_mbbtombc();
|
||||||
test_mbctombb();
|
test_mbctombb();
|
||||||
test_ismbckata();
|
test_ismbckata();
|
||||||
|
|
Loading…
Reference in New Issue