From 5c03a35f7a78f158e79b86ab0cfb72b594439da7 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Wed, 27 Mar 2013 16:11:23 +0100 Subject: [PATCH] msvcrt: Don't forward _wtoi to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b648f88f525..ef5823c40ab 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1222,7 +1222,7 @@ # stub _wtmpnam_s(ptr long) @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l -@ cdecl _wtoi(wstr) ntdll._wtoi +@ cdecl _wtoi(wstr) MSVCRT__wtoi @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index fe0b6ac4de5..e00cb83bc2b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1449,7 +1449,7 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, /********************************************************************* * _wtoi_l (MSVCRT.@) */ -int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +int __cdecl MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) { __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); @@ -1463,6 +1463,14 @@ int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) return ret; } +/********************************************************************* + * _wtoi (MSVCRT.@) + */ +int __cdecl MSVCRT__wtoi(const MSVCRT_wchar_t *str) +{ + return MSVCRT__wtoi_l(str, NULL); +} + /********************************************************************* * _wcstoui64_l (MSVCRT.@) *