[PATCH v4 8/9] msvcrt: Add _mbctohira_l implementation.

[Bartosz Kosiorek]

From: Bartosz Kosiorek

---
 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          | 14 +++++++++++---
 dlls/msvcrt/msvcrt.spec     |  2 +-
 dlls/ucrtbase/ucrtbase.spec |  4 ++--
 8 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index ae73fdb0835..d32bed81d18 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1084,7 +1084,7 @@
 @ cdecl _mbclen(ptr)
 @ cdecl _mbclen_l(ptr ptr)
 @ cdecl _mbctohira(long)
-@ stub _mbctohira_l
+@ cdecl _mbctohira_l(long ptr)
 @ cdecl _mbctokata(long)
 @ stub _mbctokata_l
 @ cdecl _mbctolower(long)
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 180986405c8..d3c6760ee75 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1441,7 +1441,7 @@
 @ cdecl _mbclen(ptr)
 @ cdecl _mbclen_l(ptr ptr)
 @ cdecl _mbctohira(long)
-@ stub _mbctohira_l
+@ cdecl _mbctohira_l(long ptr)
 @ cdecl _mbctokata(long)
 @ stub _mbctokata_l
 @ cdecl _mbctolower(long)
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 751f7701046..b54edaf48d4 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1452,7 +1452,7 @@
 @ cdecl _mbclen(ptr)
 @ cdecl _mbclen_l(ptr ptr)
 @ cdecl _mbctohira(long)
-@ stub _mbctohira_l
+@ cdecl _mbctohira_l(long ptr)
 @ cdecl _mbctokata(long)
 @ stub _mbctokata_l
 @ cdecl _mbctolower(long)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index d84b4faf265..5c11c5d871c 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -756,7 +756,7 @@
 @ cdecl _mbclen(ptr)
 @ cdecl _mbclen_l(ptr ptr)
 @ cdecl _mbctohira(long)
-@ stub _mbctohira_l
+@ cdecl _mbctohira_l(long ptr)
 @ cdecl _mbctokata(long)
 @ stub _mbctokata_l
 @ cdecl _mbctolower(long)
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 27593fbcaef..9c25f566a96 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -734,7 +734,7 @@
 @ cdecl _mbclen(ptr)
 @ cdecl _mbclen_l(ptr ptr)
 @ cdecl _mbctohira(long)
-@ stub _mbctohira_l
+@ cdecl _mbctohira_l(long ptr)
 @ cdecl _mbctokata(long)
 @ stub _mbctokata_l
 @ cdecl _mbctolower(long)
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 3b653cfff23..32ed7a56c45 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -2943,17 +2943,25 @@ int CDECL mbsrtowcs_s(size_t *ret, wchar_t *wcstr, size_t len,
 }

/*********************************************************************
- *		_mbctohira (MSVCRT.@)
+ *		_mbctohira_l (MSVCRT.@)
  *
  *              Converts a sjis katakana character to hiragana.
  */
-unsigned int CDECL _mbctohira(unsigned int c)
+unsigned int CDECL _mbctohira_l(unsigned int c, _locale_t locale)
 {
-    if(_ismbckata(c) && c <= 0x8393)
+    if(_ismbckata_l(c, locale) && c <= 0x8393)
         return (c - 0x8340 - (c >= 0x837f ? 1 : 0)) + 0x829f;
     return c;
 }

+/*********************************************************************
+ *		_mbctohira (MSVCRT.@)
+ */
+unsigned int CDECL _mbctohira(unsigned int c)
+{
+    return _mbctohira_l(c, NULL);
+}
+
 /*********************************************************************
  *		_mbctokata (MSVCRT.@)
  *
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 90e54cab83c..3c8476f8b61 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -701,7 +701,7 @@
 @ cdecl _mbclen(ptr)
 @ cdecl _mbclen_l(ptr ptr)
 @ cdecl _mbctohira(long)
-# stub _mbctohira_l(long ptr)
+@ cdecl _mbctohira_l(long ptr)
 @ cdecl _mbctokata(long)
 # stub _mbctokata_l(long ptr)
 @ cdecl _mbctolower(long)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 29e0dc9a6e4..ea017cbffcd 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -599,7 +599,7 @@
 @ cdecl _mbclen(ptr)
 @ cdecl _mbclen_l(ptr ptr)
 @ cdecl _mbctohira(long)
-@ stub _mbctohira_l
+@ cdecl _mbctohira_l(long ptr)
 @ cdecl _mbctokata(long)
 @ stub _mbctokata_l
 @ cdecl _mbctolower(long)
@@ -1169,7 +1169,7 @@
 @ cdecl _o__mbclen(ptr) _mbclen
 @ cdecl _o__mbclen_l(ptr ptr) _mbclen_l
 @ cdecl _o__mbctohira(long) _mbctohira
-@ stub _o__mbctohira_l
+@ cdecl _o__mbctohira_l(long ptr) _mbctohira_l
 @ cdecl _o__mbctokata(long) _mbctokata
 @ stub _o__mbctokata_l
 @ cdecl _o__mbctolower(long) _mbctolower