msvcrt: Add _ismbbkana_l implementation.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Add _ismbbkana_l implementation.
fbbcd3f8 · Piotr Caban · Alexandre Julliard · a81f5509 · fbbcd3f8 · fbbcd3f8
Commit fbbcd3f8 authored Jul 16, 2020 by Piotr Caban Committed by Alexandre Julliard Jul 17, 2020
11 changed files
--- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec
@@ -11,7 +11,7 @@
 @ cdecl _ismbbkalnum(long) ucrtbase._ismbbkalnum
 @ stub _ismbbkalnum_l
 @ cdecl _ismbbkana(long) ucrtbase._ismbbkana
-@ stub _ismbbkana_l
+@ cdecl _ismbbkana_l(long ptr) ucrtbase._ismbbkana_l
 @ cdecl _ismbbkprint(long) ucrtbase._ismbbkprint
 @ stub _ismbbkprint_l
 @ cdecl _ismbbkpunct(long) ucrtbase._ismbbkpunct

--- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec
@@ -384,7 +384,7 @@
 @ stub _o__ismbbkalnum
 @ stub _o__ismbbkalnum_l
 @ cdecl _o__ismbbkana(long) ucrtbase._o__ismbbkana
-@ stub _o__ismbbkana_l
+@ cdecl _o__ismbbkana_l(long ptr) ucrtbase._o__ismbbkana_l
 @ stub _o__ismbbkprint
 @ stub _o__ismbbkprint_l
 @ stub _o__ismbbkpunct

--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -961,7 +961,7 @@
 @ stub _ismbbkalnum(long)
 @ stub _ismbbkalnum_l
 @ cdecl _ismbbkana(long)
-@ stub _ismbbkana_l
+@ cdecl _ismbbkana_l(long ptr)
 @ stub _ismbbkprint(long)
 @ stub _ismbbkprint_l
 @ stub _ismbbkpunct(long)

--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1307,7 +1307,7 @@
 @ stub _ismbbkalnum(long)
 @ stub _ismbbkalnum_l
 @ cdecl _ismbbkana(long)
-@ stub _ismbbkana_l
+@ cdecl _ismbbkana_l(long ptr)
 @ stub _ismbbkprint(long)
 @ stub _ismbbkprint_l
 @ stub _ismbbkpunct(long)

--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1310,7 +1310,7 @@
 @ stub _ismbbkalnum(long)
 @ stub _ismbbkalnum_l
 @ cdecl _ismbbkana(long)
-@ stub _ismbbkana_l
+@ cdecl _ismbbkana_l(long ptr)
 @ stub _ismbbkprint(long)
 @ stub _ismbbkprint_l
 @ stub _ismbbkpunct(long)

--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1213,7 +1213,7 @@
 @ cdecl _ismbbkalnum(long) msvcr120._ismbbkalnum
 @ stub _ismbbkalnum_l
 @ cdecl _ismbbkana(long) msvcr120._ismbbkana
-@ stub _ismbbkana_l
+@ cdecl _ismbbkana_l(long ptr) msvcr120._ismbbkana_l
 @ cdecl _ismbbkprint(long) msvcr120._ismbbkprint
 @ stub _ismbbkprint_l
 @ cdecl _ismbbkpunct(long) msvcr120._ismbbkpunct

--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -633,7 +633,7 @@
 @ stub _ismbbkalnum(long)
 @ stub _ismbbkalnum_l
 @ cdecl _ismbbkana(long)
-@ stub _ismbbkana_l
+@ cdecl _ismbbkana_l(long ptr)
 @ stub _ismbbkprint(long)
 @ stub _ismbbkprint_l
 @ stub _ismbbkpunct(long)

--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -611,7 +611,7 @@
 @ stub _ismbbkalnum(long)
 @ stub _ismbbkalnum_l
 @ cdecl _ismbbkana(long)
-@ stub _ismbbkana_l
+@ cdecl _ismbbkana_l(long ptr)
 @ stub _ismbbkprint(long)
 @ stub _ismbbkprint_l
 @ stub _ismbbkpunct(long)

--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -1389,12 +1389,18 @@ int CDECL _mbbtype(unsigned char c, int type)
 }

 /*********************************************************************
- *		_ismbbkana(MSVCRT.@)
+ *		_ismbbkana_l(MSVCRT.@)
 */
-int CDECL _ismbbkana(unsigned int c)
+int CDECL _ismbbkana_l(unsigned int c, MSVCRT__locale_t locale)
 {
-  /* FIXME: use lc_ctype when supported, not lc_all */
-  if(get_mbcinfo()->mbcodepage == 932)
+    MSVCRT_pthreadmbcinfo mbcinfo;
+
+    if(locale)
+        mbcinfo = locale->mbcinfo;
+    else
+        mbcinfo = get_mbcinfo();
+
+    if(mbcinfo->mbcodepage == 932)
    {
        /* Japanese/Katakana, CP 932 */
        return (c >= 0xa1 && c <= 0xdf);
@@ -1403,6 +1409,14 @@ int CDECL _ismbbkana(unsigned int c)
 }

 /*********************************************************************
+ *              _ismbbkana(MSVCRT.@)
+ */
+int CDECL _ismbbkana(unsigned int c)
+{
+    return _ismbbkana_l( c, NULL );
+}
+
+/*********************************************************************
 *              _ismbcdigit(MSVCRT.@)
 */
 int CDECL _ismbcdigit(unsigned int ch)

--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -579,7 +579,7 @@
 @ stub _ismbbkalnum(long)
 # stub _ismbbkalnum_l(long ptr)
 @ cdecl _ismbbkana(long)
-# stub _ismbbkana_l(long ptr)
+@ cdecl _ismbbkana_l(long ptr)
 @ stub _ismbbkprint(long)
 # stub _ismbbkprint_l(long ptr)
 @ stub _ismbbkpunct(long)

--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -449,7 +449,7 @@
 @ stub _ismbbkalnum(long)
 @ stub _ismbbkalnum_l
 @ cdecl _ismbbkana(long)
-@ stub _ismbbkana_l
+@ cdecl _ismbbkana_l(long ptr)
 @ stub _ismbbkprint(long)
 @ stub _ismbbkprint_l
 @ stub _ismbbkpunct(long)
@@ -1048,7 +1048,7 @@
 @ stub _o__ismbbkalnum
 @ stub _o__ismbbkalnum_l
 @ cdecl _o__ismbbkana(long) _ismbbkana
-@ stub _o__ismbbkana_l
+@ cdecl _o__ismbbkana_l(long ptr) _ismbbkana_l
 @ stub _o__ismbbkprint
 @ stub _o__ismbbkprint_l
 @ stub _o__ismbbkpunct