[ros-diffs] [mbosma] 27112: Some more movement.

Author: mbosma
Date: Sun Jun 10 15:50:56 2007
New Revision: 27112

URL: http://svn.reactos.org/svn/reactos?rev=27112&view=rev
Log:
Some more movement.

Added:
    trunk/rostests/dxtest/ddraw/DDraw/create.cpp
      - copied unchanged from r27110, trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp
    trunk/rostests/dxtest/ddraw/DDraw/display_modes.cpp
      - copied unchanged from r27110, trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp
    trunk/rostests/dxtest/ddraw/Surface/create.cpp
      - copied unchanged from r27110, trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp
Removed:
    trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp
    trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp
    trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp
Modified:
    trunk/rostests/dxtest/ddraw/testlist.cpp

Removed: trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/Create…
==============================================================================
--- trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp (original)
+++ trunk/rostests/dxtest/ddraw/DDraw/CreateDDraw.cpp (removed)
@@ -1,423 +1,0 @@
-#include "ddrawtest.h"
-
-HWND CreateBasicWindow (VOID);
-
-BOOL Test_CreateDDraw (INT* passed, INT* failed)
-{
-	LPDIRECTDRAW7 DirectDraw;
-	IDirectDraw* DirectDraw2;
-
-	/*** FIXME: Test first parameter using EnumDisplayDrivers  ***/
-	DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL);
-
-	TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7,
(IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION);
-	TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw4, NULL) ==
DDERR_INVALIDPARAMS);
-	TEST (DirectDrawCreateEx(NULL, NULL, IID_IDirectDraw7, NULL) == DDERR_INVALIDPARAMS); 
-
-	DirectDraw = NULL;
-	TEST (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) ==
DD_OK);
-	if(DirectDraw)
-	{
-		TEST (DirectDraw->Initialize(NULL) == DDERR_ALREADYINITIALIZED);
-		TEST (DirectDraw->Release() == 0);
-	}
-
-	DirectDraw2 = NULL;
-	TEST (DirectDrawCreate(NULL ,&DirectDraw2, NULL) == DD_OK);
-	if(DirectDraw2)
-	{
-		TEST (DirectDraw2->QueryInterface(IID_IDirectDraw7, (PVOID*)&DirectDraw) == 0);
-		TEST (DirectDraw2->AddRef() == 2);
-		TEST (DirectDraw->AddRef() == 2);
-		TEST (DirectDraw->Release() == 1);
-		TEST (DirectDraw->Release() == 0);
-		TEST (DirectDraw2->Release() == 1);
-		TEST (DirectDraw2->Release() == 0);
-	}
-
-	return TRUE;
-}
-
-BOOL Test_SetCooperativeLevel (INT* passed, INT* failed)
-{
-	HWND hwnd;
-	LPDIRECTDRAW7 DirectDraw;
-
-	/* Preparations */
-	if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK)
-	{
-		printf("ERROR: Failed to set up ddraw\n");
-		return FALSE;
-	}
-
-	if(!( hwnd = CreateBasicWindow() ))
-	{
-		printf("ERROR: Failed to create window\n");
-		DirectDraw->Release();
-		return FALSE;
-	}
-
-	/* The Test */
-	TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN) ==
DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) ==
DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ==
DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN) ==
DDERR_INVALIDPARAMS);
-	TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL | DDSCL_ALLOWMODEX) ==
DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->SetCooperativeLevel ((HWND)0xdeadbeef, DDSCL_NORMAL) ==
DDERR_INVALIDPARAMS);
-
-	TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE) ==
DD_OK);
-	TEST ( DirectDraw->Compact() == DD_OK );
-	TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_FULLSCREEN | DDSCL_EXCLUSIVE |
DDSCL_ALLOWMODEX) == DD_OK);
-	TEST ( DirectDraw->SetCooperativeLevel (NULL, DDSCL_NORMAL) == DD_OK );
-	TEST ( DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) == DD_OK );
-	TEST ( DirectDraw->Compact() == DDERR_NOEXCLUSIVEMODE );
-
-	TEST ( DirectDraw->TestCooperativeLevel() == DD_OK ); // I do not get what this API
does it always seems to return DD_OK
-
-	DirectDraw->Release();
-
-	return TRUE;
-}
-
-BOOL Test_GetAvailableVidMem (INT* passed, INT* failed)
-{
-	LPDIRECTDRAW7 DirectDraw;
-
-	/* Preparations */
-	if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK)
-	{
-		printf("ERROR: Failed to set up ddraw\n");
-		return FALSE;
-	}
-
-	/* Here we go */
-	DWORD Total, Free;
-	DDSCAPS2 Caps = { 0 };
-
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, NULL, NULL) == DDERR_INVALIDPARAMS);
-	TEST (DirectDraw->GetAvailableVidMem(NULL, &Total, &Free) ==
DDERR_INVALIDPARAMS);
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-
-    /* testing caps */
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_RESERVED1;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_ALPHA;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_BACKBUFFER;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_COMPLEX;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_FLIP;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_FRONTBUFFER;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_OVERLAY;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_PALETTE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_RESERVED3;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_SYSTEMMEMORY;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_TEXTURE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_3DDEVICE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_VIDEOMEMORY;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_VISIBLE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_WRITEONLY;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_ZBUFFER;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_OWNDC;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDPARAMS );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_LIVEVIDEO;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_HWCODEC;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_MODEX;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_MIPMAP;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_RESERVED2;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_ALLOCONLOAD;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_VIDEOPORT;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK );
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_LOCALVIDMEM;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps = DDSCAPS_NONLOCALVIDMEM;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = 0x01;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) ==
DDERR_INVALIDCAPS);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_RESERVED4;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_HINTDYNAMIC;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_HINTSTATIC;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_TEXTUREMANAGE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_RESERVED1;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_RESERVED2;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_OPAQUE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_HINTANTIALIASING;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_CUBEMAP;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEX;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEX;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEY;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEY;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_CUBEMAP_POSITIVEZ;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_CUBEMAP_NEGATIVEZ;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_D3DTEXTUREMANAGE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_DONOTPERSIST;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_STEREOSURFACELEFT;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_VOLUME;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_NOTUSERLOCKABLE;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_POINTS;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 =  DDSCAPS2_RTPATCHES;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_NPATCHES;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_RESERVED3;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_DISCARDBACKBUFFER;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_ENABLEALPHACHANNEL;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_EXTENDEDFORMATPRIMARY;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	memset(&Caps,0,sizeof(DDSCAPS2));
-	Caps.dwCaps2 = DDSCAPS2_ADDITIONALPRIMARY;
-	TEST (DirectDraw->GetAvailableVidMem(&Caps, &Total, &Free) == DD_OK);
-
-	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) ==
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;
-}
-
-BOOL Test_GetFourCCCodes (INT* passed, INT* failed)
-{
-	LPDIRECTDRAW7 DirectDraw;
-
-	/* Preparations */
-	if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK)
-	{
-		printf("ERROR: Failed to set up ddraw\n");
-		return FALSE;
-	}
-
-	/* Here we go */
-	DWORD dwNumCodes, *lpCodes;
-	TEST (DirectDraw->GetFourCCCodes(NULL, (PDWORD)0xdeadbeef) == DDERR_INVALIDPARAMS);
-
-	TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, NULL) == DD_OK &&
dwNumCodes);
-	lpCodes = (PDWORD)HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD)*dwNumCodes);
-	*lpCodes = 0;
-	TEST ( DirectDraw->GetFourCCCodes(NULL, lpCodes) == DDERR_INVALIDPARAMS );
-	TEST (DirectDraw->GetFourCCCodes(&dwNumCodes, lpCodes) == DD_OK &&
*lpCodes );
-
-	DirectDraw->Release();
-
-	return TRUE;
-}
-
-BOOL Test_GetDeviceIdentifier (INT* passed, INT* failed)
-{
-	LPDIRECTDRAW7 DirectDraw;
-	DDDEVICEIDENTIFIER2 pDDDI;
-	//OLECHAR GuidStr[100];
-
-
-
-	/* Preparations */
-	if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK)
-	{
-		printf("ERROR: Failed to set up ddraw\n");
-		return FALSE;
-	}
-
-	TEST ( DirectDraw->GetDeviceIdentifier(NULL, 0) == DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->GetDeviceIdentifier(NULL, ~DDGDI_GETHOSTIDENTIFIER) ==
DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->GetDeviceIdentifier(NULL, DDGDI_GETHOSTIDENTIFIER) ==
DDERR_INVALIDPARAMS );
-
-
-	memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2));
-	TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, 0) == DD_OK );
-
-/*
-    StringFromGUID2(pDDDI.guidDeviceIdentifier, GuidStr, 100);
-    printf("1. \n");
-    printf("szDriver : %s\n",pDDDI.szDriver);
-    printf("szDescription : %s\n",pDDDI.szDescription);
-    printf("liDriverVersion : 0x%08x . 0x%08x\n",
pDDDI.liDriverVersion.HighPart, pDDDI.liDriverVersion.LowPart);
-    printf("dwVendorId : 0x%08x\n",pDDDI.dwVendorId);
-    printf("dwDeviceId : 0x%08x\n",pDDDI.dwDeviceId);
-    printf("dwSubSysId : 0x%08x\n",pDDDI.dwSubSysId);
-    printf("dwRevision : 0x%08x\n",pDDDI.dwRevision);
-    printf("guidDeviceIdentifier : %ls\n",GuidStr);
-    printf("dwWHQLLevel : 0x%08x\n",pDDDI.dwWHQLLevel);
-*/
-
-	memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2));
-	TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, DDGDI_GETHOSTIDENTIFIER) == DD_OK
);
-	memset(&pDDDI,0,sizeof(DDDEVICEIDENTIFIER2));
-	TEST ( DirectDraw->GetDeviceIdentifier(&pDDDI, ~DDGDI_GETHOSTIDENTIFIER) ==
DDERR_INVALIDPARAMS );
-
-	DirectDraw->Release();
-
-	return TRUE;
-}

Removed: trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/Create…
==============================================================================
--- trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp (original)
+++ trunk/rostests/dxtest/ddraw/DDraw/CreateSurface.cpp (removed)
@@ -1,210 +1,0 @@
-HWND CreateBasicWindow (VOID);
- 
-BOOL Test_CreateSurface (INT* passed, INT* failed)
-{
-	LPDIRECTDRAW7 DirectDraw;
-	LPDIRECTDRAWSURFACE7 DirectDrawSurface = NULL;
-	HWND hwnd;
- 
-	/* Preparations */
-	if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK)
-	{
-		printf("ERROR: Failed to set up ddraw\n");
-		return FALSE;
-	}
- 
-	if(!( hwnd = CreateBasicWindow() ))
-	{
-		printf("ERROR: Failed to create window\n");
-		DirectDraw->Release();
-		return FALSE;
-	}
- 
-	if (DirectDraw->SetCooperativeLevel (hwnd, DDSCL_NORMAL) != DD_OK)
-	{
-		printf("ERROR: Could not set cooperative level\n");
-		DirectDraw->Release();
-		return 0;
-	}
- 
-	/* The Test */
- 
-	DDSURFACEDESC2 Desc = { 0 };
- 
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface,
(IUnknown*)0xdeadbeef) == CLASS_E_NOAGGREGATION );
-	TEST ( DirectDraw->CreateSurface(NULL, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->CreateSurface(&Desc, NULL, NULL) == DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS );
- 
-	Desc.dwHeight = 200;
-	Desc.dwWidth = 200;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.dwSize = sizeof (DDSURFACEDESC2);
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_3DDEVICE;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_ALLOCONLOAD;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_ALPHA;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_BACKBUFFER;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_FLIP;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_FRONTBUFFER;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_HWCODEC;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_LIVEVIDEO;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_MIPMAP;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_MODEX;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_NONLOCALVIDMEM;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == DD_OK );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_OPTIMIZED;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_OVERLAY;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-#if 0
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
-#endif
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_OWNDC;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_UNSUPPORTED);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_PALETTE;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK
);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_STANDARDVGAMODE;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	DirectDrawSurface = NULL;
-	Desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
-	Desc.dwFlags = DDSD_CAPS;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK
);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_VIDEOMEMORY;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_VIDEOPORT;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) == DD_OK);
-	TEST ( DirectDrawSurface && DirectDrawSurface->Release() == 0 );
-	DirectDrawSurface = NULL;
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_VISIBLE;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS;
-	Desc.ddsCaps.dwCaps = DDSCAPS_WRITEONLY;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDCAPS);
- 
-	Desc.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
-	Desc.ddsCaps.dwCaps = DDSCAPS_ZBUFFER;
-	TEST ( DirectDraw->CreateSurface(&Desc, &DirectDrawSurface, NULL) ==
DDERR_INVALIDPARAMS);
- 
-	DirectDraw->Release();
- 
-	return TRUE;
-}

Removed: trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/DDraw/Displa…
==============================================================================
--- trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp (original)
+++ trunk/rostests/dxtest/ddraw/DDraw/DisplayModes.cpp (removed)
@@ -1,131 +1,0 @@
-typedef struct
-{
-	INT* passed;
-	INT* failed;
-	LPDIRECTDRAW7 DirectDraw;
-} ENUMCONTEXT;
-
-HRESULT CALLBACK DummyEnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context )
-{
-	return DDENUMRET_OK;
-}
-
-HRESULT CALLBACK EnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context )
-{
-	static int setcout = 0;
-	if(setcout >= 5)
-		return DDENUMRET_OK;
-
-	DWORD lpdwFrequency = 0; 
-	INT* passed = Context->passed;
-	INT* failed = Context->failed;
-	DDSURFACEDESC2 DisplayMode = {0};
-	DisplayMode.dwSize = sizeof(DDSURFACEDESC2);
-
-	TEST ( pDDSD->dwFlags == DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT |
DDSD_REFRESHRATE);
-	TEST ( pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB | DDPF_PALETTEINDEXED8 ||
pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB );
-	TEST ( Context->DirectDraw->SetDisplayMode (pDDSD->dwWidth, pDDSD->dwHeight,
pDDSD->ddpfPixelFormat.dwRGBBitCount, pDDSD->dwRefreshRate, 0) == DD_OK);
-	TEST ( Context->DirectDraw->GetMonitorFrequency (&lpdwFrequency) == DD_OK
&& lpdwFrequency == pDDSD->dwRefreshRate);
-	TEST ( Context->DirectDraw->GetDisplayMode (&DisplayMode) == DD_OK
-		&& pDDSD->dwHeight == DisplayMode.dwHeight 
-		&& pDDSD->dwWidth == DisplayMode.dwWidth 
-		&& pDDSD->dwRefreshRate == DisplayMode.dwRefreshRate
-		&& pDDSD->ddpfPixelFormat.dwRGBBitCount ==
DisplayMode.ddpfPixelFormat.dwRGBBitCount 
-		&& DisplayMode.dwFlags == DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH |
DDSD_PIXELFORMAT | DDSD_REFRESHRATE );
-	
-	setcout++;
-	return DDENUMRET_OK;
-}
-
-BOOL Test_DisplayModes (INT* passed, INT* failed)
-{
-	/*** FIXME: Also test with surface as parameter; try busy/locked surface as well ***/
-	LPDIRECTDRAW7 DirectDraw;
-
-	/* Preparations */
-	if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK)
-	{
-		printf("ERROR: Failed to set up ddraw\n");
-		return FALSE;
-	}
-
-	ENUMCONTEXT Context = {passed, failed, DirectDraw};
-
-	/* The Test */
-
-	/* First try with some generic display modes */
-	TEST ( DirectDraw->SetDisplayMode (1586, 895, 0, 0, 0) == DDERR_UNSUPPORTED );
-	TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0x123) == DDERR_INVALIDPARAMS );
-
-	// does this change the display mode to DDSCL_EXCLUSIVE ?
-	TEST ( DirectDraw->SetDisplayMode (0, 0, 0, 0, 0) == DD_OK );
-	TEST ( DirectDraw->SetDisplayMode (800, 600, 0, 0, 0) == DD_OK );
-	TEST ( DirectDraw->SetDisplayMode (0, 0, 16, 0, 0) == DD_OK );
-
-	TEST ( DirectDraw->GetMonitorFrequency (NULL) == DDERR_INVALIDPARAMS );
-	TEST ( DirectDraw->GetDisplayMode (NULL) == DDERR_INVALIDPARAMS );
-	DDSURFACEDESC2 DisplayMode = {0};
-	TEST ( DirectDraw->GetDisplayMode (&DisplayMode) == DDERR_INVALIDPARAMS );
-
-	//* Now try getting vaild modes from drive */
-	TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context,
NULL) == DDERR_INVALIDPARAMS);
-	TEST (DirectDraw->EnumDisplayModes(0, NULL, (PVOID)&Context,
(LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK );
-	TEST (DirectDraw->EnumDisplayModes(DDEDM_REFRESHRATES, NULL, (PVOID)&Context,
(LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK );
-	TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES, NULL, (PVOID)&Context,
(LPDDENUMMODESCALLBACK2)DummyEnumDisplayModes) == DD_OK );
-	TEST (DirectDraw->EnumDisplayModes(DDEDM_STANDARDVGAMODES|DDEDM_REFRESHRATES, NULL,
(PVOID)&Context, (LPDDENUMMODESCALLBACK2)EnumDisplayModes) == DD_OK);
-
-	TEST (DirectDraw->RestoreDisplayMode() == DD_OK);
-
-	DirectDraw->Release();
-
-
-	return TRUE;
-}
-
-
-BOOL Test_GetMonitorFrequency (INT* passed, INT* failed)
-{
-	LPDIRECTDRAW7 DirectDraw;
-	LPDDRAWI_DIRECTDRAW_INT This;
-
-	/* Preparations */
-	if (DirectDrawCreateEx(NULL, (VOID**)&DirectDraw, IID_IDirectDraw7, NULL) != DD_OK)
-	{
-		printf("ERROR: Failed to set up ddraw\n");
-		return FALSE;
-	}
-	This = (LPDDRAWI_DIRECTDRAW_INT)DirectDraw;
-
-	/* Here we go */
-	DWORD lpFreq;
-	DWORD temp;
-	HRESULT retVal;
-	TEST (DirectDraw->GetMonitorFrequency((PDWORD)0xdeadbeef) == DDERR_INVALIDPARAMS);
-	TEST (DirectDraw->GetMonitorFrequency(NULL) == DDERR_INVALIDPARAMS);
-
-	/* This test depns on which graphice card you have */
-	retVal = DirectDraw->GetMonitorFrequency((PDWORD)&lpFreq);
-
-	if ( retVal == DDERR_UNSUPPORTED)
-	{
-		retVal = DD_OK;
-	}
-	TEST ( retVal == DD_OK);
-
-	/* hacking testing */
-
-	/* shall return  DDERR_UNSUPPORTED */
-	This->lpLcl->lpGbl->dwMonitorFrequency = 0;
-	TEST (DirectDraw->GetMonitorFrequency(&temp) == DDERR_UNSUPPORTED);
-
-	/* shall return  DD_OK */
-	This->lpLcl->lpGbl->dwMonitorFrequency = 85;
-	TEST (DirectDraw->GetMonitorFrequency(&temp) == DD_OK);
-
-	/* restore */
-	This->lpLcl->lpGbl->dwMonitorFrequency =  lpFreq;
-
-	DirectDraw->Release();
-
-	return TRUE;
-}

Modified: trunk/rostests/dxtest/ddraw/testlist.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp…
==============================================================================
--- trunk/rostests/dxtest/ddraw/testlist.cpp (original)
+++ trunk/rostests/dxtest/ddraw/testlist.cpp Sun Jun 10 15:50:56 2007
@@ -5,9 +5,9 @@
 #include "debug.cpp"
 
 /* include the tests */
-#include "DDraw/CreateDDraw.cpp"
-#include "DDraw/DisplayModes.cpp"
-#include "DDraw/CreateSurface.cpp"
+#include "DDraw/create.cpp"
+#include "DDraw/display_modes.cpp"
+#include "Surface/create.cpp"
 #include "Surface/private_data.cpp"
 
 /* The List of tests */