- DirectDrawCreateEx fails with Standard VGA Adapter driver.

- IDirect3D7::CreateDevice() returns E_OUTOFMEMORY if a card has no 3D acceleration.

- DirectDrawCreateEx fails with Standard VGA Adapter driver.
f1853ba1 · Saulius Krasuckas · Alexandre Julliard · 33e8e88e · f1853ba1
Commit f1853ba1 authored Aug 25, 2005 by Saulius Krasuckas Committed by Alexandre Julliard Aug 25, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

d3d.c dlls/ddraw/tests/d3d.c +7 -3

No files found.
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -48,7 +48,11 @@ static BOOL CreateDirect3D(void)

    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 @@ static BOOL CreateDirect3D(void)

    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;
    }