From: Francois Gouget fgouget@codeweavers.com
Remove the redundant is_wine variables in the tests. --- dlls/ddraw/tests/ddraw4.c | 3 --- dlls/ddraw/tests/ddraw7.c | 3 --- dlls/user32/tests/win.c | 1 - include/wine/test.h | 14 +++++++++----- 4 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 471f6fc3f09..8347d712400 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18086,7 +18086,6 @@ static void test_surface_format_conversion_alpha(void) DWORD supported_fmts; IDirectDraw4 *ddraw; ULONG refcount; - BOOL is_wine; HWND window; BOOL passed; HRESULT hr; @@ -18108,8 +18107,6 @@ static void test_surface_format_conversion_alpha(void) &supported_fmts); ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr);
- is_wine = !strcmp(winetest_platform, "wine"); - memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 15ab548ebc6..03a2bb408a2 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18106,7 +18106,6 @@ static void test_surface_format_conversion_alpha(void) DWORD supported_fmts; IDirectDraw7 *ddraw; ULONG refcount; - BOOL is_wine; HWND window; BOOL passed; HRESULT hr; @@ -18128,8 +18127,6 @@ static void test_surface_format_conversion_alpha(void) &supported_fmts); ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr);
- is_wine = !strcmp(winetest_platform, "wine"); - memset(&surface_desc, 0, sizeof(surface_desc)); surface_desc.dwSize = sizeof(surface_desc); surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 4c2af09d0c6..c2765a8810c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -11611,7 +11611,6 @@ static void reset_window_state(HWND *state, int n) static void test_topmost(void) { HWND owner, hwnd, hwnd2, hwnd_child, hwnd_child2, hwnd_grandchild, state[6] = { 0 }; - BOOL is_wine = !strcmp(winetest_platform, "wine");
owner = create_tool_window(WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE, 0); diff --git a/include/wine/test.h b/include/wine/test.h index 1690c5613d8..0d9e4d52267 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -52,6 +52,7 @@ extern int winetest_mute_threshold;
/* current platform */ extern const char *winetest_platform; +extern int is_windows, is_wine;
extern void winetest_set_location( const char* file, int line ); extern void winetest_subtest( const char* name ); @@ -114,8 +115,8 @@ extern void winetest_pop_context(void); #define todo_if(is_todo) for (winetest_start_todo(is_todo); \ winetest_loop_todo(); \ winetest_end_todo()) -#define todo_wine todo_if(!strcmp(winetest_platform, "wine")) -#define todo_wine_if(is_todo) todo_if((is_todo) && !strcmp(winetest_platform, "wine")) +#define todo_wine todo_if(is_wine) +#define todo_wine_if(is_todo) todo_if((is_todo) && is_wine)
#ifndef ARRAY_SIZE @@ -193,6 +194,7 @@ int winetest_interactive = 0;
/* current platform */ const char *winetest_platform = "windows"; +int is_windows, is_wine;
/* report successful tests (BOOL) */ int winetest_report_success = 0; @@ -321,7 +323,7 @@ void winetest_ignore_exceptions( BOOL ignore )
int broken( int condition ) { - return (strcmp(winetest_platform, "windows") == 0) && condition; + return is_windows && condition; }
static LONG winetest_add_line( void ) @@ -463,7 +465,7 @@ void winetest_win_skip( const char *msg, ... ) { va_list valist; va_start(valist, msg); - if (strcmp(winetest_platform, "windows") == 0) + if (is_windows) winetest_vskip(msg, valist); else winetest_vok(0, msg, valist); @@ -676,6 +678,8 @@ int main( int argc, char **argv ) winetest_platform = strdup(p); else if (running_under_wine()) winetest_platform = "wine"; + is_windows = !strcmp( winetest_platform, "windows" ); + is_wine = !strcmp( winetest_platform, "wine" );
if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) winetest_color = !strcasecmp(p, "auto") ? isatty(fileno(stdout)) : atoi(p); @@ -685,7 +689,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); winetest_last_time = winetest_start_time = GetTickCount();
- if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); + if (is_windows) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX );
if (!argv[1])