Nikolay Sivov : msvcrt: Add _ismbcl1().

Alexandre Julliard julliard at winehq.org
Thu Feb 14 16:19:11 CST 2019


Module: wine
Branch: master
Commit: 698b26a432ff8ce036014adc041efb08a63d6367
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=698b26a432ff8ce036014adc041efb08a63d6367

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Feb 14 14:35:45 2019 +0100

msvcrt: Add _ismbcl1().

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46644
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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  | 15 +++++++++++++++
 dlls/ucrtbase/ucrtbase.spec |  2 +-
 11 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index e9fdbff..202042d 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 dc1fa1d..1f4bfe3 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 5d05b3d..7e03eb1 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 e1b373f..629dce9 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 24bd681..f0009be 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 ec1cd22..7dc4ea8 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 78f1768..16a2473 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 9174214..909ea46 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -2600,3 +2600,11 @@ int CDECL _ismbcl1_l(unsigned int c, MSVCRT__locale_t locale)
 
     return 0;
 }
+
+/*********************************************************************
+ *		_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 b6b7882..1f9ad64 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 4574ea7..53fbfd3 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);
@@ -3291,6 +3297,15 @@ static void test__ismbclx(void)
     ret = _ismbcl0(0x817f);
     ok(!ret, "got %d\n", ret);
 
+    ret = _ismbcl1(0);
+    ok(!ret, "got %d\n", ret);
+
+    ret = _ismbcl1(0x889f);
+    ok(ret, "got %d\n", ret);
+
+    ret = _ismbcl1(0x88fd);
+    ok(!ret, "got %d\n", ret);
+
     _setmbcp(cp);
 }
 
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 8387521..db894a0 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




More information about the wine-cvs mailing list