Piotr Caban : msvcrt: Don't forward atoi to ntdll.

[Alexandre Julliard]

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

Author: Piotr Caban 
Date:   Wed Mar 27 16:11:49 2013 +0100

msvcrt: Don't forward atoi to ntdll.

---

dlls/msvcrt/msvcrt.spec |    2 +-
 dlls/msvcrt/string.c    |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 36e1510..7b27220 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -1249,7 +1249,7 @@
 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f
 @ cdecl atexit(ptr) MSVCRT_atexit
 @ cdecl atof(str) MSVCRT_atof
-@ cdecl atoi(str) ntdll.atoi
+@ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) ntdll.atol
 @ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch
 @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 1b2dea8..0002ff0 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -861,7 +861,7 @@ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base)
 /*********************************************************************
  *  _atoi_l (MSVCRT.@)
  */
-int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale)
+int __cdecl MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale)
 {
     __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale);

@@ -876,6 +876,14 @@ int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale)
 }

/*********************************************************************
+ *  atoi (MSVCRT.@)
+ */
+int __cdecl MSVCRT_atoi(const char *str)
+{
+    return MSVCRT__atoi_l(str, NULL);
+}
+
+/*********************************************************************
  *  _strtoui64_l (MSVCRT.@)
  *
  * FIXME: locale parameter is ignored