From 8c9302e2aafe308275ddb80262b9bcb75ef51e34 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Fri, 8 Jun 2007 20:30:07 +0000 Subject: [PATCH] last testcase for getavailmemory svn path=/trunk/; revision=27080 --- rostests/dxtest/ddraw/tests/CreateDDraw.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rostests/dxtest/ddraw/tests/CreateDDraw.cpp b/rostests/dxtest/ddraw/tests/CreateDDraw.cpp index 302636eda0b..43af1830f64 100644 --- a/rostests/dxtest/ddraw/tests/CreateDDraw.cpp +++ b/rostests/dxtest/ddraw/tests/CreateDDraw.cpp @@ -332,22 +332,18 @@ BOOL Test_GetAvailableVidMem (INT* passed, INT* failed) Caps.dwCaps2 = DDSCAPS2_ADDITIONALPRIMARY; TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - // FIXME memset(&Caps,0,sizeof(DDSCAPS2)); - Caps.dwCaps3 = 0; - TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); - - - /* dwCaps does not accpect any input param */ + Caps.dwCaps3 = ~(DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); + TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS); + memset(&Caps,0,sizeof(DDSCAPS2)); + Caps.dwCaps3 = (DDSCAPS3_MULTISAMPLE_QUALITY_MASK | DDSCAPS3_MULTISAMPLE_MASK | DDSCAPS3_RESERVED1 | DDSCAPS3_RESERVED2 | DDSCAPS3_LIGHTWEIGHTMIPMAP | DDSCAPS3_AUTOGENMIPMAP | DDSCAPS3_DMAP); TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK); memset(&Caps,0,sizeof(DDSCAPS2)); Caps.dwCaps4 = 1; TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DDERR_INVALIDCAPS ); - DirectDraw->Release(); return TRUE;