Alexandre Julliard : msvcrt: Use the msvcrt version of printf
everywhere.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jan 24 06:45:23 CST 2006
Module: wine
Branch: refs/heads/master
Commit: a17b2c1cd2551eaf001d7df07c5121ebea5d3146
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a17b2c1cd2551eaf001d7df07c5121ebea5d3146
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jan 24 12:21:58 2006 +0100
msvcrt: Use the msvcrt version of printf everywhere.
---
dlls/msvcrt/console.c | 2 +-
dlls/msvcrt/file.c | 2 +-
dlls/msvcrt/msvcrt.h | 4 ++--
dlls/msvcrt/wcs.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c
index aeb4d75..718e980 100644
--- a/dlls/msvcrt/console.c
+++ b/dlls/msvcrt/console.c
@@ -254,7 +254,7 @@ int _cprintf(const char* format, ...)
* Return the number of bytes that would have been written
* 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)
{
resize = (written == -1 ? resize * 2 : written + 1);
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 1f751f8..b6897b2 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -2908,7 +2908,7 @@ int MSVCRT_vfwprintf(MSVCRT_FILE* file,
MSVCRT_wchar_t buf[2048], *mem = buf;
int written, resize = sizeof(buf) / sizeof(MSVCRT_wchar_t), retval;
/* See vfprintf comments */
- while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 ||
+ while ((written = MSVCRT_vsnwprintf(mem, resize, format, valist)) == -1 ||
written > resize)
{
resize = (written == -1 ? resize * 2 : written + sizeof(MSVCRT_wchar_t));
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 0ac0758..3e00480 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -611,11 +611,12 @@ double MSVCRT_difftime(MSVCRT_ti
MSVCRT_time_t MSVCRT_time(MSVCRT_time_t*);
MSVCRT_FILE* MSVCRT__fdopen(int, const char *);
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
int _write(int,const void*,unsigned int);
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);
MSVCRT_intptr_t _spawnve(int,const char*,const char* const *,const char* const *);
void _searchenv(const char*,const char*,char*);
@@ -626,7 +627,6 @@ char* _strset(char*,int);
int _ungetch(int);
int _cputs(const char*);
int _cprintf(const char*,...);
-int _snprintf(char*,size_t,const char*,...);
char*** __p__environ(void);
int* __p___mb_cur_max(void);
unsigned int* __p__fmode(void);
diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c
index 992185d..9c35c46 100644
--- a/dlls/msvcrt/wcs.c
+++ b/dlls/msvcrt/wcs.c
@@ -764,7 +764,7 @@ int MSVCRT__snprintf(char *str, unsigned
* _vsnwsprintf (MSVCRT.@)
*/
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;
More information about the wine-cvs
mailing list