msvcrt: Remove MSVCRT_ prefix from heap.c functions.

dlls/crtdll/crtdll.spec

 # Old C runtime library. All functions provided by msvcrt
 
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
 @ cdecl -arch=i386 _CIacos()
 @ cdecl -arch=i386 _CIasin()
 @ cdecl -arch=i386 _CIatan()
@@ -351,7 +351,7 @@
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl clearerr(ptr) MSVCRT_clearerr
 @ cdecl clock() MSVCRT_clock
@@ -379,7 +379,7 @@
 @ cdecl fputs(str ptr) MSVCRT_fputs
 @ cdecl fputwc(long ptr) MSVCRT_fputwc
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl frexp(double ptr) MSVCRT_frexp
 @ varargs fscanf(ptr str) MSVCRT_fscanf
@@ -428,7 +428,7 @@
 @ cdecl log(double) MSVCRT_log
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
 @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@@ -448,7 +448,7 @@
 @ cdecl qsort(ptr long long ptr) MSVCRT_qsort
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind

dlls/msvcr100/msvcr100.spec

@@ -197,12 +197,12 @@
 @ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) type_info_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ stub -arch=win32 ??4?$_SpinWait@$00@details@Concurrency@@QAEAAV012@ABV012@@Z
 @ stub -arch=win64 ??4?$_SpinWait@$00@details@Concurrency@@QEAAAEAV012@AEBV012@@Z
 @ stub -arch=win32 ??4?$_SpinWait@$0A@@details@Concurrency@@QAEAAV012@ABV012@@Z
@@ -236,12 +236,12 @@
 @ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) bad_cast_default_ctor
 @ thiscall -arch=i386 ??_Fbad_typeid@std@@QAEXXZ(ptr) bad_typeid_default_ctor
 @ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) bad_typeid_default_ctor
-@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete
 @ cdecl -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z(long) Concurrency_Alloc
 @ cdecl -arch=win64 ?Alloc@Concurrency@@YAPEAX_K@Z(long) Concurrency_Alloc
 @ cdecl ?Block@Context@Concurrency@@SAXXZ() Context_Block
@@ -435,14 +435,14 @@
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ 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
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
 @ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned int)
 @ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned __int64)
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *)
 @ 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) _set_se_translator
@@ -476,7 +476,7 @@
 @ cdecl -arch=win64 ?reset@event@Concurrency@@QEAAXXZ(ptr) event_reset
 @ thiscall -arch=win32 ?set@event@Concurrency@@QAEXXZ(ptr) event_set
 @ cdecl -arch=win64 ?set@event@Concurrency@@QEAAXXZ(ptr) event_set
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ stub ?set_terminate@@YAP6AXXZH@Z
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
 @ stub ?set_unexpected@@YAP6AXXZH@Z
@@ -711,7 +711,7 @@
 @ cdecl _c_exit() MSVCRT__c_exit
 @ cdecl _cabs(long) MSVCRT__cabs
 @ cdecl _callnewh(long)
-@ cdecl _calloc_crt(long long) MSVCRT_calloc
+@ cdecl _calloc_crt(long long) calloc
 @ cdecl _cexit() MSVCRT__cexit
 @ cdecl _cgets(ptr)
 @ stub _cgets_s
@@ -1067,7 +1067,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) MSVCRT_malloc
+@ cdecl _malloc_crt(long) malloc
 @ cdecl _mbbtombc(long)
 @ stub _mbbtombc_l
 @ cdecl _mbbtype(long long)
@@ -1245,7 +1245,7 @@
 @ cdecl _putws(wstr) MSVCRT__putws
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
-@ cdecl _realloc_crt(ptr long) MSVCRT_realloc
+@ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw() MSVCRT__resetstkoflw
@@ -1643,7 +1643,7 @@
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
 @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
 @ cdecl btowc(long)
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -1681,7 +1681,7 @@
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
 @ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
 @ cdecl frexp(double ptr) MSVCRT_frexp
@@ -1740,7 +1740,7 @@
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen
 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc
@@ -1752,9 +1752,9 @@
 @ cdecl memchr(ptr long long) MSVCRT_memchr
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
-@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
+@ cdecl memcpy_s(ptr long ptr long)
 @ cdecl memmove(ptr ptr long)
-@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
+@ cdecl memmove_s(ptr long ptr long)
 @ cdecl memset(ptr long long)
 @ cdecl modf(double ptr) MSVCRT_modf
 @ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@@ -1773,7 +1773,7 @@
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
 @ cdecl rand_s(ptr) MSVCRT_rand_s
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind
@@ -1811,7 +1811,7 @@
 @ cdecl strncat_s(str long str long) MSVCRT_strncat_s
 @ cdecl strncmp(str str long) MSVCRT_strncmp
 @ cdecl strncpy(ptr str long) MSVCRT_strncpy
-@ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s
+@ cdecl strncpy_s(ptr long str long)
 @ cdecl strnlen(str long) MSVCRT_strnlen
 @ cdecl strpbrk(str str) MSVCRT_strpbrk
 @ cdecl strrchr(str long) MSVCRT_strrchr

dlls/msvcr110/msvcr110.spec

@@ -335,12 +335,12 @@
 @ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) type_info_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ stub -arch=win32 ??3@YAXPAXHPBDH@Z
 @ stub -arch=win64 ??3@YAXPEAXHPEBDH@Z
 @ stub -arch=arm ??4?$_SpinWait@$00@details@Concurrency@@QAAAAV012@ABV012@@Z
@@ -392,12 +392,12 @@
 @ cdecl -arch=arm ??_Fbad_typeid@std@@QAAXXZ(ptr) bad_typeid_default_ctor
 @ thiscall -arch=i386 ??_Fbad_typeid@std@@QAEXXZ(ptr) bad_typeid_default_ctor
 @ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) bad_typeid_default_ctor
-@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete
 @ stub -arch=win32 ??_V@YAXPAXHPBDH@Z
 @ stub -arch=win64 ??_V@YAXPEAXHPEBDH@Z
 @ cdecl -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z(long) Concurrency_Alloc
@@ -717,14 +717,14 @@
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ 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
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
 @ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned int)
 @ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned __int64)
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *)
 @ 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) _set_se_translator
@@ -776,7 +776,7 @@
 @ cdecl -arch=arm ?set@event@Concurrency@@QAAXXZ(ptr) event_set
 @ thiscall -arch=win32 ?set@event@Concurrency@@QAEXXZ(ptr) event_set
 @ cdecl -arch=win64 ?set@event@Concurrency@@QEAAXXZ(ptr) event_set
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ stub -arch=win32 ?set_task_execution_resources@Concurrency@@YAXGPAU_GROUP_AFFINITY@@@Z
 @ stub -arch=win64 ?set_task_execution_resources@Concurrency@@YAXGPEAU_GROUP_AFFINITY@@@Z
 @ stub -arch=win32 ?set_task_execution_resources@Concurrency@@YAXK@Z
@@ -1059,7 +1059,7 @@
 @ cdecl _c_exit() MSVCRT__c_exit
 @ cdecl _cabs(long) MSVCRT__cabs
 @ cdecl _callnewh(long)
-@ cdecl _calloc_crt(long long) MSVCRT_calloc
+@ cdecl _calloc_crt(long long) calloc
 @ cdecl _cexit() MSVCRT__cexit
 @ cdecl _cgets(ptr)
 @ stub _cgets_s
@@ -1424,7 +1424,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) MSVCRT_malloc
+@ cdecl _malloc_crt(long) malloc
 @ cdecl _mbbtombc(long)
 @ stub _mbbtombc_l
 @ cdecl _mbbtype(long long)
@@ -1602,7 +1602,7 @@
 @ cdecl _putws(wstr) MSVCRT__putws
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
-@ cdecl _realloc_crt(ptr long) MSVCRT_realloc
+@ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw() MSVCRT__resetstkoflw
@@ -2000,7 +2000,7 @@
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
 @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
 @ cdecl btowc(long)
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -2039,7 +2039,7 @@
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
 @ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
 @ cdecl frexp(double ptr) MSVCRT_frexp
@@ -2098,7 +2098,7 @@
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen
 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc
@@ -2110,9 +2110,9 @@
 @ cdecl memchr(ptr long long) MSVCRT_memchr
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
-@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
+@ cdecl memcpy_s(ptr long ptr long)
 @ cdecl memmove(ptr ptr long)
-@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
+@ cdecl memmove_s(ptr long ptr long)
 @ cdecl memset(ptr long long)
 @ cdecl modf(double ptr) MSVCRT_modf
 @ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@@ -2131,7 +2131,7 @@
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
 @ cdecl rand_s(ptr) MSVCRT_rand_s
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind
@@ -2169,7 +2169,7 @@
 @ cdecl strncat_s(str long str long) MSVCRT_strncat_s
 @ cdecl strncmp(str str long) MSVCRT_strncmp
 @ cdecl strncpy(ptr str long) MSVCRT_strncpy
-@ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s
+@ cdecl strncpy_s(ptr long str long)
 @ cdecl strnlen(str long) MSVCRT_strnlen
 @ cdecl strpbrk(str str) MSVCRT_strpbrk
 @ cdecl strrchr(str long) MSVCRT_strrchr

dlls/msvcr120/msvcr120.spec

@@ -331,12 +331,12 @@
 @ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) type_info_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ stub -arch=win32 ??3@YAXPAXHPBDH@Z
 @ stub -arch=win64 ??3@YAXPEAXHPEBDH@Z
 @ stub -arch=arm ??4?$_SpinWait@$00@details@Concurrency@@QAAAAV012@ABV012@@Z
@@ -388,12 +388,12 @@
 @ cdecl -arch=arm ??_Fbad_typeid@std@@QAAXXZ(ptr) bad_typeid_default_ctor
 @ thiscall -arch=i386 ??_Fbad_typeid@std@@QAEXXZ(ptr) bad_typeid_default_ctor
 @ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) bad_typeid_default_ctor
-@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete
 @ stub -arch=win32 ??_V@YAXPAXHPBDH@Z
 @ stub -arch=win64 ??_V@YAXPEAXHPEBDH@Z
 @ cdecl -arch=win32 ?Alloc@Concurrency@@YAPAXI@Z(long) Concurrency_Alloc
@@ -699,14 +699,14 @@
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ 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
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
 @ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned int)
 @ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned __int64)
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *)
 @ 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) _set_se_translator
@@ -758,7 +758,7 @@
 @ cdecl -arch=arm ?set@event@Concurrency@@QAAXXZ(ptr) event_set
 @ thiscall -arch=win32 ?set@event@Concurrency@@QAEXXZ(ptr) event_set
 @ cdecl -arch=win64 ?set@event@Concurrency@@QEAAXXZ(ptr) event_set
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ stub -arch=win32 ?set_task_execution_resources@Concurrency@@YAXGPAU_GROUP_AFFINITY@@@Z
 @ stub -arch=win64 ?set_task_execution_resources@Concurrency@@YAXGPEAU_GROUP_AFFINITY@@@Z
 @ stub -arch=win32 ?set_task_execution_resources@Concurrency@@YAXK@Z
@@ -1050,7 +1050,7 @@
 @ cdecl _c_exit() MSVCRT__c_exit
 @ cdecl _cabs(long) MSVCRT__cabs
 @ cdecl _callnewh(long)
-@ cdecl _calloc_crt(long long) MSVCRT_calloc
+@ cdecl _calloc_crt(long long) calloc
 @ cdecl _cexit() MSVCRT__cexit
 @ cdecl _cgets(ptr)
 @ stub _cgets_s
@@ -1434,7 +1434,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) MSVCRT_malloc
+@ cdecl _malloc_crt(long) malloc
 @ cdecl _mbbtombc(long)
 @ stub _mbbtombc_l
 @ cdecl _mbbtype(long long)
@@ -1612,7 +1612,7 @@
 @ cdecl _putws(wstr) MSVCRT__putws
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
-@ cdecl _realloc_crt(ptr long) MSVCRT_realloc
+@ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw() MSVCRT__resetstkoflw
@@ -2045,7 +2045,7 @@
 @ stub cacoshf
 @ stub cacoshl
 @ stub cacosl
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ stub carg
 @ stub cargf
 @ stub cargl
@@ -2185,7 +2185,7 @@
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
 @ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
 @ cdecl frexp(double ptr) MSVCRT_frexp
@@ -2275,7 +2275,7 @@
 @ cdecl lround(double) MSVCR120_lround
 @ cdecl lroundf(float) MSVCR120_lroundf
 @ cdecl lroundl(double) MSVCR120_lroundl
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen
 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc
@@ -2287,9 +2287,9 @@
 @ cdecl memchr(ptr long long) MSVCRT_memchr
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
-@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
+@ cdecl memcpy_s(ptr long ptr long)
 @ cdecl memmove(ptr ptr long)
-@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
+@ cdecl memmove_s(ptr long ptr long)
 @ cdecl memset(ptr long long)
 @ cdecl modf(double ptr) MSVCRT_modf
 @ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@@ -2323,7 +2323,7 @@
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
 @ cdecl rand_s(ptr) MSVCRT_rand_s
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remainder(double double) MSVCR120_remainder
 @ cdecl remainderf(float float) MSVCR120_remainderf
 @ cdecl remainderl(double double) MSVCR120_remainderl
@@ -2379,7 +2379,7 @@
 @ cdecl strncat_s(str long str long) MSVCRT_strncat_s
 @ cdecl strncmp(str str long) MSVCRT_strncmp
 @ cdecl strncpy(ptr str long) MSVCRT_strncpy
-@ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s
+@ cdecl strncpy_s(ptr long str long)
 @ cdecl strnlen(str long) MSVCRT_strnlen
 @ cdecl strpbrk(str str) MSVCRT_strpbrk
 @ cdecl strrchr(str long) MSVCRT_strrchr

dlls/msvcr70/msvcr70.spec

@@ -32,10 +32,10 @@
 @ cdecl -arch=win64 ??1exception@@UEAA@XZ(ptr) exception_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr ptr) __non_rtti_object_opequals
 @ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr ptr) __non_rtti_object_opequals
 @ thiscall -arch=i386 ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr ptr) bad_cast_opequals
@@ -64,17 +64,17 @@
 @ thiscall -arch=win32 ??_Gbad_cast@@UAEPAXI@Z(ptr long) bad_cast_scalar_dtor
 @ thiscall -arch=win32 ??_Gbad_typeid@@UAEPAXI@Z(ptr long) bad_typeid_scalar_dtor
 @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) exception_scalar_dtor
-@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete
 @ cdecl __uncaught_exception() MSVCRT___uncaught_exception
-@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) type_info_before
@@ -83,7 +83,7 @@
 @ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ(ptr) type_info_name
 @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) type_info_raw_name
 @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) type_info_raw_name
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
 @ cdecl ?terminate@@YAXXZ() terminate
@@ -691,7 +691,7 @@
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl clearerr(ptr) MSVCRT_clearerr
 @ cdecl clock() MSVCRT_clock
@@ -721,7 +721,7 @@
 @ cdecl fputwc(long ptr) MSVCRT_fputwc
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl frexp(double ptr) MSVCRT_frexp
 @ varargs fscanf(ptr str) MSVCRT_fscanf
@@ -772,7 +772,7 @@
 @ cdecl log(double) MSVCRT_log
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
 @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@@ -794,7 +794,7 @@
 @ cdecl qsort(ptr long long ptr) MSVCRT_qsort
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind

dlls/msvcr71/msvcr71.spec

@@ -30,10 +30,10 @@
 @ cdecl -arch=win64 ??1exception@@UEAA@XZ(ptr) exception_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr ptr) __non_rtti_object_opequals
 @ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr ptr) __non_rtti_object_opequals
 @ thiscall -arch=i386 ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr ptr) bad_cast_opequals
@@ -54,17 +54,17 @@
 @ cdecl -arch=win64 ??_Fbad_cast@@QEAAXXZ(ptr) bad_cast_default_ctor
 @ thiscall -arch=i386 ??_Fbad_typeid@@QAEXXZ(ptr) bad_typeid_default_ctor
 @ cdecl -arch=win64 ??_Fbad_typeid@@QEAAXXZ(ptr) bad_typeid_default_ctor
-@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete
 @ cdecl __uncaught_exception() MSVCRT___uncaught_exception
-@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) type_info_before
@@ -73,7 +73,7 @@
 @ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ(ptr) type_info_name
 @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) type_info_raw_name
 @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) type_info_raw_name
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
 @ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) MSVCRT__snwprintf
@@ -687,7 +687,7 @@
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl clearerr(ptr) MSVCRT_clearerr
 @ cdecl clock() MSVCRT_clock
@@ -717,7 +717,7 @@
 @ cdecl fputwc(long ptr) MSVCRT_fputwc
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl frexp(double ptr) MSVCRT_frexp
 @ varargs fscanf(ptr str) MSVCRT_fscanf
@@ -768,7 +768,7 @@
 @ cdecl log(double) MSVCRT_log
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
 @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@@ -790,7 +790,7 @@
 @ cdecl qsort(ptr long long ptr) MSVCRT_qsort
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind

dlls/msvcr80/msvcr80.spec

@@ -31,12 +31,12 @@
 @ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) type_info_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ thiscall -arch=i386 ??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z(ptr ptr) __non_rtti_object_opequals
 @ cdecl -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) __non_rtti_object_opequals
 @ thiscall -arch=i386 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) bad_cast_opequals
@@ -60,12 +60,12 @@
 @ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) bad_cast_default_ctor
 @ thiscall -arch=i386 ??_Fbad_typeid@std@@QAEXXZ(ptr) bad_typeid_default_ctor
 @ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) bad_typeid_default_ctor
-@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete
 @ stub -arch=win32 ?_Name_base@type_info@@CAPBDPBV1@PAU__type_info_node@@@Z  # private: static char const * __cdecl type_info::_Name_base(class type_info const *,struct __type_info_node *)
 @ stub -arch=win64 ?_Name_base@type_info@@CAPEBDPEBV1@PEAU__type_info_node@@@Z  # private: static char const * __ptr64 __cdecl type_info::_Name_base(class type_info const * __ptr64,struct __type_info_node * __ptr64)
 @ stub -arch=win32 ?_Name_base_internal@type_info@@CAPBDPBV1@PAU__type_info_node@@@Z  # private: static char const * __cdecl type_info::_Name_base_internal(class type_info const *,struct __type_info_node *)
@@ -91,14 +91,14 @@
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ 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
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
 @ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned int)
 @ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned __int64)
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *)
 @ 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) _set_se_translator
@@ -118,7 +118,7 @@
 @ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ(ptr) type_info_raw_name
 @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) type_info_raw_name
 @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) type_info_raw_name
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ stub ?set_terminate@@YAP6AXXZH@Z
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
 @ stub ?set_unexpected@@YAP6AXXZH@Z
@@ -131,7 +131,7 @@
 @ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception
 @ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception
 @ stub @_calloc_crt@8
-@ cdecl @_malloc_crt@4(long) MSVCRT_malloc
+@ cdecl @_malloc_crt@4(long) malloc
 @ stub @_realloc_crt@8
 @ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT
 @ cdecl -arch=i386 _CIacos()
@@ -375,7 +375,7 @@
 @ cdecl _c_exit() MSVCRT__c_exit
 @ cdecl _cabs(long) MSVCRT__cabs
 @ cdecl _callnewh(long)
-@ cdecl _calloc_crt(long long) MSVCRT_calloc
+@ cdecl _calloc_crt(long long) calloc
 @ cdecl _cexit() MSVCRT__cexit
 @ cdecl _cgets(ptr)
 @ stub _cgets_s
@@ -739,7 +739,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) MSVCRT_malloc
+@ cdecl _malloc_crt(long) malloc
 @ cdecl _mbbtombc(long)
 @ stub _mbbtombc_l
 @ cdecl _mbbtype(long long)
@@ -919,7 +919,7 @@
 @ cdecl _putws(wstr) MSVCRT__putws
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
-@ cdecl _realloc_crt(ptr long) MSVCRT_realloc
+@ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw() MSVCRT__resetstkoflw
@@ -1326,7 +1326,7 @@
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
 @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
 @ cdecl btowc(long)
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -1364,7 +1364,7 @@
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
 @ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
 @ cdecl frexp(double ptr) MSVCRT_frexp
@@ -1421,7 +1421,7 @@
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen
 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc
@@ -1433,9 +1433,9 @@
 @ cdecl memchr(ptr long long) MSVCRT_memchr
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
-@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
+@ cdecl memcpy_s(ptr long ptr long)
 @ cdecl memmove(ptr ptr long)
-@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
+@ cdecl memmove_s(ptr long ptr long)
 @ cdecl memset(ptr long long)
 @ cdecl modf(double ptr) MSVCRT_modf
 @ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@@ -1454,7 +1454,7 @@
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
 @ cdecl rand_s(ptr) MSVCRT_rand_s
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind
@@ -1492,7 +1492,7 @@
 @ cdecl strncat_s(str long str long) MSVCRT_strncat_s
 @ cdecl strncmp(str str long) MSVCRT_strncmp
 @ cdecl strncpy(ptr str long) MSVCRT_strncpy
-@ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s
+@ cdecl strncpy_s(ptr long str long)
 @ cdecl strnlen(str long) MSVCRT_strnlen
 @ cdecl strpbrk(str str) MSVCRT_strpbrk
 @ cdecl strrchr(str long) MSVCRT_strrchr

dlls/msvcr90/msvcr90.spec

@@ -31,12 +31,12 @@
 @ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) type_info_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ thiscall -arch=i386 ??4__non_rtti_object@std@@QAEAAV01@ABV01@@Z(ptr ptr) __non_rtti_object_opequals
 @ cdecl -arch=win64 ??4__non_rtti_object@std@@QEAAAEAV01@AEBV01@@Z(ptr ptr) __non_rtti_object_opequals
 @ thiscall -arch=i386 ??4bad_cast@std@@QAEAAV01@ABV01@@Z(ptr ptr) bad_cast_opequals
@@ -60,12 +60,12 @@
 @ cdecl -arch=win64 ??_Fbad_cast@std@@QEAAXXZ(ptr) bad_cast_default_ctor
 @ thiscall -arch=i386 ??_Fbad_typeid@std@@QAEXXZ(ptr) bad_typeid_default_ctor
 @ cdecl -arch=win64 ??_Fbad_typeid@std@@QEAAXXZ(ptr) bad_typeid_default_ctor
-@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete
 @ stub -arch=win32 ?_Name_base@type_info@@CAPBDPBV1@PAU__type_info_node@@@Z  # private: static char const * __cdecl type_info::_Name_base(class type_info const *,struct __type_info_node *)
 @ stub -arch=win64 ?_Name_base@type_info@@CAPEBDPEBV1@PEAU__type_info_node@@@Z  # private: static char const * __ptr64 __cdecl type_info::_Name_base(class type_info const * __ptr64,struct __type_info_node * __ptr64)
 @ stub -arch=win32 ?_Name_base_internal@type_info@@CAPBDPBV1@PAU__type_info_node@@@Z  # private: static char const * __cdecl type_info::_Name_base_internal(class type_info const *,struct __type_info_node *)
@@ -91,14 +91,14 @@
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ 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
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
 @ stub -arch=win32 ?_set_new_handler@@YAP6AHI@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned int)
 @ stub -arch=win64 ?_set_new_handler@@YAP6AH_K@ZH@Z  # int (__cdecl*__cdecl _set_new_handler(int))(unsigned __int64)
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *)
 @ 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) _set_se_translator
@@ -118,7 +118,7 @@
 @ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ(ptr) type_info_raw_name
 @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) type_info_raw_name
 @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) type_info_raw_name
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ stub ?set_terminate@@YAP6AXXZH@Z
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
 @ stub ?set_unexpected@@YAP6AXXZH@Z
@@ -359,7 +359,7 @@
 @ cdecl _c_exit() MSVCRT__c_exit
 @ cdecl _cabs(long) MSVCRT__cabs
 @ cdecl _callnewh(long)
-@ cdecl _calloc_crt(long long) MSVCRT_calloc
+@ cdecl _calloc_crt(long long) calloc
 @ cdecl _cexit() MSVCRT__cexit
 @ cdecl _cgets(ptr)
 @ stub _cgets_s
@@ -717,7 +717,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) MSVCRT_malloc
+@ cdecl _malloc_crt(long) malloc
 @ cdecl _mbbtombc(long)
 @ stub _mbbtombc_l
 @ cdecl _mbbtype(long long)
@@ -895,7 +895,7 @@
 @ cdecl _putws(wstr) MSVCRT__putws
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
-@ cdecl _realloc_crt(ptr long) MSVCRT_realloc
+@ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw() MSVCRT__resetstkoflw
@@ -1298,7 +1298,7 @@
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
 @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
 @ cdecl btowc(long)
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -1336,7 +1336,7 @@
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
 @ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
 @ cdecl frexp(double ptr) MSVCRT_frexp
@@ -1393,7 +1393,7 @@
 @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f
 @ cdecl -arch=!i386 logf(float) MSVCRT_logf
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen
 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc
@@ -1405,9 +1405,9 @@
 @ cdecl memchr(ptr long long) MSVCRT_memchr
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
-@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
+@ cdecl memcpy_s(ptr long ptr long)
 @ cdecl memmove(ptr ptr long)
-@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
+@ cdecl memmove_s(ptr long ptr long)
 @ cdecl memset(ptr long long)
 @ cdecl modf(double ptr) MSVCRT_modf
 @ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@@ -1426,7 +1426,7 @@
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
 @ cdecl rand_s(ptr) MSVCRT_rand_s
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind
@@ -1464,7 +1464,7 @@
 @ cdecl strncat_s(str long str long) MSVCRT_strncat_s
 @ cdecl strncmp(str str long) MSVCRT_strncmp
 @ cdecl strncpy(ptr str long) MSVCRT_strncpy
-@ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s
+@ cdecl strncpy_s(ptr long str long)
 @ cdecl strnlen(str long) MSVCRT_strnlen
 @ cdecl strpbrk(str str) MSVCRT_strpbrk
 @ cdecl strrchr(str long) MSVCRT_strrchr

dlls/msvcrt/console.c

@@ -476,7 +476,7 @@ int CDECL _kbhit(void)
 
     GetNumberOfConsoleInputEvents(MSVCRT_console_in, &count);
 
-    if (count && (ir = MSVCRT_malloc(count * sizeof(INPUT_RECORD))) &&
+    if (count && (ir = malloc(count * sizeof(INPUT_RECORD))) &&
         PeekConsoleInputA(MSVCRT_console_in, ir, count, &count))
       for(i = 0; i < count - 1; i++)
       {
@@ -488,7 +488,7 @@ int CDECL _kbhit(void)
           break;
         }
       }
-    MSVCRT_free(ir);
+    free(ir);
   }
   UNLOCK_CONSOLE;
   return retval;

dlls/msvcrt/cpp.c

@@ -125,7 +125,7 @@ static void EXCEPTION_ctor(exception *_this, const char** name)
   if (*name)
   {
     unsigned int name_len = strlen(*name) + 1;
-    _this->name = MSVCRT_malloc(name_len);
+    _this->name = malloc(name_len);
     memcpy(_this->name, *name, name_len);
     _this->do_free = TRUE;
   }
@@ -201,7 +201,7 @@ void __thiscall exception_dtor(exception * _this)
 {
   TRACE("(%p)\n", _this);
   _this->vtable = &exception_vtable;
-  if (_this->do_free) MSVCRT_free(_this->name);
+  if (_this->do_free) free(_this->name);
 }
 
 /******************************************************************
@@ -233,12 +233,12 @@ void * __thiscall exception_vector_dtor(exception * _this, unsigned int flags)
         INT_PTR i, *ptr = (INT_PTR *)_this - 1;
 
         for (i = *ptr - 1; i >= 0; i--) exception_dtor(_this + i);
-        MSVCRT_operator_delete(ptr);
+        operator_delete(ptr);
     }
     else
     {
         exception_dtor(_this);
-        if (flags & 1) MSVCRT_operator_delete(_this);
+        if (flags & 1) operator_delete(_this);
     }
     return _this;
 }
@@ -251,7 +251,7 @@ void * __thiscall exception_scalar_dtor(exception * _this, unsigned int flags)
 {
     TRACE("(%p %x)\n", _this, flags);
     exception_dtor(_this);
-    if (flags & 1) MSVCRT_operator_delete(_this);
+    if (flags & 1) operator_delete(_this);
     return _this;
 }
 
@@ -332,12 +332,12 @@ void * __thiscall bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags)
         INT_PTR i, *ptr = (INT_PTR *)_this - 1;
 
         for (i = *ptr - 1; i >= 0; i--) bad_typeid_dtor(_this + i);
-        MSVCRT_operator_delete(ptr);
+        operator_delete(ptr);
     }
     else
     {
         bad_typeid_dtor(_this);
-        if (flags & 1) MSVCRT_operator_delete(_this);
+        if (flags & 1) operator_delete(_this);
     }
     return _this;
 }
@@ -350,7 +350,7 @@ void * __thiscall bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags)
 {
     TRACE("(%p %x)\n", _this, flags);
     bad_typeid_dtor(_this);
-    if (flags & 1) MSVCRT_operator_delete(_this);
+    if (flags & 1) operator_delete(_this);
     return _this;
 }
 
@@ -415,12 +415,12 @@ void * __thiscall __non_rtti_object_vector_dtor(__non_rtti_object * _this, unsig
         INT_PTR i, *ptr = (INT_PTR *)_this - 1;
 
         for (i = *ptr - 1; i >= 0; i--) __non_rtti_object_dtor(_this + i);
-        MSVCRT_operator_delete(ptr);
+        operator_delete(ptr);
     }
     else
     {
         __non_rtti_object_dtor(_this);
-        if (flags & 1) MSVCRT_operator_delete(_this);
+        if (flags & 1) operator_delete(_this);
     }
     return _this;
 }
@@ -433,7 +433,7 @@ void * __thiscall __non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsig
 {
   TRACE("(%p %x)\n", _this, flags);
   __non_rtti_object_dtor(_this);
-  if (flags & 1) MSVCRT_operator_delete(_this);
+  if (flags & 1) operator_delete(_this);
   return _this;
 }
 
@@ -517,12 +517,12 @@ void * __thiscall bad_cast_vector_dtor(bad_cast * _this, unsigned int flags)
         INT_PTR i, *ptr = (INT_PTR *)_this - 1;
 
         for (i = *ptr - 1; i >= 0; i--) bad_cast_dtor(_this + i);
-        MSVCRT_operator_delete(ptr);
+        operator_delete(ptr);
     }
     else
     {
         bad_cast_dtor(_this);
-        if (flags & 1) MSVCRT_operator_delete(_this);
+        if (flags & 1) operator_delete(_this);
     }
     return _this;
 }
@@ -535,7 +535,7 @@ void * __thiscall bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags)
 {
   TRACE("(%p %x)\n", _this, flags);
   bad_cast_dtor(_this);
-  if (flags & 1) MSVCRT_operator_delete(_this);
+  if (flags & 1) operator_delete(_this);
   return _this;
 }
 
@@ -579,7 +579,7 @@ DEFINE_THISCALL_WRAPPER(type_info_dtor,4)
 void __thiscall type_info_dtor(type_info * _this)
 {
   TRACE("(%p)\n", _this);
-  MSVCRT_free(_this->name);
+  free(_this->name);
 }
 
 /******************************************************************
@@ -596,7 +596,7 @@ const char * __thiscall type_info_name(type_info * _this)
      * Is this '.' really part of the mangled name, or has it some other meaning ?
      */
     char* name = __unDName(0, _this->mangled + 1, 0,
-                           MSVCRT_malloc, MSVCRT_free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE);
+                           malloc, free, UNDNAME_NO_ARGUMENTS | UNDNAME_32_BIT_DECODE);
     if (name)
     {
       unsigned int len = strlen(name);
@@ -608,7 +608,7 @@ const char * __thiscall type_info_name(type_info * _this)
       if (InterlockedCompareExchangePointer((void**)&_this->name, name, NULL))
       {
         /* Another thread set this member since we checked above - use it */
-        MSVCRT_free(name);
+        free(name);
       }
     }
   }
@@ -637,12 +637,12 @@ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags)
         INT_PTR i, *ptr = (INT_PTR *)_this - 1;
 
         for (i = *ptr - 1; i >= 0; i--) type_info_dtor(_this + i);
-        MSVCRT_operator_delete(ptr);
+        operator_delete(ptr);
     }
     else
     {
         type_info_dtor(_this);
-        if (flags & 1) MSVCRT_operator_delete(_this);
+        if (flags & 1) operator_delete(_this);
     }
     return _this;
 }
@@ -2051,14 +2051,14 @@ typedef struct
 
 static void* CDECL type_info_entry_malloc(size_t size)
 {
-    type_info_entry *ret = MSVCRT_malloc(FIELD_OFFSET(type_info_entry, name) + size);
+    type_info_entry *ret = malloc(FIELD_OFFSET(type_info_entry, name) + size);
     return ret->name;
 }
 
 static void CDECL type_info_entry_free(void *ptr)
 {
     ptr = (char*)ptr - FIELD_OFFSET(type_info_entry, name);
-    MSVCRT_free(ptr);
+    free(ptr);
 }
 
 /******************************************************************
@@ -2117,7 +2117,7 @@ void CDECL __std_type_info_destroy_list(SLIST_HEADER *header)
     for(cur = InterlockedFlushSList(header); cur; cur = next)
     {
         next = cur->Next;
-        MSVCRT_free(cur);
+        free(cur);
     }
 }
 

dlls/msvcrt/data.c

@@ -375,7 +375,7 @@ int CDECL MSVCRT__get_osplatform(int *pValue)
 wchar_t *msvcrt_wstrdupa(const char *str)
 {
   const unsigned int len = strlen(str) + 1 ;
-  wchar_t *wstr = MSVCRT_malloc(len* sizeof (wchar_t));
+  wchar_t *wstr = malloc(len* sizeof (wchar_t));
   if (!wstr)
     return NULL;
    MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED,str,len,wstr,len);
@@ -569,7 +569,7 @@ int CDECL __wgetmainargs(int *argc, wchar_t** *wargv, wchar_t** *wenvp,
     *wargv = MSVCRT___wargv;
     *wenvp = MSVCRT___winitenv;
     if (new_mode)
-        MSVCRT__set_new_mode( *new_mode );
+        _set_new_mode( *new_mode );
     return 0;
 }
 
@@ -604,7 +604,7 @@ int CDECL __getmainargs(int *argc, char** *argv, char** *envp,
     *envp = MSVCRT___initenv;
 
     if (new_mode)
-        MSVCRT__set_new_mode( *new_mode );
+        _set_new_mode( *new_mode );
     return 0;
 }
 

dlls/msvcrt/dir.c

@@ -771,7 +771,7 @@ char* CDECL MSVCRT__getcwd(char * buf, int size)
   if (!buf)
   {
       if (size <= dir_len) size = dir_len + 1;
-      if (!(buf = MSVCRT_malloc( size ))) return NULL;
+      if (!(buf = malloc( size ))) return NULL;
   }
   else if (dir_len >= size)
   {
@@ -798,7 +798,7 @@ wchar_t* CDECL MSVCRT__wgetcwd(wchar_t * buf, int size)
   if (!buf)
   {
       if (size <= dir_len) size = dir_len + 1;
-      if (!(buf = MSVCRT_malloc( size * sizeof(WCHAR) ))) return NULL;
+      if (!(buf = malloc( size * sizeof(WCHAR) ))) return NULL;
   }
   if (dir_len >= size)
   {
@@ -1244,7 +1244,7 @@ wchar_t * CDECL MSVCRT__wfullpath(wchar_t * absPath, const wchar_t* relPath, siz
 
   if (absPath == NULL)
   {
-      buffer = MSVCRT_malloc(MAX_PATH * sizeof(WCHAR));
+      buffer = malloc(MAX_PATH * sizeof(WCHAR));
       size = MAX_PATH;
       alloced = TRUE;
   }
@@ -1266,7 +1266,7 @@ wchar_t * CDECL MSVCRT__wfullpath(wchar_t * absPath, const wchar_t* relPath, siz
   else
   {
       if (alloced)
-          MSVCRT_free(buffer);
+          free(buffer);
         return NULL;
   }
 }
@@ -1298,7 +1298,7 @@ char * CDECL MSVCRT__fullpath(char * absPath, const char* relPath, unsigned int
 
   if (absPath == NULL)
   {
-      buffer = MSVCRT_malloc(MAX_PATH);
+      buffer = malloc(MAX_PATH);
       size = MAX_PATH;
       alloced = TRUE;
   }
@@ -1320,7 +1320,7 @@ char * CDECL MSVCRT__fullpath(char * absPath, const char* relPath, unsigned int
   else
   {
       if (alloced)
-          MSVCRT_free(buffer);
+          free(buffer);
         return NULL;
   }
 }

dlls/msvcrt/environ.c

@@ -222,7 +222,7 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname
     if (!(e = MSVCRT_getenv(varname))) return *_errno() = EINVAL;
 
     sz = strlen(e) + 1;
-    if (!(*buffer = MSVCRT_malloc(sz)))
+    if (!(*buffer = malloc(sz)))
     {
         if (numberOfElements) *numberOfElements = 0;
         return *_errno() = ENOMEM;
@@ -247,7 +247,7 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements,
     if (!(e = MSVCRT__wgetenv(varname))) return *_errno() = EINVAL;
 
     sz = MSVCRT_wcslen(e) + 1;
-    if (!(*buffer = MSVCRT_malloc(sz * sizeof(wchar_t))))
+    if (!(*buffer = malloc(sz * sizeof(wchar_t))))
     {
         if (numberOfElements) *numberOfElements = 0;
         return *_errno() = ENOMEM;

dlls/msvcrt/errno.c

@@ -274,7 +274,7 @@ char* CDECL strerror(int err)
     thread_data_t *data = msvcrt_get_thread_data();
 
     if (!data->strerror_buffer)
-        if (!(data->strerror_buffer = MSVCRT_malloc(256))) return NULL;
+        if (!(data->strerror_buffer = malloc(256))) return NULL;
 
     if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr;
     strcpy( data->strerror_buffer, MSVCRT__sys_errlist[err] );
@@ -317,7 +317,7 @@ char* CDECL _strerror(const char* str)
     int err;
 
     if (!data->strerror_buffer)
-        if (!(data->strerror_buffer = MSVCRT_malloc(256))) return NULL;
+        if (!(data->strerror_buffer = malloc(256))) return NULL;
 
     err = data->thread_errno;
     if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr;
@@ -360,16 +360,16 @@ void CDECL _wperror(const wchar_t* str)
         size = MSVCRT_wcstombs(NULL, str, 0);
         if (size == -1) return;
         size++;
-        buffer = MSVCRT_malloc(size);
+        buffer = malloc(size);
         if (!buffer) return;
         if (MSVCRT_wcstombs(buffer, str, size) == -1)
         {
-            MSVCRT_free(buffer);
+            free(buffer);
             return;
         }
     }
     perror(buffer);
-    MSVCRT_free(buffer);
+    free(buffer);
 }
 
 /*********************************************************************
@@ -393,7 +393,7 @@ wchar_t* CDECL _wcserror(int err)
     thread_data_t *data = msvcrt_get_thread_data();
 
     if (!data->wcserror_buffer)
-        if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(wchar_t)))) return NULL;
+        if (!(data->wcserror_buffer = malloc(256 * sizeof(wchar_t)))) return NULL;
     _wcserror_s(data->wcserror_buffer, 256, err);
     return data->wcserror_buffer;
 }
@@ -438,7 +438,7 @@ wchar_t* CDECL __wcserror(const wchar_t* str)
     int err;
 
     if (!data->wcserror_buffer)
-        if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(wchar_t)))) return NULL;
+        if (!(data->wcserror_buffer = malloc(256 * sizeof(wchar_t)))) return NULL;
 
     err = __wcserror_s(data->wcserror_buffer, 256, str);
     if (err) FIXME("bad wcserror call (%d)\n", err);

dlls/msvcrt/except.c

@@ -502,7 +502,7 @@ void CDECL MSVCRT___std_exception_destroy(struct __std_exception_data *data)
     TRACE("(%p)\n", data);
 
     if(data->dofree)
-        MSVCRT_free(data->what);
+        free(data->what);
     data->what   = NULL;
     data->dofree = 0;
 }

dlls/msvcrt/exit.c

@@ -72,7 +72,7 @@ static int register_onexit_function(_onexit_table_t *table, _onexit_t func)
     EnterCriticalSection(&MSVCRT_onexit_cs);
     if (!table->_first)
     {
-        table->_first = MSVCRT_calloc(32, sizeof(void *));
+        table->_first = calloc(32, sizeof(void *));
         if (!table->_first)
         {
             WARN("failed to allocate initial table.\n");
@@ -87,7 +87,7 @@ static int register_onexit_function(_onexit_table_t *table, _onexit_t func)
     if (table->_last == table->_end)
     {
         int len = table->_end - table->_first;
-        _PVFV *tmp = MSVCRT_realloc(table->_first, 2 * len * sizeof(void *));
+        _PVFV *tmp = realloc(table->_first, 2 * len * sizeof(void *));
         if (!tmp)
         {
             WARN("failed to grow table.\n");
@@ -132,7 +132,7 @@ static int execute_onexit_table(_onexit_table_t *table)
            (*func)();
     }
 
-    MSVCRT_free(copy._first);
+    free(copy._first);
     return 0;
 }
 
@@ -166,7 +166,7 @@ _onexit_t CDECL __dllonexit(_onexit_t func, _onexit_t **start, _onexit_t **end)
   if (++len <= 0)
     return NULL;
 
-  tmp = MSVCRT_realloc(*start, len * sizeof(*tmp));
+  tmp = realloc(*start, len * sizeof(*tmp));
   if (!tmp)
     return NULL;
   *start = tmp;

dlls/msvcrt/file.c

@@ -281,7 +281,7 @@ static inline BOOL alloc_pioinfo_block(int fd)
         return FALSE;
     }
 
-    block = MSVCRT_calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(ioinfo));
+    block = calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(ioinfo));
     if(!block)
     {
         WARN(":out of memory!\n");
@@ -291,7 +291,7 @@ static inline BOOL alloc_pioinfo_block(int fd)
     for(i=0; i<MSVCRT_FD_BLOCK_SIZE; i++)
         block[i].handle = INVALID_HANDLE_VALUE;
     if(InterlockedCompareExchangePointer((void**)&MSVCRT___pioinfo[fd/MSVCRT_FD_BLOCK_SIZE], block, NULL))
-        MSVCRT_free(block);
+        free(block);
     return TRUE;
 }
 
@@ -360,7 +360,7 @@ static inline MSVCRT_FILE* msvcrt_get_file(int i)
 
     ret = MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE];
     if(!ret) {
-        MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE] = MSVCRT_calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(file_crit));
+        MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE] = calloc(MSVCRT_FD_BLOCK_SIZE, sizeof(file_crit));
         if(!MSVCRT_fstream[i/MSVCRT_FD_BLOCK_SIZE]) {
             ERR("out of memory\n");
             *_errno() = ENOMEM;
@@ -509,7 +509,7 @@ unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block)
   last_fd++;
 
   *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * last_fd;
-  *block = MSVCRT_calloc(1, *size);
+  *block = calloc(1, *size);
   if (!*block)
   {
     *size = 0;
@@ -686,7 +686,7 @@ static BOOL msvcrt_alloc_buffer(MSVCRT_FILE* file)
             && MSVCRT__isatty(file->_file))
         return FALSE;
 
-    file->_base = MSVCRT_calloc(1, MSVCRT_INTERNAL_BUFSIZ);
+    file->_base = calloc(1, MSVCRT_INTERNAL_BUFSIZ);
     if(file->_base) {
         file->_bufsiz = MSVCRT_INTERNAL_BUFSIZ;
         file->_flag |= MSVCRT__IOMYBUF;
@@ -1232,7 +1232,7 @@ void msvcrt_free_io(void)
             if(MSVCRT___pioinfo[i][j].exflag & EF_CRIT_INIT)
                 DeleteCriticalSection(&MSVCRT___pioinfo[i][j].crit);
         }
-        MSVCRT_free(MSVCRT___pioinfo[i]);
+        free(MSVCRT___pioinfo[i]);
     }
 
     for(j=0; j<MSVCRT_stream_idx; j++)
@@ -1246,7 +1246,7 @@ void msvcrt_free_io(void)
     }
 
     for(i=0; i<ARRAY_SIZE(MSVCRT_fstream); i++)
-        MSVCRT_free(MSVCRT_fstream[i]);
+        free(MSVCRT_fstream[i]);
 }
 
 /*********************************************************************
@@ -1651,7 +1651,7 @@ MSVCRT_FILE* CDECL MSVCRT__fdopen(int fd, const char *mode)
 
     ret = MSVCRT__wfdopen(fd, modeW);
 
-    MSVCRT_free(modeW);
+    free(modeW);
     return ret;
 }
 
@@ -2400,7 +2400,7 @@ int CDECL MSVCRT__sopen_dispatch( const char *path, int oflags, int shflags,
         return EINVAL;
 
     ret = MSVCRT__wsopen_dispatch(pathW, oflags, shflags, pmode, fd, secure);
-    MSVCRT_free(pathW);
+    free(pathW);
     return ret;
 }
 
@@ -2576,7 +2576,7 @@ static int read_utf8(ioinfo *fdinfo, wchar_t *buf, unsigned int count)
     /* read bytes have to fit to output and lookahead buffers */
     count /= 2;
     readbuf_size = count < 4 ? 4 : count;
-    if(readbuf_size<=4 || !(readbuf = MSVCRT_malloc(readbuf_size))) {
+    if(readbuf_size<=4 || !(readbuf = malloc(readbuf_size))) {
         readbuf_size = 4;
         readbuf = min_buf;
     }
@@ -2659,16 +2659,16 @@ static int read_utf8(ioinfo *fdinfo, wchar_t *buf, unsigned int count)
             num_read = 0;
         }else if(GetLastError() == ERROR_BROKEN_PIPE) {
             fdinfo->wxflag |= WX_ATEOF;
-            if (readbuf != min_buf) MSVCRT_free(readbuf);
+            if (readbuf != min_buf) free(readbuf);
             return 0;
         }else {
             msvcrt_set_errno(GetLastError());
-            if (readbuf != min_buf) MSVCRT_free(readbuf);
+            if (readbuf != min_buf) free(readbuf);
             return -1;
         }
     }else if(!pos && !num_read) {
         fdinfo->wxflag |= WX_ATEOF;
-        if (readbuf != min_buf) MSVCRT_free(readbuf);
+        if (readbuf != min_buf) free(readbuf);
         return 0;
     }
 
@@ -2727,11 +2727,11 @@ static int read_utf8(ioinfo *fdinfo, wchar_t *buf, unsigned int count)
 
     if(!(num_read = MultiByteToWideChar(CP_UTF8, 0, readbuf, pos, buf, count))) {
         msvcrt_set_errno(GetLastError());
-        if (readbuf != min_buf) MSVCRT_free(readbuf);
+        if (readbuf != min_buf) free(readbuf);
         return -1;
     }
 
-    if (readbuf != min_buf) MSVCRT_free(readbuf);
+    if (readbuf != min_buf) free(readbuf);
     return num_read*2;
 }
 
@@ -3649,13 +3649,13 @@ int CDECL MSVCRT__fclose_nolock(MSVCRT_FILE* file)
   }
 
   flag = file->_flag;
-  MSVCRT_free(file->_tmpfname);
+  free(file->_tmpfname);
   file->_tmpfname = NULL;
   /* flush stdio buffers */
   if(file->_flag & MSVCRT__IOWRT)
       MSVCRT__fflush_nolock(file);
   if(file->_flag & MSVCRT__IOMYBUF)
-      MSVCRT_free(file->_base);
+      free(file->_base);
 
   r=MSVCRT__close(file->_file);
   file->_flag = 0;
@@ -4163,7 +4163,7 @@ MSVCRT_FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share
     }
     if (mode && !(modeW = msvcrt_wstrdupa(mode)))
     {
-        MSVCRT_free(pathW);
+        free(pathW);
         _invalid_parameter(NULL, NULL, NULL, 0, 0);
         *_errno() = EINVAL;
         return NULL;
@@ -4171,8 +4171,8 @@ MSVCRT_FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share
 
     ret = MSVCRT__wfsopen(pathW, modeW, share);
 
-    MSVCRT_free(pathW);
-    MSVCRT_free(modeW);
+    free(pathW);
+    free(modeW);
     return ret;
 }
 
@@ -4503,14 +4503,14 @@ MSVCRT_FILE* CDECL MSVCRT_freopen(const char *path, const char *mode, MSVCRT_FIL
     if (path && !(pathW = msvcrt_wstrdupa(path))) return NULL;
     if (mode && !(modeW = msvcrt_wstrdupa(mode)))
     {
-        MSVCRT_free(pathW);
+        free(pathW);
         return NULL;
     }
 
     ret = MSVCRT__wfreopen(pathW, modeW, file);
 
-    MSVCRT_free(pathW);
-    MSVCRT_free(modeW);
+    free(pathW);
+    free(modeW);
     return ret;
 }
 
@@ -4902,7 +4902,7 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, size_t size)
 
     MSVCRT__fflush_nolock(file);
     if(file->_flag & MSVCRT__IOMYBUF)
-        MSVCRT_free(file->_base);
+        free(file->_base);
     file->_flag &= ~(MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF);
     file->_cnt = 0;
 
@@ -4915,7 +4915,7 @@ int CDECL MSVCRT_setvbuf(MSVCRT_FILE* file, char *buf, int mode, size_t size)
         file->_flag |= MSVCRT__USERBUF;
         file->_bufsiz = size;
     }else {
-        file->_base = file->_ptr = MSVCRT_malloc(size);
+        file->_base = file->_ptr = malloc(size);
         if(!file->_base) {
             file->_bufsiz = 0;
             MSVCRT__unlock_file(file);
@@ -5000,7 +5000,7 @@ char * CDECL MSVCRT_tmpnam(char *s)
     thread_data_t *data = msvcrt_get_thread_data();
 
     if(!data->tmpnam_buffer)
-      data->tmpnam_buffer = MSVCRT_malloc(MAX_PATH);
+      data->tmpnam_buffer = malloc(MAX_PATH);
 
     s = data->tmpnam_buffer;
   }
@@ -5074,7 +5074,7 @@ wchar_t * CDECL MSVCRT__wtmpnam(wchar_t *s)
         thread_data_t *data = msvcrt_get_thread_data();
 
         if(!data->wtmpnam_buffer)
-            data->wtmpnam_buffer = MSVCRT_malloc(sizeof(wchar_t[MAX_PATH]));
+            data->wtmpnam_buffer = malloc(sizeof(wchar_t[MAX_PATH]));
 
         s = data->wtmpnam_buffer;
     }
@@ -5106,7 +5106,7 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void)
 
   if(fd != -1 && !file)
       MSVCRT__close(fd);
-  MSVCRT_free(filename);
+  free(filename);
   UNLOCK_FILES();
   return file;
 }

dlls/msvcrt/heap.c

@@ -139,7 +139,7 @@ int CDECL _callnewh(size_t size)
 /*********************************************************************
  *		??2@YAPAXI@Z (MSVCRT.@)
  */
-void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(size_t size)
+void* CDECL DECLSPEC_HOTPATCH operator_new(size_t size)
 {
   void *retval;
 
@@ -164,16 +164,16 @@ void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(size_t size)
 /*********************************************************************
  *		??2@YAPAXIHPBDH@Z (MSVCRT.@)
  */
-void* CDECL MSVCRT_operator_new_dbg(size_t size, int type, const char *file, int line)
+void* CDECL operator_new_dbg(size_t size, int type, const char *file, int line)
 {
-    return MSVCRT_operator_new( size );
+    return operator_new( size );
 }
 
 
 /*********************************************************************
  *		??3@YAXPAX@Z (MSVCRT.@)
  */
-void CDECL DECLSPEC_HOTPATCH MSVCRT_operator_delete(void *mem)
+void CDECL DECLSPEC_HOTPATCH operator_delete(void *mem)
 {
   TRACE("(%p)\n", mem);
   msvcrt_heap_free(mem);
@@ -183,7 +183,7 @@ void CDECL DECLSPEC_HOTPATCH MSVCRT_operator_delete(void *mem)
 /*********************************************************************
  *		?_query_new_handler@@YAP6AHI@ZXZ (MSVCRT.@)
  */
-MSVCRT_new_handler_func CDECL MSVCRT__query_new_handler(void)
+MSVCRT_new_handler_func CDECL _query_new_handler(void)
 {
   return MSVCRT_new_handler;
 }
@@ -192,7 +192,7 @@ MSVCRT_new_handler_func CDECL MSVCRT__query_new_handler(void)
 /*********************************************************************
  *		?_query_new_mode@@YAHXZ (MSVCRT.@)
  */
-int CDECL MSVCRT__query_new_mode(void)
+int CDECL _query_new_mode(void)
 {
   return MSVCRT_new_mode;
 }
@@ -200,7 +200,7 @@ int CDECL MSVCRT__query_new_mode(void)
 /*********************************************************************
  *		?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z (MSVCRT.@)
  */
-MSVCRT_new_handler_func CDECL MSVCRT__set_new_handler(MSVCRT_new_handler_func func)
+MSVCRT_new_handler_func CDECL _set_new_handler(MSVCRT_new_handler_func func)
 {
   MSVCRT_new_handler_func old_handler;
   LOCK_HEAP;
@@ -213,17 +213,17 @@ MSVCRT_new_handler_func CDECL MSVCRT__set_new_handler(MSVCRT_new_handler_func fu
 /*********************************************************************
  *		?set_new_handler@@YAP6AXXZP6AXXZ@Z (MSVCRT.@)
  */
-MSVCRT_new_handler_func CDECL MSVCRT_set_new_handler(void *func)
+MSVCRT_new_handler_func CDECL set_new_handler(void *func)
 {
   TRACE("(%p)\n",func);
-  MSVCRT__set_new_handler(NULL);
+  _set_new_handler(NULL);
   return NULL;
 }
 
 /*********************************************************************
  *		?_set_new_mode@@YAHH@Z (MSVCRT.@)
  */
-int CDECL MSVCRT__set_new_mode(int mode)
+int CDECL _set_new_mode(int mode)
 {
   if(!MSVCRT_CHECK_PMT(mode == 0 || mode == 1)) return -1;
   return InterlockedExchange(&MSVCRT_new_mode, mode);
@@ -382,7 +382,7 @@ size_t CDECL _aligned_msize(void *p, size_t alignment, size_t offset)
 /*********************************************************************
  *		calloc (MSVCRT.@)
  */
-void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(size_t count, size_t size)
+void* CDECL DECLSPEC_HOTPATCH calloc(size_t count, size_t size)
 {
   size_t bytes = count*size;
 
@@ -401,14 +401,14 @@ void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(size_t count, size_t size)
  */
 void* CDECL _calloc_base(size_t count, size_t size)
 {
-  return MSVCRT_calloc(count, size);
+  return calloc(count, size);
 }
 #endif
 
 /*********************************************************************
  *		free (MSVCRT.@)
  */
-void CDECL DECLSPEC_HOTPATCH MSVCRT_free(void* ptr)
+void CDECL DECLSPEC_HOTPATCH free(void* ptr)
 {
   msvcrt_heap_free(ptr);
 }
@@ -426,7 +426,7 @@ void CDECL _free_base(void* ptr)
 /*********************************************************************
  *                  malloc (MSVCRT.@)
  */
-void* CDECL MSVCRT_malloc(size_t size)
+void* CDECL malloc(size_t size)
 {
     void *ret;
 
@@ -448,18 +448,18 @@ void* CDECL MSVCRT_malloc(size_t size)
  */
 void* CDECL _malloc_base(size_t size)
 {
-  return MSVCRT_malloc(size);
+  return malloc(size);
 }
 #endif
 
 /*********************************************************************
  *		realloc (MSVCRT.@)
  */
-void* CDECL DECLSPEC_HOTPATCH MSVCRT_realloc(void* ptr, size_t size)
+void* CDECL DECLSPEC_HOTPATCH realloc(void* ptr, size_t size)
 {
-  if (!ptr) return MSVCRT_malloc(size);
+  if (!ptr) return malloc(size);
   if (size) return msvcrt_heap_realloc(0, ptr, size);
-  MSVCRT_free(ptr);
+  free(ptr);
   return NULL;
 }
 
@@ -469,7 +469,7 @@ void* CDECL DECLSPEC_HOTPATCH MSVCRT_realloc(void* ptr, size_t size)
  */
 void* CDECL _realloc_base(void* ptr, size_t size)
 {
-  return MSVCRT_realloc(ptr, size);
+  return realloc(ptr, size);
 }
 #endif
 
@@ -483,12 +483,12 @@ void* CDECL _recalloc(void *mem, size_t num, size_t size)
     void *ret;
 
     if(!mem)
-        return MSVCRT_calloc(num, size);
+        return calloc(num, size);
 
     size = num*size;
     old_size = _msize(mem);
 
-    ret = MSVCRT_realloc(mem, size);
+    ret = realloc(mem, size);
     if(!ret) {
         *_errno() = ENOMEM;
         return NULL;
@@ -549,7 +549,7 @@ void CDECL _aligned_free(void *memblock)
     if (memblock)
     {
         void **saved = SAVED_PTR(memblock);
-        MSVCRT_free(*saved);
+        free(*saved);
     }
 }
 
@@ -580,7 +580,7 @@ void * CDECL _aligned_offset_malloc(size_t size, size_t alignment, size_t offset
         alignment = sizeof(void *);
 
     /* allocate enough space for void pointer and alignment */
-    temp = MSVCRT_malloc(size + alignment + sizeof(void *));
+    temp = malloc(size + alignment + sizeof(void *));
 
     if (!temp)
         return NULL;
@@ -668,7 +668,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size,
     }
     old_size -= old_padding;
 
-    temp = MSVCRT_realloc(*saved, size + alignment + sizeof(void *));
+    temp = realloc(*saved, size + alignment + sizeof(void *));
 
     if (!temp)
         return NULL;
@@ -700,7 +700,7 @@ void * CDECL _aligned_offset_realloc(void *memblock, size_t size,
           temp                       saved memblock
 
    However, in the new block, actual data is still written as follows
-   (because it was copied by MSVCRT_realloc):
+   (because it was copied by realloc):
    +-------+---------------------+--------------------------------+-------+
    |  ...  | "old_padding" bytes |   ... "old_size" bytes ...     |  ...  |
    +-------+---------------------+--------------------------------+-------+
@@ -732,7 +732,7 @@ void * CDECL _aligned_realloc(void *memblock, size_t size, size_t alignment)
 /*********************************************************************
  *		memmove_s (MSVCRT.@)
  */
-int CDECL MSVCRT_memmove_s(void *dest, size_t numberOfElements, const void *src, size_t count)
+int CDECL memmove_s(void *dest, size_t numberOfElements, const void *src, size_t count)
 {
     TRACE("(%p %Iu %p %Iu)\n", dest, numberOfElements, src, count);
 
@@ -775,7 +775,7 @@ int CDECL wmemmove_s(wchar_t *dest, size_t numberOfElements,
 /*********************************************************************
  *		memcpy_s (MSVCRT.@)
  */
-int CDECL MSVCRT_memcpy_s(void *dest, size_t numberOfElements, const void *src, size_t count)
+int CDECL memcpy_s(void *dest, size_t numberOfElements, const void *src, size_t count)
 {
     TRACE("(%p %Iu %p %Iu)\n", dest, numberOfElements, src, count);
 
@@ -829,7 +829,7 @@ int CDECL wmemcpy_s(wchar_t *dest, size_t numberOfElements,
 /*********************************************************************
  *		strncpy_s (MSVCRT.@)
  */
-int CDECL MSVCRT_strncpy_s(char *dest, size_t numberOfElements,
+int CDECL strncpy_s(char *dest, size_t numberOfElements,
         const char *src, size_t count)
 {
     size_t i, end;

dlls/msvcrt/main.c

@@ -68,14 +68,14 @@ static inline void msvcrt_free_tls_mem(void)
 
   if (tls)
   {
-    MSVCRT_free(tls->efcvt_buffer);
-    MSVCRT_free(tls->asctime_buffer);
-    MSVCRT_free(tls->wasctime_buffer);
-    MSVCRT_free(tls->strerror_buffer);
-    MSVCRT_free(tls->wcserror_buffer);
-    MSVCRT_free(tls->time_buffer);
-    MSVCRT_free(tls->tmpnam_buffer);
-    MSVCRT_free(tls->wtmpnam_buffer);
+    free(tls->efcvt_buffer);
+    free(tls->asctime_buffer);
+    free(tls->wasctime_buffer);
+    free(tls->strerror_buffer);
+    free(tls->wcserror_buffer);
+    free(tls->time_buffer);
+    free(tls->tmpnam_buffer);
+    free(tls->wtmpnam_buffer);
     if(tls->locale_flags & LOCALE_FREE) {
         free_locinfo(tls->locinfo);
         free_mbcinfo(tls->mbcinfo);

dlls/msvcrt/math.c

@@ -2398,7 +2398,7 @@ char * CDECL MSVCRT__ecvt( double number, int ndigits, int *decpt, int *sign )
                                       * 4 for exponent and one for
                                       * terminating '\0' */
     if (!data->efcvt_buffer)
-        data->efcvt_buffer = MSVCRT_malloc( 80 ); /* ought to be enough */
+        data->efcvt_buffer = malloc( 80 ); /* ought to be enough */
 
     if( number < 0) {
         *sign = TRUE;
@@ -2461,7 +2461,7 @@ int CDECL MSVCRT__ecvt_s( char *buffer, size_t length, double number, int ndigit
     /* handle cases with zero ndigits or less */
     prec = ndigits;
     if( prec < 1) prec = 2;
-    result = MSVCRT_malloc(prec + 7);
+    result = malloc(prec + 7);
 
     if( number < 0) {
         *sign = TRUE;
@@ -2487,7 +2487,7 @@ int CDECL MSVCRT__ecvt_s( char *buffer, size_t length, double number, int ndigit
         result[ 0] = '\0';
     }
     memcpy( buffer, result, max(ndigits + 1, 1) );
-    MSVCRT_free( result );
+    free( result );
     return 0;
 }
 
@@ -2503,7 +2503,7 @@ char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign )
     char decimal_separator = get_locinfo()->lconv->decimal_point[0];
 
     if (!data->efcvt_buffer)
-        data->efcvt_buffer = MSVCRT_malloc( 80 ); /* ought to be enough */
+        data->efcvt_buffer = malloc( 80 ); /* ought to be enough */
 
     if (number < 0)
     {

dlls/msvcrt/mbcs.c

@@ -229,7 +229,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo)
     return old_mbcinfo;
   }
 
-  mbcinfo = MSVCRT_malloc(sizeof(threadmbcinfo));
+  mbcinfo = malloc(sizeof(threadmbcinfo));
   if(!mbcinfo)
     return NULL;
   mbcinfo->refcount = 1;
@@ -271,7 +271,7 @@ threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo)
   if (!GetCPInfo(newcp, &cpi))
   {
     WARN("Codepage %d not found\n", newcp);
-    MSVCRT_free(mbcinfo);
+    free(mbcinfo);
     return NULL;
   }
 
@@ -2241,7 +2241,7 @@ size_t CDECL _mbscspn(const unsigned char* str, const unsigned char* cmp)
 unsigned char* CDECL _mbsrev(unsigned char* str)
 {
     int i, len = _mbslen(str);
-    unsigned char *p, *temp=MSVCRT_malloc(len*2);
+    unsigned char *p, *temp=malloc(len*2);
 
     if(!temp)
         return str;
@@ -2277,7 +2277,7 @@ unsigned char* CDECL _mbsrev(unsigned char* str)
         }
     }
 
-    MSVCRT_free(temp);
+    free(temp);
 
     return str;
 }

dlls/msvcrt/msvcrt.h

@@ -212,10 +212,9 @@ extern unsigned int MSVCRT__commode;
 /* FIXME: This should be declared in new.h but it's not an extern "C" so
  * it would not be much use anyway. Even for Winelib applications.
  */
-int __cdecl MSVCRT__set_new_mode(int mode);
-
-void* __cdecl MSVCRT_operator_new(size_t);
-void __cdecl MSVCRT_operator_delete(void*);
+void* __cdecl operator_new(size_t);
+void __cdecl operator_delete(void*);
+int __cdecl _set_new_mode(int mode);
 
 typedef void* (__cdecl *malloc_func_t)(size_t);
 typedef void  (__cdecl *free_func_t)(void*);
@@ -756,11 +755,6 @@ typedef void (__cdecl *MSVCRT___sighandler_t)(int);
 
 #define MSVCRT__NLSCMPERROR ((unsigned int)0x7fffffff)
 
-void  __cdecl    MSVCRT_free(void*);
-void* __cdecl    MSVCRT_malloc(size_t);
-void* __cdecl    MSVCRT_calloc(size_t,size_t);
-void* __cdecl    MSVCRT_realloc(void*,size_t);
-
 int __cdecl      MSVCRT_atoi(const char *str);
 int __cdecl      MSVCRT_isalpha(int c);
 int __cdecl      MSVCRT_isdigit(int c);

dlls/msvcrt/msvcrt.spec

@@ -51,12 +51,12 @@
 @ cdecl -arch=arm ??1type_info@@UAA@XZ(ptr) type_info_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ cdecl -arch=arm ??4__non_rtti_object@std@@QAAAAV01@ABV01@@Z(ptr ptr) __non_rtti_object_opequals
 @ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr ptr) __non_rtti_object_opequals
 @ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr ptr) __non_rtti_object_opequals
@@ -93,18 +93,18 @@
 @ thiscall -arch=win32 ??_Gbad_cast@@UAEPAXI@Z(ptr long) bad_cast_scalar_dtor
 @ thiscall -arch=win32 ??_Gbad_typeid@@UAEPAXI@Z(ptr long) bad_typeid_scalar_dtor
 @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) exception_scalar_dtor
-@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ??_U@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??_U@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??_U@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??_U@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) operator_delete
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=arm ?before@type_info@@QBA_NABV1@@Z(ptr ptr) type_info_before
@@ -115,7 +115,7 @@
 @ cdecl -arch=arm ?raw_name@type_info@@QBAPBDXZ(ptr) type_info_raw_name
 @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) type_info_raw_name
 @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) type_info_raw_name
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
 @ cdecl ?terminate@@YAXXZ() terminate
@@ -1259,7 +1259,7 @@
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
 @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
 @ cdecl btowc(long)
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl -arch=!i386 ceilf(float) MSVCRT_ceilf
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -1301,7 +1301,7 @@
 @ cdecl fputwc(long ptr) MSVCRT_fputwc
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
 @ cdecl frexp(double ptr) MSVCRT_frexp
@@ -1360,7 +1360,7 @@
 @ cdecl -arch=!i386 logf(float) MSVCRT_logf
 @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen
 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc
@@ -1373,9 +1373,9 @@
 @ cdecl memchr(ptr long long) MSVCRT_memchr
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
-@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
+@ cdecl memcpy_s(ptr long ptr long)
 @ cdecl memmove(ptr ptr long)
-@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
+@ cdecl memmove_s(ptr long ptr long)
 @ cdecl memset(ptr long long)
 @ cdecl mktime(ptr) MSVCRT_mktime
 @ cdecl modf(double ptr) MSVCRT_modf
@@ -1395,7 +1395,7 @@
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
 @ cdecl rand_s(ptr) MSVCRT_rand_s
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind
@@ -1433,7 +1433,7 @@
 @ cdecl strncat_s(str long str long) MSVCRT_strncat_s
 @ cdecl strncmp(str str long) MSVCRT_strncmp
 @ cdecl strncpy(ptr str long) MSVCRT_strncpy
-@ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s
+@ cdecl strncpy_s(ptr long str long)
 @ cdecl strnlen(str long) MSVCRT_strnlen
 @ cdecl strpbrk(str str) MSVCRT_strpbrk
 @ cdecl strrchr(str long) MSVCRT_strrchr

dlls/msvcrt/process.c

@@ -153,11 +153,11 @@ static intptr_t msvcrt_spawn(int flags, const wchar_t* exe, wchar_t* cmdline,
                       create_flags, env, NULL, &si, &pi))
   {
     msvcrt_set_errno(GetLastError());
-    MSVCRT_free(si.lpReserved2);
+    free(si.lpReserved2);
     return -1;
   }
 
-  MSVCRT_free(si.lpReserved2);
+  free(si.lpReserved2);
   switch(flags)
   {
   case MSVCRT__P_WAIT:
@@ -205,7 +205,7 @@ static wchar_t* msvcrt_argvtos(const wchar_t* const* arg, wchar_t delim)
     a++;
   }
 
-  ret = MSVCRT_malloc((size + 1) * sizeof(wchar_t));
+  ret = malloc((size + 1) * sizeof(wchar_t));
   if (!ret)
     return NULL;
 
@@ -249,7 +249,7 @@ static wchar_t *msvcrt_argvtos_aw(const char * const *arg, wchar_t delim)
     a++;
   }
 
-  ret = MSVCRT_malloc((len + 1) * sizeof(wchar_t));
+  ret = malloc((len + 1) * sizeof(wchar_t));
   if (!ret)
     return NULL;
 
@@ -283,9 +283,9 @@ static wchar_t *msvcrt_valisttos(const wchar_t *arg0, __ms_va_list alist, wchar_
         {
             size = max( 256, size * 2 );
             size = max( size, pos + len + 1 );
-            if (!(new = MSVCRT_realloc( ret, size * sizeof(wchar_t) )))
+            if (!(new = realloc( ret, size * sizeof(wchar_t) )))
             {
-                MSVCRT_free( ret );
+                free( ret );
                 return NULL;
             }
             ret = new;
@@ -318,9 +318,9 @@ static wchar_t *msvcrt_valisttos_aw(const char *arg0, __ms_va_list alist, wchar_
         {
             size = max( 256, size * 2 );
             size = max( size, pos + len + 1 );
-            if (!(new = MSVCRT_realloc( ret, size * sizeof(wchar_t) )))
+            if (!(new = realloc( ret, size * sizeof(wchar_t) )))
             {
-                MSVCRT_free( ret );
+                free( ret );
                 return NULL;
             }
             ret = new;
@@ -398,7 +398,7 @@ intptr_t WINAPIV _wexecl(const wchar_t* name, const wchar_t* arg0, ...)
 
   ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, NULL, 0);
 
-  MSVCRT_free(args);
+  free(args);
   return ret;
 }
 
@@ -422,8 +422,8 @@ intptr_t WINAPIV _execl(const char* name, const char* arg0, ...)
 
   ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, NULL, 0);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
+  free(nameW);
+  free(args);
   return ret;
 }
 
@@ -451,8 +451,8 @@ intptr_t WINAPIV _wexecle(const wchar_t* name, const wchar_t* arg0, ...)
 
   ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, envs, 0);
 
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -480,9 +480,9 @@ intptr_t WINAPIV _execle(const char* name, const char* arg0, ...)
 
   ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, envs, 0);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(nameW);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -503,7 +503,7 @@ intptr_t WINAPIV _wexeclp(const wchar_t* name, const wchar_t* arg0, ...)
 
   ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, NULL, 1);
 
-  MSVCRT_free(args);
+  free(args);
   return ret;
 }
 
@@ -527,8 +527,8 @@ intptr_t WINAPIV _execlp(const char* name, const char* arg0, ...)
 
   ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, NULL, 1);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
+  free(nameW);
+  free(args);
   return ret;
 }
 
@@ -556,8 +556,8 @@ intptr_t WINAPIV _wexeclpe(const wchar_t* name, const wchar_t* arg0, ...)
 
   ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, envs, 1);
 
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -585,9 +585,9 @@ intptr_t WINAPIV _execlpe(const char* name, const char* arg0, ...)
 
   ret = msvcrt_spawn(MSVCRT__P_OVERLAY, nameW, args, envs, 1);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(nameW);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -692,7 +692,7 @@ intptr_t WINAPIV MSVCRT__wspawnl(int flags, const wchar_t* name, const wchar_t*
 
   ret = msvcrt_spawn(flags, name, args, NULL, 0);
 
-  MSVCRT_free(args);
+  free(args);
   return ret;
 }
 
@@ -716,8 +716,8 @@ intptr_t WINAPIV MSVCRT__spawnl(int flags, const char* name, const char* arg0, .
 
   ret = msvcrt_spawn(flags, nameW, args, NULL, 0);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
+  free(nameW);
+  free(args);
   return ret;
 }
 
@@ -745,8 +745,8 @@ intptr_t WINAPIV MSVCRT__wspawnle(int flags, const wchar_t* name, const wchar_t*
 
   ret = msvcrt_spawn(flags, name, args, envs, 0);
 
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -774,9 +774,9 @@ intptr_t WINAPIV MSVCRT__spawnle(int flags, const char* name, const char* arg0,
 
   ret = msvcrt_spawn(flags, nameW, args, envs, 0);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(nameW);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -797,7 +797,7 @@ intptr_t WINAPIV MSVCRT__wspawnlp(int flags, const wchar_t* name, const wchar_t*
 
   ret = msvcrt_spawn(flags, name, args, NULL, 1);
 
-  MSVCRT_free(args);
+  free(args);
   return ret;
 }
 
@@ -821,8 +821,8 @@ intptr_t WINAPIV MSVCRT__spawnlp(int flags, const char* name, const char* arg0,
 
   ret = msvcrt_spawn(flags, nameW, args, NULL, 1);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
+  free(nameW);
+  free(args);
   return ret;
 }
 
@@ -850,8 +850,8 @@ intptr_t WINAPIV MSVCRT__wspawnlpe(int flags, const wchar_t* name, const wchar_t
 
   ret = msvcrt_spawn(flags, name, args, envs, 1);
 
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -879,9 +879,9 @@ intptr_t WINAPIV MSVCRT__spawnlpe(int flags, const char* name, const char* arg0,
 
   ret = msvcrt_spawn(flags, nameW, args, envs, 1);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(nameW);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -904,9 +904,9 @@ intptr_t CDECL MSVCRT__spawnve(int flags, const char* name, const char* const* a
 
   ret = msvcrt_spawn(flags, nameW, args, envs, 0);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(nameW);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -926,8 +926,8 @@ intptr_t CDECL MSVCRT__wspawnve(int flags, const wchar_t* name, const wchar_t* c
 
   ret = msvcrt_spawn(flags, name, args, envs, 0);
 
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -971,9 +971,9 @@ intptr_t CDECL MSVCRT__spawnvpe(int flags, const char* name, const char* const*
 
   ret = msvcrt_spawn(flags, nameW, args, envs, 1);
 
-  MSVCRT_free(nameW);
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(nameW);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -993,8 +993,8 @@ intptr_t CDECL MSVCRT__wspawnvpe(int flags, const wchar_t* name, const wchar_t*
 
   ret = msvcrt_spawn(flags, name, args, envs, 1);
 
-  MSVCRT_free(args);
-  MSVCRT_free(envs);
+  free(args);
+  free(envs);
   return ret;
 }
 
@@ -1027,7 +1027,7 @@ static DWORD popen_handles_size;
 
 void msvcrt_free_popen_data(void)
 {
-    MSVCRT_free(popen_handles);
+    free(popen_handles);
 }
 
 /*********************************************************************
@@ -1087,7 +1087,7 @@ MSVCRT_FILE* CDECL MSVCRT__wpopen(const wchar_t* command, const wchar_t* mode)
   if (i==popen_handles_size)
   {
     i = (popen_handles_size ? popen_handles_size*2 : 8);
-    container = MSVCRT_realloc(popen_handles, i*sizeof(*container));
+    container = realloc(popen_handles, i*sizeof(*container));
     if (!container) goto error;
 
     popen_handles = container;

dlls/msvcrt/scheduler.c

@@ -184,7 +184,7 @@ static Context* get_current_context(void)
 
     ret = TlsGetValue(context_tls_index);
     if (!ret) {
-        ExternalContextBase *context = MSVCRT_operator_new(sizeof(ExternalContextBase));
+        ExternalContextBase *context = operator_new(sizeof(ExternalContextBase));
         ExternalContextBase_ctor(context);
         TlsSetValue(context_tls_index, context);
         ret = &context->context;
@@ -335,7 +335,7 @@ static void ExternalContextBase_dtor(ExternalContextBase *this)
     for(i=0; i<ARRAY_SIZE(this->allocator_cache); i++) {
         for(cur = this->allocator_cache[i]; cur; cur=next) {
             next = cur->free.next;
-            MSVCRT_operator_delete(cur);
+            operator_delete(cur);
         }
     }
 
@@ -345,7 +345,7 @@ static void ExternalContextBase_dtor(ExternalContextBase *this)
         for(scheduler_cur=this->scheduler.next; scheduler_cur; scheduler_cur=scheduler_next) {
             scheduler_next = scheduler_cur->next;
             call_Scheduler_Release(scheduler_cur->scheduler);
-            MSVCRT_operator_delete(scheduler_cur);
+            operator_delete(scheduler_cur);
         }
     }
 }
@@ -360,11 +360,11 @@ Context* __thiscall ExternalContextBase_vector_dtor(ExternalContextBase *this, u
 
         for(i=*ptr-1; i>=0; i--)
             ExternalContextBase_dtor(this+i);
-        MSVCRT_operator_delete(ptr);
+        operator_delete(ptr);
     } else {
         ExternalContextBase_dtor(this);
         if(flags & 1)
-            MSVCRT_operator_delete(this);
+            operator_delete(this);
     }
 
     return &this->context;
@@ -395,7 +395,7 @@ void * CDECL Concurrency_Alloc(size_t size)
         size = sizeof(*p);
 
     if (context->context.vtable != &ExternalContextBase_vtable) {
-        p = MSVCRT_operator_new(size);
+        p = operator_new(size);
         p->alloc.bucket = -1;
     }else {
         int i;
@@ -405,14 +405,14 @@ void * CDECL Concurrency_Alloc(size_t size)
             if (1 << (i+4) >= size) break;
 
         if(i==ARRAY_SIZE(context->allocator_cache)) {
-            p = MSVCRT_operator_new(size);
+            p = operator_new(size);
             p->alloc.bucket = -1;
         }else if (context->allocator_cache[i]) {
             p = context->allocator_cache[i];
             context->allocator_cache[i] = p->free.next;
             p->alloc.bucket = i;
         }else {
-            p = MSVCRT_operator_new(1 << (i+4));
+            p = operator_new(1 << (i+4));
             p->alloc.bucket = i;
         }
     }
@@ -432,7 +432,7 @@ void CDECL Concurrency_Free(void* mem)
     TRACE("(%p)\n", mem);
 
     if (context->context.vtable != &ExternalContextBase_vtable) {
-        MSVCRT_operator_delete(p);
+        operator_delete(p);
     }else {
         if(bucket >= 0 && bucket < ARRAY_SIZE(context->allocator_cache) &&
             (!context->allocator_cache[bucket] || context->allocator_cache[bucket]->free.depth < 20)) {
@@ -440,7 +440,7 @@ void CDECL Concurrency_Free(void* mem)
             p->free.depth = p->free.next ? p->free.next->free.depth+1 : 0;
             context->allocator_cache[bucket] = p;
         }else {
-            MSVCRT_operator_delete(p);
+            operator_delete(p);
         }
     }
 }
@@ -531,7 +531,7 @@ SchedulerPolicy* __thiscall SchedulerPolicy_ctor(SchedulerPolicy *this)
 {
     TRACE("(%p)\n", this);
 
-    this->policy_container = MSVCRT_operator_new(sizeof(*this->policy_container));
+    this->policy_container = operator_new(sizeof(*this->policy_container));
     /* TODO: default values can probably be affected by CurrentScheduler */
     this->policy_container->policies[SchedulerKind] = 0;
     this->policy_container->policies[MaxConcurrency] = -1;
@@ -608,7 +608,7 @@ DEFINE_THISCALL_WRAPPER(SchedulerPolicy_dtor, 4)
 void __thiscall SchedulerPolicy_dtor(SchedulerPolicy *this)
 {
     TRACE("(%p)\n", this);
-    MSVCRT_operator_delete(this->policy_container);
+    operator_delete(this->policy_container);
 }
 
 static void ThreadScheduler_dtor(ThreadScheduler *this)
@@ -620,7 +620,7 @@ static void ThreadScheduler_dtor(ThreadScheduler *this)
 
     for(i=0; i<this->shutdown_count; i++)
         SetEvent(this->shutdown_events[i]);
-    MSVCRT_operator_delete(this->shutdown_events);
+    operator_delete(this->shutdown_events);
 
     this->cs.DebugInfo->Spare[0] = 0;
     DeleteCriticalSection(&this->cs);
@@ -664,7 +664,7 @@ unsigned int __thiscall ThreadScheduler_Release(ThreadScheduler *this)
 
     if(!ret) {
         ThreadScheduler_dtor(this);
-        MSVCRT_operator_delete(this);
+        operator_delete(this);
     }
     return ret;
 }
@@ -680,10 +680,10 @@ void __thiscall ThreadScheduler_RegisterShutdownEvent(ThreadScheduler *this, HAN
     EnterCriticalSection(&this->cs);
 
     size = this->shutdown_size ? this->shutdown_size * 2 : 1;
-    shutdown_events = MSVCRT_operator_new(size * sizeof(*shutdown_events));
+    shutdown_events = operator_new(size * sizeof(*shutdown_events));
     memcpy(shutdown_events, this->shutdown_events,
             this->shutdown_count * sizeof(*shutdown_events));
-    MSVCRT_operator_delete(this->shutdown_events);
+    operator_delete(this->shutdown_events);
     this->shutdown_size = size;
     this->shutdown_events = shutdown_events;
     this->shutdown_events[this->shutdown_count++] = event;
@@ -707,7 +707,7 @@ void __thiscall ThreadScheduler_Attach(ThreadScheduler *this)
         throw_exception(EXCEPTION_IMPROPER_SCHEDULER_ATTACH, 0, NULL);
 
     if(context->scheduler.scheduler) {
-        struct scheduler_list *l = MSVCRT_operator_new(sizeof(*l));
+        struct scheduler_list *l = operator_new(sizeof(*l));
         *l = context->scheduler;
         context->scheduler.next = l;
     }
@@ -762,11 +762,11 @@ Scheduler* __thiscall ThreadScheduler_vector_dtor(ThreadScheduler *this, unsigne
 
         for(i=*ptr-1; i>=0; i--)
             ThreadScheduler_dtor(this+i);
-        MSVCRT_operator_delete(ptr);
+        operator_delete(ptr);
     } else {
         ThreadScheduler_dtor(this);
         if(flags & 1)
-            MSVCRT_operator_delete(this);
+            operator_delete(this);
     }
 
     return &this->scheduler;
@@ -805,7 +805,7 @@ Scheduler* __cdecl Scheduler_Create(const SchedulerPolicy *policy)
 
     TRACE("(%p)\n", policy);
 
-    ret = MSVCRT_operator_new(sizeof(*ret));
+    ret = operator_new(sizeof(*ret));
     return &ThreadScheduler_ctor(ret, policy)->scheduler;
 }
 
@@ -872,7 +872,7 @@ void __cdecl CurrentScheduler_Detach(void)
         struct scheduler_list *entry = context->scheduler.next;
         context->scheduler.scheduler = entry->scheduler;
         context->scheduler.next = entry->next;
-        MSVCRT_operator_delete(entry);
+        operator_delete(entry);
     }
 }
 
@@ -888,7 +888,7 @@ static void create_default_scheduler(void)
         if(!default_scheduler_policy.policy_container)
             SchedulerPolicy_ctor(&default_scheduler_policy);
 
-        scheduler = MSVCRT_operator_new(sizeof(*scheduler));
+        scheduler = operator_new(sizeof(*scheduler));
         ThreadScheduler_ctor(scheduler, &default_scheduler_policy);
         default_scheduler = scheduler;
     }
@@ -1158,7 +1158,7 @@ void msvcrt_free_scheduler(void)
         SchedulerPolicy_dtor(&default_scheduler_policy);
     if(default_scheduler) {
         ThreadScheduler_dtor(default_scheduler);
-        MSVCRT_operator_delete(default_scheduler);
+        operator_delete(default_scheduler);
     }
 }
 

dlls/msvcrt/string.c

@@ -43,7 +43,7 @@ char* CDECL MSVCRT__strdup(const char* str)
 {
     if(str)
     {
-      char * ret = MSVCRT_malloc(strlen(str)+1);
+      char * ret = malloc(strlen(str)+1);
       if (ret) strcpy( ret, str );
       return ret;
     }

dlls/msvcrt/thread.c

@@ -99,7 +99,7 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg)
 
     memcpy(&local_trampoline,arg,sizeof(local_trampoline));
     data->handle = local_trampoline.thread;
-    MSVCRT_free(arg);
+    free(arg);
 
     local_trampoline.start_address(local_trampoline.arglist);
     _endthread();
@@ -119,7 +119,7 @@ uintptr_t CDECL _beginthread(
 
   TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist);
 
-  trampoline = MSVCRT_malloc(sizeof(*trampoline));
+  trampoline = malloc(sizeof(*trampoline));
   if(!trampoline) {
       *_errno() = EAGAIN;
       return -1;
@@ -128,7 +128,7 @@ uintptr_t CDECL _beginthread(
   thread = CreateThread(NULL, stack_size, _beginthread_trampoline,
           trampoline, CREATE_SUSPENDED, NULL);
   if(!thread) {
-      MSVCRT_free(trampoline);
+      free(trampoline);
       *_errno() = EAGAIN;
       return -1;
   }
@@ -138,7 +138,7 @@ uintptr_t CDECL _beginthread(
   trampoline->arglist = arglist;
 
   if(ResumeThread(thread) == -1) {
-      MSVCRT_free(trampoline);
+      free(trampoline);
       *_errno() = EAGAIN;
       return -1;
   }

dlls/msvcrt/time.c

@@ -429,7 +429,7 @@ struct tm* CDECL MSVCRT__localtime64(const __time64_t* secs)
     thread_data_t *data = msvcrt_get_thread_data();
 
     if(!data->time_buffer)
-        data->time_buffer = MSVCRT_malloc(sizeof(struct tm));
+        data->time_buffer = malloc(sizeof(struct tm));
 
     if(_localtime64_s(data->time_buffer, secs))
         return NULL;
@@ -536,7 +536,7 @@ struct tm* CDECL MSVCRT__gmtime64(const __time64_t *secs)
     thread_data_t * const data = msvcrt_get_thread_data();
 
     if(!data->time_buffer)
-        data->time_buffer = MSVCRT_malloc(sizeof(struct tm));
+        data->time_buffer = malloc(sizeof(struct tm));
 
     if(MSVCRT__gmtime64_s(data->time_buffer, secs))
         return NULL;
@@ -1543,19 +1543,19 @@ static size_t strftime_helper(char *str, size_t max, const char *format,
     if (!MSVCRT_CHECK_PMT(format != NULL)) return 0;
 
     len = MSVCRT__mbstowcs_l( NULL, format, 0, loc ) + 1;
-    if (!len || !(fmt = MSVCRT_malloc( len*sizeof(wchar_t) ))) return 0;
+    if (!len || !(fmt = malloc( len*sizeof(wchar_t) ))) return 0;
     MSVCRT__mbstowcs_l(fmt, format, len, loc);
 
-    if ((s = MSVCRT_malloc( max*sizeof(wchar_t) )))
+    if ((s = malloc( max*sizeof(wchar_t) )))
     {
         len = strftime_impl( s, max, fmt, mstm, time_data, loc );
         if (len)
             len = MSVCRT__wcstombs_l( str, s, max, loc );
-        MSVCRT_free( s );
+        free( s );
     }
     else len = 0;
 
-    MSVCRT_free( fmt );
+    free( fmt );
     return len;
 #endif
 }
@@ -1600,18 +1600,18 @@ static size_t wcsftime_helper( wchar_t *str, size_t max,
     TRACE("%p %Iu %s %p %p %p\n", str, max, debugstr_w(format), mstm, time_data, loc);
 
     len = MSVCRT__wcstombs_l( NULL, format, 0, loc ) + 1;
-    if (!(fmt = MSVCRT_malloc( len ))) return 0;
+    if (!(fmt = malloc( len ))) return 0;
     MSVCRT__wcstombs_l(fmt, format, len, loc);
 
-    if ((s = MSVCRT_malloc( max*4 )))
+    if ((s = malloc( max*4 )))
     {
         if (!strftime_impl( s, max*4, fmt, mstm, time_data, loc )) s[0] = 0;
         len = MSVCRT__mbstowcs_l( str, s, max, loc );
-        MSVCRT_free( s );
+        free( s );
     }
     else len = 0;
 
-    MSVCRT_free( fmt );
+    free( fmt );
     return len;
 #else
     TRACE("%p %Iu %s %p %p %p\n", str, max, debugstr_w(format), mstm, time_data, loc);
@@ -1688,7 +1688,7 @@ char * CDECL MSVCRT_asctime(const struct tm *mstm)
 
     /* asctime returns date in format that always has exactly 26 characters */
     if (!data->asctime_buffer) {
-        data->asctime_buffer = MSVCRT_malloc(26);
+        data->asctime_buffer = malloc(26);
         if (!data->asctime_buffer) {
             *_errno() = ENOMEM;
             return NULL;
@@ -1729,7 +1729,7 @@ wchar_t * CDECL MSVCRT__wasctime(const struct tm *mstm)
     char buffer[26];
 
     if(!data->wasctime_buffer) {
-        data->wasctime_buffer = MSVCRT_malloc(26*sizeof(wchar_t));
+        data->wasctime_buffer = malloc(26*sizeof(wchar_t));
         if(!data->wasctime_buffer) {
             *_errno() = ENOMEM;
             return NULL;

dlls/msvcrt/wcs.c

@@ -79,7 +79,7 @@ wchar_t* CDECL MSVCRT__wcsdup( const wchar_t* str )
   if (str)
   {
     int size = (MSVCRT_wcslen(str) + 1) * sizeof(wchar_t);
-    ret = MSVCRT_malloc( size );
+    ret = malloc( size );
     if (ret) memcpy( ret, str, size );
   }
   return ret;

dlls/msvcrtd/msvcrtd.spec

@@ -29,12 +29,12 @@
 @ cdecl -arch=win64 ??1exception@@UEAA@XZ(ptr) exception_dtor
 @ thiscall -arch=i386 ??1type_info@@UAE@XZ(ptr) type_info_dtor
 @ cdecl -arch=win64 ??1type_info@@UEAA@XZ(ptr) type_info_dtor
-@ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) MSVCRT_operator_new
-@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) MSVCRT_operator_new_dbg
-@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) MSVCRT_operator_delete
-@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) MSVCRT_operator_delete
+@ cdecl -arch=win32 ??2@YAPAXI@Z(long) operator_new
+@ cdecl -arch=win64 ??2@YAPEAX_K@Z(long) operator_new
+@ cdecl -arch=win32 ??2@YAPAXIHPBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win64 ??2@YAPEAX_KHPEBDH@Z(long long str long) operator_new_dbg
+@ cdecl -arch=win32 ??3@YAXPAX@Z(ptr) operator_delete
+@ cdecl -arch=win64 ??3@YAXPEAX@Z(ptr) operator_delete
 @ thiscall -arch=i386 ??4__non_rtti_object@@QAEAAV0@ABV0@@Z(ptr ptr) __non_rtti_object_opequals
 @ cdecl -arch=win64 ??4__non_rtti_object@@QEAAAEAV0@AEBV0@@Z(ptr ptr) __non_rtti_object_opequals
 @ thiscall -arch=i386 ??4bad_cast@@QAEAAV0@ABV0@@Z(ptr ptr) bad_cast_opequals
@@ -59,12 +59,12 @@
 @ thiscall -arch=win32 ??_Gbad_cast@@UAEPAXI@Z(ptr long) bad_cast_scalar_dtor
 @ thiscall -arch=win32 ??_Gbad_typeid@@UAEPAXI@Z(ptr long) bad_typeid_scalar_dtor
 @ thiscall -arch=win32 ??_Gexception@@UAEPAXI@Z(ptr long) exception_scalar_dtor
-@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler
-@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
-@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
-@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) MSVCRT__set_new_handler
-@ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode
+@ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
+@ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
+@ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
+@ cdecl -arch=win32 ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z(ptr) _set_new_handler
+@ cdecl -arch=win64 ?_set_new_handler@@YAP6AH_K@ZP6AH0@Z@Z(ptr) _set_new_handler
+@ cdecl ?_set_new_mode@@YAHH@Z(long) _set_new_mode
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) type_info_before
@@ -73,7 +73,7 @@
 @ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ(ptr) type_info_name
 @ thiscall -arch=i386 ?raw_name@type_info@@QBEPBDXZ(ptr) type_info_raw_name
 @ cdecl -arch=win64 ?raw_name@type_info@@QEBAPEBDXZ(ptr) type_info_raw_name
-@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) MSVCRT_set_new_handler
+@ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) set_new_handler
 @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) set_terminate
 @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) set_unexpected
 @ cdecl ?terminate@@YAXXZ() terminate
@@ -226,7 +226,7 @@
 @ cdecl _c_exit() MSVCRT__c_exit
 @ cdecl _cabs(long) MSVCRT__cabs
 @ cdecl _callnewh(long)
-@ cdecl _calloc_dbg(long long) MSVCRT_calloc
+@ cdecl _calloc_dbg(long long) calloc
 @ cdecl _cexit() MSVCRT__cexit
 @ cdecl _cgets(ptr)
 @ cdecl _chdir(str) MSVCRT__chdir
@@ -298,7 +298,7 @@
 @ cdecl _fpreset()
 @ cdecl _fputchar(long) MSVCRT__fputchar
 @ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _free_dbg(ptr) MSVCRT_free
+@ cdecl _free_dbg(ptr) free
 @ cdecl _fsopen(str str long) MSVCRT__fsopen
 @ cdecl _fstat(long ptr) MSVCRT__fstat
 @ cdecl _fstati64(long ptr) MSVCRT__fstati64
@@ -392,7 +392,7 @@
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltow(long ptr long) ntdll._ltow
 @ cdecl _makepath(ptr str str str str) MSVCRT__makepath
-@ cdecl _malloc_dbg(long) MSVCRT_malloc
+@ cdecl _malloc_dbg(long) malloc
 @ cdecl _mbbtombc(long)
 @ cdecl _mbbtype(long long)
 # extern _mbcasemap
@@ -474,7 +474,7 @@
 @ cdecl _putws(wstr) MSVCRT__putws
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
-@ cdecl _realloc_dbg(ptr long) MSVCRT_realloc
+@ cdecl _realloc_dbg(ptr long) realloc
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -643,7 +643,7 @@
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
 @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl clearerr(ptr) MSVCRT_clearerr
 @ cdecl clock() MSVCRT_clock
@@ -673,7 +673,7 @@
 @ cdecl fputwc(long ptr) MSVCRT_fputwc
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl frexp(double ptr) MSVCRT_frexp
 @ varargs fscanf(ptr str) MSVCRT_fscanf
@@ -724,7 +724,7 @@
 @ cdecl log(double) MSVCRT_log
 @ cdecl log10(double) MSVCRT_log10
 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs
 @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc
@@ -746,7 +746,7 @@
 @ cdecl qsort(ptr long long ptr) MSVCRT_qsort
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
 @ cdecl rewind(ptr) MSVCRT_rewind

dlls/ucrtbase/ucrtbase.spec

@@ -1332,8 +1332,8 @@
 @ cdecl _o__set_errno(long) _set_errno
 @ cdecl _o__set_fmode(long) MSVCRT__set_fmode
 @ cdecl _o__set_invalid_parameter_handler(ptr) _set_invalid_parameter_handler
-@ cdecl _o__set_new_handler(ptr) MSVCRT_set_new_handler
-@ cdecl _o__set_new_mode(long) MSVCRT__set_new_mode
+@ cdecl _o__set_new_handler(ptr) set_new_handler
+@ cdecl _o__set_new_mode(long) _set_new_mode
 @ cdecl _o__set_thread_local_invalid_parameter_handler(ptr) _set_thread_local_invalid_parameter_handler
 @ cdecl _o__seterrormode(long) _seterrormode
 @ cdecl _o__setmbcp(long) _setmbcp
@@ -1583,7 +1583,7 @@
 @ cdecl _o_bsearch(ptr ptr long long ptr) MSVCRT_bsearch
 @ cdecl _o_bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
 @ cdecl _o_btowc(long) btowc
-@ cdecl _o_calloc(long long) MSVCRT_calloc
+@ cdecl _o_calloc(long long) calloc
 @ cdecl _o_cbrt(double) MSVCR120_cbrt
 @ cdecl _o_cbrtf(float) MSVCR120_cbrtf
 @ cdecl _o_ceil(double) MSVCRT_ceil
@@ -1631,7 +1631,7 @@
 @ cdecl _o_fputws(wstr ptr) MSVCRT_fputws
 @ cdecl _o_fread(ptr long long ptr) MSVCRT_fread
 @ cdecl _o_fread_s(ptr long long long ptr) MSVCRT_fread_s
-@ cdecl _o_free(ptr) MSVCRT_free
+@ cdecl _o_free(ptr) free
 @ cdecl _o_freopen(str str ptr) MSVCRT_freopen
 @ cdecl _o_freopen_s(ptr str str ptr) MSVCRT_freopen_s
 @ cdecl _o_frexp(double ptr) MSVCRT_frexp
@@ -1706,7 +1706,7 @@
 @ cdecl _o_lround(double) MSVCR120_lround
 @ cdecl _o_lroundf(float) MSVCR120_lroundf
 @ cdecl _o_lroundl(double) MSVCR120_lroundl
-@ cdecl _o_malloc(long) MSVCRT_malloc
+@ cdecl _o_malloc(long) malloc
 @ cdecl _o_mblen(ptr long) MSVCRT_mblen
 @ cdecl _o_mbrlen(ptr long ptr) MSVCRT_mbrlen
 @ stub _o_mbrtoc16
@@ -1717,7 +1717,7 @@
 @ cdecl _o_mbstowcs(ptr str long) MSVCRT_mbstowcs
 @ cdecl _o_mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s
 @ cdecl _o_mbtowc(ptr str long) MSVCRT_mbtowc
-@ cdecl _o_memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
+@ cdecl _o_memcpy_s(ptr long ptr long) memcpy_s
 @ cdecl _o_memset(ptr long long) memset
 @ cdecl _o_modf(double ptr) MSVCRT_modf
 @ cdecl -arch=!i386 _o_modff(float ptr) MSVCRT_modff
@@ -1745,7 +1745,7 @@
 @ cdecl _o_raise(long) MSVCRT_raise
 @ cdecl _o_rand() MSVCRT_rand
 @ cdecl _o_rand_s(ptr) MSVCRT_rand_s
-@ cdecl _o_realloc(ptr long) MSVCRT_realloc
+@ cdecl _o_realloc(ptr long) realloc
 @ cdecl _o_remainder(double double) MSVCR120_remainder
 @ cdecl _o_remainderf(float float) MSVCR120_remainderf
 @ cdecl _o_remainderl(double double) MSVCR120_remainderl
@@ -1785,7 +1785,7 @@
 @ cdecl _o_strerror_s(ptr long long) strerror_s
 @ cdecl _o_strftime(ptr long str ptr) MSVCRT_strftime
 @ cdecl _o_strncat_s(str long str long) MSVCRT_strncat_s
-@ cdecl _o_strncpy_s(ptr long str long) MSVCRT_strncpy_s
+@ cdecl _o_strncpy_s(ptr long str long) strncpy_s
 @ cdecl _o_strtod(str ptr) MSVCRT_strtod
 @ cdecl _o_strtof(str ptr) MSVCRT_strtof
 @ cdecl _o_strtok(str str) MSVCRT_strtok
@@ -1856,8 +1856,8 @@
 @ cdecl _putwch_nolock(long)
 @ cdecl _putws(wstr) MSVCRT__putws
 @ stub _query_app_type
-@ cdecl _query_new_handler() MSVCRT__query_new_handler
-@ cdecl _query_new_mode() MSVCRT__query_new_mode
+@ cdecl _query_new_handler()
+@ cdecl _query_new_mode()
 @ cdecl _read(long ptr long) MSVCRT__read
 @ cdecl _realloc_base(ptr long)
 @ cdecl _recalloc(ptr long long)
@@ -1888,8 +1888,8 @@
 @ cdecl _set_error_mode(long)
 @ cdecl _set_fmode(long) MSVCRT__set_fmode
 @ cdecl _set_invalid_parameter_handler(ptr)
-@ cdecl _set_new_handler(ptr) MSVCRT_set_new_handler
-@ cdecl _set_new_mode(long) MSVCRT__set_new_mode
+@ cdecl _set_new_handler(ptr) set_new_handler
+@ cdecl _set_new_mode(long)
 @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
 @ cdecl _set_purecall_handler(ptr)
 @ cdecl _set_se_translator(ptr)
@@ -2188,7 +2188,7 @@
 @ stub cacoshf
 @ stub cacoshl
 @ stub cacosl
-@ cdecl calloc(long long) MSVCRT_calloc
+@ cdecl calloc(long long)
 @ stub carg
 @ stub cargf
 @ stub cargl
@@ -2324,7 +2324,7 @@
 @ cdecl fputws(wstr ptr) MSVCRT_fputws
 @ cdecl fread(ptr long long ptr) MSVCRT_fread
 @ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
-@ cdecl free(ptr) MSVCRT_free
+@ cdecl free(ptr)
 @ cdecl freopen(str str ptr) MSVCRT_freopen
 @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
 @ cdecl frexp(double ptr) MSVCRT_frexp
@@ -2409,7 +2409,7 @@
 @ cdecl lround(double) MSVCR120_lround
 @ cdecl lroundf(float) MSVCR120_lroundf
 @ cdecl lroundl(double) MSVCR120_lroundl
-@ cdecl malloc(long) MSVCRT_malloc
+@ cdecl malloc(long)
 @ cdecl mblen(ptr long) MSVCRT_mblen
 @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen
 @ stub mbrtoc16
@@ -2423,9 +2423,9 @@
 @ cdecl memchr(ptr long long) MSVCRT_memchr
 @ cdecl memcmp(ptr ptr long)
 @ cdecl memcpy(ptr ptr long)
-@ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
+@ cdecl memcpy_s(ptr long ptr long)
 @ cdecl memmove(ptr ptr long)
-@ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
+@ cdecl memmove_s(ptr long ptr long) memmove_s
 @ cdecl memset(ptr long long)
 @ cdecl modf(double ptr) MSVCRT_modf
 @ cdecl -arch=!i386 modff(float ptr) MSVCRT_modff
@@ -2458,7 +2458,7 @@
 @ cdecl raise(long) MSVCRT_raise
 @ cdecl rand() MSVCRT_rand
 @ cdecl rand_s(ptr) MSVCRT_rand_s
-@ cdecl realloc(ptr long) MSVCRT_realloc
+@ cdecl realloc(ptr long)
 @ cdecl remainder(double double) MSVCR120_remainder
 @ cdecl remainderf(float float) MSVCR120_remainderf
 @ cdecl remainderl(double double) MSVCR120_remainderl
@@ -2510,7 +2510,7 @@
 @ cdecl strncat_s(str long str long) MSVCRT_strncat_s
 @ cdecl strncmp(str str long) MSVCRT_strncmp
 @ cdecl strncpy(ptr str long) MSVCRT_strncpy
-@ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s
+@ cdecl strncpy_s(ptr long str long)
 @ cdecl strnlen(str long) MSVCRT_strnlen
 @ cdecl strpbrk(str str) MSVCRT_strpbrk
 @ cdecl strrchr(str long) MSVCRT_strrchr