From f1853ba1864c507e28b5682155f70e2c6129f63d Mon Sep 17 00:00:00 2001 From: Saulius Krasuckas Date: Thu, 25 Aug 2005 19:19:46 +0000 Subject: [PATCH] - DirectDrawCreateEx fails with Standard VGA Adapter driver. - IDirect3D7::CreateDevice() returns E_OUTOFMEMORY if a card has no 3D acceleration. --- dlls/ddraw/tests/d3d.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9d026bf02ad..00d84d6b923 100644 --- 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; } -- 2.11.4.GIT