Piotr Caban : msvcrt: Added _is*_l functions implementation.

Alexandre Julliard julliard at winehq.org
Thu May 12 13:57:48 CDT 2011


Module: wine
Branch: master
Commit: 52c2976f1dd0139c7c651e2fdb2f38c2345c0afc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=52c2976f1dd0139c7c651e2fdb2f38c2345c0afc

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Thu May 12 11:37:48 2011 +0200

msvcrt: Added _is*_l functions implementation.

---

 dlls/msvcrt/ctype.c     |   88 +++++++++++++++++++++++++++++++++++++++++++++++
 dlls/msvcrt/msvcrt.spec |   22 ++++++------
 2 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c
index 9d5ed1e..2149591 100644
--- a/dlls/msvcrt/ctype.c
+++ b/dlls/msvcrt/ctype.c
@@ -103,6 +103,14 @@ int CDECL _isctype(int c, int type)
 }
 
 /*********************************************************************
+ *		_isalnum_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isalnum_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT, locale );
+}
+
+/*********************************************************************
  *		isalnum (MSVCRT.@)
  */
 int CDECL MSVCRT_isalnum(int c)
@@ -111,6 +119,14 @@ int CDECL MSVCRT_isalnum(int c)
 }
 
 /*********************************************************************
+ *		_isalpha_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isalpha_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__ALPHA, locale );
+}
+
+/*********************************************************************
  *		isalpha (MSVCRT.@)
  */
 int CDECL MSVCRT_isalpha(int c)
@@ -119,6 +135,14 @@ int CDECL MSVCRT_isalpha(int c)
 }
 
 /*********************************************************************
+ *		_iscntrl_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__iscntrl_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__CONTROL, locale );
+}
+
+/*********************************************************************
  *		iscntrl (MSVCRT.@)
  */
 int CDECL MSVCRT_iscntrl(int c)
@@ -127,6 +151,14 @@ int CDECL MSVCRT_iscntrl(int c)
 }
 
 /*********************************************************************
+ *		_isdigit_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isdigit_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__DIGIT, locale );
+}
+
+/*********************************************************************
  *		isdigit (MSVCRT.@)
  */
 int CDECL MSVCRT_isdigit(int c)
@@ -135,6 +167,14 @@ int CDECL MSVCRT_isdigit(int c)
 }
 
 /*********************************************************************
+ *		_isgraph_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isgraph_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT, locale );
+}
+
+/*********************************************************************
  *		isgraph (MSVCRT.@)
  */
 int CDECL MSVCRT_isgraph(int c)
@@ -143,6 +183,14 @@ int CDECL MSVCRT_isgraph(int c)
 }
 
 /*********************************************************************
+ *		_isleadbyte_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isleadbyte_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__LEADBYTE, locale );
+}
+
+/*********************************************************************
  *		isleadbyte (MSVCRT.@)
  */
 int CDECL MSVCRT_isleadbyte(int c)
@@ -151,6 +199,14 @@ int CDECL MSVCRT_isleadbyte(int c)
 }
 
 /*********************************************************************
+ *		_islower_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__islower_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__LOWER, locale );
+}
+
+/*********************************************************************
  *		islower (MSVCRT.@)
  */
 int CDECL MSVCRT_islower(int c)
@@ -159,6 +215,14 @@ int CDECL MSVCRT_islower(int c)
 }
 
 /*********************************************************************
+ *		_isprint_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isprint_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT, locale );
+}
+
+/*********************************************************************
  *		isprint (MSVCRT.@)
  */
 int CDECL MSVCRT_isprint(int c)
@@ -175,6 +239,14 @@ int CDECL MSVCRT_ispunct(int c)
 }
 
 /*********************************************************************
+ *		_isspace_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isspace_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__SPACE, locale );
+}
+
+/*********************************************************************
  *		isspace (MSVCRT.@)
  */
 int CDECL MSVCRT_isspace(int c)
@@ -183,6 +255,14 @@ int CDECL MSVCRT_isspace(int c)
 }
 
 /*********************************************************************
+ *		_isupper_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isupper_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__UPPER, locale );
+}
+
+/*********************************************************************
  *		isupper (MSVCRT.@)
  */
 int CDECL MSVCRT_isupper(int c)
@@ -191,6 +271,14 @@ int CDECL MSVCRT_isupper(int c)
 }
 
 /*********************************************************************
+ *		_isxdigit_l (MSVCRT.@)
+ */
+int CDECL MSVCRT__isxdigit_l(int c, MSVCRT__locale_t locale)
+{
+  return _isctype_l( c, MSVCRT__HEX, locale );
+}
+
+/*********************************************************************
  *		isxdigit (MSVCRT.@)
  */
 int CDECL MSVCRT_isxdigit(int c)
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 23ba26d..15de47a 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -530,16 +530,16 @@
 @ stub -arch=i386 _inpw(long)
 @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter
 @ extern _iob MSVCRT__iob
-# stub _isalnum_l(long ptr)
-# stub _isalpha_l(long ptr)
+@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
+@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
 @ cdecl _isatty(long)
-# stub _iscntrl_l(long ptr)
+@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l
 @ cdecl _isctype(long long)
 @ cdecl _isctype_l(long long ptr)
-# stub _isdigit_l(long ptr)
-# stub _isgraph_l(long ptr)
-# stub _isleadbyte_l(long ptr)
-# stub _islower_l(long ptr)
+@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l
+@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l
+@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
+@ cdecl _islower_l(long ptr) MSVCRT__islower_l
 @ stub _ismbbalnum(long)
 # stub _ismbbalnum_l(long ptr)
 @ stub _ismbbalpha(long)
@@ -600,9 +600,9 @@
 # stub _ismbstrail_l(long ptr)
 @ cdecl _isnan( double )
 # stub -arch=win64 _isnanf(float)
-# stub _isprint_l(long ptr)
-# stub _isspace_l(long ptr)
-# stub _isupper_l(long ptr)
+@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
+@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
+@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
 # stub _iswalnum_l(long ptr)
 @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l
 # stub _iswcntrl_l(long ptr)
@@ -615,7 +615,7 @@
 # stub _iswspace_l(long ptr)
 # stub _iswupper_l(long ptr)
 # stub _iswxdigit_l(long ptr)
-# stub _isxdigit_l(long ptr)
+@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
 @ cdecl _itoa(long ptr long) ntdll._itoa
 @ cdecl _itoa_s(long ptr long long)
 @ cdecl _itow(long ptr long) ntdll._itow




More information about the wine-cvs mailing list