[PATCH 1/1] include: Add _tcsto[u]ll declarations.

Daniel Lehman wine at gitlab.winehq.org
Sat Jun 18 16:27:05 CDT 2022


From: Daniel Lehman <dlehman25 at gmail.com>

Signed-off-by: Daniel Lehman <dlehman25 at gmail.com>
---
 include/msvcrt/corecrt_wstdlib.h | 4 ++++
 include/msvcrt/stdlib.h          | 4 ++--
 include/tchar.h                  | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h
index 53acdfe5a08..eef1fa26e0b 100644
--- a/include/msvcrt/corecrt_wstdlib.h
+++ b/include/msvcrt/corecrt_wstdlib.h
@@ -57,6 +57,10 @@ _ACRTIMP __int64       __cdecl _wcstoi64(const wchar_t*,wchar_t**,int);
 _ACRTIMP __int64       __cdecl _wcstoi64_l(const wchar_t*,wchar_t**,int,_locale_t);
 _ACRTIMP unsigned __int64 __cdecl _wcstoui64(const wchar_t*,wchar_t**,int);
 _ACRTIMP unsigned __int64 __cdecl _wcstoui64_l(const wchar_t*,wchar_t**,int,_locale_t);
+_ACRTIMP __int64       __cdecl wcstoll(const wchar_t*,wchar_t**,int);
+_ACRTIMP __int64       __cdecl _wcstoll_l(const wchar_t*,wchar_t**,int,_locale_t);
+_ACRTIMP unsigned __int64 __cdecl wcstoull(const wchar_t*,wchar_t**,int);
+_ACRTIMP unsigned __int64 __cdecl _wcstoull_l(const wchar_t*,wchar_t**,int,_locale_t);
 
 #ifdef __cplusplus
 }
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index 7a2a774dfb5..f7acdda73cb 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -227,8 +227,8 @@ _ACRTIMP float         __cdecl strtof(const char*,char**);
 _ACRTIMP double        __cdecl strtod(const char*,char**);
 _ACRTIMP __msvcrt_long __cdecl strtol(const char*,char**,int);
 _ACRTIMP __msvcrt_ulong __cdecl strtoul(const char*,char**,int);
-_ACRTIMP __int64       __cdecl strtoll_l(const char*,char**,int,_locale_t);
-_ACRTIMP unsigned __int64 __cdecl strtoull_l(const char*,char**,int,_locale_t);
+_ACRTIMP __int64       __cdecl _strtoll_l(const char*,char**,int,_locale_t);
+_ACRTIMP unsigned __int64 __cdecl _strtoull_l(const char*,char**,int,_locale_t);
 _ACRTIMP __int64       __cdecl strtoimax(const char*,char**,int);
 _ACRTIMP __int64       __cdecl strtoimax_l(const char*,char**,int,_locale_t);
 _ACRTIMP unsigned __int64 __cdecl strtoumax(const char*,char**,int);
diff --git a/include/tchar.h b/include/tchar.h
index 526565ee0b5..a51bd5b359f 100644
--- a/include/tchar.h
+++ b/include/tchar.h
@@ -150,7 +150,11 @@ extern "C" {
 #define _tcstod       WINE_tchar_routine(strtod,          strtod,      wcstod)
 #define _tcstok       WINE_tchar_routine(strtok,          _mbstok,     _wcstok)
 #define _tcstol       WINE_tchar_routine(strtol,          strtol,      wcstol)
+#define _tcstoll      WINE_tchar_routine(strtoll,         strtoll,     wcstoll)
+#define _tcstoll_l    WINE_tchar_routine(_strtoll_l,      _strtoll_l,  _wcstoll_l)
 #define _tcstoul      WINE_tchar_routine(strtoul,         strtoul,     wcstoul)
+#define _tcstoull     WINE_tchar_routine(strtoull,        strtoull,    wcstoull)
+#define _tcstoull_l   WINE_tchar_routine(_strtoull_l,     _strtoull_l, _wcstoull_l)
 #define _tcsupr       WINE_tchar_routine(_strupr,         _mbsupr,     _wcsupr)
 #define _tcsupr_s     WINE_tchar_routine(_strupr_s,       _mbsupr_s,   _wcsupr_s)
 #define _tcsxfrm      WINE_tchar_routine(strxfrm,         strxfrm,     wcsxfrm)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/276



More information about the wine-devel mailing list