From 1514c54ce560acadb4cacb77cd4ee5915e8dbd67 Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Wed, 2 Dec 2020 00:54:09 +0100 Subject: [PATCH] msvcrt: Remove MSVCRT_ prefix from string.c functions. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/crtdll/crtdll.spec | 62 ++++---- dlls/msvcr100/msvcr100.spec | 158 +++++++++--------- dlls/msvcr110/msvcr110.spec | 158 +++++++++--------- dlls/msvcr120/msvcr120.spec | 186 +++++++++++----------- dlls/msvcr70/msvcr70.spec | 76 ++++----- dlls/msvcr71/msvcr71.spec | 74 ++++----- dlls/msvcr80/msvcr80.spec | 158 +++++++++--------- dlls/msvcr90/msvcr90.spec | 158 +++++++++--------- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/dir.c | 2 +- dlls/msvcrt/environ.c | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/file.c | 4 +- dlls/msvcrt/locale.c | 18 +-- dlls/msvcrt/mbcs.c | 22 +-- dlls/msvcrt/msvcrt.h | 15 +- dlls/msvcrt/msvcrt.spec | 160 +++++++++---------- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/string.c | 273 ++++++++++++++++---------------- dlls/msvcrt/time.c | 6 +- dlls/msvcrt/undname.c | 4 +- dlls/msvcrtd/msvcrtd.spec | 72 ++++----- dlls/ucrtbase/ucrtbase.spec | 334 +++++++++++++++++++-------------------- include/msvcrt/corecrt_wstdlib.h | 4 +- 24 files changed, 970 insertions(+), 982 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 4be1a124362..5a4d4707b88 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -168,7 +168,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ cdecl _isnan(double) MSVCRT__isnan -@ cdecl _itoa(long ptr long) MSVCRT__itoa +@ cdecl _itoa(long ptr long) @ cdecl _itow(long ptr long) ntdll._itow @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @@ -206,7 +206,7 @@ @ cdecl _mbscpy(ptr str) @ cdecl _mbscspn(str str) @ cdecl _mbsdec(ptr ptr) -@ cdecl _mbsdup(str) MSVCRT__strdup +@ cdecl _mbsdup(str) _strdup @ cdecl _mbsicmp(str str) @ cdecl _mbsinc(str) @ cdecl _mbslen(str) @@ -236,7 +236,7 @@ @ cdecl _mbstrlen(str) @ cdecl _mbsupr(str) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy -@ cdecl _memicmp(str str long) MSVCRT__memicmp +@ cdecl _memicmp(str str long) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mktemp(str) MSVCRT__mktemp @ cdecl _msize(ptr) @@ -285,26 +285,26 @@ @ cdecl _splitpath(str ptr ptr ptr ptr) MSVCRT__splitpath @ cdecl _stat(str ptr) MSVCRT_stat @ cdecl _statusfp() -@ cdecl _strcmpi(str str) MSVCRT__stricmp +@ cdecl _strcmpi(str str) _stricmp @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdec(str str) -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricoll(str str) MSVCRT__stricoll +@ cdecl _stricmp(str str) +@ cdecl _stricoll(str str) @ cdecl _strinc(str) -@ cdecl _strlwr(str) MSVCRT__strlwr -@ cdecl _strncnt(str long) MSVCRT___strncnt +@ cdecl _strlwr(str) +@ cdecl _strncnt(str long) __strncnt @ cdecl _strnextc(str) -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp +@ cdecl _strnicmp(str str long) @ cdecl _strninc(str long) -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _strnset(str long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ cdecl _strspnp(str str) @ cdecl _strtime(ptr) MSVCRT__strtime -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strupr(str) +@ cdecl _swab(str str long) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr_dll MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -349,9 +349,9 @@ @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -private atexit(ptr) MSVCRT_atexit -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl calloc(long long) @ cdecl ceil(double) MSVCRT_ceil @@ -434,7 +434,7 @@ @ cdecl mblen(ptr long) @ cdecl mbstowcs(ptr str long) @ cdecl mbtowc(ptr str long) -@ cdecl memchr(ptr long long) MSVCRT_memchr +@ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memmove(ptr ptr long) @@ -468,24 +468,24 @@ @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ cdecl strncmp(str str long) MSVCRT_strncmp -@ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) MSVCRT_strpbrk -@ cdecl strrchr(str long) MSVCRT_strrchr +@ cdecl strncat(str str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf(ptr wstr) MSVCRT_swprintf @ varargs swscanf(wstr wstr) @ cdecl system(str) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5f65b3aed6a..0ff6d6673d3 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -503,7 +503,7 @@ @ cdecl -arch=win64 ?wait_for_multiple@event@Concurrency@@SA_KPEAPEAV12@_K_NI@Z(ptr long long long) event_wait_for_multiple @ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception @ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -656,7 +656,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ cdecl __strncnt(str long) MSVCRT___strncnt +@ cdecl __strncnt(str long) @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @@ -691,17 +691,17 @@ @ stub _aligned_recalloc @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l -@ cdecl _atof_l(str ptr) MSVCRT__atof_l -@ cdecl _atoflt(ptr str) MSVCRT__atoflt -@ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l -@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ cdecl _atol_l(str ptr) MSVCRT__atol_l -@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl -@ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l +@ cdecl _atodbl(ptr str) +@ cdecl _atodbl_l(ptr str ptr) +@ cdecl _atof_l(str ptr) +@ cdecl _atoflt(ptr str) +@ cdecl _atoflt_l(ptr str ptr) +@ cdecl -ret64 _atoi64(str) +@ cdecl -ret64 _atoi64_l(str ptr) +@ cdecl _atoi_l(str ptr) +@ cdecl _atol_l(str ptr) +@ cdecl _atoldbl(ptr str) +@ cdecl _atoldbl_l(ptr str ptr) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -928,9 +928,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) MSVCRT__hypotf @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) @ stub _initptd @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @@ -1031,10 +1031,10 @@ @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) -@ cdecl _itoa(long ptr long) MSVCRT__itoa -@ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s +@ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -@ cdecl _itow_s(long ptr long long) MSVCRT__itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @@ -1062,9 +1062,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -@ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s +@ cdecl _ltow_s(long ptr long long) @ 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) malloc @@ -1205,8 +1205,8 @@ @ stub _mbsupr_s_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 +@ cdecl _memicmp(str str long) +@ cdecl _memicmp_l(str str long ptr) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 @ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 @@ -1334,47 +1334,47 @@ @ cdecl _stat64i32(str ptr) MSVCRT__stat64i32 @ cdecl _statusfp() @ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l +@ cdecl _strcoll_l(str str ptr) @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) @ stub _strerror_s @ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l -@ cdecl _strlwr(str) MSVCRT__strlwr +@ cdecl _stricmp(str str) +@ cdecl _stricmp_l(str str ptr) +@ cdecl _stricoll(str str) +@ cdecl _stricoll_l(str str ptr) +@ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) -@ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s -@ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _strlwr_s(ptr long) +@ cdecl _strlwr_s_l(ptr long ptr) +@ cdecl _strncoll(str str long) +@ cdecl _strncoll_l(str str long ptr) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicmp_l(str str long ptr) +@ cdecl _strnicoll(str str long) +@ cdecl _strnicoll_l(str str long ptr) +@ cdecl _strnset(str long long) +@ cdecl _strnset_s(str long long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ stub _strset_s @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) -@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l -@ cdecl _strupr_s(str long) MSVCRT__strupr_s -@ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strtod_l(str ptr ptr) +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) +@ cdecl _strtol_l(str ptr long ptr) +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) +@ cdecl _strtoul_l(str ptr long ptr) +@ cdecl _strupr(str) +@ cdecl _strupr_l(str ptr) +@ cdecl _strupr_s(str long) +@ cdecl _strupr_s_l(str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) +@ cdecl _swab(str str long) @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c @ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @@ -1400,13 +1400,13 @@ @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa -@ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s +@ cdecl _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) ntdll._ultoa -@ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow -@ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s +@ cdecl _ultow_s(long ptr long long) @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @@ -1637,9 +1637,9 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=!i386 atan2f(float float) MSVCRT_atan2f @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl bsearch_s(ptr ptr long long ptr ptr) @ cdecl btowc(long) @@ -1749,7 +1749,7 @@ @ 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 memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @@ -1796,33 +1796,33 @@ @ varargs sscanf(str str) @ varargs sscanf_s(str str) @ cdecl strcat(str str) -@ cdecl strcat_s(str long str) MSVCRT_strcat_s +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcpy_s(ptr long str) +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strerror_s(ptr long long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ 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 strncat(str str long) +@ cdecl strncat_s(str long str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) @ 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 +@ cdecl strnlen(str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtok_s(ptr str ptr) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) @ varargs swscanf_s(wstr wstr) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bca7fbf8931..059629e662d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -823,7 +823,7 @@ @ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception @ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception @ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -1004,7 +1004,7 @@ @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ cdecl __strncnt(str long) MSVCRT___strncnt +@ cdecl __strncnt(str long) @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @@ -1039,17 +1039,17 @@ @ stub _aligned_recalloc @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l -@ cdecl _atof_l(str ptr) MSVCRT__atof_l -@ cdecl _atoflt(ptr str) MSVCRT__atoflt -@ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l -@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ cdecl _atol_l(str ptr) MSVCRT__atol_l -@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl -@ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l +@ cdecl _atodbl(ptr str) +@ cdecl _atodbl_l(ptr str ptr) +@ cdecl _atof_l(str ptr) +@ cdecl _atoflt(ptr str) +@ cdecl _atoflt_l(ptr str ptr) +@ cdecl -ret64 _atoi64(str) +@ cdecl -ret64 _atoi64_l(str ptr) +@ cdecl _atoi_l(str ptr) +@ cdecl _atol_l(str ptr) +@ cdecl _atoldbl(ptr str) +@ cdecl _atoldbl_l(ptr str ptr) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -1274,9 +1274,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) MSVCRT__hypotf @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) @ stub _initptd @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @@ -1377,10 +1377,10 @@ @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) -@ cdecl _itoa(long ptr long) MSVCRT__itoa -@ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s +@ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -@ cdecl _itow_s(long ptr long long) MSVCRT__itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @@ -1419,9 +1419,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -@ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s +@ cdecl _ltow_s(long ptr long long) @ 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) malloc @@ -1562,8 +1562,8 @@ @ stub _mbsupr_s_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 +@ cdecl _memicmp(str str long) +@ cdecl _memicmp_l(str str long ptr) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 @ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 @@ -1691,47 +1691,47 @@ @ cdecl _stat64i32(str ptr) MSVCRT__stat64i32 @ cdecl _statusfp() @ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l +@ cdecl _strcoll_l(str str ptr) @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) @ stub _strerror_s @ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l -@ cdecl _strlwr(str) MSVCRT__strlwr +@ cdecl _stricmp(str str) +@ cdecl _stricmp_l(str str ptr) +@ cdecl _stricoll(str str) +@ cdecl _stricoll_l(str str ptr) +@ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) -@ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s -@ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _strlwr_s(ptr long) +@ cdecl _strlwr_s_l(ptr long ptr) +@ cdecl _strncoll(str str long) +@ cdecl _strncoll_l(str str long ptr) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicmp_l(str str long ptr) +@ cdecl _strnicoll(str str long) +@ cdecl _strnicoll_l(str str long ptr) +@ cdecl _strnset(str long long) +@ cdecl _strnset_s(str long long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ stub _strset_s @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) -@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l -@ cdecl _strupr_s(str long) MSVCRT__strupr_s -@ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strtod_l(str ptr ptr) +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) +@ cdecl _strtol_l(str ptr long ptr) +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) +@ cdecl _strtoul_l(str ptr long ptr) +@ cdecl _strupr(str) +@ cdecl _strupr_l(str ptr) +@ cdecl _strupr_s(str long) +@ cdecl _strupr_s_l(str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) +@ cdecl _swab(str str long) @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c @ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @@ -1757,13 +1757,13 @@ @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa -@ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s +@ cdecl _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) ntdll._ultoa -@ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow -@ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s +@ cdecl _ultow_s(long ptr long long) @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @@ -1994,9 +1994,9 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=!i386 atan2f(float float) MSVCRT_atan2f @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl bsearch_s(ptr ptr long long ptr ptr) @ cdecl btowc(long) @@ -2107,7 +2107,7 @@ @ 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 memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @@ -2154,33 +2154,33 @@ @ varargs sscanf(str str) @ varargs sscanf_s(str str) @ cdecl strcat(str str) -@ cdecl strcat_s(str long str) MSVCRT_strcat_s +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcpy_s(ptr long str) +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strerror_s(ptr long long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ 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 strncat(str str long) +@ cdecl strncat_s(str long str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) @ 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 +@ cdecl strnlen(str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtok_s(ptr str ptr) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) @ varargs swscanf_s(wstr wstr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 9188e8cdd06..459ef43182c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -805,7 +805,7 @@ @ cdecl -arch=arm ?what@exception@std@@UBAPBDXZ(ptr) what_exception @ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception @ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -994,7 +994,7 @@ @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ cdecl __strncnt(str long) MSVCRT___strncnt +@ cdecl __strncnt(str long) @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @@ -1029,18 +1029,18 @@ @ stub _aligned_recalloc @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l -@ cdecl _atof_l(str ptr) MSVCRT__atof_l -@ cdecl _atoflt(ptr str) MSVCRT__atoflt -@ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l -@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ cdecl _atol_l(str ptr) MSVCRT__atol_l -@ 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 _atodbl(ptr str) +@ cdecl _atodbl_l(ptr str ptr) +@ cdecl _atof_l(str ptr) +@ cdecl _atoflt(ptr str) +@ cdecl _atoflt_l(ptr str ptr) +@ cdecl -ret64 _atoi64(str) +@ cdecl -ret64 _atoi64_l(str ptr) +@ cdecl _atoi_l(str ptr) +@ cdecl _atol_l(str ptr) +@ cdecl _atoldbl(ptr str) +@ cdecl _atoldbl_l(ptr str ptr) +@ cdecl -ret64 _atoll_l(str ptr) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -1274,9 +1274,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) MSVCRT__hypotf @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) @ stub _initptd @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @@ -1383,10 +1383,10 @@ @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) -@ cdecl _itoa(long ptr long) MSVCRT__itoa -@ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s +@ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -@ cdecl _itow_s(long ptr long long) MSVCRT__itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @@ -1429,9 +1429,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -@ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s +@ cdecl _ltow_s(long ptr long long) @ 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) malloc @@ -1572,8 +1572,8 @@ @ stub _mbsupr_s_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 +@ cdecl _memicmp(str str long) +@ cdecl _memicmp_l(str str long ptr) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 @ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 @@ -1702,53 +1702,53 @@ @ cdecl _stat64i32(str ptr) MSVCRT__stat64i32 @ cdecl _statusfp() @ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l +@ cdecl _strcoll_l(str str ptr) @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) @ stub _strerror_s @ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l -@ cdecl _strlwr(str) MSVCRT__strlwr +@ cdecl _stricmp(str str) +@ cdecl _stricmp_l(str str ptr) +@ cdecl _stricoll(str str) +@ cdecl _stricoll_l(str str ptr) +@ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) -@ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s -@ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _strlwr_s(ptr long) +@ cdecl _strlwr_s_l(ptr long ptr) +@ cdecl _strncoll(str str long) +@ cdecl _strncoll_l(str str long ptr) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicmp_l(str str long ptr) +@ cdecl _strnicoll(str str long) +@ cdecl _strnicoll_l(str str long ptr) +@ cdecl _strnset(str long long) +@ cdecl _strnset_s(str long long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ stub _strset_s @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) -@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl _strtof_l(str ptr ptr) MSVCRT__strtof_l -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ cdecl _strtold_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl -ret64 _strtoumax_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l -@ cdecl _strupr_s(str long) MSVCRT__strupr_s -@ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strtod_l(str ptr ptr) +@ cdecl _strtof_l(str ptr ptr) +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) _strtoi64_l +@ cdecl _strtol_l(str ptr long ptr) +@ cdecl _strtold_l(str ptr ptr) _strtod_l +@ cdecl -ret64 _strtoll_l(str ptr long ptr) _strtoi64_l +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) +@ cdecl _strtoul_l(str ptr long ptr) +@ cdecl -ret64 _strtoull_l(str ptr long ptr) _strtoui64_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) _strtoui64_l +@ cdecl _strupr(str) +@ cdecl _strupr_l(str ptr) +@ cdecl _strupr_s(str long) +@ cdecl _strupr_s_l(str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) +@ cdecl _swab(str str long) @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c @ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @@ -1774,13 +1774,13 @@ @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa -@ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s +@ cdecl _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) ntdll._ultoa -@ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow -@ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s +@ cdecl _ultow_s(long ptr long long) @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @@ -2029,10 +2029,10 @@ @ cdecl atanhf(float) MSVCR120_atanhf @ cdecl atanhl(double) MSVCR120_atanhl @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol -@ cdecl -ret64 atoll(str) MSVCRT_atoll +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) +@ cdecl -ret64 atoll(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl bsearch_s(ptr ptr long long ptr ptr) @ cdecl btowc(long) @@ -2284,7 +2284,7 @@ @ 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 memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @@ -2364,39 +2364,39 @@ @ varargs sscanf(str str) @ varargs sscanf_s(str str) @ cdecl strcat(str str) -@ cdecl strcat_s(str long str) MSVCRT_strcat_s +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcpy_s(ptr long str) +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strerror_s(ptr long long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ 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 strncat(str str long) +@ cdecl strncat_s(str long str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) @ 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 +@ cdecl strnlen(str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtof(str ptr) MSVCRT_strtof -@ cdecl -ret64 strtoimax(str ptr long) MSVCRT_strtoi64 -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtold(str ptr) MSVCRT_strtod -@ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 strtoumax(str ptr long) MSVCRT_strtoui64 -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtof(str ptr) +@ cdecl -ret64 strtoimax(str ptr long) _strtoi64 +@ cdecl strtok(str str) +@ cdecl strtok_s(ptr str ptr) +@ cdecl strtol(str ptr long) +@ cdecl strtold(str ptr) strtod +@ cdecl -ret64 strtoll(str ptr long) _strtoi64 +@ cdecl strtoul(str ptr long) +@ cdecl -ret64 strtoull(str ptr long) _strtoui64 +@ cdecl -ret64 strtoumax(str ptr long) _strtoui64 +@ cdecl strxfrm(ptr str long) @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) @ varargs swscanf_s(wstr wstr) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index c82efc73701..258924b0e30 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -90,7 +90,7 @@ @ cdecl ?unexpected@@YAXXZ() unexpected @ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception @ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -234,9 +234,9 @@ @ cdecl _aligned_realloc(ptr long long) @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl +@ cdecl _atodbl(ptr str) +@ cdecl -ret64 _atoi64(str) +@ cdecl _atoldbl(ptr str) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -395,7 +395,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ cdecl _isnan(double) MSVCRT__isnan -@ cdecl _itoa(long ptr long) MSVCRT__itoa +@ cdecl _itoa(long ptr long) @ cdecl _itow(long ptr long) ntdll._itow @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @@ -438,7 +438,7 @@ @ cdecl _mbscpy(ptr str) @ cdecl _mbscspn(str str) @ cdecl _mbsdec(ptr ptr) -@ cdecl _mbsdup(str) MSVCRT__strdup +@ cdecl _mbsdup(str) _strdup @ cdecl _mbsicmp(str str) @ cdecl _mbsicoll(str str) @ cdecl _mbsinc(str) @@ -473,7 +473,7 @@ @ cdecl _mbstrlen(str) @ cdecl _mbsupr(str) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy -@ cdecl _memicmp(str str long) MSVCRT__memicmp +@ cdecl _memicmp(str str long) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mktemp(str) MSVCRT__mktemp @ cdecl _mktime64(ptr) MSVCRT__mktime64 @@ -544,24 +544,24 @@ @ cdecl _stat64(str ptr) MSVCRT_stat64 @ cdecl _stati64(str ptr) MSVCRT_stati64 @ cdecl _statusfp() -@ cdecl _strcmpi(str str) MSVCRT__stricmp +@ cdecl _strcmpi(str str) _stricmp @ cdecl _strdate(ptr) MSVCRT__strdate -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _strlwr(str) MSVCRT__strlwr -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _stricmp(str str) +@ cdecl _stricoll(str str) +@ cdecl _strlwr(str) +@ cdecl _strncoll(str str long) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicoll(str str long) +@ cdecl _strnset(str long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ cdecl _strtime(ptr) MSVCRT__strtime -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl _strupr(str) +@ cdecl _swab(str str long) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -690,9 +690,9 @@ @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl calloc(long long) @ cdecl ceil(double) MSVCRT_ceil @@ -779,7 +779,7 @@ @ cdecl mblen(ptr long) @ cdecl mbstowcs(ptr str long) @ cdecl mbtowc(ptr str long) -@ cdecl memchr(ptr long long) MSVCRT_memchr +@ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memmove(ptr ptr long) @@ -815,24 +815,24 @@ @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ cdecl strncmp(str str long) MSVCRT_strncmp -@ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) MSVCRT_strpbrk -@ cdecl strrchr(str long) MSVCRT_strrchr +@ cdecl strncat(str str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf(ptr wstr) MSVCRT_swprintf @ varargs swscanf(wstr wstr) @ cdecl system(str) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 6f529bd5c62..827fd220323 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -84,7 +84,7 @@ @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) MSVCRT_vsnwprintf @ thiscall -arch=i386 ?what@exception@@UBEPBDXZ(ptr) what_exception @ cdecl -arch=win64 ?what@exception@@UEBAPEBDXZ(ptr) what_exception -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -229,9 +229,9 @@ @ cdecl _aligned_realloc(ptr long long) @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl +@ cdecl _atodbl(ptr str) @ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl +@ cdecl _atoldbl(ptr str) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -390,7 +390,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ cdecl _isnan(double) MSVCRT__isnan -@ cdecl _itoa(long ptr long) MSVCRT__itoa +@ cdecl _itoa(long ptr long) @ cdecl _itow(long ptr long) ntdll._itow @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @@ -433,7 +433,7 @@ @ cdecl _mbscpy(ptr str) @ cdecl _mbscspn(str str) @ cdecl _mbsdec(ptr ptr) -@ cdecl _mbsdup(str) MSVCRT__strdup +@ cdecl _mbsdup(str) _strdup @ cdecl _mbsicmp(str str) @ cdecl _mbsicoll(str str) @ cdecl _mbsinc(str) @@ -468,7 +468,7 @@ @ cdecl _mbstrlen(str) @ cdecl _mbsupr(str) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy -@ cdecl _memicmp(str str long) MSVCRT__memicmp +@ cdecl _memicmp(str str long) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mktemp(str) MSVCRT__mktemp @ cdecl _mktime64(ptr) MSVCRT__mktime64 @@ -540,24 +540,24 @@ @ cdecl _stat64(str ptr) MSVCRT_stat64 @ cdecl _stati64(str ptr) MSVCRT_stati64 @ cdecl _statusfp() -@ cdecl _strcmpi(str str) MSVCRT__stricmp +@ cdecl _strcmpi(str str) _stricmp @ cdecl _strdate(ptr) MSVCRT__strdate -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _strlwr(str) MSVCRT__strlwr -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _stricmp(str str) +@ cdecl _stricoll(str str) +@ cdecl _strlwr(str) +@ cdecl _strncoll(str str long) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicoll(str str long) +@ cdecl _strnset(str long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ cdecl _strtime(ptr) MSVCRT__strtime -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl _strupr(str) +@ cdecl _swab(str str long) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -686,9 +686,9 @@ @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl calloc(long long) @ cdecl ceil(double) MSVCRT_ceil @@ -775,7 +775,7 @@ @ cdecl mblen(ptr long) @ cdecl mbstowcs(ptr str long) @ cdecl mbtowc(ptr str long) -@ cdecl memchr(ptr long long) MSVCRT_memchr +@ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memmove(ptr ptr long) @@ -811,24 +811,24 @@ @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ cdecl strncmp(str str long) MSVCRT_strncmp -@ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) MSVCRT_strpbrk -@ cdecl strrchr(str long) MSVCRT_strrchr +@ cdecl strncat(str str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf(ptr wstr) MSVCRT_swprintf @ varargs swscanf(wstr wstr) @ cdecl system(str) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e9a9d0c0151..ae8b0f35080 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -133,7 +133,7 @@ @ stub @_calloc_crt@8 @ cdecl @_malloc_crt@4(long) malloc @ stub @_realloc_crt@8 -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -305,7 +305,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ cdecl __strncnt(str long) MSVCRT___strncnt +@ cdecl __strncnt(str long) @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @@ -355,17 +355,17 @@ @ stub _aligned_recalloc @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l -@ cdecl _atof_l(str ptr) MSVCRT__atof_l -@ cdecl _atoflt(ptr str) MSVCRT__atoflt -@ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l -@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ cdecl _atol_l(str ptr) MSVCRT__atol_l -@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl -@ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l +@ cdecl _atodbl(ptr str) +@ cdecl _atodbl_l(ptr str ptr) +@ cdecl _atof_l(str ptr) +@ cdecl _atoflt(ptr str) +@ cdecl _atoflt_l(ptr str ptr) +@ cdecl -ret64 _atoi64(str) +@ cdecl -ret64 _atoi64_l(str ptr) +@ cdecl _atoi_l(str ptr) +@ cdecl _atol_l(str ptr) +@ cdecl _atoldbl(ptr str) +@ cdecl _atoldbl_l(ptr str ptr) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -601,9 +601,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) MSVCRT__hypotf @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) @ stub _initptd @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @@ -703,10 +703,10 @@ @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) -@ cdecl _itoa(long ptr long) MSVCRT__itoa -@ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s +@ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -@ cdecl _itow_s(long ptr long long) MSVCRT__itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @@ -734,9 +734,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -@ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s +@ cdecl _ltow_s(long ptr long long) @ 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) malloc @@ -877,8 +877,8 @@ @ stub _mbsupr_s_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 +@ cdecl _memicmp(str str long) +@ cdecl _memicmp_l(str str long ptr) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 @ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 @@ -1014,47 +1014,47 @@ @ cdecl _stat64i32(str ptr) MSVCRT__stat64i32 @ cdecl _statusfp() @ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l +@ cdecl _strcoll_l(str str ptr) @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) @ stub _strerror_s @ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l -@ cdecl _strlwr(str) MSVCRT__strlwr +@ cdecl _stricmp(str str) +@ cdecl _stricmp_l(str str ptr) +@ cdecl _stricoll(str str) +@ cdecl _stricoll_l(str str ptr) +@ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) -@ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s -@ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _strlwr_s(ptr long) +@ cdecl _strlwr_s_l(ptr long ptr) +@ cdecl _strncoll(str str long) +@ cdecl _strncoll_l(str str long ptr) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicmp_l(str str long ptr) +@ cdecl _strnicoll(str str long) +@ cdecl _strnicoll_l(str str long ptr) +@ cdecl _strnset(str long long) +@ cdecl _strnset_s(str long long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ stub _strset_s @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) -@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l -@ cdecl _strupr_s(str long) MSVCRT__strupr_s -@ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strtod_l(str ptr ptr) +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) +@ cdecl _strtol_l(str ptr long ptr) +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) +@ cdecl _strtoul_l(str ptr long ptr) +@ cdecl _strupr(str) +@ cdecl _strupr_l(str ptr) +@ cdecl _strupr_s(str long) +@ cdecl _strupr_s_l(str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) +@ cdecl _swab(str str long) @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c @ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @@ -1080,13 +1080,13 @@ @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa -@ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s +@ cdecl _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) ntdll._ultoa -@ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow -@ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s +@ cdecl _ultow_s(long ptr long long) @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @@ -1320,9 +1320,9 @@ @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=!i386 atan2f(float float) MSVCRT_atan2f @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl bsearch_s(ptr ptr long long ptr ptr) @ cdecl btowc(long) @@ -1430,7 +1430,7 @@ @ 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 memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @@ -1477,33 +1477,33 @@ @ varargs sscanf(str str) @ varargs sscanf_s(str str) @ cdecl strcat(str str) -@ cdecl strcat_s(str long str) MSVCRT_strcat_s +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcpy_s(ptr long str) +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strerror_s(ptr long long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ 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 strncat(str str long) +@ cdecl strncat_s(str long str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) @ 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 +@ cdecl strnlen(str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtok_s(ptr str ptr) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) @ varargs swscanf_s(wstr wstr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 78dc9cfb332..5f7d5356287 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -130,7 +130,7 @@ @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD@Z(ptr long wstr ptr) MSVCRT_vsnwprintf @ thiscall -arch=i386 ?what@exception@std@@UBEPBDXZ(ptr) what_exception @ cdecl -arch=win64 ?what@exception@std@@UEBAPEBDXZ(ptr) what_exception -@ cdecl -norelay $I10_OUTPUT(double long long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long long ptr) I10_OUTPUT @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -289,7 +289,7 @@ @ stub __set_flsgetvalue @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ cdecl __strncnt(str long) MSVCRT___strncnt +@ cdecl __strncnt(str long) @ varargs __swprintf_l(ptr wstr ptr) MSVCRT___swprintf_l @ cdecl __sys_errlist() @ cdecl __sys_nerr() @@ -339,17 +339,17 @@ @ stub _aligned_recalloc @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l -@ cdecl _atof_l(str ptr) MSVCRT__atof_l -@ cdecl _atoflt(ptr str) MSVCRT__atoflt -@ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l -@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ cdecl _atol_l(str ptr) MSVCRT__atol_l -@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl -@ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l +@ cdecl _atodbl(ptr str) +@ cdecl _atodbl_l(ptr str ptr) +@ cdecl _atof_l(str ptr) +@ cdecl _atoflt(ptr str) +@ cdecl _atoflt_l(ptr str ptr) +@ cdecl -ret64 _atoi64(str) +@ cdecl -ret64 _atoi64_l(str ptr) +@ cdecl _atoi_l(str ptr) +@ cdecl _atol_l(str ptr) +@ cdecl _atoldbl(ptr str) +@ cdecl _atoldbl_l(ptr str ptr) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -579,9 +579,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) MSVCRT__hypotf @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) @ stub _initptd @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @@ -681,10 +681,10 @@ @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) -@ cdecl _itoa(long ptr long) MSVCRT__itoa -@ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s +@ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -@ cdecl _itow_s(long ptr long long) MSVCRT__itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @@ -712,9 +712,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -@ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s +@ cdecl _ltow_s(long ptr long long) @ 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) malloc @@ -855,8 +855,8 @@ @ stub _mbsupr_s_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 +@ cdecl _memicmp(str str long) +@ cdecl _memicmp_l(str str long ptr) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 @ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 @@ -989,47 +989,47 @@ @ cdecl _stat64i32(str ptr) MSVCRT__stat64i32 @ cdecl _statusfp() @ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l +@ cdecl _strcoll_l(str str ptr) @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) @ stub _strerror_s @ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l -@ cdecl _strlwr(str) MSVCRT__strlwr +@ cdecl _stricmp(str str) +@ cdecl _stricmp_l(str str ptr) +@ cdecl _stricoll(str str) +@ cdecl _stricoll_l(str str ptr) +@ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) -@ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s -@ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _strlwr_s(ptr long) +@ cdecl _strlwr_s_l(ptr long ptr) +@ cdecl _strncoll(str str long) +@ cdecl _strncoll_l(str str long ptr) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicmp_l(str str long ptr) +@ cdecl _strnicoll(str str long) +@ cdecl _strnicoll_l(str str long ptr) +@ cdecl _strnset(str long long) +@ cdecl _strnset_s(str long long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ stub _strset_s @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) -@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l -@ cdecl _strupr_s(str long) MSVCRT__strupr_s -@ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strtod_l(str ptr ptr) +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) +@ cdecl _strtol_l(str ptr long ptr) +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) +@ cdecl _strtoul_l(str ptr long ptr) +@ cdecl _strupr(str) +@ cdecl _strupr_l(str ptr) +@ cdecl _strupr_s(str long) +@ cdecl _strupr_s_l(str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) +@ cdecl _swab(str str long) @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c @ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @@ -1055,13 +1055,13 @@ @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa -@ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s +@ cdecl _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) ntdll._ultoa -@ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow -@ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s +@ cdecl _ultow_s(long ptr long long) @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @@ -1292,9 +1292,9 @@ @ cdecl -arch=!i386 atan2f(float float) MSVCRT_atan2f @ cdecl -arch=!i386 atanf(float) MSVCRT_atanf @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl bsearch_s(ptr ptr long long ptr ptr) @ cdecl btowc(long) @@ -1402,7 +1402,7 @@ @ 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 memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @@ -1449,33 +1449,33 @@ @ varargs sscanf(str str) @ varargs sscanf_s(str str) @ cdecl strcat(str str) -@ cdecl strcat_s(str long str) MSVCRT_strcat_s +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcpy_s(ptr long str) +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strerror_s(ptr long long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ 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 strncat(str str long) +@ cdecl strncat_s(str long str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) @ 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 +@ cdecl strnlen(str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtok_s(ptr str ptr) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) @ varargs swscanf_s(wstr wstr) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index dcaf0370559..b483fb840f7 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -407,7 +407,7 @@ void msvcrt_init_args(void) { OSVERSIONINFOW osvi; - MSVCRT__acmdln = MSVCRT__strdup( GetCommandLineA() ); + MSVCRT__acmdln = _strdup( GetCommandLineA() ); MSVCRT__wcmdln = MSVCRT__wcsdup( GetCommandLineW() ); initial_wargv = cmdline_to_argv( GetCommandLineW(), &initial_argc ); MSVCRT___argc = initial_argc; diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 069c86c889c..d565db95230 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -875,7 +875,7 @@ char* CDECL MSVCRT__getdcwd(int drive, char * buf, int size) TRACE(":returning '%s'\n", dir); if (!buf) - return MSVCRT__strdup(dir); /* allocate */ + return _strdup(dir); /* allocate */ strcpy(buf,dir); } diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 636de6b7203..aaea2b13d0f 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -37,7 +37,7 @@ char * CDECL getenv(const char *name) { char *str = *env; char *pos = strchr(str,'='); - if (pos && ((pos - str) == length) && !MSVCRT__strnicmp(str,name,length)) + if (pos && ((pos - str) == length) && !_strnicmp(str,name,length)) { TRACE("(%s): got %s\n", debugstr_a(name), debugstr_a(pos + 1)); return pos + 1; diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 0992de5b128..3cc8b9c92ea 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -488,7 +488,7 @@ void CDECL __std_exception_copy(const struct __std_exception_data *src, TRACE("(%p %p)\n", src, dst); if(src->dofree && src->what) { - dst->what = MSVCRT__strdup(src->what); + dst->what = _strdup(src->what); dst->dofree = 1; } else { dst->what = src->what; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1b84056927c..a0fa1788767 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3286,7 +3286,7 @@ char * CDECL MSVCRT__tempnam(const char *dir, const char *prefix) { TRACE("got name (%s)\n",tmpbuf); DeleteFileA(tmpbuf); - return MSVCRT__strdup(tmpbuf); + return _strdup(tmpbuf); } TRACE("failed (%d)\n",GetLastError()); return NULL; @@ -5060,7 +5060,7 @@ FILE* CDECL MSVCRT_tmpfile(void) file->_flag = 0; file = NULL; } - else file->_tmpfname = MSVCRT__strdup(filename); + else file->_tmpfname = _strdup(filename); } if(fd != -1 && !file) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1f72efcf196..1966aa733ed 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -205,7 +205,7 @@ static void remap_synonym(char *name) unsigned int i; for (i = 0; i < ARRAY_SIZE(_country_synonyms); i += 2) { - if (!MSVCRT__stricmp(_country_synonyms[i],name)) + if (!_stricmp(_country_synonyms[i],name)) { TRACE(":Mapping synonym %s to %s\n",name,_country_synonyms[i+1]); strcpy(name, _country_synonyms[i+1]); @@ -247,9 +247,9 @@ static int compare_info(LCID lcid, DWORD flags, char* buff, const char* cmp, BOO /* Partial matches are only allowed on language/country names */ len = strlen(cmp); if(exact || len<=3) - return !MSVCRT__stricmp(cmp, buff); + return !_stricmp(cmp, buff); else - return !MSVCRT__strnicmp(cmp, buff, len); + return !_strnicmp(cmp, buff, len); } static BOOL CALLBACK @@ -361,7 +361,7 @@ LCID locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *sname) search.allow_sname = TRUE; } - if(!MSVCRT__stricmp(search.search_country, "China")) + if(!_stricmp(search.search_country, "China")) strcpy(search.search_country, "People's Republic of China"); EnumResourceLanguagesA(GetModuleHandleA("KERNEL32"), (LPSTR)RT_STRING, @@ -382,21 +382,21 @@ LCID locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *sname) } /* Obtain code page */ - if (!cp || !cp[1] || !MSVCRT__strnicmp(cp, ".ACP", 4)) { + if (!cp || !cp[1] || !_strnicmp(cp, ".ACP", 4)) { GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&locale_cp, sizeof(DWORD)/sizeof(WCHAR)); if (!locale_cp) locale_cp = GetACP(); - } else if (!MSVCRT__strnicmp(cp, ".OCP", 4)) { + } else if (!_strnicmp(cp, ".OCP", 4)) { GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, (WCHAR *)&locale_cp, sizeof(DWORD)/sizeof(WCHAR)); #if _MSVCR_VER >= 140 - } else if (!MSVCRT__strnicmp(cp, ".UTF-8", 6) - || !MSVCRT__strnicmp(cp, ".UTF8", 5)) { + } else if (!_strnicmp(cp, ".UTF-8", 6) + || !_strnicmp(cp, ".UTF8", 5)) { locale_cp = CP_UTF8; #endif } else { - locale_cp = MSVCRT_atoi(cp + 1); + locale_cp = atoi(cp + 1); } if (!IsValidCodePage(locale_cp)) return -1; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 56de6b9a69b..11a1be29705 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -126,7 +126,7 @@ static inline size_t u_strlen( const unsigned char *str ) static inline unsigned char* u_strncat( unsigned char* dst, const unsigned char* src, size_t len ) { - return (unsigned char*)MSVCRT_strncat( (char*)dst, (const char*)src, len); + return (unsigned char*)strncat( (char*)dst, (const char*)src, len); } static inline int u_strcmp( const unsigned char *s1, const unsigned char *s2 ) @@ -136,17 +136,17 @@ static inline int u_strcmp( const unsigned char *s1, const unsigned char *s2 ) static inline int u_strcasecmp( const unsigned char *s1, const unsigned char *s2 ) { - return MSVCRT__stricmp( (const char*)s1, (const char*)s2 ); + return _stricmp( (const char*)s1, (const char*)s2 ); } static inline int u_strncmp( const unsigned char *s1, const unsigned char *s2, size_t len ) { - return MSVCRT_strncmp( (const char*)s1, (const char*)s2, len ); + return strncmp( (const char*)s1, (const char*)s2, len ); } static inline int u_strncasecmp( const unsigned char *s1, const unsigned char *s2, size_t len ) { - return MSVCRT__strnicmp( (const char*)s1, (const char*)s2, len ); + return _strnicmp( (const char*)s1, (const char*)s2, len ); } static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x ) @@ -156,7 +156,7 @@ static inline unsigned char *u_strchr( const unsigned char *s, unsigned char x ) static inline unsigned char *u_strrchr( const unsigned char *s, unsigned char x ) { - return (unsigned char*) MSVCRT_strrchr( (const char*)s, x ); + return (unsigned char*) strrchr( (const char*)s, x ); } static inline unsigned char *u__strset( unsigned char *s, unsigned char c ) @@ -166,7 +166,7 @@ static inline unsigned char *u__strset( unsigned char *s, unsigned char c ) static inline unsigned char *u__strnset( unsigned char *s, unsigned char c, size_t len ) { - return (unsigned char*) MSVCRT__strnset( (char*)s, c, len ); + return (unsigned char*) _strnset( (char*)s, c, len ); } /********************************************************************* @@ -628,7 +628,7 @@ size_t CDECL _mbsnlen_l(const unsigned char *str, mbcinfo = locale->mbcinfo; if(!mbcinfo->ismbcodepage) - return MSVCRT_strnlen((const char*)str, maxsize); + return strnlen((const char*)str, maxsize); while(imbcinfo; if(!mbcinfo->ismbcodepage) - return MSVCRT__strnicoll_l((const char*)str1, (const char*)str2, len, locale); + return _strnicoll_l((const char*)str1, (const char*)str2, len, locale); return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; } @@ -995,7 +995,7 @@ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, siz mbcinfo = locale->mbcinfo; if(!mbcinfo->ismbcodepage) - return MSVCRT__strncoll_l((const char*)str1, (const char*)str2, len, locale); + return _strncoll_l((const char*)str1, (const char*)str2, len, locale); return CompareStringA(mbcinfo->mblcid, 0, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; } @@ -1271,7 +1271,7 @@ unsigned char* CDECL _mbscpy( unsigned char *dst, const unsigned char *src ) */ unsigned char * CDECL _mbsstr(const unsigned char *haystack, const unsigned char *needle) { - return (unsigned char *)MSVCRT_strstr( (const char *)haystack, (const char *)needle ); + return (unsigned char *)strstr( (const char *)haystack, (const char *)needle ); } /********************************************************************* @@ -1339,7 +1339,7 @@ unsigned char* CDECL _mbstok_s_l(unsigned char *str, const unsigned char *delim, mbcinfo = get_mbcinfo(); if(!mbcinfo->ismbcodepage) - return (unsigned char*)MSVCRT_strtok_s((char*)str, (const char*)delim, (char**)ctx); + return (unsigned char*)strtok_s((char*)str, (const char*)delim, (char**)ctx); if(!str) str = *ctx; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 23e77931146..67e58426e02 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" +#undef strncpy #define DBL80_MAX_10_EXP 4932 #define DBL80_MIN_10_EXP -4951 @@ -601,7 +602,6 @@ struct MSVCRT__stat64 { #define MSVCRT__NLSCMPERROR ((unsigned int)0x7fffffff) -int __cdecl MSVCRT_atoi(const char *str); int __cdecl MSVCRT_iswalpha(wint_t); int __cdecl MSVCRT_iswspace(wint_t); int __cdecl MSVCRT_iswdigit(wint_t); @@ -664,8 +664,6 @@ 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); void __cdecl MSVCRT__searchenv(const char*,const char*,char*); int __cdecl MSVCRT__getdrive(void); -char* __cdecl MSVCRT__strdup(const char*); -char* __cdecl MSVCRT__strnset(char*,int,size_t); char* __cdecl _strset(char*,int); int __cdecl _ungetch(int); int __cdecl _cputs(const char*); @@ -674,7 +672,6 @@ int WINAPIV _cwprintf(const wchar_t*,...); char*** __cdecl MSVCRT___p__environ(void); int* __cdecl __p___mb_cur_max(void); wchar_t* __cdecl MSVCRT__wcsdup(const wchar_t*); -size_t __cdecl MSVCRT_strnlen(const char *,size_t); size_t __cdecl MSVCRT_wcsnlen(const wchar_t*,size_t); wchar_t*** __cdecl MSVCRT___p__wenviron(void); INT __cdecl MSVCRT_wctomb(char*,wchar_t); @@ -689,17 +686,7 @@ int __cdecl MSVCRT__pipe(int *, unsigned int, int); void __cdecl MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*); int __cdecl MSVCRT__towupper_l(wint_t,_locale_t); int __cdecl MSVCRT__towlower_l(wint_t,_locale_t); -int __cdecl MSVCRT__stricmp(const char*, const char*); -int __cdecl MSVCRT__strnicmp(const char*, const char*, size_t); -int __cdecl MSVCRT__strnicoll_l(const char*, const char*, size_t, _locale_t); -int __cdecl MSVCRT__strncoll_l(const char*, const char*, size_t, _locale_t); -char* __cdecl MSVCRT_strncat(char*,const char *,size_t); -int __cdecl MSVCRT_strncmp(const char*, const char*, size_t); 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); -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); int __cdecl MSVCRT__wcsnicmp(const wchar_t*, const wchar_t*, size_t); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1f038800ac4..f10e339468c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1,6 +1,6 @@ # msvcrt.dll - MS VC++ Run Time Library -@ cdecl -norelay $I10_OUTPUT(double long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long ptr) I10_OUTPUT @ cdecl -arch=arm ??0__non_rtti_object@std@@QAA@ABV01@@Z(ptr ptr) __non_rtti_object_copy_ctor @ thiscall -arch=i386 ??0__non_rtti_object@@QAE@ABV0@@Z(ptr ptr) __non_rtti_object_copy_ctor @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr ptr) __non_rtti_object_copy_ctor @@ -281,7 +281,7 @@ @ cdecl __set_app_type(long) @ extern __setlc_active MSVCRT___setlc_active @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr -@ cdecl __strncnt(str long) MSVCRT___strncnt +@ cdecl __strncnt(str long) @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) @@ -327,16 +327,16 @@ # stub _aligned_realloc_dbg(ptr long long str long) @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l -@ cdecl _atof_l(str ptr) MSVCRT__atof_l -@ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l -@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ cdecl _atol_l(str ptr) MSVCRT__atol_l -@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl -@ cdecl _atoldbl_l(ptr str ptr) MSVCRT__atoldbl_l +@ cdecl _atodbl(ptr str) +@ cdecl _atodbl_l(ptr str ptr) +@ cdecl _atof_l(str ptr) +@ cdecl _atoflt_l(ptr str ptr) +@ cdecl -ret64 _atoi64(str) +@ cdecl -ret64 _atoi64_l(str ptr) +@ cdecl _atoi_l(str ptr) +@ cdecl _atol_l(str ptr) +@ cdecl _atoldbl(ptr str) +@ cdecl _atoldbl_l(ptr str ptr) @ cdecl _beep(long long) @ cdecl _beginthread (ptr long ptr) @ cdecl _beginthreadex (ptr long ptr ptr long ptr) @@ -551,9 +551,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) MSVCRT__hypotf @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ stub -arch=i386 _inp(long) @@ -647,10 +647,10 @@ @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) -@ cdecl _itoa(long ptr long) MSVCRT__itoa -@ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s +@ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -@ cdecl _itow_s(long ptr long long) MSVCRT__itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @@ -678,9 +678,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -@ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s +@ cdecl _ltow_s(long ptr long long) @ cdecl _makepath(ptr str str str str) MSVCRT__makepath @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s # stub _malloc_dbg(long long str long) @@ -728,7 +728,7 @@ @ cdecl _mbscspn_l(str str ptr) @ cdecl _mbsdec(ptr ptr) # stub _mbsdec_l(ptr ptr ptr) -@ cdecl _mbsdup(str) MSVCRT__strdup +@ cdecl _mbsdup(str) _strdup # stub _strdup_dbg(str long str long) @ cdecl _mbsicmp(str str) # stub _mbsicmp_l(str str ptr) @@ -824,8 +824,8 @@ # stub _mbsupr_s_l(str long ptr) @ 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 +@ cdecl _memicmp(str str long) +@ cdecl _memicmp_l(str str long ptr) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mkgmtime(ptr) MSVCRT__mkgmtime @ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 @@ -948,48 +948,48 @@ @ cdecl _stat64(str ptr) MSVCRT_stat64 @ cdecl _stati64(str ptr) MSVCRT_stati64 @ cdecl _statusfp() -@ cdecl _strcmpi(str str) MSVCRT__stricmp -@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l +@ cdecl _strcmpi(str str) _stricmp +@ cdecl _strcoll_l(str str ptr) @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) # stub _strdup_dbg(str long str long) @ cdecl _strerror(long) # stub _strerror_s(ptr long long) -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l -@ cdecl _strlwr(str) MSVCRT__strlwr +@ cdecl _stricmp(str str) +@ cdecl _stricmp_l(str str ptr) +@ cdecl _stricoll(str str) +@ cdecl _stricoll_l(str str ptr) +@ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) -@ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s -@ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _strlwr_s(ptr long) +@ cdecl _strlwr_s_l(ptr long ptr) +@ cdecl _strncoll(str str long) +@ cdecl _strncoll_l(str str long ptr) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicmp_l(str str long ptr) +@ cdecl _strnicoll(str str long) +@ cdecl _strnicoll_l(str str long ptr) +@ cdecl _strnset(str long long) +@ cdecl _strnset_s(str long long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) # stub _strset_s(str long long) @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) -@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l -@ cdecl _strupr_s(str long) MSVCRT__strupr_s -@ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strtod_l(str ptr ptr) +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) +@ cdecl _strtol_l(str ptr long ptr) +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) +@ cdecl _strtoul_l(str ptr long ptr) +@ cdecl _strupr(str) +@ cdecl _strupr_l(str ptr) +@ cdecl _strupr_s(str long) +@ cdecl _strupr_s_l(str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) +@ cdecl _swab(str str long) @ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ varargs _swprintf_c(ptr long str) MSVCRT_swprintf_c @ varargs _swprintf_c_l(ptr long str ptr) MSVCRT_swprintf_c_l @@ -1015,13 +1015,13 @@ @ extern _tzname MSVCRT__tzname @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa -@ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s +@ cdecl _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) ntdll._ultoa -@ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow -@ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s +@ cdecl _ultow_s(long ptr long long) @ cdecl _umask(long) MSVCRT__umask # stub _umask_s(long ptr) @ cdecl _ungetch(long) @@ -1256,9 +1256,9 @@ @ cdecl -arch=!i386 atanf(float) MSVCRT_atanf @ cdecl -arch=!i386 atan2f(float float) MSVCRT_atan2f @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl bsearch_s(ptr ptr long long ptr ptr) @ cdecl btowc(long) @@ -1373,7 +1373,7 @@ @ 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 memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @@ -1421,33 +1421,33 @@ @ varargs sscanf(str str) @ varargs sscanf_s(str str) @ cdecl strcat(str str) -@ cdecl strcat_s(str long str) MSVCRT_strcat_s +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcpy_s(ptr long str) +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strerror_s(ptr long long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ 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 strncat(str str long) +@ cdecl strncat_s(str long str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) @ 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 +@ cdecl strnlen(str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtok_s(ptr str ptr) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf(ptr wstr) MSVCRT_swprintf @ varargs swprintf_s(ptr long wstr) MSVCRT_swprintf_s @ varargs swscanf(wstr wstr) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 66738c0b959..d2cec528762 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -219,7 +219,7 @@ static inline int FUNC_NAME(pf_output_format_str)(FUNC_NAME(puts_clbk) pf_puts, if(len < 0) { /* Do not search past the length specified by the precision. */ if(flags->Precision>=0) - len = MSVCRT_strnlen(str, flags->Precision); + len = strnlen(str, flags->Precision); else len = strlen(str); } diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 36a9026c0a2..b7acca6774e 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); * _mbsdup (MSVCRT.@) * _strdup (MSVCRT.@) */ -char* CDECL MSVCRT__strdup(const char* str) +char* CDECL _strdup(const char* str) { if(str) { @@ -53,7 +53,7 @@ char* CDECL MSVCRT__strdup(const char* str) /********************************************************************* * _strlwr_s_l (MSVCRT.@) */ -int CDECL MSVCRT__strlwr_s_l(char *str, size_t len, _locale_t locale) +int CDECL _strlwr_s_l(char *str, size_t len, _locale_t locale) { pthreadlocinfo locinfo; char *ptr = str; @@ -106,9 +106,9 @@ int CDECL MSVCRT__strlwr_s_l(char *str, size_t len, _locale_t locale) /********************************************************************* * _strlwr_s (MSVCRT.@) */ -int CDECL MSVCRT__strlwr_s(char *str, size_t len) +int CDECL _strlwr_s(char *str, size_t len) { - return MSVCRT__strlwr_s_l(str, len, NULL); + return _strlwr_s_l(str, len, NULL); } /********************************************************************* @@ -116,23 +116,23 @@ int CDECL MSVCRT__strlwr_s(char *str, size_t len) */ char* CDECL _strlwr_l(char *str, _locale_t locale) { - MSVCRT__strlwr_s_l(str, -1, locale); + _strlwr_s_l(str, -1, locale); return str; } /********************************************************************* * _strlwr (MSVCRT.@) */ -char* CDECL MSVCRT__strlwr(char *str) +char* CDECL _strlwr(char *str) { - MSVCRT__strlwr_s_l(str, -1, NULL); + _strlwr_s_l(str, -1, NULL); return str; } /********************************************************************* * _strupr_s_l (MSVCRT.@) */ -int CDECL MSVCRT__strupr_s_l(char *str, size_t len, _locale_t locale) +int CDECL _strupr_s_l(char *str, size_t len, _locale_t locale) { pthreadlocinfo locinfo; char *ptr = str; @@ -185,33 +185,33 @@ int CDECL MSVCRT__strupr_s_l(char *str, size_t len, _locale_t locale) /********************************************************************* * _strupr_s (MSVCRT.@) */ -int CDECL MSVCRT__strupr_s(char *str, size_t len) +int CDECL _strupr_s(char *str, size_t len) { - return MSVCRT__strupr_s_l(str, len, NULL); + return _strupr_s_l(str, len, NULL); } /********************************************************************* * _strupr_l (MSVCRT.@) */ -char* CDECL MSVCRT__strupr_l(char *str, _locale_t locale) +char* CDECL _strupr_l(char *str, _locale_t locale) { - MSVCRT__strupr_s_l(str, -1, locale); + _strupr_s_l(str, -1, locale); return str; } /********************************************************************* * _strupr (MSVCRT.@) */ -char* CDECL MSVCRT__strupr(char *str) +char* CDECL _strupr(char *str) { - MSVCRT__strupr_s_l(str, -1, NULL); + _strupr_s_l(str, -1, NULL); return str; } /********************************************************************* * _strnset_s (MSVCRT.@) */ -int CDECL MSVCRT__strnset_s(char *str, size_t size, int c, size_t count) +int CDECL _strnset_s(char *str, size_t size, int c, size_t count) { size_t i; @@ -235,7 +235,7 @@ int CDECL MSVCRT__strnset_s(char *str, size_t size, int c, size_t count) /********************************************************************* * _strnset (MSVCRT.@) */ -char* CDECL MSVCRT__strnset(char* str, int value, size_t len) +char* CDECL _strnset(char* str, int value, size_t len) { if (len > 0 && str) while (*str && len--) @@ -246,7 +246,7 @@ char* CDECL MSVCRT__strnset(char* str, int value, size_t len) /********************************************************************* * _strrev (MSVCRT.@) */ -char* CDECL MSVCRT__strrev(char* str) +char* CDECL _strrev(char* str) { char * p1; char * p2; @@ -277,7 +277,7 @@ char* CDECL _strset(char* str, int value) /********************************************************************* * strtok (MSVCRT.@) */ -char * CDECL MSVCRT_strtok( char *str, const char *delim ) +char * CDECL strtok( char *str, const char *delim ) { thread_data_t *data = msvcrt_get_thread_data(); char *ret; @@ -297,7 +297,7 @@ char * CDECL MSVCRT_strtok( char *str, const char *delim ) /********************************************************************* * strtok_s (MSVCRT.@) */ -char * CDECL MSVCRT_strtok_s(char *str, const char *delim, char **ctx) +char * CDECL strtok_s(char *str, const char *delim, char **ctx) { if (!MSVCRT_CHECK_PMT(delim != NULL)) return NULL; if (!MSVCRT_CHECK_PMT(ctx != NULL)) return NULL; @@ -326,7 +326,7 @@ char * CDECL MSVCRT_strtok_s(char *str, const char *delim, char **ctx) /********************************************************************* * _swab (MSVCRT.@) */ -void CDECL MSVCRT__swab(char* src, char* dst, int len) +void CDECL _swab(char* src, char* dst, int len) { if (len > 1) { @@ -1038,9 +1038,9 @@ static inline double strtod_helper(const char *str, char **end, _locale_t locale } /********************************************************************* - * strtod_l (MSVCRT.@) + * _strtod_l (MSVCRT.@) */ -double CDECL MSVCRT_strtod_l(const char *str, char **end, _locale_t locale) +double CDECL _strtod_l(const char *str, char **end, _locale_t locale) { return strtod_helper(str, end, locale, NULL); } @@ -1048,9 +1048,9 @@ double CDECL MSVCRT_strtod_l(const char *str, char **end, _locale_t locale) /********************************************************************* * strtod (MSVCRT.@) */ -double CDECL MSVCRT_strtod( const char *str, char **end ) +double CDECL strtod( const char *str, char **end ) { - return MSVCRT_strtod_l( str, end, NULL ); + return _strtod_l( str, end, NULL ); } #if _MSVCR_VER>=120 @@ -1058,17 +1058,17 @@ double CDECL MSVCRT_strtod( const char *str, char **end ) /********************************************************************* * strtof_l (MSVCR120.@) */ -float CDECL MSVCRT__strtof_l( const char *str, char **end, _locale_t locale ) +float CDECL _strtof_l( const char *str, char **end, _locale_t locale ) { - return MSVCRT_strtod_l(str, end, locale); + return _strtod_l(str, end, locale); } /********************************************************************* * strtof (MSVCR120.@) */ -float CDECL MSVCRT_strtof( const char *str, char **end ) +float CDECL strtof( const char *str, char **end ) { - return MSVCRT__strtof_l(str, end, NULL); + return _strtof_l(str, end, NULL); } #endif /* _MSVCR_VER>=120 */ @@ -1076,23 +1076,23 @@ float CDECL MSVCRT_strtof( const char *str, char **end ) /********************************************************************* * atof (MSVCRT.@) */ -double CDECL MSVCRT_atof( const char *str ) +double CDECL atof( const char *str ) { - return MSVCRT_strtod_l(str, NULL, NULL); + return _strtod_l(str, NULL, NULL); } /********************************************************************* * _atof_l (MSVCRT.@) */ -double CDECL MSVCRT__atof_l( const char *str, _locale_t locale) +double CDECL _atof_l( const char *str, _locale_t locale) { - return MSVCRT_strtod_l(str, NULL, locale); + return _strtod_l(str, NULL, locale); } /********************************************************************* * _atoflt_l (MSVCRT.@) */ -int CDECL MSVCRT__atoflt_l(_CRT_FLOAT *value, char *str, _locale_t locale) +int CDECL _atoflt_l(_CRT_FLOAT *value, char *str, _locale_t locale) { double d; int err; @@ -1109,15 +1109,15 @@ int CDECL MSVCRT__atoflt_l(_CRT_FLOAT *value, char *str, _locale_t locale) /********************************************************************* * _atoflt (MSVCR100.@) */ -int CDECL MSVCRT__atoflt(_CRT_FLOAT *value, char *str) +int CDECL _atoflt(_CRT_FLOAT *value, char *str) { - return MSVCRT__atoflt_l(value, str, NULL); + return _atoflt_l(value, str, NULL); } /********************************************************************* * _atodbl_l (MSVCRT.@) */ -int CDECL MSVCRT__atodbl_l(_CRT_DOUBLE *value, char *str, _locale_t locale) +int CDECL _atodbl_l(_CRT_DOUBLE *value, char *str, _locale_t locale) { int err; @@ -1132,15 +1132,15 @@ int CDECL MSVCRT__atodbl_l(_CRT_DOUBLE *value, char *str, _locale_t locale) /********************************************************************* * _atodbl (MSVCRT.@) */ -int CDECL MSVCRT__atodbl(_CRT_DOUBLE *value, char *str) +int CDECL _atodbl(_CRT_DOUBLE *value, char *str) { - return MSVCRT__atodbl_l(value, str, NULL); + return _atodbl_l(value, str, NULL); } /********************************************************************* * _strcoll_l (MSVCRT.@) */ -int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, _locale_t locale ) +int CDECL _strcoll_l( const char* str1, const char* str2, _locale_t locale ) { pthreadlocinfo locinfo; @@ -1157,15 +1157,15 @@ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, _locale_t locale /********************************************************************* * strcoll (MSVCRT.@) */ -int CDECL MSVCRT_strcoll( const char* str1, const char* str2 ) +int CDECL strcoll( const char* str1, const char* str2 ) { - return MSVCRT_strcoll_l(str1, str2, NULL); + return _strcoll_l(str1, str2, NULL); } /********************************************************************* * _stricoll_l (MSVCRT.@) */ -int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, _locale_t locale ) +int CDECL _stricoll_l( const char* str1, const char* str2, _locale_t locale ) { pthreadlocinfo locinfo; @@ -1175,7 +1175,7 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, _locale_t loca locinfo = locale->locinfo; if(!locinfo->lc_handle[LC_COLLATE]) - return MSVCRT__stricmp(str1, str2); + return _stricmp(str1, str2); return CompareStringA(locinfo->lc_handle[LC_COLLATE], NORM_IGNORECASE, str1, -1, str2, -1)-CSTR_EQUAL; } @@ -1183,15 +1183,15 @@ int CDECL MSVCRT__stricoll_l( const char* str1, const char* str2, _locale_t loca /********************************************************************* * _stricoll (MSVCRT.@) */ -int CDECL MSVCRT__stricoll( const char* str1, const char* str2 ) +int CDECL _stricoll( const char* str1, const char* str2 ) { - return MSVCRT__stricoll_l(str1, str2, NULL); + return _stricoll_l(str1, str2, NULL); } /********************************************************************* * _strncoll_l (MSVCRT.@) */ -int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, size_t count, _locale_t locale ) +int CDECL _strncoll_l( const char* str1, const char* str2, size_t count, _locale_t locale ) { pthreadlocinfo locinfo; @@ -1201,24 +1201,24 @@ int CDECL MSVCRT__strncoll_l( const char* str1, const char* str2, size_t count, locinfo = locale->locinfo; if(!locinfo->lc_handle[LC_COLLATE]) - return MSVCRT_strncmp(str1, str2, count); + return strncmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[LC_COLLATE], 0, - str1, MSVCRT_strnlen(str1, count), - str2, MSVCRT_strnlen(str2, count))-CSTR_EQUAL; + str1, strnlen(str1, count), + str2, strnlen(str2, count))-CSTR_EQUAL; } /********************************************************************* * _strncoll (MSVCRT.@) */ -int CDECL MSVCRT__strncoll( const char* str1, const char* str2, size_t count ) +int CDECL _strncoll( const char* str1, const char* str2, size_t count ) { - return MSVCRT__strncoll_l(str1, str2, count, NULL); + return _strncoll_l(str1, str2, count, NULL); } /********************************************************************* * _strnicoll_l (MSVCRT.@) */ -int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, size_t count, _locale_t locale ) +int CDECL _strnicoll_l( const char* str1, const char* str2, size_t count, _locale_t locale ) { pthreadlocinfo locinfo; @@ -1228,24 +1228,24 @@ int CDECL MSVCRT__strnicoll_l( const char* str1, const char* str2, size_t count, locinfo = locale->locinfo; if(!locinfo->lc_handle[LC_COLLATE]) - return MSVCRT__strnicmp(str1, str2, count); + return _strnicmp(str1, str2, count); return CompareStringA(locinfo->lc_handle[LC_COLLATE], NORM_IGNORECASE, - str1, MSVCRT_strnlen(str1, count), - str2, MSVCRT_strnlen(str2, count))-CSTR_EQUAL; + str1, strnlen(str1, count), + str2, strnlen(str2, count))-CSTR_EQUAL; } /********************************************************************* * _strnicoll (MSVCRT.@) */ -int CDECL MSVCRT__strnicoll( const char* str1, const char* str2, size_t count ) +int CDECL _strnicoll( const char* str1, const char* str2, size_t count ) { - return MSVCRT__strnicoll_l(str1, str2, count, NULL); + return _strnicoll_l(str1, str2, count, NULL); } /********************************************************************* * strncpy (MSVCRT.@) */ -char* __cdecl MSVCRT_strncpy(char *dst, const char *src, size_t len) +char* __cdecl strncpy(char *dst, const char *src, size_t len) { size_t i; @@ -1270,7 +1270,7 @@ char* CDECL strcpy(char *dst, const char *src) /********************************************************************* * strcpy_s (MSVCRT.@) */ -int CDECL MSVCRT_strcpy_s( char* dst, size_t elem, const char* src ) +int CDECL strcpy_s( char* dst, size_t elem, const char* src ) { size_t i; if(!elem) return EINVAL; @@ -1292,7 +1292,7 @@ int CDECL MSVCRT_strcpy_s( char* dst, size_t elem, const char* src ) /********************************************************************* * strcat_s (MSVCRT.@) */ -int CDECL MSVCRT_strcat_s( char* dst, size_t elem, const char* src ) +int CDECL strcat_s( char* dst, size_t elem, const char* src ) { size_t i, j; if(!dst) return EINVAL; @@ -1332,7 +1332,7 @@ char* __cdecl strcat( char *dst, const char *src ) /********************************************************************* * strncat_s (MSVCRT.@) */ -int CDECL MSVCRT_strncat_s( char* dst, size_t elem, const char* src, size_t count ) +int CDECL strncat_s( char* dst, size_t elem, const char* src, size_t count ) { size_t i, j; @@ -1371,7 +1371,7 @@ int CDECL MSVCRT_strncat_s( char* dst, size_t elem, const char* src, size_t coun /********************************************************************* * strncat (MSVCRT.@) */ -char* __cdecl MSVCRT_strncat(char *dst, const char *src, size_t len) +char* __cdecl strncat(char *dst, const char *src, size_t len) { char *d = dst; while (*d) d++; @@ -1383,7 +1383,7 @@ char* __cdecl MSVCRT_strncat(char *dst, const char *src, size_t len) /********************************************************************* * _strxfrm_l (MSVCRT.@) */ -size_t CDECL MSVCRT__strxfrm_l( char *dest, const char *src, +size_t CDECL _strxfrm_l( char *dest, const char *src, size_t len, _locale_t locale ) { pthreadlocinfo locinfo; @@ -1403,7 +1403,7 @@ size_t CDECL MSVCRT__strxfrm_l( char *dest, const char *src, locinfo = locale->locinfo; if(!locinfo->lc_handle[LC_COLLATE]) { - MSVCRT_strncpy(dest, src, len); + strncpy(dest, src, len); return strlen(src); } @@ -1429,9 +1429,9 @@ size_t CDECL MSVCRT__strxfrm_l( char *dest, const char *src, /********************************************************************* * strxfrm (MSVCRT.@) */ -size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, size_t len ) +size_t CDECL strxfrm( char *dest, const char *src, size_t len ) { - return MSVCRT__strxfrm_l(dest, src, len, NULL); + return _strxfrm_l(dest, src, len, NULL); } /******************************************************************** @@ -1477,7 +1477,7 @@ int CDECL __STRINGTOLD( MSVCRT__LDOUBLE *value, char **endptr, const char *str, /******************************************************************** * _atoldbl_l (MSVCRT.@) */ -int CDECL MSVCRT__atoldbl_l( MSVCRT__LDOUBLE *value, const char *str, _locale_t locale ) +int CDECL _atoldbl_l( MSVCRT__LDOUBLE *value, char *str, _locale_t locale ) { char *endptr; switch(__STRINGTOLD_L( value, &endptr, str, 0, locale )) @@ -1491,9 +1491,9 @@ int CDECL MSVCRT__atoldbl_l( MSVCRT__LDOUBLE *value, const char *str, _locale_t /******************************************************************** * _atoldbl (MSVCRT.@) */ -int CDECL MSVCRT__atoldbl(MSVCRT__LDOUBLE *value, const char *str) +int CDECL _atoldbl(_LDOUBLE *value, char *str) { - return MSVCRT__atoldbl_l( value, str, NULL ); + return _atoldbl_l( (MSVCRT__LDOUBLE*)value, str, NULL ); } /********************************************************************* @@ -1509,7 +1509,7 @@ size_t __cdecl strlen(const char *str) /****************************************************************** * strnlen (MSVCRT.@) */ -size_t CDECL MSVCRT_strnlen(const char *s, size_t maxlen) +size_t CDECL strnlen(const char *s, size_t maxlen) { size_t i; @@ -1524,7 +1524,7 @@ size_t CDECL MSVCRT_strnlen(const char *s, size_t maxlen) * * FIXME: locale parameter is ignored */ -__int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) +__int64 CDECL _strtoi64_l(const char *nptr, char **endptr, int base, _locale_t locale) { const char *p = nptr; BOOL negative = FALSE; @@ -1596,17 +1596,17 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, _loca /********************************************************************* * _strtoi64 (MSVCRT.@) */ -__int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) +__int64 CDECL _strtoi64(const char *nptr, char **endptr, int base) { - return MSVCRT_strtoi64_l(nptr, endptr, base, NULL); + return _strtoi64_l(nptr, endptr, base, NULL); } /********************************************************************* * _atoi_l (MSVCRT.@) */ -int __cdecl MSVCRT__atoi_l(const char *str, _locale_t locale) +int __cdecl _atoi_l(const char *str, _locale_t locale) { - __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); + __int64 ret = _strtoi64_l(str, NULL, 10, locale); if(ret > INT_MAX) { ret = INT_MAX; @@ -1622,7 +1622,7 @@ int __cdecl MSVCRT__atoi_l(const char *str, _locale_t locale) * atoi (MSVCRT.@) */ #if _MSVCR_VER == 0 -int __cdecl MSVCRT_atoi(const char *str) +int __cdecl atoi(const char *str) { BOOL minus = FALSE; int ret = 0; @@ -1647,34 +1647,34 @@ int __cdecl MSVCRT_atoi(const char *str) return minus ? -ret : ret; } #else -int CDECL MSVCRT_atoi(const char *str) +int CDECL atoi(const char *str) { - return MSVCRT__atoi_l(str, NULL); + return _atoi_l(str, NULL); } #endif /****************************************************************** * _atoi64_l (MSVCRT.@) */ -__int64 CDECL MSVCRT__atoi64_l(const char *str, _locale_t locale) +__int64 CDECL _atoi64_l(const char *str, _locale_t locale) { - return MSVCRT_strtoi64_l(str, NULL, 10, locale); + return _strtoi64_l(str, NULL, 10, locale); } /****************************************************************** * _atoi64 (MSVCRT.@) */ -__int64 CDECL MSVCRT__atoi64(const char *str) +__int64 CDECL _atoi64(const char *str) { - return MSVCRT_strtoi64_l(str, NULL, 10, NULL); + return _strtoi64_l(str, NULL, 10, NULL); } /****************************************************************** * _atol_l (MSVCRT.@) */ -__msvcrt_long CDECL MSVCRT__atol_l(const char *str, _locale_t locale) +__msvcrt_long CDECL _atol_l(const char *str, _locale_t locale) { - __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); + __int64 ret = _strtoi64_l(str, NULL, 10, locale); if(ret > LONG_MAX) { ret = LONG_MAX; @@ -1689,12 +1689,12 @@ __msvcrt_long CDECL MSVCRT__atol_l(const char *str, _locale_t locale) /****************************************************************** * atol (MSVCRT.@) */ -__msvcrt_long CDECL MSVCRT_atol(const char *str) +__msvcrt_long CDECL atol(const char *str) { #if _MSVCR_VER == 0 - return MSVCRT_atoi(str); + return atoi(str); #else - return MSVCRT__atol_l(str, NULL); + return _atol_l(str, NULL); #endif } @@ -1703,28 +1703,28 @@ __msvcrt_long CDECL MSVCRT_atol(const char *str) /****************************************************************** * _atoll_l (MSVCR120.@) */ -__int64 CDECL MSVCRT__atoll_l(const char* str, _locale_t locale) +__int64 CDECL _atoll_l(const char* str, _locale_t locale) { - return MSVCRT_strtoi64_l(str, NULL, 10, locale); + return _strtoi64_l(str, NULL, 10, locale); } /****************************************************************** * atoll (MSVCR120.@) */ -__int64 CDECL MSVCRT_atoll(const char* str) +__int64 CDECL atoll(const char* str) { - return MSVCRT__atoll_l(str, NULL); + return _atoll_l(str, NULL); } -#endif /* if _MSVCR_VER>=120 */ +#endif /* _MSVCR_VER>=120 */ /****************************************************************** * _strtol_l (MSVCRT.@) */ -__msvcrt_long CDECL MSVCRT__strtol_l(const char* nptr, +__msvcrt_long CDECL _strtol_l(const char* nptr, char** end, int base, _locale_t locale) { - __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, locale); + __int64 ret = _strtoi64_l(nptr, end, base, locale); if(ret > LONG_MAX) { ret = LONG_MAX; @@ -1740,17 +1740,17 @@ __msvcrt_long CDECL MSVCRT__strtol_l(const char* nptr, /****************************************************************** * strtol (MSVCRT.@) */ -__msvcrt_long CDECL MSVCRT_strtol(const char* nptr, char** end, int base) +__msvcrt_long CDECL strtol(const char* nptr, char** end, int base) { - return MSVCRT__strtol_l(nptr, end, base, NULL); + return _strtol_l(nptr, end, base, NULL); } /****************************************************************** * _strtoul_l (MSVCRT.@) */ -__msvcrt_ulong CDECL MSVCRT_strtoul_l(const char* nptr, char** end, int base, _locale_t locale) +__msvcrt_ulong CDECL _strtoul_l(const char* nptr, char** end, int base, _locale_t locale) { - __int64 ret = MSVCRT_strtoi64_l(nptr, end, base, locale); + __int64 ret = _strtoi64_l(nptr, end, base, locale); if(ret > ULONG_MAX) { ret = ULONG_MAX; @@ -1766,9 +1766,9 @@ __msvcrt_ulong CDECL MSVCRT_strtoul_l(const char* nptr, char** end, int base, _l /****************************************************************** * strtoul (MSVCRT.@) */ -__msvcrt_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) +__msvcrt_ulong CDECL strtoul(const char* nptr, char** end, int base) { - return MSVCRT_strtoul_l(nptr, end, base, NULL); + return _strtoul_l(nptr, end, base, NULL); } /********************************************************************* @@ -1776,7 +1776,7 @@ __msvcrt_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) * * FIXME: locale parameter is ignored */ -unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int base, _locale_t locale) +unsigned __int64 CDECL _strtoui64_l(const char *nptr, char **endptr, int base, _locale_t locale) { const char *p = nptr; BOOL negative = FALSE; @@ -1842,9 +1842,9 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b /********************************************************************* * _strtoui64 (MSVCRT.@) */ -unsigned __int64 CDECL MSVCRT_strtoui64(const char *nptr, char **endptr, int base) +unsigned __int64 CDECL _strtoui64(const char *nptr, char **endptr, int base) { - return MSVCRT_strtoui64_l(nptr, endptr, base, NULL); + return _strtoui64_l(nptr, endptr, base, NULL); } static int ltoa_helper(__msvcrt_long value, char *str, size_t size, int radix) @@ -1914,7 +1914,7 @@ static int ltoa_helper(__msvcrt_long value, char *str, size_t size, int radix) /********************************************************************* * _ltoa_s (MSVCRT.@) */ -int CDECL MSVCRT__ltoa_s(__msvcrt_long value, char *str, size_t size, int radix) +int CDECL _ltoa_s(__msvcrt_long value, char *str, size_t size, int radix) { if (!MSVCRT_CHECK_PMT(str != NULL)) return EINVAL; if (!MSVCRT_CHECK_PMT(size > 0)) return EINVAL; @@ -1930,7 +1930,7 @@ int CDECL MSVCRT__ltoa_s(__msvcrt_long value, char *str, size_t size, int radix) /********************************************************************* * _ltow_s (MSVCRT.@) */ -int CDECL MSVCRT__ltow_s(__msvcrt_long value, wchar_t *str, size_t size, int radix) +int CDECL _ltow_s(__msvcrt_long value, wchar_t *str, size_t size, int radix) { __msvcrt_ulong val; unsigned int digit; @@ -2005,15 +2005,15 @@ int CDECL MSVCRT__ltow_s(__msvcrt_long value, wchar_t *str, size_t size, int rad /********************************************************************* * _itoa_s (MSVCRT.@) */ -int CDECL MSVCRT__itoa_s(int value, char *str, size_t size, int radix) +int CDECL _itoa_s(int value, char *str, size_t size, int radix) { - return MSVCRT__ltoa_s(value, str, size, radix); + return _ltoa_s(value, str, size, radix); } /********************************************************************* * _itoa (MSVCRT.@) */ -char* CDECL MSVCRT__itoa(int value, char *str, int radix) +char* CDECL _itoa(int value, char *str, int radix) { return ltoa_helper(value, str, SIZE_MAX, radix) ? NULL : str; } @@ -2021,15 +2021,15 @@ char* CDECL MSVCRT__itoa(int value, char *str, int radix) /********************************************************************* * _itow_s (MSVCRT.@) */ -int CDECL MSVCRT__itow_s(int value, wchar_t *str, size_t size, int radix) +int CDECL _itow_s(int value, wchar_t *str, size_t size, int radix) { - return MSVCRT__ltow_s(value, str, size, radix); + return _ltow_s(value, str, size, radix); } /********************************************************************* * _ui64toa_s (MSVCRT.@) */ -int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, +int CDECL _ui64toa_s(unsigned __int64 value, char *str, size_t size, int radix) { char buffer[65], *pos; @@ -2068,7 +2068,7 @@ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str, /********************************************************************* * _ui64tow_s (MSVCRT.@) */ -int CDECL MSVCRT__ui64tow_s( unsigned __int64 value, wchar_t *str, +int CDECL _ui64tow_s( unsigned __int64 value, wchar_t *str, size_t size, int radix ) { wchar_t buffer[65], *pos; @@ -2106,7 +2106,7 @@ int CDECL MSVCRT__ui64tow_s( unsigned __int64 value, wchar_t *str, /********************************************************************* * _ultoa_s (MSVCRT.@) */ -int CDECL MSVCRT__ultoa_s(__msvcrt_ulong value, char *str, size_t size, int radix) +int CDECL _ultoa_s(__msvcrt_ulong value, char *str, size_t size, int radix) { __msvcrt_ulong digit; char buffer[33], *pos; @@ -2160,7 +2160,7 @@ int CDECL MSVCRT__ultoa_s(__msvcrt_ulong value, char *str, size_t size, int radi /********************************************************************* * _ultow_s (MSVCRT.@) */ -int CDECL MSVCRT__ultow_s(__msvcrt_ulong value, wchar_t *str, size_t size, int radix) +int CDECL _ultow_s(__msvcrt_ulong value, wchar_t *str, size_t size, int radix) { __msvcrt_ulong digit; WCHAR buffer[33], *pos; @@ -2214,7 +2214,7 @@ int CDECL MSVCRT__ultow_s(__msvcrt_ulong value, wchar_t *str, size_t size, int r /********************************************************************* * _i64toa_s (MSVCRT.@) */ -int CDECL MSVCRT__i64toa_s(__int64 value, char *str, size_t size, int radix) +int CDECL _i64toa_s(__int64 value, char *str, size_t size, int radix) { unsigned __int64 val; unsigned int digit; @@ -2289,7 +2289,7 @@ int CDECL MSVCRT__i64toa_s(__int64 value, char *str, size_t size, int radix) /********************************************************************* * _i64tow_s (MSVCRT.@) */ -int CDECL MSVCRT__i64tow_s(__int64 value, wchar_t *str, size_t size, int radix) +int CDECL _i64tow_s(__int64 value, wchar_t *str, size_t size, int radix) { unsigned __int64 val; unsigned int digit; @@ -2385,7 +2385,7 @@ struct _I10_OUTPUT_DATA { * Native sets last byte of data->str to '0' or '9', I don't know what * it means. Current implementation sets it always to '0'. */ -int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) +int CDECL I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) { struct fpnum num; double d; @@ -2438,7 +2438,7 @@ int CDECL MSVCRT_I10_OUTPUT(MSVCRT__LDOUBLE ld80, int prec, int flag, struct _I1 MSVCRT_sprintf(buf, format, d); buf[1] = buf[0]; - data->pos = MSVCRT_atoi(buf+prec+3); + data->pos = atoi(buf+prec+3); if(buf[1] != '0') data->pos++; @@ -2607,7 +2607,7 @@ char* __cdecl strchr(const char *str, int c) /********************************************************************* * strrchr (MSVCRT.@) */ -char* __cdecl MSVCRT_strrchr(const char *str, int c) +char* __cdecl strrchr(const char *str, int c) { char *ret = NULL; do { if (*str == (char)c) ret = (char*)str; } while (*str++); @@ -2617,7 +2617,7 @@ char* __cdecl MSVCRT_strrchr(const char *str, int c) /********************************************************************* * memchr (MSVCRT.@) */ -void* __cdecl MSVCRT_memchr(const void *ptr, int c, size_t n) +void* __cdecl memchr(const void *ptr, int c, size_t n) { const unsigned char *p = ptr; @@ -2639,7 +2639,7 @@ int __cdecl strcmp(const char *str1, const char *str2) /********************************************************************* * strncmp (MSVCRT.@) */ -int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, size_t len) +int __cdecl strncmp(const char *str1, const char *str2, size_t len) { if (!len) return 0; while (--len && *str1 && *str1 == *str2) { str1++; str2++; } @@ -2649,7 +2649,7 @@ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, size_t len) /********************************************************************* * _strnicmp_l (MSVCRT.@) */ -int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, +int __cdecl _strnicmp_l(const char *s1, const char *s2, size_t count, _locale_t locale) { pthreadlocinfo locinfo; @@ -2689,31 +2689,31 @@ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2, /********************************************************************* * _stricmp_l (MSVCRT.@) */ -int __cdecl MSVCRT__stricmp_l(const char *s1, const char *s2, _locale_t locale) +int __cdecl _stricmp_l(const char *s1, const char *s2, _locale_t locale) { - return MSVCRT__strnicmp_l(s1, s2, -1, locale); + return _strnicmp_l(s1, s2, -1, locale); } /********************************************************************* * _strnicmp (MSVCRT.@) */ -int __cdecl MSVCRT__strnicmp(const char *s1, const char *s2, size_t count) +int __cdecl _strnicmp(const char *s1, const char *s2, size_t count) { - return MSVCRT__strnicmp_l(s1, s2, count, NULL); + return _strnicmp_l(s1, s2, count, NULL); } /********************************************************************* * _stricmp (MSVCRT.@) */ -int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) +int __cdecl _stricmp(const char *s1, const char *s2) { - return MSVCRT__strnicmp_l(s1, s2, -1, NULL); + return _strnicmp_l(s1, s2, -1, NULL); } /********************************************************************* * strstr (MSVCRT.@) */ -char* __cdecl MSVCRT_strstr(const char *haystack, const char *needle) +char* __cdecl strstr(const char *haystack, const char *needle) { size_t i, j, len, needle_len, lps_len; BYTE lps[256]; @@ -2744,7 +2744,7 @@ char* __cdecl MSVCRT_strstr(const char *haystack, const char *needle) if (j == needle_len) return (char*)haystack + i - j; else if (j) { - if (j == ARRAY_SIZE(lps) && !MSVCRT_strncmp(haystack + i, needle + j, needle_len - j)) + if (j == ARRAY_SIZE(lps) && !strncmp(haystack + i, needle + j, needle_len - j)) return (char*)haystack + i - j; j = lps[j-1]; } @@ -2756,8 +2756,9 @@ char* __cdecl MSVCRT_strstr(const char *haystack, const char *needle) /********************************************************************* * _memicmp_l (MSVCRT.@) */ -int __cdecl MSVCRT__memicmp_l(const char *s1, const char *s2, size_t len, _locale_t locale) +int __cdecl _memicmp_l(const void *v1, const void *v2, size_t len, _locale_t locale) { + const char *s1 = v1, *s2 = v2; int ret = 0; #if _MSVCR_VER == 0 || _MSVCR_VER >= 80 @@ -2782,15 +2783,15 @@ int __cdecl MSVCRT__memicmp_l(const char *s1, const char *s2, size_t len, _local /********************************************************************* * _memicmp (MSVCRT.@) */ -int __cdecl MSVCRT__memicmp(const char *s1, const char *s2, size_t len) +int __cdecl _memicmp(const void *s1, const void *s2, size_t len) { - return MSVCRT__memicmp_l(s1, s2, len, NULL); + return _memicmp_l(s1, s2, len, NULL); } /********************************************************************* * strcspn (MSVCRT.@) */ -size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) +size_t __cdecl strcspn(const char *str, const char *reject) { BOOL rejects[256]; const char *p; @@ -2812,7 +2813,7 @@ size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) /********************************************************************* * strpbrk (MSVCRT.@) */ -char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) +char* __cdecl strpbrk(const char *str, const char *accept) { for (; *str; str++) if (strchr( accept, *str )) return (char*)str; return NULL; @@ -2821,7 +2822,7 @@ char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) /********************************************************************* * __strncnt (MSVCRT.@) */ -size_t __cdecl MSVCRT___strncnt(const char *str, size_t size) +size_t __cdecl __strncnt(const char *str, size_t size) { size_t ret = 0; diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index d9f9884bd3d..4e071563a6c 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -127,11 +127,11 @@ void CDECL MSVCRT__tzset(void) }else if(*tz == '+') { tz++; } - MSVCRT___timezone = MSVCRT_strtol(tz, &tz, 10)*3600; + MSVCRT___timezone = strtol(tz, &tz, 10)*3600; if(*tz == ':') { - MSVCRT___timezone += MSVCRT_strtol(tz+1, &tz, 10)*60; + MSVCRT___timezone += strtol(tz+1, &tz, 10)*60; if(*tz == ':') - MSVCRT___timezone += MSVCRT_strtol(tz+1, &tz, 10); + MSVCRT___timezone += strtol(tz+1, &tz, 10); } if(neg_zone) MSVCRT___timezone = -MSVCRT___timezone; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 92cbf805489..60bf552fac0 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -466,7 +466,7 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, sym->current++; if (!(n1 = get_number(sym))) return FALSE; - num = MSVCRT_atoi(n1); + num = atoi(n1); if (str_modif[0] == ' ' && !modifier) str_modif++; @@ -1004,7 +1004,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, sym->current++; if (!(n1 = get_number(sym))) goto done; - num = MSVCRT_atoi(n1); + num = atoi(n1); while (num--) arr = str_printf(sym, "%s[%s]", arr, get_number(sym)); diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 88abe37e664..2735d520071 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -1,6 +1,6 @@ # msvcrtd.dll - MS VC++ Run Time Library -@ cdecl -norelay $I10_OUTPUT(double long long ptr) MSVCRT_I10_OUTPUT +@ cdecl -norelay $I10_OUTPUT(double long long ptr) I10_OUTPUT @ thiscall -arch=i386 ??0__non_rtti_object@@QAE@ABV0@@Z(ptr ptr) __non_rtti_object_copy_ctor @ cdecl -arch=win64 ??0__non_rtti_object@@QEAA@AEBV0@@Z(ptr ptr) __non_rtti_object_copy_ctor @ thiscall -arch=i386 ??0__non_rtti_object@@QAE@PBD@Z(ptr ptr) __non_rtti_object_ctor @@ -217,9 +217,9 @@ @ extern _aexit_rtn @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl _atoldbl(ptr str) MSVCRT__atoldbl +@ cdecl _atodbl(ptr str) +@ cdecl -ret64 _atoi64(str) +@ cdecl _atoldbl(ptr str) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -371,7 +371,7 @@ @ cdecl _ismbslead(ptr ptr) @ cdecl _ismbstrail(ptr ptr) @ cdecl _isnan(double) MSVCRT__isnan -@ cdecl _itoa(long ptr long) MSVCRT__itoa +@ cdecl _itoa(long ptr long) @ cdecl _itow(long ptr long) ntdll._itow @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @@ -415,7 +415,7 @@ @ cdecl _mbscpy(ptr str) @ cdecl _mbscspn(str str) @ cdecl _mbsdec(ptr ptr) -@ cdecl _mbsdup(str) MSVCRT__strdup +@ cdecl _mbsdup(str) _strdup @ cdecl _mbsicmp(str str) @ cdecl _mbsicoll(str str) @ cdecl _mbsinc(str) @@ -450,7 +450,7 @@ @ cdecl _mbstrlen(str) @ cdecl _mbsupr(str) @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy -@ cdecl _memicmp(str str long) MSVCRT__memicmp +@ cdecl _memicmp(str str long) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mktemp(str) MSVCRT__mktemp @ cdecl _msize(ptr) @@ -513,22 +513,22 @@ @ cdecl _stat(str ptr) MSVCRT_stat @ cdecl _stati64(str ptr) MSVCRT_stati64 @ cdecl _statusfp() -@ cdecl _strcmpi(str str) MSVCRT__stricmp +@ cdecl _strcmpi(str str) _stricmp @ cdecl _strdate(ptr) MSVCRT__strdate -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _strlwr(str) MSVCRT__strlwr -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _stricmp(str str) +@ cdecl _stricoll(str str) +@ cdecl _strlwr(str) +@ cdecl _strncoll(str str long) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicoll(str str long) +@ cdecl _strnset(str long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ cdecl _strtime(ptr) MSVCRT__strtime -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strupr(str) +@ cdecl _swab(str str long) @ extern _sys_errlist MSVCRT__sys_errlist @ extern _sys_nerr MSVCRT__sys_nerr @ cdecl _tell(long) MSVCRT__tell @@ -642,9 +642,9 @@ @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -private atexit(ptr) MSVCRT_atexit -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl calloc(long long) @ cdecl ceil(double) MSVCRT_ceil @@ -731,7 +731,7 @@ @ cdecl mblen(ptr long) @ cdecl mbstowcs(ptr str long) @ cdecl mbtowc(ptr str long) -@ cdecl memchr(ptr long long) MSVCRT_memchr +@ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memmove(ptr ptr long) @@ -767,24 +767,24 @@ @ cdecl strcat(str str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ cdecl strncmp(str str long) MSVCRT_strncmp -@ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) MSVCRT_strpbrk -@ cdecl strrchr(str long) MSVCRT_strrchr +@ cdecl strncat(str str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtok(str str) +@ cdecl strtol(str ptr long) +@ cdecl strtoul(str ptr long) +@ cdecl strxfrm(ptr str long) @ varargs swprintf(ptr wstr) MSVCRT_swprintf @ varargs swscanf(wstr wstr) @ cdecl system(str) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3724e4d72a9..e528ed8d6ae 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -164,7 +164,7 @@ @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) -@ cdecl __strncnt(str long) MSVCRT___strncnt +@ cdecl __strncnt(str long) @ cdecl __sys_errlist() @ cdecl __sys_nerr() @ cdecl __threadhandle() kernel32.GetCurrentThread @@ -190,18 +190,18 @@ @ cdecl _aligned_realloc(ptr long long) @ stub _aligned_recalloc @ cdecl _assert(str str long) -@ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l -@ cdecl _atof_l(str ptr) MSVCRT__atof_l -@ cdecl _atoflt(ptr str) MSVCRT__atoflt -@ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 -@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l -@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l -@ cdecl _atol_l(str ptr) MSVCRT__atol_l -@ 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 _atodbl(ptr str) +@ cdecl _atodbl_l(ptr str ptr) +@ cdecl _atof_l(str ptr) +@ cdecl _atoflt(ptr str) +@ cdecl _atoflt_l(ptr str ptr) +@ cdecl -ret64 _atoi64(str) +@ cdecl -ret64 _atoi64_l(str ptr) +@ cdecl _atoi_l(str ptr) +@ cdecl _atol_l(str ptr) +@ cdecl _atoldbl(ptr str) +@ cdecl _atoldbl_l(ptr str ptr) +@ cdecl -ret64 _atoll_l(str ptr) @ cdecl _beep(long long) @ cdecl _beginthread(ptr long ptr) @ cdecl _beginthreadex(ptr long ptr ptr long ptr) @@ -415,9 +415,9 @@ @ cdecl _hypot(double double) @ cdecl _hypotf(float float) MSVCRT__hypotf @ cdecl _i64toa(int64 ptr long) ntdll._i64toa -@ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) ntdll._i64tow -@ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _i64tow_s(int64 ptr long long) @ cdecl _initialize_narrow_environment() @ cdecl _initialize_onexit_table(ptr) @ cdecl _initialize_wide_environment() @@ -522,10 +522,10 @@ @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l @ cdecl _isxdigit_l(long ptr) -@ cdecl _itoa(long ptr long) MSVCRT__itoa -@ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s +@ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -@ cdecl _itow_s(long ptr long long) MSVCRT__itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) MSVCRT__j0 @ cdecl _j1(double) MSVCRT__j1 @ cdecl _jn(long double) MSVCRT__jn @@ -575,9 +575,9 @@ @ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _ltoa(long ptr long) ntdll._ltoa -@ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) ntdll._ltow -@ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s +@ cdecl _ltow_s(long ptr long long) @ cdecl _makepath(ptr str str str str) MSVCRT__makepath @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s @ cdecl _malloc_base(long) @@ -718,8 +718,8 @@ @ stub _mbsupr_s_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 +@ cdecl _memicmp(str str long) +@ cdecl _memicmp_l(str str long ptr) @ cdecl _mkdir(str) MSVCRT__mkdir @ cdecl _mkgmtime32(ptr) MSVCRT__mkgmtime32 @ cdecl _mkgmtime64(ptr) MSVCRT__mkgmtime64 @@ -841,18 +841,18 @@ @ stub _o__aligned_offset_recalloc @ cdecl _o__aligned_realloc(ptr long long) _aligned_realloc @ stub _o__aligned_recalloc -@ cdecl _o__atodbl(ptr str) MSVCRT__atodbl -@ cdecl _o__atodbl_l(ptr str ptr) MSVCRT__atodbl_l -@ cdecl _o__atof_l(str ptr) MSVCRT__atof_l -@ cdecl _o__atoflt(ptr str) MSVCRT__atoflt -@ cdecl _o__atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _o__atoi64(str) MSVCRT__atoi64 -@ cdecl -ret64 _o__atoi64_l(str ptr) MSVCRT__atoi64_l -@ cdecl _o__atoi_l(str ptr) MSVCRT__atoi_l -@ cdecl _o__atol_l(str ptr) MSVCRT__atol_l -@ 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__atodbl(ptr str) _atodbl +@ cdecl _o__atodbl_l(ptr str ptr) _atodbl_l +@ cdecl _o__atof_l(str ptr) _atof_l +@ cdecl _o__atoflt(ptr str) _atoflt +@ cdecl _o__atoflt_l(ptr str ptr) _atoflt_l +@ cdecl -ret64 _o__atoi64(str) _atoi64 +@ cdecl -ret64 _o__atoi64_l(str ptr) _atoi64_l +@ cdecl _o__atoi_l(str ptr) _atoi_l +@ cdecl _o__atol_l(str ptr) _atol_l +@ cdecl _o__atoldbl(ptr str) _atoldbl +@ cdecl _o__atoldbl_l(ptr str ptr) _atoldbl_l +@ cdecl -ret64 _o__atoll_l(str ptr) _atoll_l @ cdecl _o__beep(long long) _beep @ cdecl _o__beginthread(ptr long ptr) _beginthread @ cdecl _o__beginthreadex(ptr long ptr ptr long ptr) _beginthreadex @@ -1025,9 +1025,9 @@ @ cdecl _o__hypot(double double) _hypot @ cdecl _o__hypotf(float float) MSVCRT__hypotf @ cdecl _o__i64toa(int64 ptr long) ntdll._i64toa -@ cdecl _o__i64toa_s(int64 ptr long long) MSVCRT__i64toa_s +@ cdecl _o__i64toa_s(int64 ptr long long) _i64toa_s @ cdecl _o__i64tow(int64 ptr long) ntdll._i64tow -@ cdecl _o__i64tow_s(int64 ptr long long) MSVCRT__i64tow_s +@ cdecl _o__i64tow_s(int64 ptr long long) _i64tow_s @ cdecl _o__initialize_narrow_environment() _initialize_narrow_environment @ cdecl _o__initialize_onexit_table(ptr) _initialize_onexit_table @ cdecl _o__initialize_wide_environment() _initialize_wide_environment @@ -1100,10 +1100,10 @@ @ cdecl _o__ismbstrail(ptr ptr) _ismbstrail @ stub _o__ismbstrail_l @ cdecl _o__iswctype_l(long long ptr) MSVCRT__iswctype_l -@ cdecl _o__itoa(long ptr long) MSVCRT__itoa -@ cdecl _o__itoa_s(long ptr long long) MSVCRT__itoa_s +@ cdecl _o__itoa(long ptr long) _itoa +@ cdecl _o__itoa_s(long ptr long long) _itoa_s @ cdecl _o__itow(long ptr long) ntdll._itow -@ cdecl _o__itow_s(long ptr long long) MSVCRT__itow_s +@ cdecl _o__itow_s(long ptr long long) _itow_s @ cdecl _o__j0(double) MSVCRT__j0 @ cdecl _o__j1(double) MSVCRT__j1 @ cdecl _o__jn(long double) MSVCRT__jn @@ -1146,9 +1146,9 @@ @ cdecl _o__lseek(long long long) MSVCRT__lseek @ cdecl -ret64 _o__lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl _o__ltoa(long ptr long) ntdll._ltoa -@ cdecl _o__ltoa_s(long ptr long long) MSVCRT__ltoa_s +@ cdecl _o__ltoa_s(long ptr long long) _ltoa_s @ cdecl _o__ltow(long ptr long) ntdll._ltow -@ cdecl _o__ltow_s(long ptr long long) MSVCRT__ltow_s +@ cdecl _o__ltow_s(long ptr long long) _ltow_s @ cdecl _o__makepath(ptr str str str str) MSVCRT__makepath @ cdecl _o__makepath_s(ptr long str str str str) MSVCRT__makepath_s @ cdecl _o__malloc_base(long) _malloc_base @@ -1286,8 +1286,8 @@ @ cdecl _o__mbsupr_s(str long) _mbsupr_s @ stub _o__mbsupr_s_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__memicmp(str str long) _memicmp +@ cdecl _o__memicmp_l(str str long ptr) _memicmp_l @ cdecl _o__mkdir(str) MSVCRT__mkdir @ cdecl _o__mkgmtime32(ptr) MSVCRT__mkgmtime32 @ cdecl _o__mkgmtime64(ptr) MSVCRT__mkgmtime64 @@ -1353,48 +1353,48 @@ @ cdecl _o__stat32i64(str ptr) MSVCRT__stat32i64 @ cdecl _o__stat64(str ptr) MSVCRT_stat64 @ cdecl _o__stat64i32(str ptr) MSVCRT__stat64i32 -@ cdecl _o__strcoll_l(str str ptr) MSVCRT_strcoll_l +@ cdecl _o__strcoll_l(str str ptr) _strcoll_l @ cdecl _o__strdate(ptr) MSVCRT__strdate @ cdecl _o__strdate_s(ptr long) _strdate_s -@ cdecl _o__strdup(str) MSVCRT__strdup +@ cdecl _o__strdup(str) _strdup @ cdecl _o__strerror(long) _strerror @ stub _o__strerror_s @ cdecl _o__strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l -@ cdecl _o__stricmp(str str) MSVCRT__stricmp -@ cdecl _o__stricmp_l(str str ptr) MSVCRT__stricmp_l -@ cdecl _o__stricoll(str str) MSVCRT__stricoll -@ cdecl _o__stricoll_l(str str ptr) MSVCRT__stricoll_l -@ cdecl _o__strlwr(str) MSVCRT__strlwr +@ cdecl _o__stricmp(str str) _stricmp +@ cdecl _o__stricmp_l(str str ptr) _stricmp_l +@ cdecl _o__stricoll(str str) _stricoll +@ cdecl _o__stricoll_l(str str ptr) _stricoll_l +@ cdecl _o__strlwr(str) _strlwr @ cdecl _o__strlwr_l(str ptr) _strlwr_l -@ cdecl _o__strlwr_s(ptr long) MSVCRT__strlwr_s -@ cdecl _o__strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -@ cdecl _o__strncoll(str str long) MSVCRT__strncoll -@ cdecl _o__strncoll_l(str str long ptr) MSVCRT__strncoll_l -@ cdecl _o__strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _o__strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -@ cdecl _o__strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _o__strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -@ cdecl _o__strnset_s(str long long long) MSVCRT__strnset_s +@ cdecl _o__strlwr_s(ptr long) _strlwr_s +@ cdecl _o__strlwr_s_l(ptr long ptr) _strlwr_s_l +@ cdecl _o__strncoll(str str long) _strncoll +@ cdecl _o__strncoll_l(str str long ptr) _strncoll_l +@ cdecl _o__strnicmp(str str long) _strnicmp +@ cdecl _o__strnicmp_l(str str long ptr) _strnicmp_l +@ cdecl _o__strnicoll(str str long) _strnicoll +@ cdecl _o__strnicoll_l(str str long ptr) _strnicoll_l +@ cdecl _o__strnset_s(str long long long) _strnset_s @ stub _o__strset_s @ cdecl _o__strtime(ptr) MSVCRT__strtime @ cdecl _o__strtime_s(ptr long) _strtime_s -@ cdecl _o__strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl _o__strtof_l(str ptr ptr) MSVCRT__strtof_l -@ cdecl -ret64 _o__strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _o__strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl _o__strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ cdecl _o__strtold_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl -ret64 _o__strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl -ret64 _o__strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 _o__strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _o__strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ cdecl -ret64 _o__strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _o__strupr(str) MSVCRT__strupr -@ cdecl _o__strupr_l(str ptr) MSVCRT__strupr_l -@ cdecl _o__strupr_s(str long) MSVCRT__strupr_s -@ cdecl _o__strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ cdecl _o__strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -@ cdecl _o__swab(str str long) MSVCRT__swab +@ cdecl _o__strtod_l(str ptr ptr) _strtod_l +@ cdecl _o__strtof_l(str ptr ptr) _strtof_l +@ cdecl -ret64 _o__strtoi64(str ptr long) _strtoi64 +@ cdecl -ret64 _o__strtoi64_l(str ptr long ptr) _strtoi64_l +@ cdecl _o__strtol_l(str ptr long ptr) _strtol_l +@ cdecl _o__strtold_l(str ptr ptr) _strtod_l +@ cdecl -ret64 _o__strtoll_l(str ptr long ptr) _strtoi64_l +@ cdecl -ret64 _o__strtoui64(str ptr long) _strtoui64 +@ cdecl -ret64 _o__strtoui64_l(str ptr long ptr) _strtoui64_l +@ cdecl _o__strtoul_l(str ptr long ptr) _strtoul_l +@ cdecl -ret64 _o__strtoull_l(str ptr long ptr) _strtoui64_l +@ cdecl _o__strupr(str) _strupr +@ cdecl _o__strupr_l(str ptr) _strupr_l +@ cdecl _o__strupr_s(str long) _strupr_s +@ cdecl _o__strupr_s_l(str long ptr) _strupr_s_l +@ cdecl _o__strxfrm_l(ptr str long ptr) _strxfrm_l +@ cdecl _o__swab(str str long) _swab @ cdecl _o__tell(long) MSVCRT__tell @ cdecl -ret64 _o__telli64(long) _telli64 @ cdecl _o__timespec32_get(ptr long) _timespec32_get @@ -1407,13 +1407,13 @@ @ cdecl _o__towupper_l(long ptr) MSVCRT__towupper_l @ cdecl _o__tzset() MSVCRT__tzset @ cdecl _o__ui64toa(int64 ptr long) ntdll._ui64toa -@ cdecl _o__ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s +@ cdecl _o__ui64toa_s(int64 ptr long long) _ui64toa_s @ cdecl _o__ui64tow(int64 ptr long) ntdll._ui64tow -@ cdecl _o__ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s +@ cdecl _o__ui64tow_s(int64 ptr long long) _ui64tow_s @ cdecl _o__ultoa(long ptr long) ntdll._ultoa -@ cdecl _o__ultoa_s(long ptr long long) MSVCRT__ultoa_s +@ cdecl _o__ultoa_s(long ptr long long) _ultoa_s @ cdecl _o__ultow(long ptr long) ntdll._ultow -@ cdecl _o__ultow_s(long ptr long long) MSVCRT__ultow_s +@ cdecl _o__ultow_s(long ptr long long) _ultow_s @ cdecl _o__umask(long) MSVCRT__umask @ stub _o__umask_s @ cdecl _o__ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @@ -1576,10 +1576,10 @@ @ cdecl _o_atanh(double) MSVCR120_atanh @ cdecl _o_atanhf(float) MSVCR120_atanhf @ cdecl _o_atanhl(double) MSVCR120_atanhl -@ cdecl _o_atof(str) MSVCRT_atof -@ cdecl _o_atoi(str) MSVCRT_atoi -@ cdecl _o_atol(str) MSVCRT_atol -@ cdecl -ret64 _o_atoll(str) MSVCRT_atoll +@ cdecl _o_atof(str) atof +@ cdecl _o_atoi(str) atoi +@ cdecl _o_atol(str) atol +@ cdecl -ret64 _o_atoll(str) atoll @ 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 @@ -1778,23 +1778,23 @@ @ cdecl _o_sqrt(double) MSVCRT_sqrt @ cdecl -arch=!i386 _o_sqrtf(float) MSVCRT_sqrtf @ 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 +@ cdecl _o_strcat_s(str long str) strcat_s +@ cdecl _o_strcoll(str str) strcoll +@ cdecl _o_strcpy_s(ptr long str) strcpy_s @ cdecl _o_strerror(long) strerror @ 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_strncat_s(str long str long) strncat_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 -@ cdecl _o_strtok_s(ptr str ptr) MSVCRT_strtok_s -@ cdecl _o_strtol(str ptr long) MSVCRT_strtol -@ cdecl _o_strtold(str ptr) MSVCRT_strtod -@ cdecl -ret64 _o_strtoll(str ptr long) MSVCRT_strtoi64 -@ cdecl _o_strtoul(str ptr long) MSVCRT_strtoul -@ cdecl -ret64 _o_strtoull(str ptr long) MSVCRT_strtoui64 +@ cdecl _o_strtod(str ptr) strtod +@ cdecl _o_strtof(str ptr) strtof +@ cdecl _o_strtok(str str) strtok +@ cdecl _o_strtok_s(ptr str ptr) strtok_s +@ cdecl _o_strtol(str ptr long) strtol +@ cdecl _o_strtold(str ptr) strtod +@ cdecl -ret64 _o_strtoll(str ptr long) _strtoi64 +@ cdecl _o_strtoul(str ptr long) strtoul +@ cdecl -ret64 _o_strtoull(str ptr long) _strtoui64 @ cdecl _o_system(str) system @ cdecl _o_tan(double) MSVCRT_tan @ cdecl -arch=!i386 _o_tanf(float) MSVCRT_tanf @@ -1920,53 +1920,53 @@ @ cdecl _stat64i32(str ptr) MSVCRT__stat64i32 @ cdecl _statusfp() @ cdecl -arch=i386 _statusfp2(ptr ptr) -@ cdecl _strcoll_l(str str ptr) MSVCRT_strcoll_l +@ cdecl _strcoll_l(str str ptr) @ cdecl _strdate(ptr) MSVCRT__strdate @ cdecl _strdate_s(ptr long) -@ cdecl _strdup(str) MSVCRT__strdup +@ cdecl _strdup(str) @ cdecl _strerror(long) @ stub _strerror_s @ cdecl _strftime_l(ptr long str ptr ptr) MSVCRT__strftime_l -@ cdecl _stricmp(str str) MSVCRT__stricmp -@ cdecl _stricmp_l(str str ptr) MSVCRT__stricmp_l -@ cdecl _stricoll(str str) MSVCRT__stricoll -@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l -@ cdecl _strlwr(str) MSVCRT__strlwr +@ cdecl _stricmp(str str) +@ cdecl _stricmp_l(str str ptr) +@ cdecl _stricoll(str str) +@ cdecl _stricoll_l(str str ptr) +@ cdecl _strlwr(str) @ cdecl _strlwr_l(str ptr) -@ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s -@ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l -@ cdecl _strncoll(str str long) MSVCRT__strncoll -@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l -@ cdecl _strnicmp(str str long) MSVCRT__strnicmp -@ cdecl _strnicmp_l(str str long ptr) MSVCRT__strnicmp_l -@ cdecl _strnicoll(str str long) MSVCRT__strnicoll -@ cdecl _strnicoll_l(str str long ptr) MSVCRT__strnicoll_l -@ cdecl _strnset(str long long) MSVCRT__strnset -@ cdecl _strnset_s(str long long long) MSVCRT__strnset_s -@ cdecl _strrev(str) MSVCRT__strrev +@ cdecl _strlwr_s(ptr long) +@ cdecl _strlwr_s_l(ptr long ptr) +@ cdecl _strncoll(str str long) +@ cdecl _strncoll_l(str str long ptr) +@ cdecl _strnicmp(str str long) +@ cdecl _strnicmp_l(str str long ptr) +@ cdecl _strnicoll(str str long) +@ cdecl _strnicoll_l(str str long ptr) +@ cdecl _strnset(str long long) +@ cdecl _strnset_s(str long long long) +@ cdecl _strrev(str) @ cdecl _strset(str long) @ stub _strset_s @ cdecl _strtime(ptr) MSVCRT__strtime @ cdecl _strtime_s(ptr long) -@ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl _strtof_l(str ptr ptr) MSVCRT__strtof_l -@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl -ret64 _strtoimax_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl _strtol_l(str ptr long ptr) MSVCRT__strtol_l -@ cdecl _strtold_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl -ret64 _strtoll_l(str ptr long ptr) MSVCRT_strtoi64_l -@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strtoul_l(str ptr long ptr) MSVCRT_strtoul_l -@ cdecl -ret64 _strtoull_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl -ret64 _strtoumax_l(str ptr long ptr) MSVCRT_strtoui64_l -@ cdecl _strupr(str) MSVCRT__strupr -@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l -@ cdecl _strupr_s(str long) MSVCRT__strupr_s -@ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l -@ cdecl _strxfrm_l(ptr str long ptr) MSVCRT__strxfrm_l -@ cdecl _swab(str str long) MSVCRT__swab +@ cdecl _strtod_l(str ptr ptr) +@ cdecl _strtof_l(str ptr ptr) +@ cdecl -ret64 _strtoi64(str ptr long) +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) +@ cdecl -ret64 _strtoimax_l(str ptr long ptr) _strtoi64_l +@ cdecl _strtol_l(str ptr long ptr) +@ cdecl _strtold_l(str ptr ptr) _strtod_l +@ cdecl -ret64 _strtoll_l(str ptr long ptr) _strtoi64_l +@ cdecl -ret64 _strtoui64(str ptr long) +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) +@ cdecl _strtoul_l(str ptr long ptr) +@ cdecl -ret64 _strtoull_l(str ptr long ptr) _strtoui64_l +@ cdecl -ret64 _strtoumax_l(str ptr long ptr) _strtoui64_l +@ cdecl _strupr(str) +@ cdecl _strupr_l(str ptr) +@ cdecl _strupr_s(str long) +@ cdecl _strupr_s_l(str long ptr) +@ cdecl _strxfrm_l(ptr str long ptr) +@ cdecl _swab(str str long) @ cdecl _tell(long) MSVCRT__tell @ cdecl -ret64 _telli64(long) @ cdecl _tempnam(str str) MSVCRT__tempnam @@ -1982,13 +1982,13 @@ @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l @ cdecl _tzset() MSVCRT__tzset @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa -@ cdecl _ui64toa_s(int64 ptr long long) MSVCRT__ui64toa_s +@ cdecl _ui64toa_s(int64 ptr long long) @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow -@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s +@ cdecl _ui64tow_s(int64 ptr long long) @ cdecl _ultoa(long ptr long) ntdll._ultoa -@ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s +@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow -@ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s +@ cdecl _ultow_s(long ptr long long) @ cdecl _umask(long) MSVCRT__umask @ stub _umask_s @ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock @@ -2170,10 +2170,10 @@ @ cdecl atanh(double) MSVCR120_atanh @ cdecl atanhf(float) MSVCR120_atanhf @ cdecl atanhl(double) MSVCR120_atanhl -@ cdecl atof(str) MSVCRT_atof -@ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) MSVCRT_atol -@ cdecl -ret64 atoll(str) MSVCRT_atoll +@ cdecl atof(str) +@ cdecl atoi(str) +@ cdecl atol(str) +@ cdecl -ret64 atoll(str) @ cdecl bsearch(ptr ptr long long ptr) @ cdecl bsearch_s(ptr ptr long long ptr ptr) @ cdecl btowc(long) @@ -2420,7 +2420,7 @@ @ 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 memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) @ cdecl memcpy_s(ptr long ptr long) @@ -2495,39 +2495,39 @@ @ cdecl -arch=!i386 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) @ cdecl strcat(str str) -@ cdecl strcat_s(str long str) MSVCRT_strcat_s +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) -@ cdecl strcoll(str str) MSVCRT_strcoll +@ cdecl strcoll(str str) @ cdecl strcpy(ptr str) -@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) MSVCRT_strcspn +@ cdecl strcpy_s(ptr long str) +@ cdecl strcspn(str str) @ cdecl strerror(long) @ cdecl strerror_s(ptr long long) @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) -@ cdecl strncat(str str long) MSVCRT_strncat -@ 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 strncat(str str long) +@ cdecl strncat_s(str long str long) +@ cdecl strncmp(str str long) +@ cdecl strncpy(ptr str long) @ 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 +@ cdecl strnlen(str long) +@ cdecl strpbrk(str str) +@ cdecl strrchr(str long) @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) MSVCRT_strstr -@ cdecl strtod(str ptr) MSVCRT_strtod -@ cdecl strtof(str ptr) MSVCRT_strtof -@ cdecl -ret64 strtoimax(str ptr long) MSVCRT_strtoi64 -@ cdecl strtok(str str) MSVCRT_strtok -@ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s -@ cdecl strtol(str ptr long) MSVCRT_strtol -@ cdecl strtold(str ptr) MSVCRT_strtod -@ cdecl -ret64 strtoll(str ptr long) MSVCRT_strtoi64 -@ cdecl strtoul(str ptr long) MSVCRT_strtoul -@ cdecl -ret64 strtoull(str ptr long) MSVCRT_strtoui64 -@ cdecl -ret64 strtoumax(str ptr long) MSVCRT_strtoui64 -@ cdecl strxfrm(ptr str long) MSVCRT_strxfrm +@ cdecl strstr(str str) +@ cdecl strtod(str ptr) +@ cdecl strtof(str ptr) +@ cdecl -ret64 strtoimax(str ptr long) _strtoi64 +@ cdecl strtok(str str) +@ cdecl strtok_s(ptr str ptr) +@ cdecl strtol(str ptr long) +@ cdecl strtold(str ptr) strtod +@ cdecl -ret64 strtoll(str ptr long) _strtoi64 +@ cdecl strtoul(str ptr long) +@ cdecl -ret64 strtoull(str ptr long) _strtoui64 +@ cdecl -ret64 strtoumax(str ptr long) _strtoui64 +@ cdecl strxfrm(ptr str long) @ cdecl system(str) @ cdecl tan(double) MSVCRT_tan @ cdecl -arch=!i386 tanf(float) MSVCRT_tanf diff --git a/include/msvcrt/corecrt_wstdlib.h b/include/msvcrt/corecrt_wstdlib.h index 4a32db00b57..1b15ecff860 100644 --- a/include/msvcrt/corecrt_wstdlib.h +++ b/include/msvcrt/corecrt_wstdlib.h @@ -13,11 +13,11 @@ extern "C" { #endif _ACRTIMP wchar_t* __cdecl _itow(int,wchar_t*,int); -_ACRTIMP errno_t __cdecl _itow_s(int,wchar_t*,int, int); +_ACRTIMP errno_t __cdecl _itow_s(int,wchar_t*,size_t, int); _ACRTIMP wchar_t* __cdecl _i64tow(__int64,wchar_t*,int); _ACRTIMP errno_t __cdecl _i64tow_s(__int64, wchar_t*, size_t, int); _ACRTIMP wchar_t* __cdecl _ltow(__msvcrt_long,wchar_t*,int); -_ACRTIMP errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,int,int); +_ACRTIMP errno_t __cdecl _ltow_s(__msvcrt_long,wchar_t*,size_t,int); _ACRTIMP wchar_t* __cdecl _ui64tow(unsigned __int64,wchar_t*,int); _ACRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64, wchar_t*, size_t, int); _ACRTIMP wchar_t* __cdecl _ultow(__msvcrt_ulong,wchar_t*,int); -- 2.11.4.GIT