Fix building of tests
Modified: trunk/reactos/lib/kernel32/tests/setup.c
Modified: trunk/reactos/subsys/win32k/tests/stubs.xml
Modified: trunk/reactos/subsys/win32k/tests/win32k.xml
Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp
_____
Modified: trunk/reactos/lib/kernel32/tests/setup.c
--- trunk/reactos/lib/kernel32/tests/setup.c 2005-07-17 09:56:38 UTC
(rev 16604)
+++ trunk/reactos/lib/kernel32/tests/setup.c 2005-07-17 10:20:18 UTC
(rev 16605)
@@ -1,6 +1,12 @@
#include <windows.h>
#include "regtests.h"
+int
+mainCRTStartup(int argc, char *argv[])
+{
+ return WinMain(NULL, NULL, NULL, 0);
+}
+
_SetupOnce()
{
}
_____
Modified: trunk/reactos/subsys/win32k/tests/stubs.xml
--- trunk/reactos/subsys/win32k/tests/stubs.xml 2005-07-17 09:56:38 UTC
(rev 16604)
+++ trunk/reactos/subsys/win32k/tests/stubs.xml 2005-07-17 10:20:18 UTC
(rev 16605)
@@ -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>
_____
Modified: trunk/reactos/subsys/win32k/tests/win32k.xml
--- trunk/reactos/subsys/win32k/tests/win32k.xml 2005-07-17
09:56:38 UTC (rev 16604)
+++ trunk/reactos/subsys/win32k/tests/win32k.xml 2005-07-17
10:20:18 UTC (rev 16605)
@@ -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>
_____
Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp
--- trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-07-17
09:56:38 UTC (rev 16604)
+++ trunk/reactos/tools/rbuild/testsupportcode.cpp 2005-07-17
10:20:18 UTC (rev 16605)
@@ -376,8 +376,9 @@
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" );
Show replies by date