>From 518dd7b4002e8ced002f558768e1496966727c02 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Wed, 11 Mar 2009 11:52:40 +0100 Subject: [PATCH] Fix a few test failures on W2K (VMware?) --- dlls/ddraw/tests/visual.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 7c5e651..0255b5e 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -588,6 +588,9 @@ static void offscreen_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "DrawPrimitive failed, hr = %08x\n", hr); IDirect3DDevice7_EndScene(device); + } else { + win_skip("Nothing is drawn, colors won't be checked\n"); + goto out; } /* Center quad - should be white */ @@ -754,6 +757,9 @@ static void alpha_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice7_EndScene failed, hr = %08x\n", hr); + } else { + win_skip("Nothing is drawn, colors won't be checked\n"); + goto out; } color = getPixelColor(device, 160, 360); @@ -1819,7 +1825,10 @@ static void D3D1_ViewportClearTest(void) hr = IDirect3DDevice_EndScene(Direct3DDevice1); ok(hr == D3D_OK, "IDirect3DDevice3_EndScene failed, hr = %08x\n", hr); - } + } else { + win_skip("Nothing is drawn, colors won't be checked\n"); + goto out; + } color = D3D1_getPixelColor(DirectDraw1, Surface1, 5, 5); red = (color & 0x00ff0000) >> 16; @@ -2608,6 +2617,11 @@ static void cubemap_test(IDirect3DDevice7 *device) hr = IDirect3DDevice7_EndScene(device); ok(hr == DD_OK, "IDirect3DDevice7_EndScene returned %08x\n", hr); } + else + { + win_skip("Nothing is drawn, colors won't be checked\n"); + goto out; + } hr = IDirect3DDevice7_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); ok(hr == DD_OK, "IDirect3DDevice7_SetTextureStageState returned %08x\n", hr); @@ -2621,6 +2635,8 @@ static void cubemap_test(IDirect3DDevice7 *device) ok(color == 0x000000ff, "DDSCAPS2_CUBEMAP_POSITIVEZ has color 0x%08x, expected 0x000000ff\n", color); hr = IDirect3DDevice7_SetTexture(device, 0, NULL); ok(hr == DD_OK, "IDirect3DDevice7_SetTexture returned %08x\n", hr); + +out: IDirectDrawSurface7_Release(cubemap); } -- 1.6.0.6