From ae18ba571af3ae04071f9f32c78bc2b26785cdd7 Mon Sep 17 00:00:00 2001
From: Casper Hornstrup <chorns@users.sourceforge.net>
Date: Fri, 6 May 2005 10:38:30 +0000
Subject: [PATCH] Set svn:eol-style=native

svn path=/branches/xmlbuildsystem/; revision=15035
---
 reactos/tools/rbuild/XML.cpp                  | 1482 ++---
 reactos/tools/rbuild/XML.h                    |  232 +-
 reactos/tools/rbuild/automaticdependency.cpp  |  906 +--
 reactos/tools/rbuild/backend/backend.cpp      |  124 +-
 reactos/tools/rbuild/backend/backend.h        |   94 +-
 .../tools/rbuild/backend/devcpp/devcpp.cpp    |  502 +-
 reactos/tools/rbuild/backend/devcpp/devcpp.h  |   98 +-
 reactos/tools/rbuild/backend/mingw/mingw.cpp  | 1666 ++---
 reactos/tools/rbuild/backend/mingw/mingw.h    |  224 +-
 .../rbuild/backend/mingw/modulehandler.cpp    | 5838 ++++++++---------
 .../rbuild/backend/mingw/modulehandler.h      |  824 +--
 .../rbuild/backend/mingw/pipe_detection.c     |   10 +-
 reactos/tools/rbuild/bootstrap.cpp            |  156 +-
 reactos/tools/rbuild/cdfile.cpp               |   84 +-
 reactos/tools/rbuild/compilerflag.cpp         |   94 +-
 reactos/tools/rbuild/define.cpp               |   88 +-
 reactos/tools/rbuild/exception.cpp            |  348 +-
 reactos/tools/rbuild/exception.h              |  250 +-
 reactos/tools/rbuild/include.cpp              |  146 +-
 reactos/tools/rbuild/installfile.cpp          |   84 +-
 reactos/tools/rbuild/linkerflag.cpp           |   94 +-
 reactos/tools/rbuild/module.cpp               | 1940 +++---
 reactos/tools/rbuild/pch.h                    |   82 +-
 reactos/tools/rbuild/project.cpp              |  700 +-
 reactos/tools/rbuild/rbuild.cpp               |  214 +-
 reactos/tools/rbuild/rbuild.h                 | 1238 ++--
 reactos/tools/rbuild/rbuild.mak               |  700 +-
 reactos/tools/rbuild/rbuild.txt               |  962 +--
 reactos/tools/rbuild/ssprintf.cpp             | 3834 +++++------
 reactos/tools/rbuild/ssprintf.h               |   46 +-
 reactos/tools/rbuild/stubbedcomponent.cpp     |  160 +-
 reactos/tools/rbuild/test.h                   |  272 +-
 reactos/tools/rbuild/tests/alltests.cpp       |  386 +-
 reactos/tools/rbuild/tests/cdfiletest.cpp     |   44 +-
 .../rbuild/tests/data/automaticdependency.xml |   30 +-
 .../data/automaticdependency_include.xml      |   32 +-
 reactos/tools/rbuild/tests/data/cdfile.xml    |   16 +-
 reactos/tools/rbuild/tests/data/define.xml    |   18 +-
 reactos/tools/rbuild/tests/data/if.xml        |   18 +-
 reactos/tools/rbuild/tests/data/include.xml   |   28 +-
 reactos/tools/rbuild/tests/data/invoke.xml    |   26 +-
 .../tools/rbuild/tests/data/linkerflag.xml    |   14 +-
 reactos/tools/rbuild/tests/data/module.xml    |   34 +-
 reactos/tools/rbuild/tests/data/project.xml   |   22 +-
 reactos/tools/rbuild/tests/data/sourcefile1.c |   26 +-
 .../data/sourcefile1/sourcefile1_header3.h    |    2 +-
 .../data/sourcefile1/sourcefile_includenext.h |    2 +-
 .../rbuild/tests/data/sourcefile1_header1.h   |    2 +-
 .../rbuild/tests/data/sourcefile1_header2.h   |    6 +-
 .../rbuild/tests/data/sourcefile1_recurse.h   |    4 +-
 .../rbuild/tests/data/sourcefile_include.c    |    4 +-
 .../rbuild/tests/data/sourcefile_include.h    |    2 +-
 .../tests/data/sourcefile_includenext.h       |    2 +-
 reactos/tools/rbuild/tests/data/symbol.xml    |   18 +-
 reactos/tools/rbuild/tests/definetest.cpp     |   42 +-
 reactos/tools/rbuild/tests/functiontest.cpp   |   18 +-
 reactos/tools/rbuild/tests/iftest.cpp         |   50 +-
 reactos/tools/rbuild/tests/includetest.cpp    |   48 +-
 reactos/tools/rbuild/tests/invoketest.cpp     |   38 +-
 reactos/tools/rbuild/tests/linkerflagtest.cpp |   38 +-
 reactos/tools/rbuild/tests/moduletest.cpp     |   74 +-
 reactos/tools/rbuild/tests/projecttest.cpp    |   20 +-
 reactos/tools/rbuild/tests/sourcefiletest.cpp |  140 +-
 reactos/tools/rbuild/tests/symboltest.cpp     |   50 +-
 64 files changed, 12373 insertions(+), 12373 deletions(-)

diff --git a/reactos/tools/rbuild/XML.cpp b/reactos/tools/rbuild/XML.cpp
index 6a60fe1d61e..4e86c8f281b 100644
--- a/reactos/tools/rbuild/XML.cpp
+++ b/reactos/tools/rbuild/XML.cpp
@@ -1,741 +1,741 @@
-// XML.cpp
-
-#include "pch.h"
-
-#ifdef _MSC_VER
-#define MAX_PATH _MAX_PATH
-#endif
-
-#ifdef WIN32
-#	include <direct.h>
-#	include <io.h>
-#else
-#	include <sys/stat.h>
-#	define MAX_PATH PATH_MAX
-#endif
-#include <assert.h>
-
-#include "XML.h"
-#include "exception.h"
-#include "ssprintf.h"
-
-using std::string;
-using std::vector;
-
-#ifdef WIN32
-#define getcwd _getcwd
-#endif//WIN32
-
-static const char* WS = " \t\r\n";
-static const char* WSEQ = " =\t\r\n";
-
-string working_directory;
-
-XMLIncludes::~XMLIncludes()
-{
-	for ( size_t i = 0; i < this->size(); i++ )
-		delete (*this)[i];
-}
-
-void
-InitWorkingDirectory()
-{
-	// store the current directory for path calculations
-	working_directory.resize ( _MAX_PATH );
-	working_directory[0] = 0;
-	getcwd ( &working_directory[0], working_directory.size() );
-	working_directory.resize ( strlen ( working_directory.c_str() ) );
-}
-
-#ifdef _MSC_VER
-unsigned __int64
-#else
-unsigned long long
-#endif
-filelen ( FILE* f )
-{
-#ifdef WIN32
-	return _filelengthi64 ( _fileno(f) );
-#else
-	struct stat64 file_stat;
-	if ( fstat64(fileno(f), &file_stat) != 0 )
-		return 0;
-	return file_stat.st_size;
-#endif
-}
-
-Path::Path()
-{
-	if ( !working_directory.size() )
-		InitWorkingDirectory();
-	string s ( working_directory );
-	const char* p = strtok ( &s[0], "/\\" );
-	while ( p )
-	{
-		if ( *p )
-			path.push_back ( p );
-		p = strtok ( NULL, "/\\" );
-	}
-}
-
-Path::Path ( const Path& cwd, const string& file )
-{
-	string s ( cwd.Fixup ( file, false ) );
-	const char* p = strtok ( &s[0], "/\\" );
-	while ( p )
-	{
-		if ( *p )
-			path.push_back ( p );
-		p = strtok ( NULL, "/\\" );
-	}
-}
-
-string
-Path::Fixup ( const string& file, bool include_filename ) const
-{
-	if ( strchr ( "/\\", file[0] )
-#ifdef WIN32
-		// this squirreliness is b/c win32 has drive letters and *nix doesn't...
-		|| file[1] == ':'
-#endif//WIN32
-		)
-	{
-		return file;
-	}
-	vector<string> pathtmp ( path );
-	string tmp ( file );
-	const char* prev = strtok ( &tmp[0], "/\\" );
-	const char* p = strtok ( NULL, "/\\" );
-	while ( p )
-	{
-		if ( !strcmp ( prev, "." ) )
-			; // do nothing
-		else if ( !strcmp ( prev, ".." ) )
-		{
-			// this squirreliness is b/c win32 has drive letters and *nix doesn't...
-#ifdef WIN32
-			if ( pathtmp.size() > 1 )
-#else
-			if ( pathtmp.size() )
-#endif
-				pathtmp.resize ( pathtmp.size() - 1 );
-		}
-		else
-			pathtmp.push_back ( prev );
-		prev = p;
-		p = strtok ( NULL, "/\\" );
-	}
-	if ( include_filename )
-		pathtmp.push_back ( prev );
-
-	// reuse tmp variable to return recombined path
-	tmp.resize(0);
-	for ( size_t i = 0; i < pathtmp.size(); i++ )
-	{
-		// this squirreliness is b/c win32 has drive letters and *nix doesn't...
-#ifdef WIN32
-		if ( i ) tmp += "/";
-#else
-		tmp += "/";
-#endif
-		tmp += pathtmp[i];
-	}
-	return tmp;
-}
-
-string
-Path::RelativeFromWorkingDirectory ()
-{
-	string out = "";
-	for ( size_t i = 0; i < path.size(); i++ )
-	{
-		out += "/" + path[i];
-	}
-	return RelativeFromWorkingDirectory ( out );
-}
-
-string
-Path::RelativeFromWorkingDirectory ( const string& path )
-{
-	vector<string> vwork, vpath, vout;
-	Path::Split ( vwork, working_directory, true );
-	Path::Split ( vpath, path, true );
-#ifdef WIN32
-	// this squirreliness is b/c win32 has drive letters and *nix doesn't...
-	// not possible to do relative across different drive letters
-	if ( vwork[0] != vpath[0] )
-		return path;
-#endif
-	size_t i = 0;
-	while ( i < vwork.size() && i < vpath.size() && vwork[i] == vpath[i] )
-		++i;
-	if ( i < vwork.size() )
-	{
-		// path goes above our working directory, we will need some ..'s
-		for ( size_t j = 0; j < i; j++ )
-			vout.push_back ( ".." );
-	}
-	while ( i < vpath.size() )
-		vout.push_back ( vpath[i++] );
-
-	// now merge vout into a string again
-	string out = vout[0];
-	for ( i = 1; i < vout.size(); i++ )
-	{
-		out += "/" + vout[i];
-	}
-	return out;
-}
-
-void
-Path::Split ( vector<string>& out,
-              const string& path,
-              bool include_last )
-{
-	string s ( path );
-	const char* prev = strtok ( &s[0], "/\\" );
-	const char* p = strtok ( NULL, "/\\" );
-	out.resize ( 0 );
-	while ( p )
-	{
-		out.push_back ( prev );
-		prev = p;
-		p = strtok ( NULL, "/\\" );
-	}
-	if ( include_last )
-		out.push_back ( prev );
-}
-
-XMLFile::XMLFile()
-{
-}
-
-void
-XMLFile::close()
-{
-	_buf.resize(0);
-	_p = _end = NULL;
-}
-
-bool
-XMLFile::open(const string& filename_)
-{
-	close();
-	FILE* f = fopen ( filename_.c_str(), "rb" );
-	if ( !f )
-		return false;
-	unsigned long len = (unsigned long)filelen(f);
-	_buf.resize ( len );
-	fread ( &_buf[0], 1, len, f );
-	fclose ( f );
-	_p = _buf.c_str();
-	_end = _p + len;
-	_filename = filename_;
-	next_token();
-	return true;
-}
-
-// next_token() moves the pointer to next token, which may be
-// an xml element or a text element, basically it's a glorified
-// skipspace, normally the user of this class won't need to call
-// this function
-void
-XMLFile::next_token()
-{
-	_p += strspn ( _p, WS );
-}
-
-bool
-XMLFile::next_is_text()
-{
-	return *_p != '<';
-}
-
-bool
-XMLFile::more_tokens()
-{
-	return _p != _end;
-}
-
-// get_token() is used to return a token, and move the pointer
-// past the token
-bool
-XMLFile::get_token(string& token)
-{
-	const char* tokend;
-	if ( !strncmp ( _p, "<!--", 4 ) )
-	{
-		tokend = strstr ( _p, "-->" );
-		if ( !tokend )
-			tokend = _end;
-		else
-			tokend += 3;
-	}
-	else if ( !strncmp ( _p, "<?", 2 ) )
-	{
-		tokend = strstr ( _p, "?>" );
-		if ( !tokend )
-			tokend = _end;
-		else
-			tokend += 2;
-	}
-	else if ( *_p == '<' )
-	{
-		tokend = strchr ( _p, '>' );
-		if ( !tokend )
-			tokend = _end;
-		else
-			++tokend;
-	}
-	else
-	{
-		tokend = strchr ( _p, '<' );
-		if ( !tokend )
-			tokend = _end;
-		while ( tokend > _p && isspace(tokend[-1]) )
-			--tokend;
-	}
-	if ( tokend == _p )
-		return false;
-	token = string ( _p, tokend-_p );
-	_p = tokend;
-	next_token();
-	return true;
-}
-
-string
-XMLFile::Location() const
-{
-	int line = 1;
-	const char* p = strchr ( _buf.c_str(), '\n' );
-	while ( p && p < _p )
-	{
-		++line;
-		p = strchr ( p+1, '\n' );
-	}
-	return ssprintf ( "%s(%i)",_filename.c_str(), line );
-}
-
-XMLAttribute::XMLAttribute()
-{
-}
-
-XMLAttribute::XMLAttribute(const string& name_,
-                           const string& value_)
-	: name(name_), value(value_)
-{
-}
-
-XMLAttribute::XMLAttribute ( const XMLAttribute& src )
-	: name(src.name), value(src.value)
-{
-
-}
-
-XMLAttribute& XMLAttribute::operator = ( const XMLAttribute& src )
-{
-	name = src.name;
-	value = src.value;
-	return *this;
-}
-
-XMLElement::XMLElement ( XMLFile* xmlFile,
-                         const string& location )
-	: xmlFile ( xmlFile ),
-	  location ( location ),
-	  parentElement ( NULL )
-{
-}
-
-XMLElement::~XMLElement()
-{
-	size_t i;
-	for ( i = 0; i < attributes.size(); i++ )
-		delete attributes[i];
-	for ( i = 0; i < subElements.size(); i++ )
-		delete subElements[i];
-}
-
-void
-XMLElement::AddSubElement ( XMLElement* e )
-{
-	subElements.push_back ( e );
-	e->parentElement = this;
-}
-
-// Parse()
-// This function takes a single xml tag ( i.e. beginning with '<' and
-// ending with '>', and parses out it's tag name and constituent
-// attributes.
-// Return Value: returns true if you need to look for a </tag> for
-// the one it just parsed...
-bool
-XMLElement::Parse(const string& token,
-                  bool& end_tag)
-{
-	const char* p = token.c_str();
-	assert ( *p == '<' );
-	++p;
-	p += strspn ( p, WS );
-
-	// check if this is a comment
-	if ( !strncmp ( p, "!--", 3 ) )
-	{
-		name = "!--";
-		end_tag = false;
-		return false; // never look for end tag to a comment
-	}
-
-	end_tag = ( *p == '/' );
-	if ( end_tag )
-	{
-		++p;
-		p += strspn ( p, WS );
-	}
-	const char* end = strpbrk ( p, WS );
-	if ( !end )
-	{
-		end = strpbrk ( p, "/>" );
-		assert ( end );
-	}
-	name = string ( p, end-p );
-	p = end;
-	p += strspn ( p, WS );
-	while ( *p != '>' && *p != '/' )
-	{
-		end = strpbrk ( p, WSEQ );
-		if ( !end )
-		{
-			end = strpbrk ( p, "/>" );
-			assert ( end );
-		}
-		string attribute ( p, end-p ), value;
-		p = end;
-		p += strspn ( p, WS );
-		if ( *p == '=' )
-		{
-			++p;
-			p += strspn ( p, WS );
-			char quote = 0;
-			if ( strchr ( "\"'", *p ) )
-			{
-				quote = *p++;
-				end = strchr ( p, quote );
-			}
-			else
-			{
-				end = strpbrk ( p, WS );
-			}
-			if ( !end )
-			{
-				end = strchr ( p, '>' );
-				assert(end);
-				if ( end[-1] == '/' )
-					end--;
-			}
-			value = string ( p, end-p );
-			p = end;
-			if ( quote && *p == quote )
-				p++;
-			p += strspn ( p, WS );
-		}
-		else if ( name[0] != '!' )
-		{
-			throw XMLSyntaxErrorException ( location,
-			                                "attributes must have values" );
-		}
-		attributes.push_back ( new XMLAttribute ( attribute, value ) );
-	}
-	return !( *p == '/' ) && !end_tag;
-}
-
-XMLAttribute*
-XMLElement::GetAttribute ( const string& attribute,
-                           bool required )
-{
-	// this would be faster with a tree-based container, but our attribute
-	// lists are likely to stay so short as to not be an issue.
-	for ( size_t i = 0; i < attributes.size(); i++ )
-	{
-		if ( attribute == attributes[i]->name )
-			return attributes[i];
-	}
-	if ( required )
-	{
-		throw RequiredAttributeNotFoundException ( location,
-		                                           attribute,
-		                                           name );
-	}
-	return NULL;
-}
-
-const XMLAttribute*
-XMLElement::GetAttribute ( const string& attribute,
-                           bool required ) const
-{
-	// this would be faster with a tree-based container, but our attribute
-	// lists are likely to stay so short as to not be an issue.
-	for ( size_t i = 0; i < attributes.size(); i++ )
-	{
-		if ( attribute == attributes[i]->name )
-			return attributes[i];
-	}
-	if ( required )
-	{
-		throw RequiredAttributeNotFoundException ( location,
-		                                           attribute,
-		                                           name );
-	}
-	return NULL;
-}
-
-// XMLParse()
-// This function reads a "token" from the file loaded in XMLFile
-// if it finds a tag that is non-singular, it parses sub-elements and/or
-// inner text into the XMLElement that it is building to return.
-// Return Value: an XMLElement allocated via the new operator that contains
-// it's parsed data. Keep calling this function until it returns NULL
-// (no more data)
-XMLElement*
-XMLParse ( XMLFile& f,
-           XMLIncludes* includes,
-           const Path& path,
-           bool* pend_tag = NULL )
-{
-	string token;
-	if ( !f.get_token(token) )
-		return NULL;
-	bool end_tag, is_include = false;
-
-	while ( token[0] != '<'
-	        || !strncmp ( token.c_str (), "<!--", 4 )
-	        || !strncmp ( token.c_str (), "<?", 2 ) )
-	{
-		if ( token[0] != '<' )
-			throw XMLSyntaxErrorException ( f.Location (),
-			                                "expecting xml tag, not '%s'",
-			                                token.c_str () );
-		if ( !f.get_token(token) )
-			return NULL;
-	}
-
-	XMLElement* e = new XMLElement ( &f,
-	                                 f.Location () );
-	bool bNeedEnd = e->Parse ( token, end_tag );
-
-	if ( e->name == "xi:include" && includes )
-	{
-		XMLAttribute* att;
-		att = e->GetAttribute ( "href", true );
-		assert ( att );
-		string includeFile ( path.Fixup ( att->value, true ) );
-		string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) );
-		includes->push_back ( new XMLInclude ( e, path, topIncludeFile ) );
-		is_include = true;
-	}
-
-	if ( !bNeedEnd )
-	{
-		if ( pend_tag )
-			*pend_tag = end_tag;
-		else if ( end_tag )
-		{
-			delete e;
-			throw XMLSyntaxErrorException ( f.Location (),
-			                                "end tag '%s' not expected",
-			                                token.c_str() );
-			return NULL;
-		}
-		return e;
-	}
-	bool bThisMixingErrorReported = false;
-	while ( f.more_tokens () )
-	{
-		if ( f.next_is_text () )
-		{
-			if ( !f.get_token ( token ) || token.size () == 0 )
-			{
-				throw InvalidBuildFileException (
-					f.Location(),
-					"internal tool error - get_token() failed when more_tokens() returned true" );
-				break;
-			}
-			if ( e->subElements.size() && !bThisMixingErrorReported )
-			{
-				throw XMLSyntaxErrorException ( f.Location (),
-				                                "mixing of inner text with sub elements" );
-				bThisMixingErrorReported = true;
-			}
-			if ( strchr ( token.c_str (), '>' ) )
-			{
-				throw XMLSyntaxErrorException ( f.Location (),
-				                                "invalid symbol '>'" );
-			}
-			if ( e->value.size() > 0 )
-			{
-				throw XMLSyntaxErrorException ( f.Location (),
-				                                "multiple instances of inner text" );
-				e->value += " " + token;
-			}
-			else
-				e->value = token;
-		}
-		else
-		{
-			XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag );
-			if ( !e2 )
-			{
-				throw InvalidBuildFileException (
-					e->location,
-					"end of file found looking for end tag" );
-				break;
-			}
-			if ( end_tag )
-			{
-				if ( e->name != e2->name )
-				{
-					delete e2;
-					throw XMLSyntaxErrorException ( f.Location (),
-					                                "end tag name mismatch" );
-					break;
-				}
-				delete e2;
-				break;
-			}
-			if ( e->value.size () > 0 && !bThisMixingErrorReported )
-			{
-				throw XMLSyntaxErrorException ( f.Location (),
-				                                "mixing of inner text with sub elements" );
-				bThisMixingErrorReported = true;
-			}
-			e->AddSubElement ( e2 );
-		}
-	}
-	return e;
-}
-
-void
-XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path )
-{
-	for ( ;; )
-	{
-		XMLElement* e = XMLParse ( f, &includes, path );
-		if ( !e )
-			return;
-		head.AddSubElement ( e );
-	}
-}
-
-XMLElement*
-XMLLoadInclude ( XMLInclude& include,
-	             XMLIncludes& includes )
-{
-	XMLAttribute* att;
-	att = include.e->GetAttribute("href", true);
-	assert(att);
-
-	string file ( include.path.Fixup(att->value, true) );
-	string top_file ( Path::RelativeFromWorkingDirectory ( file ) );
-	include.e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) );
-	XMLFile* fInc = new XMLFile();
-	if ( !fInc->open ( file ) )
-	{
-		include.fileExists = false;
-		// look for xi:fallback element
-		for ( size_t i = 0; i < include.e->subElements.size (); i++ )
-		{
-			XMLElement* e2 = include.e->subElements[i];
-			if ( e2->name == "xi:fallback" )
-			{
-				// now look for xi:include below...
-				for ( i = 0; i < e2->subElements.size (); i++ )
-				{
-					XMLElement* e3 = e2->subElements[i];
-					if ( e3->name == "xi:include" )
-					{
-						att = e3->GetAttribute ( "href", true );
-						assert ( att );
-						string includeFile ( include.path.Fixup ( att->value, true ) );
-						string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) );
-						XMLInclude* fallbackInclude = new XMLInclude ( e3, include.path, topIncludeFile );
-						return XMLLoadInclude ( *fallbackInclude, includes );
-					}
-				}
-				throw InvalidBuildFileException (
-					e2->location,
-					"<xi:fallback> must have a <xi:include> sub-element" );
-				return NULL;
-			}
-		}
-		return NULL;
-	}
-	else
-	{
-		include.fileExists = true;
-		XMLElement* new_e = new XMLElement ( fInc,
-		                                     include.e->location );
-		new_e->name = "xi:included";
-		Path path2 ( include.path, att->value );
-		XMLReadFile ( *fInc, *new_e, includes, path2 );
-		return new_e;
-	}
-}
-
-XMLElement*
-XMLLoadFile ( const string& filename,
-	          const Path& path,
-	          XMLIncludes& includes )
-{
-	XMLFile* f = new XMLFile();
-
-	if ( !f->open ( filename ) )
-		throw FileNotFoundException ( filename );
-
-	XMLElement* head = new XMLElement ( f,
-	                                    "(virtual)" );
-
-	XMLReadFile ( *f, *head, includes, path );
-
-	for ( size_t i = 0; i < includes.size (); i++ )
-	{
-		XMLElement* e = includes[i]->e;
-		XMLElement* e2 = XMLLoadInclude ( *includes[i], includes );
-		if ( !e2 )
-		{
-			throw FileNotFoundException (
-				ssprintf ( "%s (referenced from %s)",
-					e->GetAttribute ( "top_href", true )->value.c_str (),
-					f->Location ().c_str () ) );
-		}
-		XMLElement* parent = e->parentElement;
-		XMLElement** parent_container = NULL;
-		if ( !parent )
-		{
-			delete e;
-			throw Exception ( "internal tool error: xi:include doesn't have a parent" );
-			return NULL;
-		}
-		for ( size_t j = 0; j < parent->subElements.size (); j++ )
-		{
-			if ( parent->subElements[j] == e )
-			{
-				parent_container = &parent->subElements[j];
-				break;
-			}
-		}
-		if ( !parent_container )
-		{
-			delete e;
-			throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" );
-			return NULL;
-		}
-		// replace inclusion tree with the imported tree
-		e2->parentElement = e->parentElement;
-		e2->name = e->name;
-		e2->attributes = e->attributes;
-		*parent_container = e2;
-		e->attributes.resize ( 0 );
-		delete e;
-	}
-	return head;
-}
+// XML.cpp
+
+#include "pch.h"
+
+#ifdef _MSC_VER
+#define MAX_PATH _MAX_PATH
+#endif
+
+#ifdef WIN32
+#	include <direct.h>
+#	include <io.h>
+#else
+#	include <sys/stat.h>
+#	define MAX_PATH PATH_MAX
+#endif
+#include <assert.h>
+
+#include "XML.h"
+#include "exception.h"
+#include "ssprintf.h"
+
+using std::string;
+using std::vector;
+
+#ifdef WIN32
+#define getcwd _getcwd
+#endif//WIN32
+
+static const char* WS = " \t\r\n";
+static const char* WSEQ = " =\t\r\n";
+
+string working_directory;
+
+XMLIncludes::~XMLIncludes()
+{
+	for ( size_t i = 0; i < this->size(); i++ )
+		delete (*this)[i];
+}
+
+void
+InitWorkingDirectory()
+{
+	// store the current directory for path calculations
+	working_directory.resize ( _MAX_PATH );
+	working_directory[0] = 0;
+	getcwd ( &working_directory[0], working_directory.size() );
+	working_directory.resize ( strlen ( working_directory.c_str() ) );
+}
+
+#ifdef _MSC_VER
+unsigned __int64
+#else
+unsigned long long
+#endif
+filelen ( FILE* f )
+{
+#ifdef WIN32
+	return _filelengthi64 ( _fileno(f) );
+#else
+	struct stat64 file_stat;
+	if ( fstat64(fileno(f), &file_stat) != 0 )
+		return 0;
+	return file_stat.st_size;
+#endif
+}
+
+Path::Path()
+{
+	if ( !working_directory.size() )
+		InitWorkingDirectory();
+	string s ( working_directory );
+	const char* p = strtok ( &s[0], "/\\" );
+	while ( p )
+	{
+		if ( *p )
+			path.push_back ( p );
+		p = strtok ( NULL, "/\\" );
+	}
+}
+
+Path::Path ( const Path& cwd, const string& file )
+{
+	string s ( cwd.Fixup ( file, false ) );
+	const char* p = strtok ( &s[0], "/\\" );
+	while ( p )
+	{
+		if ( *p )
+			path.push_back ( p );
+		p = strtok ( NULL, "/\\" );
+	}
+}
+
+string
+Path::Fixup ( const string& file, bool include_filename ) const
+{
+	if ( strchr ( "/\\", file[0] )
+#ifdef WIN32
+		// this squirreliness is b/c win32 has drive letters and *nix doesn't...
+		|| file[1] == ':'
+#endif//WIN32
+		)
+	{
+		return file;
+	}
+	vector<string> pathtmp ( path );
+	string tmp ( file );
+	const char* prev = strtok ( &tmp[0], "/\\" );
+	const char* p = strtok ( NULL, "/\\" );
+	while ( p )
+	{
+		if ( !strcmp ( prev, "." ) )
+			; // do nothing
+		else if ( !strcmp ( prev, ".." ) )
+		{
+			// this squirreliness is b/c win32 has drive letters and *nix doesn't...
+#ifdef WIN32
+			if ( pathtmp.size() > 1 )
+#else
+			if ( pathtmp.size() )
+#endif
+				pathtmp.resize ( pathtmp.size() - 1 );
+		}
+		else
+			pathtmp.push_back ( prev );
+		prev = p;
+		p = strtok ( NULL, "/\\" );
+	}
+	if ( include_filename )
+		pathtmp.push_back ( prev );
+
+	// reuse tmp variable to return recombined path
+	tmp.resize(0);
+	for ( size_t i = 0; i < pathtmp.size(); i++ )
+	{
+		// this squirreliness is b/c win32 has drive letters and *nix doesn't...
+#ifdef WIN32
+		if ( i ) tmp += "/";
+#else
+		tmp += "/";
+#endif
+		tmp += pathtmp[i];
+	}
+	return tmp;
+}
+
+string
+Path::RelativeFromWorkingDirectory ()
+{
+	string out = "";
+	for ( size_t i = 0; i < path.size(); i++ )
+	{
+		out += "/" + path[i];
+	}
+	return RelativeFromWorkingDirectory ( out );
+}
+
+string
+Path::RelativeFromWorkingDirectory ( const string& path )
+{
+	vector<string> vwork, vpath, vout;
+	Path::Split ( vwork, working_directory, true );
+	Path::Split ( vpath, path, true );
+#ifdef WIN32
+	// this squirreliness is b/c win32 has drive letters and *nix doesn't...
+	// not possible to do relative across different drive letters
+	if ( vwork[0] != vpath[0] )
+		return path;
+#endif
+	size_t i = 0;
+	while ( i < vwork.size() && i < vpath.size() && vwork[i] == vpath[i] )
+		++i;
+	if ( i < vwork.size() )
+	{
+		// path goes above our working directory, we will need some ..'s
+		for ( size_t j = 0; j < i; j++ )
+			vout.push_back ( ".." );
+	}
+	while ( i < vpath.size() )
+		vout.push_back ( vpath[i++] );
+
+	// now merge vout into a string again
+	string out = vout[0];
+	for ( i = 1; i < vout.size(); i++ )
+	{
+		out += "/" + vout[i];
+	}
+	return out;
+}
+
+void
+Path::Split ( vector<string>& out,
+              const string& path,
+              bool include_last )
+{
+	string s ( path );
+	const char* prev = strtok ( &s[0], "/\\" );
+	const char* p = strtok ( NULL, "/\\" );
+	out.resize ( 0 );
+	while ( p )
+	{
+		out.push_back ( prev );
+		prev = p;
+		p = strtok ( NULL, "/\\" );
+	}
+	if ( include_last )
+		out.push_back ( prev );
+}
+
+XMLFile::XMLFile()
+{
+}
+
+void
+XMLFile::close()
+{
+	_buf.resize(0);
+	_p = _end = NULL;
+}
+
+bool
+XMLFile::open(const string& filename_)
+{
+	close();
+	FILE* f = fopen ( filename_.c_str(), "rb" );
+	if ( !f )
+		return false;
+	unsigned long len = (unsigned long)filelen(f);
+	_buf.resize ( len );
+	fread ( &_buf[0], 1, len, f );
+	fclose ( f );
+	_p = _buf.c_str();
+	_end = _p + len;
+	_filename = filename_;
+	next_token();
+	return true;
+}
+
+// next_token() moves the pointer to next token, which may be
+// an xml element or a text element, basically it's a glorified
+// skipspace, normally the user of this class won't need to call
+// this function
+void
+XMLFile::next_token()
+{
+	_p += strspn ( _p, WS );
+}
+
+bool
+XMLFile::next_is_text()
+{
+	return *_p != '<';
+}
+
+bool
+XMLFile::more_tokens()
+{
+	return _p != _end;
+}
+
+// get_token() is used to return a token, and move the pointer
+// past the token
+bool
+XMLFile::get_token(string& token)
+{
+	const char* tokend;
+	if ( !strncmp ( _p, "<!--", 4 ) )
+	{
+		tokend = strstr ( _p, "-->" );
+		if ( !tokend )
+			tokend = _end;
+		else
+			tokend += 3;
+	}
+	else if ( !strncmp ( _p, "<?", 2 ) )
+	{
+		tokend = strstr ( _p, "?>" );
+		if ( !tokend )
+			tokend = _end;
+		else
+			tokend += 2;
+	}
+	else if ( *_p == '<' )
+	{
+		tokend = strchr ( _p, '>' );
+		if ( !tokend )
+			tokend = _end;
+		else
+			++tokend;
+	}
+	else
+	{
+		tokend = strchr ( _p, '<' );
+		if ( !tokend )
+			tokend = _end;
+		while ( tokend > _p && isspace(tokend[-1]) )
+			--tokend;
+	}
+	if ( tokend == _p )
+		return false;
+	token = string ( _p, tokend-_p );
+	_p = tokend;
+	next_token();
+	return true;
+}
+
+string
+XMLFile::Location() const
+{
+	int line = 1;
+	const char* p = strchr ( _buf.c_str(), '\n' );
+	while ( p && p < _p )
+	{
+		++line;
+		p = strchr ( p+1, '\n' );
+	}
+	return ssprintf ( "%s(%i)",_filename.c_str(), line );
+}
+
+XMLAttribute::XMLAttribute()
+{
+}
+
+XMLAttribute::XMLAttribute(const string& name_,
+                           const string& value_)
+	: name(name_), value(value_)
+{
+}
+
+XMLAttribute::XMLAttribute ( const XMLAttribute& src )
+	: name(src.name), value(src.value)
+{
+
+}
+
+XMLAttribute& XMLAttribute::operator = ( const XMLAttribute& src )
+{
+	name = src.name;
+	value = src.value;
+	return *this;
+}
+
+XMLElement::XMLElement ( XMLFile* xmlFile,
+                         const string& location )
+	: xmlFile ( xmlFile ),
+	  location ( location ),
+	  parentElement ( NULL )
+{
+}
+
+XMLElement::~XMLElement()
+{
+	size_t i;
+	for ( i = 0; i < attributes.size(); i++ )
+		delete attributes[i];
+	for ( i = 0; i < subElements.size(); i++ )
+		delete subElements[i];
+}
+
+void
+XMLElement::AddSubElement ( XMLElement* e )
+{
+	subElements.push_back ( e );
+	e->parentElement = this;
+}
+
+// Parse()
+// This function takes a single xml tag ( i.e. beginning with '<' and
+// ending with '>', and parses out it's tag name and constituent
+// attributes.
+// Return Value: returns true if you need to look for a </tag> for
+// the one it just parsed...
+bool
+XMLElement::Parse(const string& token,
+                  bool& end_tag)
+{
+	const char* p = token.c_str();
+	assert ( *p == '<' );
+	++p;
+	p += strspn ( p, WS );
+
+	// check if this is a comment
+	if ( !strncmp ( p, "!--", 3 ) )
+	{
+		name = "!--";
+		end_tag = false;
+		return false; // never look for end tag to a comment
+	}
+
+	end_tag = ( *p == '/' );
+	if ( end_tag )
+	{
+		++p;
+		p += strspn ( p, WS );
+	}
+	const char* end = strpbrk ( p, WS );
+	if ( !end )
+	{
+		end = strpbrk ( p, "/>" );
+		assert ( end );
+	}
+	name = string ( p, end-p );
+	p = end;
+	p += strspn ( p, WS );
+	while ( *p != '>' && *p != '/' )
+	{
+		end = strpbrk ( p, WSEQ );
+		if ( !end )
+		{
+			end = strpbrk ( p, "/>" );
+			assert ( end );
+		}
+		string attribute ( p, end-p ), value;
+		p = end;
+		p += strspn ( p, WS );
+		if ( *p == '=' )
+		{
+			++p;
+			p += strspn ( p, WS );
+			char quote = 0;
+			if ( strchr ( "\"'", *p ) )
+			{
+				quote = *p++;
+				end = strchr ( p, quote );
+			}
+			else
+			{
+				end = strpbrk ( p, WS );
+			}
+			if ( !end )
+			{
+				end = strchr ( p, '>' );
+				assert(end);
+				if ( end[-1] == '/' )
+					end--;
+			}
+			value = string ( p, end-p );
+			p = end;
+			if ( quote && *p == quote )
+				p++;
+			p += strspn ( p, WS );
+		}
+		else if ( name[0] != '!' )
+		{
+			throw XMLSyntaxErrorException ( location,
+			                                "attributes must have values" );
+		}
+		attributes.push_back ( new XMLAttribute ( attribute, value ) );
+	}
+	return !( *p == '/' ) && !end_tag;
+}
+
+XMLAttribute*
+XMLElement::GetAttribute ( const string& attribute,
+                           bool required )
+{
+	// this would be faster with a tree-based container, but our attribute
+	// lists are likely to stay so short as to not be an issue.
+	for ( size_t i = 0; i < attributes.size(); i++ )
+	{
+		if ( attribute == attributes[i]->name )
+			return attributes[i];
+	}
+	if ( required )
+	{
+		throw RequiredAttributeNotFoundException ( location,
+		                                           attribute,
+		                                           name );
+	}
+	return NULL;
+}
+
+const XMLAttribute*
+XMLElement::GetAttribute ( const string& attribute,
+                           bool required ) const
+{
+	// this would be faster with a tree-based container, but our attribute
+	// lists are likely to stay so short as to not be an issue.
+	for ( size_t i = 0; i < attributes.size(); i++ )
+	{
+		if ( attribute == attributes[i]->name )
+			return attributes[i];
+	}
+	if ( required )
+	{
+		throw RequiredAttributeNotFoundException ( location,
+		                                           attribute,
+		                                           name );
+	}
+	return NULL;
+}
+
+// XMLParse()
+// This function reads a "token" from the file loaded in XMLFile
+// if it finds a tag that is non-singular, it parses sub-elements and/or
+// inner text into the XMLElement that it is building to return.
+// Return Value: an XMLElement allocated via the new operator that contains
+// it's parsed data. Keep calling this function until it returns NULL
+// (no more data)
+XMLElement*
+XMLParse ( XMLFile& f,
+           XMLIncludes* includes,
+           const Path& path,
+           bool* pend_tag = NULL )
+{
+	string token;
+	if ( !f.get_token(token) )
+		return NULL;
+	bool end_tag, is_include = false;
+
+	while ( token[0] != '<'
+	        || !strncmp ( token.c_str (), "<!--", 4 )
+	        || !strncmp ( token.c_str (), "<?", 2 ) )
+	{
+		if ( token[0] != '<' )
+			throw XMLSyntaxErrorException ( f.Location (),
+			                                "expecting xml tag, not '%s'",
+			                                token.c_str () );
+		if ( !f.get_token(token) )
+			return NULL;
+	}
+
+	XMLElement* e = new XMLElement ( &f,
+	                                 f.Location () );
+	bool bNeedEnd = e->Parse ( token, end_tag );
+
+	if ( e->name == "xi:include" && includes )
+	{
+		XMLAttribute* att;
+		att = e->GetAttribute ( "href", true );
+		assert ( att );
+		string includeFile ( path.Fixup ( att->value, true ) );
+		string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) );
+		includes->push_back ( new XMLInclude ( e, path, topIncludeFile ) );
+		is_include = true;
+	}
+
+	if ( !bNeedEnd )
+	{
+		if ( pend_tag )
+			*pend_tag = end_tag;
+		else if ( end_tag )
+		{
+			delete e;
+			throw XMLSyntaxErrorException ( f.Location (),
+			                                "end tag '%s' not expected",
+			                                token.c_str() );
+			return NULL;
+		}
+		return e;
+	}
+	bool bThisMixingErrorReported = false;
+	while ( f.more_tokens () )
+	{
+		if ( f.next_is_text () )
+		{
+			if ( !f.get_token ( token ) || token.size () == 0 )
+			{
+				throw InvalidBuildFileException (
+					f.Location(),
+					"internal tool error - get_token() failed when more_tokens() returned true" );
+				break;
+			}
+			if ( e->subElements.size() && !bThisMixingErrorReported )
+			{
+				throw XMLSyntaxErrorException ( f.Location (),
+				                                "mixing of inner text with sub elements" );
+				bThisMixingErrorReported = true;
+			}
+			if ( strchr ( token.c_str (), '>' ) )
+			{
+				throw XMLSyntaxErrorException ( f.Location (),
+				                                "invalid symbol '>'" );
+			}
+			if ( e->value.size() > 0 )
+			{
+				throw XMLSyntaxErrorException ( f.Location (),
+				                                "multiple instances of inner text" );
+				e->value += " " + token;
+			}
+			else
+				e->value = token;
+		}
+		else
+		{
+			XMLElement* e2 = XMLParse ( f, is_include ? NULL : includes, path, &end_tag );
+			if ( !e2 )
+			{
+				throw InvalidBuildFileException (
+					e->location,
+					"end of file found looking for end tag" );
+				break;
+			}
+			if ( end_tag )
+			{
+				if ( e->name != e2->name )
+				{
+					delete e2;
+					throw XMLSyntaxErrorException ( f.Location (),
+					                                "end tag name mismatch" );
+					break;
+				}
+				delete e2;
+				break;
+			}
+			if ( e->value.size () > 0 && !bThisMixingErrorReported )
+			{
+				throw XMLSyntaxErrorException ( f.Location (),
+				                                "mixing of inner text with sub elements" );
+				bThisMixingErrorReported = true;
+			}
+			e->AddSubElement ( e2 );
+		}
+	}
+	return e;
+}
+
+void
+XMLReadFile ( XMLFile& f, XMLElement& head, XMLIncludes& includes, const Path& path )
+{
+	for ( ;; )
+	{
+		XMLElement* e = XMLParse ( f, &includes, path );
+		if ( !e )
+			return;
+		head.AddSubElement ( e );
+	}
+}
+
+XMLElement*
+XMLLoadInclude ( XMLInclude& include,
+	             XMLIncludes& includes )
+{
+	XMLAttribute* att;
+	att = include.e->GetAttribute("href", true);
+	assert(att);
+
+	string file ( include.path.Fixup(att->value, true) );
+	string top_file ( Path::RelativeFromWorkingDirectory ( file ) );
+	include.e->attributes.push_back ( new XMLAttribute ( "top_href", top_file ) );
+	XMLFile* fInc = new XMLFile();
+	if ( !fInc->open ( file ) )
+	{
+		include.fileExists = false;
+		// look for xi:fallback element
+		for ( size_t i = 0; i < include.e->subElements.size (); i++ )
+		{
+			XMLElement* e2 = include.e->subElements[i];
+			if ( e2->name == "xi:fallback" )
+			{
+				// now look for xi:include below...
+				for ( i = 0; i < e2->subElements.size (); i++ )
+				{
+					XMLElement* e3 = e2->subElements[i];
+					if ( e3->name == "xi:include" )
+					{
+						att = e3->GetAttribute ( "href", true );
+						assert ( att );
+						string includeFile ( include.path.Fixup ( att->value, true ) );
+						string topIncludeFile ( Path::RelativeFromWorkingDirectory ( includeFile ) );
+						XMLInclude* fallbackInclude = new XMLInclude ( e3, include.path, topIncludeFile );
+						return XMLLoadInclude ( *fallbackInclude, includes );
+					}
+				}
+				throw InvalidBuildFileException (
+					e2->location,
+					"<xi:fallback> must have a <xi:include> sub-element" );
+				return NULL;
+			}
+		}
+		return NULL;
+	}
+	else
+	{
+		include.fileExists = true;
+		XMLElement* new_e = new XMLElement ( fInc,
+		                                     include.e->location );
+		new_e->name = "xi:included";
+		Path path2 ( include.path, att->value );
+		XMLReadFile ( *fInc, *new_e, includes, path2 );
+		return new_e;
+	}
+}
+
+XMLElement*
+XMLLoadFile ( const string& filename,
+	          const Path& path,
+	          XMLIncludes& includes )
+{
+	XMLFile* f = new XMLFile();
+
+	if ( !f->open ( filename ) )
+		throw FileNotFoundException ( filename );
+
+	XMLElement* head = new XMLElement ( f,
+	                                    "(virtual)" );
+
+	XMLReadFile ( *f, *head, includes, path );
+
+	for ( size_t i = 0; i < includes.size (); i++ )
+	{
+		XMLElement* e = includes[i]->e;
+		XMLElement* e2 = XMLLoadInclude ( *includes[i], includes );
+		if ( !e2 )
+		{
+			throw FileNotFoundException (
+				ssprintf ( "%s (referenced from %s)",
+					e->GetAttribute ( "top_href", true )->value.c_str (),
+					f->Location ().c_str () ) );
+		}
+		XMLElement* parent = e->parentElement;
+		XMLElement** parent_container = NULL;
+		if ( !parent )
+		{
+			delete e;
+			throw Exception ( "internal tool error: xi:include doesn't have a parent" );
+			return NULL;
+		}
+		for ( size_t j = 0; j < parent->subElements.size (); j++ )
+		{
+			if ( parent->subElements[j] == e )
+			{
+				parent_container = &parent->subElements[j];
+				break;
+			}
+		}
+		if ( !parent_container )
+		{
+			delete e;
+			throw Exception ( "internal tool error: couldn't find xi:include in parent's sub-elements" );
+			return NULL;
+		}
+		// replace inclusion tree with the imported tree
+		e2->parentElement = e->parentElement;
+		e2->name = e->name;
+		e2->attributes = e->attributes;
+		*parent_container = e2;
+		e->attributes.resize ( 0 );
+		delete e;
+	}
+	return head;
+}
diff --git a/reactos/tools/rbuild/XML.h b/reactos/tools/rbuild/XML.h
index 171f40205e2..8b1730a6616 100644
--- a/reactos/tools/rbuild/XML.h
+++ b/reactos/tools/rbuild/XML.h
@@ -1,116 +1,116 @@
-#ifndef XML_H
-#define XML_H
-
-#include "pch.h"
-
-class XMLElement;
-
-void
-InitWorkingDirectory();
-
-#ifdef _MSC_VER
-unsigned __int64
-#else
-unsigned long long
-#endif
-filelen ( FILE* f );
-
-class Path
-{
-	std::vector<std::string> path;
-public:
-	Path(); // initializes path to getcwd();
-	Path ( const Path& cwd, const std::string& filename );
-	std::string Fixup ( const std::string& filename, bool include_filename ) const;
-
-	std::string RelativeFromWorkingDirectory ();
-	static std::string RelativeFromWorkingDirectory ( const std::string& path );
-
-	static void Split ( std::vector<std::string>& out,
-	                    const std::string& path,
-	                    bool include_last );
-};
-
-class XMLInclude
-{
-public:
-	XMLElement *e;
-	Path path;
-	std::string topIncludeFilename;
-	bool fileExists;
-
-	XMLInclude ( XMLElement* e_, const Path& path_, const std::string topIncludeFilename_ )
-		: e ( e_ ), path ( path_ ), topIncludeFilename ( topIncludeFilename_ )
-	{
-	}
-};
-
-class XMLIncludes : public std::vector<XMLInclude*>
-{
-public:
-	~XMLIncludes();
-};
-
-class XMLFile
-{
-	friend class XMLElement;
-public:
-	XMLFile();
-	void close();
-	bool open(const std::string& filename);
-	void next_token();
-	bool next_is_text();
-	bool more_tokens();
-	bool get_token(std::string& token);
-	const std::string& filename() { return _filename; }
-	std::string Location() const;
-
-private:
-	std::string _buf, _filename;
-
-	const char *_p, *_end;
-};
-
-
-class XMLAttribute
-{
-public:
-	std::string name;
-	std::string value;
-
-	XMLAttribute();
-	XMLAttribute ( const std::string& name_, const std::string& value_ );
-	XMLAttribute ( const XMLAttribute& );
-	XMLAttribute& operator = ( const XMLAttribute& );
-};
-
-
-class XMLElement
-{
-public:
-	XMLFile* xmlFile;
-	std::string location;
-	std::string name;
-	std::vector<XMLAttribute*> attributes;
-	XMLElement* parentElement;
-	std::vector<XMLElement*> subElements;
-	std::string value;
-
-	XMLElement ( XMLFile* xmlFile,
-	             const std::string& location );
-	~XMLElement();
-	bool Parse(const std::string& token,
-	           bool& end_tag);
-	void AddSubElement ( XMLElement* e );
-	XMLAttribute* GetAttribute ( const std::string& attribute,
-	                             bool required);
-	const XMLAttribute* GetAttribute ( const std::string& attribute,
-	                                   bool required) const;
-};
-
-XMLElement*
-XMLLoadFile ( const std::string& filename,
-	          const Path& path,
-	          XMLIncludes& includes );
-
-#endif // XML_H
+#ifndef XML_H
+#define XML_H
+
+#include "pch.h"
+
+class XMLElement;
+
+void
+InitWorkingDirectory();
+
+#ifdef _MSC_VER
+unsigned __int64
+#else
+unsigned long long
+#endif
+filelen ( FILE* f );
+
+class Path
+{
+	std::vector<std::string> path;
+public:
+	Path(); // initializes path to getcwd();
+	Path ( const Path& cwd, const std::string& filename );
+	std::string Fixup ( const std::string& filename, bool include_filename ) const;
+
+	std::string RelativeFromWorkingDirectory ();
+	static std::string RelativeFromWorkingDirectory ( const std::string& path );
+
+	static void Split ( std::vector<std::string>& out,
+	                    const std::string& path,
+	                    bool include_last );
+};
+
+class XMLInclude
+{
+public:
+	XMLElement *e;
+	Path path;
+	std::string topIncludeFilename;
+	bool fileExists;
+
+	XMLInclude ( XMLElement* e_, const Path& path_, const std::string topIncludeFilename_ )
+		: e ( e_ ), path ( path_ ), topIncludeFilename ( topIncludeFilename_ )
+	{
+	}
+};
+
+class XMLIncludes : public std::vector<XMLInclude*>
+{
+public:
+	~XMLIncludes();
+};
+
+class XMLFile
+{
+	friend class XMLElement;
+public:
+	XMLFile();
+	void close();
+	bool open(const std::string& filename);
+	void next_token();
+	bool next_is_text();
+	bool more_tokens();
+	bool get_token(std::string& token);
+	const std::string& filename() { return _filename; }
+	std::string Location() const;
+
+private:
+	std::string _buf, _filename;
+
+	const char *_p, *_end;
+};
+
+
+class XMLAttribute
+{
+public:
+	std::string name;
+	std::string value;
+
+	XMLAttribute();
+	XMLAttribute ( const std::string& name_, const std::string& value_ );
+	XMLAttribute ( const XMLAttribute& );
+	XMLAttribute& operator = ( const XMLAttribute& );
+};
+
+
+class XMLElement
+{
+public:
+	XMLFile* xmlFile;
+	std::string location;
+	std::string name;
+	std::vector<XMLAttribute*> attributes;
+	XMLElement* parentElement;
+	std::vector<XMLElement*> subElements;
+	std::string value;
+
+	XMLElement ( XMLFile* xmlFile,
+	             const std::string& location );
+	~XMLElement();
+	bool Parse(const std::string& token,
+	           bool& end_tag);
+	void AddSubElement ( XMLElement* e );
+	XMLAttribute* GetAttribute ( const std::string& attribute,
+	                             bool required);
+	const XMLAttribute* GetAttribute ( const std::string& attribute,
+	                                   bool required) const;
+};
+
+XMLElement*
+XMLLoadFile ( const std::string& filename,
+	          const Path& path,
+	          XMLIncludes& includes );
+
+#endif // XML_H
diff --git a/reactos/tools/rbuild/automaticdependency.cpp b/reactos/tools/rbuild/automaticdependency.cpp
index 4e33bec5206..b4efa2c78e8 100644
--- a/reactos/tools/rbuild/automaticdependency.cpp
+++ b/reactos/tools/rbuild/automaticdependency.cpp
@@ -1,453 +1,453 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-/* Read at most this amount of bytes from each file and assume that all #includes are located within this block */
-#define MAX_BYTES_TO_READ 4096
-
-using std::string;
-using std::vector;
-using std::map;
-
-SourceFile::SourceFile ( AutomaticDependency* automaticDependency,
-                         Module& module,
-                         const string& filename,
-                         SourceFile* parent,
-                         bool isNonAutomaticDependency )
-	: automaticDependency ( automaticDependency ),
-	  module ( module ),
-	  filename ( filename ),
-	  isNonAutomaticDependency ( isNonAutomaticDependency ),
-	  youngestLastWriteTime ( 0 )
-{
-	if ( parent != NULL )
-		parents.push_back ( parent );
-	GetDirectoryAndFilenameParts ();
-}
-
-void
-SourceFile::GetDirectoryAndFilenameParts ()
-{
-	size_t index = filename.find_last_of ( CSEP );
-	if ( index != string::npos )
-	{
-		directoryPart = filename.substr ( 0, index );
-		filenamePart = filename.substr ( index + 1, filename.length () - index );
-	}
-	else
-	{
-		directoryPart = "";
-		filenamePart = filename;
-	}
-}
-
-void
-SourceFile::Close ()
-{
-	buf.resize ( 0 );
-	p = end = NULL;
-}
-
-void
-SourceFile::Open ()
-{
-	struct stat statbuf;
-
-	Close ();
-	FILE* f = fopen ( filename.c_str (), "rb" );
-	if ( !f )
-		throw FileNotFoundException ( filename );
-
-	if ( fstat ( fileno ( f ), &statbuf ) != 0 )
-	{
-		fclose ( f );
-		throw AccessDeniedException ( filename );
-	}
-	lastWriteTime = statbuf.st_mtime;
-
-	unsigned long len = (unsigned long) filelen ( f );
-	if ( len > MAX_BYTES_TO_READ )
-		len = MAX_BYTES_TO_READ;
-	buf.resize ( len );
-	fread ( &buf[0], 1, len, f );
-	fclose ( f );
-	p = buf.c_str ();
-	end = p + len;
-}
-
-void
-SourceFile::SkipWhitespace ()
-{
-	while ( p < end && isspace ( *p ))
-		p++;
-}
-
-bool
-SourceFile::ReadInclude ( string& filename,
-	                      bool& includeNext)
-{
-	while ( p < end )
-	{
-		if ( ( *p == '#') && ( end - p > 13 ) )
-		{
-			bool include = false;
-			p++;
-			SkipWhitespace ();
-			if ( strncmp ( p, "include ", 8 ) == 0 )
-			{
-				p += 8;
-				includeNext = false;
-				include = true;
-			}
-	        if ( strncmp ( p, "include_next ", 13 ) == 0 )
-	        {
-				p += 13;
-				includeNext = true;
-	        	include = true;
-	        }
-	        
-       		if ( include )
-			{
-				SkipWhitespace ();
-				if ( p < end && *p == '<' || *p == '"' )
-				{
-					p++;
-					filename.resize ( MAX_PATH );
-					int i = 0;
-					while ( p < end && *p != '>' && *p != '"' && *p != '\n' )
-						filename[i++] = *p++;
-					filename.resize ( i );
-					return true;
-				}
-			}
-		}
-		p++;
-	}
-	filename = "";
-	includeNext = false;
-	return false;
-}
-
-bool
-SourceFile::IsParentOf ( const SourceFile* parent,
-	                     const SourceFile* child )
-{
-	size_t i;
-	for ( i = 0; i < child->parents.size (); i++ )
-	{
-		if ( child->parents[i] != NULL )
-		{
-			if ( child->parents[i] == parent )
-				return true;
-		}
-	}
-	for ( i = 0; i < child->parents.size (); i++ )
-	{
-		if ( child->parents[i] != NULL )
-		{
-			if ( IsParentOf ( parent,
-			                  child->parents[i] ) )
-				return true;
-		}
-	}
-	return false;
-}
-
-bool
-SourceFile::IsIncludedFrom ( const string& normalizedFilename )
-{
-	if ( normalizedFilename == filename )
-		return true;
-	
-	SourceFile* sourceFile = automaticDependency->RetrieveFromCache ( normalizedFilename );
-	if ( sourceFile == NULL )
-		return false;
-
-	return IsParentOf ( sourceFile,
-	                    this );
-}
-
-SourceFile*
-SourceFile::GetParentSourceFile ()
-{
-	if ( isNonAutomaticDependency )
-		return NULL;
-	return this;
-}
-
-bool
-SourceFile::CanProcessFile ( const string& extension )
-{
-	if ( extension == ".h" || extension == ".H" )
-		return true;
-	if ( extension == ".c" || extension == ".C" )
-		return true;
-	if ( extension == ".cpp" || extension == ".CPP" )
-		return true;
-	if ( extension == ".rc" || extension == ".RC" )
-		return true;
-	if ( extension == ".s" || extension == ".S" )
-		return true;
-	return false;
-}
-
-SourceFile*
-SourceFile::ParseFile ( const string& normalizedFilename )
-{
-	string extension = GetExtension ( normalizedFilename );
-	if ( CanProcessFile ( extension ) )
-	{
-		if ( IsIncludedFrom ( normalizedFilename ) )
-			return NULL;
-		
-		SourceFile* sourceFile = automaticDependency->RetrieveFromCacheOrParse ( module,
-		                                                                         normalizedFilename,
-		                                                                         GetParentSourceFile () );
-		return sourceFile;
-	}
-	return NULL;
-}
-
-void
-SourceFile::Parse ()
-{
-	Open ();
-	while ( p < end )
-	{
-		string includedFilename ( "" );
-		
-		bool includeNext;
-		while ( ReadInclude ( includedFilename,
-		                      includeNext ) )
-		{
-			string resolvedFilename ( "" );
-			bool locatedFile = automaticDependency->LocateIncludedFile ( this,
-			                                                             module,
-			                                                             includedFilename,
-			                                                             includeNext,
-			                                                             resolvedFilename );
-			if ( locatedFile )
-			{
-				SourceFile* sourceFile = ParseFile ( resolvedFilename );
-				if ( sourceFile != NULL )
-					files.push_back ( sourceFile );
-			}
-		}
-		p++;
-	}
-	Close ();
-}
-
-string
-SourceFile::Location () const
-{
-	int line = 1;
-	const char* end_of_line = strchr ( buf.c_str (), '\n' );
-	while ( end_of_line && end_of_line < p )
-	{
-		++line;
-		end_of_line = strchr ( end_of_line + 1, '\n' );
-	}
-	return ssprintf ( "%s(%i)",
-	                  filename.c_str (),
-	                  line );
-}
-
-
-AutomaticDependency::AutomaticDependency ( const Project& project )
-	: project ( project )
-{
-}
-
-AutomaticDependency::~AutomaticDependency ()
-{
-	std::map<std::string, SourceFile*>::iterator theIterator;
-	for ( theIterator = sourcefile_map.begin (); theIterator != sourcefile_map.end (); theIterator++ )
-		delete theIterator->second;
-}
-
-void
-AutomaticDependency::Process ()
-{
-	for ( size_t i = 0; i < project.modules.size (); i++ )
-		ProcessModule ( *project.modules[i] );
-}
-
-void
-AutomaticDependency::ProcessModule ( Module& module )
-{
-	const vector<File*>& files = module.non_if_data.files;
-	for ( size_t i = 0; i < files.size (); i++ )
-		ProcessFile ( module, *files[i] );
-}
-
-void
-AutomaticDependency::ProcessFile ( Module& module,
-	                               const File& file )
-{
-	string normalizedFilename = NormalizeFilename ( file.name );
-	RetrieveFromCacheOrParse ( module,
-	                           normalizedFilename,
-	                           NULL );
-}
-
-bool
-AutomaticDependency::LocateIncludedFile ( const string& directory,
-	                                      const string& includedFilename,
-	                                      string& resolvedFilename )
-{
-	string normalizedFilename = NormalizeFilename ( directory + SSEP + includedFilename );
-	FILE* f = fopen ( normalizedFilename.c_str (), "rb" );
-	if ( f != NULL )
-	{
-		fclose ( f );
-		resolvedFilename = normalizedFilename;
-		return true;
-	}
-	resolvedFilename = "";
-	return false;
-}
-
-string
-AutomaticDependency::GetFilename ( const string& filename )
-{
-	size_t index = filename.find_last_of ( CSEP );
-	if (index == string::npos)
-		return filename;
-	else
-		return filename.substr ( index + 1,
-		                         filename.length () - index - 1);
-}
-
-bool
-AutomaticDependency::LocateIncludedFile ( SourceFile* sourceFile,
-	                                      Module& module,
-	                                      const string& includedFilename,
-	                                      bool includeNext,
-	                                      string& resolvedFilename )
-{
-	size_t i, j;
-	const vector<Include*>* pincludes;
-	for ( i = 0; i < 2; i++ )
-	{
-		if ( !i )
-			pincludes = &module.non_if_data.includes;
-		else
-			pincludes = &module.project.non_if_data.includes;
-		const vector<Include*>& includes = *pincludes;
-		for ( j = 0; j < includes.size (); j++ )
-		{
-			Include& include = *includes[j];
-			if ( LocateIncludedFile ( include.directory,
-									  includedFilename,
-									  resolvedFilename ) )
-			{
-				if ( includeNext && stricmp ( resolvedFilename.c_str (),
-											  sourceFile->filename.c_str () ) == 0 )
-					continue;
-				return true;
-			}
-		}
-	}
-
-	resolvedFilename = "";
-	return false;
-}
-
-SourceFile*
-AutomaticDependency::RetrieveFromCacheOrParse ( Module& module,
-	                                            const string& filename,
-	                                            SourceFile* parentSourceFile )
-{
-	SourceFile* sourceFile = sourcefile_map[filename];
-	if ( sourceFile == NULL )
-	{
-		sourceFile = new SourceFile ( this,
-		                              module,
-		                              filename,
-		                              parentSourceFile,
-		                              false );
-		sourcefile_map[filename] = sourceFile;
-		sourceFile->Parse ();
-	}
-	else if ( parentSourceFile != NULL )
-		sourceFile->parents.push_back ( parentSourceFile );
-	return sourceFile;
-}
-
-SourceFile*
-AutomaticDependency::RetrieveFromCache ( const string& filename )
-{
-	return sourcefile_map[filename];
-}
-
-void
-AutomaticDependency::CheckAutomaticDependencies ( bool verbose )
-{
-	struct utimbuf timebuf;
-	for ( size_t mi = 0; mi < project.modules.size (); mi++ )
-	{
-		const vector<File*>& files = project.modules[mi]->non_if_data.files;
-		for ( size_t fi = 0; fi < files.size (); fi++ )
-		{
-			File& file = *files[fi];
-			string normalizedFilename = NormalizeFilename ( file.name );
-
-			SourceFile* sourceFile = RetrieveFromCache ( normalizedFilename );
-			if ( sourceFile != NULL )
-			{
-				CheckAutomaticDependenciesForFile ( sourceFile );
-				assert ( sourceFile->youngestLastWriteTime != 0 );
-				if ( sourceFile->youngestLastWriteTime > sourceFile->lastWriteTime )
-				{
-					if ( verbose )
-					{
-						printf ( "Marking %s for rebuild due to younger file %s\n",
-						         sourceFile->filename.c_str (),
-						         sourceFile->youngestFile->filename.c_str () );
-					}
-					timebuf.actime = sourceFile->youngestLastWriteTime;
-					timebuf.modtime = sourceFile->youngestLastWriteTime;
-					utime ( sourceFile->filename.c_str (),
-					        &timebuf );
-				}
-			}
-		}
-	}
-}
-
-void
-AutomaticDependency::CheckAutomaticDependenciesForFile ( SourceFile* sourceFile )
-{
-	if ( sourceFile->youngestLastWriteTime > 0 )
-		return;
-
-	if ( sourceFile->files.size () == 0 )
-	{
-		sourceFile->youngestLastWriteTime = sourceFile->lastWriteTime;
-		sourceFile->youngestFile = sourceFile;
-		return;
-	}
-
-	for ( size_t i = 0; i < sourceFile->files.size (); i++ )
-	{
-		SourceFile* childSourceFile = sourceFile->files[i];
-		
-		CheckAutomaticDependenciesForFile ( childSourceFile );
-		if ( ( childSourceFile->youngestLastWriteTime > sourceFile->youngestLastWriteTime ) ||
-		     ( childSourceFile->lastWriteTime > sourceFile->youngestLastWriteTime ) )
-		{
-			if ( childSourceFile->youngestLastWriteTime > childSourceFile->lastWriteTime )
-			{
-				sourceFile->youngestLastWriteTime = childSourceFile->youngestLastWriteTime;
-				sourceFile->youngestFile = childSourceFile->youngestFile;
-			}
-			else
-			{
-				sourceFile->youngestLastWriteTime = childSourceFile->lastWriteTime;
-				sourceFile->youngestFile = childSourceFile;
-			}
-		}
-	}
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+/* Read at most this amount of bytes from each file and assume that all #includes are located within this block */
+#define MAX_BYTES_TO_READ 4096
+
+using std::string;
+using std::vector;
+using std::map;
+
+SourceFile::SourceFile ( AutomaticDependency* automaticDependency,
+                         Module& module,
+                         const string& filename,
+                         SourceFile* parent,
+                         bool isNonAutomaticDependency )
+	: automaticDependency ( automaticDependency ),
+	  module ( module ),
+	  filename ( filename ),
+	  isNonAutomaticDependency ( isNonAutomaticDependency ),
+	  youngestLastWriteTime ( 0 )
+{
+	if ( parent != NULL )
+		parents.push_back ( parent );
+	GetDirectoryAndFilenameParts ();
+}
+
+void
+SourceFile::GetDirectoryAndFilenameParts ()
+{
+	size_t index = filename.find_last_of ( CSEP );
+	if ( index != string::npos )
+	{
+		directoryPart = filename.substr ( 0, index );
+		filenamePart = filename.substr ( index + 1, filename.length () - index );
+	}
+	else
+	{
+		directoryPart = "";
+		filenamePart = filename;
+	}
+}
+
+void
+SourceFile::Close ()
+{
+	buf.resize ( 0 );
+	p = end = NULL;
+}
+
+void
+SourceFile::Open ()
+{
+	struct stat statbuf;
+
+	Close ();
+	FILE* f = fopen ( filename.c_str (), "rb" );
+	if ( !f )
+		throw FileNotFoundException ( filename );
+
+	if ( fstat ( fileno ( f ), &statbuf ) != 0 )
+	{
+		fclose ( f );
+		throw AccessDeniedException ( filename );
+	}
+	lastWriteTime = statbuf.st_mtime;
+
+	unsigned long len = (unsigned long) filelen ( f );
+	if ( len > MAX_BYTES_TO_READ )
+		len = MAX_BYTES_TO_READ;
+	buf.resize ( len );
+	fread ( &buf[0], 1, len, f );
+	fclose ( f );
+	p = buf.c_str ();
+	end = p + len;
+}
+
+void
+SourceFile::SkipWhitespace ()
+{
+	while ( p < end && isspace ( *p ))
+		p++;
+}
+
+bool
+SourceFile::ReadInclude ( string& filename,
+	                      bool& includeNext)
+{
+	while ( p < end )
+	{
+		if ( ( *p == '#') && ( end - p > 13 ) )
+		{
+			bool include = false;
+			p++;
+			SkipWhitespace ();
+			if ( strncmp ( p, "include ", 8 ) == 0 )
+			{
+				p += 8;
+				includeNext = false;
+				include = true;
+			}
+	        if ( strncmp ( p, "include_next ", 13 ) == 0 )
+	        {
+				p += 13;
+				includeNext = true;
+	        	include = true;
+	        }
+	        
+       		if ( include )
+			{
+				SkipWhitespace ();
+				if ( p < end && *p == '<' || *p == '"' )
+				{
+					p++;
+					filename.resize ( MAX_PATH );
+					int i = 0;
+					while ( p < end && *p != '>' && *p != '"' && *p != '\n' )
+						filename[i++] = *p++;
+					filename.resize ( i );
+					return true;
+				}
+			}
+		}
+		p++;
+	}
+	filename = "";
+	includeNext = false;
+	return false;
+}
+
+bool
+SourceFile::IsParentOf ( const SourceFile* parent,
+	                     const SourceFile* child )
+{
+	size_t i;
+	for ( i = 0; i < child->parents.size (); i++ )
+	{
+		if ( child->parents[i] != NULL )
+		{
+			if ( child->parents[i] == parent )
+				return true;
+		}
+	}
+	for ( i = 0; i < child->parents.size (); i++ )
+	{
+		if ( child->parents[i] != NULL )
+		{
+			if ( IsParentOf ( parent,
+			                  child->parents[i] ) )
+				return true;
+		}
+	}
+	return false;
+}
+
+bool
+SourceFile::IsIncludedFrom ( const string& normalizedFilename )
+{
+	if ( normalizedFilename == filename )
+		return true;
+	
+	SourceFile* sourceFile = automaticDependency->RetrieveFromCache ( normalizedFilename );
+	if ( sourceFile == NULL )
+		return false;
+
+	return IsParentOf ( sourceFile,
+	                    this );
+}
+
+SourceFile*
+SourceFile::GetParentSourceFile ()
+{
+	if ( isNonAutomaticDependency )
+		return NULL;
+	return this;
+}
+
+bool
+SourceFile::CanProcessFile ( const string& extension )
+{
+	if ( extension == ".h" || extension == ".H" )
+		return true;
+	if ( extension == ".c" || extension == ".C" )
+		return true;
+	if ( extension == ".cpp" || extension == ".CPP" )
+		return true;
+	if ( extension == ".rc" || extension == ".RC" )
+		return true;
+	if ( extension == ".s" || extension == ".S" )
+		return true;
+	return false;
+}
+
+SourceFile*
+SourceFile::ParseFile ( const string& normalizedFilename )
+{
+	string extension = GetExtension ( normalizedFilename );
+	if ( CanProcessFile ( extension ) )
+	{
+		if ( IsIncludedFrom ( normalizedFilename ) )
+			return NULL;
+		
+		SourceFile* sourceFile = automaticDependency->RetrieveFromCacheOrParse ( module,
+		                                                                         normalizedFilename,
+		                                                                         GetParentSourceFile () );
+		return sourceFile;
+	}
+	return NULL;
+}
+
+void
+SourceFile::Parse ()
+{
+	Open ();
+	while ( p < end )
+	{
+		string includedFilename ( "" );
+		
+		bool includeNext;
+		while ( ReadInclude ( includedFilename,
+		                      includeNext ) )
+		{
+			string resolvedFilename ( "" );
+			bool locatedFile = automaticDependency->LocateIncludedFile ( this,
+			                                                             module,
+			                                                             includedFilename,
+			                                                             includeNext,
+			                                                             resolvedFilename );
+			if ( locatedFile )
+			{
+				SourceFile* sourceFile = ParseFile ( resolvedFilename );
+				if ( sourceFile != NULL )
+					files.push_back ( sourceFile );
+			}
+		}
+		p++;
+	}
+	Close ();
+}
+
+string
+SourceFile::Location () const
+{
+	int line = 1;
+	const char* end_of_line = strchr ( buf.c_str (), '\n' );
+	while ( end_of_line && end_of_line < p )
+	{
+		++line;
+		end_of_line = strchr ( end_of_line + 1, '\n' );
+	}
+	return ssprintf ( "%s(%i)",
+	                  filename.c_str (),
+	                  line );
+}
+
+
+AutomaticDependency::AutomaticDependency ( const Project& project )
+	: project ( project )
+{
+}
+
+AutomaticDependency::~AutomaticDependency ()
+{
+	std::map<std::string, SourceFile*>::iterator theIterator;
+	for ( theIterator = sourcefile_map.begin (); theIterator != sourcefile_map.end (); theIterator++ )
+		delete theIterator->second;
+}
+
+void
+AutomaticDependency::Process ()
+{
+	for ( size_t i = 0; i < project.modules.size (); i++ )
+		ProcessModule ( *project.modules[i] );
+}
+
+void
+AutomaticDependency::ProcessModule ( Module& module )
+{
+	const vector<File*>& files = module.non_if_data.files;
+	for ( size_t i = 0; i < files.size (); i++ )
+		ProcessFile ( module, *files[i] );
+}
+
+void
+AutomaticDependency::ProcessFile ( Module& module,
+	                               const File& file )
+{
+	string normalizedFilename = NormalizeFilename ( file.name );
+	RetrieveFromCacheOrParse ( module,
+	                           normalizedFilename,
+	                           NULL );
+}
+
+bool
+AutomaticDependency::LocateIncludedFile ( const string& directory,
+	                                      const string& includedFilename,
+	                                      string& resolvedFilename )
+{
+	string normalizedFilename = NormalizeFilename ( directory + SSEP + includedFilename );
+	FILE* f = fopen ( normalizedFilename.c_str (), "rb" );
+	if ( f != NULL )
+	{
+		fclose ( f );
+		resolvedFilename = normalizedFilename;
+		return true;
+	}
+	resolvedFilename = "";
+	return false;
+}
+
+string
+AutomaticDependency::GetFilename ( const string& filename )
+{
+	size_t index = filename.find_last_of ( CSEP );
+	if (index == string::npos)
+		return filename;
+	else
+		return filename.substr ( index + 1,
+		                         filename.length () - index - 1);
+}
+
+bool
+AutomaticDependency::LocateIncludedFile ( SourceFile* sourceFile,
+	                                      Module& module,
+	                                      const string& includedFilename,
+	                                      bool includeNext,
+	                                      string& resolvedFilename )
+{
+	size_t i, j;
+	const vector<Include*>* pincludes;
+	for ( i = 0; i < 2; i++ )
+	{
+		if ( !i )
+			pincludes = &module.non_if_data.includes;
+		else
+			pincludes = &module.project.non_if_data.includes;
+		const vector<Include*>& includes = *pincludes;
+		for ( j = 0; j < includes.size (); j++ )
+		{
+			Include& include = *includes[j];
+			if ( LocateIncludedFile ( include.directory,
+									  includedFilename,
+									  resolvedFilename ) )
+			{
+				if ( includeNext && stricmp ( resolvedFilename.c_str (),
+											  sourceFile->filename.c_str () ) == 0 )
+					continue;
+				return true;
+			}
+		}
+	}
+
+	resolvedFilename = "";
+	return false;
+}
+
+SourceFile*
+AutomaticDependency::RetrieveFromCacheOrParse ( Module& module,
+	                                            const string& filename,
+	                                            SourceFile* parentSourceFile )
+{
+	SourceFile* sourceFile = sourcefile_map[filename];
+	if ( sourceFile == NULL )
+	{
+		sourceFile = new SourceFile ( this,
+		                              module,
+		                              filename,
+		                              parentSourceFile,
+		                              false );
+		sourcefile_map[filename] = sourceFile;
+		sourceFile->Parse ();
+	}
+	else if ( parentSourceFile != NULL )
+		sourceFile->parents.push_back ( parentSourceFile );
+	return sourceFile;
+}
+
+SourceFile*
+AutomaticDependency::RetrieveFromCache ( const string& filename )
+{
+	return sourcefile_map[filename];
+}
+
+void
+AutomaticDependency::CheckAutomaticDependencies ( bool verbose )
+{
+	struct utimbuf timebuf;
+	for ( size_t mi = 0; mi < project.modules.size (); mi++ )
+	{
+		const vector<File*>& files = project.modules[mi]->non_if_data.files;
+		for ( size_t fi = 0; fi < files.size (); fi++ )
+		{
+			File& file = *files[fi];
+			string normalizedFilename = NormalizeFilename ( file.name );
+
+			SourceFile* sourceFile = RetrieveFromCache ( normalizedFilename );
+			if ( sourceFile != NULL )
+			{
+				CheckAutomaticDependenciesForFile ( sourceFile );
+				assert ( sourceFile->youngestLastWriteTime != 0 );
+				if ( sourceFile->youngestLastWriteTime > sourceFile->lastWriteTime )
+				{
+					if ( verbose )
+					{
+						printf ( "Marking %s for rebuild due to younger file %s\n",
+						         sourceFile->filename.c_str (),
+						         sourceFile->youngestFile->filename.c_str () );
+					}
+					timebuf.actime = sourceFile->youngestLastWriteTime;
+					timebuf.modtime = sourceFile->youngestLastWriteTime;
+					utime ( sourceFile->filename.c_str (),
+					        &timebuf );
+				}
+			}
+		}
+	}
+}
+
+void
+AutomaticDependency::CheckAutomaticDependenciesForFile ( SourceFile* sourceFile )
+{
+	if ( sourceFile->youngestLastWriteTime > 0 )
+		return;
+
+	if ( sourceFile->files.size () == 0 )
+	{
+		sourceFile->youngestLastWriteTime = sourceFile->lastWriteTime;
+		sourceFile->youngestFile = sourceFile;
+		return;
+	}
+
+	for ( size_t i = 0; i < sourceFile->files.size (); i++ )
+	{
+		SourceFile* childSourceFile = sourceFile->files[i];
+		
+		CheckAutomaticDependenciesForFile ( childSourceFile );
+		if ( ( childSourceFile->youngestLastWriteTime > sourceFile->youngestLastWriteTime ) ||
+		     ( childSourceFile->lastWriteTime > sourceFile->youngestLastWriteTime ) )
+		{
+			if ( childSourceFile->youngestLastWriteTime > childSourceFile->lastWriteTime )
+			{
+				sourceFile->youngestLastWriteTime = childSourceFile->youngestLastWriteTime;
+				sourceFile->youngestFile = childSourceFile->youngestFile;
+			}
+			else
+			{
+				sourceFile->youngestLastWriteTime = childSourceFile->lastWriteTime;
+				sourceFile->youngestFile = childSourceFile;
+			}
+		}
+	}
+}
diff --git a/reactos/tools/rbuild/backend/backend.cpp b/reactos/tools/rbuild/backend/backend.cpp
index bbaffa7525c..c898ed37d60 100644
--- a/reactos/tools/rbuild/backend/backend.cpp
+++ b/reactos/tools/rbuild/backend/backend.cpp
@@ -1,62 +1,62 @@
-
-#include "../pch.h"
-
-#include "../rbuild.h"
-#include "backend.h"
-
-using std::string;
-using std::vector;
-using std::map;
-
-map<string,Backend::Factory*>*
-Backend::Factory::factories = NULL;
-int
-Backend::Factory::ref = 0;
-
-Backend::Factory::Factory ( const std::string& name_ )
-{
-	string name(name_);
-	strlwr ( &name[0] );
-	if ( !ref++ )
-		factories = new map<string,Factory*>;
-	(*factories)[name] = this;
-}
-
-Backend::Factory::~Factory ()
-{
-	if ( !--ref )
-	{
-		delete factories;
-		factories = NULL;
-	}
-}
-
-/*static*/ Backend*
-Backend::Factory::Create ( const string& name,
-                           Project& project,
-                           bool verbose,
-                           bool cleanAsYouGo )
-{
-	string sname ( name );
-	strlwr ( &sname[0] );
-	if ( !factories || !factories->size () )
-		throw InvalidOperationException ( __FILE__,
-		                                  __LINE__,
-		                                  "No registered factories" );
-	Backend::Factory* f = (*factories)[sname];
-	if ( !f )
-	{
-		throw UnknownBackendException ( sname );
-		return NULL;
-	}
-	return (*f) ( project, verbose, cleanAsYouGo );
-}
-
-Backend::Backend ( Project& project,
-                   bool verbose,
-                   bool cleanAsYouGo )
-	: ProjectNode ( project ),
-	  verbose ( verbose ),
-	  cleanAsYouGo ( cleanAsYouGo )
-{
-}
+
+#include "../pch.h"
+
+#include "../rbuild.h"
+#include "backend.h"
+
+using std::string;
+using std::vector;
+using std::map;
+
+map<string,Backend::Factory*>*
+Backend::Factory::factories = NULL;
+int
+Backend::Factory::ref = 0;
+
+Backend::Factory::Factory ( const std::string& name_ )
+{
+	string name(name_);
+	strlwr ( &name[0] );
+	if ( !ref++ )
+		factories = new map<string,Factory*>;
+	(*factories)[name] = this;
+}
+
+Backend::Factory::~Factory ()
+{
+	if ( !--ref )
+	{
+		delete factories;
+		factories = NULL;
+	}
+}
+
+/*static*/ Backend*
+Backend::Factory::Create ( const string& name,
+                           Project& project,
+                           bool verbose,
+                           bool cleanAsYouGo )
+{
+	string sname ( name );
+	strlwr ( &sname[0] );
+	if ( !factories || !factories->size () )
+		throw InvalidOperationException ( __FILE__,
+		                                  __LINE__,
+		                                  "No registered factories" );
+	Backend::Factory* f = (*factories)[sname];
+	if ( !f )
+	{
+		throw UnknownBackendException ( sname );
+		return NULL;
+	}
+	return (*f) ( project, verbose, cleanAsYouGo );
+}
+
+Backend::Backend ( Project& project,
+                   bool verbose,
+                   bool cleanAsYouGo )
+	: ProjectNode ( project ),
+	  verbose ( verbose ),
+	  cleanAsYouGo ( cleanAsYouGo )
+{
+}
diff --git a/reactos/tools/rbuild/backend/backend.h b/reactos/tools/rbuild/backend/backend.h
index 58498eec399..51a7861c348 100644
--- a/reactos/tools/rbuild/backend/backend.h
+++ b/reactos/tools/rbuild/backend/backend.h
@@ -1,47 +1,47 @@
-#ifndef __BACKEND_H
-#define __BACKEND_H
-
-#include "../rbuild.h"
-
-class Backend;
-
-typedef Backend* BackendFactory ( Project& project,
-                                  bool verbose );
-
-class Backend
-{
-public:
-	class Factory
-	{
-		static std::map<std::string,Factory*>* factories;
-		static int ref;
-
-	protected:
-
-		Factory ( const std::string& name_ );
-		virtual ~Factory();
-
-		virtual Backend* operator() ( Project&,
-		                              bool verbose,
-		                              bool cleanAsYouGo ) = 0;
-
-	public:
-		static Backend* Create ( const std::string& name,
-		                         Project& project,
-		                         bool verbose,
-		                         bool cleanAsYouGo );
-	};
-
-protected:
-	Backend ( Project& project,
-	          bool verbose,
-	          bool cleanAsYouGo );
-
-public:
-	virtual void Process () = 0;
-	Project& ProjectNode;
-	bool verbose;
-	bool cleanAsYouGo;
-};
-
-#endif /* __BACKEND_H */
+#ifndef __BACKEND_H
+#define __BACKEND_H
+
+#include "../rbuild.h"
+
+class Backend;
+
+typedef Backend* BackendFactory ( Project& project,
+                                  bool verbose );
+
+class Backend
+{
+public:
+	class Factory
+	{
+		static std::map<std::string,Factory*>* factories;
+		static int ref;
+
+	protected:
+
+		Factory ( const std::string& name_ );
+		virtual ~Factory();
+
+		virtual Backend* operator() ( Project&,
+		                              bool verbose,
+		                              bool cleanAsYouGo ) = 0;
+
+	public:
+		static Backend* Create ( const std::string& name,
+		                         Project& project,
+		                         bool verbose,
+		                         bool cleanAsYouGo );
+	};
+
+protected:
+	Backend ( Project& project,
+	          bool verbose,
+	          bool cleanAsYouGo );
+
+public:
+	virtual void Process () = 0;
+	Project& ProjectNode;
+	bool verbose;
+	bool cleanAsYouGo;
+};
+
+#endif /* __BACKEND_H */
diff --git a/reactos/tools/rbuild/backend/devcpp/devcpp.cpp b/reactos/tools/rbuild/backend/devcpp/devcpp.cpp
index 2fd892960ab..83ec32d7775 100644
--- a/reactos/tools/rbuild/backend/devcpp/devcpp.cpp
+++ b/reactos/tools/rbuild/backend/devcpp/devcpp.cpp
@@ -1,251 +1,251 @@
-/*
- * Dev-C++ Backend
- * Copyright (C) 2005  Trevor McCort
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifdef _MSC_VER
-#pragma warning ( disable : 4786 )
-#endif//_MSC_VER
-
-#include <iostream>
-#include <fstream>
-#include <string>
-
-#include "devcpp.h"
-
-using namespace std;
-
-static class DevCppFactory : public Backend::Factory
-{
-	public:
-
-		DevCppFactory() : Factory("devcpp") {}
-		Backend *operator() (Project &project,
-		                     bool verbose,
-		                     bool cleanAsYouGo)
-		{
-			return new DevCppBackend(project, verbose, cleanAsYouGo);
-		}
-		
-} factory;
-
-
-DevCppBackend::DevCppBackend(Project &project,
-                             bool verbose,
-                             bool cleanAsYouGo) : Backend(project, verbose, cleanAsYouGo)
-{
-	m_unitCount = 0;
-}
-
-void DevCppBackend::Process()
-{
-	string filename = ProjectNode.name + ".dev";
-	
-	cout << "Creating Dev-C++ project: " << filename << endl;
-
-	ProcessModules();
-
-	m_devFile.open(filename.c_str());
-
-	if(!m_devFile.is_open())
-	{
-		cout << "Could not open file." << endl;
-		return;
-	}
-
-	m_devFile << "[Project]" << endl;
-	
-	m_devFile	<< "FileName="				<< filename 		<< endl
-				<< "Name="					<< ProjectNode.name	<< endl
-				<< "UnitCount="				<< m_unitCount		<< endl
-				<< "Type=1"					<< endl
-				<< "Ver=1"					<< endl
-				<< "ObjFiles="				<< endl
-				<< "Includes="				<< endl
-				<< "Libs="					<< endl
-				<< "PrivateResource="		<< endl
-				<< "ResourceIncludes="		<< endl
-				<< "MakeIncludes="			<< endl
-				<< "Compiler="				<< endl
-				<< "CppCompiler="			<< endl
-				<< "Linker="				<< endl
-				<< "IsCpp=1"				<< endl
-				<< "Icon="					<< endl
-				<< "ExeOutput="				<< endl
-				<< "ObjectOutput="			<< endl
-				<< "OverrideOutput=0"		<< endl
-				<< "OverrideOutputName="	<< endl
-				<< "HostApplication="		<< endl
-				<< "CommandLine="			<< endl
-				<< "UseCustomMakefile=1"	<< endl
-				<< "CustomMakefile="		<< ProjectNode.makefile << endl
-				<< "IncludeVersionInto=0"	<< endl
-				<< "SupportXPThemes=0"		<< endl
-				<< "CompilerSet=0"			<< endl
-				
-				<< "CompilerSettings=0000000000000000000000" << endl;
-	
-	OutputFolders();
-
-	m_devFile << endl << endl;
-
-	OutputFileUnits();
-
-	m_devFile.close();
-	
-	// Dev-C++ needs a makefile, so use the MinGW backend to create one.
-	
-	cout << "Creating Makefile: " << ProjectNode.makefile << endl;
-	
-	Backend *backend = Backend::Factory::Create("mingw",
-	                                            ProjectNode,
-	                                            verbose,
-	                                            cleanAsYouGo );
-	backend->Process();
-	delete backend;
-
-	cout << "Done." << endl << endl;
-
-	cout	<< "You may want to disable Class browsing (see below) before you open this project in Dev-C++, as the "
-			<< "parsing required for large projects can take quite awhile."
-			<< endl << endl
-			<< "(Tools->Editor Options->Class browsing->Enable class browsing check box)"
-			<< endl << endl;
-}
-
-void DevCppBackend::ProcessModules()
-{
-	for(size_t i = 0; i < ProjectNode.modules.size(); i++)
-	{
-		Module &module = *ProjectNode.modules[i];
-
-		for(size_t k = 0; k < module.non_if_data.files.size(); k++)
-		{
-			File &file = *module.non_if_data.files[k];
-			
-			ProcessFile(file.name);
-		}
-	}
-}
-
-bool FileExists(string &filename)
-{
-	ifstream file(filename.c_str());
-
-	if(!file.is_open())
-		return false;
-
-	file.close();
-	return true;
-}
-
-void DevCppBackend::ProcessFile(string &filepath)
-{
-	// Remove the .\ at the start of the filenames
-	filepath.erase(0, 2);
-
-	if(!FileExists(filepath))
-		return;
-
-	// Change the \ to /
-	for(size_t i = 0; i < filepath.length(); i++)
-	{
-		if(filepath[i] == '\\')
-			filepath[i] = '/';
-	}
-
-	// Remove the filename from the path
-	string folder = "";
-
-	size_t pos = filepath.rfind(string("/"), filepath.length() - 1);
-
-	if(pos != string::npos)
-	{
-		folder = filepath;
-		folder.erase(pos, folder.length() - pos);
-	}
-	
-	FileUnit fileUnit;
-	fileUnit.filename = filepath;
-	fileUnit.folder = folder;
-
-	m_fileUnits.push_back(fileUnit);
-
-	if(folder != "")
-		AddFolders(folder);
-
-	m_unitCount++;
-}
-
-bool DevCppBackend::CheckFolderAdded(string &folder)
-{
-	for(size_t i = 0; i < m_folders.size(); i++)
-	{
-		if(m_folders[i] == folder)
-			return true;
-	}
-
-	return false;
-}
-
-void DevCppBackend::AddFolders(string &folder)
-{
-	// Check if this folder was already added. true if it was, false otherwise.
-	if(CheckFolderAdded(folder))
-		return;
-	
-	m_folders.push_back(folder);
-	
-	size_t pos = folder.rfind(string("/"), folder.length() - 1);
-
-	if(pos == string::npos)
-		return;
-
-	folder.erase(pos, folder.length() - pos);
-	AddFolders(folder);
-}
-
-void DevCppBackend::OutputFolders()
-{
-	m_devFile << "Folders=";
-
-	for(size_t i = 0; i < m_folders.size(); i++)
-	{
-		if(i > 0)
-			m_devFile << ",";
-
-		m_devFile << m_folders[i];
-	}
-}
-
-void DevCppBackend::OutputFileUnits()
-{
-	for(size_t i = 0; i < m_fileUnits.size(); i++)
-	{
-		m_devFile << "[Unit" << i + 1 << "]" << endl;
-		
-
-		m_devFile << "FileName="			<< m_fileUnits[i].filename << endl;
-		m_devFile << "CompileCpp=1" 		<< endl;
-		m_devFile << "Folder=" 				<< m_fileUnits[i].folder << endl;
-		m_devFile << "Compile=1"			<< endl;
-		m_devFile << "Link=1" 				<< endl;
-		m_devFile << "Priority=1000"		<< endl;
-		m_devFile << "OverrideBuildCmd=0"	<< endl;
-		m_devFile << "BuildCmd="			<< endl << endl;;
-	}
-}
+/*
+ * Dev-C++ Backend
+ * Copyright (C) 2005  Trevor McCort
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifdef _MSC_VER
+#pragma warning ( disable : 4786 )
+#endif//_MSC_VER
+
+#include <iostream>
+#include <fstream>
+#include <string>
+
+#include "devcpp.h"
+
+using namespace std;
+
+static class DevCppFactory : public Backend::Factory
+{
+	public:
+
+		DevCppFactory() : Factory("devcpp") {}
+		Backend *operator() (Project &project,
+		                     bool verbose,
+		                     bool cleanAsYouGo)
+		{
+			return new DevCppBackend(project, verbose, cleanAsYouGo);
+		}
+		
+} factory;
+
+
+DevCppBackend::DevCppBackend(Project &project,
+                             bool verbose,
+                             bool cleanAsYouGo) : Backend(project, verbose, cleanAsYouGo)
+{
+	m_unitCount = 0;
+}
+
+void DevCppBackend::Process()
+{
+	string filename = ProjectNode.name + ".dev";
+	
+	cout << "Creating Dev-C++ project: " << filename << endl;
+
+	ProcessModules();
+
+	m_devFile.open(filename.c_str());
+
+	if(!m_devFile.is_open())
+	{
+		cout << "Could not open file." << endl;
+		return;
+	}
+
+	m_devFile << "[Project]" << endl;
+	
+	m_devFile	<< "FileName="				<< filename 		<< endl
+				<< "Name="					<< ProjectNode.name	<< endl
+				<< "UnitCount="				<< m_unitCount		<< endl
+				<< "Type=1"					<< endl
+				<< "Ver=1"					<< endl
+				<< "ObjFiles="				<< endl
+				<< "Includes="				<< endl
+				<< "Libs="					<< endl
+				<< "PrivateResource="		<< endl
+				<< "ResourceIncludes="		<< endl
+				<< "MakeIncludes="			<< endl
+				<< "Compiler="				<< endl
+				<< "CppCompiler="			<< endl
+				<< "Linker="				<< endl
+				<< "IsCpp=1"				<< endl
+				<< "Icon="					<< endl
+				<< "ExeOutput="				<< endl
+				<< "ObjectOutput="			<< endl
+				<< "OverrideOutput=0"		<< endl
+				<< "OverrideOutputName="	<< endl
+				<< "HostApplication="		<< endl
+				<< "CommandLine="			<< endl
+				<< "UseCustomMakefile=1"	<< endl
+				<< "CustomMakefile="		<< ProjectNode.makefile << endl
+				<< "IncludeVersionInto=0"	<< endl
+				<< "SupportXPThemes=0"		<< endl
+				<< "CompilerSet=0"			<< endl
+				
+				<< "CompilerSettings=0000000000000000000000" << endl;
+	
+	OutputFolders();
+
+	m_devFile << endl << endl;
+
+	OutputFileUnits();
+
+	m_devFile.close();
+	
+	// Dev-C++ needs a makefile, so use the MinGW backend to create one.
+	
+	cout << "Creating Makefile: " << ProjectNode.makefile << endl;
+	
+	Backend *backend = Backend::Factory::Create("mingw",
+	                                            ProjectNode,
+	                                            verbose,
+	                                            cleanAsYouGo );
+	backend->Process();
+	delete backend;
+
+	cout << "Done." << endl << endl;
+
+	cout	<< "You may want to disable Class browsing (see below) before you open this project in Dev-C++, as the "
+			<< "parsing required for large projects can take quite awhile."
+			<< endl << endl
+			<< "(Tools->Editor Options->Class browsing->Enable class browsing check box)"
+			<< endl << endl;
+}
+
+void DevCppBackend::ProcessModules()
+{
+	for(size_t i = 0; i < ProjectNode.modules.size(); i++)
+	{
+		Module &module = *ProjectNode.modules[i];
+
+		for(size_t k = 0; k < module.non_if_data.files.size(); k++)
+		{
+			File &file = *module.non_if_data.files[k];
+			
+			ProcessFile(file.name);
+		}
+	}
+}
+
+bool FileExists(string &filename)
+{
+	ifstream file(filename.c_str());
+
+	if(!file.is_open())
+		return false;
+
+	file.close();
+	return true;
+}
+
+void DevCppBackend::ProcessFile(string &filepath)
+{
+	// Remove the .\ at the start of the filenames
+	filepath.erase(0, 2);
+
+	if(!FileExists(filepath))
+		return;
+
+	// Change the \ to /
+	for(size_t i = 0; i < filepath.length(); i++)
+	{
+		if(filepath[i] == '\\')
+			filepath[i] = '/';
+	}
+
+	// Remove the filename from the path
+	string folder = "";
+
+	size_t pos = filepath.rfind(string("/"), filepath.length() - 1);
+
+	if(pos != string::npos)
+	{
+		folder = filepath;
+		folder.erase(pos, folder.length() - pos);
+	}
+	
+	FileUnit fileUnit;
+	fileUnit.filename = filepath;
+	fileUnit.folder = folder;
+
+	m_fileUnits.push_back(fileUnit);
+
+	if(folder != "")
+		AddFolders(folder);
+
+	m_unitCount++;
+}
+
+bool DevCppBackend::CheckFolderAdded(string &folder)
+{
+	for(size_t i = 0; i < m_folders.size(); i++)
+	{
+		if(m_folders[i] == folder)
+			return true;
+	}
+
+	return false;
+}
+
+void DevCppBackend::AddFolders(string &folder)
+{
+	// Check if this folder was already added. true if it was, false otherwise.
+	if(CheckFolderAdded(folder))
+		return;
+	
+	m_folders.push_back(folder);
+	
+	size_t pos = folder.rfind(string("/"), folder.length() - 1);
+
+	if(pos == string::npos)
+		return;
+
+	folder.erase(pos, folder.length() - pos);
+	AddFolders(folder);
+}
+
+void DevCppBackend::OutputFolders()
+{
+	m_devFile << "Folders=";
+
+	for(size_t i = 0; i < m_folders.size(); i++)
+	{
+		if(i > 0)
+			m_devFile << ",";
+
+		m_devFile << m_folders[i];
+	}
+}
+
+void DevCppBackend::OutputFileUnits()
+{
+	for(size_t i = 0; i < m_fileUnits.size(); i++)
+	{
+		m_devFile << "[Unit" << i + 1 << "]" << endl;
+		
+
+		m_devFile << "FileName="			<< m_fileUnits[i].filename << endl;
+		m_devFile << "CompileCpp=1" 		<< endl;
+		m_devFile << "Folder=" 				<< m_fileUnits[i].folder << endl;
+		m_devFile << "Compile=1"			<< endl;
+		m_devFile << "Link=1" 				<< endl;
+		m_devFile << "Priority=1000"		<< endl;
+		m_devFile << "OverrideBuildCmd=0"	<< endl;
+		m_devFile << "BuildCmd="			<< endl << endl;;
+	}
+}
diff --git a/reactos/tools/rbuild/backend/devcpp/devcpp.h b/reactos/tools/rbuild/backend/devcpp/devcpp.h
index 6205049b41c..21a3f1c57b8 100644
--- a/reactos/tools/rbuild/backend/devcpp/devcpp.h
+++ b/reactos/tools/rbuild/backend/devcpp/devcpp.h
@@ -1,49 +1,49 @@
-
-#ifndef __DEVCPP_H__
-#define __DEVCPP_H__
-
-#include <fstream>
-#include <vector>
-#include <string>
-
-#include "../backend.h"
-
-class FileUnit
-{
-	public:
-		std::string filename;
-		std::string folder;
-};
-
-class DevCppBackend : public Backend
-{
-	public:
-
-		DevCppBackend(Project &project,
-	                  bool verbose,
-	                  bool cleanAsYouGo);
-		virtual ~DevCppBackend() {}
-
-		virtual void Process();
-
-	private:
-
-		void ProcessModules();
-		void ProcessFile(std::string &filename);
-		
-		bool CheckFolderAdded(std::string &folder);
-		void AddFolders(std::string &folder);
-
-		void OutputFolders();
-		void OutputFileUnits();
-		
-		std::vector<FileUnit> m_fileUnits;
-		std::vector<std::string> m_folders;
-
-		int m_unitCount;
-
-		std::ofstream m_devFile;
-};
-
-#endif // __DEVCPP_H__
-
+
+#ifndef __DEVCPP_H__
+#define __DEVCPP_H__
+
+#include <fstream>
+#include <vector>
+#include <string>
+
+#include "../backend.h"
+
+class FileUnit
+{
+	public:
+		std::string filename;
+		std::string folder;
+};
+
+class DevCppBackend : public Backend
+{
+	public:
+
+		DevCppBackend(Project &project,
+	                  bool verbose,
+	                  bool cleanAsYouGo);
+		virtual ~DevCppBackend() {}
+
+		virtual void Process();
+
+	private:
+
+		void ProcessModules();
+		void ProcessFile(std::string &filename);
+		
+		bool CheckFolderAdded(std::string &folder);
+		void AddFolders(std::string &folder);
+
+		void OutputFolders();
+		void OutputFileUnits();
+		
+		std::vector<FileUnit> m_fileUnits;
+		std::vector<std::string> m_folders;
+
+		int m_unitCount;
+
+		std::ofstream m_devFile;
+};
+
+#endif // __DEVCPP_H__
+
diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index 6dd9bddc419..51bd74a2d02 100644
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -1,833 +1,833 @@
-
-#include "../../pch.h"
-
-#include "mingw.h"
-#include <assert.h>
-#include <dirent.h>
-#include "modulehandler.h"
-
-#ifdef WIN32
-#define MKDIR(s) mkdir(s)
-#else
-#define MKDIR(s) mkdir(s, 0755)
-#endif
-
-using std::string;
-using std::vector;
-using std::set;
-using std::map;
-
-typedef set<string> set_string;
-
-
-string
-v2s ( const string_list& v, int wrap_at )
-{
-	if ( !v.size() )
-		return "";
-	string s;
-	int wrap_count = 0;
-	for ( size_t i = 0; i < v.size(); i++ )
-	{
-		if ( !v[i].size() )
-			continue;
-		if ( wrap_at > 0 && wrap_count++ == wrap_at )
-			s += " \\\n\t\t";
-		else if ( s.size() )
-			s += " ";
-		s += v[i];
-	}
-	return s;
-}
-
-
-/* static */ string
-Environment::GetVariable ( const string& name )
-{
-	char* value = getenv ( name.c_str () );
-	if ( value != NULL && strlen ( value ) > 0 )
-		return ssprintf ( "%s",
-		                  value );
-	else
-		return "";
-}
-
-
-Directory::Directory ( const string& name_ )
-	: name(name_)
-{
-}
-
-void
-Directory::Add ( const char* subdir )
-{
-	size_t i;
-	string s1 = string ( subdir );
-	if ( ( i = s1.find ( '$' ) ) != string::npos )
-	{
-		throw InvalidOperationException ( __FILE__,
-		                                  __LINE__,
-		                                  "No environment variables can be used here. Path was %s",
-		                                  subdir );
-	}
-
-	const char* p = strpbrk ( subdir, "/\\" );
-	if ( !p )
-		p = subdir + strlen(subdir);
-	string s ( subdir, p-subdir );
-	if ( subdirs.find(s) == subdirs.end() )
-		subdirs[s] = new Directory(s);
-	if ( *p && *++p )
-		subdirs[s]->Add ( p );
-}
-
-bool
-Directory::mkdir_p ( const char* path )
-{
-	DIR *directory;
-	directory = opendir ( path );
-	if ( directory != NULL )
-	{
-		closedir ( directory );
-		return false;
-	}
-
-	if ( MKDIR ( path ) != 0 )
-		throw AccessDeniedException ( string ( path ) );
-	return true;
-}
-
-bool
-Directory::CreateDirectory ( string path )
-{
-	size_t index = 0;
-	size_t nextIndex;
-	if ( isalpha ( path[0] ) && path[1] == ':' && path[2] == CSEP )
-	{
-		nextIndex = path.find ( CSEP, 3);
-	}
-	else
-		nextIndex = path.find ( CSEP );
-
-	bool directoryWasCreated = false;
-	while ( nextIndex != string::npos )
-	{
-		nextIndex = path.find ( CSEP, index + 1 );
-		directoryWasCreated = mkdir_p ( path.substr ( 0, nextIndex ).c_str () );
-		index = nextIndex;
-	}
-	return directoryWasCreated;
-}
-
-string
-Directory::ReplaceVariable ( string name,
-	                         string value,
-	                         string path )
-{
-	size_t i = path.find ( name );
-	if ( i != string::npos )
-		return path.replace ( i, name.length (), value );
-	else
-		return path;
-}
-
-string
-Directory::GetEnvironmentVariablePathOrDefault ( const string& name,
-	                                             const string& defaultValue )
-{
-	const string& environmentVariableValue = Environment::GetVariable ( name );
-	if ( environmentVariableValue.length () > 0 )
-		return NormalizeFilename ( environmentVariableValue );
-	else
-		return defaultValue;
-}
-
-string
-Directory::GetIntermediatePath ()
-{
-	return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE",
-	                                             "obj-i386" );
-}
-
-string
-Directory::GetOutputPath ()
-{
-	return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT",
-	                                             "output-i386" );
-}
-
-string
-Directory::GetInstallPath ()
-{
-	return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL",
-	                                             "reactos" );
-}
-
-void
-Directory::ResolveVariablesInPath ( char* buf,
-	                                string path )
-{
-	string s = ReplaceVariable ( "$(INTERMEDIATE)", GetIntermediatePath (), path );
-	s = ReplaceVariable ( "$(OUTPUT)", GetOutputPath (), s );
-	s = ReplaceVariable ( "$(INSTALL)", GetInstallPath (), s );
-	strcpy ( buf, s.c_str () );
-}
-
-void
-Directory::GenerateTree ( const string& parent,
-	                      bool verbose )
-{
-	string path;
-
-	if ( parent.size() )
-	{
-		char buf[256];
-		
-		path = parent + SSEP + name;
-		ResolveVariablesInPath ( buf, path );
-		if ( CreateDirectory ( buf ) && verbose )
-			printf ( "Created %s\n", buf );
-	}
-	else
-		path = name;
-
-	for ( directory_map::iterator i = subdirs.begin();
-		i != subdirs.end();
-		++i )
-	{
-		i->second->GenerateTree ( path, verbose );
-	}
-}
-
-
-static class MingwFactory : public Backend::Factory
-{
-public:
-	MingwFactory() : Factory ( "mingw" ) {}
-	Backend* operator() ( Project& project,
-	                      bool verbose,
-	                      bool cleanAsYouGo )
-	{
-		return new MingwBackend ( project,
-		                          verbose,
-		                          cleanAsYouGo );
-	}
-} factory;
-
-
-MingwBackend::MingwBackend ( Project& project,
-                             bool verbose,
-                             bool cleanAsYouGo )
-	: Backend ( project, verbose, cleanAsYouGo ),
-	  intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ),
-	  outputDirectory ( new Directory ( "$(OUTPUT)" ) ),
-	  installDirectory ( new Directory ( "$(INSTALL)" ) )
-{
-}
-
-MingwBackend::~MingwBackend()
-{
-	delete intermediateDirectory;
-	delete outputDirectory;
-	delete installDirectory;
-}
-
-string
-MingwBackend::AddDirectoryTarget ( const string& directory,
-	                               Directory* directoryTree )
-{
-	directoryTree->Add ( directory.c_str() );
-	return directoryTree->name;
-}
-
-void
-MingwBackend::ProcessModules ()
-{
-	printf ( "Processing modules..." );
-
-	vector<MingwModuleHandler*> v;
-	size_t i;
-	for ( i = 0; i < ProjectNode.modules.size (); i++ )
-	{
-		Module& module = *ProjectNode.modules[i];
-		MingwModuleHandler* h = MingwModuleHandler::InstanciateHandler (
-			module,
-			this );
-		if ( module.host == HostDefault )
-		{
-			module.host = h->DefaultHost();
-			assert ( module.host != HostDefault );
-		}
-		v.push_back ( h );
-	}
-
-	size_t iend = v.size ();
-
-	for ( i = 0; i < iend; i++ )
-		v[i]->GenerateObjectMacro();
-	fprintf ( fMakefile, "\n" );
-	for ( i = 0; i < iend; i++ )
-		v[i]->GenerateTargetMacro();
-	fprintf ( fMakefile, "\n" );
-
-	GenerateAllTarget ( v );
-	GenerateInitTarget ();
-
-	for ( i = 0; i < iend; i++ )
-		v[i]->GenerateOtherMacros();
-
-	for ( i = 0; i < iend; i++ )
-	{
-		MingwModuleHandler& h = *v[i];
-		h.GeneratePreconditionDependencies ();
-		h.Process ();
-		h.GenerateInvocations ();
-		h.GenerateCleanTarget ();
-		delete v[i];
-	}
-
-	printf ( "done\n" );
-}
-	
-void
-MingwBackend::Process ()
-{
-	DetectCompiler ();
-	DetectPipeSupport ();
-	DetectPCHSupport ();
-	CreateMakefile ();
-	GenerateHeader ();
-	GenerateGlobalVariables ();
-	GenerateXmlBuildFilesMacro ();
-	ProcessModules ();
-	GenerateInstallTarget ();
-	GenerateDirectories ();
-	CheckAutomaticDependencies ();
-	CloseMakefile ();
-}
-
-void
-MingwBackend::CreateMakefile ()
-{
-	fMakefile = fopen ( ProjectNode.makefile.c_str (), "w" );
-	if ( !fMakefile )
-		throw AccessDeniedException ( ProjectNode.makefile );
-	MingwModuleHandler::SetBackend ( this );
-	MingwModuleHandler::SetMakefile ( fMakefile );
-	MingwModuleHandler::SetUsePch ( use_pch );
-}
-
-void
-MingwBackend::CloseMakefile () const
-{
-	if (fMakefile)
-		fclose ( fMakefile );
-}
-
-void
-MingwBackend::GenerateHeader () const
-{
-	fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT 'ReactOS.xml' INSTEAD\n\n" );
-}
-
-void
-MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation,
-                                           IfableData& data ) const
-{
-	size_t i;
-
-	fprintf (
-		fMakefile,
-		"PROJECT_CFLAGS %s",
-		assignmentOperation );
-	for ( i = 0; i < data.includes.size(); i++ )
-	{
-		fprintf (
-			fMakefile,
-			" -I%s",
-			data.includes[i]->directory.c_str() );
-	}
-
-	for ( i = 0; i < data.defines.size(); i++ )
-	{
-		Define& d = *data.defines[i];
-		fprintf (
-			fMakefile,
-			" -D%s",
-			d.name.c_str() );
-		if ( d.value.size() )
-			fprintf (
-				fMakefile,
-				"=%s",
-				d.value.c_str() );
-	}
-	fprintf ( fMakefile, "\n" );
-}
-
-void
-MingwBackend::GenerateGlobalCFlagsAndProperties (
-	const char* assignmentOperation,
-	IfableData& data ) const
-{
-	size_t i;
-
-	for ( i = 0; i < data.properties.size(); i++ )
-	{
-		Property& prop = *data.properties[i];
-		fprintf ( fMakefile, "%s := %s\n",
-			prop.name.c_str(),
-			prop.value.c_str() );
-	}
-
-	if ( data.includes.size() || data.defines.size() )
-	{
-		GenerateProjectCFlagsMacro ( assignmentOperation,
-		                             data );
-	}
-
-	for ( i = 0; i < data.ifs.size(); i++ )
-	{
-		If& rIf = *data.ifs[i];
-		if ( rIf.data.defines.size()
-			|| rIf.data.includes.size()
-			|| rIf.data.ifs.size() )
-		{
-			fprintf (
-				fMakefile,
-				"ifeq (\"$(%s)\",\"%s\")\n",
-				rIf.property.c_str(),
-				rIf.value.c_str() );
-			GenerateGlobalCFlagsAndProperties (
-				"+=",
-				rIf.data );
-			fprintf (
-				fMakefile,
-				"endif\n\n" );
-		}
-	}
-}
-
-string
-MingwBackend::GenerateProjectLFLAGS () const
-{
-	string lflags;
-	for ( size_t i = 0; i < ProjectNode.linkerFlags.size (); i++ )
-	{
-		LinkerFlag& linkerFlag = *ProjectNode.linkerFlags[i];
-		if ( lflags.length () > 0 )
-			lflags += " ";
-		lflags += linkerFlag.flag;
-	}
-	return lflags;
-}
-
-void
-MingwBackend::GenerateGlobalVariables () const
-{
-	GenerateGlobalCFlagsAndProperties (
-		"=",
-		ProjectNode.non_if_data );
-
-	fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" );
-	fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" );
-	fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n",
-	          GenerateProjectLFLAGS ().c_str () );
-	fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
-	fprintf ( fMakefile, "\n" );
-}
-
-bool
-MingwBackend::IncludeInAllTarget ( const Module& module ) const
-{
-	if ( MingwModuleHandler::ReferenceObjects ( module ) )
-		return false;
-	if ( module.type == BootSector )
-		return false;
-	if ( module.type == Iso )
-		return false;
-	if ( module.type == LiveIso )
-		return false;
-	if ( module.type == Test )
-		return false;
-	return true;
-}
-
-void
-MingwBackend::GenerateAllTarget ( const vector<MingwModuleHandler*>& handlers ) const
-{
-	fprintf ( fMakefile, "all:" );
-	int wrap_count = 0;
-	size_t iend = handlers.size ();
-	for ( size_t i = 0; i < iend; i++ )
-	{
-		const Module& module = handlers[i]->module;
-		if ( IncludeInAllTarget ( module ) )
-		{
-			if ( wrap_count++ == 5 )
-				fprintf ( fMakefile, " \\\n\t\t" ), wrap_count = 0;
-			fprintf ( fMakefile,
-			          " %s",
-			          GetTargetMacro(module).c_str () );
-		}
-	}
-	fprintf ( fMakefile, "\n\t\n\n" );
-}
-
-string
-MingwBackend::GetBuildToolDependencies () const
-{
-	string dependencies;
-	for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
-	{
-		Module& module = *ProjectNode.modules[i];
-		if ( module.type == BuildTool )
-		{
-			if ( dependencies.length () > 0 )
-				dependencies += " ";
-			dependencies += module.GetDependencyPath ();
-		}
-	}
-	return dependencies;
-}
-
-void
-MingwBackend::GenerateInitTarget () const
-{
-	fprintf ( fMakefile,
-	          "INIT = %s\n",
-	          GetBuildToolDependencies ().c_str () );
-	fprintf ( fMakefile, "\n" );
-}
-
-void
-MingwBackend::GenerateXmlBuildFilesMacro() const
-{
-	fprintf ( fMakefile,
-	          "XMLBUILDFILES = %s \\\n",
-	          ProjectNode.GetProjectFilename ().c_str () );
-	string xmlbuildFilenames;
-	int numberOfExistingFiles = 0;
-	for ( size_t i = 0; i < ProjectNode.xmlbuildfiles.size (); i++ )
-	{
-		XMLInclude& xmlbuildfile = *ProjectNode.xmlbuildfiles[i];
-		if ( !xmlbuildfile.fileExists )
-			continue;
-		numberOfExistingFiles++;
-		if ( xmlbuildFilenames.length () > 0 )
-			xmlbuildFilenames += " ";
-		xmlbuildFilenames += NormalizeFilename ( xmlbuildfile.topIncludeFilename );
-		if ( numberOfExistingFiles % 5 == 4 || i == ProjectNode.xmlbuildfiles.size () - 1 )
-		{
-			fprintf ( fMakefile,
-			          "\t%s",
-			          xmlbuildFilenames.c_str ());
-			if ( i == ProjectNode.xmlbuildfiles.size () - 1 )
-			{
-				fprintf ( fMakefile, "\n" );
-			}
-			else
-			{
-				fprintf ( fMakefile,
-				          " \\\n",
-				          xmlbuildFilenames.c_str () );
-			}
-			xmlbuildFilenames.resize ( 0 );
-		}
-		numberOfExistingFiles++;
-	}
-	fprintf ( fMakefile, "\n" );
-}
-
-void
-MingwBackend::CheckAutomaticDependencies ()
-{
-	printf ( "Checking automatic dependencies..." );
-	AutomaticDependency automaticDependency ( ProjectNode );
-	automaticDependency.Process ();
-	automaticDependency.CheckAutomaticDependencies ( verbose );
-	printf ( "done\n" );
-}
-
-bool
-MingwBackend::IncludeDirectoryTarget ( const string& directory ) const
-{
-	if ( directory == "$(INTERMEDIATE)" SSEP "tools")
-		return false;
-	else
-		return true;
-}
-
-void
-MingwBackend::GenerateDirectories ()
-{
-	printf ( "Creating directories..." );
-	intermediateDirectory->GenerateTree ( "", verbose );
-	outputDirectory->GenerateTree ( "", verbose );
-	installDirectory->GenerateTree ( "", verbose );
-	printf ( "done\n" );
-}
-
-bool
-MingwBackend::TryToDetectThisCompiler ( const string& compiler )
-{
-	string command = ssprintf (
-		"%s -v 2>%s",
-		compiler.c_str (),
-		NUL );
-	int exitcode = system ( command.c_str () );
-	return (exitcode == 0);
-}
-
-void
-MingwBackend::DetectCompiler ()
-{
-	printf ( "Detecting compiler..." );
-
-	bool detectedCompiler = false;
-	const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
-	if ( ROS_PREFIXValue.length () > 0 )
-	{
-		compilerCommand = ROS_PREFIXValue + "-gcc";
-		detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
-	}
-#if defined(WIN32)
-	if ( !detectedCompiler )
-	{
-		compilerCommand = "gcc";
-		detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
-	}
-#endif
-	if ( !detectedCompiler )
-	{
-		compilerCommand = "mingw32-gcc";
-		detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
-	}
-	if ( detectedCompiler )
-		printf ( "detected (%s)\n", compilerCommand.c_str () );
-	else
-		printf ( "not detected\n" );
-}
-
-void
-MingwBackend::DetectPipeSupport ()
-{
-	printf ( "Detecting compiler -pipe support..." );
-
-	string pipe_detection = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pipe_detection.c";
-	string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection,
-	                                                         ".o" );
-	string command = ssprintf (
-		"%s -pipe -c %s -o %s 2>%s",
-		compilerCommand.c_str (),
-		pipe_detection.c_str (),
-		pipe_detectionObjectFilename.c_str (),
-		NUL );
-	int exitcode = system ( command.c_str () );
-	FILE* f = fopen ( pipe_detectionObjectFilename.c_str (), "rb" );
-	if ( f )
-	{
-		usePipe = (exitcode == 0);
-		fclose ( f );
-		unlink ( pipe_detectionObjectFilename.c_str () );
-	}
-	else
-		usePipe = false;
-
-	if ( usePipe )
-		printf ( "detected\n" );
-	else
-		printf ( "not detected\n" );
-}
-
-void
-MingwBackend::DetectPCHSupport ()
-{
-	printf ( "Detecting compiler pre-compiled header support..." );
-
-	string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h";
-	string cmd = ssprintf (
-		"%s -c %s 2>%s",
-		compilerCommand.c_str (),
-		path.c_str (),
-		NUL );
-	system ( cmd.c_str () );
-	path += ".gch";
-
-	FILE* f = fopen ( path.c_str (), "rb" );
-	if ( f )
-	{
-		use_pch = true;
-		fclose ( f );
-		unlink ( path.c_str () );
-	}
-	else
-		use_pch = false;
-
-	if ( use_pch )
-		printf ( "detected\n" );
-	else
-		printf ( "not detected\n" );
-}
-
-void
-MingwBackend::GetNonModuleInstallTargetFiles (
-	vector<string>& out ) const
-{
-	for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ )
-	{
-		const InstallFile& installfile = *ProjectNode.installfiles[i];
-		string targetFilenameNoFixup = installfile.base + SSEP + installfile.newname;
-		string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
-			NormalizeFilename ( targetFilenameNoFixup ),
-			installDirectory );
-		out.push_back ( targetFilename );
-	}
-}
-
-void
-MingwBackend::GetModuleInstallTargetFiles (
-	vector<string>& out ) const
-{
-	for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
-	{
-		const Module& module = *ProjectNode.modules[i];
-		if ( module.installName.length () > 0 )
-		{
-			string targetFilenameNoFixup = module.installBase + SSEP + module.installName;
-			string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
-				NormalizeFilename ( targetFilenameNoFixup ),
-				installDirectory );
-			out.push_back ( targetFilename );
-		}
-	}
-}
-
-void
-MingwBackend::GetInstallTargetFiles (
-	vector<string>& out ) const
-{
-	GetNonModuleInstallTargetFiles ( out );
-	GetModuleInstallTargetFiles ( out );
-}
-
-void
-MingwBackend::OutputInstallTarget ( const string& sourceFilename,
-	                                const string& targetFilename,
-	                                const string& targetDirectory )
-{
-	string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory (
-		NormalizeFilename ( targetDirectory + SSEP + targetFilename ),
-		installDirectory );
-	string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory (
-		NormalizeFilename ( targetDirectory ),
-		installDirectory );
-	fprintf ( fMakefile,
-	          "%s: %s %s\n",
-	          normalizedTargetFilename.c_str (),
-	          sourceFilename.c_str (),
-	          normalizedTargetDirectory.c_str () );
-	fprintf ( fMakefile,
-	          "\t$(ECHO_CP)\n" );
-	fprintf ( fMakefile,
-	          "\t${cp} %s %s 1>$(NUL)\n",
-	          sourceFilename.c_str (),
-	          normalizedTargetFilename.c_str () );
-}
-
-void
-MingwBackend::OutputNonModuleInstallTargets ()
-{
-	for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ )
-	{
-		const InstallFile& installfile = *ProjectNode.installfiles[i];
-		OutputInstallTarget ( installfile.GetPath (),
-	                          installfile.newname,
-	                          installfile.base );
-	}
-}
-
-void
-MingwBackend::OutputModuleInstallTargets ()
-{
-	for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
-	{
-		const Module& module = *ProjectNode.modules[i];
-		if ( module.installName.length () > 0 )
-		{
-			string sourceFilename = MingwModuleHandler::PassThruCacheDirectory (
-				NormalizeFilename ( module.GetPath () ),
-				outputDirectory );
-			OutputInstallTarget ( sourceFilename,
-		                          module.installName,
-		                          module.installBase );
-		}
-	}
-}
-
-string
-MingwBackend::GetRegistrySourceFiles ()
-{
-	return "bootdata" SSEP "hivecls.inf "
-		"bootdata" SSEP "hivedef.inf "
-		"bootdata" SSEP "hiveinst.inf "
-		"bootdata" SSEP "hivesft.inf "
-		"bootdata" SSEP "hivesys.inf";
-}
-
-string
-MingwBackend::GetRegistryTargetFiles ()
-{
-	string system32ConfigDirectory = NormalizeFilename (
-		MingwModuleHandler::PassThruCacheDirectory (
-		"system32" SSEP "config" SSEP,
-		installDirectory ) );
-	return system32ConfigDirectory + SSEP "default " +
-		system32ConfigDirectory + SSEP "sam " +
-		system32ConfigDirectory + SSEP "security " +
-		system32ConfigDirectory + SSEP "software " +
-		system32ConfigDirectory + SSEP "system";
-}
-
-void
-MingwBackend::OutputRegistryInstallTarget ()
-{
-	string system32ConfigDirectory = NormalizeFilename (
-		MingwModuleHandler::PassThruCacheDirectory (
-		"system32" SSEP "config" SSEP,
-		installDirectory ) );
-
-	string registrySourceFiles = GetRegistrySourceFiles ();
-	string registryTargetFiles = GetRegistryTargetFiles ();
-	fprintf ( fMakefile,
-	          "install_registry: %s\n",
-	          registryTargetFiles.c_str () );
-	fprintf ( fMakefile,
-	          "%s: %s %s $(MKHIVE_TARGET)\n",
-	          registryTargetFiles.c_str (),
-	          registrySourceFiles.c_str (),
-	          system32ConfigDirectory.c_str () );
-	fprintf ( fMakefile,
-	          "\t$(ECHO_MKHIVE)\n" );
-	fprintf ( fMakefile,
-	          "\t$(MKHIVE_TARGET) bootdata %s bootdata" SSEP "hiveinst.inf\n",
-	          system32ConfigDirectory.c_str () );
-	fprintf ( fMakefile,
-	          "\n" );
-}
-
-void
-MingwBackend::GenerateInstallTarget ()
-{
-	vector<string> vInstallTargetFiles;
-	GetInstallTargetFiles ( vInstallTargetFiles );
-	string installTargetFiles = v2s ( vInstallTargetFiles, 5 );
-
-	fprintf ( fMakefile,
-	          "install: %s install_registry\n",
-	          installTargetFiles.c_str () );
-	OutputNonModuleInstallTargets ();
-	OutputModuleInstallTargets ();
-	OutputRegistryInstallTarget ();
-	fprintf ( fMakefile,
-	          "\n" );
-}
+
+#include "../../pch.h"
+
+#include "mingw.h"
+#include <assert.h>
+#include <dirent.h>
+#include "modulehandler.h"
+
+#ifdef WIN32
+#define MKDIR(s) mkdir(s)
+#else
+#define MKDIR(s) mkdir(s, 0755)
+#endif
+
+using std::string;
+using std::vector;
+using std::set;
+using std::map;
+
+typedef set<string> set_string;
+
+
+string
+v2s ( const string_list& v, int wrap_at )
+{
+	if ( !v.size() )
+		return "";
+	string s;
+	int wrap_count = 0;
+	for ( size_t i = 0; i < v.size(); i++ )
+	{
+		if ( !v[i].size() )
+			continue;
+		if ( wrap_at > 0 && wrap_count++ == wrap_at )
+			s += " \\\n\t\t";
+		else if ( s.size() )
+			s += " ";
+		s += v[i];
+	}
+	return s;
+}
+
+
+/* static */ string
+Environment::GetVariable ( const string& name )
+{
+	char* value = getenv ( name.c_str () );
+	if ( value != NULL && strlen ( value ) > 0 )
+		return ssprintf ( "%s",
+		                  value );
+	else
+		return "";
+}
+
+
+Directory::Directory ( const string& name_ )
+	: name(name_)
+{
+}
+
+void
+Directory::Add ( const char* subdir )
+{
+	size_t i;
+	string s1 = string ( subdir );
+	if ( ( i = s1.find ( '$' ) ) != string::npos )
+	{
+		throw InvalidOperationException ( __FILE__,
+		                                  __LINE__,
+		                                  "No environment variables can be used here. Path was %s",
+		                                  subdir );
+	}
+
+	const char* p = strpbrk ( subdir, "/\\" );
+	if ( !p )
+		p = subdir + strlen(subdir);
+	string s ( subdir, p-subdir );
+	if ( subdirs.find(s) == subdirs.end() )
+		subdirs[s] = new Directory(s);
+	if ( *p && *++p )
+		subdirs[s]->Add ( p );
+}
+
+bool
+Directory::mkdir_p ( const char* path )
+{
+	DIR *directory;
+	directory = opendir ( path );
+	if ( directory != NULL )
+	{
+		closedir ( directory );
+		return false;
+	}
+
+	if ( MKDIR ( path ) != 0 )
+		throw AccessDeniedException ( string ( path ) );
+	return true;
+}
+
+bool
+Directory::CreateDirectory ( string path )
+{
+	size_t index = 0;
+	size_t nextIndex;
+	if ( isalpha ( path[0] ) && path[1] == ':' && path[2] == CSEP )
+	{
+		nextIndex = path.find ( CSEP, 3);
+	}
+	else
+		nextIndex = path.find ( CSEP );
+
+	bool directoryWasCreated = false;
+	while ( nextIndex != string::npos )
+	{
+		nextIndex = path.find ( CSEP, index + 1 );
+		directoryWasCreated = mkdir_p ( path.substr ( 0, nextIndex ).c_str () );
+		index = nextIndex;
+	}
+	return directoryWasCreated;
+}
+
+string
+Directory::ReplaceVariable ( string name,
+	                         string value,
+	                         string path )
+{
+	size_t i = path.find ( name );
+	if ( i != string::npos )
+		return path.replace ( i, name.length (), value );
+	else
+		return path;
+}
+
+string
+Directory::GetEnvironmentVariablePathOrDefault ( const string& name,
+	                                             const string& defaultValue )
+{
+	const string& environmentVariableValue = Environment::GetVariable ( name );
+	if ( environmentVariableValue.length () > 0 )
+		return NormalizeFilename ( environmentVariableValue );
+	else
+		return defaultValue;
+}
+
+string
+Directory::GetIntermediatePath ()
+{
+	return GetEnvironmentVariablePathOrDefault ( "ROS_INTERMEDIATE",
+	                                             "obj-i386" );
+}
+
+string
+Directory::GetOutputPath ()
+{
+	return GetEnvironmentVariablePathOrDefault ( "ROS_OUTPUT",
+	                                             "output-i386" );
+}
+
+string
+Directory::GetInstallPath ()
+{
+	return GetEnvironmentVariablePathOrDefault ( "ROS_INSTALL",
+	                                             "reactos" );
+}
+
+void
+Directory::ResolveVariablesInPath ( char* buf,
+	                                string path )
+{
+	string s = ReplaceVariable ( "$(INTERMEDIATE)", GetIntermediatePath (), path );
+	s = ReplaceVariable ( "$(OUTPUT)", GetOutputPath (), s );
+	s = ReplaceVariable ( "$(INSTALL)", GetInstallPath (), s );
+	strcpy ( buf, s.c_str () );
+}
+
+void
+Directory::GenerateTree ( const string& parent,
+	                      bool verbose )
+{
+	string path;
+
+	if ( parent.size() )
+	{
+		char buf[256];
+		
+		path = parent + SSEP + name;
+		ResolveVariablesInPath ( buf, path );
+		if ( CreateDirectory ( buf ) && verbose )
+			printf ( "Created %s\n", buf );
+	}
+	else
+		path = name;
+
+	for ( directory_map::iterator i = subdirs.begin();
+		i != subdirs.end();
+		++i )
+	{
+		i->second->GenerateTree ( path, verbose );
+	}
+}
+
+
+static class MingwFactory : public Backend::Factory
+{
+public:
+	MingwFactory() : Factory ( "mingw" ) {}
+	Backend* operator() ( Project& project,
+	                      bool verbose,
+	                      bool cleanAsYouGo )
+	{
+		return new MingwBackend ( project,
+		                          verbose,
+		                          cleanAsYouGo );
+	}
+} factory;
+
+
+MingwBackend::MingwBackend ( Project& project,
+                             bool verbose,
+                             bool cleanAsYouGo )
+	: Backend ( project, verbose, cleanAsYouGo ),
+	  intermediateDirectory ( new Directory ("$(INTERMEDIATE)" ) ),
+	  outputDirectory ( new Directory ( "$(OUTPUT)" ) ),
+	  installDirectory ( new Directory ( "$(INSTALL)" ) )
+{
+}
+
+MingwBackend::~MingwBackend()
+{
+	delete intermediateDirectory;
+	delete outputDirectory;
+	delete installDirectory;
+}
+
+string
+MingwBackend::AddDirectoryTarget ( const string& directory,
+	                               Directory* directoryTree )
+{
+	directoryTree->Add ( directory.c_str() );
+	return directoryTree->name;
+}
+
+void
+MingwBackend::ProcessModules ()
+{
+	printf ( "Processing modules..." );
+
+	vector<MingwModuleHandler*> v;
+	size_t i;
+	for ( i = 0; i < ProjectNode.modules.size (); i++ )
+	{
+		Module& module = *ProjectNode.modules[i];
+		MingwModuleHandler* h = MingwModuleHandler::InstanciateHandler (
+			module,
+			this );
+		if ( module.host == HostDefault )
+		{
+			module.host = h->DefaultHost();
+			assert ( module.host != HostDefault );
+		}
+		v.push_back ( h );
+	}
+
+	size_t iend = v.size ();
+
+	for ( i = 0; i < iend; i++ )
+		v[i]->GenerateObjectMacro();
+	fprintf ( fMakefile, "\n" );
+	for ( i = 0; i < iend; i++ )
+		v[i]->GenerateTargetMacro();
+	fprintf ( fMakefile, "\n" );
+
+	GenerateAllTarget ( v );
+	GenerateInitTarget ();
+
+	for ( i = 0; i < iend; i++ )
+		v[i]->GenerateOtherMacros();
+
+	for ( i = 0; i < iend; i++ )
+	{
+		MingwModuleHandler& h = *v[i];
+		h.GeneratePreconditionDependencies ();
+		h.Process ();
+		h.GenerateInvocations ();
+		h.GenerateCleanTarget ();
+		delete v[i];
+	}
+
+	printf ( "done\n" );
+}
+	
+void
+MingwBackend::Process ()
+{
+	DetectCompiler ();
+	DetectPipeSupport ();
+	DetectPCHSupport ();
+	CreateMakefile ();
+	GenerateHeader ();
+	GenerateGlobalVariables ();
+	GenerateXmlBuildFilesMacro ();
+	ProcessModules ();
+	GenerateInstallTarget ();
+	GenerateDirectories ();
+	CheckAutomaticDependencies ();
+	CloseMakefile ();
+}
+
+void
+MingwBackend::CreateMakefile ()
+{
+	fMakefile = fopen ( ProjectNode.makefile.c_str (), "w" );
+	if ( !fMakefile )
+		throw AccessDeniedException ( ProjectNode.makefile );
+	MingwModuleHandler::SetBackend ( this );
+	MingwModuleHandler::SetMakefile ( fMakefile );
+	MingwModuleHandler::SetUsePch ( use_pch );
+}
+
+void
+MingwBackend::CloseMakefile () const
+{
+	if (fMakefile)
+		fclose ( fMakefile );
+}
+
+void
+MingwBackend::GenerateHeader () const
+{
+	fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT 'ReactOS.xml' INSTEAD\n\n" );
+}
+
+void
+MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation,
+                                           IfableData& data ) const
+{
+	size_t i;
+
+	fprintf (
+		fMakefile,
+		"PROJECT_CFLAGS %s",
+		assignmentOperation );
+	for ( i = 0; i < data.includes.size(); i++ )
+	{
+		fprintf (
+			fMakefile,
+			" -I%s",
+			data.includes[i]->directory.c_str() );
+	}
+
+	for ( i = 0; i < data.defines.size(); i++ )
+	{
+		Define& d = *data.defines[i];
+		fprintf (
+			fMakefile,
+			" -D%s",
+			d.name.c_str() );
+		if ( d.value.size() )
+			fprintf (
+				fMakefile,
+				"=%s",
+				d.value.c_str() );
+	}
+	fprintf ( fMakefile, "\n" );
+}
+
+void
+MingwBackend::GenerateGlobalCFlagsAndProperties (
+	const char* assignmentOperation,
+	IfableData& data ) const
+{
+	size_t i;
+
+	for ( i = 0; i < data.properties.size(); i++ )
+	{
+		Property& prop = *data.properties[i];
+		fprintf ( fMakefile, "%s := %s\n",
+			prop.name.c_str(),
+			prop.value.c_str() );
+	}
+
+	if ( data.includes.size() || data.defines.size() )
+	{
+		GenerateProjectCFlagsMacro ( assignmentOperation,
+		                             data );
+	}
+
+	for ( i = 0; i < data.ifs.size(); i++ )
+	{
+		If& rIf = *data.ifs[i];
+		if ( rIf.data.defines.size()
+			|| rIf.data.includes.size()
+			|| rIf.data.ifs.size() )
+		{
+			fprintf (
+				fMakefile,
+				"ifeq (\"$(%s)\",\"%s\")\n",
+				rIf.property.c_str(),
+				rIf.value.c_str() );
+			GenerateGlobalCFlagsAndProperties (
+				"+=",
+				rIf.data );
+			fprintf (
+				fMakefile,
+				"endif\n\n" );
+		}
+	}
+}
+
+string
+MingwBackend::GenerateProjectLFLAGS () const
+{
+	string lflags;
+	for ( size_t i = 0; i < ProjectNode.linkerFlags.size (); i++ )
+	{
+		LinkerFlag& linkerFlag = *ProjectNode.linkerFlags[i];
+		if ( lflags.length () > 0 )
+			lflags += " ";
+		lflags += linkerFlag.flag;
+	}
+	return lflags;
+}
+
+void
+MingwBackend::GenerateGlobalVariables () const
+{
+	GenerateGlobalCFlagsAndProperties (
+		"=",
+		ProjectNode.non_if_data );
+
+	fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS)\n" );
+	fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS)\n" );
+	fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n",
+	          GenerateProjectLFLAGS ().c_str () );
+	fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
+	fprintf ( fMakefile, "\n" );
+}
+
+bool
+MingwBackend::IncludeInAllTarget ( const Module& module ) const
+{
+	if ( MingwModuleHandler::ReferenceObjects ( module ) )
+		return false;
+	if ( module.type == BootSector )
+		return false;
+	if ( module.type == Iso )
+		return false;
+	if ( module.type == LiveIso )
+		return false;
+	if ( module.type == Test )
+		return false;
+	return true;
+}
+
+void
+MingwBackend::GenerateAllTarget ( const vector<MingwModuleHandler*>& handlers ) const
+{
+	fprintf ( fMakefile, "all:" );
+	int wrap_count = 0;
+	size_t iend = handlers.size ();
+	for ( size_t i = 0; i < iend; i++ )
+	{
+		const Module& module = handlers[i]->module;
+		if ( IncludeInAllTarget ( module ) )
+		{
+			if ( wrap_count++ == 5 )
+				fprintf ( fMakefile, " \\\n\t\t" ), wrap_count = 0;
+			fprintf ( fMakefile,
+			          " %s",
+			          GetTargetMacro(module).c_str () );
+		}
+	}
+	fprintf ( fMakefile, "\n\t\n\n" );
+}
+
+string
+MingwBackend::GetBuildToolDependencies () const
+{
+	string dependencies;
+	for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
+	{
+		Module& module = *ProjectNode.modules[i];
+		if ( module.type == BuildTool )
+		{
+			if ( dependencies.length () > 0 )
+				dependencies += " ";
+			dependencies += module.GetDependencyPath ();
+		}
+	}
+	return dependencies;
+}
+
+void
+MingwBackend::GenerateInitTarget () const
+{
+	fprintf ( fMakefile,
+	          "INIT = %s\n",
+	          GetBuildToolDependencies ().c_str () );
+	fprintf ( fMakefile, "\n" );
+}
+
+void
+MingwBackend::GenerateXmlBuildFilesMacro() const
+{
+	fprintf ( fMakefile,
+	          "XMLBUILDFILES = %s \\\n",
+	          ProjectNode.GetProjectFilename ().c_str () );
+	string xmlbuildFilenames;
+	int numberOfExistingFiles = 0;
+	for ( size_t i = 0; i < ProjectNode.xmlbuildfiles.size (); i++ )
+	{
+		XMLInclude& xmlbuildfile = *ProjectNode.xmlbuildfiles[i];
+		if ( !xmlbuildfile.fileExists )
+			continue;
+		numberOfExistingFiles++;
+		if ( xmlbuildFilenames.length () > 0 )
+			xmlbuildFilenames += " ";
+		xmlbuildFilenames += NormalizeFilename ( xmlbuildfile.topIncludeFilename );
+		if ( numberOfExistingFiles % 5 == 4 || i == ProjectNode.xmlbuildfiles.size () - 1 )
+		{
+			fprintf ( fMakefile,
+			          "\t%s",
+			          xmlbuildFilenames.c_str ());
+			if ( i == ProjectNode.xmlbuildfiles.size () - 1 )
+			{
+				fprintf ( fMakefile, "\n" );
+			}
+			else
+			{
+				fprintf ( fMakefile,
+				          " \\\n",
+				          xmlbuildFilenames.c_str () );
+			}
+			xmlbuildFilenames.resize ( 0 );
+		}
+		numberOfExistingFiles++;
+	}
+	fprintf ( fMakefile, "\n" );
+}
+
+void
+MingwBackend::CheckAutomaticDependencies ()
+{
+	printf ( "Checking automatic dependencies..." );
+	AutomaticDependency automaticDependency ( ProjectNode );
+	automaticDependency.Process ();
+	automaticDependency.CheckAutomaticDependencies ( verbose );
+	printf ( "done\n" );
+}
+
+bool
+MingwBackend::IncludeDirectoryTarget ( const string& directory ) const
+{
+	if ( directory == "$(INTERMEDIATE)" SSEP "tools")
+		return false;
+	else
+		return true;
+}
+
+void
+MingwBackend::GenerateDirectories ()
+{
+	printf ( "Creating directories..." );
+	intermediateDirectory->GenerateTree ( "", verbose );
+	outputDirectory->GenerateTree ( "", verbose );
+	installDirectory->GenerateTree ( "", verbose );
+	printf ( "done\n" );
+}
+
+bool
+MingwBackend::TryToDetectThisCompiler ( const string& compiler )
+{
+	string command = ssprintf (
+		"%s -v 2>%s",
+		compiler.c_str (),
+		NUL );
+	int exitcode = system ( command.c_str () );
+	return (exitcode == 0);
+}
+
+void
+MingwBackend::DetectCompiler ()
+{
+	printf ( "Detecting compiler..." );
+
+	bool detectedCompiler = false;
+	const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
+	if ( ROS_PREFIXValue.length () > 0 )
+	{
+		compilerCommand = ROS_PREFIXValue + "-gcc";
+		detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
+	}
+#if defined(WIN32)
+	if ( !detectedCompiler )
+	{
+		compilerCommand = "gcc";
+		detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
+	}
+#endif
+	if ( !detectedCompiler )
+	{
+		compilerCommand = "mingw32-gcc";
+		detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
+	}
+	if ( detectedCompiler )
+		printf ( "detected (%s)\n", compilerCommand.c_str () );
+	else
+		printf ( "not detected\n" );
+}
+
+void
+MingwBackend::DetectPipeSupport ()
+{
+	printf ( "Detecting compiler -pipe support..." );
+
+	string pipe_detection = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pipe_detection.c";
+	string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection,
+	                                                         ".o" );
+	string command = ssprintf (
+		"%s -pipe -c %s -o %s 2>%s",
+		compilerCommand.c_str (),
+		pipe_detection.c_str (),
+		pipe_detectionObjectFilename.c_str (),
+		NUL );
+	int exitcode = system ( command.c_str () );
+	FILE* f = fopen ( pipe_detectionObjectFilename.c_str (), "rb" );
+	if ( f )
+	{
+		usePipe = (exitcode == 0);
+		fclose ( f );
+		unlink ( pipe_detectionObjectFilename.c_str () );
+	}
+	else
+		usePipe = false;
+
+	if ( usePipe )
+		printf ( "detected\n" );
+	else
+		printf ( "not detected\n" );
+}
+
+void
+MingwBackend::DetectPCHSupport ()
+{
+	printf ( "Detecting compiler pre-compiled header support..." );
+
+	string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h";
+	string cmd = ssprintf (
+		"%s -c %s 2>%s",
+		compilerCommand.c_str (),
+		path.c_str (),
+		NUL );
+	system ( cmd.c_str () );
+	path += ".gch";
+
+	FILE* f = fopen ( path.c_str (), "rb" );
+	if ( f )
+	{
+		use_pch = true;
+		fclose ( f );
+		unlink ( path.c_str () );
+	}
+	else
+		use_pch = false;
+
+	if ( use_pch )
+		printf ( "detected\n" );
+	else
+		printf ( "not detected\n" );
+}
+
+void
+MingwBackend::GetNonModuleInstallTargetFiles (
+	vector<string>& out ) const
+{
+	for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ )
+	{
+		const InstallFile& installfile = *ProjectNode.installfiles[i];
+		string targetFilenameNoFixup = installfile.base + SSEP + installfile.newname;
+		string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
+			NormalizeFilename ( targetFilenameNoFixup ),
+			installDirectory );
+		out.push_back ( targetFilename );
+	}
+}
+
+void
+MingwBackend::GetModuleInstallTargetFiles (
+	vector<string>& out ) const
+{
+	for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
+	{
+		const Module& module = *ProjectNode.modules[i];
+		if ( module.installName.length () > 0 )
+		{
+			string targetFilenameNoFixup = module.installBase + SSEP + module.installName;
+			string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
+				NormalizeFilename ( targetFilenameNoFixup ),
+				installDirectory );
+			out.push_back ( targetFilename );
+		}
+	}
+}
+
+void
+MingwBackend::GetInstallTargetFiles (
+	vector<string>& out ) const
+{
+	GetNonModuleInstallTargetFiles ( out );
+	GetModuleInstallTargetFiles ( out );
+}
+
+void
+MingwBackend::OutputInstallTarget ( const string& sourceFilename,
+	                                const string& targetFilename,
+	                                const string& targetDirectory )
+{
+	string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory (
+		NormalizeFilename ( targetDirectory + SSEP + targetFilename ),
+		installDirectory );
+	string normalizedTargetDirectory = MingwModuleHandler::PassThruCacheDirectory (
+		NormalizeFilename ( targetDirectory ),
+		installDirectory );
+	fprintf ( fMakefile,
+	          "%s: %s %s\n",
+	          normalizedTargetFilename.c_str (),
+	          sourceFilename.c_str (),
+	          normalizedTargetDirectory.c_str () );
+	fprintf ( fMakefile,
+	          "\t$(ECHO_CP)\n" );
+	fprintf ( fMakefile,
+	          "\t${cp} %s %s 1>$(NUL)\n",
+	          sourceFilename.c_str (),
+	          normalizedTargetFilename.c_str () );
+}
+
+void
+MingwBackend::OutputNonModuleInstallTargets ()
+{
+	for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ )
+	{
+		const InstallFile& installfile = *ProjectNode.installfiles[i];
+		OutputInstallTarget ( installfile.GetPath (),
+	                          installfile.newname,
+	                          installfile.base );
+	}
+}
+
+void
+MingwBackend::OutputModuleInstallTargets ()
+{
+	for ( size_t i = 0; i < ProjectNode.modules.size (); i++ )
+	{
+		const Module& module = *ProjectNode.modules[i];
+		if ( module.installName.length () > 0 )
+		{
+			string sourceFilename = MingwModuleHandler::PassThruCacheDirectory (
+				NormalizeFilename ( module.GetPath () ),
+				outputDirectory );
+			OutputInstallTarget ( sourceFilename,
+		                          module.installName,
+		                          module.installBase );
+		}
+	}
+}
+
+string
+MingwBackend::GetRegistrySourceFiles ()
+{
+	return "bootdata" SSEP "hivecls.inf "
+		"bootdata" SSEP "hivedef.inf "
+		"bootdata" SSEP "hiveinst.inf "
+		"bootdata" SSEP "hivesft.inf "
+		"bootdata" SSEP "hivesys.inf";
+}
+
+string
+MingwBackend::GetRegistryTargetFiles ()
+{
+	string system32ConfigDirectory = NormalizeFilename (
+		MingwModuleHandler::PassThruCacheDirectory (
+		"system32" SSEP "config" SSEP,
+		installDirectory ) );
+	return system32ConfigDirectory + SSEP "default " +
+		system32ConfigDirectory + SSEP "sam " +
+		system32ConfigDirectory + SSEP "security " +
+		system32ConfigDirectory + SSEP "software " +
+		system32ConfigDirectory + SSEP "system";
+}
+
+void
+MingwBackend::OutputRegistryInstallTarget ()
+{
+	string system32ConfigDirectory = NormalizeFilename (
+		MingwModuleHandler::PassThruCacheDirectory (
+		"system32" SSEP "config" SSEP,
+		installDirectory ) );
+
+	string registrySourceFiles = GetRegistrySourceFiles ();
+	string registryTargetFiles = GetRegistryTargetFiles ();
+	fprintf ( fMakefile,
+	          "install_registry: %s\n",
+	          registryTargetFiles.c_str () );
+	fprintf ( fMakefile,
+	          "%s: %s %s $(MKHIVE_TARGET)\n",
+	          registryTargetFiles.c_str (),
+	          registrySourceFiles.c_str (),
+	          system32ConfigDirectory.c_str () );
+	fprintf ( fMakefile,
+	          "\t$(ECHO_MKHIVE)\n" );
+	fprintf ( fMakefile,
+	          "\t$(MKHIVE_TARGET) bootdata %s bootdata" SSEP "hiveinst.inf\n",
+	          system32ConfigDirectory.c_str () );
+	fprintf ( fMakefile,
+	          "\n" );
+}
+
+void
+MingwBackend::GenerateInstallTarget ()
+{
+	vector<string> vInstallTargetFiles;
+	GetInstallTargetFiles ( vInstallTargetFiles );
+	string installTargetFiles = v2s ( vInstallTargetFiles, 5 );
+
+	fprintf ( fMakefile,
+	          "install: %s install_registry\n",
+	          installTargetFiles.c_str () );
+	OutputNonModuleInstallTargets ();
+	OutputModuleInstallTargets ();
+	OutputRegistryInstallTarget ();
+	fprintf ( fMakefile,
+	          "\n" );
+}
diff --git a/reactos/tools/rbuild/backend/mingw/mingw.h b/reactos/tools/rbuild/backend/mingw/mingw.h
index 90cc3cee7a5..84e706f9c90 100644
--- a/reactos/tools/rbuild/backend/mingw/mingw.h
+++ b/reactos/tools/rbuild/backend/mingw/mingw.h
@@ -1,112 +1,112 @@
-#ifndef MINGW_H
-#define MINGW_H
-
-#include "../backend.h"
-
-#ifdef WIN32
-	#define NUL "NUL"
-#else
-	#define NUL "/dev/null"
-#endif
-
-class Directory;
-class MingwModuleHandler;
-
-extern std::string
-v2s ( const string_list& v, int wrap_at );
-
-typedef std::map<std::string,Directory*> directory_map;
-
-
-class Environment
-{
-public:
-	static std::string GetVariable ( const std::string& name );
-};
-
-
-class Directory
-{
-public:
-	std::string name;
-	directory_map subdirs;
-	Directory ( const std::string& name );
-	void Add ( const char* subdir );
-	void GenerateTree ( const std::string& parent,
-	                    bool verbose );
-private:
-	bool mkdir_p ( const char* path );
-	std::string ReplaceVariable ( std::string name,
-	                              std::string value,
-	                              std::string path );
-	std::string GetEnvironmentVariable ( const std::string& name );
-	std::string GetEnvironmentVariablePathOrDefault ( const std::string& name,
-	                                                  const std::string& defaultValue );
-	std::string GetIntermediatePath ();
-	std::string GetOutputPath ();
-	std::string GetInstallPath ();
-	void ResolveVariablesInPath ( char* buf,
-	                              std::string path );
-	bool CreateDirectory ( std::string path );
-};
-
-
-class MingwBackend : public Backend
-{
-public:
-	MingwBackend ( Project& project,
-	               bool verbose,
-	               bool cleanAsYouGo );
-	virtual ~MingwBackend ();
-	virtual void Process ();
-	std::string AddDirectoryTarget ( const std::string& directory,
-	                                 Directory* directoryTree );
-	std::string compilerCommand;
-	bool usePipe;
-	Directory* intermediateDirectory;
-	Directory* outputDirectory;
-	Directory* installDirectory;
-private:
-	void CreateMakefile ();
-	void CloseMakefile () const;
-	void GenerateHeader () const;
-	void GenerateProjectCFlagsMacro ( const char* assignmentOperation,
-	                                  IfableData& data ) const;
-	void GenerateGlobalCFlagsAndProperties ( const char* op,
-	                                         IfableData& data ) const;
-	std::string GenerateProjectLFLAGS () const;
-	void GenerateDirectories ();
-	void GenerateGlobalVariables () const;
-	bool IncludeInAllTarget ( const Module& module ) const;
-	void GenerateAllTarget ( const std::vector<MingwModuleHandler*>& handlers ) const;
-	std::string GetBuildToolDependencies () const;
-	void GenerateInitTarget () const;
-	void GenerateXmlBuildFilesMacro() const;
-	void CheckAutomaticDependencies ();
-	bool IncludeDirectoryTarget ( const std::string& directory ) const;
-	bool TryToDetectThisCompiler ( const std::string& compiler );
-	void DetectCompiler ();
-	void DetectPipeSupport ();
-	void DetectPCHSupport ();
-	void ProcessModules ();
-	std::string GetNonModuleInstallDirectories ( const std::string& installDirectory );
-	std::string GetInstallDirectories ( const std::string& installDirectory );
-	void GetNonModuleInstallFiles ( std::vector<std::string>& out ) const;
-	void GetInstallFiles ( std::vector<std::string>& out ) const;
-	void GetNonModuleInstallTargetFiles ( std::vector<std::string>& out ) const;
-	void GetModuleInstallTargetFiles ( std::vector<std::string>& out ) const;
-	void GetInstallTargetFiles ( std::vector<std::string>& out ) const;
-	void OutputInstallTarget ( const std::string& sourceFilename,
-	                           const std::string& targetFilename,
-	                           const std::string& targetDirectory );
-	void OutputNonModuleInstallTargets ();
-	void OutputModuleInstallTargets ();
-	std::string GetRegistrySourceFiles ();
-	std::string GetRegistryTargetFiles ();
-	void OutputRegistryInstallTarget ();
-	void GenerateInstallTarget ();
-	FILE* fMakefile;
-	bool use_pch;
-};
-
-#endif /* MINGW_H */
+#ifndef MINGW_H
+#define MINGW_H
+
+#include "../backend.h"
+
+#ifdef WIN32
+	#define NUL "NUL"
+#else
+	#define NUL "/dev/null"
+#endif
+
+class Directory;
+class MingwModuleHandler;
+
+extern std::string
+v2s ( const string_list& v, int wrap_at );
+
+typedef std::map<std::string,Directory*> directory_map;
+
+
+class Environment
+{
+public:
+	static std::string GetVariable ( const std::string& name );
+};
+
+
+class Directory
+{
+public:
+	std::string name;
+	directory_map subdirs;
+	Directory ( const std::string& name );
+	void Add ( const char* subdir );
+	void GenerateTree ( const std::string& parent,
+	                    bool verbose );
+private:
+	bool mkdir_p ( const char* path );
+	std::string ReplaceVariable ( std::string name,
+	                              std::string value,
+	                              std::string path );
+	std::string GetEnvironmentVariable ( const std::string& name );
+	std::string GetEnvironmentVariablePathOrDefault ( const std::string& name,
+	                                                  const std::string& defaultValue );
+	std::string GetIntermediatePath ();
+	std::string GetOutputPath ();
+	std::string GetInstallPath ();
+	void ResolveVariablesInPath ( char* buf,
+	                              std::string path );
+	bool CreateDirectory ( std::string path );
+};
+
+
+class MingwBackend : public Backend
+{
+public:
+	MingwBackend ( Project& project,
+	               bool verbose,
+	               bool cleanAsYouGo );
+	virtual ~MingwBackend ();
+	virtual void Process ();
+	std::string AddDirectoryTarget ( const std::string& directory,
+	                                 Directory* directoryTree );
+	std::string compilerCommand;
+	bool usePipe;
+	Directory* intermediateDirectory;
+	Directory* outputDirectory;
+	Directory* installDirectory;
+private:
+	void CreateMakefile ();
+	void CloseMakefile () const;
+	void GenerateHeader () const;
+	void GenerateProjectCFlagsMacro ( const char* assignmentOperation,
+	                                  IfableData& data ) const;
+	void GenerateGlobalCFlagsAndProperties ( const char* op,
+	                                         IfableData& data ) const;
+	std::string GenerateProjectLFLAGS () const;
+	void GenerateDirectories ();
+	void GenerateGlobalVariables () const;
+	bool IncludeInAllTarget ( const Module& module ) const;
+	void GenerateAllTarget ( const std::vector<MingwModuleHandler*>& handlers ) const;
+	std::string GetBuildToolDependencies () const;
+	void GenerateInitTarget () const;
+	void GenerateXmlBuildFilesMacro() const;
+	void CheckAutomaticDependencies ();
+	bool IncludeDirectoryTarget ( const std::string& directory ) const;
+	bool TryToDetectThisCompiler ( const std::string& compiler );
+	void DetectCompiler ();
+	void DetectPipeSupport ();
+	void DetectPCHSupport ();
+	void ProcessModules ();
+	std::string GetNonModuleInstallDirectories ( const std::string& installDirectory );
+	std::string GetInstallDirectories ( const std::string& installDirectory );
+	void GetNonModuleInstallFiles ( std::vector<std::string>& out ) const;
+	void GetInstallFiles ( std::vector<std::string>& out ) const;
+	void GetNonModuleInstallTargetFiles ( std::vector<std::string>& out ) const;
+	void GetModuleInstallTargetFiles ( std::vector<std::string>& out ) const;
+	void GetInstallTargetFiles ( std::vector<std::string>& out ) const;
+	void OutputInstallTarget ( const std::string& sourceFilename,
+	                           const std::string& targetFilename,
+	                           const std::string& targetDirectory );
+	void OutputNonModuleInstallTargets ();
+	void OutputModuleInstallTargets ();
+	std::string GetRegistrySourceFiles ();
+	std::string GetRegistryTargetFiles ();
+	void OutputRegistryInstallTarget ();
+	void GenerateInstallTarget ();
+	FILE* fMakefile;
+	bool use_pch;
+};
+
+#endif /* MINGW_H */
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index a8c0c49da62..50584897e71 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -1,2919 +1,2919 @@
-#include "../../pch.h"
-#include <assert.h>
-
-#include "../../rbuild.h"
-#include "mingw.h"
-#include "modulehandler.h"
-
-using std::string;
-using std::vector;
-
-#define CLEAN_FILE(f) clean_files.push_back ( f );
-
-static string ros_temp = "$(TEMPORARY)";
-MingwBackend*
-MingwModuleHandler::backend = NULL;
-FILE*
-MingwModuleHandler::fMakefile = NULL;
-bool
-MingwModuleHandler::use_pch = false;
-
-string
-PrefixFilename (
-	const string& filename,
-	const string& prefix )
-{
-	if ( !prefix.length() )
-		return filename;
-	string out;
-	const char* pfilename = filename.c_str();
-	const char* p1 = strrchr ( pfilename, '/' );
-	const char* p2 = strrchr ( pfilename, '\\' );
-	if ( p1 || p2 )
-	{
-		if ( p2 > p1 )
-			p1 = p2;
-		out += string(pfilename,p1-pfilename) + CSEP;
-		pfilename = p1 + 1;
-	}
-	out += prefix + pfilename;
-	return out;
-}
-
-string
-GetTargetMacro ( const Module& module, bool with_dollar )
-{
-	string s ( module.name );
-	strupr ( &s[0] );
-	s += "_TARGET";
-	if ( with_dollar )
-		return ssprintf ( "$(%s)", s.c_str() );
-	return s;
-}
-
-MingwModuleHandler::MingwModuleHandler (
-	const Module& module_ )
-
-	: module(module_)
-{
-}
-
-MingwModuleHandler::~MingwModuleHandler()
-{
-}
-
-/*static*/ void
-MingwModuleHandler::SetBackend ( MingwBackend* backend_ )
-{
-	backend = backend_;
-}
-
-/*static*/ void
-MingwModuleHandler::SetMakefile ( FILE* f )
-{
-	fMakefile = f;
-}
-
-/*static*/ void
-MingwModuleHandler::SetUsePch ( bool b )
-{
-	use_pch = b;
-}
-
-/* static*/ string
-MingwModuleHandler::RemoveVariables ( string path)
-{
-	size_t i = path.find ( '$' );
-	if ( i != string::npos )
-	{
-		size_t j = path.find ( ')', i );
-		if ( j != string::npos )
-		{
-			if ( j + 2 < path.length () && path[j + 1] == CSEP )
-				return path.substr ( j + 2);
-			else
-				return path.substr ( j + 1);
-		}
-	}
-	return path;
-}
-
-/*static*/ string
-MingwModuleHandler::PassThruCacheDirectory (
-	const string &file,
-	Directory* directoryTree )
-{
-	string directory ( GetDirectory ( RemoveVariables ( file ) ) );
-	string generatedFilesDirectory = backend->AddDirectoryTarget ( directory,
-	                                                               directoryTree );
-	if ( directory.find ( generatedFilesDirectory ) != string::npos )
-		/* This path already includes the generated files directory variable */
-		return file;
-	else
-		return generatedFilesDirectory + SSEP + file;
-}
-
-/*static*/ string
-MingwModuleHandler::GetTargetFilename (
-	const Module& module,
-	string_list* pclean_files )
-{
-	string target = PassThruCacheDirectory (
-		NormalizeFilename ( module.GetPath () ),
-		backend->outputDirectory );
-	if ( pclean_files )
-	{
-		string_list& clean_files = *pclean_files;
-		CLEAN_FILE ( target );
-	}
-	return target;
-}
-
-/*static*/ string
-MingwModuleHandler::GetImportLibraryFilename (
-	const Module& module,
-	string_list* pclean_files )
-{
-	string target = PassThruCacheDirectory (
-		NormalizeFilename ( module.GetDependencyPath () ),
-		backend->outputDirectory );
-	if ( pclean_files )
-	{
-		string_list& clean_files = *pclean_files;
-		CLEAN_FILE ( target );
-	}
-	return target;
-}
-
-/*static*/ MingwModuleHandler*
-MingwModuleHandler::InstanciateHandler (
-	const Module& module,
-	MingwBackend* backend )
-{
-	MingwModuleHandler* handler;
-	switch ( module.type )
-	{
-		case BuildTool:
-			handler = new MingwBuildToolModuleHandler ( module );
-			break;
-		case StaticLibrary:
-			handler = new MingwStaticLibraryModuleHandler ( module );
-			break;
-		case ObjectLibrary:
-			handler = new MingwObjectLibraryModuleHandler ( module );
-			break;
-		case Kernel:
-			handler = new MingwKernelModuleHandler ( module );
-			break;
-		case NativeCUI:
-			handler = new MingwNativeCUIModuleHandler ( module );
-			break;
-		case Win32CUI:
-			handler = new MingwWin32CUIModuleHandler ( module );
-			break;
-		case Win32GUI:
-			handler = new MingwWin32GUIModuleHandler ( module );
-			break;
-		case KernelModeDLL:
-			handler = new MingwKernelModeDLLModuleHandler ( module );
-			break;
-		case NativeDLL:
-			handler = new MingwNativeDLLModuleHandler ( module );
-			break;
-		case Win32DLL:
-			handler = new MingwWin32DLLModuleHandler ( module );
-			break;
-		case KernelModeDriver:
-			handler = new MingwKernelModeDriverModuleHandler ( module );
-			break;
-		case BootLoader:
-			handler = new MingwBootLoaderModuleHandler ( module );
-			break;
-		case BootSector:
-			handler = new MingwBootSectorModuleHandler ( module );
-			break;
-		case Iso:
-			handler = new MingwIsoModuleHandler ( module );
-			break;
-		case LiveIso:
-			handler = new MingwLiveIsoModuleHandler ( module );
-			break;
-		case Test:
-			handler = new MingwTestModuleHandler ( module );
-			break;
-		case RpcServer:
-			handler = new MingwRpcServerModuleHandler ( module );
-			break;
-		case RpcClient:
-			handler = new MingwRpcClientModuleHandler ( module );
-			break;
-		default:
-			throw UnknownModuleTypeException (
-				module.node.location,
-				module.type );
-			break;
-	}
-	return handler;
-}
-
-string
-MingwModuleHandler::GetWorkingDirectory () const
-{
-	return ".";
-}
-
-string
-MingwModuleHandler::GetBasename ( const string& filename ) const
-{
-	size_t index = filename.find_last_of ( '.' );
-	if ( index != string::npos )
-		return filename.substr ( 0, index );
-	return "";
-}
-
-string
-MingwModuleHandler::GetActualSourceFilename (
-	const string& filename ) const
-{
-	string extension = GetExtension ( filename );
-	if ( extension == ".spec" || extension == ".SPEC" )
-	{
-		string basename = GetBasename ( filename );
-		return PassThruCacheDirectory ( NormalizeFilename ( basename + ".stubs.c" ),
-		                                backend->intermediateDirectory );
-	}
-	else if ( extension == ".idl" || extension == ".IDL" )
-	{
-		string basename = GetBasename ( filename );
-		string newname;
-		if ( module.type == RpcServer )
-			newname = basename + "_s.c";
-		else
-			newname = basename + "_c.c";
-		return PassThruCacheDirectory ( NormalizeFilename ( newname ),
-		                                backend->intermediateDirectory );
-	}
-	else
-		return filename;
-}
-
-string
-MingwModuleHandler::GetModuleArchiveFilename () const
-{
-	if ( module.type == StaticLibrary )
-		return GetTargetFilename ( module, NULL );
-	return PassThruCacheDirectory ( ReplaceExtension (
-		NormalizeFilename ( module.GetPath () ),
-		".temp.a" ),
-		backend->intermediateDirectory );
-}
-
-bool
-MingwModuleHandler::IsGeneratedFile ( const File& file ) const
-{
-	string extension = GetExtension ( file.name );
-	return ( extension == ".spec" || extension == ".SPEC" );
-}
-
-/*static*/ bool
-MingwModuleHandler::ReferenceObjects (
-	const Module& module )
-{
-	if ( module.type == ObjectLibrary )
-		return true;
-	if ( module.type == RpcServer )
-		return true;
-	if ( module.type == RpcClient )
-		return true;
-	return false;
-}
-
-string
-MingwModuleHandler::GetImportLibraryDependency (
-	const Module& importedModule )
-{
-	string dep;
-	if ( ReferenceObjects ( importedModule ) )
-		dep = GetTargetMacro ( importedModule );
-	else
-		dep = GetImportLibraryFilename ( importedModule, NULL );
-	return dep;
-}
-
-void
-MingwModuleHandler::GetTargets ( const Module& dependencyModule,
-	                             string_list& targets )
-{
-	if ( dependencyModule.invocations.size () > 0 )
-	{
-		for ( size_t i = 0; i < dependencyModule.invocations.size (); i++ )
-		{
-			Invoke& invoke = *dependencyModule.invocations[i];
-			invoke.GetTargets ( targets );
-		}
-	}
-	else
-		targets.push_back ( GetImportLibraryDependency ( dependencyModule ) );
-}
-
-void
-MingwModuleHandler::GetModuleDependencies (
-	string_list& dependencies )
-{
-	size_t iend = module.dependencies.size ();
-
-	if ( iend == 0 )
-		return;
-	
-	for ( size_t i = 0; i < iend; i++ )
-	{
-		const Dependency& dependency = *module.dependencies[i];
-		const Module& dependencyModule = *dependency.dependencyModule;
-		GetTargets ( dependencyModule,
-		             dependencies );
-	}
-	GetDefinitionDependencies ( dependencies );
-}
-
-void
-MingwModuleHandler::GetSourceFilenames (
-	string_list& list,
-	bool includeGeneratedFiles ) const
-{
-	size_t i;
-
-	const vector<File*>& files = module.non_if_data.files;
-	for ( i = 0; i < files.size (); i++ )
-	{
-		if ( includeGeneratedFiles || !IsGeneratedFile ( *files[i] ) )
-		{
-			list.push_back (
-				GetActualSourceFilename ( files[i]->name ) );
-		}
-	}
-	// intentionally make a copy so that we can append more work in
-	// the middle of processing without having to go recursive
-	vector<If*> v = module.non_if_data.ifs;
-	for ( i = 0; i < v.size (); i++ )
-	{
-		size_t j;
-		If& rIf = *v[i];
-		// check for sub-ifs to add to list
-		const vector<If*>& ifs = rIf.data.ifs;
-		for ( j = 0; j < ifs.size (); j++ )
-			v.push_back ( ifs[j] );
-		const vector<File*>& files = rIf.data.files;
-		for ( j = 0; j < files.size (); j++ )
-		{
-			File& file = *files[j];
-			if ( includeGeneratedFiles || !IsGeneratedFile ( file ) )
-			{
-				list.push_back (
-					GetActualSourceFilename ( file.name ) );
-			}
-		}
-	}
-}
-
-void
-MingwModuleHandler::GetSourceFilenamesWithoutGeneratedFiles (
-	string_list& list ) const
-{
-	GetSourceFilenames ( list, false );
-}
-
-string
-MingwModuleHandler::GetObjectFilename (
-	const string& sourceFilename,
-	string_list* pclean_files ) const
-{
-	Directory* directoryTree;
-
-	string newExtension;
-	string extension = GetExtension ( sourceFilename );
-	if ( extension == ".rc" || extension == ".RC" )
-		newExtension = ".coff";
-	else if ( extension == ".spec" || extension == ".SPEC" )
-		newExtension = ".stubs.o";
-	else if ( extension == ".idl" || extension == ".IDL" )
-	{
-		if ( module.type == RpcServer )
-			newExtension = "_s.o";
-		else
-			newExtension = "_c.o";
-	}
-	else
-		newExtension = ".o";
-	
-	if ( module.type == BootSector )
-		directoryTree = backend->outputDirectory;
-	else
-		directoryTree = backend->intermediateDirectory;
-
-	string obj_file = PassThruCacheDirectory (
-		NormalizeFilename ( ReplaceExtension (
-			RemoveVariables ( sourceFilename ),
-			                  newExtension ) ),
-			directoryTree );
-	if ( pclean_files )
-	{
-		string_list& clean_files = *pclean_files;
-		CLEAN_FILE ( obj_file );
-	}
-	return obj_file;
-}
-
-void
-MingwModuleHandler::GenerateCleanTarget () const
-{
-	if ( 0 == clean_files.size() )
-		return;
-	fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() );
-	fprintf ( fMakefile, "%s_clean:\n\t-@${rm}", module.name.c_str() );
-	for ( size_t i = 0; i < clean_files.size(); i++ )
-	{
-		if ( 9==((i+1)%10) )
-			fprintf ( fMakefile, " 2>$(NUL)\n\t-@${rm}" );
-		fprintf ( fMakefile, " %s", clean_files[i].c_str() );
-	}
-	fprintf ( fMakefile, " 2>$(NUL)\n" );
-	fprintf ( fMakefile, "clean: %s_clean\n\n", module.name.c_str() );
-}
-
-string
-MingwModuleHandler::GetObjectFilenames ()
-{
-	const vector<File*>& files = module.non_if_data.files;
-	if ( files.size () == 0 )
-		return "";
-	
-	string objectFilenames ( "" );
-	for ( size_t i = 0; i < files.size (); i++ )
-	{
-		if ( objectFilenames.size () > 0 )
-			objectFilenames += " ";
-		objectFilenames +=
-			GetObjectFilename ( files[i]->name, NULL );
-	}
-	return objectFilenames;
-}
-
-string
-MingwModuleHandler::GenerateGccDefineParametersFromVector (
-	const vector<Define*>& defines ) const
-{
-	string parameters;
-	for ( size_t i = 0; i < defines.size (); i++ )
-	{
-		Define& define = *defines[i];
-		if (parameters.length () > 0)
-			parameters += " ";
-		parameters += "-D";
-		parameters += define.name;
-		if (define.value.length () > 0)
-		{
-			parameters += "=";
-			parameters += define.value;
-		}
-	}
-	return parameters;
-}
-
-string
-MingwModuleHandler::GenerateGccDefineParameters () const
-{
-	string parameters = GenerateGccDefineParametersFromVector ( module.project.non_if_data.defines );
-	string s = GenerateGccDefineParametersFromVector ( module.non_if_data.defines );
-	if ( s.length () > 0 )
-	{
-		parameters += " ";
-		parameters += s;
-	}
-	return parameters;
-}
-
-string
-MingwModuleHandler::ConcatenatePaths (
-	const string& path1,
-	const string& path2 ) const
-{
-	if ( ( path1.length () == 0 ) || ( path1 == "." ) || ( path1 == "./" ) )
-		return path2;
-	if ( path1[path1.length ()] == CSEP )
-		return path1 + path2;
-	else
-		return path1 + CSEP + path2;
-}
-
-string
-MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) const
-{
-	string parameters;
-	for ( size_t i = 0; i < includes.size (); i++ )
-	{
-		Include& include = *includes[i];
-		if ( parameters.length () > 0 )
-			parameters += " ";
-		parameters += "-I" + include.directory;
-	}
-	return parameters;
-}
-
-string
-MingwModuleHandler::GenerateGccIncludeParameters () const
-{
-	string parameters = GenerateGccIncludeParametersFromVector ( module.non_if_data.includes );
-	string s = GenerateGccIncludeParametersFromVector ( module.project.non_if_data.includes );
-	if ( s.length () > 0 )
-	{
-		parameters += " ";
-		parameters += s;
-	}
-	return parameters;
-}
-
-
-string
-MingwModuleHandler::GenerateCompilerParametersFromVector ( const vector<CompilerFlag*>& compilerFlags ) const
-{
-	string parameters;
-	for ( size_t i = 0; i < compilerFlags.size (); i++ )
-	{
-		CompilerFlag& compilerFlag = *compilerFlags[i];
-		if ( parameters.length () > 0 )
-			parameters += " ";
-		parameters += compilerFlag.flag;
-	}
-	return parameters;
-}
-
-string
-MingwModuleHandler::GenerateLinkerParametersFromVector ( const vector<LinkerFlag*>& linkerFlags ) const
-{
-	string parameters;
-	for ( size_t i = 0; i < linkerFlags.size (); i++ )
-	{
-		LinkerFlag& linkerFlag = *linkerFlags[i];
-		if ( parameters.length () > 0 )
-			parameters += " ";
-		parameters += linkerFlag.flag;
-	}
-	return parameters;
-}
-
-string
-MingwModuleHandler::GenerateImportLibraryDependenciesFromVector (
-	const vector<Library*>& libraries )
-{
-	string dependencies ( "" );
-	int wrap_count = 0;
-	for ( size_t i = 0; i < libraries.size (); i++ )
-	{
-		if ( wrap_count++ == 5 )
-			dependencies += " \\\n\t\t", wrap_count = 0;
-		else if ( dependencies.size () > 0 )
-			dependencies += " ";
-		dependencies += GetImportLibraryDependency ( *libraries[i]->imported_module );
-	}
-	return dependencies;
-}
-
-string
-MingwModuleHandler::GenerateLinkerParameters () const
-{
-	return GenerateLinkerParametersFromVector ( module.linkerFlags );
-}
-
-void
-MingwModuleHandler::GenerateMacro (
-	const char* assignmentOperation,
-	const string& macro,
-	const IfableData& data,
-	const vector<CompilerFlag*>* compilerFlags )
-{
-	size_t i;
-
-	fprintf (
-		fMakefile,
-		"%s %s",
-		macro.c_str(),
-		assignmentOperation );
-	
-	if ( compilerFlags != NULL )
-	{
-		string compilerParameters = GenerateCompilerParametersFromVector ( *compilerFlags );
-		if ( compilerParameters.size () > 0 )
-		{
-			fprintf (
-				fMakefile,
-				" %s",
-				compilerParameters.c_str () );
-		}
-	}
-
-	for ( i = 0; i < data.includes.size(); i++ )
-	{
-		fprintf (
-			fMakefile,
-			" -I%s",
-			data.includes[i]->directory.c_str() );
-	}
-	for ( i = 0; i < data.defines.size(); i++ )
-	{
-		Define& d = *data.defines[i];
-		fprintf (
-			fMakefile,
-			" -D%s",
-			d.name.c_str() );
-		if ( d.value.size() )
-			fprintf (
-				fMakefile,
-				"=%s",
-				d.value.c_str() );
-	}
-	fprintf ( fMakefile, "\n" );
-}
-
-void
-MingwModuleHandler::GenerateMacros (
-	const char* assignmentOperation,
-	const IfableData& data,
-	const vector<CompilerFlag*>* compilerFlags,
-	const vector<LinkerFlag*>* linkerFlags )
-{
-	size_t i;
-
-	if ( data.includes.size () > 0 || data.defines.size () > 0 )
-	{
-		GenerateMacro ( assignmentOperation,
-		                cflagsMacro,
-		                data,
-		                compilerFlags );
-		GenerateMacro ( assignmentOperation,
-		                windresflagsMacro,
-		                data,
-		                compilerFlags );
-	}
-	
-	if ( linkerFlags != NULL )
-	{
-		string linkerParameters = GenerateLinkerParametersFromVector ( *linkerFlags );
-		if ( linkerParameters.size () > 0 )
-		{
-			fprintf (
-				fMakefile,
-				"%s %s %s\n",
-				linkerflagsMacro.c_str (),
-				assignmentOperation,
-				linkerParameters.c_str() );
-		}
-	}
-
-	if ( data.libraries.size () > 0 )
-	{
-		string deps = GenerateImportLibraryDependenciesFromVector ( data.libraries );
-		if ( deps.size () > 0 )
-		{
-			fprintf (
-				fMakefile,
-				"%s %s %s\n",
-				libsMacro.c_str(),
-				assignmentOperation,
-				deps.c_str() );
-		}
-	}
-
-	const vector<If*>& ifs = data.ifs;
-	for ( i = 0; i < ifs.size(); i++ )
-	{
-		If& rIf = *ifs[i];
-		if ( rIf.data.defines.size()
-			|| rIf.data.includes.size()
-			|| rIf.data.libraries.size()
-			|| rIf.data.files.size()
-			|| rIf.data.ifs.size() )
-		{
-			fprintf (
-				fMakefile,
-				"ifeq (\"$(%s)\",\"%s\")\n",
-				rIf.property.c_str(),
-				rIf.value.c_str() );
-			GenerateMacros (
-				"+=",
-				rIf.data,
-				NULL,
-				NULL );
-			fprintf ( 
-				fMakefile,
-				"endif\n\n" );
-		}
-	}
-}
-
-void
-MingwModuleHandler::GenerateObjectMacros (
-	const char* assignmentOperation,
-	const IfableData& data,
-	const vector<CompilerFlag*>* compilerFlags,
-	const vector<LinkerFlag*>* linkerFlags )
-{
-	size_t i;
-
-	const vector<File*>& files = data.files;
-	if ( files.size () > 0 )
-	{
-		for ( i = 0; i < files.size (); i++ )
-		{
-			File& file = *files[i];
-			if ( file.first )
-			{
-				fprintf ( fMakefile,
-					"%s := %s $(%s)\n",
-					objectsMacro.c_str(),
-					GetObjectFilename (
-						file.name, NULL ).c_str (),
-					objectsMacro.c_str() );
-			}
-		}
-		fprintf (
-			fMakefile,
-			"%s %s",
-			objectsMacro.c_str (),
-			assignmentOperation );
-		for ( i = 0; i < files.size(); i++ )
-		{
-			File& file = *files[i];
-			if ( !file.first )
-			{
-				fprintf (
-					fMakefile,
-					"%s%s",
-					( i%10 == 9 ? " \\\n\t" : " " ),
-					GetObjectFilename (
-						file.name, NULL ).c_str () );
-			}
-		}
-		fprintf ( fMakefile, "\n" );
-	}
-
-	const vector<If*>& ifs = data.ifs;
-	for ( i = 0; i < ifs.size(); i++ )
-	{
-		If& rIf = *ifs[i];
-		if ( rIf.data.defines.size()
-			|| rIf.data.includes.size()
-			|| rIf.data.libraries.size()
-			|| rIf.data.files.size()
-			|| rIf.data.ifs.size() )
-		{
-			fprintf (
-				fMakefile,
-				"ifeq (\"$(%s)\",\"%s\")\n",
-				rIf.property.c_str(),
-				rIf.value.c_str() );
-			GenerateObjectMacros (
-				"+=",
-				rIf.data,
-				NULL,
-				NULL );
-			fprintf ( 
-				fMakefile,
-				"endif\n\n" );
-		}
-	}
-}
-
-void
-MingwModuleHandler::GenerateGccCommand (
-	const string& sourceFilename,
-	const string& cc,
-	const string& cflagsMacro )
-{
-	string dependencies = sourceFilename;
-	if ( module.pch && use_pch )
-		dependencies += " " + module.pch->header + ".gch";
-	
-	/* WIDL generated headers may be used */
-	dependencies += " " + GetLinkingDependenciesMacro ();
-	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
-
-	string objectFilename = GetObjectFilename (
-		sourceFilename, &clean_files );
-	fprintf ( fMakefile,
-	          "%s: %s | %s\n",
-	          objectFilename.c_str (),
-	          dependencies.c_str (),
-	          GetDirectory ( objectFilename ).c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_CC)\n" );
-	fprintf ( fMakefile,
-	         "\t%s -c $< -o $@ %s\n",
-	         cc.c_str (),
-	         cflagsMacro.c_str () );
-}
-
-void
-MingwModuleHandler::GenerateGccAssemblerCommand (
-	const string& sourceFilename,
-	const string& cc,
-	const string& cflagsMacro )
-{
-	string dependencies = sourceFilename;
-	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
-	string objectFilename = GetObjectFilename (
-		sourceFilename, &clean_files );
-	fprintf ( fMakefile,
-	          "%s: %s | %s\n",
-	          objectFilename.c_str (),
-	          dependencies.c_str (),
-	          GetDirectory ( objectFilename ).c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_GAS)\n" );
-	fprintf ( fMakefile,
-	          "\t%s -x assembler-with-cpp -c $< -o $@ -D__ASM__ %s\n",
-	          cc.c_str (),
-	          cflagsMacro.c_str () );
-}
-
-void
-MingwModuleHandler::GenerateNasmCommand (
-	const string& sourceFilename,
-	const string& nasmflagsMacro )
-{
-	string dependencies = sourceFilename;
-	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
-	string objectFilename = GetObjectFilename (
-		sourceFilename, &clean_files );
-	fprintf ( fMakefile,
-	          "%s: %s | %s\n",
-	          objectFilename.c_str (),
-	          dependencies.c_str (),
-	          GetDirectory ( objectFilename ).c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_NASM)\n" );
-	fprintf ( fMakefile,
-	          "\t%s -f win32 $< -o $@ %s\n",
-	          "$(Q)nasm",
-	          nasmflagsMacro.c_str () );
-}
-
-void
-MingwModuleHandler::GenerateWindresCommand (
-	const string& sourceFilename,
-	const string& windresflagsMacro )
-{
-	string dependencies = sourceFilename;
-	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
-	string objectFilename =
-		GetObjectFilename ( sourceFilename, &clean_files );
-	string rciFilename = ros_temp + module.name + ".rci.tmp";
-	string resFilename = ros_temp + module.name + ".res.tmp";
-	if ( module.useWRC )
-	{
-		fprintf ( fMakefile,
-		          "%s: %s $(WRC_TARGET) | %s\n",
-		          objectFilename.c_str (),
-		          dependencies.c_str (),
-		          GetDirectory ( objectFilename ).c_str () );
-		fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
-		fprintf ( fMakefile,
-		         "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n",
-		         windresflagsMacro.c_str (),
-		         sourceFilename.c_str (),
-		         rciFilename.c_str () );
-		fprintf ( fMakefile,
-		         "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n",
-		         windresflagsMacro.c_str (),
-		         rciFilename.c_str (),
-		         resFilename.c_str () );
-		fprintf ( fMakefile,
-		         "\t-@${rm} %s 2>$(NUL)\n",
-		         rciFilename.c_str () );
-		fprintf ( fMakefile,
-		         "\t${windres} %s -o $@\n",
-		         resFilename.c_str () );
-		fprintf ( fMakefile,
-		         "\t-@${rm} %s 2>$(NUL)\n",
-		         resFilename.c_str () );
-	}
-	else
-	{
-		fprintf ( fMakefile,
-		          "%s: %s $(WRC_TARGET) | %s\n",
-		          objectFilename.c_str (),
-		          dependencies.c_str (),
-		          GetDirectory ( objectFilename ).c_str () );
-		fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
-		fprintf ( fMakefile,
-		         "\t${windres} $(%s) %s -o $@\n",
-		         windresflagsMacro.c_str (),
-		         sourceFilename.c_str () );
-	}
-}
-
-void
-MingwModuleHandler::GenerateWinebuildCommands (
-	const string& sourceFilename )
-{
-	string dependencies = sourceFilename;
-	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
-
-	string basename = GetBasename ( sourceFilename );
-	string def_file = PassThruCacheDirectory (
-		basename + ".spec.def",
-		backend->intermediateDirectory );
-	CLEAN_FILE(def_file);
-
-	string stub_file = PassThruCacheDirectory (
-		basename + ".stubs.c",
-		backend->intermediateDirectory );
-	CLEAN_FILE(stub_file)
-
-	fprintf ( fMakefile,
-	          "%s: %s $(WINEBUILD_TARGET)\n",
-	          def_file.c_str (),
-	          dependencies.c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
-	fprintf ( fMakefile,
-	          "\t%s --def=%s -o %s\n",
-	          "$(Q)$(WINEBUILD_TARGET)",
-	          sourceFilename.c_str (),
-	          def_file.c_str () );
-
-	fprintf ( fMakefile,
-	          "%s: %s $(WINEBUILD_TARGET)\n",
-	          stub_file.c_str (),
-	          sourceFilename.c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
-	fprintf ( fMakefile,
-	          "\t%s --pedll=%s -o %s\n",
-	          "$(Q)$(WINEBUILD_TARGET)",
-	          sourceFilename.c_str (),
-	          stub_file.c_str () );
-}
-
-string
-MingwModuleHandler::GetWidlFlags ( const File& file )
-{
-	return file.switches;
-}
-		
-void
-MingwModuleHandler::GenerateWidlCommandsServer (
-	const File& file,
-	const string& widlflagsMacro )
-{
-	string dependencies = file.name;
-	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
-
-	string basename = GetBasename ( file.name );
-
-	/*string generatedHeaderFilename = PassThruCacheDirectory (
-		basename + ".h",
-		backend->intermediateDirectory );
-	CLEAN_FILE(generatedHeaderFilename);
-	*/
-	string generatedHeaderFilename = basename + "_s.h";
-	CLEAN_FILE(generatedHeaderFilename);
-
-  	string generatedServerFilename = PassThruCacheDirectory (
-		basename + "_s.c",
-		backend->intermediateDirectory );
-	CLEAN_FILE(generatedServerFilename);
-
-	fprintf ( fMakefile,
-	          "%s %s: %s $(WIDL_TARGET) | %s\n",
-	          generatedServerFilename.c_str (),
-	          generatedHeaderFilename.c_str (),
-	          dependencies.c_str (),
-	          GetDirectory ( generatedServerFilename ).c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" );
-	fprintf ( fMakefile,
-	          "\t%s %s %s -h -H %s -s -S %s %s\n",
-	          "$(Q)$(WIDL_TARGET)",
-	          GetWidlFlags ( file ).c_str (),
-	          widlflagsMacro.c_str (),
-	          generatedHeaderFilename.c_str (),
-	          generatedServerFilename.c_str (),
-	          file.name.c_str () );
-}
-
-void
-MingwModuleHandler::GenerateWidlCommandsClient (
-	const File& file,
-	const string& widlflagsMacro )
-{
-	string dependencies = file.name;
-	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
-
-	string basename = GetBasename ( file.name );
-
-	/*string generatedHeaderFilename = PassThruCacheDirectory (
-		basename + ".h",
-		backend->intermediateDirectory );
-	CLEAN_FILE(generatedHeaderFilename);
-	*/
-	string generatedHeaderFilename = basename + "_c.h";
-	CLEAN_FILE(generatedHeaderFilename);
-
-  	string generatedClientFilename = PassThruCacheDirectory (
-		basename + "_c.c",
-		backend->intermediateDirectory );
-	CLEAN_FILE(generatedClientFilename);
-
-	fprintf ( fMakefile,
-	          "%s %s: %s $(WIDL_TARGET) | %s\n",
-	          generatedClientFilename.c_str (),
-	          generatedHeaderFilename.c_str (),
-	          dependencies.c_str (),
-	          GetDirectory ( generatedClientFilename ).c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" );
-	fprintf ( fMakefile,
-	          "\t%s %s %s -h -H %s -c -C %s %s\n",
-	          "$(Q)$(WIDL_TARGET)",
-	          GetWidlFlags ( file ).c_str (),
-	          widlflagsMacro.c_str (),
-	          generatedHeaderFilename.c_str (),
-	          generatedClientFilename.c_str (),
-	          file.name.c_str () );
-}
-
-void
-MingwModuleHandler::GenerateWidlCommands (
-	const File& file,
-	const string& widlflagsMacro )
-{
-	if ( module.type == RpcServer )
-		GenerateWidlCommandsServer ( file,
-		                             widlflagsMacro );
-	else
-		GenerateWidlCommandsClient ( file,
-		                             widlflagsMacro );
-}
-
-void
-MingwModuleHandler::GenerateCommands (
-	const File& file,
-	const string& cc,
-	const string& cppc,
-	const string& cflagsMacro,
-	const string& nasmflagsMacro,
-	const string& windresflagsMacro,
-	const string& widlflagsMacro )
-{
-	string extension = GetExtension ( file.name );
-	if ( extension == ".c" || extension == ".C" )
-	{
-		GenerateGccCommand ( file.name,
-		                     cc,
-		                     cflagsMacro );
-		return;
-	}
-	else if ( extension == ".cc" || extension == ".CC" ||
-	          extension == ".cpp" || extension == ".CPP" ||
-	          extension == ".cxx" || extension == ".CXX" )
-	{
-		GenerateGccCommand ( file.name,
-		                     cppc,
-		                     cflagsMacro );
-		return;
-	}
-	else if ( extension == ".s" || extension == ".S" )
-	{
-		GenerateGccAssemblerCommand ( file.name,
-		                              cc,
-		                              cflagsMacro );
-		return;
-	}
-	else if ( extension == ".asm" || extension == ".ASM" )
-	{
-		GenerateNasmCommand ( file.name,
-		                      nasmflagsMacro );
-		return;
-	}
-	else if ( extension == ".rc" || extension == ".RC" )
-	{
-		GenerateWindresCommand ( file.name,
-		                         windresflagsMacro );
-		return;
-	}
-	else if ( extension == ".spec" || extension == ".SPEC" )
-	{
-		GenerateWinebuildCommands ( file.name );
-		GenerateGccCommand ( GetActualSourceFilename ( file.name ),
-		                     cc,
-		                     cflagsMacro );
-		return;
-	}
-	else if ( extension == ".idl" || extension == ".IDL" )
-	{
-		GenerateWidlCommands ( file,
-		                       widlflagsMacro );
-		GenerateGccCommand ( GetActualSourceFilename ( file.name ),
-		                     cc,
-		                     cflagsMacro );
-		return;
-	}
-
-	throw InvalidOperationException ( __FILE__,
-	                                  __LINE__,
-	                                  "Unsupported filename extension '%s' in file '%s'",
-	                                  extension.c_str (),
-	                                  file.name.c_str () );
-}
-
-void
-MingwModuleHandler::GenerateBuildMapCode ()
-{
-	fprintf ( fMakefile,
-	          "ifeq ($(ROS_BUILDMAP),full)\n" );
-
-	string mapFilename = PassThruCacheDirectory (
-		GetBasename ( module.GetPath () ) + ".map",
-		backend->outputDirectory );
-	CLEAN_FILE ( mapFilename );
-	
-	fprintf ( fMakefile,
-	          "\t$(ECHO_OBJDUMP)\n" );
-	fprintf ( fMakefile,
-	          "\t$(Q)${objdump} -d -S $@ > %s\n",
-	          mapFilename.c_str () );
-
-	fprintf ( fMakefile,
-	          "else\n" );
-	fprintf ( fMakefile,
-	          "ifeq ($(ROS_BUILDMAP),yes)\n" );
-
-	fprintf ( fMakefile,
-	          "\t$(ECHO_NM)\n" );
-	fprintf ( fMakefile,
-	          "\t$(Q)${nm} --numeric-sort $@ > %s\n",
-	          mapFilename.c_str () );
-
-	fprintf ( fMakefile,
-	          "endif\n" );
-
-	fprintf ( fMakefile,
-	          "endif\n" );
-}
-
-void
-MingwModuleHandler::GenerateBuildNonSymbolStrippedCode ()
-{
-	fprintf ( fMakefile,
-	          "ifeq ($(ROS_BUILDNOSTRIP),yes)\n" );
-
-	string filename = module.GetPath ();
-	string outputFilename = PassThruCacheDirectory (
-		filename,
-		backend->outputDirectory );
-	string nostripFilename = PassThruCacheDirectory (
-		GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ),
-		backend->outputDirectory );
-	CLEAN_FILE ( nostripFilename );
-	
-	fprintf ( fMakefile,
-	          "\t$(ECHO_CP)\n" );
-	fprintf ( fMakefile,
-			  "\t${cp} %s %s 1>$(NUL)\n",
-			  outputFilename.c_str (),
-	          nostripFilename.c_str () );
-	
-	fprintf ( fMakefile,
-	          "endif\n" );
-}
-
-void
-MergeStringVector ( const vector<string>& input,
-	                vector<string>& output )
-{
-	int wrap_at = 25;
-	string s;
-	int wrap_count = -1;
-	for ( size_t i = 0; i < input.size (); i++ )
-	{
-		if ( input[i].size () == 0 )
-			continue;
-		if ( wrap_count++ == wrap_at )
-		{
-			output.push_back ( s );
-			s = "";
-			wrap_count = 0;
-		}
-		else if ( s.size () > 0)
-			s += " ";
-		s += input[i];
-	}
-	if ( s.length () > 0 )
-		output.push_back ( s );
-}
-
-void
-MingwModuleHandler::GetObjectsVector ( const IfableData& data,
-                                       vector<string>& objectFiles ) const
-{
-	for ( size_t i = 0; i < data.files.size (); i++ )
-	{
-		File& file = *data.files[i];
-		objectFiles.push_back ( GetObjectFilename ( file.name, NULL ) );
-	}
-}
-
-void
-MingwModuleHandler::GenerateCleanObjectsAsYouGoCode () const
-{
-	if ( backend->cleanAsYouGo )
-	{
-		vector<string> objectFiles;
-		GetObjectsVector ( module.non_if_data,
-                           objectFiles );
-		vector<string> lines;
-		MergeStringVector ( objectFiles,
-	                        lines );
-		for ( size_t i = 0; i < lines.size (); i++ )
-		{
-			fprintf ( fMakefile,
-			          "\t-@${rm} %s 2>$(NUL)\n",
-			          lines[i].c_str () );
-		}
-	}
-}
-
-void
-MingwModuleHandler::GenerateLinkerCommand (
-	const string& dependencies,
-	const string& linker,
-	const string& linkerParameters,
-	const string& objectsMacro,
-	const string& libsMacro )
-{
-	string target ( GetTargetMacro ( module ) );
-	string target_folder ( GetDirectory ( GetTargetFilename ( module, NULL ) ) );
-
-	fprintf ( fMakefile,
-		"%s: %s $(RSYM_TARGET) | %s\n",
-		target.c_str (),
-		dependencies.c_str (),
-		target_folder.c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
-	string targetName ( module.GetTargetName () );
-	if ( module.importLibrary != NULL )
-	{
-		string base_tmp = ros_temp + module.name + ".base.tmp";
-		CLEAN_FILE ( base_tmp );
-		string junk_tmp = ros_temp + module.name + ".junk.tmp";
-		CLEAN_FILE ( junk_tmp );
-		string temp_exp = ros_temp + module.name + ".temp.exp";
-		CLEAN_FILE ( temp_exp );
-		string def_file = GetDefinitionFilename ();
-
-		fprintf ( fMakefile,
-		          "\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n",
-		          linker.c_str (),
-		          linkerParameters.c_str (),
-		          base_tmp.c_str (),
-		          junk_tmp.c_str (),
-		          objectsMacro.c_str (),
-		          libsMacro.c_str (),
-		          GetLinkerMacro ().c_str () );
-
-		fprintf ( fMakefile,
-		          "\t-@${rm} %s 2>$(NUL)\n",
-		          junk_tmp.c_str () );
-
-		string killAt = module.mangledSymbols ? "" : "--kill-at";
-		fprintf ( fMakefile,
-		          "\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s %s\n",
-		          targetName.c_str (),
-		          base_tmp.c_str (),
-		          def_file.c_str (),
-		          temp_exp.c_str (),
-		          killAt.c_str () );
-
-		fprintf ( fMakefile,
-		          "\t-@${rm} %s 2>$(NUL)\n",
-		          base_tmp.c_str () );
-
-		fprintf ( fMakefile,
-		          "\t%s %s %s -o %s %s %s %s\n",
-		          linker.c_str (),
-		          linkerParameters.c_str (),
-		          temp_exp.c_str (),
-		          target.c_str (),
-		          objectsMacro.c_str (),
-		          libsMacro.c_str (),
-		          GetLinkerMacro ().c_str () );
-
-		fprintf ( fMakefile,
-		          "\t-@${rm} %s 2>$(NUL)\n",
-		          temp_exp.c_str () );
-		
-		GenerateCleanObjectsAsYouGoCode ();
-	}
-	else
-	{
-		fprintf ( fMakefile,
-		          "\t%s %s -o %s %s %s %s\n",
-		          linker.c_str (),
-		          linkerParameters.c_str (),
-		          target.c_str (),
-		          objectsMacro.c_str (),
-		          libsMacro.c_str (),
-		          GetLinkerMacro ().c_str () );
-
-		GenerateCleanObjectsAsYouGoCode ();
-	}
-
-	GenerateBuildMapCode ();
-
-	GenerateBuildNonSymbolStrippedCode ();
-
-	fprintf ( fMakefile,
-	          "\t$(ECHO_RSYM)\n" );
-	fprintf ( fMakefile,
-	          "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" );
-}
-
-void
-MingwModuleHandler::GeneratePhonyTarget() const
-{
-	string targetMacro ( GetTargetMacro(module) );
-	fprintf ( fMakefile, ".PHONY: %s\n\n",
-	          targetMacro.c_str ());
-	fprintf ( fMakefile, "%s: | %s\n",
-	          targetMacro.c_str (),
-	          GetDirectory(GetTargetFilename(module,NULL)).c_str () );
-}
-
-void
-MingwModuleHandler::GenerateObjectFileTargets (
-	const IfableData& data,
-	const string& cc,
-	const string& cppc,
-	const string& cflagsMacro,
-	const string& nasmflagsMacro,
-	const string& windresflagsMacro,
-	const string& widlflagsMacro )
-{
-	size_t i;
-	
-	const vector<File*>& files = data.files;
-	for ( i = 0; i < files.size (); i++ )
-	{
-		GenerateCommands ( *files[i],
-		                   cc,
-		                   cppc,
-		                   cflagsMacro,
-		                   nasmflagsMacro,
-		                   windresflagsMacro,
-		                   widlflagsMacro );
-		fprintf ( fMakefile,
-		          "\n" );
-	}
-
-	const vector<If*>& ifs = data.ifs;
-	for ( i = 0; i < ifs.size(); i++ )
-	{
-		GenerateObjectFileTargets ( ifs[i]->data,
-		                            cc,
-		                            cppc,
-		                            cflagsMacro,
-		                            nasmflagsMacro,
-		                            windresflagsMacro,
-		                            widlflagsMacro );
-	}
-}
-
-void
-MingwModuleHandler::GenerateObjectFileTargets (
-	const string& cc,
-	const string& cppc,
-	const string& cflagsMacro,
-	const string& nasmflagsMacro,
-	const string& windresflagsMacro,
-	const string& widlflagsMacro )
-{
-	if ( module.pch )
-	{
-		const string& pch_file = module.pch->header;
-		string gch_file = pch_file + ".gch";
-		CLEAN_FILE(gch_file);
-		if ( use_pch )
-		{
-			fprintf (
-				fMakefile,
-				"%s: %s\n",
-				gch_file.c_str(),
-				pch_file.c_str() );
-			fprintf ( fMakefile, "\t$(ECHO_PCH)\n" );
-			fprintf (
-				fMakefile,
-				"\t%s -o %s %s -g %s\n\n",
-				( module.cplusplus ? cppc.c_str() : cc.c_str() ),
-				gch_file.c_str(),
-				cflagsMacro.c_str(),
-				pch_file.c_str() );
-		}
-	}
-
-	GenerateObjectFileTargets ( module.non_if_data,
-	                            cc,
-	                            cppc,
-	                            cflagsMacro,
-	                            nasmflagsMacro,
-	                            windresflagsMacro,
-	                            widlflagsMacro );
-	fprintf ( fMakefile, "\n" );
-}
-
-string
-MingwModuleHandler::GenerateArchiveTarget ( const string& ar,
-                                            const string& objs_macro ) const
-{
-	string archiveFilename ( GetModuleArchiveFilename () );
-	
-	fprintf ( fMakefile,
-	          "%s: %s | %s\n",
-	          archiveFilename.c_str (),
-	          objs_macro.c_str (),
-	          GetDirectory(archiveFilename).c_str() );
-
-	fprintf ( fMakefile, "\t$(ECHO_AR)\n" );
-
-	fprintf ( fMakefile,
-	          "\t%s -rc $@ %s\n",
-	          ar.c_str (),
-	          objs_macro.c_str ());
-
-	GenerateCleanObjectsAsYouGoCode ();
-
-	fprintf ( fMakefile, "\n" );
-
-	return archiveFilename;
-}
-
-string
-MingwModuleHandler::GetCFlagsMacro () const
-{
-	return ssprintf ( "$(%s_CFLAGS)",
-	                  module.name.c_str () );
-}
-
-/*static*/ string
-MingwModuleHandler::GetObjectsMacro ( const Module& module )
-{
-	return ssprintf ( "$(%s_OBJS)",
-	                  module.name.c_str () );
-}
-
-string
-MingwModuleHandler::GetLinkingDependenciesMacro () const
-{
-	return ssprintf ( "$(%s_LINKDEPS)", module.name.c_str () );
-}
-
-string
-MingwModuleHandler::GetLibsMacro () const
-{
-	return ssprintf ( "$(%s_LIBS)", module.name.c_str () );
-}
-
-string
-MingwModuleHandler::GetLinkerMacro () const
-{
-	return ssprintf ( "$(%s_LFLAGS)",
-	                  module.name.c_str () );
-}
-
-string
-MingwModuleHandler::GetModuleTargets ( const Module& module )
-{
-	if ( ReferenceObjects ( module ) )
-		return GetObjectsMacro ( module );
-	else
-		return GetTargetFilename ( module, NULL );
-}
-
-void
-MingwModuleHandler::GenerateObjectMacro ()
-{
-	objectsMacro = ssprintf ("%s_OBJS", module.name.c_str ());
-
-	GenerateObjectMacros (
-		"=",
-		module.non_if_data,
-		&module.compilerFlags,
-		&module.linkerFlags );
-
-	// future references to the macro will be to get its values
-	objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ());
-}
-
-void
-MingwModuleHandler::GenerateTargetMacro ()
-{
-	fprintf ( fMakefile,
-		"%s := %s\n",
-		GetTargetMacro ( module, false ).c_str (),
-		GetModuleTargets ( module ).c_str () );
-}
-
-void
-MingwModuleHandler::GenerateOtherMacros ()
-{
-	cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ());
-	nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ());
-	windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ());
-	widlflagsMacro = ssprintf ("%s_WIDLFLAGS", module.name.c_str ());
-	linkerflagsMacro = ssprintf ("%s_LFLAGS", module.name.c_str ());
-	libsMacro = ssprintf("%s_LIBS", module.name.c_str ());
-	linkDepsMacro = ssprintf ("%s_LINKDEPS", module.name.c_str ());
-
-	GenerateMacros (
-		"=",
-		module.non_if_data,
-		&module.compilerFlags,
-		&module.linkerFlags );
-
-	if ( module.importLibrary )
-	{
-		string_list s;
-		const vector<File*>& files = module.non_if_data.files;
-		for ( size_t i = 0; i < files.size (); i++ )
-		{
-			File& file = *files[i];
-			string extension = GetExtension ( file.name );
-			if ( extension == ".spec" || extension == ".SPEC" )
-				GetSpecObjectDependencies ( s, file.name );
-		}
-		if ( s.size () > 0 )
-		{
-			fprintf (
-				fMakefile,
-				"%s +=",
-				linkDepsMacro.c_str() );
-			for ( size_t i = 0; i < s.size(); i++ )
-				fprintf ( fMakefile,
-				          " %s",
-				          s[i].c_str () );
-			fprintf ( fMakefile, "\n" );
-		}
-	}
-
-	string globalCflags = "-g";
-	if ( backend->usePipe )
-		globalCflags += " -pipe";
-	if ( !module.enableWarnings )
-		globalCflags += " -Werror";
-	
-	fprintf (
-		fMakefile,
-		"%s += $(PROJECT_CFLAGS) %s\n",
-		cflagsMacro.c_str (),
-		globalCflags.c_str () );
-
-	fprintf (
-		fMakefile,
-		"%s += $(PROJECT_RCFLAGS)\n",
-		windresflagsMacro.c_str () );
-
-	fprintf (
-		fMakefile,
-		"%s += $(PROJECT_WIDLFLAGS)\n",
-		widlflagsMacro.c_str () );
-
-	fprintf (
-		fMakefile,
-		"%s_LFLAGS += $(PROJECT_LFLAGS) -g\n",
-		module.name.c_str () );
-
-	fprintf (
-		fMakefile,
-		"%s += $(%s)\n",
-		linkDepsMacro.c_str (),
-		libsMacro.c_str () );
-
-	string cflags = TypeSpecificCFlags();
-	if ( cflags.size() > 0 )
-	{
-		fprintf ( fMakefile,
-		          "%s += %s\n\n",
-		          cflagsMacro.c_str (),
-		          cflags.c_str () );
-	}
-
-	string nasmflags = TypeSpecificNasmFlags();
-	if ( nasmflags.size () > 0 )
-	{
-		fprintf ( fMakefile,
-		          "%s += %s\n\n",
-		          nasmflagsMacro.c_str (),
-		          nasmflags.c_str () );
-	}
-
-	string linkerflags = TypeSpecificLinkerFlags();
-	if ( linkerflags.size() > 0 )
-	{
-		fprintf ( fMakefile,
-		          "%s += %s\n\n",
-		          linkerflagsMacro.c_str (),
-		          linkerflags.c_str () );
-	}
-
-	fprintf ( fMakefile, "\n\n" );
-
-	// future references to the macros will be to get their values
-	cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ());
-	nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ());
-	widlflagsMacro = ssprintf ("$(%s)", widlflagsMacro.c_str ());
-}
-
-void
-MingwModuleHandler::GenerateRules ()
-{
-	string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" );
-	string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" );
-	string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" );
-
-	string targetMacro = GetTargetMacro ( module );
-
-	CLEAN_FILE ( targetMacro );
-
-	// generate phony target for module name
-	fprintf ( fMakefile, ".PHONY: %s\n",
-		module.name.c_str () );
-	fprintf ( fMakefile, "%s: %s\n\n",
-		module.name.c_str (),
-		GetTargetMacro ( module ).c_str () );
-
-	if ( !ReferenceObjects ( module ) )
-	{
-		string ar_target ( GenerateArchiveTarget ( ar, objectsMacro ) );
-		if ( targetMacro != ar_target )
-		{
-			CLEAN_FILE ( ar_target );
-		}
-	}
-
-	GenerateObjectFileTargets ( cc,
-								cppc,
-								cflagsMacro,
-								nasmflagsMacro,
-								windresflagsMacro,
-							    widlflagsMacro );
-}
-
-void
-MingwModuleHandler::GetInvocationDependencies (
-	const Module& module,
-	string_list& dependencies )
-{
-	for ( size_t i = 0; i < module.invocations.size (); i++ )
-	{
-		Invoke& invoke = *module.invocations[i];
-		if ( invoke.invokeModule == &module )
-			/* Protect against circular dependencies */
-			continue;
-		invoke.GetTargets ( dependencies );
-	}
-}
-
-void
-MingwModuleHandler::GenerateInvocations () const
-{
-	if ( module.invocations.size () == 0 )
-		return;
-	
-	size_t iend = module.invocations.size ();
-	for ( size_t i = 0; i < iend; i++ )
-	{
-		const Invoke& invoke = *module.invocations[i];
-
-		if ( invoke.invokeModule->type != BuildTool )
-		{
-			throw InvalidBuildFileException ( module.node.location,
-			                                  "Only modules of type buildtool can be invoked." );
-		}
-
-		string invokeTarget = module.GetInvocationTarget ( i );
-		string_list invoke_targets;
-		assert ( invoke_targets.size() );
-		invoke.GetTargets ( invoke_targets );
-		fprintf ( fMakefile,
-		          ".PHONY: %s\n\n",
-		          invokeTarget.c_str () );
-		fprintf ( fMakefile,
-		          "%s:",
-		          invokeTarget.c_str () );
-		size_t j, jend = invoke_targets.size();
-		for ( j = 0; j < jend; j++ )
-		{
-			fprintf ( fMakefile,
-			          " %s",
-			          invoke_targets[i].c_str () );
-		}
-		fprintf ( fMakefile, "\n\n%s", invoke_targets[0].c_str () );
-		for ( j = 1; j < jend; j++ )
-			fprintf ( fMakefile,
-			          " %s",
-			          invoke_targets[i].c_str () );
-		fprintf ( fMakefile,
-		          ": %s\n",
-		          NormalizeFilename ( invoke.invokeModule->GetPath () ).c_str () );
-		fprintf ( fMakefile, "\t$(ECHO_INVOKE)\n" );
-		fprintf ( fMakefile,
-		          "\t%s %s\n\n",
-		          NormalizeFilename ( invoke.invokeModule->GetPath () ).c_str (),
-		          invoke.GetParameters ().c_str () );
-	}
-}
-
-string
-MingwModuleHandler::GetPreconditionDependenciesName () const
-{
-	return module.name + "_precondition";
-}
-
-void
-MingwModuleHandler::GetDefaultDependencies (
-	string_list& dependencies ) const
-{
-	/* Avoid circular dependency */
-	if ( module.type != BuildTool
-		&& module.name != "zlib"
-		&& module.name != "hostzlib" )
-
-		dependencies.push_back ( "$(INIT)" );
-}
-
-void
-MingwModuleHandler::GeneratePreconditionDependencies ()
-{
-	string preconditionDependenciesName = GetPreconditionDependenciesName ();
-	string_list sourceFilenames;
-	GetSourceFilenamesWithoutGeneratedFiles ( sourceFilenames );
-	string_list dependencies;
-	GetDefaultDependencies ( dependencies );
-	GetModuleDependencies ( dependencies );
-
-	GetInvocationDependencies ( module, dependencies );
-	
-	if ( dependencies.size() )
-	{
-		fprintf ( fMakefile,
-		          "%s =",
-		          preconditionDependenciesName.c_str () );
-		for ( size_t i = 0; i < dependencies.size(); i++ )
-			fprintf ( fMakefile,
-			          " %s",
-			          dependencies[i].c_str () );
-		fprintf ( fMakefile, "\n\n" );
-	}
-
-	for ( size_t i = 0; i < sourceFilenames.size(); i++ )
-	{
-		fprintf ( fMakefile,
-		          "%s: ${%s}\n",
-		          sourceFilenames[i].c_str(),
-		          preconditionDependenciesName.c_str ());
-	}
-	fprintf ( fMakefile, "\n" );
-}
-
-bool
-MingwModuleHandler::IsWineModule () const
-{
-	if ( module.importLibrary == NULL)
-		return false;
-
-	size_t index = module.importLibrary->definition.rfind ( ".spec.def" );
-	return ( index != string::npos );
-}
-
-string
-MingwModuleHandler::GetDefinitionFilename () const
-{
-	string defFilename = module.GetBasePath () + SSEP + module.importLibrary->definition;
-	if ( IsWineModule () )
-		return PassThruCacheDirectory ( NormalizeFilename ( defFilename ),
-		                                backend->intermediateDirectory );
-	else
-		return defFilename;
-}
-
-void
-MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ()
-{
-	if ( module.importLibrary != NULL )
-	{
-		string library_target (
-			GetImportLibraryFilename ( module, &clean_files ) );
-
-		string_list deps;
-		GetDefinitionDependencies ( deps );
-
-		fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" );
-
-		fprintf ( fMakefile, "%s:",
-		          library_target.c_str () );
-
-		size_t i, iend = deps.size();
-		for ( i = 0; i < iend; i++ )
-			fprintf ( fMakefile, " %s",
-			          deps[i].c_str () );
-
-		fprintf ( fMakefile, " | %s\n",
-		          GetDirectory ( GetTargetFilename ( module, NULL ) ).c_str () );
-
-		fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );
-
-		string killAt = module.mangledSymbols ? "" : "--kill-at";
-		fprintf ( fMakefile,
-		          "\t${dlltool} --dllname %s --def %s --output-lib %s %s\n\n",
-		          module.GetTargetName ().c_str (),
-		          GetDefinitionFilename ().c_str (),
-		          library_target.c_str (),
-		          killAt.c_str () );
-	}
-}
-
-void
-MingwModuleHandler::GetSpecObjectDependencies (
-	string_list& dependencies,
-	const string& filename ) const
-{
-	string basename = GetBasename ( filename );
-	string defDependency = PassThruCacheDirectory (
-		NormalizeFilename ( basename + ".spec.def" ),
-		backend->intermediateDirectory );
-	dependencies.push_back ( defDependency );
-	string stubsDependency = PassThruCacheDirectory (
-		NormalizeFilename ( basename + ".stubs.c" ),
-		backend->intermediateDirectory );
-	dependencies.push_back ( stubsDependency );
-}
-
-void
-MingwModuleHandler::GetWidlObjectDependencies (
-	string_list& dependencies,
-	const string& filename ) const
-{
-	string basename = GetBasename ( filename );
-	string serverDependency = PassThruCacheDirectory (
-		NormalizeFilename ( basename + "_s.c" ),
-		backend->intermediateDirectory );
-	dependencies.push_back ( serverDependency );
-}
-
-void
-MingwModuleHandler::GetDefinitionDependencies (
-	string_list& dependencies ) const
-{
-	string dkNkmLibNoFixup = "dk/nkm/lib";
-	const vector<File*>& files = module.non_if_data.files;
-	for ( size_t i = 0; i < files.size (); i++ )
-	{
-		File& file = *files[i];
-		string extension = GetExtension ( file.name );
-		if ( extension == ".spec" || extension == ".SPEC" )
-		{
-			GetSpecObjectDependencies ( dependencies, file.name );
-		}
-		if ( extension == ".idl" || extension == ".IDL" )
-		{
-			GetWidlObjectDependencies ( dependencies, file.name );
-		}
-	}
-}
-
-
-MingwBuildToolModuleHandler::MingwBuildToolModuleHandler ( const Module& module_ )
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwBuildToolModuleHandler::Process ()
-{
-	GenerateBuildToolModuleTarget ();
-}
-
-void
-MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro (module) );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-
-	GenerateRules ();
-
-	string linker;
-	if ( module.cplusplus )
-		linker = "${host_gpp}";
-	else
-		linker = "${host_gcc}";
-	
-	fprintf ( fMakefile, "%s: %s %s | %s\n",
-	          targetMacro.c_str (),
-	          objectsMacro.c_str (),
-	          linkDepsMacro.c_str (),
-	          GetDirectory(GetTargetFilename(module,NULL)).c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
-	fprintf ( fMakefile,
-	          "\t%s %s -o $@ %s %s\n\n",
-	          linker.c_str (),
-	          GetLinkerMacro ().c_str (),
-	          objectsMacro.c_str (),
-	          libsMacro.c_str () );
-}
-
-
-MingwKernelModuleHandler::MingwKernelModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwKernelModuleHandler::Process ()
-{
-	GenerateKernelModuleTarget ();
-}
-
-void
-MingwKernelModuleHandler::GenerateKernelModuleTarget ()
-{
-	string targetName ( module.GetTargetName () ); // i.e. "ntoskrnl.exe"
-	string targetMacro ( GetTargetMacro ( module ) ); // i.e. "$(NTOSKRNL_TARGET)"
-	string workingDirectory = GetWorkingDirectory ();
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-	string base_tmp = ros_temp + module.name + ".base.tmp";
-	CLEAN_FILE ( base_tmp );
-	string junk_tmp = ros_temp + module.name + ".junk.tmp";
-	CLEAN_FILE ( junk_tmp );
-	string temp_exp = ros_temp + module.name + ".temp.exp";
-	CLEAN_FILE ( temp_exp );
-	string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
-	                              module.GetBasePath ().c_str (),
-	                              module.entrypoint.c_str (),
-	                              module.baseaddress.c_str () );
-
-	GenerateRules ();
-
-	GenerateImportLibraryTargetIfNeeded ();
-
-	fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) | %s\n",
-	          targetMacro.c_str (),
-	          objectsMacro.c_str (),
-	          linkDepsMacro.c_str (),
-	          GetDirectory(GetTargetFilename(module,NULL)).c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
-	fprintf ( fMakefile,
-	          "\t${gcc} %s %s -Wl,--base-file,%s -o %s %s %s\n",
-	          GetLinkerMacro ().c_str (),
-	          gccOptions.c_str (),
-	          base_tmp.c_str (),
-	          junk_tmp.c_str (),
-	          objectsMacro.c_str (),
-	          linkDepsMacro.c_str () );
-	fprintf ( fMakefile,
-	          "\t-@${rm} %s 2>$(NUL)\n",
-	          junk_tmp.c_str () );
-	string killAt = module.mangledSymbols ? "" : "--kill-at";
-	fprintf ( fMakefile,
-	          "\t${dlltool} --dllname %s --base-file %s --def ntoskrnl/ntoskrnl.def --output-exp %s %s\n",
-	          targetName.c_str (),
-	          base_tmp.c_str (),
-	          temp_exp.c_str (),
-	          killAt.c_str () );
-	fprintf ( fMakefile,
-	          "\t-@${rm} %s 2>$(NUL)\n",
-	          base_tmp.c_str () );
-	fprintf ( fMakefile,
-	          "\t${gcc} %s %s -Wl,%s -o $@ %s %s\n",
-	          GetLinkerMacro ().c_str (),
-	          gccOptions.c_str (),
-	          temp_exp.c_str (),
-	          objectsMacro.c_str (),
-	          linkDepsMacro.c_str () );
-	fprintf ( fMakefile,
-	          "\t-@${rm} %s 2>$(NUL)\n",
-	          temp_exp.c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" );
-	fprintf ( fMakefile,
-	          "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" );
-}
-
-
-MingwStaticLibraryModuleHandler::MingwStaticLibraryModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwStaticLibraryModuleHandler::Process ()
-{
-	GenerateStaticLibraryModuleTarget ();
-}
-
-void
-MingwStaticLibraryModuleHandler::GenerateStaticLibraryModuleTarget ()
-{
-	GenerateRules ();
-}
-
-
-MingwObjectLibraryModuleHandler::MingwObjectLibraryModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwObjectLibraryModuleHandler::Process ()
-{
-	GenerateObjectLibraryModuleTarget ();
-}
-
-void
-MingwObjectLibraryModuleHandler::GenerateObjectLibraryModuleTarget ()
-{
-	GenerateRules ();
-}
-
-
-MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwKernelModeDLLModuleHandler::Process ()
-{
-	GenerateKernelModeDLLModuleTarget ();
-}
-
-void
-MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro ( module ) );
-	string workingDirectory = GetWorkingDirectory ( );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-
-	GenerateImportLibraryTargetIfNeeded ();
-
-	if ( module.non_if_data.files.size () > 0 )
-	{
-		GenerateRules ();
-
-		string dependencies = linkDepsMacro + " " + objectsMacro;
-
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
-		                                     module.entrypoint.c_str (),
-		                                     module.baseaddress.c_str () );
-		GenerateLinkerCommand ( dependencies,
-		                        "${gcc}",
-		                        linkerParameters,
-		                        objectsMacro,
-		                        libsMacro );
-	}
-	else
-	{
-		GeneratePhonyTarget();
-	}
-}
-
-
-MingwKernelModeDriverModuleHandler::MingwKernelModeDriverModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwKernelModeDriverModuleHandler::Process ()
-{
-	GenerateKernelModeDriverModuleTarget ();
-}
-
-
-void
-MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro (module) );
-	string workingDirectory = GetWorkingDirectory ();
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-
-	GenerateImportLibraryTargetIfNeeded ();
-
-	if ( module.non_if_data.files.size () > 0 )
-	{
-		GenerateRules ();
-
-		string dependencies = linkDepsMacro + " " + objectsMacro;
-
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
-		                                     module.entrypoint.c_str (),
-		                                     module.baseaddress.c_str () );
-		GenerateLinkerCommand ( dependencies,
-		                        "${gcc}",
-		                        linkerParameters,
-		                        objectsMacro,
-		                        libsMacro );
-	}
-	else
-	{
-		GeneratePhonyTarget();
-	}
-}
-
-
-MingwNativeDLLModuleHandler::MingwNativeDLLModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwNativeDLLModuleHandler::Process ()
-{
-	GenerateNativeDLLModuleTarget ();
-}
-
-void
-MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro (module) );
-	string workingDirectory = GetWorkingDirectory ( );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-	
-	GenerateImportLibraryTargetIfNeeded ();
-
-	if ( module.non_if_data.files.size () > 0 )
-	{
-		GenerateRules ();
-
-		string dependencies = linkDepsMacro + " " + objectsMacro;
-
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll",
-		                                     module.entrypoint.c_str (),
-		                                     module.baseaddress.c_str () );
-		GenerateLinkerCommand ( dependencies,
-		                        "${gcc}",
-		                        linkerParameters,
-		                        objectsMacro,
-		                        libsMacro );
-	}
-	else
-	{
-		GeneratePhonyTarget();
-	}
-}
-
-
-MingwNativeCUIModuleHandler::MingwNativeCUIModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwNativeCUIModuleHandler::Process ()
-{
-	GenerateNativeCUIModuleTarget ();
-}
-
-void
-MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro (module) );
-	string workingDirectory = GetWorkingDirectory ( );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-	
-	GenerateImportLibraryTargetIfNeeded ();
-
-	if ( module.non_if_data.files.size () > 0 )
-	{
-		GenerateRules ();
-
-		string dependencies = linkDepsMacro + " " + objectsMacro;
-
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib",
-		                                     module.entrypoint.c_str (),
-		                                     module.baseaddress.c_str () );
-		GenerateLinkerCommand ( dependencies,
-		                        "${gcc}",
-		                        linkerParameters,
-		                        objectsMacro,
-		                        libsMacro );
-	}
-	else
-	{
-		GeneratePhonyTarget();
-	}
-}
-
-
-MingwWin32DLLModuleHandler::MingwWin32DLLModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwWin32DLLModuleHandler::Process ()
-{
-	GenerateExtractWineDLLResourcesTarget ();
-	GenerateWin32DLLModuleTarget ();
-}
-
-void
-MingwWin32DLLModuleHandler::GenerateExtractWineDLLResourcesTarget ()
-{
-	fprintf ( fMakefile, ".PHONY: %s_extractresources\n\n",
-	          module.name.c_str () );
-	fprintf ( fMakefile, "%s_extractresources: $(BIN2RES_TARGET)\n",
-	          module.name.c_str () );
-	const vector<File*>& files = module.non_if_data.files;
-	for ( size_t i = 0; i < files.size (); i++ )
-	{
-		File& file = *files[i];
-		string extension = GetExtension ( file.name );
-		if ( extension == ".rc" || extension == ".RC" )
-		{
-			string resource = NormalizeFilename ( file.name );
-			fprintf ( fMakefile, "\t$(ECHO_BIN2RES)\n" );
-			fprintf ( fMakefile, "\t@:echo ${bin2res} -f -x %s\n",
-			          resource.c_str () );
-		}
-	}
-	fprintf ( fMakefile, "\n");
-}
-
-void
-MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro (module) );
-	string workingDirectory = GetWorkingDirectory ( );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-
-	GenerateImportLibraryTargetIfNeeded ();
-
-	if ( module.non_if_data.files.size () > 0 )
-	{
-		GenerateRules ();
-
-		string dependencies = linkDepsMacro + " " + objectsMacro;
-
-		string linker;
-		if ( module.cplusplus )
-			linker = "${gpp}";
-		else
-			linker = "${gcc}";
-
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll",
-		                                     module.entrypoint.c_str (),
-		                                     module.baseaddress.c_str () );
-		GenerateLinkerCommand ( dependencies,
-		                        linker,
-		                        linkerParameters,
-		                        objectsMacro,
-		                        libsMacro );
-	}
-	else
-	{
-		GeneratePhonyTarget();
-	}
-}
-
-
-MingwWin32CUIModuleHandler::MingwWin32CUIModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwWin32CUIModuleHandler::Process ()
-{
-	GenerateWin32CUIModuleTarget ();
-}
-
-void
-MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro (module) );
-	string workingDirectory = GetWorkingDirectory ( );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-
-	GenerateImportLibraryTargetIfNeeded ();
-
-	if ( module.non_if_data.files.size () > 0 )
-	{
-		GenerateRules ();
-
-		string dependencies = linkDepsMacro + " " + objectsMacro;
-
-		string linker;
-		if ( module.cplusplus )
-			linker = "${gpp}";
-		else
-			linker = "${gcc}";
-
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
-		                                     module.entrypoint.c_str (),
-		                                     module.baseaddress.c_str () );
-		GenerateLinkerCommand ( dependencies,
-		                        linker,
-		                        linkerParameters,
-		                        objectsMacro,
-		                        libsMacro );
-	}
-	else
-	{
-		GeneratePhonyTarget();
-	}
-}
-
-
-MingwWin32GUIModuleHandler::MingwWin32GUIModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwWin32GUIModuleHandler::Process ()
-{
-	GenerateWin32GUIModuleTarget ();
-}
-
-void
-MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro (module) );
-	string workingDirectory = GetWorkingDirectory ( );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-
-	GenerateImportLibraryTargetIfNeeded ();
-
-	if ( module.non_if_data.files.size () > 0 )
-	{
-		GenerateRules ();
-
-		string dependencies = linkDepsMacro + " " + objectsMacro;
-
-		string linker;
-		if ( module.cplusplus )
-			linker = "${gpp}";
-		else
-			linker = "${gcc}";
-
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
-		                                     module.entrypoint.c_str (),
-		                                     module.baseaddress.c_str () );
-		GenerateLinkerCommand ( dependencies,
-		                        linker,
-		                        linkerParameters,
-		                        objectsMacro,
-		                        libsMacro );
-	}
-	else
-	{
-		GeneratePhonyTarget();
-	}
-}
-
-
-MingwBootLoaderModuleHandler::MingwBootLoaderModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwBootLoaderModuleHandler::Process ()
-{
-	GenerateBootLoaderModuleTarget ();
-}
-
-void
-MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
-{
-	string targetName ( module.GetTargetName () );
-	string targetMacro ( GetTargetMacro (module) );
-	string workingDirectory = GetWorkingDirectory ();
-	string junk_tmp = ros_temp + module.name + ".junk.tmp";
-	CLEAN_FILE ( junk_tmp );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-
-	GenerateRules ();
-
-	fprintf ( fMakefile, "%s: %s %s | %s\n",
-	          targetMacro.c_str (),
-	          objectsMacro.c_str (),
-	          linkDepsMacro.c_str (),
-	          GetDirectory(GetTargetFilename(module,NULL)).c_str () );
-
-	fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
-
-	fprintf ( fMakefile,
-	          "\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n",
-	          GetLinkerMacro ().c_str (),
-	          junk_tmp.c_str (),
-	          objectsMacro.c_str (),
-	          linkDepsMacro.c_str () );
-	fprintf ( fMakefile,
-	          "\t${objcopy} -O binary %s $@\n",
-	          junk_tmp.c_str () );
-	fprintf ( fMakefile,
-	          "\t-@${rm} %s 2>$(NUL)\n",
-	          junk_tmp.c_str () );
-}
-
-
-MingwBootSectorModuleHandler::MingwBootSectorModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwBootSectorModuleHandler::Process ()
-{
-	GenerateBootSectorModuleTarget ();
-}
-
-void
-MingwBootSectorModuleHandler::GenerateBootSectorModuleTarget ()
-{
-	string objectsMacro = GetObjectsMacro ( module );
-
-	GenerateRules ();
-
-	fprintf ( fMakefile, ".PHONY: %s\n\n",
-	          module.name.c_str ());
-	fprintf ( fMakefile,
-	          "%s: %s\n",
-	          module.name.c_str (),
-	          objectsMacro.c_str () );
-}
-
-
-MingwIsoModuleHandler::MingwIsoModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwIsoModuleHandler::Process ()
-{
-	GenerateIsoModuleTarget ();
-}
-
-void
-MingwIsoModuleHandler::OutputBootstrapfileCopyCommands (
-	const string& bootcdDirectory )
-{
-	for ( size_t i = 0; i < module.project.modules.size (); i++ )
-	{
-		const Module& m = *module.project.modules[i];
-		if ( m.bootstrap != NULL )
-		{
-			string sourceFilename = PassThruCacheDirectory (
-				NormalizeFilename ( m.GetPath () ),
-				backend->outputDirectory );
-			string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd );
-			string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
-				NormalizeFilename ( targetFilenameNoFixup ),
-				backend->outputDirectory );
-			fprintf ( fMakefile,
-			          "\t$(ECHO_CP)\n" );
-			fprintf ( fMakefile,
-			          "\t${cp} %s %s 1>$(NUL)\n",
-			          sourceFilename.c_str (),
-			          targetFilename.c_str () );
-		}
-	}
-}
-
-void
-MingwIsoModuleHandler::OutputCdfileCopyCommands (
-	const string& bootcdDirectory )
-{
-	for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )
-	{
-		const CDFile& cdfile = *module.project.cdfiles[i];
-		string targetFilenameNoFixup = bootcdDirectory + SSEP + cdfile.base + SSEP + cdfile.nameoncd;
-		string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
-			NormalizeFilename ( targetFilenameNoFixup ),
-			backend->outputDirectory );
-		fprintf ( fMakefile,
-		          "\t$(ECHO_CP)\n" );
-		fprintf ( fMakefile,
-		          "\t${cp} %s %s 1>$(NUL)\n",
-		          cdfile.GetPath ().c_str (),
-		          targetFilename.c_str () );
-	}
-}
-
-string
-MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string& bootcdDirectory )
-{
-	string directories;
-	for ( size_t i = 0; i < module.project.modules.size (); i++ )
-	{
-		const Module& m = *module.project.modules[i];
-		if ( m.bootstrap != NULL )
-		{
-			string targetDirectory ( bootcdDirectory + SSEP + m.bootstrap->base );
-			if ( directories.size () > 0 )
-				directories += " ";
-			directories += PassThruCacheDirectory (
-				NormalizeFilename ( targetDirectory ),
-				backend->outputDirectory );
-		}
-	}
-	return directories;
-}
-
-string
-MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string& bootcdDirectory )
-{
-	string directories;
-	for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )
-	{
-		const CDFile& cdfile = *module.project.cdfiles[i];
-		string targetDirectory ( bootcdDirectory + SSEP + cdfile.base );
-		if ( directories.size () > 0 )
-			directories += " ";
-		directories += PassThruCacheDirectory (
-			NormalizeFilename ( targetDirectory ),
-			backend->outputDirectory );
-	}
-	return directories;
-}
-
-string
-MingwIsoModuleHandler::GetCdDirectories ( const string& bootcdDirectory )
-{
-	string directories = GetBootstrapCdDirectories ( bootcdDirectory );
-	directories += " " + GetNonModuleCdDirectories ( bootcdDirectory );
-	return directories;
-}
-
-void
-MingwIsoModuleHandler::GetBootstrapCdFiles (
-	vector<string>& out ) const
-{
-	for ( size_t i = 0; i < module.project.modules.size (); i++ )
-	{
-		const Module& m = *module.project.modules[i];
-		if ( m.bootstrap != NULL )
-		{
-			string filename = PassThruCacheDirectory (
-				NormalizeFilename ( m.GetPath () ),
-				backend->outputDirectory );
-			out.push_back ( filename );
-		}
-	}
-}
-
-void
-MingwIsoModuleHandler::GetNonModuleCdFiles (
-	vector<string>& out ) const
-{
-	for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )
-	{
-		const CDFile& cdfile = *module.project.cdfiles[i];
-		out.push_back ( cdfile.GetPath () );
-	}
-}
-
-void
-MingwIsoModuleHandler::GetCdFiles (
-	vector<string>& out ) const
-{
-	GetBootstrapCdFiles ( out );
-	GetNonModuleCdFiles ( out );
-}
-
-void
-MingwIsoModuleHandler::GenerateIsoModuleTarget ()
-{
-	string bootcdDirectory = "cd";
-	string bootcd = PassThruCacheDirectory (
-		NormalizeFilename ( bootcdDirectory + SSEP ),
-		backend->outputDirectory );
-	string isoboot = PassThruCacheDirectory (
-		NormalizeFilename ( "boot" SSEP "freeldr" SSEP "bootsect" SSEP "isoboot.o" ),
-		backend->outputDirectory );
-	string bootcdReactosNoFixup = bootcdDirectory + SSEP "reactos";
-	string bootcdReactos = PassThruCacheDirectory (
-		NormalizeFilename ( bootcdReactosNoFixup + SSEP ),
-		backend->outputDirectory );
-	CLEAN_FILE ( bootcdReactos );
-	string reactosInf = PassThruCacheDirectory (
-		NormalizeFilename ( bootcdReactosNoFixup + SSEP "reactos.inf" ),
-		backend->outputDirectory );
-	string reactosDff = NormalizeFilename ( "bootdata" SSEP "packages" SSEP "reactos.dff" );
-	string cdDirectories = GetCdDirectories ( bootcdDirectory );
-	vector<string> vCdFiles;
-	GetCdFiles ( vCdFiles );
-	string cdFiles = v2s ( vCdFiles, 5 );
-
-	fprintf ( fMakefile, ".PHONY: %s\n\n",
-	          module.name.c_str ());
-	fprintf ( fMakefile,
-	          "%s: all %s %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET)\n",
-	          module.name.c_str (),
-	          isoboot.c_str (),
-	          bootcdReactos.c_str (),
-	          cdDirectories.c_str (),
-	          cdFiles.c_str () );
-	fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" );
-	fprintf ( fMakefile,
-	          "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n",
-	          reactosDff.c_str (),
-	          bootcdReactos.c_str () );
-	fprintf ( fMakefile,
-	          "\t$(Q)$(CABMAN_TARGET) -C %s -RC %s -L %s -N -P $(OUTPUT)\n",
-	          reactosDff.c_str (),
-	          reactosInf.c_str (),
-	          bootcdReactos.c_str ());
-	fprintf ( fMakefile,
-	          "\t-@${rm} %s 2>$(NUL)\n",
-	          reactosInf.c_str () );
-	OutputBootstrapfileCopyCommands ( bootcdDirectory );
-	OutputCdfileCopyCommands ( bootcdDirectory );
-	fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
-	fprintf ( fMakefile,
-	          "\t$(Q)$(CDMAKE_TARGET) -v -m -b %s %s REACTOS ReactOS.iso\n",
-	          isoboot.c_str (),
-	          bootcd.c_str () );
-	fprintf ( fMakefile,
-	          "\n" );
-}
-
-
-MingwLiveIsoModuleHandler::MingwLiveIsoModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwLiveIsoModuleHandler::Process ()
-{
-	GenerateLiveIsoModuleTarget ();
-}
-
-void
-MingwLiveIsoModuleHandler::CreateDirectory ( const string& directory )
-{
-	string normalizedDirectory = MingwModuleHandler::PassThruCacheDirectory (
-		NormalizeFilename ( directory ) + SSEP,
-		backend->outputDirectory );
-}
-
-void
-MingwLiveIsoModuleHandler::OutputCopyCommand ( const string& sourceFilename,
-	                                           const string& targetFilename,
-	                                           const string& targetDirectory )
-{
-	string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory (
-		NormalizeFilename ( targetDirectory + SSEP + targetFilename ),
-		backend->outputDirectory );
-	fprintf ( fMakefile,
-	          "\t$(ECHO_CP)\n" );
-	fprintf ( fMakefile,
-	          "\t${cp} %s %s 1>$(NUL)\n",
-	          sourceFilename.c_str (),
-	          normalizedTargetFilename.c_str () );
-}
-
-void
-MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory,
-	                                                  string& reactosDirectory )
-{
-	for ( size_t i = 0; i < module.project.modules.size (); i++ )
-	{
-		const Module& m = *module.project.modules[i];
-		if ( m.installName.length () > 0 )
-		{
-			string sourceFilename = MingwModuleHandler::PassThruCacheDirectory (
-				NormalizeFilename ( m.GetPath () ),
-				backend->outputDirectory );
-			OutputCopyCommand ( sourceFilename,
-		                        m.installName,
-		                        livecdDirectory + SSEP + reactosDirectory + SSEP + m.installBase );
-		}
-	}
-}
-
-void
-MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdDirectory,
-	                                                     string& reactosDirectory )
-{
-	for ( size_t i = 0; i < module.project.installfiles.size (); i++ )
-	{
-		const InstallFile& installfile = *module.project.installfiles[i];
-		OutputCopyCommand ( installfile.GetPath (),
-	                        installfile.newname,
-	                        livecdDirectory + SSEP + reactosDirectory + SSEP + installfile.base );
-	}
-}
-
-void
-MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirectory )
-{
-	CreateDirectory ( livecdDirectory + SSEP "Profiles" );
-	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "All Users") ;
-	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "All Users" SSEP "Desktop" );
-	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" );
-	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" SSEP "Desktop" );
-	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" SSEP "My Documents" );
-
-	string livecdIni = "bootdata" SSEP "livecd.ini";
-	OutputCopyCommand ( livecdIni,
-                        "freeldr.ini",
-                        livecdDirectory );
-}
-
-void
-MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory )
-{
-	string freeldr = PassThruCacheDirectory (
-		NormalizeFilename ( "boot" SSEP "freeldr" SSEP "freeldr" SSEP "freeldr.sys" ),
-		backend->outputDirectory );
-	CreateDirectory ( livecdDirectory + SSEP "loader" );
-	OutputCopyCommand ( freeldr,
-                        "setupldr.sys",
-                        livecdDirectory + SSEP + "loader" );
-}
-
-void
-MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory )
-{
-	string reactosSystem32ConfigDirectory = NormalizeFilename (
-		MingwModuleHandler::PassThruCacheDirectory (
-		livecdDirectory + SSEP "reactos" SSEP "system32" SSEP "config" SSEP,
-		backend->outputDirectory ) );
-	fprintf ( fMakefile,
-	          "\t$(ECHO_MKHIVE)\n" );
-	fprintf ( fMakefile,
-	          "\t$(MKHIVE_TARGET) bootdata %s bootdata" SSEP "livecd.inf bootdata" SSEP "hiveinst.inf\n",
-	          reactosSystem32ConfigDirectory.c_str () );
-}
-
-void
-MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget ()
-{
-	string livecdDirectory = "livecd";
-	string livecd = PassThruCacheDirectory (
-		NormalizeFilename ( livecdDirectory + SSEP ),
-		backend->outputDirectory );
-	string isoboot = PassThruCacheDirectory (
-		NormalizeFilename ( "boot" SSEP "freeldr" SSEP "bootsect" SSEP "isoboot.o" ),
-		backend->outputDirectory );
-	string reactosDirectory = "reactos";
-	string livecdReactosNoFixup = livecdDirectory + SSEP + reactosDirectory;
-	string livecdReactos = NormalizeFilename ( PassThruCacheDirectory (
-		NormalizeFilename ( livecdReactosNoFixup + SSEP ),
-		backend->outputDirectory ) );
-	CLEAN_FILE ( livecdReactos );
-
-	fprintf ( fMakefile, ".PHONY: %s\n\n",
-	          module.name.c_str ());
-	fprintf ( fMakefile,
-	          "%s: all %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n",
-	          module.name.c_str (),
-	          isoboot.c_str (),
-	          livecdReactos.c_str () );
-	OutputModuleCopyCommands ( livecdDirectory,
-	                           reactosDirectory );
-	OutputNonModuleCopyCommands ( livecdDirectory,
-	                              reactosDirectory );
-	OutputProfilesDirectoryCommands ( livecdDirectory );
-	OutputLoaderCommands ( livecdDirectory );
-	OutputRegistryCommands ( livecdDirectory );
-	fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
-	fprintf ( fMakefile,
-	          "\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS ReactOS-LiveCD.iso\n",
-	          isoboot.c_str (),
-	          livecd.c_str () );
-	fprintf ( fMakefile,
-	          "\n" );
-}
-
-
-MingwTestModuleHandler::MingwTestModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwTestModuleHandler::Process ()
-{
-	GenerateTestModuleTarget ();
-}
-
-void
-MingwTestModuleHandler::GenerateTestModuleTarget ()
-{
-	string targetMacro ( GetTargetMacro ( module ) );
-	string workingDirectory = GetWorkingDirectory ( );
-	string objectsMacro = GetObjectsMacro ( module );
-	string linkDepsMacro = GetLinkingDependenciesMacro ();
-	string libsMacro = GetLibsMacro ();
-
-	GenerateImportLibraryTargetIfNeeded ();
-
-	if ( module.non_if_data.files.size () > 0 )
-	{
-		GenerateRules ();
-
-		string dependencies = linkDepsMacro + " " + objectsMacro;
-
-		string linker;
-		if ( module.cplusplus )
-			linker = "${gpp}";
-		else
-			linker = "${gcc}";
-
-		string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
-		                                     module.entrypoint.c_str (),
-		                                     module.baseaddress.c_str () );
-		GenerateLinkerCommand ( dependencies,
-		                        linker,
-		                        linkerParameters,
-		                        objectsMacro,
-		                        libsMacro );
-	}
-	else
-	{
-		GeneratePhonyTarget();
-	}
-}
-
-
-MingwRpcServerModuleHandler::MingwRpcServerModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwRpcServerModuleHandler::Process ()
-{
-	GenerateRules ();
-}
-
-MingwRpcClientModuleHandler::MingwRpcClientModuleHandler (
-	const Module& module_ )
-
-	: MingwModuleHandler ( module_ )
-{
-}
-
-void
-MingwRpcClientModuleHandler::Process ()
-{
-	GenerateRules ();
-}
+#include "../../pch.h"
+#include <assert.h>
+
+#include "../../rbuild.h"
+#include "mingw.h"
+#include "modulehandler.h"
+
+using std::string;
+using std::vector;
+
+#define CLEAN_FILE(f) clean_files.push_back ( f );
+
+static string ros_temp = "$(TEMPORARY)";
+MingwBackend*
+MingwModuleHandler::backend = NULL;
+FILE*
+MingwModuleHandler::fMakefile = NULL;
+bool
+MingwModuleHandler::use_pch = false;
+
+string
+PrefixFilename (
+	const string& filename,
+	const string& prefix )
+{
+	if ( !prefix.length() )
+		return filename;
+	string out;
+	const char* pfilename = filename.c_str();
+	const char* p1 = strrchr ( pfilename, '/' );
+	const char* p2 = strrchr ( pfilename, '\\' );
+	if ( p1 || p2 )
+	{
+		if ( p2 > p1 )
+			p1 = p2;
+		out += string(pfilename,p1-pfilename) + CSEP;
+		pfilename = p1 + 1;
+	}
+	out += prefix + pfilename;
+	return out;
+}
+
+string
+GetTargetMacro ( const Module& module, bool with_dollar )
+{
+	string s ( module.name );
+	strupr ( &s[0] );
+	s += "_TARGET";
+	if ( with_dollar )
+		return ssprintf ( "$(%s)", s.c_str() );
+	return s;
+}
+
+MingwModuleHandler::MingwModuleHandler (
+	const Module& module_ )
+
+	: module(module_)
+{
+}
+
+MingwModuleHandler::~MingwModuleHandler()
+{
+}
+
+/*static*/ void
+MingwModuleHandler::SetBackend ( MingwBackend* backend_ )
+{
+	backend = backend_;
+}
+
+/*static*/ void
+MingwModuleHandler::SetMakefile ( FILE* f )
+{
+	fMakefile = f;
+}
+
+/*static*/ void
+MingwModuleHandler::SetUsePch ( bool b )
+{
+	use_pch = b;
+}
+
+/* static*/ string
+MingwModuleHandler::RemoveVariables ( string path)
+{
+	size_t i = path.find ( '$' );
+	if ( i != string::npos )
+	{
+		size_t j = path.find ( ')', i );
+		if ( j != string::npos )
+		{
+			if ( j + 2 < path.length () && path[j + 1] == CSEP )
+				return path.substr ( j + 2);
+			else
+				return path.substr ( j + 1);
+		}
+	}
+	return path;
+}
+
+/*static*/ string
+MingwModuleHandler::PassThruCacheDirectory (
+	const string &file,
+	Directory* directoryTree )
+{
+	string directory ( GetDirectory ( RemoveVariables ( file ) ) );
+	string generatedFilesDirectory = backend->AddDirectoryTarget ( directory,
+	                                                               directoryTree );
+	if ( directory.find ( generatedFilesDirectory ) != string::npos )
+		/* This path already includes the generated files directory variable */
+		return file;
+	else
+		return generatedFilesDirectory + SSEP + file;
+}
+
+/*static*/ string
+MingwModuleHandler::GetTargetFilename (
+	const Module& module,
+	string_list* pclean_files )
+{
+	string target = PassThruCacheDirectory (
+		NormalizeFilename ( module.GetPath () ),
+		backend->outputDirectory );
+	if ( pclean_files )
+	{
+		string_list& clean_files = *pclean_files;
+		CLEAN_FILE ( target );
+	}
+	return target;
+}
+
+/*static*/ string
+MingwModuleHandler::GetImportLibraryFilename (
+	const Module& module,
+	string_list* pclean_files )
+{
+	string target = PassThruCacheDirectory (
+		NormalizeFilename ( module.GetDependencyPath () ),
+		backend->outputDirectory );
+	if ( pclean_files )
+	{
+		string_list& clean_files = *pclean_files;
+		CLEAN_FILE ( target );
+	}
+	return target;
+}
+
+/*static*/ MingwModuleHandler*
+MingwModuleHandler::InstanciateHandler (
+	const Module& module,
+	MingwBackend* backend )
+{
+	MingwModuleHandler* handler;
+	switch ( module.type )
+	{
+		case BuildTool:
+			handler = new MingwBuildToolModuleHandler ( module );
+			break;
+		case StaticLibrary:
+			handler = new MingwStaticLibraryModuleHandler ( module );
+			break;
+		case ObjectLibrary:
+			handler = new MingwObjectLibraryModuleHandler ( module );
+			break;
+		case Kernel:
+			handler = new MingwKernelModuleHandler ( module );
+			break;
+		case NativeCUI:
+			handler = new MingwNativeCUIModuleHandler ( module );
+			break;
+		case Win32CUI:
+			handler = new MingwWin32CUIModuleHandler ( module );
+			break;
+		case Win32GUI:
+			handler = new MingwWin32GUIModuleHandler ( module );
+			break;
+		case KernelModeDLL:
+			handler = new MingwKernelModeDLLModuleHandler ( module );
+			break;
+		case NativeDLL:
+			handler = new MingwNativeDLLModuleHandler ( module );
+			break;
+		case Win32DLL:
+			handler = new MingwWin32DLLModuleHandler ( module );
+			break;
+		case KernelModeDriver:
+			handler = new MingwKernelModeDriverModuleHandler ( module );
+			break;
+		case BootLoader:
+			handler = new MingwBootLoaderModuleHandler ( module );
+			break;
+		case BootSector:
+			handler = new MingwBootSectorModuleHandler ( module );
+			break;
+		case Iso:
+			handler = new MingwIsoModuleHandler ( module );
+			break;
+		case LiveIso:
+			handler = new MingwLiveIsoModuleHandler ( module );
+			break;
+		case Test:
+			handler = new MingwTestModuleHandler ( module );
+			break;
+		case RpcServer:
+			handler = new MingwRpcServerModuleHandler ( module );
+			break;
+		case RpcClient:
+			handler = new MingwRpcClientModuleHandler ( module );
+			break;
+		default:
+			throw UnknownModuleTypeException (
+				module.node.location,
+				module.type );
+			break;
+	}
+	return handler;
+}
+
+string
+MingwModuleHandler::GetWorkingDirectory () const
+{
+	return ".";
+}
+
+string
+MingwModuleHandler::GetBasename ( const string& filename ) const
+{
+	size_t index = filename.find_last_of ( '.' );
+	if ( index != string::npos )
+		return filename.substr ( 0, index );
+	return "";
+}
+
+string
+MingwModuleHandler::GetActualSourceFilename (
+	const string& filename ) const
+{
+	string extension = GetExtension ( filename );
+	if ( extension == ".spec" || extension == ".SPEC" )
+	{
+		string basename = GetBasename ( filename );
+		return PassThruCacheDirectory ( NormalizeFilename ( basename + ".stubs.c" ),
+		                                backend->intermediateDirectory );
+	}
+	else if ( extension == ".idl" || extension == ".IDL" )
+	{
+		string basename = GetBasename ( filename );
+		string newname;
+		if ( module.type == RpcServer )
+			newname = basename + "_s.c";
+		else
+			newname = basename + "_c.c";
+		return PassThruCacheDirectory ( NormalizeFilename ( newname ),
+		                                backend->intermediateDirectory );
+	}
+	else
+		return filename;
+}
+
+string
+MingwModuleHandler::GetModuleArchiveFilename () const
+{
+	if ( module.type == StaticLibrary )
+		return GetTargetFilename ( module, NULL );
+	return PassThruCacheDirectory ( ReplaceExtension (
+		NormalizeFilename ( module.GetPath () ),
+		".temp.a" ),
+		backend->intermediateDirectory );
+}
+
+bool
+MingwModuleHandler::IsGeneratedFile ( const File& file ) const
+{
+	string extension = GetExtension ( file.name );
+	return ( extension == ".spec" || extension == ".SPEC" );
+}
+
+/*static*/ bool
+MingwModuleHandler::ReferenceObjects (
+	const Module& module )
+{
+	if ( module.type == ObjectLibrary )
+		return true;
+	if ( module.type == RpcServer )
+		return true;
+	if ( module.type == RpcClient )
+		return true;
+	return false;
+}
+
+string
+MingwModuleHandler::GetImportLibraryDependency (
+	const Module& importedModule )
+{
+	string dep;
+	if ( ReferenceObjects ( importedModule ) )
+		dep = GetTargetMacro ( importedModule );
+	else
+		dep = GetImportLibraryFilename ( importedModule, NULL );
+	return dep;
+}
+
+void
+MingwModuleHandler::GetTargets ( const Module& dependencyModule,
+	                             string_list& targets )
+{
+	if ( dependencyModule.invocations.size () > 0 )
+	{
+		for ( size_t i = 0; i < dependencyModule.invocations.size (); i++ )
+		{
+			Invoke& invoke = *dependencyModule.invocations[i];
+			invoke.GetTargets ( targets );
+		}
+	}
+	else
+		targets.push_back ( GetImportLibraryDependency ( dependencyModule ) );
+}
+
+void
+MingwModuleHandler::GetModuleDependencies (
+	string_list& dependencies )
+{
+	size_t iend = module.dependencies.size ();
+
+	if ( iend == 0 )
+		return;
+	
+	for ( size_t i = 0; i < iend; i++ )
+	{
+		const Dependency& dependency = *module.dependencies[i];
+		const Module& dependencyModule = *dependency.dependencyModule;
+		GetTargets ( dependencyModule,
+		             dependencies );
+	}
+	GetDefinitionDependencies ( dependencies );
+}
+
+void
+MingwModuleHandler::GetSourceFilenames (
+	string_list& list,
+	bool includeGeneratedFiles ) const
+{
+	size_t i;
+
+	const vector<File*>& files = module.non_if_data.files;
+	for ( i = 0; i < files.size (); i++ )
+	{
+		if ( includeGeneratedFiles || !IsGeneratedFile ( *files[i] ) )
+		{
+			list.push_back (
+				GetActualSourceFilename ( files[i]->name ) );
+		}
+	}
+	// intentionally make a copy so that we can append more work in
+	// the middle of processing without having to go recursive
+	vector<If*> v = module.non_if_data.ifs;
+	for ( i = 0; i < v.size (); i++ )
+	{
+		size_t j;
+		If& rIf = *v[i];
+		// check for sub-ifs to add to list
+		const vector<If*>& ifs = rIf.data.ifs;
+		for ( j = 0; j < ifs.size (); j++ )
+			v.push_back ( ifs[j] );
+		const vector<File*>& files = rIf.data.files;
+		for ( j = 0; j < files.size (); j++ )
+		{
+			File& file = *files[j];
+			if ( includeGeneratedFiles || !IsGeneratedFile ( file ) )
+			{
+				list.push_back (
+					GetActualSourceFilename ( file.name ) );
+			}
+		}
+	}
+}
+
+void
+MingwModuleHandler::GetSourceFilenamesWithoutGeneratedFiles (
+	string_list& list ) const
+{
+	GetSourceFilenames ( list, false );
+}
+
+string
+MingwModuleHandler::GetObjectFilename (
+	const string& sourceFilename,
+	string_list* pclean_files ) const
+{
+	Directory* directoryTree;
+
+	string newExtension;
+	string extension = GetExtension ( sourceFilename );
+	if ( extension == ".rc" || extension == ".RC" )
+		newExtension = ".coff";
+	else if ( extension == ".spec" || extension == ".SPEC" )
+		newExtension = ".stubs.o";
+	else if ( extension == ".idl" || extension == ".IDL" )
+	{
+		if ( module.type == RpcServer )
+			newExtension = "_s.o";
+		else
+			newExtension = "_c.o";
+	}
+	else
+		newExtension = ".o";
+	
+	if ( module.type == BootSector )
+		directoryTree = backend->outputDirectory;
+	else
+		directoryTree = backend->intermediateDirectory;
+
+	string obj_file = PassThruCacheDirectory (
+		NormalizeFilename ( ReplaceExtension (
+			RemoveVariables ( sourceFilename ),
+			                  newExtension ) ),
+			directoryTree );
+	if ( pclean_files )
+	{
+		string_list& clean_files = *pclean_files;
+		CLEAN_FILE ( obj_file );
+	}
+	return obj_file;
+}
+
+void
+MingwModuleHandler::GenerateCleanTarget () const
+{
+	if ( 0 == clean_files.size() )
+		return;
+	fprintf ( fMakefile, ".PHONY: %s_clean\n", module.name.c_str() );
+	fprintf ( fMakefile, "%s_clean:\n\t-@${rm}", module.name.c_str() );
+	for ( size_t i = 0; i < clean_files.size(); i++ )
+	{
+		if ( 9==((i+1)%10) )
+			fprintf ( fMakefile, " 2>$(NUL)\n\t-@${rm}" );
+		fprintf ( fMakefile, " %s", clean_files[i].c_str() );
+	}
+	fprintf ( fMakefile, " 2>$(NUL)\n" );
+	fprintf ( fMakefile, "clean: %s_clean\n\n", module.name.c_str() );
+}
+
+string
+MingwModuleHandler::GetObjectFilenames ()
+{
+	const vector<File*>& files = module.non_if_data.files;
+	if ( files.size () == 0 )
+		return "";
+	
+	string objectFilenames ( "" );
+	for ( size_t i = 0; i < files.size (); i++ )
+	{
+		if ( objectFilenames.size () > 0 )
+			objectFilenames += " ";
+		objectFilenames +=
+			GetObjectFilename ( files[i]->name, NULL );
+	}
+	return objectFilenames;
+}
+
+string
+MingwModuleHandler::GenerateGccDefineParametersFromVector (
+	const vector<Define*>& defines ) const
+{
+	string parameters;
+	for ( size_t i = 0; i < defines.size (); i++ )
+	{
+		Define& define = *defines[i];
+		if (parameters.length () > 0)
+			parameters += " ";
+		parameters += "-D";
+		parameters += define.name;
+		if (define.value.length () > 0)
+		{
+			parameters += "=";
+			parameters += define.value;
+		}
+	}
+	return parameters;
+}
+
+string
+MingwModuleHandler::GenerateGccDefineParameters () const
+{
+	string parameters = GenerateGccDefineParametersFromVector ( module.project.non_if_data.defines );
+	string s = GenerateGccDefineParametersFromVector ( module.non_if_data.defines );
+	if ( s.length () > 0 )
+	{
+		parameters += " ";
+		parameters += s;
+	}
+	return parameters;
+}
+
+string
+MingwModuleHandler::ConcatenatePaths (
+	const string& path1,
+	const string& path2 ) const
+{
+	if ( ( path1.length () == 0 ) || ( path1 == "." ) || ( path1 == "./" ) )
+		return path2;
+	if ( path1[path1.length ()] == CSEP )
+		return path1 + path2;
+	else
+		return path1 + CSEP + path2;
+}
+
+string
+MingwModuleHandler::GenerateGccIncludeParametersFromVector ( const vector<Include*>& includes ) const
+{
+	string parameters;
+	for ( size_t i = 0; i < includes.size (); i++ )
+	{
+		Include& include = *includes[i];
+		if ( parameters.length () > 0 )
+			parameters += " ";
+		parameters += "-I" + include.directory;
+	}
+	return parameters;
+}
+
+string
+MingwModuleHandler::GenerateGccIncludeParameters () const
+{
+	string parameters = GenerateGccIncludeParametersFromVector ( module.non_if_data.includes );
+	string s = GenerateGccIncludeParametersFromVector ( module.project.non_if_data.includes );
+	if ( s.length () > 0 )
+	{
+		parameters += " ";
+		parameters += s;
+	}
+	return parameters;
+}
+
+
+string
+MingwModuleHandler::GenerateCompilerParametersFromVector ( const vector<CompilerFlag*>& compilerFlags ) const
+{
+	string parameters;
+	for ( size_t i = 0; i < compilerFlags.size (); i++ )
+	{
+		CompilerFlag& compilerFlag = *compilerFlags[i];
+		if ( parameters.length () > 0 )
+			parameters += " ";
+		parameters += compilerFlag.flag;
+	}
+	return parameters;
+}
+
+string
+MingwModuleHandler::GenerateLinkerParametersFromVector ( const vector<LinkerFlag*>& linkerFlags ) const
+{
+	string parameters;
+	for ( size_t i = 0; i < linkerFlags.size (); i++ )
+	{
+		LinkerFlag& linkerFlag = *linkerFlags[i];
+		if ( parameters.length () > 0 )
+			parameters += " ";
+		parameters += linkerFlag.flag;
+	}
+	return parameters;
+}
+
+string
+MingwModuleHandler::GenerateImportLibraryDependenciesFromVector (
+	const vector<Library*>& libraries )
+{
+	string dependencies ( "" );
+	int wrap_count = 0;
+	for ( size_t i = 0; i < libraries.size (); i++ )
+	{
+		if ( wrap_count++ == 5 )
+			dependencies += " \\\n\t\t", wrap_count = 0;
+		else if ( dependencies.size () > 0 )
+			dependencies += " ";
+		dependencies += GetImportLibraryDependency ( *libraries[i]->imported_module );
+	}
+	return dependencies;
+}
+
+string
+MingwModuleHandler::GenerateLinkerParameters () const
+{
+	return GenerateLinkerParametersFromVector ( module.linkerFlags );
+}
+
+void
+MingwModuleHandler::GenerateMacro (
+	const char* assignmentOperation,
+	const string& macro,
+	const IfableData& data,
+	const vector<CompilerFlag*>* compilerFlags )
+{
+	size_t i;
+
+	fprintf (
+		fMakefile,
+		"%s %s",
+		macro.c_str(),
+		assignmentOperation );
+	
+	if ( compilerFlags != NULL )
+	{
+		string compilerParameters = GenerateCompilerParametersFromVector ( *compilerFlags );
+		if ( compilerParameters.size () > 0 )
+		{
+			fprintf (
+				fMakefile,
+				" %s",
+				compilerParameters.c_str () );
+		}
+	}
+
+	for ( i = 0; i < data.includes.size(); i++ )
+	{
+		fprintf (
+			fMakefile,
+			" -I%s",
+			data.includes[i]->directory.c_str() );
+	}
+	for ( i = 0; i < data.defines.size(); i++ )
+	{
+		Define& d = *data.defines[i];
+		fprintf (
+			fMakefile,
+			" -D%s",
+			d.name.c_str() );
+		if ( d.value.size() )
+			fprintf (
+				fMakefile,
+				"=%s",
+				d.value.c_str() );
+	}
+	fprintf ( fMakefile, "\n" );
+}
+
+void
+MingwModuleHandler::GenerateMacros (
+	const char* assignmentOperation,
+	const IfableData& data,
+	const vector<CompilerFlag*>* compilerFlags,
+	const vector<LinkerFlag*>* linkerFlags )
+{
+	size_t i;
+
+	if ( data.includes.size () > 0 || data.defines.size () > 0 )
+	{
+		GenerateMacro ( assignmentOperation,
+		                cflagsMacro,
+		                data,
+		                compilerFlags );
+		GenerateMacro ( assignmentOperation,
+		                windresflagsMacro,
+		                data,
+		                compilerFlags );
+	}
+	
+	if ( linkerFlags != NULL )
+	{
+		string linkerParameters = GenerateLinkerParametersFromVector ( *linkerFlags );
+		if ( linkerParameters.size () > 0 )
+		{
+			fprintf (
+				fMakefile,
+				"%s %s %s\n",
+				linkerflagsMacro.c_str (),
+				assignmentOperation,
+				linkerParameters.c_str() );
+		}
+	}
+
+	if ( data.libraries.size () > 0 )
+	{
+		string deps = GenerateImportLibraryDependenciesFromVector ( data.libraries );
+		if ( deps.size () > 0 )
+		{
+			fprintf (
+				fMakefile,
+				"%s %s %s\n",
+				libsMacro.c_str(),
+				assignmentOperation,
+				deps.c_str() );
+		}
+	}
+
+	const vector<If*>& ifs = data.ifs;
+	for ( i = 0; i < ifs.size(); i++ )
+	{
+		If& rIf = *ifs[i];
+		if ( rIf.data.defines.size()
+			|| rIf.data.includes.size()
+			|| rIf.data.libraries.size()
+			|| rIf.data.files.size()
+			|| rIf.data.ifs.size() )
+		{
+			fprintf (
+				fMakefile,
+				"ifeq (\"$(%s)\",\"%s\")\n",
+				rIf.property.c_str(),
+				rIf.value.c_str() );
+			GenerateMacros (
+				"+=",
+				rIf.data,
+				NULL,
+				NULL );
+			fprintf ( 
+				fMakefile,
+				"endif\n\n" );
+		}
+	}
+}
+
+void
+MingwModuleHandler::GenerateObjectMacros (
+	const char* assignmentOperation,
+	const IfableData& data,
+	const vector<CompilerFlag*>* compilerFlags,
+	const vector<LinkerFlag*>* linkerFlags )
+{
+	size_t i;
+
+	const vector<File*>& files = data.files;
+	if ( files.size () > 0 )
+	{
+		for ( i = 0; i < files.size (); i++ )
+		{
+			File& file = *files[i];
+			if ( file.first )
+			{
+				fprintf ( fMakefile,
+					"%s := %s $(%s)\n",
+					objectsMacro.c_str(),
+					GetObjectFilename (
+						file.name, NULL ).c_str (),
+					objectsMacro.c_str() );
+			}
+		}
+		fprintf (
+			fMakefile,
+			"%s %s",
+			objectsMacro.c_str (),
+			assignmentOperation );
+		for ( i = 0; i < files.size(); i++ )
+		{
+			File& file = *files[i];
+			if ( !file.first )
+			{
+				fprintf (
+					fMakefile,
+					"%s%s",
+					( i%10 == 9 ? " \\\n\t" : " " ),
+					GetObjectFilename (
+						file.name, NULL ).c_str () );
+			}
+		}
+		fprintf ( fMakefile, "\n" );
+	}
+
+	const vector<If*>& ifs = data.ifs;
+	for ( i = 0; i < ifs.size(); i++ )
+	{
+		If& rIf = *ifs[i];
+		if ( rIf.data.defines.size()
+			|| rIf.data.includes.size()
+			|| rIf.data.libraries.size()
+			|| rIf.data.files.size()
+			|| rIf.data.ifs.size() )
+		{
+			fprintf (
+				fMakefile,
+				"ifeq (\"$(%s)\",\"%s\")\n",
+				rIf.property.c_str(),
+				rIf.value.c_str() );
+			GenerateObjectMacros (
+				"+=",
+				rIf.data,
+				NULL,
+				NULL );
+			fprintf ( 
+				fMakefile,
+				"endif\n\n" );
+		}
+	}
+}
+
+void
+MingwModuleHandler::GenerateGccCommand (
+	const string& sourceFilename,
+	const string& cc,
+	const string& cflagsMacro )
+{
+	string dependencies = sourceFilename;
+	if ( module.pch && use_pch )
+		dependencies += " " + module.pch->header + ".gch";
+	
+	/* WIDL generated headers may be used */
+	dependencies += " " + GetLinkingDependenciesMacro ();
+	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
+
+	string objectFilename = GetObjectFilename (
+		sourceFilename, &clean_files );
+	fprintf ( fMakefile,
+	          "%s: %s | %s\n",
+	          objectFilename.c_str (),
+	          dependencies.c_str (),
+	          GetDirectory ( objectFilename ).c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_CC)\n" );
+	fprintf ( fMakefile,
+	         "\t%s -c $< -o $@ %s\n",
+	         cc.c_str (),
+	         cflagsMacro.c_str () );
+}
+
+void
+MingwModuleHandler::GenerateGccAssemblerCommand (
+	const string& sourceFilename,
+	const string& cc,
+	const string& cflagsMacro )
+{
+	string dependencies = sourceFilename;
+	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
+	string objectFilename = GetObjectFilename (
+		sourceFilename, &clean_files );
+	fprintf ( fMakefile,
+	          "%s: %s | %s\n",
+	          objectFilename.c_str (),
+	          dependencies.c_str (),
+	          GetDirectory ( objectFilename ).c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_GAS)\n" );
+	fprintf ( fMakefile,
+	          "\t%s -x assembler-with-cpp -c $< -o $@ -D__ASM__ %s\n",
+	          cc.c_str (),
+	          cflagsMacro.c_str () );
+}
+
+void
+MingwModuleHandler::GenerateNasmCommand (
+	const string& sourceFilename,
+	const string& nasmflagsMacro )
+{
+	string dependencies = sourceFilename;
+	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
+	string objectFilename = GetObjectFilename (
+		sourceFilename, &clean_files );
+	fprintf ( fMakefile,
+	          "%s: %s | %s\n",
+	          objectFilename.c_str (),
+	          dependencies.c_str (),
+	          GetDirectory ( objectFilename ).c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_NASM)\n" );
+	fprintf ( fMakefile,
+	          "\t%s -f win32 $< -o $@ %s\n",
+	          "$(Q)nasm",
+	          nasmflagsMacro.c_str () );
+}
+
+void
+MingwModuleHandler::GenerateWindresCommand (
+	const string& sourceFilename,
+	const string& windresflagsMacro )
+{
+	string dependencies = sourceFilename;
+	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
+	string objectFilename =
+		GetObjectFilename ( sourceFilename, &clean_files );
+	string rciFilename = ros_temp + module.name + ".rci.tmp";
+	string resFilename = ros_temp + module.name + ".res.tmp";
+	if ( module.useWRC )
+	{
+		fprintf ( fMakefile,
+		          "%s: %s $(WRC_TARGET) | %s\n",
+		          objectFilename.c_str (),
+		          dependencies.c_str (),
+		          GetDirectory ( objectFilename ).c_str () );
+		fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
+		fprintf ( fMakefile,
+		         "\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n",
+		         windresflagsMacro.c_str (),
+		         sourceFilename.c_str (),
+		         rciFilename.c_str () );
+		fprintf ( fMakefile,
+		         "\t$(Q)$(WRC_TARGET) ${%s} %s %s\n",
+		         windresflagsMacro.c_str (),
+		         rciFilename.c_str (),
+		         resFilename.c_str () );
+		fprintf ( fMakefile,
+		         "\t-@${rm} %s 2>$(NUL)\n",
+		         rciFilename.c_str () );
+		fprintf ( fMakefile,
+		         "\t${windres} %s -o $@\n",
+		         resFilename.c_str () );
+		fprintf ( fMakefile,
+		         "\t-@${rm} %s 2>$(NUL)\n",
+		         resFilename.c_str () );
+	}
+	else
+	{
+		fprintf ( fMakefile,
+		          "%s: %s $(WRC_TARGET) | %s\n",
+		          objectFilename.c_str (),
+		          dependencies.c_str (),
+		          GetDirectory ( objectFilename ).c_str () );
+		fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
+		fprintf ( fMakefile,
+		         "\t${windres} $(%s) %s -o $@\n",
+		         windresflagsMacro.c_str (),
+		         sourceFilename.c_str () );
+	}
+}
+
+void
+MingwModuleHandler::GenerateWinebuildCommands (
+	const string& sourceFilename )
+{
+	string dependencies = sourceFilename;
+	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
+
+	string basename = GetBasename ( sourceFilename );
+	string def_file = PassThruCacheDirectory (
+		basename + ".spec.def",
+		backend->intermediateDirectory );
+	CLEAN_FILE(def_file);
+
+	string stub_file = PassThruCacheDirectory (
+		basename + ".stubs.c",
+		backend->intermediateDirectory );
+	CLEAN_FILE(stub_file)
+
+	fprintf ( fMakefile,
+	          "%s: %s $(WINEBUILD_TARGET)\n",
+	          def_file.c_str (),
+	          dependencies.c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
+	fprintf ( fMakefile,
+	          "\t%s --def=%s -o %s\n",
+	          "$(Q)$(WINEBUILD_TARGET)",
+	          sourceFilename.c_str (),
+	          def_file.c_str () );
+
+	fprintf ( fMakefile,
+	          "%s: %s $(WINEBUILD_TARGET)\n",
+	          stub_file.c_str (),
+	          sourceFilename.c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
+	fprintf ( fMakefile,
+	          "\t%s --pedll=%s -o %s\n",
+	          "$(Q)$(WINEBUILD_TARGET)",
+	          sourceFilename.c_str (),
+	          stub_file.c_str () );
+}
+
+string
+MingwModuleHandler::GetWidlFlags ( const File& file )
+{
+	return file.switches;
+}
+		
+void
+MingwModuleHandler::GenerateWidlCommandsServer (
+	const File& file,
+	const string& widlflagsMacro )
+{
+	string dependencies = file.name;
+	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
+
+	string basename = GetBasename ( file.name );
+
+	/*string generatedHeaderFilename = PassThruCacheDirectory (
+		basename + ".h",
+		backend->intermediateDirectory );
+	CLEAN_FILE(generatedHeaderFilename);
+	*/
+	string generatedHeaderFilename = basename + "_s.h";
+	CLEAN_FILE(generatedHeaderFilename);
+
+  	string generatedServerFilename = PassThruCacheDirectory (
+		basename + "_s.c",
+		backend->intermediateDirectory );
+	CLEAN_FILE(generatedServerFilename);
+
+	fprintf ( fMakefile,
+	          "%s %s: %s $(WIDL_TARGET) | %s\n",
+	          generatedServerFilename.c_str (),
+	          generatedHeaderFilename.c_str (),
+	          dependencies.c_str (),
+	          GetDirectory ( generatedServerFilename ).c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" );
+	fprintf ( fMakefile,
+	          "\t%s %s %s -h -H %s -s -S %s %s\n",
+	          "$(Q)$(WIDL_TARGET)",
+	          GetWidlFlags ( file ).c_str (),
+	          widlflagsMacro.c_str (),
+	          generatedHeaderFilename.c_str (),
+	          generatedServerFilename.c_str (),
+	          file.name.c_str () );
+}
+
+void
+MingwModuleHandler::GenerateWidlCommandsClient (
+	const File& file,
+	const string& widlflagsMacro )
+{
+	string dependencies = file.name;
+	dependencies += " " + NormalizeFilename ( module.xmlbuildFile );
+
+	string basename = GetBasename ( file.name );
+
+	/*string generatedHeaderFilename = PassThruCacheDirectory (
+		basename + ".h",
+		backend->intermediateDirectory );
+	CLEAN_FILE(generatedHeaderFilename);
+	*/
+	string generatedHeaderFilename = basename + "_c.h";
+	CLEAN_FILE(generatedHeaderFilename);
+
+  	string generatedClientFilename = PassThruCacheDirectory (
+		basename + "_c.c",
+		backend->intermediateDirectory );
+	CLEAN_FILE(generatedClientFilename);
+
+	fprintf ( fMakefile,
+	          "%s %s: %s $(WIDL_TARGET) | %s\n",
+	          generatedClientFilename.c_str (),
+	          generatedHeaderFilename.c_str (),
+	          dependencies.c_str (),
+	          GetDirectory ( generatedClientFilename ).c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" );
+	fprintf ( fMakefile,
+	          "\t%s %s %s -h -H %s -c -C %s %s\n",
+	          "$(Q)$(WIDL_TARGET)",
+	          GetWidlFlags ( file ).c_str (),
+	          widlflagsMacro.c_str (),
+	          generatedHeaderFilename.c_str (),
+	          generatedClientFilename.c_str (),
+	          file.name.c_str () );
+}
+
+void
+MingwModuleHandler::GenerateWidlCommands (
+	const File& file,
+	const string& widlflagsMacro )
+{
+	if ( module.type == RpcServer )
+		GenerateWidlCommandsServer ( file,
+		                             widlflagsMacro );
+	else
+		GenerateWidlCommandsClient ( file,
+		                             widlflagsMacro );
+}
+
+void
+MingwModuleHandler::GenerateCommands (
+	const File& file,
+	const string& cc,
+	const string& cppc,
+	const string& cflagsMacro,
+	const string& nasmflagsMacro,
+	const string& windresflagsMacro,
+	const string& widlflagsMacro )
+{
+	string extension = GetExtension ( file.name );
+	if ( extension == ".c" || extension == ".C" )
+	{
+		GenerateGccCommand ( file.name,
+		                     cc,
+		                     cflagsMacro );
+		return;
+	}
+	else if ( extension == ".cc" || extension == ".CC" ||
+	          extension == ".cpp" || extension == ".CPP" ||
+	          extension == ".cxx" || extension == ".CXX" )
+	{
+		GenerateGccCommand ( file.name,
+		                     cppc,
+		                     cflagsMacro );
+		return;
+	}
+	else if ( extension == ".s" || extension == ".S" )
+	{
+		GenerateGccAssemblerCommand ( file.name,
+		                              cc,
+		                              cflagsMacro );
+		return;
+	}
+	else if ( extension == ".asm" || extension == ".ASM" )
+	{
+		GenerateNasmCommand ( file.name,
+		                      nasmflagsMacro );
+		return;
+	}
+	else if ( extension == ".rc" || extension == ".RC" )
+	{
+		GenerateWindresCommand ( file.name,
+		                         windresflagsMacro );
+		return;
+	}
+	else if ( extension == ".spec" || extension == ".SPEC" )
+	{
+		GenerateWinebuildCommands ( file.name );
+		GenerateGccCommand ( GetActualSourceFilename ( file.name ),
+		                     cc,
+		                     cflagsMacro );
+		return;
+	}
+	else if ( extension == ".idl" || extension == ".IDL" )
+	{
+		GenerateWidlCommands ( file,
+		                       widlflagsMacro );
+		GenerateGccCommand ( GetActualSourceFilename ( file.name ),
+		                     cc,
+		                     cflagsMacro );
+		return;
+	}
+
+	throw InvalidOperationException ( __FILE__,
+	                                  __LINE__,
+	                                  "Unsupported filename extension '%s' in file '%s'",
+	                                  extension.c_str (),
+	                                  file.name.c_str () );
+}
+
+void
+MingwModuleHandler::GenerateBuildMapCode ()
+{
+	fprintf ( fMakefile,
+	          "ifeq ($(ROS_BUILDMAP),full)\n" );
+
+	string mapFilename = PassThruCacheDirectory (
+		GetBasename ( module.GetPath () ) + ".map",
+		backend->outputDirectory );
+	CLEAN_FILE ( mapFilename );
+	
+	fprintf ( fMakefile,
+	          "\t$(ECHO_OBJDUMP)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)${objdump} -d -S $@ > %s\n",
+	          mapFilename.c_str () );
+
+	fprintf ( fMakefile,
+	          "else\n" );
+	fprintf ( fMakefile,
+	          "ifeq ($(ROS_BUILDMAP),yes)\n" );
+
+	fprintf ( fMakefile,
+	          "\t$(ECHO_NM)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)${nm} --numeric-sort $@ > %s\n",
+	          mapFilename.c_str () );
+
+	fprintf ( fMakefile,
+	          "endif\n" );
+
+	fprintf ( fMakefile,
+	          "endif\n" );
+}
+
+void
+MingwModuleHandler::GenerateBuildNonSymbolStrippedCode ()
+{
+	fprintf ( fMakefile,
+	          "ifeq ($(ROS_BUILDNOSTRIP),yes)\n" );
+
+	string filename = module.GetPath ();
+	string outputFilename = PassThruCacheDirectory (
+		filename,
+		backend->outputDirectory );
+	string nostripFilename = PassThruCacheDirectory (
+		GetBasename ( filename ) + ".nostrip" + GetExtension ( filename ),
+		backend->outputDirectory );
+	CLEAN_FILE ( nostripFilename );
+	
+	fprintf ( fMakefile,
+	          "\t$(ECHO_CP)\n" );
+	fprintf ( fMakefile,
+			  "\t${cp} %s %s 1>$(NUL)\n",
+			  outputFilename.c_str (),
+	          nostripFilename.c_str () );
+	
+	fprintf ( fMakefile,
+	          "endif\n" );
+}
+
+void
+MergeStringVector ( const vector<string>& input,
+	                vector<string>& output )
+{
+	int wrap_at = 25;
+	string s;
+	int wrap_count = -1;
+	for ( size_t i = 0; i < input.size (); i++ )
+	{
+		if ( input[i].size () == 0 )
+			continue;
+		if ( wrap_count++ == wrap_at )
+		{
+			output.push_back ( s );
+			s = "";
+			wrap_count = 0;
+		}
+		else if ( s.size () > 0)
+			s += " ";
+		s += input[i];
+	}
+	if ( s.length () > 0 )
+		output.push_back ( s );
+}
+
+void
+MingwModuleHandler::GetObjectsVector ( const IfableData& data,
+                                       vector<string>& objectFiles ) const
+{
+	for ( size_t i = 0; i < data.files.size (); i++ )
+	{
+		File& file = *data.files[i];
+		objectFiles.push_back ( GetObjectFilename ( file.name, NULL ) );
+	}
+}
+
+void
+MingwModuleHandler::GenerateCleanObjectsAsYouGoCode () const
+{
+	if ( backend->cleanAsYouGo )
+	{
+		vector<string> objectFiles;
+		GetObjectsVector ( module.non_if_data,
+                           objectFiles );
+		vector<string> lines;
+		MergeStringVector ( objectFiles,
+	                        lines );
+		for ( size_t i = 0; i < lines.size (); i++ )
+		{
+			fprintf ( fMakefile,
+			          "\t-@${rm} %s 2>$(NUL)\n",
+			          lines[i].c_str () );
+		}
+	}
+}
+
+void
+MingwModuleHandler::GenerateLinkerCommand (
+	const string& dependencies,
+	const string& linker,
+	const string& linkerParameters,
+	const string& objectsMacro,
+	const string& libsMacro )
+{
+	string target ( GetTargetMacro ( module ) );
+	string target_folder ( GetDirectory ( GetTargetFilename ( module, NULL ) ) );
+
+	fprintf ( fMakefile,
+		"%s: %s $(RSYM_TARGET) | %s\n",
+		target.c_str (),
+		dependencies.c_str (),
+		target_folder.c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
+	string targetName ( module.GetTargetName () );
+	if ( module.importLibrary != NULL )
+	{
+		string base_tmp = ros_temp + module.name + ".base.tmp";
+		CLEAN_FILE ( base_tmp );
+		string junk_tmp = ros_temp + module.name + ".junk.tmp";
+		CLEAN_FILE ( junk_tmp );
+		string temp_exp = ros_temp + module.name + ".temp.exp";
+		CLEAN_FILE ( temp_exp );
+		string def_file = GetDefinitionFilename ();
+
+		fprintf ( fMakefile,
+		          "\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n",
+		          linker.c_str (),
+		          linkerParameters.c_str (),
+		          base_tmp.c_str (),
+		          junk_tmp.c_str (),
+		          objectsMacro.c_str (),
+		          libsMacro.c_str (),
+		          GetLinkerMacro ().c_str () );
+
+		fprintf ( fMakefile,
+		          "\t-@${rm} %s 2>$(NUL)\n",
+		          junk_tmp.c_str () );
+
+		string killAt = module.mangledSymbols ? "" : "--kill-at";
+		fprintf ( fMakefile,
+		          "\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s %s\n",
+		          targetName.c_str (),
+		          base_tmp.c_str (),
+		          def_file.c_str (),
+		          temp_exp.c_str (),
+		          killAt.c_str () );
+
+		fprintf ( fMakefile,
+		          "\t-@${rm} %s 2>$(NUL)\n",
+		          base_tmp.c_str () );
+
+		fprintf ( fMakefile,
+		          "\t%s %s %s -o %s %s %s %s\n",
+		          linker.c_str (),
+		          linkerParameters.c_str (),
+		          temp_exp.c_str (),
+		          target.c_str (),
+		          objectsMacro.c_str (),
+		          libsMacro.c_str (),
+		          GetLinkerMacro ().c_str () );
+
+		fprintf ( fMakefile,
+		          "\t-@${rm} %s 2>$(NUL)\n",
+		          temp_exp.c_str () );
+		
+		GenerateCleanObjectsAsYouGoCode ();
+	}
+	else
+	{
+		fprintf ( fMakefile,
+		          "\t%s %s -o %s %s %s %s\n",
+		          linker.c_str (),
+		          linkerParameters.c_str (),
+		          target.c_str (),
+		          objectsMacro.c_str (),
+		          libsMacro.c_str (),
+		          GetLinkerMacro ().c_str () );
+
+		GenerateCleanObjectsAsYouGoCode ();
+	}
+
+	GenerateBuildMapCode ();
+
+	GenerateBuildNonSymbolStrippedCode ();
+
+	fprintf ( fMakefile,
+	          "\t$(ECHO_RSYM)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" );
+}
+
+void
+MingwModuleHandler::GeneratePhonyTarget() const
+{
+	string targetMacro ( GetTargetMacro(module) );
+	fprintf ( fMakefile, ".PHONY: %s\n\n",
+	          targetMacro.c_str ());
+	fprintf ( fMakefile, "%s: | %s\n",
+	          targetMacro.c_str (),
+	          GetDirectory(GetTargetFilename(module,NULL)).c_str () );
+}
+
+void
+MingwModuleHandler::GenerateObjectFileTargets (
+	const IfableData& data,
+	const string& cc,
+	const string& cppc,
+	const string& cflagsMacro,
+	const string& nasmflagsMacro,
+	const string& windresflagsMacro,
+	const string& widlflagsMacro )
+{
+	size_t i;
+	
+	const vector<File*>& files = data.files;
+	for ( i = 0; i < files.size (); i++ )
+	{
+		GenerateCommands ( *files[i],
+		                   cc,
+		                   cppc,
+		                   cflagsMacro,
+		                   nasmflagsMacro,
+		                   windresflagsMacro,
+		                   widlflagsMacro );
+		fprintf ( fMakefile,
+		          "\n" );
+	}
+
+	const vector<If*>& ifs = data.ifs;
+	for ( i = 0; i < ifs.size(); i++ )
+	{
+		GenerateObjectFileTargets ( ifs[i]->data,
+		                            cc,
+		                            cppc,
+		                            cflagsMacro,
+		                            nasmflagsMacro,
+		                            windresflagsMacro,
+		                            widlflagsMacro );
+	}
+}
+
+void
+MingwModuleHandler::GenerateObjectFileTargets (
+	const string& cc,
+	const string& cppc,
+	const string& cflagsMacro,
+	const string& nasmflagsMacro,
+	const string& windresflagsMacro,
+	const string& widlflagsMacro )
+{
+	if ( module.pch )
+	{
+		const string& pch_file = module.pch->header;
+		string gch_file = pch_file + ".gch";
+		CLEAN_FILE(gch_file);
+		if ( use_pch )
+		{
+			fprintf (
+				fMakefile,
+				"%s: %s\n",
+				gch_file.c_str(),
+				pch_file.c_str() );
+			fprintf ( fMakefile, "\t$(ECHO_PCH)\n" );
+			fprintf (
+				fMakefile,
+				"\t%s -o %s %s -g %s\n\n",
+				( module.cplusplus ? cppc.c_str() : cc.c_str() ),
+				gch_file.c_str(),
+				cflagsMacro.c_str(),
+				pch_file.c_str() );
+		}
+	}
+
+	GenerateObjectFileTargets ( module.non_if_data,
+	                            cc,
+	                            cppc,
+	                            cflagsMacro,
+	                            nasmflagsMacro,
+	                            windresflagsMacro,
+	                            widlflagsMacro );
+	fprintf ( fMakefile, "\n" );
+}
+
+string
+MingwModuleHandler::GenerateArchiveTarget ( const string& ar,
+                                            const string& objs_macro ) const
+{
+	string archiveFilename ( GetModuleArchiveFilename () );
+	
+	fprintf ( fMakefile,
+	          "%s: %s | %s\n",
+	          archiveFilename.c_str (),
+	          objs_macro.c_str (),
+	          GetDirectory(archiveFilename).c_str() );
+
+	fprintf ( fMakefile, "\t$(ECHO_AR)\n" );
+
+	fprintf ( fMakefile,
+	          "\t%s -rc $@ %s\n",
+	          ar.c_str (),
+	          objs_macro.c_str ());
+
+	GenerateCleanObjectsAsYouGoCode ();
+
+	fprintf ( fMakefile, "\n" );
+
+	return archiveFilename;
+}
+
+string
+MingwModuleHandler::GetCFlagsMacro () const
+{
+	return ssprintf ( "$(%s_CFLAGS)",
+	                  module.name.c_str () );
+}
+
+/*static*/ string
+MingwModuleHandler::GetObjectsMacro ( const Module& module )
+{
+	return ssprintf ( "$(%s_OBJS)",
+	                  module.name.c_str () );
+}
+
+string
+MingwModuleHandler::GetLinkingDependenciesMacro () const
+{
+	return ssprintf ( "$(%s_LINKDEPS)", module.name.c_str () );
+}
+
+string
+MingwModuleHandler::GetLibsMacro () const
+{
+	return ssprintf ( "$(%s_LIBS)", module.name.c_str () );
+}
+
+string
+MingwModuleHandler::GetLinkerMacro () const
+{
+	return ssprintf ( "$(%s_LFLAGS)",
+	                  module.name.c_str () );
+}
+
+string
+MingwModuleHandler::GetModuleTargets ( const Module& module )
+{
+	if ( ReferenceObjects ( module ) )
+		return GetObjectsMacro ( module );
+	else
+		return GetTargetFilename ( module, NULL );
+}
+
+void
+MingwModuleHandler::GenerateObjectMacro ()
+{
+	objectsMacro = ssprintf ("%s_OBJS", module.name.c_str ());
+
+	GenerateObjectMacros (
+		"=",
+		module.non_if_data,
+		&module.compilerFlags,
+		&module.linkerFlags );
+
+	// future references to the macro will be to get its values
+	objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ());
+}
+
+void
+MingwModuleHandler::GenerateTargetMacro ()
+{
+	fprintf ( fMakefile,
+		"%s := %s\n",
+		GetTargetMacro ( module, false ).c_str (),
+		GetModuleTargets ( module ).c_str () );
+}
+
+void
+MingwModuleHandler::GenerateOtherMacros ()
+{
+	cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ());
+	nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ());
+	windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ());
+	widlflagsMacro = ssprintf ("%s_WIDLFLAGS", module.name.c_str ());
+	linkerflagsMacro = ssprintf ("%s_LFLAGS", module.name.c_str ());
+	libsMacro = ssprintf("%s_LIBS", module.name.c_str ());
+	linkDepsMacro = ssprintf ("%s_LINKDEPS", module.name.c_str ());
+
+	GenerateMacros (
+		"=",
+		module.non_if_data,
+		&module.compilerFlags,
+		&module.linkerFlags );
+
+	if ( module.importLibrary )
+	{
+		string_list s;
+		const vector<File*>& files = module.non_if_data.files;
+		for ( size_t i = 0; i < files.size (); i++ )
+		{
+			File& file = *files[i];
+			string extension = GetExtension ( file.name );
+			if ( extension == ".spec" || extension == ".SPEC" )
+				GetSpecObjectDependencies ( s, file.name );
+		}
+		if ( s.size () > 0 )
+		{
+			fprintf (
+				fMakefile,
+				"%s +=",
+				linkDepsMacro.c_str() );
+			for ( size_t i = 0; i < s.size(); i++ )
+				fprintf ( fMakefile,
+				          " %s",
+				          s[i].c_str () );
+			fprintf ( fMakefile, "\n" );
+		}
+	}
+
+	string globalCflags = "-g";
+	if ( backend->usePipe )
+		globalCflags += " -pipe";
+	if ( !module.enableWarnings )
+		globalCflags += " -Werror";
+	
+	fprintf (
+		fMakefile,
+		"%s += $(PROJECT_CFLAGS) %s\n",
+		cflagsMacro.c_str (),
+		globalCflags.c_str () );
+
+	fprintf (
+		fMakefile,
+		"%s += $(PROJECT_RCFLAGS)\n",
+		windresflagsMacro.c_str () );
+
+	fprintf (
+		fMakefile,
+		"%s += $(PROJECT_WIDLFLAGS)\n",
+		widlflagsMacro.c_str () );
+
+	fprintf (
+		fMakefile,
+		"%s_LFLAGS += $(PROJECT_LFLAGS) -g\n",
+		module.name.c_str () );
+
+	fprintf (
+		fMakefile,
+		"%s += $(%s)\n",
+		linkDepsMacro.c_str (),
+		libsMacro.c_str () );
+
+	string cflags = TypeSpecificCFlags();
+	if ( cflags.size() > 0 )
+	{
+		fprintf ( fMakefile,
+		          "%s += %s\n\n",
+		          cflagsMacro.c_str (),
+		          cflags.c_str () );
+	}
+
+	string nasmflags = TypeSpecificNasmFlags();
+	if ( nasmflags.size () > 0 )
+	{
+		fprintf ( fMakefile,
+		          "%s += %s\n\n",
+		          nasmflagsMacro.c_str (),
+		          nasmflags.c_str () );
+	}
+
+	string linkerflags = TypeSpecificLinkerFlags();
+	if ( linkerflags.size() > 0 )
+	{
+		fprintf ( fMakefile,
+		          "%s += %s\n\n",
+		          linkerflagsMacro.c_str (),
+		          linkerflags.c_str () );
+	}
+
+	fprintf ( fMakefile, "\n\n" );
+
+	// future references to the macros will be to get their values
+	cflagsMacro = ssprintf ("$(%s)", cflagsMacro.c_str ());
+	nasmflagsMacro = ssprintf ("$(%s)", nasmflagsMacro.c_str ());
+	widlflagsMacro = ssprintf ("$(%s)", widlflagsMacro.c_str ());
+}
+
+void
+MingwModuleHandler::GenerateRules ()
+{
+	string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" );
+	string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" );
+	string ar = ( module.host == HostTrue ? "${host_ar}" : "${ar}" );
+
+	string targetMacro = GetTargetMacro ( module );
+
+	CLEAN_FILE ( targetMacro );
+
+	// generate phony target for module name
+	fprintf ( fMakefile, ".PHONY: %s\n",
+		module.name.c_str () );
+	fprintf ( fMakefile, "%s: %s\n\n",
+		module.name.c_str (),
+		GetTargetMacro ( module ).c_str () );
+
+	if ( !ReferenceObjects ( module ) )
+	{
+		string ar_target ( GenerateArchiveTarget ( ar, objectsMacro ) );
+		if ( targetMacro != ar_target )
+		{
+			CLEAN_FILE ( ar_target );
+		}
+	}
+
+	GenerateObjectFileTargets ( cc,
+								cppc,
+								cflagsMacro,
+								nasmflagsMacro,
+								windresflagsMacro,
+							    widlflagsMacro );
+}
+
+void
+MingwModuleHandler::GetInvocationDependencies (
+	const Module& module,
+	string_list& dependencies )
+{
+	for ( size_t i = 0; i < module.invocations.size (); i++ )
+	{
+		Invoke& invoke = *module.invocations[i];
+		if ( invoke.invokeModule == &module )
+			/* Protect against circular dependencies */
+			continue;
+		invoke.GetTargets ( dependencies );
+	}
+}
+
+void
+MingwModuleHandler::GenerateInvocations () const
+{
+	if ( module.invocations.size () == 0 )
+		return;
+	
+	size_t iend = module.invocations.size ();
+	for ( size_t i = 0; i < iend; i++ )
+	{
+		const Invoke& invoke = *module.invocations[i];
+
+		if ( invoke.invokeModule->type != BuildTool )
+		{
+			throw InvalidBuildFileException ( module.node.location,
+			                                  "Only modules of type buildtool can be invoked." );
+		}
+
+		string invokeTarget = module.GetInvocationTarget ( i );
+		string_list invoke_targets;
+		assert ( invoke_targets.size() );
+		invoke.GetTargets ( invoke_targets );
+		fprintf ( fMakefile,
+		          ".PHONY: %s\n\n",
+		          invokeTarget.c_str () );
+		fprintf ( fMakefile,
+		          "%s:",
+		          invokeTarget.c_str () );
+		size_t j, jend = invoke_targets.size();
+		for ( j = 0; j < jend; j++ )
+		{
+			fprintf ( fMakefile,
+			          " %s",
+			          invoke_targets[i].c_str () );
+		}
+		fprintf ( fMakefile, "\n\n%s", invoke_targets[0].c_str () );
+		for ( j = 1; j < jend; j++ )
+			fprintf ( fMakefile,
+			          " %s",
+			          invoke_targets[i].c_str () );
+		fprintf ( fMakefile,
+		          ": %s\n",
+		          NormalizeFilename ( invoke.invokeModule->GetPath () ).c_str () );
+		fprintf ( fMakefile, "\t$(ECHO_INVOKE)\n" );
+		fprintf ( fMakefile,
+		          "\t%s %s\n\n",
+		          NormalizeFilename ( invoke.invokeModule->GetPath () ).c_str (),
+		          invoke.GetParameters ().c_str () );
+	}
+}
+
+string
+MingwModuleHandler::GetPreconditionDependenciesName () const
+{
+	return module.name + "_precondition";
+}
+
+void
+MingwModuleHandler::GetDefaultDependencies (
+	string_list& dependencies ) const
+{
+	/* Avoid circular dependency */
+	if ( module.type != BuildTool
+		&& module.name != "zlib"
+		&& module.name != "hostzlib" )
+
+		dependencies.push_back ( "$(INIT)" );
+}
+
+void
+MingwModuleHandler::GeneratePreconditionDependencies ()
+{
+	string preconditionDependenciesName = GetPreconditionDependenciesName ();
+	string_list sourceFilenames;
+	GetSourceFilenamesWithoutGeneratedFiles ( sourceFilenames );
+	string_list dependencies;
+	GetDefaultDependencies ( dependencies );
+	GetModuleDependencies ( dependencies );
+
+	GetInvocationDependencies ( module, dependencies );
+	
+	if ( dependencies.size() )
+	{
+		fprintf ( fMakefile,
+		          "%s =",
+		          preconditionDependenciesName.c_str () );
+		for ( size_t i = 0; i < dependencies.size(); i++ )
+			fprintf ( fMakefile,
+			          " %s",
+			          dependencies[i].c_str () );
+		fprintf ( fMakefile, "\n\n" );
+	}
+
+	for ( size_t i = 0; i < sourceFilenames.size(); i++ )
+	{
+		fprintf ( fMakefile,
+		          "%s: ${%s}\n",
+		          sourceFilenames[i].c_str(),
+		          preconditionDependenciesName.c_str ());
+	}
+	fprintf ( fMakefile, "\n" );
+}
+
+bool
+MingwModuleHandler::IsWineModule () const
+{
+	if ( module.importLibrary == NULL)
+		return false;
+
+	size_t index = module.importLibrary->definition.rfind ( ".spec.def" );
+	return ( index != string::npos );
+}
+
+string
+MingwModuleHandler::GetDefinitionFilename () const
+{
+	string defFilename = module.GetBasePath () + SSEP + module.importLibrary->definition;
+	if ( IsWineModule () )
+		return PassThruCacheDirectory ( NormalizeFilename ( defFilename ),
+		                                backend->intermediateDirectory );
+	else
+		return defFilename;
+}
+
+void
+MingwModuleHandler::GenerateImportLibraryTargetIfNeeded ()
+{
+	if ( module.importLibrary != NULL )
+	{
+		string library_target (
+			GetImportLibraryFilename ( module, &clean_files ) );
+
+		string_list deps;
+		GetDefinitionDependencies ( deps );
+
+		fprintf ( fMakefile, "# IMPORT LIBRARY RULE:\n" );
+
+		fprintf ( fMakefile, "%s:",
+		          library_target.c_str () );
+
+		size_t i, iend = deps.size();
+		for ( i = 0; i < iend; i++ )
+			fprintf ( fMakefile, " %s",
+			          deps[i].c_str () );
+
+		fprintf ( fMakefile, " | %s\n",
+		          GetDirectory ( GetTargetFilename ( module, NULL ) ).c_str () );
+
+		fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );
+
+		string killAt = module.mangledSymbols ? "" : "--kill-at";
+		fprintf ( fMakefile,
+		          "\t${dlltool} --dllname %s --def %s --output-lib %s %s\n\n",
+		          module.GetTargetName ().c_str (),
+		          GetDefinitionFilename ().c_str (),
+		          library_target.c_str (),
+		          killAt.c_str () );
+	}
+}
+
+void
+MingwModuleHandler::GetSpecObjectDependencies (
+	string_list& dependencies,
+	const string& filename ) const
+{
+	string basename = GetBasename ( filename );
+	string defDependency = PassThruCacheDirectory (
+		NormalizeFilename ( basename + ".spec.def" ),
+		backend->intermediateDirectory );
+	dependencies.push_back ( defDependency );
+	string stubsDependency = PassThruCacheDirectory (
+		NormalizeFilename ( basename + ".stubs.c" ),
+		backend->intermediateDirectory );
+	dependencies.push_back ( stubsDependency );
+}
+
+void
+MingwModuleHandler::GetWidlObjectDependencies (
+	string_list& dependencies,
+	const string& filename ) const
+{
+	string basename = GetBasename ( filename );
+	string serverDependency = PassThruCacheDirectory (
+		NormalizeFilename ( basename + "_s.c" ),
+		backend->intermediateDirectory );
+	dependencies.push_back ( serverDependency );
+}
+
+void
+MingwModuleHandler::GetDefinitionDependencies (
+	string_list& dependencies ) const
+{
+	string dkNkmLibNoFixup = "dk/nkm/lib";
+	const vector<File*>& files = module.non_if_data.files;
+	for ( size_t i = 0; i < files.size (); i++ )
+	{
+		File& file = *files[i];
+		string extension = GetExtension ( file.name );
+		if ( extension == ".spec" || extension == ".SPEC" )
+		{
+			GetSpecObjectDependencies ( dependencies, file.name );
+		}
+		if ( extension == ".idl" || extension == ".IDL" )
+		{
+			GetWidlObjectDependencies ( dependencies, file.name );
+		}
+	}
+}
+
+
+MingwBuildToolModuleHandler::MingwBuildToolModuleHandler ( const Module& module_ )
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwBuildToolModuleHandler::Process ()
+{
+	GenerateBuildToolModuleTarget ();
+}
+
+void
+MingwBuildToolModuleHandler::GenerateBuildToolModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro (module) );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+
+	GenerateRules ();
+
+	string linker;
+	if ( module.cplusplus )
+		linker = "${host_gpp}";
+	else
+		linker = "${host_gcc}";
+	
+	fprintf ( fMakefile, "%s: %s %s | %s\n",
+	          targetMacro.c_str (),
+	          objectsMacro.c_str (),
+	          linkDepsMacro.c_str (),
+	          GetDirectory(GetTargetFilename(module,NULL)).c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
+	fprintf ( fMakefile,
+	          "\t%s %s -o $@ %s %s\n\n",
+	          linker.c_str (),
+	          GetLinkerMacro ().c_str (),
+	          objectsMacro.c_str (),
+	          libsMacro.c_str () );
+}
+
+
+MingwKernelModuleHandler::MingwKernelModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwKernelModuleHandler::Process ()
+{
+	GenerateKernelModuleTarget ();
+}
+
+void
+MingwKernelModuleHandler::GenerateKernelModuleTarget ()
+{
+	string targetName ( module.GetTargetName () ); // i.e. "ntoskrnl.exe"
+	string targetMacro ( GetTargetMacro ( module ) ); // i.e. "$(NTOSKRNL_TARGET)"
+	string workingDirectory = GetWorkingDirectory ();
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+	string base_tmp = ros_temp + module.name + ".base.tmp";
+	CLEAN_FILE ( base_tmp );
+	string junk_tmp = ros_temp + module.name + ".junk.tmp";
+	CLEAN_FILE ( junk_tmp );
+	string temp_exp = ros_temp + module.name + ".temp.exp";
+	CLEAN_FILE ( temp_exp );
+	string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
+	                              module.GetBasePath ().c_str (),
+	                              module.entrypoint.c_str (),
+	                              module.baseaddress.c_str () );
+
+	GenerateRules ();
+
+	GenerateImportLibraryTargetIfNeeded ();
+
+	fprintf ( fMakefile, "%s: %s %s $(RSYM_TARGET) | %s\n",
+	          targetMacro.c_str (),
+	          objectsMacro.c_str (),
+	          linkDepsMacro.c_str (),
+	          GetDirectory(GetTargetFilename(module,NULL)).c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
+	fprintf ( fMakefile,
+	          "\t${gcc} %s %s -Wl,--base-file,%s -o %s %s %s\n",
+	          GetLinkerMacro ().c_str (),
+	          gccOptions.c_str (),
+	          base_tmp.c_str (),
+	          junk_tmp.c_str (),
+	          objectsMacro.c_str (),
+	          linkDepsMacro.c_str () );
+	fprintf ( fMakefile,
+	          "\t-@${rm} %s 2>$(NUL)\n",
+	          junk_tmp.c_str () );
+	string killAt = module.mangledSymbols ? "" : "--kill-at";
+	fprintf ( fMakefile,
+	          "\t${dlltool} --dllname %s --base-file %s --def ntoskrnl/ntoskrnl.def --output-exp %s %s\n",
+	          targetName.c_str (),
+	          base_tmp.c_str (),
+	          temp_exp.c_str (),
+	          killAt.c_str () );
+	fprintf ( fMakefile,
+	          "\t-@${rm} %s 2>$(NUL)\n",
+	          base_tmp.c_str () );
+	fprintf ( fMakefile,
+	          "\t${gcc} %s %s -Wl,%s -o $@ %s %s\n",
+	          GetLinkerMacro ().c_str (),
+	          gccOptions.c_str (),
+	          temp_exp.c_str (),
+	          objectsMacro.c_str (),
+	          linkDepsMacro.c_str () );
+	fprintf ( fMakefile,
+	          "\t-@${rm} %s 2>$(NUL)\n",
+	          temp_exp.c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" );
+}
+
+
+MingwStaticLibraryModuleHandler::MingwStaticLibraryModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwStaticLibraryModuleHandler::Process ()
+{
+	GenerateStaticLibraryModuleTarget ();
+}
+
+void
+MingwStaticLibraryModuleHandler::GenerateStaticLibraryModuleTarget ()
+{
+	GenerateRules ();
+}
+
+
+MingwObjectLibraryModuleHandler::MingwObjectLibraryModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwObjectLibraryModuleHandler::Process ()
+{
+	GenerateObjectLibraryModuleTarget ();
+}
+
+void
+MingwObjectLibraryModuleHandler::GenerateObjectLibraryModuleTarget ()
+{
+	GenerateRules ();
+}
+
+
+MingwKernelModeDLLModuleHandler::MingwKernelModeDLLModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwKernelModeDLLModuleHandler::Process ()
+{
+	GenerateKernelModeDLLModuleTarget ();
+}
+
+void
+MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro ( module ) );
+	string workingDirectory = GetWorkingDirectory ( );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+
+	GenerateImportLibraryTargetIfNeeded ();
+
+	if ( module.non_if_data.files.size () > 0 )
+	{
+		GenerateRules ();
+
+		string dependencies = linkDepsMacro + " " + objectsMacro;
+
+		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
+		                                     module.entrypoint.c_str (),
+		                                     module.baseaddress.c_str () );
+		GenerateLinkerCommand ( dependencies,
+		                        "${gcc}",
+		                        linkerParameters,
+		                        objectsMacro,
+		                        libsMacro );
+	}
+	else
+	{
+		GeneratePhonyTarget();
+	}
+}
+
+
+MingwKernelModeDriverModuleHandler::MingwKernelModeDriverModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwKernelModeDriverModuleHandler::Process ()
+{
+	GenerateKernelModeDriverModuleTarget ();
+}
+
+
+void
+MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro (module) );
+	string workingDirectory = GetWorkingDirectory ();
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+
+	GenerateImportLibraryTargetIfNeeded ();
+
+	if ( module.non_if_data.files.size () > 0 )
+	{
+		GenerateRules ();
+
+		string dependencies = linkDepsMacro + " " + objectsMacro;
+
+		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
+		                                     module.entrypoint.c_str (),
+		                                     module.baseaddress.c_str () );
+		GenerateLinkerCommand ( dependencies,
+		                        "${gcc}",
+		                        linkerParameters,
+		                        objectsMacro,
+		                        libsMacro );
+	}
+	else
+	{
+		GeneratePhonyTarget();
+	}
+}
+
+
+MingwNativeDLLModuleHandler::MingwNativeDLLModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwNativeDLLModuleHandler::Process ()
+{
+	GenerateNativeDLLModuleTarget ();
+}
+
+void
+MingwNativeDLLModuleHandler::GenerateNativeDLLModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro (module) );
+	string workingDirectory = GetWorkingDirectory ( );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+	
+	GenerateImportLibraryTargetIfNeeded ();
+
+	if ( module.non_if_data.files.size () > 0 )
+	{
+		GenerateRules ();
+
+		string dependencies = linkDepsMacro + " " + objectsMacro;
+
+		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll",
+		                                     module.entrypoint.c_str (),
+		                                     module.baseaddress.c_str () );
+		GenerateLinkerCommand ( dependencies,
+		                        "${gcc}",
+		                        linkerParameters,
+		                        objectsMacro,
+		                        libsMacro );
+	}
+	else
+	{
+		GeneratePhonyTarget();
+	}
+}
+
+
+MingwNativeCUIModuleHandler::MingwNativeCUIModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwNativeCUIModuleHandler::Process ()
+{
+	GenerateNativeCUIModuleTarget ();
+}
+
+void
+MingwNativeCUIModuleHandler::GenerateNativeCUIModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro (module) );
+	string workingDirectory = GetWorkingDirectory ( );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+	
+	GenerateImportLibraryTargetIfNeeded ();
+
+	if ( module.non_if_data.files.size () > 0 )
+	{
+		GenerateRules ();
+
+		string dependencies = linkDepsMacro + " " + objectsMacro;
+
+		string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib",
+		                                     module.entrypoint.c_str (),
+		                                     module.baseaddress.c_str () );
+		GenerateLinkerCommand ( dependencies,
+		                        "${gcc}",
+		                        linkerParameters,
+		                        objectsMacro,
+		                        libsMacro );
+	}
+	else
+	{
+		GeneratePhonyTarget();
+	}
+}
+
+
+MingwWin32DLLModuleHandler::MingwWin32DLLModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwWin32DLLModuleHandler::Process ()
+{
+	GenerateExtractWineDLLResourcesTarget ();
+	GenerateWin32DLLModuleTarget ();
+}
+
+void
+MingwWin32DLLModuleHandler::GenerateExtractWineDLLResourcesTarget ()
+{
+	fprintf ( fMakefile, ".PHONY: %s_extractresources\n\n",
+	          module.name.c_str () );
+	fprintf ( fMakefile, "%s_extractresources: $(BIN2RES_TARGET)\n",
+	          module.name.c_str () );
+	const vector<File*>& files = module.non_if_data.files;
+	for ( size_t i = 0; i < files.size (); i++ )
+	{
+		File& file = *files[i];
+		string extension = GetExtension ( file.name );
+		if ( extension == ".rc" || extension == ".RC" )
+		{
+			string resource = NormalizeFilename ( file.name );
+			fprintf ( fMakefile, "\t$(ECHO_BIN2RES)\n" );
+			fprintf ( fMakefile, "\t@:echo ${bin2res} -f -x %s\n",
+			          resource.c_str () );
+		}
+	}
+	fprintf ( fMakefile, "\n");
+}
+
+void
+MingwWin32DLLModuleHandler::GenerateWin32DLLModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro (module) );
+	string workingDirectory = GetWorkingDirectory ( );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+
+	GenerateImportLibraryTargetIfNeeded ();
+
+	if ( module.non_if_data.files.size () > 0 )
+	{
+		GenerateRules ();
+
+		string dependencies = linkDepsMacro + " " + objectsMacro;
+
+		string linker;
+		if ( module.cplusplus )
+			linker = "${gpp}";
+		else
+			linker = "${gcc}";
+
+		string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll",
+		                                     module.entrypoint.c_str (),
+		                                     module.baseaddress.c_str () );
+		GenerateLinkerCommand ( dependencies,
+		                        linker,
+		                        linkerParameters,
+		                        objectsMacro,
+		                        libsMacro );
+	}
+	else
+	{
+		GeneratePhonyTarget();
+	}
+}
+
+
+MingwWin32CUIModuleHandler::MingwWin32CUIModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwWin32CUIModuleHandler::Process ()
+{
+	GenerateWin32CUIModuleTarget ();
+}
+
+void
+MingwWin32CUIModuleHandler::GenerateWin32CUIModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro (module) );
+	string workingDirectory = GetWorkingDirectory ( );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+
+	GenerateImportLibraryTargetIfNeeded ();
+
+	if ( module.non_if_data.files.size () > 0 )
+	{
+		GenerateRules ();
+
+		string dependencies = linkDepsMacro + " " + objectsMacro;
+
+		string linker;
+		if ( module.cplusplus )
+			linker = "${gpp}";
+		else
+			linker = "${gcc}";
+
+		string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
+		                                     module.entrypoint.c_str (),
+		                                     module.baseaddress.c_str () );
+		GenerateLinkerCommand ( dependencies,
+		                        linker,
+		                        linkerParameters,
+		                        objectsMacro,
+		                        libsMacro );
+	}
+	else
+	{
+		GeneratePhonyTarget();
+	}
+}
+
+
+MingwWin32GUIModuleHandler::MingwWin32GUIModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwWin32GUIModuleHandler::Process ()
+{
+	GenerateWin32GUIModuleTarget ();
+}
+
+void
+MingwWin32GUIModuleHandler::GenerateWin32GUIModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro (module) );
+	string workingDirectory = GetWorkingDirectory ( );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+
+	GenerateImportLibraryTargetIfNeeded ();
+
+	if ( module.non_if_data.files.size () > 0 )
+	{
+		GenerateRules ();
+
+		string dependencies = linkDepsMacro + " " + objectsMacro;
+
+		string linker;
+		if ( module.cplusplus )
+			linker = "${gpp}";
+		else
+			linker = "${gcc}";
+
+		string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
+		                                     module.entrypoint.c_str (),
+		                                     module.baseaddress.c_str () );
+		GenerateLinkerCommand ( dependencies,
+		                        linker,
+		                        linkerParameters,
+		                        objectsMacro,
+		                        libsMacro );
+	}
+	else
+	{
+		GeneratePhonyTarget();
+	}
+}
+
+
+MingwBootLoaderModuleHandler::MingwBootLoaderModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwBootLoaderModuleHandler::Process ()
+{
+	GenerateBootLoaderModuleTarget ();
+}
+
+void
+MingwBootLoaderModuleHandler::GenerateBootLoaderModuleTarget ()
+{
+	string targetName ( module.GetTargetName () );
+	string targetMacro ( GetTargetMacro (module) );
+	string workingDirectory = GetWorkingDirectory ();
+	string junk_tmp = ros_temp + module.name + ".junk.tmp";
+	CLEAN_FILE ( junk_tmp );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+
+	GenerateRules ();
+
+	fprintf ( fMakefile, "%s: %s %s | %s\n",
+	          targetMacro.c_str (),
+	          objectsMacro.c_str (),
+	          linkDepsMacro.c_str (),
+	          GetDirectory(GetTargetFilename(module,NULL)).c_str () );
+
+	fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
+
+	fprintf ( fMakefile,
+	          "\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n",
+	          GetLinkerMacro ().c_str (),
+	          junk_tmp.c_str (),
+	          objectsMacro.c_str (),
+	          linkDepsMacro.c_str () );
+	fprintf ( fMakefile,
+	          "\t${objcopy} -O binary %s $@\n",
+	          junk_tmp.c_str () );
+	fprintf ( fMakefile,
+	          "\t-@${rm} %s 2>$(NUL)\n",
+	          junk_tmp.c_str () );
+}
+
+
+MingwBootSectorModuleHandler::MingwBootSectorModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwBootSectorModuleHandler::Process ()
+{
+	GenerateBootSectorModuleTarget ();
+}
+
+void
+MingwBootSectorModuleHandler::GenerateBootSectorModuleTarget ()
+{
+	string objectsMacro = GetObjectsMacro ( module );
+
+	GenerateRules ();
+
+	fprintf ( fMakefile, ".PHONY: %s\n\n",
+	          module.name.c_str ());
+	fprintf ( fMakefile,
+	          "%s: %s\n",
+	          module.name.c_str (),
+	          objectsMacro.c_str () );
+}
+
+
+MingwIsoModuleHandler::MingwIsoModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwIsoModuleHandler::Process ()
+{
+	GenerateIsoModuleTarget ();
+}
+
+void
+MingwIsoModuleHandler::OutputBootstrapfileCopyCommands (
+	const string& bootcdDirectory )
+{
+	for ( size_t i = 0; i < module.project.modules.size (); i++ )
+	{
+		const Module& m = *module.project.modules[i];
+		if ( m.bootstrap != NULL )
+		{
+			string sourceFilename = PassThruCacheDirectory (
+				NormalizeFilename ( m.GetPath () ),
+				backend->outputDirectory );
+			string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd );
+			string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
+				NormalizeFilename ( targetFilenameNoFixup ),
+				backend->outputDirectory );
+			fprintf ( fMakefile,
+			          "\t$(ECHO_CP)\n" );
+			fprintf ( fMakefile,
+			          "\t${cp} %s %s 1>$(NUL)\n",
+			          sourceFilename.c_str (),
+			          targetFilename.c_str () );
+		}
+	}
+}
+
+void
+MingwIsoModuleHandler::OutputCdfileCopyCommands (
+	const string& bootcdDirectory )
+{
+	for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )
+	{
+		const CDFile& cdfile = *module.project.cdfiles[i];
+		string targetFilenameNoFixup = bootcdDirectory + SSEP + cdfile.base + SSEP + cdfile.nameoncd;
+		string targetFilename = MingwModuleHandler::PassThruCacheDirectory (
+			NormalizeFilename ( targetFilenameNoFixup ),
+			backend->outputDirectory );
+		fprintf ( fMakefile,
+		          "\t$(ECHO_CP)\n" );
+		fprintf ( fMakefile,
+		          "\t${cp} %s %s 1>$(NUL)\n",
+		          cdfile.GetPath ().c_str (),
+		          targetFilename.c_str () );
+	}
+}
+
+string
+MingwIsoModuleHandler::GetBootstrapCdDirectories ( const string& bootcdDirectory )
+{
+	string directories;
+	for ( size_t i = 0; i < module.project.modules.size (); i++ )
+	{
+		const Module& m = *module.project.modules[i];
+		if ( m.bootstrap != NULL )
+		{
+			string targetDirectory ( bootcdDirectory + SSEP + m.bootstrap->base );
+			if ( directories.size () > 0 )
+				directories += " ";
+			directories += PassThruCacheDirectory (
+				NormalizeFilename ( targetDirectory ),
+				backend->outputDirectory );
+		}
+	}
+	return directories;
+}
+
+string
+MingwIsoModuleHandler::GetNonModuleCdDirectories ( const string& bootcdDirectory )
+{
+	string directories;
+	for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )
+	{
+		const CDFile& cdfile = *module.project.cdfiles[i];
+		string targetDirectory ( bootcdDirectory + SSEP + cdfile.base );
+		if ( directories.size () > 0 )
+			directories += " ";
+		directories += PassThruCacheDirectory (
+			NormalizeFilename ( targetDirectory ),
+			backend->outputDirectory );
+	}
+	return directories;
+}
+
+string
+MingwIsoModuleHandler::GetCdDirectories ( const string& bootcdDirectory )
+{
+	string directories = GetBootstrapCdDirectories ( bootcdDirectory );
+	directories += " " + GetNonModuleCdDirectories ( bootcdDirectory );
+	return directories;
+}
+
+void
+MingwIsoModuleHandler::GetBootstrapCdFiles (
+	vector<string>& out ) const
+{
+	for ( size_t i = 0; i < module.project.modules.size (); i++ )
+	{
+		const Module& m = *module.project.modules[i];
+		if ( m.bootstrap != NULL )
+		{
+			string filename = PassThruCacheDirectory (
+				NormalizeFilename ( m.GetPath () ),
+				backend->outputDirectory );
+			out.push_back ( filename );
+		}
+	}
+}
+
+void
+MingwIsoModuleHandler::GetNonModuleCdFiles (
+	vector<string>& out ) const
+{
+	for ( size_t i = 0; i < module.project.cdfiles.size (); i++ )
+	{
+		const CDFile& cdfile = *module.project.cdfiles[i];
+		out.push_back ( cdfile.GetPath () );
+	}
+}
+
+void
+MingwIsoModuleHandler::GetCdFiles (
+	vector<string>& out ) const
+{
+	GetBootstrapCdFiles ( out );
+	GetNonModuleCdFiles ( out );
+}
+
+void
+MingwIsoModuleHandler::GenerateIsoModuleTarget ()
+{
+	string bootcdDirectory = "cd";
+	string bootcd = PassThruCacheDirectory (
+		NormalizeFilename ( bootcdDirectory + SSEP ),
+		backend->outputDirectory );
+	string isoboot = PassThruCacheDirectory (
+		NormalizeFilename ( "boot" SSEP "freeldr" SSEP "bootsect" SSEP "isoboot.o" ),
+		backend->outputDirectory );
+	string bootcdReactosNoFixup = bootcdDirectory + SSEP "reactos";
+	string bootcdReactos = PassThruCacheDirectory (
+		NormalizeFilename ( bootcdReactosNoFixup + SSEP ),
+		backend->outputDirectory );
+	CLEAN_FILE ( bootcdReactos );
+	string reactosInf = PassThruCacheDirectory (
+		NormalizeFilename ( bootcdReactosNoFixup + SSEP "reactos.inf" ),
+		backend->outputDirectory );
+	string reactosDff = NormalizeFilename ( "bootdata" SSEP "packages" SSEP "reactos.dff" );
+	string cdDirectories = GetCdDirectories ( bootcdDirectory );
+	vector<string> vCdFiles;
+	GetCdFiles ( vCdFiles );
+	string cdFiles = v2s ( vCdFiles, 5 );
+
+	fprintf ( fMakefile, ".PHONY: %s\n\n",
+	          module.name.c_str ());
+	fprintf ( fMakefile,
+	          "%s: all %s %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET)\n",
+	          module.name.c_str (),
+	          isoboot.c_str (),
+	          bootcdReactos.c_str (),
+	          cdDirectories.c_str (),
+	          cdFiles.c_str () );
+	fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n",
+	          reactosDff.c_str (),
+	          bootcdReactos.c_str () );
+	fprintf ( fMakefile,
+	          "\t$(Q)$(CABMAN_TARGET) -C %s -RC %s -L %s -N -P $(OUTPUT)\n",
+	          reactosDff.c_str (),
+	          reactosInf.c_str (),
+	          bootcdReactos.c_str ());
+	fprintf ( fMakefile,
+	          "\t-@${rm} %s 2>$(NUL)\n",
+	          reactosInf.c_str () );
+	OutputBootstrapfileCopyCommands ( bootcdDirectory );
+	OutputCdfileCopyCommands ( bootcdDirectory );
+	fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)$(CDMAKE_TARGET) -v -m -b %s %s REACTOS ReactOS.iso\n",
+	          isoboot.c_str (),
+	          bootcd.c_str () );
+	fprintf ( fMakefile,
+	          "\n" );
+}
+
+
+MingwLiveIsoModuleHandler::MingwLiveIsoModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwLiveIsoModuleHandler::Process ()
+{
+	GenerateLiveIsoModuleTarget ();
+}
+
+void
+MingwLiveIsoModuleHandler::CreateDirectory ( const string& directory )
+{
+	string normalizedDirectory = MingwModuleHandler::PassThruCacheDirectory (
+		NormalizeFilename ( directory ) + SSEP,
+		backend->outputDirectory );
+}
+
+void
+MingwLiveIsoModuleHandler::OutputCopyCommand ( const string& sourceFilename,
+	                                           const string& targetFilename,
+	                                           const string& targetDirectory )
+{
+	string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory (
+		NormalizeFilename ( targetDirectory + SSEP + targetFilename ),
+		backend->outputDirectory );
+	fprintf ( fMakefile,
+	          "\t$(ECHO_CP)\n" );
+	fprintf ( fMakefile,
+	          "\t${cp} %s %s 1>$(NUL)\n",
+	          sourceFilename.c_str (),
+	          normalizedTargetFilename.c_str () );
+}
+
+void
+MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory,
+	                                                  string& reactosDirectory )
+{
+	for ( size_t i = 0; i < module.project.modules.size (); i++ )
+	{
+		const Module& m = *module.project.modules[i];
+		if ( m.installName.length () > 0 )
+		{
+			string sourceFilename = MingwModuleHandler::PassThruCacheDirectory (
+				NormalizeFilename ( m.GetPath () ),
+				backend->outputDirectory );
+			OutputCopyCommand ( sourceFilename,
+		                        m.installName,
+		                        livecdDirectory + SSEP + reactosDirectory + SSEP + m.installBase );
+		}
+	}
+}
+
+void
+MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdDirectory,
+	                                                     string& reactosDirectory )
+{
+	for ( size_t i = 0; i < module.project.installfiles.size (); i++ )
+	{
+		const InstallFile& installfile = *module.project.installfiles[i];
+		OutputCopyCommand ( installfile.GetPath (),
+	                        installfile.newname,
+	                        livecdDirectory + SSEP + reactosDirectory + SSEP + installfile.base );
+	}
+}
+
+void
+MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirectory )
+{
+	CreateDirectory ( livecdDirectory + SSEP "Profiles" );
+	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "All Users") ;
+	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "All Users" SSEP "Desktop" );
+	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" );
+	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" SSEP "Desktop" );
+	CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" SSEP "My Documents" );
+
+	string livecdIni = "bootdata" SSEP "livecd.ini";
+	OutputCopyCommand ( livecdIni,
+                        "freeldr.ini",
+                        livecdDirectory );
+}
+
+void
+MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory )
+{
+	string freeldr = PassThruCacheDirectory (
+		NormalizeFilename ( "boot" SSEP "freeldr" SSEP "freeldr" SSEP "freeldr.sys" ),
+		backend->outputDirectory );
+	CreateDirectory ( livecdDirectory + SSEP "loader" );
+	OutputCopyCommand ( freeldr,
+                        "setupldr.sys",
+                        livecdDirectory + SSEP + "loader" );
+}
+
+void
+MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory )
+{
+	string reactosSystem32ConfigDirectory = NormalizeFilename (
+		MingwModuleHandler::PassThruCacheDirectory (
+		livecdDirectory + SSEP "reactos" SSEP "system32" SSEP "config" SSEP,
+		backend->outputDirectory ) );
+	fprintf ( fMakefile,
+	          "\t$(ECHO_MKHIVE)\n" );
+	fprintf ( fMakefile,
+	          "\t$(MKHIVE_TARGET) bootdata %s bootdata" SSEP "livecd.inf bootdata" SSEP "hiveinst.inf\n",
+	          reactosSystem32ConfigDirectory.c_str () );
+}
+
+void
+MingwLiveIsoModuleHandler::GenerateLiveIsoModuleTarget ()
+{
+	string livecdDirectory = "livecd";
+	string livecd = PassThruCacheDirectory (
+		NormalizeFilename ( livecdDirectory + SSEP ),
+		backend->outputDirectory );
+	string isoboot = PassThruCacheDirectory (
+		NormalizeFilename ( "boot" SSEP "freeldr" SSEP "bootsect" SSEP "isoboot.o" ),
+		backend->outputDirectory );
+	string reactosDirectory = "reactos";
+	string livecdReactosNoFixup = livecdDirectory + SSEP + reactosDirectory;
+	string livecdReactos = NormalizeFilename ( PassThruCacheDirectory (
+		NormalizeFilename ( livecdReactosNoFixup + SSEP ),
+		backend->outputDirectory ) );
+	CLEAN_FILE ( livecdReactos );
+
+	fprintf ( fMakefile, ".PHONY: %s\n\n",
+	          module.name.c_str ());
+	fprintf ( fMakefile,
+	          "%s: all %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n",
+	          module.name.c_str (),
+	          isoboot.c_str (),
+	          livecdReactos.c_str () );
+	OutputModuleCopyCommands ( livecdDirectory,
+	                           reactosDirectory );
+	OutputNonModuleCopyCommands ( livecdDirectory,
+	                              reactosDirectory );
+	OutputProfilesDirectoryCommands ( livecdDirectory );
+	OutputLoaderCommands ( livecdDirectory );
+	OutputRegistryCommands ( livecdDirectory );
+	fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
+	fprintf ( fMakefile,
+	          "\t$(Q)$(CDMAKE_TARGET) -v -m -j -b %s %s REACTOS ReactOS-LiveCD.iso\n",
+	          isoboot.c_str (),
+	          livecd.c_str () );
+	fprintf ( fMakefile,
+	          "\n" );
+}
+
+
+MingwTestModuleHandler::MingwTestModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwTestModuleHandler::Process ()
+{
+	GenerateTestModuleTarget ();
+}
+
+void
+MingwTestModuleHandler::GenerateTestModuleTarget ()
+{
+	string targetMacro ( GetTargetMacro ( module ) );
+	string workingDirectory = GetWorkingDirectory ( );
+	string objectsMacro = GetObjectsMacro ( module );
+	string linkDepsMacro = GetLinkingDependenciesMacro ();
+	string libsMacro = GetLibsMacro ();
+
+	GenerateImportLibraryTargetIfNeeded ();
+
+	if ( module.non_if_data.files.size () > 0 )
+	{
+		GenerateRules ();
+
+		string dependencies = linkDepsMacro + " " + objectsMacro;
+
+		string linker;
+		if ( module.cplusplus )
+			linker = "${gpp}";
+		else
+			linker = "${gcc}";
+
+		string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000",
+		                                     module.entrypoint.c_str (),
+		                                     module.baseaddress.c_str () );
+		GenerateLinkerCommand ( dependencies,
+		                        linker,
+		                        linkerParameters,
+		                        objectsMacro,
+		                        libsMacro );
+	}
+	else
+	{
+		GeneratePhonyTarget();
+	}
+}
+
+
+MingwRpcServerModuleHandler::MingwRpcServerModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwRpcServerModuleHandler::Process ()
+{
+	GenerateRules ();
+}
+
+MingwRpcClientModuleHandler::MingwRpcClientModuleHandler (
+	const Module& module_ )
+
+	: MingwModuleHandler ( module_ )
+{
+}
+
+void
+MingwRpcClientModuleHandler::Process ()
+{
+	GenerateRules ();
+}
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.h b/reactos/tools/rbuild/backend/mingw/modulehandler.h
index 567d4ac3f86..a6913a27555 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.h
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.h
@@ -1,412 +1,412 @@
-#ifndef MINGW_MODULEHANDLER_H
-#define MINGW_MODULEHANDLER_H
-
-#include "../backend.h"
-#include "mingw.h"
-
-class MingwBackend;
-
-extern std::string
-GetTargetMacro ( const Module&, bool with_dollar = true );
-
-extern std::string
-PrefixFilename (
-	const std::string& filename,
-	const std::string& prefix );
-
-class MingwModuleHandler
-{
-public:
-	MingwModuleHandler ( const Module& module_ );
-	virtual ~MingwModuleHandler();
-
-	static void SetBackend ( MingwBackend* backend_ );
-	static void SetMakefile ( FILE* f );
-	static void SetUsePch ( bool use_pch );
-
-	static std::string PassThruCacheDirectory (
-		const std::string &f,
-		Directory* directoryTree );
-
-	static std::string GetTargetFilename (
-		const Module& module,
-		string_list* pclean_files );
-
-	static std::string
-	GetImportLibraryFilename (
-		const Module& module,
-		string_list* pclean_files );
-
-	std::string GetModuleTargets ( const Module& module );
-	void GetObjectsVector ( const IfableData& data,
-	                        std::vector<std::string>& objectFiles ) const;
-	void GenerateObjectMacro();
-	void GenerateTargetMacro();
-	void GenerateOtherMacros();
-
-	static MingwModuleHandler* InstanciateHandler ( const Module& module_,
-	                                                MingwBackend* backend_ );
-	virtual HostType DefaultHost() = 0;
-	void GeneratePreconditionDependencies ();
-	virtual void Process () = 0;
-	virtual std::string TypeSpecificCFlags() { return ""; }
-	virtual std::string TypeSpecificNasmFlags() { return ""; }
-	virtual std::string TypeSpecificLinkerFlags() { return ""; }
-	void GenerateInvocations () const;
-	void GenerateCleanTarget () const;
-	static bool ReferenceObjects ( const Module& module );
-protected:
-	std::string GetWorkingDirectory () const;
-	std::string GetBasename ( const std::string& filename ) const;
-	std::string GetActualSourceFilename ( const std::string& filename ) const;
-	std::string GetModuleArchiveFilename () const;
-	bool IsGeneratedFile ( const File& file ) const;
-	std::string GetImportLibraryDependency ( const Module& importedModule );
-	void GetTargets ( const Module& dependencyModule,
-	                  string_list& targets );
-	void GetModuleDependencies ( string_list& dependencies );
-	std::string GetAllDependencies () const;
-	void GetSourceFilenames ( string_list& list, bool includeGeneratedFiles = true ) const;
-	void GetSourceFilenamesWithoutGeneratedFiles ( string_list& list ) const;
-	std::string GetObjectFilename ( const std::string& sourceFilename,
-	                                string_list* pclean_files ) const;
-
-	std::string GetObjectFilenames ();
-	
-	std::string GetPreconditionDependenciesName () const;
-	std::string GetCFlagsMacro () const;
-	static std::string GetObjectsMacro ( const Module& );
-	std::string GetLinkingDependenciesMacro () const;
-	std::string GetLibsMacro () const;
-	std::string GetLinkerMacro () const;
-	void GenerateCleanObjectsAsYouGoCode () const;
-	void GenerateLinkerCommand ( const std::string& dependencies,
-	                             const std::string& linker,
-	                             const std::string& linkerParameters,
-	                             const std::string& objectsMacro,
-	                             const std::string& libsMacro );
-	void GeneratePhonyTarget() const;
-	void GenerateRules ();
-	void GenerateImportLibraryTargetIfNeeded ();
-	void GetDefinitionDependencies ( string_list& dependencies ) const;
-	std::string GetLinkingDependencies () const;
-	static MingwBackend* backend;
-	static FILE* fMakefile;
-	static bool use_pch;
-private:
-	std::string ConcatenatePaths ( const std::string& path1,
-	                               const std::string& path2 ) const;
-	std::string GenerateGccDefineParametersFromVector ( const std::vector<Define*>& defines ) const;
-	std::string GenerateGccDefineParameters () const;
-	std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ) const;
-	std::string GenerateCompilerParametersFromVector ( const std::vector<CompilerFlag*>& compilerFlags ) const;
-	std::string GenerateLinkerParametersFromVector ( const std::vector<LinkerFlag*>& linkerFlags ) const;
-	std::string GenerateImportLibraryDependenciesFromVector ( const std::vector<Library*>& libraries );
-	std::string GenerateLinkerParameters () const;
-	void GenerateMacro ( const char* assignmentOperation,
-	                     const std::string& macro,
-	                     const IfableData& data,
-	                     const std::vector<CompilerFlag*>* compilerFlags );
-	void GenerateMacros ( const char* op,
-	                      const IfableData& data,
-	                      const std::vector<CompilerFlag*>* compilerFlags,
-	                      const std::vector<LinkerFlag*>* linkerFlags );
-	void GenerateObjectMacros ( const char* assignmentOperation,
-	                            const IfableData& data,
-	                            const std::vector<CompilerFlag*>* compilerFlags,
-	                            const std::vector<LinkerFlag*>* linkerFlags );
-	std::string GenerateGccIncludeParameters () const;
-	std::string GenerateGccParameters () const;
-	std::string GenerateNasmParameters () const;
-	void GenerateGccCommand ( const std::string& sourceFilename,
-	                          const std::string& cc,
-	                          const std::string& cflagsMacro );
-	void GenerateGccAssemblerCommand ( const std::string& sourceFilename,
-	                                   const std::string& cc,
-	                                   const std::string& cflagsMacro );
-	void GenerateNasmCommand ( const std::string& sourceFilename,
-	                           const std::string& nasmflagsMacro );
-	void GenerateWindresCommand ( const std::string& sourceFilename,
-	                              const std::string& windresflagsMacro );
-	void GenerateWinebuildCommands ( const std::string& sourceFilename );
-	std::string GetWidlFlags ( const File& file );
-	void GenerateWidlCommandsServer (
-		const File& file,
-		const std::string& widlflagsMacro );
-	void GenerateWidlCommandsClient (
-		const File& file,
-		const std::string& widlflagsMacro );
-	void GenerateWidlCommands ( const File& file,
-	                            const std::string& widlflagsMacro );
-	void GenerateCommands ( const File& file,
-	                        const std::string& cc,
-	                        const std::string& cppc,
-	                        const std::string& cflagsMacro,
-	                        const std::string& nasmflagsMacro,
-	                        const std::string& windresflagsMacro,
-	                        const std::string& widlflagsMacro );
-	void GenerateObjectFileTargets ( const IfableData& data,
-	                                 const std::string& cc,
-	                                 const std::string& cppc,
-	                                 const std::string& cflagsMacro,
-	                                 const std::string& nasmflagsMacro,
-	                                 const std::string& windresflagsMacro,
-	                                 const std::string& widlflagsMacro );
-	void GenerateObjectFileTargets ( const std::string& cc,
-	                                 const std::string& cppc,
-	                                 const std::string& cflagsMacro,
-	                                 const std::string& nasmflagsMacro,
-	                                 const std::string& windresflagsMacro,
-	                                 const std::string& widlflagsMacro );
-	std::string GenerateArchiveTarget ( const std::string& ar,
-	                                    const std::string& objs_macro ) const;
-	void GetSpecObjectDependencies ( string_list& dependencies,
-	                                 const std::string& filename ) const;
-	void GetWidlObjectDependencies ( string_list& dependencies,
-	                                 const std::string& filename ) const;
-	void GetDefaultDependencies ( string_list& dependencies ) const;
-	void GetInvocationDependencies ( const Module& module, string_list& dependencies );
-	bool IsWineModule () const;
-	std::string GetDefinitionFilename () const;
-	static std::string RemoveVariables ( std::string path);
-	void GenerateBuildMapCode ();
-	void GenerateBuildNonSymbolStrippedCode ();
-public:
-	const Module& module;
-	string_list clean_files;
-	std::string cflagsMacro;
-	std::string nasmflagsMacro;
-	std::string windresflagsMacro;
-	std::string widlflagsMacro;
-	std::string linkerflagsMacro;
-	std::string objectsMacro;
-	std::string libsMacro;
-	std::string linkDepsMacro;
-};
-
-
-class MingwBuildToolModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwBuildToolModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostTrue; }
-	virtual void Process ();
-private:
-	void GenerateBuildToolModuleTarget ();
-};
-
-
-class MingwKernelModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwKernelModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-	std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; }
-private:
-	void GenerateKernelModuleTarget ();
-};
-
-
-class MingwStaticLibraryModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwStaticLibraryModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-private:
-	void GenerateStaticLibraryModuleTarget ();
-};
-
-
-class MingwObjectLibraryModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwObjectLibraryModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-private:
-	void GenerateObjectLibraryModuleTarget ();
-};
-
-
-class MingwKernelModeDLLModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwKernelModeDLLModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-	std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; }
-	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
-private:
-	void GenerateKernelModeDLLModuleTarget ();
-};
-
-
-class MingwKernelModeDriverModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwKernelModeDriverModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-	std::string TypeSpecificCFlags() { return "-D__NTDRIVER__ -D_SEH_NO_NATIVE_NLG"; }
-	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
-private:
-	void GenerateKernelModeDriverModuleTarget ();
-};
-
-
-class MingwNativeDLLModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwNativeDLLModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-	std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; }
-	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
-private:
-	void GenerateNativeDLLModuleTarget ();
-};
-
-
-class MingwNativeCUIModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwNativeCUIModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-	std::string TypeSpecificCFlags() { return "-D__NTAPP__ -D_SEH_NO_NATIVE_NLG"; }
-	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
-private:
-	void GenerateNativeCUIModuleTarget ();
-};
-
-
-class MingwWin32DLLModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwWin32DLLModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-private:
-	void GenerateExtractWineDLLResourcesTarget ();
-	void GenerateWin32DLLModuleTarget ();
-};
-
-
-class MingwWin32CUIModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwWin32CUIModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-private:
-	void GenerateWin32CUIModuleTarget ();
-};
-
-
-class MingwWin32GUIModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwWin32GUIModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-private:
-	void GenerateWin32GUIModuleTarget ();
-};
-
-
-class MingwBootLoaderModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwBootLoaderModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
-private:
-	void GenerateBootLoaderModuleTarget ();
-};
-
-
-class MingwBootSectorModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwBootSectorModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-	std::string TypeSpecificNasmFlags() { return "-f bin"; }
-private:
-	void GenerateBootSectorModuleTarget ();
-};
-
-
-class MingwIsoModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwIsoModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-private:
-	void GenerateIsoModuleTarget ();
-	std::string GetBootstrapCdDirectories ( const std::string& bootcdDirectory );
-	std::string GetNonModuleCdDirectories ( const std::string& bootcdDirectory );
-	std::string GetCdDirectories ( const std::string& bootcdDirectory );
-	void GetBootstrapCdFiles ( std::vector<std::string>& out ) const;
-	void GetNonModuleCdFiles ( std::vector<std::string>& out ) const;
-	void GetCdFiles ( std::vector<std::string>& out ) const;
-	void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory );
-	void OutputCdfileCopyCommands ( const std::string& bootcdDirectory );
-};
-
-
-class MingwLiveIsoModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwLiveIsoModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-private:
-	void GenerateLiveIsoModuleTarget ();
-	void CreateDirectory ( const std::string& directory );
-	void OutputCopyCommand ( const std::string& sourceFilename,
-	                         const std::string& targetFilename,
-	                         const std::string& targetDirectory );
-	void OutputModuleCopyCommands ( std::string& livecdDirectory,
-	                                std::string& livecdReactos );
-	void OutputNonModuleCopyCommands ( std::string& livecdDirectory,
-	                                   std::string& livecdReactos );
-	void OutputProfilesDirectoryCommands ( std::string& livecdDirectory );
-	void OutputLoaderCommands ( std::string& livecdDirectory );
-	void OutputRegistryCommands ( std::string& livecdDirectory );
-};
-
-
-class MingwTestModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwTestModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-private:
-	void GenerateTestModuleTarget ();
-};
-
-
-class MingwRpcServerModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwRpcServerModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-};
-
-
-class MingwRpcClientModuleHandler : public MingwModuleHandler
-{
-public:
-	MingwRpcClientModuleHandler ( const Module& module );
-	virtual HostType DefaultHost() { return HostFalse; }
-	virtual void Process ();
-};
-
-#endif /* MINGW_MODULEHANDLER_H */
+#ifndef MINGW_MODULEHANDLER_H
+#define MINGW_MODULEHANDLER_H
+
+#include "../backend.h"
+#include "mingw.h"
+
+class MingwBackend;
+
+extern std::string
+GetTargetMacro ( const Module&, bool with_dollar = true );
+
+extern std::string
+PrefixFilename (
+	const std::string& filename,
+	const std::string& prefix );
+
+class MingwModuleHandler
+{
+public:
+	MingwModuleHandler ( const Module& module_ );
+	virtual ~MingwModuleHandler();
+
+	static void SetBackend ( MingwBackend* backend_ );
+	static void SetMakefile ( FILE* f );
+	static void SetUsePch ( bool use_pch );
+
+	static std::string PassThruCacheDirectory (
+		const std::string &f,
+		Directory* directoryTree );
+
+	static std::string GetTargetFilename (
+		const Module& module,
+		string_list* pclean_files );
+
+	static std::string
+	GetImportLibraryFilename (
+		const Module& module,
+		string_list* pclean_files );
+
+	std::string GetModuleTargets ( const Module& module );
+	void GetObjectsVector ( const IfableData& data,
+	                        std::vector<std::string>& objectFiles ) const;
+	void GenerateObjectMacro();
+	void GenerateTargetMacro();
+	void GenerateOtherMacros();
+
+	static MingwModuleHandler* InstanciateHandler ( const Module& module_,
+	                                                MingwBackend* backend_ );
+	virtual HostType DefaultHost() = 0;
+	void GeneratePreconditionDependencies ();
+	virtual void Process () = 0;
+	virtual std::string TypeSpecificCFlags() { return ""; }
+	virtual std::string TypeSpecificNasmFlags() { return ""; }
+	virtual std::string TypeSpecificLinkerFlags() { return ""; }
+	void GenerateInvocations () const;
+	void GenerateCleanTarget () const;
+	static bool ReferenceObjects ( const Module& module );
+protected:
+	std::string GetWorkingDirectory () const;
+	std::string GetBasename ( const std::string& filename ) const;
+	std::string GetActualSourceFilename ( const std::string& filename ) const;
+	std::string GetModuleArchiveFilename () const;
+	bool IsGeneratedFile ( const File& file ) const;
+	std::string GetImportLibraryDependency ( const Module& importedModule );
+	void GetTargets ( const Module& dependencyModule,
+	                  string_list& targets );
+	void GetModuleDependencies ( string_list& dependencies );
+	std::string GetAllDependencies () const;
+	void GetSourceFilenames ( string_list& list, bool includeGeneratedFiles = true ) const;
+	void GetSourceFilenamesWithoutGeneratedFiles ( string_list& list ) const;
+	std::string GetObjectFilename ( const std::string& sourceFilename,
+	                                string_list* pclean_files ) const;
+
+	std::string GetObjectFilenames ();
+	
+	std::string GetPreconditionDependenciesName () const;
+	std::string GetCFlagsMacro () const;
+	static std::string GetObjectsMacro ( const Module& );
+	std::string GetLinkingDependenciesMacro () const;
+	std::string GetLibsMacro () const;
+	std::string GetLinkerMacro () const;
+	void GenerateCleanObjectsAsYouGoCode () const;
+	void GenerateLinkerCommand ( const std::string& dependencies,
+	                             const std::string& linker,
+	                             const std::string& linkerParameters,
+	                             const std::string& objectsMacro,
+	                             const std::string& libsMacro );
+	void GeneratePhonyTarget() const;
+	void GenerateRules ();
+	void GenerateImportLibraryTargetIfNeeded ();
+	void GetDefinitionDependencies ( string_list& dependencies ) const;
+	std::string GetLinkingDependencies () const;
+	static MingwBackend* backend;
+	static FILE* fMakefile;
+	static bool use_pch;
+private:
+	std::string ConcatenatePaths ( const std::string& path1,
+	                               const std::string& path2 ) const;
+	std::string GenerateGccDefineParametersFromVector ( const std::vector<Define*>& defines ) const;
+	std::string GenerateGccDefineParameters () const;
+	std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ) const;
+	std::string GenerateCompilerParametersFromVector ( const std::vector<CompilerFlag*>& compilerFlags ) const;
+	std::string GenerateLinkerParametersFromVector ( const std::vector<LinkerFlag*>& linkerFlags ) const;
+	std::string GenerateImportLibraryDependenciesFromVector ( const std::vector<Library*>& libraries );
+	std::string GenerateLinkerParameters () const;
+	void GenerateMacro ( const char* assignmentOperation,
+	                     const std::string& macro,
+	                     const IfableData& data,
+	                     const std::vector<CompilerFlag*>* compilerFlags );
+	void GenerateMacros ( const char* op,
+	                      const IfableData& data,
+	                      const std::vector<CompilerFlag*>* compilerFlags,
+	                      const std::vector<LinkerFlag*>* linkerFlags );
+	void GenerateObjectMacros ( const char* assignmentOperation,
+	                            const IfableData& data,
+	                            const std::vector<CompilerFlag*>* compilerFlags,
+	                            const std::vector<LinkerFlag*>* linkerFlags );
+	std::string GenerateGccIncludeParameters () const;
+	std::string GenerateGccParameters () const;
+	std::string GenerateNasmParameters () const;
+	void GenerateGccCommand ( const std::string& sourceFilename,
+	                          const std::string& cc,
+	                          const std::string& cflagsMacro );
+	void GenerateGccAssemblerCommand ( const std::string& sourceFilename,
+	                                   const std::string& cc,
+	                                   const std::string& cflagsMacro );
+	void GenerateNasmCommand ( const std::string& sourceFilename,
+	                           const std::string& nasmflagsMacro );
+	void GenerateWindresCommand ( const std::string& sourceFilename,
+	                              const std::string& windresflagsMacro );
+	void GenerateWinebuildCommands ( const std::string& sourceFilename );
+	std::string GetWidlFlags ( const File& file );
+	void GenerateWidlCommandsServer (
+		const File& file,
+		const std::string& widlflagsMacro );
+	void GenerateWidlCommandsClient (
+		const File& file,
+		const std::string& widlflagsMacro );
+	void GenerateWidlCommands ( const File& file,
+	                            const std::string& widlflagsMacro );
+	void GenerateCommands ( const File& file,
+	                        const std::string& cc,
+	                        const std::string& cppc,
+	                        const std::string& cflagsMacro,
+	                        const std::string& nasmflagsMacro,
+	                        const std::string& windresflagsMacro,
+	                        const std::string& widlflagsMacro );
+	void GenerateObjectFileTargets ( const IfableData& data,
+	                                 const std::string& cc,
+	                                 const std::string& cppc,
+	                                 const std::string& cflagsMacro,
+	                                 const std::string& nasmflagsMacro,
+	                                 const std::string& windresflagsMacro,
+	                                 const std::string& widlflagsMacro );
+	void GenerateObjectFileTargets ( const std::string& cc,
+	                                 const std::string& cppc,
+	                                 const std::string& cflagsMacro,
+	                                 const std::string& nasmflagsMacro,
+	                                 const std::string& windresflagsMacro,
+	                                 const std::string& widlflagsMacro );
+	std::string GenerateArchiveTarget ( const std::string& ar,
+	                                    const std::string& objs_macro ) const;
+	void GetSpecObjectDependencies ( string_list& dependencies,
+	                                 const std::string& filename ) const;
+	void GetWidlObjectDependencies ( string_list& dependencies,
+	                                 const std::string& filename ) const;
+	void GetDefaultDependencies ( string_list& dependencies ) const;
+	void GetInvocationDependencies ( const Module& module, string_list& dependencies );
+	bool IsWineModule () const;
+	std::string GetDefinitionFilename () const;
+	static std::string RemoveVariables ( std::string path);
+	void GenerateBuildMapCode ();
+	void GenerateBuildNonSymbolStrippedCode ();
+public:
+	const Module& module;
+	string_list clean_files;
+	std::string cflagsMacro;
+	std::string nasmflagsMacro;
+	std::string windresflagsMacro;
+	std::string widlflagsMacro;
+	std::string linkerflagsMacro;
+	std::string objectsMacro;
+	std::string libsMacro;
+	std::string linkDepsMacro;
+};
+
+
+class MingwBuildToolModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwBuildToolModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostTrue; }
+	virtual void Process ();
+private:
+	void GenerateBuildToolModuleTarget ();
+};
+
+
+class MingwKernelModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwKernelModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+	std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; }
+private:
+	void GenerateKernelModuleTarget ();
+};
+
+
+class MingwStaticLibraryModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwStaticLibraryModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+private:
+	void GenerateStaticLibraryModuleTarget ();
+};
+
+
+class MingwObjectLibraryModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwObjectLibraryModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+private:
+	void GenerateObjectLibraryModuleTarget ();
+};
+
+
+class MingwKernelModeDLLModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwKernelModeDLLModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+	std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; }
+	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
+private:
+	void GenerateKernelModeDLLModuleTarget ();
+};
+
+
+class MingwKernelModeDriverModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwKernelModeDriverModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+	std::string TypeSpecificCFlags() { return "-D__NTDRIVER__ -D_SEH_NO_NATIVE_NLG"; }
+	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
+private:
+	void GenerateKernelModeDriverModuleTarget ();
+};
+
+
+class MingwNativeDLLModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwNativeDLLModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+	std::string TypeSpecificCFlags() { return "-D_SEH_NO_NATIVE_NLG"; }
+	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
+private:
+	void GenerateNativeDLLModuleTarget ();
+};
+
+
+class MingwNativeCUIModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwNativeCUIModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+	std::string TypeSpecificCFlags() { return "-D__NTAPP__ -D_SEH_NO_NATIVE_NLG"; }
+	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
+private:
+	void GenerateNativeCUIModuleTarget ();
+};
+
+
+class MingwWin32DLLModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwWin32DLLModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+private:
+	void GenerateExtractWineDLLResourcesTarget ();
+	void GenerateWin32DLLModuleTarget ();
+};
+
+
+class MingwWin32CUIModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwWin32CUIModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+private:
+	void GenerateWin32CUIModuleTarget ();
+};
+
+
+class MingwWin32GUIModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwWin32GUIModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+private:
+	void GenerateWin32GUIModuleTarget ();
+};
+
+
+class MingwBootLoaderModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwBootLoaderModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+	std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; }
+private:
+	void GenerateBootLoaderModuleTarget ();
+};
+
+
+class MingwBootSectorModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwBootSectorModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+	std::string TypeSpecificNasmFlags() { return "-f bin"; }
+private:
+	void GenerateBootSectorModuleTarget ();
+};
+
+
+class MingwIsoModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwIsoModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+private:
+	void GenerateIsoModuleTarget ();
+	std::string GetBootstrapCdDirectories ( const std::string& bootcdDirectory );
+	std::string GetNonModuleCdDirectories ( const std::string& bootcdDirectory );
+	std::string GetCdDirectories ( const std::string& bootcdDirectory );
+	void GetBootstrapCdFiles ( std::vector<std::string>& out ) const;
+	void GetNonModuleCdFiles ( std::vector<std::string>& out ) const;
+	void GetCdFiles ( std::vector<std::string>& out ) const;
+	void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory );
+	void OutputCdfileCopyCommands ( const std::string& bootcdDirectory );
+};
+
+
+class MingwLiveIsoModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwLiveIsoModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+private:
+	void GenerateLiveIsoModuleTarget ();
+	void CreateDirectory ( const std::string& directory );
+	void OutputCopyCommand ( const std::string& sourceFilename,
+	                         const std::string& targetFilename,
+	                         const std::string& targetDirectory );
+	void OutputModuleCopyCommands ( std::string& livecdDirectory,
+	                                std::string& livecdReactos );
+	void OutputNonModuleCopyCommands ( std::string& livecdDirectory,
+	                                   std::string& livecdReactos );
+	void OutputProfilesDirectoryCommands ( std::string& livecdDirectory );
+	void OutputLoaderCommands ( std::string& livecdDirectory );
+	void OutputRegistryCommands ( std::string& livecdDirectory );
+};
+
+
+class MingwTestModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwTestModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+private:
+	void GenerateTestModuleTarget ();
+};
+
+
+class MingwRpcServerModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwRpcServerModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+};
+
+
+class MingwRpcClientModuleHandler : public MingwModuleHandler
+{
+public:
+	MingwRpcClientModuleHandler ( const Module& module );
+	virtual HostType DefaultHost() { return HostFalse; }
+	virtual void Process ();
+};
+
+#endif /* MINGW_MODULEHANDLER_H */
diff --git a/reactos/tools/rbuild/backend/mingw/pipe_detection.c b/reactos/tools/rbuild/backend/mingw/pipe_detection.c
index ae9e0d8632c..9f3b6c17449 100644
--- a/reactos/tools/rbuild/backend/mingw/pipe_detection.c
+++ b/reactos/tools/rbuild/backend/mingw/pipe_detection.c
@@ -1,5 +1,5 @@
-int
-main ( int argc, char** argv )
-{
-	return 0;
-}
+int
+main ( int argc, char** argv )
+{
+	return 0;
+}
diff --git a/reactos/tools/rbuild/bootstrap.cpp b/reactos/tools/rbuild/bootstrap.cpp
index ff510596138..9b8e6b72239 100644
--- a/reactos/tools/rbuild/bootstrap.cpp
+++ b/reactos/tools/rbuild/bootstrap.cpp
@@ -1,78 +1,78 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-
-Bootstrap::Bootstrap ( const Project& project_,
-	                   const Module* module_,
-	                   const XMLElement& bootstrapNode )
-	: project(project_),
-	  module(module_),
-	  node(bootstrapNode)
-{
-	Initialize();
-}
-
-Bootstrap::~Bootstrap ()
-{
-}
-
-bool
-Bootstrap::IsSupportedModuleType ( ModuleType type )
-{
-	switch ( type )
-	{
-		case Kernel:
-		case KernelModeDLL:
-		case NativeDLL:
-		case NativeCUI:
-		case Win32DLL:
-		case Win32CUI:
-		case Win32GUI:
-		case KernelModeDriver:
-		case BootSector:
-		case BootLoader:
-			return true;
-		case BuildTool:
-		case StaticLibrary:
-		case ObjectLibrary:
-		case Iso:
-		case LiveIso:
-		case Test:
-		case RpcServer:
-		case RpcClient:
-			return false;
-	}
-	throw InvalidOperationException ( __FILE__,
-	                                  __LINE__ );
-}
-
-void
-Bootstrap::Initialize ()
-{
-	if ( !IsSupportedModuleType ( module->type ) )
-	{
-		throw InvalidBuildFileException (
-			node.location,
-			"<bootstrap> is not applicable for this module type." );
-	}
-
-	const XMLAttribute* att = node.GetAttribute ( "base", false );
-	if ( att != NULL )
-		base = att->value;
-	else
-		base = "";
-
-	att = node.GetAttribute ( "nameoncd", false );
-	if ( att != NULL )
-		nameoncd = att->value;
-	else
-		nameoncd = module->GetTargetName ();
-}
-
-void
-Bootstrap::ProcessXML()
-{
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+
+Bootstrap::Bootstrap ( const Project& project_,
+	                   const Module* module_,
+	                   const XMLElement& bootstrapNode )
+	: project(project_),
+	  module(module_),
+	  node(bootstrapNode)
+{
+	Initialize();
+}
+
+Bootstrap::~Bootstrap ()
+{
+}
+
+bool
+Bootstrap::IsSupportedModuleType ( ModuleType type )
+{
+	switch ( type )
+	{
+		case Kernel:
+		case KernelModeDLL:
+		case NativeDLL:
+		case NativeCUI:
+		case Win32DLL:
+		case Win32CUI:
+		case Win32GUI:
+		case KernelModeDriver:
+		case BootSector:
+		case BootLoader:
+			return true;
+		case BuildTool:
+		case StaticLibrary:
+		case ObjectLibrary:
+		case Iso:
+		case LiveIso:
+		case Test:
+		case RpcServer:
+		case RpcClient:
+			return false;
+	}
+	throw InvalidOperationException ( __FILE__,
+	                                  __LINE__ );
+}
+
+void
+Bootstrap::Initialize ()
+{
+	if ( !IsSupportedModuleType ( module->type ) )
+	{
+		throw InvalidBuildFileException (
+			node.location,
+			"<bootstrap> is not applicable for this module type." );
+	}
+
+	const XMLAttribute* att = node.GetAttribute ( "base", false );
+	if ( att != NULL )
+		base = att->value;
+	else
+		base = "";
+
+	att = node.GetAttribute ( "nameoncd", false );
+	if ( att != NULL )
+		nameoncd = att->value;
+	else
+		nameoncd = module->GetTargetName ();
+}
+
+void
+Bootstrap::ProcessXML()
+{
+}
diff --git a/reactos/tools/rbuild/cdfile.cpp b/reactos/tools/rbuild/cdfile.cpp
index d11fe75332f..cd55d480c36 100644
--- a/reactos/tools/rbuild/cdfile.cpp
+++ b/reactos/tools/rbuild/cdfile.cpp
@@ -1,42 +1,42 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-
-CDFile::CDFile ( const Project& project_,
-	             const XMLElement& cdfileNode,
-	             const string& path )
-	: project ( project_ ),
-	  node ( cdfileNode )
-{
-	const XMLAttribute* att = node.GetAttribute ( "base", false );
-	if ( att != NULL )
-		base = att->value;
-	else
-		base = "";
-
-	att = node.GetAttribute ( "nameoncd", false );
-	if ( att != NULL )
-		nameoncd = att->value;
-	else
-		nameoncd = node.value;
-	name = node.value;
-	this->path = path;
-}
-
-CDFile::~CDFile ()
-{
-}
-
-string
-CDFile::GetPath () const
-{
-	return path + SSEP + name;
-}
-
-void
-CDFile::ProcessXML()
-{
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+
+CDFile::CDFile ( const Project& project_,
+	             const XMLElement& cdfileNode,
+	             const string& path )
+	: project ( project_ ),
+	  node ( cdfileNode )
+{
+	const XMLAttribute* att = node.GetAttribute ( "base", false );
+	if ( att != NULL )
+		base = att->value;
+	else
+		base = "";
+
+	att = node.GetAttribute ( "nameoncd", false );
+	if ( att != NULL )
+		nameoncd = att->value;
+	else
+		nameoncd = node.value;
+	name = node.value;
+	this->path = path;
+}
+
+CDFile::~CDFile ()
+{
+}
+
+string
+CDFile::GetPath () const
+{
+	return path + SSEP + name;
+}
+
+void
+CDFile::ProcessXML()
+{
+}
diff --git a/reactos/tools/rbuild/compilerflag.cpp b/reactos/tools/rbuild/compilerflag.cpp
index 2a2f051346d..dde21edce25 100644
--- a/reactos/tools/rbuild/compilerflag.cpp
+++ b/reactos/tools/rbuild/compilerflag.cpp
@@ -1,47 +1,47 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-using std::vector;
-
-CompilerFlag::CompilerFlag ( const Project& project_,
-                             const XMLElement& compilerFlagNode )
-	: project(project_),
-	  module(NULL),
-	  node(compilerFlagNode)
-{
-	Initialize();
-}
-
-CompilerFlag::CompilerFlag ( const Project& project_,
-	                         const Module* module_,
-	                         const XMLElement& compilerFlagNode )
-	: project(project_),
-	  module(module_),
-	  node(compilerFlagNode)
-{
-	Initialize();
-}
-
-CompilerFlag::~CompilerFlag ()
-{
-}
-
-void
-CompilerFlag::Initialize ()
-{
-}
-
-void
-CompilerFlag::ProcessXML ()
-{
-	if (node.value.size () == 0)
-	{
-		throw InvalidBuildFileException (
-			node.location,
-			"<compilerflag> is empty." );
-	}
-	flag = node.value;
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+using std::vector;
+
+CompilerFlag::CompilerFlag ( const Project& project_,
+                             const XMLElement& compilerFlagNode )
+	: project(project_),
+	  module(NULL),
+	  node(compilerFlagNode)
+{
+	Initialize();
+}
+
+CompilerFlag::CompilerFlag ( const Project& project_,
+	                         const Module* module_,
+	                         const XMLElement& compilerFlagNode )
+	: project(project_),
+	  module(module_),
+	  node(compilerFlagNode)
+{
+	Initialize();
+}
+
+CompilerFlag::~CompilerFlag ()
+{
+}
+
+void
+CompilerFlag::Initialize ()
+{
+}
+
+void
+CompilerFlag::ProcessXML ()
+{
+	if (node.value.size () == 0)
+	{
+		throw InvalidBuildFileException (
+			node.location,
+			"<compilerflag> is empty." );
+	}
+	flag = node.value;
+}
diff --git a/reactos/tools/rbuild/define.cpp b/reactos/tools/rbuild/define.cpp
index 2530249ece1..43c69afd73b 100644
--- a/reactos/tools/rbuild/define.cpp
+++ b/reactos/tools/rbuild/define.cpp
@@ -1,44 +1,44 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-using std::vector;
-
-Define::Define ( const Project& project,
-                 const XMLElement& defineNode )
-	: project(project),
-	  module(NULL),
-	  node(defineNode)
-{
-	Initialize();
-}
-
-Define::Define ( const Project& project,
-	             const Module* module,
-                 const XMLElement& defineNode )
-	: project(project),
-	  module(module),
-	  node(defineNode)
-{
-	Initialize();
-}
-
-Define::~Define ()
-{
-}
-
-void
-Define::Initialize()
-{
-	const XMLAttribute* att = node.GetAttribute ( "name", true );
-	assert(att);
-	name = att->value;
-	value = node.value;
-}
-
-void
-Define::ProcessXML()
-{
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+using std::vector;
+
+Define::Define ( const Project& project,
+                 const XMLElement& defineNode )
+	: project(project),
+	  module(NULL),
+	  node(defineNode)
+{
+	Initialize();
+}
+
+Define::Define ( const Project& project,
+	             const Module* module,
+                 const XMLElement& defineNode )
+	: project(project),
+	  module(module),
+	  node(defineNode)
+{
+	Initialize();
+}
+
+Define::~Define ()
+{
+}
+
+void
+Define::Initialize()
+{
+	const XMLAttribute* att = node.GetAttribute ( "name", true );
+	assert(att);
+	name = att->value;
+	value = node.value;
+}
+
+void
+Define::ProcessXML()
+{
+}
diff --git a/reactos/tools/rbuild/exception.cpp b/reactos/tools/rbuild/exception.cpp
index 2038a1757e4..ae22d587031 100644
--- a/reactos/tools/rbuild/exception.cpp
+++ b/reactos/tools/rbuild/exception.cpp
@@ -1,174 +1,174 @@
-
-#include "pch.h"
-
-#include "rbuild.h"
-
-using std::string;
-
-Exception::Exception ()
-{
-}
-
-Exception::Exception ( const string& message )
-{
-	Message = message;
-}
-
-Exception::Exception ( const char* format,
-                       ...)
-{
-	va_list args;
-	va_start ( args,
-	           format);
-	Message = ssvprintf ( format,
-	                      args);
-	va_end ( args );
-}
-
-void Exception::SetMessage ( const char* message,
-                             va_list args)
-{
-	Message = ssvprintf ( message,
-	                      args);
-}
-
-
-OutOfMemoryException::OutOfMemoryException ()
-	: Exception ( "Out of memory" )
-{
-}
-
-
-InvalidOperationException::InvalidOperationException ( const char* filename,
-	                                                   const int linenumber )
-{
-	Message = ssprintf ( "%s:%d",
-	                     filename,
-	                     linenumber );
-}
-
-InvalidOperationException::InvalidOperationException ( const char* filename,
-	                                                   const int linenumber,
-	                                                   const char* message,
-	                                                   ... )
-{
-	string errorMessage;
-	va_list args;
-	va_start ( args,
-	           message );
-	errorMessage = ssvprintf ( message,
-	                           args );
-	va_end ( args );
-	Message = ssprintf ( "%s:%d %s",
-	                     filename,
-	                     linenumber,
-	                     errorMessage.c_str () );
-}
-
-
-FileNotFoundException::FileNotFoundException ( const string& filename )
-	: Exception ( "File '%s' not found.",
-	              filename.c_str() )
-{
-	Filename = filename;
-}
-
-
-AccessDeniedException::AccessDeniedException ( const string& filename)
-	: Exception ( "Access denied to file or directory '%s'.",
-	             filename.c_str() )
-{
-	Filename = filename;
-}
-
-
-InvalidBuildFileException::InvalidBuildFileException ( const string& location,
-                                                       const char* message,
-                                                       ...)
-{
-	va_list args;
-	va_start ( args,
-	           message );
-	SetLocationMessage ( location, message, args );
-	va_end ( args );
-}
-
-InvalidBuildFileException::InvalidBuildFileException ()
-{
-}
-
-void
-InvalidBuildFileException::SetLocationMessage ( const std::string& location,
-                                                const char* message,
-                                                va_list args )
-{
-	Message = location + ": " + ssvprintf ( message, args );
-}
-
-XMLSyntaxErrorException::XMLSyntaxErrorException ( const string& location,
-	                                               const char* message,
-	                                               ... )
-{
-	va_list args;
-	va_start ( args,
-	          message );
-	SetLocationMessage ( location, message, args );
-	va_end ( args );
-}
-
-
-RequiredAttributeNotFoundException::RequiredAttributeNotFoundException (
-	const string& location,
-	const string& attributeName,
-	const string& elementName )
-	: InvalidBuildFileException ( location,
-	                              "Required attribute '%s' not found on '%s'.",
-	                              attributeName.c_str (),
-	                              elementName.c_str ())
-{
-}
-
-InvalidAttributeValueException::InvalidAttributeValueException (
-	const string& location,
-	const string& name,
-	const string& value )
-	: InvalidBuildFileException ( location,
-	                              "Attribute '%s' has an invalid value '%s'.",
-	                              name.c_str (),
-	                              value.c_str () )
-{
-	
-}
-
-BackendNameConflictException::BackendNameConflictException ( const string& name )
-	: Exception ( "Backend name conflict: '%s'",
-	             name.c_str() )
-{
-}
-
-
-UnknownBackendException::UnknownBackendException ( const string& name )
-	: Exception ( "Unknown Backend requested: '%s'",
-	              name.c_str() )
-{
-}
-
-
-UnknownModuleTypeException::UnknownModuleTypeException ( const string& location,
-                                                         int moduletype )
-	: InvalidBuildFileException ( location,
-	                              "module type requested: %i",
-	                              moduletype )
-{
-}
-
-
-InvocationFailedException::InvocationFailedException ( const std::string& command,
-                                                       int exitcode )
-	: Exception ( "Failed to execute '%s' (exit code %d)",
-	              command.c_str (),
-	              exitcode )
-{
-	Command = command;
-	ExitCode = exitcode;
-}
+
+#include "pch.h"
+
+#include "rbuild.h"
+
+using std::string;
+
+Exception::Exception ()
+{
+}
+
+Exception::Exception ( const string& message )
+{
+	Message = message;
+}
+
+Exception::Exception ( const char* format,
+                       ...)
+{
+	va_list args;
+	va_start ( args,
+	           format);
+	Message = ssvprintf ( format,
+	                      args);
+	va_end ( args );
+}
+
+void Exception::SetMessage ( const char* message,
+                             va_list args)
+{
+	Message = ssvprintf ( message,
+	                      args);
+}
+
+
+OutOfMemoryException::OutOfMemoryException ()
+	: Exception ( "Out of memory" )
+{
+}
+
+
+InvalidOperationException::InvalidOperationException ( const char* filename,
+	                                                   const int linenumber )
+{
+	Message = ssprintf ( "%s:%d",
+	                     filename,
+	                     linenumber );
+}
+
+InvalidOperationException::InvalidOperationException ( const char* filename,
+	                                                   const int linenumber,
+	                                                   const char* message,
+	                                                   ... )
+{
+	string errorMessage;
+	va_list args;
+	va_start ( args,
+	           message );
+	errorMessage = ssvprintf ( message,
+	                           args );
+	va_end ( args );
+	Message = ssprintf ( "%s:%d %s",
+	                     filename,
+	                     linenumber,
+	                     errorMessage.c_str () );
+}
+
+
+FileNotFoundException::FileNotFoundException ( const string& filename )
+	: Exception ( "File '%s' not found.",
+	              filename.c_str() )
+{
+	Filename = filename;
+}
+
+
+AccessDeniedException::AccessDeniedException ( const string& filename)
+	: Exception ( "Access denied to file or directory '%s'.",
+	             filename.c_str() )
+{
+	Filename = filename;
+}
+
+
+InvalidBuildFileException::InvalidBuildFileException ( const string& location,
+                                                       const char* message,
+                                                       ...)
+{
+	va_list args;
+	va_start ( args,
+	           message );
+	SetLocationMessage ( location, message, args );
+	va_end ( args );
+}
+
+InvalidBuildFileException::InvalidBuildFileException ()
+{
+}
+
+void
+InvalidBuildFileException::SetLocationMessage ( const std::string& location,
+                                                const char* message,
+                                                va_list args )
+{
+	Message = location + ": " + ssvprintf ( message, args );
+}
+
+XMLSyntaxErrorException::XMLSyntaxErrorException ( const string& location,
+	                                               const char* message,
+	                                               ... )
+{
+	va_list args;
+	va_start ( args,
+	          message );
+	SetLocationMessage ( location, message, args );
+	va_end ( args );
+}
+
+
+RequiredAttributeNotFoundException::RequiredAttributeNotFoundException (
+	const string& location,
+	const string& attributeName,
+	const string& elementName )
+	: InvalidBuildFileException ( location,
+	                              "Required attribute '%s' not found on '%s'.",
+	                              attributeName.c_str (),
+	                              elementName.c_str ())
+{
+}
+
+InvalidAttributeValueException::InvalidAttributeValueException (
+	const string& location,
+	const string& name,
+	const string& value )
+	: InvalidBuildFileException ( location,
+	                              "Attribute '%s' has an invalid value '%s'.",
+	                              name.c_str (),
+	                              value.c_str () )
+{
+	
+}
+
+BackendNameConflictException::BackendNameConflictException ( const string& name )
+	: Exception ( "Backend name conflict: '%s'",
+	             name.c_str() )
+{
+}
+
+
+UnknownBackendException::UnknownBackendException ( const string& name )
+	: Exception ( "Unknown Backend requested: '%s'",
+	              name.c_str() )
+{
+}
+
+
+UnknownModuleTypeException::UnknownModuleTypeException ( const string& location,
+                                                         int moduletype )
+	: InvalidBuildFileException ( location,
+	                              "module type requested: %i",
+	                              moduletype )
+{
+}
+
+
+InvocationFailedException::InvocationFailedException ( const std::string& command,
+                                                       int exitcode )
+	: Exception ( "Failed to execute '%s' (exit code %d)",
+	              command.c_str (),
+	              exitcode )
+{
+	Command = command;
+	ExitCode = exitcode;
+}
diff --git a/reactos/tools/rbuild/exception.h b/reactos/tools/rbuild/exception.h
index 3530be65a51..6f7b4f30cea 100644
--- a/reactos/tools/rbuild/exception.h
+++ b/reactos/tools/rbuild/exception.h
@@ -1,125 +1,125 @@
-#ifndef __EXCEPTION_H
-#define __EXCEPTION_H
-
-#include "pch.h"
-
-class Exception
-{
-public:
-	Exception ( const std::string& message );
-	Exception ( const char* format,
-	            ...);
-	std::string Message;
-protected:
-	Exception ();
-	void SetMessage ( const char* message,
-	                  va_list args );
-};
-
-
-class InvalidOperationException : public Exception
-{
-public:
-	InvalidOperationException ( const char* filename,
-	                            const int linenumber);
-	InvalidOperationException ( const char* filename,
-	                            const int linenumber,
-	                            const char* message,
-	                            ... );
-};
-
-
-class OutOfMemoryException : public Exception
-{
-public:
-	OutOfMemoryException ();
-};
-
-
-class FileNotFoundException : public Exception
-{
-public:
-	FileNotFoundException ( const std::string& filename );
-	std::string Filename;
-};
-
-
-class AccessDeniedException : public Exception
-{
-public:
-	AccessDeniedException ( const std::string& filename );
-	std::string Filename;
-};
-
-class InvalidBuildFileException : public Exception
-{
-public:
-	InvalidBuildFileException ( const std::string& location,
-	                            const char* message,
-	                            ...);
-	void SetLocationMessage ( const std::string& location,
-	                          const char* message,
-	                          va_list args );
-protected:
-	InvalidBuildFileException ();
-};
-
-
-class XMLSyntaxErrorException : public InvalidBuildFileException
-{
-public:
-	XMLSyntaxErrorException ( const std::string& location,
-	                          const char* message,
-	                          ... );
-};
-
-
-class RequiredAttributeNotFoundException : public InvalidBuildFileException
-{
-public:
-	RequiredAttributeNotFoundException ( const std::string& location,
-	                                     const std::string& attributeName,
-	                                     const std::string& elementName );
-};
-
-
-class InvalidAttributeValueException : public InvalidBuildFileException
-{
-public:
-	InvalidAttributeValueException ( const std::string& location,
-	                                 const std::string& name,
-	                                 const std::string& value );
-};
-
-
-class BackendNameConflictException : public Exception
-{
-public:
-	BackendNameConflictException ( const std::string& name );
-};
-
-
-class UnknownBackendException : public Exception
-{
-public:
-	UnknownBackendException ( const std::string& name );
-};
-
-class UnknownModuleTypeException : public InvalidBuildFileException
-{
-public:
-	UnknownModuleTypeException ( const std::string& location,
-	                             int moduletype );
-};
-
-
-class InvocationFailedException : public Exception
-{
-public:
-	InvocationFailedException ( const std::string& command,
-	                            int exitcode );
-	std::string Command;
-	int ExitCode;
-};
-
-#endif /* __EXCEPTION_H */
+#ifndef __EXCEPTION_H
+#define __EXCEPTION_H
+
+#include "pch.h"
+
+class Exception
+{
+public:
+	Exception ( const std::string& message );
+	Exception ( const char* format,
+	            ...);
+	std::string Message;
+protected:
+	Exception ();
+	void SetMessage ( const char* message,
+	                  va_list args );
+};
+
+
+class InvalidOperationException : public Exception
+{
+public:
+	InvalidOperationException ( const char* filename,
+	                            const int linenumber);
+	InvalidOperationException ( const char* filename,
+	                            const int linenumber,
+	                            const char* message,
+	                            ... );
+};
+
+
+class OutOfMemoryException : public Exception
+{
+public:
+	OutOfMemoryException ();
+};
+
+
+class FileNotFoundException : public Exception
+{
+public:
+	FileNotFoundException ( const std::string& filename );
+	std::string Filename;
+};
+
+
+class AccessDeniedException : public Exception
+{
+public:
+	AccessDeniedException ( const std::string& filename );
+	std::string Filename;
+};
+
+class InvalidBuildFileException : public Exception
+{
+public:
+	InvalidBuildFileException ( const std::string& location,
+	                            const char* message,
+	                            ...);
+	void SetLocationMessage ( const std::string& location,
+	                          const char* message,
+	                          va_list args );
+protected:
+	InvalidBuildFileException ();
+};
+
+
+class XMLSyntaxErrorException : public InvalidBuildFileException
+{
+public:
+	XMLSyntaxErrorException ( const std::string& location,
+	                          const char* message,
+	                          ... );
+};
+
+
+class RequiredAttributeNotFoundException : public InvalidBuildFileException
+{
+public:
+	RequiredAttributeNotFoundException ( const std::string& location,
+	                                     const std::string& attributeName,
+	                                     const std::string& elementName );
+};
+
+
+class InvalidAttributeValueException : public InvalidBuildFileException
+{
+public:
+	InvalidAttributeValueException ( const std::string& location,
+	                                 const std::string& name,
+	                                 const std::string& value );
+};
+
+
+class BackendNameConflictException : public Exception
+{
+public:
+	BackendNameConflictException ( const std::string& name );
+};
+
+
+class UnknownBackendException : public Exception
+{
+public:
+	UnknownBackendException ( const std::string& name );
+};
+
+class UnknownModuleTypeException : public InvalidBuildFileException
+{
+public:
+	UnknownModuleTypeException ( const std::string& location,
+	                             int moduletype );
+};
+
+
+class InvocationFailedException : public Exception
+{
+public:
+	InvocationFailedException ( const std::string& command,
+	                            int exitcode );
+	std::string Command;
+	int ExitCode;
+};
+
+#endif /* __EXCEPTION_H */
diff --git a/reactos/tools/rbuild/include.cpp b/reactos/tools/rbuild/include.cpp
index 9713457bb37..35e4dcc751e 100644
--- a/reactos/tools/rbuild/include.cpp
+++ b/reactos/tools/rbuild/include.cpp
@@ -1,73 +1,73 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-using std::vector;
-
-Include::Include ( const Project& project_,
-                   const XMLElement& includeNode )
-	: project (project_),
-	  module (NULL),
-	  node (includeNode)
-{
-	Initialize();
-}
-
-Include::Include ( const Project& project_,
-	               const Module* module_,
-	               const XMLElement& includeNode )
-	: project (project_),
-	  module (module_),
-	  node (includeNode)
-{
-	Initialize();
-}
-
-Include::~Include ()
-{
-}
-
-void
-Include::Initialize()
-{
-}
-
-void
-Include::ProcessXML()
-{
-	const XMLAttribute* att;
-	att = node.GetAttribute ( "base",
-	                          false );
-	if ( att )
-	{
-		if ( !module )
-			throw InvalidBuildFileException (
-				node.location,
-				"'base' attribute illegal from global <include>" );
-		bool referenceResolved = false;
-		if ( att->value == project.name )
-		{
-			basePath = ".";
-			referenceResolved = true;
-		}
-		else
-		{
-			const Module* base = project.LocateModule ( att->value );
-			if ( base != NULL )
-			{
-				basePath = base->GetBasePath ();
-				referenceResolved = true;
-			}
-		}
-		if ( !referenceResolved )
-			throw InvalidBuildFileException (
-				node.location,
-				"<include> attribute 'base' references non-existant project or module '%s'",
-				att->value.c_str() );
-		directory = FixSeparator ( basePath + "/" + node.value );
-	}
-	else
-		directory = FixSeparator ( node.value );
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+using std::vector;
+
+Include::Include ( const Project& project_,
+                   const XMLElement& includeNode )
+	: project (project_),
+	  module (NULL),
+	  node (includeNode)
+{
+	Initialize();
+}
+
+Include::Include ( const Project& project_,
+	               const Module* module_,
+	               const XMLElement& includeNode )
+	: project (project_),
+	  module (module_),
+	  node (includeNode)
+{
+	Initialize();
+}
+
+Include::~Include ()
+{
+}
+
+void
+Include::Initialize()
+{
+}
+
+void
+Include::ProcessXML()
+{
+	const XMLAttribute* att;
+	att = node.GetAttribute ( "base",
+	                          false );
+	if ( att )
+	{
+		if ( !module )
+			throw InvalidBuildFileException (
+				node.location,
+				"'base' attribute illegal from global <include>" );
+		bool referenceResolved = false;
+		if ( att->value == project.name )
+		{
+			basePath = ".";
+			referenceResolved = true;
+		}
+		else
+		{
+			const Module* base = project.LocateModule ( att->value );
+			if ( base != NULL )
+			{
+				basePath = base->GetBasePath ();
+				referenceResolved = true;
+			}
+		}
+		if ( !referenceResolved )
+			throw InvalidBuildFileException (
+				node.location,
+				"<include> attribute 'base' references non-existant project or module '%s'",
+				att->value.c_str() );
+		directory = FixSeparator ( basePath + "/" + node.value );
+	}
+	else
+		directory = FixSeparator ( node.value );
+}
diff --git a/reactos/tools/rbuild/installfile.cpp b/reactos/tools/rbuild/installfile.cpp
index 1e497f40203..36ed113ff64 100644
--- a/reactos/tools/rbuild/installfile.cpp
+++ b/reactos/tools/rbuild/installfile.cpp
@@ -1,42 +1,42 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-
-InstallFile::InstallFile ( const Project& project_,
-	                       const XMLElement& installfileNode,
-	                       const string& path )
-	: project ( project_ ),
-	  node ( installfileNode )
-{
-	const XMLAttribute* att = node.GetAttribute ( "base", false );
-	if ( att != NULL )
-		base = att->value;
-	else
-		base = "";
-
-	att = node.GetAttribute ( "newname", false );
-	if ( att != NULL )
-		newname = att->value;
-	else
-		newname = node.value;
-	name = node.value;
-	this->path = path;
-}
-
-InstallFile::~InstallFile ()
-{
-}
-
-string
-InstallFile::GetPath () const
-{
-	return path + SSEP + name;
-}
-
-void
-InstallFile::ProcessXML()
-{
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+
+InstallFile::InstallFile ( const Project& project_,
+	                       const XMLElement& installfileNode,
+	                       const string& path )
+	: project ( project_ ),
+	  node ( installfileNode )
+{
+	const XMLAttribute* att = node.GetAttribute ( "base", false );
+	if ( att != NULL )
+		base = att->value;
+	else
+		base = "";
+
+	att = node.GetAttribute ( "newname", false );
+	if ( att != NULL )
+		newname = att->value;
+	else
+		newname = node.value;
+	name = node.value;
+	this->path = path;
+}
+
+InstallFile::~InstallFile ()
+{
+}
+
+string
+InstallFile::GetPath () const
+{
+	return path + SSEP + name;
+}
+
+void
+InstallFile::ProcessXML()
+{
+}
diff --git a/reactos/tools/rbuild/linkerflag.cpp b/reactos/tools/rbuild/linkerflag.cpp
index f2abab3c736..73eb2d256e1 100644
--- a/reactos/tools/rbuild/linkerflag.cpp
+++ b/reactos/tools/rbuild/linkerflag.cpp
@@ -1,47 +1,47 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-using std::vector;
-
-LinkerFlag::LinkerFlag ( const Project& project_,
-                         const XMLElement& linkerFlagNode )
-	: project(project_),
-	  module(NULL),
-	  node(linkerFlagNode)
-{
-	Initialize();
-}
-
-LinkerFlag::LinkerFlag ( const Project& project_,
-	                     const Module* module_,
-	                     const XMLElement& linkerFlagNode )
-	: project(project_),
-	  module(module_),
-	  node(linkerFlagNode)
-{
-	Initialize();
-}
-
-LinkerFlag::~LinkerFlag ()
-{
-}
-
-void
-LinkerFlag::Initialize ()
-{
-}
-
-void
-LinkerFlag::ProcessXML ()
-{
-	if ( node.value.size () == 0 )
-	{
-		throw InvalidBuildFileException (
-			node.location,
-			"<linkerflag> is empty." );
-	}
-	flag = node.value;
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+using std::vector;
+
+LinkerFlag::LinkerFlag ( const Project& project_,
+                         const XMLElement& linkerFlagNode )
+	: project(project_),
+	  module(NULL),
+	  node(linkerFlagNode)
+{
+	Initialize();
+}
+
+LinkerFlag::LinkerFlag ( const Project& project_,
+	                     const Module* module_,
+	                     const XMLElement& linkerFlagNode )
+	: project(project_),
+	  module(module_),
+	  node(linkerFlagNode)
+{
+	Initialize();
+}
+
+LinkerFlag::~LinkerFlag ()
+{
+}
+
+void
+LinkerFlag::Initialize ()
+{
+}
+
+void
+LinkerFlag::ProcessXML ()
+{
+	if ( node.value.size () == 0 )
+	{
+		throw InvalidBuildFileException (
+			node.location,
+			"<linkerflag> is empty." );
+	}
+	flag = node.value;
+}
diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index 26422d2af86..eaeacd0adea 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -1,970 +1,970 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-using std::vector;
-
-string
-FixSeparator ( const string& s )
-{
-	string s2(s);
-	char* p = strchr ( &s2[0], CBAD_SEP );
-	while ( p )
-	{
-		*p++ = CSEP;
-		p = strchr ( p, CBAD_SEP );
-	}
-	return s2;
-}
-
-string
-ReplaceExtension (
-	const string& filename,
-	const string& newExtension )
-{
-	size_t index = filename.find_last_of ( '/' );
-	if ( index == string::npos )
-		index = 0;
-	size_t index2 = filename.find_last_of ( '\\' );
-	if ( index2 != string::npos && index2 > index )
-		index = index2;
-	string tmp = filename.substr( index /*, filename.size() - index*/ );
-	size_t ext_index = tmp.find_last_of( '.' );
-	if ( ext_index != string::npos )
-		return filename.substr ( 0, index + ext_index ) + newExtension;
-	return filename + newExtension;
-}
-
-string
-GetSubPath (
-	const string& location,
-	const string& path,
-	const string& att_value )
-{
-	if ( !att_value.size() )
-		throw InvalidBuildFileException (
-			location,
-			"<directory> tag has empty 'name' attribute" );
-	if ( strpbrk ( att_value.c_str (), "/\\?*:<>|" ) )
-		throw InvalidBuildFileException (
-			location,
-			"<directory> tag has invalid characters in 'name' attribute" );
-	if ( !path.size() )
-		return att_value;
-	return FixSeparator(path + CSEP + att_value);
-}
-
-string
-GetExtension ( const string& filename )
-{
-	size_t index = filename.find_last_of ( '/' );
-	if (index == string::npos) index = 0;
-	string tmp = filename.substr( index, filename.size() - index );
-	size_t ext_index = tmp.find_last_of( '.' );
-	if (ext_index != string::npos) 
-		return filename.substr ( index + ext_index, filename.size() );
-	return "";
-}
-
-string
-GetDirectory ( const string& filename )
-{
-	size_t index = filename.find_last_of ( CSEP );
-	if ( index == string::npos )
-		return filename;
-	else
-		return filename.substr ( 0, index );
-}
-
-string
-NormalizeFilename ( const string& filename )
-{
-	Path path;
-	string normalizedPath = path.Fixup ( filename, true );
-	string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath );
-	return FixSeparator ( relativeNormalizedPath );
-}
-
-IfableData::~IfableData()
-{
-	size_t i;
-	for ( i = 0; i < files.size(); i++ )
-		delete files[i];
-	for ( i = 0; i < includes.size(); i++ )
-		delete includes[i];
-	for ( i = 0; i < defines.size(); i++ )
-		delete defines[i];
-	for ( i = 0; i < libraries.size(); i++ )
-		delete libraries[i];
-	for ( i = 0; i < properties.size(); i++ )
-		delete properties[i];
-	for ( i = 0; i < ifs.size(); i++ )
-		delete ifs[i];
-}
-
-void IfableData::ProcessXML ()
-{
-	size_t i;
-	for ( i = 0; i < files.size (); i++ )
-		files[i]->ProcessXML ();
-	for ( i = 0; i < includes.size (); i++ )
-		includes[i]->ProcessXML ();
-	for ( i = 0; i < defines.size (); i++ )
-		defines[i]->ProcessXML ();
-	for ( i = 0; i < libraries.size (); i++ )
-		libraries[i]->ProcessXML ();
-	for ( i = 0; i < properties.size(); i++ )
-		properties[i]->ProcessXML ();
-	for ( i = 0; i < ifs.size (); i++ )
-		ifs[i]->ProcessXML ();
-}
-
-Module::Module ( const Project& project,
-                 const XMLElement& moduleNode,
-                 const string& modulePath )
-	: project (project),
-	  node (moduleNode),
-	  importLibrary (NULL),
-	  bootstrap (NULL),
-	  pch (NULL),
-	  cplusplus (false),
-	  host (HostDefault)
-{
-	if ( node.name != "module" )
-		throw InvalidOperationException ( __FILE__,
-		                                  __LINE__,
-		                                  "Module created with non-<module> node" );
-
-	xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename() );
-
-	path = FixSeparator ( modulePath );
-
-	const XMLAttribute* att = moduleNode.GetAttribute ( "name", true );
-	assert(att);
-	name = att->value;
-
-	att = moduleNode.GetAttribute ( "type", true );
-	assert(att);
-	type = GetModuleType ( node.location, *att );
-
-	att = moduleNode.GetAttribute ( "extension", false );
-	if ( att != NULL )
-		extension = att->value;
-	else
-		extension = GetDefaultModuleExtension ();
-
-	att = moduleNode.GetAttribute ( "entrypoint", false );
-	if ( att != NULL )
-		entrypoint = att->value;
-	else
-		entrypoint = GetDefaultModuleEntrypoint ();
-
-	att = moduleNode.GetAttribute ( "baseaddress", false );
-	if ( att != NULL )
-		baseaddress = att->value;
-	else
-		baseaddress = GetDefaultModuleBaseaddress ();
-
-	att = moduleNode.GetAttribute ( "mangledsymbols", false );
-	if ( att != NULL )
-	{
-		const char* p = att->value.c_str();
-		if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) )
-			mangledSymbols = true;
-		else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) )
-			mangledSymbols = false;
-		else
-		{
-			throw InvalidAttributeValueException (
-				moduleNode.location,
-				"mangledsymbols",
-				att->value );
-		}
-	}
-	else
-		mangledSymbols = false;
-
-	att = moduleNode.GetAttribute ( "host", false );
-	if ( att != NULL )
-	{
-		const char* p = att->value.c_str();
-		if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) )
-			host = HostTrue;
-		else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) )
-			host = HostFalse;
-		else
-		{
-			throw InvalidAttributeValueException (
-				moduleNode.location,
-				"host",
-				att->value );
-		}
-	}
-
-	att = moduleNode.GetAttribute ( "prefix", false );
-	if ( att != NULL )
-		prefix = att->value;
-
-	att = moduleNode.GetAttribute ( "installbase", false );
-	if ( att != NULL )
-		installBase = att->value;
-	else
-		installBase = "";
-
-	att = moduleNode.GetAttribute ( "installname", false );
-	if ( att != NULL )
-		installName = att->value;
-	else
-		installName = "";
-	
-	att = moduleNode.GetAttribute ( "usewrc", false );
-	if ( att != NULL )
-		useWRC = att->value == "true";
-	else
-		useWRC = true;
-
-	att = moduleNode.GetAttribute ( "warnings", false );
-	if ( att != NULL )
-		enableWarnings = att->value == "true";
-	else
-		enableWarnings = false;
-}
-
-Module::~Module ()
-{
-	size_t i;
-	for ( i = 0; i < invocations.size(); i++ )
-		delete invocations[i];
-	for ( i = 0; i < dependencies.size(); i++ )
-		delete dependencies[i];
-	for ( i = 0; i < compilerFlags.size(); i++ )
-		delete compilerFlags[i];
-	for ( i = 0; i < linkerFlags.size(); i++ )
-		delete linkerFlags[i];
-	for ( i = 0; i < stubbedComponents.size(); i++ )
-		delete stubbedComponents[i];
-	if ( pch )
-		delete pch;
-}
-
-void
-Module::ProcessXML()
-{
-	size_t i;
-	for ( i = 0; i < node.subElements.size(); i++ )
-		ProcessXMLSubElement ( *node.subElements[i], path );
-	for ( i = 0; i < invocations.size(); i++ )
-		invocations[i]->ProcessXML ();
-	for ( i = 0; i < dependencies.size(); i++ )
-		dependencies[i]->ProcessXML ();
-	for ( i = 0; i < compilerFlags.size(); i++ )
-		compilerFlags[i]->ProcessXML();
-	for ( i = 0; i < linkerFlags.size(); i++ )
-		linkerFlags[i]->ProcessXML();
-	for ( i = 0; i < stubbedComponents.size(); i++ )
-		stubbedComponents[i]->ProcessXML();
-	non_if_data.ProcessXML();
-	if ( pch )
-		pch->ProcessXML();
-}
-
-void
-Module::ProcessXMLSubElement ( const XMLElement& e,
-                               const string& path,
-                               If* pIf /*= NULL*/ )
-{
-	bool subs_invalid = false;
-	string subpath ( path );
-	if ( e.name == "file" && e.value.size () > 0 )
-	{
-		bool first = false;
-		const XMLAttribute* att = e.GetAttribute ( "first", false );
-		if ( att != NULL )
-		{
-			if ( !stricmp ( att->value.c_str(), "true" ) )
-				first = true;
-			else if ( stricmp ( att->value.c_str(), "false" ) )
-				throw InvalidBuildFileException (
-					e.location,
-					"attribute 'first' of <file> element can only be 'true' or 'false'" );
-		}
-		string switches = "";
-		att = e.GetAttribute ( "switches", false );
-		if ( att != NULL )
-			switches = att->value;
-		if ( !cplusplus )
-		{
-			// check for c++ file
-			string ext = GetExtension ( e.value );
-			if ( !stricmp ( ext.c_str(), ".cpp" ) )
-				cplusplus = true;
-			else if ( !stricmp ( ext.c_str(), ".cc" ) )
-				cplusplus = true;
-			else if ( !stricmp ( ext.c_str(), ".cxx" ) )
-				cplusplus = true;
-		}
-		File* pFile = new File ( FixSeparator ( path + CSEP + e.value ),
-		                         first,
-		                         switches );
-		if ( pIf )
-			pIf->data.files.push_back ( pFile );
-		else
-			non_if_data.files.push_back ( pFile );
-		subs_invalid = true;
-	}
-	else if ( e.name == "library" && e.value.size () )
-	{
-		Library* pLibrary = new Library ( e, *this, e.value );
-		if ( pIf )
-			pIf->data.libraries.push_back ( pLibrary );
-		else
-			non_if_data.libraries.push_back ( pLibrary );
-		subs_invalid = true;
-	}
-	else if ( e.name == "directory" )
-	{
-		const XMLAttribute* att = e.GetAttribute ( "name", true );
-		assert(att);
-		subpath = GetSubPath ( e.location, path, att->value );
-	}
-	else if ( e.name == "include" )
-	{
-		Include* include = new Include ( project, this, e );
-		if ( pIf )
-			pIf->data.includes.push_back ( include );
-		else
-			non_if_data.includes.push_back ( include );
-		subs_invalid = true;
-	}
-	else if ( e.name == "define" )
-	{
-		Define* pDefine = new Define ( project, this, e );
-		if ( pIf )
-			pIf->data.defines.push_back ( pDefine );
-		else
-			non_if_data.defines.push_back ( pDefine );
-		subs_invalid = true;
-	}
-	else if ( e.name == "invoke" )
-	{
-		if ( pIf )
-			throw InvalidBuildFileException (
-				e.location,
-				"<invoke> is not a valid sub-element of <if>" );
-		invocations.push_back ( new Invoke ( e, *this ) );
-		subs_invalid = false;
-	}
-	else if ( e.name == "dependency" )
-	{
-		if ( pIf )
-			throw InvalidBuildFileException (
-				e.location,
-				"<dependency> is not a valid sub-element of <if>" );
-		dependencies.push_back ( new Dependency ( e, *this ) );
-		subs_invalid = true;
-	}
-	else if ( e.name == "importlibrary" )
-	{
-		if ( pIf )
-			throw InvalidBuildFileException (
-				e.location,
-				"<importlibrary> is not a valid sub-element of <if>" );
-		if ( importLibrary )
-			throw InvalidBuildFileException (
-				e.location,
-				"Only one <importlibrary> is valid per module" );
-		importLibrary = new ImportLibrary ( e, *this );
-		subs_invalid = true;
-	}
-	else if ( e.name == "if" )
-	{
-		If* pOldIf = pIf;
-		pIf = new If ( e, project, this );
-		if ( pOldIf )
-			pOldIf->data.ifs.push_back ( pIf );
-		else
-			non_if_data.ifs.push_back ( pIf );
-		subs_invalid = false;
-	}
-	else if ( e.name == "compilerflag" )
-	{
-		compilerFlags.push_back ( new CompilerFlag ( project, this, e ) );
-		subs_invalid = true;
-	}
-	else if ( e.name == "linkerflag" )
-	{
-		linkerFlags.push_back ( new LinkerFlag ( project, this, e ) );
-		subs_invalid = true;
-	}
-	else if ( e.name == "component" )
-	{
-		stubbedComponents.push_back ( new StubbedComponent ( this, e ) );
-		subs_invalid = false;
-	}
-	else if ( e.name == "property" )
-	{
-		throw InvalidBuildFileException (
-			e.location,
-			"<property> is not a valid sub-element of <module>" );
-	}
-	else if ( e.name == "bootstrap" )
-	{
-		bootstrap = new Bootstrap ( project, this, e );
-		subs_invalid = true;
-	}
-	else if ( e.name == "pch" )
-	{
-		if ( pIf )
-			throw InvalidBuildFileException (
-				e.location,
-				"<pch> is not a valid sub-element of <if>" );
-		if ( pch )
-			throw InvalidBuildFileException (
-				e.location,
-				"Only one <pch> is valid per module" );
-		pch = new PchFile (
-			e, *this, FixSeparator ( path + CSEP + e.value ) );
-		subs_invalid = true;
-	}
-	if ( subs_invalid && e.subElements.size() > 0 )
-		throw InvalidBuildFileException (
-			e.location,
-			"<%s> cannot have sub-elements",
-			e.name.c_str() );
-	for ( size_t i = 0; i < e.subElements.size (); i++ )
-		ProcessXMLSubElement ( *e.subElements[i], subpath, pIf );
-}
-
-ModuleType
-Module::GetModuleType ( const string& location, const XMLAttribute& attribute )
-{
-	if ( attribute.value == "buildtool" )
-		return BuildTool;
-	if ( attribute.value == "staticlibrary" )
-		return StaticLibrary;
-	if ( attribute.value == "objectlibrary" )
-		return ObjectLibrary;
-	if ( attribute.value == "kernel" )
-		return Kernel;
-	if ( attribute.value == "kernelmodedll" )
-		return KernelModeDLL;
-	if ( attribute.value == "kernelmodedriver" )
-		return KernelModeDriver;
-	if ( attribute.value == "nativedll" )
-		return NativeDLL;
-	if ( attribute.value == "nativecui" )
-		return NativeCUI;
-	if ( attribute.value == "win32dll" )
-		return Win32DLL;
-	if ( attribute.value == "win32cui" )
-		return Win32CUI;
-	if ( attribute.value == "win32gui" )
-		return Win32GUI;
-	if ( attribute.value == "bootloader" )
-		return BootLoader;
-	if ( attribute.value == "bootsector" )
-		return BootSector;
-	if ( attribute.value == "iso" )
-		return Iso;
-	if ( attribute.value == "liveiso" )
-		return LiveIso;
-	if ( attribute.value == "test" )
-		return Test;
-	if ( attribute.value == "rpcserver" )
-		return RpcServer;
-	if ( attribute.value == "rpcclient" )
-		return RpcClient;
-	throw InvalidAttributeValueException ( location,
-	                                       attribute.name,
-	                                       attribute.value );
-}
-
-string
-Module::GetDefaultModuleExtension () const
-{
-	switch (type)
-	{
-		case BuildTool:
-			return EXEPOSTFIX;
-		case StaticLibrary:
-			return ".a";
-		case ObjectLibrary:
-			return ".o";
-		case Kernel:
-		case NativeCUI:
-		case Win32CUI:
-		case Win32GUI:
-			return ".exe";
-		case KernelModeDLL:
-		case NativeDLL:
-		case Win32DLL:
-			return ".dll";
-		case KernelModeDriver:
-		case BootLoader:
-			return ".sys";
-		case BootSector:
-			return ".o";
-		case Iso:
-		case LiveIso:
-			return ".iso";
-		case Test:
-			return ".exe";
-		case RpcServer:
-			return ".o";
-		case RpcClient:
-			return ".o";
-	}
-	throw InvalidOperationException ( __FILE__,
-	                                  __LINE__ );
-}
-
-string
-Module::GetDefaultModuleEntrypoint () const
-{
-	switch (type)
-	{
-		case Kernel:
-			return "_NtProcessStartup";
-		case KernelModeDLL:
-			return "_DriverEntry@8";
-		case NativeDLL:
-			return "_DllMainCRTStartup@12";
-		case NativeCUI:
-			return "_NtProcessStartup@4";
-		case Win32DLL:
-			return "_DllMain@12";
-		case Win32CUI:
-		case Test:
-			return "_mainCRTStartup";
-		case Win32GUI:
-			return "_WinMainCRTStartup";
-		case KernelModeDriver:
-			return "_DriverEntry@8";
-		case BuildTool:
-		case StaticLibrary:
-		case ObjectLibrary:
-		case BootLoader:
-		case BootSector:
-		case Iso:
-		case LiveIso:
-		case RpcServer:
-		case RpcClient:
-			return "";
-	}
-	throw InvalidOperationException ( __FILE__,
-	                                  __LINE__ );
-}
-
-string
-Module::GetDefaultModuleBaseaddress () const
-{
-	switch (type)
-	{
-		case Kernel:
-			return "0xc0000000";
-		case KernelModeDLL:
-			return "0x10000";
-		case NativeDLL:
-			return "0x10000";
-		case NativeCUI:
-			return "0x10000";
-		case Win32DLL:
-			return "0x10000";
-		case Win32CUI:
-		case Test:
-			return "0x00400000";
-		case Win32GUI:
-			return "0x00400000";
-		case KernelModeDriver:
-			return "0x10000";
-		case BuildTool:
-		case StaticLibrary:
-		case ObjectLibrary:
-		case BootLoader:
-		case BootSector:
-		case Iso:
-		case LiveIso:
-		case RpcServer:
-		case RpcClient:
-			return "";
-	}
-	throw InvalidOperationException ( __FILE__,
-	                                  __LINE__ );
-}
-
-bool
-Module::HasImportLibrary () const
-{
-	return importLibrary != NULL;
-}
-
-string
-Module::GetTargetName () const
-{
-	return name + extension;
-}
-
-string
-Module::GetDependencyPath () const
-{
-	if ( HasImportLibrary () )
-	{
-		return ReplaceExtension ( GetPath(), ".a" );
-	}
-	else
-		return GetPath();
-}
-
-string
-Module::GetBasePath () const
-{
-	return path;
-}
-
-string
-Module::GetPath () const
-{
-	if ( path.length() > 0 )
-		return path + CSEP + GetTargetName ();
-	else
-		return GetTargetName ();
-}
-
-string
-Module::GetPathWithPrefix ( const string& prefix ) const
-{
-	return path + CSEP + prefix + GetTargetName ();
-}
-
-string
-Module::GetInvocationTarget ( const int index ) const
-{
-	return ssprintf ( "%s_invoke_%d",
-	                  name.c_str (),
-	                  index );
-}
-
-bool
-Module::HasFileWithExtension (
-	const IfableData& data,
-	const std::string& extension ) const
-{
-	size_t i;
-	for ( i = 0; i < data.files.size (); i++ )
-	{
-		File& file = *data.files[i];
-		string file_ext = GetExtension ( file.name );
-		if ( !stricmp ( file_ext.c_str (), extension.c_str () ) )
-			return true;
-	}
-	for ( i = 0; i < data.ifs.size (); i++ )
-	{
-		if ( HasFileWithExtension ( data.ifs[i]->data, extension ) )
-			return true;
-	}
-	return false;
-}
-
-void
-Module::InvokeModule () const
-{
-	for ( size_t i = 0; i < invocations.size (); i++ )
-	{
-		Invoke& invoke = *invocations[i];
-		string command = invoke.invokeModule->GetPath () + " " + invoke.GetParameters ();
-		printf ( "Executing '%s'\n\n", command.c_str () );
-		int exitcode = system ( command.c_str () );
-		if ( exitcode != 0 )
-			throw InvocationFailedException ( command,
-			                                  exitcode );
-	}
-}
-
-
-File::File ( const string& _name, bool _first,
-	       std::string _switches )
-	: name(_name),
-	  first(_first),
-	  switches(_switches)
-{
-}
-
-void
-File::ProcessXML()
-{
-}
-
-
-Library::Library ( const XMLElement& _node,
-                   const Module& _module,
-                   const string& _name )
-	: node(_node),
-	  module(_module),
-	  name(_name),
-	  imported_module(_module.project.LocateModule(_name))
-{
-	if ( module.name == name )
-		throw InvalidBuildFileException (
-			node.location,
-			"module '%s' cannot link against itself",
-			name.c_str() );
-	if ( !imported_module )
-		throw InvalidBuildFileException (
-			node.location,
-			"module '%s' trying to import non-existant module '%s'",
-			module.name.c_str(),
-			name.c_str() );
-}
-
-void
-Library::ProcessXML()
-{
-	if ( !module.project.LocateModule ( name ) )
-		throw InvalidBuildFileException (
-			node.location,
-			"module '%s' is trying to link against non-existant module '%s'",
-			module.name.c_str(),
-			name.c_str() );
-}
-
-
-Invoke::Invoke ( const XMLElement& _node,
-                 const Module& _module )
-	: node (_node),
-	  module (_module)
-{
-}
-
-void
-Invoke::ProcessXML()
-{
-	const XMLAttribute* att = node.GetAttribute ( "module", false );
-	if (att == NULL)
-		invokeModule = &module;
-	else
-	{
-		invokeModule = module.project.LocateModule ( att->value );
-		if ( invokeModule == NULL )
-			throw InvalidBuildFileException (
-				node.location,
-				"module '%s' is trying to invoke non-existant module '%s'",
-				module.name.c_str(),
-				att->value.c_str() );
-	}
-
-	for ( size_t i = 0; i < node.subElements.size (); i++ )
-		ProcessXMLSubElement ( *node.subElements[i] );
-}
-
-void
-Invoke::ProcessXMLSubElement ( const XMLElement& e )
-{
-	bool subs_invalid = false;
-	if ( e.name == "input" )
-	{
-		for ( size_t i = 0; i < e.subElements.size (); i++ )
-			ProcessXMLSubElementInput ( *e.subElements[i] );
-	}
-	else if ( e.name == "output" )
-	{
-		for ( size_t i = 0; i < e.subElements.size (); i++ )
-			ProcessXMLSubElementOutput ( *e.subElements[i] );
-	}
-	if ( subs_invalid && e.subElements.size() > 0 )
-		throw InvalidBuildFileException ( e.location,
-		                                  "<%s> cannot have sub-elements",
-		                                  e.name.c_str() );
-}
-
-void
-Invoke::ProcessXMLSubElementInput ( const XMLElement& e )
-{
-	bool subs_invalid = false;
-	if ( e.name == "inputfile" && e.value.size () > 0 )
-	{
-		input.push_back ( new InvokeFile ( e, FixSeparator ( module.path + CSEP + e.value ) ) );
-		subs_invalid = true;
-	}
-	if ( subs_invalid && e.subElements.size() > 0 )
-		throw InvalidBuildFileException ( e.location,
-		                                  "<%s> cannot have sub-elements",
-		                                  e.name.c_str() );
-}
-
-void
-Invoke::ProcessXMLSubElementOutput ( const XMLElement& e )
-{
-	bool subs_invalid = false;
-	if ( e.name == "outputfile" && e.value.size () > 0 )
-	{
-		output.push_back ( new InvokeFile ( e, FixSeparator ( module.path + CSEP + e.value ) ) );
-		subs_invalid = true;
-	}
-	if ( subs_invalid && e.subElements.size() > 0 )
-		throw InvalidBuildFileException (
-			e.location,
-			"<%s> cannot have sub-elements",
-			e.name.c_str() );
-}
-
-void
-Invoke::GetTargets ( string_list& targets ) const
-{
-	for ( size_t i = 0; i < output.size (); i++ )
-	{
-		InvokeFile& file = *output[i];
-		targets.push_back ( NormalizeFilename ( file.name ) );
-	}
-}
-
-string
-Invoke::GetParameters () const
-{
-	string parameters ( "" );
-	size_t i;
-	for ( i = 0; i < output.size (); i++ )
-	{
-		if ( parameters.length () > 0)
-			parameters += " ";
-		InvokeFile& invokeFile = *output[i];
-		if ( invokeFile.switches.length () > 0 )
-		{
-			parameters += invokeFile.switches + " ";
-		}
-		parameters += invokeFile.name;
-	}
-
-	for ( i = 0; i < input.size (); i++ )
-	{
-		if ( parameters.length () > 0 )
-			parameters += " ";
-		InvokeFile& invokeFile = *input[i];
-		if ( invokeFile.switches.length () > 0 )
-		{
-			parameters += invokeFile.switches;
-			parameters += " ";
-		}
-		parameters += invokeFile.name ;
-	}
-
-	return parameters;
-}
-
-
-InvokeFile::InvokeFile ( const XMLElement& _node,
-                         const string& _name )
-	: node (_node),
-      name (_name)
-{
-	const XMLAttribute* att = _node.GetAttribute ( "switches", false );
-	if (att != NULL)
-		switches = att->value;
-	else
-		switches = "";
-}
-
-void
-InvokeFile::ProcessXML()
-{
-}
-
-
-Dependency::Dependency ( const XMLElement& _node,
-                         const Module& _module )
-	: node (_node),
-	  module (_module),
-	  dependencyModule (NULL)
-{
-}
-
-void
-Dependency::ProcessXML()
-{
-	dependencyModule = module.project.LocateModule ( node.value );
-	if ( dependencyModule == NULL )
-		throw InvalidBuildFileException ( node.location,
-		                                  "module '%s' depend on non-existant module '%s'",
-		                                  module.name.c_str(),
-		                                  node.value.c_str() );
-}
-
-
-ImportLibrary::ImportLibrary ( const XMLElement& _node,
-                               const Module& _module )
-	: node (_node),
-	  module (_module)
-{
-	const XMLAttribute* att = _node.GetAttribute ( "basename", false );
-	if (att != NULL)
-		basename = att->value;
-	else
-		basename = module.name;
-
-	att = _node.GetAttribute ( "definition", true );
-	assert (att);
-	definition = FixSeparator(att->value);
-}
-
-
-If::If ( const XMLElement& node_,
-         const Project& project_,
-         const Module* module_ )
-	: node(node_), project(project_), module(module_)
-{
-	const XMLAttribute* att;
-
-	att = node.GetAttribute ( "property", true );
-	assert(att);
-	property = att->value;
-
-	att = node.GetAttribute ( "value", true );
-	assert(att);
-	value = att->value;
-}
-
-If::~If ()
-{
-}
-
-void
-If::ProcessXML()
-{
-}
-
-
-Property::Property ( const XMLElement& node_,
-                     const Project& project_,
-                     const Module* module_ )
-	: node(node_), project(project_), module(module_)
-{
-	const XMLAttribute* att;
-
-	att = node.GetAttribute ( "name", true );
-	assert(att);
-	name = att->value;
-
-	att = node.GetAttribute ( "value", true );
-	assert(att);
-	value = att->value;
-}
-
-void
-Property::ProcessXML()
-{
-}
-
-
-PchFile::PchFile (
-	const XMLElement& node_,
-	const Module& module_,
-	const string& header_ )
-	: node(node_), module(module_), header(header_)
-{
-}
-
-void
-PchFile::ProcessXML()
-{
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+using std::vector;
+
+string
+FixSeparator ( const string& s )
+{
+	string s2(s);
+	char* p = strchr ( &s2[0], CBAD_SEP );
+	while ( p )
+	{
+		*p++ = CSEP;
+		p = strchr ( p, CBAD_SEP );
+	}
+	return s2;
+}
+
+string
+ReplaceExtension (
+	const string& filename,
+	const string& newExtension )
+{
+	size_t index = filename.find_last_of ( '/' );
+	if ( index == string::npos )
+		index = 0;
+	size_t index2 = filename.find_last_of ( '\\' );
+	if ( index2 != string::npos && index2 > index )
+		index = index2;
+	string tmp = filename.substr( index /*, filename.size() - index*/ );
+	size_t ext_index = tmp.find_last_of( '.' );
+	if ( ext_index != string::npos )
+		return filename.substr ( 0, index + ext_index ) + newExtension;
+	return filename + newExtension;
+}
+
+string
+GetSubPath (
+	const string& location,
+	const string& path,
+	const string& att_value )
+{
+	if ( !att_value.size() )
+		throw InvalidBuildFileException (
+			location,
+			"<directory> tag has empty 'name' attribute" );
+	if ( strpbrk ( att_value.c_str (), "/\\?*:<>|" ) )
+		throw InvalidBuildFileException (
+			location,
+			"<directory> tag has invalid characters in 'name' attribute" );
+	if ( !path.size() )
+		return att_value;
+	return FixSeparator(path + CSEP + att_value);
+}
+
+string
+GetExtension ( const string& filename )
+{
+	size_t index = filename.find_last_of ( '/' );
+	if (index == string::npos) index = 0;
+	string tmp = filename.substr( index, filename.size() - index );
+	size_t ext_index = tmp.find_last_of( '.' );
+	if (ext_index != string::npos) 
+		return filename.substr ( index + ext_index, filename.size() );
+	return "";
+}
+
+string
+GetDirectory ( const string& filename )
+{
+	size_t index = filename.find_last_of ( CSEP );
+	if ( index == string::npos )
+		return filename;
+	else
+		return filename.substr ( 0, index );
+}
+
+string
+NormalizeFilename ( const string& filename )
+{
+	Path path;
+	string normalizedPath = path.Fixup ( filename, true );
+	string relativeNormalizedPath = path.RelativeFromWorkingDirectory ( normalizedPath );
+	return FixSeparator ( relativeNormalizedPath );
+}
+
+IfableData::~IfableData()
+{
+	size_t i;
+	for ( i = 0; i < files.size(); i++ )
+		delete files[i];
+	for ( i = 0; i < includes.size(); i++ )
+		delete includes[i];
+	for ( i = 0; i < defines.size(); i++ )
+		delete defines[i];
+	for ( i = 0; i < libraries.size(); i++ )
+		delete libraries[i];
+	for ( i = 0; i < properties.size(); i++ )
+		delete properties[i];
+	for ( i = 0; i < ifs.size(); i++ )
+		delete ifs[i];
+}
+
+void IfableData::ProcessXML ()
+{
+	size_t i;
+	for ( i = 0; i < files.size (); i++ )
+		files[i]->ProcessXML ();
+	for ( i = 0; i < includes.size (); i++ )
+		includes[i]->ProcessXML ();
+	for ( i = 0; i < defines.size (); i++ )
+		defines[i]->ProcessXML ();
+	for ( i = 0; i < libraries.size (); i++ )
+		libraries[i]->ProcessXML ();
+	for ( i = 0; i < properties.size(); i++ )
+		properties[i]->ProcessXML ();
+	for ( i = 0; i < ifs.size (); i++ )
+		ifs[i]->ProcessXML ();
+}
+
+Module::Module ( const Project& project,
+                 const XMLElement& moduleNode,
+                 const string& modulePath )
+	: project (project),
+	  node (moduleNode),
+	  importLibrary (NULL),
+	  bootstrap (NULL),
+	  pch (NULL),
+	  cplusplus (false),
+	  host (HostDefault)
+{
+	if ( node.name != "module" )
+		throw InvalidOperationException ( __FILE__,
+		                                  __LINE__,
+		                                  "Module created with non-<module> node" );
+
+	xmlbuildFile = Path::RelativeFromWorkingDirectory ( moduleNode.xmlFile->filename() );
+
+	path = FixSeparator ( modulePath );
+
+	const XMLAttribute* att = moduleNode.GetAttribute ( "name", true );
+	assert(att);
+	name = att->value;
+
+	att = moduleNode.GetAttribute ( "type", true );
+	assert(att);
+	type = GetModuleType ( node.location, *att );
+
+	att = moduleNode.GetAttribute ( "extension", false );
+	if ( att != NULL )
+		extension = att->value;
+	else
+		extension = GetDefaultModuleExtension ();
+
+	att = moduleNode.GetAttribute ( "entrypoint", false );
+	if ( att != NULL )
+		entrypoint = att->value;
+	else
+		entrypoint = GetDefaultModuleEntrypoint ();
+
+	att = moduleNode.GetAttribute ( "baseaddress", false );
+	if ( att != NULL )
+		baseaddress = att->value;
+	else
+		baseaddress = GetDefaultModuleBaseaddress ();
+
+	att = moduleNode.GetAttribute ( "mangledsymbols", false );
+	if ( att != NULL )
+	{
+		const char* p = att->value.c_str();
+		if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) )
+			mangledSymbols = true;
+		else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) )
+			mangledSymbols = false;
+		else
+		{
+			throw InvalidAttributeValueException (
+				moduleNode.location,
+				"mangledsymbols",
+				att->value );
+		}
+	}
+	else
+		mangledSymbols = false;
+
+	att = moduleNode.GetAttribute ( "host", false );
+	if ( att != NULL )
+	{
+		const char* p = att->value.c_str();
+		if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) )
+			host = HostTrue;
+		else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) )
+			host = HostFalse;
+		else
+		{
+			throw InvalidAttributeValueException (
+				moduleNode.location,
+				"host",
+				att->value );
+		}
+	}
+
+	att = moduleNode.GetAttribute ( "prefix", false );
+	if ( att != NULL )
+		prefix = att->value;
+
+	att = moduleNode.GetAttribute ( "installbase", false );
+	if ( att != NULL )
+		installBase = att->value;
+	else
+		installBase = "";
+
+	att = moduleNode.GetAttribute ( "installname", false );
+	if ( att != NULL )
+		installName = att->value;
+	else
+		installName = "";
+	
+	att = moduleNode.GetAttribute ( "usewrc", false );
+	if ( att != NULL )
+		useWRC = att->value == "true";
+	else
+		useWRC = true;
+
+	att = moduleNode.GetAttribute ( "warnings", false );
+	if ( att != NULL )
+		enableWarnings = att->value == "true";
+	else
+		enableWarnings = false;
+}
+
+Module::~Module ()
+{
+	size_t i;
+	for ( i = 0; i < invocations.size(); i++ )
+		delete invocations[i];
+	for ( i = 0; i < dependencies.size(); i++ )
+		delete dependencies[i];
+	for ( i = 0; i < compilerFlags.size(); i++ )
+		delete compilerFlags[i];
+	for ( i = 0; i < linkerFlags.size(); i++ )
+		delete linkerFlags[i];
+	for ( i = 0; i < stubbedComponents.size(); i++ )
+		delete stubbedComponents[i];
+	if ( pch )
+		delete pch;
+}
+
+void
+Module::ProcessXML()
+{
+	size_t i;
+	for ( i = 0; i < node.subElements.size(); i++ )
+		ProcessXMLSubElement ( *node.subElements[i], path );
+	for ( i = 0; i < invocations.size(); i++ )
+		invocations[i]->ProcessXML ();
+	for ( i = 0; i < dependencies.size(); i++ )
+		dependencies[i]->ProcessXML ();
+	for ( i = 0; i < compilerFlags.size(); i++ )
+		compilerFlags[i]->ProcessXML();
+	for ( i = 0; i < linkerFlags.size(); i++ )
+		linkerFlags[i]->ProcessXML();
+	for ( i = 0; i < stubbedComponents.size(); i++ )
+		stubbedComponents[i]->ProcessXML();
+	non_if_data.ProcessXML();
+	if ( pch )
+		pch->ProcessXML();
+}
+
+void
+Module::ProcessXMLSubElement ( const XMLElement& e,
+                               const string& path,
+                               If* pIf /*= NULL*/ )
+{
+	bool subs_invalid = false;
+	string subpath ( path );
+	if ( e.name == "file" && e.value.size () > 0 )
+	{
+		bool first = false;
+		const XMLAttribute* att = e.GetAttribute ( "first", false );
+		if ( att != NULL )
+		{
+			if ( !stricmp ( att->value.c_str(), "true" ) )
+				first = true;
+			else if ( stricmp ( att->value.c_str(), "false" ) )
+				throw InvalidBuildFileException (
+					e.location,
+					"attribute 'first' of <file> element can only be 'true' or 'false'" );
+		}
+		string switches = "";
+		att = e.GetAttribute ( "switches", false );
+		if ( att != NULL )
+			switches = att->value;
+		if ( !cplusplus )
+		{
+			// check for c++ file
+			string ext = GetExtension ( e.value );
+			if ( !stricmp ( ext.c_str(), ".cpp" ) )
+				cplusplus = true;
+			else if ( !stricmp ( ext.c_str(), ".cc" ) )
+				cplusplus = true;
+			else if ( !stricmp ( ext.c_str(), ".cxx" ) )
+				cplusplus = true;
+		}
+		File* pFile = new File ( FixSeparator ( path + CSEP + e.value ),
+		                         first,
+		                         switches );
+		if ( pIf )
+			pIf->data.files.push_back ( pFile );
+		else
+			non_if_data.files.push_back ( pFile );
+		subs_invalid = true;
+	}
+	else if ( e.name == "library" && e.value.size () )
+	{
+		Library* pLibrary = new Library ( e, *this, e.value );
+		if ( pIf )
+			pIf->data.libraries.push_back ( pLibrary );
+		else
+			non_if_data.libraries.push_back ( pLibrary );
+		subs_invalid = true;
+	}
+	else if ( e.name == "directory" )
+	{
+		const XMLAttribute* att = e.GetAttribute ( "name", true );
+		assert(att);
+		subpath = GetSubPath ( e.location, path, att->value );
+	}
+	else if ( e.name == "include" )
+	{
+		Include* include = new Include ( project, this, e );
+		if ( pIf )
+			pIf->data.includes.push_back ( include );
+		else
+			non_if_data.includes.push_back ( include );
+		subs_invalid = true;
+	}
+	else if ( e.name == "define" )
+	{
+		Define* pDefine = new Define ( project, this, e );
+		if ( pIf )
+			pIf->data.defines.push_back ( pDefine );
+		else
+			non_if_data.defines.push_back ( pDefine );
+		subs_invalid = true;
+	}
+	else if ( e.name == "invoke" )
+	{
+		if ( pIf )
+			throw InvalidBuildFileException (
+				e.location,
+				"<invoke> is not a valid sub-element of <if>" );
+		invocations.push_back ( new Invoke ( e, *this ) );
+		subs_invalid = false;
+	}
+	else if ( e.name == "dependency" )
+	{
+		if ( pIf )
+			throw InvalidBuildFileException (
+				e.location,
+				"<dependency> is not a valid sub-element of <if>" );
+		dependencies.push_back ( new Dependency ( e, *this ) );
+		subs_invalid = true;
+	}
+	else if ( e.name == "importlibrary" )
+	{
+		if ( pIf )
+			throw InvalidBuildFileException (
+				e.location,
+				"<importlibrary> is not a valid sub-element of <if>" );
+		if ( importLibrary )
+			throw InvalidBuildFileException (
+				e.location,
+				"Only one <importlibrary> is valid per module" );
+		importLibrary = new ImportLibrary ( e, *this );
+		subs_invalid = true;
+	}
+	else if ( e.name == "if" )
+	{
+		If* pOldIf = pIf;
+		pIf = new If ( e, project, this );
+		if ( pOldIf )
+			pOldIf->data.ifs.push_back ( pIf );
+		else
+			non_if_data.ifs.push_back ( pIf );
+		subs_invalid = false;
+	}
+	else if ( e.name == "compilerflag" )
+	{
+		compilerFlags.push_back ( new CompilerFlag ( project, this, e ) );
+		subs_invalid = true;
+	}
+	else if ( e.name == "linkerflag" )
+	{
+		linkerFlags.push_back ( new LinkerFlag ( project, this, e ) );
+		subs_invalid = true;
+	}
+	else if ( e.name == "component" )
+	{
+		stubbedComponents.push_back ( new StubbedComponent ( this, e ) );
+		subs_invalid = false;
+	}
+	else if ( e.name == "property" )
+	{
+		throw InvalidBuildFileException (
+			e.location,
+			"<property> is not a valid sub-element of <module>" );
+	}
+	else if ( e.name == "bootstrap" )
+	{
+		bootstrap = new Bootstrap ( project, this, e );
+		subs_invalid = true;
+	}
+	else if ( e.name == "pch" )
+	{
+		if ( pIf )
+			throw InvalidBuildFileException (
+				e.location,
+				"<pch> is not a valid sub-element of <if>" );
+		if ( pch )
+			throw InvalidBuildFileException (
+				e.location,
+				"Only one <pch> is valid per module" );
+		pch = new PchFile (
+			e, *this, FixSeparator ( path + CSEP + e.value ) );
+		subs_invalid = true;
+	}
+	if ( subs_invalid && e.subElements.size() > 0 )
+		throw InvalidBuildFileException (
+			e.location,
+			"<%s> cannot have sub-elements",
+			e.name.c_str() );
+	for ( size_t i = 0; i < e.subElements.size (); i++ )
+		ProcessXMLSubElement ( *e.subElements[i], subpath, pIf );
+}
+
+ModuleType
+Module::GetModuleType ( const string& location, const XMLAttribute& attribute )
+{
+	if ( attribute.value == "buildtool" )
+		return BuildTool;
+	if ( attribute.value == "staticlibrary" )
+		return StaticLibrary;
+	if ( attribute.value == "objectlibrary" )
+		return ObjectLibrary;
+	if ( attribute.value == "kernel" )
+		return Kernel;
+	if ( attribute.value == "kernelmodedll" )
+		return KernelModeDLL;
+	if ( attribute.value == "kernelmodedriver" )
+		return KernelModeDriver;
+	if ( attribute.value == "nativedll" )
+		return NativeDLL;
+	if ( attribute.value == "nativecui" )
+		return NativeCUI;
+	if ( attribute.value == "win32dll" )
+		return Win32DLL;
+	if ( attribute.value == "win32cui" )
+		return Win32CUI;
+	if ( attribute.value == "win32gui" )
+		return Win32GUI;
+	if ( attribute.value == "bootloader" )
+		return BootLoader;
+	if ( attribute.value == "bootsector" )
+		return BootSector;
+	if ( attribute.value == "iso" )
+		return Iso;
+	if ( attribute.value == "liveiso" )
+		return LiveIso;
+	if ( attribute.value == "test" )
+		return Test;
+	if ( attribute.value == "rpcserver" )
+		return RpcServer;
+	if ( attribute.value == "rpcclient" )
+		return RpcClient;
+	throw InvalidAttributeValueException ( location,
+	                                       attribute.name,
+	                                       attribute.value );
+}
+
+string
+Module::GetDefaultModuleExtension () const
+{
+	switch (type)
+	{
+		case BuildTool:
+			return EXEPOSTFIX;
+		case StaticLibrary:
+			return ".a";
+		case ObjectLibrary:
+			return ".o";
+		case Kernel:
+		case NativeCUI:
+		case Win32CUI:
+		case Win32GUI:
+			return ".exe";
+		case KernelModeDLL:
+		case NativeDLL:
+		case Win32DLL:
+			return ".dll";
+		case KernelModeDriver:
+		case BootLoader:
+			return ".sys";
+		case BootSector:
+			return ".o";
+		case Iso:
+		case LiveIso:
+			return ".iso";
+		case Test:
+			return ".exe";
+		case RpcServer:
+			return ".o";
+		case RpcClient:
+			return ".o";
+	}
+	throw InvalidOperationException ( __FILE__,
+	                                  __LINE__ );
+}
+
+string
+Module::GetDefaultModuleEntrypoint () const
+{
+	switch (type)
+	{
+		case Kernel:
+			return "_NtProcessStartup";
+		case KernelModeDLL:
+			return "_DriverEntry@8";
+		case NativeDLL:
+			return "_DllMainCRTStartup@12";
+		case NativeCUI:
+			return "_NtProcessStartup@4";
+		case Win32DLL:
+			return "_DllMain@12";
+		case Win32CUI:
+		case Test:
+			return "_mainCRTStartup";
+		case Win32GUI:
+			return "_WinMainCRTStartup";
+		case KernelModeDriver:
+			return "_DriverEntry@8";
+		case BuildTool:
+		case StaticLibrary:
+		case ObjectLibrary:
+		case BootLoader:
+		case BootSector:
+		case Iso:
+		case LiveIso:
+		case RpcServer:
+		case RpcClient:
+			return "";
+	}
+	throw InvalidOperationException ( __FILE__,
+	                                  __LINE__ );
+}
+
+string
+Module::GetDefaultModuleBaseaddress () const
+{
+	switch (type)
+	{
+		case Kernel:
+			return "0xc0000000";
+		case KernelModeDLL:
+			return "0x10000";
+		case NativeDLL:
+			return "0x10000";
+		case NativeCUI:
+			return "0x10000";
+		case Win32DLL:
+			return "0x10000";
+		case Win32CUI:
+		case Test:
+			return "0x00400000";
+		case Win32GUI:
+			return "0x00400000";
+		case KernelModeDriver:
+			return "0x10000";
+		case BuildTool:
+		case StaticLibrary:
+		case ObjectLibrary:
+		case BootLoader:
+		case BootSector:
+		case Iso:
+		case LiveIso:
+		case RpcServer:
+		case RpcClient:
+			return "";
+	}
+	throw InvalidOperationException ( __FILE__,
+	                                  __LINE__ );
+}
+
+bool
+Module::HasImportLibrary () const
+{
+	return importLibrary != NULL;
+}
+
+string
+Module::GetTargetName () const
+{
+	return name + extension;
+}
+
+string
+Module::GetDependencyPath () const
+{
+	if ( HasImportLibrary () )
+	{
+		return ReplaceExtension ( GetPath(), ".a" );
+	}
+	else
+		return GetPath();
+}
+
+string
+Module::GetBasePath () const
+{
+	return path;
+}
+
+string
+Module::GetPath () const
+{
+	if ( path.length() > 0 )
+		return path + CSEP + GetTargetName ();
+	else
+		return GetTargetName ();
+}
+
+string
+Module::GetPathWithPrefix ( const string& prefix ) const
+{
+	return path + CSEP + prefix + GetTargetName ();
+}
+
+string
+Module::GetInvocationTarget ( const int index ) const
+{
+	return ssprintf ( "%s_invoke_%d",
+	                  name.c_str (),
+	                  index );
+}
+
+bool
+Module::HasFileWithExtension (
+	const IfableData& data,
+	const std::string& extension ) const
+{
+	size_t i;
+	for ( i = 0; i < data.files.size (); i++ )
+	{
+		File& file = *data.files[i];
+		string file_ext = GetExtension ( file.name );
+		if ( !stricmp ( file_ext.c_str (), extension.c_str () ) )
+			return true;
+	}
+	for ( i = 0; i < data.ifs.size (); i++ )
+	{
+		if ( HasFileWithExtension ( data.ifs[i]->data, extension ) )
+			return true;
+	}
+	return false;
+}
+
+void
+Module::InvokeModule () const
+{
+	for ( size_t i = 0; i < invocations.size (); i++ )
+	{
+		Invoke& invoke = *invocations[i];
+		string command = invoke.invokeModule->GetPath () + " " + invoke.GetParameters ();
+		printf ( "Executing '%s'\n\n", command.c_str () );
+		int exitcode = system ( command.c_str () );
+		if ( exitcode != 0 )
+			throw InvocationFailedException ( command,
+			                                  exitcode );
+	}
+}
+
+
+File::File ( const string& _name, bool _first,
+	       std::string _switches )
+	: name(_name),
+	  first(_first),
+	  switches(_switches)
+{
+}
+
+void
+File::ProcessXML()
+{
+}
+
+
+Library::Library ( const XMLElement& _node,
+                   const Module& _module,
+                   const string& _name )
+	: node(_node),
+	  module(_module),
+	  name(_name),
+	  imported_module(_module.project.LocateModule(_name))
+{
+	if ( module.name == name )
+		throw InvalidBuildFileException (
+			node.location,
+			"module '%s' cannot link against itself",
+			name.c_str() );
+	if ( !imported_module )
+		throw InvalidBuildFileException (
+			node.location,
+			"module '%s' trying to import non-existant module '%s'",
+			module.name.c_str(),
+			name.c_str() );
+}
+
+void
+Library::ProcessXML()
+{
+	if ( !module.project.LocateModule ( name ) )
+		throw InvalidBuildFileException (
+			node.location,
+			"module '%s' is trying to link against non-existant module '%s'",
+			module.name.c_str(),
+			name.c_str() );
+}
+
+
+Invoke::Invoke ( const XMLElement& _node,
+                 const Module& _module )
+	: node (_node),
+	  module (_module)
+{
+}
+
+void
+Invoke::ProcessXML()
+{
+	const XMLAttribute* att = node.GetAttribute ( "module", false );
+	if (att == NULL)
+		invokeModule = &module;
+	else
+	{
+		invokeModule = module.project.LocateModule ( att->value );
+		if ( invokeModule == NULL )
+			throw InvalidBuildFileException (
+				node.location,
+				"module '%s' is trying to invoke non-existant module '%s'",
+				module.name.c_str(),
+				att->value.c_str() );
+	}
+
+	for ( size_t i = 0; i < node.subElements.size (); i++ )
+		ProcessXMLSubElement ( *node.subElements[i] );
+}
+
+void
+Invoke::ProcessXMLSubElement ( const XMLElement& e )
+{
+	bool subs_invalid = false;
+	if ( e.name == "input" )
+	{
+		for ( size_t i = 0; i < e.subElements.size (); i++ )
+			ProcessXMLSubElementInput ( *e.subElements[i] );
+	}
+	else if ( e.name == "output" )
+	{
+		for ( size_t i = 0; i < e.subElements.size (); i++ )
+			ProcessXMLSubElementOutput ( *e.subElements[i] );
+	}
+	if ( subs_invalid && e.subElements.size() > 0 )
+		throw InvalidBuildFileException ( e.location,
+		                                  "<%s> cannot have sub-elements",
+		                                  e.name.c_str() );
+}
+
+void
+Invoke::ProcessXMLSubElementInput ( const XMLElement& e )
+{
+	bool subs_invalid = false;
+	if ( e.name == "inputfile" && e.value.size () > 0 )
+	{
+		input.push_back ( new InvokeFile ( e, FixSeparator ( module.path + CSEP + e.value ) ) );
+		subs_invalid = true;
+	}
+	if ( subs_invalid && e.subElements.size() > 0 )
+		throw InvalidBuildFileException ( e.location,
+		                                  "<%s> cannot have sub-elements",
+		                                  e.name.c_str() );
+}
+
+void
+Invoke::ProcessXMLSubElementOutput ( const XMLElement& e )
+{
+	bool subs_invalid = false;
+	if ( e.name == "outputfile" && e.value.size () > 0 )
+	{
+		output.push_back ( new InvokeFile ( e, FixSeparator ( module.path + CSEP + e.value ) ) );
+		subs_invalid = true;
+	}
+	if ( subs_invalid && e.subElements.size() > 0 )
+		throw InvalidBuildFileException (
+			e.location,
+			"<%s> cannot have sub-elements",
+			e.name.c_str() );
+}
+
+void
+Invoke::GetTargets ( string_list& targets ) const
+{
+	for ( size_t i = 0; i < output.size (); i++ )
+	{
+		InvokeFile& file = *output[i];
+		targets.push_back ( NormalizeFilename ( file.name ) );
+	}
+}
+
+string
+Invoke::GetParameters () const
+{
+	string parameters ( "" );
+	size_t i;
+	for ( i = 0; i < output.size (); i++ )
+	{
+		if ( parameters.length () > 0)
+			parameters += " ";
+		InvokeFile& invokeFile = *output[i];
+		if ( invokeFile.switches.length () > 0 )
+		{
+			parameters += invokeFile.switches + " ";
+		}
+		parameters += invokeFile.name;
+	}
+
+	for ( i = 0; i < input.size (); i++ )
+	{
+		if ( parameters.length () > 0 )
+			parameters += " ";
+		InvokeFile& invokeFile = *input[i];
+		if ( invokeFile.switches.length () > 0 )
+		{
+			parameters += invokeFile.switches;
+			parameters += " ";
+		}
+		parameters += invokeFile.name ;
+	}
+
+	return parameters;
+}
+
+
+InvokeFile::InvokeFile ( const XMLElement& _node,
+                         const string& _name )
+	: node (_node),
+      name (_name)
+{
+	const XMLAttribute* att = _node.GetAttribute ( "switches", false );
+	if (att != NULL)
+		switches = att->value;
+	else
+		switches = "";
+}
+
+void
+InvokeFile::ProcessXML()
+{
+}
+
+
+Dependency::Dependency ( const XMLElement& _node,
+                         const Module& _module )
+	: node (_node),
+	  module (_module),
+	  dependencyModule (NULL)
+{
+}
+
+void
+Dependency::ProcessXML()
+{
+	dependencyModule = module.project.LocateModule ( node.value );
+	if ( dependencyModule == NULL )
+		throw InvalidBuildFileException ( node.location,
+		                                  "module '%s' depend on non-existant module '%s'",
+		                                  module.name.c_str(),
+		                                  node.value.c_str() );
+}
+
+
+ImportLibrary::ImportLibrary ( const XMLElement& _node,
+                               const Module& _module )
+	: node (_node),
+	  module (_module)
+{
+	const XMLAttribute* att = _node.GetAttribute ( "basename", false );
+	if (att != NULL)
+		basename = att->value;
+	else
+		basename = module.name;
+
+	att = _node.GetAttribute ( "definition", true );
+	assert (att);
+	definition = FixSeparator(att->value);
+}
+
+
+If::If ( const XMLElement& node_,
+         const Project& project_,
+         const Module* module_ )
+	: node(node_), project(project_), module(module_)
+{
+	const XMLAttribute* att;
+
+	att = node.GetAttribute ( "property", true );
+	assert(att);
+	property = att->value;
+
+	att = node.GetAttribute ( "value", true );
+	assert(att);
+	value = att->value;
+}
+
+If::~If ()
+{
+}
+
+void
+If::ProcessXML()
+{
+}
+
+
+Property::Property ( const XMLElement& node_,
+                     const Project& project_,
+                     const Module* module_ )
+	: node(node_), project(project_), module(module_)
+{
+	const XMLAttribute* att;
+
+	att = node.GetAttribute ( "name", true );
+	assert(att);
+	name = att->value;
+
+	att = node.GetAttribute ( "value", true );
+	assert(att);
+	value = att->value;
+}
+
+void
+Property::ProcessXML()
+{
+}
+
+
+PchFile::PchFile (
+	const XMLElement& node_,
+	const Module& module_,
+	const string& header_ )
+	: node(node_), module(module_), header(header_)
+{
+}
+
+void
+PchFile::ProcessXML()
+{
+}
diff --git a/reactos/tools/rbuild/pch.h b/reactos/tools/rbuild/pch.h
index f2e25d429b2..62a8cc3adc9 100644
--- a/reactos/tools/rbuild/pch.h
+++ b/reactos/tools/rbuild/pch.h
@@ -1,36 +1,36 @@
-// pre-compiled header stuff
-
-#ifndef PCH_H
-#define PCH_H
-
-#ifdef _MSC_VER
-#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information
-#endif//_MSC_VER
-
-#include <string>
-#include <vector>
-#include <map>
-#include <set>
-
-#include <stdarg.h>
-
-#ifdef _MSC_VER
-#define MAX_PATH _MAX_PATH
-#endif
-
-#ifndef WIN32
-#include <string.h>
-#include <ctype.h>
-#include <wctype.h>
-#include <math.h>
-
-inline char* strlwr ( char* str )
-{
-  char* p = str;
-  while ( *p )
-    *p++ = tolower(*p);
-  return str;
-}
+// pre-compiled header stuff
+
+#ifndef PCH_H
+#define PCH_H
+
+#ifdef _MSC_VER
+#pragma warning ( disable : 4786 ) // identifier was truncated to '255' characters in the debug information
+#endif//_MSC_VER
+
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+
+#include <stdarg.h>
+
+#ifdef _MSC_VER
+#define MAX_PATH _MAX_PATH
+#endif
+
+#ifndef WIN32
+#include <string.h>
+#include <ctype.h>
+#include <wctype.h>
+#include <math.h>
+
+inline char* strlwr ( char* str )
+{
+  char* p = str;
+  while ( *p )
+    *p++ = tolower(*p);
+  return str;
+}
 
 inline char* strupr ( char* str )
 {
@@ -40,11 +40,11 @@ inline char* strupr ( char* str )
   return c;
 }
 
-#define _finite __finite
-#define _isnan __isnan
-#define stricmp strcasecmp
-#define MAX_PATH PATH_MAX 
-#define _MAX_PATH PATH_MAX
-#endif
-
-#endif//PCH_H
+#define _finite __finite
+#define _isnan __isnan
+#define stricmp strcasecmp
+#define MAX_PATH PATH_MAX 
+#define _MAX_PATH PATH_MAX
+#endif
+
+#endif//PCH_H
diff --git a/reactos/tools/rbuild/project.cpp b/reactos/tools/rbuild/project.cpp
index c10da9fa2ad..f41c7a0be00 100644
--- a/reactos/tools/rbuild/project.cpp
+++ b/reactos/tools/rbuild/project.cpp
@@ -1,350 +1,350 @@
-
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-using std::vector;
-
-Project::Project ( const string& filename )
-	: xmlfile (filename),
-	  node (NULL),
-	  head (NULL)
-{
-	ReadXml();
-}
-
-Project::~Project ()
-{
-	size_t i;
-	for ( i = 0; i < modules.size (); i++ )
-		delete modules[i];
-	for ( i = 0; i < linkerFlags.size (); i++ )
-		delete linkerFlags[i];
-	for ( i = 0; i < cdfiles.size (); i++ )
-		delete cdfiles[i];
-	for ( i = 0; i < installfiles.size (); i++ )
-		delete installfiles[i];
-	delete head;
-}
-
-const Property*
-Project::LookupProperty ( const string& name ) const
-{
-	for ( size_t i = 0; i < non_if_data.properties.size (); i++ )
-	{
-		const Property* property = non_if_data.properties[i];
-		if ( property->name == name )
-			return property;
-	}
-	return NULL;
-}
-
-void
-Project::WriteIfChanged ( char* outbuf,
-	                      string filename )
-{
-	FILE* out;
-	unsigned int end;
-	char* cmpbuf;
-	unsigned int stat;
-	
-	out = fopen ( filename.c_str (), "rb" );
-	if ( out == NULL )
-	{
-		out = fopen ( filename.c_str (), "wb" );
-		if ( out == NULL )
-			throw AccessDeniedException ( filename );
-		fputs ( outbuf, out );
-		fclose ( out );
-		return;
-	}
-	
-	fseek ( out, 0, SEEK_END );
-	end = ftell ( out );
-	cmpbuf = (char*) malloc ( end );
-	if ( cmpbuf == NULL )
-	{
-		fclose ( out );
-		throw OutOfMemoryException ();
-	}
-	
-	fseek ( out, 0, SEEK_SET );
-	stat = fread ( cmpbuf, 1, end, out );
-	if ( stat != end )
-	{
-		free ( cmpbuf );
-		fclose ( out );
-		throw AccessDeniedException ( filename );
-	}
-	if ( end == strlen ( outbuf ) && memcmp ( cmpbuf, outbuf, end ) == 0 )
-	{
-		free ( cmpbuf );
-		fclose ( out );
-		return;
-	}
-	
-	free ( cmpbuf );
-	fclose ( out );
-	out = fopen ( filename.c_str (), "wb" );
-	if ( out == NULL )
-	{
-		throw AccessDeniedException ( filename );
-	}
-	
-	stat = fwrite ( outbuf, 1, strlen ( outbuf ), out);
-	if ( strlen ( outbuf ) != stat )
-	{
-		fclose ( out );
-		throw AccessDeniedException ( filename );
-	}
-
-	fclose ( out );
-}
-
-void
-Project::SetConfigurationOption ( char* s,
-	                              string name,
-	                              string* alternativeName )
-{
-	const Property* property = LookupProperty ( name );
-	if ( property != NULL && property->value.length () > 0 )
-	{
-		s = s + sprintf ( s,
-		                  "#define %s=%s\n",
-		                  property->name.c_str (),
-		                  property->value.c_str () );
-	}
-	else if ( property != NULL )
-	{
-		s = s + sprintf ( s,
-		                  "#define %s\n",
-		                  property->name.c_str () );
-	}
-	else if ( alternativeName != NULL )
-	{
-		s = s + sprintf ( s,
-		                  "#define %s\n",
-		                  alternativeName->c_str () );
-	}
-}
-
-void
-Project::SetConfigurationOption ( char* s,
-	                              string name )
-{
-	SetConfigurationOption ( s, name, NULL );
-}
-
-void
-Project::WriteConfigurationFile ()
-{
-	char* buf;
-	char* s;
-
-	buf = (char*) malloc ( 10*1024 );
-	if ( buf == NULL )
-		throw OutOfMemoryException ();
-	
-	s = buf;
-	s = s + sprintf ( s, "/* Automatically generated. " );
-	s = s + sprintf ( s, "Edit config.xml to change configuration */\n" );
-	s = s + sprintf ( s, "#ifndef __INCLUDE_CONFIG_H\n" );
-	s = s + sprintf ( s, "#define __INCLUDE_CONFIG_H\n" );
-
-	SetConfigurationOption ( s, "ARCH" );
-	SetConfigurationOption ( s, "OPTIMIZED" );
-	SetConfigurationOption ( s, "MP", new string ( "UP" ) );
-	SetConfigurationOption ( s, "ACPI" );
-	SetConfigurationOption ( s, "_3GB" );
-
-	s = s + sprintf ( s, "#endif /* __INCLUDE_CONFIG_H */\n" );
-
-	WriteIfChanged ( buf, "include" SSEP "roscfg.h" );
-
-	free ( buf );
-}
-
-void
-Project::ExecuteInvocations ()
-{
-	for ( size_t i = 0; i < modules.size (); i++ )
-		modules[i]->InvokeModule ();
-}
-
-void
-Project::ReadXml ()
-{
-	Path path;
-	head = XMLLoadFile ( xmlfile, path, xmlbuildfiles );
-	node = NULL;
-	for ( size_t i = 0; i < head->subElements.size (); i++ )
-	{
-		if ( head->subElements[i]->name == "project" )
-		{
-			node = head->subElements[i];
-			string path;
-			this->ProcessXML ( path );
-			return;
-		}
-	}
-
-	throw InvalidBuildFileException (
-		node->location,
-		"Document contains no 'project' tag." );
-}
-
-void
-Project::ProcessXML ( const string& path )
-{
-	const XMLAttribute *att;
-	if ( node->name != "project" )
-		throw Exception ( "internal tool error: Project::ProcessXML() called with non-<project> node" );
-
-	att = node->GetAttribute ( "name", false );
-	if ( !att )
-		name = "Unnamed";
-	else
-		name = att->value;
-
-	att = node->GetAttribute ( "makefile", true );
-	assert(att);
-	makefile = att->value;
-
-	size_t i;
-	for ( i = 0; i < node->subElements.size (); i++ )
-		ProcessXMLSubElement ( *node->subElements[i], path );
-	for ( i = 0; i < modules.size (); i++ )
-		modules[i]->ProcessXML ();
-	for ( i = 0; i < linkerFlags.size (); i++ )
-		linkerFlags[i]->ProcessXML ();
-	non_if_data.ProcessXML ();
-	for ( i = 0; i < cdfiles.size (); i++ )
-		cdfiles[i]->ProcessXML ();
-	for ( i = 0; i < installfiles.size (); i++ )
-		installfiles[i]->ProcessXML ();
-}
-
-void
-Project::ProcessXMLSubElement ( const XMLElement& e,
-                                const string& path,
-                                If* pIf )
-{
-	bool subs_invalid = false;
-	string subpath(path);
-	if ( e.name == "module" )
-	{
-		if ( pIf )
-			throw InvalidBuildFileException (
-				e.location,
-				"<module> is not a valid sub-element of <if>" );
-		Module* module = new Module ( *this, e, path );
-		if ( LocateModule ( module->name ) )
-			throw InvalidBuildFileException (
-				node->location,
-				"module name conflict: '%s' (originally defined at %s)",
-				module->name.c_str(),
-				module->node.location.c_str() );
-		modules.push_back ( module );
-		return; // defer processing until later
-	}
-	else if ( e.name == "cdfile" )
-	{
-		CDFile* cdfile = new CDFile ( *this, e, path );
-		cdfiles.push_back ( cdfile );
-		subs_invalid = true;
-	}
-	else if ( e.name == "installfile" )
-	{
-		InstallFile* installfile = new InstallFile ( *this, e, path );
-		installfiles.push_back ( installfile );
-		subs_invalid = true;
-	}
-	else if ( e.name == "directory" )
-	{
-		const XMLAttribute* att = e.GetAttribute ( "name", true );
-		assert(att);
-		subpath = GetSubPath ( e.location, path, att->value );
-	}
-	else if ( e.name == "include" )
-	{
-		Include* include = new Include ( *this, e );
-		if ( pIf )
-			pIf->data.includes.push_back ( include );
-		else
-			non_if_data.includes.push_back ( include );
-		subs_invalid = true;
-	}
-	else if ( e.name == "define" )
-	{
-		Define* define = new Define ( *this, e );
-		if ( pIf )
-			pIf->data.defines.push_back ( define );
-		else
-			non_if_data.defines.push_back ( define );
-		subs_invalid = true;
-	}
-	else if ( e.name == "linkerflag" )
-	{
-		linkerFlags.push_back ( new LinkerFlag ( *this, e ) );
-		subs_invalid = true;
-	}
-	else if ( e.name == "if" )
-	{
-		If* pOldIf = pIf;
-		pIf = new If ( e, *this, NULL );
-		if ( pOldIf )
-			pOldIf->data.ifs.push_back ( pIf );
-		else
-			non_if_data.ifs.push_back ( pIf );
-		subs_invalid = false;
-	}
-	else if ( e.name == "property" )
-	{
-		Property* property = new Property ( e, *this, NULL );
-		if ( pIf )
-			pIf->data.properties.push_back ( property );
-		else
-			non_if_data.properties.push_back ( property );
-	}
-	if ( subs_invalid && e.subElements.size() )
-		throw InvalidBuildFileException (
-			e.location,
-			"<%s> cannot have sub-elements",
-			e.name.c_str() );
-	for ( size_t i = 0; i < e.subElements.size (); i++ )
-		ProcessXMLSubElement ( *e.subElements[i], subpath, pIf );
-}
-
-Module*
-Project::LocateModule ( const string& name )
-{
-	for ( size_t i = 0; i < modules.size (); i++ )
-	{
-		if (modules[i]->name == name)
-			return modules[i];
-	}
-
-	return NULL;
-}
-
-const Module*
-Project::LocateModule ( const string& name ) const
-{
-	for ( size_t i = 0; i < modules.size (); i++ )
-	{
-		if ( modules[i]->name == name )
-			return modules[i];
-	}
-
-	return NULL;
-}
-
-std::string
-Project::GetProjectFilename () const
-{
-	return xmlfile;
-}
-
-	
+
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+using std::vector;
+
+Project::Project ( const string& filename )
+	: xmlfile (filename),
+	  node (NULL),
+	  head (NULL)
+{
+	ReadXml();
+}
+
+Project::~Project ()
+{
+	size_t i;
+	for ( i = 0; i < modules.size (); i++ )
+		delete modules[i];
+	for ( i = 0; i < linkerFlags.size (); i++ )
+		delete linkerFlags[i];
+	for ( i = 0; i < cdfiles.size (); i++ )
+		delete cdfiles[i];
+	for ( i = 0; i < installfiles.size (); i++ )
+		delete installfiles[i];
+	delete head;
+}
+
+const Property*
+Project::LookupProperty ( const string& name ) const
+{
+	for ( size_t i = 0; i < non_if_data.properties.size (); i++ )
+	{
+		const Property* property = non_if_data.properties[i];
+		if ( property->name == name )
+			return property;
+	}
+	return NULL;
+}
+
+void
+Project::WriteIfChanged ( char* outbuf,
+	                      string filename )
+{
+	FILE* out;
+	unsigned int end;
+	char* cmpbuf;
+	unsigned int stat;
+	
+	out = fopen ( filename.c_str (), "rb" );
+	if ( out == NULL )
+	{
+		out = fopen ( filename.c_str (), "wb" );
+		if ( out == NULL )
+			throw AccessDeniedException ( filename );
+		fputs ( outbuf, out );
+		fclose ( out );
+		return;
+	}
+	
+	fseek ( out, 0, SEEK_END );
+	end = ftell ( out );
+	cmpbuf = (char*) malloc ( end );
+	if ( cmpbuf == NULL )
+	{
+		fclose ( out );
+		throw OutOfMemoryException ();
+	}
+	
+	fseek ( out, 0, SEEK_SET );
+	stat = fread ( cmpbuf, 1, end, out );
+	if ( stat != end )
+	{
+		free ( cmpbuf );
+		fclose ( out );
+		throw AccessDeniedException ( filename );
+	}
+	if ( end == strlen ( outbuf ) && memcmp ( cmpbuf, outbuf, end ) == 0 )
+	{
+		free ( cmpbuf );
+		fclose ( out );
+		return;
+	}
+	
+	free ( cmpbuf );
+	fclose ( out );
+	out = fopen ( filename.c_str (), "wb" );
+	if ( out == NULL )
+	{
+		throw AccessDeniedException ( filename );
+	}
+	
+	stat = fwrite ( outbuf, 1, strlen ( outbuf ), out);
+	if ( strlen ( outbuf ) != stat )
+	{
+		fclose ( out );
+		throw AccessDeniedException ( filename );
+	}
+
+	fclose ( out );
+}
+
+void
+Project::SetConfigurationOption ( char* s,
+	                              string name,
+	                              string* alternativeName )
+{
+	const Property* property = LookupProperty ( name );
+	if ( property != NULL && property->value.length () > 0 )
+	{
+		s = s + sprintf ( s,
+		                  "#define %s=%s\n",
+		                  property->name.c_str (),
+		                  property->value.c_str () );
+	}
+	else if ( property != NULL )
+	{
+		s = s + sprintf ( s,
+		                  "#define %s\n",
+		                  property->name.c_str () );
+	}
+	else if ( alternativeName != NULL )
+	{
+		s = s + sprintf ( s,
+		                  "#define %s\n",
+		                  alternativeName->c_str () );
+	}
+}
+
+void
+Project::SetConfigurationOption ( char* s,
+	                              string name )
+{
+	SetConfigurationOption ( s, name, NULL );
+}
+
+void
+Project::WriteConfigurationFile ()
+{
+	char* buf;
+	char* s;
+
+	buf = (char*) malloc ( 10*1024 );
+	if ( buf == NULL )
+		throw OutOfMemoryException ();
+	
+	s = buf;
+	s = s + sprintf ( s, "/* Automatically generated. " );
+	s = s + sprintf ( s, "Edit config.xml to change configuration */\n" );
+	s = s + sprintf ( s, "#ifndef __INCLUDE_CONFIG_H\n" );
+	s = s + sprintf ( s, "#define __INCLUDE_CONFIG_H\n" );
+
+	SetConfigurationOption ( s, "ARCH" );
+	SetConfigurationOption ( s, "OPTIMIZED" );
+	SetConfigurationOption ( s, "MP", new string ( "UP" ) );
+	SetConfigurationOption ( s, "ACPI" );
+	SetConfigurationOption ( s, "_3GB" );
+
+	s = s + sprintf ( s, "#endif /* __INCLUDE_CONFIG_H */\n" );
+
+	WriteIfChanged ( buf, "include" SSEP "roscfg.h" );
+
+	free ( buf );
+}
+
+void
+Project::ExecuteInvocations ()
+{
+	for ( size_t i = 0; i < modules.size (); i++ )
+		modules[i]->InvokeModule ();
+}
+
+void
+Project::ReadXml ()
+{
+	Path path;
+	head = XMLLoadFile ( xmlfile, path, xmlbuildfiles );
+	node = NULL;
+	for ( size_t i = 0; i < head->subElements.size (); i++ )
+	{
+		if ( head->subElements[i]->name == "project" )
+		{
+			node = head->subElements[i];
+			string path;
+			this->ProcessXML ( path );
+			return;
+		}
+	}
+
+	throw InvalidBuildFileException (
+		node->location,
+		"Document contains no 'project' tag." );
+}
+
+void
+Project::ProcessXML ( const string& path )
+{
+	const XMLAttribute *att;
+	if ( node->name != "project" )
+		throw Exception ( "internal tool error: Project::ProcessXML() called with non-<project> node" );
+
+	att = node->GetAttribute ( "name", false );
+	if ( !att )
+		name = "Unnamed";
+	else
+		name = att->value;
+
+	att = node->GetAttribute ( "makefile", true );
+	assert(att);
+	makefile = att->value;
+
+	size_t i;
+	for ( i = 0; i < node->subElements.size (); i++ )
+		ProcessXMLSubElement ( *node->subElements[i], path );
+	for ( i = 0; i < modules.size (); i++ )
+		modules[i]->ProcessXML ();
+	for ( i = 0; i < linkerFlags.size (); i++ )
+		linkerFlags[i]->ProcessXML ();
+	non_if_data.ProcessXML ();
+	for ( i = 0; i < cdfiles.size (); i++ )
+		cdfiles[i]->ProcessXML ();
+	for ( i = 0; i < installfiles.size (); i++ )
+		installfiles[i]->ProcessXML ();
+}
+
+void
+Project::ProcessXMLSubElement ( const XMLElement& e,
+                                const string& path,
+                                If* pIf )
+{
+	bool subs_invalid = false;
+	string subpath(path);
+	if ( e.name == "module" )
+	{
+		if ( pIf )
+			throw InvalidBuildFileException (
+				e.location,
+				"<module> is not a valid sub-element of <if>" );
+		Module* module = new Module ( *this, e, path );
+		if ( LocateModule ( module->name ) )
+			throw InvalidBuildFileException (
+				node->location,
+				"module name conflict: '%s' (originally defined at %s)",
+				module->name.c_str(),
+				module->node.location.c_str() );
+		modules.push_back ( module );
+		return; // defer processing until later
+	}
+	else if ( e.name == "cdfile" )
+	{
+		CDFile* cdfile = new CDFile ( *this, e, path );
+		cdfiles.push_back ( cdfile );
+		subs_invalid = true;
+	}
+	else if ( e.name == "installfile" )
+	{
+		InstallFile* installfile = new InstallFile ( *this, e, path );
+		installfiles.push_back ( installfile );
+		subs_invalid = true;
+	}
+	else if ( e.name == "directory" )
+	{
+		const XMLAttribute* att = e.GetAttribute ( "name", true );
+		assert(att);
+		subpath = GetSubPath ( e.location, path, att->value );
+	}
+	else if ( e.name == "include" )
+	{
+		Include* include = new Include ( *this, e );
+		if ( pIf )
+			pIf->data.includes.push_back ( include );
+		else
+			non_if_data.includes.push_back ( include );
+		subs_invalid = true;
+	}
+	else if ( e.name == "define" )
+	{
+		Define* define = new Define ( *this, e );
+		if ( pIf )
+			pIf->data.defines.push_back ( define );
+		else
+			non_if_data.defines.push_back ( define );
+		subs_invalid = true;
+	}
+	else if ( e.name == "linkerflag" )
+	{
+		linkerFlags.push_back ( new LinkerFlag ( *this, e ) );
+		subs_invalid = true;
+	}
+	else if ( e.name == "if" )
+	{
+		If* pOldIf = pIf;
+		pIf = new If ( e, *this, NULL );
+		if ( pOldIf )
+			pOldIf->data.ifs.push_back ( pIf );
+		else
+			non_if_data.ifs.push_back ( pIf );
+		subs_invalid = false;
+	}
+	else if ( e.name == "property" )
+	{
+		Property* property = new Property ( e, *this, NULL );
+		if ( pIf )
+			pIf->data.properties.push_back ( property );
+		else
+			non_if_data.properties.push_back ( property );
+	}
+	if ( subs_invalid && e.subElements.size() )
+		throw InvalidBuildFileException (
+			e.location,
+			"<%s> cannot have sub-elements",
+			e.name.c_str() );
+	for ( size_t i = 0; i < e.subElements.size (); i++ )
+		ProcessXMLSubElement ( *e.subElements[i], subpath, pIf );
+}
+
+Module*
+Project::LocateModule ( const string& name )
+{
+	for ( size_t i = 0; i < modules.size (); i++ )
+	{
+		if (modules[i]->name == name)
+			return modules[i];
+	}
+
+	return NULL;
+}
+
+const Module*
+Project::LocateModule ( const string& name ) const
+{
+	for ( size_t i = 0; i < modules.size (); i++ )
+	{
+		if ( modules[i]->name == name )
+			return modules[i];
+	}
+
+	return NULL;
+}
+
+std::string
+Project::GetProjectFilename () const
+{
+	return xmlfile;
+}
+
+	
diff --git a/reactos/tools/rbuild/rbuild.cpp b/reactos/tools/rbuild/rbuild.cpp
index c18b27273cc..eefcf144ebe 100644
--- a/reactos/tools/rbuild/rbuild.cpp
+++ b/reactos/tools/rbuild/rbuild.cpp
@@ -1,107 +1,107 @@
-// rbuild.cpp
-
-#include "pch.h"
-#include <typeinfo>
-
-#include <stdio.h>
-#ifdef WIN32
-#include <io.h>
-#endif
-#include <assert.h>
-
-#include "rbuild.h"
-#include "backend/backend.h"
-#include "backend/mingw/mingw.h"
-
-using std::string;
-using std::vector;
-
-static string BuildSystem;
-static string RootXmlFile = "ReactOS.xml";
-static bool Verbose = false;
-static bool CleanAsYouGo = false;
-
-bool
-ParseSwitch ( int argc, char** argv, int index )
-{
-	char switchChar = argv[index][1];
-	switch ( switchChar )
-	{
-		case 'v':
-			Verbose = true;
-			break;
-		case 'c':
-			CleanAsYouGo = true;
-			break;
-		case 'r':
-			RootXmlFile = string(&argv[index][2]);
-			break;
-		default:
-			printf ( "Unknown switch -%c",
-			         switchChar );
-			return false;
-	}
-	return true;
-}
-
-bool
-ParseArguments ( int argc, char** argv )
-{
-	if ( argc < 2 )
-		return false;
-	
-	for ( int i = 1; i < argc; i++ )
-	{
-		if ( argv[i][0] == '-' )
-		{
-			if ( !ParseSwitch ( argc, argv, i ) )
-				return false;
-		}
-		else
-			BuildSystem = argv[i];
-	}
-	
-	return true;
-}
-
-int
-main ( int argc, char** argv )
-{
-	if ( !ParseArguments ( argc, argv ) )
-	{
-		printf ( "Generates project files for buildsystems\n\n" );
-		printf ( "  rbuild [-v] [-rfile.xml] buildsystem\n\n" );
-		printf ( "Switches:\n" );
-		printf ( "  -v           Be verbose\n" );
-		printf ( "  -c           Clean as you go. Delete generated files as soon as they are not needed anymore\n" );
-		printf ( "  -rfile.xml   Name of the root xml file. Default is ReactOS.xml\n" );
-		printf ( "\n" );
-		printf ( "  buildsystem  Target build system. Can be one of:\n" );
-		printf ( "                 mingw   MinGW\n" );
-		printf ( "                 devcpp  DevC++\n" );
-		return 1;
-	}
-	try
-	{
-		string projectFilename ( RootXmlFile );
-		printf ( "Reading build files..." );
-		Project project ( projectFilename );
-		printf ( "done\n" );
-		project.WriteConfigurationFile ();
-		project.ExecuteInvocations ();
-		Backend* backend = Backend::Factory::Create ( BuildSystem,
-		                                              project,
-		                                              Verbose,
-		                                              CleanAsYouGo );
-		backend->Process ();
-		delete backend;
-
-		return 0;
-	}
-	catch (Exception& ex)
-	{
-		printf ( "%s\n",
-		         ex.Message.c_str () );
-		return 1;
-	}
-}
+// rbuild.cpp
+
+#include "pch.h"
+#include <typeinfo>
+
+#include <stdio.h>
+#ifdef WIN32
+#include <io.h>
+#endif
+#include <assert.h>
+
+#include "rbuild.h"
+#include "backend/backend.h"
+#include "backend/mingw/mingw.h"
+
+using std::string;
+using std::vector;
+
+static string BuildSystem;
+static string RootXmlFile = "ReactOS.xml";
+static bool Verbose = false;
+static bool CleanAsYouGo = false;
+
+bool
+ParseSwitch ( int argc, char** argv, int index )
+{
+	char switchChar = argv[index][1];
+	switch ( switchChar )
+	{
+		case 'v':
+			Verbose = true;
+			break;
+		case 'c':
+			CleanAsYouGo = true;
+			break;
+		case 'r':
+			RootXmlFile = string(&argv[index][2]);
+			break;
+		default:
+			printf ( "Unknown switch -%c",
+			         switchChar );
+			return false;
+	}
+	return true;
+}
+
+bool
+ParseArguments ( int argc, char** argv )
+{
+	if ( argc < 2 )
+		return false;
+	
+	for ( int i = 1; i < argc; i++ )
+	{
+		if ( argv[i][0] == '-' )
+		{
+			if ( !ParseSwitch ( argc, argv, i ) )
+				return false;
+		}
+		else
+			BuildSystem = argv[i];
+	}
+	
+	return true;
+}
+
+int
+main ( int argc, char** argv )
+{
+	if ( !ParseArguments ( argc, argv ) )
+	{
+		printf ( "Generates project files for buildsystems\n\n" );
+		printf ( "  rbuild [-v] [-rfile.xml] buildsystem\n\n" );
+		printf ( "Switches:\n" );
+		printf ( "  -v           Be verbose\n" );
+		printf ( "  -c           Clean as you go. Delete generated files as soon as they are not needed anymore\n" );
+		printf ( "  -rfile.xml   Name of the root xml file. Default is ReactOS.xml\n" );
+		printf ( "\n" );
+		printf ( "  buildsystem  Target build system. Can be one of:\n" );
+		printf ( "                 mingw   MinGW\n" );
+		printf ( "                 devcpp  DevC++\n" );
+		return 1;
+	}
+	try
+	{
+		string projectFilename ( RootXmlFile );
+		printf ( "Reading build files..." );
+		Project project ( projectFilename );
+		printf ( "done\n" );
+		project.WriteConfigurationFile ();
+		project.ExecuteInvocations ();
+		Backend* backend = Backend::Factory::Create ( BuildSystem,
+		                                              project,
+		                                              Verbose,
+		                                              CleanAsYouGo );
+		backend->Process ();
+		delete backend;
+
+		return 0;
+	}
+	catch (Exception& ex)
+	{
+		printf ( "%s\n",
+		         ex.Message.c_str () );
+		return 1;
+	}
+}
diff --git a/reactos/tools/rbuild/rbuild.h b/reactos/tools/rbuild/rbuild.h
index 88d8838a3ef..87e9aac6b34 100644
--- a/reactos/tools/rbuild/rbuild.h
+++ b/reactos/tools/rbuild/rbuild.h
@@ -1,619 +1,619 @@
-#ifndef __RBUILD_H
-#define __RBUILD_H
-
-#include "pch.h"
-
-#ifdef WIN32
-#include <direct.h>
-#include <io.h>
-#endif/*WIN32*/
-#include <sys/stat.h>
-#include <time.h>
-#ifdef _MSC_VER
-#include <sys/utime.h>
-#else/*_MSC_VER*/
-#include <utime.h>
-#ifdef WIN32
-#include <process.h>
-#endif/*WIN32*/
-#endif/*_MSC_VER*/
-
-#include "ssprintf.h"
-#include "exception.h"
-#include "XML.h"
-
-typedef std::vector<std::string> string_list;
-
-#ifdef WIN32
-#define EXEPREFIX ""
-#define EXEPOSTFIX ".exe"
-#define CSEP '\\'
-#define CBAD_SEP '/'
-#define SSEP "\\"
-#define SBAD_SEP "/"
-#else
-#define EXEPREFIX "./"
-#define EXEPOSTFIX ""
-#define CSEP '/'
-#define CBAD_SEP '\\'
-#define SSEP "/"
-#define SBAD_SEP "\\"
-#endif
-
-class Project;
-class IfableData;
-class Module;
-class Include;
-class Define;
-class File;
-class Library;
-class Invoke;
-class InvokeFile;
-class Dependency;
-class ImportLibrary;
-class If;
-class CompilerFlag;
-class LinkerFlag;
-class Property;
-class AutomaticDependency;
-class Bootstrap;
-class CDFile;
-class InstallFile;
-class PchFile;
-class StubbedComponent;
-class StubbedSymbol;
-
-class SourceFileTest;
-
-class IfableData
-{
-public:
-	std::vector<File*> files;
-	std::vector<Include*> includes;
-	std::vector<Define*> defines;
-	std::vector<Library*> libraries;
-	std::vector<Property*> properties;
-	std::vector<If*> ifs;
-
-	~IfableData();
-	void ProcessXML();
-};
-
-class Project
-{
-	std::string xmlfile;
-	XMLElement *node, *head;
-public:
-	std::string name;
-	std::string makefile;
-	XMLIncludes xmlbuildfiles;
-	std::vector<Module*> modules;
-	std::vector<LinkerFlag*> linkerFlags;
-	std::vector<CDFile*> cdfiles;
-	std::vector<InstallFile*> installfiles;
-	IfableData non_if_data;
-
-	Project ( const std::string& filename );
-	~Project ();
-	void WriteConfigurationFile ();
-	void ExecuteInvocations ();
-	void ProcessXML ( const std::string& path );
-	Module* LocateModule ( const std::string& name );
-	const Module* LocateModule ( const std::string& name ) const;
-	std::string GetProjectFilename () const;
-private:
-	const Property* LookupProperty ( const std::string& name ) const;
-	void SetConfigurationOption ( char* s,
-	                              std::string name,
-	                              std::string* alternativeName );
-	void SetConfigurationOption ( char* s,
-	                              std::string name );
-	void WriteIfChanged ( char* outbuf,
-	                      std::string filename );
-	void ReadXml ();
-	void ProcessXMLSubElement ( const XMLElement& e,
-	                            const std::string& path,
-	                            If* pIf = NULL );
-
-	// disable copy semantics
-	Project ( const Project& );
-	Project& operator = ( const Project& );
-};
-
-
-enum ModuleType
-{
-	BuildTool,
-	StaticLibrary,
-	ObjectLibrary,
-	Kernel,
-	KernelModeDLL,
-	KernelModeDriver,
-	NativeDLL,
-	NativeCUI,
-	Win32DLL,
-	Win32CUI,
-	Win32GUI,
-	BootLoader,
-	BootSector,
-	Iso,
-	LiveIso,
-	Test,
-	RpcServer,
-	RpcClient
-};
-
-enum HostType
-{
-	HostFalse,
-	HostDefault,
-	HostTrue
-};
-
-class Module
-{
-public:
-	const Project& project;
-	const XMLElement& node;
-	std::string xmlbuildFile;
-	std::string name;
-	std::string extension;
-	std::string entrypoint;
-	std::string baseaddress;
-	std::string path;
-	ModuleType type;
-	ImportLibrary* importLibrary;
-	bool mangledSymbols;
-	Bootstrap* bootstrap;
-	IfableData non_if_data;
-	std::vector<Invoke*> invocations;
-	std::vector<Dependency*> dependencies;
-	std::vector<CompilerFlag*> compilerFlags;
-	std::vector<LinkerFlag*> linkerFlags;
-	std::vector<StubbedComponent*> stubbedComponents;
-	PchFile* pch;
-	bool cplusplus;
-	std::string prefix;
-	HostType host;
-	std::string installBase;
-	std::string installName;
-	bool useWRC;
-	bool enableWarnings;
-
-	Module ( const Project& project,
-	         const XMLElement& moduleNode,
-	         const std::string& modulePath );
-	~Module ();
-	ModuleType GetModuleType ( const std::string& location,
-	                           const XMLAttribute& attribute );
-	bool HasImportLibrary () const;
-	std::string GetTargetName () const;
-	std::string GetDependencyPath () const;
-	std::string GetBasePath () const;
-	std::string GetPath () const;
-	std::string GetPathWithPrefix ( const std::string& prefix ) const;
-	void GetTargets ( string_list& ) const;
-	std::string GetInvocationTarget ( const int index ) const;
-	bool HasFileWithExtension ( const IfableData&, const std::string& extension ) const;
-	void InvokeModule () const;
-	void ProcessXML ();
-private:
-	std::string GetDefaultModuleExtension () const;
-	std::string GetDefaultModuleEntrypoint () const;
-	std::string GetDefaultModuleBaseaddress () const;
-	void ProcessXMLSubElement ( const XMLElement& e,
-	                            const std::string& path,
-	                            If* pIf = NULL );
-};
-
-
-class Include
-{
-public:
-	const Project& project;
-	const Module* module;
-	const XMLElement& node;
-	std::string directory;
-	std::string basePath;
-
-	Include ( const Project& project,
-	          const XMLElement& includeNode );
-	Include ( const Project& project,
-	          const Module* module,
-	          const XMLElement& includeNode );
-	~Include ();
-	void ProcessXML();
-private:
-	void Initialize();
-};
-
-
-class Define
-{
-public:
-	const Project& project;
-	const Module* module;
-	const XMLElement& node;
-	std::string name;
-	std::string value;
-
-	Define ( const Project& project,
-	         const XMLElement& defineNode );
-	Define ( const Project& project,
-	         const Module* module,
-	         const XMLElement& defineNode );
-	~Define();
-	void ProcessXML();
-private:
-	void Initialize();
-};
-
-
-class File
-{
-public:
-	std::string name;
-	bool first;
-	std::string switches;
-
-	File ( const std::string& _name,
-	       bool _first,
-	       std::string _switches );
-
-	void ProcessXML();
-};
-
-
-class Library
-{
-public:
-	const XMLElement& node;
-	const Module& module;
-	std::string name;
-	const Module* imported_module;
-
-	Library ( const XMLElement& _node,
-	          const Module& _module,
-	          const std::string& _name );
-
-	void ProcessXML();
-};
-
-
-class Invoke
-{
-public:
-	const XMLElement& node;
-	const Module& module;
-	const Module* invokeModule;
-	std::vector<InvokeFile*> input;
-	std::vector<InvokeFile*> output;
-
-	Invoke ( const XMLElement& _node,
-	         const Module& _module );
-
-	void ProcessXML();
-	void GetTargets ( string_list& targets ) const;
-	std::string GetParameters () const;
-private:
-	void ProcessXMLSubElement ( const XMLElement& e );
-	void ProcessXMLSubElementInput ( const XMLElement& e );
-	void ProcessXMLSubElementOutput ( const XMLElement& e );
-};
-
-
-class InvokeFile
-{
-public:
-	const XMLElement& node;
-	std::string name;
-	std::string switches;
-
-	InvokeFile ( const XMLElement& _node,
-	             const std::string& _name );
-
-	void ProcessXML ();
-};
-
-
-class Dependency
-{
-public:
-	const XMLElement& node;
-	const Module& module;
-	const Module* dependencyModule;
-
-	Dependency ( const XMLElement& _node,
-	             const Module& _module );
-
-	void ProcessXML();
-};
-
-
-class ImportLibrary
-{
-public:
-	const XMLElement& node;
-	const Module& module;
-	std::string basename;
-	std::string definition;
-
-	ImportLibrary ( const XMLElement& _node,
-	                const Module& module );
-
-	void ProcessXML ();
-};
-
-
-class If
-{
-public:
-	const XMLElement& node;
-	const Project& project;
-	const Module* module;
-	std::string property, value;
-	IfableData data;
-
-	If ( const XMLElement& node_,
-	     const Project& project_,
-	     const Module* module_ );
-	~If();
-
-	void ProcessXML();
-};
-
-
-class CompilerFlag
-{
-public:
-	const Project& project;
-	const Module* module;
-	const XMLElement& node;
-	std::string flag;
-
-	CompilerFlag ( const Project& project,
-	               const XMLElement& compilerFlagNode );
-	CompilerFlag ( const Project& project,
-	               const Module* module,
-	               const XMLElement& compilerFlagNode );
-	~CompilerFlag ();
-	void ProcessXML();
-private:
-	void Initialize();
-};
-
-
-class LinkerFlag
-{
-public:
-	const Project& project;
-	const Module* module;
-	const XMLElement& node;
-	std::string flag;
-
-	LinkerFlag ( const Project& project,
-	             const XMLElement& linkerFlagNode );
-	LinkerFlag ( const Project& project,
-	             const Module* module,
-	             const XMLElement& linkerFlagNode );
-	~LinkerFlag ();
-	void ProcessXML();
-private:
-	void Initialize();
-};
-
-
-class Property
-{
-public:
-	const XMLElement& node;
-	const Project& project;
-	const Module* module;
-	std::string name, value;
-
-	Property ( const XMLElement& node_,
-	           const Project& project_,
-	           const Module* module_ );
-
-	void ProcessXML();
-};
-
-
-class SourceFile
-{
-public:
-	SourceFile ( AutomaticDependency* automaticDependency,
-	             Module& module,
-	             const std::string& filename,
-	             SourceFile* parent,
-	             bool isNonAutomaticDependency );
-	SourceFile* ParseFile ( const std::string& normalizedFilename );
-	void Parse ();
-	std::string Location () const;
-	std::vector<SourceFile*> files;
-	AutomaticDependency* automaticDependency;
-	Module& module;
-	std::string filename;
-	std::string filenamePart;
-	std::string directoryPart;
-	std::vector<SourceFile*> parents; /* List of files, this file is included from */
-	bool isNonAutomaticDependency;
-	std::string cachedDependencies;
-	time_t lastWriteTime;
-	time_t youngestLastWriteTime; /* Youngest last write time of this file and all children */
-	SourceFile* youngestFile;
-private:
-	void GetDirectoryAndFilenameParts ();
-	void Close ();
-	void Open ();
-	void SkipWhitespace ();
-	bool ReadInclude ( std::string& filename,
-	                   bool& includeNext );
-	bool IsIncludedFrom ( const std::string& normalizedFilename );
-	SourceFile* GetParentSourceFile ();
-	bool CanProcessFile ( const std::string& extension );
-	bool IsParentOf ( const SourceFile* parent,
-	                  const SourceFile* child );
-	std::string buf;
-	const char *p;
-	const char *end;
-};
-
-
-class AutomaticDependency
-{
-	friend class SourceFileTest;
-public:
-	const Project& project;
-
-	AutomaticDependency ( const Project& project );
-	~AutomaticDependency ();
-	void Process ();
-	std::string GetFilename ( const std::string& filename );
-	bool LocateIncludedFile ( const std::string& directory,
-	                          const std::string& includedFilename,
-	                          std::string& resolvedFilename );
-	bool LocateIncludedFile ( SourceFile* sourceFile,
-	                          Module& module,
-	                          const std::string& includedFilename,
-	                          bool includeNext,
-	                          std::string& resolvedFilename );
-	SourceFile* RetrieveFromCacheOrParse ( Module& module,
-	                                       const std::string& filename,
-	                                       SourceFile* parentSourceFile );
-	SourceFile* RetrieveFromCache ( const std::string& filename );
-	void CheckAutomaticDependencies ( bool verbose );
-	void CheckAutomaticDependenciesForFile ( SourceFile* sourceFile );
-private:
-	void ProcessModule ( Module& module );
-	void ProcessFile ( Module& module,
-	                   const File& file );
-	std::map<std::string, SourceFile*> sourcefile_map;
-};
-
-
-class Bootstrap
-{
-public:
-	const Project& project;
-	const Module* module;
-	const XMLElement& node;
-	std::string base;
-	std::string nameoncd;
-
-	Bootstrap ( const Project& project,
-	            const Module* module,
-	            const XMLElement& bootstrapNode );
-	~Bootstrap ();
-	void ProcessXML();
-private:
-	bool IsSupportedModuleType ( ModuleType type );
-	void Initialize();
-};
-
-
-class CDFile
-{
-public:
-	const Project& project;
-	const XMLElement& node;
-	std::string name;
-	std::string base;
-	std::string nameoncd;
-	std::string path;
-
-	CDFile ( const Project& project,
-	         const XMLElement& bootstrapNode,
-	         const std::string& path );
-	~CDFile ();
-	void ProcessXML();
-	std::string GetPath () const;
-};
-
-
-class InstallFile
-{
-public:
-	const Project& project;
-	const XMLElement& node;
-	std::string name;
-	std::string base;
-	std::string newname;
-	std::string path;
-
-	InstallFile ( const Project& project,
-	              const XMLElement& bootstrapNode,
-	              const std::string& path );
-	~InstallFile ();
-	void ProcessXML ();
-	std::string GetPath () const;
-};
-
-
-class PchFile
-{
-public:
-	const XMLElement& node;
-	const Module& module;
-	std::string header;
-
-	PchFile (
-		const XMLElement& node,
-		const Module& module,
-		const std::string& header );
-	void ProcessXML();
-};
-
-
-class StubbedComponent
-{
-public:
-	const Module* module;
-	const XMLElement& node;
-	std::string name;
-	std::vector<StubbedSymbol*> symbols;
-
-	StubbedComponent ( const Module* module_,
-	                   const XMLElement& stubbedComponentNode );
-	~StubbedComponent ();
-	void ProcessXML ();
-	void ProcessXMLSubElement ( const XMLElement& e );
-};
-
-
-class StubbedSymbol
-{
-public:
-	const XMLElement& node;
-	std::string symbol;
-	std::string newname;
-
-	StubbedSymbol ( const XMLElement& stubbedSymbolNode );
-	~StubbedSymbol ();
-	void ProcessXML();
-};
-
-extern std::string
-FixSeparator ( const std::string& s );
-
-extern std::string
-ReplaceExtension (
-	const std::string& filename,
-	const std::string& newExtension );
-
-extern std::string
-GetSubPath (
-	const std::string& location,
-	const std::string& path,
-	const std::string& att_value );
-
-extern std::string
-GetExtension ( const std::string& filename );
-
-extern std::string
-GetDirectory ( const std::string& filename );
-
-extern std::string
-NormalizeFilename ( const std::string& filename );
-
-#endif /* __RBUILD_H */
+#ifndef __RBUILD_H
+#define __RBUILD_H
+
+#include "pch.h"
+
+#ifdef WIN32
+#include <direct.h>
+#include <io.h>
+#endif/*WIN32*/
+#include <sys/stat.h>
+#include <time.h>
+#ifdef _MSC_VER
+#include <sys/utime.h>
+#else/*_MSC_VER*/
+#include <utime.h>
+#ifdef WIN32
+#include <process.h>
+#endif/*WIN32*/
+#endif/*_MSC_VER*/
+
+#include "ssprintf.h"
+#include "exception.h"
+#include "XML.h"
+
+typedef std::vector<std::string> string_list;
+
+#ifdef WIN32
+#define EXEPREFIX ""
+#define EXEPOSTFIX ".exe"
+#define CSEP '\\'
+#define CBAD_SEP '/'
+#define SSEP "\\"
+#define SBAD_SEP "/"
+#else
+#define EXEPREFIX "./"
+#define EXEPOSTFIX ""
+#define CSEP '/'
+#define CBAD_SEP '\\'
+#define SSEP "/"
+#define SBAD_SEP "\\"
+#endif
+
+class Project;
+class IfableData;
+class Module;
+class Include;
+class Define;
+class File;
+class Library;
+class Invoke;
+class InvokeFile;
+class Dependency;
+class ImportLibrary;
+class If;
+class CompilerFlag;
+class LinkerFlag;
+class Property;
+class AutomaticDependency;
+class Bootstrap;
+class CDFile;
+class InstallFile;
+class PchFile;
+class StubbedComponent;
+class StubbedSymbol;
+
+class SourceFileTest;
+
+class IfableData
+{
+public:
+	std::vector<File*> files;
+	std::vector<Include*> includes;
+	std::vector<Define*> defines;
+	std::vector<Library*> libraries;
+	std::vector<Property*> properties;
+	std::vector<If*> ifs;
+
+	~IfableData();
+	void ProcessXML();
+};
+
+class Project
+{
+	std::string xmlfile;
+	XMLElement *node, *head;
+public:
+	std::string name;
+	std::string makefile;
+	XMLIncludes xmlbuildfiles;
+	std::vector<Module*> modules;
+	std::vector<LinkerFlag*> linkerFlags;
+	std::vector<CDFile*> cdfiles;
+	std::vector<InstallFile*> installfiles;
+	IfableData non_if_data;
+
+	Project ( const std::string& filename );
+	~Project ();
+	void WriteConfigurationFile ();
+	void ExecuteInvocations ();
+	void ProcessXML ( const std::string& path );
+	Module* LocateModule ( const std::string& name );
+	const Module* LocateModule ( const std::string& name ) const;
+	std::string GetProjectFilename () const;
+private:
+	const Property* LookupProperty ( const std::string& name ) const;
+	void SetConfigurationOption ( char* s,
+	                              std::string name,
+	                              std::string* alternativeName );
+	void SetConfigurationOption ( char* s,
+	                              std::string name );
+	void WriteIfChanged ( char* outbuf,
+	                      std::string filename );
+	void ReadXml ();
+	void ProcessXMLSubElement ( const XMLElement& e,
+	                            const std::string& path,
+	                            If* pIf = NULL );
+
+	// disable copy semantics
+	Project ( const Project& );
+	Project& operator = ( const Project& );
+};
+
+
+enum ModuleType
+{
+	BuildTool,
+	StaticLibrary,
+	ObjectLibrary,
+	Kernel,
+	KernelModeDLL,
+	KernelModeDriver,
+	NativeDLL,
+	NativeCUI,
+	Win32DLL,
+	Win32CUI,
+	Win32GUI,
+	BootLoader,
+	BootSector,
+	Iso,
+	LiveIso,
+	Test,
+	RpcServer,
+	RpcClient
+};
+
+enum HostType
+{
+	HostFalse,
+	HostDefault,
+	HostTrue
+};
+
+class Module
+{
+public:
+	const Project& project;
+	const XMLElement& node;
+	std::string xmlbuildFile;
+	std::string name;
+	std::string extension;
+	std::string entrypoint;
+	std::string baseaddress;
+	std::string path;
+	ModuleType type;
+	ImportLibrary* importLibrary;
+	bool mangledSymbols;
+	Bootstrap* bootstrap;
+	IfableData non_if_data;
+	std::vector<Invoke*> invocations;
+	std::vector<Dependency*> dependencies;
+	std::vector<CompilerFlag*> compilerFlags;
+	std::vector<LinkerFlag*> linkerFlags;
+	std::vector<StubbedComponent*> stubbedComponents;
+	PchFile* pch;
+	bool cplusplus;
+	std::string prefix;
+	HostType host;
+	std::string installBase;
+	std::string installName;
+	bool useWRC;
+	bool enableWarnings;
+
+	Module ( const Project& project,
+	         const XMLElement& moduleNode,
+	         const std::string& modulePath );
+	~Module ();
+	ModuleType GetModuleType ( const std::string& location,
+	                           const XMLAttribute& attribute );
+	bool HasImportLibrary () const;
+	std::string GetTargetName () const;
+	std::string GetDependencyPath () const;
+	std::string GetBasePath () const;
+	std::string GetPath () const;
+	std::string GetPathWithPrefix ( const std::string& prefix ) const;
+	void GetTargets ( string_list& ) const;
+	std::string GetInvocationTarget ( const int index ) const;
+	bool HasFileWithExtension ( const IfableData&, const std::string& extension ) const;
+	void InvokeModule () const;
+	void ProcessXML ();
+private:
+	std::string GetDefaultModuleExtension () const;
+	std::string GetDefaultModuleEntrypoint () const;
+	std::string GetDefaultModuleBaseaddress () const;
+	void ProcessXMLSubElement ( const XMLElement& e,
+	                            const std::string& path,
+	                            If* pIf = NULL );
+};
+
+
+class Include
+{
+public:
+	const Project& project;
+	const Module* module;
+	const XMLElement& node;
+	std::string directory;
+	std::string basePath;
+
+	Include ( const Project& project,
+	          const XMLElement& includeNode );
+	Include ( const Project& project,
+	          const Module* module,
+	          const XMLElement& includeNode );
+	~Include ();
+	void ProcessXML();
+private:
+	void Initialize();
+};
+
+
+class Define
+{
+public:
+	const Project& project;
+	const Module* module;
+	const XMLElement& node;
+	std::string name;
+	std::string value;
+
+	Define ( const Project& project,
+	         const XMLElement& defineNode );
+	Define ( const Project& project,
+	         const Module* module,
+	         const XMLElement& defineNode );
+	~Define();
+	void ProcessXML();
+private:
+	void Initialize();
+};
+
+
+class File
+{
+public:
+	std::string name;
+	bool first;
+	std::string switches;
+
+	File ( const std::string& _name,
+	       bool _first,
+	       std::string _switches );
+
+	void ProcessXML();
+};
+
+
+class Library
+{
+public:
+	const XMLElement& node;
+	const Module& module;
+	std::string name;
+	const Module* imported_module;
+
+	Library ( const XMLElement& _node,
+	          const Module& _module,
+	          const std::string& _name );
+
+	void ProcessXML();
+};
+
+
+class Invoke
+{
+public:
+	const XMLElement& node;
+	const Module& module;
+	const Module* invokeModule;
+	std::vector<InvokeFile*> input;
+	std::vector<InvokeFile*> output;
+
+	Invoke ( const XMLElement& _node,
+	         const Module& _module );
+
+	void ProcessXML();
+	void GetTargets ( string_list& targets ) const;
+	std::string GetParameters () const;
+private:
+	void ProcessXMLSubElement ( const XMLElement& e );
+	void ProcessXMLSubElementInput ( const XMLElement& e );
+	void ProcessXMLSubElementOutput ( const XMLElement& e );
+};
+
+
+class InvokeFile
+{
+public:
+	const XMLElement& node;
+	std::string name;
+	std::string switches;
+
+	InvokeFile ( const XMLElement& _node,
+	             const std::string& _name );
+
+	void ProcessXML ();
+};
+
+
+class Dependency
+{
+public:
+	const XMLElement& node;
+	const Module& module;
+	const Module* dependencyModule;
+
+	Dependency ( const XMLElement& _node,
+	             const Module& _module );
+
+	void ProcessXML();
+};
+
+
+class ImportLibrary
+{
+public:
+	const XMLElement& node;
+	const Module& module;
+	std::string basename;
+	std::string definition;
+
+	ImportLibrary ( const XMLElement& _node,
+	                const Module& module );
+
+	void ProcessXML ();
+};
+
+
+class If
+{
+public:
+	const XMLElement& node;
+	const Project& project;
+	const Module* module;
+	std::string property, value;
+	IfableData data;
+
+	If ( const XMLElement& node_,
+	     const Project& project_,
+	     const Module* module_ );
+	~If();
+
+	void ProcessXML();
+};
+
+
+class CompilerFlag
+{
+public:
+	const Project& project;
+	const Module* module;
+	const XMLElement& node;
+	std::string flag;
+
+	CompilerFlag ( const Project& project,
+	               const XMLElement& compilerFlagNode );
+	CompilerFlag ( const Project& project,
+	               const Module* module,
+	               const XMLElement& compilerFlagNode );
+	~CompilerFlag ();
+	void ProcessXML();
+private:
+	void Initialize();
+};
+
+
+class LinkerFlag
+{
+public:
+	const Project& project;
+	const Module* module;
+	const XMLElement& node;
+	std::string flag;
+
+	LinkerFlag ( const Project& project,
+	             const XMLElement& linkerFlagNode );
+	LinkerFlag ( const Project& project,
+	             const Module* module,
+	             const XMLElement& linkerFlagNode );
+	~LinkerFlag ();
+	void ProcessXML();
+private:
+	void Initialize();
+};
+
+
+class Property
+{
+public:
+	const XMLElement& node;
+	const Project& project;
+	const Module* module;
+	std::string name, value;
+
+	Property ( const XMLElement& node_,
+	           const Project& project_,
+	           const Module* module_ );
+
+	void ProcessXML();
+};
+
+
+class SourceFile
+{
+public:
+	SourceFile ( AutomaticDependency* automaticDependency,
+	             Module& module,
+	             const std::string& filename,
+	             SourceFile* parent,
+	             bool isNonAutomaticDependency );
+	SourceFile* ParseFile ( const std::string& normalizedFilename );
+	void Parse ();
+	std::string Location () const;
+	std::vector<SourceFile*> files;
+	AutomaticDependency* automaticDependency;
+	Module& module;
+	std::string filename;
+	std::string filenamePart;
+	std::string directoryPart;
+	std::vector<SourceFile*> parents; /* List of files, this file is included from */
+	bool isNonAutomaticDependency;
+	std::string cachedDependencies;
+	time_t lastWriteTime;
+	time_t youngestLastWriteTime; /* Youngest last write time of this file and all children */
+	SourceFile* youngestFile;
+private:
+	void GetDirectoryAndFilenameParts ();
+	void Close ();
+	void Open ();
+	void SkipWhitespace ();
+	bool ReadInclude ( std::string& filename,
+	                   bool& includeNext );
+	bool IsIncludedFrom ( const std::string& normalizedFilename );
+	SourceFile* GetParentSourceFile ();
+	bool CanProcessFile ( const std::string& extension );
+	bool IsParentOf ( const SourceFile* parent,
+	                  const SourceFile* child );
+	std::string buf;
+	const char *p;
+	const char *end;
+};
+
+
+class AutomaticDependency
+{
+	friend class SourceFileTest;
+public:
+	const Project& project;
+
+	AutomaticDependency ( const Project& project );
+	~AutomaticDependency ();
+	void Process ();
+	std::string GetFilename ( const std::string& filename );
+	bool LocateIncludedFile ( const std::string& directory,
+	                          const std::string& includedFilename,
+	                          std::string& resolvedFilename );
+	bool LocateIncludedFile ( SourceFile* sourceFile,
+	                          Module& module,
+	                          const std::string& includedFilename,
+	                          bool includeNext,
+	                          std::string& resolvedFilename );
+	SourceFile* RetrieveFromCacheOrParse ( Module& module,
+	                                       const std::string& filename,
+	                                       SourceFile* parentSourceFile );
+	SourceFile* RetrieveFromCache ( const std::string& filename );
+	void CheckAutomaticDependencies ( bool verbose );
+	void CheckAutomaticDependenciesForFile ( SourceFile* sourceFile );
+private:
+	void ProcessModule ( Module& module );
+	void ProcessFile ( Module& module,
+	                   const File& file );
+	std::map<std::string, SourceFile*> sourcefile_map;
+};
+
+
+class Bootstrap
+{
+public:
+	const Project& project;
+	const Module* module;
+	const XMLElement& node;
+	std::string base;
+	std::string nameoncd;
+
+	Bootstrap ( const Project& project,
+	            const Module* module,
+	            const XMLElement& bootstrapNode );
+	~Bootstrap ();
+	void ProcessXML();
+private:
+	bool IsSupportedModuleType ( ModuleType type );
+	void Initialize();
+};
+
+
+class CDFile
+{
+public:
+	const Project& project;
+	const XMLElement& node;
+	std::string name;
+	std::string base;
+	std::string nameoncd;
+	std::string path;
+
+	CDFile ( const Project& project,
+	         const XMLElement& bootstrapNode,
+	         const std::string& path );
+	~CDFile ();
+	void ProcessXML();
+	std::string GetPath () const;
+};
+
+
+class InstallFile
+{
+public:
+	const Project& project;
+	const XMLElement& node;
+	std::string name;
+	std::string base;
+	std::string newname;
+	std::string path;
+
+	InstallFile ( const Project& project,
+	              const XMLElement& bootstrapNode,
+	              const std::string& path );
+	~InstallFile ();
+	void ProcessXML ();
+	std::string GetPath () const;
+};
+
+
+class PchFile
+{
+public:
+	const XMLElement& node;
+	const Module& module;
+	std::string header;
+
+	PchFile (
+		const XMLElement& node,
+		const Module& module,
+		const std::string& header );
+	void ProcessXML();
+};
+
+
+class StubbedComponent
+{
+public:
+	const Module* module;
+	const XMLElement& node;
+	std::string name;
+	std::vector<StubbedSymbol*> symbols;
+
+	StubbedComponent ( const Module* module_,
+	                   const XMLElement& stubbedComponentNode );
+	~StubbedComponent ();
+	void ProcessXML ();
+	void ProcessXMLSubElement ( const XMLElement& e );
+};
+
+
+class StubbedSymbol
+{
+public:
+	const XMLElement& node;
+	std::string symbol;
+	std::string newname;
+
+	StubbedSymbol ( const XMLElement& stubbedSymbolNode );
+	~StubbedSymbol ();
+	void ProcessXML();
+};
+
+extern std::string
+FixSeparator ( const std::string& s );
+
+extern std::string
+ReplaceExtension (
+	const std::string& filename,
+	const std::string& newExtension );
+
+extern std::string
+GetSubPath (
+	const std::string& location,
+	const std::string& path,
+	const std::string& att_value );
+
+extern std::string
+GetExtension ( const std::string& filename );
+
+extern std::string
+GetDirectory ( const std::string& filename );
+
+extern std::string
+NormalizeFilename ( const std::string& filename );
+
+#endif /* __RBUILD_H */
diff --git a/reactos/tools/rbuild/rbuild.mak b/reactos/tools/rbuild/rbuild.mak
index da7f4e433e4..5c976d8bcdf 100644
--- a/reactos/tools/rbuild/rbuild.mak
+++ b/reactos/tools/rbuild/rbuild.mak
@@ -1,350 +1,350 @@
-RBUILD_BASE = $(TOOLS_BASE_)rbuild
-RBUILD_BASE_ = $(RBUILD_BASE)$(SEP)
-RBUILD_INT = $(INTERMEDIATE_)$(RBUILD_BASE)
-RBUILD_INT_ = $(RBUILD_INT)$(SEP)
-RBUILD_OUT = $(OUTPUT_)$(RBUILD_BASE)
-RBUILD_OUT_ = $(RBUILD_OUT)$(SEP)
-
-$(RBUILD_INT): | $(TOOLS_INT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-
-ifneq ($(INTERMEDIATE),$(OUTPUT))
-$(RBUILD_OUT): | $(TOOLS_OUT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-endif
-
-
-RBUILD_BACKEND_BASE = $(RBUILD_BASE_)backend
-RBUILD_BACKEND_BASE_ = $(RBUILD_BACKEND_BASE)$(SEP)
-RBUILD_BACKEND_INT = $(INTERMEDIATE_)$(RBUILD_BACKEND_BASE)
-RBUILD_BACKEND_INT_ = $(RBUILD_BACKEND_INT)$(SEP)
-RBUILD_BACKEND_OUT = $(OUTPUT)$(RBUILD_BACKEND_BASE)
-RBUILD_BACKEND_OUT_ = $(RBUILD_BACKEND_OUT)$(SEP)
-
-$(RBUILD_BACKEND_INT): | $(RBUILD_INT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-
-ifneq ($(INTERMEDIATE),$(OUTPUT))
-$(RBUILD_BACKEND_OUT): | $(RBUILD_OUT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-endif
-
-
-RBUILD_MINGW_BASE = $(RBUILD_BACKEND_BASE_)mingw
-RBUILD_MINGW_BASE_ = $(RBUILD_MINGW_BASE)$(SEP)
-RBUILD_MINGW_INT = $(INTERMEDIATE_)$(RBUILD_MINGW_BASE)
-RBUILD_MINGW_INT_ = $(RBUILD_MINGW_INT)$(SEP)
-RBUILD_MINGW_OUT = $(OUTPUT)$(RBUILD_MINGW_BASE)
-RBUILD_MINGW_OUT_ = $(RBUILD_MINGW_OUT)$(SEP)
-
-$(RBUILD_MINGW_INT): | $(RBUILD_BACKEND_INT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-
-ifneq ($(INTERMEDIATE),$(OUTPUT))
-$(RBUILD_MINGW_OUT): | $(RBUILD_BACKEND_OUT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-endif
-
-
-RBUILD_TESTS_BASE = $(RBUILD_BASE_)tests
-RBUILD_TESTS_BASE_ = $(RBUILD_TESTS_BASE)$(SEP)
-RBUILD_TESTS_INT = $(INTERMEDIATE_)$(RBUILD_TESTS_BASE)
-RBUILD_TESTS_INT_ = $(RBUILD_TESTS_INT)$(SEP)
-RBUILD_TESTS_OUT = $(OUTPUT)$(RBUILD_TESTS_BASE)
-
-$(RBUILD_TESTS_INT): | $(RBUILD_INT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-
-ifneq ($(INTERMEDIATE),$(OUTPUT))
-$(RBUILD_TESTS_OUT): | $(RBUILD_OUT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-endif
-
-
-RBUILD_DEVCPP_BASE = $(RBUILD_BACKEND_BASE_)devcpp
-RBUILD_DEVCPP_BASE_ = $(RBUILD_DEVCPP_BASE)$(SEP)
-RBUILD_DEVCPP_INT = $(INTERMEDIATE_)$(RBUILD_DEVCPP_BASE)
-RBUILD_DEVCPP_INT_ = $(RBUILD_DEVCPP_INT)$(SEP)
-RBUILD_DEVCPP_OUT = $(OUTPUT)$(RBUILD_DEVCPP_BASE)
-RBUILD_DEVCPP_OUT_ = $(RBUILD_DEVCPP_OUT)$(SEP)
-
-$(RBUILD_DEVCPP_INT): | $(RBUILD_BACKEND_INT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-
-ifneq ($(INTERMEDIATE),$(OUTPUT))
-$(RBUILD_DEVCPP_OUT): | $(RBUILD_BACKEND_OUT)
-	$(ECHO_MKDIR)
-	${mkdir} $@
-endif
-
-
-RBUILD_TARGET = \
-	$(EXEPREFIX)$(RBUILD_OUT_)rbuild$(EXEPOSTFIX)
-
-RBUILD_TEST_TARGET = \
-	$(EXEPREFIX)$(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX)
-
-RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \
-	mingw.cpp \
-	modulehandler.cpp \
-	)
-
-RBUILD_BACKEND_DEVCPP_BASE_SOURCES = $(addprefix $(RBUILD_DEVCPP_BASE_), \
-	devcpp.cpp \
-	)
-
-RBUILD_BACKEND_SOURCES = \
-	$(RBUILD_BACKEND_MINGW_BASE_SOURCES) \
-	$(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \
-	$(RBUILD_BACKEND_BASE_)backend.cpp
-
-RBUILD_COMMON_SOURCES = \
-	$(RBUILD_BACKEND_SOURCES) \
-	$(addprefix $(RBUILD_BASE_), \
-		automaticdependency.cpp \
-		bootstrap.cpp \
-		cdfile.cpp \
-		compilerflag.cpp \
-		define.cpp \
-		exception.cpp \
-		include.cpp \
-		installfile.cpp \
-		linkerflag.cpp \
-		module.cpp \
-		project.cpp \
-		ssprintf.cpp \
-		stubbedcomponent.cpp \
-		XML.cpp \
-		)
-
-RBUILD_SPECIAL_SOURCES = \
-	$(RBUILD_BASE_)rbuild.cpp
-
-RBUILD_SOURCES = \
-	$(RBUILD_COMMON_SOURCES) \
-	$(RBUILD_SPECIAL_SOURCES)
-
-RBUILD_COMMON_OBJECTS = \
-	$(addprefix $(INTERMEDIATE_), $(RBUILD_COMMON_SOURCES:.cpp=.o))
-
-RBUILD_SPECIAL_OBJECTS = \
-	$(addprefix $(INTERMEDIATE_), $(RBUILD_SPECIAL_SOURCES:.cpp=.o))
-
-RBUILD_OBJECTS = \
-	$(RBUILD_COMMON_OBJECTS) \
-	$(RBUILD_SPECIAL_OBJECTS)
-
-RBUILD_BACKEND_DEVCPP_HEADERS = \
-	devcpp.h
-
-RBUILD_BACKEND_MINGW_HEADERS = \
-	mingw.h \
-	modulehandler.h
-
-RBUILD_BACKEND_HEADERS = \
-	backend.h \
-	$(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \
-	$(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS))
-
-RBUILD_HEADERS = \
-	$(addprefix $(RBUILD_BASE_), \
-		exception.h \
-		pch.h \
-		rbuild.h \
-		ssprintf.h \
-		test.h \
-		XML.h \
-		$(addprefix backend$(SEP), $(RBUILD_BACKEND_HEADERS)) \
-	)
-
-RBUILD_TESTS = \
-	tests$(SEP)cdfiletest.cpp \
-	tests$(SEP)definetest.cpp \
-	tests$(SEP)functiontest.cpp \
-	tests$(SEP)iftest.cpp \
-	tests$(SEP)includetest.cpp \
-	tests$(SEP)invoketest.cpp \
-	tests$(SEP)linkerflagtest.cpp \
-	tests$(SEP)moduletest.cpp \
-	tests$(SEP)projecttest.cpp \
-	tests$(SEP)sourcefiletest.cpp \
-	tests$(SEP)symboltest.cpp
-
-RBUILD_TEST_SPECIAL_SOURCES = \
-	$(addprefix $(RBUILD_BASE_), $(RBUILD_TESTS)) \
-	$(RBUILD_BASE_)tests$(SEP)alltests.cpp
-
-RBUILD_TEST_SOURCES = \
-	$(RBUILD_COMMON_SOURCES) \
-	$(RBUILD_TEST_SPECIAL_SOURCES)
-
-RBUILD_TEST_SPECIAL_OBJECTS = \
-	$(addprefix $(INTERMEDIATE_), $(RBUILD_TEST_SPECIAL_SOURCES:.cpp=.o))
-
-RBUILD_TEST_OBJECTS = \
-	$(RBUILD_COMMON_OBJECTS) \
-	$(RBUILD_TEST_SPECIAL_OBJECTS)
-
-RBUILD_HOST_CXXFLAGS = -g -I$(RBUILD_BASE) -Werror -Wall
-
-RBUILD_HOST_LFLAGS = -g
-
-.PHONY: rbuild
-rbuild: $(RBUILD_TARGET)
-
-$(RBUILD_TARGET): $(RBUILD_OBJECTS) | $(RBUILD_OUT)
-	$(ECHO_LD)
-	${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@
-
-$(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)bootstrap.o: $(RBUILD_BASE_)bootstrap.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)cdfile.o: $(RBUILD_BASE_)cdfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)module.o: $(RBUILD_BASE_)module.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)project.o: $(RBUILD_BASE_)project.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)rbuild.o: $(RBUILD_BASE_)rbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)ssprintf.o: $(RBUILD_BASE_)ssprintf.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_INT_)XML.o: $(RBUILD_BASE_)XML.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_BACKEND_INT_)backend.o: $(RBUILD_BACKEND_BASE_)backend.cpp $(RBUILD_HEADERS) | $(RBUILD_BACKEND_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_MINGW_INT_)mingw.o: $(RBUILD_MINGW_BASE_)mingw.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_HEADERS) | $(RBUILD_DEVCPP_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT)
-	$(ECHO_LD)
-	${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@
-
-$(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-$(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
-	$(ECHO_CC)
-	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
-
-
-.PHONY: rbuild_test
-
-rbuild_test: $(RBUILD_TEST_TARGET)
-	$(ECHO_TEST)
-	$(Q)$(RBUILD_TEST_TARGET)
-
-.PHONY: rbuild_test_clean
-rbuild_test_clean: $(RBUILD_TEST_TARGET) $(RBUILD_TESTS_INT)
-	-@$(rm) $(RBUILD_TEST_TARGET) $(RBUILD_TEST_SPECIAL_OBJECTS) 2>$(NUL)
-
-.PHONY: rbuild_clean
-rbuild_clean: $(RBUILD_TARGET) $(RBUILD_OBJECTS) $(RBUILD_TESTS_INT)
-	-@$(rm) $(RBUILD_TARGET) $(RBUILD_OBJECTS) 2>$(NUL)
-clean: rbuild_clean
+RBUILD_BASE = $(TOOLS_BASE_)rbuild
+RBUILD_BASE_ = $(RBUILD_BASE)$(SEP)
+RBUILD_INT = $(INTERMEDIATE_)$(RBUILD_BASE)
+RBUILD_INT_ = $(RBUILD_INT)$(SEP)
+RBUILD_OUT = $(OUTPUT_)$(RBUILD_BASE)
+RBUILD_OUT_ = $(RBUILD_OUT)$(SEP)
+
+$(RBUILD_INT): | $(TOOLS_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RBUILD_OUT): | $(TOOLS_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
+
+RBUILD_BACKEND_BASE = $(RBUILD_BASE_)backend
+RBUILD_BACKEND_BASE_ = $(RBUILD_BACKEND_BASE)$(SEP)
+RBUILD_BACKEND_INT = $(INTERMEDIATE_)$(RBUILD_BACKEND_BASE)
+RBUILD_BACKEND_INT_ = $(RBUILD_BACKEND_INT)$(SEP)
+RBUILD_BACKEND_OUT = $(OUTPUT)$(RBUILD_BACKEND_BASE)
+RBUILD_BACKEND_OUT_ = $(RBUILD_BACKEND_OUT)$(SEP)
+
+$(RBUILD_BACKEND_INT): | $(RBUILD_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RBUILD_BACKEND_OUT): | $(RBUILD_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
+
+RBUILD_MINGW_BASE = $(RBUILD_BACKEND_BASE_)mingw
+RBUILD_MINGW_BASE_ = $(RBUILD_MINGW_BASE)$(SEP)
+RBUILD_MINGW_INT = $(INTERMEDIATE_)$(RBUILD_MINGW_BASE)
+RBUILD_MINGW_INT_ = $(RBUILD_MINGW_INT)$(SEP)
+RBUILD_MINGW_OUT = $(OUTPUT)$(RBUILD_MINGW_BASE)
+RBUILD_MINGW_OUT_ = $(RBUILD_MINGW_OUT)$(SEP)
+
+$(RBUILD_MINGW_INT): | $(RBUILD_BACKEND_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RBUILD_MINGW_OUT): | $(RBUILD_BACKEND_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
+
+RBUILD_TESTS_BASE = $(RBUILD_BASE_)tests
+RBUILD_TESTS_BASE_ = $(RBUILD_TESTS_BASE)$(SEP)
+RBUILD_TESTS_INT = $(INTERMEDIATE_)$(RBUILD_TESTS_BASE)
+RBUILD_TESTS_INT_ = $(RBUILD_TESTS_INT)$(SEP)
+RBUILD_TESTS_OUT = $(OUTPUT)$(RBUILD_TESTS_BASE)
+
+$(RBUILD_TESTS_INT): | $(RBUILD_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RBUILD_TESTS_OUT): | $(RBUILD_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
+
+RBUILD_DEVCPP_BASE = $(RBUILD_BACKEND_BASE_)devcpp
+RBUILD_DEVCPP_BASE_ = $(RBUILD_DEVCPP_BASE)$(SEP)
+RBUILD_DEVCPP_INT = $(INTERMEDIATE_)$(RBUILD_DEVCPP_BASE)
+RBUILD_DEVCPP_INT_ = $(RBUILD_DEVCPP_INT)$(SEP)
+RBUILD_DEVCPP_OUT = $(OUTPUT)$(RBUILD_DEVCPP_BASE)
+RBUILD_DEVCPP_OUT_ = $(RBUILD_DEVCPP_OUT)$(SEP)
+
+$(RBUILD_DEVCPP_INT): | $(RBUILD_BACKEND_INT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+
+ifneq ($(INTERMEDIATE),$(OUTPUT))
+$(RBUILD_DEVCPP_OUT): | $(RBUILD_BACKEND_OUT)
+	$(ECHO_MKDIR)
+	${mkdir} $@
+endif
+
+
+RBUILD_TARGET = \
+	$(EXEPREFIX)$(RBUILD_OUT_)rbuild$(EXEPOSTFIX)
+
+RBUILD_TEST_TARGET = \
+	$(EXEPREFIX)$(RBUILD_OUT_)rbuild_test$(EXEPOSTFIX)
+
+RBUILD_BACKEND_MINGW_BASE_SOURCES = $(addprefix $(RBUILD_MINGW_BASE_), \
+	mingw.cpp \
+	modulehandler.cpp \
+	)
+
+RBUILD_BACKEND_DEVCPP_BASE_SOURCES = $(addprefix $(RBUILD_DEVCPP_BASE_), \
+	devcpp.cpp \
+	)
+
+RBUILD_BACKEND_SOURCES = \
+	$(RBUILD_BACKEND_MINGW_BASE_SOURCES) \
+	$(RBUILD_BACKEND_DEVCPP_BASE_SOURCES) \
+	$(RBUILD_BACKEND_BASE_)backend.cpp
+
+RBUILD_COMMON_SOURCES = \
+	$(RBUILD_BACKEND_SOURCES) \
+	$(addprefix $(RBUILD_BASE_), \
+		automaticdependency.cpp \
+		bootstrap.cpp \
+		cdfile.cpp \
+		compilerflag.cpp \
+		define.cpp \
+		exception.cpp \
+		include.cpp \
+		installfile.cpp \
+		linkerflag.cpp \
+		module.cpp \
+		project.cpp \
+		ssprintf.cpp \
+		stubbedcomponent.cpp \
+		XML.cpp \
+		)
+
+RBUILD_SPECIAL_SOURCES = \
+	$(RBUILD_BASE_)rbuild.cpp
+
+RBUILD_SOURCES = \
+	$(RBUILD_COMMON_SOURCES) \
+	$(RBUILD_SPECIAL_SOURCES)
+
+RBUILD_COMMON_OBJECTS = \
+	$(addprefix $(INTERMEDIATE_), $(RBUILD_COMMON_SOURCES:.cpp=.o))
+
+RBUILD_SPECIAL_OBJECTS = \
+	$(addprefix $(INTERMEDIATE_), $(RBUILD_SPECIAL_SOURCES:.cpp=.o))
+
+RBUILD_OBJECTS = \
+	$(RBUILD_COMMON_OBJECTS) \
+	$(RBUILD_SPECIAL_OBJECTS)
+
+RBUILD_BACKEND_DEVCPP_HEADERS = \
+	devcpp.h
+
+RBUILD_BACKEND_MINGW_HEADERS = \
+	mingw.h \
+	modulehandler.h
+
+RBUILD_BACKEND_HEADERS = \
+	backend.h \
+	$(addprefix devcpp$(SEP), $(RBUILD_BACKEND_DEVCPP_HEADERS)) \
+	$(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS))
+
+RBUILD_HEADERS = \
+	$(addprefix $(RBUILD_BASE_), \
+		exception.h \
+		pch.h \
+		rbuild.h \
+		ssprintf.h \
+		test.h \
+		XML.h \
+		$(addprefix backend$(SEP), $(RBUILD_BACKEND_HEADERS)) \
+	)
+
+RBUILD_TESTS = \
+	tests$(SEP)cdfiletest.cpp \
+	tests$(SEP)definetest.cpp \
+	tests$(SEP)functiontest.cpp \
+	tests$(SEP)iftest.cpp \
+	tests$(SEP)includetest.cpp \
+	tests$(SEP)invoketest.cpp \
+	tests$(SEP)linkerflagtest.cpp \
+	tests$(SEP)moduletest.cpp \
+	tests$(SEP)projecttest.cpp \
+	tests$(SEP)sourcefiletest.cpp \
+	tests$(SEP)symboltest.cpp
+
+RBUILD_TEST_SPECIAL_SOURCES = \
+	$(addprefix $(RBUILD_BASE_), $(RBUILD_TESTS)) \
+	$(RBUILD_BASE_)tests$(SEP)alltests.cpp
+
+RBUILD_TEST_SOURCES = \
+	$(RBUILD_COMMON_SOURCES) \
+	$(RBUILD_TEST_SPECIAL_SOURCES)
+
+RBUILD_TEST_SPECIAL_OBJECTS = \
+	$(addprefix $(INTERMEDIATE_), $(RBUILD_TEST_SPECIAL_SOURCES:.cpp=.o))
+
+RBUILD_TEST_OBJECTS = \
+	$(RBUILD_COMMON_OBJECTS) \
+	$(RBUILD_TEST_SPECIAL_OBJECTS)
+
+RBUILD_HOST_CXXFLAGS = -g -I$(RBUILD_BASE) -Werror -Wall
+
+RBUILD_HOST_LFLAGS = -g
+
+.PHONY: rbuild
+rbuild: $(RBUILD_TARGET)
+
+$(RBUILD_TARGET): $(RBUILD_OBJECTS) | $(RBUILD_OUT)
+	$(ECHO_LD)
+	${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@
+
+$(RBUILD_INT_)automaticdependency.o: $(RBUILD_BASE_)automaticdependency.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)bootstrap.o: $(RBUILD_BASE_)bootstrap.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)cdfile.o: $(RBUILD_BASE_)cdfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)compilerflag.o: $(RBUILD_BASE_)compilerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)define.o: $(RBUILD_BASE_)define.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)exception.o: $(RBUILD_BASE_)exception.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)include.o: $(RBUILD_BASE_)include.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)installfile.o: $(RBUILD_BASE_)installfile.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)linkerflag.o: $(RBUILD_BASE_)linkerflag.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)module.o: $(RBUILD_BASE_)module.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)project.o: $(RBUILD_BASE_)project.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)rbuild.o: $(RBUILD_BASE_)rbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)ssprintf.o: $(RBUILD_BASE_)ssprintf.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)stubbedcomponent.o: $(RBUILD_BASE_)stubbedcomponent.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_INT_)XML.o: $(RBUILD_BASE_)XML.cpp $(RBUILD_HEADERS) | $(RBUILD_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_BACKEND_INT_)backend.o: $(RBUILD_BACKEND_BASE_)backend.cpp $(RBUILD_HEADERS) | $(RBUILD_BACKEND_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_MINGW_INT_)mingw.o: $(RBUILD_MINGW_BASE_)mingw.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_MINGW_INT_)modulehandler.o: $(RBUILD_MINGW_BASE_)modulehandler.cpp $(RBUILD_HEADERS) | $(RBUILD_MINGW_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_DEVCPP_INT_)devcpp.o: $(RBUILD_DEVCPP_BASE_)devcpp.cpp $(RBUILD_HEADERS) | $(RBUILD_DEVCPP_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS) $(RBUILD_HEADERS) | $(RBUILD_OUT)
+	$(ECHO_LD)
+	${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $@
+
+$(RBUILD_TESTS_INT_)cdfiletest.o: $(RBUILD_TESTS_BASE_)cdfiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)definetest.o: $(RBUILD_TESTS_BASE_)definetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)functiontest.o: $(RBUILD_TESTS_BASE_)functiontest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)iftest.o: $(RBUILD_TESTS_BASE_)iftest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)includetest.o: $(RBUILD_TESTS_BASE_)includetest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)invoketest.o: $(RBUILD_TESTS_BASE_)invoketest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)linkerflagtest.o: $(RBUILD_TESTS_BASE_)linkerflagtest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)moduletest.o: $(RBUILD_TESTS_BASE_)moduletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)projecttest.o: $(RBUILD_TESTS_BASE_)projecttest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)sourcefiletest.o: $(RBUILD_TESTS_BASE_)sourcefiletest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)symboltest.o: $(RBUILD_TESTS_BASE_)symboltest.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+$(RBUILD_TESTS_INT_)alltests.o: $(RBUILD_TESTS_BASE_)alltests.cpp $(RBUILD_HEADERS) | $(RBUILD_TESTS_INT)
+	$(ECHO_CC)
+	${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
+
+
+.PHONY: rbuild_test
+
+rbuild_test: $(RBUILD_TEST_TARGET)
+	$(ECHO_TEST)
+	$(Q)$(RBUILD_TEST_TARGET)
+
+.PHONY: rbuild_test_clean
+rbuild_test_clean: $(RBUILD_TEST_TARGET) $(RBUILD_TESTS_INT)
+	-@$(rm) $(RBUILD_TEST_TARGET) $(RBUILD_TEST_SPECIAL_OBJECTS) 2>$(NUL)
+
+.PHONY: rbuild_clean
+rbuild_clean: $(RBUILD_TARGET) $(RBUILD_OBJECTS) $(RBUILD_TESTS_INT)
+	-@$(rm) $(RBUILD_TARGET) $(RBUILD_OBJECTS) 2>$(NUL)
+clean: rbuild_clean
diff --git a/reactos/tools/rbuild/rbuild.txt b/reactos/tools/rbuild/rbuild.txt
index af5b9fba6cc..4633fe39947 100644
--- a/reactos/tools/rbuild/rbuild.txt
+++ b/reactos/tools/rbuild/rbuild.txt
@@ -1,481 +1,481 @@
-ReactOS Build System Documentation
-==================================
-
-Building ReactOS
-----------------
-To generate GNU make makefiles and building ReactOS do the following:
-
-	1) Go to the top-level reactos directory
-	2) Run the command: mingw32-make
-
-This will start building ReactOS.
-
-To build a bootable CD run the following command:
-
-	mingw32-make bootcd
-
-This will create ReactOS.iso in the top-level reactos directory.
-
-
-Top-level XML Build File
-------------------------
-The top-level xml build file (ReactOS.xml) is processed by rbuild. The following is an example of how it could look like:
-
-<?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
-	<xi:include href="config.xml">
-		<xi:fallback>
-			<xi:include href="config.template.xml" />
-		</xi:fallback>
-	</xi:include>
-
-	<define name="_M_IX86" />
-	<if property="DBG" value="1">
-		<define name="DBG" value="1" />
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-
-	<include base="ReactOS">include</include>
-
-	<directory name="boot">
-		<xi:include href="boot/boot.xml" />
-	</directory>
-
-	<module name="bootcd" type="iso">
-	</module>
-</project>
-
-
-xi:include
-----------
-It is possible to split an xml build file over several files. The include element in the xi namespace is used to accomplish this.
-
-Syntax:
-	<xi:include href="config.xml">
-		<xi:fallback>
-			<xi:include href="config.template.xml" />
-		</xi:fallback>
-	</xi:include>
-
-Attributes:
-	href - Name of xml build file to include. The filename is relative to the location of the current xml build file.
-
-Value:
-	None.
-
-Elements:
-	xi:fallback
-
-
-xi:fallback
------------
-This element is used to provide the name of an alternate file that is to be included if the first include file did not exists.
-
-Attributes:
-	None.
-
-Value:
-	None.
-
-Elements:
-	xi:include.
-
-
-Project element
----------------
-There can be one project per top-level XML build file. A project can only be defined in a top-level xml build file.
-
-Syntax:
-	<project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
-		...
-	</project>
-
-Attributes:
-	name - Name of the project.
-	makefile - Filename of the GNU makefile that is to be created.
-
-Value:
-	None.
-
-Elements:
-	define, directory, if, include, module, property
-
-
-Module element
---------------
-There can be zero or more modules per xml build file.
-
-Syntax:
-	<module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true">
-		...
-	</module>
-
-Attributes:
-	name - Name of the module. Also the base name of the generated file if such file is generated for the particular module type.
-	type - Type of module. See below for an explanation of module types.
-	extension - Extension of the generated file if such file is generated for the particular module type.
-	entrypoint - Entrypoint symbol of the generated file if such file is generated for the particular module type.
-	baseaddress - Base address of the generated file if such file is generated for the particular module type.
-	mangledsymbols - Controls wether or not to pass --kill-at to dlltool. If this attribute has the value false then --kill-at is passed to dlltool. If the value is true, then --kill-at is not passed to dlltool. If the generated file exports C++ classes then this need to be true.
-	installbase - Base directory of the generated file in the installation directory. This attribute is optional.
-	installname - Name of generated file in the installation directory. This attribute is optional, but if not specified, the generated file is not copied to the installation directory.
-	usewrc - Use WRC to compile resources if true. If false, windres is used. This attribute is optional. If not specified, WRC will be used.
-	warnings - Error out if false and at least one warning is emitted during building of this module. This attribute is optional. If not specified, it is assumed to be false.
-
-Value:
-	None.
-
-Elements:
-	bootstrap, component, define, dependency, directory, file, if, importlibrary, include, invoke, library, property.
-
-
-Module types
-------------
-The module type determines the actions that is to be carried out to process the module. The defined module types are seen below:
-	buildtool - Builds a tool that can be run (invoked) when building ReactOS. Default extension is .exe when building on Windows and nothing when building on Linux. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
-	staticlibrary - Builds a static library containing object files that can be linked together with other modules. Default extension is .a. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
-	objectlibrary - Builds object files that can be linked together with other modules. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
-	kernel - Builds ntoskrnl.exe. Default extension is .exe. Default entrypoint is _NtProcessStartup. 
-	kernelmodedll - Builds a kernel-mode DLL. Default extension is .dll. Default entrypoint is _DriverEntry@8.
-	kernelmodedriver - Builds a kernel-mode driver. Default extension is .sys. Default entrypoint is _DriverEntry@8.
-	nativedll - Builds a native DLL. Default extension is .dll. Default entrypoint is _DllMainCRTStartup@12.
-	win32dll - Builds a Win32 DLL. Default extension is .dll. Default entrypoint is _DllMain@12.
-	win32cui - Builds a Win32 console executable. Default extension is .exe. Default entrypoint is _mainCRTStartup. The baseaddress module attribute is not applicable for this module type.
-	win32gui - Builds a Win32 GUI executable. Default extension is .exe. Default entrypoint is _WinMainCRTStartup. The baseaddress module attribute is not applicable for this module type.
-	bootloader - Builds a bootloader. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
-	bootsector - Builds one or more bootsector binaries. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
-	iso - Builds a bootable CD. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
-	test - Builds a testsuite. Default extension is .exe. Default entrypoint is _mainCRTStartup. The baseaddress module attribute is not applicable for this module type.
-	rpcserver - Generates and builds server code for an RPC interface. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
-	rpcclient - Generates and builds client code for an RPC interface. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
-
-
-Bootstrap element
------------------
-A bootstrap element specifies that the generated file should be put on the bootable CD as a bootstrap file.
-
-Syntax:
-	<bootstrap base="reactos" nameoncd="halmp.dll" />
-
-Attributes:
-	base - Put file in this directory on the bootable CD. This attribute is optional.
-	nameoncd - Name of file on the bootable CD. This attribute is optional.
-
-Value:
-	None.
-
-Elements:
-	None.
-
-
-CDFile element
---------------
-A cdfile element specifies the name of a file that is to be put on the bootable CD.
-
-Syntax:
-	<cdfile base="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile>
-
-Attributes:
-	base - Put file in this directory on the bootable CD. This attribute is optional.
-	nameoncd - Name of file on the bootable CD. This attribute is optional.
-
-Value:
-	Name of file.
-
-Elements:
-	None.
-
-
-Component element
------------------
-A component element specifies that imports from a library are to be stubbed so tests can be run without actually calling the functions in the library. This element can only be used for modules of type test.
-
-Syntax:
-	<component name="ntdll.dll">
-		...
-	</component>
-
-Attributes:
-	name - Name of library.
-
-Value:
-	None.
-
-Elements:
-	Symbol.
-
-
-Symbol element
---------------
-A symbol element specifies an imported function from a library that is to be stubbed so tests can be run without actually calling the function in the library.
-
-Syntax:
-	<symbol newname="RtlAllocateHeap">HeapAlloc@12</symbol>
-
-Attributes:
-	newname - New name of symbol. This attribute is optional.
-
-Value:
-	Name of symbol.
-
-Elements:
-	None.
-
-
-Define element
---------------
-A define element specifies the name and (optionally) value of a define for the C/C++ compiler and resource compiler.
-
-Syntax:
-	<define name="WINVER">0x501</define>
-
-Attributes:
-	name - Name of define.
-
-Value:
-	Value of define. The value is optional.
-
-Elements:
-	None.
-
-
-Dependency element
-------------------
-A dependency element specifies the name of a module (usually of type buildtool) that is to be processed before the current module.
-
-Syntax:
-	<dependency>OtherModule</dependency>
-
-Attributes:
-	None.
-
-Value:
-	Name of module.
-
-Elements:
-	None.
-
-
-Directory element
------------------
-A directory element specifies the name of a subdirectory.
-
-Syntax:
-	<directory name="MyDirectory">
-		...
-	</directory>
-
-Attributes:
-	name - Name of directory.
-
-Value:
-	None.
-
-Elements:
-	cdfile, directory, file, if, property.
-
-
-File element
-------------
-A file element specifies the name of a file that is to be processed.
-
-Syntax:
-	<file>MyFile.c</file>
-
-Attributes:
-	None.
-
-Value:
-	Name of file.
-
-Elements:
-	None.
-
-
-If element
-----------
-An if element allows for conditional processing of other elements.
-
-Syntax:
-	<if property="DBG" value="1">
-		...
-	</if>
-
-Attributes:
-	property - Name of the property that is to be evaluated.
-	value - Value to compare to the value of the property. If the property has the specified value, then the subelements are processed.
-
-Value:
-	None.
-
-Elements:
-	define, directory, file, if, include, property.
-
-
-Importlibrary element
----------------------
-An importlibrary element specifies that an import library should be generated which other modules can use to link with the current module.
-
-Syntax:
-	<importlibrary definition="MyModule.def" />
-
-Attributes:
-	definition - Filename of definition file (.def) used to generate the import library. The filename is relative to the current module.
-
-Value:
-	None.
-
-Elements:
-	None.
-
-
-Include element
----------------
-An include element specifies an include directory for the C/C++ compiler and resource compiler.
-
-Syntax:
-	<include base="MyLibraryModule">include</include>
-
-Attributes:
-	base - Module or project which the value of this element is relative to. This attribute is optional. If left out, the include directory is relative to the position of the top-level xml build file.
-
-Value:
-	Relative include directory.
-
-Elements:
-	None.
-
-
-Installfile element
--------------------
-An installfile element specifies the name of a file that is to be installed when using 'make install'.
-
-Syntax:
-	<installfile base="reactos" newname="ReadMe.txt">ReadMe.txt</installfile>
-
-Attributes:
-	base - Put file in this directory within the install directory. This attribute is optional.
-	newname - Name of file within the install directory. This attribute is optional.
-
-Value:
-	Name of file.
-
-Elements:
-	None.
-
-
-Invoke element
---------------
-An invoke element specifies the name of a module which is to be executed before the current module is processed.
-
-Syntax:
-	<invoke module="wmc">
-		<input>
-			<inputfile>ntoskrnl.mc</inputfile>
-		</input>
-		<output>
-			<outputfile switches="-H">../include/reactos/bugcodes.h</outputfile>
-			<outputfile switches="-o">bugcodes.rc</outputfile>
-		</output>
-	</invoke>
-
-Attributes:
-	None.
-
-Value:
-	Name of the module to execute.
-
-Elements:
-	input, output.
-
-
-Input element
--------------
-An input element specifies a group of filenames that is to be passed as parameters to a build tool. Input filename parameters are located after output filename parameters on the command line. 
-
-Attributes:
-	None.
-
-Value:
-	None.
-
-Elements:
-	inputfile.
-
-
-Inputfile element
------------------
-An inputfile element specifies a filename that is to be passed as a parameter to a build tool.
-
-Attributes:
-	switches - Switches that is passed as parameters just before the filename. This attribute is optional.
-
-Value:
-	Name of file that is to be passed as a parameter to the build tool.
-
-Elements:
-	None.
-
-
-Output element
---------------
-An output element specifies a group of filenames that is to be passed as parameters to a build tool. Output filename parameters are located before input filename parameters on the command line. 
-
-Attributes:
-	None.
-
-Value:
-	None.
-
-Elements:
-	outputfile.
-
-
-Outputfile element
-------------------
-An outputfile element specifies a filename that is to be passed as a parameter to a build tool.
-
-Attributes:
-	switches - Switches that is passed as parameters just before the filename. This attribute is optional.
-
-Value:
-	Name of file that is to be passed as a parameter to the build tool.
-
-Elements:
-	None.
-
-
-Library
--------
-An importlibrary element specifies the name of another module which is to be linked with the current module.
-
-Syntax:
-	<library>MyLibraryModule</library>
-
-Attributes:
-	None.
-
-Value:
-	Name of the module to link with.
-
-Elements:
-	None.
-
-
-Property
---------
-A property element specifies the name and value of a property that can be used for conditional processing of the xml build file.
-
-Syntax:
-	<property name="mypropertyname" value="mypropertyvalue" />
-
-Attributes:
-	name - Name of property.
-	value - Value of property.
-
-Value:
-	None.
-
-Elements:
-	None.
+ReactOS Build System Documentation
+==================================
+
+Building ReactOS
+----------------
+To generate GNU make makefiles and building ReactOS do the following:
+
+	1) Go to the top-level reactos directory
+	2) Run the command: mingw32-make
+
+This will start building ReactOS.
+
+To build a bootable CD run the following command:
+
+	mingw32-make bootcd
+
+This will create ReactOS.iso in the top-level reactos directory.
+
+
+Top-level XML Build File
+------------------------
+The top-level xml build file (ReactOS.xml) is processed by rbuild. The following is an example of how it could look like:
+
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="config.xml">
+		<xi:fallback>
+			<xi:include href="config.template.xml" />
+		</xi:fallback>
+	</xi:include>
+
+	<define name="_M_IX86" />
+	<if property="DBG" value="1">
+		<define name="DBG" value="1" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+
+	<include base="ReactOS">include</include>
+
+	<directory name="boot">
+		<xi:include href="boot/boot.xml" />
+	</directory>
+
+	<module name="bootcd" type="iso">
+	</module>
+</project>
+
+
+xi:include
+----------
+It is possible to split an xml build file over several files. The include element in the xi namespace is used to accomplish this.
+
+Syntax:
+	<xi:include href="config.xml">
+		<xi:fallback>
+			<xi:include href="config.template.xml" />
+		</xi:fallback>
+	</xi:include>
+
+Attributes:
+	href - Name of xml build file to include. The filename is relative to the location of the current xml build file.
+
+Value:
+	None.
+
+Elements:
+	xi:fallback
+
+
+xi:fallback
+-----------
+This element is used to provide the name of an alternate file that is to be included if the first include file did not exists.
+
+Attributes:
+	None.
+
+Value:
+	None.
+
+Elements:
+	xi:include.
+
+
+Project element
+---------------
+There can be one project per top-level XML build file. A project can only be defined in a top-level xml build file.
+
+Syntax:
+	<project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+		...
+	</project>
+
+Attributes:
+	name - Name of the project.
+	makefile - Filename of the GNU makefile that is to be created.
+
+Value:
+	None.
+
+Elements:
+	define, directory, if, include, module, property
+
+
+Module element
+--------------
+There can be zero or more modules per xml build file.
+
+Syntax:
+	<module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" baseaddress="0x70000000" mangledsymbols="true" installbase="system32" installname="msvcrt.dll" usewrc="false" warnings="true">
+		...
+	</module>
+
+Attributes:
+	name - Name of the module. Also the base name of the generated file if such file is generated for the particular module type.
+	type - Type of module. See below for an explanation of module types.
+	extension - Extension of the generated file if such file is generated for the particular module type.
+	entrypoint - Entrypoint symbol of the generated file if such file is generated for the particular module type.
+	baseaddress - Base address of the generated file if such file is generated for the particular module type.
+	mangledsymbols - Controls wether or not to pass --kill-at to dlltool. If this attribute has the value false then --kill-at is passed to dlltool. If the value is true, then --kill-at is not passed to dlltool. If the generated file exports C++ classes then this need to be true.
+	installbase - Base directory of the generated file in the installation directory. This attribute is optional.
+	installname - Name of generated file in the installation directory. This attribute is optional, but if not specified, the generated file is not copied to the installation directory.
+	usewrc - Use WRC to compile resources if true. If false, windres is used. This attribute is optional. If not specified, WRC will be used.
+	warnings - Error out if false and at least one warning is emitted during building of this module. This attribute is optional. If not specified, it is assumed to be false.
+
+Value:
+	None.
+
+Elements:
+	bootstrap, component, define, dependency, directory, file, if, importlibrary, include, invoke, library, property.
+
+
+Module types
+------------
+The module type determines the actions that is to be carried out to process the module. The defined module types are seen below:
+	buildtool - Builds a tool that can be run (invoked) when building ReactOS. Default extension is .exe when building on Windows and nothing when building on Linux. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+	staticlibrary - Builds a static library containing object files that can be linked together with other modules. Default extension is .a. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+	objectlibrary - Builds object files that can be linked together with other modules. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+	kernel - Builds ntoskrnl.exe. Default extension is .exe. Default entrypoint is _NtProcessStartup. 
+	kernelmodedll - Builds a kernel-mode DLL. Default extension is .dll. Default entrypoint is _DriverEntry@8.
+	kernelmodedriver - Builds a kernel-mode driver. Default extension is .sys. Default entrypoint is _DriverEntry@8.
+	nativedll - Builds a native DLL. Default extension is .dll. Default entrypoint is _DllMainCRTStartup@12.
+	win32dll - Builds a Win32 DLL. Default extension is .dll. Default entrypoint is _DllMain@12.
+	win32cui - Builds a Win32 console executable. Default extension is .exe. Default entrypoint is _mainCRTStartup. The baseaddress module attribute is not applicable for this module type.
+	win32gui - Builds a Win32 GUI executable. Default extension is .exe. Default entrypoint is _WinMainCRTStartup. The baseaddress module attribute is not applicable for this module type.
+	bootloader - Builds a bootloader. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+	bootsector - Builds one or more bootsector binaries. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+	iso - Builds a bootable CD. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+	test - Builds a testsuite. Default extension is .exe. Default entrypoint is _mainCRTStartup. The baseaddress module attribute is not applicable for this module type.
+	rpcserver - Generates and builds server code for an RPC interface. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+	rpcclient - Generates and builds client code for an RPC interface. Default extension is .o. The entrypoint, baseaddress, and mangledsymbols module attributes are not applicable for this module type.
+
+
+Bootstrap element
+-----------------
+A bootstrap element specifies that the generated file should be put on the bootable CD as a bootstrap file.
+
+Syntax:
+	<bootstrap base="reactos" nameoncd="halmp.dll" />
+
+Attributes:
+	base - Put file in this directory on the bootable CD. This attribute is optional.
+	nameoncd - Name of file on the bootable CD. This attribute is optional.
+
+Value:
+	None.
+
+Elements:
+	None.
+
+
+CDFile element
+--------------
+A cdfile element specifies the name of a file that is to be put on the bootable CD.
+
+Syntax:
+	<cdfile base="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile>
+
+Attributes:
+	base - Put file in this directory on the bootable CD. This attribute is optional.
+	nameoncd - Name of file on the bootable CD. This attribute is optional.
+
+Value:
+	Name of file.
+
+Elements:
+	None.
+
+
+Component element
+-----------------
+A component element specifies that imports from a library are to be stubbed so tests can be run without actually calling the functions in the library. This element can only be used for modules of type test.
+
+Syntax:
+	<component name="ntdll.dll">
+		...
+	</component>
+
+Attributes:
+	name - Name of library.
+
+Value:
+	None.
+
+Elements:
+	Symbol.
+
+
+Symbol element
+--------------
+A symbol element specifies an imported function from a library that is to be stubbed so tests can be run without actually calling the function in the library.
+
+Syntax:
+	<symbol newname="RtlAllocateHeap">HeapAlloc@12</symbol>
+
+Attributes:
+	newname - New name of symbol. This attribute is optional.
+
+Value:
+	Name of symbol.
+
+Elements:
+	None.
+
+
+Define element
+--------------
+A define element specifies the name and (optionally) value of a define for the C/C++ compiler and resource compiler.
+
+Syntax:
+	<define name="WINVER">0x501</define>
+
+Attributes:
+	name - Name of define.
+
+Value:
+	Value of define. The value is optional.
+
+Elements:
+	None.
+
+
+Dependency element
+------------------
+A dependency element specifies the name of a module (usually of type buildtool) that is to be processed before the current module.
+
+Syntax:
+	<dependency>OtherModule</dependency>
+
+Attributes:
+	None.
+
+Value:
+	Name of module.
+
+Elements:
+	None.
+
+
+Directory element
+-----------------
+A directory element specifies the name of a subdirectory.
+
+Syntax:
+	<directory name="MyDirectory">
+		...
+	</directory>
+
+Attributes:
+	name - Name of directory.
+
+Value:
+	None.
+
+Elements:
+	cdfile, directory, file, if, property.
+
+
+File element
+------------
+A file element specifies the name of a file that is to be processed.
+
+Syntax:
+	<file>MyFile.c</file>
+
+Attributes:
+	None.
+
+Value:
+	Name of file.
+
+Elements:
+	None.
+
+
+If element
+----------
+An if element allows for conditional processing of other elements.
+
+Syntax:
+	<if property="DBG" value="1">
+		...
+	</if>
+
+Attributes:
+	property - Name of the property that is to be evaluated.
+	value - Value to compare to the value of the property. If the property has the specified value, then the subelements are processed.
+
+Value:
+	None.
+
+Elements:
+	define, directory, file, if, include, property.
+
+
+Importlibrary element
+---------------------
+An importlibrary element specifies that an import library should be generated which other modules can use to link with the current module.
+
+Syntax:
+	<importlibrary definition="MyModule.def" />
+
+Attributes:
+	definition - Filename of definition file (.def) used to generate the import library. The filename is relative to the current module.
+
+Value:
+	None.
+
+Elements:
+	None.
+
+
+Include element
+---------------
+An include element specifies an include directory for the C/C++ compiler and resource compiler.
+
+Syntax:
+	<include base="MyLibraryModule">include</include>
+
+Attributes:
+	base - Module or project which the value of this element is relative to. This attribute is optional. If left out, the include directory is relative to the position of the top-level xml build file.
+
+Value:
+	Relative include directory.
+
+Elements:
+	None.
+
+
+Installfile element
+-------------------
+An installfile element specifies the name of a file that is to be installed when using 'make install'.
+
+Syntax:
+	<installfile base="reactos" newname="ReadMe.txt">ReadMe.txt</installfile>
+
+Attributes:
+	base - Put file in this directory within the install directory. This attribute is optional.
+	newname - Name of file within the install directory. This attribute is optional.
+
+Value:
+	Name of file.
+
+Elements:
+	None.
+
+
+Invoke element
+--------------
+An invoke element specifies the name of a module which is to be executed before the current module is processed.
+
+Syntax:
+	<invoke module="wmc">
+		<input>
+			<inputfile>ntoskrnl.mc</inputfile>
+		</input>
+		<output>
+			<outputfile switches="-H">../include/reactos/bugcodes.h</outputfile>
+			<outputfile switches="-o">bugcodes.rc</outputfile>
+		</output>
+	</invoke>
+
+Attributes:
+	None.
+
+Value:
+	Name of the module to execute.
+
+Elements:
+	input, output.
+
+
+Input element
+-------------
+An input element specifies a group of filenames that is to be passed as parameters to a build tool. Input filename parameters are located after output filename parameters on the command line. 
+
+Attributes:
+	None.
+
+Value:
+	None.
+
+Elements:
+	inputfile.
+
+
+Inputfile element
+-----------------
+An inputfile element specifies a filename that is to be passed as a parameter to a build tool.
+
+Attributes:
+	switches - Switches that is passed as parameters just before the filename. This attribute is optional.
+
+Value:
+	Name of file that is to be passed as a parameter to the build tool.
+
+Elements:
+	None.
+
+
+Output element
+--------------
+An output element specifies a group of filenames that is to be passed as parameters to a build tool. Output filename parameters are located before input filename parameters on the command line. 
+
+Attributes:
+	None.
+
+Value:
+	None.
+
+Elements:
+	outputfile.
+
+
+Outputfile element
+------------------
+An outputfile element specifies a filename that is to be passed as a parameter to a build tool.
+
+Attributes:
+	switches - Switches that is passed as parameters just before the filename. This attribute is optional.
+
+Value:
+	Name of file that is to be passed as a parameter to the build tool.
+
+Elements:
+	None.
+
+
+Library
+-------
+An importlibrary element specifies the name of another module which is to be linked with the current module.
+
+Syntax:
+	<library>MyLibraryModule</library>
+
+Attributes:
+	None.
+
+Value:
+	Name of the module to link with.
+
+Elements:
+	None.
+
+
+Property
+--------
+A property element specifies the name and value of a property that can be used for conditional processing of the xml build file.
+
+Syntax:
+	<property name="mypropertyname" value="mypropertyvalue" />
+
+Attributes:
+	name - Name of property.
+	value - Value of property.
+
+Value:
+	None.
+
+Elements:
+	None.
diff --git a/reactos/tools/rbuild/ssprintf.cpp b/reactos/tools/rbuild/ssprintf.cpp
index d8c415fc965..5085f2d30e7 100644
--- a/reactos/tools/rbuild/ssprintf.cpp
+++ b/reactos/tools/rbuild/ssprintf.cpp
@@ -1,1917 +1,1917 @@
-// ssprintf.cpp
-
-#include "pch.h"
-
-#include <malloc.h>
-#include <math.h>
-#include <float.h>
-#include <assert.h>
-#include "ssprintf.h"
-
-#ifdef _MSC_VER
-#define alloca _alloca
-#endif//_MSC_VER
-
-#ifdef _MSC_VER
-typedef __int64 LONGLONG;
-typedef unsigned __int64 ULONGLONG;
-#else
-typedef long long LONGLONG;
-typedef unsigned long long ULONGLONG;
-#endif
-
-typedef struct {
-    unsigned int mantissa:23;
-    unsigned int exponent:8;
-    unsigned int sign:1;
-} ieee_float_t;
-
-typedef struct {
-    unsigned int mantissal:32;
-    unsigned int mantissah:20;
-    unsigned int exponent:11;
-    unsigned int sign:1;
-} ieee_double_t;
-
-typedef struct {
-    unsigned int mantissal:32;
-    unsigned int mantissah:32;
-    unsigned int exponent:15;
-    unsigned int sign:1;
-    unsigned int empty:16;
-} ieee_long_double_t;
-
-std::string
-ssprintf ( const char* fmt, ... )
-{
-	va_list arg;
-	va_start(arg, fmt);
-	std::string f = ssvprintf ( fmt, arg );
-	va_end(arg);
-	return f;
-}
-
-std::wstring
-sswprintf ( const wchar_t* fmt, ... )
-{
-	va_list arg;
-	va_start(arg, fmt);
-	std::wstring f = sswvprintf ( fmt, arg );
-	va_end(arg);
-	return f;
-}
-
-#define ZEROPAD		1	/* pad with zero */
-#define SIGN		2	/* unsigned/signed long */
-#define PLUS		4	/* show plus */
-#define SPACE		8	/* space if plus */
-#define LEFT		16	/* left justified */
-#define SPECIAL		32	/* 0x */
-#define LARGE		64	/* use 'ABCDEF' instead of 'abcdef' */
-#define ZEROTRUNC	128	/* truncate zero 's */
-
-
-static int
-skip_atoi(const char **s)
-{
-	int i=0;
-
-	while (isdigit(**s))
-		i = i*10 + *((*s)++) - '0';
-	return i;
-}
-
-static int
-skip_wtoi(const wchar_t **s)
-{
-	int i=0;
-
-	while (iswdigit(**s))
-		i = i*10 + *((*s)++) - L'0';
-	return i;
-}
-
-
-static int
-do_div(LONGLONG *n,int base)
-{
-	int __res = ((ULONGLONG) *n) % (unsigned) base;
-	*n = ((ULONGLONG) *n) / (unsigned) base;
-	return __res;
-}
-
-
-static bool
-number(std::string& f, LONGLONG num, int base, int size, int precision ,int type)
-{
-	char c,sign,tmp[66];
-	const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
-	int i;
-
-	if (type & LARGE)
-		digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	if (type & LEFT)
-		type &= ~ZEROPAD;
-	if (base < 2 || base > 36)
-		return 0;
-	c = (type & ZEROPAD) ? '0' : ' ';
-	sign = 0;
-	if (type & SIGN) {
-		if (num < 0) {
-			sign = '-';
-			num = -num;
-			size--;
-		} else if (type & PLUS) {
-			sign = '+';
-			size--;
-		} else if (type & SPACE) {
-			sign = ' ';
-			size--;
-		}
-	}
-	if (type & SPECIAL) {
-		if (base == 16)
-			size -= 2;
-		else if (base == 8)
-			size--;
-	}
-	i = 0;
-	if (num == 0)
-		tmp[i++]='0';
-	else while (num != 0)
-		tmp[i++] = digits[do_div(&num,base)];
-	if (i > precision)
-		precision = i;
-	size -= precision;
-	if (!(type&(ZEROPAD+LEFT)))
-		while(size-->0)
-			f += ' ';
-	if (sign)
-		f += sign;
-	if (type & SPECIAL)
-	{
-		if (base==8)
-			f += '0';
-		else if (base==16)
-		{
-			f += '0';
-			f += digits[33];
-		}
-	}
-	if (!(type & LEFT))
-	{
-		while (size-- > 0)
-			f += c;
-	}
-	while (i < precision--)
-	{
-		f += '0';
-	}
-	while (i-- > 0)
-	{
-		f += tmp[i];
-	}
-	while (size-- > 0)
-	{
-		f += ' ';
-	}
-	return true;
-}
-
-static bool
-wnumber(std::wstring& f, LONGLONG num, int base, int size, int precision ,int type)
-{
-	wchar_t c,sign,tmp[66];
-	const wchar_t *digits = L"0123456789abcdefghijklmnopqrstuvwxyz";
-	int i;
-
-	if (type & LARGE)
-		digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	if (type & LEFT)
-		type &= ~ZEROPAD;
-	if (base < 2 || base > 36)
-		return 0;
-	c = (type & ZEROPAD) ? L'0' : L' ';
-	sign = 0;
-	if (type & SIGN) {
-		if (num < 0) {
-			sign = L'-';
-			num = -num;
-			size--;
-		} else if (type & PLUS) {
-			sign = L'+';
-			size--;
-		} else if (type & SPACE) {
-			sign = L' ';
-			size--;
-		}
-	}
-	if (type & SPECIAL) {
-		if (base == 16)
-			size -= 2;
-		else if (base == 8)
-			size--;
-	}
-	i = 0;
-	if (num == 0)
-		tmp[i++]=L'0';
-	else while (num != 0)
-		tmp[i++] = digits[do_div(&num,base)];
-	if (i > precision)
-		precision = i;
-	size -= precision;
-	if (!(type&(ZEROPAD+LEFT)))
-		while(size-->0)
-			f += L' ';
-	if (sign)
-		f += sign;
-	if (type & SPECIAL)
-	{
-		if (base==8)
-			f += L'0';
-		else if (base==16)
-		{
-			f += L'0';
-			f += digits[33];
-		}
-	}
-	if (!(type & LEFT))
-	{
-		while (size-- > 0)
-			f += c;
-	}
-	while (i < precision--)
-	{
-		f += L'0';
-	}
-	while (i-- > 0)
-	{
-		f += tmp[i];
-	}
-	while (size-- > 0)
-	{
-		f += L' ';
-	}
-	return true;
-}
-
-
-static bool
-numberf(std::string& f, double __n, char exp_sign,  int size, int precision, int type)
-{
-	double exponent = 0.0;
-	double e;
-	long ie;
-
-	//int x;
-	char *buf, *tmp;
-	int i = 0;
-	int j = 0;
-	//int k = 0;
-
-	double frac, intr;
-	double p;
-	char sign;
-	char c;
-	char ro = 0;
-	int result;
-
-	union
-	{
-		double*  __n;
-		ieee_double_t*  n;
-	} n;
-	
-	n.__n = &__n;
-
-	if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) {
-		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff);
-		exponent = ie/3.321928;
-	}
-
-	if ( exp_sign == 'g' || exp_sign == 'G' ) {
-		type |= ZEROTRUNC;
-		if ( exponent < -4 || fabs(exponent) >= precision )
-			 exp_sign -= 2; // g -> e and G -> E
-	}
-
-	if ( exp_sign == 'e' ||  exp_sign == 'E' ) {
-		frac = modf(exponent,&e);
-		if ( frac > 0.5 )
-			e++;
-		else if (  frac < -0.5  )
-			e--;
-
-		result = numberf(f,__n/pow(10.0L,e),'f',size-4, precision, type);
-		if (result < 0)
-			return false;
-		f += exp_sign;
-		size--;
-		ie = (long)e;
-		type = LEFT | PLUS;
-		if ( ie < 0 )
-			type |= SIGN;
-
-		result = number(f,ie, 10,2, 2,type );
-		if (result < 0)
-			return false;
-		return true;
-	}
-
-	if ( exp_sign == 'f' ) {
-		buf = (char*)alloca(4096);
-		if (type & LEFT) {
-			type &= ~ZEROPAD;
-		}
-
-		c = (type & ZEROPAD) ? '0' : ' ';
-		sign = 0;
-		if (type & SIGN) {
-			if (__n < 0) {
-				sign = '-';
-				__n = fabs(__n);
-				size--;
-			} else if (type & PLUS) {
-				sign = '+';
-				size--;
-			} else if (type & SPACE) {
-				sign = ' ';
-				size--;
-			}
-		}
-
-		frac = modf(__n,&intr);
-
-		// # flags forces a . and prevents trucation of trailing zero's
-
-		if ( precision > 0 ) {
-			//frac = modfl(__n,&intr);
-			i = precision-1;
-			while (  i >= 0  ) {
-				frac*=10.0L;
-				frac = modf(frac, &p);
-				buf[i] = (int)p + '0';
-				i--;
-			}
-			i = precision;
-			size -= precision;
-
-			ro = 0;
-			if ( frac > 0.5 ) {
-				ro = 1;
-			}
-
-			if ( precision >= 1 || type & SPECIAL) {
-				buf[i++] = '.';
-				size--;
-			}
-		}
-
-		if ( intr == 0.0 ) {
-			buf[i++] = '0';
-			size--;
-		}
-		else {
-			while ( intr > 0.0 ) {
-			        p = intr;
-				intr/=10.0L;
-				modf(intr, &intr);
-
-				p -= 10.0*intr;
-
-				buf[i++] = (int)p + '0';
-				size--;
-			}
-		}
-
-		j = 0;
-		while ( j < i && ro == 1) {
-			if ( buf[j] >= '0' && buf[j] <= '8' ) {
-				buf[j]++;
-				ro = 0;
-			}
-			else if ( buf[j] == '9' ) {
-				buf[j] = '0';
-			}
-			j++;
-		}
-		if ( ro == 1 )
-			buf[i++] = '1';
-
-		buf[i] = 0;
-
-		size -= precision;
-		if (!(type&(ZEROPAD+LEFT)))
-		{
-			while(size-->0)
-				f += ' ';
-		}
-		if (sign)
-		{
-			f += sign;
-		}
-
-		if (!(type&(ZEROPAD+LEFT)))
-			while(size-->0)
-			{
-				f += ' ';
-			}
-		if (type & SPECIAL) {
-		}
-
-		if (!(type & LEFT))
-			while (size-- > 0)
-			{
-				f += c;
-			}
-
-		tmp = buf;
-		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
-		{
-			j = 0;
-			while ( j < i && ( *tmp == '0' || *tmp == '.' ))
-			{
-				tmp++;
-				i--;
-			}
-		}
-//		else
-//			while (i < precision--)
-//				putc('0', f);
-		while (i-- > 0)
-		{
-			f += tmp[i];
-		}
-		while (size-- > 0)
-		{
-			f += ' ';
-		}
-	}
-	return true;
-}
-
-static bool
-wnumberf(std::wstring& f, double __n, wchar_t exp_sign,  int size, int precision, int type)
-{
-	double exponent = 0.0;
-	double e;
-	long ie;
-
-	int i = 0;
-	int j = 0;
-
-	double frac, intr;
-	double p;
-	wchar_t *buf, *tmp, sign, c, ro = 0;
-	int result;
-
-	union
-	{
-		double*  __n;
-		ieee_double_t*  n;
-	} n;
-	
-	n.__n = &__n;
-
-	if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) {
-		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff);
-		exponent = ie/3.321928;
-	}
-
-	if ( exp_sign == L'g' || exp_sign == L'G' )
-	{
-		type |= ZEROTRUNC;
-		if ( exponent < -4 || fabs(exponent) >= precision )
-			 exp_sign -= 2; // g -> e and G -> E
-	}
-
-	if ( exp_sign == L'e' ||  exp_sign == L'E' )
-	{
-		frac = modf(exponent,&e);
-		if ( frac > 0.5 )
-			e++;
-		else if (  frac < -0.5  )
-			e--;
-
-		result = wnumberf(f,__n/pow(10.0L,e),L'f',size-4, precision, type);
-		if (result < 0)
-			return false;
-		f += exp_sign;
-		size--;
-		ie = (long)e;
-		type = LEFT | PLUS;
-		if ( ie < 0 )
-			type |= SIGN;
-
-		result = wnumber(f,ie, 10,2, 2,type );
-		if (result < 0)
-			return false;
-		return true;
-	}
-
-	if ( exp_sign == L'f' )
-	{
-		buf = (wchar_t*)alloca(4096*sizeof(wchar_t));
-		if (type & LEFT)
-			type &= ~ZEROPAD;
-
-		c = (type & ZEROPAD) ? L'0' : L' ';
-		sign = 0;
-		if (type & SIGN)
-		{
-			if (__n < 0)
-			{
-				sign = L'-';
-				__n = fabs(__n);
-				size--;
-			}
-			else if (type & PLUS)
-			{
-				sign = L'+';
-				size--;
-			}
-			else if (type & SPACE)
-			{
-				sign = L' ';
-				size--;
-			}
-		}
-
-		frac = modf(__n,&intr);
-
-		// # flags forces a . and prevents trucation of trailing zero's
-
-		if ( precision > 0 ) {
-			//frac = modfl(__n,&intr);
-			i = precision-1;
-			while (  i >= 0  ) {
-				frac*=10.0L;
-				frac = modf(frac, &p);
-				buf[i] = (int)p + L'0';
-				i--;
-			}
-			i = precision;
-			size -= precision;
-
-			ro = 0;
-			if ( frac > 0.5 ) {
-				ro = 1;
-			}
-
-			if ( precision >= 1 || type & SPECIAL) {
-				buf[i++] = L'.';
-				size--;
-			}
-		}
-
-		if ( intr == 0.0 ) {
-			buf[i++] = L'0';
-			size--;
-		}
-		else {
-			while ( intr > 0.0 ) {
-				p = intr;
-				intr/=10.0L;
-				modf(intr, &intr);
-
-				p -= 10.0*intr;
-
-				buf[i++] = (int)p + L'0';
-				size--;
-			}
-		}
-
-		j = 0;
-		while ( j < i && ro == 1) {
-			if ( buf[j] >= L'0' && buf[j] <= L'8' ) {
-				buf[j]++;
-				ro = 0;
-			}
-			else if ( buf[j] == L'9' ) {
-				buf[j] = L'0';
-			}
-			j++;
-		}
-		if ( ro == 1 )
-			buf[i++] = L'1';
-
-		buf[i] = 0;
-
-		size -= precision;
-		if (!(type&(ZEROPAD+LEFT)))
-		{
-			while(size-->0)
-				f += L' ';
-		}
-		if (sign)
-		{
-			f += sign;
-		}
-
-		if (!(type&(ZEROPAD+LEFT)))
-			while(size-->0)
-			{
-				f += L' ';
-			}
-		if (type & SPECIAL) {
-		}
-
-		if (!(type & LEFT))
-			while (size-- > 0)
-			{
-				f += c;
-			}
-
-		tmp = buf;
-		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
-		{
-			j = 0;
-			while ( j < i && ( *tmp == L'0' || *tmp == L'.' ))
-			{
-				tmp++;
-				i--;
-			}
-		}
-		while (i-- > 0)
-		{
-			f += tmp[i];
-		}
-		while (size-- > 0)
-		{
-			f += L' ';
-		}
-	}
-	return true;
-}
-
-static bool
-numberfl(std::string& f, long double __n, char exp_sign,  int size, int precision, int type)
-{
-	long double exponent = 0.0;
-	long double e;
-	long ie;
-
-	//int x;
-	char *buf, *tmp;
-	int i = 0;
-	int j = 0;
-	//int k = 0;
-
-	long double frac, intr;
-	long double p;
-	char sign;
-	char c;
-	char ro = 0;
-
-	int result;
-
-	union
-	{
-	    long double*   __n;
-	    ieee_long_double_t*   n;
-	} n;
-
-	n.__n = &__n;
-
-	if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) {
-		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff);
-		exponent = ie/3.321928;
-	}
-
-	if ( exp_sign == 'g' || exp_sign == 'G' ) {
-		type |= ZEROTRUNC;
-		if ( exponent < -4 || fabs(exponent) >= precision ) 
-			 exp_sign -= 2; // g -> e and G -> E
-	}
-
-	if ( exp_sign == 'e' || exp_sign == 'E' ) {
-		frac = modfl(exponent,&e);
-		if ( frac > 0.5 )
-			e++;
-		else if ( frac < -0.5 )
-			e--;
-
-		result = numberf(f,__n/powl(10.0L,e),'f',size-4, precision, type);
-		if (result < 0)
-			return false;
-		f += exp_sign;
-		size--;
-		ie = (long)e;
-		type = LEFT | PLUS;
-		if ( ie < 0 )
-			type |= SIGN;
-
-		result = number(f,ie, 10,2, 2,type );
-		if (result < 0)
-			return false;
-		return true;
-	}
-
-	if ( exp_sign == 'f' )
-	{
-		
-		buf = (char*)alloca(4096);
-		if (type & LEFT)
-		{
-			type &= ~ZEROPAD;
-		}
-
-		c = (type & ZEROPAD) ? '0' : ' ';
-		sign = 0;
-		if (type & SIGN)
-		{
-			if (__n < 0)
-			{
-				sign = '-';
-				__n = fabs(__n);
-				size--;
-			} else if (type & PLUS)
-			{
-				sign = '+';
-				size--;
-			} else if (type & SPACE)
-			{
-				sign = ' ';
-				size--;
-			}
-		}
-
-		frac = modfl(__n,&intr);
-
-		// # flags forces a . and prevents trucation of trailing zero's
-		if ( precision > 0 )
-		{
-			//frac = modfl(__n,&intr);
-
-			i = precision-1;
-			while ( i >= 0  )
-			{
-				frac*=10.0L;
-				frac = modfl((long double)frac, &p);
-				buf[i] = (int)p + '0';
-				i--;
-			}
-			i = precision;
-			size -= precision;
-
-			ro = 0;
-			if ( frac > 0.5 )
-			{
-				ro = 1;
-			}
-
-			if ( precision >= 1 || type & SPECIAL)
-			{
-				buf[i++] = '.';
-				size--;
-			}
-		}
-
-		if ( intr == 0.0 )
-		{
-			buf[i++] = '0';
-			size--;
-		}
-		else
-		{
-			while ( intr > 0.0 )
-			{
-			        p=intr;
-				intr/=10.0L;
-				modfl(intr, &intr);
-
-				p -= 10.0L*intr;
-
-				buf[i++] = (int)p + '0';
-				size--;
-			}
-		}
-
-		j = 0;
-		while ( j < i && ro == 1) {
-			if ( buf[j] >= '0' && buf[j] <= '8' )
-			{
-				buf[j]++;
-				ro = 0;
-			}
-			else if ( buf[j] == '9' )
-			{
-				buf[j] = '0';
-			}
-			j++;
-		}
-		if ( ro == 1 )
-			buf[i++] = '1';
-
-		buf[i] = 0;
-
-		size -= precision;
-		if (!(type&(ZEROPAD+LEFT)))
-		{
-			while(size-->0)
-				f += ' ';
-		}
-		if (sign)
-		{
-			f += sign;
-		}
-
-		if (!(type&(ZEROPAD+LEFT)))
-		{
-			while(size-->0)
-				f += ' ';
-		}
-		if (type & SPECIAL) {
-		}
-
-		if (!(type & LEFT))
-			while (size-- > 0)
-			{
-				f += c;
-			}
-		tmp = buf;
-		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
-		{
-			j = 0;
-			while ( j < i && ( *tmp == '0' || *tmp == '.' ))
-			{
-				tmp++;
-				i--;
-			}
-		}
-		while (i-- > 0)
-		{
-			f += tmp[i];
-		}
-		while (size-- > 0)
-		{
-			f += ' ';
-		}
-	}
-	return true;
-}
-
-static bool
-wnumberfl(std::wstring& f, long double __n, wchar_t exp_sign,  int size, int precision, int type)
-{
-	long double exponent = 0.0;
-	long double e;
-	long ie;
-
-	wchar_t *buf, *tmp, sign, c, ro = 0;
-	int i = 0;
-	int j = 0;
-
-	long double frac, intr;
-	long double p;
-
-	int result;
-
-	union
-	{
-	    long double*   __n;
-	    ieee_long_double_t*   n;
-	} n;
-
-	n.__n = &__n;
-
-	if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) {
-		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff);
-		exponent = ie/3.321928;
-	}
-
-	if ( exp_sign == L'g' || exp_sign == L'G' ) {
-		type |= ZEROTRUNC;
-		if ( exponent < -4 || fabs(exponent) >= precision ) 
-			 exp_sign -= 2; // g -> e and G -> E
-	}
-
-	if ( exp_sign == L'e' || exp_sign == L'E' ) {
-		frac = modfl(exponent,&e);
-		if ( frac > 0.5 )
-			e++;
-		else if ( frac < -0.5 )
-			e--;
-
-		result = wnumberf(f,__n/powl(10.0L,e),L'f',size-4, precision, type);
-		if (result < 0)
-			return false;
-		f += exp_sign;
-		size--;
-		ie = (long)e;
-		type = LEFT | PLUS;
-		if ( ie < 0 )
-			type |= SIGN;
-
-		result = wnumber(f,ie, 10,2, 2,type );
-		if (result < 0)
-			return false;
-		return true;
-	}
-
-	if ( exp_sign == L'f' )
-	{
-		
-		buf = (wchar_t*)alloca(4096*sizeof(wchar_t));
-		if (type & LEFT)
-		{
-			type &= ~ZEROPAD;
-		}
-
-		c = (type & ZEROPAD) ? L'0' : L' ';
-		sign = 0;
-		if (type & SIGN)
-		{
-			if (__n < 0)
-			{
-				sign = L'-';
-				__n = fabs(__n);
-				size--;
-			} else if (type & PLUS)
-			{
-				sign = L'+';
-				size--;
-			} else if (type & SPACE)
-			{
-				sign = L' ';
-				size--;
-			}
-		}
-
-		frac = modfl(__n,&intr);
-
-		// # flags forces a . and prevents trucation of trailing zero's
-		if ( precision > 0 )
-		{
-			//frac = modfl(__n,&intr);
-
-			i = precision-1;
-			while ( i >= 0  )
-			{
-				frac*=10.0L;
-				frac = modfl((long double)frac, &p);
-				buf[i] = (int)p + L'0';
-				i--;
-			}
-			i = precision;
-			size -= precision;
-
-			ro = 0;
-			if ( frac > 0.5 )
-			{
-				ro = 1;
-			}
-
-			if ( precision >= 1 || type & SPECIAL)
-			{
-				buf[i++] = L'.';
-				size--;
-			}
-		}
-
-		if ( intr == 0.0 )
-		{
-			buf[i++] = L'0';
-			size--;
-		}
-		else
-		{
-			while ( intr > 0.0 )
-			{
-				p=intr;
-				intr/=10.0L;
-				modfl(intr, &intr);
-
-				p -= 10.0L*intr;
-
-				buf[i++] = (int)p + L'0';
-				size--;
-			}
-		}
-
-		j = 0;
-		while ( j < i && ro == 1) {
-			if ( buf[j] >= L'0' && buf[j] <= L'8' )
-			{
-				buf[j]++;
-				ro = 0;
-			}
-			else if ( buf[j] == L'9' )
-			{
-				buf[j] = L'0';
-			}
-			j++;
-		}
-		if ( ro == 1 )
-			buf[i++] = L'1';
-
-		buf[i] = 0;
-
-		size -= precision;
-		if (!(type&(ZEROPAD+LEFT)))
-		{
-			while(size-->0)
-				f += L' ';
-		}
-		if (sign)
-		{
-			f += sign;
-		}
-
-		if (!(type&(ZEROPAD+LEFT)))
-		{
-			while(size-->0)
-				f += L' ';
-		}
-		if (type & SPECIAL) {
-		}
-
-		if (!(type & LEFT))
-			while (size-- > 0)
-			{
-				f += c;
-			}
-		tmp = buf;
-		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
-		{
-			j = 0;
-			while ( j < i && ( *tmp == L'0' || *tmp == L'.' ))
-			{
-				tmp++;
-				i--;
-			}
-		}
-		while (i-- > 0)
-		{
-			f += tmp[i];
-		}
-		while (size-- > 0)
-		{
-			f += L' ';
-		}
-	}
-	return true;
-}
-
-static int
-do_string(std::string& f, const char* s, int len, int field_width, int precision, int flags)
-{
-	int i, done = 0;
-	if (s == NULL)
-	{
-		s = "<NULL>";
-		len = 6;
-	}
-	else
-	{
-		if (len == -1)
-		{
-			len = 0;
-			while ((unsigned int)len < (unsigned int)precision && s[len])
-				len++;
-		}
-		else
-		{
-			if ((unsigned int)len > (unsigned int)precision)
-				len = precision;
-		}
-	}
-	if (!(flags & LEFT))
-		while (len < field_width--)
-		{
-			f += ' ';
-			done++;
-		}
-	for (i = 0; i < len; ++i)
-	{
-		f += *s++;
-		done++;
-	}
-	while (len < field_width--)
-	{
-		f += ' ';
-		done++;
-	}
-	return done;
-}
-
-static int
-do_wstring(std::wstring& f, const wchar_t* s, int len, int field_width, int precision, int flags)
-{
-	int i, done = 0;
-	if (s == NULL)
-	{
-		s = L"<NULL>";
-		len = 6;
-	}
-	else
-	{
-		if (len == -1)
-		{
-			len = 0;
-			while ((unsigned int)len < (unsigned int)precision && s[len])
-				len++;
-		}
-		else
-		{
-			if ((unsigned int)len > (unsigned int)precision)
-				len = precision;
-		}
-	}
-	if (!(flags & LEFT))
-		while (len < field_width--)
-		{
-			f += L' ';
-			done++;
-		}
-	for (i = 0; i < len; ++i)
-	{
-		f += *s++;
-		done++;
-	}
-	while (len < field_width--)
-	{
-		f += L' ';
-		done++;
-	}
-	return done;
-}
-
-static int
-stringw(std::string& f, const wchar_t* sw, int len, int field_width, int precision, int flags)
-{
-	int i, done = 0;
-	if (sw == NULL)
-	{
-		sw = L"<NULL>";
-		len = 6;
-	}
-	else
-	{
-		if (len == -1)
-		{
-			len = 0;
-			while ((unsigned int)len < (unsigned int)precision && sw[len])
-				len++;
-		}
-		else
-		{
-			if ((unsigned int)len > (unsigned int)precision)
-				len = precision;
-		}
-	}
-	if (!(flags & LEFT))
-		while (len < field_width--)
-		{
-			f += ' ';
-			done++;
-		}
-	for (i = 0; i < len; ++i)
-	{
-#define MY_MB_CUR_MAX 1
-		char mb[MY_MB_CUR_MAX];
-		int mbcount, j;
-		mbcount = wctomb(mb, *sw++);
-		if (mbcount <= 0)
-		{
-			break;
-		}
-		for (j = 0; j < mbcount; j++)
-		{
-			f += mb[j];
-			done++;
-		}
-	}
-	while (len < field_width--)
-	{
-		f += ' ';
-		done++;
-	}
-	return done;
-}
-
-static int
-wstringa(std::wstring& f, const char* sa, int len, int field_width, int precision, int flags)
-{
-	int i, done = 0;
-	if (sa == NULL)
-	{
-		sa = "<NULL>";
-		len = 6;
-	}
-	else
-	{
-		if (len == -1)
-		{
-			len = 0;
-			while ((unsigned int)len < (unsigned int)precision && sa[len])
-				len++;
-		}
-		else
-		{
-			if ((unsigned int)len > (unsigned int)precision)
-				len = precision;
-		}
-	}
-	if (!(flags & LEFT))
-		while (len < field_width--)
-		{
-			f += L' ';
-			done++;
-		}
-	for (i = 0; i < len;)
-	{
-		wchar_t w;
-		int mbcount;
-		mbcount = mbtowc(&w, sa, len-i);
-		if (mbcount <= 0)
-			break;
-		f += w;
-		done++;
-		i += mbcount;
-	}
-	while (len < field_width--)
-	{
-		f += L' ';
-		done++;
-	}
-	return done;
-}
-
-#define _isnanl _isnan
-#define _finitel _finite
-
-std::string
-ssvprintf ( const char *fmt, va_list args )
-{
-	ULONGLONG num;
-	int base;
-	long double _ldouble;
-	double _double;
-	const char *s;
-	const wchar_t* sw;
-	int result;
-	std::string f;
-
-	int flags;		/* flags to number() */
-
-	int field_width;	/* width of output field */
-	int precision;		/* min. # of digits for integers; max
-				   number of chars for from string */
-	int qualifier = 0;	/* 'h', 'l', 'L' or 'I64' for integer fields */
-
-	for (; *fmt ; ++fmt)
-	{
-		if (*fmt != '%')
-		{
-			f += *fmt;
-			continue;
-		}
-
-		/* process flags */
-		flags = 0;
-		repeat:
-			++fmt;		/* this also skips first '%' */
-			switch (*fmt) {
-				case '-': flags |= LEFT; goto repeat;
-				case '+': flags |= PLUS; goto repeat;
-				case ' ': flags |= SPACE; goto repeat;
-				case '#': flags |= SPECIAL; goto repeat;
-				case '0': flags |= ZEROPAD; goto repeat;
-				}
-
-		/* get field width */
-		field_width = -1;
-		if (isdigit(*fmt))
-			field_width = skip_atoi(&fmt);
-		else if (*fmt == '*') {
-			++fmt;
-			/* it's the next argument */
-			field_width = va_arg(args, int);
-			if (field_width < 0) {
-				field_width = -field_width;
-				flags |= LEFT;
-			}
-		}
-
-		/* get the precision */
-		precision = -1;
-		if (*fmt == '.') {
-			++fmt;
-			if (isdigit(*fmt))
-				precision = skip_atoi(&fmt);
-			else if (*fmt == '*') {
-				++fmt;
-				/* it's the next argument */
-				precision = va_arg(args, int);
-			}
-			if (precision < 0)
-				precision = 0;
-		}
-
-		/* get the conversion qualifier */
-		qualifier = 0;
-		// %Z can be just stand alone or as size_t qualifier
-		if ( *fmt == 'Z' ) {
-			qualifier = *fmt;
-			switch ( *(fmt+1)) {
-				case 'o':
-				case 'b':
-				case 'X':
-				case 'x':
-				case 'd':
-				case 'i':
-				case 'u':
-					++fmt;
-					break;
-				default:
-					break;
-			}
-		} else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') {
-			qualifier = *fmt;
-			++fmt;
-		} else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') {
-			qualifier = *fmt;
-			fmt += 3;
-		}
-
-		// go fine with ll instead of L
-		if ( *fmt == 'l' ) {
-			++fmt;
-			qualifier = 'L';
-		}
-
-		/* default base */
-		base = 10;
-
-		switch (*fmt) {
-		case 'c':
-			if (!(flags & LEFT))
-				while (--field_width > 0)
-				{
-					f += ' ';
-				}
-			if (qualifier == 'l' || qualifier == 'w')
-			{
-				f += (char)(unsigned char)(wchar_t) va_arg(args,int);
-			}
-			else
-			{
-				f += (char)(unsigned char) va_arg(args,int);
-			}
-			while (--field_width > 0)
-			{
-				f += ' ';
-			}
-			continue;
-
-		case 'C':
-			if (!(flags & LEFT))
-				while (--field_width > 0)
-				{
-					f += ' ';
-				}
-			if (qualifier == 'h')
-			{
-				f += (char)(unsigned char) va_arg(args,int);
-			}
-			else
-			{
-				f += (char)(unsigned char)(wchar_t) va_arg(args,int);
-			}
-			while (--field_width > 0)
-			{
-				f += ' ';
-			}
-			continue;
-
-		case 's':
-			if (qualifier == 'l' || qualifier == 'w') {
-				/* print unicode string */
-				sw = va_arg(args, wchar_t *);
-				result = stringw(f, sw, -1, field_width, precision, flags);
-			} else {
-				/* print ascii string */
-				s = va_arg(args, char *);
-				result = do_string(f, s, -1, field_width, precision, flags);
-			}
-			if (result < 0)
-			{
-				assert(!"TODO FIXME handle error better");
-				return f;
-			}
-			continue;
-
-		case 'S':
-			if (qualifier == 'h') {
-				/* print ascii string */
-				s = va_arg(args, char *);
-				result = do_string(f, s, -1, field_width, precision, flags);
-			} else {
-				/* print unicode string */
-				sw = va_arg(args, wchar_t *);
-				result = stringw(f, sw, -1, field_width, precision, flags);
-			}
-			if (result < 0)
-			{
-				assert(!"TODO FIXME handle error better");
-				return f;
-			}
-			continue;
-
-		/*case 'Z':
-			if (qualifier == 'w') {
-				// print counted unicode string
-				PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING);
-				if ((pus == NULL) || (pus->Buffer == NULL)) {
-					sw = NULL;
-					len = -1;
-				} else {
-					sw = pus->Buffer;
-					len = pus->Length / sizeof(WCHAR);
-				}
-				result = stringw(f, sw, len, field_width, precision, flags);
-			} else {
-				// print counted ascii string
-				PANSI_STRING pas = va_arg(args, PANSI_STRING);
-				if ((pas == NULL) || (pas->Buffer == NULL)) {
-					s = NULL;
-					len = -1;
-				} else {
-					s = pas->Buffer;
-					len = pas->Length;
-				}
-				result = string(f, s, -1, field_width, precision, flags);
-			}
-			if (result < 0)
-				return -1;
-			continue;*/
-
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'g':
-		case 'G':
-			if (qualifier == 'l' || qualifier == 'L' ) {
-				_ldouble = va_arg(args, long double);
-			
-				if ( _isnanl(_ldouble) )
-				{
-					f += "Nan";
-				}
-				else if ( !_finitel(_ldouble) )
-				{
-					if ( _ldouble < 0 )
-						f += "-Inf";
-					else
-						f += "+Inf";
-				} else {
-					if ( precision == -1 )
-						precision = 6;
-					result = numberfl(f,_ldouble,*fmt,field_width,precision,flags);
-					if (result < 0)
-					{
-						assert(!"TODO FIXME handle error better");
-						return f;
-					}
-				}
-			} else {
-				_double = (double)va_arg(args, double);
-
-				if ( _isnan(_double) )
-				{
-					f += "Nan";
-				}
-				else if ( !_finite(_double) )
-				{
-					if ( _double < 0 )
-						f += "-Inf";
-					else
-						f += "+Inf";
-				}
-				else
-				{
-					if ( precision == -1 )
-						precision = 6;
-					result = numberf(f,_double,*fmt,field_width,precision,flags);
-					if (result < 0)
-					{
-						assert(!"TODO FIXME handle error better");
-						return f;
-					}
-				}
-			}
-			continue;
-
-		case 'p':
-			if (field_width == -1) {
-				field_width = 2*sizeof(void *);
-				flags |= ZEROPAD;
-			}
-			result = number(f,
-				        (unsigned long) va_arg(args, void *), 16,
-					field_width, precision, flags);
-			if (result < 0)
-			{
-				assert(!"TODO FIXME handle error better");
-				return f;
-			}
-			continue;
-
-		case 'n':
-			if (qualifier == 'l') {
-				long * ip = va_arg(args, long *);
-				*ip = 0;
-			} else {
-				int * ip = va_arg(args, int *);
-				*ip = 0;
-			}
-			continue;
-
-		/* integer number formats - set up the flags and "break" */
-		case 'o':
-			base = 8;
-			break;
-
-		case 'b':
-			base = 2;
-			break;
-
-		case 'X':
-			flags |= LARGE;
-		case 'x':
-			base = 16;
-			break;
-
-		case 'd':
-		case 'i':
-			flags |= SIGN;
-		case 'u':
-			break;
-
-		default:
-			if (*fmt != '%')
-			{
-				f += '%';
-			}
-			if (*fmt)
-			{
-				f += *fmt;
-			}
-			else
-				--fmt;
-			continue;
-		}
-
-		if (qualifier == 'I')
-			num = va_arg(args, ULONGLONG);
-		else if (qualifier == 'l') {
-			if (flags & SIGN)
-				num = va_arg(args, long);
-			else
-				num = va_arg(args, unsigned long);
-		}
-		else if (qualifier == 'h') {
-			if (flags & SIGN)
-				num = va_arg(args, int);
-			else
-				num = va_arg(args, unsigned int);
-		}
-		else if (flags & SIGN)
-			num = va_arg(args, int);
-		else
-			num = va_arg(args, unsigned int);
-		result = number(f, num, base, field_width, precision, flags);
-		if (result < 0)
-		{
-			assert(!"TODO FIXME handle error better");
-			return f;
-		}
-	}
-	//putc('\0',f);
-	return f;
-}
-
-std::wstring
-sswvprintf ( const wchar_t* fmt, va_list args )
-{
-	ULONGLONG num;
-	int base;
-	long double _ldouble;
-	double _double;
-	const wchar_t* s;
-	const char* sa;
-	int result;
-	std::wstring f;
-
-	int flags;		/* flags to number() */
-
-	int field_width;	/* width of output field */
-	int precision;		/* min. # of digits for integers; max
-				   number of chars for from string */
-	int qualifier = 0;	/* 'h', 'l', 'L' or 'I64' for integer fields */
-
-	for (; *fmt ; ++fmt)
-	{
-		if (*fmt != L'%')
-		{
-			f += *fmt;
-			continue;
-		}
-
-		/* process flags */
-		flags = 0;
-		repeat:
-			++fmt;		/* this also skips first '%' */
-			switch (*fmt) {
-				case L'-': flags |= LEFT; goto repeat;
-				case L'+': flags |= PLUS; goto repeat;
-				case L' ': flags |= SPACE; goto repeat;
-				case L'#': flags |= SPECIAL; goto repeat;
-				case L'0': flags |= ZEROPAD; goto repeat;
-				}
-
-		/* get field width */
-		field_width = -1;
-		if (isdigit(*fmt))
-			field_width = skip_wtoi(&fmt);
-		else if (*fmt == L'*') {
-			++fmt;
-			/* it's the next argument */
-			field_width = va_arg(args, int);
-			if (field_width < 0) {
-				field_width = -field_width;
-				flags |= LEFT;
-			}
-		}
-
-		/* get the precision */
-		precision = -1;
-		if (*fmt == L'.') {
-			++fmt;
-			if (iswdigit(*fmt))
-				precision = skip_wtoi(&fmt);
-			else if (*fmt == L'*') {
-				++fmt;
-				/* it's the next argument */
-				precision = va_arg(args, int);
-			}
-			if (precision < 0)
-				precision = 0;
-		}
-
-		/* get the conversion qualifier */
-		qualifier = 0;
-		// %Z can be just stand alone or as size_t qualifier
-		if ( *fmt == L'Z' ) {
-			qualifier = *fmt;
-			switch ( *(fmt+1)) {
-				case L'o':
-				case L'b':
-				case L'X':
-				case L'x':
-				case L'd':
-				case L'i':
-				case L'u':
-					++fmt;
-					break;
-				default:
-					break;
-			}
-		} else if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') {
-			qualifier = *fmt;
-			++fmt;
-		} else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') {
-			qualifier = *fmt;
-			fmt += 3;
-		}
-
-		// go fine with ll instead of L
-		if ( *fmt == L'l' ) {
-			++fmt;
-			qualifier = L'L';
-		}
-
-		/* default base */
-		base = 10;
-
-		switch (*fmt) {
-		case L'c':
-			if (!(flags & LEFT))
-				while (--field_width > 0)
-				{
-					f += L' ';
-				}
-			if ( qualifier == L'h' )
-			{
-				f += (wchar_t)(char)(unsigned char) va_arg(args,int);
-			}
-			else
-			{
-				f += (wchar_t) va_arg(args,int);
-			}
-			while (--field_width > 0)
-			{
-				f += ' ';
-			}
-			continue;
-
-		case 'C':
-			if (!(flags & LEFT))
-				while (--field_width > 0)
-				{
-					f += L' ';
-				}
-			if (qualifier == L'l' || qualifier == L'w')
-			{
-				f += (wchar_t) va_arg(args,int);
-			}
-			else
-			{
-				f += (wchar_t)(char)(unsigned char) va_arg(args,int);
-			}
-			while (--field_width > 0)
-			{
-				f += L' ';
-			}
-			continue;
-
-		case 's':
-			if (qualifier == L'h') {
-				/* print ascii string */
-				sa = va_arg(args, char *);
-				result = wstringa(f, sa, -1, field_width, precision, flags);
-			} else {
-				/* print unicode string */
-				s = va_arg(args, wchar_t *);
-				result = do_wstring(f, s, -1, field_width, precision, flags);
-			}
-			if (result < 0)
-			{
-				assert(!"TODO FIXME handle error better");
-				return f;
-			}
-			continue;
-
-		case 'S':
-			if (qualifier == L'l' || qualifier == L'w') {
-				/* print unicode string */
-				s = va_arg(args, wchar_t *);
-				result = do_wstring(f, s, -1, field_width, precision, flags);
-			} else {
-				/* print ascii string */
-				sa = va_arg(args, char *);
-				result = wstringa(f, sa, -1, field_width, precision, flags);
-			}
-			if (result < 0)
-			{
-				assert(!"TODO FIXME handle error better");
-				return f;
-			}
-			continue;
-
-		case L'e':
-		case L'E':
-		case L'f':
-		case L'g':
-		case L'G':
-			if (qualifier == L'l' || qualifier == L'L' )
-			{
-				_ldouble = va_arg(args, long double);
-			
-				if ( _isnanl(_ldouble) )
-				{
-					f += L"Nan";
-				}
-				else if ( !_finitel(_ldouble) )
-				{
-					if ( _ldouble < 0 )
-						f += L"-Inf";
-					else
-						f += L"+Inf";
-				} else {
-					if ( precision == -1 )
-						precision = 6;
-					result = wnumberfl(f,_ldouble,*fmt,field_width,precision,flags);
-					if (result < 0)
-					{
-						assert(!"TODO FIXME handle error better");
-						return f;
-					}
-				}
-			} else {
-				_double = (double)va_arg(args, double);
-
-				if ( _isnan(_double) )
-				{
-					f += L"Nan";
-				}
-				else if ( !_finite(_double) )
-				{
-					if ( _double < 0 )
-						f += L"-Inf";
-					else
-						f += L"+Inf";
-				}
-				else
-				{
-					if ( precision == -1 )
-						precision = 6;
-					result = wnumberf(f,_double,*fmt,field_width,precision,flags);
-					if (result < 0)
-					{
-						assert(!"TODO FIXME handle error better");
-						return f;
-					}
-				}
-			}
-			continue;
-
-		case L'p':
-			if (field_width == -1) {
-				field_width = 2*sizeof(void *);
-				flags |= ZEROPAD;
-			}
-			result = wnumber(f,
-				        (unsigned long) va_arg(args, void *), 16,
-					field_width, precision, flags);
-			if (result < 0)
-			{
-				assert(!"TODO FIXME handle error better");
-				return f;
-			}
-			continue;
-
-		case L'n':
-			if (qualifier == L'l') {
-				long * ip = va_arg(args, long *);
-				*ip = 0;
-			} else {
-				int * ip = va_arg(args, int *);
-				*ip = 0;
-			}
-			continue;
-
-		/* integer number formats - set up the flags and "break" */
-		case L'o':
-			base = 8;
-			break;
-
-		case L'b':
-			base = 2;
-			break;
-
-		case L'X':
-			flags |= LARGE;
-		case L'x':
-			base = 16;
-			break;
-
-		case L'd':
-		case L'i':
-			flags |= SIGN;
-		case L'u':
-			break;
-
-		default:
-			if (*fmt != L'%')
-			{
-				f += L'%';
-			}
-			if (*fmt)
-			{
-				f += *fmt;
-			}
-			else
-				--fmt;
-			continue;
-		}
-
-		if (qualifier == L'I')
-			num = va_arg(args, ULONGLONG);
-		else if (qualifier == L'l') {
-			if (flags & SIGN)
-				num = va_arg(args, long);
-			else
-				num = va_arg(args, unsigned long);
-		}
-		else if (qualifier == L'h') {
-			if (flags & SIGN)
-				num = va_arg(args, int);
-			else
-				num = va_arg(args, unsigned int);
-		}
-		else if (flags & SIGN)
-			num = va_arg(args, int);
-		else
-			num = va_arg(args, unsigned int);
-		result = wnumber(f, num, base, field_width, precision, flags);
-		if (result < 0)
-		{
-			assert(!"TODO FIXME handle error better");
-			return f;
-		}
-	}
-	//putc('\0',f);
-	return f;
-}
+// ssprintf.cpp
+
+#include "pch.h"
+
+#include <malloc.h>
+#include <math.h>
+#include <float.h>
+#include <assert.h>
+#include "ssprintf.h"
+
+#ifdef _MSC_VER
+#define alloca _alloca
+#endif//_MSC_VER
+
+#ifdef _MSC_VER
+typedef __int64 LONGLONG;
+typedef unsigned __int64 ULONGLONG;
+#else
+typedef long long LONGLONG;
+typedef unsigned long long ULONGLONG;
+#endif
+
+typedef struct {
+    unsigned int mantissa:23;
+    unsigned int exponent:8;
+    unsigned int sign:1;
+} ieee_float_t;
+
+typedef struct {
+    unsigned int mantissal:32;
+    unsigned int mantissah:20;
+    unsigned int exponent:11;
+    unsigned int sign:1;
+} ieee_double_t;
+
+typedef struct {
+    unsigned int mantissal:32;
+    unsigned int mantissah:32;
+    unsigned int exponent:15;
+    unsigned int sign:1;
+    unsigned int empty:16;
+} ieee_long_double_t;
+
+std::string
+ssprintf ( const char* fmt, ... )
+{
+	va_list arg;
+	va_start(arg, fmt);
+	std::string f = ssvprintf ( fmt, arg );
+	va_end(arg);
+	return f;
+}
+
+std::wstring
+sswprintf ( const wchar_t* fmt, ... )
+{
+	va_list arg;
+	va_start(arg, fmt);
+	std::wstring f = sswvprintf ( fmt, arg );
+	va_end(arg);
+	return f;
+}
+
+#define ZEROPAD		1	/* pad with zero */
+#define SIGN		2	/* unsigned/signed long */
+#define PLUS		4	/* show plus */
+#define SPACE		8	/* space if plus */
+#define LEFT		16	/* left justified */
+#define SPECIAL		32	/* 0x */
+#define LARGE		64	/* use 'ABCDEF' instead of 'abcdef' */
+#define ZEROTRUNC	128	/* truncate zero 's */
+
+
+static int
+skip_atoi(const char **s)
+{
+	int i=0;
+
+	while (isdigit(**s))
+		i = i*10 + *((*s)++) - '0';
+	return i;
+}
+
+static int
+skip_wtoi(const wchar_t **s)
+{
+	int i=0;
+
+	while (iswdigit(**s))
+		i = i*10 + *((*s)++) - L'0';
+	return i;
+}
+
+
+static int
+do_div(LONGLONG *n,int base)
+{
+	int __res = ((ULONGLONG) *n) % (unsigned) base;
+	*n = ((ULONGLONG) *n) / (unsigned) base;
+	return __res;
+}
+
+
+static bool
+number(std::string& f, LONGLONG num, int base, int size, int precision ,int type)
+{
+	char c,sign,tmp[66];
+	const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
+	int i;
+
+	if (type & LARGE)
+		digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	if (type & LEFT)
+		type &= ~ZEROPAD;
+	if (base < 2 || base > 36)
+		return 0;
+	c = (type & ZEROPAD) ? '0' : ' ';
+	sign = 0;
+	if (type & SIGN) {
+		if (num < 0) {
+			sign = '-';
+			num = -num;
+			size--;
+		} else if (type & PLUS) {
+			sign = '+';
+			size--;
+		} else if (type & SPACE) {
+			sign = ' ';
+			size--;
+		}
+	}
+	if (type & SPECIAL) {
+		if (base == 16)
+			size -= 2;
+		else if (base == 8)
+			size--;
+	}
+	i = 0;
+	if (num == 0)
+		tmp[i++]='0';
+	else while (num != 0)
+		tmp[i++] = digits[do_div(&num,base)];
+	if (i > precision)
+		precision = i;
+	size -= precision;
+	if (!(type&(ZEROPAD+LEFT)))
+		while(size-->0)
+			f += ' ';
+	if (sign)
+		f += sign;
+	if (type & SPECIAL)
+	{
+		if (base==8)
+			f += '0';
+		else if (base==16)
+		{
+			f += '0';
+			f += digits[33];
+		}
+	}
+	if (!(type & LEFT))
+	{
+		while (size-- > 0)
+			f += c;
+	}
+	while (i < precision--)
+	{
+		f += '0';
+	}
+	while (i-- > 0)
+	{
+		f += tmp[i];
+	}
+	while (size-- > 0)
+	{
+		f += ' ';
+	}
+	return true;
+}
+
+static bool
+wnumber(std::wstring& f, LONGLONG num, int base, int size, int precision ,int type)
+{
+	wchar_t c,sign,tmp[66];
+	const wchar_t *digits = L"0123456789abcdefghijklmnopqrstuvwxyz";
+	int i;
+
+	if (type & LARGE)
+		digits = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	if (type & LEFT)
+		type &= ~ZEROPAD;
+	if (base < 2 || base > 36)
+		return 0;
+	c = (type & ZEROPAD) ? L'0' : L' ';
+	sign = 0;
+	if (type & SIGN) {
+		if (num < 0) {
+			sign = L'-';
+			num = -num;
+			size--;
+		} else if (type & PLUS) {
+			sign = L'+';
+			size--;
+		} else if (type & SPACE) {
+			sign = L' ';
+			size--;
+		}
+	}
+	if (type & SPECIAL) {
+		if (base == 16)
+			size -= 2;
+		else if (base == 8)
+			size--;
+	}
+	i = 0;
+	if (num == 0)
+		tmp[i++]=L'0';
+	else while (num != 0)
+		tmp[i++] = digits[do_div(&num,base)];
+	if (i > precision)
+		precision = i;
+	size -= precision;
+	if (!(type&(ZEROPAD+LEFT)))
+		while(size-->0)
+			f += L' ';
+	if (sign)
+		f += sign;
+	if (type & SPECIAL)
+	{
+		if (base==8)
+			f += L'0';
+		else if (base==16)
+		{
+			f += L'0';
+			f += digits[33];
+		}
+	}
+	if (!(type & LEFT))
+	{
+		while (size-- > 0)
+			f += c;
+	}
+	while (i < precision--)
+	{
+		f += L'0';
+	}
+	while (i-- > 0)
+	{
+		f += tmp[i];
+	}
+	while (size-- > 0)
+	{
+		f += L' ';
+	}
+	return true;
+}
+
+
+static bool
+numberf(std::string& f, double __n, char exp_sign,  int size, int precision, int type)
+{
+	double exponent = 0.0;
+	double e;
+	long ie;
+
+	//int x;
+	char *buf, *tmp;
+	int i = 0;
+	int j = 0;
+	//int k = 0;
+
+	double frac, intr;
+	double p;
+	char sign;
+	char c;
+	char ro = 0;
+	int result;
+
+	union
+	{
+		double*  __n;
+		ieee_double_t*  n;
+	} n;
+	
+	n.__n = &__n;
+
+	if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) {
+		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff);
+		exponent = ie/3.321928;
+	}
+
+	if ( exp_sign == 'g' || exp_sign == 'G' ) {
+		type |= ZEROTRUNC;
+		if ( exponent < -4 || fabs(exponent) >= precision )
+			 exp_sign -= 2; // g -> e and G -> E
+	}
+
+	if ( exp_sign == 'e' ||  exp_sign == 'E' ) {
+		frac = modf(exponent,&e);
+		if ( frac > 0.5 )
+			e++;
+		else if (  frac < -0.5  )
+			e--;
+
+		result = numberf(f,__n/pow(10.0L,e),'f',size-4, precision, type);
+		if (result < 0)
+			return false;
+		f += exp_sign;
+		size--;
+		ie = (long)e;
+		type = LEFT | PLUS;
+		if ( ie < 0 )
+			type |= SIGN;
+
+		result = number(f,ie, 10,2, 2,type );
+		if (result < 0)
+			return false;
+		return true;
+	}
+
+	if ( exp_sign == 'f' ) {
+		buf = (char*)alloca(4096);
+		if (type & LEFT) {
+			type &= ~ZEROPAD;
+		}
+
+		c = (type & ZEROPAD) ? '0' : ' ';
+		sign = 0;
+		if (type & SIGN) {
+			if (__n < 0) {
+				sign = '-';
+				__n = fabs(__n);
+				size--;
+			} else if (type & PLUS) {
+				sign = '+';
+				size--;
+			} else if (type & SPACE) {
+				sign = ' ';
+				size--;
+			}
+		}
+
+		frac = modf(__n,&intr);
+
+		// # flags forces a . and prevents trucation of trailing zero's
+
+		if ( precision > 0 ) {
+			//frac = modfl(__n,&intr);
+			i = precision-1;
+			while (  i >= 0  ) {
+				frac*=10.0L;
+				frac = modf(frac, &p);
+				buf[i] = (int)p + '0';
+				i--;
+			}
+			i = precision;
+			size -= precision;
+
+			ro = 0;
+			if ( frac > 0.5 ) {
+				ro = 1;
+			}
+
+			if ( precision >= 1 || type & SPECIAL) {
+				buf[i++] = '.';
+				size--;
+			}
+		}
+
+		if ( intr == 0.0 ) {
+			buf[i++] = '0';
+			size--;
+		}
+		else {
+			while ( intr > 0.0 ) {
+			        p = intr;
+				intr/=10.0L;
+				modf(intr, &intr);
+
+				p -= 10.0*intr;
+
+				buf[i++] = (int)p + '0';
+				size--;
+			}
+		}
+
+		j = 0;
+		while ( j < i && ro == 1) {
+			if ( buf[j] >= '0' && buf[j] <= '8' ) {
+				buf[j]++;
+				ro = 0;
+			}
+			else if ( buf[j] == '9' ) {
+				buf[j] = '0';
+			}
+			j++;
+		}
+		if ( ro == 1 )
+			buf[i++] = '1';
+
+		buf[i] = 0;
+
+		size -= precision;
+		if (!(type&(ZEROPAD+LEFT)))
+		{
+			while(size-->0)
+				f += ' ';
+		}
+		if (sign)
+		{
+			f += sign;
+		}
+
+		if (!(type&(ZEROPAD+LEFT)))
+			while(size-->0)
+			{
+				f += ' ';
+			}
+		if (type & SPECIAL) {
+		}
+
+		if (!(type & LEFT))
+			while (size-- > 0)
+			{
+				f += c;
+			}
+
+		tmp = buf;
+		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
+		{
+			j = 0;
+			while ( j < i && ( *tmp == '0' || *tmp == '.' ))
+			{
+				tmp++;
+				i--;
+			}
+		}
+//		else
+//			while (i < precision--)
+//				putc('0', f);
+		while (i-- > 0)
+		{
+			f += tmp[i];
+		}
+		while (size-- > 0)
+		{
+			f += ' ';
+		}
+	}
+	return true;
+}
+
+static bool
+wnumberf(std::wstring& f, double __n, wchar_t exp_sign,  int size, int precision, int type)
+{
+	double exponent = 0.0;
+	double e;
+	long ie;
+
+	int i = 0;
+	int j = 0;
+
+	double frac, intr;
+	double p;
+	wchar_t *buf, *tmp, sign, c, ro = 0;
+	int result;
+
+	union
+	{
+		double*  __n;
+		ieee_double_t*  n;
+	} n;
+	
+	n.__n = &__n;
+
+	if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) {
+		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3ff);
+		exponent = ie/3.321928;
+	}
+
+	if ( exp_sign == L'g' || exp_sign == L'G' )
+	{
+		type |= ZEROTRUNC;
+		if ( exponent < -4 || fabs(exponent) >= precision )
+			 exp_sign -= 2; // g -> e and G -> E
+	}
+
+	if ( exp_sign == L'e' ||  exp_sign == L'E' )
+	{
+		frac = modf(exponent,&e);
+		if ( frac > 0.5 )
+			e++;
+		else if (  frac < -0.5  )
+			e--;
+
+		result = wnumberf(f,__n/pow(10.0L,e),L'f',size-4, precision, type);
+		if (result < 0)
+			return false;
+		f += exp_sign;
+		size--;
+		ie = (long)e;
+		type = LEFT | PLUS;
+		if ( ie < 0 )
+			type |= SIGN;
+
+		result = wnumber(f,ie, 10,2, 2,type );
+		if (result < 0)
+			return false;
+		return true;
+	}
+
+	if ( exp_sign == L'f' )
+	{
+		buf = (wchar_t*)alloca(4096*sizeof(wchar_t));
+		if (type & LEFT)
+			type &= ~ZEROPAD;
+
+		c = (type & ZEROPAD) ? L'0' : L' ';
+		sign = 0;
+		if (type & SIGN)
+		{
+			if (__n < 0)
+			{
+				sign = L'-';
+				__n = fabs(__n);
+				size--;
+			}
+			else if (type & PLUS)
+			{
+				sign = L'+';
+				size--;
+			}
+			else if (type & SPACE)
+			{
+				sign = L' ';
+				size--;
+			}
+		}
+
+		frac = modf(__n,&intr);
+
+		// # flags forces a . and prevents trucation of trailing zero's
+
+		if ( precision > 0 ) {
+			//frac = modfl(__n,&intr);
+			i = precision-1;
+			while (  i >= 0  ) {
+				frac*=10.0L;
+				frac = modf(frac, &p);
+				buf[i] = (int)p + L'0';
+				i--;
+			}
+			i = precision;
+			size -= precision;
+
+			ro = 0;
+			if ( frac > 0.5 ) {
+				ro = 1;
+			}
+
+			if ( precision >= 1 || type & SPECIAL) {
+				buf[i++] = L'.';
+				size--;
+			}
+		}
+
+		if ( intr == 0.0 ) {
+			buf[i++] = L'0';
+			size--;
+		}
+		else {
+			while ( intr > 0.0 ) {
+				p = intr;
+				intr/=10.0L;
+				modf(intr, &intr);
+
+				p -= 10.0*intr;
+
+				buf[i++] = (int)p + L'0';
+				size--;
+			}
+		}
+
+		j = 0;
+		while ( j < i && ro == 1) {
+			if ( buf[j] >= L'0' && buf[j] <= L'8' ) {
+				buf[j]++;
+				ro = 0;
+			}
+			else if ( buf[j] == L'9' ) {
+				buf[j] = L'0';
+			}
+			j++;
+		}
+		if ( ro == 1 )
+			buf[i++] = L'1';
+
+		buf[i] = 0;
+
+		size -= precision;
+		if (!(type&(ZEROPAD+LEFT)))
+		{
+			while(size-->0)
+				f += L' ';
+		}
+		if (sign)
+		{
+			f += sign;
+		}
+
+		if (!(type&(ZEROPAD+LEFT)))
+			while(size-->0)
+			{
+				f += L' ';
+			}
+		if (type & SPECIAL) {
+		}
+
+		if (!(type & LEFT))
+			while (size-- > 0)
+			{
+				f += c;
+			}
+
+		tmp = buf;
+		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
+		{
+			j = 0;
+			while ( j < i && ( *tmp == L'0' || *tmp == L'.' ))
+			{
+				tmp++;
+				i--;
+			}
+		}
+		while (i-- > 0)
+		{
+			f += tmp[i];
+		}
+		while (size-- > 0)
+		{
+			f += L' ';
+		}
+	}
+	return true;
+}
+
+static bool
+numberfl(std::string& f, long double __n, char exp_sign,  int size, int precision, int type)
+{
+	long double exponent = 0.0;
+	long double e;
+	long ie;
+
+	//int x;
+	char *buf, *tmp;
+	int i = 0;
+	int j = 0;
+	//int k = 0;
+
+	long double frac, intr;
+	long double p;
+	char sign;
+	char c;
+	char ro = 0;
+
+	int result;
+
+	union
+	{
+	    long double*   __n;
+	    ieee_long_double_t*   n;
+	} n;
+
+	n.__n = &__n;
+
+	if ( exp_sign == 'g' || exp_sign == 'G' || exp_sign == 'e' || exp_sign == 'E' ) {
+		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff);
+		exponent = ie/3.321928;
+	}
+
+	if ( exp_sign == 'g' || exp_sign == 'G' ) {
+		type |= ZEROTRUNC;
+		if ( exponent < -4 || fabs(exponent) >= precision ) 
+			 exp_sign -= 2; // g -> e and G -> E
+	}
+
+	if ( exp_sign == 'e' || exp_sign == 'E' ) {
+		frac = modfl(exponent,&e);
+		if ( frac > 0.5 )
+			e++;
+		else if ( frac < -0.5 )
+			e--;
+
+		result = numberf(f,__n/powl(10.0L,e),'f',size-4, precision, type);
+		if (result < 0)
+			return false;
+		f += exp_sign;
+		size--;
+		ie = (long)e;
+		type = LEFT | PLUS;
+		if ( ie < 0 )
+			type |= SIGN;
+
+		result = number(f,ie, 10,2, 2,type );
+		if (result < 0)
+			return false;
+		return true;
+	}
+
+	if ( exp_sign == 'f' )
+	{
+		
+		buf = (char*)alloca(4096);
+		if (type & LEFT)
+		{
+			type &= ~ZEROPAD;
+		}
+
+		c = (type & ZEROPAD) ? '0' : ' ';
+		sign = 0;
+		if (type & SIGN)
+		{
+			if (__n < 0)
+			{
+				sign = '-';
+				__n = fabs(__n);
+				size--;
+			} else if (type & PLUS)
+			{
+				sign = '+';
+				size--;
+			} else if (type & SPACE)
+			{
+				sign = ' ';
+				size--;
+			}
+		}
+
+		frac = modfl(__n,&intr);
+
+		// # flags forces a . and prevents trucation of trailing zero's
+		if ( precision > 0 )
+		{
+			//frac = modfl(__n,&intr);
+
+			i = precision-1;
+			while ( i >= 0  )
+			{
+				frac*=10.0L;
+				frac = modfl((long double)frac, &p);
+				buf[i] = (int)p + '0';
+				i--;
+			}
+			i = precision;
+			size -= precision;
+
+			ro = 0;
+			if ( frac > 0.5 )
+			{
+				ro = 1;
+			}
+
+			if ( precision >= 1 || type & SPECIAL)
+			{
+				buf[i++] = '.';
+				size--;
+			}
+		}
+
+		if ( intr == 0.0 )
+		{
+			buf[i++] = '0';
+			size--;
+		}
+		else
+		{
+			while ( intr > 0.0 )
+			{
+			        p=intr;
+				intr/=10.0L;
+				modfl(intr, &intr);
+
+				p -= 10.0L*intr;
+
+				buf[i++] = (int)p + '0';
+				size--;
+			}
+		}
+
+		j = 0;
+		while ( j < i && ro == 1) {
+			if ( buf[j] >= '0' && buf[j] <= '8' )
+			{
+				buf[j]++;
+				ro = 0;
+			}
+			else if ( buf[j] == '9' )
+			{
+				buf[j] = '0';
+			}
+			j++;
+		}
+		if ( ro == 1 )
+			buf[i++] = '1';
+
+		buf[i] = 0;
+
+		size -= precision;
+		if (!(type&(ZEROPAD+LEFT)))
+		{
+			while(size-->0)
+				f += ' ';
+		}
+		if (sign)
+		{
+			f += sign;
+		}
+
+		if (!(type&(ZEROPAD+LEFT)))
+		{
+			while(size-->0)
+				f += ' ';
+		}
+		if (type & SPECIAL) {
+		}
+
+		if (!(type & LEFT))
+			while (size-- > 0)
+			{
+				f += c;
+			}
+		tmp = buf;
+		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
+		{
+			j = 0;
+			while ( j < i && ( *tmp == '0' || *tmp == '.' ))
+			{
+				tmp++;
+				i--;
+			}
+		}
+		while (i-- > 0)
+		{
+			f += tmp[i];
+		}
+		while (size-- > 0)
+		{
+			f += ' ';
+		}
+	}
+	return true;
+}
+
+static bool
+wnumberfl(std::wstring& f, long double __n, wchar_t exp_sign,  int size, int precision, int type)
+{
+	long double exponent = 0.0;
+	long double e;
+	long ie;
+
+	wchar_t *buf, *tmp, sign, c, ro = 0;
+	int i = 0;
+	int j = 0;
+
+	long double frac, intr;
+	long double p;
+
+	int result;
+
+	union
+	{
+	    long double*   __n;
+	    ieee_long_double_t*   n;
+	} n;
+
+	n.__n = &__n;
+
+	if ( exp_sign == L'g' || exp_sign == L'G' || exp_sign == L'e' || exp_sign == L'E' ) {
+		ie = ((unsigned int)n.n->exponent - (unsigned int)0x3fff);
+		exponent = ie/3.321928;
+	}
+
+	if ( exp_sign == L'g' || exp_sign == L'G' ) {
+		type |= ZEROTRUNC;
+		if ( exponent < -4 || fabs(exponent) >= precision ) 
+			 exp_sign -= 2; // g -> e and G -> E
+	}
+
+	if ( exp_sign == L'e' || exp_sign == L'E' ) {
+		frac = modfl(exponent,&e);
+		if ( frac > 0.5 )
+			e++;
+		else if ( frac < -0.5 )
+			e--;
+
+		result = wnumberf(f,__n/powl(10.0L,e),L'f',size-4, precision, type);
+		if (result < 0)
+			return false;
+		f += exp_sign;
+		size--;
+		ie = (long)e;
+		type = LEFT | PLUS;
+		if ( ie < 0 )
+			type |= SIGN;
+
+		result = wnumber(f,ie, 10,2, 2,type );
+		if (result < 0)
+			return false;
+		return true;
+	}
+
+	if ( exp_sign == L'f' )
+	{
+		
+		buf = (wchar_t*)alloca(4096*sizeof(wchar_t));
+		if (type & LEFT)
+		{
+			type &= ~ZEROPAD;
+		}
+
+		c = (type & ZEROPAD) ? L'0' : L' ';
+		sign = 0;
+		if (type & SIGN)
+		{
+			if (__n < 0)
+			{
+				sign = L'-';
+				__n = fabs(__n);
+				size--;
+			} else if (type & PLUS)
+			{
+				sign = L'+';
+				size--;
+			} else if (type & SPACE)
+			{
+				sign = L' ';
+				size--;
+			}
+		}
+
+		frac = modfl(__n,&intr);
+
+		// # flags forces a . and prevents trucation of trailing zero's
+		if ( precision > 0 )
+		{
+			//frac = modfl(__n,&intr);
+
+			i = precision-1;
+			while ( i >= 0  )
+			{
+				frac*=10.0L;
+				frac = modfl((long double)frac, &p);
+				buf[i] = (int)p + L'0';
+				i--;
+			}
+			i = precision;
+			size -= precision;
+
+			ro = 0;
+			if ( frac > 0.5 )
+			{
+				ro = 1;
+			}
+
+			if ( precision >= 1 || type & SPECIAL)
+			{
+				buf[i++] = L'.';
+				size--;
+			}
+		}
+
+		if ( intr == 0.0 )
+		{
+			buf[i++] = L'0';
+			size--;
+		}
+		else
+		{
+			while ( intr > 0.0 )
+			{
+				p=intr;
+				intr/=10.0L;
+				modfl(intr, &intr);
+
+				p -= 10.0L*intr;
+
+				buf[i++] = (int)p + L'0';
+				size--;
+			}
+		}
+
+		j = 0;
+		while ( j < i && ro == 1) {
+			if ( buf[j] >= L'0' && buf[j] <= L'8' )
+			{
+				buf[j]++;
+				ro = 0;
+			}
+			else if ( buf[j] == L'9' )
+			{
+				buf[j] = L'0';
+			}
+			j++;
+		}
+		if ( ro == 1 )
+			buf[i++] = L'1';
+
+		buf[i] = 0;
+
+		size -= precision;
+		if (!(type&(ZEROPAD+LEFT)))
+		{
+			while(size-->0)
+				f += L' ';
+		}
+		if (sign)
+		{
+			f += sign;
+		}
+
+		if (!(type&(ZEROPAD+LEFT)))
+		{
+			while(size-->0)
+				f += L' ';
+		}
+		if (type & SPECIAL) {
+		}
+
+		if (!(type & LEFT))
+			while (size-- > 0)
+			{
+				f += c;
+			}
+		tmp = buf;
+		if ( type & ZEROTRUNC && ((type & SPECIAL) != SPECIAL) )
+		{
+			j = 0;
+			while ( j < i && ( *tmp == L'0' || *tmp == L'.' ))
+			{
+				tmp++;
+				i--;
+			}
+		}
+		while (i-- > 0)
+		{
+			f += tmp[i];
+		}
+		while (size-- > 0)
+		{
+			f += L' ';
+		}
+	}
+	return true;
+}
+
+static int
+do_string(std::string& f, const char* s, int len, int field_width, int precision, int flags)
+{
+	int i, done = 0;
+	if (s == NULL)
+	{
+		s = "<NULL>";
+		len = 6;
+	}
+	else
+	{
+		if (len == -1)
+		{
+			len = 0;
+			while ((unsigned int)len < (unsigned int)precision && s[len])
+				len++;
+		}
+		else
+		{
+			if ((unsigned int)len > (unsigned int)precision)
+				len = precision;
+		}
+	}
+	if (!(flags & LEFT))
+		while (len < field_width--)
+		{
+			f += ' ';
+			done++;
+		}
+	for (i = 0; i < len; ++i)
+	{
+		f += *s++;
+		done++;
+	}
+	while (len < field_width--)
+	{
+		f += ' ';
+		done++;
+	}
+	return done;
+}
+
+static int
+do_wstring(std::wstring& f, const wchar_t* s, int len, int field_width, int precision, int flags)
+{
+	int i, done = 0;
+	if (s == NULL)
+	{
+		s = L"<NULL>";
+		len = 6;
+	}
+	else
+	{
+		if (len == -1)
+		{
+			len = 0;
+			while ((unsigned int)len < (unsigned int)precision && s[len])
+				len++;
+		}
+		else
+		{
+			if ((unsigned int)len > (unsigned int)precision)
+				len = precision;
+		}
+	}
+	if (!(flags & LEFT))
+		while (len < field_width--)
+		{
+			f += L' ';
+			done++;
+		}
+	for (i = 0; i < len; ++i)
+	{
+		f += *s++;
+		done++;
+	}
+	while (len < field_width--)
+	{
+		f += L' ';
+		done++;
+	}
+	return done;
+}
+
+static int
+stringw(std::string& f, const wchar_t* sw, int len, int field_width, int precision, int flags)
+{
+	int i, done = 0;
+	if (sw == NULL)
+	{
+		sw = L"<NULL>";
+		len = 6;
+	}
+	else
+	{
+		if (len == -1)
+		{
+			len = 0;
+			while ((unsigned int)len < (unsigned int)precision && sw[len])
+				len++;
+		}
+		else
+		{
+			if ((unsigned int)len > (unsigned int)precision)
+				len = precision;
+		}
+	}
+	if (!(flags & LEFT))
+		while (len < field_width--)
+		{
+			f += ' ';
+			done++;
+		}
+	for (i = 0; i < len; ++i)
+	{
+#define MY_MB_CUR_MAX 1
+		char mb[MY_MB_CUR_MAX];
+		int mbcount, j;
+		mbcount = wctomb(mb, *sw++);
+		if (mbcount <= 0)
+		{
+			break;
+		}
+		for (j = 0; j < mbcount; j++)
+		{
+			f += mb[j];
+			done++;
+		}
+	}
+	while (len < field_width--)
+	{
+		f += ' ';
+		done++;
+	}
+	return done;
+}
+
+static int
+wstringa(std::wstring& f, const char* sa, int len, int field_width, int precision, int flags)
+{
+	int i, done = 0;
+	if (sa == NULL)
+	{
+		sa = "<NULL>";
+		len = 6;
+	}
+	else
+	{
+		if (len == -1)
+		{
+			len = 0;
+			while ((unsigned int)len < (unsigned int)precision && sa[len])
+				len++;
+		}
+		else
+		{
+			if ((unsigned int)len > (unsigned int)precision)
+				len = precision;
+		}
+	}
+	if (!(flags & LEFT))
+		while (len < field_width--)
+		{
+			f += L' ';
+			done++;
+		}
+	for (i = 0; i < len;)
+	{
+		wchar_t w;
+		int mbcount;
+		mbcount = mbtowc(&w, sa, len-i);
+		if (mbcount <= 0)
+			break;
+		f += w;
+		done++;
+		i += mbcount;
+	}
+	while (len < field_width--)
+	{
+		f += L' ';
+		done++;
+	}
+	return done;
+}
+
+#define _isnanl _isnan
+#define _finitel _finite
+
+std::string
+ssvprintf ( const char *fmt, va_list args )
+{
+	ULONGLONG num;
+	int base;
+	long double _ldouble;
+	double _double;
+	const char *s;
+	const wchar_t* sw;
+	int result;
+	std::string f;
+
+	int flags;		/* flags to number() */
+
+	int field_width;	/* width of output field */
+	int precision;		/* min. # of digits for integers; max
+				   number of chars for from string */
+	int qualifier = 0;	/* 'h', 'l', 'L' or 'I64' for integer fields */
+
+	for (; *fmt ; ++fmt)
+	{
+		if (*fmt != '%')
+		{
+			f += *fmt;
+			continue;
+		}
+
+		/* process flags */
+		flags = 0;
+		repeat:
+			++fmt;		/* this also skips first '%' */
+			switch (*fmt) {
+				case '-': flags |= LEFT; goto repeat;
+				case '+': flags |= PLUS; goto repeat;
+				case ' ': flags |= SPACE; goto repeat;
+				case '#': flags |= SPECIAL; goto repeat;
+				case '0': flags |= ZEROPAD; goto repeat;
+				}
+
+		/* get field width */
+		field_width = -1;
+		if (isdigit(*fmt))
+			field_width = skip_atoi(&fmt);
+		else if (*fmt == '*') {
+			++fmt;
+			/* it's the next argument */
+			field_width = va_arg(args, int);
+			if (field_width < 0) {
+				field_width = -field_width;
+				flags |= LEFT;
+			}
+		}
+
+		/* get the precision */
+		precision = -1;
+		if (*fmt == '.') {
+			++fmt;
+			if (isdigit(*fmt))
+				precision = skip_atoi(&fmt);
+			else if (*fmt == '*') {
+				++fmt;
+				/* it's the next argument */
+				precision = va_arg(args, int);
+			}
+			if (precision < 0)
+				precision = 0;
+		}
+
+		/* get the conversion qualifier */
+		qualifier = 0;
+		// %Z can be just stand alone or as size_t qualifier
+		if ( *fmt == 'Z' ) {
+			qualifier = *fmt;
+			switch ( *(fmt+1)) {
+				case 'o':
+				case 'b':
+				case 'X':
+				case 'x':
+				case 'd':
+				case 'i':
+				case 'u':
+					++fmt;
+					break;
+				default:
+					break;
+			}
+		} else if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') {
+			qualifier = *fmt;
+			++fmt;
+		} else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') {
+			qualifier = *fmt;
+			fmt += 3;
+		}
+
+		// go fine with ll instead of L
+		if ( *fmt == 'l' ) {
+			++fmt;
+			qualifier = 'L';
+		}
+
+		/* default base */
+		base = 10;
+
+		switch (*fmt) {
+		case 'c':
+			if (!(flags & LEFT))
+				while (--field_width > 0)
+				{
+					f += ' ';
+				}
+			if (qualifier == 'l' || qualifier == 'w')
+			{
+				f += (char)(unsigned char)(wchar_t) va_arg(args,int);
+			}
+			else
+			{
+				f += (char)(unsigned char) va_arg(args,int);
+			}
+			while (--field_width > 0)
+			{
+				f += ' ';
+			}
+			continue;
+
+		case 'C':
+			if (!(flags & LEFT))
+				while (--field_width > 0)
+				{
+					f += ' ';
+				}
+			if (qualifier == 'h')
+			{
+				f += (char)(unsigned char) va_arg(args,int);
+			}
+			else
+			{
+				f += (char)(unsigned char)(wchar_t) va_arg(args,int);
+			}
+			while (--field_width > 0)
+			{
+				f += ' ';
+			}
+			continue;
+
+		case 's':
+			if (qualifier == 'l' || qualifier == 'w') {
+				/* print unicode string */
+				sw = va_arg(args, wchar_t *);
+				result = stringw(f, sw, -1, field_width, precision, flags);
+			} else {
+				/* print ascii string */
+				s = va_arg(args, char *);
+				result = do_string(f, s, -1, field_width, precision, flags);
+			}
+			if (result < 0)
+			{
+				assert(!"TODO FIXME handle error better");
+				return f;
+			}
+			continue;
+
+		case 'S':
+			if (qualifier == 'h') {
+				/* print ascii string */
+				s = va_arg(args, char *);
+				result = do_string(f, s, -1, field_width, precision, flags);
+			} else {
+				/* print unicode string */
+				sw = va_arg(args, wchar_t *);
+				result = stringw(f, sw, -1, field_width, precision, flags);
+			}
+			if (result < 0)
+			{
+				assert(!"TODO FIXME handle error better");
+				return f;
+			}
+			continue;
+
+		/*case 'Z':
+			if (qualifier == 'w') {
+				// print counted unicode string
+				PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING);
+				if ((pus == NULL) || (pus->Buffer == NULL)) {
+					sw = NULL;
+					len = -1;
+				} else {
+					sw = pus->Buffer;
+					len = pus->Length / sizeof(WCHAR);
+				}
+				result = stringw(f, sw, len, field_width, precision, flags);
+			} else {
+				// print counted ascii string
+				PANSI_STRING pas = va_arg(args, PANSI_STRING);
+				if ((pas == NULL) || (pas->Buffer == NULL)) {
+					s = NULL;
+					len = -1;
+				} else {
+					s = pas->Buffer;
+					len = pas->Length;
+				}
+				result = string(f, s, -1, field_width, precision, flags);
+			}
+			if (result < 0)
+				return -1;
+			continue;*/
+
+		case 'e':
+		case 'E':
+		case 'f':
+		case 'g':
+		case 'G':
+			if (qualifier == 'l' || qualifier == 'L' ) {
+				_ldouble = va_arg(args, long double);
+			
+				if ( _isnanl(_ldouble) )
+				{
+					f += "Nan";
+				}
+				else if ( !_finitel(_ldouble) )
+				{
+					if ( _ldouble < 0 )
+						f += "-Inf";
+					else
+						f += "+Inf";
+				} else {
+					if ( precision == -1 )
+						precision = 6;
+					result = numberfl(f,_ldouble,*fmt,field_width,precision,flags);
+					if (result < 0)
+					{
+						assert(!"TODO FIXME handle error better");
+						return f;
+					}
+				}
+			} else {
+				_double = (double)va_arg(args, double);
+
+				if ( _isnan(_double) )
+				{
+					f += "Nan";
+				}
+				else if ( !_finite(_double) )
+				{
+					if ( _double < 0 )
+						f += "-Inf";
+					else
+						f += "+Inf";
+				}
+				else
+				{
+					if ( precision == -1 )
+						precision = 6;
+					result = numberf(f,_double,*fmt,field_width,precision,flags);
+					if (result < 0)
+					{
+						assert(!"TODO FIXME handle error better");
+						return f;
+					}
+				}
+			}
+			continue;
+
+		case 'p':
+			if (field_width == -1) {
+				field_width = 2*sizeof(void *);
+				flags |= ZEROPAD;
+			}
+			result = number(f,
+				        (unsigned long) va_arg(args, void *), 16,
+					field_width, precision, flags);
+			if (result < 0)
+			{
+				assert(!"TODO FIXME handle error better");
+				return f;
+			}
+			continue;
+
+		case 'n':
+			if (qualifier == 'l') {
+				long * ip = va_arg(args, long *);
+				*ip = 0;
+			} else {
+				int * ip = va_arg(args, int *);
+				*ip = 0;
+			}
+			continue;
+
+		/* integer number formats - set up the flags and "break" */
+		case 'o':
+			base = 8;
+			break;
+
+		case 'b':
+			base = 2;
+			break;
+
+		case 'X':
+			flags |= LARGE;
+		case 'x':
+			base = 16;
+			break;
+
+		case 'd':
+		case 'i':
+			flags |= SIGN;
+		case 'u':
+			break;
+
+		default:
+			if (*fmt != '%')
+			{
+				f += '%';
+			}
+			if (*fmt)
+			{
+				f += *fmt;
+			}
+			else
+				--fmt;
+			continue;
+		}
+
+		if (qualifier == 'I')
+			num = va_arg(args, ULONGLONG);
+		else if (qualifier == 'l') {
+			if (flags & SIGN)
+				num = va_arg(args, long);
+			else
+				num = va_arg(args, unsigned long);
+		}
+		else if (qualifier == 'h') {
+			if (flags & SIGN)
+				num = va_arg(args, int);
+			else
+				num = va_arg(args, unsigned int);
+		}
+		else if (flags & SIGN)
+			num = va_arg(args, int);
+		else
+			num = va_arg(args, unsigned int);
+		result = number(f, num, base, field_width, precision, flags);
+		if (result < 0)
+		{
+			assert(!"TODO FIXME handle error better");
+			return f;
+		}
+	}
+	//putc('\0',f);
+	return f;
+}
+
+std::wstring
+sswvprintf ( const wchar_t* fmt, va_list args )
+{
+	ULONGLONG num;
+	int base;
+	long double _ldouble;
+	double _double;
+	const wchar_t* s;
+	const char* sa;
+	int result;
+	std::wstring f;
+
+	int flags;		/* flags to number() */
+
+	int field_width;	/* width of output field */
+	int precision;		/* min. # of digits for integers; max
+				   number of chars for from string */
+	int qualifier = 0;	/* 'h', 'l', 'L' or 'I64' for integer fields */
+
+	for (; *fmt ; ++fmt)
+	{
+		if (*fmt != L'%')
+		{
+			f += *fmt;
+			continue;
+		}
+
+		/* process flags */
+		flags = 0;
+		repeat:
+			++fmt;		/* this also skips first '%' */
+			switch (*fmt) {
+				case L'-': flags |= LEFT; goto repeat;
+				case L'+': flags |= PLUS; goto repeat;
+				case L' ': flags |= SPACE; goto repeat;
+				case L'#': flags |= SPECIAL; goto repeat;
+				case L'0': flags |= ZEROPAD; goto repeat;
+				}
+
+		/* get field width */
+		field_width = -1;
+		if (isdigit(*fmt))
+			field_width = skip_wtoi(&fmt);
+		else if (*fmt == L'*') {
+			++fmt;
+			/* it's the next argument */
+			field_width = va_arg(args, int);
+			if (field_width < 0) {
+				field_width = -field_width;
+				flags |= LEFT;
+			}
+		}
+
+		/* get the precision */
+		precision = -1;
+		if (*fmt == L'.') {
+			++fmt;
+			if (iswdigit(*fmt))
+				precision = skip_wtoi(&fmt);
+			else if (*fmt == L'*') {
+				++fmt;
+				/* it's the next argument */
+				precision = va_arg(args, int);
+			}
+			if (precision < 0)
+				precision = 0;
+		}
+
+		/* get the conversion qualifier */
+		qualifier = 0;
+		// %Z can be just stand alone or as size_t qualifier
+		if ( *fmt == L'Z' ) {
+			qualifier = *fmt;
+			switch ( *(fmt+1)) {
+				case L'o':
+				case L'b':
+				case L'X':
+				case L'x':
+				case L'd':
+				case L'i':
+				case L'u':
+					++fmt;
+					break;
+				default:
+					break;
+			}
+		} else if (*fmt == L'h' || *fmt == L'l' || *fmt == L'L' || *fmt == L'w') {
+			qualifier = *fmt;
+			++fmt;
+		} else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') {
+			qualifier = *fmt;
+			fmt += 3;
+		}
+
+		// go fine with ll instead of L
+		if ( *fmt == L'l' ) {
+			++fmt;
+			qualifier = L'L';
+		}
+
+		/* default base */
+		base = 10;
+
+		switch (*fmt) {
+		case L'c':
+			if (!(flags & LEFT))
+				while (--field_width > 0)
+				{
+					f += L' ';
+				}
+			if ( qualifier == L'h' )
+			{
+				f += (wchar_t)(char)(unsigned char) va_arg(args,int);
+			}
+			else
+			{
+				f += (wchar_t) va_arg(args,int);
+			}
+			while (--field_width > 0)
+			{
+				f += ' ';
+			}
+			continue;
+
+		case 'C':
+			if (!(flags & LEFT))
+				while (--field_width > 0)
+				{
+					f += L' ';
+				}
+			if (qualifier == L'l' || qualifier == L'w')
+			{
+				f += (wchar_t) va_arg(args,int);
+			}
+			else
+			{
+				f += (wchar_t)(char)(unsigned char) va_arg(args,int);
+			}
+			while (--field_width > 0)
+			{
+				f += L' ';
+			}
+			continue;
+
+		case 's':
+			if (qualifier == L'h') {
+				/* print ascii string */
+				sa = va_arg(args, char *);
+				result = wstringa(f, sa, -1, field_width, precision, flags);
+			} else {
+				/* print unicode string */
+				s = va_arg(args, wchar_t *);
+				result = do_wstring(f, s, -1, field_width, precision, flags);
+			}
+			if (result < 0)
+			{
+				assert(!"TODO FIXME handle error better");
+				return f;
+			}
+			continue;
+
+		case 'S':
+			if (qualifier == L'l' || qualifier == L'w') {
+				/* print unicode string */
+				s = va_arg(args, wchar_t *);
+				result = do_wstring(f, s, -1, field_width, precision, flags);
+			} else {
+				/* print ascii string */
+				sa = va_arg(args, char *);
+				result = wstringa(f, sa, -1, field_width, precision, flags);
+			}
+			if (result < 0)
+			{
+				assert(!"TODO FIXME handle error better");
+				return f;
+			}
+			continue;
+
+		case L'e':
+		case L'E':
+		case L'f':
+		case L'g':
+		case L'G':
+			if (qualifier == L'l' || qualifier == L'L' )
+			{
+				_ldouble = va_arg(args, long double);
+			
+				if ( _isnanl(_ldouble) )
+				{
+					f += L"Nan";
+				}
+				else if ( !_finitel(_ldouble) )
+				{
+					if ( _ldouble < 0 )
+						f += L"-Inf";
+					else
+						f += L"+Inf";
+				} else {
+					if ( precision == -1 )
+						precision = 6;
+					result = wnumberfl(f,_ldouble,*fmt,field_width,precision,flags);
+					if (result < 0)
+					{
+						assert(!"TODO FIXME handle error better");
+						return f;
+					}
+				}
+			} else {
+				_double = (double)va_arg(args, double);
+
+				if ( _isnan(_double) )
+				{
+					f += L"Nan";
+				}
+				else if ( !_finite(_double) )
+				{
+					if ( _double < 0 )
+						f += L"-Inf";
+					else
+						f += L"+Inf";
+				}
+				else
+				{
+					if ( precision == -1 )
+						precision = 6;
+					result = wnumberf(f,_double,*fmt,field_width,precision,flags);
+					if (result < 0)
+					{
+						assert(!"TODO FIXME handle error better");
+						return f;
+					}
+				}
+			}
+			continue;
+
+		case L'p':
+			if (field_width == -1) {
+				field_width = 2*sizeof(void *);
+				flags |= ZEROPAD;
+			}
+			result = wnumber(f,
+				        (unsigned long) va_arg(args, void *), 16,
+					field_width, precision, flags);
+			if (result < 0)
+			{
+				assert(!"TODO FIXME handle error better");
+				return f;
+			}
+			continue;
+
+		case L'n':
+			if (qualifier == L'l') {
+				long * ip = va_arg(args, long *);
+				*ip = 0;
+			} else {
+				int * ip = va_arg(args, int *);
+				*ip = 0;
+			}
+			continue;
+
+		/* integer number formats - set up the flags and "break" */
+		case L'o':
+			base = 8;
+			break;
+
+		case L'b':
+			base = 2;
+			break;
+
+		case L'X':
+			flags |= LARGE;
+		case L'x':
+			base = 16;
+			break;
+
+		case L'd':
+		case L'i':
+			flags |= SIGN;
+		case L'u':
+			break;
+
+		default:
+			if (*fmt != L'%')
+			{
+				f += L'%';
+			}
+			if (*fmt)
+			{
+				f += *fmt;
+			}
+			else
+				--fmt;
+			continue;
+		}
+
+		if (qualifier == L'I')
+			num = va_arg(args, ULONGLONG);
+		else if (qualifier == L'l') {
+			if (flags & SIGN)
+				num = va_arg(args, long);
+			else
+				num = va_arg(args, unsigned long);
+		}
+		else if (qualifier == L'h') {
+			if (flags & SIGN)
+				num = va_arg(args, int);
+			else
+				num = va_arg(args, unsigned int);
+		}
+		else if (flags & SIGN)
+			num = va_arg(args, int);
+		else
+			num = va_arg(args, unsigned int);
+		result = wnumber(f, num, base, field_width, precision, flags);
+		if (result < 0)
+		{
+			assert(!"TODO FIXME handle error better");
+			return f;
+		}
+	}
+	//putc('\0',f);
+	return f;
+}
diff --git a/reactos/tools/rbuild/ssprintf.h b/reactos/tools/rbuild/ssprintf.h
index 8efdb874117..c7a6d2d2595 100644
--- a/reactos/tools/rbuild/ssprintf.h
+++ b/reactos/tools/rbuild/ssprintf.h
@@ -1,23 +1,23 @@
-// ssprintf.h
-
-#ifndef SSPRINTF_H
-#define SSPRINTF_H
-
-#include <string>
-#include <stdarg.h>
-
-std::string ssprintf ( const char* fmt, ... );
-std::string ssvprintf ( const char* fmt, va_list args );
-
-std::wstring sswprintf ( const wchar_t* fmt, ... );
-std::wstring sswvprintf ( const wchar_t* fmt, va_list args );
-
-#ifdef _UNICODE
-#define sstprintf sswprintf
-#define sstvprintf sswvprintf
-#else
-#define sstprintf ssprintf
-#define sstvprintf ssvprintf
-#endif
-
-#endif//SSPRINTF_H
+// ssprintf.h
+
+#ifndef SSPRINTF_H
+#define SSPRINTF_H
+
+#include <string>
+#include <stdarg.h>
+
+std::string ssprintf ( const char* fmt, ... );
+std::string ssvprintf ( const char* fmt, va_list args );
+
+std::wstring sswprintf ( const wchar_t* fmt, ... );
+std::wstring sswvprintf ( const wchar_t* fmt, va_list args );
+
+#ifdef _UNICODE
+#define sstprintf sswprintf
+#define sstvprintf sswvprintf
+#else
+#define sstprintf ssprintf
+#define sstvprintf ssvprintf
+#endif
+
+#endif//SSPRINTF_H
diff --git a/reactos/tools/rbuild/stubbedcomponent.cpp b/reactos/tools/rbuild/stubbedcomponent.cpp
index 707b5bb01b8..5d65716bee9 100644
--- a/reactos/tools/rbuild/stubbedcomponent.cpp
+++ b/reactos/tools/rbuild/stubbedcomponent.cpp
@@ -1,80 +1,80 @@
-#include "pch.h"
-#include <assert.h>
-
-#include "rbuild.h"
-
-using std::string;
-using std::vector;
-
-StubbedComponent::StubbedComponent ( const Module* module_,
-                                     const XMLElement& stubbedComponentNode )
-	: module(module_),
-	  node(stubbedComponentNode)
-{
-	const XMLAttribute* att = node.GetAttribute ( "name", true );
-	assert ( att );
-	name = att->value;
-}
-
-StubbedComponent::~StubbedComponent ()
-{
-	for ( size_t i = 0; i < symbols.size(); i++ )
-		delete symbols[i];
-}
-
-void
-StubbedComponent::ProcessXML ()
-{
-	size_t i;
-	for ( i = 0; i < node.subElements.size (); i++ )
-		ProcessXMLSubElement ( *node.subElements[i] );
-	for ( i = 0; i < symbols.size (); i++ )
-		symbols[i]->ProcessXML ();
-}
-
-void
-StubbedComponent::ProcessXMLSubElement ( const XMLElement& e )
-{
-	bool subs_invalid = false;
-	if ( e.name == "symbol" )
-	{
-		symbols.push_back ( new StubbedSymbol ( e ) );
-		subs_invalid = false;
-	}
-	if ( subs_invalid && e.subElements.size () > 0 )
-		throw InvalidBuildFileException (
-			e.location,
-			"<%s> cannot have sub-elements",
-			e.name.c_str() );
-	for ( size_t i = 0; i < e.subElements.size (); i++ )
-		ProcessXMLSubElement ( *e.subElements[i] );
-}
-
-
-
-StubbedSymbol::StubbedSymbol ( const XMLElement& stubbedSymbolNode )
-	: node(stubbedSymbolNode)
-{
-}
-
-StubbedSymbol::~StubbedSymbol ()
-{
-}
-
-void
-StubbedSymbol::ProcessXML ()
-{
-	if ( node.value.size () == 0 )
-	{
-		throw InvalidBuildFileException (
-			node.location,
-			"<symbol> is empty." );
-	}
-	symbol = node.value;
-
-	const XMLAttribute* att = node.GetAttribute ( "newname", false );
-	if ( att != NULL )
-		newname = att->value;
-	else
-		newname = symbol;
-}
+#include "pch.h"
+#include <assert.h>
+
+#include "rbuild.h"
+
+using std::string;
+using std::vector;
+
+StubbedComponent::StubbedComponent ( const Module* module_,
+                                     const XMLElement& stubbedComponentNode )
+	: module(module_),
+	  node(stubbedComponentNode)
+{
+	const XMLAttribute* att = node.GetAttribute ( "name", true );
+	assert ( att );
+	name = att->value;
+}
+
+StubbedComponent::~StubbedComponent ()
+{
+	for ( size_t i = 0; i < symbols.size(); i++ )
+		delete symbols[i];
+}
+
+void
+StubbedComponent::ProcessXML ()
+{
+	size_t i;
+	for ( i = 0; i < node.subElements.size (); i++ )
+		ProcessXMLSubElement ( *node.subElements[i] );
+	for ( i = 0; i < symbols.size (); i++ )
+		symbols[i]->ProcessXML ();
+}
+
+void
+StubbedComponent::ProcessXMLSubElement ( const XMLElement& e )
+{
+	bool subs_invalid = false;
+	if ( e.name == "symbol" )
+	{
+		symbols.push_back ( new StubbedSymbol ( e ) );
+		subs_invalid = false;
+	}
+	if ( subs_invalid && e.subElements.size () > 0 )
+		throw InvalidBuildFileException (
+			e.location,
+			"<%s> cannot have sub-elements",
+			e.name.c_str() );
+	for ( size_t i = 0; i < e.subElements.size (); i++ )
+		ProcessXMLSubElement ( *e.subElements[i] );
+}
+
+
+
+StubbedSymbol::StubbedSymbol ( const XMLElement& stubbedSymbolNode )
+	: node(stubbedSymbolNode)
+{
+}
+
+StubbedSymbol::~StubbedSymbol ()
+{
+}
+
+void
+StubbedSymbol::ProcessXML ()
+{
+	if ( node.value.size () == 0 )
+	{
+		throw InvalidBuildFileException (
+			node.location,
+			"<symbol> is empty." );
+	}
+	symbol = node.value;
+
+	const XMLAttribute* att = node.GetAttribute ( "newname", false );
+	if ( att != NULL )
+		newname = att->value;
+	else
+		newname = symbol;
+}
diff --git a/reactos/tools/rbuild/test.h b/reactos/tools/rbuild/test.h
index ee740fdaecf..94bd90e41e3 100644
--- a/reactos/tools/rbuild/test.h
+++ b/reactos/tools/rbuild/test.h
@@ -1,136 +1,136 @@
-#ifndef __TEST_H
-#define __TEST_H
-
-#include "rbuild.h"
-#include "backend/mingw/mingw.h"
-
-#define RBUILD_BASE "tools" SSEP "rbuild" SSEP
-	
-class BaseTest
-{
-public:
-	bool Failed;
-	BaseTest ();
-	virtual ~BaseTest ();
-	virtual void Run () = 0;
-protected:
-	void Assert ( const char *message,
-	              ... );
-	void IsNull ( void* reference,
-	              const char* file,
-	              int line );
-	void IsNotNull ( void* reference,
-	                 const char* file,
-	                 int line );
-	void IsTrue ( bool condition,
-	              const char* file,
-	              int line );
-	void IsFalse ( bool condition,
-	               const char* file,
-	               int line );
-	void AreEqual ( int expected,
-	                int actual,
-	                const char* file,
-	                int line );
-	void AreEqual ( const std::string& expected,
-	                const std::string& actual,
-	                const char* file,
-	                int line );
-	void AreNotEqual ( int expected,
-	                   int actual,
-	                   const char* file,
-	                   int line );
-private:
-	void Fail ();
-};
-
-#define IS_NULL(reference) IsNull((void*)reference,__FILE__,__LINE__)
-#define IS_NOT_NULL(reference) IsNotNull((void*)reference,__FILE__,__LINE__)
-#define IS_TRUE(condition) IsTrue(condition,__FILE__,__LINE__)
-#define IS_FALSE(condition) IsFalse(condition,__FILE__,__LINE__)
-#define ARE_EQUAL(expected,actual) AreEqual(expected,actual,__FILE__,__LINE__)
-#define ARE_NOT_EQUAL(expected,actual) AreNotEqual(expected,actual,__FILE__,__LINE__)
-
-class ProjectTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class ModuleTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class DefineTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class IncludeTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class InvokeTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class LinkerFlagTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class IfTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class FunctionTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class SourceFileTest : public BaseTest
-{
-public:
-	void Run ();
-	void IncludeTest ();
-	void FullParseTest ();
-private:
-	bool IsParentOf ( const SourceFile* parent,
-	                  const SourceFile* child );
-
-};
-
-
-class CDFileTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-
-class SymbolTest : public BaseTest
-{
-public:
-	void Run ();
-};
-
-#endif /* __TEST_H */
+#ifndef __TEST_H
+#define __TEST_H
+
+#include "rbuild.h"
+#include "backend/mingw/mingw.h"
+
+#define RBUILD_BASE "tools" SSEP "rbuild" SSEP
+	
+class BaseTest
+{
+public:
+	bool Failed;
+	BaseTest ();
+	virtual ~BaseTest ();
+	virtual void Run () = 0;
+protected:
+	void Assert ( const char *message,
+	              ... );
+	void IsNull ( void* reference,
+	              const char* file,
+	              int line );
+	void IsNotNull ( void* reference,
+	                 const char* file,
+	                 int line );
+	void IsTrue ( bool condition,
+	              const char* file,
+	              int line );
+	void IsFalse ( bool condition,
+	               const char* file,
+	               int line );
+	void AreEqual ( int expected,
+	                int actual,
+	                const char* file,
+	                int line );
+	void AreEqual ( const std::string& expected,
+	                const std::string& actual,
+	                const char* file,
+	                int line );
+	void AreNotEqual ( int expected,
+	                   int actual,
+	                   const char* file,
+	                   int line );
+private:
+	void Fail ();
+};
+
+#define IS_NULL(reference) IsNull((void*)reference,__FILE__,__LINE__)
+#define IS_NOT_NULL(reference) IsNotNull((void*)reference,__FILE__,__LINE__)
+#define IS_TRUE(condition) IsTrue(condition,__FILE__,__LINE__)
+#define IS_FALSE(condition) IsFalse(condition,__FILE__,__LINE__)
+#define ARE_EQUAL(expected,actual) AreEqual(expected,actual,__FILE__,__LINE__)
+#define ARE_NOT_EQUAL(expected,actual) AreNotEqual(expected,actual,__FILE__,__LINE__)
+
+class ProjectTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class ModuleTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class DefineTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class IncludeTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class InvokeTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class LinkerFlagTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class IfTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class FunctionTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class SourceFileTest : public BaseTest
+{
+public:
+	void Run ();
+	void IncludeTest ();
+	void FullParseTest ();
+private:
+	bool IsParentOf ( const SourceFile* parent,
+	                  const SourceFile* child );
+
+};
+
+
+class CDFileTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+
+class SymbolTest : public BaseTest
+{
+public:
+	void Run ();
+};
+
+#endif /* __TEST_H */
diff --git a/reactos/tools/rbuild/tests/alltests.cpp b/reactos/tools/rbuild/tests/alltests.cpp
index f25306d5e92..d5982385981 100644
--- a/reactos/tools/rbuild/tests/alltests.cpp
+++ b/reactos/tools/rbuild/tests/alltests.cpp
@@ -1,193 +1,193 @@
-
-#include "pch.h"
-
-#include "rbuild.h"
-#include "test.h"
-
-BaseTest::BaseTest()
-{
-	Failed = false;
-}
-
-BaseTest::~BaseTest()
-{
-}
-
-void BaseTest::Assert(const char *message, ...)
-{
-	va_list args;
-	va_start ( args, message );
-	vprintf(message, args);
-	va_end ( args );
-	Fail();
-}
-
-void BaseTest::IsNull(void* reference,
-                      const char* file,
-                      int line)
-{
-	if (reference != NULL)
-	{
-		Assert("Condition was not NULL at %s:%d\n",
-		       file,
-		       line);
-	}
-}
-
-void BaseTest::IsNotNull(void* reference,
-                         const char* file,
-                         int line)
-{
-	if (reference == NULL)
-	{
-		Assert("Condition was NULL at %s:%d\n",
-		       file,
-		       line);
-	}
-}
-
-void BaseTest::IsTrue(bool condition,
-                      const char* file,
-                      int line)
-{
-	if (!condition)
-	{
-		Assert("Condition was not true at %s:%d\n",
-		       file,
-		       line);
-	}
-}
-
-void BaseTest::IsFalse(bool condition,
-                       const char* file,
-                       int line)
-{
-	if (condition)
-	{
-		Assert("Condition was not false at %s:%d\n",
-		       file,
-		       line);
-	}
-}
-
-void BaseTest::AreEqual(int expected,
-                        int actual,
-                        const char* file,
-                        int line)
-{
-	if (actual != expected)
-	{
-		Assert("Expected %d/0x%.08x was %d/0x%.08x at %s:%d\n",
-		       expected,
-		       expected,
-		       actual,
-		       actual,
-		       file,
-		       line);
-	}
-}
-
-void BaseTest::AreEqual(const std::string& expected,
-                        const std::string& actual,
-                        const char* file,
-                        int line)
-{
-	if (actual != expected)
-	{
-		Assert("Expected '%s' was '%s' at %s:%d\n",
-		       expected.c_str(),
-		       actual.c_str(),
-		       file,
-		       line);
-	}
-}
-
-void BaseTest::AreNotEqual(int expected,
-                           int actual,
-                           const char* file,
-                           int line)
-{
-	if (actual == expected)
-	{
-		Assert("Actual value expected to be different from %d/0x%.08x at %s:%d\n",
-		       expected,
-		       expected,
-		       file,
-		       line);
-	}
-}
-
-void BaseTest::Fail()
-{
-	Failed = true;
-}
-
-class BaseTestList : public std::vector<BaseTest*>
-{
-public:
-	~BaseTestList()
-	{
-		for ( size_t i = 0; i < size(); i++ )
-		{
-			delete (*this)[i];
-		}
-	}
-};
-
-class TestDispatcher
-{
-public:
-	void Run()
-	{
-		int numberOfFailedTests = 0;
-		BaseTestList tests;
-		GetTests(tests);
-		for (size_t i = 0; i < tests.size(); i++)
-		{
-			try
-			{
-				BaseTest& test = *tests[i];
-				test.Run();
-				if (test.Failed)
-					numberOfFailedTests++;
-			}
-			catch (Exception& ex)
-			{
-				printf("%s\n",
-				       ex.Message.c_str());
-				numberOfFailedTests++;
-			}
-		}
-		
-		if (numberOfFailedTests > 0)
-			printf("%d tests failed\n",
-			       numberOfFailedTests);
-		else
-			printf("All tests succeeded\n");
-	}
-
-private:
-	void GetTests ( BaseTestList& tests )
-	{
-		tests.push_back(new ProjectTest());
-		tests.push_back(new ModuleTest());
-		tests.push_back(new DefineTest());
-		tests.push_back(new IncludeTest());
-		tests.push_back(new InvokeTest());
-		tests.push_back(new LinkerFlagTest());
-		tests.push_back(new IfTest());
-		tests.push_back(new FunctionTest());
-		tests.push_back(new SourceFileTest());
-		tests.push_back(new CDFileTest());
-		tests.push_back(new SymbolTest());
-	}
-};
-
-
-int main(int argc,
-         char** argv)
-{
-	TestDispatcher testDispatcher;
-	testDispatcher.Run();
-	return 0;
-};
+
+#include "pch.h"
+
+#include "rbuild.h"
+#include "test.h"
+
+BaseTest::BaseTest()
+{
+	Failed = false;
+}
+
+BaseTest::~BaseTest()
+{
+}
+
+void BaseTest::Assert(const char *message, ...)
+{
+	va_list args;
+	va_start ( args, message );
+	vprintf(message, args);
+	va_end ( args );
+	Fail();
+}
+
+void BaseTest::IsNull(void* reference,
+                      const char* file,
+                      int line)
+{
+	if (reference != NULL)
+	{
+		Assert("Condition was not NULL at %s:%d\n",
+		       file,
+		       line);
+	}
+}
+
+void BaseTest::IsNotNull(void* reference,
+                         const char* file,
+                         int line)
+{
+	if (reference == NULL)
+	{
+		Assert("Condition was NULL at %s:%d\n",
+		       file,
+		       line);
+	}
+}
+
+void BaseTest::IsTrue(bool condition,
+                      const char* file,
+                      int line)
+{
+	if (!condition)
+	{
+		Assert("Condition was not true at %s:%d\n",
+		       file,
+		       line);
+	}
+}
+
+void BaseTest::IsFalse(bool condition,
+                       const char* file,
+                       int line)
+{
+	if (condition)
+	{
+		Assert("Condition was not false at %s:%d\n",
+		       file,
+		       line);
+	}
+}
+
+void BaseTest::AreEqual(int expected,
+                        int actual,
+                        const char* file,
+                        int line)
+{
+	if (actual != expected)
+	{
+		Assert("Expected %d/0x%.08x was %d/0x%.08x at %s:%d\n",
+		       expected,
+		       expected,
+		       actual,
+		       actual,
+		       file,
+		       line);
+	}
+}
+
+void BaseTest::AreEqual(const std::string& expected,
+                        const std::string& actual,
+                        const char* file,
+                        int line)
+{
+	if (actual != expected)
+	{
+		Assert("Expected '%s' was '%s' at %s:%d\n",
+		       expected.c_str(),
+		       actual.c_str(),
+		       file,
+		       line);
+	}
+}
+
+void BaseTest::AreNotEqual(int expected,
+                           int actual,
+                           const char* file,
+                           int line)
+{
+	if (actual == expected)
+	{
+		Assert("Actual value expected to be different from %d/0x%.08x at %s:%d\n",
+		       expected,
+		       expected,
+		       file,
+		       line);
+	}
+}
+
+void BaseTest::Fail()
+{
+	Failed = true;
+}
+
+class BaseTestList : public std::vector<BaseTest*>
+{
+public:
+	~BaseTestList()
+	{
+		for ( size_t i = 0; i < size(); i++ )
+		{
+			delete (*this)[i];
+		}
+	}
+};
+
+class TestDispatcher
+{
+public:
+	void Run()
+	{
+		int numberOfFailedTests = 0;
+		BaseTestList tests;
+		GetTests(tests);
+		for (size_t i = 0; i < tests.size(); i++)
+		{
+			try
+			{
+				BaseTest& test = *tests[i];
+				test.Run();
+				if (test.Failed)
+					numberOfFailedTests++;
+			}
+			catch (Exception& ex)
+			{
+				printf("%s\n",
+				       ex.Message.c_str());
+				numberOfFailedTests++;
+			}
+		}
+		
+		if (numberOfFailedTests > 0)
+			printf("%d tests failed\n",
+			       numberOfFailedTests);
+		else
+			printf("All tests succeeded\n");
+	}
+
+private:
+	void GetTests ( BaseTestList& tests )
+	{
+		tests.push_back(new ProjectTest());
+		tests.push_back(new ModuleTest());
+		tests.push_back(new DefineTest());
+		tests.push_back(new IncludeTest());
+		tests.push_back(new InvokeTest());
+		tests.push_back(new LinkerFlagTest());
+		tests.push_back(new IfTest());
+		tests.push_back(new FunctionTest());
+		tests.push_back(new SourceFileTest());
+		tests.push_back(new CDFileTest());
+		tests.push_back(new SymbolTest());
+	}
+};
+
+
+int main(int argc,
+         char** argv)
+{
+	TestDispatcher testDispatcher;
+	testDispatcher.Run();
+	return 0;
+};
diff --git a/reactos/tools/rbuild/tests/cdfiletest.cpp b/reactos/tools/rbuild/tests/cdfiletest.cpp
index 717209924f6..3e6143ca982 100644
--- a/reactos/tools/rbuild/tests/cdfiletest.cpp
+++ b/reactos/tools/rbuild/tests/cdfiletest.cpp
@@ -1,22 +1,22 @@
-#include "test.h"
-
-using std::string;
-
-void CDFileTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/cdfile.xml" );
-	Project project( projectFilename );
-	ARE_EQUAL ( 3, project.cdfiles.size () );
-
-	CDFile& cdfile1 = *project.cdfiles[0];
-	ARE_EQUAL("dir1", cdfile1.base);
-	ARE_EQUAL("ReadMe1.txt", cdfile1.nameoncd);
-
-	CDFile& cdfile2 = *project.cdfiles[1];
-	ARE_EQUAL("dir2", cdfile2.base);
-	ARE_EQUAL("readme2.txt", cdfile2.nameoncd);
-
-	CDFile& cdfile3 = *project.cdfiles[2];
-	//ARE_EQUAL("", cdfile3.base);
-	ARE_EQUAL("readme3.txt", cdfile3.nameoncd);
-}
+#include "test.h"
+
+using std::string;
+
+void CDFileTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/cdfile.xml" );
+	Project project( projectFilename );
+	ARE_EQUAL ( 3, project.cdfiles.size () );
+
+	CDFile& cdfile1 = *project.cdfiles[0];
+	ARE_EQUAL("dir1", cdfile1.base);
+	ARE_EQUAL("ReadMe1.txt", cdfile1.nameoncd);
+
+	CDFile& cdfile2 = *project.cdfiles[1];
+	ARE_EQUAL("dir2", cdfile2.base);
+	ARE_EQUAL("readme2.txt", cdfile2.nameoncd);
+
+	CDFile& cdfile3 = *project.cdfiles[2];
+	//ARE_EQUAL("", cdfile3.base);
+	ARE_EQUAL("readme3.txt", cdfile3.nameoncd);
+}
diff --git a/reactos/tools/rbuild/tests/data/automaticdependency.xml b/reactos/tools/rbuild/tests/data/automaticdependency.xml
index 6fa14b1adbf..3cf3d0a7cbe 100644
--- a/reactos/tools/rbuild/tests/data/automaticdependency.xml
+++ b/reactos/tools/rbuild/tests/data/automaticdependency.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<directory name="tools">
-		<directory name="rbuild">
-			<directory name="tests">
-				<directory name="data">
-					<module name="module1" type="buildtool">
-						<include base="module1">.</include>
-						<file>sourcefile1.c</file>
-					</module>
-				</directory>
-			</directory>
-		</directory>
-	</directory>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<directory name="tools">
+		<directory name="rbuild">
+			<directory name="tests">
+				<directory name="data">
+					<module name="module1" type="buildtool">
+						<include base="module1">.</include>
+						<file>sourcefile1.c</file>
+					</module>
+				</directory>
+			</directory>
+		</directory>
+	</directory>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/automaticdependency_include.xml b/reactos/tools/rbuild/tests/data/automaticdependency_include.xml
index de713cf9d31..9d8c7b43d4e 100644
--- a/reactos/tools/rbuild/tests/data/automaticdependency_include.xml
+++ b/reactos/tools/rbuild/tests/data/automaticdependency_include.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<directory name="tools">
-		<directory name="rbuild">
-			<directory name="tests">
-				<directory name="data">
-					<module name="module1" type="buildtool">
-						<include base="module1">.</include>
-						<include base="module1">sourcefile1</include>
-						<file>sourcefile_include.c</file>
-					</module>
-				</directory>
-			</directory>
-		</directory>
-	</directory>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<directory name="tools">
+		<directory name="rbuild">
+			<directory name="tests">
+				<directory name="data">
+					<module name="module1" type="buildtool">
+						<include base="module1">.</include>
+						<include base="module1">sourcefile1</include>
+						<file>sourcefile_include.c</file>
+					</module>
+				</directory>
+			</directory>
+		</directory>
+	</directory>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/cdfile.xml b/reactos/tools/rbuild/tests/data/cdfile.xml
index ef69d76d3f7..22e5407d690 100644
--- a/reactos/tools/rbuild/tests/data/cdfile.xml
+++ b/reactos/tools/rbuild/tests/data/cdfile.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<directory name="dir1">
-		<cdfile base="dir1" nameoncd="ReadMe1.txt">readme1.txt</cdfile>
-		<cdfile base="dir2">readme2.txt</cdfile>
-		<cdfile>readme3.txt</cdfile>
-	</directory>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<directory name="dir1">
+		<cdfile base="dir1" nameoncd="ReadMe1.txt">readme1.txt</cdfile>
+		<cdfile base="dir2">readme2.txt</cdfile>
+		<cdfile>readme3.txt</cdfile>
+	</directory>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/define.xml b/reactos/tools/rbuild/tests/data/define.xml
index 1f5c823f838..d4f10c12d59 100644
--- a/reactos/tools/rbuild/tests/data/define.xml
+++ b/reactos/tools/rbuild/tests/data/define.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<define name="define1">value1</define>
-	<directory name="dir1">
-		<module name="module1" type="buildtool">
-			<define name="define2">value2</define>
-		</module>
-	</directory>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<define name="define1">value1</define>
+	<directory name="dir1">
+		<module name="module1" type="buildtool">
+			<define name="define2">value2</define>
+		</module>
+	</directory>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/if.xml b/reactos/tools/rbuild/tests/data/if.xml
index 4aae6b06de5..03a981831de 100644
--- a/reactos/tools/rbuild/tests/data/if.xml
+++ b/reactos/tools/rbuild/tests/data/if.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<module name="module1" type="buildtool">
-		<if property="VAR1" value="value1">
-			<file>file1.c</file>
-		</if>
-		<file>file2.c</file>
-	</module>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<module name="module1" type="buildtool">
+		<if property="VAR1" value="value1">
+			<file>file1.c</file>
+		</if>
+		<file>file2.c</file>
+	</module>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/include.xml b/reactos/tools/rbuild/tests/data/include.xml
index 69add646f7d..5bf12038751 100644
--- a/reactos/tools/rbuild/tests/data/include.xml
+++ b/reactos/tools/rbuild/tests/data/include.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<include>include1</include>
-	<directory name="dir1">
-		<module name="module1" type="buildtool">
-			<include>include2</include>
-		</module>
-	</directory>
-	<directory name="dir2">
-		<module name="module2" type="buildtool">
-			<include base="module1">include3</include>
-		</module>
-	</directory>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<include>include1</include>
+	<directory name="dir1">
+		<module name="module1" type="buildtool">
+			<include>include2</include>
+		</module>
+	</directory>
+	<directory name="dir2">
+		<module name="module2" type="buildtool">
+			<include base="module1">include3</include>
+		</module>
+	</directory>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/invoke.xml b/reactos/tools/rbuild/tests/data/invoke.xml
index 7940a0f85b1..33bedb5564e 100644
--- a/reactos/tools/rbuild/tests/data/invoke.xml
+++ b/reactos/tools/rbuild/tests/data/invoke.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<directory name="dir1">
-		<module name="module1" type="buildtool">
-			<file>file1.c</file>
-			<invoke>
-				<output>
-					<outputfile>file1.c</outputfile>
-				</output>
-			</invoke>
-		</module>
-	</directory>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<directory name="dir1">
+		<module name="module1" type="buildtool">
+			<file>file1.c</file>
+			<invoke>
+				<output>
+					<outputfile>file1.c</outputfile>
+				</output>
+			</invoke>
+		</module>
+	</directory>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/linkerflag.xml b/reactos/tools/rbuild/tests/data/linkerflag.xml
index 843a03ede2f..8977cc5c915 100644
--- a/reactos/tools/rbuild/tests/data/linkerflag.xml
+++ b/reactos/tools/rbuild/tests/data/linkerflag.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<linkerflag>-lgcc1</linkerflag>
-	<module name="module1" type="buildtool">
-	<linkerflag>-lgcc2</linkerflag>
-	</module>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<linkerflag>-lgcc1</linkerflag>
+	<module name="module1" type="buildtool">
+	<linkerflag>-lgcc2</linkerflag>
+	</module>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/module.xml b/reactos/tools/rbuild/tests/data/module.xml
index 6e72aad37be..6ccc81839e1 100644
--- a/reactos/tools/rbuild/tests/data/module.xml
+++ b/reactos/tools/rbuild/tests/data/module.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<directory name="dir1">
-		<module name="module1" type="buildtool">
-			<file>file1.c</file>
-			<file>file2.c</file>
-		</module>
-	</directory>
-	<directory name="dir2">
-		<module name="module2" type="kernelmodedll" installbase="reactos" installname="module2.ext">
-			<dependency>module1</dependency>
-			<library>module1</library>
-			<file>file3.c</file>
-			<file>file4.c</file>
-		</module>
-	</directory>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<directory name="dir1">
+		<module name="module1" type="buildtool">
+			<file>file1.c</file>
+			<file>file2.c</file>
+		</module>
+	</directory>
+	<directory name="dir2">
+		<module name="module2" type="kernelmodedll" installbase="reactos" installname="module2.ext">
+			<dependency>module1</dependency>
+			<library>module1</library>
+			<file>file3.c</file>
+			<file>file4.c</file>
+		</module>
+	</directory>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/project.xml b/reactos/tools/rbuild/tests/data/project.xml
index 472cf619c66..97d58317cd8 100644
--- a/reactos/tools/rbuild/tests/data/project.xml
+++ b/reactos/tools/rbuild/tests/data/project.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<directory name="dir1">
-		<module name="module1" type="buildtool">
-		</module>
-	</directory>
-	<directory name="dir2">
-		<module name="module2" type="buildtool">
-		</module>
-	</directory>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<directory name="dir1">
+		<module name="module1" type="buildtool">
+		</module>
+	</directory>
+	<directory name="dir2">
+		<module name="module2" type="buildtool">
+		</module>
+	</directory>
+</project>
diff --git a/reactos/tools/rbuild/tests/data/sourcefile1.c b/reactos/tools/rbuild/tests/data/sourcefile1.c
index 55f17e7c3d2..28af7778e50 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile1.c
+++ b/reactos/tools/rbuild/tests/data/sourcefile1.c
@@ -1,13 +1,13 @@
-/*
- *  ReactOS kernel
- */
-/* $Id: main.c 12694 2005-01-01 11:47:33Z hbirr $
- * FILE:            ntoskrnl/ke/main.c
- */
-
-/* INCLUDES *****************************************************************/
-
-#include <sourcefile1_header1.h>
-#include <sourcefile1_header2.h>
-
-/* GLOBALS *******************************************************************/
+/*
+ *  ReactOS kernel
+ */
+/* $Id: main.c 12694 2005-01-01 11:47:33Z hbirr $
+ * FILE:            ntoskrnl/ke/main.c
+ */
+
+/* INCLUDES *****************************************************************/
+
+#include <sourcefile1_header1.h>
+#include <sourcefile1_header2.h>
+
+/* GLOBALS *******************************************************************/
diff --git a/reactos/tools/rbuild/tests/data/sourcefile1/sourcefile1_header3.h b/reactos/tools/rbuild/tests/data/sourcefile1/sourcefile1_header3.h
index ab79b95a5f7..40a8c178f10 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile1/sourcefile1_header3.h
+++ b/reactos/tools/rbuild/tests/data/sourcefile1/sourcefile1_header3.h
@@ -1 +1 @@
-/* empty */
+/* empty */
diff --git a/reactos/tools/rbuild/tests/data/sourcefile1/sourcefile_includenext.h b/reactos/tools/rbuild/tests/data/sourcefile1/sourcefile_includenext.h
index ab79b95a5f7..40a8c178f10 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile1/sourcefile_includenext.h
+++ b/reactos/tools/rbuild/tests/data/sourcefile1/sourcefile_includenext.h
@@ -1 +1 @@
-/* empty */
+/* empty */
diff --git a/reactos/tools/rbuild/tests/data/sourcefile1_header1.h b/reactos/tools/rbuild/tests/data/sourcefile1_header1.h
index fbae0f515d4..c4261ef88cb 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile1_header1.h
+++ b/reactos/tools/rbuild/tests/data/sourcefile1_header1.h
@@ -1 +1 @@
-#include <sourcefile1_header2.h>
+#include <sourcefile1_header2.h>
diff --git a/reactos/tools/rbuild/tests/data/sourcefile1_header2.h b/reactos/tools/rbuild/tests/data/sourcefile1_header2.h
index f92a74186ae..212537b619a 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile1_header2.h
+++ b/reactos/tools/rbuild/tests/data/sourcefile1_header2.h
@@ -1,3 +1,3 @@
-#include "sourcefile1/sourcefile1_header3.h"
-#include <sourcefile2/sourcefile1_dontexist.h>
-#include <sourcefile1_recurse.h>
+#include "sourcefile1/sourcefile1_header3.h"
+#include <sourcefile2/sourcefile1_dontexist.h>
+#include <sourcefile1_recurse.h>
diff --git a/reactos/tools/rbuild/tests/data/sourcefile1_recurse.h b/reactos/tools/rbuild/tests/data/sourcefile1_recurse.h
index f3ab6df93fd..0ce390cf892 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile1_recurse.h
+++ b/reactos/tools/rbuild/tests/data/sourcefile1_recurse.h
@@ -1,2 +1,2 @@
-#include <sourcefile1_recurse.h>
-#include <sourcefile1_header1.h>
+#include <sourcefile1_recurse.h>
+#include <sourcefile1_header1.h>
diff --git a/reactos/tools/rbuild/tests/data/sourcefile_include.c b/reactos/tools/rbuild/tests/data/sourcefile_include.c
index 373a64d4dcc..8ee9670f406 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile_include.c
+++ b/reactos/tools/rbuild/tests/data/sourcefile_include.c
@@ -1,2 +1,2 @@
-#           include     <sourcefile_include.h>
-#include <sourcefile_includenext.h>
+#           include     <sourcefile_include.h>
+#include <sourcefile_includenext.h>
diff --git a/reactos/tools/rbuild/tests/data/sourcefile_include.h b/reactos/tools/rbuild/tests/data/sourcefile_include.h
index ab79b95a5f7..40a8c178f10 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile_include.h
+++ b/reactos/tools/rbuild/tests/data/sourcefile_include.h
@@ -1 +1 @@
-/* empty */
+/* empty */
diff --git a/reactos/tools/rbuild/tests/data/sourcefile_includenext.h b/reactos/tools/rbuild/tests/data/sourcefile_includenext.h
index f02b86b654d..0f4f8e730b5 100644
--- a/reactos/tools/rbuild/tests/data/sourcefile_includenext.h
+++ b/reactos/tools/rbuild/tests/data/sourcefile_includenext.h
@@ -1 +1 @@
-#include_next <sourcefile_includenext.h>
+#include_next <sourcefile_includenext.h>
diff --git a/reactos/tools/rbuild/tests/data/symbol.xml b/reactos/tools/rbuild/tests/data/symbol.xml
index 0089d6431fc..cb0d536d035 100644
--- a/reactos/tools/rbuild/tests/data/symbol.xml
+++ b/reactos/tools/rbuild/tests/data/symbol.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" ?>
-<project name="Project" makefile="Makefile">
-	<module name="module1" type="test">
-		<component name="ntdll.dll">
-			<symbol newname="RtlAllocateHeap">HeapAlloc@12</symbol>
-			<symbol>LdrAccessResource@16</symbol>
-		</component>
-	</module>
-</project>
+<?xml version="1.0" ?>
+<project name="Project" makefile="Makefile">
+	<module name="module1" type="test">
+		<component name="ntdll.dll">
+			<symbol newname="RtlAllocateHeap">HeapAlloc@12</symbol>
+			<symbol>LdrAccessResource@16</symbol>
+		</component>
+	</module>
+</project>
diff --git a/reactos/tools/rbuild/tests/definetest.cpp b/reactos/tools/rbuild/tests/definetest.cpp
index 539f21a2619..09943a543bd 100644
--- a/reactos/tools/rbuild/tests/definetest.cpp
+++ b/reactos/tools/rbuild/tests/definetest.cpp
@@ -1,21 +1,21 @@
-#include "test.h"
-
-using std::string;
-
-void DefineTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/define.xml" );
-	Project project ( projectFilename );
-	ARE_EQUAL(1, project.non_if_data.defines.size());
-	Define& define1 = *project.non_if_data.defines[0];
-	ARE_EQUAL("define1", define1.name);
-	ARE_EQUAL("value1", define1.value);
-
-	ARE_EQUAL(1, project.modules.size());
-	Module& module1 = *project.modules[0];
-
-	ARE_EQUAL(1, module1.non_if_data.defines.size());
-	Define& define2 = *module1.non_if_data.defines[0];
-	ARE_EQUAL("define2", define2.name);
-	ARE_EQUAL("value2", define2.value);
-}
+#include "test.h"
+
+using std::string;
+
+void DefineTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/define.xml" );
+	Project project ( projectFilename );
+	ARE_EQUAL(1, project.non_if_data.defines.size());
+	Define& define1 = *project.non_if_data.defines[0];
+	ARE_EQUAL("define1", define1.name);
+	ARE_EQUAL("value1", define1.value);
+
+	ARE_EQUAL(1, project.modules.size());
+	Module& module1 = *project.modules[0];
+
+	ARE_EQUAL(1, module1.non_if_data.defines.size());
+	Define& define2 = *module1.non_if_data.defines[0];
+	ARE_EQUAL("define2", define2.name);
+	ARE_EQUAL("value2", define2.value);
+}
diff --git a/reactos/tools/rbuild/tests/functiontest.cpp b/reactos/tools/rbuild/tests/functiontest.cpp
index 3e766567304..571d4c7c805 100644
--- a/reactos/tools/rbuild/tests/functiontest.cpp
+++ b/reactos/tools/rbuild/tests/functiontest.cpp
@@ -1,9 +1,9 @@
-#include "test.h"
-
-using std::string;
-
-void FunctionTest::Run ()
-{
-	string fixedupFilename = NormalizeFilename ( "." SSEP "dir1" SSEP "dir2" SSEP ".." SSEP "filename.txt" );
-	ARE_EQUAL ( "dir1" SSEP "filename.txt", fixedupFilename );
-}
+#include "test.h"
+
+using std::string;
+
+void FunctionTest::Run ()
+{
+	string fixedupFilename = NormalizeFilename ( "." SSEP "dir1" SSEP "dir2" SSEP ".." SSEP "filename.txt" );
+	ARE_EQUAL ( "dir1" SSEP "filename.txt", fixedupFilename );
+}
diff --git a/reactos/tools/rbuild/tests/iftest.cpp b/reactos/tools/rbuild/tests/iftest.cpp
index 92a4c846eae..37d88c15c63 100644
--- a/reactos/tools/rbuild/tests/iftest.cpp
+++ b/reactos/tools/rbuild/tests/iftest.cpp
@@ -1,25 +1,25 @@
-#include "test.h"
-
-using std::string;
-
-void IfTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/if.xml" );
-	Project project ( projectFilename );
-
-	ARE_EQUAL ( 1, project.modules.size () );
-	Module& module1 = *project.modules[0];
-
-	ARE_EQUAL ( 1, module1.non_if_data.ifs.size () );
-	If& if1 = *module1.non_if_data.ifs[0];
-	ARE_EQUAL ( "VAR1", if1.property );
-	ARE_EQUAL ( "value1", if1.value );
-
-	ARE_EQUAL ( 1, if1.data.files.size () );
-	File& file1 = *if1.data.files[0];
-	ARE_EQUAL( SSEP "file1.c", file1.name );
-
-	ARE_EQUAL ( 1, module1.non_if_data.files.size () );
-	File& file2 = *module1.non_if_data.files[0];
-	ARE_EQUAL( SSEP "file2.c", file2.name );
-}
+#include "test.h"
+
+using std::string;
+
+void IfTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/if.xml" );
+	Project project ( projectFilename );
+
+	ARE_EQUAL ( 1, project.modules.size () );
+	Module& module1 = *project.modules[0];
+
+	ARE_EQUAL ( 1, module1.non_if_data.ifs.size () );
+	If& if1 = *module1.non_if_data.ifs[0];
+	ARE_EQUAL ( "VAR1", if1.property );
+	ARE_EQUAL ( "value1", if1.value );
+
+	ARE_EQUAL ( 1, if1.data.files.size () );
+	File& file1 = *if1.data.files[0];
+	ARE_EQUAL( SSEP "file1.c", file1.name );
+
+	ARE_EQUAL ( 1, module1.non_if_data.files.size () );
+	File& file2 = *module1.non_if_data.files[0];
+	ARE_EQUAL( SSEP "file2.c", file2.name );
+}
diff --git a/reactos/tools/rbuild/tests/includetest.cpp b/reactos/tools/rbuild/tests/includetest.cpp
index 6fb4ac8bd1d..3977d68605d 100644
--- a/reactos/tools/rbuild/tests/includetest.cpp
+++ b/reactos/tools/rbuild/tests/includetest.cpp
@@ -1,24 +1,24 @@
-#include "test.h"
-
-using std::string;
-
-void IncludeTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/include.xml" );
-	Project project ( projectFilename );
-	ARE_EQUAL(1, project.non_if_data.includes.size());
-	Include& include1 = *project.non_if_data.includes[0];
-	ARE_EQUAL("include1", include1.directory);
-
-	ARE_EQUAL(2, project.modules.size());
-	Module& module1 = *project.modules[0];
-	Module& module2 = *project.modules[1];
-
-	ARE_EQUAL(1, module1.non_if_data.includes.size());
-	Include& include2 = *module1.non_if_data.includes[0];
-	ARE_EQUAL("include2", include2.directory);
-
-	ARE_EQUAL(1, module2.non_if_data.includes.size());
-	Include& include3 = *module2.non_if_data.includes[0];
-	ARE_EQUAL(FixSeparator("dir1/include3"), include3.directory);
-}
+#include "test.h"
+
+using std::string;
+
+void IncludeTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/include.xml" );
+	Project project ( projectFilename );
+	ARE_EQUAL(1, project.non_if_data.includes.size());
+	Include& include1 = *project.non_if_data.includes[0];
+	ARE_EQUAL("include1", include1.directory);
+
+	ARE_EQUAL(2, project.modules.size());
+	Module& module1 = *project.modules[0];
+	Module& module2 = *project.modules[1];
+
+	ARE_EQUAL(1, module1.non_if_data.includes.size());
+	Include& include2 = *module1.non_if_data.includes[0];
+	ARE_EQUAL("include2", include2.directory);
+
+	ARE_EQUAL(1, module2.non_if_data.includes.size());
+	Include& include3 = *module2.non_if_data.includes[0];
+	ARE_EQUAL(FixSeparator("dir1/include3"), include3.directory);
+}
diff --git a/reactos/tools/rbuild/tests/invoketest.cpp b/reactos/tools/rbuild/tests/invoketest.cpp
index fdd18937e24..409478a406f 100644
--- a/reactos/tools/rbuild/tests/invoketest.cpp
+++ b/reactos/tools/rbuild/tests/invoketest.cpp
@@ -1,19 +1,19 @@
-#include "test.h"
-
-using std::string;
-
-void InvokeTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/invoke.xml" );
-	Project project ( projectFilename );
-	ARE_EQUAL(1, project.modules.size());
-
-	Module& module1 = *project.modules[0];
-	ARE_EQUAL(1, module1.invocations.size());
-
-	Invoke& invoke1 = *module1.invocations[0];
-	ARE_EQUAL(1, invoke1.output.size());
-
-	InvokeFile& file1 = *invoke1.output[0];
-	ARE_EQUAL(FixSeparator("dir1/file1.c"), file1.name);
-}
+#include "test.h"
+
+using std::string;
+
+void InvokeTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/invoke.xml" );
+	Project project ( projectFilename );
+	ARE_EQUAL(1, project.modules.size());
+
+	Module& module1 = *project.modules[0];
+	ARE_EQUAL(1, module1.invocations.size());
+
+	Invoke& invoke1 = *module1.invocations[0];
+	ARE_EQUAL(1, invoke1.output.size());
+
+	InvokeFile& file1 = *invoke1.output[0];
+	ARE_EQUAL(FixSeparator("dir1/file1.c"), file1.name);
+}
diff --git a/reactos/tools/rbuild/tests/linkerflagtest.cpp b/reactos/tools/rbuild/tests/linkerflagtest.cpp
index 4e804523aed..6f7ac48a3a9 100644
--- a/reactos/tools/rbuild/tests/linkerflagtest.cpp
+++ b/reactos/tools/rbuild/tests/linkerflagtest.cpp
@@ -1,19 +1,19 @@
-#include "test.h"
-
-using std::string;
-
-void LinkerFlagTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/linkerflag.xml" );
-	Project project ( projectFilename );
-	ARE_EQUAL(1, project.linkerFlags.size());
-	LinkerFlag& linkerFlag1 = *project.linkerFlags[0];
-	ARE_EQUAL("-lgcc1", linkerFlag1.flag);
-
-	ARE_EQUAL(1, project.modules.size());
-	Module& module1 = *project.modules[0];
-
-	ARE_EQUAL(1, module1.linkerFlags.size());
-	LinkerFlag& linkerFlag2 = *module1.linkerFlags[0];
-	ARE_EQUAL("-lgcc2", linkerFlag2.flag);
-}
+#include "test.h"
+
+using std::string;
+
+void LinkerFlagTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/linkerflag.xml" );
+	Project project ( projectFilename );
+	ARE_EQUAL(1, project.linkerFlags.size());
+	LinkerFlag& linkerFlag1 = *project.linkerFlags[0];
+	ARE_EQUAL("-lgcc1", linkerFlag1.flag);
+
+	ARE_EQUAL(1, project.modules.size());
+	Module& module1 = *project.modules[0];
+
+	ARE_EQUAL(1, module1.linkerFlags.size());
+	LinkerFlag& linkerFlag2 = *module1.linkerFlags[0];
+	ARE_EQUAL("-lgcc2", linkerFlag2.flag);
+}
diff --git a/reactos/tools/rbuild/tests/moduletest.cpp b/reactos/tools/rbuild/tests/moduletest.cpp
index 01313e9364a..87e31dbef9a 100644
--- a/reactos/tools/rbuild/tests/moduletest.cpp
+++ b/reactos/tools/rbuild/tests/moduletest.cpp
@@ -1,37 +1,37 @@
-#include "test.h"
-
-using std::string;
-
-void ModuleTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/module.xml" );
-	Project project ( projectFilename );
-	ARE_EQUAL(2, project.modules.size());
-
-	Module& module1 = *project.modules[0];
-	IS_TRUE(module1.type == BuildTool);
-	
-	ARE_EQUAL(2, module1.non_if_data.files.size());
-	ARE_EQUAL("dir1" SSEP "file1.c", module1.non_if_data.files[0]->name);
-	ARE_EQUAL("dir1" SSEP "file2.c", module1.non_if_data.files[1]->name);
-
-	ARE_EQUAL(0, module1.non_if_data.libraries.size());
-
-	Module& module2 = *project.modules[1];
-	IS_TRUE(module2.type == KernelModeDLL);
-	ARE_EQUAL("reactos", module2.installBase);
-	ARE_EQUAL("module2.ext", module2.installName);
-
-	ARE_EQUAL(2, module2.non_if_data.files.size());
-	ARE_EQUAL("dir2" SSEP "file3.c", module2.non_if_data.files[0]->name);
-	ARE_EQUAL("dir2" SSEP "file4.c", module2.non_if_data.files[1]->name);
-
-	ARE_EQUAL(1, module2.non_if_data.libraries.size());
-	Library& library1 = *module2.non_if_data.libraries[0];
-	ARE_EQUAL("module1", library1.name);
-
-	ARE_EQUAL(1, module2.dependencies.size());
-	Dependency& module1dependency = *module2.dependencies[0];
-	IS_NOT_NULL(module1dependency.dependencyModule);
-	ARE_EQUAL("module1", module1dependency.dependencyModule->name);
-}
+#include "test.h"
+
+using std::string;
+
+void ModuleTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/module.xml" );
+	Project project ( projectFilename );
+	ARE_EQUAL(2, project.modules.size());
+
+	Module& module1 = *project.modules[0];
+	IS_TRUE(module1.type == BuildTool);
+	
+	ARE_EQUAL(2, module1.non_if_data.files.size());
+	ARE_EQUAL("dir1" SSEP "file1.c", module1.non_if_data.files[0]->name);
+	ARE_EQUAL("dir1" SSEP "file2.c", module1.non_if_data.files[1]->name);
+
+	ARE_EQUAL(0, module1.non_if_data.libraries.size());
+
+	Module& module2 = *project.modules[1];
+	IS_TRUE(module2.type == KernelModeDLL);
+	ARE_EQUAL("reactos", module2.installBase);
+	ARE_EQUAL("module2.ext", module2.installName);
+
+	ARE_EQUAL(2, module2.non_if_data.files.size());
+	ARE_EQUAL("dir2" SSEP "file3.c", module2.non_if_data.files[0]->name);
+	ARE_EQUAL("dir2" SSEP "file4.c", module2.non_if_data.files[1]->name);
+
+	ARE_EQUAL(1, module2.non_if_data.libraries.size());
+	Library& library1 = *module2.non_if_data.libraries[0];
+	ARE_EQUAL("module1", library1.name);
+
+	ARE_EQUAL(1, module2.dependencies.size());
+	Dependency& module1dependency = *module2.dependencies[0];
+	IS_NOT_NULL(module1dependency.dependencyModule);
+	ARE_EQUAL("module1", module1dependency.dependencyModule->name);
+}
diff --git a/reactos/tools/rbuild/tests/projecttest.cpp b/reactos/tools/rbuild/tests/projecttest.cpp
index 71d5b5481a6..2769d860314 100644
--- a/reactos/tools/rbuild/tests/projecttest.cpp
+++ b/reactos/tools/rbuild/tests/projecttest.cpp
@@ -1,10 +1,10 @@
-#include "test.h"
-
-using std::string;
-
-void ProjectTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/project.xml" );
-	Project project( projectFilename );
-	ARE_EQUAL(2, project.modules.size());
-}
+#include "test.h"
+
+using std::string;
+
+void ProjectTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/project.xml" );
+	Project project( projectFilename );
+	ARE_EQUAL(2, project.modules.size());
+}
diff --git a/reactos/tools/rbuild/tests/sourcefiletest.cpp b/reactos/tools/rbuild/tests/sourcefiletest.cpp
index 5885baa062c..a7af1a499a5 100644
--- a/reactos/tools/rbuild/tests/sourcefiletest.cpp
+++ b/reactos/tools/rbuild/tests/sourcefiletest.cpp
@@ -1,70 +1,70 @@
-#include "test.h"
-
-using std::string;
-
-bool
-SourceFileTest::IsParentOf ( const SourceFile* parent,
-	                         const SourceFile* child )
-{
-	size_t i;
-	for ( i = 0; i < child->parents.size (); i++ )
-	{
-		if ( child->parents[i] != NULL )
-		{
-			if ( child->parents[i] == parent )
-			{
-				return true;
-			}
-		}
-	}
-	for ( i = 0; i < child->parents.size (); i++ )
-	{
-		if ( child->parents[i] != NULL )
-		{
-			if ( IsParentOf ( parent,
-			                  child->parents[i] ) )
-			{
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-void
-SourceFileTest::IncludeTest ()
-{
-	const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml" );
-	AutomaticDependency automaticDependency ( project );
-	automaticDependency.Process ();
-	ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () );
-	const SourceFile* include = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile_include.h" );
-	IS_NOT_NULL( include );
-	const SourceFile* includenext = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1" SSEP "sourcefile_includenext.h" );
-	IS_NOT_NULL( includenext );
-}
-
-void
-SourceFileTest::FullParseTest ()
-{
-	const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml" );
-	AutomaticDependency automaticDependency ( project );
-	automaticDependency.Process ();
-	ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () );
-	const SourceFile* header1 = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1_header1.h" );
-	IS_NOT_NULL( header1 );
-	const SourceFile* recurse = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1_recurse.h" );
-	IS_NOT_NULL( recurse );
-	IS_TRUE( IsParentOf ( header1,
-	                      recurse ) );
-	IS_FALSE( IsParentOf ( recurse,
-	                       header1 ) );
-	
-}
-
-void
-SourceFileTest::Run ()
-{
-	IncludeTest ();
-	FullParseTest ();
-}
+#include "test.h"
+
+using std::string;
+
+bool
+SourceFileTest::IsParentOf ( const SourceFile* parent,
+	                         const SourceFile* child )
+{
+	size_t i;
+	for ( i = 0; i < child->parents.size (); i++ )
+	{
+		if ( child->parents[i] != NULL )
+		{
+			if ( child->parents[i] == parent )
+			{
+				return true;
+			}
+		}
+	}
+	for ( i = 0; i < child->parents.size (); i++ )
+	{
+		if ( child->parents[i] != NULL )
+		{
+			if ( IsParentOf ( parent,
+			                  child->parents[i] ) )
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+void
+SourceFileTest::IncludeTest ()
+{
+	const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml" );
+	AutomaticDependency automaticDependency ( project );
+	automaticDependency.Process ();
+	ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () );
+	const SourceFile* include = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile_include.h" );
+	IS_NOT_NULL( include );
+	const SourceFile* includenext = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1" SSEP "sourcefile_includenext.h" );
+	IS_NOT_NULL( includenext );
+}
+
+void
+SourceFileTest::FullParseTest ()
+{
+	const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml" );
+	AutomaticDependency automaticDependency ( project );
+	automaticDependency.Process ();
+	ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () );
+	const SourceFile* header1 = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1_header1.h" );
+	IS_NOT_NULL( header1 );
+	const SourceFile* recurse = automaticDependency.RetrieveFromCache ( RBUILD_BASE "tests" SSEP "data" SSEP "sourcefile1_recurse.h" );
+	IS_NOT_NULL( recurse );
+	IS_TRUE( IsParentOf ( header1,
+	                      recurse ) );
+	IS_FALSE( IsParentOf ( recurse,
+	                       header1 ) );
+	
+}
+
+void
+SourceFileTest::Run ()
+{
+	IncludeTest ();
+	FullParseTest ();
+}
diff --git a/reactos/tools/rbuild/tests/symboltest.cpp b/reactos/tools/rbuild/tests/symboltest.cpp
index 9d6d534667a..007c49d4924 100644
--- a/reactos/tools/rbuild/tests/symboltest.cpp
+++ b/reactos/tools/rbuild/tests/symboltest.cpp
@@ -1,25 +1,25 @@
-#include "test.h"
-
-using std::string;
-
-void SymbolTest::Run()
-{
-	string projectFilename ( RBUILD_BASE "tests/data/symbol.xml" );
-	Project project ( projectFilename );
-	
-	ARE_EQUAL ( 1, project.modules.size () );
-	Module& module1 = *project.modules[0];
-	
-	ARE_EQUAL ( 1, module1.stubbedComponents.size () );
-	StubbedComponent& component1 = *module1.stubbedComponents[0];
-	ARE_EQUAL ( "ntdll.dll", component1.name );
-	
-	ARE_EQUAL ( 2, component1.symbols.size () );
-	StubbedSymbol& symbol1 = *component1.symbols[0];
-	ARE_EQUAL ( "HeapAlloc@12", symbol1.symbol );
-	ARE_EQUAL ( "RtlAllocateHeap", symbol1.newname );
-	
-	StubbedSymbol& symbol2 = *component1.symbols[1];
-	ARE_EQUAL ( "LdrAccessResource@16", symbol2.symbol );
-	ARE_EQUAL ( "LdrAccessResource@16", symbol2.newname );
-}
+#include "test.h"
+
+using std::string;
+
+void SymbolTest::Run()
+{
+	string projectFilename ( RBUILD_BASE "tests/data/symbol.xml" );
+	Project project ( projectFilename );
+	
+	ARE_EQUAL ( 1, project.modules.size () );
+	Module& module1 = *project.modules[0];
+	
+	ARE_EQUAL ( 1, module1.stubbedComponents.size () );
+	StubbedComponent& component1 = *module1.stubbedComponents[0];
+	ARE_EQUAL ( "ntdll.dll", component1.name );
+	
+	ARE_EQUAL ( 2, component1.symbols.size () );
+	StubbedSymbol& symbol1 = *component1.symbols[0];
+	ARE_EQUAL ( "HeapAlloc@12", symbol1.symbol );
+	ARE_EQUAL ( "RtlAllocateHeap", symbol1.newname );
+	
+	StubbedSymbol& symbol2 = *component1.symbols[1];
+	ARE_EQUAL ( "LdrAccessResource@16", symbol2.symbol );
+	ARE_EQUAL ( "LdrAccessResource@16", symbol2.newname );
+}
-- 
2.17.1