msvcrt: Remove MSVCRT_ prefix from misc.c functions.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Remove MSVCRT_ prefix from misc.c functions.
0364b768 · Piotr Caban · Alexandre Julliard · 065cf4e7 · 0364b768 · 0364b768
Commit 0364b768 authored Dec 02, 2020 by Piotr Caban Committed by Alexandre Julliard Dec 02, 2020
15 changed files
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -47,7 +47,7 @@
 @ extern _basemajor_dll CRTDLL__basemajor_dll
 @ extern _baseminor_dll CRTDLL__baseminor_dll
 @ extern _baseversion_dll MSVCRT__osver
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _c_exit()
 @ cdecl _cabs(long) MSVCRT__cabs
@@ -270,7 +270,7 @@
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
 @ varargs _sopen(str long long) MSVCRT__sopen
@@ -352,7 +352,7 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
+@ cdecl bsearch(ptr ptr long long ptr)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -447,9 +447,9 @@
 @ cdecl putc(long ptr) MSVCRT_putc
 @ cdecl putchar(long) MSVCRT_putchar
 @ cdecl puts(str) MSVCRT_puts
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
+@ cdecl qsort(ptr long long ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
+@ cdecl rand()
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -463,7 +463,7 @@
 @ cdecl sinh(double) MSVCRT_sinh
 @ varargs sprintf(ptr str) MSVCRT_sprintf
 @ cdecl sqrt(double) MSVCRT_sqrt
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ cdecl strcat(str str)
 @ cdecl strchr(str long)

--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -702,11 +702,11 @@
 @ cdecl _atol_l(str ptr) MSVCRT__atol_l
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
 @ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _byteswap_uint64(int64)
-@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong
+@ cdecl _byteswap_ulong(long)
 @ cdecl _byteswap_ushort(long)
 @ cdecl _c_exit()
 @ cdecl _cabs(long) MSVCRT__cabs
@@ -745,8 +745,8 @@
 @ cdecl _cputws(wstr)
 @ cdecl _creat(str long) MSVCRT__creat
 @ cdecl _create_locale(long str)
-@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook
-@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook
+@ cdecl -arch=i386 _crt_debugger_hook(long)
+@ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
 @ varargs _cscanf(str)
 @ varargs _cscanf_l(str ptr)
 @ varargs _cscanf_s(str)
@@ -880,7 +880,7 @@
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
 @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
-@ cdecl _get_output_format() MSVCRT__get_output_format
+@ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
 @ cdecl _get_purecall_handler()
@@ -1248,7 +1248,7 @@
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -1280,7 +1280,7 @@
 @ cdecl _set_fmode(long)
 @ cdecl _set_invalid_parameter_handler(ptr)
 @ stub _set_malloc_crt_max_wait
-@ cdecl _set_output_format(long) MSVCRT__set_output_format
+@ cdecl _set_output_format(long)
 @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
 @ cdecl _set_purecall_handler(ptr)
 @ cdecl _seterrormode(long)
@@ -1291,7 +1291,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c
 @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l
@@ -1640,8 +1640,8 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
+@ cdecl bsearch(ptr ptr long long ptr)
+@ cdecl bsearch_s(ptr ptr long long ptr ptr)
 @ cdecl btowc(long)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
@@ -1768,11 +1768,11 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
-@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s
+@ cdecl qsort(ptr long long ptr)
+@ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
-@ cdecl rand_s(ptr) MSVCRT_rand_s
+@ cdecl rand()
+@ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -1792,7 +1792,7 @@
 @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s
 @ cdecl sqrt(double) MSVCRT_sqrt
 @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ varargs sscanf_s(str str) MSVCRT_sscanf_s
 @ cdecl strcat(str str)

--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -918,10 +918,10 @@
 @ stub -arch=i386,win64 __crtFlsSetValue
 @ stub -arch=i386,win64 __crtGetDateFormatEx
 @ cdecl -arch=i386,win64 __crtGetLocaleInfoEx(wstr long ptr long)
-@ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode
+@ cdecl __crtGetShowWindowMode()
 @ stub -arch=i386,win64 __crtGetTimeFormatEx
 @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName
-@ cdecl -arch=i386,win64 __crtInitializeCriticalSectionEx(ptr long long) MSVCR110__crtInitializeCriticalSectionEx
+@ cdecl -arch=i386,win64 __crtInitializeCriticalSectionEx(ptr long long)
 @ stub __crtIsPackagedApp
 @ stub -arch=i386,win64 __crtIsValidLocaleName
 @ cdecl __crtLCMapStringA(long long str long ptr long long long)
@@ -930,7 +930,7 @@
 @ stub -arch=i386,win64 __crtSetThreadStackGuarantee
 @ cdecl __crtSetUnhandledExceptionFilter(ptr)
 @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess
-@ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException
+@ cdecl -arch=i386,win64 __crtUnhandledException(ptr)
 @ cdecl __daylight() MSVCRT___p__daylight
 @ cdecl __dllonexit(ptr ptr ptr)
 @ cdecl __doserrno()
@@ -1050,11 +1050,11 @@
 @ cdecl _atol_l(str ptr) MSVCRT__atol_l
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
 @ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _byteswap_uint64(int64)
-@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong
+@ cdecl _byteswap_ulong(long)
 @ cdecl _byteswap_ushort(long)
 @ cdecl _c_exit()
 @ cdecl _cabs(long) MSVCRT__cabs
@@ -1093,8 +1093,8 @@
 @ cdecl _cputws(wstr)
 @ cdecl _creat(str long) MSVCRT__creat
 @ cdecl _create_locale(long str)
-@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook
-@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook
+@ cdecl -arch=i386 _crt_debugger_hook(long)
+@ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
 @ varargs _cscanf(str)
 @ varargs _cscanf_l(str ptr)
 @ varargs _cscanf_s(str)
@@ -1227,7 +1227,7 @@
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
 @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
-@ cdecl _get_output_format() MSVCRT__get_output_format
+@ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
 @ cdecl _get_purecall_handler()
@@ -1605,7 +1605,7 @@
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -1637,7 +1637,7 @@
 @ cdecl _set_fmode(long)
 @ cdecl _set_invalid_parameter_handler(ptr)
 @ stub _set_malloc_crt_max_wait
-@ cdecl _set_output_format(long) MSVCRT__set_output_format
+@ cdecl _set_output_format(long)
 @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
 @ cdecl _set_purecall_handler(ptr)
 @ cdecl _seterrormode(long)
@@ -1648,7 +1648,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c
 @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l
@@ -1997,8 +1997,8 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
+@ cdecl bsearch(ptr ptr long long ptr)
+@ cdecl bsearch_s(ptr ptr long long ptr ptr)
 @ cdecl btowc(long)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
@@ -2126,11 +2126,11 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
-@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s
+@ cdecl qsort(ptr long long ptr)
+@ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
-@ cdecl rand_s(ptr) MSVCRT_rand_s
+@ cdecl rand()
+@ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -2150,7 +2150,7 @@
 @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s
 @ cdecl sqrt(double) MSVCRT_sqrt
 @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ varargs sscanf_s(str str) MSVCRT_sscanf_s
 @ cdecl strcat(str str)

--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -844,7 +844,7 @@
 @ stub -arch=i386 _NLG_Return
 @ stub -arch=i386 _NLG_Return2
 @ stub -arch=arm,win64 __NLG_Return2
-@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback
+@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr)
 @ stub -arch=win64 _SetImageBase
 @ stub -arch=win64 _SetThrowImageBase
 @ cdecl _Strftime(ptr long str ptr ptr)
@@ -905,11 +905,11 @@
 @ stub -arch=i386,win64 __crtGetDateFormatEx
 @ stub __crtGetFileInformationByHandleEx
 @ cdecl -arch=i386,win64 __crtGetLocaleInfoEx(wstr long ptr long)
-@ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode
+@ cdecl __crtGetShowWindowMode()
 @ stub __crtGetTickCount64
 @ stub -arch=i386,win64 __crtGetTimeFormatEx
 @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName
-@ cdecl -arch=i386,win64 __crtInitializeCriticalSectionEx(ptr long long) MSVCR110__crtInitializeCriticalSectionEx
+@ cdecl -arch=i386,win64 __crtInitializeCriticalSectionEx(ptr long long)
 @ stub __crtIsPackagedApp
 @ stub -arch=i386,win64 __crtIsValidLocaleName
 @ cdecl __crtLCMapStringA(long long str long ptr long long long)
@@ -919,8 +919,8 @@
 @ stub -arch=i386,win64 __crtSetThreadStackGuarantee
 @ cdecl __crtSetUnhandledExceptionFilter(ptr)
 @ cdecl -arch=i386,win64 __crtTerminateProcess(long) MSVCR110__crtTerminateProcess
-@ cdecl __crtSleep(long) MSVCRT__crtSleep
-@ cdecl -arch=i386,win64 __crtUnhandledException(ptr) MSVCRT__crtUnhandledException
+@ cdecl __crtSleep(long)
+@ cdecl -arch=i386,win64 __crtUnhandledException(ptr)
 @ cdecl __daylight() MSVCRT___p__daylight
 @ cdecl __dllonexit(ptr ptr ptr)
 @ cdecl __doserrno()
@@ -1041,11 +1041,11 @@
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
 @ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l
 @ cdecl -ret64 _atoll_l(str ptr) MSVCRT__atoll_l
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _byteswap_uint64(int64)
-@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong
+@ cdecl _byteswap_ulong(long)
 @ cdecl _byteswap_ushort(long)
 @ cdecl _c_exit()
 @ cdecl _cabs(long) MSVCRT__cabs
@@ -1084,8 +1084,8 @@
 @ cdecl _cputws(wstr)
 @ cdecl _creat(str long) MSVCRT__creat
 @ cdecl _create_locale(long str)
-@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook
-@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook
+@ cdecl -arch=i386 _crt_debugger_hook(long)
+@ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
 @ varargs _cscanf(str)
 @ varargs _cscanf_l(str ptr)
 @ varargs _cscanf_s(str)
@@ -1227,7 +1227,7 @@
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
 @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
-@ cdecl _get_output_format() MSVCRT__get_output_format
+@ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
 @ cdecl _get_purecall_handler()
@@ -1615,7 +1615,7 @@
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -1648,7 +1648,7 @@
 @ cdecl _set_fmode(long)
 @ cdecl _set_invalid_parameter_handler(ptr)
 @ stub _set_malloc_crt_max_wait
-@ cdecl _set_output_format(long) MSVCRT__set_output_format
+@ cdecl _set_output_format(long)
 @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
 @ cdecl _set_purecall_handler(ptr)
 @ cdecl _seterrormode(long)
@@ -1659,7 +1659,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c
 @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l
@@ -1795,7 +1795,7 @@
 @ cdecl _unlock_file(ptr) MSVCRT__unlock_file
 @ cdecl _utime32(str ptr)
 @ cdecl _utime64(str ptr)
-@ cdecl _vacopy(ptr ptr) MSVCR120__vacopy
+@ cdecl _vacopy(ptr ptr)
 @ cdecl _vcprintf(str ptr)
 @ stub _vcprintf_l
 @ stub _vcprintf_p
@@ -2033,8 +2033,8 @@
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
 @ cdecl -ret64 atoll(str) MSVCRT_atoll
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
+@ cdecl bsearch(ptr ptr long long ptr)
+@ cdecl bsearch_s(ptr ptr long long ptr ptr)
 @ cdecl btowc(long)
 @ stub cabs
 @ stub cabsf
@@ -2318,11 +2318,11 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
-@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s
+@ cdecl qsort(ptr long long ptr)
+@ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
-@ cdecl rand_s(ptr) MSVCRT_rand_s
+@ cdecl rand()
+@ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
 @ cdecl remainder(double double) MSVCR120_remainder
 @ cdecl remainderf(float float) MSVCR120_remainderf
@@ -2360,7 +2360,7 @@
 @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s
 @ cdecl sqrt(double) MSVCRT_sqrt
 @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ varargs sscanf_s(str str) MSVCRT_sscanf_s
 @ cdecl strcat(str str)

--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -237,7 +237,7 @@
 @ cdecl _atodbl(ptr str) MSVCRT__atodbl
 @ cdecl -ret64 _atoi64(str) MSVCRT__atoi64
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _c_exit()
@@ -500,7 +500,7 @@
 @ cdecl _putws(wstr) MSVCRT__putws
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -525,7 +525,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snscanf(str long str) MSVCRT__snscanf
 @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
@@ -693,7 +693,7 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
+@ cdecl bsearch(ptr ptr long long ptr)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -794,9 +794,9 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
+@ cdecl qsort(ptr long long ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
+@ cdecl rand()
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -810,7 +810,7 @@
 @ cdecl sinh(double) MSVCRT_sinh
 @ varargs sprintf(ptr str) MSVCRT_sprintf
 @ cdecl sqrt(double) MSVCRT_sqrt
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ cdecl strcat(str str)
 @ cdecl strchr(str long)

--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -232,7 +232,7 @@
 @ cdecl _atodbl(ptr str) MSVCRT__atodbl
 @ cdecl -ret64 _atoi64(str) ntdll._atoi64
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _c_exit()
@@ -495,7 +495,7 @@
 @ cdecl _putws(wstr) MSVCRT__putws
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -521,7 +521,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snscanf(str long str) MSVCRT__snscanf
 @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
@@ -689,7 +689,7 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
+@ cdecl bsearch(ptr ptr long long ptr)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -790,9 +790,9 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
+@ cdecl qsort(ptr long long ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
+@ cdecl rand()
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -806,7 +806,7 @@
 @ cdecl sinh(double) MSVCRT_sinh
 @ varargs sprintf(ptr str) MSVCRT_sprintf
 @ cdecl sqrt(double) MSVCRT_sqrt
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ cdecl strcat(str str)
 @ cdecl strchr(str long)

--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -366,11 +366,11 @@
 @ cdecl _atol_l(str ptr) MSVCRT__atol_l
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
 @ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _byteswap_uint64(int64)
-@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong
+@ cdecl _byteswap_ulong(long)
 @ cdecl _byteswap_ushort(long)
 @ cdecl _c_exit()
 @ cdecl _cabs(long) MSVCRT__cabs
@@ -409,8 +409,8 @@
 @ cdecl _cputws(wstr)
 @ cdecl _creat(str long) MSVCRT__creat
 @ cdecl _create_locale(long str)
-@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook
-@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook
+@ cdecl -arch=i386 _crt_debugger_hook(long)
+@ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
 @ varargs _cscanf(str)
 @ varargs _cscanf_l(str ptr)
 @ varargs _cscanf_s(str)
@@ -431,7 +431,7 @@
 @ varargs _cwscanf_s(wstr)
 @ varargs _cwscanf_s_l(wstr ptr)
 @ extern _daylight MSVCRT___daylight
-@ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer
+@ cdecl _decode_pointer(ptr)
 @ cdecl _difftime32(long long) MSVCRT__difftime32
 @ cdecl _difftime64(int64 int64) MSVCRT__difftime64
 @ stub _dosmaperr
@@ -441,7 +441,7 @@
 @ cdecl _dupenv_s(ptr ptr str)
 @ cdecl _ecvt(double long ptr ptr) MSVCRT__ecvt
 @ cdecl _ecvt_s(str long double long ptr ptr) MSVCRT__ecvt_s
-@ cdecl _encode_pointer(ptr) MSVCRT_encode_pointer
+@ cdecl _encode_pointer(ptr)
 @ cdecl _encoded_null()
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
@@ -549,7 +549,7 @@
 @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
 @ cdecl _get_osplatform(ptr)
 @ cdecl _get_osver(ptr)
-@ cdecl _get_output_format() MSVCRT__get_output_format
+@ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
 @ cdecl _get_purecall_handler()
@@ -922,7 +922,7 @@
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -959,7 +959,7 @@
 @ cdecl _set_fmode(long)
 @ cdecl _set_invalid_parameter_handler(ptr)
 @ stub _set_malloc_crt_max_wait
-@ cdecl _set_output_format(long) MSVCRT__set_output_format
+@ cdecl _set_output_format(long)
 @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
 @ cdecl _set_purecall_handler(ptr)
 @ cdecl _set_sbh_threshold(long)
@@ -971,7 +971,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c
 @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l
@@ -1323,8 +1323,8 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
+@ cdecl bsearch(ptr ptr long long ptr)
+@ cdecl bsearch_s(ptr ptr long long ptr ptr)
 @ cdecl btowc(long)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
@@ -1449,11 +1449,11 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
-@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s
+@ cdecl qsort(ptr long long ptr)
+@ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
-@ cdecl rand_s(ptr) MSVCRT_rand_s
+@ cdecl rand()
+@ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -1473,7 +1473,7 @@
 @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s
 @ cdecl sqrt(double) MSVCRT_sqrt
 @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ varargs sscanf_s(str str) MSVCRT_sscanf_s
 @ cdecl strcat(str str)

--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -350,11 +350,11 @@
 @ cdecl _atol_l(str ptr) MSVCRT__atol_l
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
 @ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _byteswap_uint64(int64)
-@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong
+@ cdecl _byteswap_ulong(long)
 @ cdecl _byteswap_ushort(long)
 @ cdecl _c_exit()
 @ cdecl _cabs(long) MSVCRT__cabs
@@ -392,8 +392,8 @@
 @ cdecl _cputws(wstr)
 @ cdecl _creat(str long) MSVCRT__creat
 @ cdecl _create_locale(long str)
-@ cdecl -arch=i386 _crt_debugger_hook(long) MSVCRT__crt_debugger_hook
-@ cdecl -arch=arm,win64 __crt_debugger_hook(long) MSVCRT__crt_debugger_hook
+@ cdecl -arch=i386 _crt_debugger_hook(long)
+@ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
 @ varargs _cscanf(str)
 @ varargs _cscanf_l(str ptr)
 @ varargs _cscanf_s(str)
@@ -414,7 +414,7 @@
 @ varargs _cwscanf_s(wstr)
 @ varargs _cwscanf_s_l(wstr ptr)
 @ extern _daylight MSVCRT___daylight
-@ cdecl _decode_pointer(ptr) MSVCRT_decode_pointer
+@ cdecl _decode_pointer(ptr)
 @ cdecl _difftime32(long long) MSVCRT__difftime32
 @ cdecl _difftime64(int64 int64) MSVCRT__difftime64
 @ stub _dosmaperr
@@ -424,7 +424,7 @@
 @ cdecl _dupenv_s(ptr ptr str)
 @ cdecl _ecvt(double long ptr ptr) MSVCRT__ecvt
 @ cdecl _ecvt_s(str long double long ptr ptr) MSVCRT__ecvt_s
-@ cdecl _encode_pointer(ptr) MSVCRT_encode_pointer
+@ cdecl _encode_pointer(ptr)
 @ cdecl _encoded_null()
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
@@ -530,7 +530,7 @@
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
 @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
-@ cdecl _get_output_format() MSVCRT__get_output_format
+@ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
 @ cdecl _get_purecall_handler()
@@ -898,7 +898,7 @@
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -935,7 +935,7 @@
 @ cdecl _set_fmode(long)
 @ cdecl _set_invalid_parameter_handler(ptr)
 @ stub _set_malloc_crt_max_wait
-@ cdecl _set_output_format(long) MSVCRT__set_output_format
+@ cdecl _set_output_format(long)
 @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
 @ cdecl _set_purecall_handler(ptr)
 @ cdecl _set_sbh_threshold(long)
@@ -946,7 +946,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c
 @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l
@@ -1295,8 +1295,8 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
+@ cdecl bsearch(ptr ptr long long ptr)
+@ cdecl bsearch_s(ptr ptr long long ptr ptr)
 @ cdecl btowc(long)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
@@ -1421,11 +1421,11 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
-@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s
+@ cdecl qsort(ptr long long ptr)
+@ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
-@ cdecl rand_s(ptr) MSVCRT_rand_s
+@ cdecl rand()
+@ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -1445,7 +1445,7 @@
 @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s
 @ cdecl sqrt(double) MSVCRT_sqrt
 @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ varargs sscanf_s(str str) MSVCRT_sscanf_s
 @ cdecl strcat(str str)

--- a/dlls/msvcrt/misc.c
+++ b/dlls/msvcrt/misc.c
@@ -34,7 +34,7 @@ static unsigned int output_format;
 /*********************************************************************
 *		_beep (MSVCRT.@)
 */
-void CDECL MSVCRT__beep( unsigned int freq, unsigned int duration)
+void CDECL _beep( unsigned int freq, unsigned int duration)
 {
    TRACE(":Freq %d, Duration %d\n",freq,duration);
    Beep(freq, duration);
@@ -43,7 +43,7 @@ void CDECL MSVCRT__beep( unsigned int freq, unsigned int duration)
 /*********************************************************************
 *		srand (MSVCRT.@)
 */
-void CDECL MSVCRT_srand( unsigned int seed )
+void CDECL srand( unsigned int seed )
 {
    thread_data_t *data = msvcrt_get_thread_data();
    data->random_seed = seed;
@@ -52,7 +52,7 @@ void CDECL MSVCRT_srand( unsigned int seed )
 /*********************************************************************
 *		rand (MSVCRT.@)
 */
-int CDECL MSVCRT_rand(void)
+int CDECL rand(void)
 {
    thread_data_t *data = msvcrt_get_thread_data();

@@ -65,7 +65,7 @@ int CDECL MSVCRT_rand(void)
 /*********************************************************************
 *		rand_s (MSVCRT.@)
 */
-int CDECL MSVCRT_rand_s(unsigned int *pval)
+int CDECL rand_s(unsigned int *pval)
 {
    if (!pval || !RtlGenRandom(pval, sizeof(*pval)))
    {
@@ -78,7 +78,7 @@ int CDECL MSVCRT_rand_s(unsigned int *pval)
 /*********************************************************************
 *		_sleep (MSVCRT.@)
 */
-void CDECL MSVCRT__sleep(__msvcrt_ulong timeout)
+void CDECL _sleep(__msvcrt_ulong timeout)
 {
  TRACE("_sleep for %ld milliseconds\n",timeout);
  Sleep((timeout)?timeout:1);
@@ -153,7 +153,7 @@ void* CDECL _lsearch(const void* match, void* start,
 /*********************************************************************
 *                  bsearch_s (msvcrt.@)
 */
-void* CDECL MSVCRT_bsearch_s(const void *key, const void *base, size_t nmemb, size_t size,
+void* CDECL bsearch_s(const void *key, const void *base, size_t nmemb, size_t size,
                             int (__cdecl *compare)(void *, const void *, const void *), void *ctx)
 {
    ssize_t min = 0;
@@ -185,10 +185,10 @@ static int CDECL compare_wrapper(void *ctx, const void *e1, const void *e2)
 /*********************************************************************
 *                  bsearch (msvcrt.@)
 */
-void* CDECL MSVCRT_bsearch(const void *key, const void *base, size_t nmemb,
+void* CDECL bsearch(const void *key, const void *base, size_t nmemb,
        size_t size, int (__cdecl *compar)(const void *, const void *))
 {
-    return MSVCRT_bsearch_s(key, base, nmemb, size, compare_wrapper, compar);
+    return bsearch_s(key, base, nmemb, size, compare_wrapper, compar);
 }
 /*********************************************************************
 *		_chkesp (MSVCRT.@)
@@ -227,7 +227,7 @@ __ASM_GLOBAL_FUNC(_chkesp,
                  "pushl %eax\n\t"
                  "pushl %ecx\n\t"
                  "pushl %edx\n\t"
-                  "call " __ASM_NAME("MSVCRT_chkesp_fail") "\n\t"
+                  "call " __ASM_NAME("chkesp_fail") "\n\t"
                  "popl %edx\n\t"
                  "popl %ecx\n\t"
                  "popl %eax\n\t"
@@ -236,7 +236,7 @@ __ASM_GLOBAL_FUNC(_chkesp,
                  __ASM_CFI(".cfi_same_value %ebp\n\t")
                  "ret")

-void CDECL DECLSPEC_HIDDEN MSVCRT_chkesp_fail(void)
+void CDECL DECLSPEC_HIDDEN chkesp_fail(void)
 {
  ERR("Stack pointer incorrect after last function call - Bad prototype/spec entry?\n");
  DebugBreak();
@@ -367,7 +367,7 @@ static void quick_sort(void *base, size_t nmemb, size_t size,
 * This function is trying to sort data doing identical comparisons
 * as native does. There are still cases where it behaves differently.
 */
-void CDECL MSVCRT_qsort_s(void *base, size_t nmemb, size_t size,
+void CDECL qsort_s(void *base, size_t nmemb, size_t size,
    int (CDECL *compar)(void *, const void *, const void *), void *context)
 {
    const size_t total_size = nmemb*size;
@@ -385,16 +385,16 @@ void CDECL MSVCRT_qsort_s(void *base, size_t nmemb, size_t size,
 /*********************************************************************
 * qsort (MSVCRT.@)
 */
-void CDECL MSVCRT_qsort(void *base, size_t nmemb, size_t size,
+void CDECL qsort(void *base, size_t nmemb, size_t size,
        int (CDECL *compar)(const void*, const void*))
 {
-    MSVCRT_qsort_s(base, nmemb, size, compare_wrapper, compar);
+    qsort_s(base, nmemb, size, compare_wrapper, compar);
 }

 /*********************************************************************
 * _get_output_format (MSVCRT.@)
 */
-unsigned int CDECL MSVCRT__get_output_format(void)
+unsigned int CDECL _get_output_format(void)
 {
   return output_format;
 }
@@ -402,7 +402,7 @@ unsigned int CDECL MSVCRT__get_output_format(void)
 /*********************************************************************
 * _set_output_format (MSVCRT.@)
 */
-unsigned int CDECL MSVCRT__set_output_format(unsigned int new_output_format)
+unsigned int CDECL _set_output_format(unsigned int new_output_format)
 {
    unsigned int ret = output_format;

@@ -416,7 +416,7 @@ unsigned int CDECL MSVCRT__set_output_format(unsigned int new_output_format)
 /*********************************************************************
 * _resetstkoflw (MSVCRT.@)
 */
-int CDECL MSVCRT__resetstkoflw(void)
+int CDECL _resetstkoflw(void)
 {
    int stack_addr;
    DWORD oldprot;
@@ -430,7 +430,7 @@ int CDECL MSVCRT__resetstkoflw(void)
 /*********************************************************************
 *  _decode_pointer (MSVCR80.@)
 */
-void * CDECL MSVCRT_decode_pointer(void * ptr)
+void * CDECL _decode_pointer(void * ptr)
 {
    return DecodePointer(ptr);
 }
@@ -438,7 +438,7 @@ void * CDECL MSVCRT_decode_pointer(void * ptr)
 /*********************************************************************
 *  _encode_pointer (MSVCR80.@)
 */
-void * CDECL MSVCRT_encode_pointer(void * ptr)
+void * CDECL _encode_pointer(void * ptr)
 {
    return EncodePointer(ptr);
 }
@@ -490,7 +490,7 @@ unsigned short CDECL _byteswap_ushort(unsigned short s)
 /*********************************************************************
 * _byteswap_ulong (MSVCR80.@)
 */
-ULONG CDECL MSVCRT__byteswap_ulong(ULONG l)
+ULONG CDECL _byteswap_ulong(ULONG l)
 {
    return (l<<24) + ((l<<8)&0xFF0000) + ((l>>8)&0xFF00) + (l>>24);
 }
@@ -511,7 +511,7 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i)
 /*********************************************************************
 *  __crtGetShowWindowMode (MSVCR110.@)
 */
-int CDECL MSVCR110__crtGetShowWindowMode(void)
+int CDECL __crtGetShowWindowMode(void)
 {
    STARTUPINFOW si;

@@ -523,7 +523,7 @@ int CDECL MSVCR110__crtGetShowWindowMode(void)
 /*********************************************************************
 *  __crtInitializeCriticalSectionEx (MSVCR110.@)
 */
-BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx(
+BOOL CDECL __crtInitializeCriticalSectionEx(
        CRITICAL_SECTION *cs, DWORD spin_count, DWORD flags)
 {
    TRACE("(%p %x %x)\n", cs, spin_count, flags);
@@ -536,7 +536,7 @@ BOOL CDECL MSVCR110__crtInitializeCriticalSectionEx(
 /*********************************************************************
 * _vacopy (MSVCR120.@)
 */
-void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src)
+void CDECL _vacopy(__ms_va_list *dest, __ms_va_list src)
 {
    __ms_va_copy(*dest, src);
 }
@@ -546,7 +546,7 @@ void CDECL MSVCR120__vacopy(__ms_va_list *dest, __ms_va_list src)
 /*********************************************************************
 * _crt_debugger_hook (MSVCR80.@)
 */
-void CDECL MSVCRT__crt_debugger_hook(int reserved)
+void CDECL _crt_debugger_hook(int reserved)
 {
    WARN("(%x)\n", reserved);
 }
@@ -556,7 +556,7 @@ void CDECL MSVCRT__crt_debugger_hook(int reserved)
 /*********************************************************************
 *  __crtUnhandledException (MSVCR110.@)
 */
-LONG CDECL MSVCRT__crtUnhandledException(EXCEPTION_POINTERS *ep)
+LONG CDECL __crtUnhandledException(EXCEPTION_POINTERS *ep)
 {
    TRACE("(%p)\n", ep);
    SetUnhandledExceptionFilter(NULL);
@@ -574,7 +574,7 @@ void WINAPIV _Trace_agents(/*enum Concurrency::Agents_EventType*/int type, __int
 /*********************************************************************
 *		__crtSleep (MSVCR120.@)
 */
-void CDECL MSVCRT__crtSleep(DWORD timeout)
+void CDECL __crtSleep(DWORD timeout)
 {
  TRACE("(%u)\n", timeout);
  Sleep(timeout);
@@ -583,7 +583,7 @@ void CDECL MSVCRT__crtSleep(DWORD timeout)
 /*********************************************************************
 * _SetWinRTOutOfMemoryExceptionCallback (MSVCR120.@)
 */
-void CDECL MSVCR120__SetWinRTOutOfMemoryExceptionCallback(void *callback)
+void CDECL _SetWinRTOutOfMemoryExceptionCallback(void *callback)
 {
    FIXME("(%p): stub\n", callback);
 }

--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -704,7 +704,6 @@ int __cdecl      MSVCRT_strcmp(const char*, const char*);
 char* __cdecl    MSVCRT_strrchr(const char *, int);
 char* __cdecl    MSVCRT_strstr(const char*, const char*);
 __msvcrt_long __cdecl MSVCRT_strtol(const char*, char**, int);
-unsigned int __cdecl MSVCRT__get_output_format(void);
 char* __cdecl MSVCRT_strtok_s(char*, const char*, char**);
 char* __cdecl MSVCRT__itoa(int, char*, int);
 int __cdecl MSVCRT_wcsncmp(const wchar_t*, const wchar_t*, size_t);

--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -337,7 +337,7 @@
 @ cdecl _atol_l(str ptr) MSVCRT__atol_l
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
 @ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread (ptr long ptr)
 @ cdecl _beginthreadex (ptr long ptr ptr long ptr)
 @ cdecl _c_exit()
@@ -510,7 +510,7 @@
 @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
 @ cdecl _get_osplatform(ptr)
 @ cdecl _get_osver(ptr)
-@ cdecl _get_output_format() MSVCRT__get_output_format
+@ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_sbh_threshold()
 @ cdecl _get_wenviron(ptr)
@@ -866,7 +866,7 @@
 @ extern _pwctype MSVCRT__pwctype
 @ cdecl _read(long ptr long) MSVCRT__read
 # stub _realloc_dbg(ptr long long str long)
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -898,7 +898,7 @@
 @ cdecl _set_error_mode(long)
 # stub _set_fileinfo(long)
 @ cdecl _set_fmode(long)
-@ cdecl _set_output_format(long) MSVCRT__set_output_format
+@ cdecl _set_output_format(long)
 @ cdecl _set_sbh_threshold(long)
 @ cdecl _seterrormode(long)
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
@@ -908,7 +908,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snprintf_c(ptr long str) MSVCRT_snprintf_c
 @ varargs _snprintf_c_l(ptr long str ptr) MSVCRT_snprintf_c_l
@@ -1259,8 +1259,8 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
+@ cdecl bsearch(ptr ptr long long ptr)
+@ cdecl bsearch_s(ptr ptr long long ptr ptr)
 @ cdecl btowc(long)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
@@ -1393,11 +1393,11 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
-@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s
+@ cdecl qsort(ptr long long ptr)
+@ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
-@ cdecl rand_s(ptr) MSVCRT_rand_s
+@ cdecl rand()
+@ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -1417,7 +1417,7 @@
 @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s
 @ cdecl sqrt(double) MSVCRT_sqrt
 @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ varargs sscanf_s(str str) MSVCRT_sscanf_s
 @ cdecl strcat(str str)

--- a/dlls/msvcrt/printf.h
+++ b/dlls/msvcrt/printf.h
@@ -966,7 +966,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API
    BOOL standard_rounding = options & _CRT_INTERNAL_PRINTF_STANDARD_ROUNDING;
 #else
    BOOL legacy_wide = TRUE, legacy_msvcrt_compat = TRUE;
-    BOOL three_digit_exp = MSVCRT__get_output_format() != MSVCRT__TWO_DIGIT_EXPONENT;
+    BOOL three_digit_exp = _get_output_format() != MSVCRT__TWO_DIGIT_EXPONENT;
    BOOL standard_rounding = FALSE;
 #endif


--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -220,7 +220,7 @@
 @ cdecl _atodbl(ptr str) MSVCRT__atodbl
 @ cdecl -ret64 _atoi64(str) MSVCRT__atoi64
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _c_exit()
@@ -497,7 +497,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str) MSVCRT__snprintf
 @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf
 @ varargs _sopen(str long long) MSVCRT__sopen
@@ -645,7 +645,7 @@
 @ cdecl atof(str) MSVCRT_atof
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
+@ cdecl bsearch(ptr ptr long long ptr)
 @ cdecl calloc(long long)
 @ cdecl ceil(double) MSVCRT_ceil
 @ cdecl clearerr(ptr) MSVCRT_clearerr
@@ -746,9 +746,9 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
+@ cdecl qsort(ptr long long ptr)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
+@ cdecl rand()
 @ cdecl realloc(ptr long)
 @ cdecl remove(str) MSVCRT_remove
 @ cdecl rename(str str) MSVCRT_rename
@@ -762,7 +762,7 @@
 @ cdecl sinh(double) MSVCRT_sinh
 @ varargs sprintf(ptr str) MSVCRT_sprintf
 @ cdecl sqrt(double) MSVCRT_sqrt
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ varargs sscanf(str str) MSVCRT_sscanf
 @ cdecl strcat(str str)
 @ cdecl strchr(str long)

--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -39,7 +39,7 @@
 @ stub _NLG_Dispatch2
 @ stub _NLG_Return
 @ stub _NLG_Return2
-@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback
+@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr)
 @ cdecl _Strftime(ptr long str ptr ptr)
 @ cdecl _W_Getdays()
 @ cdecl _W_Getmonths()
@@ -202,11 +202,11 @@
 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl
 @ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l
 @ cdecl -ret64 _atoll_l(str ptr) MSVCRT__atoll_l
-@ cdecl _beep(long long) MSVCRT__beep
+@ cdecl _beep(long long)
 @ cdecl _beginthread(ptr long ptr)
 @ cdecl _beginthreadex(ptr long ptr ptr long ptr)
 @ cdecl _byteswap_uint64(int64)
-@ cdecl _byteswap_ulong(long) MSVCRT__byteswap_ulong
+@ cdecl _byteswap_ulong(long)
 @ cdecl _byteswap_ushort(long)
 @ cdecl _c_exit()
 @ cdecl _cabs(long) MSVCRT__cabs
@@ -242,7 +242,7 @@
 @ cdecl _create_locale(long str)
 @ cdecl _crt_at_quick_exit(ptr)
 @ cdecl _crt_atexit(ptr)
-@ cdecl _crt_debugger_hook(long) MSVCRT__crt_debugger_hook
+@ cdecl _crt_debugger_hook(long)
 @ cdecl _ctime32(ptr) MSVCRT__ctime32
 @ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s
 @ cdecl _ctime64(ptr) MSVCRT__ctime64
@@ -853,7 +853,7 @@
 @ cdecl _o__atoldbl(ptr str) MSVCRT__atoldbl
 @ cdecl _o__atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l
 @ cdecl -ret64 _o__atoll_l(str ptr) MSVCRT__atoll_l
-@ cdecl _o__beep(long long) MSVCRT__beep
+@ cdecl _o__beep(long long) _beep
 @ cdecl _o__beginthread(ptr long ptr) _beginthread
 @ cdecl _o__beginthreadex(ptr long ptr ptr long ptr) _beginthreadex
 @ cdecl _o__cabs(long) MSVCRT__cabs
@@ -1317,7 +1317,7 @@
 @ cdecl _o__realloc_base(ptr long) _realloc_base
 @ cdecl _o__recalloc(ptr long long) _recalloc
 @ cdecl _o__register_onexit_function(ptr ptr) _register_onexit_function
-@ cdecl _o__resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _o__resetstkoflw() _resetstkoflw
 @ cdecl _o__rmdir(str) MSVCRT__rmdir
 @ cdecl _o__rmtmp() MSVCRT__rmtmp
 @ cdecl _o__scalb(double long) MSVCRT__scalb
@@ -1339,7 +1339,7 @@
 @ cdecl _o__setmbcp(long) _setmbcp
 @ cdecl _o__setmode(long long) MSVCRT__setmode
 @ stub _o__setsystime
-@ cdecl _o__sleep(long) MSVCRT__sleep
+@ cdecl _o__sleep(long) _sleep
 @ varargs _o__sopen(str long long) MSVCRT__sopen
 @ cdecl _o__sopen_dispatch(str long long long ptr long) MSVCRT__sopen_dispatch
 @ cdecl _o__sopen_s(ptr str long long long) MSVCRT__sopen_s
@@ -1580,8 +1580,8 @@
 @ cdecl _o_atoi(str) MSVCRT_atoi
 @ cdecl _o_atol(str) MSVCRT_atol
 @ cdecl -ret64 _o_atoll(str) MSVCRT_atoll
-@ 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_bsearch(ptr ptr long long ptr) bsearch
+@ cdecl _o_bsearch_s(ptr ptr long long ptr ptr) bsearch_s
 @ cdecl _o_btowc(long) btowc
 @ cdecl _o_calloc(long long) calloc
 @ cdecl _o_cbrt(double) MSVCR120_cbrt
@@ -1740,11 +1740,11 @@
 @ cdecl _o_puts(str) MSVCRT_puts
 @ cdecl _o_putwc(long ptr) MSVCRT_fputwc
 @ cdecl _o_putwchar(long) MSVCRT__fputwchar
-@ cdecl _o_qsort(ptr long long ptr) MSVCRT_qsort
-@ cdecl _o_qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s
+@ cdecl _o_qsort(ptr long long ptr) qsort
+@ cdecl _o_qsort_s(ptr long long ptr ptr) qsort_s
 @ cdecl _o_raise(long) raise
-@ cdecl _o_rand() MSVCRT_rand
-@ cdecl _o_rand_s(ptr) MSVCRT_rand_s
+@ cdecl _o_rand() rand
+@ cdecl _o_rand_s(ptr) rand_s
 @ cdecl _o_realloc(ptr long) realloc
 @ cdecl _o_remainder(double double) MSVCR120_remainder
 @ cdecl _o_remainderf(float float) MSVCR120_remainderf
@@ -1777,7 +1777,7 @@
 @ cdecl -arch=!i386 _o_sinhf(float) MSVCRT_sinhf
 @ cdecl _o_sqrt(double) MSVCRT_sqrt
 @ cdecl -arch=!i386 _o_sqrtf(float) MSVCRT_sqrtf
-@ cdecl _o_srand(long) MSVCRT_srand
+@ cdecl _o_srand(long) srand
 @ cdecl _o_strcat_s(str long str) MSVCRT_strcat_s
 @ cdecl _o_strcoll(str str) MSVCRT_strcoll
 @ cdecl _o_strcpy_s(ptr long str) MSVCRT_strcpy_s
@@ -1863,7 +1863,7 @@
 @ cdecl _recalloc(ptr long long)
 @ cdecl _register_onexit_function(ptr ptr)
 @ cdecl _register_thread_local_exe_atexit_callback(ptr)
-@ cdecl _resetstkoflw() MSVCRT__resetstkoflw
+@ cdecl _resetstkoflw()
 @ cdecl _rmdir(str) MSVCRT__rmdir
 @ cdecl _rmtmp() MSVCRT__rmtmp
 @ cdecl _rotl(long long)
@@ -1900,7 +1900,7 @@
 @ cdecl _setmbcp(long)
 @ cdecl _setmode(long long) MSVCRT__setmode
 @ stub _setsystime(ptr long)
-@ cdecl _sleep(long) MSVCRT__sleep
+@ cdecl _sleep(long)
 @ varargs _sopen(str long long) MSVCRT__sopen
 @ cdecl _sopen_dispatch(str long long long ptr long) MSVCRT__sopen_dispatch
 @ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s
@@ -2174,8 +2174,8 @@
 @ cdecl atoi(str) MSVCRT_atoi
 @ cdecl atol(str) MSVCRT_atol
 @ cdecl -ret64 atoll(str) MSVCRT_atoll
-@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch
-@ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s
+@ cdecl bsearch(ptr ptr long long ptr)
+@ cdecl bsearch_s(ptr ptr long long ptr ptr)
 @ cdecl btowc(long)
 @ stub c16rtomb
 @ stub c32rtomb
@@ -2452,12 +2452,12 @@
 @ cdecl puts(str) MSVCRT_puts
 @ cdecl putwc(long ptr) MSVCRT_fputwc
 @ cdecl putwchar(long) MSVCRT__fputwchar
-@ cdecl qsort(ptr long long ptr) MSVCRT_qsort
-@ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s
+@ cdecl qsort(ptr long long ptr)
+@ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl quick_exit(long)
 @ cdecl raise(long)
-@ cdecl rand() MSVCRT_rand
-@ cdecl rand_s(ptr) MSVCRT_rand_s
+@ cdecl rand()
+@ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
 @ cdecl remainder(double double) MSVCR120_remainder
 @ cdecl remainderf(float float) MSVCR120_remainderf
@@ -2493,7 +2493,7 @@
 @ cdecl -arch=!i386 sinhf(float) MSVCRT_sinhf
 @ cdecl sqrt(double) MSVCRT_sqrt
 @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf
-@ cdecl srand(long) MSVCRT_srand
+@ cdecl srand(long)
 @ cdecl strcat(str str)
 @ cdecl strcat_s(str long str) MSVCRT_strcat_s
 @ cdecl strchr(str long)

--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -141,7 +141,7 @@ _ACRTIMP FILE*  __cdecl tmpfile(void);
 _ACRTIMP char*  __cdecl tmpnam(char*);
 _ACRTIMP int    __cdecl ungetc(int,FILE*);
 _ACRTIMP unsigned int __cdecl _get_output_format(void);
-_ACRTIMP unsigned int __cdecl _set_output_format(void);
+_ACRTIMP unsigned int __cdecl _set_output_format(unsigned int);

 #ifdef _UCRT