ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Fix compilation errors on Mingw.

This commit is contained in:
Piotr Caban 2014-04-16 16:15:07 +02:00 committed by Alexandre Julliard
parent ef08f69efc
commit e70bf5f8c6
12 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/msvcrt/data.c
View File

@ -141,7 +141,7 @@ typedef int (CDECL *_INITTERM_E_FN)(void);
/*********************************************************************** /***********************************************************************
* __p___argc (MSVCRT.@) * __p___argc (MSVCRT.@)
*/ */
int* CDECL __p___argc(void) { return &MSVCRT___argc; } int* CDECL MSVCRT___p___argc(void) { return &MSVCRT___argc; }
/*********************************************************************** /***********************************************************************
* __p__commode (MSVCRT.@) * __p__commode (MSVCRT.@)
@ -152,12 +152,12 @@ unsigned int* CDECL __p__commode(void) { return &MSVCRT__commode; }
/*********************************************************************** /***********************************************************************
* __p__pgmptr (MSVCRT.@) * __p__pgmptr (MSVCRT.@)
*/ */
char** CDECL __p__pgmptr(void) { return &MSVCRT__pgmptr; } char** CDECL MSVCRT___p__pgmptr(void) { return &MSVCRT__pgmptr; }
/*********************************************************************** /***********************************************************************
* __p__wpgmptr (MSVCRT.@) * __p__wpgmptr (MSVCRT.@)
*/ */
WCHAR** CDECL __p__wpgmptr(void) { return &MSVCRT__wpgmptr; } WCHAR** CDECL MSVCRT___p__wpgmptr(void) { return &MSVCRT__wpgmptr; }
/*********************************************************************** /***********************************************************************
* _get_pgmptr (MSVCRT.@) * _get_pgmptr (MSVCRT.@)
@ -188,7 +188,7 @@ unsigned int* CDECL __p__fmode(void) { return &MSVCRT__fmode; }
/*********************************************************************** /***********************************************************************
* _set_fmode (MSVCRT.@) * _set_fmode (MSVCRT.@)
*/ */
int CDECL _set_fmode(int mode) int CDECL MSVCRT__set_fmode(int mode)
{ {
/* TODO: support _O_WTEXT */ /* TODO: support _O_WTEXT */
if(!MSVCRT_CHECK_PMT(mode==MSVCRT__O_TEXT || mode==MSVCRT__O_BINARY)) 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.@) * _get_fmode (MSVCRT.@)
*/ */
int CDECL _get_fmode(int *mode) int CDECL MSVCRT__get_fmode(int *mode)
{ {
if(!MSVCRT_CHECK_PMT(mode)) if(!MSVCRT_CHECK_PMT(mode))
return MSVCRT_EINVAL; return MSVCRT_EINVAL;
@ -243,12 +243,12 @@ MSVCRT_wchar_t** CDECL __p__wcmdln(void) { return &MSVCRT__wcmdln; }
/********************************************************************* /*********************************************************************
* __p___argv (MSVCRT.@) * __p___argv (MSVCRT.@)
*/ */
char*** CDECL __p___argv(void) { return &MSVCRT___argv; } char*** CDECL MSVCRT___p___argv(void) { return &MSVCRT___argv; }
/********************************************************************* /*********************************************************************
* __p___wargv (MSVCRT.@) * __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.@) * __p__environ (MSVCRT.@)

28
dlls/msvcrt/dir.c
View File

@ -1023,7 +1023,7 @@ int CDECL MSVCRT__wrmdir(const MSVCRT_wchar_t * dir)
/****************************************************************** /******************************************************************
* _splitpath_s (MSVCRT.@) * _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* drive, MSVCRT_size_t sz_drive,
char* dir, MSVCRT_size_t sz_dir, char* dir, MSVCRT_size_t sz_dir,
char* fname, MSVCRT_size_t sz_fname, char* fname, MSVCRT_size_t sz_fname,
@ -1111,10 +1111,10 @@ do_error:
/********************************************************************* /*********************************************************************
* _splitpath (MSVCRT.@) * _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) 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); 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 * 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* drive, MSVCRT_size_t sz_drive,
MSVCRT_wchar_t* dir, MSVCRT_size_t sz_dir, MSVCRT_wchar_t* dir, MSVCRT_size_t sz_dir,
MSVCRT_wchar_t* fname, MSVCRT_size_t sz_fname, MSVCRT_wchar_t* fname, MSVCRT_size_t sz_fname,
@ -1205,10 +1205,10 @@ do_error:
* *
* Unicode version of _splitpath. * 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) 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); 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. * 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; DWORD rc;
WCHAR* buffer; 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. * Otherwise populates absPath with the path and returns it.
* Failure: NULL. errno indicates the error. * 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; DWORD rc;
char* lastpart; 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, * Nothing. If path is not large enough to hold the resulting pathname,
* random process memory will be overwritten. * 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 *directory, const char * filename,
const char * extension) const char * extension)
{ {
@ -1373,7 +1373,7 @@ VOID CDECL _makepath(char * path, const char * drive,
* *
* Unicode version of _wmakepath. * 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) const MSVCRT_wchar_t *filename, const MSVCRT_wchar_t *extension)
{ {
MSVCRT_wchar_t *p = path; 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. * 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 *directory, const char *filename,
const char *extension) const char *extension)
{ {
@ -1524,7 +1524,7 @@ range:
* *
* Safe version of _wmakepath. * 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 *directory, const MSVCRT_wchar_t *filename,
const MSVCRT_wchar_t *extension) const MSVCRT_wchar_t *extension)
{ {
@ -1698,7 +1698,7 @@ void CDECL MSVCRT__searchenv(const char* file, const char* env, char *buf)
/********************************************************************* /*********************************************************************
* _searchenv_s (MSVCRT.@) * _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*envVal, *penv;
char curPath[MAX_PATH]; char curPath[MAX_PATH];
@ -1829,7 +1829,7 @@ void CDECL MSVCRT__wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t*
/********************************************************************* /*********************************************************************
* _wsearchenv_s (MSVCRT.@) * _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 *buf, MSVCRT_size_t count)
{ {
MSVCRT_wchar_t* envVal, *penv; MSVCRT_wchar_t* envVal, *penv;

10
dlls/msvcrt/errno.c
View File

@ -264,7 +264,7 @@ char* CDECL MSVCRT_strerror(int err)
/********************************************************************** /**********************************************************************
* strerror_s (MSVCRT.@) * 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; char *ptr;
@ -330,7 +330,7 @@ void CDECL MSVCRT_perror(const char* str)
/********************************************************************* /*********************************************************************
* _wcserror_s (MSVCRT.@) * _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(buffer != NULL)) return MSVCRT_EINVAL;
if (!MSVCRT_CHECK_PMT(nc > 0)) 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)
if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL; 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; return data->wcserror_buffer;
} }
/********************************************************************** /**********************************************************************
* __wcserror_s (MSVCRT.@) * __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; int err;
static const WCHAR colonW[] = {':', ' ', '\0'}; 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)
if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL; 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); if (err) FIXME("bad wcserror call (%d)\n", err);
return data->wcserror_buffer; return data->wcserror_buffer;

10
dlls/msvcrt/file.c
View File

@ -713,7 +713,7 @@ int CDECL MSVCRT__access(const char *filename, int mode)
/********************************************************************* /*********************************************************************
* _access_s (MSVCRT.@) * _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(filename != NULL)) return *MSVCRT__errno();
if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) 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.@) * _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(filename != NULL)) return *MSVCRT__errno();
if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) 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 */ /* _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; int ret;
struct MSVCRT__stat64 buf64; struct MSVCRT__stat64 buf64;
@ -1626,7 +1626,7 @@ int CDECL _fstat32(int fd, struct MSVCRT__stat32* buf)
} }
/* _fstat64i32 - not exported in native msvcrt */ /* _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; int ret;
struct MSVCRT__stat64 buf64; 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 */ /* 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) MSVCRT_size_t count, MSVCRT_FILE *stream)
{ {
size_t bytes_left, buf_pos; size_t bytes_left, buf_pos;

6
dlls/msvcrt/heap.c
View File

@ -547,7 +547,7 @@ void * CDECL _aligned_realloc(void *memblock, MSVCRT_size_t size, MSVCRT_size_t
/********************************************************************* /*********************************************************************
* memmove_s (MSVCRT.@) * 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); 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.@) * 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); 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.@) * 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) const char *src, MSVCRT_size_t count)
{ {
MSVCRT_size_t i, end; MSVCRT_size_t i, end;

12
dlls/msvcrt/math.c
View File

@ -1338,7 +1338,7 @@ double CDECL MSVCRT__nextafter(double num, double next)
/********************************************************************* /*********************************************************************
* _ecvt (MSVCRT.@) * _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; int prec, len;
thread_data_t *data = msvcrt_get_thread_data(); 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.@) * _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; int prec, len;
char *result; char *result;
@ -1443,7 +1443,7 @@ int CDECL _ecvt_s( char *buffer, MSVCRT_size_t length, double number, int ndigit
/*********************************************************************** /***********************************************************************
* _fcvt (MSVCRT.@) * _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(); thread_data_t *data = msvcrt_get_thread_data();
int stop, dec1, dec2; int stop, dec1, dec2;
@ -1526,7 +1526,7 @@ char * CDECL _fcvt( double number, int ndigits, int *decpt, int *sign )
/*********************************************************************** /***********************************************************************
* _fcvt_s (MSVCRT.@) * _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; int stop, dec1, dec2;
char *ptr1, *ptr2, *first; char *ptr1, *ptr2, *first;
@ -1615,7 +1615,7 @@ int CDECL _fcvt_s(char* outbuffer, MSVCRT_size_t size, double number, int ndigit
/*********************************************************************** /***********************************************************************
* _gcvt (MSVCRT.@) * _gcvt (MSVCRT.@)
*/ */
char * CDECL _gcvt( double number, int ndigit, char *buff ) char * CDECL MSVCRT__gcvt( double number, int ndigit, char *buff )
{ {
if(!buff) { if(!buff) {
*MSVCRT__errno() = MSVCRT_EINVAL; *MSVCRT__errno() = MSVCRT_EINVAL;
@ -1634,7 +1634,7 @@ char * CDECL _gcvt( double number, int ndigit, char *buff )
/*********************************************************************** /***********************************************************************
* _gcvt_s (MSVCRT.@) * _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; int len;

2
dlls/msvcrt/misc.c
View File

@ -305,7 +305,7 @@ void CDECL MSVCRT_qsort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size,
/********************************************************************* /*********************************************************************
* _get_output_format (MSVCRT.@) * _get_output_format (MSVCRT.@)
*/ */
unsigned int CDECL _get_output_format(void) unsigned int CDECL MSVCRT__get_output_format(void)
{ {
return output_format; return output_format;
} }

2
dlls/msvcrt/msvcrt.h
View File

@ -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__tolower_l(int,MSVCRT__locale_t);
int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, 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); 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**); 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) /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd)

106
dlls/msvcrt/msvcrt.spec
View File

@ -245,11 +245,11 @@
@ cdecl -arch=i386 __libm_sse2_tan() @ cdecl -arch=i386 __libm_sse2_tan()
@ cdecl -arch=i386 __libm_sse2_tanf() @ cdecl -arch=i386 __libm_sse2_tanf()
@ extern __mb_cur_max MSVCRT___mb_cur_max @ extern __mb_cur_max MSVCRT___mb_cur_max
@ cdecl __p___argc() @ cdecl __p___argc() MSVCRT___p___argc
@ cdecl __p___argv() @ cdecl __p___argv() MSVCRT___p___argv
@ cdecl __p___initenv() @ cdecl __p___initenv()
@ cdecl __p___mb_cur_max() @ cdecl __p___mb_cur_max()
@ cdecl __p___wargv() @ cdecl __p___wargv() MSVCRT___p___wargv
@ cdecl __p___winitenv() @ cdecl __p___winitenv()
@ cdecl __p__acmdln() @ cdecl __p__acmdln()
@ cdecl __p__amblksiz() @ cdecl __p__amblksiz()
@ -264,7 +264,7 @@
@ cdecl __p__mbctype() @ cdecl __p__mbctype()
@ cdecl __p__osver() @ cdecl __p__osver()
@ cdecl __p__pctype() MSVCRT___p__pctype @ cdecl __p__pctype() MSVCRT___p__pctype
@ cdecl __p__pgmptr() @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
@ stub __p__pwctype() @ stub __p__pwctype()
@ cdecl __p__timezone() MSVCRT___p__timezone @ cdecl __p__timezone() MSVCRT___p__timezone
@ cdecl __p__tzname() @ cdecl __p__tzname()
@ -273,7 +273,7 @@
@ cdecl __p__winmajor() @ cdecl __p__winmajor()
@ cdecl __p__winminor() @ cdecl __p__winminor()
@ cdecl __p__winver() @ cdecl __p__winver()
@ cdecl __p__wpgmptr() @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
@ cdecl __pctype_func() MSVCRT___pctype_func @ cdecl __pctype_func() MSVCRT___pctype_func
@ extern __pioinfo MSVCRT___pioinfo @ extern __pioinfo MSVCRT___pioinfo
# stub __pwctype_func() # stub __pwctype_func()
@ -291,14 +291,14 @@
@ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@ extern __wargv MSVCRT___wargv @ extern __wargv MSVCRT___wargv
@ cdecl __wcserror(wstr) MSVCRT___wcserror @ cdecl __wcserror(wstr) MSVCRT___wcserror
@ cdecl __wcserror_s(ptr long wstr) @ cdecl __wcserror_s(ptr long wstr) MSVCRT___wcserror_s
# stub __wcsncnt(wstr long) # stub __wcsncnt(wstr long)
@ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr)
@ extern __winitenv MSVCRT___winitenv @ extern __winitenv MSVCRT___winitenv
@ cdecl _abnormal_termination() @ cdecl _abnormal_termination()
@ cdecl -ret64 _abs64(int64) @ cdecl -ret64 _abs64(int64)
@ cdecl _access(str long) MSVCRT__access @ cdecl _access(str long) MSVCRT__access
@ cdecl _access_s(str long) @ cdecl _access_s(str long) MSVCRT__access_s
@ extern _acmdln MSVCRT__acmdln @ extern _acmdln MSVCRT__acmdln
@ stdcall -arch=i386 _adj_fdiv_m16i(long) @ stdcall -arch=i386 _adj_fdiv_m16i(long)
@ stdcall -arch=i386 _adj_fdiv_m32(long) @ stdcall -arch=i386 _adj_fdiv_m32(long)
@ -407,8 +407,8 @@
@ extern _dstbias MSVCRT__dstbias @ extern _dstbias MSVCRT__dstbias
@ cdecl _dup (long) MSVCRT__dup @ cdecl _dup (long) MSVCRT__dup
@ cdecl _dup2 (long long) MSVCRT__dup2 @ cdecl _dup2 (long long) MSVCRT__dup2
@ cdecl _ecvt(double long ptr ptr) @ cdecl _ecvt(double long ptr ptr) MSVCRT__ecvt
@ cdecl _ecvt_s(str long double long ptr ptr) @ cdecl _ecvt_s(str long double long ptr ptr) MSVCRT__ecvt_s
@ cdecl _endthread () @ cdecl _endthread ()
@ cdecl _endthreadex(long) @ cdecl _endthreadex(long)
@ extern _environ MSVCRT__environ @ extern _environ MSVCRT__environ
@ -429,8 +429,8 @@
@ cdecl _expand(ptr long) @ cdecl _expand(ptr long)
# stub _expand_dbg(ptr long long str long) # stub _expand_dbg(ptr long long str long)
@ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcloseall() MSVCRT__fcloseall
@ cdecl _fcvt(double long ptr ptr) @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt
@ cdecl _fcvt_s(ptr long double long ptr ptr) @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s
@ cdecl _fdopen(long str) MSVCRT__fdopen @ cdecl _fdopen(long str) MSVCRT__fdopen
@ cdecl _fgetchar() MSVCRT__fgetchar @ cdecl _fgetchar() MSVCRT__fgetchar
@ cdecl _fgetwchar() MSVCRT__fgetwchar @ cdecl _fgetwchar() MSVCRT__fgetwchar
@ -486,7 +486,7 @@
@ cdecl -arch=i386 -ret64 _ftol2() MSVCRT__ftol @ cdecl -arch=i386 -ret64 _ftol2() MSVCRT__ftol
@ cdecl -arch=i386 -ret64 _ftol2_sse() MSVCRT__ftol #FIXME: SSE variant should be implemented @ cdecl -arch=i386 -ret64 _ftol2_sse() MSVCRT__ftol #FIXME: SSE variant should be implemented
# stub _ftol2_sse_excpt # stub _ftol2_sse_excpt
@ cdecl _fullpath(ptr str long) @ cdecl _fullpath(ptr str long) MSVCRT__fullpath
# stub _fullpath_dbg(ptr str long long str long) # stub _fullpath_dbg(ptr str long long str long)
@ cdecl _futime(long ptr) @ cdecl _futime(long ptr)
@ cdecl _futime32(long ptr) @ cdecl _futime32(long ptr)
@ -497,19 +497,19 @@
# stub _fwprintf_s_l(ptr wstr ptr) # stub _fwprintf_s_l(ptr wstr ptr)
@ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l
@ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l
@ cdecl _gcvt(double long str) @ cdecl _gcvt(double long str) MSVCRT__gcvt
@ cdecl _gcvt_s(ptr long double long) @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s
@ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_current_locale() MSVCRT__get_current_locale
@ cdecl _get_doserrno(ptr) @ cdecl _get_doserrno(ptr)
# stub _get_environ(ptr) # stub _get_environ(ptr)
@ cdecl _get_errno(ptr) @ cdecl _get_errno(ptr)
# stub _get_fileinfo(ptr) # stub _get_fileinfo(ptr)
@ cdecl _get_fmode(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode
@ cdecl _get_heap_handle() @ cdecl _get_heap_handle()
@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
@ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform
# stub _get_osver(ptr) # stub _get_osver(ptr)
@ cdecl _get_output_format() @ cdecl _get_output_format() MSVCRT__get_output_format
@ cdecl _get_pgmptr(ptr) @ cdecl _get_pgmptr(ptr)
@ cdecl _get_sbh_threshold() @ cdecl _get_sbh_threshold()
# stub _get_wenviron(ptr) # stub _get_wenviron(ptr)
@ -550,9 +550,9 @@
@ cdecl _hypot(double double) @ cdecl _hypot(double double)
@ cdecl _hypotf(float float) MSVCRT__hypotf @ cdecl _hypotf(float float) MSVCRT__hypotf
@ cdecl _i64toa(int64 ptr long) ntdll._i64toa @ cdecl _i64toa(int64 ptr long) ntdll._i64toa
@ cdecl _i64toa_s(int64 ptr long long) _i64toa_s @ cdecl _i64toa_s(int64 ptr long long) MSVCRT__i64toa_s
@ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow(int64 ptr long) ntdll._i64tow
@ cdecl _i64tow_s(int64 ptr long long) _i64tow_s @ cdecl _i64tow_s(int64 ptr long long) MSVCRT__i64tow_s
@ cdecl _initterm(ptr ptr) @ cdecl _initterm(ptr ptr)
@ cdecl _initterm_e(ptr ptr) @ cdecl _initterm_e(ptr ptr)
@ stub -arch=i386 _inp(long) @ stub -arch=i386 _inp(long)
@ -646,10 +646,10 @@
# stub _iswupper_l(long ptr) # stub _iswupper_l(long ptr)
# stub _iswxdigit_l(long ptr) # stub _iswxdigit_l(long ptr)
@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l @ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
@ cdecl _itoa(long ptr long) @ cdecl _itoa(long ptr long) MSVCRT__itoa
@ cdecl _itoa_s(long ptr long long) @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
@ cdecl _itow(long ptr long) ntdll._itow @ cdecl _itow(long ptr long) ntdll._itow
@ cdecl _itow_s(long ptr long long) @ cdecl _itow_s(long ptr long long) MSVCRT__itow_s
@ cdecl _j0(double) MSVCRT__j0 @ cdecl _j0(double) MSVCRT__j0
@ cdecl _j1(double) MSVCRT__j1 @ cdecl _j1(double) MSVCRT__j1
@ cdecl _jn(long double) MSVCRT__jn @ cdecl _jn(long double) MSVCRT__jn
@ -677,11 +677,11 @@
@ cdecl _lseek(long long long) MSVCRT__lseek @ cdecl _lseek(long long long) MSVCRT__lseek
@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64 @ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
@ cdecl _ltoa(long ptr long) ntdll._ltoa @ cdecl _ltoa(long ptr long) ntdll._ltoa
@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltoa_s(long ptr long long) MSVCRT__ltoa_s
@ cdecl _ltow(long ptr long) ntdll._ltow @ cdecl _ltow(long ptr long) ntdll._ltow
@ cdecl _ltow_s(long ptr long long) @ cdecl _ltow_s(long ptr long long) MSVCRT__ltow_s
@ cdecl _makepath(ptr str str str str) @ cdecl _makepath(ptr str str str str) MSVCRT__makepath
@ cdecl _makepath_s(ptr long str str str str) @ cdecl _makepath_s(ptr long str str str str) MSVCRT__makepath_s
# stub _malloc_dbg(long long str long) # stub _malloc_dbg(long long str long)
@ cdecl _matherr(ptr) MSVCRT__matherr @ cdecl _matherr(ptr) MSVCRT__matherr
@ cdecl _mbbtombc(long) @ cdecl _mbbtombc(long)
@ -888,7 +888,7 @@
# stub _scwprintf_l(wstr ptr) # stub _scwprintf_l(wstr ptr)
# stub _scwprintf_p_l(wstr ptr) # stub _scwprintf_p_l(wstr ptr)
@ cdecl _searchenv(str str ptr) MSVCRT__searchenv @ cdecl _searchenv(str str ptr) MSVCRT__searchenv
@ cdecl _searchenv_s(str str ptr long) @ cdecl _searchenv_s(str str ptr long) MSVCRT__searchenv_s
@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind4(ptr)
@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ stdcall -arch=i386 _seh_longjmp_unwind(ptr)
@ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable
@ -897,7 +897,7 @@
@ cdecl _set_errno(long) @ cdecl _set_errno(long)
@ cdecl _set_error_mode(long) @ cdecl _set_error_mode(long)
# stub _set_fileinfo(long) # stub _set_fileinfo(long)
@ cdecl _set_fmode(long) @ cdecl _set_fmode(long) MSVCRT__set_fmode
@ cdecl _set_output_format(long) @ cdecl _set_output_format(long)
@ cdecl _set_sbh_threshold(long) @ cdecl _set_sbh_threshold(long)
@ cdecl _seterrormode(long) @ cdecl _seterrormode(long)
@ -937,8 +937,8 @@
@ cdecl _spawnve(long str ptr ptr) MSVCRT__spawnve @ cdecl _spawnve(long str ptr ptr) MSVCRT__spawnve
@ cdecl _spawnvp(long str ptr) @ cdecl _spawnvp(long str ptr)
@ cdecl _spawnvpe(long str ptr ptr) MSVCRT__spawnvpe @ cdecl _spawnvpe(long str ptr ptr) MSVCRT__spawnvpe
@ cdecl _splitpath(str ptr ptr ptr ptr) @ cdecl _splitpath(str ptr ptr ptr ptr) MSVCRT__splitpath
@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) MSVCRT__splitpath_s
@ varargs _sprintf_l(ptr str ptr) MSVCRT_sprintf_l @ varargs _sprintf_l(ptr str ptr) MSVCRT_sprintf_l
@ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l @ varargs _sprintf_p_l(ptr long str ptr) MSVCRT_sprintf_p_l
@ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l @ varargs _sprintf_s_l(ptr long str ptr) MSVCRT_sprintf_s_l
@ -962,8 +962,8 @@
@ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l @ cdecl _stricoll_l(str str ptr) MSVCRT__stricoll_l
@ cdecl _strlwr(str) MSVCRT__strlwr @ cdecl _strlwr(str) MSVCRT__strlwr
@ cdecl _strlwr_l(str ptr) @ cdecl _strlwr_l(str ptr)
@ cdecl _strlwr_s(ptr long) @ cdecl _strlwr_s(ptr long) MSVCRT__strlwr_s
@ cdecl _strlwr_s_l(ptr long ptr) @ cdecl _strlwr_s_l(ptr long ptr) MSVCRT__strlwr_s_l
@ cdecl _strncoll(str str long) MSVCRT__strncoll @ cdecl _strncoll(str str long) MSVCRT__strncoll
@ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l @ cdecl _strncoll_l(str str long ptr) MSVCRT__strncoll_l
@ cdecl _strnicmp(str str long) MSVCRT__strnicmp @ cdecl _strnicmp(str str long) MSVCRT__strnicmp
@ -986,8 +986,8 @@
# stub _strtoul_l(str ptr long ptr) # stub _strtoul_l(str ptr long ptr)
@ cdecl _strupr(str) MSVCRT__strupr @ cdecl _strupr(str) MSVCRT__strupr
@ cdecl _strupr_l(str ptr) MSVCRT__strupr_l @ cdecl _strupr_l(str ptr) MSVCRT__strupr_l
@ cdecl _strupr_s(str long) @ cdecl _strupr_s(str long) MSVCRT__strupr_s
@ cdecl _strupr_s_l(str long ptr) @ cdecl _strupr_s_l(str long ptr) MSVCRT__strupr_s_l
# stub _strxfrm_l(ptr str long ptr) # stub _strxfrm_l(ptr str long ptr)
@ cdecl _swab(str str long) MSVCRT__swab @ cdecl _swab(str str long) MSVCRT__swab
@ varargs _swprintf(ptr wstr) MSVCRT_swprintf @ varargs _swprintf(ptr wstr) MSVCRT_swprintf
@ -1019,9 +1019,9 @@
@ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow
@ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s @ cdecl _ui64tow_s(int64 ptr long long) MSVCRT__ui64tow_s
@ cdecl _ultoa(long ptr long) ntdll._ultoa @ cdecl _ultoa(long ptr long) ntdll._ultoa
@ cdecl _ultoa_s(long ptr long long) @ cdecl _ultoa_s(long ptr long long) MSVCRT__ultoa_s
@ cdecl _ultow(long ptr long) ntdll._ultow @ cdecl _ultow(long ptr long) ntdll._ultow
@ cdecl _ultow_s(long ptr long long) @ cdecl _ultow_s(long ptr long long) MSVCRT__ultow_s
@ cdecl _umask(long) MSVCRT__umask @ cdecl _umask(long) MSVCRT__umask
# stub _umask_s(long ptr) # stub _umask_s(long ptr)
@ cdecl _ungetch(long) @ cdecl _ungetch(long)
@ -1088,7 +1088,7 @@
# stub _vwprintf_p_l(wstr ptr ptr) # stub _vwprintf_p_l(wstr ptr ptr)
# stub _vwprintf_s_l(wstr ptr ptr) # stub _vwprintf_s_l(wstr ptr ptr)
@ cdecl _waccess(wstr long) MSVCRT__waccess @ cdecl _waccess(wstr long) MSVCRT__waccess
@ cdecl _waccess_s(wstr long) @ cdecl _waccess_s(wstr long) MSVCRT__waccess_s
@ cdecl _wasctime(ptr) MSVCRT__wasctime @ cdecl _wasctime(ptr) MSVCRT__wasctime
@ cdecl _wasctime_s(ptr long ptr) MSVCRT__wasctime_s @ cdecl _wasctime_s(ptr long ptr) MSVCRT__wasctime_s
@ cdecl _wassert(wstr wstr long) MSVCRT__wassert @ cdecl _wassert(wstr wstr long) MSVCRT__wassert
@ -1100,7 +1100,7 @@
@ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcsdup(wstr) MSVCRT__wcsdup
# stub _wcsdup_dbg(wstr long str long) # stub _wcsdup_dbg(wstr long str long)
@ cdecl _wcserror(long) MSVCRT__wcserror @ cdecl _wcserror(long) MSVCRT__wcserror
@ cdecl _wcserror_s(ptr long long) @ cdecl _wcserror_s(ptr long long) MSVCRT__wcserror_s
# stub _wcsftime_l(ptr long wstr ptr ptr) # stub _wcsftime_l(ptr long wstr ptr ptr)
@ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp @ cdecl _wcsicmp(wstr wstr) MSVCRT__wcsicmp
@ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l @ cdecl _wcsicmp_l(wstr wstr ptr) MSVCRT__wcsicmp_l
@ -1167,7 +1167,7 @@
@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen @ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s @ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen @ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
@ cdecl _wfullpath(ptr wstr long) @ cdecl _wfullpath(ptr wstr long) MSVCRT__wfullpath
# stub _wfullpath_dbg(ptr wstr long long str long) # stub _wfullpath_dbg(ptr wstr long long str long)
@ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd @ cdecl _wgetcwd(wstr long) MSVCRT__wgetcwd
@ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd @ cdecl _wgetdcwd(long wstr long) MSVCRT__wgetdcwd
@ -1177,8 +1177,8 @@
@ extern _winminor MSVCRT__winminor @ extern _winminor MSVCRT__winminor
# stub _winput_s # stub _winput_s
@ extern _winver MSVCRT__winver @ extern _winver MSVCRT__winver
@ cdecl _wmakepath(ptr wstr wstr wstr wstr) @ cdecl _wmakepath(ptr wstr wstr wstr wstr) MSVCRT__wmakepath
@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr) MSVCRT__wmakepath_s
@ cdecl _wmkdir(wstr) MSVCRT__wmkdir @ cdecl _wmkdir(wstr) MSVCRT__wmkdir
@ cdecl _wmktemp(wstr) MSVCRT__wmktemp @ cdecl _wmktemp(wstr) MSVCRT__wmktemp
@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s @ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
@ -1200,7 +1200,7 @@
@ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l @ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l
@ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l @ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l
@ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv
@ cdecl _wsearchenv_s(wstr wstr ptr long) @ cdecl _wsearchenv_s(wstr wstr ptr long) MSVCRT__wsearchenv_s
@ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale
@ varargs _wsopen(wstr long long) MSVCRT__wsopen @ varargs _wsopen(wstr long long) MSVCRT__wsopen
@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s @ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
@ -1212,8 +1212,8 @@
@ cdecl _wspawnve(long wstr ptr ptr) MSVCRT__wspawnve @ cdecl _wspawnve(long wstr ptr ptr) MSVCRT__wspawnve
@ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvp(long wstr ptr)
@ cdecl _wspawnvpe(long wstr ptr ptr) MSVCRT__wspawnvpe @ cdecl _wspawnvpe(long wstr ptr ptr) MSVCRT__wspawnvpe
@ cdecl _wsplitpath(wstr ptr ptr ptr ptr) @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) MSVCRT__wsplitpath
@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) _wsplitpath_s @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) MSVCRT__wsplitpath_s
@ cdecl _wstat(wstr ptr) MSVCRT__wstat @ cdecl _wstat(wstr ptr) MSVCRT__wstat
@ cdecl _wstati64(wstr ptr) MSVCRT__wstati64 @ cdecl _wstati64(wstr ptr) MSVCRT__wstati64
@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64 @ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
@ -1229,8 +1229,8 @@
@ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof(wstr) MSVCRT__wtof
@ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l
@ cdecl _wtoi(wstr) MSVCRT__wtoi @ cdecl _wtoi(wstr) MSVCRT__wtoi
@ cdecl -ret64 _wtoi64(wstr) @ cdecl -ret64 _wtoi64(wstr) MSVCRT__wtoi64
@ cdecl -ret64 _wtoi64_l(wstr ptr) @ cdecl -ret64 _wtoi64_l(wstr ptr) MSVCRT__wtoi64_l
@ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l
@ cdecl _wtol(wstr) MSVCRT__wtol @ cdecl _wtol(wstr) MSVCRT__wtol
@ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l @ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l
@ -1372,9 +1372,9 @@
@ cdecl memchr(ptr long long) MSVCRT_memchr @ cdecl memchr(ptr long long) MSVCRT_memchr
@ cdecl memcmp(ptr ptr long) MSVCRT_memcmp @ cdecl memcmp(ptr ptr long) MSVCRT_memcmp
@ cdecl memcpy(ptr ptr long) MSVCRT_memcpy @ cdecl memcpy(ptr ptr long) MSVCRT_memcpy
@ cdecl memcpy_s(ptr long ptr long) @ cdecl memcpy_s(ptr long ptr long) MSVCRT_memcpy_s
@ cdecl memmove(ptr ptr long) MSVCRT_memmove @ cdecl memmove(ptr ptr long) MSVCRT_memmove
@ cdecl memmove_s(ptr long ptr long) @ cdecl memmove_s(ptr long ptr long) MSVCRT_memmove_s
@ cdecl memset(ptr long long) MSVCRT_memset @ cdecl memset(ptr long long) MSVCRT_memset
@ cdecl mktime(ptr) MSVCRT_mktime @ cdecl mktime(ptr) MSVCRT_mktime
@ cdecl modf(double ptr) MSVCRT_modf @ cdecl modf(double ptr) MSVCRT_modf
@ -1425,14 +1425,14 @@
@ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s
@ cdecl strcspn(str str) ntdll.strcspn @ cdecl strcspn(str str) ntdll.strcspn
@ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror(long) MSVCRT_strerror
@ cdecl strerror_s(ptr long long) @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s
@ cdecl strftime(str long str ptr) MSVCRT_strftime @ cdecl strftime(str long str ptr) MSVCRT_strftime
@ cdecl strlen(str) MSVCRT_strlen @ cdecl strlen(str) MSVCRT_strlen
@ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncat(str str long) MSVCRT_strncat
@ cdecl strncat_s(str long str long) MSVCRT_strncat_s @ cdecl strncat_s(str long str long) MSVCRT_strncat_s
@ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncmp(str str long) MSVCRT_strncmp
@ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy(ptr str long) MSVCRT_strncpy
@ cdecl strncpy_s(ptr long str long) @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s
@ cdecl strnlen(str long) MSVCRT_strnlen @ cdecl strnlen(str long) MSVCRT_strnlen
@ cdecl strpbrk(str str) ntdll.strpbrk @ cdecl strpbrk(str str) ntdll.strpbrk
@ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strrchr(str long) MSVCRT_strrchr
@ -1504,7 +1504,7 @@
@ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr
@ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstod(wstr ptr) MSVCRT_wcstod
@ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok(wstr wstr) MSVCRT_wcstok
@ cdecl wcstok_s(ptr wstr ptr) @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s
@ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstol(wstr ptr long) ntdll.wcstol
@ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs
@ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s
@ -1534,8 +1534,8 @@
@ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output @ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
@ cdecl _getptd() @ cdecl _getptd()
@ cdecl fread_s(ptr long long long ptr) @ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
@ cdecl _fstat32(long ptr) @ cdecl _fstat32(long ptr) MSVCRT__fstat32
@ cdecl _fstat64i32(long ptr) @ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32
@ cdecl _is_exception_typeof(ptr ptr) @ cdecl _is_exception_typeof(ptr ptr)
@ cdecl -arch=i386 __libm_sse2_sqrt_precise() @ cdecl -arch=i386 __libm_sse2_sqrt_precise()

2
dlls/msvcrt/printf.h
View File

@ -309,7 +309,7 @@ static inline void FUNC_NAME(pf_fixup_exponent)(char *buf)
if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') && if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') &&
isdigit(tmp[2]) && isdigit(tmp[3])) { 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; tmp += 2;
if(isdigit(tmp[2])) { if(isdigit(tmp[2])) {

42
dlls/msvcrt/string.c
View File

@ -54,7 +54,7 @@ char* CDECL MSVCRT__strdup(const char* str)
/********************************************************************* /*********************************************************************
* _strlwr_s_l (MSVCRT.@) * _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; 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.@) * _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) 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; return str;
} }
@ -108,14 +108,14 @@ char* CDECL _strlwr_l(char *str, MSVCRT__locale_t locale)
*/ */
char* CDECL MSVCRT__strlwr(char *str) char* CDECL MSVCRT__strlwr(char *str)
{ {
_strlwr_s_l(str, -1, NULL); MSVCRT__strlwr_s_l(str, -1, NULL);
return str; return str;
} }
/********************************************************************* /*********************************************************************
* _strupr_s_l (MSVCRT.@) * _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; 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.@) * _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) 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; return str;
} }
@ -169,7 +169,7 @@ char* CDECL MSVCRT__strupr_l(char *str, MSVCRT__locale_t locale)
*/ */
char* CDECL MSVCRT__strupr(char *str) char* CDECL MSVCRT__strupr(char *str)
{ {
_strupr_s_l(str, -1, NULL); MSVCRT__strupr_s_l(str, -1, NULL);
return str; return str;
} }
@ -1055,7 +1055,7 @@ static int ltoa_helper(MSVCRT_long value, char *str, MSVCRT_size_t size, int rad
/********************************************************************* /*********************************************************************
* _ltoa_s (MSVCRT.@) * _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(str != NULL)) return MSVCRT_EINVAL;
if (!MSVCRT_CHECK_PMT(size > 0)) 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.@) * _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; MSVCRT_ulong val;
unsigned int digit; 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.@) * _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.@) * _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; 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.@) * _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.@) * _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; MSVCRT_ulong digit;
char buffer[33], *pos; 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.@) * _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; MSVCRT_ulong digit;
WCHAR buffer[33], *pos; 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.@) * _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 __int64 val;
unsigned int digit; unsigned int digit;
@ -1430,7 +1430,7 @@ int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix)
/********************************************************************* /*********************************************************************
* _i64tow_s (MSVCRT.@) * _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 __int64 val;
unsigned int digit; unsigned int digit;

10
dlls/msvcrt/wcs.c
View File

@ -1219,7 +1219,7 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcspbrk( const MSVCRT_wchar_t* str, const MSVCRT_wc
/********************************************************************* /*********************************************************************
* wcstok_s (MSVCRT.@) * 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 **next_token )
{ {
MSVCRT_wchar_t *ret; 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 ) 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.@) * _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; ULONGLONG RunningTotal = 0;
BOOL bMinus = FALSE; BOOL bMinus = FALSE;
@ -1973,9 +1973,9 @@ __int64 CDECL _wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale)
/********************************************************************* /*********************************************************************
* _wtoi64 (MSVCRT.@) * _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);
} }
/********************************************************************* /*********************************************************************