From 065cf4e71496d96baf5f7ff35af4f0bbfee9d1a8 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Wed, 2 Dec 2020 00:53:51 +0100 Subject: [PATCH] msvcrt: Remove MSVCRT_ prefix from mbcs.c functions. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/crtdll/crtdll.spec | 6 ++-- dlls/msvcr100/msvcr100.spec | 24 ++++++++-------- dlls/msvcr110/msvcr110.spec | 24 ++++++++-------- dlls/msvcr120/msvcr120.spec | 24 ++++++++-------- dlls/msvcr70/msvcr70.spec | 8 +++--- dlls/msvcr71/msvcr71.spec | 8 +++--- dlls/msvcr80/msvcr80.spec | 24 ++++++++-------- dlls/msvcr90/msvcr90.spec | 24 ++++++++-------- dlls/msvcrt/exit.c | 8 +++--- dlls/msvcrt/file.c | 4 +-- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 38 ++++++++++++------------- dlls/msvcrt/msvcrt.h | 6 ---- dlls/msvcrt/msvcrt.spec | 24 ++++++++-------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/time.c | 8 +++--- dlls/msvcrtd/msvcrtd.spec | 8 +++--- dlls/ucrtbase/ucrtbase.spec | 48 ++++++++++++++++---------------- include/msvcrt/corecrt_wstdlib.h | 3 ++ 19 files changed, 145 insertions(+), 148 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index be74abdf1c7..4248a5601e9 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -431,9 +431,9 @@ @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c8354712cdd..53b1fda8494 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -567,7 +567,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @@ -1193,8 +1193,8 @@ @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) -@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) @ stub _mbstrnlen @@ -1203,7 +1203,7 @@ @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) @ stub _mbsupr_s_l -@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l +@ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) MSVCRT__memicmp @ cdecl _memicmp_l(str str long ptr) MSVCRT__memicmp_l @@ -1741,14 +1741,14 @@ @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc -@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbrlen(ptr long ptr) +@ cdecl mbrtowc(ptr str long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbstowcs_s(ptr ptr long str long) _mbstowcs_s +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5942782f665..01e92a0ec6d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -894,7 +894,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_locale_name_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @@ -1550,8 +1550,8 @@ @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) -@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) @ stub _mbstrnlen @@ -1560,7 +1560,7 @@ @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) @ stub _mbsupr_s_l -@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l +@ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) MSVCRT__memicmp @ cdecl _memicmp_l(str str long ptr) MSVCRT__memicmp_l @@ -2099,14 +2099,14 @@ @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc -@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbrlen(ptr long ptr) +@ cdecl mbrtowc(ptr str long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbstowcs_s(ptr ptr long str long) _mbstowcs_s +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index ec4cdd433dc..b2776f452c8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -879,7 +879,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_locale_name_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @@ -1560,8 +1560,8 @@ @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) -@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) @ stub _mbstrnlen @@ -1570,7 +1570,7 @@ @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) @ stub _mbsupr_s_l -@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l +@ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) MSVCRT__memicmp @ cdecl _memicmp_l(str str long ptr) MSVCRT__memicmp_l @@ -2276,14 +2276,14 @@ @ cdecl lroundf(float) MSVCR120_lroundf @ cdecl lroundl(double) MSVCR120_lroundl @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc -@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbrlen(ptr long ptr) +@ cdecl mbrtowc(ptr str long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbstowcs_s(ptr ptr long str long) _mbstowcs_s +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 285e9793e07..06850fd5b73 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -133,7 +133,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @@ -776,9 +776,9 @@ @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 04cdb908ae2..6f5a0b82f80 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -128,7 +128,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @@ -772,9 +772,9 @@ @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 20980de6fed..45a187aa0fe 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -201,7 +201,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @@ -865,8 +865,8 @@ @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) -@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) @ stub _mbstrnlen @@ -875,7 +875,7 @@ @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) @ stub _mbsupr_s_l -@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l +@ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) MSVCRT__memicmp @ cdecl _memicmp_l(str str long ptr) MSVCRT__memicmp_l @@ -1422,14 +1422,14 @@ @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc -@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbrlen(ptr long ptr) +@ cdecl mbrtowc(ptr str long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbstowcs_s(ptr ptr long str long) _mbstowcs_s +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 51101cee23f..b2bf4985c41 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -192,7 +192,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @@ -843,8 +843,8 @@ @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) -@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) @ stub _mbstrnlen @@ -853,7 +853,7 @@ @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) @ stub _mbsupr_s_l -@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l +@ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) MSVCRT__memicmp @ cdecl _memicmp_l(str str long ptr) MSVCRT__memicmp_l @@ -1394,14 +1394,14 @@ @ cdecl -arch=!i386 logf(float) MSVCRT_logf @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc -@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbrlen(ptr long ptr) +@ cdecl mbrtowc(ptr str long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbstowcs_s(ptr ptr long str long) _mbstowcs_s +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 080524dadb0..0ecc9d7dab0 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -217,8 +217,8 @@ static void DoMessageBox(const char *lead, const char *message) { wchar_t leadW[1024], messageW[1024]; - MSVCRT_mbstowcs(leadW, lead, 1024); - MSVCRT_mbstowcs(messageW, message, 1024); + mbstowcs(leadW, lead, 1024); + mbstowcs(messageW, message, 1024); DoMessageBoxW(leadW, messageW); } @@ -309,8 +309,8 @@ void CDECL _assert(const char* str, const char* file, unsigned int line) { wchar_t strW[1024], fileW[1024]; - MSVCRT_mbstowcs(strW, str, 1024); - MSVCRT_mbstowcs(fileW, file, 1024); + mbstowcs(strW, str, 1024); + mbstowcs(fileW, file, 1024); _wassert(strW, fileW, line); } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e2efc12de7c..1b84056927c 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3481,7 +3481,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) conv[j] = s[i]; } - len = MSVCRT_mbstowcs((WCHAR*)lfbuf, conv, len); + len = mbstowcs((WCHAR*)lfbuf, conv, len); if (len == -1) { msvcrt_set_errno(GetLastError()); @@ -3806,7 +3806,7 @@ wint_t CDECL MSVCRT__fgetwc_nolock(FILE* file) } } - if(!len || MSVCRT_mbtowc(&ret, mbs, len)==-1) + if(!len || mbtowc(&ret, mbs, len)==-1) ret = WEOF; } diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e7a614b72ba..1f72efcf196 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2036,7 +2036,7 @@ wchar_t* CDECL _wsetlocale(int category, const wchar_t* wlocale) ret = setlocale(category, locale); free(locale); - if(ret && MSVCRT_mbstowcs(current_lc_all, ret, MAX_LOCALE_LENGTH)==-1) + if(ret && mbstowcs(current_lc_all, ret, MAX_LOCALE_LENGTH)==-1) ret = NULL; _unlock_locales(); diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a5f18d14075..56de6b9a69b 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -188,7 +188,7 @@ int* CDECL __p___mb_cur_max(void) /********************************************************************* * ___mb_cur_max_func(MSVCRT.@) */ -int CDECL MSVCRT____mb_cur_max_func(void) +int CDECL ___mb_cur_max_func(void) { return get_locinfo()->mb_cur_max; } @@ -2313,7 +2313,7 @@ unsigned char* CDECL _mbspbrk(const unsigned char* str, const unsigned char* acc * Unlike most of the multibyte string functions this function uses * the locale codepage, not the codepage set by _setmbcp */ -int CDECL MSVCRT_mblen(const char* str, size_t size) +int CDECL mblen(const char* str, size_t size) { if (str && *str && size) { @@ -2328,7 +2328,7 @@ int CDECL MSVCRT_mblen(const char* str, size_t size) /********************************************************************* * mbrlen(MSVCRT.@) */ -size_t CDECL MSVCRT_mbrlen(const char *str, size_t len, mbstate_t *state) +size_t CDECL mbrlen(const char *str, size_t len, mbstate_t *state) { mbstate_t s = (state ? *state : 0); size_t ret; @@ -2394,7 +2394,7 @@ size_t CDECL _mbstrlen(const char* str) /********************************************************************* * _mbtowc_l(MSVCRT.@) */ -int CDECL MSVCRT_mbtowc_l(wchar_t *dst, const char* str, size_t n, _locale_t locale) +int CDECL _mbtowc_l(wchar_t *dst, const char* str, size_t n, _locale_t locale) { pthreadlocinfo locinfo; wchar_t tmpdst; @@ -2431,9 +2431,9 @@ int CDECL MSVCRT_mbtowc_l(wchar_t *dst, const char* str, size_t n, _locale_t loc /********************************************************************* * mbtowc(MSVCRT.@) */ -int CDECL MSVCRT_mbtowc(wchar_t *dst, const char* str, size_t n) +int CDECL mbtowc(wchar_t *dst, const char* str, size_t n) { - return MSVCRT_mbtowc_l(dst, str, n, NULL); + return _mbtowc_l(dst, str, n, NULL); } /********************************************************************* @@ -2458,7 +2458,7 @@ wint_t CDECL btowc(int c) /********************************************************************* * mbrtowc(MSVCRT.@) */ -size_t CDECL MSVCRT_mbrtowc(wchar_t *dst, const char *str, +size_t CDECL mbrtowc(wchar_t *dst, const char *str, size_t n, mbstate_t *state) { pthreadlocinfo locinfo = get_locinfo(); @@ -2505,7 +2505,7 @@ size_t CDECL MSVCRT_mbrtowc(wchar_t *dst, const char *str, /********************************************************************* * _mbstowcs_l(MSVCRT.@) */ -size_t CDECL MSVCRT__mbstowcs_l(wchar_t *wcstr, const char *mbstr, +size_t CDECL _mbstowcs_l(wchar_t *wcstr, const char *mbstr, size_t count, _locale_t locale) { pthreadlocinfo locinfo; @@ -2569,23 +2569,23 @@ size_t CDECL MSVCRT__mbstowcs_l(wchar_t *wcstr, const char *mbstr, /********************************************************************* * mbstowcs(MSVCRT.@) */ -size_t CDECL MSVCRT_mbstowcs(wchar_t *wcstr, +size_t CDECL mbstowcs(wchar_t *wcstr, const char *mbstr, size_t count) { - return MSVCRT__mbstowcs_l(wcstr, mbstr, count, NULL); + return _mbstowcs_l(wcstr, mbstr, count, NULL); } /********************************************************************* * _mbstowcs_s_l(MSVCRT.@) */ -int CDECL MSVCRT__mbstowcs_s_l(size_t *ret, wchar_t *wcstr, +int CDECL _mbstowcs_s_l(size_t *ret, wchar_t *wcstr, size_t size, const char *mbstr, size_t count, _locale_t locale) { size_t conv; int err = 0; if(!wcstr && !size) { - conv = MSVCRT__mbstowcs_l(NULL, mbstr, 0, locale); + conv = _mbstowcs_l(NULL, mbstr, 0, locale); if(ret) *ret = conv+1; return 0; @@ -2602,7 +2602,7 @@ int CDECL MSVCRT__mbstowcs_s_l(size_t *ret, wchar_t *wcstr, else conv = count; - conv = MSVCRT__mbstowcs_l(wcstr, mbstr, conv, locale); + conv = _mbstowcs_l(wcstr, mbstr, conv, locale); if(convret) { - int ch_len = MSVCRT_mbrtowc(&tmpdst, p, 2, &s); + int ch_len = mbrtowc(&tmpdst, p, 2, &s); if(wcstr) wcstr[ret] = tmpdst; @@ -2667,7 +2667,7 @@ size_t CDECL MSVCRT_mbsrtowcs(wchar_t *wcstr, /********************************************************************* * mbsrtowcs_s(MSVCRT.@) */ -int CDECL MSVCRT_mbsrtowcs_s(size_t *ret, wchar_t *wcstr, size_t len, +int CDECL mbsrtowcs_s(size_t *ret, wchar_t *wcstr, size_t len, const char **mbstr, size_t count, mbstate_t *state) { size_t tmp; @@ -2678,7 +2678,7 @@ int CDECL MSVCRT_mbsrtowcs_s(size_t *ret, wchar_t *wcstr, size_t len, return EINVAL; } - *ret = MSVCRT_mbsrtowcs(wcstr, mbstr, count>len ? len : count, state); + *ret = mbsrtowcs(wcstr, mbstr, count>len ? len : count, state); if(*ret == -1) { if(wcstr) *wcstr = 0; return *_errno(); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 8423a9f70ee..4c81db21a70 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -659,12 +659,6 @@ int __cdecl _ismbblead(unsigned int); int __cdecl _ismbblead_l(unsigned int, _locale_t); int __cdecl _ismbclegal(unsigned int c); int __cdecl _ismbstrail(const unsigned char* start, const unsigned char* str); -int __cdecl MSVCRT_mbtowc(wchar_t*,const char*,size_t); -int __cdecl MSVCRT_mbtowc_l(wchar_t*,const char*,size_t,_locale_t); -size_t __cdecl MSVCRT_mbstowcs(wchar_t*,const char*,size_t); -size_t __cdecl MSVCRT__mbstowcs_l(wchar_t*, const char*, size_t, _locale_t); -int __cdecl MSVCRT__mbstowcs_s_l(size_t*, wchar_t*, - size_t, const char*, size_t, _locale_t); size_t __cdecl MSVCRT_wcstombs(char*,const wchar_t*,size_t); size_t __cdecl MSVCRT__wcstombs_l(char*, const wchar_t*, size_t, _locale_t); intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9ebc0a56cad..9c603cfe79d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -194,7 +194,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_handle_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___setlc_active_func() @ cdecl ___unguarded_readlc_active_add_func() @ extern __argc MSVCRT___argc @@ -812,8 +812,8 @@ @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) -@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) # stub _mbstrnlen(str long) @@ -822,7 +822,7 @@ # stub _mbsupr_l(str ptr) @ cdecl _mbsupr_s(str long) # stub _mbsupr_s_l(str long ptr) -@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l +@ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) MSVCRT__memicmp @ cdecl _memicmp_l(str str long ptr) MSVCRT__memicmp_l @@ -1364,15 +1364,15 @@ @ cdecl -arch=!i386 log10f(float) MSVCRT_log10f @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen -@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc +@ cdecl mblen(ptr long) +@ cdecl mbrlen(ptr long ptr) +@ cdecl mbrtowc(ptr str long ptr) # stub mbsdup_dbg(wstr long ptr long) -@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbstowcs_s(ptr ptr long str long) _mbstowcs_s +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 826e8e76805..63de2548f9b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -129,7 +129,7 @@ static inline int mbstowcs_len(wchar_t *wcstr, const char *mbstr, WCHAR buf; for(i=0; itm_isdst ? 1 : 0)) return 0; #else - if(MSVCRT__mbstowcs_s_l(&tmp, str+ret, max-ret, + if(_mbstowcs_s_l(&tmp, str+ret, max-ret, mstm->tm_isdst ? tzname_dst : tzname_std, MSVCRT__TRUNCATE, loc) == STRUNCATE) ret = max; @@ -1542,9 +1542,9 @@ static size_t strftime_helper(char *str, size_t max, const char *format, *str = 0; if (!MSVCRT_CHECK_PMT(format != NULL)) return 0; - len = MSVCRT__mbstowcs_l( NULL, format, 0, loc ) + 1; + len = _mbstowcs_l( NULL, format, 0, loc ) + 1; if (!len || !(fmt = malloc( len*sizeof(wchar_t) ))) return 0; - MSVCRT__mbstowcs_l(fmt, format, len, loc); + _mbstowcs_l(fmt, format, len, loc); if ((s = malloc( max*sizeof(wchar_t) ))) { @@ -1606,7 +1606,7 @@ static size_t wcsftime_helper( wchar_t *str, size_t max, 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 ); + len = _mbstowcs_l( str, s, max, loc ); free( s ); } else len = 0; diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 1323f5064a3..021a14f7fd7 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -130,7 +130,7 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) @ cdecl __RTtypeid(ptr) @ cdecl __STRINGTOLD(ptr ptr str long) -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ extern __argc MSVCRT___argc @ extern __argv MSVCRT___argv @ extern __badioinfo MSVCRT___badioinfo @@ -728,9 +728,9 @@ @ cdecl log10(double) MSVCRT_log10 @ cdecl -arch=i386,x86_64,arm,arm64 longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mblen(ptr long) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f2508023386..bf52b956b5e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -70,7 +70,7 @@ @ cdecl ___lc_codepage_func() @ cdecl ___lc_collate_cp_func() @ cdecl ___lc_locale_name_func() -@ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl ___mb_cur_max_func() @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func @ cdecl __conio_common_vcprintf(int64 str ptr ptr) @@ -706,8 +706,8 @@ @ cdecl _mbstok_l(str str ptr) @ cdecl _mbstok_s(str str ptr) @ cdecl _mbstok_s_l(str str ptr ptr) -@ cdecl _mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l +@ cdecl _mbstowcs_l(ptr str long ptr) +@ cdecl _mbstowcs_s_l(ptr ptr long str long ptr) @ cdecl _mbstrlen(str) @ cdecl _mbstrlen_l(str ptr) @ stub _mbstrnlen @@ -716,7 +716,7 @@ @ stub _mbsupr_l @ cdecl _mbsupr_s(str long) @ stub _mbsupr_s_l -@ cdecl _mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l +@ cdecl _mbtowc_l(ptr str long ptr) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy @ cdecl _memicmp(str str long) MSVCRT__memicmp @ cdecl _memicmp_l(str str long ptr) MSVCRT__memicmp_l @@ -757,7 +757,7 @@ @ cdecl _o____lc_codepage_func() ___lc_codepage_func @ cdecl _o____lc_collate_cp_func() ___lc_collate_cp_func @ cdecl _o____lc_locale_name_func() ___lc_locale_name_func -@ cdecl _o____mb_cur_max_func() MSVCRT____mb_cur_max_func +@ cdecl _o____mb_cur_max_func() ___mb_cur_max_func @ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func @ cdecl _o___conio_common_vcprintf(int64 str ptr ptr) __conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @@ -1275,8 +1275,8 @@ @ cdecl _o__mbstok_l(str str ptr) _mbstok_l @ cdecl _o__mbstok_s(str str ptr) _mbstok_s @ cdecl _o__mbstok_s_l(str str ptr ptr) _mbstok_s_l -@ cdecl _o__mbstowcs_l(ptr str long ptr) MSVCRT__mbstowcs_l -@ cdecl _o__mbstowcs_s_l(ptr ptr long str long ptr) MSVCRT__mbstowcs_s_l +@ cdecl _o__mbstowcs_l(ptr str long ptr) _mbstowcs_l +@ cdecl _o__mbstowcs_s_l(ptr ptr long str long ptr) _mbstowcs_s_l @ cdecl _o__mbstrlen(str) _mbstrlen @ cdecl _o__mbstrlen_l(str ptr) _mbstrlen_l @ stub _o__mbstrnlen @@ -1285,7 +1285,7 @@ @ stub _o__mbsupr_l @ cdecl _o__mbsupr_s(str long) _mbsupr_s @ stub _o__mbsupr_s_l -@ cdecl _o__mbtowc_l(ptr str long ptr) MSVCRT_mbtowc_l +@ cdecl _o__mbtowc_l(ptr str long ptr) _mbtowc_l @ cdecl _o__memicmp(str str long) MSVCRT__memicmp @ cdecl _o__memicmp_l(str str long ptr) MSVCRT__memicmp_l @ cdecl _o__mkdir(str) MSVCRT__mkdir @@ -1707,16 +1707,16 @@ @ cdecl _o_lroundf(float) MSVCR120_lroundf @ cdecl _o_lroundl(double) MSVCR120_lroundl @ cdecl _o_malloc(long) malloc -@ cdecl _o_mblen(ptr long) MSVCRT_mblen -@ cdecl _o_mbrlen(ptr long ptr) MSVCRT_mbrlen +@ cdecl _o_mblen(ptr long) mblen +@ cdecl _o_mbrlen(ptr long ptr) mbrlen @ stub _o_mbrtoc16 @ stub _o_mbrtoc32 -@ cdecl _o_mbrtowc(ptr str long ptr) MSVCRT_mbrtowc -@ cdecl _o_mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ cdecl _o_mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s -@ 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_mbrtowc(ptr str long ptr) mbrtowc +@ cdecl _o_mbsrtowcs(ptr ptr long ptr) mbsrtowcs +@ cdecl _o_mbsrtowcs_s(ptr ptr long ptr long ptr) mbsrtowcs_s +@ cdecl _o_mbstowcs(ptr str long) mbstowcs +@ cdecl _o_mbstowcs_s(ptr ptr long str long) _mbstowcs_s +@ cdecl _o_mbtowc(ptr str long) mbtowc @ cdecl _o_memcpy_s(ptr long ptr long) memcpy_s @ cdecl _o_memset(ptr long long) memset @ cdecl _o_modf(double ptr) MSVCRT_modf @@ -2410,16 +2410,16 @@ @ cdecl lroundf(float) MSVCR120_lroundf @ cdecl lroundl(double) MSVCR120_lroundl @ cdecl malloc(long) -@ cdecl mblen(ptr long) MSVCRT_mblen -@ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen +@ cdecl mblen(ptr long) +@ cdecl mbrlen(ptr long ptr) @ stub mbrtoc16 @ stub mbrtoc32 -@ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc -@ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s -@ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs -@ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s -@ cdecl mbtowc(ptr str long) MSVCRT_mbtowc +@ cdecl mbrtowc(ptr str long ptr) +@ cdecl mbsrtowcs(ptr ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbstowcs(ptr str long) +@ cdecl mbstowcs_s(ptr ptr long str long) _mbstowcs_s +@ cdecl mbtowc(ptr str long) @ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h index 9883b1ab820..4a32db00b57 100644 --- a/include/msvcrt/corecrt_wstdlib.h +++ b/include/msvcrt/corecrt_wstdlib.h @@ -39,8 +39,11 @@ _ACRTIMP __int64 __cdecl _wtoi64(const wchar_t*); _ACRTIMP __msvcrt_long __cdecl _wtol(const wchar_t*); _ACRTIMP size_t __cdecl mbstowcs(wchar_t*,const char*,size_t); +_ACRTIMP size_t __cdecl _mbstowcs_l(wchar_t*,const char*,size_t,_locale_t); _ACRTIMP errno_t __cdecl mbstowcs_s(size_t*,wchar_t*,size_t,const char*,size_t); +_ACRTIMP errno_t __cdecl _mbstowcs_s_l(size_t*,wchar_t*,size_t,const char*,size_t,_locale_t); _ACRTIMP int __cdecl mbtowc(wchar_t*,const char*,size_t); +_ACRTIMP int __cdecl _mbtowc_l(wchar_t*,const char*,size_t,_locale_t); _ACRTIMP float __cdecl wcstof(const wchar_t*,wchar_t**); _ACRTIMP double __cdecl wcstod(const wchar_t*,wchar_t**); _ACRTIMP __msvcrt_long __cdecl wcstol(const wchar_t*,wchar_t**,int);