Paul Vriens : ddrawex/tests: Don't crash on some Win98/WinMe boxes.

Alexandre Julliard julliard at winehq.org
Wed Mar 31 10:04:49 CDT 2010


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

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Tue Mar 30 19:44:59 2010 +0200

ddrawex/tests: Don't crash on some Win98/WinMe boxes.

---

 dlls/ddrawex/tests/surface.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/dlls/ddrawex/tests/surface.c b/dlls/ddrawex/tests/surface.c
index d5a26b5..d5d347b 100644
--- a/dlls/ddrawex/tests/surface.c
+++ b/dlls/ddrawex/tests/surface.c
@@ -261,6 +261,11 @@ static void test_surface_from_dc3(void)
     ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
 
     hr = IDirectDraw3_CreateSurface(dd3, &ddsd, &surf1, NULL);
+    if (hr == DDERR_UNSUPPORTEDMODE) {
+        win_skip("Unsupported mode\n");
+        IDirectDraw3_Release(dd3);
+        return;
+    }
     ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr);
 
     hr = IDirectDrawSurface3_QueryInterface(surf1, &IID_IDirectDrawSurface, (void **)&surf3);
@@ -323,6 +328,11 @@ static void test_surface_from_dc4(void)
     ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
 
     hr = IDirectDraw4_CreateSurface(dd4, &ddsd2, &surf4, NULL);
+    if (hr == DDERR_UNSUPPORTEDMODE) {
+        win_skip("Unsupported mode\n");
+        IDirectDraw3_Release(dd4);
+        return;
+    }
     ok(SUCCEEDED(hr), "CreateSurface failed, hr %#x.\n", hr);
 
     hr = IDirectDrawSurface4_QueryInterface(surf4, &IID_IDirectDrawSurface, (void **)&surf1);




More information about the wine-cvs mailing list