[ros-diffs] [greatlrd] 26814: Fixing a msvc7 comping issue

[greatlrd at svn.reactos.org]

Author: greatlrd
Date: Thu May 17 01:03:02 2007
New Revision: 26814

URL: http://svn.reactos.org/svn/reactos?rev=26814&view=rev
Log:
Fixing a msvc7 comping issue

Added:
    trunk/rostests/dxtest/ddraw/ddraw_test.cpp
      - copied, changed from r26809, trunk/rostests/dxtest/ddraw/ddraw_test.c
Removed:
    trunk/rostests/dxtest/ddraw/ddraw_test.c
Modified:
    trunk/rostests/dxtest/ddraw/ddraw.rbuild
    trunk/rostests/dxtest/ddraw/testlist.cpp

Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw.rbuild?rev=26814&r1=26813&r2=26814&view=diff
==============================================================================
--- trunk/rostests/dxtest/ddraw/ddraw.rbuild (original)
+++ trunk/rostests/dxtest/ddraw/ddraw.rbuild Thu May 17 01:03:02 2007
@@ -7,6 +7,6 @@
 	<library>gdi32</library>
 	<library>ddraw</library>
 	<library>dxguid</library>
-	<file>ddraw_test.c</file>
+	<file>ddraw_test.cpp</file>
 	<file>testlist.cpp</file>
 </module>

Removed: trunk/rostests/dxtest/ddraw/ddraw_test.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw_test.c?rev=26813&view=auto
==============================================================================
--- trunk/rostests/dxtest/ddraw/ddraw_test.c (original)
+++ trunk/rostests/dxtest/ddraw/ddraw_test.c (removed)
@@ -1,51 +1,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "ddrawtest.h"
-
-INT NumTests(void);
-
-int main(int argc, char *argv[])
-{
-	INT Num = NumTests();
-	INT i, j;
-	INT passed, failed, opassed, ofailed;
-
-	opassed = 0;
-	ofailed = 0;
-	printf("DirectDraw tests\n");
-	if (argc > 1)
-	{
-		for (i = 1; i < argc; i++)
-		{
-			for (j = 0; j < NumTests(); j++)
-			{
-				if (stricmp(argv[i], TestList[j].Test) == 0)
-				{
-					passed = 0;
-					failed = 0;
-					TestList[j].Proc(&passed, &failed);
-					opassed += passed;
-					ofailed += failed;
-					printf(" tests: %d, passed: %d, failed: %d\n\n", passed+failed, passed, failed);
-				}
-			}
-		}
-	}
-	else
-	{
-		for (i = 0; i < Num; i++)
-		{
-			passed = 0;
-			failed = 0;
-			printf("Test: %s\n", TestList[i].Test);
-			TestList[i].Proc(&passed, &failed);
-			opassed += passed;
-			ofailed += failed;
-			printf(" tests: %d, passed: %d, failed: %d\n\n", passed+failed, passed, failed);
-		}
-	}
-	printf("\nOverall tests: %d, passed: %d, failed: %d\n", opassed+ofailed, opassed, ofailed);
-
-	return ofailed;
-}

Copied: trunk/rostests/dxtest/ddraw/ddraw_test.cpp (from r26809, trunk/rostests/dxtest/ddraw/ddraw_test.c)
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw_test.cpp?p2=trunk/rostests/dxtest/ddraw/ddraw_test.cpp&p1=trunk/rostests/dxtest/ddraw/ddraw_test.c&r1=26809&r2=26814&rev=26814&view=diff
==============================================================================
--- trunk/rostests/dxtest/ddraw/ddraw_test.c (original)
+++ trunk/rostests/dxtest/ddraw/ddraw_test.cpp Thu May 17 01:03:02 2007
@@ -20,7 +20,7 @@
 		{
 			for (j = 0; j < NumTests(); j++)
 			{
-				if (stricmp(argv[i], TestList[j].Test) == 0)
+				if (_stricmp(argv[i], TestList[j].Test) == 0)
 				{
 					passed = 0;
 					failed = 0;

Modified: trunk/rostests/dxtest/ddraw/testlist.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/testlist.cpp?rev=26814&r1=26813&r2=26814&view=diff
==============================================================================
--- trunk/rostests/dxtest/ddraw/testlist.cpp (original)
+++ trunk/rostests/dxtest/ddraw/testlist.cpp Thu May 17 01:03:02 2007
@@ -19,7 +19,7 @@
 };
 
 /* The function that gives us the number of tests */
-extern "C" INT NumTests(void)
+INT NumTests(void)
 {
 	return sizeof(TestList) / sizeof(TEST);
 }