--- trunk/reactos/subsys/win32k/tests/stubs.xml	2005-06-17 22:59:39 UTC (rev 16021)
+++ trunk/reactos/subsys/win32k/tests/stubs.xml	2005-06-18 06:17:10 UTC (rev 16022)
@@ -0,0 +1,154 @@

+<component name="ntdll.dll">
+	<symbol>DbgPrint</symbol>
+	<symbol>RtlAssert@16</symbol>
+	<symbol>ZwAllocateVirtualMemory@24</symbol>
+	<symbol>RtlImageDirectoryEntryToData@16</symbol>
+	<symbol>RtlInitAnsiString@8</symbol>
+	<symbol>RtlInitUnicodeString@8</symbol>
+	<symbol>NtClose@4</symbol>
+	<symbol>ZwOpenFile@24</symbol>
+	<symbol>ZwClose@4</symbol>
+	<symbol>RtlNtStatusToDosError@4</symbol>
+	<symbol>NtW32Call@20</symbol>
+	<symbol>ZwOpenKey@12</symbol>
+	<symbol>ZwQueryValueKey@24</symbol>
+	<symbol>RtlUnicodeStringToInteger@12</symbol>
+	<symbol>RtlQueryAtomInAtomTable@24</symbol>
+	<symbol>RtlDeleteAtomFromAtomTable@8</symbol>
+	<symbol>RtlCopyUnicodeString@8</symbol>
+	<symbol>ZwRequestWaitReplyPort@12</symbol>
+	<symbol>ZwDuplicateObject@28</symbol>
+	<symbol>ZwSetSystemInformation@12</symbol>
+	<symbol>RtlLookupAtomInAtomTable@12</symbol>
+	<symbol>RtlAddAtomToAtomTable@12</symbol>
+	<symbol>RtlFreeUnicodeString@4</symbol>
+	<symbol>ZwConnectPort@32</symbol>
+	<symbol>ZwOpenProcess@16</symbol>
+	<symbol>RtlCreateUnicodeString@8</symbol>
+	<symbol>RtlQueryRegistryValues@20</symbol>
+	<symbol>RtlGetVersion@4</symbol>
+	<symbol>NtOpenFile@24</symbol>
+	<symbol>NtReadFile@36</symbol>
+	<symbol>NtWaitForSingleObject@12</symbol>
+	<symbol>NtDeviceIoControlFile@40</symbol>
+	<symbol>NtAlertThread@4</symbol>
+	<symbol>ZwQueryDefaultLocale@8</symbol>
+	<symbol>ZwFreeVirtualMemory@16</symbol>
+	<symbol>RtlFindClearBitsAndSet@12</symbol>
+	<symbol>ZwReadFile@36</symbol>
+	<symbol>RtlAnsiStringToUnicodeString@12</symbol>
+	<symbol>RtlCompareUnicodeString@12</symbol>
+	<symbol>ZwCreateDirectoryObject@12</symbol>
+	<symbol>RtlCreateAtomTable@8</symbol>
+	<symbol>RtlDestroyAtomTable@4</symbol>
+	<symbol>ZwOpenDirectoryObject@12</symbol>
+	<symbol>ZwQueryDirectoryObject@28</symbol>
+	<symbol>RtlAppendUnicodeToString@8</symbol>
+	<symbol>ZwCreateEvent@20</symbol>
+	<symbol>RtlAreBitsSet@12</symbol>
+	<symbol>RtlClearBits@12</symbol>
+	<symbol>RtlInitializeBitMap@12</symbol>
+	<symbol>RtlClearAllBits@4</symbol>
+	<symbol>RtlAppendUnicodeStringToString@8</symbol>
+	<symbol>ZwSetValueKey@24</symbol>
+	<symbol>ZwQueryDirectoryFile@44</symbol>
+	<symbol>RtlUnwind@16</symbol>
+	<symbol>NtQueryInformationFile@20</symbol>
+</component>
+<component name="ntoskrnl.exe">
+	<symbol>ExAllocatePool@8</symbol>
+	<symbol>ExFreePool@4</symbol>
+	<symbol>ExAllocatePoolWithTag@12</symbol>
+	<symbol>IoBuildDeviceIoControlRequest@36</symbol>
+	<symbol>@IofCallDriver@8</symbol>
+	<symbol>KeWaitForSingleObject@20</symbol>
+	<symbol>@ExAcquireFastMutex@4</symbol>
+	<symbol>PsGetWin32Process@0</symbol>
+	<symbol>@ExReleaseFastMutex@4</symbol>
+	<symbol>@ExTryToAcquireFastMutex@4</symbol>
+	<symbol>KeInitializeEvent@12</symbol>
+	<symbol>ExEventObjectType</symbol>
+	<symbol>ObReferenceObjectByHandle@24</symbol>
+	<symbol>KeSetEvent@12</symbol>
+	<symbol>@ObfDereferenceObject@4</symbol>
+	<symbol>KeRestoreFloatingPointState@4</symbol>
+	<symbol>KeSaveFloatingPointState@4</symbol>
+	<symbol>MmSecureVirtualMemory@12</symbol>
+	<symbol>MmUnsecureVirtualMemory@4</symbol>
+	<symbol>IoGetCurrentProcess@0</symbol>
+	<symbol>KeQueryPerformanceCounter@4</symbol>
+	<symbol>ExInitializeResourceLite@4</symbol>
+	<symbol>ExAcquireResourceExclusiveLite@8</symbol>
+	<symbol>KeGetCurrentThread@0</symbol>
+	<symbol>PsGetCurrentProcessId@0</symbol>
+	<symbol>@InterlockedDecrement@4</symbol>
+	<symbol>@InterlockedExchange@8</symbol>
+	<symbol>KeBugCheck@4</symbol>
+	<symbol>ExDesktopObjectType</symbol>
+	<symbol>PsEstablishWin32Callouts@24</symbol>
+	<symbol>MmUnmapViewInSystemSpace@4</symbol>
+	<symbol>MmCreateSection@32</symbol>
+	<symbol>MmMapViewInSystemSpace@12</symbol>
+	<symbol>MmCopyToCaller@12</symbol>
+	<symbol>PsGetWin32Thread@0</symbol>
+	<symbol>KeDetachProcess@0</symbol>
+	<symbol>ExInitializePagedLookasideList@28</symbol>
+	<symbol>@InterlockedPushEntrySList@8</symbol>
+	<symbol>ExInterlockedInsertTailList@12</symbol>
+	<symbol>KeReleaseSpinLock@8</symbol>
+	<symbol>ObOpenObjectByName@28</symbol>
+	<symbol>ObOpenObjectByPointer@28</symbol>
+	<symbol>KeAcquireSpinLock@8</symbol>
+	<symbol>ExGetPreviousMode@0</symbol>
+	<symbol>PsGetCurrentThreadId@0</symbol>
+	<symbol>@ExReleaseResourceLite@4</symbol>
+	<symbol>ExIsResourceAcquiredExclusiveLite@</symbol>
+	<symbol>@InterlockedIncrement@4</symbol>
+	<symbol>@InterlockedCompareExchange@12</symbol>
+	<symbol>KeAddSystemServiceTable@20</symbol>
+	<symbol>IoFileObjectType</symbol>
+	<symbol>ObReferenceObjectByPointer@16</symbol>
+	<symbol>MmUnmapViewOfSection@8</symbol>
+	<symbol>MmCopyFromCaller@12</symbol>
+	<symbol>KiKernelApcDeliveryCheck@0</symbol>
+	<symbol>ExIsResourceAcquiredExclusiveLite@4</symbol>
+	<symbol>MmMapViewOfSection@40</symbol>
+	<symbol>KeAttachProcess@4</symbol>
+	<symbol>@InterlockedPopEntrySList@4</symbol>
+	<symbol>ExWindowStationObjectType</symbol>
+	<symbol>ObInsertObject@24</symbol>
+	<symbol>KeInitializeSpinLock@4</symbol>
+	<symbol>PsThreadType</symbol>
+	<symbol>PsCreateSystemThread@28</symbol>
+	<symbol>KeQueryTickCount@4</symbol>
+	<symbol>PsLookupThreadByThreadId@8</symbol>
+	<symbol>KeInitializeMutex@8</symbol>
+	<symbol>KeWaitForMutexObject@20</symbol>
+	<symbol>KeReleaseMutex@8</symbol>
+	<symbol>KeDelayExecutionThread@12</symbol>
+	<symbol>PsGetProcessId@4</symbol>
+	<symbol>ObCreateObject@36</symbol>
+	<symbol>KeClearEvent@4</symbol>
+	<symbol>PsLookupProcessByProcessId@8</symbol>
+	<symbol>PsProcessType</symbol>
+	<symbol>KeWaitForMultipleObjects@32</symbol>
+	<symbol>KeQuerySystemTime@4</symbol>
+	<symbol>ObReferenceObjectByName@32</symbol>
+	<symbol>HalQueryDisplayOwnership@0</symbol>
+	<symbol>IoDeviceObjectType</symbol>
+</component>
+<component name="freetype.dll">
+	<symbol>FT_Init_FreeType</symbol>
+	<symbol>FT_New_Memory_Face</symbol>
+	<symbol>FT_Done_Face</symbol>
+	<symbol>FT_MulFix</symbol>
+	<symbol>FT_Get_Sfnt_Table</symbol>
+	<symbol>FT_Get_First_Char</symbol>
+	<symbol>FT_Set_Pixel_Sizes</symbol>
+	<symbol>FT_Get_Char_Index</symbol>
+	<symbol>FT_Load_Glyph</symbol>
+	<symbol>FT_Get_Kerning</symbol>
+	<symbol>FT_Render_Glyph</symbol>
+	<symbol>FT_Set_Charmap</symbol>
+	<symbol>FT_Load_Sfnt_Table</symbol>
+</component>

Property changes on: trunk/reactos/subsys/win32k/tests/stubs.xml
___________________________________________________________________
Name: svn:eol-style
   + native

--- trunk/reactos/subsys/win32k/tests/win32k.xml	2005-06-17 22:59:39 UTC (rev 16021)
+++ trunk/reactos/subsys/win32k/tests/win32k.xml	2005-06-18 06:17:10 UTC (rev 16022)
@@ -0,0 +1,25 @@

+<module name="win32k_test" type="test">
+	<include base="rtshared">.</include>
+	<include base="win32k">.</include>
+	<include base="win32k">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>
+	<library>regtests</library>
+	<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">
+	</directory>
+	<file>setup.c</file>
+	<xi:include href="stubs.xml" />
+</module>

Property changes on: trunk/reactos/subsys/win32k/tests/win32k.xml
___________________________________________________________________
Name: svn:eol-style
   + native

--- trunk/reactos/subsys/win32k/win32k.xml	2005-06-17 22:59:39 UTC (rev 16021)
+++ trunk/reactos/subsys/win32k/win32k.xml	2005-06-18 06:17:10 UTC (rev 16022)
@@ -1,5 +1,4 @@

-<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" warnings="true">
-	<importlibrary definition="win32k.def" />

+<module name="win32k_base" type="objectlibrary" warnings="true">

 	<include base="win32k">.</include>
 	<include base="win32k">include</include>
 	<include base="ntoskrnl">include</include>
@@ -8,12 +7,8 @@

 	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="WINVER">0x600</define>

+	<define name="_SEH_NO_NATIVE_NLG" />

 	<define name="_WIN32K_" />

-	<library>pseh</library>
-	<library>rosrtl</library>
-	<library>ntoskrnl</library>
-	<library>hal</library>
-	<library>freetype</library>

 	<pch>w32k.h</pch>
 	<directory name="dib">
 		<file>dib1bpp.c</file>
@@ -132,5 +127,17 @@

 		<file>stubs.c</file>
 		<file>xpstubs.c</file>
 	</directory>

+</module>
+<module name="win32k" type="kernelmodedriver" installbase="system32" installname="win32k.sys" warnings="true">
+	<importlibrary definition="win32k.def" />
+	<library>win32k_base</library>
+	<library>pseh</library>
+	<library>rosrtl</library>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<library>freetype</library>

 	<file>win32k.rc</file>
 </module>

+<directory name="tests">
+	<xi:include href="tests/win32k.xml" />
+</directory>

--- trunk/reactos/tools/rbuild/rbuild.h	2005-06-17 22:59:39 UTC (rev 16021)
+++ trunk/reactos/tools/rbuild/rbuild.h	2005-06-18 06:17:10 UTC (rev 16022)
@@ -494,6 +494,7 @@

 	                                         int* stubIndex );
 	void WriteStubsFile ( Module& module );
 	std::string GetStartupFilename ( Module& module );

+	bool IsUnknownCharacter ( char ch );

 	std::string GetTestDispatcherName ( std::string filename );
 	bool IsTestFile ( std::string& filename ) const;
 	void GetSourceFilenames ( string_list& list,

--- trunk/reactos/tools/rbuild/testsupportcode.cpp	2005-06-17 22:59:39 UTC (rev 16021)
+++ trunk/reactos/tools/rbuild/testsupportcode.cpp	2005-06-18 06:17:10 UTC (rev 16022)
@@ -93,7 +93,7 @@

 	s = s + sprintf ( s, "#include <windows.h>\n" );
 	s = s + sprintf ( s, "#include \"regtests.h\"\n" );
 	s = s + sprintf ( s, "\n" );

-	s = s + sprintf ( s, "API_DESCRIPTION ExternalDependencies[] =\n" );

+	s = s + sprintf ( s, "_API_DESCRIPTION ExternalDependencies[] =\n" );

 	s = s + sprintf ( s, "{\n" );
 
 	int symbolCount = 0;
@@ -121,19 +121,35 @@

 	return NormalizeFilename ( Environment::GetIntermediatePath () + SSEP + module.GetBasePath () + SSEP + "_stubs.S" );
 }
 

+string
+GetImportSymbol ( const StubbedSymbol& symbol )
+{
+	if (symbol.symbol[0] == '@')
+		return "__imp_" + symbol.symbol;
+	else
+		return "__imp__" + symbol.symbol;
+}
+

 char*
 TestSupportCode::WriteStubbedSymbolToStubsFile ( char* buffer,
                                                  const StubbedComponent& component,

-	                                         const StubbedSymbol& symbol,

+                                                 const StubbedSymbol& symbol,

                                                  int stubIndex )
 {

+	string importSymbol = GetImportSymbol( symbol );

 	buffer = buffer + sprintf ( buffer,
 	                            ".globl _%s\n",
 	                            symbol.symbol.c_str () );
 	buffer = buffer + sprintf ( buffer,

+	                            ".globl %s\n",
+	                            importSymbol.c_str () );
+	buffer = buffer + sprintf ( buffer,

 	                            "_%s:\n",
 	                            symbol.symbol.c_str () );
 	buffer = buffer + sprintf ( buffer,

+	                            "%s:\n",
+	                            importSymbol.c_str () );
+	buffer = buffer + sprintf ( buffer,

 	                            "  pushl $%d\n",
 	                            stubIndex );
 	buffer = buffer + sprintf ( buffer,
@@ -196,6 +212,18 @@

 	return NormalizeFilename ( Environment::GetIntermediatePath () + SSEP + module.GetBasePath () + SSEP + "_startup.c" );
 }
 

+bool
+TestSupportCode::IsUnknownCharacter ( char ch )
+{
+	if ( ch >= 'a' && ch <= 'z' )
+		return false;
+	if ( ch >= 'A' && ch <= 'Z' )
+		return false;
+	if ( ch >= '0' && ch <= '9' )
+		return false;
+	return true;
+}
+

 string
 TestSupportCode::GetTestDispatcherName ( string filename )
 {
@@ -204,7 +232,10 @@

 		filenamePart[0] = toupper ( filenamePart[0] );
 	for ( size_t i = 1; i < filenamePart.length (); i++ )
 	{

-		filenamePart[i] = tolower ( filenamePart[i] );

+		if ( IsUnknownCharacter ( filenamePart[i] ) )
+			filenamePart[i] = '_';
+		else
+			filenamePart[i] = tolower ( filenamePart[i] );

 	}
 	return filenamePart + "Test";
 }
@@ -333,7 +364,7 @@

 	s = s + sprintf ( s, "  LPSTR lpszCmdParam,\n" );
 	s = s + sprintf ( s, "  int nCmdShow)\n" );
 	s = s + sprintf ( s, "{\n" );

-	s = s + sprintf ( s, "  _SetPriorityClass(GetCurrentProcess(), IDLE_PRIORITY_CLASS);\n" );

+	s = s + sprintf ( s, "  _SetPriorityClass(_GetCurrentProcess(), IDLE_PRIORITY_CLASS);\n" );

 	s = s + sprintf ( s, "  InitializeTests();\n" );
 	s = s + sprintf ( s, "  RegisterTests();\n" );
 	s = s + sprintf ( s, "  SetupOnce();\n" );