Skip to content

W
wine-cw
Commit 5ba68bb9 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard
Browse files
Options

msvcrt: Implement _strtoul_l.

parent eb6790c1
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 8 deletions
dlls/msvcr100/msvcr100.spec
View file @ 5ba68bb9
...@@ -1362,7 +1362,7 @@ ...@@ -1362,7 +1362,7 @@
@ stub _strtol_l @ stub _strtol_l
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ 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(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s(str long) MSVCRT__strupr_s
......
dlls/msvcr110/msvcr110.spec
View file @ 5ba68bb9
...@@ -1720,7 +1720,7 @@ ...@@ -1720,7 +1720,7 @@
@ stub _strtol_l @ stub _strtol_l
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ 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(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s(str long) MSVCRT__strupr_s
......
dlls/msvcr80/msvcr80.spec
View file @ 5ba68bb9
...@@ -1042,7 +1042,7 @@ ...@@ -1042,7 +1042,7 @@
@ stub _strtol_l @ stub _strtol_l
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ 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(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s(str long) MSVCRT__strupr_s
......
dlls/msvcr90/msvcr90.spec
View file @ 5ba68bb9
...@@ -1017,7 +1017,7 @@ ...@@ -1017,7 +1017,7 @@
@ stub _strtol_l @ stub _strtol_l
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ 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(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s(str long) MSVCRT__strupr_s
......
dlls/msvcrt/msvcrt.spec
View file @ 5ba68bb9
...@@ -983,7 +983,7 @@ ...@@ -983,7 +983,7 @@
# stub _strtol_l(str ptr long ptr) # stub _strtol_l(str ptr long ptr)
@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 @ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64
@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l @ 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(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) MSVCRT__strupr_s @ cdecl _strupr_s(str long) MSVCRT__strupr_s
......
dlls/msvcrt/string.c
View file @ 5ba68bb9
...@@ -982,11 +982,11 @@ MSVCRT_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) ...@@ -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) { if(ret > MSVCRT_ULONG_MAX) {
ret = MSVCRT_ULONG_MAX; ret = MSVCRT_ULONG_MAX;
...@@ -999,6 +999,14 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) ...@@ -999,6 +999,14 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base)
return ret; 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.@) * _strtoui64_l (MSVCRT.@)
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment