Paul Vriens : ddraw/tests: Fix some test failures on WinME/VMware.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ddd255cb0898b706edb6c4100c348f99384be9d9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ddd255cb0898b706edb6c4100c...

Author: Paul Vriens 
Date:   Thu Oct  8 10:40:31 2009 +0200

ddraw/tests: Fix some test failures on WinME/VMware.

---

dlls/ddraw/tests/visual.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c
index 3a29151..450d231 100644
--- a/dlls/ddraw/tests/visual.c
+++ b/dlls/ddraw/tests/visual.c
@@ -2294,7 +2294,8 @@ static void p8_primary_test(void)
     U1(ddsd.ddpfPixelFormat).dwRGBBitCount      = 8;
     hr = IDirectDraw_CreateSurface(DirectDraw1, &ddsd, &offscreen, NULL);
     ok(hr == DD_OK ||
-       broken(hr == DDERR_INVALIDPIXELFORMAT), /* VMware */
+       broken(hr == DDERR_INVALIDPIXELFORMAT) || /* VMware */
+       broken(hr == DDERR_NODIRECTDRAWHW), /* VMware */
        "IDirectDraw_CreateSurface returned %08x\n", hr);
     if (FAILED(hr)) goto out;

@@ -2614,7 +2615,7 @@ static void cubemap_test(IDirect3DDevice7 *device)
     if(SUCCEEDED(hr))
     {
         hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEX1, quad + 0 * 6, 4, 0);
-        if (hr == E_NOTIMPL)
+        if (hr == DDERR_UNSUPPORTED || hr == DDERR_NODIRECTDRAWHW)
         {
             /* VMware */
             win_skip("IDirect3DDevice7_DrawPrimitive is not completely implemented, colors won't be tested\n");