commit 60f3a809f5fcac32263e7b902699d0c48f7f9400
author Alexandre Julliard <julliard@winehq.org> Fri Apr 29 15:06:53 2011 +0200
committer Alexandre Julliard <julliard@winehq.org> Fri Apr 29 16:51:57 2011 +0200
tree 0edf63f256ad718df3667ec0f8767282fa70d94e
parent a3172a5dcdecb8022bb203ca6a532015c1fe7854

msvcrt: Synchronize spec files across dlls.

dlls/msvcr100/msvcr100.spec

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 8ef8eac..b22266a 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -317,7 +317,7 @@
 @ stub ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z
 @ thiscall -arch=win32 ?what@exception@std@@UBEPBDXZ(ptr) msvcrt.?what@exception@@UBEPBDXZ
 @ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) msvcrt.?what@exception@@UEBAPEBDXZ
-@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
+@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
 @ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@@ -736,10 +736,10 @@
 @ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s
 @ stub _initptd
 @ cdecl _initterm(ptr ptr) msvcrt._initterm
-@ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e
-@ stub _inp
-@ stub _inpd
-@ stub _inpw
+@ cdecl _initterm_e(ptr ptr) msvcrt._initterm_e
+@ stub -arch=i386 _inp
+@ stub -arch=i386 _inpd
+@ stub -arch=i386 _inpw
 @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter
 @ cdecl _invalid_parameter_noinfo() msvcr90._invalid_parameter_noinfo
 @ stub _invalid_parameter_noinfo_noreturn
@@ -853,7 +853,7 @@
 @ cdecl _lock(long) msvcrt._lock
 @ cdecl _lock_file(ptr) msvcrt._lock_file
 @ cdecl _locking(long long long) msvcrt._locking
-@ cdecl _logb( double ) msvcrt._logb
+@ cdecl _logb(double) msvcrt._logb
 @ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex
 @ cdecl _lrotl(long long) msvcrt._lrotl
 @ cdecl _lrotr(long long) msvcrt._lrotr
@@ -1019,9 +1019,9 @@
 @ cdecl _onexit(ptr) msvcrt._onexit
 @ varargs _open(str long) msvcrt._open
 @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle
-@ stub _outp
-@ stub _outpd
-@ stub _outpw
+@ stub -arch=i386 _outp
+@ stub -arch=i386 _outpd
+@ stub -arch=i386 _outpw
 @ cdecl _pclose(ptr) msvcrt._pclose
 @ extern _pctype msvcrt._pctype
 @ extern _pgmptr msvcrt._pgmptr
@@ -1040,7 +1040,7 @@
 @ cdecl _putwch(long) msvcrt._putwch
 @ stub _putwch_nolock
 @ cdecl _putws(wstr) msvcrt._putws
-@ stub _pwctype
+# extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
 @ cdecl _realloc_crt(ptr long) msvcrt.realloc
 @ cdecl _recalloc(ptr long long) msvcr90._recalloc
@@ -1345,7 +1345,7 @@
 @ stub _wfindnext32
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64
-@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32
+@ cdecl _wfindnext64i32(long ptr) msvcrt._wfindnext64i32
 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen
 @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s
 @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen
@@ -1441,7 +1441,7 @@
 @ cdecl clock() msvcrt.clock
 @ cdecl cos(double) msvcrt.cos
 @ cdecl cosh(double) msvcrt.cosh
-@ cdecl div(long long) msvcrt.div
+@ cdecl -ret64 div(long long) msvcrt.div
 @ cdecl exit(long) msvcrt.exit
 @ cdecl exp(double) msvcrt.exp
 @ cdecl fabs(double) msvcrt.fabs
@@ -1476,7 +1476,7 @@
 @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos
 @ cdecl ftell(ptr) msvcrt.ftell
 @ varargs fwprintf(ptr wstr) msvcrt.fwprintf
-@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s
+@ varargs fwprintf_s(ptr wstr) msvcrt.fwprintf_s
 @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite
 @ varargs fwscanf(ptr wstr) msvcrt.fwscanf
 @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s

dlls/msvcr70/msvcr70.spec

diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index a48003b..d95f2a1 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -90,7 +90,7 @@
 @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ
 @ thiscall -arch=win32 ?what@exception@@UBEPBDXZ(ptr) msvcrt.?what@exception@@UBEPBDXZ
 @ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) msvcrt.?what@exception@@UEBAPEBDXZ
-@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
+@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
 @ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@@ -226,7 +226,7 @@
 @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1
 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan
 @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv
-@ stub _aexit_rtn
+# extern _aexit_rtn
 @ cdecl _aligned_free(ptr) msvcrt._aligned_free
 @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc
 @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc
@@ -267,7 +267,7 @@
 @ cdecl _ctime64(ptr) msvcrt._ctime64
 @ extern _ctype msvcrt._ctype
 @ cdecl _cwait(ptr long long) msvcrt._cwait
-@ varargs _cwprintf(str) msvcrt._cwprintf
+@ varargs _cwprintf(wstr) msvcrt._cwprintf
 @ varargs _cwscanf(wstr) msvcrt._cwscanf
 @ extern _daylight msvcrt._daylight
 @ extern _dstbias msvcrt._dstbias
@@ -297,7 +297,7 @@
 @ cdecl _fgetchar() msvcrt._fgetchar
 @ cdecl _fgetwchar() msvcrt._fgetwchar
 @ cdecl _filbuf(ptr) msvcrt._filbuf
-@ stub _fileinfo
+# extern _fileinfo
 @ cdecl _filelength(long) msvcrt._filelength
 @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64
 @ cdecl _fileno(ptr) msvcrt._fileno
@@ -358,9 +358,9 @@
 @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa
 @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow
 @ cdecl _initterm(ptr ptr) msvcrt._initterm
-@ stub _inp
-@ stub _inpd
-@ stub _inpw
+@ stub -arch=i386 _inp
+@ stub -arch=i386 _inpd
+@ stub -arch=i386 _inpw
 @ extern _iob msvcrt._iob
 @ cdecl _isatty(long) msvcrt._isatty
 @ cdecl _isctype(long long) msvcrt._isctype
@@ -406,7 +406,7 @@
 @ cdecl _localtime64(ptr) msvcrt._localtime64
 @ cdecl _lock(long) msvcrt._lock
 @ cdecl _locking(long long long) msvcrt._locking
-@ cdecl _logb( double ) msvcrt._logb
+@ cdecl _logb(double) msvcrt._logb
 @ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex
 @ cdecl _lrotl(long long) msvcrt._lrotl
 @ cdecl _lrotr(long long) msvcrt._lrotr
@@ -483,9 +483,9 @@
 @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle
 @ extern _osplatform msvcrt._osplatform
 @ extern _osver msvcrt._osver
-@ stub _outp
-@ stub _outpd
-@ stub _outpw
+@ stub -arch=i386 _outp
+@ stub -arch=i386 _outpd
+@ stub -arch=i386 _outpw
 @ cdecl _pclose(ptr) msvcrt._pclose
 @ extern _pctype msvcrt._pctype
 @ extern _pgmptr msvcrt._pgmptr
@@ -497,7 +497,7 @@
 @ cdecl _putw(long ptr) msvcrt._putw
 @ cdecl _putwch(long) msvcrt._putwch
 @ cdecl _putws(wstr) msvcrt._putws
-@ stub _pwctype
+# extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
 @ cdecl _resetstkoflw() msvcrt._resetstkoflw
 @ cdecl _rmdir(str) msvcrt._rmdir
@@ -508,7 +508,7 @@
 @ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr
 @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
 @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
-@ cdecl _scalb( double long) msvcrt._scalb
+@ cdecl _scalb(double long) msvcrt._scalb
 @ varargs _scprintf(str) msvcrt._scprintf
 @ varargs _scwprintf(wstr) msvcrt._scwprintf
 @ cdecl _searchenv(str str ptr) msvcrt._searchenv
@@ -519,7 +519,7 @@
 @ cdecl _set_security_error_handler(ptr) msvcrt._set_security_error_handler
 @ cdecl _seterrormode(long) msvcrt._seterrormode
 @ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
-@ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
+@ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
 @ cdecl _setmbcp(long) msvcrt._setmbcp
 @ cdecl _setmode(long long) msvcrt._setmode
@@ -637,7 +637,7 @@
 @ extern _winmajor msvcrt._winmajor
 @ extern _winminor msvcrt._winminor
 @ extern _winver msvcrt._winver
-@ cdecl _wmakepath(wstr wstr wstr wstr wstr) msvcrt._wmakepath
+@ cdecl _wmakepath(ptr wstr wstr wstr wstr) msvcrt._wmakepath
 @ cdecl _wmkdir(wstr) msvcrt._wmkdir
 @ cdecl _wmktemp(wstr) msvcrt._wmktemp
 @ varargs _wopen(wstr long) msvcrt._wopen
@@ -699,7 +699,7 @@
 @ cdecl cosh(double) msvcrt.cosh
 @ cdecl ctime(ptr) msvcrt.ctime
 @ cdecl difftime(long long) msvcrt.difftime
-@ cdecl div(long long) msvcrt.div
+@ cdecl -ret64 div(long long) msvcrt.div
 @ cdecl exit(long) msvcrt.exit
 @ cdecl exp(double) msvcrt.exp
 @ cdecl fabs(double) msvcrt.fabs

dlls/msvcr71/msvcr71.spec

diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 9caefb7..38537ab 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -84,7 +84,7 @@
 @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) msvcrt._vsnwprintf
 @ thiscall -arch=win32 ?what@exception@@UBEPBDXZ(ptr) msvcrt.?what@exception@@UBEPBDXZ
 @ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) msvcrt.?what@exception@@UEBAPEBDXZ
-@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
+@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
 @ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@@ -103,7 +103,7 @@
 @ cdecl -arch=i386 _CItanh() msvcrt._CItanh
 @ cdecl _CRT_RTC_INIT(ptr ptr long long long) msvcr90._CRT_RTC_INIT
 @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException
-@ cdecl -i386 _EH_prolog() msvcrt._EH_prolog
+@ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog
 @ cdecl _Getdays() msvcrt._Getdays
 @ cdecl _Getmonths() msvcrt._Getmonths
 @ cdecl _Gettnames() msvcrt._Gettnames
@@ -115,8 +115,8 @@
 @ stub __CxxCallUnwindVecDtor
 @ cdecl __CxxDetectRethrow(ptr) msvcrt.__CxxDetectRethrow
 @ stub __CxxExceptionFilter
-@ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
-@ stdcall __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
+@ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
+@ stdcall -i386 __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
 @ cdecl __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize
 @ stub __CxxRegisterExceptionObject
 @ stub __CxxUnregisterExceptionObject
@@ -137,7 +137,7 @@
 @ stub __buffer_overrun
 @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA
 @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW
-@ cdecl __crtGetLocaleInfoW(long long ptr long)
+@ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW
 @ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW
 @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA
 @ cdecl __crtLCMapStringW(long long wstr long ptr long long long) msvcrt.__crtLCMapStringW
@@ -168,15 +168,15 @@
 @ cdecl __p__daylight() msvcrt.__p__daylight
 @ cdecl __p__dstbias() msvcrt.__p__dstbias
 @ cdecl __p__environ() msvcrt.__p__environ
-@ cdecl __p__fileinfo() msvcrt.__p__fileinfo
+@ stub __p__fileinfo
 @ cdecl __p__fmode() msvcrt.__p__fmode
 @ cdecl __p__iob() msvcrt.__p__iob
-@ cdecl __p__mbcasemap() msvcrt.__p__mbcasemap
+@ stub __p__mbcasemap
 @ cdecl __p__mbctype() msvcrt.__p__mbctype
 @ cdecl __p__osver() msvcrt.__p__osver
 @ cdecl __p__pctype() msvcrt.__p__pctype
 @ cdecl __p__pgmptr() msvcrt.__p__pgmptr
-@ cdecl __p__pwctype() msvcrt.__p__pwctype
+@ stub __p__pwctype
 @ cdecl __p__timezone() msvcrt.__p__timezone
 @ cdecl __p__tzname() msvcrt.__p__tzname
 @ cdecl __p__wcmdln() msvcrt.__p__wcmdln
@@ -188,7 +188,7 @@
 @ cdecl __pctype_func() msvcrt.__pctype_func
 @ extern __pioinfo msvcrt.__pioinfo
 @ stub __pwctype_func
-@ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
+@ stub __pxcptinfoptrs
 @ stub __security_error_handler
 @ cdecl __set_app_type(long) msvcrt.__set_app_type
 @ stub __set_buffer_overrun_handler
@@ -197,7 +197,7 @@
 @ cdecl __threadhandle() msvcrt.__threadhandle
 @ cdecl __threadid() msvcrt.__threadid
 @ cdecl __toascii(long) msvcrt.__toascii
-@ cdecl __unDName(long str ptr ptr long) msvcrt.__unDName
+@ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx
 @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active
 @ extern __wargv msvcrt.__wargv
@@ -207,29 +207,29 @@
 @ cdecl _abnormal_termination() msvcrt._abnormal_termination
 @ cdecl _access(str long) msvcrt._access
 @ extern _acmdln msvcrt._acmdln
-@ stdcall _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i
-@ stdcall _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32
-@ stdcall _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i
-@ stdcall _adj_fdiv_m64(long long) msvcrt._adj_fdiv_m64
-@ cdecl _adj_fdiv_r() msvcrt._adj_fdiv_r
-@ stdcall _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i
-@ stdcall _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32
-@ stdcall _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i
-@ stdcall _adj_fdivr_m64(long long) msvcrt._adj_fdivr_m64
-@ cdecl _adj_fpatan() msvcrt._adj_fpatan
-@ cdecl _adj_fprem() msvcrt._adj_fprem
-@ cdecl _adj_fprem1() msvcrt._adj_fprem1
-@ cdecl _adj_fptan() msvcrt._adj_fptan
-@ extern _adjust_fdiv msvcrt._adjust_fdiv
-@ stub _aexit_rtn
-@ cdecl _aligned_free(ptr)
-@ cdecl _aligned_malloc(long long)
-@ cdecl _aligned_offset_malloc(long long long)
-@ cdecl _aligned_offset_realloc(ptr long long long)
-@ cdecl _aligned_realloc(ptr long long)
+@ stdcall -arch=i386 _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i
+@ stdcall -arch=i386 _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32
+@ stdcall -arch=i386 _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i
+@ stdcall -arch=i386 _adj_fdiv_m64(int64) msvcrt._adj_fdiv_m64
+@ cdecl -arch=i386 _adj_fdiv_r() msvcrt._adj_fdiv_r
+@ stdcall -arch=i386 _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i
+@ stdcall -arch=i386 _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32
+@ stdcall -arch=i386 _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i
+@ stdcall -arch=i386 _adj_fdivr_m64(int64) msvcrt._adj_fdivr_m64
+@ cdecl -arch=i386 _adj_fpatan() msvcrt._adj_fpatan
+@ cdecl -arch=i386 _adj_fprem() msvcrt._adj_fprem
+@ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1
+@ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan
+@ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv
+# extern _aexit_rtn
+@ cdecl _aligned_free(ptr) msvcrt._aligned_free
+@ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc
+@ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc
+@ cdecl _aligned_offset_realloc(ptr long long long) msvcrt._aligned_offset_realloc
+@ cdecl _aligned_realloc(ptr long long) msvcrt._aligned_realloc
 @ cdecl _amsg_exit(long) msvcrt._amsg_exit
 @ cdecl _assert(str str long) msvcrt._assert
-@ cdecl _atodbl(ptr str) msvcrt._atodbl
+@ stub _atodbl
 @ cdecl -ret64 _atoi64(str) msvcrt._atoi64
 @ cdecl _atoldbl(ptr str) msvcrt._atoldbl
 @ cdecl _beep(long long) msvcrt._beep
@@ -244,7 +244,7 @@
 @ cdecl _chdir(str) msvcrt._chdir
 @ cdecl _chdrive(long) msvcrt._chdrive
 @ cdecl _chgsign( double ) msvcrt._chgsign
-@ cdecl -i386 _chkesp() msvcrt._chkesp
+@ cdecl -i386 -norelay _chkesp() msvcrt._chkesp
 @ cdecl _chmod(str long) msvcrt._chmod
 @ cdecl _chsize(long long) msvcrt._chsize
 @ cdecl _clearfp() msvcrt._clearfp
@@ -291,7 +291,7 @@
 @ cdecl _fgetchar() msvcrt._fgetchar
 @ cdecl _fgetwchar() msvcrt._fgetwchar
 @ cdecl _filbuf(ptr) msvcrt._filbuf
-@ extern _fileinfo msvcrt._fileinfo
+# extern _fileinfo
 @ cdecl _filelength(long) msvcrt._filelength
 @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64
 @ cdecl _fileno(ptr) msvcrt._fileno
@@ -307,7 +307,7 @@
 @ cdecl _flushall() msvcrt._flushall
 @ extern _fmode msvcrt._fmode
 @ cdecl _fpclass(double) msvcrt._fpclass
-@ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt
+@ stub _fpieee_flt
 @ cdecl _fpreset() msvcrt._fpreset
 @ cdecl _fputchar(long) msvcrt._fputchar
 @ cdecl _fputwchar(long) msvcrt._fputwchar
@@ -336,7 +336,7 @@
 @ cdecl _getmaxstdio() msvcrt._getmaxstdio
 @ cdecl _getmbcp() msvcrt._getmbcp
 @ cdecl _getpid() msvcrt._getpid
-@ cdecl _getsystime(ptr) msvcrt._getsystime
+@ stub _getsystime
 @ cdecl _getw(ptr) msvcrt._getw
 @ stub _getwch
 @ stub _getwche
@@ -347,28 +347,28 @@
 @ cdecl _heapchk() msvcrt._heapchk
 @ cdecl _heapmin() msvcrt._heapmin
 @ cdecl _heapset(long) msvcrt._heapset
-@ cdecl _heapused(ptr ptr) msvcrt._heapused
+@ stub _heapused
 @ cdecl _heapwalk(ptr) msvcrt._heapwalk
 @ cdecl _hypot(double double) msvcrt._hypot
 @ cdecl _i64toa(int64 ptr long) msvcrt._i64toa
 @ cdecl _i64tow(int64 ptr long) msvcrt._i64tow
 @ cdecl _initterm(ptr ptr) msvcrt._initterm
-@ cdecl -i386 _inp(long) msvcrt._inp
-@ cdecl -i386 _inpd(long) msvcrt._inpd
-@ cdecl -i386 _inpw(long) msvcrt._inpw
+@ stub -arch=i386 _inp
+@ stub -arch=i386 _inpd
+@ stub -arch=i386 _inpw
 @ extern _iob msvcrt._iob
 @ cdecl _isatty(long) msvcrt._isatty
 @ cdecl _isctype(long long) msvcrt._isctype
-@ cdecl _ismbbalnum(long) msvcrt._ismbbalnum
-@ cdecl _ismbbalpha(long) msvcrt._ismbbalpha
-@ cdecl _ismbbgraph(long) msvcrt._ismbbgraph
-@ cdecl _ismbbkalnum(long) msvcrt._ismbbkalnum
+@ stub _ismbbalnum
+@ stub _ismbbalpha
+@ stub _ismbbgraph
+@ stub _ismbbkalnum
 @ cdecl _ismbbkana(long) msvcrt._ismbbkana
-@ cdecl _ismbbkprint(long) msvcrt._ismbbkprint
-@ cdecl _ismbbkpunct(long) msvcrt._ismbbkpunct
+@ stub _ismbbkprint
+@ stub _ismbbkpunct
 @ cdecl _ismbblead(long) msvcrt._ismbblead
-@ cdecl _ismbbprint(long) msvcrt._ismbbprint
-@ cdecl _ismbbpunct(long) msvcrt._ismbbpunct
+@ stub _ismbbprint
+@ stub _ismbbpunct
 @ cdecl _ismbbtrail(long) msvcrt._ismbbtrail
 @ cdecl _ismbcalnum(long) msvcrt._ismbcalnum
 @ cdecl _ismbcalpha(long) msvcrt._ismbcalpha
@@ -376,9 +376,9 @@
 @ cdecl _ismbcgraph(long) msvcrt._ismbcgraph
 @ cdecl _ismbchira(long) msvcrt._ismbchira
 @ cdecl _ismbckata(long) msvcrt._ismbckata
-@ cdecl _ismbcl0(long) msvcrt._ismbcl0
-@ cdecl _ismbcl1(long) msvcrt._ismbcl1
-@ cdecl _ismbcl2(long) msvcrt._ismbcl2
+@ stub _ismbcl0
+@ stub _ismbcl1
+@ stub _ismbcl2
 @ cdecl _ismbclegal(long) msvcrt._ismbclegal
 @ cdecl _ismbclower(long) msvcrt._ismbclower
 @ cdecl _ismbcprint(long) msvcrt._ismbcprint
@@ -397,12 +397,12 @@
 @ cdecl _kbhit() msvcrt._kbhit
 @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind
 @ cdecl _loaddll(str) msvcrt._loaddll
-@ cdecl _local_unwind2(ptr long) msvcrt._local_unwind2
+@ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2
 @ cdecl _localtime64(ptr) msvcrt._localtime64
 @ cdecl _lock(long) msvcrt._lock
 @ cdecl _locking(long long long) msvcrt._locking
 @ cdecl _logb(double) msvcrt._logb
-@ cdecl -arch=i386 _longjmpex(ptr long) msvcrt._longjmpex
+@ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex
 @ cdecl _lrotl(long long) msvcrt._lrotl
 @ cdecl _lrotr(long long) msvcrt._lrotr
 @ cdecl _lsearch(ptr ptr long long ptr) msvcrt._lsearch
@@ -410,16 +410,16 @@
 @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64
 @ cdecl _ltoa(long ptr long) msvcrt._ltoa
 @ cdecl _ltow(long ptr long) msvcrt._ltow
-@ cdecl _makepath(str str str str str) msvcrt._makepath
+@ cdecl _makepath(ptr str str str str) msvcrt._makepath
 @ cdecl _mbbtombc(long) msvcrt._mbbtombc
 @ cdecl _mbbtype(long long) msvcrt._mbbtype
 @ stub _mbcasemap
 @ cdecl _mbccpy(str str) msvcrt._mbccpy
 @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms
-@ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis
+@ stub _mbcjmstojis
 @ cdecl _mbclen(ptr) msvcrt._mbclen
-@ cdecl _mbctohira(long) msvcrt._mbctohira
-@ cdecl _mbctokata(long) msvcrt._mbctokata
+@ stub _mbctohira
+@ stub _mbctokata
 @ cdecl _mbctolower(long) msvcrt._mbctolower
 @ cdecl _mbctombb(long) msvcrt._mbctombb
 @ cdecl _mbctoupper(long) msvcrt._mbctoupper
@@ -441,19 +441,19 @@
 @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat
 @ cdecl _mbsnbcmp(str str long) msvcrt._mbsnbcmp
 @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt
-@ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll
+@ stub _mbsnbcoll
 @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy
 @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp
-@ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll
+@ stub _mbsnbicoll
 @ cdecl _mbsnbset(str long long) msvcrt._mbsnbset
 @ cdecl _mbsncat(str str long) msvcrt._mbsncat
 @ cdecl _mbsnccnt(str long) msvcrt._mbsnccnt
 @ cdecl _mbsncmp(str str long) msvcrt._mbsncmp
-@ cdecl _mbsncoll(str str long) msvcrt._mbsncoll
+@ stub _mbsncoll
 @ cdecl _mbsncpy(str str long) msvcrt._mbsncpy
 @ cdecl _mbsnextc(str) msvcrt._mbsnextc
 @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp
-@ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll
+@ stub _mbsnicoll
 @ cdecl _mbsninc(str long) msvcrt._mbsninc
 @ cdecl _mbsnset(str long long) msvcrt._mbsnset
 @ cdecl _mbspbrk(str str) msvcrt._mbspbrk
@@ -478,9 +478,9 @@
 @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle
 @ extern _osplatform msvcrt._osplatform
 @ extern _osver msvcrt._osver
-@ cdecl -i386 _outp(long long) msvcrt._outp
-@ cdecl -i386 _outpd(long long) msvcrt._outpd
-@ cdecl -i386 _outpw(long long) msvcrt._outpw
+@ stub -arch=i386 _outp
+@ stub -arch=i386 _outpd
+@ stub -arch=i386 _outpw
 @ cdecl _pclose(ptr) msvcrt._pclose
 @ extern _pctype msvcrt._pctype
 @ extern _pgmptr msvcrt._pgmptr
@@ -492,18 +492,18 @@
 @ cdecl _putw(long ptr) msvcrt._putw
 @ cdecl _putwch(long) msvcrt._putwch
 @ cdecl _putws(wstr) msvcrt._putws
-@ extern _pwctype msvcrt._pwctype
+# extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
 @ cdecl _resetstkoflw() msvcrt._resetstkoflw
 @ cdecl _rmdir(str) msvcrt._rmdir
 @ cdecl _rmtmp() msvcrt._rmtmp
 @ cdecl _rotl(long long) msvcrt._rotl
 @ cdecl _rotr(long long) msvcrt._rotr
-@ cdecl _safe_fdiv() msvcrt._safe_fdiv
-@ cdecl _safe_fdivr() msvcrt._safe_fdivr
-@ cdecl _safe_fprem() msvcrt._safe_fprem
-@ cdecl _safe_fprem1() msvcrt._safe_fprem1
-@ cdecl _scalb( double long) msvcrt._scalb
+@ cdecl -arch=i386 _safe_fdiv() msvcrt._safe_fdiv
+@ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr
+@ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
+@ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
+@ cdecl _scalb(double long) msvcrt._scalb
 @ varargs _scprintf(str) msvcrt._scprintf
 @ varargs _scwprintf(wstr) msvcrt._scwprintf
 @ cdecl _searchenv(str str ptr) msvcrt._searchenv
@@ -514,16 +514,16 @@
 @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
 @ cdecl _set_security_error_handler(ptr) msvcrt._set_security_error_handler
 @ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
-@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3
+@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
 @ cdecl _setmbcp(long) msvcrt._setmbcp
 @ cdecl _setmode(long long) msvcrt._setmode
-@ cdecl _setsystime(ptr long) msvcrt._setsystime
+@ stub _setsystime
 @ cdecl _sleep(long) msvcrt._sleep
-@ varargs _snprintf(str long str) msvcrt._snprintf
+@ varargs _snprintf(ptr long str) msvcrt._snprintf
 @ varargs _snscanf(str long str) msvcrt._snscanf
-@ varargs _snwprintf(wstr long wstr) msvcrt._snwprintf
+@ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf
 @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf
 @ varargs _sopen(str long long) msvcrt._sopen
 @ varargs _spawnl(long str str) msvcrt._spawnl
@@ -546,9 +546,9 @@
 @ cdecl _stricmp(str str) msvcrt._stricmp
 @ cdecl _stricoll(str str) msvcrt._stricoll
 @ cdecl _strlwr(str) msvcrt._strlwr
-@ cdecl _strncoll(str str long) msvcrt._strncoll
+@ stub _strncoll
 @ cdecl _strnicmp(str str long) msvcrt._strnicmp
-@ cdecl _strnicoll(str str long) msvcrt._strnicoll
+@ stub _strnicoll
 @ cdecl _strnset(str long long) msvcrt._strnset
 @ cdecl _strrev(str) msvcrt._strrev
 @ cdecl _strset(str long) msvcrt._strset
@@ -582,8 +582,8 @@
 @ cdecl _utime64(str ptr) msvcrt._utime64
 @ cdecl _vscprintf(str ptr) msvcrt._vscprintf
 @ cdecl _vscwprintf(wstr ptr) msvcrt._vscwprintf
-@ cdecl _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf
-@ cdecl _vsnwprintf(ptr long wstr long) msvcrt._vsnwprintf
+@ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf
+@ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf
 @ cdecl _waccess(wstr long) msvcrt._waccess
 @ cdecl _wasctime(ptr) msvcrt._wasctime
 @ cdecl _wchdir(wstr) msvcrt._wchdir
@@ -595,7 +595,7 @@
 @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
 @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
 @ cdecl _wcslwr(wstr) msvcrt._wcslwr
-@ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll
+@ stub _wcsncoll
 @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp
 @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll
 @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset
@@ -612,10 +612,10 @@
 @ varargs _wexecle(wstr wstr) msvcrt._wexecle
 @ varargs _wexeclp(wstr wstr) msvcrt._wexeclp
 @ varargs _wexeclpe(wstr wstr) msvcrt._wexeclpe
-@ varargs _wexecv(wstr ptr) msvcrt._wexecv
-@ varargs _wexecve(wstr ptr ptr) msvcrt._wexecve
-@ varargs _wexecvp(wstr ptr) msvcrt._wexecvp
-@ varargs _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe
+@ cdecl _wexecv(wstr ptr) msvcrt._wexecv
+@ cdecl _wexecve(wstr ptr ptr) msvcrt._wexecve
+@ cdecl _wexecvp(wstr ptr) msvcrt._wexecvp
+@ cdecl _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe
 @ cdecl _wfdopen(long wstr) msvcrt._wfdopen
 @ cdecl _wfindfirst(wstr ptr) msvcrt._wfindfirst
 @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64
@@ -633,11 +633,11 @@
 @ extern _winmajor msvcrt._winmajor
 @ extern _winminor msvcrt._winminor
 @ extern _winver msvcrt._winver
-@ cdecl _wmakepath(wstr wstr wstr wstr wstr) msvcrt._wmakepath
+@ cdecl _wmakepath(ptr wstr wstr wstr wstr) msvcrt._wmakepath
 @ cdecl _wmkdir(wstr) msvcrt._wmkdir
 @ cdecl _wmktemp(wstr) msvcrt._wmktemp
 @ varargs _wopen(wstr long) msvcrt._wopen
-@ cdecl _wperror(wstr) msvcrt._wperror
+@ stub _wperror
 @ extern _wpgmptr msvcrt._wpgmptr
 @ cdecl _wpopen(wstr wstr) msvcrt._wpopen
 @ cdecl _wputenv(wstr) msvcrt._wputenv
@@ -656,7 +656,7 @@
 @ cdecl _wspawnve(long wstr ptr ptr) msvcrt._wspawnve
 @ cdecl _wspawnvp(long wstr ptr) msvcrt._wspawnvp
 @ cdecl _wspawnvpe(long wstr ptr ptr) msvcrt._wspawnvpe
-@ cdecl _wsplitpath(wstr wstr wstr wstr wstr) msvcrt._wsplitpath
+@ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath
 @ cdecl _wstat(wstr ptr) msvcrt._wstat
 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64
 @ cdecl _wstati64(wstr ptr) msvcrt._wstati64
@@ -664,7 +664,7 @@
 @ cdecl _wstrtime(ptr) msvcrt._wstrtime
 @ cdecl _wsystem(wstr) msvcrt._wsystem
 @ cdecl _wtempnam(wstr wstr) msvcrt._wtempnam
-@ cdecl _wtmpnam(ptr) msvcrt._wtmpnam
+@ stub _wtmpnam
 @ cdecl _wtof(wstr) msvcrt._wtof
 @ cdecl _wtoi(wstr) msvcrt._wtoi
 @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64
@@ -695,7 +695,7 @@
 @ cdecl cosh(double) msvcrt.cosh
 @ cdecl ctime(ptr) msvcrt.ctime
 @ cdecl difftime(long long) msvcrt.difftime
-@ cdecl div(long long) msvcrt.div
+@ cdecl -ret64 div(long long) msvcrt.div
 @ cdecl exit(long) msvcrt.exit
 @ cdecl exp(double) msvcrt.exp
 @ cdecl fabs(double) msvcrt.fabs
@@ -826,7 +826,7 @@
 @ cdecl strtol(str ptr long) msvcrt.strtol
 @ cdecl strtoul(str ptr long) msvcrt.strtoul
 @ cdecl strxfrm(ptr str long) msvcrt.strxfrm
-@ varargs swprintf(wstr wstr) msvcrt.swprintf
+@ varargs swprintf(ptr wstr) msvcrt.swprintf
 @ varargs swscanf(wstr wstr) msvcrt.swscanf
 @ cdecl system(str) msvcrt.system
 @ cdecl tan(double) msvcrt.tan
@@ -840,12 +840,12 @@
 @ cdecl towupper(long) msvcrt.towupper
 @ cdecl ungetc(long ptr) msvcrt.ungetc
 @ cdecl ungetwc(long ptr) msvcrt.ungetwc
-@ cdecl vfprintf(ptr str long) msvcrt.vfprintf
-@ cdecl vfwprintf(ptr wstr long) msvcrt.vfwprintf
-@ cdecl vprintf(str long) msvcrt.vprintf
+@ cdecl vfprintf(ptr str ptr) msvcrt.vfprintf
+@ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf
+@ cdecl vprintf(str ptr) msvcrt.vprintf
 @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf
-@ cdecl vswprintf(ptr wstr long) msvcrt.vswprintf
-@ cdecl vwprintf(wstr long) msvcrt.vwprintf
+@ cdecl vswprintf(ptr wstr ptr) msvcrt.vswprintf
+@ cdecl vwprintf(wstr ptr) msvcrt.vwprintf
 @ cdecl wcscat(wstr wstr) msvcrt.wcscat
 @ cdecl wcschr(wstr long) msvcrt.wcschr
 @ cdecl wcscmp(wstr wstr) msvcrt.wcscmp
@@ -866,7 +866,7 @@
 @ cdecl wcstol(wstr ptr long) msvcrt.wcstol
 @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs
 @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul
-@ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm
+@ stub wcsxfrm
 @ cdecl wctomb(ptr long) msvcrt.wctomb
 @ varargs wprintf(wstr) msvcrt.wprintf
 @ varargs wscanf(wstr) msvcrt.wscanf

dlls/msvcr80/msvcr80.spec

diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 05e179a..e57d89d 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -128,7 +128,7 @@
 @ stub @_calloc_crt@8
 @ cdecl @_malloc_crt@4(long) msvcrt.malloc
 @ stub @_realloc_crt@8
-@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
+@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
 @ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@@ -172,8 +172,8 @@
 @ cdecl __CxxDetectRethrow(ptr) msvcrt.__CxxDetectRethrow
 @ stub __CxxExceptionFilter
 @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
-@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
-@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
+@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler2
+@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler3
 @ stdcall -i386 __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
 @ cdecl __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize
 @ stub __CxxRegisterExceptionObject
@@ -330,7 +330,7 @@
 @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1
 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan
 @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv
-@ stub _aexit_rtn
+# extern _aexit_rtn
 @ cdecl _aligned_free(ptr) msvcrt._aligned_free
 @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc
 @ stub _aligned_msize
@@ -583,10 +583,10 @@
 @ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s
 @ stub _initptd
 @ cdecl _initterm(ptr ptr) msvcrt._initterm
-@ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e
-@ stub _inp
-@ stub _inpd
-@ stub _inpw
+@ cdecl _initterm_e(ptr ptr) msvcrt._initterm_e
+@ stub -arch=i386 _inp
+@ stub -arch=i386 _inpd
+@ stub -arch=i386 _inpw
 @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter
 @ cdecl _invalid_parameter_noinfo() msvcr90._invalid_parameter_noinfo
 @ stub _invoke_watson
@@ -699,7 +699,7 @@
 @ cdecl _lock(long) msvcrt._lock
 @ cdecl _lock_file(ptr) msvcrt._lock_file
 @ cdecl _locking(long long long) msvcrt._locking
-@ cdecl _logb( double ) msvcrt._logb
+@ cdecl _logb(double) msvcrt._logb
 @ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex
 @ cdecl _lrotl(long long) msvcrt._lrotl
 @ cdecl _lrotr(long long) msvcrt._lrotr
@@ -867,9 +867,9 @@
 @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle
 @ extern _osplatform msvcrt._osplatform
 @ extern _osver msvcrt._osver
-@ stub _outp
-@ stub _outpd
-@ stub _outpw
+@ stub -arch=i386 _outp
+@ stub -arch=i386 _outpd
+@ stub -arch=i386 _outpw
 @ cdecl _pclose(ptr) msvcrt._pclose
 @ extern _pctype msvcrt._pctype
 @ extern _pgmptr msvcrt._pgmptr
@@ -888,7 +888,7 @@
 @ cdecl _putwch(long) msvcrt._putwch
 @ stub _putwch_nolock
 @ cdecl _putws(wstr) msvcrt._putws
-@ stub _pwctype
+# extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
 @ cdecl _realloc_crt(ptr long) msvcrt.realloc
 @ cdecl _recalloc(ptr long long) msvcr90._recalloc
@@ -904,7 +904,7 @@
 @ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr
 @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
 @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
-@ cdecl _scalb( double long) msvcrt._scalb
+@ cdecl _scalb(double long) msvcrt._scalb
 @ varargs _scanf_l(str ptr) msvcrt._scanf_l
 @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l
 @ varargs _scprintf(str) msvcrt._scprintf
@@ -935,7 +935,7 @@
 @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
 @ cdecl _seterrormode(long) msvcrt._seterrormode
 @ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
-@ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
+@ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
 @ cdecl _setmbcp(long) msvcrt._setmbcp
 @ cdecl _setmode(long long) msvcrt._setmode
@@ -1102,8 +1102,8 @@
 @ stub _vscwprintf_p
 @ stub _vscwprintf_p_l
 @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf
-@ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf
-@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_l
+@ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c
+@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_c_l
 @ cdecl _vsnprintf_l(ptr long str ptr ptr) msvcrt._vsnprintf_l
 @ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s
 @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l
@@ -1198,7 +1198,7 @@
 @ stub _wfindnext32
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64
-@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32
+@ cdecl _wfindnext64i32(long ptr) msvcrt._wfindnext64i32
 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen
 @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s
 @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen
@@ -1297,7 +1297,7 @@
 @ cdecl clock() msvcrt.clock
 @ cdecl cos(double) msvcrt.cos
 @ cdecl cosh(double) msvcrt.cosh
-@ cdecl div(long long) msvcrt.div
+@ cdecl -ret64 div(long long) msvcrt.div
 @ cdecl exit(long) msvcrt.exit
 @ cdecl exp(double) msvcrt.exp
 @ cdecl fabs(double) msvcrt.fabs
@@ -1332,7 +1332,7 @@
 @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos
 @ cdecl ftell(ptr) msvcrt.ftell
 @ varargs fwprintf(ptr wstr) msvcrt.fwprintf
-@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s
+@ varargs fwprintf_s(ptr wstr) msvcrt.fwprintf_s
 @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite
 @ varargs fwscanf(ptr wstr) msvcrt.fwscanf
 @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s

dlls/msvcr90/msvcr90.spec

diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 9bc984f..30dcc26 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -125,7 +125,7 @@
 @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) msvcrt._vsnwprintf
 @ thiscall -arch=win32 ?what@exception@std@@UBEPBDXZ(ptr) msvcrt.?what@exception@@UBEPBDXZ
 @ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) msvcrt.?what@exception@@UEBAPEBDXZ
-@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
+@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
 @ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@@ -169,8 +169,8 @@
 @ cdecl __CxxDetectRethrow(ptr) msvcrt.__CxxDetectRethrow
 @ stub __CxxExceptionFilter
 @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
-@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
-@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
+@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler2
+@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler3
 @ stdcall -i386 __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
 @ cdecl __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize
 @ stub __CxxRegisterExceptionObject
@@ -322,7 +322,7 @@
 @ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1
 @ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan
 @ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv
-@ stub _aexit_rtn
+# extern _aexit_rtn
 @ cdecl _aligned_free(ptr) msvcrt._aligned_free
 @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc
 @ stub _aligned_msize
@@ -572,9 +572,9 @@
 @ stub _initptd
 @ cdecl _initterm(ptr ptr) msvcrt._initterm
 @ cdecl _initterm_e(ptr ptr) msvcrt._initterm_e
-@ stub _inp
-@ stub _inpd
-@ stub _inpw
+@ stub -arch=i386 _inp
+@ stub -arch=i386 _inpd
+@ stub -arch=i386 _inpw
 @ cdecl _invalid_parameter(wstr wstr wstr long long) msvcrt._invalid_parameter
 @ cdecl _invalid_parameter_noinfo()
 @ stub _invoke_watson
@@ -687,7 +687,7 @@
 @ cdecl _lock(long) msvcrt._lock
 @ cdecl _lock_file(ptr) msvcrt._lock_file
 @ cdecl _locking(long long long) msvcrt._locking
-@ cdecl _logb( double ) msvcrt._logb
+@ cdecl _logb(double) msvcrt._logb
 @ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex
 @ cdecl _lrotl(long long) msvcrt._lrotl
 @ cdecl _lrotr(long long) msvcrt._lrotr
@@ -853,9 +853,9 @@
 @ cdecl _onexit(ptr) msvcrt._onexit
 @ varargs _open(str long) msvcrt._open
 @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle
-@ stub _outp
-@ stub _outpd
-@ stub _outpw
+@ stub -arch=i386 _outp
+@ stub -arch=i386 _outpd
+@ stub -arch=i386 _outpw
 @ cdecl _pclose(ptr) msvcrt._pclose
 @ extern _pctype msvcrt._pctype
 @ extern _pgmptr msvcrt._pgmptr
@@ -874,7 +874,7 @@
 @ cdecl _putwch(long) msvcrt._putwch
 @ stub _putwch_nolock
 @ cdecl _putws(wstr) msvcrt._putws
-@ stub _pwctype
+# extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
 @ cdecl _realloc_crt(ptr long) msvcrt.realloc
 @ cdecl _recalloc(ptr long long)
@@ -890,7 +890,7 @@
 @ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr
 @ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
 @ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
-@ cdecl _scalb( double long) msvcrt._scalb
+@ cdecl _scalb(double long) msvcrt._scalb
 @ varargs _scanf_l(str ptr) msvcrt._scanf_l
 @ varargs _scanf_s_l(str ptr) msvcrt._scanf_s_l
 @ varargs _scprintf(str) msvcrt._scprintf
@@ -921,7 +921,7 @@
 @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
 @ cdecl _seterrormode(long) msvcrt._seterrormode
 @ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
-@ cdecl -i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
+@ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
 @ cdecl _setmbcp(long) msvcrt._setmbcp
 @ cdecl _setmode(long long) msvcrt._setmode
@@ -1089,8 +1089,8 @@
 @ stub _vscwprintf_p
 @ stub _vscwprintf_p_l
 @ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf
-@ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf
-@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_l
+@ cdecl _vsnprintf_c(ptr long str ptr) msvcrt._vsnprintf_c
+@ cdecl _vsnprintf_c_l(ptr long str ptr ptr) msvcrt._vsnprintf_c_l
 @ cdecl _vsnprintf_l(ptr long str ptr ptr) msvcrt._vsnprintf_l
 @ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s
 @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l
@@ -1185,7 +1185,7 @@
 @ stub _wfindnext32
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr) msvcrt._wfindnext64
-@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32
+@ cdecl _wfindnext64i32(long ptr) msvcrt._wfindnext64i32
 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen
 @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s
 @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen
@@ -1281,7 +1281,7 @@
 @ cdecl clock() msvcrt.clock
 @ cdecl cos(double) msvcrt.cos
 @ cdecl cosh(double) msvcrt.cosh
-@ cdecl div(long long) msvcrt.div
+@ cdecl -ret64 div(long long) msvcrt.div
 @ cdecl exit(long) msvcrt.exit
 @ cdecl exp(double) msvcrt.exp
 @ cdecl fabs(double) msvcrt.fabs
@@ -1316,7 +1316,7 @@
 @ cdecl fsetpos(ptr ptr) msvcrt.fsetpos
 @ cdecl ftell(ptr) msvcrt.ftell
 @ varargs fwprintf(ptr wstr) msvcrt.fwprintf
-@ varargs fwprintf_s(ptr str) msvcrt.fwprintf_s
+@ varargs fwprintf_s(ptr wstr) msvcrt.fwprintf_s
 @ cdecl fwrite(ptr long long ptr) msvcrt.fwrite
 @ varargs fwscanf(ptr wstr) msvcrt.fwscanf
 @ varargs fwscanf_s(ptr wstr) msvcrt.fwscanf_s

dlls/msvcrt/msvcrt.spec

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index a4a16ae..8f0d675 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -525,9 +525,9 @@
 @ cdecl _i64tow_s(int64 ptr long long) _i64tow_s
 @ cdecl _initterm(ptr ptr)
 @ cdecl _initterm_e(ptr ptr)
-@ stub _inp #(long) -i386
-@ stub _inpd #(long) -i386
-@ stub _inpw #(long) -i386
+@ stub -arch=i386 _inp #(long)
+@ stub -arch=i386 _inpd #(long)
+@ stub -arch=i386 _inpw #(long)
 @ cdecl _invalid_parameter(wstr wstr wstr long long) MSVCRT__invalid_parameter
 @ extern _iob MSVCRT__iob
 # stub _isalnum_l
@@ -637,7 +637,7 @@
 @ cdecl _lock(long)
 @ cdecl _lock_file(ptr) MSVCRT__lock_file
 @ cdecl _locking(long long long) MSVCRT__locking
-@ cdecl _logb( double )
+@ cdecl _logb(double)
 # stub _logbf
 @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp
 @ cdecl _lrotl(long long) MSVCRT__lrotl
@@ -814,9 +814,9 @@
 @ cdecl _open_osfhandle(long long)
 @ extern _osplatform MSVCRT__osplatform
 @ extern _osver MSVCRT__osver
-@ stub _outp #(long long)
-@ stub _outpd #(long long)
-@ stub _outpw #(long long)
+@ stub -arch=i386 _outp #(long long)
+@ stub -arch=i386 _outpd #(long long)
+@ stub -arch=i386 _outpw #(long long)
 @ cdecl _pclose (ptr) MSVCRT__pclose
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
@@ -1499,6 +1499,6 @@
 @ cdecl _set_security_error_handler(ptr)
 @ cdecl -arch=i386 _statusfp2(ptr ptr)
 @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l
-@ cdecl _wdupenv_s(ptr ptr str)
+@ cdecl _wdupenv_s(ptr ptr wstr)
 @ cdecl _get_printf_count_output()
 @ cdecl _set_printf_count_output(long)

dlls/msvcrt20/msvcrt20.spec

diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index 5aebddc..2d2540a 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -441,7 +441,7 @@
 @ stub ?xalloc@ios@@SAHXZ #
 @ stub ?xsgetn@streambuf@@UAEHPADH@Z #
 @ stub ?xsputn@streambuf@@UAEHPBDH@Z #
-@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
+@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
 @ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@@ -461,8 +461,8 @@
 @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException
 @ extern _HUGE msvcrt._HUGE
 @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter
-@ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
-@ stdcall __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
+@ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
+@ stdcall -i386 __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
 @ cdecl __STRINGTOLD(ptr ptr str long) msvcrt.__STRINGTOLD
 @ extern __argc msvcrt.__argc
 @ extern __argv msvcrt.__argv
@@ -493,7 +493,7 @@
 @ cdecl __p__osver() msvcrt.__p__osver
 @ cdecl __p__pctype() msvcrt.__p__pctype
 @ cdecl __p__pgmptr() msvcrt.__p__pgmptr
-@ cdecl __p__pwctype() msvcrt.__p__pwctype
+@ stub __p__pwctype
 @ cdecl __p__timezone() msvcrt.__p__timezone
 @ cdecl __p__tzname() msvcrt.__p__tzname
 @ cdecl __p__wcmdln() msvcrt.__p__wcmdln
@@ -502,7 +502,7 @@
 @ cdecl __p__winminor() msvcrt.__p__winminor
 @ cdecl __p__winver() msvcrt.__p__winver
 @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr
-@ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
+@ stub __pxcptinfoptrs
 @ cdecl __threadhandle() msvcrt.__threadhandle
 @ cdecl __threadid() msvcrt.__threadid
 @ cdecl __toascii(long) msvcrt.__toascii
@@ -512,24 +512,24 @@
 @ cdecl _abnormal_termination() msvcrt._abnormal_termination
 @ cdecl _access(str long) msvcrt._access
 @ extern _acmdln msvcrt._acmdln
-@ stdcall _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i
-@ stdcall _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32
-@ stdcall _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i
-@ stdcall _adj_fdiv_m64(long long) msvcrt._adj_fdiv_m64
-@ cdecl _adj_fdiv_r() msvcrt._adj_fdiv_r
-@ stdcall _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i
-@ stdcall _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32
-@ stdcall _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i
-@ stdcall _adj_fdivr_m64(long long) msvcrt._adj_fdivr_m64
-@ cdecl _adj_fpatan() msvcrt._adj_fpatan
-@ cdecl _adj_fprem() msvcrt._adj_fprem
-@ cdecl _adj_fprem1() msvcrt._adj_fprem1
-@ cdecl _adj_fptan() msvcrt._adj_fptan
-@ cdecl _adjust_fdiv() msvcrt._adjust_fdiv
-@ extern _aexit_rtn msvcrt._aexit_rtn
+@ stdcall -arch=i386 _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i
+@ stdcall -arch=i386 _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32
+@ stdcall -arch=i386 _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i
+@ stdcall -arch=i386 _adj_fdiv_m64(int64) msvcrt._adj_fdiv_m64
+@ cdecl -arch=i386 _adj_fdiv_r() msvcrt._adj_fdiv_r
+@ stdcall -arch=i386 _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i
+@ stdcall -arch=i386 _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32
+@ stdcall -arch=i386 _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i
+@ stdcall -arch=i386 _adj_fdivr_m64(int64) msvcrt._adj_fdivr_m64
+@ cdecl -arch=i386 _adj_fpatan() msvcrt._adj_fpatan
+@ cdecl -arch=i386 _adj_fprem() msvcrt._adj_fprem
+@ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1
+@ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan
+@ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv
+# extern _aexit_rtn
 @ cdecl _amsg_exit(long) msvcrt._amsg_exit
 @ cdecl _assert(str str long) msvcrt._assert
-@ cdecl _atodbl(ptr str) msvcrt._atodbl
+@ stub _atodbl
 @ cdecl _atoldbl(ptr str) msvcrt._atoldbl
 @ cdecl _beep(long long) msvcrt._beep
 @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread
@@ -559,7 +559,7 @@
 @ extern _daylight msvcrt._daylight
 @ cdecl _dup(long) msvcrt._dup
 @ cdecl _dup2(long long) msvcrt._dup2
-@ cdecl _ecvt( double long ptr ptr) msvcrt._ecvt
+@ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt
 @ cdecl _endthread() msvcrt._endthread
 @ cdecl _endthreadex(long) msvcrt._endthreadex
 @ extern _environ msvcrt._environ
@@ -578,12 +578,12 @@
 @ cdecl _exit(long) msvcrt._exit
 @ cdecl _expand(ptr long) msvcrt._expand
 @ cdecl _fcloseall() msvcrt._fcloseall
-@ cdecl _fcvt( double long ptr ptr) msvcrt._fcvt
+@ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt
 @ cdecl _fdopen(long str) msvcrt._fdopen
 @ cdecl _fgetchar() msvcrt._fgetchar
 @ cdecl _fgetwchar() msvcrt._fgetwchar
 @ cdecl _filbuf(ptr) msvcrt._filbuf
-@ extern _fileinfo msvcrt._fileinfo
+# extern _fileinfo
 @ cdecl _filelength(long) msvcrt._filelength
 @ cdecl _fileno(ptr) msvcrt._fileno
 @ cdecl _findclose(long) msvcrt._findclose
@@ -594,7 +594,7 @@
 @ cdecl _flushall() msvcrt._flushall
 @ extern _fmode msvcrt._fmode
 @ cdecl _fpclass(double) msvcrt._fpclass
-@ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt
+@ stub _fpieee_flt
 @ cdecl _fpreset() msvcrt._fpreset
 @ cdecl _fputchar(long) msvcrt._fputchar
 @ cdecl _fputwchar(long) msvcrt._fputwchar
@@ -604,7 +604,7 @@
 @ cdecl -ret64 _ftol() msvcrt._ftol
 @ cdecl _fullpath(ptr str long) msvcrt._fullpath
 @ cdecl _futime(long ptr) msvcrt._futime
-@ cdecl _gcvt( double long str) msvcrt._gcvt
+@ cdecl _gcvt(double long str) msvcrt._gcvt
 @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle
 @ cdecl _getch() msvcrt._getch
 @ cdecl _getche() msvcrt._getche
@@ -616,7 +616,7 @@
 @ cdecl _getdrives() msvcrt._getdrives
 @ cdecl _getmbcp() msvcrt._getmbcp
 @ cdecl _getpid() msvcrt._getpid
-@ cdecl _getsystime(ptr) msvcrt._getsystime
+@ stub _getsystime
 @ cdecl _getw(ptr) msvcrt._getw
 @ cdecl _getws(ptr) msvcrt._getws
 @ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
@@ -624,23 +624,23 @@
 @ cdecl _heapchk() msvcrt._heapchk
 @ cdecl _heapmin() msvcrt._heapmin
 @ cdecl _heapset(long) msvcrt._heapset
-@ cdecl _heapused(ptr ptr) msvcrt._heapused
+@ stub _heapused
 @ cdecl _heapwalk(ptr) msvcrt._heapwalk
 @ cdecl _hypot(double double) msvcrt._hypot
 @ cdecl _initterm(ptr ptr) msvcrt._initterm
 @ extern _iob msvcrt._iob
 @ cdecl _isatty(long) msvcrt._isatty
 @ cdecl _isctype(long long) msvcrt._isctype
-@ cdecl _ismbbalnum(long) msvcrt._ismbbalnum
-@ cdecl _ismbbalpha(long) msvcrt._ismbbalpha
-@ cdecl _ismbbgraph(long) msvcrt._ismbbgraph
-@ cdecl _ismbbkalnum(long) msvcrt._ismbbkalnum
+@ stub _ismbbalnum
+@ stub _ismbbalpha
+@ stub _ismbbgraph
+@ stub _ismbbkalnum
 @ cdecl _ismbbkana(long) msvcrt._ismbbkana
-@ cdecl _ismbbkprint(long) msvcrt._ismbbkprint
-@ cdecl _ismbbkpunct(long) msvcrt._ismbbkpunct
+@ stub _ismbbkprint
+@ stub _ismbbkpunct
 @ cdecl _ismbblead(long) msvcrt._ismbblead
-@ cdecl _ismbbprint(long) msvcrt._ismbbprint
-@ cdecl _ismbbpunct(long) msvcrt._ismbbpunct
+@ stub _ismbbprint
+@ stub _ismbbpunct
 @ cdecl _ismbbtrail(long) msvcrt._ismbbtrail
 @ cdecl _ismbcalnum(long) msvcrt._ismbcalnum
 @ cdecl _ismbcalpha(long) msvcrt._ismbcalpha
@@ -648,9 +648,9 @@
 @ cdecl _ismbcgraph(long) msvcrt._ismbcgraph
 @ cdecl _ismbchira(long) msvcrt._ismbchira
 @ cdecl _ismbckata(long) msvcrt._ismbckata
-@ cdecl _ismbcl0(long) msvcrt._ismbcl0
-@ cdecl _ismbcl1(long) msvcrt._ismbcl1
-@ cdecl _ismbcl2(long) msvcrt._ismbcl2
+@ stub _ismbcl0
+@ stub _ismbcl1
+@ stub _ismbcl2
 @ cdecl _ismbclegal(long) msvcrt._ismbclegal
 @ cdecl _ismbclower(long) msvcrt._ismbclower
 @ cdecl _ismbcprint(long) msvcrt._ismbcprint
@@ -669,26 +669,26 @@
 @ cdecl _kbhit() msvcrt._kbhit
 @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind
 @ cdecl _loaddll(str) msvcrt._loaddll
-@ cdecl _local_unwind2(ptr long) msvcrt._local_unwind2
+@ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2
 @ cdecl _locking(long long long) msvcrt._locking
 @ cdecl _logb(double) msvcrt._logb
-@ cdecl -arch=i386 _longjmpex(ptr long) msvcrt._longjmpex
+@ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex
 @ cdecl _lrotl(long long) msvcrt._lrotl
 @ cdecl _lrotr(long long) msvcrt._lrotr
 @ cdecl _lsearch(ptr ptr long long ptr) msvcrt._lsearch
 @ cdecl _lseek(long long long) msvcrt._lseek
 @ cdecl _ltoa(long ptr long) msvcrt._ltoa
 @ cdecl _ltow(long ptr long) msvcrt._ltow
-@ cdecl _makepath(str str str str str) msvcrt._makepath
+@ cdecl _makepath(ptr str str str str) msvcrt._makepath
 @ cdecl _matherr(ptr) msvcrt._matherr
 @ cdecl _mbbtombc(long) msvcrt._mbbtombc
 @ cdecl _mbbtype(long long) msvcrt._mbbtype
 @ cdecl _mbccpy(str str) msvcrt._mbccpy
 @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms
-@ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis
+@ stub _mbcjmstojis
 @ cdecl _mbclen(ptr) msvcrt._mbclen
-@ cdecl _mbctohira(long) msvcrt._mbctohira
-@ cdecl _mbctokata(long) msvcrt._mbctokata
+@ stub _mbctohira
+@ stub _mbctokata
 @ cdecl _mbctolower(long) msvcrt._mbctolower
 @ cdecl _mbctombb(long) msvcrt._mbctombb
 @ cdecl _mbctoupper(long) msvcrt._mbctoupper
@@ -710,19 +710,19 @@
 @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat
 @ cdecl _mbsnbcmp(str str long) msvcrt._mbsnbcmp
 @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt
-@ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll
+@ stub _mbsnbcoll
 @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy
 @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp
-@ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll
+@ stub _mbsnbicoll
 @ cdecl _mbsnbset(str long long) msvcrt._mbsnbset
 @ cdecl _mbsncat(str str long) msvcrt._mbsncat
 @ cdecl _mbsnccnt(str long) msvcrt._mbsnccnt
 @ cdecl _mbsncmp(str str long) msvcrt._mbsncmp
-@ cdecl _mbsncoll(str str long) msvcrt._mbsncoll
+@ stub _mbsncoll
 @ cdecl _mbsncpy(str str long) msvcrt._mbsncpy
 @ cdecl _mbsnextc(str) msvcrt._mbsnextc
 @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp
-@ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll
+@ stub _mbsnicoll
 @ cdecl _mbsninc(str long) msvcrt._mbsninc
 @ cdecl _mbsnset(str long long) msvcrt._mbsnset
 @ cdecl _mbspbrk(str str) msvcrt._mbspbrk
@@ -757,28 +757,28 @@
 @ cdecl _putenv(str) msvcrt._putenv
 @ cdecl _putw(long ptr) msvcrt._putw
 @ cdecl _putws(wstr) msvcrt._putws
-@ extern _pwctype msvcrt._pwctype
+# extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
 @ cdecl _rmdir(str) msvcrt._rmdir
 @ cdecl _rmtmp() msvcrt._rmtmp
 @ cdecl _rotl(long long) msvcrt._rotl
 @ cdecl _rotr(long long) msvcrt._rotr
-@ cdecl _safe_fdiv() msvcrt._safe_fdiv
-@ cdecl _safe_fdivr() msvcrt._safe_fdivr
-@ cdecl _safe_fprem() msvcrt._safe_fprem
-@ cdecl _safe_fprem1() msvcrt._safe_fprem1
-@ cdecl _scalb( double long) msvcrt._scalb
+@ cdecl -arch=i386 _safe_fdiv() msvcrt._safe_fdiv
+@ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr
+@ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
+@ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
+@ cdecl _scalb(double long) msvcrt._scalb
 @ cdecl _searchenv(str str ptr) msvcrt._searchenv
 @ stdcall -i386 __seh_longjmp_unwind@4(ptr) msvcrt._seh_longjmp_unwind
 @ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
-@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3
+@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
 @ cdecl _setmbcp(long) msvcrt._setmbcp
 @ cdecl _setmode(long long) msvcrt._setmode
-@ cdecl _setsystime(ptr long) msvcrt._setsystime
+@ stub _setsystime
 @ cdecl _sleep(long) msvcrt._sleep
-@ varargs _snprintf(str long str) msvcrt._snprintf
-@ varargs _snwprintf(wstr long wstr) msvcrt._snwprintf
+@ varargs _snprintf(ptr long str) msvcrt._snprintf
+@ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf
 @ varargs _sopen(str long long) msvcrt._sopen
 @ varargs _spawnl(long str str) msvcrt._spawnl
 @ varargs _spawnle(long str str) msvcrt._spawnle
@@ -798,9 +798,9 @@
 @ cdecl _stricmp(str str) msvcrt._stricmp
 @ cdecl _stricoll(str str) msvcrt._stricoll
 @ cdecl _strlwr(str) msvcrt._strlwr
-@ cdecl _strncoll(str str long) msvcrt._strncoll
+@ stub _strncoll
 @ cdecl _strnicmp(str str long) msvcrt._strnicmp
-@ cdecl _strnicoll(str str long) msvcrt._strnicoll
+@ stub _strnicoll
 @ cdecl _strnset(str long long) msvcrt._strnset
 @ cdecl _strrev(str) msvcrt._strrev
 @ cdecl _strset(str long) msvcrt._strset
@@ -856,8 +856,8 @@
 @ cdecl _unlink(str) msvcrt._unlink
 @ cdecl _unloaddll(long) msvcrt._unloaddll
 @ cdecl _utime(str ptr) msvcrt._utime
-@ cdecl _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf
-@ cdecl _vsnwprintf(ptr long wstr long) msvcrt._vsnwprintf
+@ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf
+@ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf
 @ cdecl _waccess(wstr long) msvcrt._waccess
 @ cdecl _wasctime(ptr) msvcrt._wasctime
 @ cdecl _wchdir(wstr) msvcrt._wchdir
@@ -868,7 +868,7 @@
 @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
 @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
 @ cdecl _wcslwr(wstr) msvcrt._wcslwr
-@ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll
+@ stub _wcsncoll
 @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp
 @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll
 @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset
@@ -881,10 +881,10 @@
 @ varargs _wexecle(wstr wstr) msvcrt._wexecle
 @ varargs _wexeclp(wstr wstr) msvcrt._wexeclp
 @ varargs _wexeclpe(wstr wstr) msvcrt._wexeclpe
-@ varargs _wexecv(wstr ptr) msvcrt._wexecv
-@ varargs _wexecve(wstr ptr ptr) msvcrt._wexecve
-@ varargs _wexecvp(wstr ptr) msvcrt._wexecvp
-@ varargs _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe
+@ cdecl _wexecv(wstr ptr) msvcrt._wexecv
+@ cdecl _wexecve(wstr ptr ptr) msvcrt._wexecve
+@ cdecl _wexecvp(wstr ptr) msvcrt._wexecvp
+@ cdecl _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe
 @ cdecl _wfdopen(long wstr) msvcrt._wfdopen
 @ cdecl _wfindfirst(wstr ptr) msvcrt._wfindfirst
 @ cdecl _wfindnext(long ptr) msvcrt._wfindnext
@@ -898,11 +898,11 @@
 @ extern _winmajor msvcrt._winmajor
 @ extern _winminor msvcrt._winminor
 @ extern _winver msvcrt._winver
-@ cdecl _wmakepath(wstr wstr wstr wstr wstr) msvcrt._wmakepath
+@ cdecl _wmakepath(ptr wstr wstr wstr wstr) msvcrt._wmakepath
 @ cdecl _wmkdir(wstr) msvcrt._wmkdir
 @ cdecl _wmktemp(wstr) msvcrt._wmktemp
 @ varargs _wopen(wstr long) msvcrt._wopen
-@ cdecl _wperror(wstr) msvcrt._wperror
+@ stub _wperror
 @ extern _wpgmptr msvcrt._wpgmptr
 @ cdecl _wpopen(wstr wstr) msvcrt._wpopen
 @ cdecl _wputenv(wstr) msvcrt._wputenv
@@ -921,13 +921,13 @@
 @ cdecl _wspawnve(long wstr ptr ptr) msvcrt._wspawnve
 @ cdecl _wspawnvp(long wstr ptr) msvcrt._wspawnvp
 @ cdecl _wspawnvpe(long wstr ptr ptr) msvcrt._wspawnvpe
-@ cdecl _wsplitpath(wstr wstr wstr wstr wstr) msvcrt._wsplitpath
+@ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath
 @ cdecl _wstat(wstr ptr) msvcrt._wstat
 @ cdecl _wstrdate(ptr) msvcrt._wstrdate
 @ cdecl _wstrtime(ptr) msvcrt._wstrtime
 @ cdecl _wsystem(wstr) msvcrt._wsystem
 @ cdecl _wtempnam(wstr wstr) msvcrt._wtempnam
-@ cdecl _wtmpnam(ptr) msvcrt._wtmpnam
+@ stub _wtmpnam
 @ cdecl _wtoi(wstr) msvcrt._wtoi
 @ cdecl _wtol(wstr) msvcrt._wtol
 @ cdecl _wunlink(wstr) msvcrt._wunlink
@@ -955,7 +955,7 @@
 @ cdecl cosh(double) msvcrt.cosh
 @ cdecl ctime(ptr) msvcrt.ctime
 @ cdecl difftime(long long) msvcrt.difftime
-@ cdecl div(long long) msvcrt.div
+@ cdecl -ret64 div(long long) msvcrt.div
 @ cdecl exit(long) msvcrt.exit
 @ cdecl exp(double) msvcrt.exp
 @ cdecl fabs(double) msvcrt.fabs
@@ -1086,7 +1086,7 @@
 @ cdecl strtol(str ptr long) msvcrt.strtol
 @ cdecl strtoul(str ptr long) msvcrt.strtoul
 @ cdecl strxfrm(ptr str long) msvcrt.strxfrm
-@ varargs swprintf(wstr wstr) msvcrt.swprintf
+@ varargs swprintf(ptr wstr) msvcrt.swprintf
 @ varargs swscanf(wstr wstr) msvcrt.swscanf
 @ cdecl system(str) msvcrt.system
 @ cdecl tan(double) msvcrt.tan
@@ -1100,12 +1100,12 @@
 @ cdecl towupper(long) msvcrt.towupper
 @ cdecl ungetc(long ptr) msvcrt.ungetc
 @ cdecl ungetwc(long ptr) msvcrt.ungetwc
-@ cdecl vfprintf(ptr str long) msvcrt.vfprintf
-@ cdecl vfwprintf(ptr wstr long) msvcrt.vfwprintf
-@ cdecl vprintf(str long) msvcrt.vprintf
+@ cdecl vfprintf(ptr str ptr) msvcrt.vfprintf
+@ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf
+@ cdecl vprintf(str ptr) msvcrt.vprintf
 @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf
-@ cdecl vswprintf(ptr wstr long) msvcrt.vswprintf
-@ cdecl vwprintf(wstr long) msvcrt.vwprintf
+@ cdecl vswprintf(ptr wstr ptr) msvcrt.vswprintf
+@ cdecl vwprintf(wstr ptr) msvcrt.vwprintf
 @ cdecl wcscat(wstr wstr) msvcrt.wcscat
 @ cdecl wcschr(wstr long) msvcrt.wcschr
 @ cdecl wcscmp(wstr wstr) msvcrt.wcscmp
@@ -1126,7 +1126,7 @@
 @ cdecl wcstol(wstr ptr long) msvcrt.wcstol
 @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs
 @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul
-@ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm
+@ stub wcsxfrm
 @ cdecl wctomb(ptr long) msvcrt.wctomb
 @ varargs wprintf(wstr) msvcrt.wprintf
 @ varargs wscanf(wstr) msvcrt.wscanf

dlls/msvcrt40/msvcrt40.spec

diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec
index 016dad9..7dd4dad 100644
--- a/dlls/msvcrt40/msvcrt40.spec
+++ b/dlls/msvcrt40/msvcrt40.spec
@@ -509,7 +509,7 @@
 @ stub ?xalloc@ios@@SAHXZ
 @ stub ?xsgetn@streambuf@@UAEHPADH@Z
 @ stub ?xsputn@streambuf@@UAEHPBDH@Z
-@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
+@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
 @ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@@ -527,11 +527,11 @@
 @ cdecl -arch=i386 _CItan() msvcrt._CItan
 @ cdecl -arch=i386 _CItanh() msvcrt._CItanh
 @ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException
-@ cdecl -i386 _EH_prolog() msvcrt._EH_prolog
+@ cdecl -i386 -norelay _EH_prolog() msvcrt._EH_prolog
 @ extern _HUGE msvcrt._HUGE
 @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter
-@ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
-@ stdcall __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
+@ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
+@ stdcall -i386 __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
 @ cdecl __RTCastToVoid(ptr) msvcrt.__RTCastToVoid
 @ cdecl __RTDynamicCast(ptr long ptr ptr long) msvcrt.__RTDynamicCast
 @ cdecl __RTtypeid(ptr) msvcrt.__RTtypeid
@@ -566,7 +566,7 @@
 @ cdecl __p__osver() msvcrt.__p__osver
 @ cdecl __p__pctype() msvcrt.__p__pctype
 @ cdecl __p__pgmptr() msvcrt.__p__pgmptr
-@ cdecl __p__pwctype() msvcrt.__p__pwctype
+@ stub __p__pwctype
 @ cdecl __p__timezone() msvcrt.__p__timezone
 @ cdecl __p__tzname() msvcrt.__p__tzname
 @ cdecl __p__wcmdln() msvcrt.__p__wcmdln
@@ -575,37 +575,37 @@
 @ cdecl __p__winminor() msvcrt.__p__winminor
 @ cdecl __p__winver() msvcrt.__p__winver
 @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr
-@ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
+@ stub __pxcptinfoptrs
 @ cdecl __set_app_type(long) msvcrt.__set_app_type
 @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr
 @ cdecl __threadhandle() msvcrt.__threadhandle
 @ cdecl __threadid() msvcrt.__threadid
 @ cdecl __toascii(long) msvcrt.__toascii
-@ cdecl __unDName(long str ptr ptr long) msvcrt.__unDName
+@ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName
 @ extern __wargv msvcrt.__wargv
 @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs
 @ extern __winitenv msvcrt.__winitenv
 @ cdecl _abnormal_termination() msvcrt._abnormal_termination
 @ cdecl _access(str long) msvcrt._access
 @ extern _acmdln msvcrt._acmdln
-@ stdcall _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i
-@ stdcall _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32
-@ stdcall _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i
-@ stdcall _adj_fdiv_m64(long long) msvcrt._adj_fdiv_m64
-@ cdecl _adj_fdiv_r() msvcrt._adj_fdiv_r
-@ stdcall _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i
-@ stdcall _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32
-@ stdcall _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i
-@ stdcall _adj_fdivr_m64(long long) msvcrt._adj_fdivr_m64
-@ cdecl _adj_fpatan() msvcrt._adj_fpatan
-@ cdecl _adj_fprem() msvcrt._adj_fprem
-@ cdecl _adj_fprem1() msvcrt._adj_fprem1
-@ cdecl _adj_fptan() msvcrt._adj_fptan
-@ extern _adjust_fdiv msvcrt._adjust_fdiv
-@ extern _aexit_rtn msvcrt._aexit_rtn
+@ stdcall -arch=i386 _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i
+@ stdcall -arch=i386 _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32
+@ stdcall -arch=i386 _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i
+@ stdcall -arch=i386 _adj_fdiv_m64(int64) msvcrt._adj_fdiv_m64
+@ cdecl -arch=i386 _adj_fdiv_r() msvcrt._adj_fdiv_r
+@ stdcall -arch=i386 _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i
+@ stdcall -arch=i386 _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32
+@ stdcall -arch=i386 _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i
+@ stdcall -arch=i386 _adj_fdivr_m64(int64) msvcrt._adj_fdivr_m64
+@ cdecl -arch=i386 _adj_fpatan() msvcrt._adj_fpatan
+@ cdecl -arch=i386 _adj_fprem() msvcrt._adj_fprem
+@ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1
+@ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan
+@ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv
+# extern _aexit_rtn
 @ cdecl _amsg_exit(long) msvcrt._amsg_exit
 @ cdecl _assert(str str long) msvcrt._assert
-@ cdecl _atodbl(ptr str) msvcrt._atodbl
+@ stub _atodbl
 @ cdecl _atoldbl(ptr str) msvcrt._atoldbl
 @ cdecl _beep(long long) msvcrt._beep
 @ cdecl _beginthread(ptr long ptr) msvcrt._beginthread
@@ -636,7 +636,7 @@
 @ extern _dstbias msvcrt._dstbias
 @ cdecl _dup(long) msvcrt._dup
 @ cdecl _dup2(long long) msvcrt._dup2
-@ cdecl _ecvt( double long ptr ptr) msvcrt._ecvt
+@ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt
 @ cdecl _endthread() msvcrt._endthread
 @ cdecl _endthreadex(long) msvcrt._endthreadex
 @ extern _environ msvcrt._environ
@@ -655,12 +655,12 @@
 @ cdecl _exit(long) msvcrt._exit
 @ cdecl _expand(ptr long) msvcrt._expand
 @ cdecl _fcloseall() msvcrt._fcloseall
-@ cdecl _fcvt( double long ptr ptr) msvcrt._fcvt
+@ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt
 @ cdecl _fdopen(long str) msvcrt._fdopen
 @ cdecl _fgetchar() msvcrt._fgetchar
 @ cdecl _fgetwchar() msvcrt._fgetwchar
 @ cdecl _filbuf(ptr) msvcrt._filbuf
-@ extern _fileinfo msvcrt._fileinfo
+# extern _fileinfo
 @ cdecl _filelength(long) msvcrt._filelength
 @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64
 @ cdecl _fileno(ptr) msvcrt._fileno
@@ -674,7 +674,7 @@
 @ cdecl _flushall() msvcrt._flushall
 @ extern _fmode msvcrt._fmode
 @ cdecl _fpclass(double) msvcrt._fpclass
-@ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt
+@ stub _fpieee_flt
 @ cdecl _fpreset() msvcrt._fpreset
 @ cdecl _fputchar(long) msvcrt._fputchar
 @ cdecl _fputwchar(long) msvcrt._fputwchar
@@ -685,7 +685,7 @@
 @ cdecl -ret64 _ftol() msvcrt._ftol
 @ cdecl _fullpath(ptr str long) msvcrt._fullpath
 @ cdecl _futime(long ptr) msvcrt._futime
-@ cdecl _gcvt( double long str) msvcrt._gcvt
+@ cdecl _gcvt(double long str) msvcrt._gcvt
 @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle
 @ cdecl _getch() msvcrt._getch
 @ cdecl _getche() msvcrt._getche
@@ -698,7 +698,7 @@
 @ cdecl _getmaxstdio() msvcrt._getmaxstdio
 @ cdecl _getmbcp() msvcrt._getmbcp
 @ cdecl _getpid() msvcrt._getpid
-@ cdecl _getsystime(ptr) msvcrt._getsystime
+@ stub _getsystime
 @ cdecl _getw(ptr) msvcrt._getw
 @ cdecl _getws(ptr) msvcrt._getws
 @ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
@@ -706,26 +706,26 @@
 @ cdecl _heapchk() msvcrt._heapchk
 @ cdecl _heapmin() msvcrt._heapmin
 @ cdecl _heapset(long) msvcrt._heapset
-@ cdecl _heapused(ptr ptr) msvcrt._heapused
+@ stub _heapused
 @ cdecl _heapwalk(ptr) msvcrt._heapwalk
 @ cdecl _hypot(double double) msvcrt._hypot
 @ cdecl _initterm(ptr ptr) msvcrt._initterm
-@ cdecl -i386 _inp(long) msvcrt._inp
-@ cdecl -i386 _inpd(long) msvcrt._inpd
-@ cdecl -i386 _inpw(long) msvcrt._inpw
+@ stub -arch=i386 _inp
+@ stub -arch=i386 _inpd
+@ stub -arch=i386 _inpw
 @ extern _iob msvcrt._iob
 @ cdecl _isatty(long) msvcrt._isatty
 @ cdecl _isctype(long long) msvcrt._isctype
-@ cdecl _ismbbalnum(long) msvcrt._ismbbalnum
-@ cdecl _ismbbalpha(long) msvcrt._ismbbalpha
-@ cdecl _ismbbgraph(long) msvcrt._ismbbgraph
-@ cdecl _ismbbkalnum(long) msvcrt._ismbbkalnum
+@ stub _ismbbalnum
+@ stub _ismbbalpha
+@ stub _ismbbgraph
+@ stub _ismbbkalnum
 @ cdecl _ismbbkana(long) msvcrt._ismbbkana
-@ cdecl _ismbbkprint(long) msvcrt._ismbbkprint
-@ cdecl _ismbbkpunct(long) msvcrt._ismbbkpunct
+@ stub _ismbbkprint
+@ stub _ismbbkpunct
 @ cdecl _ismbblead(long) msvcrt._ismbblead
-@ cdecl _ismbbprint(long) msvcrt._ismbbprint
-@ cdecl _ismbbpunct(long) msvcrt._ismbbpunct
+@ stub _ismbbprint
+@ stub _ismbbpunct
 @ cdecl _ismbbtrail(long) msvcrt._ismbbtrail
 @ cdecl _ismbcalnum(long) msvcrt._ismbcalnum
 @ cdecl _ismbcalpha(long) msvcrt._ismbcalpha
@@ -733,9 +733,9 @@
 @ cdecl _ismbcgraph(long) msvcrt._ismbcgraph
 @ cdecl _ismbchira(long) msvcrt._ismbchira
 @ cdecl _ismbckata(long) msvcrt._ismbckata
-@ cdecl _ismbcl0(long) msvcrt._ismbcl0
-@ cdecl _ismbcl1(long) msvcrt._ismbcl1
-@ cdecl _ismbcl2(long) msvcrt._ismbcl2
+@ stub _ismbcl0
+@ stub _ismbcl1
+@ stub _ismbcl2
 @ cdecl _ismbclegal(long) msvcrt._ismbclegal
 @ cdecl _ismbclower(long) msvcrt._ismbclower
 @ cdecl _ismbcprint(long) msvcrt._ismbcprint
@@ -754,10 +754,10 @@
 @ cdecl _kbhit() msvcrt._kbhit
 @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind
 @ cdecl _loaddll(str) msvcrt._loaddll
-@ cdecl _local_unwind2(ptr long) msvcrt._local_unwind2
+@ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2
 @ cdecl _locking(long long long) msvcrt._locking
 @ cdecl _logb(double) msvcrt._logb
-@ cdecl -arch=i386 _longjmpex(ptr long) msvcrt._longjmpex
+@ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex
 @ cdecl _lrotl(long long) msvcrt._lrotl
 @ cdecl _lrotr(long long) msvcrt._lrotr
 @ cdecl _lsearch(ptr ptr long long ptr) msvcrt._lsearch
@@ -765,15 +765,15 @@
 @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64
 @ cdecl _ltoa(long ptr long) msvcrt._ltoa
 @ cdecl _ltow(long ptr long) msvcrt._ltow
-@ cdecl _makepath(str str str str str) msvcrt._makepath
+@ cdecl _makepath(ptr str str str str) msvcrt._makepath
 @ cdecl _mbbtombc(long) msvcrt._mbbtombc
 @ cdecl _mbbtype(long long) msvcrt._mbbtype
 @ cdecl _mbccpy(str str) msvcrt._mbccpy
 @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms
-@ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis
+@ stub _mbcjmstojis
 @ cdecl _mbclen(ptr) msvcrt._mbclen
-@ cdecl _mbctohira(long) msvcrt._mbctohira
-@ cdecl _mbctokata(long) msvcrt._mbctokata
+@ stub _mbctohira
+@ stub _mbctokata
 @ cdecl _mbctolower(long) msvcrt._mbctolower
 @ cdecl _mbctombb(long) msvcrt._mbctombb
 @ cdecl _mbctoupper(long) msvcrt._mbctoupper
@@ -795,19 +795,19 @@
 @ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat
 @ cdecl _mbsnbcmp(str str long) msvcrt._mbsnbcmp
 @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt
-@ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll
+@ stub _mbsnbcoll
 @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy
 @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp
-@ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll
+@ stub _mbsnbicoll
 @ cdecl _mbsnbset(str long long) msvcrt._mbsnbset
 @ cdecl _mbsncat(str str long) msvcrt._mbsncat
 @ cdecl _mbsnccnt(str long) msvcrt._mbsnccnt
 @ cdecl _mbsncmp(str str long) msvcrt._mbsncmp
-@ cdecl _mbsncoll(str str long) msvcrt._mbsncoll
+@ stub _mbsncoll
 @ cdecl _mbsncpy(str str long) msvcrt._mbsncpy
 @ cdecl _mbsnextc(str) msvcrt._mbsnextc
 @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp
-@ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll
+@ stub _mbsnicoll
 @ cdecl _mbsninc(str long) msvcrt._mbsninc
 @ cdecl _mbsnset(str long long) msvcrt._mbsnset
 @ cdecl _mbspbrk(str str) msvcrt._mbspbrk
@@ -832,9 +832,9 @@
 @ varargs _open(str long) msvcrt._open
 @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle
 @ extern _osver msvcrt._osver
-@ cdecl -i386 _outp(long long) msvcrt._outp
-@ cdecl -i386 _outpd(long long) msvcrt._outpd
-@ cdecl -i386 _outpw(long long) msvcrt._outpw
+@ stub -arch=i386 _outp
+@ stub -arch=i386 _outpd
+@ stub -arch=i386 _outpw
 @ cdecl _pclose(ptr) msvcrt._pclose
 @ extern _pctype msvcrt._pctype
 @ extern _pgmptr msvcrt._pgmptr
@@ -845,30 +845,30 @@
 @ cdecl _putenv(str) msvcrt._putenv
 @ cdecl _putw(long ptr) msvcrt._putw
 @ cdecl _putws(wstr) msvcrt._putws
-@ extern _pwctype msvcrt._pwctype
+# extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
 @ cdecl _rmdir(str) msvcrt._rmdir
 @ cdecl _rmtmp() msvcrt._rmtmp
 @ cdecl _rotl(long long) msvcrt._rotl
 @ cdecl _rotr(long long) msvcrt._rotr
-@ cdecl _safe_fdiv() msvcrt._safe_fdiv
-@ cdecl _safe_fdivr() msvcrt._safe_fdivr
-@ cdecl _safe_fprem() msvcrt._safe_fprem
-@ cdecl _safe_fprem1() msvcrt._safe_fprem1
-@ cdecl _scalb( double long) msvcrt._scalb
+@ cdecl -arch=i386 _safe_fdiv() msvcrt._safe_fdiv
+@ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr
+@ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
+@ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
+@ cdecl _scalb(double long) msvcrt._scalb
 @ cdecl _searchenv(str str ptr) msvcrt._searchenv
 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind
 @ cdecl _set_error_mode(long) msvcrt._set_error_mode
 @ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
-@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3
+@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
 @ cdecl _setmbcp(long) msvcrt._setmbcp
 @ cdecl _setmode(long long) msvcrt._setmode
-@ cdecl _setsystime(ptr long) msvcrt._setsystime
+@ stub _setsystime
 @ cdecl _sleep(long) msvcrt._sleep
-@ varargs _snprintf(str long str) msvcrt._snprintf
-@ varargs _snwprintf(wstr long wstr) msvcrt._snwprintf
+@ varargs _snprintf(ptr long str) msvcrt._snprintf
+@ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf
 @ varargs _sopen(str long long) msvcrt._sopen
 @ varargs _spawnl(long str str) msvcrt._spawnl
 @ varargs _spawnle(long str str) msvcrt._spawnle
@@ -889,9 +889,9 @@
 @ cdecl _stricmp(str str) msvcrt._stricmp
 @ cdecl _stricoll(str str) msvcrt._stricoll
 @ cdecl _strlwr(str) msvcrt._strlwr
-@ cdecl _strncoll(str str long) msvcrt._strncoll
+@ stub _strncoll
 @ cdecl _strnicmp(str str long) msvcrt._strnicmp
-@ cdecl _strnicoll(str str long) msvcrt._strnicoll
+@ stub _strnicoll
 @ cdecl _strnset(str long long) msvcrt._strnset
 @ cdecl _strrev(str) msvcrt._strrev
 @ cdecl _strset(str long) msvcrt._strset
@@ -915,8 +915,8 @@
 @ cdecl _unlink(str) msvcrt._unlink
 @ cdecl _unloaddll(long) msvcrt._unloaddll
 @ cdecl _utime(str ptr) msvcrt._utime
-@ cdecl _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf
-@ cdecl _vsnwprintf(ptr long wstr long) msvcrt._vsnwprintf
+@ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf
+@ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf
 @ cdecl _waccess(wstr long) msvcrt._waccess
 @ cdecl _wasctime(ptr) msvcrt._wasctime
 @ cdecl _wchdir(wstr) msvcrt._wchdir
@@ -927,7 +927,7 @@
 @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
 @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
 @ cdecl _wcslwr(wstr) msvcrt._wcslwr
-@ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll
+@ stub _wcsncoll
 @ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp
 @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll
 @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset
@@ -940,10 +940,10 @@
 @ varargs _wexecle(wstr wstr) msvcrt._wexecle
 @ varargs _wexeclp(wstr wstr) msvcrt._wexeclp
 @ varargs _wexeclpe(wstr wstr) msvcrt._wexeclpe
-@ varargs _wexecv(wstr ptr) msvcrt._wexecv
-@ varargs _wexecve(wstr ptr ptr) msvcrt._wexecve
-@ varargs _wexecvp(wstr ptr) msvcrt._wexecvp
-@ varargs _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe
+@ cdecl _wexecv(wstr ptr) msvcrt._wexecv
+@ cdecl _wexecve(wstr ptr ptr) msvcrt._wexecve
+@ cdecl _wexecvp(wstr ptr) msvcrt._wexecvp
+@ cdecl _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe
 @ cdecl _wfdopen(long wstr) msvcrt._wfdopen
 @ cdecl _wfindfirst(wstr ptr) msvcrt._wfindfirst
 @ cdecl _wfindfirsti64(wstr ptr) msvcrt._wfindfirsti64
@@ -959,11 +959,11 @@
 @ extern _winmajor msvcrt._winmajor
 @ extern _winminor msvcrt._winminor
 @ extern _winver msvcrt._winver
-@ cdecl _wmakepath(wstr wstr wstr wstr wstr) msvcrt._wmakepath
+@ cdecl _wmakepath(ptr wstr wstr wstr wstr) msvcrt._wmakepath
 @ cdecl _wmkdir(wstr) msvcrt._wmkdir
 @ cdecl _wmktemp(wstr) msvcrt._wmktemp
 @ varargs _wopen(wstr long) msvcrt._wopen
-@ cdecl _wperror(wstr) msvcrt._wperror
+@ stub _wperror
 @ extern _wpgmptr msvcrt._wpgmptr
 @ cdecl _wpopen(wstr wstr) msvcrt._wpopen
 @ cdecl _wputenv(wstr) msvcrt._wputenv
@@ -982,14 +982,14 @@
 @ cdecl _wspawnve(long wstr ptr ptr) msvcrt._wspawnve
 @ cdecl _wspawnvp(long wstr ptr) msvcrt._wspawnvp
 @ cdecl _wspawnvpe(long wstr ptr ptr) msvcrt._wspawnvpe
-@ cdecl _wsplitpath(wstr wstr wstr wstr wstr) msvcrt._wsplitpath
+@ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath
 @ cdecl _wstat(wstr ptr) msvcrt._wstat
 @ cdecl _wstati64(wstr ptr) msvcrt._wstati64
 @ cdecl _wstrdate(ptr) msvcrt._wstrdate
 @ cdecl _wstrtime(ptr) msvcrt._wstrtime
 @ cdecl _wsystem(wstr) msvcrt._wsystem
 @ cdecl _wtempnam(wstr wstr) msvcrt._wtempnam
-@ cdecl _wtmpnam(ptr) msvcrt._wtmpnam
+@ stub _wtmpnam
 @ cdecl _wtoi(wstr) msvcrt._wtoi
 @ cdecl _wtol(wstr) msvcrt._wtol
 @ cdecl _wunlink(wstr) msvcrt._wunlink
@@ -1017,7 +1017,7 @@
 @ cdecl cosh(double) msvcrt.cosh
 @ cdecl ctime(ptr) msvcrt.ctime
 @ cdecl difftime(long long) msvcrt.difftime
-@ cdecl div(long long) msvcrt.div
+@ cdecl -ret64 div(long long) msvcrt.div
 @ cdecl exit(long) msvcrt.exit
 @ cdecl exp(double) msvcrt.exp
 @ cdecl fabs(double) msvcrt.fabs
@@ -1148,7 +1148,7 @@
 @ cdecl strtol(str ptr long) msvcrt.strtol
 @ cdecl strtoul(str ptr long) msvcrt.strtoul
 @ cdecl strxfrm(ptr str long) msvcrt.strxfrm
-@ varargs swprintf(wstr wstr) msvcrt.swprintf
+@ varargs swprintf(ptr wstr) msvcrt.swprintf
 @ varargs swscanf(wstr wstr) msvcrt.swscanf
 @ cdecl system(str) msvcrt.system
 @ cdecl tan(double) msvcrt.tan
@@ -1162,12 +1162,12 @@
 @ cdecl towupper(long) msvcrt.towupper
 @ cdecl ungetc(long ptr) msvcrt.ungetc
 @ cdecl ungetwc(long ptr) msvcrt.ungetwc
-@ cdecl vfprintf(ptr str long) msvcrt.vfprintf
-@ cdecl vfwprintf(ptr wstr long) msvcrt.vfwprintf
-@ cdecl vprintf(str long) msvcrt.vprintf
+@ cdecl vfprintf(ptr str ptr) msvcrt.vfprintf
+@ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf
+@ cdecl vprintf(str ptr) msvcrt.vprintf
 @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf
-@ cdecl vswprintf(ptr wstr long) msvcrt.vswprintf
-@ cdecl vwprintf(wstr long) msvcrt.vwprintf
+@ cdecl vswprintf(ptr wstr ptr) msvcrt.vswprintf
+@ cdecl vwprintf(wstr ptr) msvcrt.vwprintf
 @ cdecl wcscat(wstr wstr) msvcrt.wcscat
 @ cdecl wcschr(wstr long) msvcrt.wcschr
 @ cdecl wcscmp(wstr wstr) msvcrt.wcscmp
@@ -1188,7 +1188,7 @@
 @ cdecl wcstol(wstr ptr long) msvcrt.wcstol
 @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs
 @ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul
-@ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm
+@ stub wcsxfrm
 @ cdecl wctomb(ptr long) msvcrt.wctomb
 @ varargs wprintf(wstr) msvcrt.wprintf
 @ varargs wscanf(wstr) msvcrt.wscanf

dlls/msvcrtd/msvcrtd.spec

diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index 4b027a4..be3b5ba 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -1,6 +1,6 @@
 # msvcrtd.dll - MS VC++ Run Time Library
 
-@ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT
+@ cdecl -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ thiscall -arch=win32 ??0__non_rtti_object@@QAE@ABV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE@ABV0@@Z
 @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA@AEBV0@@Z
 @ thiscall -arch=win32 ??0__non_rtti_object@@QAE@PBD@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE@PBD@Z
@@ -124,7 +124,7 @@
 @ extern _HUGE msvcrt._HUGE
 @ cdecl _Strftime(str long str ptr ptr) msvcrt._Strftime
 @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter
-@ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
+@ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler
 @ stdcall -i386 __CxxLongjmpUnwind(ptr) msvcrt.__CxxLongjmpUnwind
 @ cdecl __RTCastToVoid(ptr) msvcrt.__RTCastToVoid
 @ cdecl __RTDynamicCast(ptr long ptr ptr long) msvcrt.__RTDynamicCast
@@ -165,15 +165,15 @@
 @ cdecl __p__daylight() msvcrt.__p__daylight
 @ cdecl __p__dstbias() msvcrt.__p__dstbias
 @ cdecl __p__environ() msvcrt.__p__environ
-@ cdecl __p__fileinfo() msvcrt.__p__fileinfo
+@ stub __p__fileinfo
 @ cdecl __p__fmode() msvcrt.__p__fmode
 @ cdecl __p__iob() msvcrt.__p__iob
-@ cdecl __p__mbcasemap() msvcrt.__p__mbcasemap
+@ stub __p__mbcasemap
 @ cdecl __p__mbctype() msvcrt.__p__mbctype
 @ cdecl __p__osver() msvcrt.__p__osver
 @ cdecl __p__pctype() msvcrt.__p__pctype
 @ cdecl __p__pgmptr() msvcrt.__p__pgmptr
-@ cdecl __p__pwctype() msvcrt.__p__pwctype
+@ stub __p__pwctype
 @ cdecl __p__timezone() msvcrt.__p__timezone
 @ cdecl __p__tzname() msvcrt.__p__tzname
 @ cdecl __p__wcmdln() msvcrt.__p__wcmdln
@@ -184,15 +184,15 @@
 @ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr
 @ cdecl __pctype_func() msvcrt.__pctype_func
 @ extern __pioinfo msvcrt.__pioinfo
-@ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
+@ stub __pxcptinfoptrs
 @ cdecl __set_app_type(long) msvcrt.__set_app_type
 @ extern __setlc_active msvcrt.__setlc_active
 @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr
-@ cdecl __threadhandle() kernel32.GetCurrentThread
-@ cdecl __threadid() kernel32.GetCurrentThreadId
+@ cdecl __threadhandle() msvcrt.__threadhandle
+@ cdecl __threadid() msvcrt.__threadid
 @ cdecl __toascii(long) msvcrt.__toascii
-@ cdecl __unDName(long str ptr ptr long) msvcrt.__unDName
-@ cdecl __unDNameEx() msvcrt.__unDNameEx
+@ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName
+@ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx
 @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active
 @ extern __wargv msvcrt.__wargv
 @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs
@@ -200,29 +200,29 @@
 @ cdecl _abnormal_termination() msvcrt._abnormal_termination
 @ cdecl _access(str long) msvcrt._access
 @ extern _acmdln msvcrt._acmdln
-@ stdcall _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i
-@ stdcall _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32
-@ stdcall _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i
-@ stdcall _adj_fdiv_m64(long long) msvcrt._adj_fdiv_m64
-@ cdecl _adj_fdiv_r() msvcrt._adj_fdiv_r
-@ stdcall _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i
-@ stdcall _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32
-@ stdcall _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i
-@ stdcall _adj_fdivr_m64(long long) msvcrt._adj_fdivr_m64
-@ cdecl _adj_fpatan() msvcrt._adj_fpatan
-@ cdecl _adj_fprem() msvcrt._adj_fprem
-@ cdecl _adj_fprem1() msvcrt._adj_fprem1
-@ cdecl _adj_fptan() msvcrt._adj_fptan
-@ cdecl _adjust_fdiv() msvcrt._adjust_fdiv
-@ extern _aexit_rtn msvcrt._aexit_rtn
+@ stdcall -arch=i386 _adj_fdiv_m16i(long) msvcrt._adj_fdiv_m16i
+@ stdcall -arch=i386 _adj_fdiv_m32(long) msvcrt._adj_fdiv_m32
+@ stdcall -arch=i386 _adj_fdiv_m32i(long) msvcrt._adj_fdiv_m32i
+@ stdcall -arch=i386 _adj_fdiv_m64(int64) msvcrt._adj_fdiv_m64
+@ cdecl -arch=i386 _adj_fdiv_r() msvcrt._adj_fdiv_r
+@ stdcall -arch=i386 _adj_fdivr_m16i(long) msvcrt._adj_fdivr_m16i
+@ stdcall -arch=i386 _adj_fdivr_m32(long) msvcrt._adj_fdivr_m32
+@ stdcall -arch=i386 _adj_fdivr_m32i(long) msvcrt._adj_fdivr_m32i
+@ stdcall -arch=i386 _adj_fdivr_m64(int64) msvcrt._adj_fdivr_m64
+@ cdecl -arch=i386 _adj_fpatan() msvcrt._adj_fpatan
+@ cdecl -arch=i386 _adj_fprem() msvcrt._adj_fprem
+@ cdecl -arch=i386 _adj_fprem1() msvcrt._adj_fprem1
+@ cdecl -arch=i386 _adj_fptan() msvcrt._adj_fptan
+@ extern -arch=i386 _adjust_fdiv msvcrt._adjust_fdiv
+# extern _aexit_rtn
 @ cdecl _amsg_exit(long) msvcrt._amsg_exit
 @ cdecl _assert(str str long) msvcrt._assert
-@ cdecl _atodbl(ptr str) msvcrt._atodbl
-@ cdecl -ret64 _atoi64(str) ntdll._atoi64
+@ stub _atodbl
+@ cdecl -ret64 _atoi64(str) msvcrt._atoi64
 @ cdecl _atoldbl(ptr str) msvcrt._atoldbl
 @ cdecl _beep(long long) msvcrt._beep
-@ cdecl _beginthread (ptr long ptr) msvcrt._beginthread
-@ cdecl _beginthreadex (ptr long ptr ptr long ptr) msvcrt._beginthreadex
+@ cdecl _beginthread(ptr long ptr) msvcrt._beginthread
+@ cdecl _beginthreadex(ptr long ptr ptr long ptr) msvcrt._beginthreadex
 @ cdecl _c_exit() msvcrt._c_exit
 @ cdecl _cabs(long) msvcrt._cabs
 @ cdecl _callnewh(long) msvcrt._callnewh
@@ -232,9 +232,9 @@
 @ cdecl _chdir(str) msvcrt._chdir
 @ cdecl _chdrive(long) msvcrt._chdrive
 @ cdecl _chgsign( double ) msvcrt._chgsign
-@ cdecl -i386 _chkesp() msvcrt._chkesp
+@ cdecl -i386 -norelay _chkesp() msvcrt._chkesp
 @ cdecl _chmod(str long) msvcrt._chmod
-@ cdecl _chsize (long long) msvcrt._chsize
+@ cdecl _chsize(long long) msvcrt._chsize
 @ cdecl _clearfp() msvcrt._clearfp
 @ cdecl _close(long) msvcrt._close
 @ cdecl _commit(long) msvcrt._commit
@@ -253,10 +253,10 @@
 @ cdecl _cwait(ptr long long) msvcrt._cwait
 @ extern _daylight msvcrt._daylight
 @ extern _dstbias msvcrt._dstbias
-@ cdecl _dup (long) msvcrt._dup
-@ cdecl _dup2 (long long) msvcrt._dup2
-@ cdecl _ecvt( double long ptr ptr) msvcrt._ecvt
-@ cdecl _endthread () msvcrt._endthread
+@ cdecl _dup(long) msvcrt._dup
+@ cdecl _dup2(long long) msvcrt._dup2
+@ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt
+@ cdecl _endthread() msvcrt._endthread
 @ cdecl _endthreadex(long) msvcrt._endthreadex
 @ extern _environ msvcrt._environ
 @ cdecl _eof(long) msvcrt._eof
@@ -275,12 +275,12 @@
 @ cdecl _expand(ptr long) msvcrt._expand
 @ cdecl _expand_dbg(ptr long) msvcrt._expand
 @ cdecl _fcloseall() msvcrt._fcloseall
-@ cdecl _fcvt( double long ptr ptr) msvcrt._fcvt
+@ cdecl _fcvt(double long ptr ptr) msvcrt._fcvt
 @ cdecl _fdopen(long str) msvcrt._fdopen
 @ cdecl _fgetchar() msvcrt._fgetchar
 @ cdecl _fgetwchar() msvcrt._fgetwchar
 @ cdecl _filbuf(ptr) msvcrt._filbuf
-@ extern _fileinfo msvcrt._fileinfo
+# extern _fileinfo
 @ cdecl _filelength(long) msvcrt._filelength
 @ cdecl -ret64 _filelengthi64(long) msvcrt._filelengthi64
 @ cdecl _fileno(ptr) msvcrt._fileno
@@ -294,7 +294,7 @@
 @ cdecl _flushall() msvcrt._flushall
 @ extern _fmode msvcrt._fmode
 @ cdecl _fpclass(double) msvcrt._fpclass
-@ cdecl _fpieee_flt(long ptr ptr) msvcrt._fpieee_flt
+@ stub _fpieee_flt
 @ cdecl _fpreset() msvcrt._fpreset
 @ cdecl _fputchar(long) msvcrt._fputchar
 @ cdecl _fputwchar(long) msvcrt._fputwchar
@@ -303,10 +303,10 @@
 @ cdecl _fstat(long ptr) msvcrt._fstat
 @ cdecl _fstati64(long ptr) msvcrt._fstati64
 @ cdecl _ftime(ptr) msvcrt._ftime
-@ cdecl -ret64 _ftol() ntdll._ftol
+@ cdecl -ret64 _ftol() msvcrt._ftol
 @ cdecl _fullpath(ptr str long) msvcrt._fullpath
 @ cdecl _futime(long ptr) msvcrt._futime
-@ cdecl _gcvt( double long str) msvcrt._gcvt
+@ cdecl _gcvt(double long str) msvcrt._gcvt
 @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle
 @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold
 @ cdecl _getch() msvcrt._getch
@@ -316,40 +316,40 @@
 @ cdecl _getdiskfree(long ptr) msvcrt._getdiskfree
 @ cdecl _getdllprocaddr(long str long) msvcrt._getdllprocaddr
 @ cdecl _getdrive() msvcrt._getdrive
-@ cdecl _getdrives() kernel32.GetLogicalDrives
+@ cdecl _getdrives() msvcrt._getdrives
 @ cdecl _getmaxstdio() msvcrt._getmaxstdio
 @ cdecl _getmbcp() msvcrt._getmbcp
-@ cdecl _getpid() kernel32.GetCurrentProcessId
-@ cdecl _getsystime(ptr) msvcrt._getsystime
+@ cdecl _getpid() msvcrt._getpid
+@ stub _getsystime
 @ cdecl _getw(ptr) msvcrt._getw
 @ cdecl _getws(ptr) msvcrt._getws
 @ cdecl -i386 _global_unwind2(ptr) msvcrt._global_unwind2
-@ cdecl _heapadd (ptr long) msvcrt._heapadd
+@ cdecl _heapadd(ptr long) msvcrt._heapadd
 @ cdecl _heapchk() msvcrt._heapchk
 @ cdecl _heapmin() msvcrt._heapmin
 @ cdecl _heapset(long) msvcrt._heapset
-@ cdecl _heapused(ptr ptr) msvcrt._heapused
+@ stub _heapused
 @ cdecl _heapwalk(ptr) msvcrt._heapwalk
 @ cdecl _hypot(double double) msvcrt._hypot
-@ cdecl _i64toa(int64 ptr long) ntdll._i64toa
-@ cdecl _i64tow(int64 ptr long) ntdll._i64tow
+@ cdecl _i64toa(int64 ptr long) msvcrt._i64toa
+@ cdecl _i64tow(int64 ptr long) msvcrt._i64tow
 @ cdecl _initterm(ptr ptr) msvcrt._initterm
-@ cdecl -i386 _inp(long) msvcrt._inp
-@ cdecl -i386 _inpd(long) msvcrt._inpd
-@ cdecl -i386 _inpw(long) msvcrt._inpw
+@ stub -arch=i386 _inp
+@ stub -arch=i386 _inpd
+@ stub -arch=i386 _inpw
 @ extern _iob msvcrt._iob
 @ cdecl _isatty(long) msvcrt._isatty
 @ cdecl _isctype(long long) msvcrt._isctype
-@ cdecl _ismbbalnum(long) msvcrt._ismbbalnum
-@ cdecl _ismbbalpha(long) msvcrt._ismbbalpha
-@ cdecl _ismbbgraph(long) msvcrt._ismbbgraph
-@ cdecl _ismbbkalnum(long) msvcrt._ismbbkalnum
+@ stub _ismbbalnum
+@ stub _ismbbalpha
+@ stub _ismbbgraph
+@ stub _ismbbkalnum
 @ cdecl _ismbbkana(long) msvcrt._ismbbkana
-@ cdecl _ismbbkprint(long) msvcrt._ismbbkprint
-@ cdecl _ismbbkpunct(long) msvcrt._ismbbkpunct
+@ stub _ismbbkprint
+@ stub _ismbbkpunct
 @ cdecl _ismbblead(long) msvcrt._ismbblead
-@ cdecl _ismbbprint(long) msvcrt._ismbbprint
-@ cdecl _ismbbpunct(long) msvcrt._ismbbpunct
+@ stub _ismbbprint
+@ stub _ismbbpunct
 @ cdecl _ismbbtrail(long) msvcrt._ismbbtrail
 @ cdecl _ismbcalnum(long) msvcrt._ismbcalnum
 @ cdecl _ismbcalpha(long) msvcrt._ismbcalpha
@@ -357,9 +357,9 @@
 @ cdecl _ismbcgraph(long) msvcrt._ismbcgraph
 @ cdecl _ismbchira(long) msvcrt._ismbchira
 @ cdecl _ismbckata(long) msvcrt._ismbckata
-@ cdecl _ismbcl0(long) msvcrt._ismbcl0
-@ cdecl _ismbcl1(long) msvcrt._ismbcl1
-@ cdecl _ismbcl2(long) msvcrt._ismbcl2
+@ stub _ismbcl0
+@ stub _ismbcl1
+@ stub _ismbcl2
 @ cdecl _ismbclegal(long) msvcrt._ismbclegal
 @ cdecl _ismbclower(long) msvcrt._ismbclower
 @ cdecl _ismbcprint(long) msvcrt._ismbcprint
@@ -370,37 +370,37 @@
 @ cdecl _ismbslead(ptr ptr) msvcrt._ismbslead
 @ cdecl _ismbstrail(ptr ptr) msvcrt._ismbstrail
 @ cdecl _isnan( double ) msvcrt._isnan
-@ cdecl _itoa(long ptr long) ntdll._itoa
-@ cdecl _itow(long ptr long) ntdll._itow
+@ cdecl _itoa(long ptr long) msvcrt._itoa
+@ cdecl _itow(long ptr long) msvcrt._itow
 @ cdecl _j0(double) msvcrt._j0
 @ cdecl _j1(double) msvcrt._j1
 @ cdecl _jn(long double) msvcrt._jn
 @ cdecl _kbhit() msvcrt._kbhit
 @ cdecl _lfind(ptr ptr ptr long ptr) msvcrt._lfind
 @ cdecl _loaddll(str) msvcrt._loaddll
-@ cdecl _local_unwind2(ptr long) msvcrt._local_unwind2
+@ cdecl -i386 _local_unwind2(ptr long) msvcrt._local_unwind2
 @ cdecl _lock(long) msvcrt._lock
 @ cdecl _locking(long long long) msvcrt._locking
-@ cdecl _logb( double ) msvcrt._logb
+@ cdecl _logb(double) msvcrt._logb
 @ cdecl -i386 _longjmpex(ptr long) msvcrt._longjmpex
 @ cdecl _lrotl(long long) msvcrt._lrotl
 @ cdecl _lrotr(long long) msvcrt._lrotr
 @ cdecl _lsearch(ptr ptr long long ptr) msvcrt._lsearch
 @ cdecl _lseek(long long long) msvcrt._lseek
 @ cdecl -ret64 _lseeki64(long int64 long) msvcrt._lseeki64
-@ cdecl _ltoa(long ptr long) ntdll._ltoa
-@ cdecl _ltow(long ptr long) ntdll._ltow
-@ cdecl _makepath(str str str str str) msvcrt._makepath
+@ cdecl _ltoa(long ptr long) msvcrt._ltoa
+@ cdecl _ltow(long ptr long) msvcrt._ltow
+@ cdecl _makepath(ptr str str str str) msvcrt._makepath
 @ cdecl _malloc_dbg(long) msvcrt.malloc
 @ cdecl _mbbtombc(long) msvcrt._mbbtombc
 @ cdecl _mbbtype(long long) msvcrt._mbbtype
-@ extern _mbcasemap msvcrt._mbcasemap
-@ cdecl _mbccpy (str str) msvcrt._mbccpy
+@ stub _mbcasemap
+@ cdecl _mbccpy(str str) msvcrt._mbccpy
 @ cdecl _mbcjistojms(long) msvcrt._mbcjistojms
-@ cdecl _mbcjmstojis(long) msvcrt._mbcjmstojis
+@ stub _mbcjmstojis
 @ cdecl _mbclen(ptr) msvcrt._mbclen
-@ cdecl _mbctohira(long) msvcrt._mbctohira
-@ cdecl _mbctokata(long) msvcrt._mbctokata
+@ stub _mbctohira
+@ stub _mbctokata
 @ cdecl _mbctolower(long) msvcrt._mbctolower
 @ cdecl _mbctombb(long) msvcrt._mbctombb
 @ cdecl _mbctoupper(long) msvcrt._mbctoupper
@@ -411,30 +411,30 @@
 @ cdecl _mbscmp(str str) msvcrt._mbscmp
 @ cdecl _mbscoll(str str) msvcrt._mbscoll
 @ cdecl _mbscpy(ptr str) msvcrt._mbscpy
-@ cdecl _mbscspn (str str) msvcrt._mbscspn
+@ cdecl _mbscspn(str str) msvcrt._mbscspn
 @ cdecl _mbsdec(ptr ptr) msvcrt._mbsdec
-@ cdecl _mbsdup(str) msvcrt._strdup
+@ cdecl _mbsdup(str) msvcrt._mbsdup
 @ cdecl _mbsicmp(str str) msvcrt._mbsicmp
 @ cdecl _mbsicoll(str str) msvcrt._mbsicoll
 @ cdecl _mbsinc(str) msvcrt._mbsinc
 @ cdecl _mbslen(str) msvcrt._mbslen
 @ cdecl _mbslwr(str) msvcrt._mbslwr
-@ cdecl _mbsnbcat (str str long) msvcrt._mbsnbcat
+@ cdecl _mbsnbcat(str str long) msvcrt._mbsnbcat
 @ cdecl _mbsnbcmp(str str long) msvcrt._mbsnbcmp
 @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt
-@ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll
+@ stub _mbsnbcoll
 @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy
 @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp
-@ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll
+@ stub _mbsnbicoll
 @ cdecl _mbsnbset(str long long) msvcrt._mbsnbset
 @ cdecl _mbsncat(str str long) msvcrt._mbsncat
 @ cdecl _mbsnccnt(str long) msvcrt._mbsnccnt
 @ cdecl _mbsncmp(str str long) msvcrt._mbsncmp
-@ cdecl _mbsncoll(str str long) msvcrt._mbsncoll
+@ stub _mbsncoll
 @ cdecl _mbsncpy(str str long) msvcrt._mbsncpy
 @ cdecl _mbsnextc(str) msvcrt._mbsnextc
 @ cdecl _mbsnicmp(str str long) msvcrt._mbsnicmp
-@ cdecl _mbsnicoll(str str long) msvcrt._mbsnicoll
+@ stub _mbsnicoll
 @ cdecl _mbsninc(str long) msvcrt._mbsninc
 @ cdecl _mbsnset(str long long) msvcrt._mbsnset
 @ cdecl _mbspbrk(str str) msvcrt._mbspbrk
@@ -448,7 +448,7 @@
 @ cdecl _mbstrlen(str) msvcrt._mbstrlen
 @ cdecl _mbsupr(str) msvcrt._mbsupr
 @ cdecl _memccpy(ptr ptr long long) msvcrt._memccpy
-@ cdecl _memicmp(str str long) ntdll._memicmp
+@ cdecl _memicmp(str str long) msvcrt._memicmp
 @ cdecl _mkdir(str) msvcrt._mkdir
 @ cdecl _mktemp(str) msvcrt._mktemp
 @ cdecl _msize(ptr) msvcrt._msize
@@ -458,9 +458,9 @@
 @ varargs _open(str long) msvcrt._open
 @ cdecl _open_osfhandle(long long) msvcrt._open_osfhandle
 @ extern _osver msvcrt._osver
-@ cdecl -i386 _outp(long long) msvcrt._outp
-@ cdecl -i386 _outpd(long long) msvcrt._outpd
-@ cdecl -i386 _outpw(long long) msvcrt._outpw
+@ stub -arch=i386 _outp
+@ stub -arch=i386 _outpd
+@ stub -arch=i386 _outpw
 @ cdecl _pclose(ptr) msvcrt._pclose
 @ extern _pctype msvcrt._pctype
 @ extern _pgmptr msvcrt._pgmptr
@@ -471,32 +471,32 @@
 @ cdecl _putenv(str) msvcrt._putenv
 @ cdecl _putw(long ptr) msvcrt._putw
 @ cdecl _putws(wstr) msvcrt._putws
-@ extern _pwctype msvcrt._pwctype
+# extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
 @ cdecl _realloc_dbg(ptr long) msvcrt.realloc
 @ cdecl _rmdir(str) msvcrt._rmdir
 @ cdecl _rmtmp() msvcrt._rmtmp
 @ cdecl _rotl(long long) msvcrt._rotl
 @ cdecl _rotr(long long) msvcrt._rotr
-@ cdecl _safe_fdiv() msvcrt._safe_fdiv
-@ cdecl _safe_fdivr() msvcrt._safe_fdivr
-@ cdecl _safe_fprem() msvcrt._safe_fprem
-@ cdecl _safe_fprem1() msvcrt._safe_fprem1
-@ cdecl _scalb( double long) msvcrt._scalb
+@ cdecl -arch=i386 _safe_fdiv() msvcrt._safe_fdiv
+@ cdecl -arch=i386 _safe_fdivr() msvcrt._safe_fdivr
+@ cdecl -arch=i386 _safe_fprem() msvcrt._safe_fprem
+@ cdecl -arch=i386 _safe_fprem1() msvcrt._safe_fprem1
+@ cdecl _scalb(double long) msvcrt._scalb
 @ cdecl _searchenv(str str ptr) msvcrt._searchenv
 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind
 @ cdecl _set_error_mode(long) msvcrt._set_error_mode
 @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold
 @ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
-@ cdecl -i386 _setjmp3(ptr long) msvcrt._setjmp3
+@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386 -norelay _setjmp3(ptr long) msvcrt._setjmp3
 @ cdecl _setmaxstdio(long) msvcrt._setmaxstdio
 @ cdecl _setmbcp(long) msvcrt._setmbcp
 @ cdecl _setmode(long long) msvcrt._setmode
-@ cdecl _setsystime(ptr long) msvcrt._setsystime
+@ stub _setsystime
 @ cdecl _sleep(long) msvcrt._sleep
-@ varargs _snprintf(str long str) msvcrt._snprintf
-@ varargs _snwprintf(wstr long wstr) ntdll._snwprintf
+@ varargs _snprintf(ptr long str) msvcrt._snprintf
+@ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf
 @ varargs _sopen(str long long) msvcrt._sopen
 @ varargs _spawnl(long str str) msvcrt._spawnl
 @ varargs _spawnle(long str str) msvcrt._spawnle
@@ -506,7 +506,7 @@
 @ cdecl _spawnve(long str ptr ptr) msvcrt._spawnve
 @ cdecl _spawnvp(long str ptr) msvcrt._spawnvp
 @ cdecl _spawnvpe(long str ptr ptr) msvcrt._spawnvpe
-@ cdecl _splitpath(str ptr ptr ptr ptr) ntdll._splitpath
+@ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath
 @ cdecl _stat(str ptr) msvcrt._stat
 @ cdecl _stati64(str ptr) msvcrt._stati64
 @ cdecl _statusfp() msvcrt._statusfp
@@ -516,15 +516,15 @@
 @ cdecl _strerror(long) msvcrt._strerror
 @ cdecl _stricmp(str str) msvcrt._stricmp
 @ cdecl _stricoll(str str) msvcrt._stricoll
-@ cdecl _strlwr(str) ntdll._strlwr
-@ cdecl _strncoll(str str long) msvcrt._strncoll
+@ cdecl _strlwr(str) msvcrt._strlwr
+@ stub _strncoll
 @ cdecl _strnicmp(str str long) msvcrt._strnicmp
-@ cdecl _strnicoll(str str long) msvcrt._strnicoll
+@ stub _strnicoll
 @ cdecl _strnset(str long long) msvcrt._strnset
 @ cdecl _strrev(str) msvcrt._strrev
 @ cdecl _strset(str long) msvcrt._strset
 @ cdecl _strtime(ptr) msvcrt._strtime
-@ cdecl _strupr(str) ntdll._strupr
+@ cdecl _strupr(str) msvcrt._strupr
 @ cdecl _swab(str str long) msvcrt._swab
 @ extern _sys_errlist msvcrt._sys_errlist
 @ extern _sys_nerr msvcrt._sys_nerr
@@ -536,18 +536,18 @@
 @ cdecl _toupper(long) msvcrt._toupper
 @ extern _tzname msvcrt._tzname
 @ cdecl _tzset() msvcrt._tzset
-@ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa
-@ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow
-@ cdecl _ultoa(long ptr long) ntdll._ultoa
-@ cdecl _ultow(long ptr long) ntdll._ultow
+@ cdecl _ui64toa(int64 ptr long) msvcrt._ui64toa
+@ cdecl _ui64tow(int64 ptr long) msvcrt._ui64tow
+@ cdecl _ultoa(long ptr long) msvcrt._ultoa
+@ cdecl _ultow(long ptr long) msvcrt._ultow
 @ cdecl _umask(long) msvcrt._umask
 @ cdecl _ungetch(long) msvcrt._ungetch
 @ cdecl _unlink(str) msvcrt._unlink
 @ cdecl _unloaddll(long) msvcrt._unloaddll
 @ cdecl _unlock(long) msvcrt._unlock
 @ cdecl _utime(str ptr) msvcrt._utime
-@ cdecl _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf
-@ cdecl _vsnwprintf(ptr long wstr long) msvcrt._vsnwprintf
+@ cdecl _vsnprintf(ptr long str ptr) msvcrt._vsnprintf
+@ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf
 @ cdecl _waccess(wstr long) msvcrt._waccess
 @ cdecl _wasctime(ptr) msvcrt._wasctime
 @ cdecl _wchdir(wstr) msvcrt._wchdir
@@ -555,16 +555,16 @@
 @ extern _wcmdln msvcrt._wcmdln
 @ cdecl _wcreat(wstr long) msvcrt._wcreat
 @ cdecl _wcsdup(wstr) msvcrt._wcsdup
-@ cdecl _wcsicmp(wstr wstr) ntdll._wcsicmp
+@ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
 @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
-@ cdecl _wcslwr(wstr) ntdll._wcslwr
-@ cdecl _wcsncoll(wstr wstr long) msvcrt._wcsncoll
-@ cdecl _wcsnicmp(wstr wstr long) ntdll._wcsnicmp
+@ cdecl _wcslwr(wstr) msvcrt._wcslwr
+@ stub _wcsncoll
+@ cdecl _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp
 @ cdecl _wcsnicoll(wstr wstr long) msvcrt._wcsnicoll
 @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset
 @ cdecl _wcsrev(wstr) msvcrt._wcsrev
 @ cdecl _wcsset(wstr long) msvcrt._wcsset
-@ cdecl _wcsupr(wstr) ntdll._wcsupr
+@ cdecl _wcsupr(wstr) msvcrt._wcsupr
 @ cdecl _wctime(ptr) msvcrt._wctime
 @ extern _wenviron msvcrt._wenviron
 @ varargs _wexecl(wstr wstr) msvcrt._wexecl
@@ -590,11 +590,11 @@
 @ extern _winmajor msvcrt._winmajor
 @ extern _winminor msvcrt._winminor
 @ extern _winver msvcrt._winver
-@ cdecl _wmakepath(wstr wstr wstr wstr wstr) msvcrt._wmakepath
+@ cdecl _wmakepath(ptr wstr wstr wstr wstr) msvcrt._wmakepath
 @ cdecl _wmkdir(wstr) msvcrt._wmkdir
 @ cdecl _wmktemp(wstr) msvcrt._wmktemp
 @ varargs _wopen(wstr long) msvcrt._wopen
-@ cdecl _wperror(wstr) msvcrt._wperror
+@ stub _wperror
 @ extern _wpgmptr msvcrt._wpgmptr
 @ cdecl _wpopen(wstr wstr) msvcrt._wpopen
 @ cdecl _wputenv(wstr) msvcrt._wputenv
@@ -604,7 +604,7 @@
 @ cdecl _wrmdir(wstr) msvcrt._wrmdir
 @ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv
 @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale
-@ varargs _wsopen (wstr long long) msvcrt._wsopen
+@ varargs _wsopen(wstr long long) msvcrt._wsopen
 @ varargs _wspawnl(long wstr wstr) msvcrt._wspawnl
 @ varargs _wspawnle(long wstr wstr) msvcrt._wspawnle
 @ varargs _wspawnlp(long wstr wstr) msvcrt._wspawnlp
@@ -613,17 +613,17 @@
 @ cdecl _wspawnve(long wstr ptr ptr) msvcrt._wspawnve
 @ cdecl _wspawnvp(long wstr ptr) msvcrt._wspawnvp
 @ cdecl _wspawnvpe(long wstr ptr ptr) msvcrt._wspawnvpe
-@ cdecl _wsplitpath(wstr wstr wstr wstr wstr) msvcrt._wsplitpath
+@ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath
 @ cdecl _wstat(wstr ptr) msvcrt._wstat
 @ cdecl _wstati64(wstr ptr) msvcrt._wstati64
 @ cdecl _wstrdate(ptr) msvcrt._wstrdate
 @ cdecl _wstrtime(ptr) msvcrt._wstrtime
 @ cdecl _wsystem(wstr) msvcrt._wsystem
 @ cdecl _wtempnam(wstr wstr) msvcrt._wtempnam
-@ cdecl _wtmpnam(ptr) msvcrt._wtmpnam
-@ cdecl _wtoi(wstr) ntdll._wtoi
-@ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64
-@ cdecl _wtol(wstr) ntdll._wtol
+@ stub _wtmpnam
+@ cdecl _wtoi(wstr) msvcrt._wtoi
+@ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64
+@ cdecl _wtol(wstr) msvcrt._wtol
 @ cdecl _wunlink(wstr) msvcrt._wunlink
 @ cdecl _wutime(wstr ptr) msvcrt._wutime
 @ cdecl _y0(double) msvcrt._y0
@@ -649,7 +649,7 @@
 @ cdecl cosh(double) msvcrt.cosh
 @ cdecl ctime(ptr) msvcrt.ctime
 @ cdecl difftime(long long) msvcrt.difftime
-@ cdecl div(long long) msvcrt.div
+@ cdecl -ret64 div(long long) msvcrt.div
 @ cdecl exit(long) msvcrt.exit
 @ cdecl exp(double) msvcrt.exp
 @ cdecl fabs(double) msvcrt.fabs
@@ -688,7 +688,7 @@
 @ cdecl getwc(ptr) msvcrt.getwc
 @ cdecl getwchar() msvcrt.getwchar
 @ cdecl gmtime(ptr) msvcrt.gmtime
-@ cdecl is_wctype(long long) ntdll.iswctype
+@ cdecl is_wctype(long long) msvcrt.is_wctype
 @ cdecl isalnum(long) msvcrt.isalnum
 @ cdecl isalpha(long) msvcrt.isalpha
 @ cdecl iscntrl(long) msvcrt.iscntrl
@@ -701,10 +701,10 @@
 @ cdecl isspace(long) msvcrt.isspace
 @ cdecl isupper(long) msvcrt.isupper
 @ cdecl iswalnum(long) msvcrt.iswalnum
-@ cdecl iswalpha(long) ntdll.iswalpha
+@ cdecl iswalpha(long) msvcrt.iswalpha
 @ cdecl iswascii(long) msvcrt.iswascii
 @ cdecl iswcntrl(long) msvcrt.iswcntrl
-@ cdecl iswctype(long long) ntdll.iswctype
+@ cdecl iswctype(long long) msvcrt.iswctype
 @ cdecl iswdigit(long) msvcrt.iswdigit
 @ cdecl iswgraph(long) msvcrt.iswgraph
 @ cdecl iswlower(long) msvcrt.iswlower
@@ -724,7 +724,7 @@
 @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp
 @ cdecl malloc(long) msvcrt.malloc
 @ cdecl mblen(ptr long) msvcrt.mblen
-@ cdecl mbstowcs(ptr str long) ntdll.mbstowcs
+@ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs
 @ cdecl mbtowc(wstr str long) msvcrt.mbtowc
 @ cdecl memchr(ptr long long) msvcrt.memchr
 @ cdecl memcmp(ptr ptr long) msvcrt.memcmp
@@ -740,7 +740,7 @@
 @ cdecl putchar(long) msvcrt.putchar
 @ cdecl puts(str) msvcrt.puts
 @ cdecl putwc(long ptr) msvcrt.putwc
-@ cdecl putwchar(long) msvcrt._fputwchar
+@ cdecl putwchar(long) msvcrt.putwchar
 @ cdecl qsort(ptr long long ptr) msvcrt.qsort
 @ cdecl raise(long) msvcrt.raise
 @ cdecl rand() msvcrt.rand
@@ -780,7 +780,7 @@
 @ cdecl strtol(str ptr long) msvcrt.strtol
 @ cdecl strtoul(str ptr long) msvcrt.strtoul
 @ cdecl strxfrm(ptr str long) msvcrt.strxfrm
-@ varargs swprintf(wstr wstr) ntdll.swprintf
+@ varargs swprintf(ptr wstr) msvcrt.swprintf
 @ varargs swscanf(wstr wstr) msvcrt.swscanf
 @ cdecl system(str) msvcrt.system
 @ cdecl tan(double) msvcrt.tan
@@ -790,37 +790,37 @@
 @ cdecl tmpnam(ptr) msvcrt.tmpnam
 @ cdecl tolower(long) msvcrt.tolower
 @ cdecl toupper(long) msvcrt.toupper
-@ cdecl towlower(long) ntdll.towlower
-@ cdecl towupper(long) ntdll.towupper
+@ cdecl towlower(long) msvcrt.towlower
+@ cdecl towupper(long) msvcrt.towupper
 @ cdecl ungetc(long ptr) msvcrt.ungetc
 @ cdecl ungetwc(long ptr) msvcrt.ungetwc
-@ cdecl vfprintf(ptr str long) msvcrt.vfprintf
-@ cdecl vfwprintf(ptr wstr long) msvcrt.vfwprintf
-@ cdecl vprintf(str long) msvcrt.vprintf
+@ cdecl vfprintf(ptr str ptr) msvcrt.vfprintf
+@ cdecl vfwprintf(ptr wstr ptr) msvcrt.vfwprintf
+@ cdecl vprintf(str ptr) msvcrt.vprintf
 @ cdecl vsprintf(ptr str ptr) msvcrt.vsprintf
-@ cdecl vswprintf(ptr wstr long) msvcrt.vswprintf
-@ cdecl vwprintf(wstr long) msvcrt.vwprintf
-@ cdecl wcscat(wstr wstr) ntdll.wcscat
-@ cdecl wcschr(wstr long) ntdll.wcschr
-@ cdecl wcscmp(wstr wstr) ntdll.wcscmp
+@ cdecl vswprintf(ptr wstr ptr) msvcrt.vswprintf
+@ cdecl vwprintf(wstr ptr) msvcrt.vwprintf
+@ cdecl wcscat(wstr wstr) msvcrt.wcscat
+@ cdecl wcschr(wstr long) msvcrt.wcschr
+@ cdecl wcscmp(wstr wstr) msvcrt.wcscmp
 @ cdecl wcscoll(wstr wstr) msvcrt.wcscoll
-@ cdecl wcscpy(ptr wstr) ntdll.wcscpy
-@ cdecl wcscspn(wstr wstr) ntdll.wcscspn
+@ cdecl wcscpy(ptr wstr) msvcrt.wcscpy
+@ cdecl wcscspn(wstr wstr) msvcrt.wcscspn
 @ cdecl wcsftime(ptr long wstr ptr) msvcrt.wcsftime
-@ cdecl wcslen(wstr) ntdll.wcslen
-@ cdecl wcsncat(wstr wstr long) ntdll.wcsncat
-@ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp
-@ cdecl wcsncpy(ptr wstr long) ntdll.wcsncpy
+@ cdecl wcslen(wstr) msvcrt.wcslen
+@ cdecl wcsncat(wstr wstr long) msvcrt.wcsncat
+@ cdecl wcsncmp(wstr wstr long) msvcrt.wcsncmp
+@ cdecl wcsncpy(ptr wstr long) msvcrt.wcsncpy
 @ cdecl wcspbrk(wstr wstr) msvcrt.wcspbrk
-@ cdecl wcsrchr(wstr long) ntdll.wcsrchr
-@ cdecl wcsspn(wstr wstr) ntdll.wcsspn
-@ cdecl wcsstr(wstr wstr) ntdll.wcsstr
+@ cdecl wcsrchr(wstr long) msvcrt.wcsrchr
+@ cdecl wcsspn(wstr wstr) msvcrt.wcsspn
+@ cdecl wcsstr(wstr wstr) msvcrt.wcsstr
 @ cdecl wcstod(wstr ptr) msvcrt.wcstod
-@ cdecl wcstok(wstr wstr) ntdll.wcstok
-@ cdecl wcstol(wstr ptr long) ntdll.wcstol
-@ cdecl wcstombs(ptr ptr long) ntdll.wcstombs
-@ cdecl wcstoul(wstr ptr long) ntdll.wcstoul
-@ cdecl wcsxfrm(ptr wstr long) msvcrt.wcsxfrm
+@ cdecl wcstok(wstr wstr) msvcrt.wcstok
+@ cdecl wcstol(wstr ptr long) msvcrt.wcstol
+@ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs
+@ cdecl wcstoul(wstr ptr long) msvcrt.wcstoul
+@ stub wcsxfrm
 @ cdecl wctomb(ptr long) msvcrt.wctomb
 @ varargs wprintf(wstr) msvcrt.wprintf
 @ varargs wscanf(wstr) msvcrt.wscanf