From 5ac184cad58e78419fcbb934d8f40d9c67fdc161 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 3 May 2011 12:02:39 +0200
Subject: [PATCH] msvcrt: Update spec files using the make_specfiles script.

---
 dlls/crtdll/crtdll.spec     |  51 ++--
 dlls/msvcirt/msvcirt.spec   |   3 +-
 dlls/msvcp60/msvcp60.spec   | 494 ++++++++++++++++++------------------
 dlls/msvcp80/msvcp80.spec   |   1 +
 dlls/msvcp90/msvcp90.spec   |   2 +-
 dlls/msvcr100/msvcr100.spec | 138 +++++-----
 dlls/msvcr71/msvcr71.spec   |   6 +-
 dlls/msvcr80/msvcr80.spec   | 138 +++++-----
 dlls/msvcrt20/msvcrt20.spec |   3 +-
 dlls/msvcrt40/msvcrt40.spec |   3 +-
 10 files changed, 419 insertions(+), 420 deletions(-)

diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec
index 0e5689a5553..4fd9323db77 100644
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -4,7 +4,8 @@
 @ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) msvcrt.??2@YAPEAX_K@Z
 @ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) msvcrt.??3@YAXPAX@Z
 @ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) msvcrt.??3@YAXPEAX@Z
-@ cdecl ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) msvcrt.?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
 @ cdecl -arch=i386 _CIatan() msvcrt._CIatan
@@ -74,7 +75,7 @@
 @ extern _daylight_dll 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
 @ extern _environ_dll msvcrt._environ
 @ cdecl _eof(long) msvcrt._eof
@@ -84,14 +85,14 @@
 @ varargs _execle(str str) msvcrt._execle
 @ varargs _execlp(str str) msvcrt._execlp
 @ varargs _execlpe(str str) msvcrt._execlpe
-@ cdecl _execv(str str) msvcrt._execv
-@ cdecl _execve(str str str) msvcrt._execve
-@ cdecl _execvp(str str) msvcrt._execvp
-@ cdecl _execvpe(str str str) msvcrt._execvpe
+@ cdecl _execv(str ptr) msvcrt._execv
+@ cdecl _execve(str ptr ptr) msvcrt._execve
+@ cdecl _execvp(str ptr) msvcrt._execvp
+@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe
 @ 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
@@ -117,7 +118,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
@@ -174,16 +175,16 @@
 @ 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 _logb(double) msvcrt._logb
 @ 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
@@ -262,15 +263,15 @@
 @ cdecl _rmtmp() msvcrt._rmtmp
 @ cdecl _rotl(long long) msvcrt._rotl
 @ cdecl _rotr(long long) msvcrt._rotr
-@ cdecl _scalb( double long) msvcrt._scalb
+@ cdecl _scalb(double long) msvcrt._scalb
 @ cdecl _searchenv(str str ptr) msvcrt._searchenv
 @ cdecl _seterrormode(long) msvcrt._seterrormode
-@ cdecl -arch=i386,x86_64 _setjmp(ptr) msvcrt._setjmp
+@ cdecl -arch=i386,x86_64 -norelay _setjmp(ptr) msvcrt._setjmp
 @ cdecl _setmode(long long) msvcrt._setmode
 @ cdecl _setsystime(ptr long) msvcrt._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
@@ -318,8 +319,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 _wcsdup(wstr) msvcrt._wcsdup
 @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp
 @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll
@@ -358,7 +359,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
@@ -483,26 +484,26 @@
 @ 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
 @ cdecl tanh(double) msvcrt.tanh
 @ cdecl time(ptr) msvcrt.time
 @ cdecl tmpfile() msvcrt.tmpfile
-@ cdecl tmpnam(str) msvcrt.tmpnam
+@ cdecl tmpnam(ptr) msvcrt.tmpnam
 @ cdecl tolower(long) msvcrt.tolower
 @ cdecl toupper(long) msvcrt.toupper
 @ 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 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
diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec
index 6e029bd1085..79353eb0c19 100644
--- a/dlls/msvcirt/msvcirt.spec
+++ b/dlls/msvcirt/msvcirt.spec
@@ -555,8 +555,7 @@
 @ stub -arch=win64 ?lock@streambuf@@QEAAXXZ
 @ stub -arch=win32 ?lockbuf@ios@@QAAXXZ  # void __cdecl ios::lockbuf(void)
 @ stub -arch=win64 ?lockbuf@ios@@QEAAXXZ
-@ stub -arch=win32 ?lockc@ios@@KAXXZ  # static void __cdecl ios::lockc(void)
-@ stub -arch=win64 ?lockc@ios@@KAXXZ
+@ stub ?lockc@ios@@KAXXZ  # static void __cdecl ios::lockc(void)
 @ stub -arch=win32 ?lockptr@ios@@IAEPAU_CRT_CRITICAL_SECTION@@XZ  # struct _CRT_CRITICAL_SECTION * __thiscall ios::lockptr(void)
 @ stub -arch=win64 ?lockptr@ios@@IEAAPEAU_CRT_CRITICAL_SECTION@@XZ
 @ stub -arch=win32 ?lockptr@streambuf@@IAEPAU_CRT_CRITICAL_SECTION@@XZ  # struct _CRT_CRITICAL_SECTION * __thiscall streambuf::lockptr(void)
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index eb260110b79..db291004059 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -1759,104 +1759,104 @@
 @ stub -arch=win64 ??_0std@@YAAEAV?$complex@N@0@AEAV10@AEBV10@@Z
 @ stub -arch=win32 ??_0std@@YAAAV?$complex@O@0@AAV10@ABV10@@Z
 @ stub -arch=win64 ??_0std@@YAAEAV?$complex@O@0@AEAV10@AEBV10@@Z
-@ stub -arch=win64 ??_7?$_Mpunct@D@std@@6B@
-@ stub -arch=win64 ??_7?$_Mpunct@G@std@@6B@
-@ stub -arch=win64 ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@
-@ stub -arch=win64 ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@
-@ stub -arch=win64 ??_7?$codecvt@DDH@std@@6B@
-@ stub -arch=win64 ??_7?$codecvt@GDH@std@@6B@
-@ stub -arch=win64 ??_7?$collate@D@std@@6B@
-@ stub -arch=win64 ??_7?$collate@G@std@@6B@
-@ stub -arch=win64 ??_7?$ctype@D@std@@6B@
-@ stub -arch=win64 ??_7?$ctype@G@std@@6B@
-@ stub -arch=win64 ??_7?$messages@D@std@@6B@
-@ stub -arch=win64 ??_7?$messages@G@std@@6B@
-@ stub -arch=win64 ??_7?$money_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$money_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$money_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$money_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$moneypunct@D$00@std@@6B@
-@ stub -arch=win64 ??_7?$moneypunct@D$0A@@std@@6B@
-@ stub -arch=win64 ??_7?$moneypunct@G$00@std@@6B@
-@ stub -arch=win64 ??_7?$moneypunct@G$0A@@std@@6B@
-@ stub -arch=win64 ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$numpunct@D@std@@6B@
-@ stub -arch=win64 ??_7?$numpunct@G@std@@6B@
-@ stub -arch=win64 ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
-@ stub -arch=win64 ??_7__non_rtti_object@std@@6B@
+@ stub ??_7?$_Mpunct@D@std@@6B@
+@ stub ??_7?$_Mpunct@G@std@@6B@
+@ stub ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_fstream@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_fstream@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_ifstream@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_ifstream@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_ios@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_ios@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_iostream@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_iostream@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_istream@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_istream@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@
+@ stub ??_7?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@
+@ stub ??_7?$basic_ofstream@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_ofstream@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_ostream@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@
+@ stub ??_7?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@
+@ stub ??_7?$basic_streambuf@DU?$char_traits@D@std@@@std@@6B@
+@ stub ??_7?$basic_streambuf@GU?$char_traits@G@std@@@std@@6B@
+@ stub ??_7?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@
+@ stub ??_7?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@
+@ stub ??_7?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@6B@
+@ stub ??_7?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@6B@
+@ stub ??_7?$codecvt@DDH@std@@6B@
+@ stub ??_7?$codecvt@GDH@std@@6B@
+@ stub ??_7?$collate@D@std@@6B@
+@ stub ??_7?$collate@G@std@@6B@
+@ stub ??_7?$ctype@D@std@@6B@
+@ stub ??_7?$ctype@G@std@@6B@
+@ stub ??_7?$messages@D@std@@6B@
+@ stub ??_7?$messages@G@std@@6B@
+@ stub ??_7?$money_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
+@ stub ??_7?$money_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
+@ stub ??_7?$money_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
+@ stub ??_7?$money_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
+@ stub ??_7?$moneypunct@D$00@std@@6B@
+@ stub ??_7?$moneypunct@D$0A@@std@@6B@
+@ stub ??_7?$moneypunct@G$00@std@@6B@
+@ stub ??_7?$moneypunct@G$0A@@std@@6B@
+@ stub ??_7?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
+@ stub ??_7?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
+@ stub ??_7?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
+@ stub ??_7?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
+@ stub ??_7?$numpunct@D@std@@6B@
+@ stub ??_7?$numpunct@G@std@@6B@
+@ stub ??_7?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
+@ stub ??_7?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
+@ stub ??_7?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@6B@
+@ stub ??_7?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@6B@
+@ stub ??_7__non_rtti_object@std@@6B@
 @ stub -arch=win64 ??_7bad_alloc@std@@6B@
-@ stub -arch=win64 ??_7bad_cast@std@@6B@
+@ stub ??_7bad_cast@std@@6B@
 @ stub -arch=win64 ??_7bad_exception@std@@6B@
-@ stub -arch=win64 ??_7bad_typeid@std@@6B@
-@ stub -arch=win64 ??_7codecvt_base@std@@6B@
-@ stub -arch=win64 ??_7ctype_base@std@@6B@
+@ stub ??_7bad_typeid@std@@6B@
+@ stub ??_7codecvt_base@std@@6B@
+@ stub ??_7ctype_base@std@@6B@
 @ stub -arch=win64 ??_7domain_error@std@@6B@
-@ stub -arch=win64 ??_7facet@locale@std@@6B@
-@ stub -arch=win64 ??_7ios_base@std@@6B@
+@ stub ??_7facet@locale@std@@6B@
+@ stub ??_7ios_base@std@@6B@
 @ stub -arch=win64 ??_7length_error@std@@6B@
 @ stub -arch=win64 ??_7logic_error@std@@6B@
-@ stub -arch=win64 ??_7messages_base@std@@6B@
-@ stub -arch=win64 ??_7money_base@std@@6B@
+@ stub ??_7messages_base@std@@6B@
+@ stub ??_7money_base@std@@6B@
 @ stub -arch=win64 ??_7out_of_range@std@@6B@
 @ stub -arch=win64 ??_7overflow_error@std@@6B@
 @ stub -arch=win64 ??_7range_error@std@@6B@
 @ stub -arch=win64 ??_7runtime_error@std@@6B@
-@ stub -arch=win64 ??_7time_base@std@@6B@
+@ stub ??_7time_base@std@@6B@
 @ stub -arch=win64 ??_7underflow_error@std@@6B@
-@ stub -arch=win64 ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_ifstream@DU?$char_traits@D@std@@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_ifstream@GU?$char_traits@G@std@@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_istream@DU?$char_traits@D@std@@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_ofstream@DU?$char_traits@D@std@@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_ofstream@GU?$char_traits@G@std@@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_ostream@DU?$char_traits@D@std@@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_ostream@GU?$char_traits@G@std@@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@
-@ stub -arch=win64 ??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@
-@ stub -arch=win64 ??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@
+@ stub ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@
+@ stub ??_8?$basic_fstream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@
+@ stub ??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@
+@ stub ??_8?$basic_fstream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@
+@ stub ??_8?$basic_ifstream@DU?$char_traits@D@std@@@std@@7B@
+@ stub ??_8?$basic_ifstream@GU?$char_traits@G@std@@@std@@7B@
+@ stub ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@
+@ stub ??_8?$basic_iostream@DU?$char_traits@D@std@@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@
+@ stub ??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@
+@ stub ??_8?$basic_iostream@GU?$char_traits@G@std@@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@
+@ stub ??_8?$basic_istream@DU?$char_traits@D@std@@@std@@7B@
+@ stub ??_8?$basic_istream@GU?$char_traits@G@std@@@std@@7B@
+@ stub ??_8?$basic_istringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@
+@ stub ??_8?$basic_istringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@
+@ stub ??_8?$basic_ofstream@DU?$char_traits@D@std@@@std@@7B@
+@ stub ??_8?$basic_ofstream@GU?$char_traits@G@std@@@std@@7B@
+@ stub ??_8?$basic_ostream@DU?$char_traits@D@std@@@std@@7B@
+@ stub ??_8?$basic_ostream@GU?$char_traits@G@std@@@std@@7B@
+@ stub ??_8?$basic_ostringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B@
+@ stub ??_8?$basic_ostringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B@
+@ stub ??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_istream@DU?$char_traits@D@std@@@1@@
+@ stub ??_8?$basic_stringstream@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@7B?$basic_ostream@DU?$char_traits@D@std@@@1@@
+@ stub ??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_istream@GU?$char_traits@G@std@@@1@@
+@ stub ??_8?$basic_stringstream@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@7B?$basic_ostream@GU?$char_traits@G@std@@@1@@
 @ stub -arch=win32 ??_D?$basic_fstream@DU?$char_traits@D@std@@@std@@QAEXXZ
 @ stub -arch=win64 ??_D?$basic_fstream@DU?$char_traits@D@std@@@std@@QEAAXXZ
 @ stub -arch=win32 ??_D?$basic_fstream@GU?$char_traits@G@std@@@std@@QAEXXZ
@@ -2198,7 +2198,7 @@
 @ stub -arch=win64 ?_Grow@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAA_N_K_N@Z
 @ stub -arch=win32 ?_Grow@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAE_NI_N@Z
 @ stub -arch=win64 ?_Grow@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AEAA_N_K_N@Z
-@ stub -arch=win64 ?_Id_cnt@id@locale@std@@0HA
+@ stub ?_Id_cnt@id@locale@std@@0HA
 @ stub -arch=win32 ?_Ifmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KAPADPADDH@Z
 @ stub -arch=win64 ?_Ifmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KAPEADPEADDH@Z
 @ stub -arch=win64 ?_Ifmt@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KAPEADPEADPEBDH@Z
@@ -2207,7 +2207,7 @@
 @ stub -arch=win64 ?_Ifmt@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KAPEADPEADPEBDH@Z
 @ stub -arch=win32 ?_Incref@facet@locale@std@@QAEXXZ
 @ stub -arch=win64 ?_Incref@facet@locale@std@@QEAAXXZ
-@ stub -arch=win64 ?_Index@ios_base@std@@0HA
+@ stub ?_Index@ios_base@std@@0HA
 @ stub -arch=win64 ?_Infv@?$_Ctr@M@std@@SAMM@Z
 @ stub -arch=win64 ?_Infv@?$_Ctr@N@std@@SANN@Z
 @ stub -arch=win64 ?_Infv@?$_Ctr@O@std@@SAOO@Z
@@ -2281,8 +2281,8 @@
 @ stub -arch=win64 ?_Init@locale@std@@CAPEAV_Locimp@12@XZ
 @ stub -arch=win32 ?_Init@strstreambuf@std@@IAEXHPAD0H@Z
 @ stub -arch=win64 ?_Init@strstreambuf@std@@IEAAXHPEAD0H@Z
-@ stub -arch=win64 ?_Init_cnt@Init@ios_base@std@@0HA
-@ stub -arch=win64 ?_Init_cnt@_Winit@std@@0HA
+@ stub ?_Init_cnt@Init@ios_base@std@@0HA
+@ stub ?_Init_cnt@_Winit@std@@0HA
 @ stub -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXXZ
 @ stub -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXXZ
 @ stub -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ
@@ -2310,7 +2310,7 @@
 @ stub -arch=win64 ?_Nanv@?$_Ctr@M@std@@SAMM@Z
 @ stub -arch=win64 ?_Nanv@?$_Ctr@N@std@@SANN@Z
 @ stub -arch=win64 ?_Nanv@?$_Ctr@O@std@@SAOO@Z
-@ stub -arch=win64 ?_Nomemory@std@@YAXXZ
+@ stub ?_Nomemory@std@@YAXXZ
 @ stub -arch=win32 ?_Nullstr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@CAPBDXZ
 @ stub -arch=win64 ?_Nullstr@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@CAPEBDXZ
 @ stub -arch=win32 ?_Nullstr@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@CAPBGXZ
@@ -2373,7 +2373,7 @@
 @ stub -arch=win64 ?_Stinit@?1??_Init@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA
 @ stub -arch=win32 ?_Stinit@?1??_Init@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA
 @ stub -arch=win64 ?_Stinit@?1??_Init@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA
-@ stub -arch=win64 ?_Sync@ios_base@std@@0_NA
+@ stub ?_Sync@ios_base@std@@0_NA
 @ stub -arch=win64 ?_Term@?$ctype@D@std@@KAXXZ
 @ stub -arch=win32 ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEX_N@Z
 @ stub -arch=win64 ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEAAX_N@Z
@@ -2385,7 +2385,7 @@
 @ stub -arch=win64 ?_Tidy@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@IEAAXXZ
 @ stub -arch=win32 ?_Tidy@ios_base@std@@AAEXXZ
 @ stub -arch=win64 ?_Tidy@ios_base@std@@AEAAXXZ
-@ stub -arch=win64 ?_Tidy@locale@std@@CAXXZ
+@ stub ?_Tidy@locale@std@@CAXXZ
 @ stub -arch=win32 ?_Tidy@strstreambuf@std@@IAEXXZ
 @ stub -arch=win64 ?_Tidy@strstreambuf@std@@IEAAXXZ
 @ stub -arch=win64 ?_Xh@?BN@???$_Fabs@M@std@@YAMAEBV?$complex@M@1@PEAH@Z@4MB
@@ -2497,8 +2497,8 @@
 @ cdecl -arch=win64 ?capacity@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ(ptr) msvcp90.?capacity@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ
 @ stub -arch=win32 ?capacity@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ
 @ stub -arch=win64 ?capacity@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ
-@ stub -arch=win64 ?cerr@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A
-@ stub -arch=win64 ?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A
+@ stub ?cerr@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A
+@ stub ?cin@std@@3V?$basic_istream@DU?$char_traits@D@std@@@1@A
 @ stub -arch=win32 ?classic@locale@std@@SAABV12@XZ
 @ stub -arch=win64 ?classic@locale@std@@SAAEBV12@XZ
 @ stub -arch=win32 ?classic_table@?$ctype@D@std@@KAPBFXZ
@@ -2515,7 +2515,7 @@
 @ stub -arch=win64 ?clear@ios_base@std@@QEAAXF@Z
 @ stub -arch=win32 ?clear@ios_base@std@@QAEXH_N@Z
 @ stub -arch=win64 ?clear@ios_base@std@@QEAAXH_N@Z
-@ stub -arch=win64 ?clog@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A
+@ stub ?clog@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A
 @ stub -arch=win32 ?close@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@XZ
 @ stub -arch=win64 ?close@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@XZ
 @ stub -arch=win32 ?close@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@XZ
@@ -2603,7 +2603,7 @@
 @ stub -arch=win64 ?cosh@std@@YA?AV?$complex@N@1@AEBV21@@Z
 @ stub -arch=win32 ?cosh@std@@YA?AV?$complex@O@1@ABV21@@Z
 @ stub -arch=win64 ?cosh@std@@YA?AV?$complex@O@1@AEBV21@@Z
-@ stub -arch=win64 ?cout@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A
+@ stub ?cout@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A
 @ stub -arch=win32 ?curr_symbol@?$_Mpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
 @ stub -arch=win64 ?curr_symbol@?$_Mpunct@D@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ
 @ stub -arch=win32 ?curr_symbol@?$_Mpunct@G@std@@QBE?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ
@@ -2624,19 +2624,19 @@
 @ stub -arch=win64 ?decimal_point@?$numpunct@D@std@@QEBADXZ
 @ stub -arch=win32 ?decimal_point@?$numpunct@G@std@@QBEGXZ
 @ stub -arch=win64 ?decimal_point@?$numpunct@G@std@@QEBAGXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@C@std@@SACXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@D@std@@SADXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@E@std@@SAEXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@F@std@@SAFXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@G@std@@SAGXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@H@std@@SAHXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@I@std@@SAIXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@J@std@@SAJXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@K@std@@SAKXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@M@std@@SAMXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@N@std@@SANXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@O@std@@SAOXZ
-@ stub -arch=win64 ?denorm_min@?$numeric_limits@_N@std@@SA_NXZ
+@ stub ?denorm_min@?$numeric_limits@C@std@@SACXZ
+@ stub ?denorm_min@?$numeric_limits@D@std@@SADXZ
+@ stub ?denorm_min@?$numeric_limits@E@std@@SAEXZ
+@ stub ?denorm_min@?$numeric_limits@F@std@@SAFXZ
+@ stub ?denorm_min@?$numeric_limits@G@std@@SAGXZ
+@ stub ?denorm_min@?$numeric_limits@H@std@@SAHXZ
+@ stub ?denorm_min@?$numeric_limits@I@std@@SAIXZ
+@ stub ?denorm_min@?$numeric_limits@J@std@@SAJXZ
+@ stub ?denorm_min@?$numeric_limits@K@std@@SAKXZ
+@ stub ?denorm_min@?$numeric_limits@M@std@@SAMXZ
+@ stub ?denorm_min@?$numeric_limits@N@std@@SANXZ
+@ stub ?denorm_min@?$numeric_limits@O@std@@SAOXZ
+@ stub ?denorm_min@?$numeric_limits@_N@std@@SA_NXZ
 @ stub -arch=win32 ?do_always_noconv@?$codecvt@GDH@std@@MBE_NXZ
 @ stub -arch=win64 ?do_always_noconv@?$codecvt@GDH@std@@MEBA_NXZ
 @ stub -arch=win32 ?do_always_noconv@codecvt_base@std@@MBE_NXZ
@@ -2897,7 +2897,7 @@
 @ stub -arch=win64 ?empty@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_NXZ
 @ stub -arch=win32 ?empty@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBE_NXZ
 @ stub -arch=win64 ?empty@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_NXZ
-@ stub -arch=win64 ?empty@locale@std@@SA?AV12@XZ
+@ stub ?empty@locale@std@@SA?AV12@XZ
 @ stub -arch=win32 ?encoding@codecvt_base@std@@QBEHXZ
 @ stub -arch=win64 ?encoding@codecvt_base@std@@QEBAHXZ
 @ stub -arch=win32 ?end@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEPADXZ
@@ -2916,27 +2916,27 @@
 @ stub -arch=win64 ?ends@std@@YAAEAV?$basic_ostream@DU?$char_traits@D@std@@@1@AEAV21@@Z
 @ stub -arch=win32 ?ends@std@@YAAAV?$basic_ostream@GU?$char_traits@G@std@@@1@AAV21@@Z
 @ stub -arch=win64 ?ends@std@@YAAEAV?$basic_ostream@GU?$char_traits@G@std@@@1@AEAV21@@Z
-@ cdecl -arch=win64 ?eof@?$char_traits@D@std@@SAHXZ() msvcp90.?eof@?$char_traits@D@std@@SAHXZ
-@ cdecl -arch=win64 ?eof@?$char_traits@G@std@@SAGXZ() msvcp90.?eof@?$char_traits@G@std@@SAGXZ
+@ cdecl ?eof@?$char_traits@D@std@@SAHXZ() msvcp90.?eof@?$char_traits@D@std@@SAHXZ
+@ cdecl ?eof@?$char_traits@G@std@@SAGXZ() msvcp90.?eof@?$char_traits@G@std@@SAGXZ
 @ stub -arch=win32 ?eof@ios_base@std@@QBE_NXZ
 @ stub -arch=win64 ?eof@ios_base@std@@QEBA_NXZ
 @ stub -arch=win32 ?epptr@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IBEPADXZ
 @ stub -arch=win64 ?epptr@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEBAPEADXZ
 @ stub -arch=win32 ?epptr@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IBEPAGXZ
 @ stub -arch=win64 ?epptr@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IEBAPEAGXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@C@std@@SACXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@D@std@@SADXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@E@std@@SAEXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@F@std@@SAFXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@G@std@@SAGXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@H@std@@SAHXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@I@std@@SAIXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@J@std@@SAJXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@K@std@@SAKXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@M@std@@SAMXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@N@std@@SANXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@O@std@@SAOXZ
-@ stub -arch=win64 ?epsilon@?$numeric_limits@_N@std@@SA_NXZ
+@ stub ?epsilon@?$numeric_limits@C@std@@SACXZ
+@ stub ?epsilon@?$numeric_limits@D@std@@SADXZ
+@ stub ?epsilon@?$numeric_limits@E@std@@SAEXZ
+@ stub ?epsilon@?$numeric_limits@F@std@@SAFXZ
+@ stub ?epsilon@?$numeric_limits@G@std@@SAGXZ
+@ stub ?epsilon@?$numeric_limits@H@std@@SAHXZ
+@ stub ?epsilon@?$numeric_limits@I@std@@SAIXZ
+@ stub ?epsilon@?$numeric_limits@J@std@@SAJXZ
+@ stub ?epsilon@?$numeric_limits@K@std@@SAKXZ
+@ stub ?epsilon@?$numeric_limits@M@std@@SAMXZ
+@ stub ?epsilon@?$numeric_limits@N@std@@SANXZ
+@ stub ?epsilon@?$numeric_limits@O@std@@SAOXZ
+@ stub ?epsilon@?$numeric_limits@_N@std@@SA_NXZ
 @ cdecl -arch=win32 ?eq@?$char_traits@D@std@@SA_NABD0@Z(ptr ptr) msvcp90.?eq@?$char_traits@D@std@@SA_NABD0@Z
 @ cdecl -arch=win64 ?eq@?$char_traits@D@std@@SA_NAEBD0@Z(ptr ptr) msvcp90.?eq@?$char_traits@D@std@@SA_NAEBD0@Z
 @ cdecl -arch=win32 ?eq@?$char_traits@G@std@@SA_NABG0@Z(ptr ptr) msvcp90.?eq@?$char_traits@G@std@@SA_NABG0@Z
@@ -3238,32 +3238,32 @@
 @ stub -arch=win64 ?hash@?$collate@D@std@@QEBAJPEBD0@Z
 @ stub -arch=win32 ?hash@?$collate@G@std@@QBEJPBG0@Z
 @ stub -arch=win64 ?hash@?$collate@G@std@@QEBAJPEBG0@Z
-@ stub -arch=win64 ?id@?$codecvt@DDH@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$codecvt@GDH@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$collate@D@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$collate@G@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$ctype@D@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$ctype@G@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$messages@D@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$messages@G@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$money_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$money_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$money_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$money_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$moneypunct@D$00@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$moneypunct@D$0A@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$moneypunct@G$00@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$moneypunct@G$0A@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$numpunct@D@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$numpunct@G@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
-@ stub -arch=win64 ?id@?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$codecvt@DDH@std@@2V0locale@2@A
+@ stub ?id@?$codecvt@GDH@std@@2V0locale@2@A
+@ stub ?id@?$collate@D@std@@2V0locale@2@A
+@ stub ?id@?$collate@G@std@@2V0locale@2@A
+@ stub ?id@?$ctype@D@std@@2V0locale@2@A
+@ stub ?id@?$ctype@G@std@@2V0locale@2@A
+@ stub ?id@?$messages@D@std@@2V0locale@2@A
+@ stub ?id@?$messages@G@std@@2V0locale@2@A
+@ stub ?id@?$money_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$money_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$money_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$money_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$moneypunct@D$00@std@@2V0locale@2@A
+@ stub ?id@?$moneypunct@D$0A@@std@@2V0locale@2@A
+@ stub ?id@?$moneypunct@G$00@std@@2V0locale@2@A
+@ stub ?id@?$moneypunct@G$0A@@std@@2V0locale@2@A
+@ stub ?id@?$num_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$num_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$numpunct@D@std@@2V0locale@2@A
+@ stub ?id@?$numpunct@G@std@@2V0locale@2@A
+@ stub ?id@?$time_get@DV?$istreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$time_get@GV?$istreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$time_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@2V0locale@2@A
+@ stub ?id@?$time_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@2V0locale@2@A
 @ stub -arch=win32 ?ignore@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEAAV12@HH@Z
 @ stub -arch=win64 ?ignore@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAAEAV12@_JH@Z
 @ stub -arch=win32 ?ignore@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEAAV12@HG@Z
@@ -3304,19 +3304,19 @@
 @ stub -arch=win64 ?in_avail@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAA_JXZ
 @ stub -arch=win32 ?in_avail@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAEHXZ
 @ stub -arch=win64 ?in_avail@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QEAA_JXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@C@std@@SACXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@D@std@@SADXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@E@std@@SAEXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@F@std@@SAFXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@G@std@@SAGXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@H@std@@SAHXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@I@std@@SAIXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@J@std@@SAJXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@K@std@@SAKXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@M@std@@SAMXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@N@std@@SANXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@O@std@@SAOXZ
-@ stub -arch=win64 ?infinity@?$numeric_limits@_N@std@@SA_NXZ
+@ stub ?infinity@?$numeric_limits@C@std@@SACXZ
+@ stub ?infinity@?$numeric_limits@D@std@@SADXZ
+@ stub ?infinity@?$numeric_limits@E@std@@SAEXZ
+@ stub ?infinity@?$numeric_limits@F@std@@SAFXZ
+@ stub ?infinity@?$numeric_limits@G@std@@SAGXZ
+@ stub ?infinity@?$numeric_limits@H@std@@SAHXZ
+@ stub ?infinity@?$numeric_limits@I@std@@SAIXZ
+@ stub ?infinity@?$numeric_limits@J@std@@SAJXZ
+@ stub ?infinity@?$numeric_limits@K@std@@SAKXZ
+@ stub ?infinity@?$numeric_limits@M@std@@SAMXZ
+@ stub ?infinity@?$numeric_limits@N@std@@SANXZ
+@ stub ?infinity@?$numeric_limits@O@std@@SAOXZ
+@ stub ?infinity@?$numeric_limits@_N@std@@SA_NXZ
 @ stub -arch=win32 ?init@?$basic_ios@DU?$char_traits@D@std@@@std@@IAEXPAV?$basic_streambuf@DU?$char_traits@D@std@@@2@_N@Z
 @ stub -arch=win64 ?init@?$basic_ios@DU?$char_traits@D@std@@@std@@IEAAXPEAV?$basic_streambuf@DU?$char_traits@D@std@@@2@_N@Z
 @ stub -arch=win32 ?init@?$basic_ios@GU?$char_traits@G@std@@@std@@IAEXPAV?$basic_streambuf@GU?$char_traits@G@std@@@2@_N@Z
@@ -3353,10 +3353,10 @@
 @ stub -arch=win64 ?insert@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXPEAGPEBG1@Z
 @ stub -arch=win32 ?insert@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXPAGPBG1@Z
 @ stub -arch=win64 ?insert@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXPEAG_KG@Z
-@ stub -arch=win64 ?intl@?$moneypunct@D$00@std@@2_NB
-@ stub -arch=win64 ?intl@?$moneypunct@D$0A@@std@@2_NB
-@ stub -arch=win64 ?intl@?$moneypunct@G$00@std@@2_NB
-@ stub -arch=win64 ?intl@?$moneypunct@G$0A@@std@@2_NB
+@ stub ?intl@?$moneypunct@D$00@std@@2_NB
+@ stub ?intl@?$moneypunct@D$0A@@std@@2_NB
+@ stub ?intl@?$moneypunct@G$00@std@@2_NB
+@ stub ?intl@?$moneypunct@G$0A@@std@@2_NB
 @ stub -arch=win32 ?ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QAE_N_N@Z
 @ stub -arch=win64 ?ipfx@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAA_N_N@Z
 @ stub -arch=win32 ?ipfx@?$basic_istream@GU?$char_traits@G@std@@@std@@QAE_N_N@Z
@@ -3425,38 +3425,38 @@
 @ cdecl -arch=win64 ?lt@?$char_traits@D@std@@SA_NAEBD0@Z(ptr ptr) msvcp90.?lt@?$char_traits@D@std@@SA_NAEBD0@Z
 @ cdecl -arch=win32 ?lt@?$char_traits@G@std@@SA_NABG0@Z(ptr ptr) msvcp90.?lt@?$char_traits@G@std@@SA_NABG0@Z
 @ cdecl -arch=win64 ?lt@?$char_traits@G@std@@SA_NAEBG0@Z(ptr ptr) msvcp90.?lt@?$char_traits@G@std@@SA_NAEBG0@Z
-@ stub -arch=win64 ?max@?$numeric_limits@C@std@@SACXZ
-@ stub -arch=win64 ?max@?$numeric_limits@D@std@@SADXZ
-@ stub -arch=win64 ?max@?$numeric_limits@E@std@@SAEXZ
-@ stub -arch=win64 ?max@?$numeric_limits@F@std@@SAFXZ
-@ stub -arch=win64 ?max@?$numeric_limits@G@std@@SAGXZ
-@ stub -arch=win64 ?max@?$numeric_limits@H@std@@SAHXZ
-@ stub -arch=win64 ?max@?$numeric_limits@I@std@@SAIXZ
-@ stub -arch=win64 ?max@?$numeric_limits@J@std@@SAJXZ
-@ stub -arch=win64 ?max@?$numeric_limits@K@std@@SAKXZ
-@ stub -arch=win64 ?max@?$numeric_limits@M@std@@SAMXZ
-@ stub -arch=win64 ?max@?$numeric_limits@N@std@@SANXZ
-@ stub -arch=win64 ?max@?$numeric_limits@O@std@@SAOXZ
-@ stub -arch=win64 ?max@?$numeric_limits@_N@std@@SA_NXZ
+@ stub ?max@?$numeric_limits@C@std@@SACXZ
+@ stub ?max@?$numeric_limits@D@std@@SADXZ
+@ stub ?max@?$numeric_limits@E@std@@SAEXZ
+@ stub ?max@?$numeric_limits@F@std@@SAFXZ
+@ stub ?max@?$numeric_limits@G@std@@SAGXZ
+@ stub ?max@?$numeric_limits@H@std@@SAHXZ
+@ stub ?max@?$numeric_limits@I@std@@SAIXZ
+@ stub ?max@?$numeric_limits@J@std@@SAJXZ
+@ stub ?max@?$numeric_limits@K@std@@SAKXZ
+@ stub ?max@?$numeric_limits@M@std@@SAMXZ
+@ stub ?max@?$numeric_limits@N@std@@SANXZ
+@ stub ?max@?$numeric_limits@O@std@@SAOXZ
+@ stub ?max@?$numeric_limits@_N@std@@SA_NXZ
 @ stub -arch=win32 ?max_length@codecvt_base@std@@QBEHXZ
 @ stub -arch=win64 ?max_length@codecvt_base@std@@QEBAHXZ
 @ stub -arch=win32 ?max_size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ
 @ stub -arch=win64 ?max_size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBA_KXZ
 @ stub -arch=win32 ?max_size@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ
 @ stub -arch=win64 ?max_size@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KXZ
-@ stub -arch=win64 ?min@?$numeric_limits@C@std@@SACXZ
-@ stub -arch=win64 ?min@?$numeric_limits@D@std@@SADXZ
-@ stub -arch=win64 ?min@?$numeric_limits@E@std@@SAEXZ
-@ stub -arch=win64 ?min@?$numeric_limits@F@std@@SAFXZ
-@ stub -arch=win64 ?min@?$numeric_limits@G@std@@SAGXZ
-@ stub -arch=win64 ?min@?$numeric_limits@H@std@@SAHXZ
-@ stub -arch=win64 ?min@?$numeric_limits@I@std@@SAIXZ
-@ stub -arch=win64 ?min@?$numeric_limits@J@std@@SAJXZ
-@ stub -arch=win64 ?min@?$numeric_limits@K@std@@SAKXZ
-@ stub -arch=win64 ?min@?$numeric_limits@M@std@@SAMXZ
-@ stub -arch=win64 ?min@?$numeric_limits@N@std@@SANXZ
-@ stub -arch=win64 ?min@?$numeric_limits@O@std@@SAOXZ
-@ stub -arch=win64 ?min@?$numeric_limits@_N@std@@SA_NXZ
+@ stub ?min@?$numeric_limits@C@std@@SACXZ
+@ stub ?min@?$numeric_limits@D@std@@SADXZ
+@ stub ?min@?$numeric_limits@E@std@@SAEXZ
+@ stub ?min@?$numeric_limits@F@std@@SAFXZ
+@ stub ?min@?$numeric_limits@G@std@@SAGXZ
+@ stub ?min@?$numeric_limits@H@std@@SAHXZ
+@ stub ?min@?$numeric_limits@I@std@@SAIXZ
+@ stub ?min@?$numeric_limits@J@std@@SAJXZ
+@ stub ?min@?$numeric_limits@K@std@@SAKXZ
+@ stub ?min@?$numeric_limits@M@std@@SAMXZ
+@ stub ?min@?$numeric_limits@N@std@@SANXZ
+@ stub ?min@?$numeric_limits@O@std@@SAOXZ
+@ stub ?min@?$numeric_limits@_N@std@@SA_NXZ
 @ cdecl -arch=win32 ?move@?$char_traits@D@std@@SAPADPADPBDI@Z(ptr ptr long) msvcp90.?move@?$char_traits@D@std@@SAPADPADPBDI@Z
 @ cdecl -arch=win64 ?move@?$char_traits@D@std@@SAPEADPEADPEBD_K@Z(ptr ptr long) msvcp90.?move@?$char_traits@D@std@@SAPEADPEADPEBD_K@Z
 @ cdecl -arch=win32 ?move@?$char_traits@G@std@@SAPAGPAGPBGI@Z(ptr ptr long) msvcp90.?move@?$char_traits@G@std@@SAPAGPAGPBGI@Z
@@ -3493,7 +3493,7 @@
 @ cdecl -arch=win64 ?not_eof@?$char_traits@D@std@@SAHAEBH@Z(ptr) msvcp90.?not_eof@?$char_traits@D@std@@SAHAEBH@Z
 @ cdecl -arch=win32 ?not_eof@?$char_traits@G@std@@SAGABG@Z(ptr) msvcp90.?not_eof@?$char_traits@G@std@@SAGABG@Z
 @ cdecl -arch=win64 ?not_eof@?$char_traits@G@std@@SAGAEBG@Z(ptr) msvcp90.?not_eof@?$char_traits@G@std@@SAGAEBG@Z
-@ stub -arch=win64 ?nothrow@std@@3Unothrow_t@1@B
+@ stub ?nothrow@std@@3Unothrow_t@1@B
 @ extern -arch=win32 ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2IB msvcp90.?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2IB
 @ extern -arch=win64 ?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2_KB msvcp90.?npos@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@2_KB
 @ stub -arch=win32 ?npos@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@2IB
@@ -3723,19 +3723,19 @@
 @ stub -arch=win64 ?putback@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@G@Z
 @ stub -arch=win32 ?pword@ios_base@std@@QAEAAPAXH@Z
 @ stub -arch=win64 ?pword@ios_base@std@@QEAAAEAPEAXH@Z
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@C@std@@SACXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@D@std@@SADXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@E@std@@SAEXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@F@std@@SAFXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@G@std@@SAGXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@H@std@@SAHXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@I@std@@SAIXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@J@std@@SAJXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@K@std@@SAKXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@M@std@@SAMXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@N@std@@SANXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@O@std@@SAOXZ
-@ stub -arch=win64 ?quiet_NaN@?$numeric_limits@_N@std@@SA_NXZ
+@ stub ?quiet_NaN@?$numeric_limits@C@std@@SACXZ
+@ stub ?quiet_NaN@?$numeric_limits@D@std@@SADXZ
+@ stub ?quiet_NaN@?$numeric_limits@E@std@@SAEXZ
+@ stub ?quiet_NaN@?$numeric_limits@F@std@@SAFXZ
+@ stub ?quiet_NaN@?$numeric_limits@G@std@@SAGXZ
+@ stub ?quiet_NaN@?$numeric_limits@H@std@@SAHXZ
+@ stub ?quiet_NaN@?$numeric_limits@I@std@@SAIXZ
+@ stub ?quiet_NaN@?$numeric_limits@J@std@@SAJXZ
+@ stub ?quiet_NaN@?$numeric_limits@K@std@@SAKXZ
+@ stub ?quiet_NaN@?$numeric_limits@M@std@@SAMXZ
+@ stub ?quiet_NaN@?$numeric_limits@N@std@@SANXZ
+@ stub ?quiet_NaN@?$numeric_limits@O@std@@SAOXZ
+@ stub ?quiet_NaN@?$numeric_limits@_N@std@@SA_NXZ
 @ stub -arch=win32 ?rbegin@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE?AV?$reverse_iterator@PADDAADPADH@2@XZ
 @ stub -arch=win64 ?rbegin@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA?AV?$reverse_iterator@PEADDAEADPEAD_J@2@XZ
 @ stub -arch=win32 ?rbegin@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBE?AV?$reverse_iterator@PBDDABDPBDH@2@XZ
@@ -3858,7 +3858,7 @@
 @ stub -arch=win64 ?reserve@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAX_K@Z
 @ stub -arch=win32 ?reserve@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QAEXI@Z
 @ stub -arch=win64 ?reserve@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAX_K@Z
-@ stub -arch=win64 ?resetiosflags@std@@YA?AU?$_Smanip@H@1@H@Z
+@ stub ?resetiosflags@std@@YA?AU?$_Smanip@H@1@H@Z
 @ thiscall -arch=win32 ?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXI@Z(ptr long) msvcp90.?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXI@Z
 @ cdecl -arch=win64 ?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAX_K@Z(ptr long) msvcp90.?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAAX_K@Z
 @ thiscall -arch=win32 ?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXID@Z(ptr long long) msvcp90.?resize@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXID@Z
@@ -3883,19 +3883,19 @@
 @ stub -arch=win64 ?rfind@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KPEBG_K1@Z
 @ stub -arch=win32 ?rfind@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIPBGII@Z
 @ stub -arch=win64 ?rfind@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEBA_KPEBG_K@Z
-@ stub -arch=win64 ?round_error@?$numeric_limits@C@std@@SACXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@D@std@@SADXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@E@std@@SAEXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@F@std@@SAFXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@G@std@@SAGXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@H@std@@SAHXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@I@std@@SAIXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@J@std@@SAJXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@K@std@@SAKXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@M@std@@SAMXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@N@std@@SANXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@O@std@@SAOXZ
-@ stub -arch=win64 ?round_error@?$numeric_limits@_N@std@@SA_NXZ
+@ stub ?round_error@?$numeric_limits@C@std@@SACXZ
+@ stub ?round_error@?$numeric_limits@D@std@@SADXZ
+@ stub ?round_error@?$numeric_limits@E@std@@SAEXZ
+@ stub ?round_error@?$numeric_limits@F@std@@SAFXZ
+@ stub ?round_error@?$numeric_limits@G@std@@SAGXZ
+@ stub ?round_error@?$numeric_limits@H@std@@SAHXZ
+@ stub ?round_error@?$numeric_limits@I@std@@SAIXZ
+@ stub ?round_error@?$numeric_limits@J@std@@SAJXZ
+@ stub ?round_error@?$numeric_limits@K@std@@SAKXZ
+@ stub ?round_error@?$numeric_limits@M@std@@SAMXZ
+@ stub ?round_error@?$numeric_limits@N@std@@SANXZ
+@ stub ?round_error@?$numeric_limits@O@std@@SAOXZ
+@ stub ?round_error@?$numeric_limits@_N@std@@SA_NXZ
 @ stub -arch=win32 ?sbumpc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QAEHXZ
 @ stub -arch=win64 ?sbumpc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@QEAAHXZ
 @ stub -arch=win32 ?sbumpc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@QAEGXZ
@@ -3952,7 +3952,7 @@
 @ stub -arch=win64 ?seekpos@?$basic_stringbuf@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@MEAA?AV?$fpos@H@2@V32@H@Z
 @ stub -arch=win32 ?seekpos@strstreambuf@std@@MAE?AV?$fpos@H@2@V32@H@Z
 @ stub -arch=win64 ?seekpos@strstreambuf@std@@MEAA?AV?$fpos@H@2@V32@H@Z
-@ stub -arch=win64 ?setbase@std@@YA?AU?$_Smanip@H@1@H@Z
+@ stub ?setbase@std@@YA?AU?$_Smanip@H@1@H@Z
 @ stub -arch=win32 ?setbuf@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEPAV?$basic_streambuf@DU?$char_traits@D@std@@@2@PADH@Z
 @ stub -arch=win64 ?setbuf@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAPEAV?$basic_streambuf@DU?$char_traits@D@std@@@2@PEAD_J@Z
 @ stub -arch=win32 ?setbuf@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEPAV?$basic_streambuf@GU?$char_traits@G@std@@@2@PAGH@Z
@@ -3969,7 +3969,7 @@
 @ stub -arch=win64 ?setg@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAXPEAD00@Z
 @ stub -arch=win32 ?setg@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IAEXPAG00@Z
 @ stub -arch=win64 ?setg@?$basic_streambuf@GU?$char_traits@G@std@@@std@@IEAAXPEAG00@Z
-@ stub -arch=win64 ?setiosflags@std@@YA?AU?$_Smanip@H@1@H@Z
+@ stub ?setiosflags@std@@YA?AU?$_Smanip@H@1@H@Z
 @ stub -arch=win32 ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEXPAD00@Z
 @ stub -arch=win64 ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IEAAXPEAD00@Z
 @ stub -arch=win32 ?setp@?$basic_streambuf@DU?$char_traits@D@std@@@std@@IAEXPAD0@Z
@@ -4006,19 +4006,19 @@
 @ stub -arch=win64 ?showmanyc@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ
 @ stub -arch=win32 ?showmanyc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEHXZ
 @ stub -arch=win64 ?showmanyc@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAHXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@C@std@@SACXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@D@std@@SADXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@E@std@@SAEXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@F@std@@SAFXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@G@std@@SAGXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@H@std@@SAHXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@I@std@@SAIXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@J@std@@SAJXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@K@std@@SAKXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@M@std@@SAMXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@N@std@@SANXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@O@std@@SAOXZ
-@ stub -arch=win64 ?signaling_NaN@?$numeric_limits@_N@std@@SA_NXZ
+@ stub ?signaling_NaN@?$numeric_limits@C@std@@SACXZ
+@ stub ?signaling_NaN@?$numeric_limits@D@std@@SADXZ
+@ stub ?signaling_NaN@?$numeric_limits@E@std@@SAEXZ
+@ stub ?signaling_NaN@?$numeric_limits@F@std@@SAFXZ
+@ stub ?signaling_NaN@?$numeric_limits@G@std@@SAGXZ
+@ stub ?signaling_NaN@?$numeric_limits@H@std@@SAHXZ
+@ stub ?signaling_NaN@?$numeric_limits@I@std@@SAIXZ
+@ stub ?signaling_NaN@?$numeric_limits@J@std@@SAJXZ
+@ stub ?signaling_NaN@?$numeric_limits@K@std@@SAKXZ
+@ stub ?signaling_NaN@?$numeric_limits@M@std@@SAMXZ
+@ stub ?signaling_NaN@?$numeric_limits@N@std@@SANXZ
+@ stub ?signaling_NaN@?$numeric_limits@O@std@@SAOXZ
+@ stub ?signaling_NaN@?$numeric_limits@_N@std@@SA_NXZ
 @ stub -arch=win64 ?sin@?$_Ctr@M@std@@SAMM@Z
 @ stub -arch=win64 ?sin@?$_Ctr@N@std@@SANN@Z
 @ stub -arch=win64 ?sin@?$_Ctr@O@std@@SAOO@Z
@@ -4123,7 +4123,7 @@
 @ stub -arch=win64 ?sync@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ
 @ stub -arch=win32 ?sync@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEHXZ
 @ stub -arch=win64 ?sync@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAHXZ
-@ stub -arch=win64 ?sync_with_stdio@ios_base@std@@SA_N_N@Z
+@ stub ?sync_with_stdio@ios_base@std@@SA_N_N@Z
 @ stub -arch=win32 ?table@?$ctype@D@std@@IBEPBFXZ
 @ stub -arch=win64 ?table@?$ctype@D@std@@IEBAPEBFXZ
 @ stub -arch=win32 ?table_size@?$ctype@D@std@@2IB
@@ -4192,7 +4192,7 @@
 @ stub -arch=win64 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ
 @ stub -arch=win32 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEGXZ
 @ stub -arch=win64 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MEAAGXZ
-@ stub -arch=win64 ?uncaught_exception@std@@YA_NXZ
+@ stub ?uncaught_exception@std@@YA_NXZ
 @ stub -arch=win32 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ
 @ stub -arch=win64 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ
 @ stub -arch=win32 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ
@@ -4213,10 +4213,10 @@
 @ stub -arch=win64 ?unget@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@XZ
 @ stub -arch=win32 ?unsetf@ios_base@std@@QAEXH@Z
 @ stub -arch=win64 ?unsetf@ios_base@std@@QEAAXH@Z
-@ stub -arch=win64 ?wcerr@std@@3V?$basic_ostream@GU?$char_traits@G@std@@@1@A
-@ stub -arch=win64 ?wcin@std@@3V?$basic_istream@GU?$char_traits@G@std@@@1@A
-@ stub -arch=win64 ?wclog@std@@3V?$basic_ostream@GU?$char_traits@G@std@@@1@A
-@ stub -arch=win64 ?wcout@std@@3V?$basic_ostream@GU?$char_traits@G@std@@@1@A
+@ stub ?wcerr@std@@3V?$basic_ostream@GU?$char_traits@G@std@@@1@A
+@ stub ?wcin@std@@3V?$basic_istream@GU?$char_traits@G@std@@@1@A
+@ stub ?wclog@std@@3V?$basic_ostream@GU?$char_traits@G@std@@@1@A
+@ stub ?wcout@std@@3V?$basic_ostream@GU?$char_traits@G@std@@@1@A
 @ stub -arch=win32 ?what@logic_error@std@@UBEPBDXZ
 @ stub -arch=win64 ?what@logic_error@std@@UEBAPEBDXZ
 @ stub -arch=win32 ?what@runtime_error@std@@UBEPBDXZ
@@ -4245,7 +4245,7 @@
 @ stub -arch=win64 ?ws@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@1@AEAV21@@Z
 @ stub -arch=win32 ?ws@std@@YAAAV?$basic_istream@GU?$char_traits@G@std@@@1@AAV21@@Z
 @ stub -arch=win64 ?ws@std@@YAAEAV?$basic_istream@GU?$char_traits@G@std@@@1@AEAV21@@Z
-@ stub -arch=win64 ?xalloc@ios_base@std@@SAHXZ
+@ stub ?xalloc@ios_base@std@@SAHXZ
 @ stub -arch=win32 ?xsgetn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHPADH@Z
 @ stub -arch=win64 ?xsgetn@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA_JPEAD_J@Z
 @ stub -arch=win32 ?xsgetn@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEHPAGH@Z
diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec
index de6ac3e5566..d8cfce7b267 100644
--- a/dlls/msvcp80/msvcp80.spec
+++ b/dlls/msvcp80/msvcp80.spec
@@ -4515,6 +4515,7 @@
 @ stub ?min_exponent@?$numeric_limits@N@std@@2HB
 @ stub ?min_exponent@?$numeric_limits@O@std@@2HB
 @ stub ?min_exponent@_Num_base@std@@2HB
+@ cdecl -arch=win32 ?move@?$char_traits@D@std@@SAPADPADPBDI@Z(ptr ptr long) msvcp90.?move@?$char_traits@D@std@@SAPADPADPBDI@Z
 @ cdecl -arch=win64 ?move@?$char_traits@D@std@@SAPEADPEADPEBD_K@Z(ptr ptr long) msvcp90.?move@?$char_traits@D@std@@SAPEADPEADPEBD_K@Z
 @ cdecl -arch=win32 ?move@?$char_traits@G@std@@SAPAGPAGPBGI@Z(ptr ptr long) msvcp90.?move@?$char_traits@G@std@@SAPAGPAGPBGI@Z
 @ cdecl -arch=win64 ?move@?$char_traits@G@std@@SAPEAGPEAGPEBG_K@Z(ptr ptr long) msvcp90.?move@?$char_traits@G@std@@SAPEAGPEAGPEBG_K@Z
diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec
index f594990da7b..db02b4fe7e2 100644
--- a/dlls/msvcp90/msvcp90.spec
+++ b/dlls/msvcp90/msvcp90.spec
@@ -4545,7 +4545,7 @@
 @ stub ?min_exponent@?$numeric_limits@N@std@@2HB
 @ stub ?min_exponent@?$numeric_limits@O@std@@2HB
 @ stub ?min_exponent@_Num_base@std@@2HB
-@ cdecl -arch=win32  ?move@?$char_traits@D@std@@SAPADPADPBDI@Z(ptr ptr long) MSVCP_char_traits_char_move
+@ cdecl -arch=win32 ?move@?$char_traits@D@std@@SAPADPADPBDI@Z(ptr ptr long) MSVCP_char_traits_char_move
 @ cdecl -arch=win64 ?move@?$char_traits@D@std@@SAPEADPEADPEBD_K@Z(ptr ptr long) MSVCP_char_traits_char_move
 @ cdecl -arch=win32 ?move@?$char_traits@G@std@@SAPAGPAGPBGI@Z(ptr ptr long) MSVCP_char_traits_short_move
 @ cdecl -arch=win64 ?move@?$char_traits@G@std@@SAPEAGPEAGPEBG_K@Z(ptr ptr long) MSVCP_char_traits_short_move
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 3a157bbf469..1397f385f7c 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -16,22 +16,22 @@
 @ stub ??0_SpinLock@details@Concurrency@@QAE@ACJ@Z
 @ stub ??0_TaskCollection@details@Concurrency@@QAE@XZ
 @ stub ??0_Timer@details@Concurrency@@IAE@I_N@Z
-@ thiscall -arch=win32 ??0__non_rtti_object@std@@QAE@ABV01@@Z(ptr ptr) msvcr90.??0__non_rtti_object@std@@QAE@ABV01@@Z
-@ cdecl -arch=win64 ??0__non_rtti_object@std@@QEAA@AEBV01@@Z(ptr ptr) msvcr90.??0__non_rtti_object@std@@QEAA@AEBV01@@Z
+@ thiscall -arch=win32 ??0__non_rtti_object@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0__non_rtti_object@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA@AEBV0@@Z
 @ thiscall -arch=win32 ??0__non_rtti_object@std@@QAE@PBD@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE@PBD@Z
-@ cdecl -arch=win64 ??0__non_rtti_object@std@@QEAA@PEBD@Z(ptr ptr) msvcr90.??0__non_rtti_object@std@@QEAA@PEBD@Z
+@ cdecl -arch=win64 ??0__non_rtti_object@std@@QEAA@PEBD@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA@PEBD@Z
 @ thiscall -arch=win32 ??0bad_cast@std@@AAE@PBQBD@Z(ptr ptr) msvcrt.??0bad_cast@@AAE@PBQBD@Z
-@ cdecl -arch=win64 ??0bad_cast@std@@AEAA@PEBQEBD@Z(ptr ptr) msvcr90.??0bad_cast@std@@AEAA@PEBQEBD@Z
-@ thiscall -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) msvcr90.??0bad_cast@std@@QAE@ABV01@@Z
-@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) msvcr90.??0bad_cast@std@@QEAA@AEBV01@@Z
-@ thiscall -arch=win32 ??0bad_cast@std@@QAE@PBD@Z(ptr str) msvcr90.??0bad_cast@std@@QAE@PBD@Z
-@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) msvcr90.??0bad_cast@std@@QEAA@PEBD@Z
+@ cdecl -arch=win64 ??0bad_cast@std@@AEAA@PEBQEBD@Z(ptr ptr) msvcrt.??0bad_cast@@AEAA@PEBQEBD@Z
+@ thiscall -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA@AEBV0@@Z
+@ thiscall -arch=win32 ??0bad_cast@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE@PBD@Z
+@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA@PEBD@Z
 @ stub ??0bad_target@Concurrency@@QAE@PBD@Z
 @ stub ??0bad_target@Concurrency@@QAE@XZ
-@ thiscall -arch=win32 ??0bad_typeid@std@@QAE@ABV01@@Z(ptr ptr) msvcr90.??0bad_typeid@std@@QAE@ABV01@@Z
-@ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@AEBV01@@Z(ptr ptr) msvcr90.??0bad_typeid@std@@QEAA@AEBV01@@Z
-@ thiscall -arch=win32 ??0bad_typeid@std@@QAE@PBD@Z(ptr str) msvcr90.??0bad_typeid@std@@QAE@PBD@Z
-@ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@PEBD@Z(ptr str) msvcr90.??0bad_typeid@std@@QEAA@PEBD@Z
+@ thiscall -arch=win32 ??0bad_typeid@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0bad_typeid@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_typeid@@QEAA@AEBV0@@Z
+@ thiscall -arch=win32 ??0bad_typeid@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_typeid@@QAE@PBD@Z
+@ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_typeid@@QEAA@PEBD@Z
 @ stub ??0context_self_unblock@Concurrency@@QAE@PBD@Z
 @ stub ??0context_self_unblock@Concurrency@@QAE@XZ
 @ stub ??0context_unblock_unbalanced@Concurrency@@QAE@PBD@Z
@@ -40,14 +40,14 @@
 @ stub ??0default_scheduler_exists@Concurrency@@QAE@PBD@Z
 @ stub ??0default_scheduler_exists@Concurrency@@QAE@XZ
 @ stub ??0event@Concurrency@@QAE@XZ
-@ thiscall -arch=win32 ??0exception@std@@QAE@ABQBD@Z(ptr ptr) msvcr90.??0exception@std@@QAE@ABQBD@Z
-@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBD@Z(ptr ptr) msvcr90.??0exception@std@@QEAA@AEBQEBD@Z
-@ thiscall -arch=win32 ??0exception@std@@QAE@ABQBDH@Z(ptr ptr long) msvcr90.??0exception@std@@QAE@ABQBDH@Z
-@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBDH@Z(ptr ptr long) msvcr90.??0exception@std@@QEAA@AEBQEBDH@Z
-@ thiscall -arch=win32 ??0exception@std@@QAE@ABV01@@Z(ptr ptr) msvcr90.??0exception@std@@QAE@ABV01@@Z
-@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBV01@@Z(ptr ptr) msvcr90.??0exception@std@@QEAA@AEBV01@@Z
-@ thiscall -arch=win32 ??0exception@std@@QAE@XZ(ptr) msvcr90.??0exception@std@@QAE@XZ
-@ cdecl -arch=win64 ??0exception@std@@QEAA@XZ(ptr) msvcr90.??0exception@std@@QEAA@XZ
+@ thiscall -arch=win32 ??0exception@std@@QAE@ABQBD@Z(ptr ptr) msvcrt.??0exception@@QAE@ABQBD@Z
+@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBD@Z(ptr ptr) msvcrt.??0exception@@QEAA@AEBQEBD@Z
+@ thiscall -arch=win32 ??0exception@std@@QAE@ABQBDH@Z(ptr ptr long) msvcrt.??0exception@@QAE@ABQBDH@Z
+@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBDH@Z(ptr ptr long) msvcrt.??0exception@@QEAA@AEBQEBDH@Z
+@ thiscall -arch=win32 ??0exception@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0exception@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0exception@@QEAA@AEBV0@@Z
+@ thiscall -arch=win32 ??0exception@std@@QAE@XZ(ptr) msvcrt.??0exception@@QAE@XZ
+@ cdecl -arch=win64 ??0exception@std@@QEAA@XZ(ptr) msvcrt.??0exception@@QEAA@XZ
 @ stub ??0improper_lock@Concurrency@@QAE@PBD@Z
 @ stub ??0improper_lock@Concurrency@@QAE@XZ
 @ stub ??0improper_scheduler_attach@Concurrency@@QAE@PBD@Z
@@ -98,16 +98,16 @@
 @ stub ??1_SpinLock@details@Concurrency@@QAE@XZ
 @ stub ??1_TaskCollection@details@Concurrency@@QAE@XZ
 @ stub ??1_Timer@details@Concurrency@@IAE@XZ
-@ thiscall -arch=win32 ??1__non_rtti_object@std@@UAE@XZ(ptr) msvcr90.??1__non_rtti_object@std@@UAE@XZ
-@ cdecl -arch=win64 ??1__non_rtti_object@std@@UEAA@XZ(ptr) msvcr90.??1__non_rtti_object@std@@UEAA@XZ
-@ thiscall -arch=win32 ??1bad_cast@std@@UAE@XZ(ptr) msvcr90.??1bad_cast@std@@UAE@XZ
-@ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcr90.??1bad_cast@std@@UEAA@XZ
-@ thiscall -arch=win32 ??1bad_typeid@std@@UAE@XZ(ptr) msvcr90.??1bad_typeid@std@@UAE@XZ
-@ cdecl -arch=win64 ??1bad_typeid@std@@UEAA@XZ(ptr) msvcr90.??1bad_typeid@std@@UEAA@XZ
+@ thiscall -arch=win32 ??1__non_rtti_object@std@@UAE@XZ(ptr) msvcrt.??1__non_rtti_object@@UAE@XZ
+@ cdecl -arch=win64 ??1__non_rtti_object@std@@UEAA@XZ(ptr) msvcrt.??1__non_rtti_object@@UEAA@XZ
+@ thiscall -arch=win32 ??1bad_cast@std@@UAE@XZ(ptr) msvcrt.??1bad_cast@@UAE@XZ
+@ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcrt.??1bad_cast@@UEAA@XZ
+@ thiscall -arch=win32 ??1bad_typeid@std@@UAE@XZ(ptr) msvcrt.??1bad_typeid@@UAE@XZ
+@ cdecl -arch=win64 ??1bad_typeid@std@@UEAA@XZ(ptr) msvcrt.??1bad_typeid@@UEAA@XZ
 @ stub ??1critical_section@Concurrency@@QAE@XZ
 @ stub ??1event@Concurrency@@QAE@XZ
-@ thiscall -arch=win32 ??1exception@std@@UAE@XZ(ptr) msvcr90.??1exception@std@@UAE@XZ
-@ cdecl -arch=win64 ??1exception@std@@UEAA@XZ(ptr) msvcr90.??1exception@std@@UEAA@XZ
+@ thiscall -arch=win32 ??1exception@std@@UAE@XZ(ptr) msvcrt.??1exception@@UAE@XZ
+@ cdecl -arch=win64 ??1exception@std@@UEAA@XZ(ptr) msvcrt.??1exception@@UEAA@XZ
 @ stub ??1reader_writer_lock@Concurrency@@QAE@XZ
 @ stub ??1scoped_lock@critical_section@Concurrency@@QAE@XZ
 @ stub ??1scoped_lock@reader_writer_lock@Concurrency@@QAE@XZ
@@ -123,29 +123,29 @@
 @ stub ??4?$_SpinWait@$00@details@Concurrency@@QAEAAV012@ABV012@@Z
 @ stub ??4?$_SpinWait@$0A@@details@Concurrency@@QAEAAV012@ABV012@@Z
 @ stub ??4SchedulerPolicy@Concurrency@@QAEAAV01@ABV01@@Z
-@ thiscall -arch=win32 ??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcr90.??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z
-@ cdecl -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcr90.??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z
-@ thiscall -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcr90.??4bad_cast@std@@QAEAAV01@ABV01@@Z
-@ cdecl -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcr90.??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z
-@ thiscall -arch=win32 ??4bad_typeid@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcr90.??4bad_typeid@std@@QAEAAV01@ABV01@@Z
-@ cdecl -arch=win64 ??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcr90.??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z
-@ thiscall -arch=win32 ??4exception@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcr90.??4exception@std@@QAEAAV01@ABV01@@Z
-@ cdecl -arch=win64 ??4exception@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcr90.??4exception@std@@QEAAAEAV01@AEBV01@@Z
-@ thiscall -arch=win32 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcr90.??8type_info@@QBE_NABV0@@Z
-@ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcr90.??8type_info@@QEBA_NAEBV0@@Z
-@ thiscall -arch=win32 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcr90.??9type_info@@QBE_NABV0@@Z
-@ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcr90.??9type_info@@QEBA_NAEBV0@@Z
-@ extern ??_7__non_rtti_object@std@@6B@ msvcr90.??_7__non_rtti_object@std@@6B@
-@ extern ??_7bad_cast@std@@6B@ msvcr90.??_7bad_cast@std@@6B@
-@ extern ??_7bad_typeid@std@@6B@ msvcr90.??_7bad_typeid@std@@6B@
+@ thiscall -arch=win32 ??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z
+@ thiscall -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0@AEBV0@@Z
+@ thiscall -arch=win32 ??4bad_typeid@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0@AEBV0@@Z
+@ thiscall -arch=win32 ??4exception@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4exception@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0@AEBV0@@Z
+@ thiscall -arch=win32 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z
+@ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z
+@ thiscall -arch=win32 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z
+@ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z
+@ extern ??_7__non_rtti_object@std@@6B@ msvcrt.??_7__non_rtti_object@@6B@
+@ extern ??_7bad_cast@std@@6B@ msvcrt.??_7bad_cast@@6B@
+@ extern ??_7bad_typeid@std@@6B@ msvcrt.??_7bad_typeid@@6B@
 @ extern ??_7exception@@6B@ msvcrt.??_7exception@@6B@
-@ extern ??_7exception@std@@6B@ msvcr90.??_7exception@std@@6B@
+@ extern ??_7exception@std@@6B@ msvcrt.??_7exception@@6B@
 @ stub ??_F?$_SpinWait@$00@details@Concurrency@@QAEXXZ
 @ stub ??_F?$_SpinWait@$0A@@details@Concurrency@@QAEXXZ
-@ thiscall -arch=win32 ??_Fbad_cast@std@@QAEXXZ(ptr) msvcr90.??_Fbad_cast@std@@QAEXXZ
-@ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) msvcr90.??_Fbad_cast@std@@QEAAXXZ
-@ thiscall -arch=win32 ??_Fbad_typeid@std@@QAEXXZ(ptr) msvcr90.??_Fbad_typeid@std@@QAEXXZ
-@ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) msvcr90.??_Fbad_typeid@std@@QEAAXXZ
+@ thiscall -arch=win32 ??_Fbad_cast@std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ
+@ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ
+@ thiscall -arch=win32 ??_Fbad_typeid@std@@QAEXXZ(ptr) msvcrt.??_Fbad_typeid@@QAEXXZ
+@ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) msvcrt.??_Fbad_typeid@@QEAAXXZ
 @ cdecl -arch=win32 ??_U@YAPAXI@Z(long) msvcrt.??_U@YAPAXI@Z
 @ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) msvcrt.??_U@YAPEAX_K@Z
 @ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) msvcrt.??_U@YAPAXIHPBDH@Z
@@ -256,14 +256,14 @@
 @ stub ?__ExceptionPtrRethrow@@YAXPBX@Z
 @ cdecl __uncaught_exception() msvcrt.__uncaught_exception
 @ stub ?_inconsistency@@YAXXZ
-@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) msvcr90.?_invalid_parameter@@YAXPBG00II@Z
-@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) msvcr90.?_invalid_parameter@@YAXPEBG00I_K@Z
+@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) msvcrt._invalid_parameter
+@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) msvcrt._invalid_parameter
 @ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z  # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *)
 @ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z  # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64)
 @ thiscall -arch=win32 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) msvcr90.?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) msvcr90.?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z
-@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) msvcr90.?_open@@YAHPBDHH@Z
-@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) msvcr90.?_open@@YAHPEBDHH@Z
+@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) msvcrt._open
+@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) msvcrt._open
 @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() msvcrt.?_query_new_handler@@YAP6AHI@ZXZ
 @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() msvcrt.?_query_new_handler@@YAP6AH_K@ZXZ
 @ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ
@@ -276,14 +276,14 @@
 @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z
-@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) msvcr90.?_sopen@@YAHPBDHHH@Z
-@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) msvcr90.?_sopen@@YAHPEBDHHH@Z
+@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) msvcrt._sopen
+@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) msvcrt._sopen
 @ stub -arch=win32 ?_type_info_dtor_internal_method@type_info@@QAEXXZ  # public: void __thiscall type_info::_type_info_dtor_internal_method(void)
 @ stub -arch=win64 ?_type_info_dtor_internal_method@type_info@@QEAAXXZ  # public: void __cdecl type_info::_type_info_dtor_internal_method(void) __ptr64
-@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) msvcr90.?_wopen@@YAHPB_WHH@Z
-@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) msvcr90.?_wopen@@YAHPEB_WHH@Z
-@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) msvcr90.?_wsopen@@YAHPB_WHHH@Z
-@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) msvcr90.?_wsopen@@YAHPEB_WHHH@Z
+@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) msvcrt._wopen
+@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) msvcrt._wopen
+@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) msvcrt._wsopen
+@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) msvcrt._wsopen
 @ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z
 @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z
 @ stub ?get_error_code@scheduler_resource_allocation_error@Concurrency@@QBEJXZ
@@ -302,8 +302,8 @@
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ@Z
 @ stub ?set_unexpected@@YAP6AXXZH@Z
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ@Z
-@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcr90.?swprintf@@YAHPAGIPBGZZ
-@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcr90.?swprintf@@YAHPA_WIPB_WZZ
+@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf
+@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf
 @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ
 @ stub ?try_lock@critical_section@Concurrency@@QAE_NXZ
 @ stub ?try_lock@reader_writer_lock@Concurrency@@QAE_NXZ
@@ -311,12 +311,12 @@
 @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ
 @ stub ?unlock@critical_section@Concurrency@@QAEXXZ
 @ stub ?unlock@reader_writer_lock@Concurrency@@QAEXXZ
-@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) msvcr90.?vswprintf@@YAHPA_WIPB_WPAD@Z
+@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) msvcrt._vsnwprintf
 @ stub ?wait@Concurrency@@YAXI@Z
 @ stub ?wait@event@Concurrency@@QAEII@Z
 @ stub ?wait_for_multiple@event@Concurrency@@SAIPAPAV12@I_NI@Z
-@ thiscall -arch=win32 ?what@exception@std@@UBEPBDXZ(ptr) msvcr90.?what@exception@std@@UBEPBDXZ
-@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) msvcr90.?what@exception@std@@UEBAPEBDXZ
+@ 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 -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
 @ cdecl -arch=i386 _CIacos() msvcrt._CIacos
 @ cdecl -arch=i386 _CIasin() msvcrt._CIasin
@@ -473,9 +473,9 @@
 @ cdecl __sys_nerr() msvcr90.__sys_nerr
 @ cdecl __threadhandle() msvcrt.__threadhandle
 @ cdecl __threadid() msvcrt.__threadid
-@ cdecl __timezone() msvcr90.__timezone
+@ cdecl __timezone() msvcrt.__p__timezone
 @ cdecl __toascii(long) msvcrt.__toascii
-@ cdecl __tzname() msvcr90.__tzname
+@ cdecl __tzname() msvcrt.__p__tzname
 @ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx
 @ stub __unDNameHelper
@@ -522,7 +522,7 @@
 @ cdecl _c_exit() msvcrt._c_exit
 @ cdecl _cabs(long) msvcrt._cabs
 @ cdecl _callnewh(long) msvcrt._callnewh
-@ cdecl _calloc_crt(long long) msvcr90._calloc_crt
+@ cdecl _calloc_crt(long long) msvcrt.calloc
 @ cdecl _cexit() msvcrt._cexit
 @ cdecl _cgets(str) msvcrt._cgets
 @ stub _cgets_s
@@ -867,7 +867,7 @@
 @ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s
 @ cdecl _makepath(ptr str str str str) msvcrt._makepath
 @ cdecl _makepath_s(ptr long str str str str) msvcrt._makepath_s
-@ cdecl _malloc_crt(long) msvcr90._malloc_crt
+@ cdecl _malloc_crt(long) msvcrt.malloc
 @ cdecl _mbbtombc(long) msvcrt._mbbtombc
 @ stub _mbbtombc_l
 @ cdecl _mbbtype(long long) msvcrt._mbbtype
@@ -1042,7 +1042,7 @@
 @ cdecl _putws(wstr) msvcrt._putws
 # extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
-@ cdecl _realloc_crt(ptr long) msvcr90._realloc_crt
+@ cdecl _realloc_crt(ptr long) msvcrt.realloc
 @ cdecl _recalloc(ptr long long) msvcr90._recalloc
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw() msvcrt._resetstkoflw
@@ -1266,7 +1266,7 @@
 @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c
 @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l
 @ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l
-@ cdecl _vswprintf_p(ptr long wstr ptr) msvcr90._vswprintf_p
+@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf
 @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l
 @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l
 @ stub _vwprintf_l
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 6370396a107..d75148687be 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -76,12 +76,12 @@
 @ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ@Z
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ@Z
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ@Z
-@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcr90.?swprintf@@YAHPAGIPBGZZ
-@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcr90.?swprintf@@YAHPA_WIPB_WZZ
+@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf
+@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf
 @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ
 @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ
 @ cdecl ?vswprintf@@YAHPAGIPBGPAD@Z(ptr long wstr ptr) msvcrt._vsnwprintf
-@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) msvcr90.?vswprintf@@YAHPA_WIPB_WPAD@Z
+@ 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 -norelay $I10_OUTPUT(double long long long ptr) msvcrt.$I10_OUTPUT
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index dc20b563209..a1b13f4d817 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -1,33 +1,33 @@
 # MS VC++2005 runtime library
 
-@ thiscall -arch=win32 ??0__non_rtti_object@std@@QAE@ABV01@@Z(ptr ptr) msvcr90.??0__non_rtti_object@std@@QAE@ABV01@@Z
-@ cdecl -arch=win64 ??0__non_rtti_object@std@@QEAA@AEBV01@@Z(ptr ptr) msvcr90.??0__non_rtti_object@std@@QEAA@AEBV01@@Z
-@ cdecl -arch=win64 ??0__non_rtti_object@std@@QEAA@PEBD@Z(ptr ptr) msvcr90.??0__non_rtti_object@std@@QEAA@PEBD@Z
-@ cdecl -arch=win64 ??0bad_cast@std@@AEAA@PEBQEBD@Z(ptr ptr) msvcr90.??0bad_cast@std@@AEAA@PEBQEBD@Z
-@ thiscall -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) msvcr90.??0bad_cast@std@@QAE@ABV01@@Z
-@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) msvcr90.??0bad_cast@std@@QEAA@AEBV01@@Z
-@ thiscall -arch=win32 ??0bad_cast@std@@QAE@PBD@Z(ptr str) msvcr90.??0bad_cast@std@@QAE@PBD@Z
-@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) msvcr90.??0bad_cast@std@@QEAA@PEBD@Z
-@ thiscall -arch=win32 ??0bad_typeid@std@@QAE@ABV01@@Z(ptr ptr) msvcr90.??0bad_typeid@std@@QAE@ABV01@@Z
-@ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@AEBV01@@Z(ptr ptr) msvcr90.??0bad_typeid@std@@QEAA@AEBV01@@Z
-@ thiscall -arch=win32 ??0bad_typeid@std@@QAE@PBD@Z(ptr str) msvcr90.??0bad_typeid@std@@QAE@PBD@Z
-@ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@PEBD@Z(ptr str) msvcr90.??0bad_typeid@std@@QEAA@PEBD@Z
-@ thiscall -arch=win32 ??0exception@std@@QAE@ABQBD@Z(ptr ptr) msvcr90.??0exception@std@@QAE@ABQBD@Z
-@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBD@Z(ptr ptr) msvcr90.??0exception@std@@QEAA@AEBQEBD@Z
-@ thiscall -arch=win32 ??0exception@std@@QAE@ABQBDH@Z(ptr ptr long) msvcr90.??0exception@std@@QAE@ABQBDH@Z
-@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBDH@Z(ptr ptr long) msvcr90.??0exception@std@@QEAA@AEBQEBDH@Z
-@ thiscall -arch=win32 ??0exception@std@@QAE@ABV01@@Z(ptr ptr) msvcr90.??0exception@std@@QAE@ABV01@@Z
-@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBV01@@Z(ptr ptr) msvcr90.??0exception@std@@QEAA@AEBV01@@Z
-@ thiscall -arch=win32 ??0exception@std@@QAE@XZ(ptr) msvcr90.??0exception@std@@QAE@XZ
-@ cdecl -arch=win64 ??0exception@std@@QEAA@XZ(ptr) msvcr90.??0exception@std@@QEAA@XZ
-@ thiscall -arch=win32 ??1__non_rtti_object@std@@UAE@XZ(ptr) msvcr90.??1__non_rtti_object@std@@UAE@XZ
-@ cdecl -arch=win64 ??1__non_rtti_object@std@@UEAA@XZ(ptr) msvcr90.??1__non_rtti_object@std@@UEAA@XZ
-@ thiscall -arch=win32 ??1bad_cast@std@@UAE@XZ(ptr) msvcr90.??1bad_cast@std@@UAE@XZ
-@ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcr90.??1bad_cast@std@@UEAA@XZ
-@ thiscall -arch=win32 ??1bad_typeid@std@@UAE@XZ(ptr) msvcr90.??1bad_typeid@std@@UAE@XZ
-@ cdecl -arch=win64 ??1bad_typeid@std@@UEAA@XZ(ptr) msvcr90.??1bad_typeid@std@@UEAA@XZ
-@ thiscall -arch=win32 ??1exception@std@@UAE@XZ(ptr) msvcr90.??1exception@std@@UAE@XZ
-@ cdecl -arch=win64 ??1exception@std@@UEAA@XZ(ptr) msvcr90.??1exception@std@@UEAA@XZ
+@ thiscall -arch=win32 ??0__non_rtti_object@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0__non_rtti_object@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA@AEBV0@@Z
+@ cdecl -arch=win64 ??0__non_rtti_object@std@@QEAA@PEBD@Z(ptr ptr) msvcrt.??0__non_rtti_object@@QEAA@PEBD@Z
+@ cdecl -arch=win64 ??0bad_cast@std@@AEAA@PEBQEBD@Z(ptr ptr) msvcrt.??0bad_cast@@AEAA@PEBQEBD@Z
+@ thiscall -arch=win32 ??0bad_cast@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_cast@@QEAA@AEBV0@@Z
+@ thiscall -arch=win32 ??0bad_cast@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_cast@@QAE@PBD@Z
+@ cdecl -arch=win64 ??0bad_cast@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_cast@@QEAA@PEBD@Z
+@ thiscall -arch=win32 ??0bad_typeid@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0bad_typeid@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0bad_typeid@@QEAA@AEBV0@@Z
+@ thiscall -arch=win32 ??0bad_typeid@std@@QAE@PBD@Z(ptr str) msvcrt.??0bad_typeid@@QAE@PBD@Z
+@ cdecl -arch=win64 ??0bad_typeid@std@@QEAA@PEBD@Z(ptr str) msvcrt.??0bad_typeid@@QEAA@PEBD@Z
+@ thiscall -arch=win32 ??0exception@std@@QAE@ABQBD@Z(ptr ptr) msvcrt.??0exception@@QAE@ABQBD@Z
+@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBD@Z(ptr ptr) msvcrt.??0exception@@QEAA@AEBQEBD@Z
+@ thiscall -arch=win32 ??0exception@std@@QAE@ABQBDH@Z(ptr ptr long) msvcrt.??0exception@@QAE@ABQBDH@Z
+@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBQEBDH@Z(ptr ptr long) msvcrt.??0exception@@QEAA@AEBQEBDH@Z
+@ thiscall -arch=win32 ??0exception@std@@QAE@ABV01@@Z(ptr ptr) msvcrt.??0exception@@QAE@ABV0@@Z
+@ cdecl -arch=win64 ??0exception@std@@QEAA@AEBV01@@Z(ptr ptr) msvcrt.??0exception@@QEAA@AEBV0@@Z
+@ thiscall -arch=win32 ??0exception@std@@QAE@XZ(ptr) msvcrt.??0exception@@QAE@XZ
+@ cdecl -arch=win64 ??0exception@std@@QEAA@XZ(ptr) msvcrt.??0exception@@QEAA@XZ
+@ thiscall -arch=win32 ??1__non_rtti_object@std@@UAE@XZ(ptr) msvcrt.??1__non_rtti_object@@UAE@XZ
+@ cdecl -arch=win64 ??1__non_rtti_object@std@@UEAA@XZ(ptr) msvcrt.??1__non_rtti_object@@UEAA@XZ
+@ thiscall -arch=win32 ??1bad_cast@std@@UAE@XZ(ptr) msvcrt.??1bad_cast@@UAE@XZ
+@ cdecl -arch=win64 ??1bad_cast@std@@UEAA@XZ(ptr) msvcrt.??1bad_cast@@UEAA@XZ
+@ thiscall -arch=win32 ??1bad_typeid@std@@UAE@XZ(ptr) msvcrt.??1bad_typeid@@UAE@XZ
+@ cdecl -arch=win64 ??1bad_typeid@std@@UEAA@XZ(ptr) msvcrt.??1bad_typeid@@UEAA@XZ
+@ thiscall -arch=win32 ??1exception@std@@UAE@XZ(ptr) msvcrt.??1exception@@UAE@XZ
+@ cdecl -arch=win64 ??1exception@std@@UEAA@XZ(ptr) msvcrt.??1exception@@UEAA@XZ
 @ thiscall -arch=win32 ??1type_info@@UAE@XZ(ptr) msvcrt.??1type_info@@UAE@XZ
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) msvcrt.??1type_info@@UEAA@XZ
 @ cdecl -arch=win32 ??2@YAPAXI@Z(long) msvcrt.??2@YAPAXI@Z
@@ -36,27 +36,27 @@
 @ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) msvcrt.??2@YAPEAX_KHPEBDH@Z
 @ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) msvcrt.??3@YAXPAX@Z
 @ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) msvcrt.??3@YAXPEAX@Z
-@ thiscall -arch=win32 ??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcr90.??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z
-@ cdecl -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcr90.??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z
-@ thiscall -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcr90.??4bad_cast@std@@QAEAAV01@ABV01@@Z
-@ cdecl -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcr90.??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z
-@ thiscall -arch=win32 ??4bad_typeid@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcr90.??4bad_typeid@std@@QAEAAV01@ABV01@@Z
-@ cdecl -arch=win64 ??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcr90.??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z
-@ thiscall -arch=win32 ??4exception@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcr90.??4exception@std@@QAEAAV01@ABV01@@Z
-@ cdecl -arch=win64 ??4exception@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcr90.??4exception@std@@QEAAAEAV01@AEBV01@@Z
-@ thiscall -arch=win32 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcr90.??8type_info@@QBE_NABV0@@Z
-@ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcr90.??8type_info@@QEBA_NAEBV0@@Z
-@ thiscall -arch=win32 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcr90.??9type_info@@QBE_NABV0@@Z
-@ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcr90.??9type_info@@QEBA_NAEBV0@@Z
-@ extern ??_7__non_rtti_object@std@@6B@ msvcr90.??_7__non_rtti_object@std@@6B@
-@ extern ??_7bad_cast@std@@6B@ msvcr90.??_7bad_cast@std@@6B@
-@ extern ??_7bad_typeid@std@@6B@ msvcr90.??_7bad_typeid@std@@6B@
+@ thiscall -arch=win32 ??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z
+@ thiscall -arch=win32 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4bad_cast@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QEAAAEAV0@AEBV0@@Z
+@ thiscall -arch=win32 ??4bad_typeid@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4bad_typeid@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4bad_typeid@@QEAAAEAV0@AEBV0@@Z
+@ thiscall -arch=win32 ??4exception@std@@QAEAAV01@ABV01@@Z(ptr ptr) msvcrt.??4exception@@QAEAAV0@ABV0@@Z
+@ cdecl -arch=win64 ??4exception@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) msvcrt.??4exception@@QEAAAEAV0@AEBV0@@Z
+@ thiscall -arch=win32 ??8type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??8type_info@@QBEHABV0@@Z
+@ cdecl -arch=win64 ??8type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??8type_info@@QEBAHAEBV0@@Z
+@ thiscall -arch=win32 ??9type_info@@QBE_NABV0@@Z(ptr ptr) msvcrt.??9type_info@@QBEHABV0@@Z
+@ cdecl -arch=win64 ??9type_info@@QEBA_NAEBV0@@Z(ptr ptr) msvcrt.??9type_info@@QEBAHAEBV0@@Z
+@ extern ??_7__non_rtti_object@std@@6B@ msvcrt.??_7__non_rtti_object@@6B@
+@ extern ??_7bad_cast@std@@6B@ msvcrt.??_7bad_cast@@6B@
+@ extern ??_7bad_typeid@std@@6B@ msvcrt.??_7bad_typeid@@6B@
 @ extern ??_7exception@@6B@ msvcrt.??_7exception@@6B@
-@ extern ??_7exception@std@@6B@ msvcr90.??_7exception@std@@6B@
-@ thiscall -arch=win32 ??_Fbad_cast@std@@QAEXXZ(ptr) msvcr90.??_Fbad_cast@std@@QAEXXZ
-@ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) msvcr90.??_Fbad_cast@std@@QEAAXXZ
-@ thiscall -arch=win32 ??_Fbad_typeid@std@@QAEXXZ(ptr) msvcr90.??_Fbad_typeid@std@@QAEXXZ
-@ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) msvcr90.??_Fbad_typeid@std@@QEAAXXZ
+@ extern ??_7exception@std@@6B@ msvcrt.??_7exception@@6B@
+@ thiscall -arch=win32 ??_Fbad_cast@std@@QAEXXZ(ptr) msvcrt.??_Fbad_cast@@QAEXXZ
+@ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) msvcrt.??_Fbad_cast@@QEAAXXZ
+@ thiscall -arch=win32 ??_Fbad_typeid@std@@QAEXXZ(ptr) msvcrt.??_Fbad_typeid@@QAEXXZ
+@ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) msvcrt.??_Fbad_typeid@@QEAAXXZ
 @ cdecl -arch=win32 ??_U@YAPAXI@Z(long) msvcrt.??_U@YAPAXI@Z
 @ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) msvcrt.??_U@YAPEAX_K@Z
 @ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) msvcrt.??_U@YAPAXIHPBDH@Z
@@ -79,14 +79,14 @@
 @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z  # int __cdecl _ValidateWrite(void * __ptr64,unsigned int)
 @ cdecl __uncaught_exception() msvcrt.__uncaught_exception
 @ stub ?_inconsistency@@YAXXZ
-@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) msvcr90.?_invalid_parameter@@YAXPBG00II@Z
-@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) msvcr90.?_invalid_parameter@@YAXPEBG00I_K@Z
+@ cdecl -arch=win32 ?_invalid_parameter@@YAXPBG00II@Z(wstr wstr wstr long long) msvcrt._invalid_parameter
+@ cdecl -arch=win64 ?_invalid_parameter@@YAXPEBG00I_K@Z(wstr wstr wstr long long) msvcrt._invalid_parameter
 @ stub -arch=win32 ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z  # int __cdecl _is_exception_typeof(class type_info const &,struct _EXCEPTION_POINTERS *)
 @ stub -arch=win64 ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z  # int __cdecl _is_exception_typeof(class type_info const & __ptr64,struct _EXCEPTION_POINTERS * __ptr64)
 @ thiscall -arch=win32 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) msvcr90.?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) msvcr90.?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z
-@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) msvcr90.?_open@@YAHPBDHH@Z
-@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) msvcr90.?_open@@YAHPEBDHH@Z
+@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) msvcrt._open
+@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) msvcrt._open
 @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() msvcrt.?_query_new_handler@@YAP6AHI@ZXZ
 @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() msvcrt.?_query_new_handler@@YAP6AH_K@ZXZ
 @ cdecl ?_query_new_mode@@YAHXZ() msvcrt.?_query_new_mode@@YAHXZ
@@ -99,14 +99,14 @@
 @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z
-@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) msvcr90.?_sopen@@YAHPBDHHH@Z
-@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) msvcr90.?_sopen@@YAHPEBDHHH@Z
+@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) msvcrt._sopen
+@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) msvcrt._sopen
 @ stub -arch=win32 ?_type_info_dtor_internal_method@type_info@@QAEXXZ  # public: void __thiscall type_info::_type_info_dtor_internal_method(void)
 @ stub -arch=win64 ?_type_info_dtor_internal_method@type_info@@QEAAXXZ  # public: void __cdecl type_info::_type_info_dtor_internal_method(void) __ptr64
-@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) msvcr90.?_wopen@@YAHPB_WHH@Z
-@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) msvcr90.?_wopen@@YAHPEB_WHH@Z
-@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) msvcr90.?_wsopen@@YAHPB_WHHH@Z
-@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) msvcr90.?_wsopen@@YAHPEB_WHHH@Z
+@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) msvcrt._wopen
+@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) msvcrt._wopen
+@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) msvcrt._wsopen
+@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) msvcrt._wsopen
 @ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z
 @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z
 @ stub -arch=win32 ?name@type_info@@QBEPBDPAU__type_info_node@@@Z  # public: char const * __thiscall type_info::name(struct __type_info_node *)const
@@ -118,13 +118,13 @@
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ@Z
 @ stub ?set_unexpected@@YAP6AXXZH@Z
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ@Z
-@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcr90.?swprintf@@YAHPAGIPBGZZ
-@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcr90.?swprintf@@YAHPA_WIPB_WZZ
+@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf
+@ varargs ?swprintf@@YAHPA_WIPB_WZZ(ptr long wstr) msvcrt._snwprintf
 @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ
 @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ
-@ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) msvcr90.?vswprintf@@YAHPA_WIPB_WPAD@Z
-@ thiscall -arch=win32 ?what@exception@std@@UBEPBDXZ(ptr) msvcr90.?what@exception@std@@UBEPBDXZ
-@ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) msvcr90.?what@exception@std@@UEBAPEBDXZ
+@ 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
 @ stub @_calloc_crt@8
 @ cdecl @_malloc_crt@4(long) msvcrt.malloc
 @ stub @_realloc_crt@8
@@ -297,9 +297,9 @@
 @ cdecl __sys_nerr() msvcr90.__sys_nerr
 @ cdecl __threadhandle() msvcrt.__threadhandle
 @ cdecl __threadid() msvcrt.__threadid
-@ cdecl __timezone() msvcr90.__timezone
+@ cdecl __timezone() msvcrt.__p__timezone
 @ cdecl __toascii(long) msvcrt.__toascii
-@ cdecl __tzname() msvcr90.__tzname
+@ cdecl __tzname() msvcrt.__p__tzname
 @ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx
 @ stub __unDNameHelper
@@ -361,7 +361,7 @@
 @ cdecl _c_exit() msvcrt._c_exit
 @ cdecl _cabs(long) msvcrt._cabs
 @ cdecl _callnewh(long) msvcrt._callnewh
-@ cdecl _calloc_crt(long long) msvcr90._calloc_crt
+@ cdecl _calloc_crt(long long) msvcrt.calloc
 @ cdecl _cexit() msvcrt._cexit
 @ cdecl _cgets(str) msvcrt._cgets
 @ stub _cgets_s
@@ -713,7 +713,7 @@
 @ cdecl _ltow_s(long ptr long long) msvcrt._ltow_s
 @ cdecl _makepath(ptr str str str str) msvcrt._makepath
 @ cdecl _makepath_s(ptr long str str str str) msvcrt._makepath_s
-@ cdecl _malloc_crt(long) msvcr90._malloc_crt
+@ cdecl _malloc_crt(long) msvcrt.malloc
 @ cdecl _mbbtombc(long) msvcrt._mbbtombc
 @ stub _mbbtombc_l
 @ cdecl _mbbtype(long long) msvcrt._mbbtype
@@ -890,7 +890,7 @@
 @ cdecl _putws(wstr) msvcrt._putws
 # extern _pwctype
 @ cdecl _read(long ptr long) msvcrt._read
-@ cdecl _realloc_crt(ptr long) msvcr90._realloc_crt
+@ cdecl _realloc_crt(ptr long) msvcrt.realloc
 @ cdecl _recalloc(ptr long long) msvcr90._recalloc
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw() msvcrt._resetstkoflw
@@ -1119,7 +1119,7 @@
 @ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c
 @ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l
 @ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l
-@ cdecl _vswprintf_p(ptr long wstr ptr) msvcr90._vswprintf_p
+@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf
 @ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l
 @ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l
 @ stub _vwprintf_l
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index 81721c60867..775b186da6f 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -541,8 +541,7 @@
 @ stub -arch=win64 ?lock@streambuf@@QEAAXXZ
 @ stub -arch=win32 ?lockbuf@ios@@QAAXXZ
 @ stub -arch=win64 ?lockbuf@ios@@QEAAXXZ
-@ stub -arch=win32 ?lockc@ios@@KAXXZ
-@ stub -arch=win64 ?lockc@ios@@KAXXZ
+@ stub ?lockc@ios@@KAXXZ
 @ stub -arch=win32 ?lockptr@ios@@IAEPAU_CRT_CRITICAL_SECTION@@XZ
 @ stub -arch=win64 ?lockptr@ios@@IEAAPEAU_CRT_CRITICAL_SECTION@@XZ
 @ stub -arch=win32 ?lockptr@streambuf@@IAEPAU_CRT_CRITICAL_SECTION@@XZ
diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec
index faca0d20091..d2639a5a286 100644
--- a/dlls/msvcrt40/msvcrt40.spec
+++ b/dlls/msvcrt40/msvcrt40.spec
@@ -608,8 +608,7 @@
 @ stub -arch=win64 ?lock@streambuf@@QEAAXXZ
 @ stub -arch=win32 ?lockbuf@ios@@QAAXXZ
 @ stub -arch=win64 ?lockbuf@ios@@QEAAXXZ
-@ stub -arch=win32 ?lockc@ios@@KAXXZ
-@ stub -arch=win64 ?lockc@ios@@KAXXZ
+@ stub ?lockc@ios@@KAXXZ
 @ stub -arch=win32 ?lockptr@ios@@IAEPAU_CRT_CRITICAL_SECTION@@XZ
 @ stub -arch=win64 ?lockptr@ios@@IEAAPEAU_CRT_CRITICAL_SECTION@@XZ
 @ stub -arch=win32 ?lockptr@streambuf@@IAEPAU_CRT_CRITICAL_SECTION@@XZ