Skip to content

W
wine-winehq
Commit 1514c54c authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Remove MSVCRT_ prefix from string.c functions.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a1662e3f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 493 additions and 506 deletions
dlls/crtdll/crtdll.spec
View file @ 1514c54c
......@@ -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)
......
dlls/msvcr70/msvcr70.spec
View file @ 1514c54c
......@@ -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)
......
dlls/msvcr71/msvcr71.spec
View file @ 1514c54c
......@@ -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)
......
dlls/msvcrt/data.c
View file @ 1514c54c
......@@ -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;
......
dlls/msvcrt/dir.c
View file @ 1514c54c
......@@ -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);
}
......
dlls/msvcrt/environ.c
View file @ 1514c54c
......@@ -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;
......
dlls/msvcrt/except.c
View file @ 1514c54c
......@@ -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;
......
dlls/msvcrt/file.c
View file @ 1514c54c
......@@ -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)
......
dlls/msvcrt/locale.c
View file @ 1514c54c
......@@ -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;
......
dlls/msvcrt/mbcs.c
View file @ 1514c54c
......@@ -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(i<maxsize && str[i])
{
......@@ -949,7 +949,7 @@ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, si
mbcinfo = locale->mbcinfo;
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;
......
dlls/msvcrt/msvcrt.h
View file @ 1514c54c
......@@ -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);
......
dlls/msvcrt/printf.h
View file @ 1514c54c
......@@ -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);
}
......
dlls/msvcrt/time.c
View file @ 1514c54c
......@@ -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;
......
dlls/msvcrt/undname.c
View file @ 1514c54c
......@@ -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));
......
dlls/msvcrtd/msvcrtd.spec
View file @ 1514c54c
# 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)
......
include/msvcrt/corecrt_wstdlib.h
View file @ 1514c54c
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment