Module: wine Branch: master Commit: 27f52727e406b8b9ceb32d33342272d061dd82f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27f52727e406b8b9ceb32d3334...
Author: Paul Vriens Paul.Vriens.Wine@gmail.com Date: Fri Mar 13 14:30:32 2009 +0100
ddraw/tests: Fix two test failures on W2K/VMware.
---
dlls/ddraw/tests/visual.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index fa96e5a..ec6ea13 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -834,7 +834,9 @@ static void rhw_zero_test(IDirect3DDevice7 *device) }
color = getPixelColor(device, 5, 5); - ok(color == 0xffffff, "Got color %08x, expected 00ffffff\n", color); + ok(color == 0xffffff || + broken(color == 0), /* VMware */ + "Got color %08x, expected 00ffffff\n", color);
color = getPixelColor(device, 105, 105); ok(color == 0, "Got color %08x, expected 00000000\n", color); @@ -2289,7 +2291,9 @@ static void p8_primary_test(void) ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 8; hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &offscreen, NULL); - ok(hr == DD_OK, "IDirectDraw_CreateSurface returned %08x\n", hr); + ok(hr == DD_OK || + broken(hr == DDERR_INVALIDPIXELFORMAT), /* VMware */ + "IDirectDraw_CreateSurface returned %08x\n", hr); if (FAILED(hr)) goto out;
memset(entries, 0, sizeof(entries));