Alexandre Julliard : d3d9/tests: Skip CheckDeviceMultiSampleType test if not available.

Alexandre Julliard julliard at winehq.org
Mon Jun 1 10:01:03 CDT 2009


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Mon Jun  1 14:07:39 2009 +0200

d3d9/tests: Skip CheckDeviceMultiSampleType test if not available.

---

 dlls/d3d9/tests/device.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index f1d3595..5610a71 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -172,7 +172,12 @@ static void test_checkdevicemultisampletype(void)
 
     hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, TRUE,
     D3DMULTISAMPLE_NONE, &qualityLevels);
-    ok(SUCCEEDED(hr), "CheckDeviceMultiSampleType failed with (%08x)\n", hr);
+    ok(SUCCEEDED(hr) || hr == D3DERR_NOTAVAILABLE, "CheckDeviceMultiSampleType failed with (%08x)\n", hr);
+    if(hr == D3DERR_NOTAVAILABLE)
+    {
+        skip("IDirect3D9_CheckDeviceMultiSampleType not available\n");
+        goto cleanup;
+    }
     ok(qualityLevels == 1,"qualitylevel is not 1 but %d\n",qualityLevels);
 
     hr = IDirect3D9_CheckDeviceMultiSampleType(pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, FALSE,




More information about the wine-cvs mailing list