[PATCH 1/3] msvcrt: Add _ismbcl0_l().
Nikolay Sivov
nsivov at codeweavers.com
Thu Feb 14 01:56:03 CST 2019
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
.../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +-
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 | 27 ++++++++++++++-----
dlls/msvcrt/msvcrt.spec | 2 +-
dlls/ucrtbase/ucrtbase.spec | 2 +-
9 files changed, 29 insertions(+), 14 deletions(-)
diff --git 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
index 1c987d0fc7..3ea8b3c470 100644
--- 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
@@ -39,7 +39,7 @@
@ cdecl _ismbckata(long) ucrtbase._ismbckata
@ stub _ismbckata_l
@ cdecl _ismbcl0(long) ucrtbase._ismbcl0
-@ stub _ismbcl0_l
+@ cdecl _ismbcl0_l(long ptr) ucrtbase._ismbcl0_l
@ cdecl _ismbcl1(long) ucrtbase._ismbcl1
@ stub _ismbcl1_l
@ cdecl _ismbcl2(long) ucrtbase._ismbcl2
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index c4574c6705..6973090cb3 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -987,7 +987,7 @@
@ cdecl _ismbckata(long)
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
-@ stub _ismbcl0_l
+@ cdecl _ismbcl0_l(long ptr)
@ stub _ismbcl1(long)
@ stub _ismbcl1_l
@ stub _ismbcl2(long)
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 59ed70310c..f37380787d 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1333,7 +1333,7 @@
@ cdecl _ismbckata(long)
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
-@ stub _ismbcl0_l
+@ cdecl _ismbcl0_l(long ptr)
@ stub _ismbcl1(long)
@ stub _ismbcl1_l
@ stub _ismbcl2(long)
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 4e25c6898d..43426bef34 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1338,7 +1338,7 @@
@ cdecl _ismbckata(long)
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
-@ stub _ismbcl0_l
+@ cdecl _ismbcl0_l(long ptr)
@ stub _ismbcl1(long)
@ stub _ismbcl1_l
@ stub _ismbcl2(long)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index c9863d953c..c15d317923 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -659,7 +659,7 @@
@ cdecl _ismbckata(long)
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
-@ stub _ismbcl0_l
+@ cdecl _ismbcl0_l(long ptr)
@ stub _ismbcl1(long)
@ stub _ismbcl1_l
@ stub _ismbcl2(long)
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index b6861223ed..35e75d69dd 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -637,7 +637,7 @@
@ cdecl _ismbckata(long)
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
-@ stub _ismbcl0_l
+@ cdecl _ismbcl0_l(long ptr)
@ stub _ismbcl1(long)
@ stub _ismbcl1_l
@ stub _ismbcl2(long)
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index d00c31af4c..16905f95b5 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -2529,16 +2529,31 @@ unsigned int CDECL _mbctokata(unsigned int c)
return c;
}
+/*********************************************************************
+ * _ismbcl0_l (MSVCRT.@)
+ */
+int CDECL _ismbcl0_l(unsigned int c, MSVCRT__locale_t locale)
+{
+ MSVCRT_pthreadmbcinfo mbcinfo;
+
+ if(!locale)
+ mbcinfo = get_mbcinfo();
+ else
+ mbcinfo = locale->mbcinfo;
+
+ if(mbcinfo->mbcodepage == 932)
+ {
+ /* JIS non-Kanji */
+ return c >= 0x8140 && c <= 0x889e;
+ }
+
+ return 0;
+}
/*********************************************************************
* _ismbcl0 (MSVCRT.@)
*/
int CDECL _ismbcl0(unsigned int c)
{
- if(get_mbcinfo()->mbcodepage == 932)
- {
- /* JIS non-Kanji */
- return (c >= 0x8140 && c <= 0x889e);
- }
- return 0;
+ return _ismbcl0_l(c, NULL);
}
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 2a74d5186c..10e231b01e 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -608,7 +608,7 @@
@ cdecl _ismbckata(long)
# stub _ismbckata_l(long ptr)
@ cdecl _ismbcl0(long)
-# stub _ismbcl0_l(long ptr)
+@ cdecl _ismbcl0_l(long ptr)
@ stub _ismbcl1(long)
# stub _ismbcl1_l(long ptr)
@ stub _ismbcl2(long)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 2d1d8da356..6426eafdea 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -477,7 +477,7 @@
@ cdecl _ismbckata(long)
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
-@ stub _ismbcl0_l
+@ cdecl _ismbcl0_l(long ptr)
@ stub _ismbcl1(long)
@ stub _ismbcl1_l
@ stub _ismbcl2(long)
--
2.20.1
More information about the wine-devel
mailing list