James Hawkins : d3d8: Fix a few test failures in win2k3.

[Alexandre Julliard]

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

Author: James Hawkins 
Date:   Thu Apr 24 20:36:04 2008 -0500

d3d8: Fix a few test failures in win2k3.

---

dlls/d3d8/tests/device.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 8617c0c..9ce967a 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -1174,7 +1174,8 @@ static void test_lights(void)

hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
                                   D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device );
-    ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
+    ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL,
+       "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
     if(!device)
     {
         skip("Failed to create a d3d device\n");
@@ -1252,7 +1253,8 @@ static void test_render_zero_triangles(void)

hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd,
                                   D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &d3dpp, &device );
-    ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
+    ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL,
+       "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
     if(!device)
     {
         skip("Failed to create a d3d device\n");
@@ -1302,7 +1304,8 @@ static void test_set_material(void)

hr = IDirect3D8_CreateDevice( d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hwnd,
                                   D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE, &present_parameters, &device );
-    ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
+    ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE || hr == D3DERR_INVALIDCALL,
+       "IDirect3D8_CreateDevice failed with %s\n", DXGetErrorString8(hr));
     if(!device)
     {
         skip("Failed to create a d3d device\n");