From: Rémi Bernon rbernon@codeweavers.com
--- programs/winetest/main.c | 1 + programs/winetest/util.c | 8 +++----- programs/winetest/winetest.h | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 997f35b8fa0..bd4744557dc 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -68,6 +68,7 @@ static char build_id[64]; static BOOL is_wow64; static int failures; static int quiet_mode; +static HANDLE logfile;
/* filters for running only specific tests */ static char **filters; diff --git a/programs/winetest/util.c b/programs/winetest/util.c index 07ab74d7996..17313c4115f 100644 --- a/programs/winetest/util.c +++ b/programs/winetest/util.c @@ -25,8 +25,6 @@
#include "winetest.h"
-HANDLE logfile = 0; - void *xalloc (size_t len) { void *p = malloc( len ); @@ -90,8 +88,8 @@ char *WINAPIV strmake( size_t *len, const char *fmt, ... ) return p; }
-void WINAPIV xprintf( const char *fmt, ... ) __WINE_PRINTF_ATTR(1,2); -void WINAPIV xprintf( const char *fmt, ... ) +void WINAPIV output( HANDLE file, const char *fmt, ... ) __WINE_PRINTF_ATTR(2,3); +void WINAPIV output( HANDLE file, const char *fmt, ... ) { va_list ap; size_t size; @@ -103,7 +101,7 @@ void WINAPIV xprintf( const char *fmt, ... ) head = buffer; va_end (ap); while (size) { - if (!WriteFile( logfile, head, size, &written, NULL )) + if (!WriteFile( file, head, size, &written, NULL )) report (R_FATAL, "Can't write logs: %u", GetLastError()); head += written; size -= written; diff --git a/programs/winetest/winetest.h b/programs/winetest/winetest.h index ca7337ea3e0..8fb93e93dbb 100644 --- a/programs/winetest/winetest.h +++ b/programs/winetest/winetest.h @@ -27,8 +27,8 @@ #include <stdarg.h> #include "wine/debug.h"
-extern HANDLE logfile; -extern void WINAPIV xprintf( const char *fmt, ... ) __WINE_PRINTF_ATTR(1,2); +#define xprintf( fmt, ... ) output( logfile, fmt, ## __VA_ARGS__ ) +extern void WINAPIV output( HANDLE file, const char *fmt, ... ) __WINE_PRINTF_ATTR(2,3); extern char *WINAPIV strmake( size_t *len, const char *fmt, ... ) __WINE_PRINTF_ATTR(2,3);
void fatal (const char* msg);