[ros-diffs] [mbosma] 27115: added wrong file

[mbosma at svn.reactos.org]

Author: mbosma
Date: Sun Jun 10 16:03:01 2007
New Revision: 27115

URL: http://svn.reactos.org/svn/reactos?rev=27115&view=rev
Log:
added wrong file

Added:
    trunk/rostests/dxtest/ddraw/Surface/private_data.cpp   (with props)
Removed:
    trunk/rostests/dxtest/ddraw/Surface/overlay.cpp

Removed: trunk/rostests/dxtest/ddraw/Surface/overlay.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/overlay.cpp?rev=27114&view=auto
==============================================================================
--- trunk/rostests/dxtest/ddraw/Surface/overlay.cpp (original)
+++ trunk/rostests/dxtest/ddraw/Surface/overlay.cpp (removed)
@@ -1,7 +1,0 @@
-//AddOverlayDirtyRect
-//EnumOverlayZOrders
-//GetOverlayPosition
-//SetOverlayPosition
-//UpdateOverlay
-//UpdateOverlayDisplay
-//UpdateOverlayZOrder

Added: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/Surface/private_data.cpp?rev=27115&view=auto
==============================================================================
--- trunk/rostests/dxtest/ddraw/Surface/private_data.cpp (added)
+++ trunk/rostests/dxtest/ddraw/Surface/private_data.cpp Sun Jun 10 16:03:01 2007
@@ -1,0 +1,49 @@
+BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface);
+
+BOOL Test_PrivateData (INT* passed, INT* failed)
+{
+	LPDIRECTDRAWSURFACE7 Surface;
+    DWORD size, dummy = 0xBAADF00D;
+    GUID guid = { 0 };
+    GUID guid2 = { 0x1 };
+
+    if(!CreateSurface(&Surface))
+        return FALSE;
+
+    // General test
+    TEST(Surface->SetPrivateData(guid, NULL, 0, 0) == DDERR_INVALIDPARAMS);
+    TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, 0, 0) == DDERR_INVALIDPARAMS);
+    TEST(Surface->SetPrivateData(guid, (LPVOID)0xdeadbeef, sizeof(DWORD), 0) == DDERR_INVALIDPARAMS);
+    TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, sizeof(DWORD), 0) == DD_OK);
+
+    TEST(Surface->GetPrivateData(guid, NULL, 0) == DDERR_INVALIDPARAMS);
+    TEST(Surface->GetPrivateData(guid, &dummy, 0) == DDERR_INVALIDPARAMS);
+    size = 0;
+    TEST(Surface->GetPrivateData(guid, &dummy, &size) == DDERR_MOREDATA && size == sizeof(DWORD));
+    size = 2;
+    TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_MOREDATA && size == sizeof(DWORD));
+    TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_INVALIDPARAMS);
+    TEST(Surface->GetPrivateData(guid, &dummy, &size) == DD_OK && dummy == 0xBAADF00D);
+    TEST(Surface->GetPrivateData(guid2, NULL, 0) == DDERR_NOTFOUND);
+
+    TEST(Surface->FreePrivateData(guid) == DD_OK);
+    TEST(Surface->FreePrivateData(guid) == DDERR_NOTFOUND);
+
+    // Test for DDSPD_VOLATILE flag 
+    TEST(Surface->SetPrivateData(guid, (LPVOID)&dummy, sizeof(DWORD), DDSPD_VOLATILE) == DD_OK);
+    size = 0;
+    TEST(Surface->GetPrivateData(guid, NULL, &size) == DDERR_MOREDATA && size == sizeof(DWORD));
+    TEST(Surface->GetPrivateData(guid, &dummy, &size) == DD_OK && dummy == 0xBAADF00D);
+
+	DDBLTFX	 bltfx;
+	bltfx.dwSize = sizeof(DDBLTFX);
+	bltfx.dwFillColor = RGB(0, 0, 0); 	
+	if(Surface->Blt(NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &bltfx) != DD_OK)
+        printf("ERROR: Failed to draw to surface !");
+    TEST(Surface->GetPrivateData(guid, &dummy, &size) == DDERR_EXPIRED);
+
+    // TODO: Test for DDSPD_IUNKNOWNPOINTER (see http://msdn.microsoft.com/archive/default.asp?url=/archive/en-us/ddraw7/directdraw7/ddref_5qyf.asp)
+
+    Surface->Release();
+    return TRUE;
+}

Propchange: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rostests/dxtest/ddraw/Surface/private_data.cpp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision