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

Alexandre Julliard julliard at winehq.org
Wed Mar 11 10:04:40 CDT 2009


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Wed Mar 11 13:52:07 2009 +0100

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

---

 dlls/ddraw/tests/visual.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c
index 7c5e651..9234e59 100644
--- a/dlls/ddraw/tests/visual.c
+++ b/dlls/ddraw/tests/visual.c
@@ -566,7 +566,12 @@ static void offscreen_test(IDirect3DDevice7 *device)
     hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE);
     ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState returned hr = %08x\n", hr);
 
-    if(IDirect3DDevice7_BeginScene(device) == D3D_OK && !refdevice) {
+    if (refdevice) {
+        win_skip("Tests would crash on W2K with a refdevice\n");
+        goto out;
+    }
+
+    if(IDirect3DDevice7_BeginScene(device) == D3D_OK) {
         hr = IDirect3DDevice7_SetRenderTarget(device, offscreen, 0);
         ok(hr == D3D_OK, "SetRenderTarget failed, hr = %08x\n", hr);
         hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0);
@@ -687,6 +692,12 @@ static void alpha_test(IDirect3DDevice7 *device)
 
     hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE);
     ok(hr == D3D_OK, "IDirect3DDevice7_SetRenderState failed, hr = %08x\n", hr);
+
+    if (refdevice) {
+        win_skip("Tests would crash on W2K with a refdevice\n");
+        goto out;
+    }
+
     if(IDirect3DDevice7_BeginScene(device) == D3D_OK) {
 
         /* Draw two quads, one with src alpha blending, one with dest alpha blending. The




More information about the wine-cvs mailing list