system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 15:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

msvcrt: Remove MSVCRT_ prefix from environ.c functions.

Browse source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-12-02 00:53:33 +01:00 committed by Alexandre Julliard
parent 0d479b9d8c
commit 9011b0b7c0
17 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/crtdll/crtdll.spec
View file

@ -393,7 +393,7 @@
@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl gmtime(ptr) MSVCRT_gmtime
@ cdecl is_wctype(long long) MSVCRT_iswctype

4
dlls/msvcr100/msvcr100.spec
View file

@ -1560,7 +1560,7 @@
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ stub _wgetdcwd_nolock
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ cdecl _wgetenv_s(ptr ptr long wstr)
@ cdecl _wmakepath(ptr wstr wstr wstr wstr) MSVCRT__wmakepath
@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) MSVCRT__wmakepath_s
@ -1697,7 +1697,7 @@
@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl getenv_s(ptr ptr long str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl gets_s(ptr long) MSVCRT_gets_s

4
dlls/msvcr110/msvcr110.spec
View file

@ -1917,7 +1917,7 @@
@ cdecl _wfullpath(ptr wstr long) MSVCRT__wfullpath
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ cdecl _wgetenv_s(ptr ptr long wstr)
@ cdecl _wmakepath(ptr wstr wstr wstr wstr) MSVCRT__wmakepath
@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) MSVCRT__wmakepath_s
@ -2055,7 +2055,7 @@
@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl getenv_s(ptr ptr long str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl gets_s(ptr long) MSVCRT_gets_s

4
dlls/msvcr120/msvcr120.spec
View file

@ -1941,7 +1941,7 @@
@ cdecl _wfullpath(ptr wstr long) MSVCRT__wfullpath
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ cdecl _wgetenv_s(ptr ptr long wstr)
@ cdecl _wmakepath(ptr wstr wstr wstr wstr) MSVCRT__wmakepath
@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) MSVCRT__wmakepath_s
@ -2201,7 +2201,7 @@
@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl getenv_s(ptr ptr long str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl gets_s(ptr long) MSVCRT_gets_s

4
dlls/msvcr70/msvcr70.spec
View file

@ -635,7 +635,7 @@
@ cdecl _wfullpath(ptr wstr long) MSVCRT__wfullpath
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ extern _winmajor MSVCRT__winmajor
@ extern _winminor MSVCRT__winminor
@ extern _winver MSVCRT__winver
@ -736,7 +736,7 @@
@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl getwc(ptr) MSVCRT_getwc
@ cdecl getwchar() MSVCRT_getwchar

4
dlls/msvcr71/msvcr71.spec
View file

@ -631,7 +631,7 @@
@ cdecl _wfullpath(ptr wstr long) MSVCRT__wfullpath
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ extern _winmajor MSVCRT__winmajor
@ extern _winminor MSVCRT__winminor
@ extern _winver MSVCRT__winver
@ -732,7 +732,7 @@
@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl getwc(ptr) MSVCRT_getwc
@ cdecl getwchar() MSVCRT_getwchar

4
dlls/msvcr80/msvcr80.spec
View file

@ -1240,7 +1240,7 @@
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ stub _wgetdcwd_nolock
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ cdecl _wgetenv_s(ptr ptr long wstr)
@ extern _winmajor MSVCRT__winmajor
@ extern _winminor MSVCRT__winminor
@ -1380,7 +1380,7 @@
@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl getenv_s(ptr ptr long str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl gets_s(ptr long) MSVCRT_gets_s

4
dlls/msvcr90/msvcr90.spec
View file

@ -1215,7 +1215,7 @@
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ stub _wgetdcwd_nolock
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ cdecl _wgetenv_s(ptr ptr long wstr)
@ cdecl _wmakepath(ptr wstr wstr wstr wstr) MSVCRT__wmakepath
@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) MSVCRT__wmakepath_s
@ -1352,7 +1352,7 @@
@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl getenv_s(ptr ptr long str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl gets_s(ptr long) MSVCRT_gets_s

4
dlls/msvcrt/dir.c
View file

@ -1666,7 +1666,7 @@ int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, size
}
/* Search given environment variable */
envVal = MSVCRT_getenv(env);
envVal = getenv(env);
if (!envVal)
{
*_errno() = ENOENT;
@ -1760,7 +1760,7 @@ int CDECL MSVCRT__wsearchenv_s(const wchar_t* file, const wchar_t* env,
}
/* Search given environment variable */
envVal = MSVCRT__wgetenv(env);
envVal = _wgetenv(env);
if (!envVal)
{
*_errno() = ENOENT;

16
dlls/msvcrt/environ.c
View file

@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
/*********************************************************************
* getenv (MSVCRT.@)
*/
char * CDECL MSVCRT_getenv(const char *name)
char * CDECL getenv(const char *name)
{
char **env;
unsigned int length=strlen(name);
@ -49,7 +49,7 @@ char * CDECL MSVCRT_getenv(const char *name)
/*********************************************************************
* _wgetenv (MSVCRT.@)
*/
wchar_t * CDECL MSVCRT__wgetenv(const wchar_t *name)
wchar_t * CDECL _wgetenv(const wchar_t *name)
{
wchar_t **env;
unsigned int length=MSVCRT_wcslen(name);
@ -219,7 +219,7 @@ int CDECL _dupenv_s(char **buffer, size_t *numberOfElements, const char *varname
if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL;
if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL;
if (!(e = MSVCRT_getenv(varname))) return *_errno() = EINVAL;
if (!(e = getenv(varname))) return *_errno() = EINVAL;
sz = strlen(e) + 1;
if (!(*buffer = malloc(sz)))
@ -244,7 +244,7 @@ int CDECL _wdupenv_s(wchar_t **buffer, size_t *numberOfElements,
if (!MSVCRT_CHECK_PMT(buffer != NULL)) return EINVAL;
if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL;
if (!(e = MSVCRT__wgetenv(varname))) return *_errno() = EINVAL;
if (!(e = _wgetenv(varname))) return *_errno() = EINVAL;
sz = MSVCRT_wcslen(e) + 1;
if (!(*buffer = malloc(sz * sizeof(wchar_t))))
@ -270,7 +270,7 @@ int CDECL getenv_s(size_t *pReturnValue, char* buffer, size_t numberOfElements,
if (!MSVCRT_CHECK_PMT(!(buffer == NULL && numberOfElements > 0))) return EINVAL;
if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL;
if (!(e = MSVCRT_getenv(varname)))
if (!(e = getenv(varname)))
{
*pReturnValue = 0;
return *_errno() = EINVAL;
@ -296,7 +296,7 @@ int CDECL _wgetenv_s(size_t *pReturnValue, wchar_t *buffer, size_t numberOfEleme
if (!MSVCRT_CHECK_PMT(!(buffer == NULL && numberOfElements > 0))) return EINVAL;
if (!MSVCRT_CHECK_PMT(varname != NULL)) return EINVAL;
if (!(e = MSVCRT__wgetenv(varname)))
if (!(e = _wgetenv(varname)))
{
*pReturnValue = 0;
return *_errno() = EINVAL;
@ -313,7 +313,7 @@ int CDECL _wgetenv_s(size_t *pReturnValue, wchar_t *buffer, size_t numberOfEleme
/*********************************************************************
* _get_environ (MSVCRT.@)
*/
void CDECL MSVCRT__get_environ(char ***ptr)
void CDECL _get_environ(char ***ptr)
{
*ptr = MSVCRT__environ;
}
@ -321,7 +321,7 @@ void CDECL MSVCRT__get_environ(char ***ptr)
/*********************************************************************
* _get_wenviron (MSVCRT.@)
*/
void CDECL MSVCRT__get_wenviron(wchar_t ***ptr)
void CDECL _get_wenviron(wchar_t ***ptr)
{
*ptr = MSVCRT__wenviron;
}

4
dlls/msvcrt/file.c
View file

@ -3277,7 +3277,7 @@ __int64 CDECL _telli64(int fd)
char * CDECL MSVCRT__tempnam(const char *dir, const char *prefix)
{
char tmpbuf[MAX_PATH];
const char *tmp_dir = MSVCRT_getenv("TMP");
const char *tmp_dir = getenv("TMP");
if (tmp_dir) dir = tmp_dir;
@ -3298,7 +3298,7 @@ char * CDECL MSVCRT__tempnam(const char *dir, const char *prefix)
wchar_t * CDECL MSVCRT__wtempnam(const wchar_t *dir, const wchar_t *prefix)
{
wchar_t tmpbuf[MAX_PATH];
const wchar_t *tmp_dir = MSVCRT__wgetenv(L"TMP");
const wchar_t *tmp_dir = _wgetenv(L"TMP");
if (tmp_dir) dir = tmp_dir;

2
dlls/msvcrt/msvcrt.h
View file

@ -623,7 +623,6 @@ __int64 __cdecl MSVCRT__ftelli64(FILE* file);
__int64 __cdecl MSVCRT__ftelli64_nolock(FILE*);
void __cdecl MSVCRT__exit(int);
void __cdecl MSVCRT_abort(void);
char* __cdecl MSVCRT_getenv(const char*);
size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,FILE*);
size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,FILE*);
size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,FILE*);
@ -700,7 +699,6 @@ int __cdecl MSVCRT__close(int);
int __cdecl MSVCRT__dup(int);
int __cdecl MSVCRT__dup2(int, int);
int __cdecl MSVCRT__pipe(int *, unsigned int, int);
wchar_t* __cdecl MSVCRT__wgetenv(const wchar_t*);
void __cdecl MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*);
int __cdecl MSVCRT__towupper_l(wint_t,_locale_t);

8
dlls/msvcrt/msvcrt.spec
View file

@ -502,7 +502,7 @@
@ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s
@ cdecl _get_current_locale()
@ cdecl _get_doserrno(ptr)
@ cdecl _get_environ(ptr) MSVCRT__get_environ
@ cdecl _get_environ(ptr)
@ cdecl _get_errno(ptr)
# stub _get_fileinfo(ptr)
@ cdecl _get_fmode(ptr)
@ -513,7 +513,7 @@
@ cdecl _get_output_format() MSVCRT__get_output_format
@ cdecl _get_pgmptr(ptr)
@ cdecl _get_sbh_threshold()
@ cdecl _get_wenviron(ptr) MSVCRT__get_wenviron
@ cdecl _get_wenviron(ptr)
@ cdecl _get_winmajor(ptr)
@ cdecl _get_winminor(ptr)
# stub _get_winver(ptr)
@ -1172,7 +1172,7 @@
# stub _wfullpath_dbg(ptr wstr long long str long)
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ cdecl _wgetenv_s(ptr ptr long wstr)
@ extern _winmajor MSVCRT__winmajor
@ extern _winminor MSVCRT__winminor
@ -1321,7 +1321,7 @@
@ varargs fwscanf_s(ptr wstr) MSVCRT_fwscanf_s
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl getenv_s(ptr ptr long str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl getwc(ptr) MSVCRT_getwc

2
dlls/msvcrt/process.c
View file

@ -83,7 +83,7 @@ static void msvcrt_search_executable(const wchar_t *name, wchar_t *fullname, int
extension = 0;
}
if (!use_path || !(env = MSVCRT__wgetenv(L"PATH"))) return;
if (!use_path || !(env = _wgetenv(L"PATH"))) return;
/* now try search path */
do

2
dlls/msvcrt/time.c
View file

@ -108,7 +108,7 @@ static TIME_ZONE_INFORMATION tzi = {0};
*/
void CDECL MSVCRT__tzset(void)
{
char *tz = MSVCRT_getenv("TZ");
char *tz = getenv("TZ");
BOOL error;
_lock(_TIME_LOCK);

4
dlls/msvcrtd/msvcrtd.spec
View file

@ -590,7 +590,7 @@
@ cdecl _wfullpath(ptr wstr long) MSVCRT__wfullpath
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ extern _winmajor MSVCRT__winmajor
@ extern _winminor MSVCRT__winminor
@ extern _winver MSVCRT__winver
@ -688,7 +688,7 @@
@ varargs fwscanf(ptr wstr) MSVCRT_fwscanf
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl getwc(ptr) MSVCRT_getwc
@ cdecl getwchar() MSVCRT_getwchar

8
dlls/ucrtbase/ucrtbase.spec
View file

@ -1504,7 +1504,7 @@
@ cdecl _o__wfullpath(ptr wstr long) MSVCRT__wfullpath
@ cdecl _o__wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _o__wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ cdecl _o__wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _o__wgetenv(wstr) _wgetenv
@ cdecl _o__wgetenv_s(ptr ptr long wstr) _wgetenv_s
@ cdecl _o__wmakepath(ptr wstr wstr wstr wstr) MSVCRT__wmakepath
@ cdecl _o__wmakepath_s(ptr long wstr wstr wstr wstr) MSVCRT__wmakepath_s
@ -1641,7 +1641,7 @@
@ cdecl _o_fwrite(ptr long long ptr) MSVCRT_fwrite
@ cdecl _o_getc(ptr) MSVCRT_getc
@ cdecl _o_getchar() MSVCRT_getchar
@ cdecl _o_getenv(str) MSVCRT_getenv
@ cdecl _o_getenv(str) getenv
@ cdecl _o_getenv_s(ptr ptr long str) getenv_s
@ cdecl _o_gets(str) MSVCRT_gets
@ cdecl _o_gets_s(ptr long) MSVCRT_gets_s
@ -2089,7 +2089,7 @@
@ cdecl _wfullpath(ptr wstr long) MSVCRT__wfullpath
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ cdecl _wgetenv(wstr) MSVCRT__wgetenv
@ cdecl _wgetenv(wstr)
@ cdecl _wgetenv_s(ptr ptr long wstr)
@ cdecl _wmakepath(ptr wstr wstr wstr wstr) MSVCRT__wmakepath
@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) MSVCRT__wmakepath_s
@ -2334,7 +2334,7 @@
@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
@ cdecl getc(ptr) MSVCRT_getc
@ cdecl getchar() MSVCRT_getchar
@ cdecl getenv(str) MSVCRT_getenv
@ cdecl getenv(str)
@ cdecl getenv_s(ptr ptr long str)
@ cdecl gets(str) MSVCRT_gets
@ cdecl gets_s(ptr long) MSVCRT_gets_s