Skip to content

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

msvcrt: Fix compilation errors on Mingw.

parent ef08f69e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 69 deletions
dlls/msvcrt/data.c
View file @ e70bf5f8
......@@ -141,7 +141,7 @@ typedef int (CDECL *_INITTERM_E_FN)(void);
/***********************************************************************
* __p___argc (MSVCRT.@)
*/
int* CDECL __p___argc(void) { return &MSVCRT___argc; }
int* CDECL MSVCRT___p___argc(void) { return &MSVCRT___argc; }
/***********************************************************************
* __p__commode (MSVCRT.@)
......@@ -152,12 +152,12 @@ unsigned int* CDECL __p__commode(void) { return &MSVCRT__commode; }
/***********************************************************************
* __p__pgmptr (MSVCRT.@)
*/
char** CDECL __p__pgmptr(void) { return &MSVCRT__pgmptr; }
char** CDECL MSVCRT___p__pgmptr(void) { return &MSVCRT__pgmptr; }
/***********************************************************************
* __p__wpgmptr (MSVCRT.@)
*/
WCHAR** CDECL __p__wpgmptr(void) { return &MSVCRT__wpgmptr; }
WCHAR** CDECL MSVCRT___p__wpgmptr(void) { return &MSVCRT__wpgmptr; }
/***********************************************************************
* _get_pgmptr (MSVCRT.@)
......@@ -188,7 +188,7 @@ unsigned int* CDECL __p__fmode(void) { return &MSVCRT__fmode; }
/***********************************************************************
* _set_fmode (MSVCRT.@)
*/
int CDECL _set_fmode(int mode)
int CDECL MSVCRT__set_fmode(int mode)
{
/* TODO: support _O_WTEXT */
if(!MSVCRT_CHECK_PMT(mode==MSVCRT__O_TEXT || mode==MSVCRT__O_BINARY))
......@@ -201,7 +201,7 @@ int CDECL _set_fmode(int mode)
/***********************************************************************
* _get_fmode (MSVCRT.@)
*/
int CDECL _get_fmode(int *mode)
int CDECL MSVCRT__get_fmode(int *mode)
{
if(!MSVCRT_CHECK_PMT(mode))
return MSVCRT_EINVAL;
......@@ -243,12 +243,12 @@ MSVCRT_wchar_t** CDECL __p__wcmdln(void) { return &MSVCRT__wcmdln; }
/*********************************************************************
* __p___argv (MSVCRT.@)
*/
char*** CDECL __p___argv(void) { return &MSVCRT___argv; }
char*** CDECL MSVCRT___p___argv(void) { return &MSVCRT___argv; }
/*********************************************************************
* __p___wargv (MSVCRT.@)
*/
MSVCRT_wchar_t*** CDECL __p___wargv(void) { return &MSVCRT___wargv; }
MSVCRT_wchar_t*** CDECL MSVCRT___p___wargv(void) { return &MSVCRT___wargv; }
/*********************************************************************
* __p__environ (MSVCRT.@)
......
dlls/msvcrt/dir.c
View file @ e70bf5f8
......@@ -1023,7 +1023,7 @@ int CDECL MSVCRT__wrmdir(const MSVCRT_wchar_t * dir)
/******************************************************************
* _splitpath_s (MSVCRT.@)
*/
int CDECL _splitpath_s(const char* inpath,
int CDECL MSVCRT__splitpath_s(const char* inpath,
char* drive, MSVCRT_size_t sz_drive,
char* dir, MSVCRT_size_t sz_dir,
char* fname, MSVCRT_size_t sz_fname,
......@@ -1111,10 +1111,10 @@ do_error:
/*********************************************************************
* _splitpath (MSVCRT.@)
*/
void CDECL _splitpath(const char *inpath, char *drv, char *dir,
void CDECL MSVCRT__splitpath(const char *inpath, char *drv, char *dir,
char *fname, char *ext)
{
_splitpath_s(inpath, drv, drv?MSVCRT__MAX_DRIVE:0, dir, dir?MSVCRT__MAX_DIR:0,
MSVCRT__splitpath_s(inpath, drv, drv?MSVCRT__MAX_DRIVE:0, dir, dir?MSVCRT__MAX_DIR:0,
fname, fname?MSVCRT__MAX_FNAME:0, ext, ext?MSVCRT__MAX_EXT:0);
}
......@@ -1123,7 +1123,7 @@ void CDECL _splitpath(const char *inpath, char *drv, char *dir,
*
* Secure version of _wsplitpath
*/
int CDECL _wsplitpath_s(const MSVCRT_wchar_t* inpath,
int CDECL MSVCRT__wsplitpath_s(const MSVCRT_wchar_t* inpath,
MSVCRT_wchar_t* drive, MSVCRT_size_t sz_drive,
MSVCRT_wchar_t* dir, MSVCRT_size_t sz_dir,
MSVCRT_wchar_t* fname, MSVCRT_size_t sz_fname,
......@@ -1205,10 +1205,10 @@ do_error:
*
* Unicode version of _splitpath.
*/
void CDECL _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT_wchar_t *dir,
void CDECL MSVCRT__wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT_wchar_t *dir,
MSVCRT_wchar_t *fname, MSVCRT_wchar_t *ext)
{
_wsplitpath_s(inpath, drv, drv?MSVCRT__MAX_DRIVE:0, dir, dir?MSVCRT__MAX_DIR:0,
MSVCRT__wsplitpath_s(inpath, drv, drv?MSVCRT__MAX_DRIVE:0, dir, dir?MSVCRT__MAX_DIR:0,
fname, fname?MSVCRT__MAX_FNAME:0, ext, ext?MSVCRT__MAX_EXT:0);
}
......@@ -1217,7 +1217,7 @@ void CDECL _wsplitpath(const MSVCRT_wchar_t *inpath, MSVCRT_wchar_t *drv, MSVCRT
*
* Unicode version of _fullpath.
*/
MSVCRT_wchar_t * CDECL _wfullpath(MSVCRT_wchar_t * absPath, const MSVCRT_wchar_t* relPath, MSVCRT_size_t size)
MSVCRT_wchar_t * CDECL MSVCRT__wfullpath(MSVCRT_wchar_t * absPath, const MSVCRT_wchar_t* relPath, MSVCRT_size_t size)
{
DWORD rc;
WCHAR* buffer;
......@@ -1271,7 +1271,7 @@ MSVCRT_wchar_t * CDECL _wfullpath(MSVCRT_wchar_t * absPath, const MSVCRT_wchar_t
* Otherwise populates absPath with the path and returns it.
* Failure: NULL. errno indicates the error.
*/
char * CDECL _fullpath(char * absPath, const char* relPath, unsigned int size)
char * CDECL MSVCRT__fullpath(char * absPath, const char* relPath, unsigned int size)
{
DWORD rc;
char* lastpart;
......@@ -1326,7 +1326,7 @@ char * CDECL _fullpath(char * absPath, const char* relPath, unsigned int size)
* Nothing. If path is not large enough to hold the resulting pathname,
* random process memory will be overwritten.
*/
VOID CDECL _makepath(char * path, const char * drive,
VOID CDECL MSVCRT__makepath(char * path, const char * drive,
const char *directory, const char * filename,
const char * extension)
{
......@@ -1373,7 +1373,7 @@ VOID CDECL _makepath(char * path, const char * drive,
*
* Unicode version of _wmakepath.
*/
VOID CDECL _wmakepath(MSVCRT_wchar_t *path, const MSVCRT_wchar_t *drive, const MSVCRT_wchar_t *directory,
VOID CDECL MSVCRT__wmakepath(MSVCRT_wchar_t *path, const MSVCRT_wchar_t *drive, const MSVCRT_wchar_t *directory,
const MSVCRT_wchar_t *filename, const MSVCRT_wchar_t *extension)
{
MSVCRT_wchar_t *p = path;
......@@ -1420,7 +1420,7 @@ VOID CDECL _wmakepath(MSVCRT_wchar_t *path, const MSVCRT_wchar_t *drive, const M
*
* Safe version of _makepath.
*/
int CDECL _makepath_s(char *path, MSVCRT_size_t size, const char *drive,
int CDECL MSVCRT__makepath_s(char *path, MSVCRT_size_t size, const char *drive,
const char *directory, const char *filename,
const char *extension)
{
......@@ -1524,7 +1524,7 @@ range:
*
* Safe version of _wmakepath.
*/
int CDECL _wmakepath_s(MSVCRT_wchar_t *path, MSVCRT_size_t size, const MSVCRT_wchar_t *drive,
int CDECL MSVCRT__wmakepath_s(MSVCRT_wchar_t *path, MSVCRT_size_t size, const MSVCRT_wchar_t *drive,
const MSVCRT_wchar_t *directory, const MSVCRT_wchar_t *filename,
const MSVCRT_wchar_t *extension)
{
......@@ -1698,7 +1698,7 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf)
/*********************************************************************
* _searchenv_s (MSVCRT.@)
*/
int CDECL _searchenv_s(const char* file, const char* env, char *buf, MSVCRT_size_t count)
int CDECL MSVCRT__searchenv_s(const char* file, const char* env, char *buf, MSVCRT_size_t count)
{
char*envVal, *penv;
char curPath[MAX_PATH];
......@@ -1829,7 +1829,7 @@ void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t*
/*********************************************************************
* _wsearchenv_s (MSVCRT.@)
*/
int CDECL _wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env,
int CDECL MSVCRT__wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env,
MSVCRT_wchar_t *buf, MSVCRT_size_t count)
{
MSVCRT_wchar_t* envVal, *penv;
......
dlls/msvcrt/errno.c
View file @ e70bf5f8
......@@ -264,7 +264,7 @@ char* CDECL MSVCRT_strerror(int err)
/**********************************************************************
* strerror_s (MSVCRT.@)
*/
int CDECL strerror_s(char *buffer, MSVCRT_size_t numberOfElements, int errnum)
int CDECL MSVCRT_strerror_s(char *buffer, MSVCRT_size_t numberOfElements, int errnum)
{
char *ptr;
......@@ -330,7 +330,7 @@ void CDECL MSVCRT_perror(const char* str)
/*********************************************************************
* _wcserror_s (MSVCRT.@)
*/
int CDECL _wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, int err)
int CDECL MSVCRT__wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, int err)
{
if (!MSVCRT_CHECK_PMT(buffer != NULL)) return MSVCRT_EINVAL;
if (!MSVCRT_CHECK_PMT(nc > 0)) return MSVCRT_EINVAL;
......@@ -349,14 +349,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcserror(int err)
if (!data->wcserror_buffer)
if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL;
_wcserror_s(data->wcserror_buffer, 256, err);
MSVCRT__wcserror_s(data->wcserror_buffer, 256, err);
return data->wcserror_buffer;
}
/**********************************************************************
* __wcserror_s (MSVCRT.@)
*/
int CDECL __wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, const MSVCRT_wchar_t* str)
int CDECL MSVCRT___wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, const MSVCRT_wchar_t* str)
{
int err;
static const WCHAR colonW[] = {':', ' ', '\0'};
......@@ -397,7 +397,7 @@ MSVCRT_wchar_t* CDECL MSVCRT___wcserror(const MSVCRT_wchar_t* str)
if (!data->wcserror_buffer)
if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL;
err = __wcserror_s(data->wcserror_buffer, 256, str);
err = MSVCRT___wcserror_s(data->wcserror_buffer, 256, str);
if (err) FIXME("bad wcserror call (%d)\n", err);
return data->wcserror_buffer;
......
dlls/msvcrt/file.c
View file @ e70bf5f8
......@@ -713,7 +713,7 @@ int CDECL MSVCRT__access(const char *filename, int mode)
/*********************************************************************
* _access_s (MSVCRT.@)
*/
int CDECL _access_s(const char *filename, int mode)
int CDECL MSVCRT__access_s(const char *filename, int mode)
{
if (!MSVCRT_CHECK_PMT(filename != NULL)) return *MSVCRT__errno();
if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *MSVCRT__errno();
......@@ -748,7 +748,7 @@ int CDECL MSVCRT__waccess(const MSVCRT_wchar_t *filename, int mode)
/*********************************************************************
* _waccess_s (MSVCRT.@)
*/
int CDECL _waccess_s(const MSVCRT_wchar_t *filename, int mode)
int CDECL MSVCRT__waccess_s(const MSVCRT_wchar_t *filename, int mode)
{
if (!MSVCRT_CHECK_PMT(filename != NULL)) return *MSVCRT__errno();
if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *MSVCRT__errno();
......@@ -1614,7 +1614,7 @@ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf)
}
/* _fstat32 - not exported in native msvcrt */
int CDECL _fstat32(int fd, struct MSVCRT__stat32* buf)
int CDECL MSVCRT__fstat32(int fd, struct MSVCRT__stat32* buf)
{
int ret;
struct MSVCRT__stat64 buf64;
......@@ -1626,7 +1626,7 @@ int CDECL _fstat32(int fd, struct MSVCRT__stat32* buf)
}
/* _fstat64i32 - not exported in native msvcrt */
int CDECL _fstat64i32(int fd, struct MSVCRT__stat64i32* buf)
int CDECL MSVCRT__fstat64i32(int fd, struct MSVCRT__stat64i32* buf)
{
int ret;
struct MSVCRT__stat64 buf64;
......@@ -3877,7 +3877,7 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm
/* fread_s - not exported in native msvcrt */
MSVCRT_size_t CDECL fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t elem_size,
MSVCRT_size_t CDECL MSVCRT_fread_s(void *buf, MSVCRT_size_t buf_size, MSVCRT_size_t elem_size,
MSVCRT_size_t count, MSVCRT_FILE *stream)
{
size_t bytes_left, buf_pos;
......
dlls/msvcrt/heap.c
View file @ e70bf5f8
......@@ -547,7 +547,7 @@ void * CDECL _aligned_realloc(void *memblock, MSVCRT_size_t size, MSVCRT_size_t
/*********************************************************************
* memmove_s (MSVCRT.@)
*/
int CDECL memmove_s(void *dest, MSVCRT_size_t numberOfElements, const void *src, MSVCRT_size_t count)
int CDECL MSVCRT_memmove_s(void *dest, MSVCRT_size_t numberOfElements, const void *src, MSVCRT_size_t count)
{
TRACE("(%p %lu %p %lu)\n", dest, numberOfElements, src, count);
......@@ -565,7 +565,7 @@ int CDECL memmove_s(void *dest, MSVCRT_size_t numberOfElements, const void *src,
/*********************************************************************
* memcpy_s (MSVCRT.@)
*/
int CDECL memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void *src, MSVCRT_size_t count)
int CDECL MSVCRT_memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void *src, MSVCRT_size_t count)
{
TRACE("(%p %lu %p %lu)\n", dest, numberOfElements, src, count);
......@@ -591,7 +591,7 @@ int CDECL memcpy_s(void *dest, MSVCRT_size_t numberOfElements, const void *src,
/*********************************************************************
* strncpy_s (MSVCRT.@)
*/
int CDECL strncpy_s(char *dest, MSVCRT_size_t numberOfElements,
int CDECL MSVCRT_strncpy_s(char *dest, MSVCRT_size_t numberOfElements,
const char *src, MSVCRT_size_t count)
{
MSVCRT_size_t i, end;
......
dlls/msvcrt/math.c
View file @ e70bf5f8
......@@ -1338,7 +1338,7 @@ double CDECL MSVCRT__nextafter(double num, double next)
/*********************************************************************
* _ecvt (MSVCRT.@)
*/
char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign )
char * CDECL MSVCRT__ecvt( double number, int ndigits, int *decpt, int *sign )
{
int prec, len;
thread_data_t *data = msvcrt_get_thread_data();
......@@ -1382,7 +1382,7 @@ char * CDECL _ecvt( double number, int ndigits, int *decpt, int *sign )
/*********************************************************************
* _ecvt_s (MSVCRT.@)
*/
int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigits, int *decpt, int *sign )
int CDECL MSVCRT__ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigits, int *decpt, int *sign )
{
int prec, len;
char *result;
......@@ -1443,7 +1443,7 @@ int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigit
/***********************************************************************
* _fcvt (MSVCRT.@)
*/
char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign )
char * CDECL MSVCRT__fcvt( double number, int ndigits, int *decpt, int *sign )
{
thread_data_t *data = msvcrt_get_thread_data();
int stop, dec1, dec2;
......@@ -1526,7 +1526,7 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign )
/***********************************************************************
* _fcvt_s (MSVCRT.@)
*/
int CDECL _fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int ndigits, int *decpt, int *sign)
int CDECL MSVCRT__fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int ndigits, int *decpt, int *sign)
{
int stop, dec1, dec2;
char *ptr1, *ptr2, *first;
......@@ -1615,7 +1615,7 @@ int CDECL _fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int ndigit
/***********************************************************************
* _gcvt (MSVCRT.@)
*/
char * CDECL _gcvt( double number, int ndigit, char *buff )
char * CDECL MSVCRT__gcvt( double number, int ndigit, char *buff )
{
if(!buff) {
*MSVCRT__errno() = MSVCRT_EINVAL;
......@@ -1634,7 +1634,7 @@ char * CDECL _gcvt( double number, int ndigit, char *buff )
/***********************************************************************
* _gcvt_s (MSVCRT.@)
*/
int CDECL _gcvt_s(char *buff, MSVCRT_size_t size, double number, int digits)
int CDECL MSVCRT__gcvt_s(char *buff, MSVCRT_size_t size, double number, int digits)
{
int len;
......
dlls/msvcrt/misc.c
View file @ e70bf5f8
......@@ -305,7 +305,7 @@ void CDECL MSVCRT_qsort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size,
/*********************************************************************
* _get_output_format (MSVCRT.@)
*/
unsigned int CDECL _get_output_format(void)
unsigned int CDECL MSVCRT__get_output_format(void)
{
return output_format;
}
......
dlls/msvcrt/msvcrt.h
View file @ e70bf5f8
......@@ -989,7 +989,7 @@ int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t);
int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t);
int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t);
int __cdecl MSVCRT__strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t);
unsigned int __cdecl _get_output_format(void);
unsigned int __cdecl MSVCRT__get_output_format(void);
char* __cdecl MSVCRT_strtok_s(char*, const char*, char**);
/* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd)
......
dlls/msvcrt/printf.h
View file @ e70bf5f8
......@@ -309,7 +309,7 @@ static inline void FUNC_NAME(pf_fixup_exponent)(char *buf)
if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') &&
isdigit(tmp[2]) && isdigit(tmp[3])) {
BOOL two_digit_exp = (_get_output_format() == MSVCRT__TWO_DIGIT_EXPONENT);
BOOL two_digit_exp = (MSVCRT__get_output_format() == MSVCRT__TWO_DIGIT_EXPONENT);
tmp += 2;
if(isdigit(tmp[2])) {
......
dlls/msvcrt/string.c
View file @ e70bf5f8
......@@ -54,7 +54,7 @@ char* CDECL MSVCRT__strdup(const char* str)
/*********************************************************************
* _strlwr_s_l (MSVCRT.@)
*/
int CDECL _strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale)
int CDECL MSVCRT__strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale)
{
char *ptr = str;
......@@ -89,9 +89,9 @@ int CDECL _strlwr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale)
/*********************************************************************
* _strlwr_s (MSVCRT.@)
*/
int CDECL _strlwr_s(char *str, MSVCRT_size_t len)
int CDECL MSVCRT__strlwr_s(char *str, MSVCRT_size_t len)
{
return _strlwr_s_l(str, len, NULL);
return MSVCRT__strlwr_s_l(str, len, NULL);
}
/*********************************************************************
......@@ -99,7 +99,7 @@ int CDECL _strlwr_s(char *str, MSVCRT_size_t len)
*/
char* CDECL _strlwr_l(char *str, MSVCRT__locale_t locale)
{
_strlwr_s_l(str, -1, locale);
MSVCRT__strlwr_s_l(str, -1, locale);
return str;
}
......@@ -108,14 +108,14 @@ char* CDECL _strlwr_l(char *str, MSVCRT__locale_t locale)
*/
char* CDECL MSVCRT__strlwr(char *str)
{
_strlwr_s_l(str, -1, NULL);
MSVCRT__strlwr_s_l(str, -1, NULL);
return str;
}
/*********************************************************************
* _strupr_s_l (MSVCRT.@)
*/
int CDECL _strupr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale)
int CDECL MSVCRT__strupr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale)
{
char *ptr = str;
......@@ -150,9 +150,9 @@ int CDECL _strupr_s_l(char *str, MSVCRT_size_t len, MSVCRT__locale_t locale)
/*********************************************************************
* _strupr_s (MSVCRT.@)
*/
int CDECL _strupr_s(char *str, MSVCRT_size_t len)
int CDECL MSVCRT__strupr_s(char *str, MSVCRT_size_t len)
{
return _strupr_s_l(str, len, NULL);
return MSVCRT__strupr_s_l(str, len, NULL);
}
/*********************************************************************
......@@ -160,7 +160,7 @@ int CDECL _strupr_s(char *str, MSVCRT_size_t len)
*/
char* CDECL MSVCRT__strupr_l(char *str, MSVCRT__locale_t locale)
{
_strupr_s_l(str, -1, locale);
MSVCRT__strupr_s_l(str, -1, locale);
return str;
}
......@@ -169,7 +169,7 @@ char* CDECL MSVCRT__strupr_l(char *str, MSVCRT__locale_t locale)
*/
char* CDECL MSVCRT__strupr(char *str)
{
_strupr_s_l(str, -1, NULL);
MSVCRT__strupr_s_l(str, -1, NULL);
return str;
}
......@@ -1055,7 +1055,7 @@ static int ltoa_helper(MSVCRT_long value, char *str, MSVCRT_size_t size, int rad
/*********************************************************************
* _ltoa_s (MSVCRT.@)
*/
int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix)
int CDECL MSVCRT__ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix)
{
if (!MSVCRT_CHECK_PMT(str != NULL)) return MSVCRT_EINVAL;
if (!MSVCRT_CHECK_PMT(size > 0)) return MSVCRT_EINVAL;
......@@ -1071,7 +1071,7 @@ int CDECL _ltoa_s(MSVCRT_long value, char *str, MSVCRT_size_t size, int radix)
/*********************************************************************
* _ltow_s (MSVCRT.@)
*/
int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)
int CDECL MSVCRT__ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)
{
MSVCRT_ulong val;
unsigned int digit;
......@@ -1146,15 +1146,15 @@ int CDECL _ltow_s(MSVCRT_long value, MSVCRT_wchar_t *str, MSVCRT_size_t size, in
/*********************************************************************
* _itoa_s (MSVCRT.@)
*/
int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix)
int CDECL MSVCRT__itoa_s(int value, char *str, MSVCRT_size_t size, int radix)
{
return _ltoa_s(value, str, size, radix);
return MSVCRT__ltoa_s(value, str, size, radix);
}
/*********************************************************************
* _itoa (MSVCRT.@)
*/
char* CDECL _itoa(int value, char *str, int radix)
char* CDECL MSVCRT__itoa(int value, char *str, int radix)
{
return ltoa_helper(value, str, MSVCRT_SIZE_MAX, radix) ? NULL : str;
}
......@@ -1162,9 +1162,9 @@ char* CDECL _itoa(int value, char *str, int radix)
/*********************************************************************
* _itow_s (MSVCRT.@)
*/
int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)
int CDECL MSVCRT__itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)
{
return _ltow_s(value, str, size, radix);
return MSVCRT__ltow_s(value, str, size, radix);
}
/*********************************************************************
......@@ -1247,7 +1247,7 @@ int CDECL MSVCRT__ui64tow_s( unsigned __int64 value, MSVCRT_wchar_t *str,
/*********************************************************************
* _ultoa_s (MSVCRT.@)
*/
int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix)
int CDECL MSVCRT__ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix)
{
MSVCRT_ulong digit;
char buffer[33], *pos;
......@@ -1301,7 +1301,7 @@ int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix)
/*********************************************************************
* _ultow_s (MSVCRT.@)
*/
int CDECL _ultow_s(MSVCRT_ulong value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)
int CDECL MSVCRT__ultow_s(MSVCRT_ulong value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)
{
MSVCRT_ulong digit;
WCHAR buffer[33], *pos;
......@@ -1355,7 +1355,7 @@ int CDECL _ultow_s(MSVCRT_ulong value, MSVCRT_wchar_t *str, MSVCRT_size_t size,
/*********************************************************************
* _i64toa_s (MSVCRT.@)
*/
int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix)
int CDECL MSVCRT__i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix)
{
unsigned __int64 val;
unsigned int digit;
......@@ -1430,7 +1430,7 @@ int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix)
/*********************************************************************
* _i64tow_s (MSVCRT.@)
*/
int CDECL _i64tow_s(__int64 value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)
int CDECL MSVCRT__i64tow_s(__int64 value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix)
{
unsigned __int64 val;
unsigned int digit;
......
dlls/msvcrt/wcs.c
View file @ e70bf5f8
......@@ -1219,7 +1219,7 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcspbrk( const MSVCRT_wchar_t* str, const MSVCRT_wc
/*********************************************************************
* wcstok_s (MSVCRT.@)
*/
MSVCRT_wchar_t * CDECL wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim,
MSVCRT_wchar_t * CDECL MSVCRT_wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim,
MSVCRT_wchar_t **next_token )
{
MSVCRT_wchar_t *ret;
......@@ -1244,7 +1244,7 @@ MSVCRT_wchar_t * CDECL wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *deli
*/
MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim )
{
return wcstok_s(str, delim, &msvcrt_get_thread_data()->wcstok_next);
return MSVCRT_wcstok_s(str, delim, &msvcrt_get_thread_data()->wcstok_next);
}
/*********************************************************************
......@@ -1946,7 +1946,7 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wcha
/*********************************************************************
* _wtoi64_l (MSVCRT.@)
*/
__int64 CDECL _wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale)
__int64 CDECL MSVCRT__wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale)
{
ULONGLONG RunningTotal = 0;
BOOL bMinus = FALSE;
......@@ -1973,9 +1973,9 @@ __int64 CDECL _wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale)
/*********************************************************************
* _wtoi64 (MSVCRT.@)
*/
__int64 CDECL _wtoi64(const MSVCRT_wchar_t *str)
__int64 CDECL MSVCRT__wtoi64(const MSVCRT_wchar_t *str)
{
return _wtoi64_l(str, NULL);
return MSVCRT__wtoi64_l(str, NULL);
}
/*********************************************************************
......
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