Module: wine Branch: stable Commit: 14665e19887606ffa1f1fd509ee3bded39642b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14665e19887606ffa1f1fd509...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Aug 8 16:44:41 2017 +0300
msvcrt: Added _ismbcl0().
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 1a6e50ce97f85e2877420252b38664281559c7b8) Signed-off-by: Michael Stefaniuc mstefani@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 | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/tests/string.c | 24 ++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 11 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a4c944b..d80522a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -986,7 +986,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 768bf8b..adefdf1 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1332,7 +1332,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7b2c5eb..47f87df 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1337,7 +1337,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index ca3ff87..f2aea27 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -381,7 +381,7 @@ @ cdecl _ismbcgraph(long) @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 7e6d7c0..06c4d32 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -376,7 +376,7 @@ @ cdecl _ismbcgraph(long) @ cdecl _ismbchira(long) @ cdecl _ismbckata(long) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl1(long) @ stub _ismbcl2(long) @ cdecl _ismbclegal(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 10d4d5a..b606cc3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -658,7 +658,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0957db0..251bff9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -636,7 +636,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 93bb1a7..aabbf7a 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2441,3 +2441,17 @@ unsigned int CDECL _mbctokata(unsigned int c) return (c - 0x829f) + 0x8340 + (c >= 0x82de ? 1 : 0); return c; } + + +/********************************************************************* + * _ismbcl0 (MSVCRT.@) + */ +int CDECL _ismbcl0(unsigned int c) +{ + if(get_mbcinfo()->mbcodepage == 932) + { + /* JIS non-Kanji */ + return (c >= 0x8140 && c <= 0x889e); + } + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 589bc1d..daf80a0 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -604,7 +604,7 @@ # stub _ismbchira_l(long ptr) @ cdecl _ismbckata(long) # stub _ismbckata_l(long ptr) -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) # stub _ismbcl0_l(long ptr) @ stub _ismbcl1(long) # stub _ismbcl1_l(long ptr) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8e78695..3fe8df8 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3113,6 +3113,29 @@ static void test__mbscmp(void) ok(ret == 1, "got %d\n", ret); }
+static void test__ismbclx(void) +{ + int cp, ret; + + ret = _ismbcl0(0); + ok(!ret, "got %d\n", ret); + + cp = _setmbcp(1252); + + ret = _ismbcl0(0x8140); + ok(!ret, "got %d\n", ret); + + _setmbcp(932); + + ret = _ismbcl0(0); + ok(!ret, "got %d\n", ret); + + ret = _ismbcl0(0x8140); + ok(ret, "got %d\n", ret); + + _setmbcp(cp); +} + START_TEST(string) { char mem[100]; @@ -3227,4 +3250,5 @@ START_TEST(string) test__strnset_s(); test__wcsset_s(); test__mbscmp(); + test__ismbclx(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 85d2ed3..f6daec0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -476,7 +476,7 @@ @ stub _ismbchira_l @ cdecl _ismbckata(long) @ stub _ismbckata_l -@ stub _ismbcl0(long) +@ cdecl _ismbcl0(long) @ stub _ismbcl0_l @ stub _ismbcl1(long) @ stub _ismbcl1_l