From 657ca8a8736d8bec95786428c9afecd86d48ac3c Mon Sep 17 00:00:00 2001
From: Thomas Mertes <thomas.mertes@gmx.at>
Date: Wed, 12 Mar 2003 20:17:03 +0000
Subject: [PATCH] Forward to the ntdll functions _itoa, _ltoa, _ultoa, _i64toa,
 _ui64toa, _itow, _ltow, _ultow, _i64tow, _ui64tow, _atoi64, _wtoi, _wtol,
 _wtoi64 from msvcrt / msvcrt20.

---
 dlls/msvcrt/msvcrt.spec     | 20 ++++++++++----------
 dlls/msvcrt/wcs.c           | 22 ----------------------
 dlls/msvcrt20/msvcrt20.spec |  6 ++++++
 3 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 88b69aa9511..46e7c5581bc 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -164,7 +164,7 @@
 @ cdecl _amsg_exit(long) MSVCRT__amsg_exit
 @ cdecl _assert(str str long) MSVCRT__assert
 @ stub _atodbl
-@ stub _atoi64 #(str)
+@ forward _atoi64 ntdll._atoi64
 @ stub _atoldbl
 @ cdecl _beep(long long) _beep
 @ cdecl _beginthread (ptr long ptr) _beginthread
@@ -271,8 +271,8 @@
 @ stub _heapused #(ptr ptr)
 @ cdecl _heapwalk(ptr) _heapwalk
 @ cdecl _hypot(double double) hypot
-@ stub _i64toa #(long str long)
-@ stub _i64tow #(long wstr long)
+@ forward _i64toa ntdll._i64toa
+@ forward _i64tow ntdll._i64tow
 @ cdecl _initterm(ptr ptr) _initterm
 @ stub _inp #(long) -i386
 @ stub _inpd #(long) -i386
@@ -311,7 +311,7 @@
 @ cdecl _ismbstrail(ptr ptr) _ismbstrail
 @ cdecl _isnan( double ) _isnan
 @ forward _itoa ntdll._itoa
-@ cdecl _itow(long wstr long) _itow
+@ forward _itow ntdll._itow
 @ cdecl _j0(double) j0
 @ cdecl _j1(double) j1
 @ cdecl _jn(long double) jn
@@ -329,7 +329,7 @@
 @ cdecl _lseek(long long long) _lseek
 @ cdecl -ret64 _lseeki64(long long long long) _lseeki64
 @ forward _ltoa ntdll._ltoa
-@ cdecl _ltow(long ptr long) _ltow
+@ forward _ltow ntdll._ltow
 @ cdecl _makepath(str str str str str) _makepath
 @ cdecl _matherr(ptr) _matherr
 @ cdecl _mbbtombc(long) _mbbtombc
@@ -474,8 +474,8 @@
 @ cdecl _toupper(long) MSVCRT__toupper
 @ stub _tzname
 @ cdecl _tzset() tzset
-@ stub _ui64toa #(long str long)
-@ stub _ui64tow #(long wstr long)
+@ forward _ui64toa ntdll._ui64toa
+@ forward _ui64tow ntdll._ui64tow
 @ forward _ultoa ntdll._ultoa
 @ forward _ultow ntdll._ultow
 @ cdecl _umask(long) _umask
@@ -559,9 +559,9 @@
 @ stub _wsystem #(wstr)
 @ cdecl _wtempnam(wstr wstr) _wtempnam
 @ stub _wtmpnam #(wstr)
-@ forward _wtoi NTDLL._wtoi
-@ stub _wtoi64 #(wstr)
-@ forward _wtol NTDLL._wtol
+@ forward _wtoi ntdll._wtoi
+@ forward _wtoi64 ntdll._wtoi64
+@ forward _wtol ntdll._wtol
 @ cdecl _wunlink(wstr) _wunlink
 @ cdecl _wutime(wstr ptr) _wutime
 @ cdecl _y0(double) _y0
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index c1c5b6b14fd..1229e9b0a21 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -363,25 +363,3 @@ INT MSVCRT_iswxdigit( MSVCRT_wchar_t wc )
 {
     return isxdigitW( wc );
 }
-
-/*********************************************************************
- *		_itow (MSVCRT.@)
- */
-MSVCRT_wchar_t* _itow(int value,MSVCRT_wchar_t* out,int base)
-{
-  char buf[64];
-  _itoa(value, buf, base);
-  MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, buf, -1, out, 128);
-  return out;
-}
-
-/*********************************************************************
- *		_ltow (MSVCRT.@)
- */
-MSVCRT_wchar_t* _ltow(long value,MSVCRT_wchar_t* out,int base)
-{
-  char buf[128];
-  _ltoa(value, buf, base);
-  MultiByteToWideChar (CP_ACP, MB_PRECOMPOSED, buf, -1, out, 128);
-  return out;
-}
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index 798c542d942..a08572b2a79 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -525,6 +525,7 @@
 @ forward _amsg_exit msvcrt._amsg_exit
 @ forward _assert msvcrt._assert
 @ forward _atodbl msvcrt._atodbl
+@ forward _atoi64 msvcrt._atoi64
 @ forward _atoldbl msvcrt._atoldbl
 @ forward _beep msvcrt._beep
 @ forward _beginthread msvcrt._beginthread
@@ -622,6 +623,8 @@
 @ forward _heapused msvcrt._heapused
 @ forward _heapwalk msvcrt._heapwalk
 @ forward _hypot msvcrt._hypot
+@ forward _i64toa msvcrt._i64toa
+@ forward _i64tow msvcrt._i64tow
 @ forward _initterm msvcrt._initterm
 @ forward _iob msvcrt._iob
 @ forward _isatty msvcrt._isatty
@@ -844,6 +847,8 @@
 @ forward _toupper msvcrt._toupper
 @ forward _tzname msvcrt._tzname
 @ forward _tzset msvcrt._tzset
+@ forward _ui64toa msvcrt._ui64toa
+@ forward _ui64tow msvcrt._ui64tow
 @ forward _ultoa msvcrt._ultoa
 @ forward _ultow msvcrt._ultow
 @ forward _umask msvcrt._umask
@@ -924,6 +929,7 @@
 @ forward _wtempnam msvcrt._wtempnam
 @ forward _wtmpnam msvcrt._wtmpnam
 @ forward _wtoi msvcrt._wtoi
+@ forward _wtoi64 msvcrt._wtoi64
 @ forward _wtol msvcrt._wtol
 @ forward _wunlink msvcrt._wunlink
 @ forward _wutime msvcrt._wutime