Module: wine Branch: master Commit: dbb01a74e0eb65f9b5902adeb433b5d4774c7208 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbb01a74e0eb65f9b5902adeb433b5d...
Author: Bartosz Kosiorek gang65@poczta.onet.pl Date: Thu Oct 27 21:17:01 2022 +0200
msvcrt: Add _mbctokata_l implementation.
---
dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 15 ++++++++++++--- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d32bed81d18..4be6144ca7e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1086,7 +1086,7 @@ @ cdecl _mbctohira(long) @ cdecl _mbctohira_l(long ptr) @ cdecl _mbctokata(long) -@ stub _mbctokata_l +@ cdecl _mbctokata_l(long ptr) @ cdecl _mbctolower(long) @ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d3c6760ee75..aee92ec232f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1443,7 +1443,7 @@ @ cdecl _mbctohira(long) @ cdecl _mbctohira_l(long ptr) @ cdecl _mbctokata(long) -@ stub _mbctokata_l +@ cdecl _mbctokata_l(long ptr) @ cdecl _mbctolower(long) @ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b54edaf48d4..6c0d560b67f 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1454,7 +1454,7 @@ @ cdecl _mbctohira(long) @ cdecl _mbctohira_l(long ptr) @ cdecl _mbctokata(long) -@ stub _mbctokata_l +@ cdecl _mbctokata_l(long ptr) @ cdecl _mbctolower(long) @ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5c11c5d871c..f3981ed3dea 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -758,7 +758,7 @@ @ cdecl _mbctohira(long) @ cdecl _mbctohira_l(long ptr) @ cdecl _mbctokata(long) -@ stub _mbctokata_l +@ cdecl _mbctokata_l(long ptr) @ cdecl _mbctolower(long) @ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9c25f566a96..3e581b911e2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -736,7 +736,7 @@ @ cdecl _mbctohira(long) @ cdecl _mbctohira_l(long ptr) @ cdecl _mbctokata(long) -@ stub _mbctokata_l +@ cdecl _mbctokata_l(long ptr) @ cdecl _mbctolower(long) @ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index b0f8696efc4..16c5c378be7 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2970,17 +2970,26 @@ unsigned int CDECL _mbctohira(unsigned int c) }
/********************************************************************* - * _mbctokata (MSVCRT.@) + * _mbctokata_l (MSVCRT.@) * * Converts a sjis hiragana character to katakana. */ -unsigned int CDECL _mbctokata(unsigned int c) +unsigned int CDECL _mbctokata_l(unsigned int c, _locale_t locale) { - if(_ismbchira(c)) + if(_ismbchira_l(c, locale)) return (c - 0x829f) + 0x8340 + (c >= 0x82de ? 1 : 0); return c; }
+ +/********************************************************************* + * _mbctokata (MSVCRT.@) + */ +unsigned int CDECL _mbctokata(unsigned int c) +{ + return _mbctokata_l(c, NULL); +} + /********************************************************************* * _ismbcl0_l (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4674082fc8c..8c6a3b9a910 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -703,7 +703,7 @@ @ cdecl _mbctohira(long) @ cdecl _mbctohira_l(long ptr) @ cdecl _mbctokata(long) -# stub _mbctokata_l(long ptr) +@ cdecl _mbctokata_l(long ptr) @ cdecl _mbctolower(long) @ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index ea017cbffcd..c7bff96ee26 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -601,7 +601,7 @@ @ cdecl _mbctohira(long) @ cdecl _mbctohira_l(long ptr) @ cdecl _mbctokata(long) -@ stub _mbctokata_l +@ cdecl _mbctokata_l(long ptr) @ cdecl _mbctolower(long) @ cdecl _mbctolower_l(long ptr) @ cdecl _mbctombb(long) @@ -1171,7 +1171,7 @@ @ cdecl _o__mbctohira(long) _mbctohira @ cdecl _o__mbctohira_l(long ptr) _mbctohira_l @ cdecl _o__mbctokata(long) _mbctokata -@ stub _o__mbctokata_l +@ cdecl _o__mbctokata_l(long ptr) _mbctokata_l @ cdecl _o__mbctolower(long) _mbctolower @ cdecl _o__mbctolower_l(long ptr) _mbctolower_l @ cdecl _o__mbctombb(long) _mbctombb