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

msvcrt: Use the msvcrt version of printf everywhere.

This commit is contained in:
Alexandre Julliard 2006-01-24 12:21:58 +01:00
parent 5cd6b34259
commit a17b2c1cd2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msvcrt/console.c
View File

@ -254,7 +254,7 @@ int _cprintf(const char* format, ...)
* Return the number of bytes that would have been written * Return the number of bytes that would have been written
* The code below handles both cases * The code below handles both cases
*/ */
while ((written = _snprintf( mem, resize, format, valist )) == -1 || while ((written = MSVCRT_vsnprintf( mem, resize, format, valist )) == -1 ||
written > resize) written > resize)
{ {
resize = (written == -1 ? resize * 2 : written + 1); resize = (written == -1 ? resize * 2 : written + 1);

2
dlls/msvcrt/file.c
View File

@ -2908,7 +2908,7 @@ int MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, va_list va
MSVCRT_wchar_t buf[2048], *mem = buf; MSVCRT_wchar_t buf[2048], *mem = buf;
int written, resize = sizeof(buf) / sizeof(MSVCRT_wchar_t), retval; int written, resize = sizeof(buf) / sizeof(MSVCRT_wchar_t), retval;
/* See vfprintf comments */ /* See vfprintf comments */
while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 || while ((written = MSVCRT_vsnwprintf(mem, resize, format, valist)) == -1 ||
written > resize) written > resize)
{ {
resize = (written == -1 ? resize * 2 : written + sizeof(MSVCRT_wchar_t)); resize = (written == -1 ? resize * 2 : written + sizeof(MSVCRT_wchar_t));

4
dlls/msvcrt/msvcrt.h
View File

@ -611,11 +611,12 @@ double MSVCRT_difftime(MSVCRT_time_t time1, MSVCRT_time_t time2);
MSVCRT_time_t MSVCRT_time(MSVCRT_time_t*); MSVCRT_time_t MSVCRT_time(MSVCRT_time_t*);
MSVCRT_FILE* MSVCRT__fdopen(int, const char *); MSVCRT_FILE* MSVCRT__fdopen(int, const char *);
int MSVCRT_vsnprintf(char *str, unsigned int len, const char *format, va_list valist); int MSVCRT_vsnprintf(char *str, unsigned int len, const char *format, va_list valist);
int MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, unsigned int len,
const MSVCRT_wchar_t *format, va_list valist );
#ifndef __WINE_MSVCRT_TEST #ifndef __WINE_MSVCRT_TEST
int _write(int,const void*,unsigned int); int _write(int,const void*,unsigned int);
int _getch(void); int _getch(void);
int _vsnwprintf(MSVCRT_wchar_t*,MSVCRT_size_t,const MSVCRT_wchar_t*,va_list);
int _ismbstrail(const unsigned char* start, const unsigned char* str); int _ismbstrail(const unsigned char* start, const unsigned char* str);
MSVCRT_intptr_t _spawnve(int,const char*,const char* const *,const char* const *); MSVCRT_intptr_t _spawnve(int,const char*,const char* const *,const char* const *);
void _searchenv(const char*,const char*,char*); void _searchenv(const char*,const char*,char*);
@ -626,7 +627,6 @@ char* _strset(char*,int);
int _ungetch(int); int _ungetch(int);
int _cputs(const char*); int _cputs(const char*);
int _cprintf(const char*,...); int _cprintf(const char*,...);
int _snprintf(char*,size_t,const char*,...);
char*** __p__environ(void); char*** __p__environ(void);
int* __p___mb_cur_max(void); int* __p___mb_cur_max(void);
unsigned int* __p__fmode(void); unsigned int* __p__fmode(void);

2
dlls/msvcrt/wcs.c
View File

@ -764,7 +764,7 @@ int MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...)
* _vsnwsprintf (MSVCRT.@) * _vsnwsprintf (MSVCRT.@)
*/ */
int MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, int MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len,
const WCHAR *format, va_list valist ) const MSVCRT_wchar_t *format, va_list valist )
{ {
pf_output out; pf_output out;