DDRAW/tests: don't fail tests on DDERR_NODIRECTDRAWSUPPORT and E_OUTOFMEMORY

Saulius Krasuckas saulius2 at ar.fi.lt
Thu Aug 25 12:05:49 CDT 2005


Log message:
	Saulius Krasuckas <saulius.krasuckas at ieee.org>
	- DirectDrawCreateEx fails with Standard VGA Adapter driver.
	- IDirect3D7::CreateDevice() returns E_OUTOFMEMORY if a card has no 3D acceleration.


Index: dlls/ddraw/tests/d3d.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/tests/d3d.c,v
retrieving revision 1.5
diff -u -r1.5 d3d.c
--- dlls/ddraw/tests/d3d.c	23 Aug 2005 19:59:35 -0000	1.5
+++ dlls/ddraw/tests/d3d.c	25 Aug 2005 16:44:33 -0000
@@ -48,7 +48,11 @@
 
     rc = pDirectDrawCreateEx(NULL, (void**)&lpDD,
         &IID_IDirectDraw7, NULL);
-    ok(rc==DD_OK, "DirectDrawCreateEx returned: %lx\n", rc);
+    ok(rc==DD_OK || rc==DDERR_NODIRECTDRAWSUPPORT, "DirectDrawCreateEx returned: %lx\n", rc);
+    if (!lpDD) {
+        trace("DirectDrawCreateEx() failed with an error %lx\n", rc);
+        return FALSE;
+    }
 
     rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL);
     ok(rc==DD_OK, "SetCooperativeLevel returned: %lx\n", rc);
@@ -67,9 +71,9 @@
 
     rc = IDirect3D7_CreateDevice(lpD3D, &IID_IDirect3DTnLHalDevice, lpDDS,
         &lpD3DDevice);
-    ok(rc==D3D_OK || rc==DDERR_NOPALETTEATTACHED, "CreateDevice returned: %lx\n", rc);
+    ok(rc==D3D_OK || rc==DDERR_NOPALETTEATTACHED || rc==E_OUTOFMEMORY, "CreateDevice returned: %lx\n", rc);
     if (!lpD3DDevice) {
-        trace("IDirect3D7::CreateDevice() failed\n");
+        trace("IDirect3D7::CreateDevice() failed with an error %lx\n", rc);
         return FALSE;
     }
 



More information about the wine-patches mailing list