From 39932ced34ae6f98485a07d25d675b2f0a083ba2 Mon Sep 17 00:00:00 2001
From: Maarten Bosma <maarten@bosma.de>
Date: Sun, 13 May 2007 17:58:05 +0000
Subject: [PATCH] Some more CreateSurface Tests (for invaild flags)

svn path=/trunk/; revision=26759
---
 rostests/dxtest/ddraw/tests/CreateDDraw.cpp   |  5 +-
 rostests/dxtest/ddraw/tests/CreateSurface.cpp | 51 ++++++++++++++++++-
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/rostests/dxtest/ddraw/tests/CreateDDraw.cpp b/rostests/dxtest/ddraw/tests/CreateDDraw.cpp
index 84ed4c1169d..ca49258988d 100644
--- a/rostests/dxtest/ddraw/tests/CreateDDraw.cpp
+++ b/rostests/dxtest/ddraw/tests/CreateDDraw.cpp
@@ -13,10 +13,9 @@ BOOL Test_CreateDDraw (INT* passed, INT* failed)
 	TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) == DDERR_INVALIDPARAMS);
 	TEST (DirectDrawCreateEx(NULL, NULL, IID_IDirectDraw7, NULL) == DDERR_INVALIDPARAMS); 
 	TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) == DD_OK);
-	TEST (DirectDraw && DirectDraw->Release());
+	//TEST (DirectDraw && DirectDraw->Release());
 	TEST (DirectDrawCreate(NULL ,&DirectDraw2, NULL) == DD_OK);
-	TEST (DirectDraw2 && DirectDraw2->Release());
-
+	//TEST (DirectDraw2 && DirectDraw2->Release());
 
 	return TRUE;
 }
diff --git a/rostests/dxtest/ddraw/tests/CreateSurface.cpp b/rostests/dxtest/ddraw/tests/CreateSurface.cpp
index dbcf5a1f1d1..bba0a518a38 100644
--- a/rostests/dxtest/ddraw/tests/CreateSurface.cpp
+++ b/rostests/dxtest/ddraw/tests/CreateSurface.cpp
@@ -45,10 +45,57 @@ BOOL Test_CreateSurface (INT* passed, INT* failed)
 	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK );
 	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK );
 
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_3DDEVICE;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_ALLOCONLOAD;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_ALPHA;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS);
+
 	DirectDrawSurface = NULL;
 	Desc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK );
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK );
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_FLIP;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_HWCODEC;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_LIVEVIDEO;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_MIPMAP;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDCAPS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_MODEX;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS);
+
+	DirectDrawSurface = NULL;
+	Desc.ddsCaps.dwCaps = DDSCAPS_MODEX;
+	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DDERR_INVALIDPARAMS);
 
 	DirectDraw->Release();