Vincent Povirk : msvcrt: Implement _strtoul_l.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Oct 29 07:36:58 CDT 2014
Module: wine
Branch: master
Commit: 5ba68bb966bf57fab33c6e55f8f9433489a85ff3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ba68bb966bf57fab33c6e55f8f9433489a85ff3
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Tue Sep 2 10:42:33 2014 -0500
msvcrt: Implement _strtoul_l.
---
dlls/msvcr100/msvcr100.spec | 2 +-
dlls/msvcr110/msvcr110.spec | 2 +-
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcrt/msvcrt.spec | 2 +-
dlls/msvcrt/string.c | 14 +++++++++++---
6 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 9b6de75..2f2b0dc 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1362,7 +1362,7 @@
@ stub _strtol_l
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l
-@ stub _strtoul_l
+@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l
@ cdecl _strupr(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index cf7beb5..282f5bc 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1720,7 +1720,7 @@
@ stub _strtol_l
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l
-@ stub _strtoul_l
+@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l
@ cdecl _strupr(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index bb26bcc..5783f3e 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -1042,7 +1042,7 @@
@ stub _strtol_l
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l
-@ stub _strtoul_l
+@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l
@ cdecl _strupr(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 34a90e6..ec5d1e7 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -1017,7 +1017,7 @@
@ stub _strtol_l
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l
-@ stub _strtoul_l
+@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l
@ cdecl _strupr(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 96bbecc..51c2d40 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -983,7 +983,7 @@
# stub _strtol_l(str ptr long ptr)
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l
-# stub _strtoul_l(str ptr long ptr)
+@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l
@ cdecl _strupr(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index be65675..6f9280f 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -982,11 +982,11 @@ MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base)
}
/******************************************************************
- * strtoul (MSVCRT.@)
+ * _strtoul_l (MSVCRT.@)
*/
-MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base)
+MSVCRT_ulong CDECL MSVCRT_strtoul_l(const char* nptr, char** end, int base, MSVCRT__locale_t locale)
{
- __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, NULL);
+ __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, locale);
if(ret > MSVCRT_ULONG_MAX) {
ret = MSVCRT_ULONG_MAX;
@@ -999,6 +999,14 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base)
return ret;
}
+/******************************************************************
+ * strtoul (MSVCRT.@)
+ */
+MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base)
+{
+ return MSVCRT_strtoul_l(nptr, end, base, NULL);
+}
+
/*********************************************************************
* _strtoui64_l (MSVCRT.@)
*
More information about the wine-cvs
mailing list