[PATCH 3/3] msvcrt: Add _ismbcl1().
Nikolay Sivov
nsivov at codeweavers.com
Thu Feb 14 01:56:05 CST 2019
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46644
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/msvcr100/msvcr100.spec | 2 +-
dlls/msvcr110/msvcr110.spec | 2 +-
dlls/msvcr120/msvcr120.spec | 2 +-
dlls/msvcr70/msvcr70.spec | 2 +-
dlls/msvcr71/msvcr71.spec | 2 +-
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcrt/mbcs.c | 8 ++++++++
dlls/msvcrt/msvcrt.spec | 2 +-
dlls/msvcrt/tests/string.c | 12 ++++++++++++
dlls/ucrtbase/ucrtbase.spec | 2 +-
11 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 9f74447e31..8b1cc5d179 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -988,7 +988,7 @@
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
@ cdecl _ismbcl0_l(long ptr)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ cdecl _ismbcl1_l(long ptr)
@ stub _ismbcl2(long)
@ stub _ismbcl2_l
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 70a74646ee..2d814fb055 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1334,7 +1334,7 @@
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
@ cdecl _ismbcl0_l(long ptr)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ cdecl _ismbcl1_l(long ptr)
@ stub _ismbcl2(long)
@ stub _ismbcl2_l
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index b22b058c61..3cac0f4b6c 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1339,7 +1339,7 @@
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
@ cdecl _ismbcl0_l(long ptr)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ cdecl _ismbcl1_l(long ptr)
@ stub _ismbcl2(long)
@ stub _ismbcl2_l
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index e1b373f948..629dce95d8 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -382,7 +382,7 @@
@ cdecl _ismbchira(long)
@ cdecl _ismbckata(long)
@ cdecl _ismbcl0(long)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ stub _ismbcl2(long)
@ cdecl _ismbclegal(long)
@ cdecl _ismbclower(long)
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 24bd681a4e..f0009beb6c 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -377,7 +377,7 @@
@ cdecl _ismbchira(long)
@ cdecl _ismbckata(long)
@ cdecl _ismbcl0(long)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ stub _ismbcl2(long)
@ cdecl _ismbclegal(long)
@ cdecl _ismbclower(long)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 93347fd4b5..a1f3ba5d96 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -660,7 +660,7 @@
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
@ cdecl _ismbcl0_l(long ptr)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ cdecl _ismbcl1_l(long ptr)
@ stub _ismbcl2(long)
@ stub _ismbcl2_l
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index dd7205256d..87ce6621c4 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -638,7 +638,7 @@
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
@ cdecl _ismbcl0_l(long ptr)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ cdecl _ismbcl1_l(long ptr)
@ stub _ismbcl2(long)
@ stub _ismbcl2_l
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index ab16dad149..593df734e5 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -2578,3 +2578,11 @@ int CDECL _ismbcl0(unsigned int c)
{
return _ismbcl0_l(c, NULL);
}
+
+/*********************************************************************
+ * _ismbcl1 (MSVCRT.@)
+ */
+int CDECL _ismbcl1(unsigned int c)
+{
+ return _ismbcl1_l(c, NULL);
+}
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 19ffee579b..7e5c8b6b6c 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -609,7 +609,7 @@
# stub _ismbckata_l(long ptr)
@ cdecl _ismbcl0(long)
@ cdecl _ismbcl0_l(long ptr)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ cdecl _ismbcl1_l(long ptr)
@ stub _ismbcl2(long)
# stub _ismbcl2_l(long ptr)
diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c
index d0cc51bc4a..4a04a2d2cc 100644
--- a/dlls/msvcrt/tests/string.c
+++ b/dlls/msvcrt/tests/string.c
@@ -3275,11 +3275,17 @@ static void test__ismbclx(void)
ret = _ismbcl0(0);
ok(!ret, "got %d\n", ret);
+ ret = _ismbcl1(0);
+ ok(!ret, "got %d\n", ret);
+
cp = _setmbcp(1252);
ret = _ismbcl0(0x8140);
ok(!ret, "got %d\n", ret);
+ ret = _ismbcl1(0x889f);
+ ok(!ret, "got %d\n", ret);
+
_setmbcp(932);
ret = _ismbcl0(0);
@@ -3288,6 +3294,12 @@ static void test__ismbclx(void)
ret = _ismbcl0(0x8140);
ok(ret, "got %d\n", ret);
+ ret = _ismbcl1(0);
+ ok(!ret, "got %d\n", ret);
+
+ ret = _ismbcl1(0x889f);
+ ok(ret, "got %d\n", ret);
+
_setmbcp(cp);
}
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 32ddb44575..505f5ab1cd 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -478,7 +478,7 @@
@ stub _ismbckata_l
@ cdecl _ismbcl0(long)
@ cdecl _ismbcl0_l(long ptr)
-@ stub _ismbcl1(long)
+@ cdecl _ismbcl1(long)
@ cdecl _ismbcl1_l(long ptr)
@ stub _ismbcl2(long)
@ stub _ismbcl2_l
--
2.20.1
More information about the wine-devel
mailing list