Skip to content

W
wine-cw
Commit f9de4eef authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Fix mingw compilation issues.

parent a282c150
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 161 deletions
dlls/msvcrt/ctype.c
View file @ f9de4eef
......@@ -69,7 +69,7 @@ const unsigned short* CDECL MSVCRT___pctype_func(void)
/*********************************************************************
* _isctype_l (MSVCRT.@)
*/
int CDECL _isctype_l(int c, int type, MSVCRT__locale_t locale)
int CDECL MSVCRT__isctype_l(int c, int type, MSVCRT__locale_t locale)
{
MSVCRT_pthreadlocinfo locinfo;
......@@ -102,9 +102,9 @@ int CDECL _isctype_l(int c, int type, MSVCRT__locale_t locale)
/*********************************************************************
* _isctype (MSVCRT.@)
*/
int CDECL _isctype(int c, int type)
int CDECL MSVCRT__isctype(int c, int type)
{
return _isctype_l(c, type, NULL);
return MSVCRT__isctype_l(c, type, NULL);
}
/*********************************************************************
......@@ -112,7 +112,7 @@ int CDECL _isctype(int c, int type)
*/
int CDECL MSVCRT__isalnum_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT, locale );
return MSVCRT__isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT, locale );
}
/*********************************************************************
......@@ -120,7 +120,7 @@ int CDECL MSVCRT__isalnum_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isalnum(int c)
{
return _isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT );
return MSVCRT__isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT );
}
/*********************************************************************
......@@ -128,7 +128,7 @@ int CDECL MSVCRT_isalnum(int c)
*/
int CDECL MSVCRT__isalpha_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__ALPHA, locale );
return MSVCRT__isctype_l( c, MSVCRT__ALPHA, locale );
}
/*********************************************************************
......@@ -136,7 +136,7 @@ int CDECL MSVCRT__isalpha_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isalpha(int c)
{
return _isctype( c, MSVCRT__ALPHA );
return MSVCRT__isctype( c, MSVCRT__ALPHA );
}
/*********************************************************************
......@@ -144,7 +144,7 @@ int CDECL MSVCRT_isalpha(int c)
*/
int CDECL MSVCRT__iscntrl_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__CONTROL, locale );
return MSVCRT__isctype_l( c, MSVCRT__CONTROL, locale );
}
/*********************************************************************
......@@ -152,7 +152,7 @@ int CDECL MSVCRT__iscntrl_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_iscntrl(int c)
{
return _isctype( c, MSVCRT__CONTROL );
return MSVCRT__isctype( c, MSVCRT__CONTROL );
}
/*********************************************************************
......@@ -160,7 +160,7 @@ int CDECL MSVCRT_iscntrl(int c)
*/
int CDECL MSVCRT__isdigit_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__DIGIT, locale );
return MSVCRT__isctype_l( c, MSVCRT__DIGIT, locale );
}
/*********************************************************************
......@@ -168,7 +168,7 @@ int CDECL MSVCRT__isdigit_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isdigit(int c)
{
return _isctype( c, MSVCRT__DIGIT );
return MSVCRT__isctype( c, MSVCRT__DIGIT );
}
/*********************************************************************
......@@ -176,7 +176,7 @@ int CDECL MSVCRT_isdigit(int c)
*/
int CDECL MSVCRT__isgraph_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT, locale );
return MSVCRT__isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT, locale );
}
/*********************************************************************
......@@ -184,7 +184,7 @@ int CDECL MSVCRT__isgraph_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isgraph(int c)
{
return _isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT );
return MSVCRT__isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__PUNCT );
}
/*********************************************************************
......@@ -192,7 +192,7 @@ int CDECL MSVCRT_isgraph(int c)
*/
int CDECL MSVCRT__isleadbyte_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__LEADBYTE, locale );
return MSVCRT__isctype_l( c, MSVCRT__LEADBYTE, locale );
}
/*********************************************************************
......@@ -200,7 +200,7 @@ int CDECL MSVCRT__isleadbyte_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isleadbyte(int c)
{
return _isctype( c, MSVCRT__LEADBYTE );
return MSVCRT__isctype( c, MSVCRT__LEADBYTE );
}
/*********************************************************************
......@@ -208,7 +208,7 @@ int CDECL MSVCRT_isleadbyte(int c)
*/
int CDECL MSVCRT__islower_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__LOWER, locale );
return MSVCRT__isctype_l( c, MSVCRT__LOWER, locale );
}
/*********************************************************************
......@@ -216,7 +216,7 @@ int CDECL MSVCRT__islower_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_islower(int c)
{
return _isctype( c, MSVCRT__LOWER );
return MSVCRT__isctype( c, MSVCRT__LOWER );
}
/*********************************************************************
......@@ -224,7 +224,7 @@ int CDECL MSVCRT_islower(int c)
*/
int CDECL MSVCRT__isprint_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT, locale );
return MSVCRT__isctype_l( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT, locale );
}
/*********************************************************************
......@@ -232,7 +232,7 @@ int CDECL MSVCRT__isprint_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isprint(int c)
{
return _isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT );
return MSVCRT__isctype( c, MSVCRT__ALPHA | MSVCRT__DIGIT | MSVCRT__BLANK | MSVCRT__PUNCT );
}
/*********************************************************************
......@@ -240,7 +240,7 @@ int CDECL MSVCRT_isprint(int c)
*/
int CDECL MSVCRT_ispunct(int c)
{
return _isctype( c, MSVCRT__PUNCT );
return MSVCRT__isctype( c, MSVCRT__PUNCT );
}
/*********************************************************************
......@@ -248,7 +248,7 @@ int CDECL MSVCRT_ispunct(int c)
*/
int CDECL MSVCRT__isspace_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__SPACE, locale );
return MSVCRT__isctype_l( c, MSVCRT__SPACE, locale );
}
/*********************************************************************
......@@ -256,7 +256,7 @@ int CDECL MSVCRT__isspace_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isspace(int c)
{
return _isctype( c, MSVCRT__SPACE );
return MSVCRT__isctype( c, MSVCRT__SPACE );
}
/*********************************************************************
......@@ -264,7 +264,7 @@ int CDECL MSVCRT_isspace(int c)
*/
int CDECL MSVCRT__isupper_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__UPPER, locale );
return MSVCRT__isctype_l( c, MSVCRT__UPPER, locale );
}
/*********************************************************************
......@@ -272,7 +272,7 @@ int CDECL MSVCRT__isupper_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isupper(int c)
{
return _isctype( c, MSVCRT__UPPER );
return MSVCRT__isctype( c, MSVCRT__UPPER );
}
/*********************************************************************
......@@ -280,7 +280,7 @@ int CDECL MSVCRT_isupper(int c)
*/
int CDECL MSVCRT__isxdigit_l(int c, MSVCRT__locale_t locale)
{
return _isctype_l( c, MSVCRT__HEX, locale );
return MSVCRT__isctype_l( c, MSVCRT__HEX, locale );
}
/*********************************************************************
......@@ -288,7 +288,7 @@ int CDECL MSVCRT__isxdigit_l(int c, MSVCRT__locale_t locale)
*/
int CDECL MSVCRT_isxdigit(int c)
{
return _isctype( c, MSVCRT__HEX );
return MSVCRT__isctype( c, MSVCRT__HEX );
}
/*********************************************************************
......
dlls/msvcrt/data.c
View file @ f9de4eef
......@@ -203,7 +203,7 @@ MSVCRT_wchar_t*** CDECL __p___wargv(void) { return &MSVCRT___wargv; }
/*********************************************************************
* __p__environ (MSVCRT.@)
*/
char*** CDECL __p__environ(void)
char*** CDECL MSVCRT___p__environ(void)
{
return &MSVCRT__environ;
}
......@@ -211,7 +211,7 @@ char*** CDECL __p__environ(void)
/*********************************************************************
* __p__wenviron (MSVCRT.@)
*/
MSVCRT_wchar_t*** CDECL __p__wenviron(void)
MSVCRT_wchar_t*** CDECL MSVCRT___p__wenviron(void)
{
return &MSVCRT__wenviron;
}
......@@ -276,7 +276,7 @@ void msvcrt_init_args(void)
{
OSVERSIONINFOW osvi;
MSVCRT__acmdln = _strdup( GetCommandLineA() );
MSVCRT__acmdln = MSVCRT__strdup( GetCommandLineA() );
MSVCRT__wcmdln = msvcrt_wstrdupa(MSVCRT__acmdln);
MSVCRT___argc = __wine_main_argc;
MSVCRT___argv = __wine_main_argv;
......
dlls/msvcrt/dir.c
View file @ f9de4eef
......@@ -246,7 +246,7 @@ int CDECL MSVCRT__chdir(const char * newdir)
*
* Unicode version of _chdir.
*/
int CDECL _wchdir(const MSVCRT_wchar_t * newdir)
int CDECL MSVCRT__wchdir(const MSVCRT_wchar_t * newdir)
{
if (!SetCurrentDirectoryW(newdir))
{
......@@ -271,7 +271,7 @@ int CDECL _wchdir(const MSVCRT_wchar_t * newdir)
* NOTES
* See SetCurrentDirectoryA.
*/
int CDECL _chdrive(int newdrive)
int CDECL MSVCRT__chdrive(int newdrive)
{
WCHAR buffer[3] = {'A', ':', 0};
......@@ -705,7 +705,7 @@ int CDECL MSVCRT__wfindnext64i32(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata6
* Otherwise populates buf with the path and returns it.
* Failure: NULL. errno indicates the error.
*/
char* CDECL _getcwd(char * buf, int size)
char* CDECL MSVCRT__getcwd(char * buf, int size)
{
char dir[MAX_PATH];
int dir_len = GetCurrentDirectoryA(MAX_PATH,dir);
......@@ -732,7 +732,7 @@ char* CDECL _getcwd(char * buf, int size)
*
* Unicode version of _getcwd.
*/
MSVCRT_wchar_t* CDECL _wgetcwd(MSVCRT_wchar_t * buf, int size)
MSVCRT_wchar_t* CDECL MSVCRT__wgetcwd(MSVCRT_wchar_t * buf, int size)
{
MSVCRT_wchar_t dir[MAX_PATH];
int dir_len = GetCurrentDirectoryW(MAX_PATH,dir);
......@@ -766,7 +766,7 @@ MSVCRT_wchar_t* CDECL _wgetcwd(MSVCRT_wchar_t * buf, int size)
* Success: The drive letter number from 1 to 26 ("A:" to "Z:").
* Failure: 0.
*/
int CDECL _getdrive(void)
int CDECL MSVCRT__getdrive(void)
{
WCHAR buffer[MAX_PATH];
if (GetCurrentDirectoryW( MAX_PATH, buffer ) &&
......@@ -790,14 +790,14 @@ int CDECL _getdrive(void)
* Otherwise populates drive with the path and returns it.
* Failure: NULL. errno indicates the error.
*/
char* CDECL _getdcwd(int drive, char * buf, int size)
char* CDECL MSVCRT__getdcwd(int drive, char * buf, int size)
{
static char* dummy;
TRACE(":drive %d(%c), size %d\n",drive, drive + 'A' - 1, size);
if (!drive || drive == _getdrive())
return _getcwd(buf,size); /* current */
if (!drive || drive == MSVCRT__getdrive())
return MSVCRT__getcwd(buf,size); /* current */
else
{
char dir[MAX_PATH];
......@@ -820,7 +820,7 @@ char* CDECL _getdcwd(int drive, char * buf, int size)
TRACE(":returning '%s'\n", dir);
if (!buf)
return _strdup(dir); /* allocate */
return MSVCRT__strdup(dir); /* allocate */
strcpy(buf,dir);
}
......@@ -832,14 +832,14 @@ char* CDECL _getdcwd(int drive, char * buf, int size)
*
* Unicode version of _wgetdcwd.
*/
MSVCRT_wchar_t* CDECL _wgetdcwd(int drive, MSVCRT_wchar_t * buf, int size)
MSVCRT_wchar_t* CDECL MSVCRT__wgetdcwd(int drive, MSVCRT_wchar_t * buf, int size)
{
static MSVCRT_wchar_t* dummy;
TRACE(":drive %d(%c), size %d\n",drive, drive + 'A' - 1, size);
if (!drive || drive == _getdrive())
return _wgetcwd(buf,size); /* current */
if (!drive || drive == MSVCRT__getdrive())
return MSVCRT__wgetcwd(buf,size); /* current */
else
{
MSVCRT_wchar_t dir[MAX_PATH];
......@@ -862,7 +862,7 @@ MSVCRT_wchar_t* CDECL _wgetdcwd(int drive, MSVCRT_wchar_t * buf, int size)
TRACE(":returning %s\n", debugstr_w(dir));
if (!buf)
return _wcsdup(dir); /* allocate */
return MSVCRT__wcsdup(dir); /* allocate */
strcpyW(buf,dir);
}
return buf;
......@@ -936,7 +936,7 @@ int CDECL MSVCRT__mkdir(const char * newdir)
*
* Unicode version of _mkdir.
*/
int CDECL _wmkdir(const MSVCRT_wchar_t* newdir)
int CDECL MSVCRT__wmkdir(const MSVCRT_wchar_t* newdir)
{
if (CreateDirectoryW(newdir,NULL))
return 0;
......@@ -972,7 +972,7 @@ int CDECL MSVCRT__rmdir(const char * dir)
*
* Unicode version of _rmdir.
*/
int CDECL _wrmdir(const MSVCRT_wchar_t * dir)
int CDECL MSVCRT__wrmdir(const MSVCRT_wchar_t * dir)
{
if (RemoveDirectoryW(dir))
return 0;
......@@ -1177,7 +1177,7 @@ MSVCRT_wchar_t * CDECL _wfullpath(MSVCRT_wchar_t * absPath, const MSVCRT_wchar_t
BOOL alloced = FALSE;
if (!relPath || !*relPath)
return _wgetcwd(absPath, size);
return MSVCRT__wgetcwd(absPath, size);
if (absPath == NULL)
{
......@@ -1231,7 +1231,7 @@ char * CDECL _fullpath(char * absPath, const char* relPath, unsigned int size)
BOOL alloced = FALSE;
if (!relPath || !*relPath)
return _getcwd(absPath, size);
return MSVCRT__getcwd(absPath, size);
if (absPath == NULL)
{
......@@ -1589,7 +1589,7 @@ range:
* Nothing. If the file is not found, buf will contain an empty string
* and errno is set.
*/
void CDECL _searchenv(const char* file, const char* env, char *buf)
void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf)
{
char*envVal, *penv;
char curPath[MAX_PATH];
......@@ -1724,7 +1724,7 @@ int CDECL _searchenv_s(const char* file, const char* env, char *buf, MSVCRT_size
*
* Unicode version of _searchenv
*/
void CDECL _wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf)
void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf)
{
MSVCRT_wchar_t *envVal, *penv;
MSVCRT_wchar_t curPath[MAX_PATH];
......@@ -1741,7 +1741,7 @@ void CDECL _wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MS
}
/* Search given environment variable */
envVal = _wgetenv(env);
envVal = MSVCRT__wgetenv(env);
if (!envVal)
{
msvcrt_set_errno(ERROR_FILE_NOT_FOUND);
......@@ -1808,7 +1808,7 @@ int CDECL _wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env,
}
/* Search given environment variable */
envVal = _wgetenv(env);
envVal = MSVCRT__wgetenv(env);
if (!envVal)
{
*MSVCRT__errno() = MSVCRT_ENOENT;
......
dlls/msvcrt/environ.c
View file @ f9de4eef
......@@ -50,7 +50,7 @@ char * CDECL MSVCRT_getenv(const char *name)
/*********************************************************************
* _wgetenv (MSVCRT.@)
*/
MSVCRT_wchar_t * CDECL _wgetenv(const MSVCRT_wchar_t *name)
MSVCRT_wchar_t * CDECL MSVCRT__wgetenv(const MSVCRT_wchar_t *name)
{
MSVCRT_wchar_t **environ;
unsigned int length=strlenW(name);
......@@ -247,7 +247,7 @@ int CDECL _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements,
MSVCRT_size_t sz;
if (!MSVCRT_CHECK_PMT(buffer != NULL) || !MSVCRT_CHECK_PMT(varname) ||
!(e = _wgetenv(varname)))
!(e = MSVCRT__wgetenv(varname)))
{
return *MSVCRT__errno() = MSVCRT_EINVAL;
}
......@@ -303,7 +303,7 @@ int CDECL _wgetenv_s(MSVCRT_size_t *pReturnValue, MSVCRT_wchar_t *buffer, MSVCRT
{
return *MSVCRT__errno() = MSVCRT_EINVAL;
}
if (!(e = _wgetenv(varname)))
if (!(e = MSVCRT__wgetenv(varname)))
{
*pReturnValue = 0;
return *MSVCRT__errno() = MSVCRT_EINVAL;
......
dlls/msvcrt/errno.c
View file @ f9de4eef
......@@ -291,7 +291,7 @@ int CDECL strerror_s(char *buffer, MSVCRT_size_t numberOfElements, int errnum)
/**********************************************************************
* _strerror (MSVCRT.@)
*/
char* CDECL _strerror(const char* str)
char* CDECL MSVCRT__strerror(const char* str)
{
thread_data_t *data = msvcrt_get_thread_data();
int err;
......@@ -345,7 +345,7 @@ int CDECL _wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, int err)
/*********************************************************************
* _wcserror (MSVCRT.@)
*/
MSVCRT_wchar_t* CDECL _wcserror(int err)
MSVCRT_wchar_t* CDECL MSVCRT__wcserror(int err)
{
thread_data_t *data = msvcrt_get_thread_data();
......@@ -392,7 +392,7 @@ int CDECL __wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, const MSVCRT_wc
/**********************************************************************
* __wcserror (MSVCRT.@)
*/
MSVCRT_wchar_t* CDECL __wcserror(const MSVCRT_wchar_t* str)
MSVCRT_wchar_t* CDECL MSVCRT___wcserror(const MSVCRT_wchar_t* str)
{
thread_data_t *data = msvcrt_get_thread_data();
int err;
......
dlls/msvcrt/locale.c
View file @ f9de4eef
......@@ -769,7 +769,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
return NULL;
}
} else
loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = _strdup("C");
loc->locinfo->lc_category[MSVCRT_LC_COLLATE].locale = MSVCRT__strdup("C");
if(lcid[MSVCRT_LC_CTYPE] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_CTYPE)) {
CPINFO cp;
......@@ -815,7 +815,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
loc->locinfo->lc_clike = 1;
loc->locinfo->mb_cur_max = 1;
loc->locinfo->pctype = MSVCRT__ctype+1;
loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = _strdup("C");
loc->locinfo->lc_category[MSVCRT_LC_CTYPE].locale = MSVCRT__strdup("C");
}
for(i=0; i<256; i++) {
......@@ -1025,7 +1025,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
loc->locinfo->lconv->p_sign_posn = 127;
loc->locinfo->lconv->n_sign_posn = 127;
loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = _strdup("C");
loc->locinfo->lc_category[MSVCRT_LC_MONETARY].locale = MSVCRT__strdup("C");
}
if(lcid[MSVCRT_LC_NUMERIC] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_NUMERIC)) {
......@@ -1092,7 +1092,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
loc->locinfo->lconv->thousands_sep[0] = '\0';
loc->locinfo->lconv->grouping[0] = '\0';
loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = _strdup("C");
loc->locinfo->lc_category[MSVCRT_LC_NUMERIC].locale = MSVCRT__strdup("C");
}
if(lcid[MSVCRT_LC_TIME] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_TIME)) {
......@@ -1101,7 +1101,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale)
return NULL;
}
} else
loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = _strdup("C");
loc->locinfo->lc_category[MSVCRT_LC_TIME].locale = MSVCRT__strdup("C");
return loc;
}
......
dlls/msvcrt/math.c
View file @ f9de4eef
......@@ -577,7 +577,7 @@ double CDECL _CItanh(void)
/*********************************************************************
* _fpclass (MSVCRT.@)
*/
int CDECL _fpclass(double num)
int CDECL MSVCRT__fpclass(double num)
{
#if defined(HAVE_FPCLASS) || defined(fpclass)
switch (fpclass( num ))
......@@ -711,7 +711,7 @@ __int64 CDECL _abs64( __int64 n )
/*********************************************************************
* _logb (MSVCRT.@)
*/
double CDECL _logb(double num)
double CDECL MSVCRT__logb(double num)
{
if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM;
return logb(num);
......@@ -738,7 +738,7 @@ double CDECL _hypot(double x, double y)
/*********************************************************************
* _hypotf (MSVCRT.@)
*/
float CDECL _hypotf(float x, float y)
float CDECL MSVCRT__hypotf(float x, float y)
{
/* FIXME: errno handling */
return hypotf( x, y );
......@@ -940,7 +940,7 @@ double CDECL MSVCRT__cabs(struct MSVCRT__complex num)
/*********************************************************************
* _chgsign (MSVCRT.@)
*/
double CDECL _chgsign(double num)
double CDECL MSVCRT__chgsign(double num)
{
/* FIXME: +-infinity,Nan not tested */
return -num;
......@@ -1140,7 +1140,7 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask
/*********************************************************************
* _copysign (MSVCRT.@)
*/
double CDECL _copysign(double num, double sign)
double CDECL MSVCRT__copysign(double num, double sign)
{
/* FIXME: Behaviour for Nan/Inf? */
if (sign < 0.0)
......@@ -1151,7 +1151,7 @@ double CDECL _copysign(double num, double sign)
/*********************************************************************
* _finite (MSVCRT.@)
*/
int CDECL _finite(double num)
int CDECL MSVCRT__finite(double num)
{
return (finite(num)?1:0); /* See comment for _isnan() */
}
......@@ -1177,7 +1177,7 @@ void CDECL _fpreset(void)
/*********************************************************************
* _isnan (MSVCRT.@)
*/
INT CDECL _isnan(double num)
INT CDECL MSVCRT__isnan(double num)
{
/* Some implementations return -1 for true(glibc), msvcrt/crtdll return 1.
* Do the same, as the result may be used in calculations
......@@ -1188,7 +1188,7 @@ INT CDECL _isnan(double num)
/*********************************************************************
* _j0 (MSVCRT.@)
*/
double CDECL _j0(double num)
double CDECL MSVCRT__j0(double num)
{
/* FIXME: errno handling */
return j0(num);
......@@ -1197,16 +1197,16 @@ double CDECL _j0(double num)
/*********************************************************************
* _j1 (MSVCRT.@)
*/
double CDECL _j1(double num)
double CDECL MSVCRT__j1(double num)
{
/* FIXME: errno handling */
return j1(num);
}
/*********************************************************************
* jn (MSVCRT.@)
* _jn (MSVCRT.@)
*/
double CDECL _jn(int n, double num)
double CDECL MSVCRT__jn(int n, double num)
{
/* FIXME: errno handling */
return jn(n, num);
......@@ -1215,12 +1215,12 @@ double CDECL _jn(int n, double num)
/*********************************************************************
* _y0 (MSVCRT.@)
*/
double CDECL _y0(double num)
double CDECL MSVCRT__y0(double num)
{
double retval;
if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM;
retval = y0(num);
if (_fpclass(retval) == MSVCRT__FPCLASS_NINF)
if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF)
{
*MSVCRT__errno() = MSVCRT_EDOM;
retval = sqrt(-1);
......@@ -1231,12 +1231,12 @@ double CDECL _y0(double num)
/*********************************************************************
* _y1 (MSVCRT.@)
*/
double CDECL _y1(double num)
double CDECL MSVCRT__y1(double num)
{
double retval;
if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM;
retval = y1(num);
if (_fpclass(retval) == MSVCRT__FPCLASS_NINF)
if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF)
{
*MSVCRT__errno() = MSVCRT_EDOM;
retval = sqrt(-1);
......@@ -1247,12 +1247,12 @@ double CDECL _y1(double num)
/*********************************************************************
* _yn (MSVCRT.@)
*/
double CDECL _yn(int order, double num)
double CDECL MSVCRT__yn(int order, double num)
{
double retval;
if (!finite(num)) *MSVCRT__errno() = MSVCRT_EDOM;
retval = yn(order,num);
if (_fpclass(retval) == MSVCRT__FPCLASS_NINF)
if (MSVCRT__fpclass(retval) == MSVCRT__FPCLASS_NINF)
{
*MSVCRT__errno() = MSVCRT_EDOM;
retval = sqrt(-1);
......@@ -1263,7 +1263,7 @@ double CDECL _yn(int order, double num)
/*********************************************************************
* _nextafter (MSVCRT.@)
*/
double CDECL _nextafter(double num, double next)
double CDECL MSVCRT__nextafter(double num, double next)
{
double retval;
if (!finite(num) || !finite(next)) *MSVCRT__errno() = MSVCRT_EDOM;
......
dlls/msvcrt/misc.c
View file @ f9de4eef
......@@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
/*********************************************************************
* _beep (MSVCRT.@)
*/
void CDECL _beep( unsigned int freq, unsigned int duration)
void CDECL MSVCRT__beep( unsigned int freq, unsigned int duration)
{
TRACE(":Freq %d, Duration %d\n",freq,duration);
Beep(freq, duration);
......@@ -265,7 +265,7 @@ unsigned int CDECL _get_output_format(void)
/*********************************************************************
* _resetstkoflw (MSVCRT.@)
*/
int CDECL _resetstkoflw(void)
int CDECL MSVCRT__resetstkoflw(void)
{
int stack_addr;
......
dlls/msvcrt/msvcrt.h
View file @ f9de4eef
......@@ -895,31 +895,31 @@ int __cdecl _ismbstrail(const unsigned char* start, const unsigned ch
MSVCRT_size_t __cdecl MSVCRT_mbstowcs(MSVCRT_wchar_t*,const char*,MSVCRT_size_t);
MSVCRT_intptr_t __cdecl MSVCRT__spawnve(int,const char*,const char* const *,const char* const *);
MSVCRT_intptr_t __cdecl MSVRT__spawnvpe(int,const char*,const char* const *,const char* const *);
MSVCRT_intptr_t __cdecl _wspawnve(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *);
MSVCRT_intptr_t __cdecl _wspawnvpe(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *);
void __cdecl _searchenv(const char*,const char*,char*);
int __cdecl _getdrive(void);
char* __cdecl _strdup(const char*);
MSVCRT_intptr_t __cdecl MSVCRT__wspawnve(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *);
MSVCRT_intptr_t __cdecl MSVCRT__wspawnvpe(int,const MSVCRT_wchar_t*,const MSVCRT_wchar_t* const *,const MSVCRT_wchar_t* const *);
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,MSVCRT_size_t);
char* __cdecl _strset(char*,int);
int __cdecl _ungetch(int);
int __cdecl _cputs(const char*);
int __cdecl _cprintf(const char*,...);
int __cdecl _cwprintf(const MSVCRT_wchar_t*,...);
char*** __cdecl __p__environ(void);
char*** __cdecl MSVCRT___p__environ(void);
int* __cdecl __p___mb_cur_max(void);
unsigned int* __cdecl __p__fmode(void);
MSVCRT_wchar_t* __cdecl _wcsdup(const MSVCRT_wchar_t*);
MSVCRT_wchar_t*** __cdecl __p__wenviron(void);
char* __cdecl _strdate(char* date);
char* __cdecl _strtime(char* date);
MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*);
MSVCRT_wchar_t*** __cdecl MSVCRT___p__wenviron(void);
char* __cdecl MSVCRT__strdate(char* date);
char* __cdecl MSVCRT__strtime(char* date);
int __cdecl _setmbcp(int);
int __cdecl MSVCRT__close(int);
int __cdecl MSVCRT__dup(int);
int __cdecl MSVCRT__dup2(int, int);
int __cdecl MSVCRT__pipe(int *, unsigned int, int);
MSVCRT_wchar_t* __cdecl _wgetenv(const MSVCRT_wchar_t*);
void __cdecl _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_wchar_t*);
MSVCRT_wchar_t* __cdecl MSVCRT__wgetenv(const MSVCRT_wchar_t*);
void __cdecl MSVCRT__wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_wchar_t*);
MSVCRT_intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*);
void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func,
const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg);
......
dlls/msvcrt/process.c
View file @ f9de4eef
......@@ -83,7 +83,7 @@ static void msvcrt_search_executable(const MSVCRT_wchar_t *name, MSVCRT_wchar_t
extension = 0;
}
if (!use_path || !(env = _wgetenv(path))) return;
if (!use_path || !(env = MSVCRT__wgetenv(path))) return;
/* now try search path */
do
......@@ -601,7 +601,7 @@ MSVCRT_intptr_t CDECL _execlpe(const char* name, const char* arg0, ...)
*/
MSVCRT_intptr_t CDECL _wexecv(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv)
{
return _wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, NULL);
return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, NULL);
}
/*********************************************************************
......@@ -622,7 +622,7 @@ MSVCRT_intptr_t CDECL _execv(const char* name, char* const* argv)
*/
MSVCRT_intptr_t CDECL _wexecve(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv)
{
return _wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv);
return MSVCRT__wspawnve(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv);
}
/*********************************************************************
......@@ -643,7 +643,7 @@ MSVCRT_intptr_t CDECL MSVCRT__execve(const char* name, char* const* argv, const
*/
MSVCRT_intptr_t CDECL _wexecvpe(const MSVCRT_wchar_t* name, MSVCRT_wchar_t* const* argv, const MSVCRT_wchar_t* const* envv)
{
return _wspawnvpe(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv);
return MSVCRT__wspawnvpe(MSVCRT__P_OVERLAY, name, (const MSVCRT_wchar_t* const*) argv, envv);
}
/*********************************************************************
......@@ -918,7 +918,7 @@ MSVCRT_intptr_t CDECL MSVCRT__spawnve(int flags, const char* name, const char* c
*
* Unicode version of _spawnve
*/
MSVCRT_intptr_t CDECL _wspawnve(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv,
MSVCRT_intptr_t CDECL MSVCRT__wspawnve(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv,
const MSVCRT_wchar_t* const* envv)
{
MSVCRT_wchar_t *args, *envs;
......@@ -952,7 +952,7 @@ MSVCRT_intptr_t CDECL _spawnv(int flags, const char* name, const char* const* ar
*/
MSVCRT_intptr_t CDECL _wspawnv(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv)
{
return _wspawnve(flags, name, argv, NULL);
return MSVCRT__wspawnve(flags, name, argv, NULL);
}
/*********************************************************************
......@@ -985,7 +985,7 @@ MSVCRT_intptr_t CDECL MSVCRT__spawnvpe(int flags, const char* name, const char*
*
* Unicode version of _spawnvpe
*/
MSVCRT_intptr_t CDECL _wspawnvpe(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv,
MSVCRT_intptr_t CDECL MSVCRT__wspawnvpe(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv,
const MSVCRT_wchar_t* const* envv)
{
MSVCRT_wchar_t *args, *envs;
......@@ -1019,7 +1019,7 @@ MSVCRT_intptr_t CDECL _spawnvp(int flags, const char* name, const char* const* a
*/
MSVCRT_intptr_t CDECL _wspawnvp(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv)
{
return _wspawnvpe(flags, name, argv, NULL);
return MSVCRT__wspawnvpe(flags, name, argv, NULL);
}
/*********************************************************************
......
dlls/msvcrt/string.c
View file @ f9de4eef
......@@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
* _mbsdup (MSVCRT.@)
* _strdup (MSVCRT.@)
*/
char* CDECL _strdup(const char* str)
char* CDECL MSVCRT__strdup(const char* str)
{
if(str)
{
......@@ -106,7 +106,7 @@ char* CDECL _strlwr_l(char *str, MSVCRT__locale_t locale)
/*********************************************************************
* _strlwr (MSVCRT.@)
*/
char* CDECL _strlwr(char *str)
char* CDECL MSVCRT__strlwr(char *str)
{
_strlwr_s_l(str, -1, NULL);
return str;
......@@ -158,7 +158,7 @@ int CDECL _strupr_s(char *str, MSVCRT_size_t len)
/*********************************************************************
* _strupr_l (MSVCRT.@)
*/
char* CDECL _strupr_l(char *str, MSVCRT__locale_t locale)
char* CDECL MSVCRT__strupr_l(char *str, MSVCRT__locale_t locale)
{
_strupr_s_l(str, -1, locale);
return str;
......@@ -167,7 +167,7 @@ char* CDECL _strupr_l(char *str, MSVCRT__locale_t locale)
/*********************************************************************
* _strupr (MSVCRT.@)
*/
char* CDECL _strupr(char *str)
char* CDECL MSVCRT__strupr(char *str)
{
_strupr_s_l(str, -1, NULL);
return str;
......@@ -187,7 +187,7 @@ char* CDECL MSVCRT__strnset(char* str, int value, MSVCRT_size_t len)
/*********************************************************************
* _strrev (MSVCRT.@)
*/
char* CDECL _strrev(char* str)
char* CDECL MSVCRT__strrev(char* str)
{
char * p1;
char * p2;
......
dlls/msvcrt/time.c
View file @ f9de4eef
......@@ -401,7 +401,7 @@ struct MSVCRT_tm* CDECL MSVCRT_gmtime(const MSVCRT___time32_t* secs)
/**********************************************************************
* _strdate (MSVCRT.@)
*/
char* CDECL _strdate(char* date)
char* CDECL MSVCRT__strdate(char* date)
{
static const char format[] = "MM'/'dd'/'yy";
......@@ -428,14 +428,14 @@ int CDECL _strdate_s(char* date, MSVCRT_size_t size)
return MSVCRT_ERANGE;
}
_strdate(date);
MSVCRT__strdate(date);
return 0;
}
/**********************************************************************
* _wstrdate (MSVCRT.@)
*/
MSVCRT_wchar_t* CDECL _wstrdate(MSVCRT_wchar_t* date)
MSVCRT_wchar_t* CDECL MSVCRT__wstrdate(MSVCRT_wchar_t* date)
{
static const WCHAR format[] = { 'M','M','\'','/','\'','d','d','\'','/','\'','y','y',0 };
......@@ -462,14 +462,14 @@ int CDECL _wstrdate_s(MSVCRT_wchar_t* date, MSVCRT_size_t size)
return MSVCRT_ERANGE;
}
_wstrdate(date);
MSVCRT__wstrdate(date);
return 0;
}
/*********************************************************************
* _strtime (MSVCRT.@)
*/
char* CDECL _strtime(char* time)
char* CDECL MSVCRT__strtime(char* time)
{
static const char format[] = "HH':'mm':'ss";
......@@ -496,14 +496,14 @@ int CDECL _strtime_s(char* time, MSVCRT_size_t size)
return MSVCRT_ERANGE;
}
_strtime(time);
MSVCRT__strtime(time);
return 0;
}
/*********************************************************************
* _wstrtime (MSVCRT.@)
*/
MSVCRT_wchar_t* CDECL _wstrtime(MSVCRT_wchar_t* time)
MSVCRT_wchar_t* CDECL MSVCRT__wstrtime(MSVCRT_wchar_t* time)
{
static const WCHAR format[] = { 'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0 };
......@@ -530,7 +530,7 @@ int CDECL _wstrtime_s(MSVCRT_wchar_t* time, MSVCRT_size_t size)
return MSVCRT_ERANGE;
}
_wstrtime(time);
MSVCRT__wstrtime(time);
return 0;
}
......
dlls/msvcrt/wcs.c
View file @ f9de4eef
......@@ -41,13 +41,13 @@ static BOOL n_format_enabled = TRUE;
#undef PRINTF_WIDE
/* _get_printf_count_output - not exported in native msvcrt */
int CDECL _get_printf_count_output( void )
int CDECL MSVCRT__get_printf_count_output( void )
{
return n_format_enabled ? 1 : 0;
}
/* _set_printf_count_output - not exported in native msvcrt */
int CDECL _set_printf_count_output( int enable )
int CDECL MSVCRT__set_printf_count_output( int enable )
{
BOOL old = n_format_enabled;
n_format_enabled = (enable ? TRUE : FALSE);
......@@ -57,7 +57,7 @@ int CDECL _set_printf_count_output( int enable )
/*********************************************************************
* _wcsdup (MSVCRT.@)
*/
MSVCRT_wchar_t* CDECL _wcsdup( const MSVCRT_wchar_t* str )
MSVCRT_wchar_t* CDECL MSVCRT__wcsdup( const MSVCRT_wchar_t* str )
{
MSVCRT_wchar_t* ret = NULL;
if (str)
......@@ -72,7 +72,7 @@ MSVCRT_wchar_t* CDECL _wcsdup( const MSVCRT_wchar_t* str )
/*********************************************************************
* _wcsicoll (MSVCRT.@)
*/
INT CDECL _wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 )
INT CDECL MSVCRT__wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 )
{
/* FIXME: handle collates */
return strcmpiW( str1, str2 );
......@@ -81,7 +81,7 @@ INT CDECL _wcsicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2 )
/*********************************************************************
* _wcsnicoll (MSVCRT.@)
*/
INT CDECL _wcsnicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT_size_t count )
INT CDECL MSVCRT__wcsnicoll( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str2, MSVCRT_size_t count )
{
/* FIXME: handle collates */
return strncmpiW( str1, str2, count );
......@@ -100,7 +100,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsnset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c, MS
/*********************************************************************
* _wcsrev (MSVCRT.@)
*/
MSVCRT_wchar_t* CDECL _wcsrev( MSVCRT_wchar_t* str )
MSVCRT_wchar_t* CDECL MSVCRT__wcsrev( MSVCRT_wchar_t* str )
{
MSVCRT_wchar_t* ret = str;
MSVCRT_wchar_t* end = str + strlenW(str) - 1;
......@@ -116,7 +116,7 @@ MSVCRT_wchar_t* CDECL _wcsrev( MSVCRT_wchar_t* str )
/*********************************************************************
* _wcsset (MSVCRT.@)
*/
MSVCRT_wchar_t* CDECL _wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c )
MSVCRT_wchar_t* CDECL MSVCRT__wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c )
{
MSVCRT_wchar_t* ret = str;
while (*str) *str++ = c;
......@@ -609,7 +609,7 @@ int CDECL MSVCRT_vsprintf_s( char *str, MSVCRT_size_t num, const char *format, _
/*********************************************************************
* _vscprintf (MSVCRT.@)
*/
int CDECL _vscprintf( const char *format, __ms_va_list valist )
int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist )
{
return MSVCRT_vsnprintf( NULL, INT_MAX, format, valist );
}
......@@ -649,7 +649,7 @@ int CDECL MSVCRT__scprintf(const char *format, ...)
int retval;
__ms_va_list valist;
__ms_va_start(valist, format);
retval = _vscprintf(format, valist);
retval = MSVCRT__vscprintf(format, valist);
__ms_va_end(valist);
return retval;
}
......@@ -842,7 +842,7 @@ int CDECL MSVCRT_vswprintf( MSVCRT_wchar_t* str, const MSVCRT_wchar_t* format, _
/*********************************************************************
* _vscwprintf (MSVCRT.@)
*/
int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args )
int CDECL MSVCRT__vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args )
{
return MSVCRT_vsnwprintf( NULL, INT_MAX, format, args );
}
......
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