debug.h, test.h: Temporary add ifdefs around some printfs to avoid format.
This commit is contained in:
parent
f8b8f216dd
commit
705b5a00c5
|
@ -196,19 +196,32 @@ static inline const char *wine_dbgstr_guid( const GUID *id )
|
||||||
static inline const char *wine_dbgstr_point( const POINT *pt )
|
static inline const char *wine_dbgstr_point( const POINT *pt )
|
||||||
{
|
{
|
||||||
if (!pt) return "(null)";
|
if (!pt) return "(null)";
|
||||||
|
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
|
||||||
return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y );
|
return wine_dbg_sprintf( "(%ld,%ld)", pt->x, pt->y );
|
||||||
|
#else
|
||||||
|
return wine_dbg_sprintf( "(%d,%d)", pt->x, pt->y );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline const char *wine_dbgstr_size( const SIZE *size )
|
static inline const char *wine_dbgstr_size( const SIZE *size )
|
||||||
{
|
{
|
||||||
if (!size) return "(null)";
|
if (!size) return "(null)";
|
||||||
|
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
|
||||||
return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy );
|
return wine_dbg_sprintf( "(%ld,%ld)", size->cx, size->cy );
|
||||||
|
#else
|
||||||
|
return wine_dbg_sprintf( "(%d,%d)", size->cx, size->cy );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline const char *wine_dbgstr_rect( const RECT *rect )
|
static inline const char *wine_dbgstr_rect( const RECT *rect )
|
||||||
{
|
{
|
||||||
if (!rect) return "(null)";
|
if (!rect) return "(null)";
|
||||||
|
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
|
||||||
return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom );
|
return wine_dbg_sprintf( "(%ld,%ld)-(%ld,%ld)", rect->left, rect->top, rect->right, rect->bottom );
|
||||||
|
#else
|
||||||
|
return wine_dbg_sprintf( "(%d,%d)-(%d,%d)", rect->left, rect->top,
|
||||||
|
rect->right, rect->bottom );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline const char *wine_dbgstr_longlong( ULONGLONG ll )
|
static inline const char *wine_dbgstr_longlong( ULONGLONG ll )
|
||||||
|
|
|
@ -371,7 +371,11 @@ static int run_test( const char *name )
|
||||||
|
|
||||||
if (winetest_debug)
|
if (winetest_debug)
|
||||||
{
|
{
|
||||||
|
#if defined(WINE_NO_LONG_AS_INT) && !defined(_WIN64)
|
||||||
fprintf( stdout, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n",
|
fprintf( stdout, "%s: %ld tests executed, %ld marked as todo, %ld %s.\n",
|
||||||
|
#else
|
||||||
|
fprintf( stdout, "%s: %d tests executed, %d marked as todo, %d %s.\n",
|
||||||
|
#endif
|
||||||
name, successes + failures + todo_successes + todo_failures,
|
name, successes + failures + todo_successes + todo_failures,
|
||||||
todo_successes, failures + todo_failures,
|
todo_successes, failures + todo_failures,
|
||||||
(failures + todo_failures != 1) ? "failures" : "failure" );
|
(failures + todo_failures != 1) ? "failures" : "failure" );
|
||||||
|
|
Loading…
Reference in New Issue