[ros-diffs] [fireball] 25546: Merge 25429:25431, 25437, 25441:25443.

Author: fireball
Date: Sat Jan 20 18:15:54 2007
New Revision: 25546

URL: http://svn.reactos.org/svn/reactos?rev=25546&view=rev
Log:
Merge 25429:25431, 25437, 25441:25443.

Added:
    branches/ros-branch-0_3_1/reactos/base/shell/cmd/it-IT.rc
      - copied unchanged from r25443, trunk/reactos/base/shell/cmd/it-IT.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/intl/it.rc
      - copied unchanged from r25443, trunk/reactos/dll/cpl/intl/it.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/It.rc
      - copied unchanged from r25443, trunk/reactos/dll/cpl/liccpa/It.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/main/It.rc
      - copied unchanged from r25443, trunk/reactos/dll/cpl/main/It.rc
    branches/ros-branch-0_3_1/reactos/dll/keyboard/kbdth/
      - copied from r25431, trunk/reactos/dll/keyboard/kbdth/
    branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/dependencymap/
      - copied from r25431, trunk/reactos/tools/rbuild/backend/dependencymap/
Modified:
    branches/ros-branch-0_3_1/reactos/Makefile
    branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.rc
    branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesys.inf
    branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff
    branches/ros-branch-0_3_1/reactos/boot/bootdata/txtsetup.sif
    branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/liccpa.rc
    branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc
    branches/ros-branch-0_3_1/reactos/dll/keyboard/keyboard.rbuild
    branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
    branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.h
    branches/ros-branch-0_3_1/reactos/tools/rbuild/rbuild.mak
    branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.cpp
    branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.h
    branches/ros-branch-0_3_1/reactos/tools/sysreg/pipe_reader.cpp
    branches/ros-branch-0_3_1/reactos/tools/sysreg/rosboot_test.cpp
    branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.cpp
    branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.mak
    branches/ros-branch-0_3_1/reactos/tools/sysreg/txtmode.cfg

Modified: branches/ros-branch-0_3_1/reactos/Makefile
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/Makefi…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/Makefile (original)
+++ branches/ros-branch-0_3_1/reactos/Makefile Sat Jan 20 18:15:54 2007
@@ -429,6 +429,10 @@
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) cb
 
+.PHONY: depmap
+depmap: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) depmap
 
 .PHONY: msvc
 msvc: $(RBUILD_TARGET)

Modified: branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/s…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.rc (original)
+++ branches/ros-branch-0_3_1/reactos/base/shell/cmd/cmd.rc Sat Jan 20 18:15:54 2007
@@ -17,6 +17,7 @@
 #include "hu-HU.rc"
 #include "nb-NO.rc"
 #include "uk-UA.rc"
+#include "it-IT.rc"
 
 STRINGTABLE DISCARDABLE
 {

Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesys.inf
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesys.inf (original)
+++ branches/ros-branch-0_3_1/reactos/boot/bootdata/hivesys.inf Sat Jan 20 18:15:54 2007
@@ -57,6 +57,8 @@
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000419","Layout
Text",0x00000000,"Russian"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout
File",0x00000000,"kbdse.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041d","Layout
Text",0x00000000,"SE"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout
File",0x00000000,"kbdth.dll"
+HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041e","Layout
Text",0x00000000,"Thai"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout
File",0x00000000,"kbdur.dll"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout
Text",0x00000000,"Ukrainian"
 HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000809","Layout
File",0x00000000,"kbduk.dll"
@@ -321,7 +323,7 @@

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,"2"

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6"

;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,""

HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1"

Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff (original)
+++ branches/ros-branch-0_3_1/reactos/boot/bootdata/packages/reactos.dff Sat Jan 20
18:15:54 2007
@@ -142,6 +142,7 @@
 dll\keyboard\kbdse\kbdse.dll                        1
 dll\keyboard\kbdsg\kbdsg.dll                        1
 dll\keyboard\kbdsk\kbdsk.dll                        1
+dll\keyboard\kbdth\kbdth.dll                        1
 dll\keyboard\kbduk\kbduk.dll                        1
 dll\keyboard\kbdur\kbdur.dll                        1
 dll\keyboard\kbdus\kbdus.dll                        1

Modified: branches/ros-branch-0_3_1/reactos/boot/bootdata/txtsetup.sif
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/boot/bootdata/txtsetup.sif (original)
+++ branches/ros-branch-0_3_1/reactos/boot/bootdata/txtsetup.sif Sat Jan 20 18:15:54 2007
@@ -110,6 +110,7 @@
 0000041B = "Slovak (QWERTZ)"
 0000040A = "Spanish (traditional short)"
 0000041D = "Swedish (Sweden)"
+0000041E = "Thai (traditional)"
 00000422 = "Ukrainian"
 
 [Files.KeyboardLayout]
@@ -122,6 +123,7 @@
 0000040E = kbdhu.dll
 00000419 = kbdru.dll
 0000041D = kbdse.dll
+0000041E = kbdth.dll
 00000422 = kbdur.dll
 00000809 = kbduk.dll
 00000807 = kbdsg.dll

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc (original)
+++ branches/ros-branch-0_3_1/reactos/dll/cpl/intl/intl.rc Sat Jan 20 18:15:54 2007
@@ -32,3 +32,4 @@
 #include "Fr.rc"
 #include "ru.rc"
 #include "uk.rc"
+#include "it.rc"

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/liccpa.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/liccpa.rc (original)
+++ branches/ros-branch-0_3_1/reactos/dll/cpl/liccpa/liccpa.rc Sat Jan 20 18:15:54 2007
@@ -17,3 +17,4 @@
 #include "Ja.rc"
 #include "Es.rc"
 #include "Ru.rc"
+#include "It.rc"

Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc (original)
+++ branches/ros-branch-0_3_1/reactos/dll/cpl/main/rsrc.rc Sat Jan 20 18:15:54 2007
@@ -19,3 +19,4 @@
 #include "Ru.rc"
 #include "Uk.rc"
 #include "Cz.rc"
+#include "It.rc"

Modified: branches/ros-branch-0_3_1/reactos/dll/keyboard/keyboard.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/ke…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/dll/keyboard/keyboard.rbuild (original)
+++ branches/ros-branch-0_3_1/reactos/dll/keyboard/keyboard.rbuild Sat Jan 20 18:15:54
2007
@@ -35,6 +35,9 @@
 	<directory name="kbdsk">
 		<xi:include href="kbdsk/kbdsk.rbuild" />
 	</directory>
+	<directory name="kbdth">
+		<xi:include href="kbdth/kbdth.rbuild" />
+	</directory>
 	<directory name="kbduk">
 		<xi:include href="kbduk/kbduk.rbuild" />
 	</directory>

Modified:
branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp
(original)
+++ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Sat
Jan 20 18:15:54 2007
@@ -347,6 +347,7 @@
 	string CompilerVar;
 	string baseaddr;
 	string windres_defines;
+	string widl_options;
 	string project_linker_flags = "-Wl,--enable-stdcall-fixup ";
 	project_linker_flags += GenerateProjectLinkerFlags();
 
@@ -358,7 +359,20 @@
 	vector<string> source_files, resource_files, includes, libraries, libpaths;
 	vector<string> header_files, common_defines, compiler_flags;
 	vector<string> vars, values;
-	
+
+	/* do not create project files for these targets
+	   use virtual targets instead */
+	switch (module.type)
+	{
+		case Iso:
+		case LiveIso:
+		case IsoRegTest:
+		case LiveIsoRegTest:
+			return;
+		default:
+			break;
+	}
+
 	compiler_flags.push_back ( "-Wall" );
 
 	// Always force disabling of sibling calls optimisation for GCC
@@ -419,6 +433,7 @@
 				module.GetBasePath() );
 
 			includes.push_back ( path );
+			widl_options += "-I" + path + " ";
 		}
 		const vector<Library*>& libs = data.libraries;
 		for ( i = 0; i < libs.size(); i++ )
@@ -472,12 +487,13 @@
 
 	fprintf ( OUT, "<?xml version=\"1.0\" encoding=\"UTF-8\"
standalone=\"yes\" ?>\r\n" );
 	fprintf ( OUT, "<CodeBlocks_project_file>\r\n" );
-	fprintf ( OUT, "\t<FileVersion major=\"1\" minor=\"5\"
/>\r\n" );
+	fprintf ( OUT, "\t<FileVersion major=\"1\" minor=\"6\"
/>\r\n" );
 	fprintf ( OUT, "\t<Project>\r\n" );
 	fprintf ( OUT, "\t\t<Option title=\"%s\" />\r\n",
module.name.c_str() );
 	fprintf ( OUT, "\t\t<Option pch_mode=\"2\" />\r\n" );
 	fprintf ( OUT, "\t\t<Option default_target=\"\" />\r\n" );
 	fprintf ( OUT, "\t\t<Option compiler=\"gcc\" />\r\n" );
+	fprintf ( OUT, "\t\t<Option extended_obj_names=\"1\" />\r\n"
);
 	fprintf ( OUT, "\t\t<Option virtualFolders=\"\" />\r\n" );
 	fprintf ( OUT, "\t\t<Build>\r\n" );
 
@@ -506,7 +522,9 @@
 		}
 
 		if ( lib )
+		{
 			fprintf ( OUT, "\t\t\t\t<Option type=\"2\" />\r\n" );
+		}
 		else if ( dll )		
 			fprintf ( OUT, "\t\t\t\t<Option type=\"3\" />\r\n" );
 		else if ( sys )
@@ -527,6 +545,7 @@
 		}
 		
 		fprintf ( OUT, "\t\t\t\t<Option compiler=\"gcc\" />\r\n" );
+
 		if ( module_type == ".cpl" )
 		{
 			fprintf ( OUT, "\t\t\t\t<Option parameters=\"shell32,Control_RunDLL
&quot;$exe_output&quot;,@\" />\r\n" );
@@ -637,12 +656,25 @@
 		if ( module.type == StaticLibrary && module.importLibrary )
 			fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s
--output-lib $exe_output; %s -U\" />\r\n",
module.importLibrary->dllname.c_str (), module.importLibrary->definition.c_str(),
module.mangledSymbols ? "" : "--kill-at" );
 		else if ( module.importLibrary != NULL )
-			fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s
--output-lib &quot;%s\\%s\\lib$(TARGET_OUTPUT_BASENAME).a&quot; %s\"
/>\r\n", module.GetTargetName ().c_str(),
module.importLibrary->definition.c_str(), intdir.c_str(), module.GetBasePath().c_str(),
module.mangledSymbols ? "" : "--kill-at" );
-			//fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s
--output-lib &quot;$(TARGET_OBJECT_DIR)lib$(TARGET_OUTPUT_BASENAME).a&quot;
%s\" />\r\n", module.GetTargetName ().c_str(),
module.importLibrary->definition.c_str(), module.mangledSymbols ? "" :
"--kill-at" );
+			fprintf ( OUT, "\t\t\t\t\t<Add after=\"dlltool --dllname %s --def %s
--output-lib &quot;$(TARGET_OBJECT_DIR)lib$(TARGET_OUTPUT_BASENAME).a&quot;
%s\" />\r\n", module.GetTargetName ().c_str(),
module.importLibrary->definition.c_str(), module.mangledSymbols ? "" :
"--kill-at" );
+
+
+		for ( i = 0; i < resource_files.size(); i++ )
+		{
+			const string& resource_file = resource_files[i];
+#ifdef WIN32
+			fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del
$(TARGET_OBJECT_DIR)\\%s.rci.tmp 2&gt;NUL\" />\r\n",
resource_file.c_str() );
+			fprintf ( OUT, "\t\t\t\t\t<Add after=\"cmd /c del
$(TARGET_OBJECT_DIR)\\%s.res.tmp 2&gt;NUL\" />\r\n",
resource_file.c_str() );
+#else
+			fprintf ( OUT, "\t\t\t\t\t<Add after=\"rm $(TARGET_OBJECT_DIR)/%s.rci.tmp
2&gt;/dev/null\" />\r\n", resource_file.c_str() );
+			fprintf ( OUT, "\t\t\t\t\t<Add after=\"rm $(TARGET_OBJECT_DIR)/%s.res.tmp
2&gt;/dev/null\" />\r\n", resource_file.c_str() );
+#endif
+		}
 
 		if ( dll )
 		{
-			
+			if (IsWineModule( module ))
+				fprintf ( OUT, "\t\t\t\t\t<Add
before=\"%s\\tools\\winebuild\\winebuild.exe -o %s --def -E %s.spec\"
/>\r\n", outdir.c_str(), module.importLibrary->definition.c_str(), 
module.name.c_str());
 			fprintf ( OUT, "\t\t\t\t\t<Add before=\"dlltool --dllname %s --def %s
--output-exp %s.temp.exp %s\" />\r\n", module.GetTargetName ().c_str(),
module.importLibrary->definition.c_str(), module.name.c_str(), module.mangledSymbols ?
"" : "--kill-at" );
 			fprintf ( OUT, "\t\t\t\t\t<Add after=\"%s\\tools\\pefixup $exe_output
-exports\" />\r\n", outdir.c_str() );
 #ifdef WIN32
@@ -701,9 +733,28 @@
 
 		string extension = GetExtension ( source_file );
 		if ( extension == ".s" || extension == ".S" )
+		{
+			fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" );
+			fprintf ( OUT, "\t\t\t<Option link=\"1\" />\r\n" );
 			fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\"
buildCommand=\"gcc -x assembler-with-cpp -c $file -o $link_objects $includes
-D__ASM__ $options\" />\r\n" );
-		if ( extension == ".asm" || extension == ".ASM" )		
+		}
+		else if ( extension == ".asm" || extension == ".ASM" )		
+		{
+			fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" );
+			fprintf ( OUT, "\t\t\t<Option link=\"1\" />\r\n" );
 			fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\"
buildCommand=\"nasm -f win32 $file -o $link_objects\" />\r\n" );
+		}
+		else if ( extension == ".idl" || extension == ".IDL" )		
+		{
+			fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" );
+			fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\"
buildCommand=\"%s\\tools\\widl\\widl.exe %s %s -h -H
&quot;$(TARGET_OUTPUT_DIR)$filetitle_c.h&quot; -c -C
&quot;$(TARGET_OUTPUT_DIR)$filetitle_c.c&quot; $file\\ngcc %s -c
&quot;$(TARGET_OUTPUT_DIR)$filetitle_c.c&quot; -o
&quot;$(TARGET_OUTPUT_DIR)$file_c.o&quot;\" />\r\n", outdir.c_str(),
widl_options.c_str(), windres_defines.c_str(), widl_options.c_str() );
+		}
+		else if ( extension == ".spec" || extension == ".SPEC" )		
+		{
+			fprintf ( OUT, "\t\t\t<Option compile=\"1\" />\r\n" );
+			fprintf ( OUT, "\t\t\t<Option link=\"1\" />\r\n" );
+			fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\"
buildCommand=\"%s\\tools\\winebuild\\winebuild.exe -o $file.stubs.c --pedll
$file\\n$compiler -c $options $includes $file.stubs.c -o
$(TARGET_OBJECT_DIR)\\$file.o\" />\r\n", outdir.c_str() );
+		}
 
 		for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ )
 		{
@@ -720,7 +771,7 @@
 		fprintf ( OUT, "\t\t<Unit filename=\"%s\">\r\n",
resource_file.c_str() );
 		fprintf ( OUT, "\t\t\t<Option compilerVar=\"WINDRES\" />\r\n"
);
 		string extension = GetExtension ( resource_file );
-		fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\"
buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o
kernel32.kernel32.rci.tmp\\n%s\\tools\\wrc\\wrc.exe $includes %s kernel32.kernel32.rci.tmp
kernel32.kernel32.res.tmp\\n$rescomp --output-format=coff kernel32.kernel32.res.tmp -o
$resource_output\" />\r\n" , windres_defines.c_str(), outdir.c_str(), 
windres_defines.c_str() );
+		fprintf ( OUT, "\t\t\t<Option compiler=\"gcc\" use=\"1\"
buildCommand=\"gcc -xc -E -DRC_INVOKED $includes %s $file -o
$(TARGET_OBJECT_DIR)\\$file.rci.tmp\\n%s\\tools\\wrc\\wrc.exe $includes %s
$(TARGET_OBJECT_DIR)\\$file.rci.tmp $(TARGET_OBJECT_DIR)\\$file.res.tmp\\n$rescomp
--output-format=coff $(TARGET_OBJECT_DIR)\\$file.res.tmp -o $resource_output\"
/>\r\n" , windres_defines.c_str(), outdir.c_str(),  windres_defines.c_str() );
 		for ( size_t icfg = 0; icfg < m_configurations.size(); icfg++ )
 		{
 			const CBConfiguration& cfg = *m_configurations[icfg];
@@ -832,3 +883,13 @@
 	// TODO FIXME - should we check global if-ed properties?
 	return NULL;
 }
+
+bool
+CBBackend::IsWineModule ( const Module& module ) const
+{
+	if ( module.importLibrary == NULL)
+		return false;
+
+	size_t index = module.importLibrary->definition.rfind ( ".spec.def" );
+	return ( index != string::npos );
+}

Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.h
(original)
+++ branches/ros-branch-0_3_1/reactos/tools/rbuild/backend/codeblocks/codeblocks.h Sat Jan
20 18:15:54 2007
@@ -74,6 +74,7 @@
 		std::string DependFileName ( const Module& module ) const;
 		std::string GenerateProjectLinkerFlags () const;
 		void MingwAddImplicitLibraries( Module &module );
+		bool IsWineModule ( const Module& module ) const;
 		std::vector<CBConfiguration*> m_configurations;
 
 		std::vector<FileUnit> m_fileUnits;

Modified: branches/ros-branch-0_3_1/reactos/tools/rbuild/rbuild.mak
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/rbuild/rbuild.mak (original)
+++ branches/ros-branch-0_3_1/reactos/tools/rbuild/rbuild.mak Sat Jan 20 18:15:54 2007
@@ -119,6 +119,23 @@
 	${mkdir} $@
 endif
 
+RBUILD_DEPMAP_BASE = $(RBUILD_BACKEND_BASE_)dependencymap
+RBUILD_DEPMAP_BASE_ = $(RBUILD_DEPMAP_BASE)$(SEP)
+RBUILD_DEPMAP_INT = $(INTERMEDIATE_)$(RBUILD_DEPMAP_BASE)
+RBUILD_DEPMAP_INT_ = $(RBUILD_DEPMAP_INT)$(SEP)
+RBUILD_DEPMAP_OUT = $(OUTPUT_)$(RBUILD_DEPMAP_BASE)
+RBUILD_DEPMAP_OUT_ = $(RBUILD_DEPMAP_OUT)$(SEP)
+
+$(RBUILD_DEPMAP_INT): | $(RBUILD_BACKEND_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RBUILD_DEPMAP_OUT): | $(RBUILD_BACKEND_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
 
 RBUILD_MSVC_BASE = $(RBUILD_BACKEND_BASE_)msvc
 RBUILD_MSVC_BASE_ = $(RBUILD_MSVC_BASE)$(SEP)
@@ -158,6 +175,11 @@
 	codeblocks.cpp \
 	)
 
+RBUILD_BACKEND_DEPMAP_BASE_SOURCES = $(addprefix $(RBUILD_DEPMAP_BASE_), \
+	dependencymap.cpp \
+	)
+
+
 RBUILD_BACKEND_MSVC_BASE_SOURCES = $(addprefix $(RBUILD_MSVC_BASE_), \
 	genguid.cpp \
 	msvc.cpp \
@@ -170,6 +192,7 @@
 	$(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \
 	$(RBUILD_BACKEND_MSVC_BASE_SOURCES) \
 	$(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \
+	$(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \
 	$(RBUILD_BACKEND_BASE_)backend.cpp
 
 RBUILD_COMMON_SOURCES = \
@@ -225,6 +248,9 @@
 RBUILD_BACKEND_CODEBLOCKS_HEADERS = \
 	codeblocks.h
 
+RBUILD_BACKEND_DEPMAP_HEADERS = \
+	dependencymap.h
+
 RBUILD_BACKEND_MINGW_HEADERS = \
 	mingw.h \
 	modulehandler.h
@@ -234,7 +260,8 @@
 	$(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \
 	$(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \
 	$(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \
-	$(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS))
+	$(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \
+	$(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS))
 
 RBUILD_HEADERS = \
 	$(addprefix $(RBUILD_BASE_), \
@@ -403,6 +430,10 @@
 	$(ECHO_CC)
 	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
 
+$(RBUILD_DEPMAP_INT_)dependencymap.o: $(RBUILD_DEPMAP_BASE_)dependencymap.cpp
$(RBUILD_HEADERS) | $(RBUILD_DEPMAP_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
 $(RBUILD_MSVC_INT_)genguid.o: $(RBUILD_MSVC_BASE_)genguid.cpp $(RBUILD_HEADERS) |
$(RBUILD_MSVC_INT)
 	$(ECHO_CC)
 	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.cpp (original)
+++ branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.cpp Sat Jan 20 18:15:54
2007
@@ -57,7 +57,7 @@
 		free(command);
 		return pid;
 	}
-#elif defined (__LINUX__)
+#else

/********************************************************************************************************************/
 	OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR
**procargs)
 	{
@@ -66,10 +66,23 @@
 		if ((pid = fork()) < 0)
 		{
 			cerr << "OsSupport::createProcess> fork failed" << endl;
-			return pid;
+			return 0;
 		}
+		if (pid == 0)
+		{
+			execv(procname, procargs);
+			return 0;
+		}
+		
+		return pid;
+	}
 
+	bool OsSupport::terminateProcess(OsSupport::ProcessID pid)
+	{
+		kill(pid, SIGKILL);
+		return true;
 	}
+
 
 #endif
 

Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.h (original)
+++ branches/ros-branch-0_3_1/reactos/tools/sysreg/os_support.h Sat Jan 20 18:15:54 2007
@@ -10,10 +10,12 @@
  * PROGRAMMERS: Johannes Anderwald (johannes.anderwald at sbox tugraz at)
  */
 
-#ifdef WIN32
+#if 0
 #include <windows.h>
-#elif defined(__LINUX__)
+#else
 #include <unistd.h>
+#include <sys/types.h>
+#include <signal.h>
 #endif
 
 #include "user_types.h"
@@ -34,14 +36,10 @@
 #ifdef WIN32
 
 		typedef DWORD ProcessID;
-
-#elif defined(__LINUX__)
+#else
 
 		typedef pid_t ProcessID;
-
-#else
-#error you need to define pid handle type for your platform
-#endif
+		#endif
 

//---------------------------------------------------------------------------------------
 ///

Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/pipe_reader.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/sysreg/pipe_reader.cpp (original)
+++ branches/ros-branch-0_3_1/reactos/tools/sysreg/pipe_reader.cpp Sat Jan 20 18:15:54
2007
@@ -36,7 +36,7 @@
 			return false;
 		}
 		// 
-		m_File = _tpopen(PipeCmd.c_str(), AccessMode.c_str());
+		m_File = popen(PipeCmd.c_str(), "r"); //AccessMode.c_str());
 		if (m_File)
 		{
 			cerr << "PipeReader::openPipe> successfully opened pipe" <<
endl;
@@ -57,7 +57,7 @@
 			return false;
 		}
 
-		int res = _pclose(m_File);
+		int res = pclose(m_File);
 		
 		if (res == INT_MAX)
 		{

Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/rosboot_test.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/sysreg/rosboot_test.cpp (original)
+++ branches/ros-branch-0_3_1/reactos/tools/sysreg/rosboot_test.cpp Sat Jan 20 18:15:54
2007
@@ -11,8 +11,8 @@
 
 #include "rosboot_test.h"
 #include "pipe_reader.h"
-#include "namedpipe_reader.h"
-#include "sym_file.h"
+//#include "namedpipe_reader.h"
+//#include "sym_file.h"
 #include "file_reader.h"
 #include "os_support.h"
 
@@ -24,14 +24,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
+#include <math.h>
  
-
+			
 namespace Sysreg_
 {
 	using std::vector;
 	using System_::PipeReader;
+#if 0
 	using System_::NamedPipeReader;
 	using System_::SymbolFile;
+#endif
 	using System_::FileReader;
 	using System_::OsSupport;
 
@@ -93,7 +96,8 @@
 		{
 			TCHAR * stop;
 			m_Timeout = _tcstod(timeout.c_str (), &stop);
-			if (_isnan(m_Timeout) || m_Timeout == 0.0)
+
+			if (isnan(m_Timeout) || m_Timeout == 0.0)
 			{
 				cerr << "Warning: overriding timeout with default of 60 sec" <<
endl;
 				m_Timeout = 60.0;
@@ -289,10 +293,10 @@
 				///
 				string result;
 				result.reserve (200);
-
+#if 0
 				SymbolFile::resolveAddress (modulename, address, result);
 				cerr << result << endl;
-				
+#endif				
 				///
 				/// TODO
 				///
@@ -338,17 +342,18 @@

//---------------------------------------------------------------------------------------
 	bool RosBootTest::fetchDebugByPipe(string boot_cmd)
 	{
-		NamedPipeReader namedpipe_reader;
 		string pipecmd = _T("");
+		bool ret = true;
 		
 		///
 		/// FIXME
 		/// split up arguments
 
 		OsSupport::ProcessID pid = OsSupport::createProcess ((TCHAR*)boot_cmd.c_str (), 0,
NULL); 
-
+#if 0		
 		string::size_type pipe_pos = boot_cmd.find (_T("serial pipe:"));
 
+		NamedPipeReader namedpipe_reader;
 		if (pipe_pos != string::npos)
 		{
 			pipe_pos += 12;
@@ -371,7 +376,7 @@
 			/// delay reading until emulator is ready
 			///
 
-			_sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC );
+			sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC );
 		}
 
 		if (!namedpipe_reader.openPipe(pipecmd))
@@ -382,7 +387,6 @@
 		string Buffer;
 		Buffer.reserve (500);
 
-		bool ret = true;
 		vector<string> vect;
 		size_t lines = 0;
 		bool write_log;
@@ -436,7 +440,7 @@
 		}
 		_sleep(3* CLOCKS_PER_SEC);
 		OsSupport::terminateProcess (pid);
-
+#endif
 		return ret;
 	}

//---------------------------------------------------------------------------------------
@@ -457,7 +461,7 @@
 			/// delay reading until emulator is ready
 			///
 
-			_sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC );
+			sleep( (clock_t)m_Delayread * CLOCKS_PER_SEC );
 		}
 
 		OsSupport::ProcessID pid = 0;

Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.cpp (original)
+++ branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.cpp Sat Jan 20 18:15:54 2007
@@ -20,7 +20,9 @@
 using Sysreg_::RegressionTest;
 using Sysreg_::RosBootTest;
 
+#if 0
 using System_::SymbolFile;
+#endif
 
 typedef ComponentFactoryTemplate<RegressionTest, string> ComponentFactory;
 
@@ -87,9 +89,9 @@
 	string envvar;
 	string ros = _T("ROS_OUTPUT");
 	config.getStringValue (ros, envvar);
-
+#if 0
 	SymbolFile::initialize (config, envvar);
-	
+#endif	
 	if (regtest->execute (config))
 	{
 		cout << "The regression test " << regtest->getName () <<
" completed successfully" << endl;

Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.mak
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.mak (original)
+++ branches/ros-branch-0_3_1/reactos/tools/sysreg/sysreg.mak Sat Jan 20 18:15:54 2007
@@ -22,9 +22,7 @@
 	conf_parser.cpp \
 	env_var.cpp \
 	pipe_reader.cpp \
-	namedpipe_reader.cpp \
 	rosboot_test.cpp \
-	sym_file.cpp \
 	sysreg.cpp \
 	file_reader.cpp \
 	os_support.cpp \

Modified: branches/ros-branch-0_3_1/reactos/tools/sysreg/txtmode.cfg
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/tools/…
==============================================================================
--- branches/ros-branch-0_3_1/reactos/tools/sysreg/txtmode.cfg (original)
+++ branches/ros-branch-0_3_1/reactos/tools/sysreg/txtmode.cfg Sat Jan 20 18:15:54 2007
@@ -27,7 +27,9 @@
 ; This value is the command which is executed to gain debugging data
 ; this value is mandatory
 
-ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L D:\reactos\qemu\
D:\reactos\RosVM.vmdk -cdrom D:\Reactos\ReactOS-RegTest.iso -pidfile pid.txt
+;ROSBOOT_CMD=D:\reactos\qemu\qemu.exe -serial pipe:qemu -boot d -m 128 -L
D:\reactos\qemu\ D:\reactos\RosVM.vmdk -cdrom ; D:\Reactos\ReactOS-RegTest.iso -pidfile
pid.txt
+
+ROSBOOT_CMD=/usr/bin/qemu -serial file:/home/freenet/reactos/tools/sysreg/txtmode.log
-boot d -m 64 -L /home/freenet/reactos/qemu /home/freenet/reactos/qemu/c.img -cdrom
/home/freenet/reactos/ReactOS.iso
 
 ;
 ; ROSBOOT_PIDFILE
@@ -47,8 +49,8 @@
 ; If the value is set to pipe, then sysreg will read from pipe created by the
 ; ROSBOOT_CMD
 ;
-;ROSBOOT_DEBUG_PORT=file
-ROSBOOT_DEBUG_PORT=pipe
+ROSBOOT_DEBUG_PORT=file
+;ROSBOOT_DEBUG_PORT=pipe
 
 ;
 ; ROSBOOT_DEBUG_FILE
@@ -60,7 +62,8 @@
 ; debug data to the specified debug file
 ;
 
-ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log
+;ROSBOOT_DEBUG_FILE=D:\ReactOS\tools\sysreg\txtmode.log
+ROSBOOT_DEBUG_FILE=/home/freenet/reactos/tools/sysreg/txtmode.log
 
 ; ROSBOOT_DELAY_READ;
 ;
@@ -94,9 +97,9 @@
 ;
 ; CP_NAME is the value of the ROSBOOT_CHECK_POINT variable
 
-ROSBOOT_CHECK_POINT=USETUP_COMPLETE
-;ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE
-;ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE
+;ROSBOOT_CHECK_POINT=USETUP_COMPLETE
+ROSBOOT_CHECK_POINT=SYSSETUP_COMPLETE
+ROSBOOT_CHECK_POINT=THIRDBOOT_COMPLETE
 
 ; ROSBOOT_CRITICAL_APP
 ;
@@ -114,5 +117,4 @@
 
 
 ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe
-;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe
lsass.exe
-
+;ROSBOOT_CRITICAL_APP=setup.exe userinit.exe smss.exe winlogon.exe csrss.exe explorer.exe
lsass.exe