Oops, used wrong tag

svn path=/tags/ReactOS-0.2.7/; revision=18974

irc/ArchBlackmann/ArchBlackmann.cpp

@@ -12,18 +12,11 @@
 #include "trim.h"
 
 #include "IRCClient.h"
+#include "config.h"
 
 using std::string;
 using std::vector;
 
-#if defined(_DEBUG) && 0
-const char* BOTNAME = "RoyBot";
-const char* CHANNEL = "#RoyBotTest";
-#else
-const char* BOTNAME = "ArchBlackmann";
-const char* CHANNEL = "#ReactOS";
-#endif
-
 //vector<string> tech, module, dev, stru, period, status, type, func, irql, curse, cursecop;
 
 class List
@@ -157,14 +150,46 @@ bool isop ( const string& who )
 	return false;
 }
 
+
 // do custom stuff with the IRCClient from your subclass via the provided callbacks...
 class MyIRCClient : public IRCClient
 {
 	File flog;
+	clock_t brake_silence;
+
+	// wait another 30 mins to brake the silence
+	#define NOIDLE brake_silence = clock () + 30 * CLK_TCK * 60
+
+	void CheckIdle ( void )
+	{
+		while (true) // _inRun
+		{
+			while (clock() < brake_silence)
+				Sleep(10000);
+
+			string out = TaggedReply("idle");
+
+			if ( !strnicmp ( out.c_str(), "/me ", 4 ) )
+				Action ( CHANNEL, &out[4] );
+			else
+				PrivMsg ( CHANNEL, out );
+
+			NOIDLE;
+		}
+	}
+
+	static void THREADAPI CallMe ( MyIRCClient* irc )
+	{
+		irc->CheckIdle();
+	}
+
 public:
+
 	MyIRCClient()
 	{
-		flog.open ( "arch.log", "w+" );
+		NOIDLE;
+		ThreadPool::Instance().Launch ( (ThreadPoolFunc*)MyIRCClient::CallMe, this );
+		flog.open ( "arch.log", "r+" );
 	}
 	// see IRCClient.h for documentation on these callbacks...
 	bool OnConnected()
@@ -173,7 +198,7 @@ public:
 	}
 	bool OnJoin ( const string& user, const string& channel )
 	{
-		printf ( "user '%s' joined channel '%s'\n", user.c_str(), channel.c_str() );
+		//printf ( "user '%s' joined channel '%s'\n", user.c_str(), channel.c_str() );
 		return true;
 	}
 	bool OnPart ( const std::string& user, const std::string& channel )
@@ -207,11 +232,18 @@ public:
 	}
 	bool OnPrivMsg ( const string& from, const string& text )
 	{
+		//flog.flush();
 		printf ( "<%s> %s\n", from.c_str(), text.c_str() );
 		flog.printf ( "<%s> %s\n", from.c_str(), text.c_str() );
-		if ( strnicmp ( text.c_str(), "!say ", 5 ) || !isop(from) )
+
+		if ( !isop(from) )
 			return PrivMsg ( from, "hey, your tongue doesn't belong there!" );
+
+		else if ( strnicmp ( text.c_str(), "!say ", 5 ) )
+			return PrivMsg ( from, "Talk to me on normal Chanel" );
+
 		string say = trim(&text[5]);
+
 		if ( !strnicmp ( say.c_str(), "/me ", 4 ) )
 			return Action ( CHANNEL, trim(&say[4]) );
 		else
@@ -219,140 +251,176 @@ public:
 	}
 	bool OnChannelMsg ( const string& channel, const string& from, const string& text )
 	{
+		fflush ( flog );
 		printf ( "%s <%s> %s\n", channel.c_str(), from.c_str(), text.c_str() );
 		flog.printf ( "%s <%s> %s\n", channel.c_str(), from.c_str(), text.c_str() );
+		NOIDLE; // add 30 mins till idle
+
 		bool found_name = false;
 		string text2 ( text );
 		strlwr ( &text2[0] );
 
 		if ( !strnicmp ( text.c_str(), BOTNAME, strlen(BOTNAME) ) )
 			found_name = true;
-		else if ( !strnicmp ( text.c_str(), "arch ", 5 ) )
-			found_name = true;
+
+		string s ( text );
 
 		if ( found_name )
-		{
-			string s ( text );
 			gobble ( s, " \t" ); // remove bot name
-			found_name = true;
-			if ( s[0] == '!' )
+
+		// command
+		if ( s[0] == '!' )
+		{
+			bool from_op = isop(from);
+			string cmd = gobble ( s, " \t" );
+
+			// from all		
+			if ( false && cmd == "!svn" && from == "TechBot" ) // || cmd == "!help" && !TechBotOnline
 			{
-				bool from_op = isop(from);
-				string cmd = gobble ( s, " \t" );
-				if ( !from_op )
+					PrivMsg ( channel, "For my help try !what." );
+			}
+
+			// from normel user
+			else if ( !from_op )
+			{
+				if ( cmd == "!grovel" )
 				{
-					if ( cmd == "!grovel" )
-					{
-						string out = ssprintf(TaggedReply("nogrovel").c_str(),from.c_str());
-						if ( !strnicmp ( out.c_str(), "/me ", 4 ) )
-							return Action ( channel, &out[4] );
-						else
-							return PrivMsg ( channel, out );
-					}
-					return PrivMsg ( channel, ssprintf("%s: I don't take commands from non-ops",from.c_str()) );
-				}
-				if ( cmd == "!add" )
-				{
-					string listname = gobble ( s, " \t" );
-					int i = GetListIndex ( listname.c_str() );
-					if ( i == -1 )
-						return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) );
-					List& list = lists[i];
-					if ( s[0] == '\"' || s[0] == '\'' )
-					{
-						char delim = s[0];
-						const char* p = &s[1];
-						const char* p2 = strchr ( p, delim );
-						if ( !p2 )
-							return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) );
-						s = string ( p, p2-p );
-					}
-					for ( i = 0; i < list.list.size(); i++ )
-					{
-						if ( list.list[i] == s )
-							return PrivMsg ( channel, ssprintf("%s: entry already exists in list '%s'",from.c_str(),listname.c_str()) );
-					}
-					if ( !stricmp ( listname.c_str(), "curse" ) )
-						strlwr ( &s[0] );
-					list.list.push_back ( s );
-					{
-						File f ( ssprintf("%s.txt",list.name.c_str()), "w" );
-						for ( i = 0; i < list.list.size(); i++ )
-							f.printf ( "%s\n", list.list[i].c_str() );
-					}
-					return PrivMsg ( channel, ssprintf("%s: entry added to list '%s'",from.c_str(),listname.c_str()) );
-				}
-				else if ( cmd == "!remove" )
-				{
-					string listname = gobble ( s, " \t" );
-					int i = GetListIndex ( listname.c_str() );
-					if ( i == -1 )
-						return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) );
-					List& list = lists[i];
-					if ( s[0] == '\"' || s[0] == '\'' )
-					{
-						char delim = s[0];
-						const char* p = &s[1];
-						const char* p2 = strchr ( p, delim );
-						if ( !p2 )
-							return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) );
-						s = string ( p, p2-p );
-					}
-					for ( i = 0; i < list.list.size(); i++ )
-					{
-						if ( list.list[i] == s )
-						{
-							list.list.erase ( &list.list[i] );
-							{
-								File f ( ssprintf("%s.txt",list.name.c_str()), "w" );
-								for ( i = 0; i < list.list.size(); i++ )
-									f.printf ( "%s\n", list.list[i].c_str() );
-							}
-							return PrivMsg ( channel, ssprintf("%s: entry removed from list '%s'",from.c_str(),listname.c_str()) );
-						}
-					}
-					return PrivMsg ( channel, ssprintf("%s: entry doesn't exist in list '%s'",from.c_str(),listname.c_str()) );
-				}
-				else if ( cmd == "!grovel" )
-				{
-					string out = ssprintf(TaggedReply("grovel").c_str(),from.c_str());
+					string out = ssprintf(TaggedReply("nogrovel").c_str(),from.c_str());
 					if ( !strnicmp ( out.c_str(), "/me ", 4 ) )
 						return Action ( channel, &out[4] );
 					else
 						return PrivMsg ( channel, out );
 				}
-				else if ( cmd == "!kiss" )
+				
+				else if ( cmd == "!what" )
 				{
-					if ( s.size() )
-						return Action ( channel, ssprintf("kisses %s",s.c_str()) );
-					else
-						return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) );
+					return PrivMsg ( channel, ssprintf("For you, %s, I only support the \"!grovel\" command.", from.c_str()).c_str() );
 				}
-				else if ( cmd == "!hug" )
+				
+				else if ( cmd == "!grovel" || cmd == "!kiss" || cmd == "!hug" 
+				       || cmd == "!give" || cmd == "!what" || cmd == "!add" || cmd == "!remove" )
 				{
-					if ( s.size() )
-						return Action ( channel, ssprintf("hugs %s",s.c_str()) );
-					else
-						return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) );
-				}
-				else if ( cmd == "!give" )
-				{
-					string who = gobble(s," \t");
-					if ( who.size() && s.size() )
-						return Action ( channel, ssprintf("gives %s a %s",who.c_str(),s.c_str()) );
-					else
-						return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) );
-				}
-				else
-				{
-					return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) );
+					PrivMsg ( channel, ssprintf("%s: I only take commands from ops",from.c_str()) );
 				}
 			}
-		}
+			
+			// from op
+			else if ( cmd == "!grovel" )
+			{
+				string out = ssprintf(TaggedReply("grovel").c_str(),from.c_str());
+				if ( !strnicmp ( out.c_str(), "/me ", 4 ) )
+					return Action ( channel, &out[4] );
+				else
+					return PrivMsg ( channel, out );
+			}
+			else if ( cmd == "!kiss" )
+			{
+				if ( s.size() )
+					return Action ( channel, ssprintf("kisses %s",s.c_str()) );
+				else
+					return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) );
+			}
+			else if ( cmd == "!hug" )
+			{
+				if ( s.size() )
+					return Action ( channel, ssprintf("hugs %s",s.c_str()) );
+				else
+					return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) );
+			}	
+			else if ( cmd == "!give" )
+			{
+				string who = gobble(s," \t");
+				if ( who.size() && s.size() )
+					return Action ( channel, ssprintf("gives %s a %s",who.c_str(),s.c_str()) );
+				else
+					return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) );
+			}
+			else if ( cmd == "!what" )
+			{		
+				PrivMsg ( channel, "For ops I support the following commands:" );
+				PrivMsg ( channel, "!grovel" );
+				PrivMsg ( channel, "!kiss" );
+				PrivMsg ( channel, "!hug" );
+				PrivMsg ( channel, "!give" );
+				PrivMsg ( channel, "!say (the input is a private message)" );
+				PrivMsg ( channel, "!add" );
+				PrivMsg ( channel, "!remove" );
+				PrivMsg ( channel, " - for more info see wiki" );
+			}
+			else if ( cmd == "!add" )
+			{
+				string listname = gobble ( s, " \t" );
+				int i = GetListIndex ( listname.c_str() );
+				if ( i == -1 )
+					return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) );
+				List& list = lists[i];
+				if ( s[0] == '\"' || s[0] == '\'' )
+				{
+					char delim = s[0];
+					const char* p = &s[1];
+					const char* p2 = strchr ( p, delim );
+					if ( !p2 )
+						return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) );
+					s = string ( p, p2-p );
+				}
+				for ( i = 0; i < list.list.size(); i++ )
+				{
+					if ( list.list[i] == s )
+						return PrivMsg ( channel, ssprintf("%s: entry already exists in list '%s'",from.c_str(),listname.c_str()) );
+				}
+				if ( !stricmp ( listname.c_str(), "curse" ) )
+					strlwr ( &s[0] );
+				list.list.push_back ( s );
+				{
+					File f ( ssprintf("%s.txt",list.name.c_str()), "w" );
+					for ( i = 0; i < list.list.size(); i++ )
+						f.printf ( "%s\n", list.list[i].c_str() );
+				}
+				return PrivMsg ( channel, ssprintf("%s: entry added to list '%s'",from.c_str(),listname.c_str()) );
+			}
+			else if ( cmd == "!remove" )
+			{
+				string listname = gobble ( s, " \t" );
+				int i = GetListIndex ( listname.c_str() );
+				if ( i == -1 )
+					return PrivMsg ( channel, ssprintf("%s: I don't have a list named '%s'",from.c_str(),listname.c_str()) );
+				List& list = lists[i];
+				if ( s[0] == '\"' || s[0] == '\'' )
+				{
+					char delim = s[0];
+					const char* p = &s[1];
+					const char* p2 = strchr ( p, delim );
+					if ( !p2 )
+						return PrivMsg ( channel, ssprintf("%s: Couldn't add, unmatched quotes",from.c_str()) );
+					s = string ( p, p2-p );
+				}
+				for ( i = 0; i < list.list.size(); i++ )
+				{
+					if ( list.list[i] == s )
+					{
+						list.list.erase ( &list.list[i] );
+						{
+								File f ( ssprintf("%s.txt",list.name.c_str()), "w" );
+							for ( i = 0; i < list.list.size(); i++ )
+								f.printf ( "%s\n", list.list[i].c_str() );
+						}
+						return PrivMsg ( channel, ssprintf("%s: entry removed from list '%s'",from.c_str(),listname.c_str()) );
+					}
+				}
+				return PrivMsg ( channel, ssprintf("%s: entry doesn't exist in list '%s'",from.c_str(),listname.c_str()) );
+			}
+			else
+			{
+				if (found_name)
+					return PrivMsg ( channel, ssprintf("%s: huh?",from.c_str()) );
+			}
+		
+		} // if (command)
 
 		bool found_curse = false;
 		static vector<string>& curse = GetList("curse").list;
-		text2 = ssprintf(" %s ",text2.c_str());
+		text2 = " " + text2 + " ";
+
 		for ( int i = 0; i < curse.size() && !found_curse; i++ )
 		{
 			if ( strstr ( text2.c_str(), curse[i].c_str() ) )
@@ -363,7 +431,12 @@ public:
 			static List& cursecop = GetList("cursecop");
 			return PrivMsg ( channel, ssprintf("%s: %s", from.c_str(), ListRand(cursecop)) );
 		}
-		else if ( found_name )
+
+		string botname (BOTNAME);
+		strlwr ( &botname[0] );
+		//botname = " " + botname + " ";
+
+		if ( strstr(text2.c_str(), botname.c_str()) || strstr(text2.c_str(), " arch ") || found_name )
 		{
 			string out = ssprintf("%s: %s", from.c_str(), TaggedReply("tech").c_str());
 			flog.printf ( "TECH-REPLY: %s\n", out.c_str() );
@@ -373,7 +446,9 @@ public:
 				return PrivMsg ( channel, out );
 		}
 		return true;
-	}
+
+	} // On Chanel Message
+
 	bool OnChannelMode ( const string& channel, const string& mode )
 	{
 		//printf ( "OnChannelMode(%s,%s)\n", channel.c_str(), mode.c_str() );
@@ -439,6 +514,16 @@ public:
 		//printf ( "\n" );
 		return true;
 	}
+	bool OnKick ( void )
+	{
+		Join(CHANNEL);
+		return true;
+	}
+	bool OnBanned ( const std::string& channel )
+	{
+		Sleep(10000);
+		return Join(CHANNEL);
+	}
 };
 
 int main ( int argc, char** argv )
@@ -461,50 +546,59 @@ int main ( int argc, char** argv )
 	ImportList ( "cursecop", false );
 	ImportList ( "grovel", false );
 	ImportList ( "nogrovel", false );
+	ImportList ( "idle", false );
 
 #ifdef _DEBUG
 	printf ( "initializing IRCClient debugging\n" );
 	IRCClient::SetDebug ( true );
 #endif//_DEBUG
-	printf ( "calling suStartup()\n" );
-	suStartup();
-	printf ( "creating IRCClient object\n" );
-	MyIRCClient irc;
-	printf ( "connecting to freenode\n" );
 
-	//const char* server = "212.204.214.114";
-	const char* server = "irc.freenode.net";
+	while (true)
+	{
+		printf ( "calling suStartup()\n" );
+		suStartup();
+		printf ( "creating IRCClient object\n" );
+		MyIRCClient irc;
+		printf ( "connecting to freenode\n" );
 
-	if ( !irc.Connect ( server ) ) // irc.freenode.net
-	{
-		printf ( "couldn't connect to server\n" );
-		return -1;
+		if ( !irc.Connect ( SERVER ) ) // irc.freenode.net
+		{
+			printf ( "couldn't connect to server\n" );
+			Sleep(10000);
+			continue;
+		}
+		printf ( "sending user command\n" );
+		if ( !irc.User ( BOTNAME, "reactos.com", SERVER, "ArchBlackmann" ) )
+		{
+			printf ( "USER command failed, retying ...\n" );
+			Sleep(10000);
+			continue;
+		}
+		printf ( "sending nick\n" );
+		if ( !irc.Nick ( BOTNAME ) )
+		{
+			printf ( "NICK command failed, retying ...\n" );
+			Sleep(10000);
+			continue;
+		}
+		printf ( "setting mode\n" );
+		if ( !irc.Mode ( MODE ) )
+		{
+			printf ( "MODE command failed, retying ...\n" );
+			Sleep(10000);
+			continue;
+		}
+		printf ( "joining channel\n" );
+		if ( !irc.Join ( CHANNEL ) )
+		{
+			printf ( "JOIN command failed, retying ...\n" );
+			Sleep(10000);
+			continue;
+		}
+
+		printf ( "entering irc client processor\n" );
+		irc.Run ( false ); // do the processing in this thread...
 	}
-	printf ( "sending user command\n" );
-	if ( !irc.User ( BOTNAME, "", "irc.freenode.net", BOTNAME ) )
-	{
-		printf ( "USER command failed\n" );
-		return -1;
-	}
-	printf ( "sending nick\n" );
-	if ( !irc.Nick ( BOTNAME ) )
-	{
-		printf ( "NICK command failed\n" );
-		return -1;
-	}
-	printf ( "setting mode\n" );
-	if ( !irc.Mode ( "+i" ) )
-	{
-		printf ( "MODE command failed\n" );
-		return -1;
-	}
-	printf ( "joining channel\n" );
-	if ( !irc.Join ( CHANNEL ) )
-	{
-		printf ( "JOIN command failed\n" );
-		return -1;
-	}
-	printf ( "entering irc client processor\n" );
-	irc.Run ( false ); // do the processing in this thread...
+
 	return 0;
 }

irc/ArchBlackmann/ArchBlackmann.dsp

@@ -110,6 +110,10 @@ SOURCE=.\chomp.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\config.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\cram_md5.cpp
 # End Source File
 # Begin Source File

irc/ArchBlackmann/IRCClient.cpp

@@ -16,6 +16,7 @@
 #include "chomp.h"
 #include "SplitJoin.h"
 #include "base64.h"
+#include "config.h"
 
 using std::string;
 using std::stringstream;
@@ -23,6 +24,8 @@ using std::vector;
 
 bool IRCClient::_debug = true;
 
+// see rfc1459 for IRC-Protocoll Reference
+
 IRCClient::IRCClient()
 	: _timeout(10*60*1000), _inRun(false)
 {
@@ -51,7 +54,9 @@ bool
 IRCClient::Nick ( const string& nick )
 {
 	_nick = nick;
-	return Send ( "NICK " + _nick + "\n" );
+	Send ( "NICK " + _nick + "\n" );
+	PrivMsg ("NickServ", "IDENTIFY " + (string)PASS);
+	return true;
 }
 
 bool
@@ -75,7 +80,7 @@ IRCClient::Mode ( const string& channel, const string& mode, const string& targe
 bool
 IRCClient::Join ( const string& channel )
 {
-	return Send ( "JOIN " + channel + "\n" );
+	return Send("JOIN " + channel + "\n");
 }
 
 bool
@@ -145,7 +150,7 @@ int IRCClient::Run ( bool launch_thread )
 	{
 		ThreadPool::Instance().Launch ( (ThreadPoolFunc*)IRCClient::Callback, this );
 		return 1;
-	}
+	} 
 	_inRun = true;
 	if ( _debug ) printf ( "IRCClient::Run() - waiting for responses\n" );
 	string buf;
@@ -296,6 +301,7 @@ int IRCClient::Run ( bool launch_thread )
 			}
 			else if ( cmd == "join" )
 			{
+				mychannel = text;
 				OnJoin ( src, text );
 			}
 			else if ( cmd == "part" )
@@ -306,14 +312,20 @@ int IRCClient::Run ( bool launch_thread )
 			{
 				OnNick ( src, text );
 			}
+			else if ( cmd == "kick" )
+			{
+				OnKick ();
+			}
 			else if ( isdigit(cmd[0]) )
 			{
 				int i = atoi(cmd.c_str());
 				switch ( i )
 				{
+
 				case 1: // "Welcome!" - i.e. it's okay to issue commands now...
 					OnConnected();
 					break;
+
 				case 353: // user list for channel....
 					{
 						p = text.c_str();
@@ -336,6 +348,7 @@ int IRCClient::Run ( bool launch_thread )
 						OnChannelUsers ( channel, users );
 					}
 					break;
+
 				case 366: // END of user list for channel
 					{
 						p = text.c_str();
@@ -345,6 +358,38 @@ int IRCClient::Run ( bool launch_thread )
 						OnEndChannelUsers ( channel );
 					}
 					break;
+
+				case 474: // You are banned
+					{
+						p = text.c_str();
+						p2 = strpbrk ( p, " :" );
+						if ( !p2 ) continue;
+						string channel ( p, p2-p );
+						OnBanned ( channel ); 
+					}
+					break;
+
+				case 433: // Nick in Use
+					{
+						string nick = _nick;
+						Nick (nick + "_");
+
+						PrivMsg ("NickServ", "GHOST " + nick + " " + PASS);
+
+						//	HACK HACK HACK 
+						Mode ( "+i" );
+						Join ( CHANNEL ); // this is because IRC client does not review if his commands were sucessfull
+
+						Sleep ( 1000 );
+						Nick ( nick );
+					}
+					break;
+
+				case 2: //MOTD
+				case 376: //MOTD
+				case 372:
+					break;
+
 				default:
 					if ( _debug ) printf ( "unknown command %i: %s", i, buf.c_str() );
 					break;

irc/ArchBlackmann/IRCClient.h

@@ -12,9 +12,11 @@
 
 class IRCClient : public suBufferedRecvSocket
 {
+
 public:
 	IRCClient();
 
+	std::string mychannel;
 	static bool GetDebug() { return _debug; }
 	static bool SetDebug ( bool debug ) { bool old = _debug; _debug = debug; return old; }
 
@@ -99,6 +101,12 @@ public:
 	virtual bool OnChannelUsers ( const std::string& channel, const std::vector<std::string>& users )
 		{ return true; }
 
+	// OnKick: if the client has been kicked
+	virtual bool OnKick ( void ) { return true; }
+
+	// OnKick: if the client has been kicked
+	virtual bool OnBanned ( const std::string& channel ) { return true; }
+
 	// notification that you have received the entire list of users for a channel
 	virtual bool OnEndChannelUsers ( const std::string& channel ) { return true; }
 

irc/ArchBlackmann/config.h

@@ -0,0 +1,7 @@
+
+
+#define SERVER "irc.freenode.net"
+#define BOTNAME "ArchBlackmann"
+#define CHANNEL "#ReactOS"
+#define MODE "+i"
+#define PASS "ilovebunnies"

irc/ArchBlackmann/curse.txt

@@ -24,3 +24,4 @@ goat.cx
 ekush
 akshor
 poop
+guten morgen

irc/ArchBlackmann/idle.txt

@@ -0,0 +1 @@
+/me is bored

reactos/CREDITS

@@ -46,6 +46,7 @@ Jason Weiler
 David Welch <welch@cwcom.net>
 Jonathan Wilson <jonwil@tpgi.com.au>
 Art Yerkes <ayerkes@speakeasy.net>
+Magnus Olsen (magnus@greatlord.com)
 
 Graphic Design from
 

reactos/Makefile

@@ -1,3 +1,52 @@
+# Well-known targets:
+#
+#    all (default target)
+#        This target builds all of ReactOS.
+#
+#    module
+#        These targets builds a single module. Replace module with the name of
+#        the module you want to build.
+#
+#    bootcd
+#        This target builds an ISO (ReactOS.iso) from which ReactOS can be booted
+#        and installed.
+#
+#    livecd
+#        This target builds an ISO (ReactOS-Live.iso) from which ReactOS can be
+#        booted, but not installed.
+#
+#    install
+#        This target installs all of ReactOS to a location specified by the
+#        ROS_INSTALL environment variable.
+#
+#    module_install
+#        These targets installs a single module to a location specified by the
+#        ROS_INSTALL environment variable. Replace module with the name of the
+#        module you want to install.
+#
+#    clean
+#        This target cleans (deletes) all files that are generated when building
+#        ReactOS.
+#
+#    module_clean
+#        These targets cleans (deletes) files that are generated when building a
+#        single module. Replace module with the name of the module you want to
+#        clean.
+#
+#    depends
+#        This target does a complete dependency check of the ReactOS codebase.
+#        This can require several minutes to complete. If you only need to check
+#        dependencies for a single or few modules then you can use the
+#        module_depends targets instead. This target can also repair a damaged or
+#        missing makefile.auto if needed.
+#
+#    module_depends
+#        These targets do a dependency check of individual modules. Replace module
+#        with the name of the module for which you want to check dependencies.
+#        This is faster than the depends target which does a complete dependency
+#        check of the ReactOS codebase.
+#
+#
 # Accepted environment variables:
 #
 #    ROS_PREFIX
@@ -50,11 +99,18 @@
 #
 #    ROS_RBUILDFLAGS
 #        Pass parameters to rbuild.
+#            -v           Be verbose.
+#            -c           Clean as you go. Delete generated files as soon as they are not needed anymore.
+#            -dd          Disable automatic dependencies.
+#            -dm{module}  Check only automatic dependencies for this module.
+#            -mi          Let make handle creation of install directories. Rbuild will not generate the directories.
+#            -ps          Generate proxy makefiles in source tree instead of the output tree.
 
 .PHONY: all
 .PHONY: clean
 all: makefile.auto
 
+
 .SUFFIXES:
 
 ifeq ($(HOST),)
@@ -81,33 +137,39 @@ else
   BUILDNO_QUIET = -q
 endif
 endif
+ifeq ($(HOST),mingw32-linux)
+  QUOTE = "
+else
+  QUOTE =
+endif
 ifeq ($(HALFVERBOSEECHO),yes)
-  ECHO_CP      =@echo [COPY]     $@
-  ECHO_MKDIR   =@echo [MKDIR]    $@
-  ECHO_BUILDNO =@echo [BUILDNO]  $@
-  ECHO_INVOKE  =@echo [INVOKE]   $<
-  ECHO_PCH     =@echo [PCH]      $@
-  ECHO_CC      =@echo [CC]       $<
-  ECHO_GAS     =@echo [GAS]      $<
-  ECHO_NASM    =@echo [NASM]     $<
-  ECHO_AR      =@echo [AR]       $@
-  ECHO_WINEBLD =@echo [WINEBLD]  $@
-  ECHO_WRC     =@echo [WRC]      $@
-  ECHO_WIDL    =@echo [WIDL]     $@
-  ECHO_BIN2RES =@echo [BIN2RES]  $<
-  ECHO_DLLTOOL =@echo [DLLTOOL]  $@
-  ECHO_LD      =@echo [LD]       $@
-  ECHO_NM      =@echo [NM]       $@
-  ECHO_OBJDUMP =@echo [OBJDUMP]  $@
-  ECHO_RBUILD  =@echo [RBUILD]   $@
-  ECHO_RSYM    =@echo [RSYM]     $@
-  ECHO_WMC     =@echo [WMC]      $@
-  ECHO_NCI     =@echo [NCI]      $@
-  ECHO_CABMAN  =@echo [CABMAN]   $<
-  ECHO_CDMAKE  =@echo [CDMAKE]   $@
-  ECHO_MKHIVE  =@echo [MKHIVE]   $@
-  ECHO_REGTESTS=@echo [REGTESTS] $@
-  ECHO_TEST    =@echo [TEST]     $@
+  ECHO_CP      =@echo $(QUOTE)[COPY]     $@$(QUOTE)
+  ECHO_MKDIR   =@echo $(QUOTE)[MKDIR]    $@$(QUOTE)
+  ECHO_BUILDNO =@echo $(QUOTE)[BUILDNO]  $@$(QUOTE)
+  ECHO_INVOKE  =@echo $(QUOTE)[INVOKE]   $<$(QUOTE)
+  ECHO_PCH     =@echo $(QUOTE)[PCH]      $@$(QUOTE)
+  ECHO_CC      =@echo $(QUOTE)[CC]       $<$(QUOTE)
+  ECHO_GAS     =@echo $(QUOTE)[GAS]      $<$(QUOTE)
+  ECHO_NASM    =@echo $(QUOTE)[NASM]     $<$(QUOTE)
+  ECHO_AR      =@echo $(QUOTE)[AR]       $@$(QUOTE)
+  ECHO_WINEBLD =@echo $(QUOTE)[WINEBLD]  $@$(QUOTE)
+  ECHO_WRC     =@echo $(QUOTE)[WRC]      $@$(QUOTE)
+  ECHO_WIDL    =@echo $(QUOTE)[WIDL]     $@$(QUOTE)
+  ECHO_BIN2RES =@echo $(QUOTE)[BIN2RES]  $<$(QUOTE)
+  ECHO_DLLTOOL =@echo $(QUOTE)[DLLTOOL]  $@$(QUOTE)
+  ECHO_LD      =@echo $(QUOTE)[LD]       $@$(QUOTE)
+  ECHO_NM      =@echo $(QUOTE)[NM]       $@$(QUOTE)
+  ECHO_OBJDUMP =@echo $(QUOTE)[OBJDUMP]  $@$(QUOTE)
+  ECHO_RBUILD  =@echo $(QUOTE)[RBUILD]   $@$(QUOTE)
+  ECHO_RSYM    =@echo $(QUOTE)[RSYM]     $@$(QUOTE)
+  ECHO_WMC     =@echo $(QUOTE)[WMC]      $@$(QUOTE)
+  ECHO_NCI     =@echo $(QUOTE)[NCI]      $@$(QUOTE)
+  ECHO_CABMAN  =@echo $(QUOTE)[CABMAN]   $<$(QUOTE)
+  ECHO_CDMAKE  =@echo $(QUOTE)[CDMAKE]   $@$(QUOTE)
+  ECHO_MKHIVE  =@echo $(QUOTE)[MKHIVE]   $@$(QUOTE)
+  ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE)
+  ECHO_TEST    =@echo $(QUOTE)[TEST]     $@$(QUOTE)
+  ECHO_GENDIB  =@echo $(QUOTE)[GENDIB]   $@$(QUOTE)
 else
   ECHO_CP      =
   ECHO_MKDIR   =
@@ -135,6 +197,7 @@ else
   ECHO_MKHIVE  =
   ECHO_REGTESTS=
   ECHO_TEST    =
+  ECHO_GENDIB  =
 endif
 
 
@@ -236,7 +299,8 @@ PREAUTO := \
 	$(BUGCODES_RC) \
 	$(ERRCODES_H) \
 	$(ERRCODES_RC) \
-	$(NCI_SERVICE_FILES)
+	$(NCI_SERVICE_FILES) \
+	$(GENDIB_DIB_FILES)
 
 makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
 	$(ECHO_RBUILD)

reactos/ReactOS.xml

@@ -28,8 +28,10 @@
 		<define name="KDBG" value="1" />
 		<property name="DBG_OR_KDBG" value="true" />
 	</if>
+	<compilerflag>-Wpointer-arith</compilerflag>
 
 	<include>include</include>
+	<include>include/reactos</include>
 	<include>w32api/include</include>
 	<include>w32api/include/ddk</include>
 
@@ -57,6 +59,9 @@
 	<directory name="media">
 		<xi:include href="media/directory.xml" />
 	</directory>
+	<directory name="modules">
+		<xi:include href="modules/directory.xml" />
+	</directory>
 	<directory name="ntoskrnl">
 		<xi:include href="ntoskrnl/ntoskrnl.xml" />
 	</directory>

reactos/apps/Makefile

@@ -1,13 +0,0 @@
-# $Id$
-#
-# ReactOS apps and tools makefile to generate Doxygen documentation
-#
-
-
-docu:
-	doxygen Doxyfile
-
-.PHONY: docu
-
-
-# EOF

reactos/apps/testsets/Makefile

@@ -1,162 +0,0 @@
-#
-# ReactOS system testsets makefile
-#
-
-PATH_TO_TOP = ../..
-
-include $(PATH_TO_TOP)/rules.mak
-
-
-# Testset applications
-TEST_SETS = loadlib
-
-TEST_KERNEL32 = 
-
-TEST_MSVCRT = 
-
-TEST_COM = 
-
-TEST_SEH = 
-
-TEST_REGRESSIONS = 
-
-all: $(TEST_SETS)  $(TEST_KERNEL32) $(TEST_MSVCRT) $(TEST_COM) $(TEST_SEH) $(TEST_REGRESSIONS) 
-
-depends: 
-
-implib: $(TEST_SETS:%=%_implib) \
-	$(TEST_KERNEL32:%=%_implib) \
-	$(TEST_MSVCRT:%=%_implib) \
-	$(TEST_COM:%=%_implib) \
-	$(TEST_SEH:%=%_implib) \
-	$(TEST_REGRESSIONS:%=%_implib)
-
-clean: 	$(TEST_SETS:%=%_clean) \
-	$(TEST_KERNEL32:%=%_clean) \
-	$(TEST_MSVCRT:%=%_clean) \
-	$(TEST_COM:%=%_clean) \
-	$(TEST_SEH:%=%_clean) \
-	$(TEST_REGRESSIONS:%=%_clean)
-
-install: $(TEST_SETS:%=%_install) \
-	 $(TEST_KERNEL32:%=%_install) \
-	 $(TEST_MSVCRT:%=%_install) \
-	 $(TEST_COM:%=%_install) \
-	 $(TEST_SEH:%=%_install) \
-	 $(TEST_REGRESSIONS:%=%_install)
-
-.PHONY: all depends implib clean install
-
-
-#
-# Testset Applications
-#
-$(TEST_SETS): %:
-	$(MAKE) -C $*
-
-$(TEST_SETS:%=%_implib): %_implib:
-	$(MAKE) -C $* implib
-
-$(TEST_SETS:%=%_clean): %_clean:
-	$(MAKE) -C $* clean
-
-$(TEST_SETS:%=%_install): %_install:
-	$(MAKE) -C $* install
-
-.PHONY: $(TEST_SETS) $(TEST_SETS:%=%_implib) $(TEST_SETS:%=%_clean) $(TEST_SETS:%=%_install)
-
-
-#
-# Kernel32 Test Applications
-#
-$(TEST_KERNEL32): %:
-	$(MAKE) -C kernel32/$*
-
-$(TEST_KERNEL32:%=%_implib): %_implib:
-	$(MAKE) -C kernel32/$* implib
-
-$(TEST_KERNEL32:%=%_clean): %_clean:
-	$(MAKE) -C kernel32/$* clean
-
-$(TEST_KERNEL32:%=%_install): %_install:
-	$(MAKE) -C kernel32/$* install
-
-.PHONY: $(TEST_KERNEL32) $(TEST_KERNEL32:%=%_implib) $(TEST_KERNEL32:%=%_clean) $(TEST_KERNEL32:%=%_install)
-
-
-#
-# msvcrt Test Applications
-#
-$(TEST_MSVCRT): %:
-	$(MAKE) -C msvcrt/$*
-
-$(TEST_MSVCRT:%=%_implib): %_implib:
-	$(MAKE) -C msvcrt/$* implib
-
-$(TEST_MSVCRT:%=%_clean): %_clean:
-	$(MAKE) -C msvcrt/$* clean
-
-$(TEST_MSVCRT:%=%_install): %_install:
-	$(MAKE) -C msvcrt/$* install
-
-.PHONY: $(TEST_MSVCRT) $(TEST_MSVCRT:%=%_implib) $(TEST_MSVCRT:%=%_clean) $(TEST_MSVCRT:%=%_install)
-
-
-#
-# COM Test Applications
-#
-$(TEST_COM): %:
-	$(MAKE) -C com/$*
-
-$(TEST_COM:%=%_implib): %_implib:
-	$(MAKE) -C com/$* implib
-
-$(TEST_COM:%=%_clean): %_clean:
-	$(MAKE) -C com/$* clean
-
-$(TEST_COM:%=%_install): %_install:
-	$(MAKE) -C com/$* install
-
-.PHONY: $(TEST_COM) $(TEST_COM:%=%_implib) $(TEST_COM:%=%_clean) $(TEST_COM:%=%_install)
-
-
-#
-# SEH Test Applications
-#
-$(TEST_SEH): %:
-	$(MAKE) -C seh/$*
-
-$(TEST_SEH:%=%_implib): %_implib:
-	$(MAKE) -C seh/$* implib
-
-$(TEST_SEH:%=%_clean): %_clean:
-	$(MAKE) -C seh/$* clean
-
-$(TEST_SEH:%=%_install): %_install:
-	$(MAKE) -C seh/$* install
-
-.PHONY: $(TEST_SEH) $(TEST_SEH:%=%_implib) $(TEST_SEH:%=%_clean) $(TEST_SEH:%=%_install)
-
-
-#
-# Regression Test Applications
-#
-$(TEST_REGRESSIONS): %:
-	$(MAKE) -C regres/$*
-
-$(TEST_REGRESSIONS:%=%_implib): %_implib:
-	$(MAKE) -C regres/$* implib
-
-$(TEST_REGRESSIONS:%=%_clean): %_clean:
-	$(MAKE) -C regres/$* clean
-
-$(TEST_REGRESSIONS:%=%_install): %_install:
-	$(MAKE) -C regres/$* install
-
-.PHONY: $(TEST_REGRESSIONS) $(TEST_REGRESSIONS:%=%_implib) $(TEST_REGRESSIONS:%=%_clean) $(TEST_REGRESSIONS:%=%_install)
-
-
-etags:
-	find . -name "*.[ch]" -print | etags --language=c -
-
-# EOF

reactos/apps/testsets/loadlib/makefile

@@ -1,24 +0,0 @@
-#
-# $Id: makefile,v 1.0
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = loadlib
-
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -DUNICODE -D_UNICODE
-
-TARGET_SDKLIBS = kernel32.a ntdll.a 
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/testsets/msvcrt/fileio/makefile

@@ -1,27 +0,0 @@
-#
-# $Id: makefile,v 1.0
-
-PATH_TO_TOP = ../../../..
-
-TEST_ROOT = $(PATH_TO_TOP)/apps/testsets/test
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = fileio
-
-#TARGET_CFLAGS = -I$(TEST_ROOT) -DDBG -DUNICODE -D_UNICODE
-TARGET_CFLAGS = -I$(TEST_ROOT) -DDBG
-
-TARGET_SDKLIBS = ntdll.a kernel32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o wfileio.o main.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/binpatch/Makefile

@@ -1,21 +0,0 @@
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = binpatch
-
-TARGET_SDKLIBS = 
-
-TARGET_OBJECTS = patch.o
-
-TARGET_CFLAGS += -Wall -Werror
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/cat/makefile

@@ -1,21 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = cat
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CFLAGS = -Wall -Werror
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/directory.xml

@@ -4,4 +4,7 @@
 <directory name="rosperf">
 	<xi:include href="rosperf/rosperf.xml" />
 </directory>
+<directory name="ps">
+	<xi:include href="ps/ps.xml" />
+</directory>
 

reactos/apps/utils/driver/load/makefile

@@ -1,21 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = load
-
-TARGET_CFLAGS = -DUNICODE -D_UNICODE
-
-TARGET_SDKLIBS = ntdll.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/driver/unload/makefile

@@ -1,21 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = unload
-
-TARGET_CFLAGS = -DUNICODE -D_UNICODE
-
-TARGET_SDKLIBS = ntdll.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/infinst/makefile

@@ -1,21 +0,0 @@
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = windows
-
-TARGET_NAME = infinst
-
-TARGET_SDKLIBS = comdlg32.a setupapi.a
-
-TARGET_OBJECTS = infinst.o
-
-TARGET_CFLAGS = -Wall -Werror
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/net/arp/arp.c

@@ -1,99 +1,465 @@
-/*
- * arp - display ARP cache from the IP stack parameters.
+/* 
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS arp utility
+ * FILE:        apps/utils/net/arp/arp.c
+ * PURPOSE:     view and manipulate the ARP cache
+ * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
+ * REVISIONS:
+ *   GM 27/06/05 Created
  *
- * This source code is in the PUBLIC DOMAIN and has NO WARRANTY.
- *
- * Robert Dickenson <robd@reactos.org>, August 15, 2002.
  */
-#include <stdio.h>
+ 
+ 
 #include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <tchar.h>
-#include <time.h>
-
-#include <iptypes.h>
-#include <ipexport.h>
+#include <string.h>
+#include <ctype.h>
+#include <winsock2.h>
 #include <iphlpapi.h>
-#include <snmp.h>
-
-#include "trace.h"
-
-
-VOID SNMP_FUNC_TYPE SnmpSvcInitUptime();
-DWORD SNMP_FUNC_TYPE SnmpSvcGetUptime();
-
-////////////////////////////////////////////////////////////////////////////////
-
-const char szUsage[] = { "\n" \
-    "Displays and modifies the IP Protocol to physical address translation tables\n" \
-    "used by address resolution protocol (ARP).\n" \
-    "\n" \
-    "ARP -s inet_addr eth_addr [if_addr]\n" \
-    "ARP -d inet_addr [if_addr]\n" \
-    "ARP -a [inet_addr] [-N if_addr]\n" \
-    "\n" \
-    "  -a            Displays the active ARP table by querying the current protocol\n" \
-    "                data. If inet_addr is specified, the IP and physical addresses\n" \
-    "                for the specified address are displayed. If more than one\n" \
-    "                network interface is using ARP, each interfaces ARP table is\n" \
-    "                displayed.\n" \
-    "  -g            Indentical to -a.\n" \
-    "  inet_addr     Specifies the IP address.\n" \
-    "  -N if_addr    Displays the ARP table for the specified interface only\n" \
-    "  -d            Deletes the host entry specified by inet_addr. inet_addr may be\n" \
-    "                wildcarded with * to delete all host entries in the ARP table.\n" \
-    "  -s            Adds the host and associates the IP address inet_addr with the\n" \
-    "                physical address eth_addr. The physical address must be specified\n" \
-    "                as 6 hexadecimal characters delimited by hyphens. The new entry\n" \
-    "                will become permanent in the ARP table.\n" \
-    "  eth_addr      Specifies the interface physical address.\n" \
-    "  if_addr       If present, this specifies the IP address of the interface whose\n" \
-    "                address translation table should be modified. If not present, the\n" \
-    "                first applicable interface will be used.\n" \
-    "Example:\n" \
-    "  > arp -s 192.168.0.12   55-AA-55-01-02-03   .... Static entry creation.\n" \
-    "  > arp -a                                    .... ARP table display.\n" \
-    "  > arp -d *                                  .... Delete all ARP table entries.\n"
-};
-
-void usage(void)
+ 
+#define WIN32_LEAN_AND_MEAN
+#define UNICODE
+#define _UNICODE
+ 
+/*
+ * Globals
+ */ 
+const char SEPERATOR = '-';
+ 
+ 
+ 
+/*
+ * function declerations
+ */ 
+INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr);
+INT PrintEntries(PMIB_IPNETROW pIpAddRow);
+INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr);
+INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr);
+VOID Usage(VOID);
+ 
+ 
+ 
+/*
+ *
+ * Takes optional parameters of an internet address and interface address.
+ * Retrieve all entries in the ARP cache. If an internet address is
+ * specified, display the ARP entry relating to that address. If an
+ * interface address is specified, display all entries relating to
+ * that interface.
+ *
+ */
+/* FIXME: allow user to specify an interface address, via pszIfAddr */
+INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
 {
-//	fprintf(stderr,"USAGE:\n");
-	fputs(szUsage, stderr);
-}
-
-int main(int argc, char *argv[])
-{
-    TCHAR szComputerName[50];
-    DWORD dwSize = 50;
-
-    int nBytes = 500;
-    BYTE* pCache;
-
-    if (argc > 1) {
-        usage();
-        return 1;
-    }
-
-    SnmpSvcInitUptime();
-
-    GetComputerName(szComputerName, &dwSize);
-    _tprintf(_T("ReactOS ARP cache on Computer Name: %s\n"), szComputerName);
-
-    pCache = (BYTE*)SnmpUtilMemAlloc(nBytes);
-
-        Sleep(2500);
-
-    if (pCache != NULL) {
-
-        DWORD dwUptime = SnmpSvcGetUptime();
-
-        _tprintf(_T("SNMP uptime: %ld\n"), dwUptime);
-
-        SnmpUtilMemFree(pCache);
+    INT iRet;
+    UINT i, k;
+    PMIB_IPNETTABLE pIpNetTable;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    ULONG ulSize = 0;
+    struct in_addr inaddr, inaddr2;
+    DWORD dwSize = 0;
+    PTCHAR pszIpAddr;
+    TCHAR szIntIpAddr[20];
+ 
+    /* Return required buffer size */
+    GetIpNetTable(NULL, &ulSize, 0);
+ 
+    /* allocate memory for ARP address table */
+    pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE));
+    ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
+ 
+    /* get Arp address table */
+    if (pIpNetTable != NULL) {
+        GetIpNetTable(pIpNetTable, &ulSize, TRUE);
     } else {
-        _tprintf(_T("ERROR: call to SnmpUtilMemAlloc() failed\n"));
-        return 1;
+        _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
+        free(pIpNetTable);
+        return -1;
     }
-	return 0;
-}
+ 
+    /* check there are entries in the table */ 
+    if (pIpNetTable->dwNumEntries == 0) {
+        _tprintf(_T("No ARP entires found\n"));
+        free(pIpNetTable);
+        return -1;
+    }
+ 
+ 
+ 
+    /* try doing this in the way it's done above, it's clearer */
+    /* Retrieve the interface-to-ip address mapping
+     * table to get the IP address for adapter */    
+    pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+    GetIpAddrTable(pIpAddrTable, &dwSize, 0);   // NULL ?
+ 
 
+    pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+    //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable));
+ 
+    if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0
+        _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
+        _tprintf(_T("error: %d\n"), WSAGetLastError());
+    }
+ 
+ 
+    for (k=0; k < pIpAddrTable->dwNumEntries; k++) {
+        if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex) {
+            //printf("printing pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex);
+            inaddr2.s_addr = pIpAddrTable->table[k].dwAddr;
+            pszIpAddr = inet_ntoa(inaddr2);
+            strcpy(szIntIpAddr, pszIpAddr);
+        }
+    }   
+ 
+ 
+    /* print header, including interface IP address and index number */
+    _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex);
+    _tprintf(_T("  Internet Address      Physical Address      Type\n"));
+ 
+    /* go through all ARP entries */
+    for (i=0; i < pIpNetTable->dwNumEntries; i++) {
+ 
+        /* if the user has supplied their own internet addesss *
+         * only print the arp entry which matches that */
+        if (pszInetAddr) {
+            inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr;        
+            pszIpAddr = inet_ntoa(inaddr);
+ 
+            /* check if it matches, print it */
+            if (strcmp(pszIpAddr, pszInetAddr) == 0) {
+                PrintEntries(&pIpNetTable->table[i]);
+            }
+        } else {
+            /* if an address is not supplied, print all entries */
+            PrintEntries(&pIpNetTable->table[i]);
+        }
+ 
+    }
+ 
+    free(pIpNetTable);
+    free(pIpAddrTable);
+ 
+    return 0;
+}
+ 
+ 
+ 
+/*
+ *
+ * Takes an ARP entry and prints the IP address,
+ * the MAC address and the entry type to screen
+ *
+ */
+INT PrintEntries(PMIB_IPNETROW pIpAddRow)
+{
+    IN_ADDR inaddr;
+    TCHAR cMacAddr[20];
+ 
+    /* print IP addresses */
+    inaddr.S_un.S_addr = pIpAddRow->dwAddr;        
+    _tprintf(_T("  %-22s"), inet_ntoa(inaddr));  //error checking
+ 
+    /* print MAC address */
+    _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"),
+        pIpAddRow->bPhysAddr[0],
+        pIpAddRow->bPhysAddr[1],
+        pIpAddRow->bPhysAddr[2],
+        pIpAddRow->bPhysAddr[3],
+        pIpAddRow->bPhysAddr[4],
+        pIpAddRow->bPhysAddr[5]);
+    _tprintf(_T("%-22s"), cMacAddr);
+ 
+    /* print cache type */
+    switch (pIpAddRow->dwType) {
+        case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n"));
+                                      break;
+        case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n"));
+                                      break;
+        case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n"));
+                                      break;
+        case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n"));
+                                      break;
+    }
+    return 0;
+}
+ 
+ 
+ 
+/*
+ *
+ * Takes an internet address, a MAC address and an optional interface
+ * address as arguments and checks their validity.
+ * Fill out an MIB_IPNETROW structure and insert the data into the 
+ * ARP cache as a static entry.
+ *
+ */
+INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
+{
+    PMIB_IPNETROW pAddHost;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    DWORD dwIpAddr;
+    DWORD dwSize = 0;
+    INT iRet, i, val;
+    TCHAR c;
+ 
+    /* error checking */
+ 
+    /* check IP address */
+    if (pszInetAddr != NULL) {
+        if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) {
+            _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr);
+            return -1;
+        }
+    } else {
+        Usage();
+        return -1;
+    }
+ 
+    /* check MAC address */
+    if (strlen(pszEthAddr) != 17) {
+        _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr);
+        return -1;
+    }
+    for (i=0; i<17; i++) {
+        if (pszEthAddr[i] == SEPERATOR) {
+            continue;
+        }
+        if (!isxdigit(pszEthAddr[i])) {
+            _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr);
+            return -1;
+        }
+    }
+ 
+    /* reserve memory on heap and zero */
+    pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW));
+    ZeroMemory(pAddHost, sizeof(MIB_IPNETROW));
+ 
+ 
+ 
+ 
+    /* set dwIndex field to the index of a local IP address to 
+     * indicate the network on which the ARP entry applies */
+    if (pszIfAddr) {
+        sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex);
+    } else {
+        /* map the IP to the index */  
+        pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+        GetIpAddrTable(pIpAddrTable, &dwSize, 0);
+ 
+        pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+ 
+        if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0
+            _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
+            _tprintf(_T("error: %d\n"), WSAGetLastError());
+        }
+        printf("printing pIpAddrTable->table[0].dwIndex = %lx\n", pIpAddrTable->table[0].dwIndex);
+        pAddHost->dwIndex = 4;
+
+        free(pIpAddrTable);
+    }
+ 
+    /* Set MAC address to 6 bytes (typical) */
+    pAddHost->dwPhysAddrLen = 6;
+ 
+ 
+    /* Encode bPhysAddr into correct byte array */
+    for (i=0; i<6; i++) {
+        val =0;
+        c = toupper(pszEthAddr[i*3]);
+        c = c - (isdigit(c) ? '0' : ('A' - 10));
+        val += c;
+        val = (val << 4);
+        c = toupper(pszEthAddr[i*3 + 1]);
+        c = c - (isdigit(c) ? '0' : ('A' - 10));
+        val += c;
+        pAddHost->bPhysAddr[i] = val;
+ 
+    }
+ 
+ 
+    /* copy converted IP address */
+    pAddHost->dwAddr = dwIpAddr;
+ 
+ 
+    /* set type to static */
+    pAddHost->dwType = MIB_IPNET_TYPE_STATIC;
+ 
+ 
+    /* Add the ARP entry */
+    if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) {
+        _tprintf(_T("The ARP entry addition failed: %d\n"), iRet);
+        return -1;
+    }
+ 
+    free(pAddHost);
+ 
+    return 0;
+}
+ 
+ 
+ 
+/*
+ *
+ * Takes an internet address and an optional interface address as 
+ * arguments and checks their validity.
+ * Add the interface number and IP to an MIB_IPNETROW structure 
+ * and remove the entrty from the ARP cache.
+ *
+ */
+INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
+{
+    PMIB_IPNETROW pDelHost;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    DWORD dwIpAddr;
+    DWORD dwSize = 0;
+    INT iret;
+ 
+    /* error checking */
+ 
+    /* check IP address */
+    if (pszInetAddr != NULL) {
+        if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) {
+            _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr);
+            return -1;
+        }
+    } else {
+        Usage();
+        return -1;
+    }
+ 
+ 
+     pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE));
+     pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW));
+     ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE));
+     ZeroMemory(pDelHost, sizeof(MIB_IPNETROW));
+    /* set dwIndex field to the index of a local IP address to 
+     * indicate the network on which the ARP entry applies */
+    if (pszIfAddr) {
+        sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex);
+    } else {
+        /* map the IP to the index */
+        if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) {
+            pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+        }
+        if ((iret = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) {
+            _tprintf(_T("GetIpAddrTable failed: %d\n"), iret);
+            _tprintf(_T("error: %d\n"), WSAGetLastError());
+        }
+        pDelHost->dwIndex = 4; //pIpAddrTable->table[0].dwIndex;
+    }    
+ 
+    /* copy converted IP address */
+    pDelHost->dwAddr = dwIpAddr; 
+ 
+    /* Add the ARP entry */
+    if ((iret = DeleteIpNetEntry(pDelHost)) != NO_ERROR) {
+        _tprintf(_T("The ARP entry deletion failed: %d\n"), iret);
+        return -1;
+    }
+ 
+    free(pIpAddrTable);
+    free(pDelHost);
+ 
+    return 0;
+}
+ 
+ 
+ 
+/*
+ *
+ * print program usage to screen
+ *
+ */ 
+VOID Usage(VOID)
+{
+    _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n"
+                "address resolution protocol (ARP).\n"
+                "\n"
+                "ARP -s inet_addr eth_addr [if_addr]\n"
+                "ARP -d inet_addr [if_addr]\n"
+                "ARP -a [inet_addr] [-N if_addr]\n"
+                "\n"
+                "  -a            Displays current ARP entries by interrogating the current\n"
+                "                protocol data.  If inet_addr is specified, the IP and Physical\n"
+                "                addresses for only the specified computer are displayed.  If\n"
+                "                more than one network interface uses ARP, entries for each ARP\n"
+                "                table are displayed.\n"
+                "  -g            Same as -a.\n"
+                "  inet_addr     Specifies an internet address.\n"
+                "  -N if_addr    Displays the ARP entries for the network interface specified\n"
+                "                by if_addr.\n"
+                "  -d            Deletes the host specified by inet_addr. inet_addr may be\n"
+                "                wildcarded with * to delete all hosts.\n"
+                "  -s            Adds the host and associates the Internet address inet_addr\n"
+                "                with the Physical address eth_addr.  The Physical address is\n"
+                "                given as 6 hexadecimal bytes separated by hyphens. The entry\n"
+                "                is permanent.\n"
+                "  eth_addr      Specifies a physical address.\n"
+                "  if_addr       If present, this specifies the Internet address of the\n"
+                "                interface whose address translation table should be modified.\n"
+                "                If not present, the first applicable interface will be used.\n"
+                "Example:\n"
+                "  > arp -s 157.55.85.212   00-aa-00-62-c6-09  .... Adds a static entry.\n"
+                "  > arp -a                                    .... Displays the arp table.\n\n"));
+}
+ 
+ 
+ 
+/* 
+ *
+ * Program entry.
+ * Parse command line and call the required function
+ *
+ */
+INT main(int argc, char* argv[])
+{
+    const char N[] = "-N";
+ 
+    if ((argc < 2) || (argc > 5)) 
+    {
+       Usage();
+       return FALSE;
+    }
+ 
+ 
+    if (argv[1][0] == '-') {
+        switch (argv[1][1]) {
+           /* FIX ME */
+           /* need better control for -a, as -N might not be arg 4 */
+           case 'a': if (argc == 2)
+                         DisplayArpEntries(NULL, NULL);
+                     else if (argc == 3)
+                         DisplayArpEntries(argv[2], NULL);
+                     else if ((argc == 5) && ((strcmp(argv[3], N)) == 0))
+                         DisplayArpEntries(argv[2], argv[4]);
+                     else
+                         Usage();
+                     break;
+           case 'g': break;
+           case 'd': if (argc == 3)
+                         Deletehost(argv[2], NULL);
+                     else if (argc == 4)
+                         Deletehost(argv[2], argv[3]);
+                     else
+                         Usage();
+                     break;
+           case 's': if (argc == 4)
+                         Addhost(argv[2], argv[3], NULL);
+                     else if (argc == 5)
+                         Addhost(argv[2], argv[3], argv[4]);
+                     else
+                         Usage();
+                     break;
+           default:
+              Usage();
+              return -1;
+        }
+    } else {
+        Usage();
+        return -1;
+    }
+ 
+    return 0;
+}

reactos/apps/utils/net/arp/arp.rc

@@ -1,6 +1,5 @@
-/* $Id$ */
-
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS TCP/IPv4 Win32 arp\0"
 #define REACTOS_STR_INTERNAL_NAME	"arp\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"arp.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT	"Ged Murphy (gedmurphy@gmail.com)\0"
 #include <reactos/version.rc>

reactos/apps/utils/net/arp/arp.xml

@@ -2,8 +2,10 @@
 	<include base="arp">.</include>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
-	<library>user32</library>
-	<library>snmpapi</library>
+	<library>iphlpapi</library>
+	<library>ws2_32</library>
+	<library>shlwapi</library>
 	<file>arp.c</file>
 	<file>arp.rc</file>
 </module>
+

reactos/apps/utils/net/directory.xml

@@ -22,6 +22,9 @@
 <directory name="telnet">
 	<xi:include href="telnet/telnet.xml" />
 </directory>
+<directory name="tracert">
+	<xi:include href="tracert/tracert.xml" />
+</directory>
 <directory name="whois">
 	<xi:include href="whois/whois.xml" />
 </directory>

reactos/apps/utils/net/finger/finger.xml

@@ -1,5 +1,6 @@
 <module name="finger" type="win32cui" installbase="system32" installname="finger.exe">
 	<include base="finger">.</include>
+	<define name="__USE_W32API" />
 	<define name="__USE_W32_SOCKETS" />
 	<library>kernel32</library>
 	<library>ws2_32</library>

reactos/apps/utils/net/finger/net.c

@@ -59,7 +59,7 @@ netfinger(char *name)
 		return;
 
 	*host++ = '\0';
-	if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) {
+	if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != (unsigned long)-1) {
 		def.h_name = host;
 		def.h_addr_list = alist;
 		def.h_addr = (char *)&defaddr;

reactos/apps/utils/net/ftp/fake.c

@@ -100,7 +100,7 @@ int fgetcSocket(int s)
        index = 0;
        total = recv(s, buffer, sizeof(buffer), 0);
 
-       if (total == INVALID_SOCKET)
+       if (total == SOCKET_ERROR)
 	 {
 	   total = 0;
 	   return ERROR;

reactos/apps/utils/net/ftp/ftp.c

@@ -119,7 +119,7 @@ char *hookup(char *host, int port)
 
 	bzero((char *)&hisctladdr, sizeof (hisctladdr));
 	hisctladdr.sin_addr.s_addr = inet_addr(host);
-	if (hisctladdr.sin_addr.s_addr != -1) {
+	if (hisctladdr.sin_addr.s_addr != (unsigned long)-1) {
 		hisctladdr.sin_family = AF_INET;
 		(void) strncpy(hostnamebuf, host, sizeof(hostnamebuf));
 	} else {

reactos/apps/utils/net/ftp/makefile

@@ -1,5 +0,0 @@
-# This file is automatically generated.
-
-TOP = ..\..\..\..
-DEFAULT = ftp
-include $(TOP)/proxy.mak

reactos/apps/utils/net/ipconfig/ipconfig.c

@@ -1,10 +1,30 @@
+/* $Id: ipconfig.c
+ *
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Ipconfig utility
+ * FILE:            apps/utils/net/ipconfig/ipconfig.c
+ * PURPOSE:         Show and set network interface IP parameters
+ */ 
 /*
- * ipconfig - display IP stack parameters.
+ *  History:
  *
- * This source code is in the PUBLIC DOMAIN and has NO WARRANTY.
+ *      15/8/2002 (Robert Dickenson <robd@reactos.org>)
+ *          Original version (PUBLIC DOMAIN and NO WARRANTY)
  *
- * Robert Dickenson <robd@reactos.org>, August 15, 2002.
- */
+ *      26/6/2005 (Tim Jobling <tjob800@yahoo.co.uk>)
+ *          Relicense to GPL. 
+ *          Display NodeType with meaningfull Human readable names.
+ *          Exclusively use TCHAR strings.
+ *          Display Physical Address, DHCP enabled state, IP Addresses/Netmasks,
+ *          Default Gateway, DHCP server and DHCP Lease times.
+ *          Parse command line options.
+ *          Default to only showing the IP/SM/DG is no options specified
+ *          Handel option: /All and /?
+ *          Display message about all unimplemented options.
+ *          Changed C++ style commenting to C style
+ *   
+*/ 
+ 
 #include <stdio.h>
 #include <windows.h>
 #include <tchar.h>
@@ -18,8 +38,6 @@
 #include "trace.h"
 #endif
 
-////////////////////////////////////////////////////////////////////////////////
-
 /* imported from iphlpapi.dll
 
 GetAdapterOrderMap
@@ -30,18 +48,43 @@ NhpAllocateAndGetInterfaceInfoFromStack
 
  */
 
-static TCHAR* GetNodeTypeName(int nNodeType)
+static TCHAR* GetNodeTypeName(UINT nNodeType)
 {
     switch (nNodeType) {
-    case 0:  return _T("zero");
-    case 1:  return _T("one");
-    case 2:  return _T("two");
-    case 3:  return _T("three");
-    case 4:  return _T("mixed");
+    case 1:  return _T("Broadcast");
+    case 2:  return _T("Peer To Peer");
+    case 4:  return _T("Mixed");
+    case 8:  return _T("Hybrid");
     default: return _T("unknown");
     }
 }
 
+static TCHAR* GetInterfaceTypeName(UINT nInterfaceType)
+{
+    switch (nInterfaceType) {
+    case MIB_IF_TYPE_OTHER:     return _T("Other");
+    case MIB_IF_TYPE_ETHERNET:  return _T("Ethernet");
+    case MIB_IF_TYPE_TOKENRING: return _T("Token Ring");
+    case MIB_IF_TYPE_FDDI:      return _T("FDDI");
+    case MIB_IF_TYPE_PPP:       return _T("PPP");
+    case MIB_IF_TYPE_LOOPBACK:  return _T("Loopback");
+    case MIB_IF_TYPE_SLIP:      return _T("SLIP");
+    default: return _T("unknown");
+    }
+}
+
+void PrintPhysicalAddr(PBYTE Addr, UINT len)
+{
+    UINT i=0;
+    for (i=0; i<len; i++)
+    {
+        _tprintf(_T("%02X"), Addr[i]);
+        if ((i+1)<len)
+            _tprintf(_T("-"));
+    }
+    _tprintf(_T("\n"));
+}
+
 static void ShowNetworkFixedInfo()
 {
     FIXED_INFO* pFixedInfo = NULL;
@@ -52,7 +95,7 @@ static void ShowNetworkFixedInfo()
     if (result == ERROR_BUFFER_OVERFLOW) {
         pFixedInfo = (FIXED_INFO*)malloc(OutBufLen);
         if (!pFixedInfo) {
-            _tprintf(_T("ERROR: failed to allocate 0x%08X bytes of memory\n"), OutBufLen);
+            _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), OutBufLen);
             return;
         }
     } else {
@@ -64,27 +107,28 @@ static void ShowNetworkFixedInfo()
     if (result == ERROR_SUCCESS) {
         IP_ADDR_STRING* pIPAddr;
 
-             printf("\tHostName. . . . . . . . . . . : %s\n",  pFixedInfo->HostName);
-             printf("\tDomainName. . . . . . . . . . : %s\n",  pFixedInfo->DomainName);
-//
-             printf("\tDNS Servers . . . . . . . . . : %s\n",  pFixedInfo->DnsServerList.IpAddress.String);
+             _tprintf(_T("\tHostName. . . . . . . . . . . : %s\n"),  pFixedInfo->HostName);
+             _tprintf(_T("\tDomainName. . . . . . . . . . : %s\n"),  pFixedInfo->DomainName);
+
+             _tprintf(_T("\tDNS Servers . . . . . . . . . : %s\n"),  pFixedInfo->DnsServerList.IpAddress.String);
              pIPAddr = pFixedInfo->DnsServerList.Next;
              while (pIPAddr) {
-                 printf("\t\t\t\t      : %s\n",  pIPAddr->IpAddress.String);
+                 _tprintf(_T("\t\t\t\t      : %s\n"),  pIPAddr->IpAddress.String);
                  pIPAddr = pIPAddr->Next;
              }
-//
+
         _tprintf(_T("\tNodeType. . . . . . . . . . . : %d (%s)\n"), pFixedInfo->NodeType, GetNodeTypeName(pFixedInfo->NodeType));
-             printf("\tScopeId . . . . . . . . . . . : %s\n",  pFixedInfo->ScopeId);
+        _tprintf(_T("\tScopeId . . . . . . . . . . . : %s\n"),  pFixedInfo->ScopeId);
         _tprintf(_T("\tEnableRouting . . . . . . . . : %s\n"), pFixedInfo->EnableRouting ? _T("yes") : _T("no"));
         _tprintf(_T("\tEnableProxy . . . . . . . . . : %s\n"), pFixedInfo->EnableProxy ? _T("yes") : _T("no"));
         _tprintf(_T("\tEnableDns . . . . . . . . . . : %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));
         _tprintf(_T("\n"));
-        //_tprintf(_T("\n"),);
-        //_tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters);
-
-//      _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));
+/*        
+        _tprintf(_T("\n"),);
+        _tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters);
 
+      _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));
+*/
     } else {
         switch (result) {
         case ERROR_BUFFER_OVERFLOW:
@@ -100,7 +144,7 @@ static void ShowNetworkFixedInfo()
             _tprintf(_T("This function is not supported on the operating system in use on the local system\n"));
             break;
         default:
-            _tprintf(_T("0x%08X - Use FormatMessage to obtain the message string for the returned error\n"), result);
+            _tprintf(_T("0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
             break;
         }
     }
@@ -114,20 +158,21 @@ static void ShowNetworkInterfaces()
     DWORD dwOutBufLen = 0;
 
     if ((result = GetNumberOfInterfaces(&dwNumIf)) != NO_ERROR) {
-        _tprintf(_T("GetNumberOfInterfaces() failed with code 0x%08X - Use FormatMessage to obtain the message string for the returned error\n"), result);
+        _tprintf(_T("GetNumberOfInterfaces() failed with code 0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
         return;
     } else {
-        _tprintf(_T("GetNumberOfInterfaces() returned %d\n"), dwNumIf);
+        _tprintf(_T("GetNumberOfInterfaces() returned %lu\n"), dwNumIf);
     }
 
     result = GetInterfaceInfo(pIfTable, &dwOutBufLen);
-//    dwOutBufLen = sizeof(IP_INTERFACE_INFO) + dwNumIf * sizeof(IP_ADAPTER_INDEX_MAP);
-//    _tprintf(_T("GetNumberOfInterfaces() returned %d, dwOutBufLen %d\n"), dwNumIf, dwOutBufLen);
-//    _tprintf(_T("sizeof(IP_INTERFACE_INFO) %d, sizeof(IP_ADAPTER_INDEX_MAP) %d\n"), sizeof(IP_INTERFACE_INFO), sizeof(IP_ADAPTER_INDEX_MAP));
-
+/*
+    dwOutBufLen = sizeof(IP_INTERFACE_INFO) + dwNumIf * sizeof(IP_ADAPTER_INDEX_MAP);
+    _tprintf(_T("GetNumberOfInterfaces() returned %d, dwOutBufLen %d\n"), dwNumIf, dwOutBufLen);
+    _tprintf(_T("sizeof(IP_INTERFACE_INFO) %d, sizeof(IP_ADAPTER_INDEX_MAP) %d\n"), sizeof(IP_INTERFACE_INFO), sizeof(IP_ADAPTER_INDEX_MAP));
+*/
     pIfTable = (IP_INTERFACE_INFO*)malloc(dwOutBufLen);
     if (!pIfTable) {
-        _tprintf(_T("ERROR: failed to allocate 0x%08X bytes of memory\n"), dwOutBufLen);
+        _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), dwOutBufLen);
         return;
     }
 /*
@@ -143,17 +188,13 @@ typedef struct _IP_INTERFACE_INFO {
  */
     result = GetInterfaceInfo(pIfTable, &dwOutBufLen);
     if (result == NO_ERROR) {
-        int i;
-        _tprintf(_T("GetInterfaceInfo() returned with %d adaptor entries\n"), pIfTable->NumAdapters);
+        UINT i;
+        _tprintf(_T("GetInterfaceInfo() returned with %ld adaptor entries\n"), pIfTable->NumAdapters);
         for (i = 0; i < pIfTable->NumAdapters; i++) {
            wprintf(L"[%d] %s\n", i + 1, pIfTable->Adapter[i].Name);
-           //wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name);
+           /*wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name);*/
 
-//  \DEVICE\TCPIP_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357}
-//  \DEVICE\TCPIP_{BD445697-0945-4591-AE7F-2AB0F383CA87}
-//  \DEVICE\TCPIP_{6D87DC08-6BC5-4E78-AB5F-18CAB785CFFE}
-
-//HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NetBT\Parameters\Interfaces\Tcpip_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357}
+/*HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NetBT\Parameters\Interfaces\Tcpip_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357}*/
         }
     } else {
         switch (result) {
@@ -162,13 +203,13 @@ typedef struct _IP_INTERFACE_INFO {
             break;
         case ERROR_INSUFFICIENT_BUFFER:
             _tprintf(_T("The buffer pointed to by the pIfTable parameter is not large enough. The required size is returned in the DWORD variable pointed to by the dwOutBufLen parameter\n"));
-            _tprintf(_T("\tdwOutBufLen: %d\n"), dwOutBufLen);
+            _tprintf(_T("\tdwOutBufLen: %lu\n"), dwOutBufLen);
             break;
         case ERROR_NOT_SUPPORTED:
             _tprintf(_T("This function is not supported on the operating system in use on the local system\n"));
             break;
         default:
-            _tprintf(_T("0x%08X - Use FormatMessage to obtain the message string for the returned error\n"), result);
+            _tprintf(_T("0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
             break;
         }
     }
@@ -213,13 +254,20 @@ Ethernet adapter VMware Virtual Ethernet Adapter (Network Address Translation (N
 a        Lease Obtained. . . . . . . . . . : Monday, 30 December 2002 5:56:53 PM
 b        Lease Expires . . . . . . . . . . : Monday, 30 December 2002 6:26:53 PM
  */
-static void ShowAdapterInfo()
+static void ShowAdapterInfo(BOOL ShowAll)
 {
     IP_ADAPTER_INFO* pAdaptorInfo;
     ULONG ulOutBufLen;
     DWORD dwRetVal;
+    PIP_ADDR_STRING pIpAddrString;
+    struct tm *LeaseTime;
+
+
+    if (ShowAll)
+    {
+        _tprintf(_T("\nAdaptor Information\t\n"));
+    }
 
-    _tprintf(_T("\nAdaptor Information\t\n"));
     pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, sizeof(IP_ADAPTER_INFO));
     ulOutBufLen = sizeof(IP_ADAPTER_INFO);
 
@@ -227,18 +275,61 @@ static void ShowAdapterInfo()
         GlobalFree(pAdaptorInfo);
         pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, ulOutBufLen);
     }
-    if (dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen)) {
-        _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: %08x\n"), dwRetVal);
+    if ((dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen))) {
+        _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal);
     } else {
         while (pAdaptorInfo) {
-            printf("  AdapterName: %s\n", pAdaptorInfo->AdapterName);
-            printf("  Description: %s\n", pAdaptorInfo->Description);
+
+            /* print the type of interface before the Name of it */
+            _tprintf(_T("\n%s Adapter %s:\n\n"), GetInterfaceTypeName(pAdaptorInfo->Type), pAdaptorInfo->AdapterName);
+
+            if (ShowAll)
+            {
+                _tprintf(_T("\tDescription. . . . . . : %s\n"), pAdaptorInfo->Description);
+
+                /* print the Physical address to the screen*/
+                _tprintf(_T("\tPhysical Address . . . : "));
+                PrintPhysicalAddr(pAdaptorInfo->Address, pAdaptorInfo->AddressLength);
+
+                /* Now the DHCP state */
+                _tprintf(_T("\tDHCP Enabled . . . . . : %s\n"), pAdaptorInfo->DhcpEnabled ? _T("Yes") : _T("No"));
+            }
+            
+            /* IP Addresses/Netmasks, there may be more than one */
+            pIpAddrString = &pAdaptorInfo->IpAddressList;
+
+            do{
+                _tprintf(_T("\tIP Address . . . . . . : %s\n"), pIpAddrString->IpAddress.String);
+                _tprintf(_T("\tSubnet Mask. . . . . . : %s\n"), pIpAddrString->IpMask.String);
+                pIpAddrString = pIpAddrString->Next;
+            }while (pIpAddrString!=NULL);
+
+            /* Default Gateway */
+            pIpAddrString = &pAdaptorInfo->GatewayList;
+            _tprintf(_T("\tDefault Gateway. . . . : %s\n"), pIpAddrString->IpAddress.String);
+
+            /* Print some stuff that is only relevant it dhcp is enabled */
+            if((pAdaptorInfo->DhcpEnabled)&&(ShowAll))
+            {
+                /* Display the DHCP server address */
+                pIpAddrString = &pAdaptorInfo->DhcpServer;
+                _tprintf(_T("\tDHCP Server. . . . . . : %s\n"), pIpAddrString->IpAddress.String);
+
+                /* Display the Lease times*/
+                LeaseTime = localtime(&pAdaptorInfo->LeaseObtained);
+                _tprintf(_T("\tLease Obtained . . . . : %s"), asctime(LeaseTime));
+
+                LeaseTime = localtime(&pAdaptorInfo->LeaseExpires);
+                _tprintf(_T("\tLease Expieres . . . . : %s"), asctime(LeaseTime));
+
+            }
+
             pAdaptorInfo = pAdaptorInfo->Next;
         }
     }
 }
 
-const char szUsage[] = { "USAGE:\n" \
+const TCHAR szUsage[] = { _T("USAGE:\n" \
     "   ipconfig [/? | /all | /release [adapter] | /renew [adapter]\n" \
     "            | /flushdns | /registerdns\n" \
     "            | /showclassid adapter\n" \
@@ -259,7 +350,7 @@ const char szUsage[] = { "USAGE:\n" \
     "       /setclassid  Modifies the dhcp class id.\n" \
     "\n" \
     "The default is to display only the IP address, subnet mask and\n" \
-    "default gateway for each adapter bound to TCP/IP.\n"
+    "default gateway for each adapter bound to TCP/IP.\n")
 };
 /*
     "\n" \
@@ -279,21 +370,114 @@ const char szUsage[] = { "USAGE:\n" \
 
 static void usage(void)
 {
-	fputs(szUsage, stderr);
+    _fputts(szUsage, stderr);
 }
 
 
-int main(int argc, char *argv[])
+int _tmain(int argc, TCHAR *argv[])
 {
-    // 10.0.0.100    // As of build 0.0.20 this is hardcoded in the ip stack
+    BOOL DoUsage=FALSE;
+    BOOL DoAll=FALSE;
+    BOOL DoRelease=FALSE;
+    BOOL DoRenew=FALSE;
+    BOOL DoFlushdns=FALSE;
+    BOOL DoRegisterdns=FALSE;
+    BOOL DoDisplaydns=FALSE;
+    BOOL DoShowclassid=FALSE;
+    BOOL DoSetclassid=FALSE;  
 
-    if (argc > 1) {
-        usage();
-        return 1;
+    _tprintf(_T("\nReactOS IP Configuration\n\n"));
+
+    /* 
+       Parse command line for options we have been given. 
+    */
+    if ( ((argc > 1))&&((argv[1][0]=='/')||(argv[1][0]=='-')) )
+    {
+        if( !_tcsicmp( &argv[1][1], _T("?") ))
+        {
+            DoUsage = TRUE;
+        }
+        else if( !_tcsnicmp( &argv[1][1], _T("ALL"), _tcslen(&argv[1][1]) ))
+        {
+           DoAll = TRUE;
+        } 
+        else if( !_tcsnicmp( &argv[1][1], _T("RELEASE"), _tcslen(&argv[1][1]) ))
+        {
+            DoRelease = TRUE; 
+        } 
+        else if( ! _tcsnicmp( &argv[1][1], _T("RENEW"), _tcslen(&argv[1][1]) ))
+        {
+            DoRenew = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("FLUSHDNS"), _tcslen(&argv[1][1]) ))
+        {
+            DoFlushdns = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("REGISTERDNS"), _tcslen(&argv[1][1]) ))
+        {
+            DoRegisterdns = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("DISPLAYDNS"), _tcslen(&argv[1][1]) ))
+        {
+            DoDisplaydns = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("SHOWCLASSID"), _tcslen(&argv[1][1]) ))
+        {
+            DoShowclassid = TRUE;
+        }
+        else if( ! _tcsnicmp( &argv[1][1], _T("SETCLASSID"), _tcslen(&argv[1][1]) ))
+        {
+            DoSetclassid = TRUE;
+        }
     }
-    _tprintf(_T("ReactOS IP Configuration\n"));
-    ShowNetworkFixedInfo();
-    ShowNetworkInterfaces();
-    ShowAdapterInfo();
-	return 0;
+
+
+    switch (argc) 
+    {
+        case 1:  /* Default behaviour if options are given specified*/
+            ShowAdapterInfo(FALSE);
+            break;
+        case 2:  /* Process all the options that take no paramiters */
+            if ( DoUsage)
+                usage();
+            else if ( DoAll)
+            {
+                ShowNetworkFixedInfo();
+                ShowNetworkInterfaces();
+                ShowAdapterInfo(TRUE);
+            }
+            else if ( DoRelease)
+                printf("\nSorry /Release is not implemented yet\n");
+            else if ( DoRenew)
+                printf("\nSorry /Renew is not implemented yet\n");
+            else if ( DoFlushdns)
+                printf("\nSorry /Flushdns is not implemented yet\n");
+            else if ( DoRegisterdns)
+                printf("\nSorry /Registerdns is not implemented yet\n");
+            else if ( DoDisplaydns)
+                printf("\nSorry /Displaydns is not implemented yet\n");
+            else
+                usage();
+            break;
+        case 3: /* Process all the options that can have 1 paramiters */
+            if ( DoRelease)
+                printf("\nSorry /Release is not implemented yet\n");
+            else if ( DoRenew)
+                printf("\nSorry /Renew is not implemented yet\n");
+            else if ( DoShowclassid)
+                printf("\nSorry /Showclassid is not implemented yet\n");
+            else
+                usage();
+            break;
+        case 4:  /* Process all the options that can have 2 paramiters */
+            if ( DoSetclassid)
+                printf("\nSorry /Setclassid is not implemented yet\n");
+            else
+                usage();
+            break;
+        default:
+            usage();
+    }
+
+    return 0;
 }

reactos/apps/utils/net/netstat/netstat.c

@@ -16,6 +16,7 @@
 #include <winsock.h>
 #include <tchar.h>
 #include <stdio.h>
+#include <ctype.h>
 #include <time.h>
 
 #include <iptypes.h>
@@ -56,31 +57,32 @@ VOID PrintError(DWORD ErrorCode)
 	FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
 				  NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 				  (LPTSTR)&lpMsgBuf, 0, NULL);
-	printf("%s\n", lpMsgBuf);
+	printf("%s\n", (TCHAR*)lpMsgBuf);
 	LocalFree(lpMsgBuf);
 }
 
+#if 0
 static void ShowTcpStatistics()
 {
     MIB_TCPSTATS TcpStatsMIB;
     GetTcpStatistics(&TcpStatsMIB);
 
     _tprintf(_T("TCP/IP Statistics\t\n"));
-    _tprintf(_T("  time-out algorithm:\t\t%d\n"), TcpStatsMIB.dwRtoAlgorithm);
-    _tprintf(_T("  minimum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMin);
-    _tprintf(_T("  maximum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMax);
-    _tprintf(_T("  maximum connections:\t\t%d\n"), TcpStatsMIB.dwMaxConn);
-    _tprintf(_T("  active opens:\t\t\t%d\n"), TcpStatsMIB.dwActiveOpens);
-    _tprintf(_T("  passive opens:\t\t\t%d\n"), TcpStatsMIB.dwPassiveOpens);
-    _tprintf(_T("  failed attempts:\t\t%d\n"), TcpStatsMIB.dwAttemptFails);
-    _tprintf(_T("  established connections reset:\t%d\n"), TcpStatsMIB.dwEstabResets);
-    _tprintf(_T("  established connections:\t%d\n"), TcpStatsMIB.dwCurrEstab);
-    _tprintf(_T("  segments received:\t\t%d\n"), TcpStatsMIB.dwInSegs);
-    _tprintf(_T("  segment sent:\t\t\t%d\n"), TcpStatsMIB.dwOutSegs);
-    _tprintf(_T("  segments retransmitted:\t\t%d\n"), TcpStatsMIB.dwRetransSegs);
-    _tprintf(_T("  incoming errors:\t\t%d\n"), TcpStatsMIB.dwInErrs);
-    _tprintf(_T("  outgoing resets:\t\t%d\n"), TcpStatsMIB.dwOutRsts);
-    _tprintf(_T("  cumulative connections:\t\t%d\n"), TcpStatsMIB.dwNumConns);
+    _tprintf(_T("  time-out algorithm:\t\t%lu\n"), TcpStatsMIB.dwRtoAlgorithm);
+    _tprintf(_T("  minimum time-out:\t\t%lu\n"), TcpStatsMIB.dwRtoMin);
+    _tprintf(_T("  maximum time-out:\t\t%lu\n"), TcpStatsMIB.dwRtoMax);
+    _tprintf(_T("  maximum connections:\t\t%lu\n"), TcpStatsMIB.dwMaxConn);
+    _tprintf(_T("  active opens:\t\t\t%lu\n"), TcpStatsMIB.dwActiveOpens);
+    _tprintf(_T("  passive opens:\t\t\t%lu\n"), TcpStatsMIB.dwPassiveOpens);
+    _tprintf(_T("  failed attempts:\t\t%lu\n"), TcpStatsMIB.dwAttemptFails);
+    _tprintf(_T("  established connections reset:\t%lu\n"), TcpStatsMIB.dwEstabResets);
+    _tprintf(_T("  established connections:\t%lu\n"), TcpStatsMIB.dwCurrEstab);
+    _tprintf(_T("  segments received:\t\t%lu\n"), TcpStatsMIB.dwInSegs);
+    _tprintf(_T("  segment sent:\t\t\t%lu\n"), TcpStatsMIB.dwOutSegs);
+    _tprintf(_T("  segments retransmitted:\t\t%lu\n"), TcpStatsMIB.dwRetransSegs);
+    _tprintf(_T("  incoming errors:\t\t%lu\n"), TcpStatsMIB.dwInErrs);
+    _tprintf(_T("  outgoing resets:\t\t%lu\n"), TcpStatsMIB.dwOutRsts);
+    _tprintf(_T("  cumulative connections:\t\t%lu\n"), TcpStatsMIB.dwNumConns);
 }
 
 static void ShowUdpStatistics()
@@ -89,11 +91,11 @@ static void ShowUdpStatistics()
     GetUdpStatistics(&UDPStatsMIB);
 
     _tprintf(_T("UDP Statistics\t\n"));
-    _tprintf(_T("  received datagrams:\t\t\t%d\n"), UDPStatsMIB.dwInDatagrams);
-    _tprintf(_T("  datagrams for which no port exists:\t%d\n"), UDPStatsMIB.dwNoPorts);
-    _tprintf(_T("  errors on received datagrams:\t\t%d\n"), UDPStatsMIB.dwInErrors);
-    _tprintf(_T("  sent datagrams:\t\t\t\t%d\n"), UDPStatsMIB.dwOutDatagrams);
-    _tprintf(_T("  number of entries in listener table:\t%d\n"), UDPStatsMIB.dwNumAddrs);
+    _tprintf(_T("  received datagrams:\t\t\t%lu\n"), UDPStatsMIB.dwInDatagrams);
+    _tprintf(_T("  datagrams for which no port exists:\t%lu\n"), UDPStatsMIB.dwNoPorts);
+    _tprintf(_T("  errors on received datagrams:\t\t%lu\n"), UDPStatsMIB.dwInErrors);
+    _tprintf(_T("  sent datagrams:\t\t\t\t%lu\n"), UDPStatsMIB.dwOutDatagrams);
+    _tprintf(_T("  number of entries in listener table:\t%lu\n"), UDPStatsMIB.dwNumAddrs);
 }
 
 static void ShowIpStatistics()
@@ -102,27 +104,27 @@ static void ShowIpStatistics()
     GetIpStatistics(&IPStatsMIB);
 
     _tprintf(_T("IP Statistics\t\n"));
-    _tprintf(_T("  IP forwarding enabled or disabled:\t%d\n"), IPStatsMIB.dwForwarding);
-    _tprintf(_T("  default time-to-live:\t\t\t%d\n"), IPStatsMIB.dwDefaultTTL);
-    _tprintf(_T("  datagrams received:\t\t\t%d\n"), IPStatsMIB.dwInReceives);
-    _tprintf(_T("  received header errors:\t\t\t%d\n"), IPStatsMIB.dwInHdrErrors);
-    _tprintf(_T("  received address errors:\t\t%d\n"), IPStatsMIB.dwInAddrErrors);
-    _tprintf(_T("  datagrams forwarded:\t\t\t%d\n"), IPStatsMIB.dwForwDatagrams);
-    _tprintf(_T("  datagrams with unknown protocol:\t%d\n"), IPStatsMIB.dwInUnknownProtos);
-    _tprintf(_T("  received datagrams discarded:\t\t%d\n"), IPStatsMIB.dwInDiscards);
-    _tprintf(_T("  received datagrams delivered:\t\t%d\n"), IPStatsMIB.dwInDelivers);
-    _tprintf(_T("  sent datagrams discarded:\t\t%d\n"), IPStatsMIB.dwOutDiscards);
-    _tprintf(_T("  datagrams for which no route exists:\t%d\n"), IPStatsMIB.dwOutNoRoutes);
-    _tprintf(_T("  datagrams for which frags didn't arrive:%d\n"), IPStatsMIB.dwReasmTimeout);
-    _tprintf(_T("  datagrams requiring reassembly:\t\t%d\n"), IPStatsMIB.dwReasmReqds);
-    _tprintf(_T("  successful reassemblies:\t\t%d\n"), IPStatsMIB.dwReasmOks);
-    _tprintf(_T("  failed reassemblies:\t\t\t%d\n"), IPStatsMIB.dwReasmFails);
-    _tprintf(_T("  successful fragmentations:\t\t%d\n"), IPStatsMIB.dwFragOks);
-    _tprintf(_T("  failed fragmentations:\t\t\t%d\n"), IPStatsMIB.dwFragFails);
-    _tprintf(_T("  datagrams fragmented:\t\t\t%d\n"), IPStatsMIB.dwFragCreates);
-    _tprintf(_T("  number of interfaces on computer:\t%d\n"), IPStatsMIB.dwNumIf);
-    _tprintf(_T("  number of IP address on computer:\t%d\n"), IPStatsMIB.dwNumAddr);
-    _tprintf(_T("  number of routes in routing table:\t%d\n"), IPStatsMIB.dwNumRoutes);
+    _tprintf(_T("  IP forwarding enabled or disabled:\t%lu\n"), IPStatsMIB.dwForwarding);
+    _tprintf(_T("  default time-to-live:\t\t\t%lu\n"), IPStatsMIB.dwDefaultTTL);
+    _tprintf(_T("  datagrams received:\t\t\t%lu\n"), IPStatsMIB.dwInReceives);
+    _tprintf(_T("  received header errors:\t\t\t%lu\n"), IPStatsMIB.dwInHdrErrors);
+    _tprintf(_T("  received address errors:\t\t%lu\n"), IPStatsMIB.dwInAddrErrors);
+    _tprintf(_T("  datagrams forwarded:\t\t\t%lu\n"), IPStatsMIB.dwForwDatagrams);
+    _tprintf(_T("  datagrams with unknown protocol:\t%lu\n"), IPStatsMIB.dwInUnknownProtos);
+    _tprintf(_T("  received datagrams discarded:\t\t%lu\n"), IPStatsMIB.dwInDiscards);
+    _tprintf(_T("  received datagrams delivered:\t\t%lu\n"), IPStatsMIB.dwInDelivers);
+    _tprintf(_T("  sent datagrams discarded:\t\t%lu\n"), IPStatsMIB.dwOutDiscards);
+    _tprintf(_T("  datagrams for which no route exists:\t%lu\n"), IPStatsMIB.dwOutNoRoutes);
+    _tprintf(_T("  datagrams for which frags didn't arrive:%lu\n"), IPStatsMIB.dwReasmTimeout);
+    _tprintf(_T("  datagrams requiring reassembly:\t\t%lu\n"), IPStatsMIB.dwReasmReqds);
+    _tprintf(_T("  successful reassemblies:\t\t%lu\n"), IPStatsMIB.dwReasmOks);
+    _tprintf(_T("  failed reassemblies:\t\t\t%lu\n"), IPStatsMIB.dwReasmFails);
+    _tprintf(_T("  successful fragmentations:\t\t%lu\n"), IPStatsMIB.dwFragOks);
+    _tprintf(_T("  failed fragmentations:\t\t\t%lu\n"), IPStatsMIB.dwFragFails);
+    _tprintf(_T("  datagrams fragmented:\t\t\t%lu\n"), IPStatsMIB.dwFragCreates);
+    _tprintf(_T("  number of interfaces on computer:\t%lu\n"), IPStatsMIB.dwNumIf);
+    _tprintf(_T("  number of IP address on computer:\t%lu\n"), IPStatsMIB.dwNumAddr);
+    _tprintf(_T("  number of routes in routing table:\t%lu\n"), IPStatsMIB.dwNumRoutes);
 }
 
 static void ShowNetworkParams()
@@ -140,8 +142,8 @@ static void ShowNetworkParams()
         GlobalFree(FixedInfo);
         FixedInfo =(FIXED_INFO*)GlobalAlloc(GPTR, ulOutBufLen);
     }
-    if (dwRetVal = GetNetworkParams(FixedInfo, &ulOutBufLen)) {
-        _tprintf(_T("Call to GetNetworkParams failed. Return Value: %08x\n"), dwRetVal);
+    if ((dwRetVal = GetNetworkParams(FixedInfo, &ulOutBufLen))) {
+        _tprintf(_T("Call to GetNetworkParams failed. Return Value: 0x%08lx\n"), dwRetVal);
     } else {
         printf("  Host Name: %s", FixedInfo->HostName);
         printf("\n  Domain Name: %s", FixedInfo->DomainName);
@@ -168,8 +170,8 @@ static void ShowAdapterInfo()
         GlobalFree(pAdaptorInfo);
         pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, ulOutBufLen);
     }
-    if (dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen)) {
-        _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: %08x\n"), dwRetVal);
+    if ((dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen))) {
+        _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal);
     } else {
         while (pAdaptorInfo) {
             printf("  AdapterName: %s\n", pAdaptorInfo->AdapterName);
@@ -178,6 +180,7 @@ static void ShowAdapterInfo()
         }
     }
 }
+#endif
 
 /*
 typedef struct {
@@ -271,7 +274,7 @@ GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen)
 		return name;
 	}
 	// Try to translate to a name
-	if (psrvent = getservbyport(port, proto)) {
+	if ((psrvent = getservbyport(port, proto))) {
 		strcpy(name, psrvent->s_name );
 	} else {
 		sprintf(name, "%d", htons((WORD)port));
@@ -351,9 +354,9 @@ GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen)
 
 BOOLEAN usage(void)
 {
-    TCHAR buffer[MAX_RESLEN];
+	TCHAR buffer[MAX_RESLEN];
 
-    int length = LoadString(GetModuleHandle(NULL), IDS_APP_USAGE, buffer, sizeof(buffer)/sizeof(buffer[0]));
+	LoadString(GetModuleHandle(NULL), IDS_APP_USAGE, buffer, sizeof(buffer)/sizeof(buffer[0]));
 	_fputts(buffer, stderr);
 	return FALSE;
 }

reactos/apps/utils/net/roshttpd/makefile

@@ -1,31 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../../..
-
-TARGET_PATH = common
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = roshttpd
-
-TARGET_CPPFLAGS = -I./include -DUNICODE -D_UNICODE -DDBG -D__USE_W32API -Wno-deprecated
-
-TARGET_GCCLIBS = stdc++
-
-TARGET_SDKLIBS = kernel32.a ws2_32.a user32.a
-
-MAIN_OBJECTS = roshttpd.o config.o error.o http.o httpd.o
-
-COMMON_OBJECTS = common/list.o common/socket.o common/thread.o
-
-TARGET_OBJECTS = $(MAIN_OBJECTS) $(COMMON_OBJECTS)
-
-TARGET_CLEAN = common/*.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/net/route/route.c

@@ -36,7 +36,7 @@ int print_routes() {
     DWORD Error;
     ULONG Size = 0;
     char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF];
-    int i;
+    unsigned int i;
 
     if( (Error = GetIpForwardTable( NULL, &Size, TRUE )) ==
     	ERROR_INSUFFICIENT_BUFFER ) {

reactos/apps/utils/net/tracert/ip.h

@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- * $FreeBSD: src/sys/netinet/ip.h,v 1.16 1999/08/28 00:49:19 peter Exp $
- */
-
-#ifndef _NETINET_IP_H_
-#define _NETINET_IP_H_
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define	IPVERSION	4
-
-/* A little magic to make the Windows build happy. */
-#if defined(_MSC_VER) || defined(__MINGW32__)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <time.h>
-
-typedef u_short n_short;
-typedef u_int n_long;
-typedef u_int n_time;
-
-#define EMSGSIZE WSAEMSGSIZE
-#define ENETUNREACH WSAENETUNREACH
-#define EHOSTUNREACH WSAEHOSTUNREACH
-#endif
-
-/*
- * Structure of an internet header, naked of options.
- */
-struct ip {
-#ifdef _IP_VHL
-	u_char	ip_vhl;			/* version << 4 | header length >> 2 */
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int	ip_hl:4,		/* header length */
-		ip_v:4;			/* version */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_int	ip_v:4,			/* version */
-		ip_hl:4;		/* header length */
-#endif
-#endif /* not _IP_VHL */
-	u_char	ip_tos;			/* type of service */
-	u_short	ip_len;			/* total length */
-	u_short	ip_id;			/* identification */
-	u_short	ip_off;			/* fragment offset field */
-#define	IP_RF 0x8000			/* reserved fragment flag */
-#define	IP_DF 0x4000			/* don't fragment flag */
-#define	IP_MF 0x2000			/* more fragments flag */
-#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
-	u_char	ip_ttl;			/* time to live */
-	u_char	ip_p;			/* protocol */
-	u_short	ip_sum;			/* checksum */
-	struct	in_addr ip_src,ip_dst;	/* source and dest address */
-};
-
-#ifdef _IP_VHL
-#define	IP_MAKE_VHL(v, hl)	((v) << 4 | (hl))
-#define	IP_VHL_HL(vhl)		((vhl) & 0x0f)
-#define	IP_VHL_V(vhl)		((vhl) >> 4)
-#define	IP_VHL_BORING		0x45
-#endif
-
-#define	IP_MAXPACKET	65535		/* maximum packet size */
-
-/*
- * Definitions for IP type of service (ip_tos)
- */
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define	IPTOS_MINCOST		0x02
-
-/*
- * Definitions for IP precedence (also in ip_tos) (hopefully unused)
- */
-#define	IPTOS_PREC_NETCONTROL		0xe0
-#define	IPTOS_PREC_INTERNETCONTROL	0xc0
-#define	IPTOS_PREC_CRITIC_ECP		0xa0
-#define	IPTOS_PREC_FLASHOVERRIDE	0x80
-#define	IPTOS_PREC_FLASH		0x60
-#define	IPTOS_PREC_IMMEDIATE		0x40
-#define	IPTOS_PREC_PRIORITY		0x20
-#define	IPTOS_PREC_ROUTINE		0x00
-
-/*
- * Definitions for options.
- */
-#define	IPOPT_COPIED(o)		((o)&0x80)
-#define	IPOPT_CLASS(o)		((o)&0x60)
-#define	IPOPT_NUMBER(o)		((o)&0x1f)
-
-#define	IPOPT_CONTROL		0x00
-#define	IPOPT_RESERVED1		0x20
-#define	IPOPT_DEBMEAS		0x40
-#define	IPOPT_RESERVED2		0x60
-
-#define	IPOPT_EOL		0		/* end of option list */
-#define	IPOPT_NOP		1		/* no operation */
-
-#define	IPOPT_RR		7		/* record packet route */
-#define	IPOPT_TS		68		/* timestamp */
-#define	IPOPT_SECURITY		130		/* provide s,c,h,tcc */
-#define	IPOPT_LSRR		131		/* loose source route */
-#define	IPOPT_SATID		136		/* satnet id */
-#define	IPOPT_SSRR		137		/* strict source route */
-#define	IPOPT_RA		148		/* router alert */
-
-/*
- * Offsets to fields in options other than EOL and NOP.
- */
-#define	IPOPT_OPTVAL		0		/* option ID */
-#define	IPOPT_OLEN		1		/* option length */
-#define IPOPT_OFFSET		2		/* offset within option */
-#define	IPOPT_MINOFF		4		/* min value of above */
-
-/*
- * Time stamp option structure.
- */
-struct	ip_timestamp {
-	u_char	ipt_code;		/* IPOPT_TS */
-	u_char	ipt_len;		/* size of structure (variable) */
-	u_char	ipt_ptr;		/* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int	ipt_flg:4,		/* flags, see below */
-		ipt_oflw:4;		/* overflow counter */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_int	ipt_oflw:4,		/* overflow counter */
-		ipt_flg:4;		/* flags, see below */
-#endif
-	union ipt_timestamp {
-		n_long	ipt_time[1];
-		struct	ipt_ta {
-			struct in_addr ipt_addr;
-			n_long ipt_time;
-		} ipt_ta[1];
-	} ipt_timestamp;
-};
-
-/* flag bits for ipt_flg */
-#define	IPOPT_TS_TSONLY		0		/* timestamps only */
-#define	IPOPT_TS_TSANDADDR	1		/* timestamps and addresses */
-#define	IPOPT_TS_PRESPEC	3		/* specified modules only */
-
-/* bits for security (not byte swapped) */
-#define	IPOPT_SECUR_UNCLASS	0x0000
-#define	IPOPT_SECUR_CONFID	0xf135
-#define	IPOPT_SECUR_EFTO	0x789a
-#define	IPOPT_SECUR_MMMM	0xbc4d
-#define	IPOPT_SECUR_RESTR	0xaf13
-#define	IPOPT_SECUR_SECRET	0xd788
-#define	IPOPT_SECUR_TOPSECRET	0x6bc5
-
-/*
- * Internet implementation parameters.
- */
-#define	MAXTTL		255		/* maximum time to live (seconds) */
-#define	IPDEFTTL	64		/* default ttl, from RFC 1340 */
-#define	IPFRAGTTL	60		/* time to live for frags, slowhz */
-#define	IPTTLDEC	1		/* subtracted when forwarding */
-
-#define	IP_MSS		576		/* default maximum segment size */
-
-#endif

reactos/apps/utils/net/tracert/ip_icmp.h

@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.13 1999/08/28 00:49:24 peter Exp $
- */
-
-#ifndef _NETINET_IP_ICMP_H_
-#define _NETINET_IP_ICMP_H_
-
-/*
- * Interface Control Message Protocol Definitions.
- * Per RFC 792, September 1981.
- */
-
-/*
- * Internal of an ICMP Router Advertisement
- */
-struct icmp_ra_addr {
-	u_int32_t ira_addr;
-	u_int32_t ira_preference;
-};
-
-/*
- * Structure of an icmp header.
- */
-struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
-	union {
-		u_char ih_pptr;			/* ICMP_PARAMPROB */
-		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
-		struct ih_idseq {
-			n_short	icd_id;
-			n_short	icd_seq;
-		} ih_idseq;
-		int ih_void;
-
-		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
-		struct ih_pmtu {
-			n_short ipm_void;
-			n_short ipm_nextmtu;
-		} ih_pmtu;
-
-		struct ih_rtradv {
-			u_char irt_num_addrs;
-			u_char irt_wpa;
-			u_int16_t irt_lifetime;
-		} ih_rtradv;
-	} icmp_hun;
-#define	icmp_pptr	icmp_hun.ih_pptr
-#define	icmp_gwaddr	icmp_hun.ih_gwaddr
-#define	icmp_id		icmp_hun.ih_idseq.icd_id
-#define	icmp_seq	icmp_hun.ih_idseq.icd_seq
-#define	icmp_void	icmp_hun.ih_void
-#define	icmp_pmvoid	icmp_hun.ih_pmtu.ipm_void
-#define	icmp_nextmtu	icmp_hun.ih_pmtu.ipm_nextmtu
-#define	icmp_num_addrs	icmp_hun.ih_rtradv.irt_num_addrs
-#define	icmp_wpa	icmp_hun.ih_rtradv.irt_wpa
-#define	icmp_lifetime	icmp_hun.ih_rtradv.irt_lifetime
-	union {
-		struct id_ts {
-			n_time its_otime;
-			n_time its_rtime;
-			n_time its_ttime;
-		} id_ts;
-		struct id_ip  {
-			struct ip idi_ip;
-			/* options and then 64 bits of data */
-		} id_ip;
-		struct icmp_ra_addr id_radv;
-		u_int32_t id_mask;
-		char	id_data[1];
-	} icmp_dun;
-#define	icmp_otime	icmp_dun.id_ts.its_otime
-#define	icmp_rtime	icmp_dun.id_ts.its_rtime
-#define	icmp_ttime	icmp_dun.id_ts.its_ttime
-#define	icmp_ip		icmp_dun.id_ip.idi_ip
-#define	icmp_radv	icmp_dun.id_radv
-#define	icmp_mask	icmp_dun.id_mask
-#define	icmp_data	icmp_dun.id_data
-};
-
-/*
- * Lower bounds on packet lengths for various types.
- * For the error advice packets must first insure that the
- * packet is large enough to contain the returned ip header.
- * Only then can we do the check to see if 64 bits of packet
- * data have been returned, since we need to check the returned
- * ip header length.
- */
-#define	ICMP_MINLEN	8				/* abs minimum */
-#define	ICMP_TSLEN	(8 + 3 * sizeof (n_time))	/* timestamp */
-#define	ICMP_MASKLEN	12				/* address mask */
-#define	ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
-#ifndef _IP_VHL
-#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
-	/* N.B.: must separately check that ip_hl >= 5 */
-#else
-#define	ICMP_ADVLEN(p)	(8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8)
-	/* N.B.: must separately check that header length >= 5 */
-#endif
-
-/*
- * Definition of type and code field values.
- */
-#define	ICMP_ECHOREPLY		0		/* echo reply */
-#define	ICMP_UNREACH		3		/* dest unreachable, codes: */
-#define		ICMP_UNREACH_NET	0		/* bad net */
-#define		ICMP_UNREACH_HOST	1		/* bad host */
-#define		ICMP_UNREACH_PROTOCOL	2		/* bad protocol */
-#define		ICMP_UNREACH_PORT	3		/* bad port */
-#define		ICMP_UNREACH_NEEDFRAG	4		/* IP_DF caused drop */
-#define		ICMP_UNREACH_SRCFAIL	5		/* src route failed */
-#define		ICMP_UNREACH_NET_UNKNOWN 6		/* unknown net */
-#define		ICMP_UNREACH_HOST_UNKNOWN 7		/* unknown host */
-#define		ICMP_UNREACH_ISOLATED	8		/* src host isolated */
-#define		ICMP_UNREACH_NET_PROHIB	9		/* prohibited access */
-#define		ICMP_UNREACH_HOST_PROHIB 10		/* ditto */
-#define		ICMP_UNREACH_TOSNET	11		/* bad tos for net */
-#define		ICMP_UNREACH_TOSHOST	12		/* bad tos for host */
-#define		ICMP_UNREACH_FILTER_PROHIB 13		/* admin prohib */
-#define		ICMP_UNREACH_HOST_PRECEDENCE 14		/* host prec vio. */
-#define		ICMP_UNREACH_PRECEDENCE_CUTOFF 15	/* prec cutoff */
-#define	ICMP_SOURCEQUENCH	4		/* packet lost, slow down */
-#define	ICMP_REDIRECT		5		/* shorter route, codes: */
-#define		ICMP_REDIRECT_NET	0		/* for network */
-#define		ICMP_REDIRECT_HOST	1		/* for host */
-#define		ICMP_REDIRECT_TOSNET	2		/* for tos and net */
-#define		ICMP_REDIRECT_TOSHOST	3		/* for tos and host */
-#define	ICMP_ECHO		8		/* echo service */
-#define	ICMP_ROUTERADVERT	9		/* router advertisement */
-#define	ICMP_ROUTERSOLICIT	10		/* router solicitation */
-#define	ICMP_TIMXCEED		11		/* time exceeded, code: */
-#define		ICMP_TIMXCEED_INTRANS	0		/* ttl==0 in transit */
-#define		ICMP_TIMXCEED_REASS	1		/* ttl==0 in reass */
-#define	ICMP_PARAMPROB		12		/* ip header bad */
-#define		ICMP_PARAMPROB_OPTABSENT 1		/* req. opt. absent */
-#define	ICMP_TSTAMP		13		/* timestamp request */
-#define	ICMP_TSTAMPREPLY	14		/* timestamp reply */
-#define	ICMP_IREQ		15		/* information request */
-#define	ICMP_IREQREPLY		16		/* information reply */
-#define	ICMP_MASKREQ		17		/* address mask request */
-#define	ICMP_MASKREPLY		18		/* address mask reply */
-
-#define	ICMP_MAXTYPE		18
-
-#define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
-
-#ifdef KERNEL
-void	icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *));
-void	icmp_input __P((struct mbuf *, int));
-#endif
-
-#endif

reactos/apps/utils/net/tracert/makefile

@@ -1,20 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = tracert
-
-TARGET_INSTALLDIR = system32
-
-TARGET_SDKLIBS = ws2_32.a iphlpapi.a ntdll.a
-
-TARGET_OBJECTS = \
-$(TARGET_NAME).o
-
-TARGET_GCCLIBS = 
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

reactos/apps/utils/net/tracert/tracert.h

@@ -0,0 +1,80 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS traceroute utility
+ * FILE:        apps/utils/net/tracert/tracert.h
+ * PURPOSE:     trace a packets route through a network
+ * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
+ * REVISIONS:
+ *   GM 03/05/05 Created
+ */
+
+#define ECHO_REPLY 0
+#define DEST_UNREACHABLE 3
+#define ECHO_REQUEST 8
+#define TTL_EXCEEDED 11
+
+#define ICMP_MIN_SIZE 8
+#define ICMP_MAX_SIZE 65535
+#define PACKET_SIZE 32
+/* we need this for packets which have the 'dont fragment' 
+ * bit set, as they can get quite large otherwise 
+ * (I've seen some reach 182 bytes */
+#define MAX_REC_SIZE 200 
+
+/* pack the structures */
+#pragma pack(1) 
+
+/* IPv4 Header, 20 bytes */
+typedef struct IPv4Header {
+    BYTE h_len:4;
+    BYTE version:4;
+    BYTE tos;
+    USHORT length;
+    USHORT id;
+    USHORT flag_frag;
+    BYTE ttl;
+    BYTE proto;
+    USHORT checksum;
+    ULONG source;
+    ULONG dest;
+} IPv4_HEADER, *PIPv4_HEADER;
+
+/* ICMP Header, 8 bytes */
+typedef struct ICMPHeader {
+    BYTE type;
+    BYTE code;
+    USHORT checksum;
+    USHORT id; // not used in time exceeded
+    USHORT seq; // not used in time exceeded
+} ICMP_HEADER, *PICMP_HEADER;
+
+/* ICMP Echo Reply Header, 12 bytes */
+typedef struct EchoReplyHeader {
+    struct ICMPHeader icmpheader;
+    struct timeval timestamp; 
+} ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER;
+
+/* ICMP Echo Reply Header, 12 bytes */
+typedef struct TTLExceedHeader {
+    struct ICMPHeader icmpheader;
+    struct IPv4Header ipheader;
+    struct ICMPHeader OrigIcmpHeader;
+} TTL_EXCEED_HEADER, *PTTL_EXCEED_HEADER;
+
+/* return to normal */
+#pragma pack()
+
+
+/* function definitions */
+//BOOL ParseCmdline(int argc, char* argv[]);
+INT Driver(void);
+INT Setup(INT ttl);
+VOID SetupTimingMethod(void);
+VOID ResolveHostname(void);
+VOID PreparePacket(INT packetSize, INT seqNum);
+INT SendPacket(INT datasize);
+INT ReceivePacket(INT datasize);
+INT DecodeResponse(INT packetSize, INT seqNum);
+LONG GetTime(void);
+WORD CheckSum(PUSHORT data, UINT size);
+VOID Usage(void);

reactos/apps/utils/net/tracert/tracert.rc

@@ -1,6 +1,5 @@
-/* $Id: route.rc 11816 2004-11-26 06:51:47Z arty $ */
-
-#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS TCP/IPv4 Traceroute\0"
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS TCP/IPv4 Win32 Traceroute\0"
 #define REACTOS_STR_INTERNAL_NAME	"tracert\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"tracert.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT	"Ged Murphy (gedmurphy@gmail.com)\0"
 #include <reactos/version.rc>

reactos/apps/utils/net/tracert/tracert.xml

@@ -0,0 +1,12 @@
+<module name="tracert" type="win32cui" installbase="system32" installname="tracert.exe">
+	<include base="tracert">.</include>
+	<define name="__USE_W32API" />
+	<define name="__USE_W32_SOCKETS" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<library>winmm</library>
+	<file>tracert.c</file>
+	<file>tracert.rc</file>
+</module>

reactos/apps/utils/net/whois/whois.xml

@@ -1,4 +1,5 @@
 <module name="whois" type="win32cui" installbase="system32" installname="whois.exe">
+        <define name="__USE_W32API" />
 	<include base="whois">.</include>
 	<library>kernel32</library>
 	<library>ws2_32</library>

reactos/apps/utils/nts2w32err/makefile

@@ -1,23 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = nts2w32err
-
-TARGET_SDKLIBS = ntdll.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CFLAGS = -Wall -Werror
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/nts2w32err/nts2w32err.c

@@ -12,8 +12,9 @@
  * 2004-01-10 Emanuele Aliberti
  *
  */
-#include <ddk/ntddk.h>
 #include <windows.h>
+#include <ddk/ntddk.h>
+
 #include <stdio.h>
 
 int main (int argc, char * argv [])

reactos/apps/utils/objdir/makefile

@@ -1,23 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = objdir
-
-TARGET_SDKLIBS = ntdll.a kernel32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CFLAGS = -Wall -Werror
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/partinfo/makefile

@@ -1,23 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = partinfo
-
-TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -Wno-format
-
-TARGET_SDKLIBS = ntdll.a kernel32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/patchnv4/Makefile

@@ -1,21 +0,0 @@
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = patchnv4
-
-TARGET_SDKLIBS = 
-
-TARGET_OBJECTS = patchnv4.o
-
-TARGET_CFLAGS += -Wall -Werror
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/pesum/makefile

@@ -1,20 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = pesum
-
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/pice/loader/makefile

@@ -1,37 +0,0 @@
-#CC = gcc
-#CFLAGS := -g -Wall -fomit-frame-pointer -O2
-#LDFLAGS := -dynamic
-#-lncurses
-
-#OBJS = main.o terminal.o
-#
-
-#loader: 	$(OBJS)
-#		$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^
-
-#clean:
-#		@echo deleting all intermediate files
-#		@rm $(OBJS) loader -f
-#		make
-
-
-PATH_TO_TOP = ../../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = loader
-
-TARGET_CFLAGS = -g -fomit-frame-pointer
-
-TARGET_SDKLIBS =
-
-TARGET_OBJECTS = main.o terminal.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-

reactos/apps/utils/pice/makefile

@@ -1,17 +0,0 @@
-# $Id$
-
-all:
-	$(MAKE) -C loader
-	$(MAKE) -C module
-
-implib:
-	$(MAKE) -C loader implib
-	$(MAKE) -C module implib
-	
-clean:
-	$(MAKE) -C loader clean
-	$(MAKE) -C module clean
-
-install:
-	$(MAKE) -C loader install
-	$(MAKE) -C module install

reactos/apps/utils/pice/module/makefile

@@ -1,35 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = driver
-
-TARGET_NAME = pice
-TARGET_CFLAGS := -g -I../../../../ntoskrnl/include  -DDEBUG
-TARGET_SDK_LIBS :=
-
-TARGET_OBJECTS = \
-  hardware.o \
-  dblflt.o \
-  debug.o \
-  disassembler.o \
-  gpfault.o \
-  bp.o \
-  hercules.o \
-  hooks.o \
-  init.o \
-  output.o \
-  parse.o \
-  patch.o \
-  pgflt.o \
-  privateice.o \
-  serial.o \
-  shell.o \
-  symbols.o \
-  syscall.o \
-  trace.o \
-  vga.o \
-  vga_utils.o \
-  utils.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

reactos/apps/utils/pice/module/symbols.c

@@ -167,7 +167,7 @@ BOOLEAN ListUserModules( PPEB peb )
 {
 	PLIST_ENTRY UserModuleListHead;
 	PLIST_ENTRY Entry;
-	PLDR_MODULE Module;
+	PLDR_DATA_TABLE_ENTRY Module;
 	PPEB_LDR_DATA Ldr;
 
 	ENTER_FUNC();
@@ -179,7 +179,7 @@ BOOLEAN ListUserModules( PPEB peb )
 		Entry = UserModuleListHead->Flink;
 		while (Entry != UserModuleListHead)
 		{
-			Module = CONTAINING_RECORD(Entry, LDR_MODULE, InLoadOrderModuleList);
+			Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList);
 			//DbgPrint("Module: %x, BaseAddress: %x\n", Module, Module->BaseAddress);
 
 			DPRINT((0,"FullName: %S, BaseName: %S, Length: %ld, EntryPoint: %x, BaseAddress: %x\n", Module->FullDllName.Buffer,

reactos/apps/utils/pnpdump/makefile

@@ -1,23 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = pnpdump
-
-TARGET_CFLAGS = -D__USE_W32API -Wall -Werror
-
-TARGET_SDKLIBS = ntdll.a kernel32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/ps/makefile

@@ -1,23 +0,0 @@
-# 
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = ps
-
-TARGET_CFLAGS = -D__USE_W32API -DANONYMOUSUNIONS -Werror -Wall
-
-TARGET_SDKLIBS = ntdll.a kernel32.a user32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/ps/ps.c

@@ -23,8 +23,8 @@
 */
 
 #include <windows.h>
-/* NOTE: W32API ddk/ntapi.h header has wrong definition of SYSTEM_PROCESSES. */
-#include <ntos/types.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
 
 typedef struct _SYSTEM_THREADS 	 
  { 	 
@@ -213,7 +213,7 @@ int main()
         unsigned char minute, minute1, tmin, tmin1;
         unsigned char  seconds, seconds1, tsec, tsec1;
 
-	int ti;
+	unsigned int ti;
 	LARGE_INTEGER ptime;
 
 	ptime.QuadPart = CurrentProcess->KernelTime.QuadPart;

reactos/apps/utils/ps/ps.xml

@@ -0,0 +1,8 @@
+<module name="ps" type="win32cui" installbase="bin" installname="ps.exe">
+    <include base="ps">.</include>
+    <define name="__USE_W32API" />
+    <library>user32</library>
+    <library>kernel32</library>
+    <library>ntdll</library>
+    <file>ps.c</file>
+</module>

reactos/apps/utils/rosperf/fill.c

@@ -36,7 +36,7 @@ FillSmallProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps)
 {
 #define SMALL_SIZE 16
   unsigned Rep;
-  unsigned x, y;
+  int x, y;
 
   x = 0;
   y = 0;

reactos/apps/utils/rosperf/lines.c

@@ -60,7 +60,7 @@ void
 LinesHorizontalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps)
 {
   unsigned Rep;
-  unsigned y;
+  int y;
   HDC Dc;
 
   for (Rep = 0; Rep < Reps; )
@@ -79,7 +79,7 @@ void
 LinesVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps)
 {
   unsigned Rep;
-  unsigned x;
+  int x;
   HDC Dc;
 
   for (Rep = 0; Rep < Reps; )

reactos/apps/utils/rosperf/rosperf.h

@@ -28,8 +28,8 @@ typedef struct tagPERF_INFO
   COLORREF BackgroundColor;
   HDC ForegroundDc;
   HDC BackgroundDc;
-  ULONG WndWidth;
-  ULONG WndHeight;
+  INT WndWidth;
+  INT WndHeight;
 } PERF_INFO, *PPERF_INFO;
 
 typedef unsigned (*INITTESTPROC)(void **Context, PPERF_INFO PerfInfo, unsigned Reps);

reactos/apps/utils/sc/makefile

@@ -1,26 +0,0 @@
-#
-# $Id: makefile,v 1.0
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_INSTALLDIR = system32
-
-TARGET_NAME = sc
-
-TARGET_CFLAGS = -D__USE_W32API -DDBG -Werror -Wall
-
-TARGET_SDKLIBS = kernel32.a ntdll.a advapi32.a
-
-TARGET_OBJECTS = command.o config.o main.o query.o setup.o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/sdkparse/test.h

@@ -89,7 +89,7 @@ typedef NTSTATUS NTAPI (*PSYSMOD_ENUM_ROUTINE)
 typedef NTSTATUS NTAPI (*PPROCMOD_ENUM_ROUTINE)
 (
  IN HANDLE ProcessHandle,
- IN PLDR_MODULE CurrentModule,
+ IN PLDR_DATA_TABLE_ENTRY CurrentModule,
  IN OUT PVOID CallbackContext
 );
 

reactos/apps/utils/shutdown/Makefile

@@ -1,25 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_INSTALLDIR = system32
-
-TARGET_NAME = shutdown
-
-TARGET_SDKLIBS = kernel32.a user32.a
-
-TARGET_OBJECTS = shutdown.o
-
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -D_WIN32_WINNT=0x0501
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/stats/Makefile

@@ -1,23 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = stats
-
-TARGET_SDKLIBS = kernel32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/theme/dump/Makefile

@@ -1,19 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = themedump
-
-TARGET_SDKLIBS = kernel32.a uxtheme.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/tickcount/makefile

@@ -1,21 +0,0 @@
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = tickcount
-
-TARGET_SDKLIBS = kernel32.a
-
-TARGET_OBJECTS = tickcount.o
-
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/apps/utils/winetest/makefile

@@ -1,23 +0,0 @@
-PATH_TO_TOP = ../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = winetest
-
-TARGET_SDKLIBS = comctl32.a comdlg32.a ws2_32.a
-
-TARGET_OBJECTS = \
-	main.o \
-	send.o \
-	util.o \
-	gui.o
-
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

reactos/baseaddress.xml

@@ -1,6 +1,7 @@
 <property name="BASEADDRESS_REGTESTS" value="0x07000000" />
 <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" />
 <property name="BASEADDRESS_DEVENUM" value="0x35680000" />
+<property name="BASEADDRESS_UXTHEME" value="0x5AD70000" />
 <property name="BASEADDRESS_DINPUT" value="0x5F580000" />
 <property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" />
 <property name="BASEADDRESS_SYSDM" value="0x64DD0000" />
@@ -36,6 +37,7 @@
 <property name="BASEADDRESS_LZ32" value="0x73d80000" />
 <property name="BASEADDRESS_USERENV" value="0x74850000" />
 <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" />
+<property name="BASEADDRESS_SAMSRV" value="0x74f30000" />
 <property name="BASEADDRESS_SAMLIB" value="0x750C0000" />
 <property name="BASEADDRESS_CABINET" value="0x75120000" />
 <property name="BASEADDRESS_MSGINA" value="0x75970000" />
@@ -48,7 +50,9 @@
 <property name="BASEADDRESS_RICHED32" value="0x76340000" />
 <property name="BASEADDRESS_RICHED20" value="0x76360000" />
 <property name="BASEADDRESS_TWAIN_32" value="0x76380000" />
+<property name="BASEADDRESS_LSASRV" value="0x76540000" />
 <property name="BASEADDRESS_MIDIMAP" value="0x76600000" />
+<property name="BASEADDRESS_WAVEMAP" value="0x76610000" />
 <property name="BASEADDRESS_MPR" value="0x76620000" />
 <property name="BASEADDRESS_SETUPAPI" value="0x76660000" />
 <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />
@@ -58,6 +62,7 @@
 <property name="BASEADDRESS_IPHLPAPI" value="0x77300000" />
 <property name="BASEADDRESS_MMDRV" value="0x77500000" />
 <property name="BASEADDRESS_CRTDLL" value="0x77630000" />
+<property name="BASEADDRESS_CFGMGR32" value="0x77700000" />
 <property name="BASEADDRESS_MSAFD" value="0x777a0000" />
 <property name="BASEADDRESS_MSI" value="0x777b0000" />
 <property name="BASEADDRESS_SNMPAPI" value="0x777c0000" />
@@ -94,7 +99,6 @@
 <property name="BASEADDRESS_OLEDLG" value="0x74d00000" />
 <property name="BASEADDRESS_COMMCTRL" value="0x75e60000" />
 <property name="BASEADDRESS_D3D8THK" value="0x76340000" />
-<property name="BASEADDRESS_LSASRV" value="0x76540000" />
 <property name="BASEADDRESS_ODBC32" value="0x76660000" />
 <property name="BASEADDRESS_MSACM32" value="0x77400000" />
 <property name="BASEADDRESS_PACKET" value="0x77780000" />

reactos/boot/freeldr/Makefile

@@ -1,54 +0,0 @@
-#
-#  FreeLoader
-#  Copyright (C) 1999, 2000, 2001  Brian Palmer  <brianp@sginet.com>
-#
-#  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., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-PATH_TO_TOP = ../..
-
-include rules.mak
-include $(PATH_TO_TOP)/config
-
-all:
-	$(MAKE) -C tools
-	$(MAKE) -C bootsect
-	$(MAKE) -C freeldr
-	$(MAKE) -C install
-	$(MAKE) -C fdebug
-
-test:
-
-clean:
-	$(MAKE) -C bootsect clean
-	$(MAKE) -C freeldr clean
-	$(MAKE) -C install clean
-	$(MAKE) -C fdebug clean
-	$(MAKE) -C tools clean
-
-bootcd:
-ifeq ($(ARCH),i386)
-	$(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/../isoboot.bin
-	$(CP) bootsect/dosmbr.bin ${BOOTCD_DIR}/loader/dosmbr.bin
-	$(CP) bootsect/ext2.bin ${BOOTCD_DIR}/loader/ext2.bin
-	$(CP) bootsect/fat.bin ${BOOTCD_DIR}/loader/fat.bin
-	$(CP) bootsect/fat32.bin ${BOOTCD_DIR}/loader/fat32.bin
-	$(CP) bootsect/isoboot.bin ${BOOTCD_DIR}/loader/isoboot.bin
-	$(CP) freeldr/freeldr.sys ${BOOTCD_DIR}/loader/freeldr.sys
-	$(CP) freeldr/setupldr.sys ${BOOTCD_DIR}/loader/setupldr.sys
-endif
-
-.PHONY : clean
-

reactos/boot/freeldr/bootsect/Makefile.i386

@@ -1,52 +0,0 @@
-all: $(BIN2C) dosmbr.bin fat.bin fat32.bin isoboot.bin ext2.bin
-
-$(BIN2C) :
-	@$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH)
-
-dosmbr.bin : dosmbr.asm
-	@echo ===================================================== Assembling dosmbr
-	@$(NASM_CMD) $(NFLAGS) -o dosmbr.bin -f bin dosmbr.asm
-
-fat.bin : fat.asm $(BIN2C)
-	@echo ===================================================== Assembling fat
-	@$(NASM_CMD) $(NFLAGS) -o fat.bin -f bin fat.asm
-	@$(BIN2C) fat.bin fat.h fat_data
-
-
-fat32.bin : fat32.asm $(BIN2C)
-	@echo ===================================================== Assembling fat32
-	@$(NASM_CMD) $(NFLAGS) -o fat32.bin -f bin fat32.asm
-	@$(BIN2C) fat32.bin fat32.h fat32_data
-
-isoboot.bin : isoboot.asm
-	@echo ===================================================== Assembling isoboot
-	@$(NASM_CMD) $(NFLAGS) -o isoboot.bin -f bin isoboot.asm
-
-ext2.bin : ext2.asm
-	@echo ===================================================== Assembling ext2
-	@$(NASM_CMD) $(NFLAGS) -o ext2.bin -f bin ext2.asm
-	@$(BIN2C) ext2.bin ext2.h ext2_data
-
-
-.PHONY : bootcd
-bootcd: bootcd_dirs isoboot.bin
-	$(CP) isoboot.bin $(BOOTCD_DIR)
-	$(CP) dosmbr.bin $(BOOTCD_DIR)/disk/loader
-	$(CP) ext2.bin $(BOOTCD_DIR)/disk/loader
-	$(CP) fat.bin $(BOOTCD_DIR)/disk/loader
-	$(CP) fat32.bin $(BOOTCD_DIR)/disk/loader
-	$(CP) isoboot.bin $(BOOTCD_DIR)/disk/loader
-
-.PHONY : bootcd_dirs
-bootcd_dirs:
-	$(MKDIR) $(BOOTCD_DIR)
-	$(MKDIR) $(BOOTCD_DIR)/disk
-	$(MKDIR) $(BOOTCD_DIR)/disk/reactos
-	$(MKDIR) $(BOOTCD_DIR)/disk/install
-	$(MKDIR) $(BOOTCD_DIR)/disk/bootdisk
-	$(MKDIR) $(BOOTCD_DIR)/disk/loader
-
-clean:
-	@-$(RM) *.bin
-	@-$(RM) *.h
-	@echo Clean ALL done.

reactos/boot/freeldr/bootsect/Makefile.powerpc

@@ -1,35 +0,0 @@
-TOOLS=$(PATH_TO_TOP)/tools
-SECTIONS= \
-	--only-section=.text \
-	--only-section=.data \
-	--only-section=.bss
-LDSECT=	-Ttext 0xe00000 -Tdata 0xe10000
-OBJS=ofwboot.o freeldr.o
-CFLAGS=-mbig -meabi -fPIC -fno-builtin -I../freeldr/include
-FREELDR=../freeldr/freeldr.sys
-
-.SUFFIXES: .c .o
-
-all: ofwldr 
-
-hack-coff$(EXEEXT):
-	$(HOST_CC) -I../freeldr/include hack-coff.c -o $@
-
-ofwboot.o: ofwboot.s
-	$(NASM_CMD) $< -c -o $@
-
-$(FREELDR):
-	$(MAKE) -C ../freeldr
-
-freeldr.o: $(FREELDR)
-	$(TOOLS)/ppc-le2be $< freeldr.tmp
-	$(OBJCOPY) -I binary -O elf32-powerpc -B powerpc:common freeldr.tmp $@
-	rm freeldr.tmp
-
-ofwldr: $(OBJS)
-	$(LD) -melf32ppc --no-omagic $(LDSECT) $(OBJS) -g -o $@.elf
-	$(OBJCOPY) $(SECTIONS) -O aixcoff-rs6000 $@.elf $@
-	$(TOOLS)/hack-coff $@
-
-clean:
-	rm -rf ofwldr *.o *.elf *.tmp

reactos/boot/freeldr/fdebug/Makefile

@@ -1,52 +0,0 @@
-#
-#  FreeLoader
-#  Copyright (C) 1999 - 2003  Brian Palmer  <brianp@sginet.com>
-#
-#  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., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-
-PATH_TO_TOP = ../../..
-
-include ../rules.mak
-
-FLAGS = -Wall
-
-OBJS = rs232.o fdebug.o fdebug.res
-
-.PHONY : clean
-
-all: fdebug.exe
-
-fdebug.exe: $(OBJS)
-	@echo freeldr: LINKING fdebug
-	$(CC) $(FLAGS) -o fdebug.exe $(OBJS) -lgdi32 -lcomdlg32 -Wl,--subsystem,windows
-
-fdebug.res: fdebug.rc resource.h
-	@echo freeldr: Compiling $*
-	$(RC) -o fdebug.res fdebug.rc -O coff
-
-fdebug.o: fdebug.c rs232.h
-	@echo freeldr: Compiling $*
-	$(CC) $(FLAGS) -o fdebug.o -c fdebug.c
-
-rs232.o: rs232.c rs232.h
-	@echo freeldr: Compiling $*
-	$(CC) $(FLAGS) -o rs232.o -c rs232.c
-
-clean:
-	@-$(RM) *.o
-	@-$(RM) *.res
-	@-$(RM) *.exe
-	@echo freeldr: Clean ALL done.

reactos/boot/freeldr/freeldr/arch/i386/hardware.c

@@ -363,7 +363,7 @@ DetectPnpBios(FRLDRHKEY SystemKey, ULONG *BusNumber)
   FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition =
     CmResourceShareUndetermined;
 
-  Ptr = (char *)(((PVOID)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]) +
+  Ptr = (char *)(((ULONG_PTR)&FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]) +
 		 sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
 
   /* Set instalation check data */
@@ -460,7 +460,7 @@ SetHarddiskConfigurationData(FRLDRHKEY DiskKey,
     sizeof(CM_DISK_GEOMETRY_DEVICE_DATA);
 
   /* Get pointer to geometry data */
-  DiskGeometry = ((PVOID)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR);
+  DiskGeometry = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR));
 
   /* Get the disk geometry */
   ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY);
@@ -648,7 +648,7 @@ DetectBiosDisks(FRLDRHKEY SystemKey,
     sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount;
 
   /* Get harddisk Int13 geometry data */
-  Int13Drives = ((PVOID)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR);
+  Int13Drives = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR));
   for (i = 0; i < DiskCount; i++)
     {
       if (MachDiskGetDriveGeometry(0x80 + i, &Geometry))
@@ -744,7 +744,7 @@ GetInt1eTable(VOID)
   PUSHORT SegPtr = (PUSHORT)0x7A;
   PUSHORT OfsPtr = (PUSHORT)0x78;
 
-  return (PVOID)(((ULONG)(*SegPtr)) << 4) + (ULONG)(*OfsPtr);
+  return (PVOID)((ULONG_PTR)(((ULONG)(*SegPtr)) << 4) + (ULONG)(*OfsPtr));
 }
 
 
@@ -814,7 +814,7 @@ DetectBiosFloppyPeripheral(FRLDRHKEY ControllerKey)
     PartialDescriptor->ShareDisposition = CmResourceShareUndetermined;
     PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_FLOPPY_DEVICE_DATA);
 
-    FloppyData = ((PVOID)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR);
+    FloppyData = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR));
     FloppyData->Version = 2;
     FloppyData->Revision = 0;
     FloppyData->MaxDensity = MaxDensity[FloppyType];
@@ -1691,7 +1691,7 @@ DetectKeyboardPeripheral(FRLDRHKEY ControllerKey)
     PartialDescriptor->ShareDisposition = CmResourceShareUndetermined;
     PartialDescriptor->u.DeviceSpecificData.DataSize = sizeof(CM_KEYBOARD_DEVICE_DATA);
 
-    KeyboardData = ((PVOID)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR);
+    KeyboardData = (PVOID)(((ULONG_PTR)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR));
     KeyboardData->Version = 0;
     KeyboardData->Revision = 0;
     KeyboardData->Type = 4;

reactos/boot/freeldr/freeldr/arch/i386/hwpci.c

@@ -208,7 +208,7 @@ DetectPciIrqRoutingTable(FRLDRHKEY BusKey)
       PartialDescriptor->ShareDisposition = CmResourceShareUndetermined;
       PartialDescriptor->u.DeviceSpecificData.DataSize = Table->Size;
 
-      memcpy(((PVOID)FullResourceDescriptor) + sizeof(CM_FULL_RESOURCE_DESCRIPTOR),
+      memcpy((PVOID)((ULONG_PTR)FullResourceDescriptor + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)),
 	     Table,
 	     Table->Size);
 

reactos/boot/freeldr/freeldr/arch/i386/mb.S

@@ -52,10 +52,10 @@
 	// Boot information structure
 	//
 
-EXTERN(_multiboot_memory_map_descriptor_size)
+EXTERN(_reactos_memory_map_descriptor_size)
 	.long	0
 
-EXTERN(_multiboot_memory_map)
+EXTERN(_reactos_memory_map)
 	.rept	(32 * /*sizeof(memory_map_t)*/24)
 	.byte	0
 	.endr
@@ -72,7 +72,7 @@ _kernel_pagetable:
 	.fill 2*4096, 1, 0
 
 _hyperspace_pagetable:
-	.fill 4096, 1, 0
+	.fill 2*4096, 1, 0
 	
 _apic_pagetable:
 	.fill 4096, 1, 0

reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c

@@ -258,7 +258,7 @@ static BOOL PcDiskReadLogicalSectorsCHS(ULONG DriveNumber, ULONGLONG SectorNumbe
 		// of checking the sector read count we will rely solely
 		// on the carry flag being set on error
 
-		Buffer += (NumberOfSectorsToRead * DriveGeometry.BytesPerSector);
+		Buffer = (PVOID)((ULONG_PTR)Buffer + (NumberOfSectorsToRead * DriveGeometry.BytesPerSector));
 		SectorCount -= NumberOfSectorsToRead;
 		SectorNumber += NumberOfSectorsToRead;
 	}

reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c

@@ -387,7 +387,7 @@ XboxDiskPolledRead(ULONG CommandPort,
       if (Junk == FALSE)
 	{
 	  IDEReadBlock(CommandPort, Buffer, IDE_SECTOR_BUF_SZ);
-	  Buffer += IDE_SECTOR_BUF_SZ;
+	  Buffer = (PVOID)((ULONG_PTR)Buffer + IDE_SECTOR_BUF_SZ);
 	}
       else
 	{

reactos/boot/freeldr/freeldr/cache/cache.c

@@ -164,14 +164,14 @@ BOOL CacheReadDiskSectors(ULONG DiskNumber, ULONG StartSector, ULONG SectorCount
 		// Copy the portion requested into the buffer
 		//
 		RtlCopyMemory(Buffer,
-			(CacheBlock->BlockData + (SectorOffsetInStartBlock * CacheManagerDrive.BytesPerSector)),
+			(PVOID)((ULONG_PTR)CacheBlock->BlockData + (SectorOffsetInStartBlock * CacheManagerDrive.BytesPerSector)),
 			(CopyLengthInStartBlock * CacheManagerDrive.BytesPerSector));
 		DbgPrint((DPRINT_CACHE, "1 - RtlCopyMemory(0x%x, 0x%x, %d)\n", Buffer, (CacheBlock->BlockData + (SectorOffsetInStartBlock * CacheManagerDrive.BytesPerSector)), (CopyLengthInStartBlock * CacheManagerDrive.BytesPerSector)));
 
 		//
 		// Update the buffer address
 		//
-		Buffer += (CopyLengthInStartBlock * CacheManagerDrive.BytesPerSector);
+		Buffer = (PVOID)((ULONG_PTR)Buffer + (CopyLengthInStartBlock * CacheManagerDrive.BytesPerSector));
 
 		//
 		// Update the block count
@@ -204,7 +204,7 @@ BOOL CacheReadDiskSectors(ULONG DiskNumber, ULONG StartSector, ULONG SectorCount
 		//
 		// Update the buffer address
 		//
-		Buffer += CacheManagerDrive.BlockSize * CacheManagerDrive.BytesPerSector;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + (CacheManagerDrive.BlockSize * CacheManagerDrive.BytesPerSector));
 
 		//
 		// Update the block count
@@ -237,7 +237,7 @@ BOOL CacheReadDiskSectors(ULONG DiskNumber, ULONG StartSector, ULONG SectorCount
 		//
 		// Update the buffer address
 		//
-		Buffer += SectorOffsetInEndBlock * CacheManagerDrive.BytesPerSector;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + (SectorOffsetInEndBlock * CacheManagerDrive.BytesPerSector));
 
 		//
 		// Update the block count

reactos/boot/freeldr/freeldr/freeldr_base.xml

@@ -74,6 +74,7 @@
 	<directory name="reactos">
 		<file>arcname.c</file>
 		<file>binhive.c</file>
+		<file>loader.c</file>
 		<file>reactos.c</file>
 		<file>registry.c</file>
 	</directory>
@@ -102,7 +103,6 @@
 	</directory>
 	<file>freeldr.c</file>
 	<file>debug.c</file>
-	<file>multiboot.c</file>
 	<file>version.c</file>
 	<file>cmdline.c</file>
 	<file>machine.c</file>

reactos/boot/freeldr/freeldr/fs/ext2.c

@@ -192,7 +192,7 @@ FILE* Ext2OpenFile(PCHAR FileName)
  */
 BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO Ext2FileInfoPointer)
 {
-	int				i;
+	UINT				i;
 	ULONG				NumberOfPathParts;
 	CHAR			PathPart[261];
 	PVOID			DirectoryBuffer;
@@ -298,7 +298,7 @@ BOOL Ext2SearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize
 
 	for (CurrentOffset=0; CurrentOffset<DirectorySize; )
 	{
-		CurrentDirectoryEntry = (PEXT2_DIR_ENTRY)(DirectoryBuffer + CurrentOffset);
+		CurrentDirectoryEntry = (PEXT2_DIR_ENTRY)((ULONG_PTR)DirectoryBuffer + CurrentOffset);
 
 		if (CurrentDirectoryEntry->rec_len == 0)
 		{
@@ -401,7 +401,7 @@ BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead,
 		DbgPrint((DPRINT_FILESYSTEM, "Reading fast symbolic link data\n"));
 
 		// Copy the data from the link
-		RtlCopyMemory(Buffer, (PVOID)(Ext2FileInfo->Inode.i_block) + Ext2FileInfo->FilePointer, BytesToRead);
+		RtlCopyMemory(Buffer, (PVOID)((ULONG_PTR)Ext2FileInfo->FilePointer + Ext2FileInfo->Inode.i_block), BytesToRead);
 
 		if (BytesRead != NULL)
 		{
@@ -466,7 +466,7 @@ BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead,
 		}
 		BytesToRead -= LengthInBlock;
 		Ext2FileInfo->FilePointer += LengthInBlock;
-		Buffer += LengthInBlock;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + LengthInBlock);
 	}
 
 	//
@@ -497,7 +497,7 @@ BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead,
 			}
 			BytesToRead -= Ext2BlockSizeInBytes;
 			Ext2FileInfo->FilePointer += Ext2BlockSizeInBytes;
-			Buffer += Ext2BlockSizeInBytes;
+			Buffer = (PVOID)((ULONG_PTR)Buffer + Ext2BlockSizeInBytes);
 			NumberOfBlocks--;
 		}
 	}
@@ -523,7 +523,7 @@ BOOL Ext2ReadFile(FILE *FileHandle, ULONGLONG BytesToRead, ULONGLONG* BytesRead,
 		}
 		Ext2FileInfo->FilePointer += BytesToRead;
 		BytesToRead -= BytesToRead;
-		Buffer += BytesToRead;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + (ULONG_PTR)BytesToRead);
 	}
 
 	return TRUE;
@@ -878,7 +878,7 @@ BOOL Ext2ReadPartialBlock(ULONG BlockNumber, ULONG StartingOffset, ULONG Length,
 		return FALSE;
 	}
 
-	memcpy(Buffer, ((PVOID)FILESYSBUFFER + StartingOffset), Length);
+	memcpy(Buffer, (PVOID)((ULONG_PTR)FILESYSBUFFER + StartingOffset), Length);
 
 	return TRUE;
 }

reactos/boot/freeldr/freeldr/fs/fat.c

@@ -689,7 +689,7 @@ BOOL FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySize
  */
 BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer)
 {
-	int		i;
+	UINT		i;
 	ULONG		NumberOfPathParts;
 	CHAR		PathPart[261];
 	PVOID		DirectoryBuffer;
@@ -827,9 +827,9 @@ void FatParseShortFileName(PCHAR Buffer, PDIRENTRY DirEntry)
 BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
 {
 	ULONG		fat = 0;
-	int		FatOffset;
-	int		ThisFatSecNum;
-	int		ThisFatEntOffset;
+	UINT		FatOffset;
+	UINT		ThisFatSecNum;
+	UINT		ThisFatEntOffset;
 
 	DbgPrint((DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster));
 
@@ -860,7 +860,7 @@ BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
 			}
 		}
 
-		fat = *((USHORT *) ((PVOID)FILESYSBUFFER + ThisFatEntOffset));
+		fat = *((USHORT *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset));
 		if (Cluster & 0x0001)
 			fat = fat >> 4;	/* Cluster number is ODD */
 		else
@@ -880,7 +880,7 @@ BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
 			return FALSE;
 		}
 
-		fat = *((USHORT *) ((PVOID)FILESYSBUFFER + ThisFatEntOffset));
+		fat = *((USHORT *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset));
 
 		break;
 
@@ -897,7 +897,7 @@ BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
 		}
 
 		// Get the fat entry
-		fat = (*((ULONG *) ((PVOID)FILESYSBUFFER + ThisFatEntOffset))) & 0x0FFFFFFF;
+		fat = (*((ULONG *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset))) & 0x0FFFFFFF;
 
 		break;
 
@@ -1091,7 +1091,7 @@ BOOL FatReadClusterChain(ULONG StartClusterNumber, ULONG NumberOfClusters, PVOID
 		//
 		// Increment buffer address by cluster size
 		//
-		Buffer += SectorsPerCluster * BytesPerSector;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + (SectorsPerCluster * BytesPerSector));
 
 		//
 		// Get next cluster
@@ -1132,7 +1132,7 @@ BOOL FatReadPartialCluster(ULONG ClusterNumber, ULONG StartingOffset, ULONG Leng
 		return FALSE;
 	}
 
-	memcpy(Buffer, ((PVOID)FILESYSBUFFER + StartingOffset), Length);
+	memcpy(Buffer, (PVOID)((ULONG_PTR)FILESYSBUFFER + StartingOffset), Length);
 
 	return TRUE;
 }
@@ -1234,7 +1234,7 @@ BOOL FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Bu
 		}
 		BytesToRead -= LengthInCluster;
 		FatFileInfo->FilePointer += LengthInCluster;
-		Buffer += LengthInCluster;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + LengthInCluster);
 	}
 
 	//
@@ -1265,7 +1265,7 @@ BOOL FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Bu
 			}
 			BytesToRead -= (NumberOfClusters * BytesPerCluster);
 			FatFileInfo->FilePointer += (NumberOfClusters * BytesPerCluster);
-			Buffer += (NumberOfClusters * BytesPerCluster);
+			Buffer = (PVOID)((ULONG_PTR)Buffer + (NumberOfClusters * BytesPerCluster));
 		}
 	}
 
@@ -1290,7 +1290,7 @@ BOOL FatReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Bu
 		}
 		FatFileInfo->FilePointer += BytesToRead;
 		BytesToRead -= BytesToRead;
-		Buffer += BytesToRead;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + BytesToRead);
 	}
 
 	return TRUE;

reactos/boot/freeldr/freeldr/fs/fs.c

@@ -339,10 +339,10 @@ BOOL FsIsEndOfFile(PFILE FileHandle)
  */
 ULONG FsGetNumPathParts(PCHAR Path)
 {
-	ULONG		i;
+	size_t		i;
 	ULONG		num;
 
-	for (i=0,num=0; i<(int)strlen(Path); i++)
+	for (i=0,num=0; i<strlen(Path); i++)
 	{
 		if ((Path[i] == '\\') || (Path[i] == '/'))
 		{
@@ -364,12 +364,12 @@ ULONG FsGetNumPathParts(PCHAR Path)
  */
 VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path)
 {
-	ULONG		i;
+	size_t		i;
 
 	// Copy all the characters up to the end of the
 	// string or until we hit a '\' character
 	// and put them in Buffer
-	for (i=0; i<(int)strlen(Path); i++)
+	for (i=0; i<strlen(Path); i++)
 	{
 		if ((Path[i] == '\\') || (Path[i] == '/'))
 		{

reactos/boot/freeldr/freeldr/fs/iso.c

@@ -81,12 +81,12 @@ static BOOL IsoSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG Directo
 	while (TRUE)
 	{
 		Offset = Offset + Record->RecordLength;
-		Record = (PDIR_RECORD)(DirectoryBuffer + Offset);
+		Record = (PDIR_RECORD)((ULONG_PTR)DirectoryBuffer + Offset);
 
 		if (Record->RecordLength == 0)
 		{
 			Offset = ROUND_UP(Offset, SECTORSIZE);
-			Record = (PDIR_RECORD)(DirectoryBuffer + Offset);
+			Record = (PDIR_RECORD)((ULONG_PTR)DirectoryBuffer + Offset);
 		}
 
 		if (Offset >= DirectoryLength)
@@ -159,7 +159,7 @@ static PVOID IsoBufferDirectory(ULONG DirectoryStartSector, ULONG DirectoryLengt
 	//
 	// Now read directory contents into DirectoryBuffer
 	//
-	for (i = 0, Ptr = DirectoryBuffer; i < SectorCount; i++, Ptr += SECTORSIZE)
+	for (i = 0, Ptr = DirectoryBuffer; i < SectorCount; i++, Ptr = (PVOID)((ULONG_PTR)Ptr + SECTORSIZE))
 	{
 		if (!MachDiskReadLogicalSectors(IsoDriveNumber, DirectoryStartSector + i, 1, (PVOID)DISKREADBUFFER))
 		{
@@ -182,7 +182,7 @@ static PVOID IsoBufferDirectory(ULONG DirectoryStartSector, ULONG DirectoryLengt
  */
 static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO IsoFileInfoPointer)
 {
-	int		i;
+	UINT		i;
 	ULONG			NumberOfPathParts;
 	CHAR		PathPart[261];
 	PVOID		DirectoryBuffer;
@@ -377,14 +377,14 @@ BOOL IsoReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Bu
 		{
 			return FALSE;
 		}
-		RtlCopyMemory(Buffer, ((PVOID)DISKREADBUFFER + OffsetInSector), LengthInSector);
+		RtlCopyMemory(Buffer, (PVOID)((ULONG_PTR)DISKREADBUFFER + OffsetInSector), LengthInSector);
 		if (BytesRead != NULL)
 		{
 			*BytesRead += LengthInSector;
 		}
 		BytesToRead -= LengthInSector;
 		IsoFileInfo->FilePointer += LengthInSector;
-		Buffer += LengthInSector;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + LengthInSector);
 	}
 
 	//
@@ -417,7 +417,7 @@ BOOL IsoReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Bu
 			}
 			BytesToRead -= SECTORSIZE;
 			IsoFileInfo->FilePointer += SECTORSIZE;
-			Buffer += SECTORSIZE;
+			Buffer = (PVOID)((ULONG_PTR)Buffer + SECTORSIZE);
 		}
 	}
 
@@ -442,7 +442,7 @@ BOOL IsoReadFile(FILE *FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Bu
 		}
 		IsoFileInfo->FilePointer += BytesToRead;
 		BytesToRead -= BytesToRead;
-		Buffer += BytesToRead;
+		Buffer = (PVOID)((ULONG_PTR)Buffer + BytesToRead);
 	}
 
 	DbgPrint((DPRINT_FILESYSTEM, "IsoReadFile() done\n"));

reactos/boot/freeldr/freeldr/fs/ntfs.c

@@ -1,6 +1,6 @@
 /*
  *  FreeLoader NTFS support
- *  Copyright (C) 2004       Filip Navara  <xnavara@volny.cz>
+ *  Copyright (C) 2004  Filip Navara  <xnavara@volny.cz>
  *
  *  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
@@ -168,7 +168,7 @@ BOOL NtfsDiskRead(ULONGLONG Offset, ULONGLONG Length, PCHAR Buffer)
     }
 
     /* II. Read all complete 64-sector blocks. */
-    while (Length >= 64 * NtfsBootSector->BytesPerSector)
+    while (Length >= (ULONGLONG)64 * (ULONGLONG)NtfsBootSector->BytesPerSector)
     {
         if (!MachDiskReadLogicalSectors(NtfsDriveNumber, NtfsSectorOfClusterZero + (Offset / NtfsBootSector->BytesPerSector), 64, (PCHAR)DISKREADBUFFER))
             return FALSE;

reactos/boot/freeldr/freeldr/fs/ntfs.h

@@ -1,6 +1,6 @@
 /*
  *  FreeLoader NTFS support
- *  Copyright (C) 2004       Filip Navara  <xnavara@volny.cz>
+ *  Copyright (C) 2004  Filip Navara  <xnavara@volny.cz>
  *
  *  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

reactos/boot/freeldr/freeldr/include/arch.h

@@ -28,10 +28,6 @@
 #define RMODE_CS	0x18	/* RMode code selector, base 0 limit 64k */
 #define RMODE_DS	0x20	/* RMode data selector, base 0 limit 64k */
 
-#define	KERNEL_BASE	0xC0000000
-#define	KERNEL_CS	0x08
-#define	KERNEL_DS	0x10
-
 #define CR0_PE_SET	0x00000001	/* OR this value with CR0 to enable pmode */
 #define CR0_PE_CLR	0xFFFFFFFE	/* AND this value with CR0 to disable pmode */
 

reactos/boot/freeldr/freeldr/include/freeldr.h

@@ -21,8 +21,8 @@
 #define __FREELDR_H
 
 #include <ddk/ntddk.h>
+#include <ndk/ntndk.h>
 #include <arch.h>
-#include <reactos.h>
 #include <rtl.h>
 #include <disk.h>
 #include <fs.h>
@@ -33,6 +33,7 @@
 #include <inifile.h>
 #include <video.h>
 #include <portio.h>
+#include <reactos.h>
 
 #define ROUND_UP(N, S) (((N) + (S) - 1) & ~((S) - 1))
 #define ROUND_DOWN(N, S) ((N) & ~((S) - 1))

reactos/boot/freeldr/freeldr/include/multiboot.h

@@ -52,7 +52,6 @@
 #define MB_INFO_FLAG_BOOT_LOADER_NAME	0x00000200
 #define MB_INFO_FLAG_APM_TABLE			0x00000400
 #define MB_INFO_FLAG_GRAPHICS_TABLE		0x00000800
-#define MB_INFO_FLAG_ACPI_TABLE         0x00001000
 
 #ifndef ASM
 /* Do not include here in boot.S. */
@@ -90,35 +89,6 @@ typedef struct elf_section_header_table
   unsigned long shndx;
 } elf_section_header_table_t;
 
-typedef struct _LOADER_PARAMETER_BLOCK
-{
-   ULONG Flags;
-   ULONG MemLower;
-   ULONG MemHigher;
-   ULONG BootDevice;
-   ULONG CommandLine;
-   ULONG ModsCount;
-   ULONG ModsAddr;
-   UCHAR Syms[12];
-   ULONG MmapLength;
-   ULONG MmapAddr;
-   ULONG DrivesCount;
-   ULONG DrivesAddr;
-   ULONG ConfigTable;
-   ULONG BootLoaderName;
-   ULONG PageDirectoryStart;
-   ULONG PageDirectoryEnd;
-   ULONG KernelBase;
-} LOADER_PARAMETER_BLOCK, *PLOADER_PARAMETER_BLOCK;
-
-/* The module structure. */
-typedef struct _FRLDR_MODULE {
-  ULONG_PTR ModuleStart;
-  ULONG_PTR ModuleEnd;
-  LPSTR ModuleName;
-  ULONG Reserved;
-} FRLDR_MODULE, *PFRLDR_MODULE;
-
 /* The memory map. Be careful that the offset 0 is base_addr_low
    but no size. */
 typedef struct memory_map
@@ -132,94 +102,6 @@ typedef struct memory_map
   unsigned long reserved;
 } memory_map_t;
 
-
-LOADER_PARAMETER_BLOCK LoaderBlock; /* Multiboot info structure passed to kernel */
-char					multiboot_kernel_cmdline[255];	// Command line passed to kernel
-FRLDR_MODULE			multiboot_modules[64];		// Array to hold boot module info loaded for the kernel
-char					multiboot_module_strings[64][256];	// Array to hold module names
-unsigned long			multiboot_memory_map_descriptor_size;
-memory_map_t			multiboot_memory_map[32];		// Memory map
-
-
-void	boot_reactos(void);
-
-#include "fs.h"		// Included FILE structure definition
-
-BOOL
-STDCALL
-FrLdrBootReactOs(VOID);
-
-BOOL
-STDCALL
-FrLdrMapKernel(FILE *KernelImage);
-
-ULONG_PTR
-STDCALL
-FrLdrCreateModule(LPSTR ModuleName);
-
-ULONG_PTR
-STDCALL
-FrLdrLoadModule(FILE *ModuleImage,
-                LPSTR ModuleName,
-                PULONG ModuleSize);
-
-BOOL
-STDCALL
-FrLdrLoadKernel(PCHAR szFileName,
-                INT nPos);
-
-BOOL
-FrLdrLoadNlsFile(PCHAR szSystemRoot,
-                 PCHAR szErrorOut);
-
-BOOL
-FrLdrLoadDriver(PCHAR szFileName,
-                INT nPos);
-BOOL
-LoadSymbolFile(PCHAR szSystemRoot,
-               PCHAR ModuleName,
-               INT nPos);
-
-VOID
-FrLdrLoadBootDrivers(PCHAR szSystemRoot,
-                     INT nPos);
-
-BOOL
-STDCALL
-FrLdrCloseModule(ULONG_PTR ModuleBase,
-                 ULONG dwModuleSize);
-
-VOID
-STDCALL
-FrLdrStartup(ULONG Magic);
-
-VOID
-FASTCALL
-FrLdrGetKernelBase(VOID);
-
-VOID
-FASTCALL
-FrLdrSetupPae(ULONG Magic);
-
-VOID
-FASTCALL
-FrLdrGetPaeMode(VOID);
-
-VOID
-FASTCALL
-FrLdrSetupPageDirectory(VOID);
-
-VOID
-LoadAndBootReactOS(PCHAR OperatingSystemName);
-
-VOID FASTCALL AsmCode(VOID);
-typedef VOID (FASTCALL *ASMCODE)(ULONG Magic,
-                                 PLOADER_PARAMETER_BLOCK LoaderBlock);
-
-int	GetBootPartition(char *OperatingSystemName);
-
-
-
 #endif /* ! ASM */
 
 

reactos/boot/freeldr/freeldr/include/reactos.h

@@ -44,5 +44,27 @@ BOOL DissectArcPath(CHAR *ArcPath, CHAR *BootPath, ULONG* BootDrive, ULONG* Boot
 VOID ConstructArcPath(PCHAR ArcPath, PCHAR SystemFolder, ULONG Disk, ULONG Partition);
 ULONG ConvertArcNameToBiosDriveNumber(PCHAR ArcPath);
 
+///////////////////////////////////////////////////////////////////////////////////////
+//
+// Loader Functions And Definitions
+//
+///////////////////////////////////////////////////////////////////////////////////////
+ 
+extern LOADER_PARAMETER_BLOCK LoaderBlock; /* Multiboot info structure passed to kernel */
+extern char					reactos_kernel_cmdline[255];	// Command line passed to kernel
+extern LOADER_MODULE		reactos_modules[64];		// Array to hold boot module info loaded for the kernel
+extern char					reactos_module_strings[64][256];	// Array to hold module names
+extern unsigned long		reactos_memory_map_descriptor_size;
+extern memory_map_t			reactos_memory_map[32];		// Memory map
+
+VOID FASTCALL FrLdrSetupPae(ULONG Magic);
+VOID FASTCALL FrLdrSetupPageDirectory(VOID);
+VOID FASTCALL FrLdrGetPaeMode(VOID);
+BOOL STDCALL FrLdrMapKernel(FILE *KernelImage);
+ULONG_PTR STDCALL FrLdrCreateModule(LPSTR ModuleName);
+ULONG_PTR STDCALL FrLdrLoadModule(FILE *ModuleImage, LPSTR ModuleName, PULONG ModuleSize);
+BOOL STDCALL FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize);
+VOID STDCALL FrLdrStartup(ULONG Magic);
+typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PLOADER_PARAMETER_BLOCK LoaderBlock);
 
 #endif // defined __REACTOS_H

reactos/boot/freeldr/freeldr/include/rtl.h

@@ -42,7 +42,7 @@ void *	memset(void *src, int val, size_t count);
 // Standard Library Functions
 //
 ///////////////////////////////////////////////////////////////////////////////////////
-int		atoi(char *string);
+int		atoi(const char *string);
 char *	itoa(int value, char *string, int radix);
 int		toupper(int c);
 int		tolower(int c);
@@ -75,8 +75,8 @@ void	sound(int freq);
 //
 ///////////////////////////////////////////////////////////////////////////////////////
 void	print(char *str);
-void	printf(char *fmt, ...);
-void	sprintf(char *buffer, char *format, ...);
+int		printf(const char *fmt, ...);
+int		sprintf(char *buffer, const char *format, ...);
 
 ///////////////////////////////////////////////////////////////////////////////////////
 //

reactos/boot/freeldr/freeldr/inffile/inffile.c

@@ -56,7 +56,7 @@ typedef struct _INFCACHELINE
   struct _INFCACHELINE *Next;
   struct _INFCACHELINE *Prev;
 
-  LONG FieldCount;
+  ULONG FieldCount;
 
   PCHAR Key;
 
@@ -437,7 +437,7 @@ inline static int is_eol( struct parser *parser, const CHAR *ptr )
 /* push data from current token start up to pos into the current token */
 static int push_token( struct parser *parser, const CHAR *pos )
 {
-  int len = pos - parser->start;
+  unsigned int len = pos - parser->start;
   const CHAR *src = parser->start;
   CHAR *dst = parser->token + parser->token_len;
 

reactos/boot/freeldr/freeldr/linuxboot.c

@@ -346,7 +346,7 @@ BOOL LinuxReadSetupSector(PFILE LinuxKernelFile)
 
 	// Read in the rest of the linux setup sectors
 	FsSetFilePointer(LinuxKernelFile, 1024);
-	if (!FsReadFile(LinuxKernelFile, SetupSectorSize - 512, NULL, ((PVOID)LinuxSetupSector) + 512))
+	if (!FsReadFile(LinuxKernelFile, SetupSectorSize - 512, NULL, (PVOID)((ULONG_PTR)LinuxSetupSector + 512)))
 	{
 		return FALSE;
 	}
@@ -400,7 +400,7 @@ BOOL LinuxReadKernel(PFILE LinuxKernelFile)
 		}
 
 		BytesLoaded += LINUX_READ_CHUNK_SIZE;
-		LoadAddress += LINUX_READ_CHUNK_SIZE;
+		LoadAddress = (PVOID)((ULONG_PTR)LoadAddress + LINUX_READ_CHUNK_SIZE);
 
 		UiDrawProgressBarCenter(BytesLoaded, LinuxKernelSize + LinuxInitrdSize, LinuxBootDescription);
 	}
@@ -491,7 +491,7 @@ BOOL LinuxReadInitrd(PFILE LinuxInitrdFile)
 		}
 
 		BytesLoaded += LINUX_READ_CHUNK_SIZE;
-		LinuxInitrdLoadAddress += LINUX_READ_CHUNK_SIZE;
+		LinuxInitrdLoadAddress = (PVOID)((ULONG_PTR)LinuxInitrdLoadAddress + LINUX_READ_CHUNK_SIZE);
 
 		UiDrawProgressBarCenter(BytesLoaded + LinuxKernelSize, LinuxInitrdSize + LinuxKernelSize, LinuxBootDescription);
 	}

reactos/boot/freeldr/freeldr/mm/meminit.c

@@ -264,7 +264,7 @@ VOID MmInitPageLookupTable(PVOID PageLookupTable, ULONG TotalPageCount, PBIOS_ME
 
 	// Mark the pages that the lookup tabel occupies as reserved
 	PageLookupTableStartPage = MmGetPageNumberFromAddress(PageLookupTable);
-	PageLookupTablePageCount = MmGetPageNumberFromAddress(PageLookupTable + ROUND_UP(TotalPageCount * sizeof(PAGE_LOOKUP_TABLE_ITEM), MM_PAGE_SIZE)) - PageLookupTableStartPage;
+	PageLookupTablePageCount = MmGetPageNumberFromAddress((PVOID)((ULONG_PTR)PageLookupTable + ROUND_UP(TotalPageCount * sizeof(PAGE_LOOKUP_TABLE_ITEM), MM_PAGE_SIZE))) - PageLookupTableStartPage;
 	DbgPrint((DPRINT_MEMORY, "Marking the page lookup table pages as reserved StartPage: %d PageCount: %d\n", PageLookupTableStartPage, PageLookupTablePageCount));
 	MmMarkPagesInLookupTable(PageLookupTable, PageLookupTableStartPage, PageLookupTablePageCount, MEMTYPE_RESERVED);
 }
@@ -384,8 +384,8 @@ ULONG MmFindAvailablePagesBeforePage(PVOID PageLookupTable, ULONG TotalPageCount
 
 VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG* MapCount)
 {
-	int		Index;
-	int		Index2;
+	UINT		Index;
+	UINT		Index2;
 
 	// Loop through each entry in the array
 	for (Index=0; Index<*MapCount; Index++)

reactos/boot/freeldr/freeldr/mm/mm.c

@@ -72,7 +72,7 @@ PVOID MmAllocateMemory(ULONG MemorySize)
 	MemorySize = ROUND_UP(MemorySize, 4);
 	if (MemorySize <= SubAllocationRest)
 	{
-		MemPointer = SubAllocationPage + MM_PAGE_SIZE - SubAllocationRest;
+		MemPointer = (PVOID)((ULONG_PTR)SubAllocationPage + MM_PAGE_SIZE - SubAllocationRest);
 		SubAllocationRest -= MemorySize;
 		return MemPointer;
 	}

reactos/boot/freeldr/freeldr/reactos/binhive.c

@@ -1360,10 +1360,10 @@ RegImportValue (PHBIN RootBin,
   PWCHAR wName;
   PCHAR cName;
   LONG Error;
-  LONG DataSize;
+  ULONG DataSize;
   PCHAR cBuffer;
   PWCHAR wBuffer;
-  LONG i;
+  ULONG i;
 
   if (ValueCell->CellSize >= 0 || ValueCell->Id != REG_VALUE_CELL_ID)
     {

reactos/boot/freeldr/freeldr/reactos/loader.c

@@ -1,10 +1,22 @@
 /*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         Freeloader
- * FILE:            boot/freeldr/freeldr/multiboot.c
- * PURPOSE:         ReactOS Loader
- * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
- *                  Hartmut Birr - SMP/PAE Code
+ *  FreeLoader
+ *  Copyright (C) 1998-2003  Brian Palmer  <brianp@sginet.com>
+ *  Copyright (C) 2005       Alex Ionescu  <alex@relsoft.net>
+ *  Copyright (C) 2005       Hartmut Birr  <hartmut.birr@gmx.de>
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <freeldr.h>
@@ -20,7 +32,7 @@
 #define PFN_SHIFT 12
 
 /* Bits to shift to convert a Virtual Address into an Offset in the Page Directory */
-#define PDE_SHIFT 20
+#define PDE_SHIFT 22
 #define PDE_SHIFT_PAE 18
 
 
@@ -36,20 +48,21 @@
 #define PaToPfn(p) \
     ((p) >> PFN_SHIFT)
 
-#define STARTUP_BASE                0xF0000000
-#define HYPERSPACE_BASE             0xF0800000
+#define STARTUP_BASE                0xC0000000
+#define HYPERSPACE_BASE             0xC0400000
+#define HYPERSPACE_PAE_BASE         0xC0800000
 #define APIC_BASE                   0xFEC00000
 #define KPCR_BASE                   0xFF000000
 
 #define LowMemPageTableIndex        0
-#define StartupPageTableIndex       (STARTUP_BASE >> 20)    / sizeof(HARDWARE_PTE_X86)
-#define HyperspacePageTableIndex    (HYPERSPACE_BASE >> 20) / sizeof(HARDWARE_PTE_X86)
-#define KpcrPageTableIndex          (KPCR_BASE >> 20)       / sizeof(HARDWARE_PTE_X86)
-#define ApicPageTableIndex          (APIC_BASE >> 20)       / sizeof(HARDWARE_PTE_X86)
+#define StartupPageTableIndex       (STARTUP_BASE >> 22)
+#define HyperspacePageTableIndex    (HYPERSPACE_BASE >> 22)
+#define KpcrPageTableIndex          (KPCR_BASE >> 22)
+#define ApicPageTableIndex          (APIC_BASE >> 22)
 
 #define LowMemPageTableIndexPae     0
 #define StartupPageTableIndexPae    (STARTUP_BASE >> 21)
-#define HyperspacePageTableIndexPae (HYPERSPACE_BASE >> 21)
+#define HyperspacePageTableIndexPae (HYPERSPACE_PAE_BASE >> 21)
 #define KpcrPageTableIndexPae       (KPCR_BASE >> 21)
 #define ApicPageTableIndexPae       (APIC_BASE >> 21)
 
@@ -60,7 +73,7 @@
 ULONG_PTR NextModuleBase = 0;
 
 /* Currently Opened Module */
-PFRLDR_MODULE CurrentModule = NULL;
+PLOADER_MODULE CurrentModule = NULL;
 
 /* Unrelocated Kernel Base in Virtual Memory */
 ULONG_PTR KernelBase;
@@ -71,41 +84,6 @@ BOOLEAN PaeModeEnabled;
 /* Kernel Entrypoint in Physical Memory */
 ULONG_PTR KernelEntry;
 
-/* Page Directory and Tables for non-PAE Systems */
-extern ULONG_PTR startup_pagedirectory;
-extern ULONG_PTR lowmem_pagetable;
-extern ULONG_PTR kernel_pagetable;
-extern ULONG_PTR hyperspace_pagetable;
-extern ULONG_PTR _pae_pagedirtable;
-extern ULONG_PTR apic_pagetable;
-extern ULONG_PTR kpcr_pagetable;
-
-/* Page Directory and Tables for PAE Systems */
-extern ULONG_PTR startup_pagedirectorytable_pae;
-extern ULONG_PTR startup_pagedirectory_pae;
-extern ULONG_PTR lowmem_pagetable_pae;
-extern ULONG_PTR kernel_pagetable_pae;
-extern ULONG_PTR hyperspace_pagetable_pae;
-extern ULONG_PTR pagedirtable_pae;
-extern ULONG_PTR apic_pagetable_pae;
-extern ULONG_PTR kpcr_pagetable_pae;
-
-typedef struct _HARDWARE_PTE_X86 {
-    ULONG Valid             : 1;
-    ULONG Write             : 1;
-    ULONG Owner             : 1;
-    ULONG WriteThrough      : 1;
-    ULONG CacheDisable      : 1;
-    ULONG Accessed          : 1;
-    ULONG Dirty             : 1;
-    ULONG LargePage         : 1;
-    ULONG Global            : 1;
-    ULONG CopyOnWrite       : 1;
-    ULONG Prototype         : 1;
-    ULONG reserved          : 1;
-    ULONG PageFrameNumber   : 20;
-} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86;
-
 typedef struct _HARDWARE_PTE_X64 {
     ULONG Valid             : 1;
     ULONG Write             : 1;
@@ -126,7 +104,7 @@ typedef struct _HARDWARE_PTE_X64 {
 
 typedef struct _PAGE_DIRECTORY_X86 {
     HARDWARE_PTE_X86 Pde[1024];
-} PAGE_DIRECTORY_x86, *PPAGE_DIRECTORY_X86;
+} PAGE_DIRECTORY_X86, *PPAGE_DIRECTORY_X86;
 
 typedef struct _PAGE_DIRECTORY_X64 {
     HARDWARE_PTE_X64 Pde[2048];
@@ -136,6 +114,25 @@ typedef struct _PAGE_DIRECTORY_TABLE_X64 {
     HARDWARE_PTE_X64 Pde[4];
 } PAGE_DIRECTORY_TABLE_X64, *PPAGE_DIRECTORY_TABLE_X64;
 
+/* Page Directory and Tables for non-PAE Systems */
+extern PAGE_DIRECTORY_X86 startup_pagedirectory;
+extern PAGE_DIRECTORY_X86 lowmem_pagetable;
+extern PAGE_DIRECTORY_X86 kernel_pagetable;
+extern ULONG_PTR hyperspace_pagetable;
+extern ULONG_PTR _pae_pagedirtable;
+extern PAGE_DIRECTORY_X86 apic_pagetable;
+extern PAGE_DIRECTORY_X86 kpcr_pagetable;
+
+/* Page Directory and Tables for PAE Systems */
+extern PAGE_DIRECTORY_TABLE_X64 startup_pagedirectorytable_pae;
+extern PAGE_DIRECTORY_X64 startup_pagedirectory_pae;
+extern PAGE_DIRECTORY_X64 lowmem_pagetable_pae;
+extern PAGE_DIRECTORY_X64 kernel_pagetable_pae;
+extern ULONG_PTR hyperspace_pagetable_pae;
+extern ULONG_PTR pagedirtable_pae;
+extern PAGE_DIRECTORY_X64 apic_pagetable_pae;
+extern PAGE_DIRECTORY_X64 kpcr_pagetable_pae;
+
 /* FUNCTIONS *****************************************************************/
 
 /*++
@@ -213,7 +210,7 @@ FrLdrSetupPae(ULONG Magic)
     Ke386SetCr0(Ke386GetCr0() | X86_CR0_PG | X86_CR0_WP);
 
     /* Jump to Kernel */
-    PagedJump = (ASMCODE)KernelEntryPoint;
+    PagedJump = (ASMCODE)(PVOID)(KernelEntryPoint);
     PagedJump(Magic, &LoaderBlock);
 }
 
@@ -239,6 +236,9 @@ FrLdrGetKernelBase(VOID)
 {
     PCHAR p;
 
+    /* Set KernelBase */
+    LoaderBlock.KernelBase = KernelBase;
+
     /* Read Command Line */
     p = (PCHAR)LoaderBlock.CommandLine;
     while ((p = strchr(p, '/')) != NULL) {
@@ -250,15 +250,13 @@ FrLdrGetKernelBase(VOID)
             if (p[4] == ' ' || p[4] == 0) {
 
                 /* Use 3GB */
-                KernelBase = 0xC0000000;
+                KernelBase = 0xE0000000;
+                LoaderBlock.KernelBase = 0xC0000000;
             }
         }
 
         p++;
     }
-
-    /* Set KernelBase */
-    LoaderBlock.KernelBase = KernelBase;
 }
 
 /*++
@@ -420,7 +418,7 @@ FrLdrSetupPageDirectory(VOID)
     } else {
 
         /* Get the Kernel Table Index */
-        KernelPageTableIndex = (KernelBase >> PDE_SHIFT) / sizeof(HARDWARE_PTE_X86);
+        KernelPageTableIndex = KernelBase >> PDE_SHIFT;
 
         /* Get the Startup Page Directory */
         PageDir = (PPAGE_DIRECTORY_X86)&startup_pagedirectory;
@@ -447,6 +445,9 @@ FrLdrSetupPageDirectory(VOID)
         PageDir->Pde[HyperspacePageTableIndex].Valid = 1;
         PageDir->Pde[HyperspacePageTableIndex].Write = 1;
         PageDir->Pde[HyperspacePageTableIndex].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable);
+        PageDir->Pde[HyperspacePageTableIndex + 1].Valid = 1;
+        PageDir->Pde[HyperspacePageTableIndex + 1].Write = 1;
+        PageDir->Pde[HyperspacePageTableIndex + 1].PageFrameNumber = PaPtrToPfn(hyperspace_pagetable + 4096);
 
         /* Set up the Apic PDE */
         PageDir->Pde[ApicPageTableIndex].Valid = 1;
@@ -528,7 +529,7 @@ FrLdrMapKernel(FILE *KernelImage)
     ULONG_PTR SourceSection;
     ULONG_PTR TargetSection;
     ULONG SectionSize;
-    LONG i;
+    INT i;
     PIMAGE_DATA_DIRECTORY RelocationDDir;
     PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd;
     ULONG Count;
@@ -588,7 +589,7 @@ FrLdrMapKernel(FILE *KernelImage)
     Section += SectionCount;
 
     /* Walk each section backwards */
-    for (i=SectionCount; i >= 0; i--, Section--) {
+    for (i=(INT)SectionCount; i >= 0; i--, Section--) {
 
         /* Get the disk location and the memory location, and the size */
         SourceSection = RaToPa(Section->PointerToRawData);
@@ -636,13 +637,10 @@ FrLdrMapKernel(FILE *KernelImage)
         /* Calculate the Offset of the Type */
         TypeOffset = (PUSHORT)(RelocationDir + 1);
 
-        for (i = 0; i < Count; i++) {
+        for (i = 0; i < (INT)Count; i++) {
 
             ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF));
 
-            /* Don't relocate after the end of the loaded driver */
-            if ((ULONG_PTR)ShortPtr >= MaxAddress) break;
-
             switch (*TypeOffset >> 12) {
 
                 case IMAGE_REL_BASED_ABSOLUTE:
@@ -683,12 +681,12 @@ FrLdrLoadModule(FILE *ModuleImage,
                 PULONG ModuleSize)
 {
     ULONG LocalModuleSize;
-    PFRLDR_MODULE ModuleData;
+    PLOADER_MODULE ModuleData;
     LPSTR NameBuffer;
     LPSTR TempName;
 
     /* Get current module data structure and module name string array */
-    ModuleData = &multiboot_modules[LoaderBlock.ModsCount];
+    ModuleData = &reactos_modules[LoaderBlock.ModsCount];
 
     /* Get only the Module Name */
     do {
@@ -700,24 +698,24 @@ FrLdrLoadModule(FILE *ModuleImage,
         }
 
     } while(TempName);
-    NameBuffer = multiboot_module_strings[LoaderBlock.ModsCount];
+    NameBuffer = reactos_module_strings[LoaderBlock.ModsCount];
 
     /* Get Module Size */
     LocalModuleSize = FsGetFileSize(ModuleImage);
 
     /* Fill out Module Data Structure */
-    ModuleData->ModuleStart = NextModuleBase;
-    ModuleData->ModuleEnd = NextModuleBase + LocalModuleSize;
+    ModuleData->ModStart = NextModuleBase;
+    ModuleData->ModEnd = NextModuleBase + LocalModuleSize;
 
     /* Save name */
     strcpy(NameBuffer, ModuleName);
-    ModuleData->ModuleName = NameBuffer;
+    ModuleData->String = (ULONG_PTR)NameBuffer;
 
     /* Load the file image */
     FsReadFile(ModuleImage, LocalModuleSize, NULL, (PVOID)NextModuleBase);
 
     /* Move to next memory block and increase Module Count */
-    NextModuleBase = ROUND_UP(ModuleData->ModuleEnd, PAGE_SIZE);
+    NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE);
     LoaderBlock.ModsCount++;
 
     /* Return Module Size if required */
@@ -725,33 +723,33 @@ FrLdrLoadModule(FILE *ModuleImage,
         *ModuleSize = LocalModuleSize;
     }
 
-    return(ModuleData->ModuleStart);
+    return(ModuleData->ModStart);
 }
 
 ULONG_PTR
 STDCALL
 FrLdrCreateModule(LPSTR ModuleName)
 {
-    PFRLDR_MODULE ModuleData;
+    PLOADER_MODULE ModuleData;
     LPSTR NameBuffer;
 
     /* Get current module data structure and module name string array */
-    ModuleData = &multiboot_modules[LoaderBlock.ModsCount];
-    NameBuffer = multiboot_module_strings[LoaderBlock.ModsCount];
+    ModuleData = &reactos_modules[LoaderBlock.ModsCount];
+    NameBuffer = reactos_module_strings[LoaderBlock.ModsCount];
 
     /* Set up the structure */
-    ModuleData->ModuleStart = NextModuleBase;
-    ModuleData->ModuleEnd = -1;
+    ModuleData->ModStart = NextModuleBase;
+    ModuleData->ModEnd = -1;
 
     /* Copy the name */
     strcpy(NameBuffer, ModuleName);
-    ModuleData->ModuleName = NameBuffer;
+    ModuleData->String = (ULONG_PTR)NameBuffer;
 
     /* Set the current Module */
     CurrentModule = ModuleData;
 
     /* Return Module Base Address */
-    return(ModuleData->ModuleStart);
+    return(ModuleData->ModStart);
 }
 
 BOOL
@@ -759,19 +757,19 @@ STDCALL
 FrLdrCloseModule(ULONG_PTR ModuleBase,
                  ULONG ModuleSize)
 {
-    PFRLDR_MODULE ModuleData = CurrentModule;
+    PLOADER_MODULE ModuleData = CurrentModule;
 
     /* Make sure a module is opened */
     if (ModuleData) {
 
         /* Make sure this is the right module and that it hasn't been closed */
-        if ((ModuleBase == ModuleData->ModuleStart) && (ModuleData->ModuleEnd == -1)) {
+        if ((ModuleBase == ModuleData->ModStart) && (ModuleData->ModEnd == (ULONG_PTR)-1)) {
 
             /* Close the Module */
-            ModuleData->ModuleEnd = ModuleData->ModuleStart + ModuleSize;
+            ModuleData->ModEnd = ModuleData->ModStart + ModuleSize;
 
             /* Set the next Module Base and increase the number of modules */
-            NextModuleBase = ROUND_UP(ModuleData->ModuleEnd, PAGE_SIZE);
+            NextModuleBase = ROUND_UP(ModuleData->ModEnd, PAGE_SIZE);
             LoaderBlock.ModsCount++;
 
             /* Close the currently opened module */

reactos/boot/freeldr/freeldr/reactos/reactos.c

@@ -1,13 +1,25 @@
 /*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         Freeloader
- * FILE:            boot/freeldr/freeldr/reactos/rosboot.c
- * PURPOSE:         ReactOS Loader
- * PROGRAMMERS:     Alex Ionescu (alex@relsoft.net)
+ *  FreeLoader
+ *
+ *  Copyright (C) 1998-2003  Brian Palmer  <brianp@sginet.com>
+ *  Copyright (C) 2005       Alex Ionescu  <alex@relsoft.net>
+ *
+ *  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., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
 #include <freeldr.h>
-#include <internal/i386/ke.h>
 #include <reactos/rossym.h>
 
 #include "registry.h"
@@ -15,6 +27,13 @@
 #define NDEBUG
 #include <debug.h>
 
+LOADER_PARAMETER_BLOCK LoaderBlock;
+char					reactos_kernel_cmdline[255];	// Command line passed to kernel
+LOADER_MODULE			reactos_modules[64];		// Array to hold boot module info loaded for the kernel
+char					reactos_module_strings[64][256];	// Array to hold module names
+unsigned long			reactos_memory_map_descriptor_size;
+memory_map_t			reactos_memory_map[32];		// Memory map
+
 BOOL
 STDCALL
 FrLdrLoadKernel(PCHAR szFileName,
@@ -559,7 +578,7 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
 	CHAR  szHalName[1024];
 	CHAR  szFileName[1024];
 	CHAR  szBootPath[256];
-	INT   i;
+	UINT   i;
 	CHAR  MsgBuffer[256];
 	ULONG SectionId;
 
@@ -584,42 +603,42 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
 	/*
 	 * Setup multiboot information structure
 	 */
-	LoaderBlock.Flags = MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE | MB_INFO_FLAG_MODULES;
+	LoaderBlock.Flags = MB_FLAGS_BOOT_DEVICE | MB_FLAGS_COMMAND_LINE | MB_FLAGS_MODULE_INFO;
 	LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart;
 	LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd;
 	LoaderBlock.BootDevice = 0xffffffff;
-	LoaderBlock.CommandLine = (unsigned long)multiboot_kernel_cmdline;
+	LoaderBlock.CommandLine = (unsigned long)reactos_kernel_cmdline;
 	LoaderBlock.ModsCount = 0;
-	LoaderBlock.ModsAddr = (unsigned long)multiboot_modules;
-	LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&multiboot_memory_map, 32) * sizeof(memory_map_t);
+	LoaderBlock.ModsAddr = (unsigned long)reactos_modules;
+	LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&reactos_memory_map, 32) * sizeof(memory_map_t);
 	if (LoaderBlock.MmapLength)
 	{
-		LoaderBlock.MmapAddr = (unsigned long)&multiboot_memory_map;
-		LoaderBlock.Flags |= MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_MEMORY_MAP;
-		multiboot_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24
+		LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map;
+		LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO;
+		reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24
 		DbgPrint((DPRINT_REACTOS, "memory map length: %d\n", LoaderBlock.MmapLength));
 		DbgPrint((DPRINT_REACTOS, "dumping memory map:\n"));
 		for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++)
 		{
-			if (MEMTYPE_USABLE == multiboot_memory_map[i].type &&
-			    0 == multiboot_memory_map[i].base_addr_low)
+			if (MEMTYPE_USABLE == reactos_memory_map[i].type &&
+			    0 == reactos_memory_map[i].base_addr_low)
 			{
-				LoaderBlock.MemLower = (multiboot_memory_map[i].base_addr_low + multiboot_memory_map[i].length_low) / 1024;
+				LoaderBlock.MemLower = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024;
 				if (640 < LoaderBlock.MemLower)
 				{
 					LoaderBlock.MemLower = 640;
 				}
 			}
-			if (MEMTYPE_USABLE == multiboot_memory_map[i].type &&
-			    multiboot_memory_map[i].base_addr_low <= 1024 * 1024 &&
-			    1024 * 1024 <= multiboot_memory_map[i].base_addr_low + multiboot_memory_map[i].length_low)
+			if (MEMTYPE_USABLE == reactos_memory_map[i].type &&
+			    reactos_memory_map[i].base_addr_low <= 1024 * 1024 &&
+			    1024 * 1024 <= reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low)
 			{
-				LoaderBlock.MemHigher = (multiboot_memory_map[i].base_addr_low + multiboot_memory_map[i].length_low) / 1024 - 1024;
+				LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024;
 			}
 			DbgPrint((DPRINT_REACTOS, "start: %x\t size: %x\t type %d\n",
-			          multiboot_memory_map[i].base_addr_low,
-				  multiboot_memory_map[i].length_low,
-				  multiboot_memory_map[i].type));
+			          reactos_memory_map[i].base_addr_low,
+				  reactos_memory_map[i].length_low,
+				  reactos_memory_map[i].type));
 		}
 	}
 	DbgPrint((DPRINT_REACTOS, "low_mem = %d\n", LoaderBlock.MemLower));
@@ -647,13 +666,13 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
 		/* Normalize */
 		MachDiskGetBootPath(SystemPath, sizeof(SystemPath));
 		strcat(SystemPath, "\\reactos");
-		strcat(strcpy(multiboot_kernel_cmdline, SystemPath),
+		strcat(strcpy(reactos_kernel_cmdline, SystemPath),
 		       " /MININT");
 	}
 	else
 	{
 		/* copy system path into kernel command line */
-		strcpy(multiboot_kernel_cmdline, SystemPath);
+		strcpy(reactos_kernel_cmdline, SystemPath);
 	}
 
 	/*
@@ -661,8 +680,8 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
 	 */
 	if (IniReadSettingByName(SectionId, "Options", value, 1024))
 	{
-		strcat(multiboot_kernel_cmdline, " ");
-		strcat(multiboot_kernel_cmdline, value);
+		strcat(reactos_kernel_cmdline, " ");
+		strcat(reactos_kernel_cmdline, value);
 	}
 
 
@@ -674,7 +693,7 @@ LoadAndBootReactOS(PCHAR OperatingSystemName)
 	 */
 	MachHwDetect();
 
-	if (AcpiPresent) LoaderBlock.Flags |= MB_INFO_FLAG_ACPI_TABLE;
+	if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE;
 
 	UiDrawStatusText("Loading...");
 	UiDrawProgressBarCenter(0, 100, "Loading ReactOS...");

reactos/boot/freeldr/freeldr/reactos/registry.c

@@ -210,7 +210,7 @@ RegCreateKey(FRLDRHKEY ParentKey,
 	     PFRLDRHKEY Key)
 {
   PLIST_ENTRY Ptr;
-  FRLDRHKEY SearchKey = INVALID_HANDLE_VALUE;
+  FRLDRHKEY SearchKey = NULL;
   FRLDRHKEY CurrentKey;
   FRLDRHKEY NewKey;
   PCHAR p;
@@ -388,7 +388,7 @@ RegOpenKey(FRLDRHKEY ParentKey,
 	   PFRLDRHKEY Key)
 {
   PLIST_ENTRY Ptr;
-  FRLDRHKEY SearchKey = INVALID_HANDLE_VALUE;
+  FRLDRHKEY SearchKey = NULL;
   FRLDRHKEY CurrentKey;
   PCHAR p;
   PCHAR name;

reactos/boot/freeldr/freeldr/reactos/registry.h

@@ -21,9 +21,6 @@
 #ifndef __REGISTRY_H
 #define __REGISTRY_H
 
-
-#define INVALID_HANDLE_VALUE  NULL
-
 typedef struct _REG_KEY
 {
   LIST_ENTRY KeyList;
@@ -64,127 +61,8 @@ typedef struct _REG_VALUE
 #define ERROR_MORE_DATA                  234L
 #define ERROR_NO_MORE_ITEMS              259L
 
-
 #define assert(x)
 
-/*
- * VOID
- * InitializeListHead (
- *		PLIST_ENTRY	ListHead
- *		);
- *
- * FUNCTION: Initializes a double linked list
- * ARGUMENTS:
- *         ListHead = Caller supplied storage for the head of the list
- */
-#define InitializeListHead(ListHead) \
-{ \
-	(ListHead)->Flink = (ListHead); \
-	(ListHead)->Blink = (ListHead); \
-}
-
-
-/*
- * VOID
- * InsertHeadList (
- *		PLIST_ENTRY	ListHead,
- *		PLIST_ENTRY	Entry
- *		);
- *
- * FUNCTION: Inserts an entry in a double linked list
- * ARGUMENTS:
- *        ListHead = Head of the list
- *        Entry = Entry to insert
- */
-#define InsertHeadList(ListHead, ListEntry) \
-{ \
-	PLIST_ENTRY OldFlink; \
-	OldFlink = (ListHead)->Flink; \
-	(ListEntry)->Flink = OldFlink; \
-	(ListEntry)->Blink = (ListHead); \
-	OldFlink->Blink = (ListEntry); \
-	(ListHead)->Flink = (ListEntry); \
-	assert((ListEntry) != NULL); \
-	assert((ListEntry)->Blink!=NULL); \
-	assert((ListEntry)->Blink->Flink == (ListEntry)); \
-	assert((ListEntry)->Flink != NULL); \
-	assert((ListEntry)->Flink->Blink == (ListEntry)); \
-}
-
-
-/*
- * VOID
- * InsertTailList (
- *		PLIST_ENTRY	ListHead,
- *		PLIST_ENTRY	Entry
- *		);
- *
- * FUNCTION:
- *	Inserts an entry in a double linked list
- *
- * ARGUMENTS:
- *	ListHead = Head of the list
- *	Entry = Entry to insert
- */
-#define InsertTailList(ListHead, ListEntry) \
-{ \
-	PLIST_ENTRY OldBlink; \
-	OldBlink = (ListHead)->Blink; \
-	(ListEntry)->Flink = (ListHead); \
-	(ListEntry)->Blink = OldBlink; \
-	OldBlink->Flink = (ListEntry); \
-	(ListHead)->Blink = (ListEntry); \
-	assert((ListEntry) != NULL); \
-	assert((ListEntry)->Blink != NULL); \
-	assert((ListEntry)->Blink->Flink == (ListEntry)); \
-	assert((ListEntry)->Flink != NULL); \
-	assert((ListEntry)->Flink->Blink == (ListEntry)); \
-}
-
-/*
- *VOID
- *RemoveEntryList (
- *	PLIST_ENTRY	Entry
- *	);
- *
- * FUNCTION:
- *	Removes an entry from a double linked list
- *
- * ARGUMENTS:
- *	ListEntry = Entry to remove
- */
-#define RemoveEntryList(ListEntry) \
-{ \
-	PLIST_ENTRY OldFlink; \
-	PLIST_ENTRY OldBlink; \
-	assert((ListEntry) != NULL); \
-	assert((ListEntry)->Blink!=NULL); \
-	assert((ListEntry)->Blink->Flink == (ListEntry)); \
-	assert((ListEntry)->Flink != NULL); \
-	assert((ListEntry)->Flink->Blink == (ListEntry)); \
-	OldFlink = (ListEntry)->Flink; \
-	OldBlink = (ListEntry)->Blink; \
-	OldFlink->Blink = OldBlink; \
-	OldBlink->Flink = OldFlink; \
-	(ListEntry)->Flink = NULL; \
-	(ListEntry)->Blink = NULL; \
-}
-
-#define REG_NONE 0
-#define REG_SZ 1
-#define REG_EXPAND_SZ 2
-#define REG_BINARY 3
-#define REG_DWORD 4
-#define REG_DWORD_BIG_ENDIAN 5
-#define REG_DWORD_LITTLE_ENDIAN 4
-#define REG_LINK 6
-#define REG_MULTI_SZ 7
-#define REG_RESOURCE_LIST 8
-#define REG_FULL_RESOURCE_DESCRIPTOR 9
-#define REG_RESOURCE_REQUIREMENTS_LIST 10
-
-
-
 VOID
 RegInitializeRegistry(VOID);
 

reactos/boot/freeldr/freeldr/reactos/setupldr.c

@@ -33,6 +33,12 @@
 
 #include "registry.h"
 
+LOADER_PARAMETER_BLOCK LoaderBlock;
+char					reactos_kernel_cmdline[255];	// Command line passed to kernel
+LOADER_MODULE			reactos_modules[64];		// Array to hold boot module info loaded for the kernel
+char					reactos_module_strings[64][256];	// Array to hold module names
+unsigned long			reactos_memory_map_descriptor_size;
+memory_map_t			reactos_memory_map[32];		// Memory map
 
 #define USE_UI
 
@@ -240,7 +246,7 @@ VOID RunLoader(VOID)
   ULONG Size;
   char *SourcePath;
   char *LoadOptions;
-  int i;
+  UINT i;
 
   HINF InfHandle;
   ULONG ErrorLine;
@@ -250,41 +256,41 @@ VOID RunLoader(VOID)
   extern ULONG PageDirectoryEnd;
 
   /* Setup multiboot information structure */
-  LoaderBlock.Flags = MB_INFO_FLAG_BOOT_DEVICE | MB_INFO_FLAG_COMMAND_LINE | MB_INFO_FLAG_MODULES;
+  LoaderBlock.Flags = MB_FLAGS_BOOT_DEVICE | MB_FLAGS_COMMAND_LINE | MB_FLAGS_MODULE_INFO;
   LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart;
   LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd;
   LoaderBlock.BootDevice = 0xffffffff;
-  LoaderBlock.CommandLine = (unsigned long)multiboot_kernel_cmdline;
+  LoaderBlock.CommandLine = (unsigned long)reactos_kernel_cmdline;
   LoaderBlock.ModsCount = 0;
-  LoaderBlock.ModsAddr = (unsigned long)multiboot_modules;
-  LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&multiboot_memory_map, 32) * sizeof(memory_map_t);
+  LoaderBlock.ModsAddr = (unsigned long)reactos_modules;
+  LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&reactos_memory_map, 32) * sizeof(memory_map_t);
   if (LoaderBlock.MmapLength)
     {
-      LoaderBlock.MmapAddr = (unsigned long)&multiboot_memory_map;
-      LoaderBlock.Flags |= MB_INFO_FLAG_MEM_SIZE | MB_INFO_FLAG_MEMORY_MAP;
-      multiboot_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24
+      LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map;
+      LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO;
+      reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24
       for (i = 0; i < (LoaderBlock.MmapLength / sizeof(memory_map_t)); i++)
         {
-          if (MEMTYPE_USABLE == multiboot_memory_map[i].type &&
-              0 == multiboot_memory_map[i].base_addr_low)
+          if (MEMTYPE_USABLE == reactos_memory_map[i].type &&
+              0 == reactos_memory_map[i].base_addr_low)
             {
-              LoaderBlock.MemLower = (multiboot_memory_map[i].base_addr_low + multiboot_memory_map[i].length_low) / 1024;
+              LoaderBlock.MemLower = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024;
               if (640 < LoaderBlock.MemLower)
                 {
                   LoaderBlock.MemLower = 640;
                 }
             }
-          if (MEMTYPE_USABLE == multiboot_memory_map[i].type &&
-              multiboot_memory_map[i].base_addr_low <= 1024 * 1024 &&
-              1024 * 1024 <= multiboot_memory_map[i].base_addr_low + multiboot_memory_map[i].length_low)
+          if (MEMTYPE_USABLE == reactos_memory_map[i].type &&
+              reactos_memory_map[i].base_addr_low <= 1024 * 1024 &&
+              1024 * 1024 <= reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low)
             {
-              LoaderBlock.MemHigher = (multiboot_memory_map[i].base_addr_low + multiboot_memory_map[i].length_low) / 1024 - 1024;
+              LoaderBlock.MemHigher = (reactos_memory_map[i].base_addr_low + reactos_memory_map[i].length_low) / 1024 - 1024;
             }
 #if 0
 	    printf("start: %x\t size: %x\t type %d\n",
-		   multiboot_memory_map[i].base_addr_low,
-		   multiboot_memory_map[i].length_low,
-		   multiboot_memory_map[i].type);
+		   reactos_memory_map[i].base_addr_low,
+		   reactos_memory_map[i].length_low,
+		   reactos_memory_map[i].type);
 #endif
         }
     }
@@ -369,8 +375,8 @@ VOID RunLoader(VOID)
     }
 
   /* Set kernel command line */
-  MachDiskGetBootPath(multiboot_kernel_cmdline, sizeof(multiboot_kernel_cmdline));
-  strcat(strcat(strcat(multiboot_kernel_cmdline, SourcePath), " "),
+  MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline));
+  strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "),
          LoadOptions);
 
   /* Load ntoskrnl.exe */

reactos/boot/freeldr/freeldr/rtl/print.c

@@ -27,7 +27,7 @@
  */
 void print(char *str)
 {
-	int	i;
+	size_t	i;
 
 	for (i = 0; i < strlen(str); i++)
 		MachConsPutChar(str[i]);
@@ -37,7 +37,7 @@ void print(char *str)
  * printf() - prints formatted text to stdout
  * originally from GRUB
  */
-void printf(char *format, ... )
+int printf(const char *format, ... )
 {
 	va_list ap;
 	va_start(ap,format);
@@ -102,9 +102,11 @@ void printf(char *format, ... )
 	}
 
 	va_end(ap);
+
+	return 0;
 }
 
-void sprintf(char *buffer, char *format, ... )
+int sprintf(char *buffer, const char *format, ... )
 {
 	va_list ap;
 	char c, *ptr, str[16];
@@ -178,4 +180,6 @@ void sprintf(char *buffer, char *format, ... )
 	}
 	va_end(ap);
 	*p=0;
+
+	return 0;
 }

reactos/boot/freeldr/freeldr/rtl/stdlib.c

@@ -127,11 +127,11 @@ int tolower(int c)
 	return c;
 }
 
-int atoi(char *string)
+int atoi(const char *string)
 {
 	int	base;
 	int	result = 0;
-	char	*str;
+	const char	*str;
 
 	if((string[0] == '0') && (string[1] == 'x'))
 	{