Commit f1853ba1 authored by Saulius Krasuckas's avatar Saulius Krasuckas Committed by Alexandre Julliard

- DirectDrawCreateEx fails with Standard VGA Adapter driver.

- IDirect3D7::CreateDevice() returns E_OUTOFMEMORY if a card has no 3D acceleration.
parent 33e8e88e
...@@ -48,7 +48,11 @@ static BOOL CreateDirect3D(void) ...@@ -48,7 +48,11 @@ static BOOL CreateDirect3D(void)
rc = pDirectDrawCreateEx(NULL, (void**)&lpDD, rc = pDirectDrawCreateEx(NULL, (void**)&lpDD,
&IID_IDirectDraw7, NULL); &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); rc = IDirectDraw_SetCooperativeLevel(lpDD, NULL, DDSCL_NORMAL);
ok(rc==DD_OK, "SetCooperativeLevel returned: %lx\n", rc); ok(rc==DD_OK, "SetCooperativeLevel returned: %lx\n", rc);
...@@ -67,9 +71,9 @@ static BOOL CreateDirect3D(void) ...@@ -67,9 +71,9 @@ static BOOL CreateDirect3D(void)
rc = IDirect3D7_CreateDevice(lpD3D, &IID_IDirect3DTnLHalDevice, lpDDS, rc = IDirect3D7_CreateDevice(lpD3D, &IID_IDirect3DTnLHalDevice, lpDDS,
&lpD3DDevice); &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) { if (!lpD3DDevice) {
trace("IDirect3D7::CreateDevice() failed\n"); trace("IDirect3D7::CreateDevice() failed with an error %lx\n", rc);
return FALSE; return FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment