From acbcf1c29a8a88c78c0e95e98041688ac849afd1 Mon Sep 17 00:00:00 2001
From: Casper Hornstrup <chorns@users.sourceforge.net>
Date: Sun, 17 Jul 2005 10:20:18 +0000
Subject: [PATCH] Fix building of tests

svn path=/trunk/; revision=16605
---
 reactos/lib/kernel32/tests/setup.c       |  6 ++++++
 reactos/subsys/win32k/tests/stubs.xml    | 10 ++++++++++
 reactos/subsys/win32k/tests/win32k.xml   |  7 ++-----
 reactos/tools/rbuild/testsupportcode.cpp |  5 +++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/reactos/lib/kernel32/tests/setup.c b/reactos/lib/kernel32/tests/setup.c
index 507484da7bd..8681759804d 100644
--- a/reactos/lib/kernel32/tests/setup.c
+++ b/reactos/lib/kernel32/tests/setup.c
@@ -1,6 +1,12 @@
 #include <windows.h>
 #include "regtests.h"
 
+int
+mainCRTStartup(int argc, char *argv[])
+{
+  return WinMain(NULL, NULL, NULL, 0);
+}
+
 _SetupOnce()
 {
 }
diff --git a/reactos/subsys/win32k/tests/stubs.xml b/reactos/subsys/win32k/tests/stubs.xml
index b5abcec6b5d..4db1e5be270 100644
--- a/reactos/subsys/win32k/tests/stubs.xml
+++ b/reactos/subsys/win32k/tests/stubs.xml
@@ -138,6 +138,16 @@
 	<symbol>IoDeviceObjectType</symbol>
 	<symbol>@KfReleaseSpinLock@8</symbol>
 	<symbol>@KfAcquireSpinLock@4</symbol>
+	<symbol>KeEnterCriticalRegion@0</symbol>
+	<symbol>KeLeaveCriticalRegion@0</symbol>
+	<symbol>KeGetCurrentIrql@0</symbol>
+	<symbol>ExFreePoolWithTag@8</symbol>
+	<symbol>PsGetProcessWin32Process@4</symbol>
+	<symbol>ObFindHandleForObject@20</symbol>
+	<symbol>PsSetProcessWin32Process@8</symbol>
+	<symbol>PsGetThreadWin32Thread@4</symbol>
+	<symbol>PsEstablishWin32Callouts@4</symbol>
+	<symbol>PsSetThreadWin32Thread@8</symbol>
 </component>
 <component name="freetype.dll">
 	<symbol>FT_Init_FreeType</symbol>
diff --git a/reactos/subsys/win32k/tests/win32k.xml b/reactos/subsys/win32k/tests/win32k.xml
index b3965a15532..20d89f2e6ac 100644
--- a/reactos/subsys/win32k/tests/win32k.xml
+++ b/reactos/subsys/win32k/tests/win32k.xml
@@ -2,11 +2,12 @@
 	<include base="rtshared">.</include>
 	<include base="win32k">.</include>
 	<include base="win32k">include</include>
+	<include base="ntoskrnl">include</include>
+	<include base="freetype">include</include>
 	<define name="UNICODE" />
 	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="WINVER">0x600</define>
-	<define name="_DISABLE_TIDENTS" />
 	<define name="_SEH_NO_NATIVE_NLG" />
 	<define name="_WIN32K_" />
 	<library>rtshared</library>
@@ -14,10 +15,6 @@
 	<library>win32k_base</library>
 	<library>pseh</library>
 	<library>rosrtl</library>
-	<library>msvcrt</library>
-	<linkerflag>-lgcc</linkerflag>
-	<linkerflag>-nostartfiles</linkerflag>
-	<linkerflag>-nostdlib</linkerflag>
 	<directory name="tests">
 		<file>DIB_24BPP_ColorFill-performance.c</file>
 	</directory>
diff --git a/reactos/tools/rbuild/testsupportcode.cpp b/reactos/tools/rbuild/testsupportcode.cpp
index 493a1a7f490..32ceb23aa4e 100644
--- a/reactos/tools/rbuild/testsupportcode.cpp
+++ b/reactos/tools/rbuild/testsupportcode.cpp
@@ -376,8 +376,9 @@ TestSupportCode::WriteStartupFile ( Module& module )
 	s = s + sprintf ( s, "}\n" );
 	s = s + sprintf ( s, "\n" );
 	s = s + sprintf ( s, "int\n" );
-	s = s + sprintf ( s, "mainCRTStartup(HANDLE hInstance,\n" );
-	s = s + sprintf ( s, "  HANDLE hPrevInstance,\n" );
+	s = s + sprintf ( s, "STDCALL\n" );
+	s = s + sprintf ( s, "WinMain(HINSTANCE hInstance,\n" );
+	s = s + sprintf ( s, "  HINSTANCE hPrevInstance,\n" );
 	s = s + sprintf ( s, "  LPSTR lpszCmdParam,\n" );
 	s = s + sprintf ( s, "  int nCmdShow)\n" );
 	s = s + sprintf ( s, "{\n" );