Fixes for GCC compilation, also fixed w32api definition of LUID

svn path=/branches/rox-u/; revision=16208

irc/ArchBlackmann/ArchBlackmann.cpp

@@ -9,59 +9,111 @@
 
 #include "File.h"
 #include "ssprintf.h"
+#include "trim.h"
 
 #include "IRCClient.h"
+#include "config.h"
 
 using std::string;
 using std::vector;
 
-const char* ArchBlackmann = "ArchBlackmann";
+//vector<string> tech, module, dev, stru, period, status, type, func, irql, curse, cursecop;
 
-vector<string> tech, module, dev, stru, period;
-
-void ImportList ( vector<string>& list, const char* filename )
+class List
 {
-	File f ( filename, "r" );
+public:
+	string name;
+	bool macro;
+	std::vector<std::string> list;
+	string tag;
+	int last;
+	List() { last = -1; }
+	List ( const char* _name, bool _macro ) : name(_name), macro(_macro)
+	{
+		tag = ssprintf("%%%s%%",_name);
+		last = -1;
+	}
+};
+
+vector<List> lists;
+vector<string> ops;
+
+void ImportList ( const char* listname, bool macro )
+{
+	lists.push_back ( List ( listname, macro ) );
+	List& list = lists.back();
+	File f ( ssprintf("%s.txt",listname).c_str(), "r" );
 	string line;
 	while ( f.next_line ( line, true ) )
-		list.push_back ( line );
+		list.list.push_back ( line );
 }
 
-const char* ListRand ( const vector<string>& list )
+const char* ListRand ( List& list )
 {
-	return list[rand()%list.size()].c_str();
+	vector<string>& l = list.list;
+	if ( !l.size() )
+	{
+		static string nothing;
+		nothing = ssprintf ( "<list '%s' empty>", list.name.c_str() );
+		return nothing.c_str();
+	}
+	else if ( l.size() == 1 )
+		return l[0].c_str();
+	int sel = list.last;
+	while ( sel == list.last )
+		sel = rand()%l.size();
+	list.last = sel;
+	return l[sel].c_str();
 }
 
-string TechReply()
+const char* ListRand ( int i )
 {
-	string t = ListRand(tech);
+	return ListRand ( lists[i] );
+}
+
+int GetListIndex ( const char* listname )
+{
+	for ( int i = 0; i < lists.size(); i++ )
+	{
+		if ( !stricmp ( lists[i].name.c_str(), listname ) )
+			return i;
+	}
+	return -1;
+}
+
+List& GetList ( const char* listname )
+{
+	return lists[GetListIndex(listname)];
+}
+
+const char* ListRand ( const char* list )
+{
+	int i = GetListIndex ( list );
+	if ( i < 0 )
+		return NULL;
+	return ListRand(i);
+}
+
+string TaggedReply ( const char* listname )
+{
+	string t = ListRand(listname);
 	string out;
 	const char* p = t.c_str();
 	while ( *p )
 	{
 		if ( *p == '%' )
 		{
-			if ( !strnicmp ( p, "%dev%", 5 ) )
+			bool found = false;
+			for ( int i = 0; i < lists.size() && !found; i++ )
 			{
-				out += ListRand(dev);
-				p += 5;
+				if ( lists[i].macro && !strnicmp ( p, lists[i].tag.c_str(), lists[i].tag.size() ) )
+				{
+					out += ListRand(i);
+					p += lists[i].tag.size();
+					found = true;
+				}
 			}
-			else if ( !strnicmp ( p, "%period%", 8 ) )
-			{
-				out += ListRand(period);
-				p += 8;
-			}
-			else if ( !strnicmp ( p, "%module%", 8 ) )
-			{
-				out += ListRand(module);
-				p += 8;
-			}
-			else if ( !strnicmp ( p, "%stru%", 6 ) )
-			{
-				out += ListRand(stru);
-				p += 6;
-			}
-			else
+			if ( !found )
 				out += *p++;
 		}
 		const char* p2 = strchr ( p, '%' );
@@ -76,14 +128,68 @@ string TechReply()
 	return out;
 }
 
+string gobble ( string& s, const char* delim )
+{
+	const char* p = s.c_str();
+	p += strspn ( p, delim );
+	const char* p2 = strpbrk ( p, delim );
+	if ( !p2 ) p2 = p + strlen(p);
+	string out ( p, p2-p );
+	p2 += strspn ( p2, delim );
+	s = string ( p2 );
+	return out;
+}
+
+bool isop ( const string& who )
+{
+	for ( int i = 0; i < ops.size(); i++ )
+	{
+		if ( ops[i] == who )
+			return true;
+	}
+	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()
@@ -92,6 +198,32 @@ public:
 	}
 	bool OnJoin ( const string& user, const string& channel )
 	{
+		//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 )
+	{
+		for ( int i = 0; i < ops.size(); i++ )
+		{
+			if ( ops[i] == user )
+			{
+				printf ( "remove '%s' to ops list\n", user.c_str() );
+				ops.erase ( &ops[i] );
+			}
+		}
+		return true;
+	}
+	bool OnNick ( const std::string& oldNick, const std::string& newNick )
+	{
+		for ( int i = 0; i < ops.size(); i++ )
+		{
+			if ( ops[i] == oldNick )
+			{
+				printf ( "op '%s' changed nick to '%s'\n", oldNick.c_str(), newNick.c_str() );
+				ops[i] = newNick;
+				return true;
+			}
+		}
 		return true;
 	}
 	bool OnEndChannelUsers ( const string& channel )
@@ -100,32 +232,267 @@ 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() );
-		return PrivMsg ( from, "hey, your tongue doesn't belong there!" );
+
+		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
+			return PrivMsg ( CHANNEL, trim(say) );
 	}
 	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() );
-		string text2(text);
+		NOIDLE; // add 30 mins till idle
+
+		bool found_name = false;
+		string text2 ( text );
 		strlwr ( &text2[0] );
-		if ( !strnicmp ( text2.c_str(), ArchBlackmann, strlen(ArchBlackmann) ) )
+
+		if ( !strnicmp ( text.c_str(), BOTNAME, strlen(BOTNAME) ) )
+			found_name = true;
+
+		string s ( text );
+
+		if ( found_name )
+			gobble ( s, " \t" ); // remove bot name
+
+		// command
+		if ( s[0] == '!' )
 		{
-			string reply = ssprintf("%s: %s", from.c_str(), TechReply().c_str());
-			flog.printf ( "TECH-REPLY: %s\n", reply.c_str() );
-			return PrivMsg ( channel, reply );
+			bool from_op = isop(from);
+			string cmd = gobble ( s, " \t" );
+
+			// from all		
+			if ( false && cmd == "!svn" && from == "TechBot" ) // || cmd == "!help" && !TechBotOnline
+			{
+					PrivMsg ( channel, "For my help try !what." );
+			}
+
+			// from normel user
+			else if ( !from_op )
+			{
+				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 );
+				}
+				
+				else if ( cmd == "!what" )
+				{
+					return PrivMsg ( channel, ssprintf("For you, %s, I only support the \"!grovel\" command.", from.c_str()).c_str() );
+				}
+				
+				else if ( cmd == "!grovel" || cmd == "!kiss" || cmd == "!hug" 
+				       || cmd == "!give" || cmd == "!what" || cmd == "!add" || cmd == "!remove" )
+				{
+					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 = " " + text2 + " ";
+
+		for ( int i = 0; i < curse.size() && !found_curse; i++ )
+		{
+			if ( strstr ( text2.c_str(), curse[i].c_str() ) )
+				found_curse = true;
+		}
+		if ( found_curse )
+		{
+			static List& cursecop = GetList("cursecop");
+			return PrivMsg ( channel, ssprintf("%s: %s", from.c_str(), ListRand(cursecop)) );
+		}
+
+		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() );
+			if ( !strnicmp ( out.c_str(), "/me ", 4 ) )
+				return Action ( channel, &out[4] );
+			else
+				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() );
 		return true;
 	}
-	bool OnUserModeInChannel ( const string& src, const string& channel, const string& user, const string& mode )
+	bool OnUserModeInChannel ( const string& src, const string& channel, const string& mode, const string& target )
 	{
-		//printf ( "OnUserModeInChannel(%s,%s%s,%s)\n", src.c_str(), channel.c_str(), user.c_str(), mode.c_str() );
+		printf ( "OnUserModeInChannel(%s,%s,%s,%s)\n", src.c_str(), channel.c_str(), mode.c_str(), target.c_str() );
+		const char* p = mode.c_str();
+		if ( !p )
+			return true;
+		while ( *p )
+		{
+			switch ( *p++ )
+			{
+			case '+':
+				while ( *p != 0 && *p != ' ' )
+				{
+					if ( *p == 'o' )
+					{
+						printf ( "adding '%s' to ops list\n", target.c_str() );
+						ops.push_back ( target );
+					}
+					break;
+				}
+				break;
+			case '-':
+				while ( *p != 0 && *p != ' ' )
+				{
+					if ( *p == 'o' )
+					{
+						for ( int i = 0; i < ops.size(); i++ )
+						{
+							if ( ops[i] == target )
+							{
+								printf ( "remove '%s' to ops list\n", target.c_str() );
+								ops.erase ( &ops[i] );
+							}
+						}
+						break;
+					}
+				}
+			}
+		}
 		return true;
 	}
 	bool OnMode ( const string& user, const string& mode )
@@ -135,64 +502,103 @@ public:
 	}
 	bool OnChannelUsers ( const string& channel, const vector<string>& users )
 	{
-		printf ( "[%s has %i users]: ", channel.c_str(), users.size() );
+		//printf ( "[%s has %i users]: ", channel.c_str(), users.size() );
 		for ( int i = 0; i < users.size(); i++ )
 		{
-			if ( i )
+			if ( users[i][0] == '@' )
+				ops.push_back ( &users[i][1] );
+			/*if ( i )
 				printf ( ", " );
-			printf ( "%s", users[i].c_str() );
+			printf ( "%s", users[i].c_str() );*/
 		}
-		printf ( "\n" );
+		//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 )
 {
 	srand ( time(NULL) );
-	ImportList ( tech, "tech.txt" );
-	ImportList ( stru, "stru.txt" );
-	ImportList ( dev, "dev.txt" );
-	ImportList ( period, "period.txt" );
-	ImportList ( module, "module.txt" );
 
+	ImportList ( "dev", true );
+	ImportList ( "func", true );
+	ImportList ( "dev", true );
+	ImportList ( "func", true );
+	ImportList ( "irql", true );
+	ImportList ( "module", true );
+	ImportList ( "period", true );
+	ImportList ( "status", true );
+	ImportList ( "stru", true );
+	ImportList ( "type", true );
+
+	ImportList ( "tech", false );
+	ImportList ( "curse", false );
+	ImportList ( "cursecop", false );
+	ImportList ( "grovel", false );
+	ImportList ( "nogrovel", false );
+	ImportList ( "idle", false );
+
+#ifdef _DEBUG
 	printf ( "initializing IRCClient debugging\n" );
 	IRCClient::SetDebug ( true );
-	printf ( "calling suStartup()\n" );
-	suStartup();
-	printf ( "creating IRCClient object\n" );
-	MyIRCClient irc;
-	printf ( "connecting to freenode\n" );
-	if ( !irc.Connect ( "212.204.214.114" ) ) // irc.freenode.net
+#endif//_DEBUG
+
+	while (true)
 	{
-		printf ( "couldn't connect to server\n" );
-		return -1;
+		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" );
+			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 ( "ArchBlackmann", "", "irc.freenode.net", "Arch Blackmann" ) )
-	{
-		printf ( "USER command failed\n" );
-		return -1;
-	}
-	printf ( "sending nick\n" );
-	if ( !irc.Nick ( "ArchBlackmann" ) )
-	{
-		printf ( "NICK command failed\n" );
-		return -1;
-	}
-	printf ( "setting mode\n" );
-	if ( !irc.Mode ( "+i" ) )
-	{
-		printf ( "MODE command failed\n" );
-		return -1;
-	}
-	printf ( "joining #ReactOS\n" );
-	if ( !irc.Join ( "#ReactOS" ) )
-	{
-		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,13 +80,19 @@ 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
 IRCClient::PrivMsg ( const string& to, const string& text )
 {
-	return Send ( "PRIVMSG " + to + " :" + text + "\n" );
+	return Send ( "PRIVMSG " + to + " :" + text + '\n' );
+}
+
+bool
+IRCClient::Action ( const string& to, const string& text )
+{
+	return Send ( "PRIVMSG " + to + " :" + (char)1 + "ACTION " + text + (char)1 + '\n' );
 }
 
 bool
@@ -139,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;
@@ -226,10 +237,41 @@ int IRCClient::Run ( bool launch_thread )
 					printf ( "!!!:OnRecv failure 5 (PRIVMSG w/o target): %s", buf.c_str() );
 					continue;
 				}
-				if ( tgt[0] == '#' )
-					OnChannelMsg ( tgt, src, text );
+				if ( *p == 1 )
+				{
+					p++;
+					p2 = strchr ( p, ' ' );
+					if ( !p2 ) p2 = p + strlen(p);
+					cmd = string ( p, p2-p );
+					strlwr ( &cmd[0] );
+					p = p2 + 1;
+					p2 = strchr ( p, 1 );
+					if ( !p2 )
+					{
+						printf ( "!!!:OnRecv failure 6 (no terminating \x01 for initial \x01 found: %s", buf.c_str() );
+						continue;
+					}
+					text = string ( p, p2-p );
+					if ( cmd == "action" )
+					{
+						if ( tgt[0] == '#' )
+							OnChannelAction ( tgt, src, text );
+						else
+							OnPrivAction ( src, text );
+					}
+					else
+					{
+						printf ( "!!!:OnRecv failure 7 (unrecognized \x01 command '%s': %s", cmd.c_str(), buf.c_str() );
+						continue;
+					}
+				}
 				else
-					OnPrivMsg ( src, text );
+				{
+					if ( tgt[0] == '#' )
+						OnChannelMsg ( tgt, src, text );
+					else
+						OnPrivMsg ( src, text );
+				}
 			}
 			else if ( cmd == "mode" )
 			{
@@ -237,38 +279,53 @@ int IRCClient::Run ( bool launch_thread )
 				//printf ( "[MODE] src='%s' cmd='%s' tgt='%s' text='%s'", src.c_str(), cmd.c_str(), tgt.c_str(), text.c_str() );
 				//OnMode ( 
 				// self mode change:
-				// [MODE] src=Relic3_14 cmd=mode tgt=Relic3_14  text=+i
+				// [MODE] src=Nick cmd=mode tgt=Nick  text=+i
 				// channel mode change:
-				// [MODE] src=Royce3 cmd=mode tgt=#Royce3 text=+o Relic3_14
+				// [MODE] src=Nick cmd=mode tgt=#Channel text=+o Nick
 				if ( tgt[0] == '#' )
 				{
 					p = text.c_str();
 					p2 = strchr ( p, ' ' );
-					if ( !p2 )
-						OnChannelMode ( tgt, text );
-					else
+					if ( p2 && *p2 )
 					{
-						string user ( p, p2-p );
+						string mode ( p, p2-p );
 						p = p2 + 1;
 						p += strspn ( p, " " );
-						OnUserModeInChannel ( src, tgt, user, p );
+						OnUserModeInChannel ( src, tgt, mode, trim(p) );
 					}
+					else
+						OnChannelMode ( tgt, text );
 				}
 				else
 					OnMode ( tgt, text );
 			}
 			else if ( cmd == "join" )
 			{
+				mychannel = text;
 				OnJoin ( src, text );
 			}
+			else if ( cmd == "part" )
+			{
+				OnPart ( src, text );
+			}
+			else if ( cmd == "nick" )
+			{
+				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();
@@ -291,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();
@@ -300,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;
@@ -307,7 +397,13 @@ int IRCClient::Run ( bool launch_thread )
 			}
 			else
 			{
-				if ( _debug ) printf ( "unrecognized ':' response: %s", buf.c_str() );
+				if ( strstr ( buf.c_str(), "ACTION" ) )
+				{
+					printf ( "ACTION: " );
+					for ( int i = 0; i < buf.size(); i++ )
+						printf ( "%c(%xh)", buf[i], (unsigned)(unsigned char)buf[i] );
+				}
+				else if ( _debug ) printf ( "unrecognized ':' response: %s", buf.c_str() );
 			}
 		}
 		else

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; }
 
@@ -48,6 +50,9 @@ public:
 	// send message to someone or some channel
 	bool PrivMsg ( const std::string& to, const std::string& text );
 
+	// send /me to someone or some channel
+	bool Action ( const std::string& to, const std::string& text );
+
 	// leave a channel
 	bool Part ( const std::string& channel, const std::string& text );
 
@@ -59,32 +64,51 @@ public:
 	// OnConnected: you just successfully logged into irc server
 	virtual bool OnConnected() = 0;
 
-	// OnJoin: you just successfully joined this channel
-	virtual bool OnJoin ( const std::string& user, const std::string& channel ) = 0;
+	virtual bool OnNick ( const std::string& oldNick, const std::string& newNick ) { return true; }
+
+	// OnJoin: someone just successfully joined a channel you are in ( also sent when you successfully join a channel )
+	virtual bool OnJoin ( const std::string& user, const std::string& channel ) { return true; }
+
+	// OnPart: someone just left a channel you are in
+	virtual bool OnPart ( const std::string& user, const std::string& channel ) { return true; }
 
 	// OnPrivMsg: you just received a private message from a user
-	virtual bool OnPrivMsg ( const std::string& from, const std::string& text ) = 0;
+	virtual bool OnPrivMsg ( const std::string& from, const std::string& text ) { return true; }
+
+	virtual bool OnPrivAction ( const std::string& from, const std::string& text ) { return true; }
 
 	// OnChannelMsg: you just received a chat line in a channel
 	virtual bool OnChannelMsg ( const std::string& channel, const std::string& from,
-		const std::string& text ) = 0;
+		const std::string& text ) { return true; }
+
+	// OnChannelAction: you just received a "/me" line in a channel
+	virtual bool OnChannelAction ( const std::string& channel, const std::string& from,
+		const std::string& text ) { return true; }
 
 	// OnChannelMode: notification of a change of a channel's mode
-	virtual bool OnChannelMode ( const std::string& channel, const std::string& mode ) = 0;
+	virtual bool OnChannelMode ( const std::string& channel, const std::string& mode )
+		{ return true; }
 
 	// OnUserModeInChannel: notification of a mode change of a user with respect to a channel.
 	// f.ex.: this will be called when someone is oped in a channel.
 	virtual bool OnUserModeInChannel ( const std::string& src, const std::string& channel,
-		const std::string& user, const std::string& mode ) = 0;
+		const std::string& mode, const std::string& target ) { return true; }
 
 	// OnMode: you will receive this when you change your own mode, at least...
-	virtual bool OnMode ( const std::string& user, const std::string& mode ) = 0;
+	virtual bool OnMode ( const std::string& user, const std::string& mode ) { return true; }
 
 	// notification of what users are in a channel ( you may get multiple of these... )
-	virtual bool OnChannelUsers ( const std::string& channel, const std::vector<std::string>& users ) = 0;
+	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 ) = 0;
+	virtual bool OnEndChannelUsers ( const std::string& channel ) { return true; }
 
 	// OnPing - default implementation replies to PING with a valid PONG. required on some systems to
 	// log in. Most systems require a response in order to stay connected, used to verify a client hasn't

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

@@ -0,0 +1,27 @@
+shit
+fuck
+pussy
+ ass 
+ ass-
+-ass 
+dumbass
+jackass
+fatass
+asshole
+smartass
+cunt
+fucker
+bitch
+dick
+penile
+stfu
+omfg
+lmao
+ ass.
+-ass.
+semprini
+goat.cx
+ekush
+akshor
+poop
+guten morgen

irc/ArchBlackmann/cursecop.txt

@@ -0,0 +1,10 @@
+You should have your mouth washed out with soap!
+This is a clean channel... please watch your language
+Please try to keep it clean
+Hey, there's children present ( I'm not even a year old yet! )
+Could you find a less-offensive way to express yourself, please?
+Such language :(
+Those aren't nice words to use
+Oh, my poor innocent ears :(
+Help! My mind is being corrupted!
+filthy mouths are not appreciated here

irc/ArchBlackmann/dev.txt

@@ -11,4 +11,5 @@ Exception
 blight_
 jimtabor
 mtempel
-Gge
+Gge
+Alex_Ionescu

irc/ArchBlackmann/func.txt

@@ -0,0 +1,580 @@
+CcCanIWrite
+CcCopyRead
+CcCopyWrite
+CcDeferWrite
+CcFastCopyRead
+CcFastCopyWrite
+CcFlushCache
+CcGetDirtyPages
+CcGetFileObjectFromBcb
+CcGetFileObjectFromSectionPtrs
+CcGetFlushedValidData
+CcGetLsnForFileObject
+CcInitializeCacheMap
+CcIsThereDirtyData
+CcMapData
+CcMdlRead
+CcMdlReadComplete
+CcMdlWriteAbort
+CcMdlWriteComplete
+CcPinMappedData
+CcPinRead
+CcPrepareMdlWrite
+CcPreparePinWrite
+CcPurgeCacheSection
+CcRemapBcb
+CcRepinBcb
+CcScheduleReadAhead
+CcSetAdditionalCacheAttributes
+CcSetBcbOwnerPointer
+CcSetDirtyPageThreshold
+CcSetDirtyPinnedData
+CcSetFileSizes
+CcSetLogHandleForFile
+CcSetReadAheadGranularity
+CcUninitializeCacheMap
+CcUnpinData
+CcUnpinDataForThread
+CcUnpinRepinnedBcb
+CcWaitForCurrentLazyWriterActivity
+CcZeroData
+DbgLoadImageSymbols
+DbgQueryDebugFilterState
+DbgSetDebugFilterState
+EVENT_TYPE
+ExAcquireResourceExclusive
+ExAcquireResourceExclusiveLite
+ExAcquireResourceSharedLite
+ExAcquireSharedStarveExclusive
+ExAcquireSharedWaitForExclusive
+ExAllocateFromZone
+ExAllocatePool
+ExAllocatePoolWithQuota
+ExAllocatePoolWithQuotaTag
+ExAllocatePoolWithTag
+ExConvertExclusiveToSharedLite
+ExCreateCallback
+ExDeleteNPagedLookasideList
+ExDeletePagedLookasideList
+ExDeleteResource
+ExDeleteResourceLite
+ExDisableResourceBoostLite
+ExEnumHandleTable
+ExExtendZone
+ExFreePool
+ExGetCurrentProcessorCounts
+ExGetCurrentProcessorCpuUsage
+ExGetExclusiveWaiterCount
+ExGetPreviousMode
+ExGetSharedWaiterCount
+ExInitializeNPagedLookasideList
+ExInitializePagedLookasideList
+ExInitializeResource
+ExInitializeResourceLite
+ExInitializeZone
+ExInterlockedAddLargeInteger
+ExInterlockedAddUlong
+ExInterlockedDecrementLong
+ExInterlockedExchangeUlong
+ExInterlockedExtendZone
+ExInterlockedIncrementLong
+ExInterlockedInsertHeadList
+ExInterlockedInsertTailList
+ExInterlockedPopEntryList
+ExInterlockedPushEntryList
+ExInterlockedRemoveHeadList
+ExIsProcessorFeaturePresent
+ExIsResourceAcquiredExclusiveLite
+ExIsResourceAcquiredSharedLite
+ExLocalTimeToSystemTime
+ExNotifyCallback
+ExPostSystemEvent
+ExQueryPoolBlockSize
+ExQueueWorkItem
+ExRaiseAccessViolation
+ExRaiseDatatypeMisalignment
+ExRaiseException
+ExRaiseHardError
+ExRaiseStatus
+ExRegisterCallback
+ExReinitializeResourceLite
+ExReleaseResource
+ExReleaseResourceForThread
+ExReleaseResourceForThreadLite
+ExRosDumpPagedPoolByTag
+ExRosQueryPoolTag
+ExSetResourceOwnerPointer
+ExSetTimerResolution
+ExSystemExceptionFilter
+ExSystemTimeToLocalTime
+ExTryToAcquireResourceExclusiveLite
+ExUnregisterCallback
+ExUuidCreate
+ExVerifySuite
+FsRtlAcquireFileExclusive
+FsRtlAddMcbEntry
+FsRtlAddToTunnelCache
+FsRtlAllocateFileLock
+FsRtlAllocatePool
+FsRtlAllocatePoolWithQuota
+FsRtlAllocatePoolWithQuotaTag
+FsRtlAllocatePoolWithTag
+FsRtlAllocateResource
+FsRtlAreNamesEqual
+FsRtlBalanceReads
+FsRtlCheckLockForReadAccess
+FsRtlCheckLockForWriteAccess
+FsRtlCopyRead
+FsRtlCopyWrite
+FsRtlFastCheckLockForRead
+FsRtlFastCheckLockForWrite
+FsRtlFastUnlockAll
+FsRtlFastUnlockAllByKey
+FsRtlFastUnlockSingle
+FsRtlFindInTunnelCache
+FsRtlFreeFileLock
+FsRtlGetFileSize
+FsRtlGetNextFileLock
+FsRtlGetNextMcbEntry
+FsRtlIncrementCcFastReadNoWait
+FsRtlIncrementCcFastReadNotPossible
+FsRtlIncrementCcFastReadResourceMiss
+FsRtlIncrementCcFastReadWait
+FsRtlInitializeFileLock
+FsRtlInitializeMcb
+FsRtlInitializeTunnelCache
+FsRtlInsertPerFileObjectContext
+FsRtlInsertPerStreamContext
+FsRtlIsDbcsInExpression
+FsRtlIsFatDbcsLegal
+FsRtlIsHpfsDbcsLegal
+FsRtlIsNameInExpression
+FsRtlLookupLastLargeMcbEntryAndIndex
+FsRtlLookupLastMcbEntry
+FsRtlLookupMcbEntry
+FsRtlLookupPerFileObjectContext
+FsRtlLookupPerStreamContextInternal
+FsRtlMdlRead
+FsRtlMdlReadComplete
+FsRtlMdlReadCompleteDev
+FsRtlMdlReadDev
+FsRtlMdlWriteComplete
+FsRtlMdlWriteCompleteDev
+FsRtlNotifyChangeDirectory
+FsRtlNotifyCleanup
+FsRtlNotifyFilterChangeDirectory
+FsRtlNotifyFilterReportChange
+FsRtlNotifyFullChangeDirectory
+FsRtlNotifyFullReportChange
+FsRtlNotifyReportChange
+FsRtlNotifyUninitializeSync
+FsRtlNumberOfRunsInMcb
+FsRtlPostPagingFileStackOverflow
+FsRtlPostStackOverflow
+FsRtlPrepareMdlWrite
+FsRtlPrepareMdlWriteDev
+FsRtlPrivateLock
+FsRtlProcessFileLock
+FsRtlRegisterFileSystemFilterCallbacks
+FsRtlReleaseFile
+FsRtlRemoveMcbEntry
+FsRtlRemovePerFileObjectContext
+FsRtlRemovePerStreamContext
+FsRtlResetLargeMcb
+FsRtlSyncVolumes
+FsRtlTeardownPerStreamContexts
+FsRtlTruncateMcb
+FsRtlUninitializeFileLock
+FsRtlUninitializeMcb
+HalAdjustResourceList
+HalAllocateCommonBuffer
+HalAssignSlotResources
+HalCalibratePerformanceCounter
+HalFlushCommonBuffer
+HalFreeCommonBuffer
+HalGetAdapter
+HalGetBusData
+HalGetBusDataByOffset
+HalGetDmaAlignmentRequirement
+HalMakeBeep
+HalQueryDisplayParameters
+HalQueryRealTimeClock
+HalReadDmaCounter
+HalRequestIpi
+HalSetBusData
+HalSetBusDataByOffset
+HalSetDisplayParameters
+HalSetRealTimeClock
+HalStartNextProcessor
+IoAcquireCancelSpinLock
+IoAcquireRemoveLockEx
+IoAcquireVpbSpinLock
+IoAllocateAdapterChannel
+IoAllocateController
+IoAllocateDriverObjectExtension
+IoAllocateErrorLogEntry
+IoAllocateIrp
+IoAllocateMdl
+IoAllocateWorkItem
+IoAssignResources
+IoAttachDevice
+IoAttachDeviceByPointer
+IoAttachDeviceToDeviceStack
+IoAttachDeviceToDeviceStackSafe
+IoBuildAsynchronousFsdRequest
+IoBuildDeviceIoControlRequest
+IoBuildPartialMdl
+IoBuildSynchronousFsdRequest
+IoCallDriver
+IoCancelFileOpen
+IoCancelIrp
+IoCheckQuerySetFileInformation
+IoCheckQuerySetVolumeInformation
+IoCheckQuotaBufferValidity
+IoCheckShareAccess
+IoCompleteRequest
+IoConnectInterrupt
+IoCreateController
+IoCreateDevice
+IoCreateDisk
+IoCreateDriver
+IoCreateFile
+IoCreateFileSpecifyDeviceObjectHint
+IoCreateNotificationEvent
+IoCreateStreamFileObject
+IoCreateStreamFileObjectEx
+IoCreateStreamFileObjectLite
+IoCreateSymbolicLink
+IoCreateSynchronizationEvent
+IoCreateUnprotectedSymbolicLink
+IoDeleteController
+IoDeleteDevice
+IoDeleteDriver
+IoDeleteSymbolicLink
+IoDetachDevice
+IoDisconnectInterrupt
+IoEnqueueIrp
+IoEnumerateDeviceObjectList
+IoFlushAdapterBuffers
+IoForwardIrpSynchronously
+IoFreeAdapterChannel
+IoFreeController
+IoFreeErrorLogEntry
+IoFreeIrp
+IoFreeMapRegisters
+IoFreeMdl
+IoFreeWorkItem
+IoGetAttachedDevice
+IoGetAttachedDeviceReference
+IoGetBaseFileSystemDeviceObject
+IoGetBootDiskInformation
+IoGetConfigurationInformation
+IoGetCurrentProcess
+IoGetDeviceAttachmentBaseRef
+IoGetDeviceInterfaceAlias
+IoGetDeviceInterfaces
+IoGetDeviceObjectPointer
+IoGetDeviceProperty
+IoGetDeviceToVerify
+IoGetDiskDeviceObject
+IoGetDriverObjectExtension
+IoGetFileObjectGenericMapping
+IoGetInitialStack
+IoGetLowerDeviceObject
+IoGetRelatedDeviceObject
+IoGetRequestorProcess
+IoGetRequestorProcessId
+IoGetRequestorSessionId
+IoGetStackLimits
+IoGetTopLevelIrp
+IoInitializeIrp
+IoInitializeRemoveLockEx
+IoInitializeTimer
+IoInvalidateDeviceRelations
+IoInvalidateDeviceState
+IoIsFileOriginRemote
+IoIsOperationSynchronous
+IoIsSystemThread
+IoIsValidNameGraftingBuffer
+IoMakeAssociatedIrp
+IoMapTransfer
+IoOpenDeviceInstanceKey
+IoOpenDeviceInterfaceRegistryKey
+IoOpenDeviceRegistryKey
+IoPageRead
+IoPnPDeliverServicePowerNotification
+IoQueryDeviceDescription
+IoQueryDeviceEnumInfo
+IoQueryFileDosDeviceName
+IoQueryFileInformation
+IoQueryVolumeInformation
+IoQueueThreadIrp
+IoQueueWorkItem
+IoRaiseHardError
+IoRaiseInformationalHardError
+IoReadDiskSignature
+IoReadPartitionTableEx
+IoRegisterBootDriverReinitialization
+IoRegisterDeviceInterface
+IoRegisterDriverReinitialization
+IoRegisterFileSystem
+IoRegisterFsRegistrationChange
+IoRegisterLastChanceShutdownNotification
+IoRegisterPlugPlayNotification
+IoRegisterShutdownNotification
+IoReleaseCancelSpinLock
+IoReleaseRemoveLockAndWaitEx
+IoReleaseRemoveLockEx
+IoReleaseVpbSpinLock
+IoRemoveShareAccess
+IoReportDetectedDevice
+IoReportHalResourceUsage
+IoReportResourceForDetection
+IoReportResourceUsage
+IoReportTargetDeviceChange
+IoReportTargetDeviceChangeAsynchronous
+IoRequestDeviceEject
+IoReuseIrp
+IoSetCompletionRoutineEx
+IoSetDeviceInterfaceState
+IoSetDeviceToVerify
+IoSetFileOrigin
+IoSetHardErrorOrVerifyDevice
+IoSetInformation
+IoSetIoCompletion
+IoSetPartitionInformationEx
+IoSetShareAccess
+IoSetStartIoAttributes
+IoSetSystemPartition
+IoSetThreadHardErrorMode
+IoSetTopLevelIrp
+IoStartNextPacket
+IoStartNextPacketByKey
+IoStartPacket
+IoStartTimer
+IoStopTimer
+IoSynchronousInvalidateDeviceRelations
+IoSynchronousPageWrite
+IoUnregisterFileSystem
+IoUnregisterFsRegistrationChange
+IoUnregisterPlugPlayNotification
+IoUnregisterShutdownNotification
+IoUpdateShareAccess
+IoValidateDeviceIoControlAccess
+IoVerifyPartitionTable
+IoVerifyVolume
+IoVolumeDeviceToDosName
+IoWMIAllocateInstanceIds
+IoWMIDeviceObjectToInstanceName
+IoWMIExecuteMethod
+IoWMIHandleToInstanceName
+IoWMIOpenBlock
+IoWMIQueryAllData
+IoWMIQueryAllDataMultiple
+IoWMIQuerySingleInstance
+IoWMIQuerySingleInstanceMultiple
+IoWMIRegistrationControl
+IoWMISetNotificationCallback
+IoWMISetSingleInstance
+IoWMISetSingleItem
+IoWMISuggestInstanceName
+IoWMIWriteEvent
+IoWriteErrorLogEntry
+IoWritePartitionTableEx
+KPRIORITY
+KdPortGetByte
+KdPortPollByte
+KdPortPutByte
+Ke386QueryIoAccessMap
+Ke386SetIoAccessMap
+KeAcquireInterruptSpinLock
+KeAreApcsDisabled
+KeCapturePersistentThreadState
+KeDeregisterBugCheckReasonCallback
+KeFindConfigurationEntry
+KeFindConfigurationNextEntry
+KeFlushEntireTb
+KeFlushQueuedDpcs
+KeGetRecommendedSharedDataAlignment
+KeIsExecutingDpc
+KeQueryActiveProcessors
+KeQueryPerformanceCounter
+KeQueryPriorityThread
+KeQueryRuntimeThread
+KeQuerySystemTime
+KeQueryTickCount
+KeQueryTimeIncrement
+KeRaiseIrql
+KeRaiseIrqlToDpcLevel
+KeRaiseUserException
+KeReadStateEvent
+KeRegisterBugCheckCallback
+KeRegisterBugCheckReasonCallback
+KeReleaseInterruptSpinLock
+KeReleaseMutant
+KeReleaseMutex
+KeReleaseSemaphore
+KeReleaseSpinLock
+KeReleaseSpinLockFromDpcLevel
+KeReleaseSpinLockFromDpcLevel
+KeRemoveByKeyDeviceQueue
+KeRemoveByKeyDeviceQueueIfBusy
+KeRemoveDeviceQueue
+KeRemoveEntryDeviceQueue
+KeRemoveSystemServiceTable
+KeRestoreFloatingPointState
+KeRevertToUserAffinityThread
+KeRosDumpStackFrames
+KeRosGetStackFrames
+KeRosPrintAddress
+KeSaveFloatingPointState
+KeSetDmaIoCoherency
+KeSetEvent
+KeSetEventBoostPriority
+KeSetIdealProcessorThread
+KeSetKernelStackSwapEnable
+KeSetProfileIrql
+KeSetSystemAffinityThread
+KeSetTimeIncrement
+KeTerminateThread
+KeUserModeCallback
+KeWaitForMutexObject
+KeWaitForSingleObject
+KiCoprocessorError
+KiUnexpectedInterrupt
+LONG
+LdrFindResourceDirectory_U
+MmAddPhysicalMemory
+MmAddVerifierThunks
+MmAdjustWorkingSetSize
+MmAdvanceMdl
+MmAllocateContiguousMemory
+MmAllocateContiguousMemorySpecifyCache
+MmAllocateMappingAddress
+MmAllocateNonCachedMemory
+MmBuildMdlForNonPagedPool
+MmCanFileBeTruncated
+MmCreateMdl
+MmCreateSection
+MmDbgTranslatePhysicalAddress
+MmDisableModifiedWriteOfSection
+MmFlushImageSection
+MmForceSectionClosed
+MmFreeContiguousMemory
+MmFreeMappingAddress
+MmFreeNonCachedMemory
+MmGetPhysicalAddress
+MmGetPhysicalMemoryRanges
+MmGetSystemRoutineAddress
+MmGetVirtualForPhysical
+MmGrowKernelStack
+MmIsAddressValid
+MmIsDriverVerifying
+MmIsNonPagedSystemAddressValid
+MmIsRecursiveIoFault
+MmIsThisAnNtAsSystem
+MmIsVerifierEnabled
+MmLockPagableDataSection
+MmLockPagableImageSection
+MmLockPagableSectionByHandle
+MmMapIoSpace
+MmMapLockedPages
+MmMapLockedPagesWithReservedMapping
+MmMapMemoryDumpMdl
+MmMapUserAddressesToPage
+MmMapVideoDisplay
+MmMapViewInSessionSpace
+MmMapViewInSystemSpace
+MmMapViewOfSection
+MmMarkPhysicalMemoryAsBad
+MmMarkPhysicalMemoryAsGood
+MmPageEntireDriver
+MmPrefetchPages
+MmProbeAndLockPages
+MmProbeAndLockProcessPages
+MmProbeAndLockSelectedPages
+MmProtectMdlSystemAddress
+MmQuerySystemSize
+MmRemovePhysicalMemory
+MmResetDriverPaging
+MmSecureVirtualMemory
+MmSetAddressRangeModified
+MmSetBankedSection
+MmSizeOfMdl
+MmTrimAllSystemPagableMemory
+MmUnlockPagableImageSection
+MmUnlockPages
+MmUnmapIoSpace
+MmUnmapLockedPages
+MmUnmapReservedMapping
+MmUnmapVideoDisplay
+MmUnmapViewInSessionSpace
+MmUnmapViewInSystemSpace
+MmUnmapViewOfSection
+MmUnsecureVirtualMemory
+OUT
+ObCreateObject
+PEJOB
+PEPROCESS
+PKBUGCHECK_CALLBACK_RECORD
+PKDEVICE_QUEUE_ENTRY
+PKIRQL
+PULONG
+PVOID
+PW32_THREAD_CALLBACK
+PoCallDriver
+PoRegisterDeviceForIdleDetection
+PoRegisterSystemState
+PoRequestPowerIrp
+PoSetDeviceBusy
+PoSetPowerState
+PoSetSystemState
+PoStartNextPowerIrp
+PoUnregisterSystemState
+ProbeForRead
+ProbeForWrite
+PsAssignImpersonationToken
+PsCreateSystemProcess
+PsCreateSystemThread
+PsGetCurrentProcessId
+PsGetCurrentThreadId
+PsImpersonateClient
+PsReferenceImpersonationToken
+PsReferencePrimaryToken
+PsRevertThreadToSelf
+PsRevertToSelf
+PsTerminateSystemThread
+READ_PORT_BUFFER_UCHAR
+READ_PORT_BUFFER_ULONG
+READ_PORT_BUFFER_USHORT
+READ_PORT_UCHAR
+READ_PORT_ULONG
+READ_PORT_USHORT
+SeAssignSecurityEx
+SeAuditHardLinkCreation
+SeAuditingFileEvents
+SeAuditingFileEventsWithContext
+SeAuditingFileOrGlobalEvents
+SeAuditingHardLinkEvents
+SeAuditingHardLinkEventsWithContext
+SeCaptureSecurityDescriptor
+SeCaptureSubjectContext
+SeCloseObjectAuditAlarm
+SeCreateAccessState
+SeCreateClientSecurityFromSubjectContext
+SeFilterToken
+SeImpersonateClientEx
+SePrivilegeObjectAuditAlarm
+SeQueryInformationToken
+SeQuerySessionIdToken
+SeReleaseSecurityDescriptor
+SeSetSecurityDescriptorInfoEx
+SeTokenIsAdmin
+SeTokenIsRestricted
+SeTokenIsWriteRestricted
+WRITE_PORT_BUFFER_UCHAR
+WRITE_PORT_BUFFER_ULONG
+WRITE_PORT_BUFFER_USHORT
+WRITE_PORT_UCHAR
+WRITE_PORT_ULONG
+WRITE_PORT_USHORT

irc/ArchBlackmann/grovel.txt

@@ -0,0 +1,10 @@
+/me bows humbly and begs %s's forgiveness
+%s is soo cool... I hope to be like him some day
+/me hides in a corner and hopes %s doesn't beat him with the whipping noodle again
+/me prostrates at %s's feet and begs his majesty's forgiveness
+%s: please don't hurt me!
+I'm not worthy... I'm not worthy...
+/me sings %s's praises to the world!
+/me thinks %s is smarter than %dev%
+%s: oh please may I defrag your sock drawer?
+/me gives %s a cookie, hoping it will make up for breaking %func% the other day...

irc/ArchBlackmann/idle.txt

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

irc/ArchBlackmann/irql.txt

@@ -0,0 +1,9 @@
+PASSIVE_LEVEL
+APC_LEVEL
+DISPATCH_LEVEL
+PROFILE_LEVEL
+CLOCK1_LEVEL
+IPI_LEVEL
+POWER_LEVEL
+HIGH_LEVEL
+SYNCH_LEVEL

irc/ArchBlackmann/nogrovel.txt

@@ -0,0 +1,5 @@
+/me slaps %s with a large trout
+recycle(%s)
+Did I hear something? Musta been a %s-fly... Where's that fly-swatter?
+%s: go away son, you bother me....
+/me beats %s with the whipping noodle

irc/ArchBlackmann/readme.txt

@@ -0,0 +1,44 @@
+This doc can be also found on the wiki.
+
+ArchBlackman is a IRC-Chat bot of the #reactos irc channel. He has been coded by Royce3 and DrFred (mbosma) currently runs him. 
+
+
+If some one use a swear word he'll tell him not to do so and you can also ask him something technical about reactos. :)
+
+Besides this he also knows some commands. The systax for giving him commands "ArchBlackmann: !grovel". (don't forget to address him)
+
+  - !grovel - This is the only command that non ops can do (No Parameter)
+  - !kiss <person>
+  - !hug <person>
+  - !give <someone> <something> 
+  - !say <something> - You can tell him to say something on the channel via PrivateMessage
+
+
+ArchBlackmann know what he should say from some text files. They can be found on the svn-dir. But can also edit them online if you are op using:
+
+  - !add <list> <item>
+  - !remove <list> <item>
+
+List that are used directly to create responses are:
+  
+  - tech - here are the sentces ArchBlackmann sais when he finds his name 
+  - curse - this are the curses he looks for 
+  - cursecop - this the responces to them
+  - grovel - this is said when a op does the grovel command
+  - nogrovel - this when someone else does it
+
+The remaining lists are not used directly, but by the other lists.
+
+They are: 
+
+  - dev
+  - func
+  - irql
+  - module
+  - period
+  - status
+  - stru
+  - type
+
+And they are used like this:
+  /me thinks %s is smarter than %dev%

irc/ArchBlackmann/status.txt

@@ -0,0 +1,654 @@
+RPC_NT_ALREADY_LISTENING
+RPC_NT_ALREADY_REGISTERED
+RPC_NT_CALL_FAILED
+RPC_NT_CALL_FAILED_DNE
+RPC_NT_CANT_CREATE_ENDPOINT
+RPC_NT_INVALID_BINDING
+RPC_NT_INVALID_ENDPOINT_FORMAT
+RPC_NT_INVALID_NETWORK_OPTIONS
+RPC_NT_INVALID_NET_ADDR
+RPC_NT_INVALID_RPC_PROTSEQ
+RPC_NT_INVALID_STRING_BINDING
+RPC_NT_INVALID_STRING_UUID
+RPC_NT_INVALID_TIMEOUT
+RPC_NT_NOT_LISTENING
+RPC_NT_NO_BINDINGS
+RPC_NT_NO_CALL_ACTIVE
+RPC_NT_NO_ENDPOINT_FOUND
+RPC_NT_NO_PROTSEQS
+RPC_NT_NO_PROTSEQS_REGISTERED
+RPC_NT_OBJECT_NOT_FOUND
+RPC_NT_OUT_OF_RESOURCES
+RPC_NT_PROTOCOL_ERROR
+RPC_NT_PROTSEQ_NOT_SUPPORTED
+RPC_NT_SERVER_TOO_BUSY
+RPC_NT_SERVER_UNAVAILABLE
+RPC_NT_SS_IN_NULL_CONTEXT
+RPC_NT_TYPE_ALREADY_REGISTERED
+RPC_NT_UNKNOWN_IF
+RPC_NT_UNKNOWN_MGR_TYPE
+RPC_NT_WRONG_KIND_OF_BINDING
+STATUS_ABANDONED
+STATUS_ABANDONED_WAIT_0
+STATUS_ABANDONED_WAIT_63
+STATUS_ABIOS_INVALID_COMMAND
+STATUS_ABIOS_INVALID_LID
+STATUS_ABIOS_INVALID_SELECTOR
+STATUS_ABIOS_LID_ALREADY_OWNED
+STATUS_ABIOS_LID_NOT_EXIST
+STATUS_ABIOS_NOT_LID_OWNER
+STATUS_ABIOS_NOT_PRESENT
+STATUS_ABIOS_SELECTOR_NOT_AVAILABLE
+STATUS_ACCESS_DENIED
+STATUS_ACCESS_VIOLATION
+STATUS_ACCOUNT_DISABLED
+STATUS_ACCOUNT_EXPIRED
+STATUS_ACCOUNT_LOCKED_OUT
+STATUS_ACCOUNT_RESTRICTION
+STATUS_ADAPTER_HARDWARE_ERROR
+STATUS_ADDRESS_ALREADY_ASSOCIATED
+STATUS_ADDRESS_ALREADY_EXISTS
+STATUS_ADDRESS_CLOSED
+STATUS_ADDRESS_NOT_ASSOCIATED
+STATUS_AGENTS_EXHAUSTED
+STATUS_ALERTED
+STATUS_ALIAS_EXISTS
+STATUS_ALLOCATE_BUCKET
+STATUS_ALLOTTED_SPACE_EXCEEDED
+STATUS_ALREADY_COMMITTED
+STATUS_ALREADY_DISCONNECTED
+STATUS_ALREADY_WIN32
+STATUS_APP_INIT_FAILURE
+STATUS_ARBITRATION_UNHANDLED
+STATUS_ARRAY_BOUNDS_EXCEEDED
+STATUS_AUDIT_FAILED
+STATUS_BACKUP_CONTROLLER
+STATUS_BAD_COMPRESSION_BUFFER
+STATUS_BAD_CURRENT_DIRECTORY
+STATUS_BAD_DESCRIPTOR_FORMAT
+STATUS_BAD_DEVICE_TYPE
+STATUS_BAD_DLL_ENTRYPOINT
+STATUS_BAD_FUNCTION_TABLE
+STATUS_BAD_IMPERSONATION_LEVEL
+STATUS_BAD_INHERITANCE_ACL
+STATUS_BAD_INITIAL_PC
+STATUS_BAD_INITIAL_STACK
+STATUS_BAD_LOGON_SESSION_STATE
+STATUS_BAD_MASTER_BOOT_RECORD
+STATUS_BAD_NETWORK_NAME
+STATUS_BAD_NETWORK_PATH
+STATUS_BAD_REMOTE_ADAPTER
+STATUS_BAD_SERVICE_ENTRYPOINT
+STATUS_BAD_STACK
+STATUS_BAD_TOKEN_TYPE
+STATUS_BAD_VALIDATION_CLASS
+STATUS_BAD_WORKING_SET_LIMIT
+STATUS_BEGINNING_OF_MEDIA
+STATUS_BIOS_FAILED_TO_CONNECT_INTERRUPT
+STATUS_BREAKPOINT
+STATUS_BUFFER_OVERFLOW
+STATUS_BUFFER_TOO_SMALL
+STATUS_BUS_RESET
+STATUS_CANCELLED
+STATUS_CANNOT_DELETE
+STATUS_CANNOT_IMPERSONATE
+STATUS_CANNOT_LOAD_REGISTRY_FILE
+STATUS_CANT_ACCESS_DOMAIN_INFO
+STATUS_CANT_DISABLE_MANDATORY
+STATUS_CANT_OPEN_ANONYMOUS
+STATUS_CANT_TERMINATE_SELF
+STATUS_CANT_WAIT
+STATUS_CARDBUS_NOT_SUPPORTED
+STATUS_CHECKING_FILE_SYSTEM
+STATUS_CHILD_MUST_BE_VOLATILE
+STATUS_CLIENT_SERVER_PARAMETERS_INVALID
+STATUS_COMMITMENT_LIMIT
+STATUS_CONFLICTING_ADDRESSES
+STATUS_CONNECTION_ABORTED
+STATUS_CONNECTION_ACTIVE
+STATUS_CONNECTION_COUNT_LIMIT
+STATUS_CONNECTION_DISCONNECTED
+STATUS_CONNECTION_INVALID
+STATUS_CONNECTION_IN_USE
+STATUS_CONNECTION_REFUSED
+STATUS_CONNECTION_RESET
+STATUS_CONTROL_C_EXIT
+STATUS_CONVERT_TO_LARGE
+STATUS_COULD_NOT_INTERPRET
+STATUS_CRC_ERROR
+STATUS_CTL_FILE_NOT_SUPPORTED
+STATUS_DATATYPE_MISALIGNMENT
+STATUS_DATA_ERROR
+STATUS_DATA_LATE_ERROR
+STATUS_DATA_NOT_ACCEPTED
+STATUS_DATA_OVERRUN
+STATUS_DEBUG_ATTACH_FAILED
+STATUS_DELETE_PENDING
+STATUS_DEVICE_ALREADY_ATTACHED
+STATUS_DEVICE_BUSY
+STATUS_DEVICE_CONFIGURATION_ERROR
+STATUS_DEVICE_DATA_ERROR
+STATUS_DEVICE_DOES_NOT_EXIST
+STATUS_DEVICE_NOT_CONNECTED
+STATUS_DEVICE_NOT_PARTITIONED
+STATUS_DEVICE_NOT_READY
+STATUS_DEVICE_OFF_LINE
+STATUS_DEVICE_PAPER_EMPTY
+STATUS_DEVICE_POWERED_OFF
+STATUS_DEVICE_POWER_FAILURE
+STATUS_DEVICE_PROTOCOL_ERROR
+STATUS_DFS_EXIT_PATH_FOUND
+STATUS_DFS_UNAVAILABLE
+STATUS_DIRECTORY_NOT_EMPTY
+STATUS_DISK_CORRUPT_ERROR
+STATUS_DISK_FULL
+STATUS_DISK_OPERATION_FAILED
+STATUS_DISK_RECALIBRATE_FAILED
+STATUS_DISK_RESET_FAILED
+STATUS_DLL_INIT_FAILED
+STATUS_DLL_INIT_FAILED_LOGOFF
+STATUS_DLL_NOT_FOUND
+STATUS_DOMAIN_CONTROLLER_NOT_FOUND
+STATUS_DOMAIN_CTRLR_CONFIG_ERROR
+STATUS_DOMAIN_EXISTS
+STATUS_DOMAIN_LIMIT_EXCEEDED
+STATUS_DOMAIN_TRUST_INCONSISTENT
+STATUS_DRIVER_CANCEL_TIMEOUT
+STATUS_DRIVER_ENTRYPOINT_NOT_FOUND
+STATUS_DRIVER_INTERNAL_ERROR
+STATUS_DRIVER_ORDINAL_NOT_FOUND
+STATUS_DRIVER_UNABLE_TO_LOAD
+STATUS_DUPLICATE_NAME
+STATUS_DUPLICATE_OBJECTID
+STATUS_EAS_NOT_SUPPORTED
+STATUS_EA_CORRUPT_ERROR
+STATUS_EA_LIST_INCONSISTENT
+STATUS_EA_TOO_LARGE
+STATUS_END_OF_FILE
+STATUS_END_OF_MEDIA
+STATUS_ENTRYPOINT_NOT_FOUND
+STATUS_EOM_OVERFLOW
+STATUS_EVALUATION_EXPIRATION
+STATUS_EVENTLOG_CANT_START
+STATUS_EVENTLOG_FILE_CHANGED
+STATUS_EVENTLOG_FILE_CORRUPT
+STATUS_EVENT_DONE
+STATUS_EVENT_PENDING
+STATUS_EXTRANEOUS_INFORMATION
+STATUS_FAIL_CHECK
+STATUS_FATAL_APP_EXIT
+STATUS_FILEMARK_DETECTED
+STATUS_FILES_OPEN
+STATUS_FILE_CLOSED
+STATUS_FILE_CORRUPT_ERROR
+STATUS_FILE_DELETED
+STATUS_FILE_FORCED_CLOSED
+STATUS_FILE_INVALID
+STATUS_FILE_IS_A_DIRECTORY
+STATUS_FILE_IS_OFFLINE
+STATUS_FILE_LOCK_CONFLICT
+STATUS_FILE_RENAMED
+STATUS_FLOAT_DENORMAL_OPERAND
+STATUS_FLOAT_DIVIDE_BY_ZERO
+STATUS_FLOAT_INEXACT_RESULT
+STATUS_FLOAT_INVALID_OPERATION
+STATUS_FLOAT_OVERFLOW
+STATUS_FLOAT_STACK_CHECK
+STATUS_FLOAT_UNDERFLOW
+STATUS_FLOPPY_BAD_REGISTERS
+STATUS_FLOPPY_ID_MARK_NOT_FOUND
+STATUS_FLOPPY_UNKNOWN_ERROR
+STATUS_FLOPPY_VOLUME
+STATUS_FLOPPY_WRONG_CYLINDER
+STATUS_FOUND_OUT_OF_SCOPE
+STATUS_FREE_VM_NOT_AT_BASE
+STATUS_FS_DRIVER_REQUIRED
+STATUS_FT_MISSING_MEMBER
+STATUS_FT_ORPHANING
+STATUS_FT_READ_RECOVERING_FROM_BACKUP
+STATUS_FT_WRITE_RECOVERY
+STATUS_FULLSCREEN_MODE
+STATUS_GENERIC_NOT_MAPPED
+STATUS_GRACEFUL_DISCONNECT
+STATUS_GROUP_EXISTS
+STATUS_GUARD_PAGE_VIOLATION
+STATUS_GUIDS_EXHAUSTED
+STATUS_GUID_SUBSTITUTION_MADE
+STATUS_HANDLES_CLOSED
+STATUS_HANDLE_NOT_CLOSABLE
+STATUS_HOST_UNREACHABLE
+STATUS_ILLEGAL_CHARACTER
+STATUS_ILLEGAL_DLL_RELOCATION
+STATUS_ILLEGAL_FLOAT_CONTEXT
+STATUS_ILLEGAL_FUNCTION
+STATUS_ILLEGAL_INSTRUCTION
+STATUS_ILL_FORMED_PASSWORD
+STATUS_ILL_FORMED_SERVICE_ENTRY
+STATUS_IMAGE_ALREADY_LOADED
+STATUS_IMAGE_CHECKSUM_MISMATCH
+STATUS_IMAGE_MACHINE_TYPE_MISMATCH
+STATUS_IMAGE_MACHINE_TYPE_MISMATCH_EXE
+STATUS_IMAGE_MP_UP_MISMATCH
+STATUS_IMAGE_NOT_AT_BASE
+STATUS_INCOMPATIBLE_FILE_MAP
+STATUS_INFO_LENGTH_MISMATCH
+STATUS_INSTANCE_NOT_AVAILABLE
+STATUS_INSTRUCTION_MISALIGNMENT
+STATUS_INSUFFICIENT_LOGON_INFO
+STATUS_INSUFFICIENT_RESOURCES
+STATUS_INSUFF_SERVER_RESOURCES
+STATUS_INTEGER_DIVIDE_BY_ZERO
+STATUS_INTEGER_OVERFLOW
+STATUS_INTERNAL_DB_CORRUPTION
+STATUS_INTERNAL_DB_ERROR
+STATUS_INTERNAL_ERROR
+STATUS_INVALID_ACCOUNT_NAME
+STATUS_INVALID_ACL
+STATUS_INVALID_ADDRESS
+STATUS_INVALID_ADDRESS_COMPONENT
+STATUS_INVALID_ADDRESS_WILDCARD
+STATUS_INVALID_BLOCK_LENGTH
+STATUS_INVALID_BUFFER_SIZE
+STATUS_INVALID_CID
+STATUS_INVALID_COMPUTER_NAME
+STATUS_INVALID_CONNECTION
+STATUS_INVALID_DEVICE_REQUEST
+STATUS_INVALID_DEVICE_STATE
+STATUS_INVALID_DISPOSITION
+STATUS_INVALID_DOMAIN_ROLE
+STATUS_INVALID_DOMAIN_STATE
+STATUS_INVALID_EA_FLAG
+STATUS_INVALID_EA_NAME
+STATUS_INVALID_FILE_FOR_SECTION
+STATUS_INVALID_GROUP_ATTRIBUTES
+STATUS_INVALID_HANDLE
+STATUS_INVALID_HW_PROFILE
+STATUS_INVALID_ID_AUTHORITY
+STATUS_INVALID_IMAGE_FORMAT
+STATUS_INVALID_IMAGE_LE_FORMAT
+STATUS_INVALID_IMAGE_NE_FORMAT
+STATUS_INVALID_IMAGE_NOT_MZ
+STATUS_INVALID_IMAGE_PROTECT
+STATUS_INVALID_IMAGE_WIN_16
+STATUS_INVALID_INFO_CLASS
+STATUS_INVALID_LDT_DESCRIPTOR
+STATUS_INVALID_LDT_OFFSET
+STATUS_INVALID_LDT_SIZE
+STATUS_INVALID_LEVEL
+STATUS_INVALID_LOCK_SEQUENCE
+STATUS_INVALID_LOGON_HOURS
+STATUS_INVALID_LOGON_TYPE
+STATUS_INVALID_MEMBER
+STATUS_INVALID_NETWORK_RESPONSE
+STATUS_INVALID_OPLOCK_PROTOCOL
+STATUS_INVALID_OWNER
+STATUS_INVALID_PAGE_PROTECTION
+STATUS_INVALID_PARAMETER
+STATUS_INVALID_PARAMETER_1
+STATUS_INVALID_PARAMETER_10
+STATUS_INVALID_PARAMETER_11
+STATUS_INVALID_PARAMETER_12
+STATUS_INVALID_PARAMETER_2
+STATUS_INVALID_PARAMETER_3
+STATUS_INVALID_PARAMETER_4
+STATUS_INVALID_PARAMETER_5
+STATUS_INVALID_PARAMETER_6
+STATUS_INVALID_PARAMETER_7
+STATUS_INVALID_PARAMETER_8
+STATUS_INVALID_PARAMETER_9
+STATUS_INVALID_PARAMETER_MIX
+STATUS_INVALID_PIPE_STATE
+STATUS_INVALID_PLUGPLAY_DEVICE_PATH
+STATUS_INVALID_PORT_ATTRIBUTES
+STATUS_INVALID_PORT_HANDLE
+STATUS_INVALID_PRIMARY_GROUP
+STATUS_INVALID_QUOTA_LOWER
+STATUS_INVALID_READ_MODE
+STATUS_INVALID_SECURITY_DESCR
+STATUS_INVALID_SERVER_STATE
+STATUS_INVALID_SID
+STATUS_INVALID_SUB_AUTHORITY
+STATUS_INVALID_SYSTEM_SERVICE
+STATUS_INVALID_UNWIND_TARGET
+STATUS_INVALID_USER_BUFFER
+STATUS_INVALID_VARIANT
+STATUS_INVALID_VIEW_SIZE
+STATUS_INVALID_VLM_OPERATION
+STATUS_INVALID_VOLUME_LABEL
+STATUS_INVALID_WORKSTATION
+STATUS_IN_PAGE_ERROR
+STATUS_IO_DEVICE_ERROR
+STATUS_IO_PRIVILEGE_FAILED
+STATUS_IO_REPARSE_DATA_INVALID
+STATUS_IO_REPARSE_TAG_INVALID
+STATUS_IO_REPARSE_TAG_MISMATCH
+STATUS_IO_REPARSE_TAG_NOT_HANDLED
+STATUS_IO_TIMEOUT
+STATUS_IP_ADDRESS_CONFLICT1
+STATUS_IP_ADDRESS_CONFLICT2
+STATUS_KERNEL_APC
+STATUS_KEY_DELETED
+STATUS_KEY_HAS_CHILDREN
+STATUS_LAST_ADMIN
+STATUS_LICENSE_QUOTA_EXCEEDED
+STATUS_LICENSE_VIOLATION
+STATUS_LINK_FAILED
+STATUS_LINK_TIMEOUT
+STATUS_LM_CROSS_ENCRYPTION_REQUIRED
+STATUS_LOCAL_DISCONNECT
+STATUS_LOCAL_USER_SESSION_KEY
+STATUS_LOCK_NOT_GRANTED
+STATUS_LOGIN_TIME_RESTRICTION
+STATUS_LOGIN_WKSTA_RESTRICTION
+STATUS_LOGON_FAILURE
+STATUS_LOGON_NOT_GRANTED
+STATUS_LOGON_SERVER_CONFLICT
+STATUS_LOGON_SESSION_COLLISION
+STATUS_LOGON_SESSION_EXISTS
+STATUS_LOGON_TYPE_NOT_GRANTED
+STATUS_LOG_FILE_FULL
+STATUS_LOG_HARD_ERROR
+STATUS_LONGJUMP
+STATUS_LOST_WRITEBEHIND_DATA
+STATUS_LPC_REPLY_LOST
+STATUS_LUIDS_EXHAUSTED
+STATUS_MAPPED_ALIGNMENT
+STATUS_MAPPED_FILE_SIZE_ZERO
+STATUS_MARSHALL_OVERFLOW
+STATUS_MEDIA_CHANGED
+STATUS_MEDIA_CHECK
+STATUS_MEDIA_WRITE_PROTECTED
+STATUS_MEMBERS_PRIMARY_GROUP
+STATUS_MEMBER_IN_ALIAS
+STATUS_MEMBER_IN_GROUP
+STATUS_MEMBER_NOT_IN_ALIAS
+STATUS_MEMBER_NOT_IN_GROUP
+STATUS_MEMORY_NOT_ALLOCATED
+STATUS_MESSAGE_NOT_FOUND
+STATUS_MISSING_SYSTEMFILE
+STATUS_MORE_ENTRIES
+STATUS_MORE_PROCESSING_REQUIRED
+STATUS_MUTANT_LIMIT_EXCEEDED
+STATUS_MUTANT_NOT_OWNED
+STATUS_NAME_TOO_LONG
+STATUS_NETLOGON_NOT_STARTED
+STATUS_NETWORK_ACCESS_DENIED
+STATUS_NETWORK_BUSY
+STATUS_NETWORK_CREDENTIAL_CONFLICT
+STATUS_NETWORK_NAME_DELETED
+STATUS_NETWORK_UNREACHABLE
+STATUS_NET_WRITE_FAULT
+STATUS_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT
+STATUS_NOLOGON_SERVER_TRUST_ACCOUNT
+STATUS_NOLOGON_WORKSTATION_TRUST_ACCOUNT
+STATUS_NONCONTINUABLE_EXCEPTION
+STATUS_NONEXISTENT_EA_ENTRY
+STATUS_NONEXISTENT_SECTOR
+STATUS_NONE_MAPPED
+STATUS_NOTIFY_CLEANUP
+STATUS_NOTIFY_ENUM_DIR
+STATUS_NOT_ALL_ASSIGNED
+STATUS_NOT_A_DIRECTORY
+STATUS_NOT_A_REPARSE_POINT
+STATUS_NOT_CLIENT_SESSION
+STATUS_NOT_COMMITTED
+STATUS_NOT_FOUND
+STATUS_NOT_IMPLEMENTED
+STATUS_NOT_LOCKED
+STATUS_NOT_LOGON_PROCESS
+STATUS_NOT_MAPPED_DATA
+STATUS_NOT_MAPPED_VIEW
+STATUS_NOT_REGISTRY_FILE
+STATUS_NOT_SAME_DEVICE
+STATUS_NOT_SERVER_SESSION
+STATUS_NOT_SUPPORTED
+STATUS_NOT_TINY_STREAM
+STATUS_NO_BROWSER_SERVERS_FOUND
+STATUS_NO_CALLBACK_ACTIVE
+STATUS_NO_DATA_DETECTED
+STATUS_NO_EAS_ON_FILE
+STATUS_NO_EVENT_PAIR
+STATUS_NO_GUID_TRANSLATION
+STATUS_NO_IMPERSONATION_TOKEN
+STATUS_NO_INHERITANCE
+STATUS_NO_LDT
+STATUS_NO_LOGON_SERVERS
+STATUS_NO_LOG_SPACE
+STATUS_NO_MATCH
+STATUS_NO_MEDIA
+STATUS_NO_MEDIA_IN_DEVICE
+STATUS_NO_MEMORY
+STATUS_NO_MORE_EAS
+STATUS_NO_MORE_ENTRIES
+STATUS_NO_MORE_FILES
+STATUS_NO_MORE_MATCHES
+STATUS_NO_PAGEFILE
+STATUS_NO_QUOTAS_NO_ACCOUNT
+STATUS_NO_SECURITY_ON_OBJECT
+STATUS_NO_SPOOL_SPACE
+STATUS_NO_SUCH_ALIAS
+STATUS_NO_SUCH_DEVICE
+STATUS_NO_SUCH_DOMAIN
+STATUS_NO_SUCH_FILE
+STATUS_NO_SUCH_GROUP
+STATUS_NO_SUCH_LOGON_SESSION
+STATUS_NO_SUCH_MEMBER
+STATUS_NO_SUCH_PACKAGE
+STATUS_NO_SUCH_PRIVILEGE
+STATUS_NO_SUCH_USER
+STATUS_NO_TOKEN
+STATUS_NO_TRUST_LSA_SECRET
+STATUS_NO_TRUST_SAM_ACCOUNT
+STATUS_NO_USER_SESSION_KEY
+STATUS_NO_YIELD_PERFORMED
+STATUS_NT_CROSS_ENCRYPTION_REQUIRED
+STATUS_NULL_LM_PASSWORD
+STATUS_OBJECTID_EXISTS
+STATUS_OBJECT_EXISTS
+STATUS_OBJECT_NAME_COLLISION
+STATUS_OBJECT_NAME_EXISTS
+STATUS_OBJECT_NAME_INVALID
+STATUS_OBJECT_NAME_NOT_FOUND
+STATUS_OBJECT_PATH_INVALID
+STATUS_OBJECT_PATH_NOT_FOUND
+STATUS_OBJECT_PATH_SYNTAX_BAD
+STATUS_OBJECT_TYPE_MISMATCH
+STATUS_OPEN_FAILED
+STATUS_OPLOCK_BREAK_IN_PROCESS
+STATUS_OPLOCK_NOT_GRANTED
+STATUS_ORDINAL_NOT_FOUND
+STATUS_PAGEFILE_CREATE_FAILED
+STATUS_PAGEFILE_QUOTA
+STATUS_PAGEFILE_QUOTA_EXCEEDED
+STATUS_PARITY_ERROR
+STATUS_PARTIAL_COPY
+STATUS_PARTITION_FAILURE
+STATUS_PASSWORD_EXPIRED
+STATUS_PASSWORD_MUST_CHANGE
+STATUS_PASSWORD_RESTRICTION
+STATUS_PATH_NOT_COVERED
+STATUS_PENDING
+STATUS_PIPE_BROKEN
+STATUS_PIPE_BUSY
+STATUS_PIPE_CLOSING
+STATUS_PIPE_CONNECTED
+STATUS_PIPE_DISCONNECTED
+STATUS_PIPE_EMPTY
+STATUS_PIPE_LISTENING
+STATUS_PIPE_NOT_AVAILABLE
+STATUS_PLUGPLAY_NO_DEVICE
+STATUS_PORT_ALREADY_SET
+STATUS_PORT_CONNECTION_REFUSED
+STATUS_PORT_DISCONNECTED
+STATUS_PORT_MESSAGE_TOO_LONG
+STATUS_PORT_UNREACHABLE
+STATUS_POSSIBLE_DEADLOCK
+STATUS_PREDEFINED_HANDLE
+STATUS_PRIMARY_TRANSPORT_CONNECT_FAILED
+STATUS_PRINT_CANCELLED
+STATUS_PRINT_QUEUE_FULL
+STATUS_PRIVILEGED_INSTRUCTION
+STATUS_PRIVILEGE_NOT_HELD
+STATUS_PROCEDURE_NOT_FOUND
+STATUS_PROCESS_IN_JOB
+STATUS_PROCESS_IS_TERMINATING
+STATUS_PROCESS_NOT_IN_JOB
+STATUS_PROFILING_AT_LIMIT
+STATUS_PROFILING_NOT_STARTED
+STATUS_PROFILING_NOT_STOPPED
+STATUS_PROPSET_NOT_FOUND
+STATUS_PROTOCOL_UNREACHABLE
+STATUS_PWD_HISTORY_CONFLICT
+STATUS_PWD_TOO_RECENT
+STATUS_PWD_TOO_SHORT
+STATUS_QUOTA_EXCEEDED
+STATUS_QUOTA_LIST_INCONSISTENT
+STATUS_RANGE_LIST_CONFLICT
+STATUS_RANGE_NOT_FOUND
+STATUS_RANGE_NOT_LOCKED
+STATUS_RECEIVE_EXPEDITED
+STATUS_RECEIVE_PARTIAL
+STATUS_RECEIVE_PARTIAL_EXPEDITED
+STATUS_RECOVERY_FAILURE
+STATUS_REDIRECTOR_HAS_OPEN_HANDLES
+STATUS_REDIRECTOR_NOT_STARTED
+STATUS_REDIRECTOR_PAUSED
+STATUS_REDIRECTOR_STARTED
+STATUS_REGISTRY_CORRUPT
+STATUS_REGISTRY_IO_FAILED
+STATUS_REGISTRY_QUOTA_LIMIT
+STATUS_REGISTRY_RECOVERED
+STATUS_REMOTE_DISCONNECT
+STATUS_REMOTE_NOT_LISTENING
+STATUS_REMOTE_RESOURCES
+STATUS_REMOTE_SESSION_LIMIT
+STATUS_REPARSE
+STATUS_REPLY_MESSAGE_MISMATCH
+STATUS_REQUEST_ABORTED
+STATUS_REQUEST_NOT_ACCEPTED
+STATUS_RESOURCE_DATA_NOT_FOUND
+STATUS_RESOURCE_LANG_NOT_FOUND
+STATUS_RESOURCE_NAME_NOT_FOUND
+STATUS_RESOURCE_NOT_OWNED
+STATUS_RESOURCE_TYPE_NOT_FOUND
+STATUS_RETRY
+STATUS_REVISION_MISMATCH
+STATUS_RXACT_COMMITTED
+STATUS_RXACT_COMMIT_FAILURE
+STATUS_RXACT_COMMIT_NECESSARY
+STATUS_RXACT_INVALID_STATE
+STATUS_RXACT_STATE_CREATED
+STATUS_SAM_INIT_FAILURE
+STATUS_SECRET_TOO_LONG
+STATUS_SECTION_NOT_EXTENDED
+STATUS_SECTION_NOT_IMAGE
+STATUS_SECTION_PROTECTION
+STATUS_SECTION_TOO_BIG
+STATUS_SEGMENT_NOTIFICATION
+STATUS_SEMAPHORE_LIMIT_EXCEEDED
+STATUS_SERIAL_COUNTER_TIMEOUT
+STATUS_SERIAL_MORE_WRITES
+STATUS_SERIAL_NO_DEVICE_INITED
+STATUS_SERVER_DISABLED
+STATUS_SERVER_HAS_OPEN_HANDLES
+STATUS_SERVER_NOT_DISABLED
+STATUS_SERVICE_NOTIFICATION
+STATUS_SETMARK_DETECTED
+STATUS_SHARED_IRQ_BUSY
+STATUS_SHARING_PAUSED
+STATUS_SHARING_VIOLATION
+STATUS_SINGLE_STEP
+STATUS_SOME_NOT_MAPPED
+STATUS_SPECIAL_ACCOUNT
+STATUS_SPECIAL_GROUP
+STATUS_SPECIAL_USER
+STATUS_STACK_OVERFLOW
+STATUS_STACK_OVERFLOW_READ
+STATUS_SUCCESS
+STATUS_SUSPEND_COUNT_EXCEEDED
+STATUS_SYNCHRONIZATION_REQUIRED
+STATUS_SYSTEM_PROCESS_TERMINATED
+STATUS_THREAD_IS_TERMINATING
+STATUS_THREAD_NOT_IN_PROCESS
+STATUS_THREAD_WAS_SUSPENDED
+STATUS_TIMEOUT
+STATUS_TIMER_NOT_CANCELED
+STATUS_TIMER_RESOLUTION_NOT_SET
+STATUS_TIMER_RESUME_IGNORED
+STATUS_TIME_DIFFERENCE_AT_DC
+STATUS_TOKEN_ALREADY_IN_USE
+STATUS_TOO_LATE
+STATUS_TOO_MANY_ADDRESSES
+STATUS_TOO_MANY_COMMANDS
+STATUS_TOO_MANY_CONTEXT_IDS
+STATUS_TOO_MANY_GUIDS_REQUESTED
+STATUS_TOO_MANY_LINKS
+STATUS_TOO_MANY_LUIDS_REQUESTED
+STATUS_TOO_MANY_NAMES
+STATUS_TOO_MANY_NODES
+STATUS_TOO_MANY_OPENED_FILES
+STATUS_TOO_MANY_PAGING_FILES
+STATUS_TOO_MANY_SECRETS
+STATUS_TOO_MANY_SESSIONS
+STATUS_TOO_MANY_SIDS
+STATUS_TOO_MANY_THREADS
+STATUS_TRANSACTION_ABORTED
+STATUS_TRANSACTION_INVALID_ID
+STATUS_TRANSACTION_INVALID_TYPE
+STATUS_TRANSACTION_NO_MATCH
+STATUS_TRANSACTION_NO_RELEASE
+STATUS_TRANSACTION_RESPONDED
+STATUS_TRANSACTION_TIMED_OUT
+STATUS_TRUSTED_DOMAIN_FAILURE
+STATUS_TRUSTED_RELATIONSHIP_FAILURE
+STATUS_TRUST_FAILURE
+STATUS_UNABLE_TO_DECOMMIT_VM
+STATUS_UNABLE_TO_DELETE_SECTION
+STATUS_UNABLE_TO_FREE_VM
+STATUS_UNABLE_TO_LOCK_MEDIA
+STATUS_UNABLE_TO_UNLOAD_MEDIA
+STATUS_UNDEFINED_CHARACTER
+STATUS_UNEXPECTED_IO_ERROR
+STATUS_UNEXPECTED_MM_CREATE_ERR
+STATUS_UNEXPECTED_MM_EXTEND_ERR
+STATUS_UNEXPECTED_MM_MAP_ERROR
+STATUS_UNEXPECTED_NETWORK_ERROR
+STATUS_UNHANDLED_EXCEPTION
+STATUS_UNKNOWN_REVISION
+STATUS_UNMAPPABLE_CHARACTER
+STATUS_UNRECOGNIZED_MEDIA
+STATUS_UNRECOGNIZED_VOLUME
+STATUS_UNSUCCESSFUL
+STATUS_UNSUPPORTED_COMPRESSION
+STATUS_UNWIND
+STATUS_USER_APC
+STATUS_USER_EXISTS
+STATUS_USER_MAPPED_FILE
+STATUS_USER_SESSION_DELETED
+STATUS_VALIDATE_CONTINUE
+STATUS_VARIABLE_NOT_FOUND
+STATUS_VDM_HARD_ERROR
+STATUS_VERIFY_REQUIRED
+STATUS_VIRTUAL_CIRCUIT_CLOSED
+STATUS_VOLUME_DISMOUNTED
+STATUS_VOLUME_MOUNTED
+STATUS_WAIT_0
+STATUS_WAIT_63
+STATUS_WAKE_SYSTEM_DEBUGGER
+STATUS_WAS_LOCKED
+STATUS_WAS_UNLOCKED
+STATUS_WORKING_SET_LIMIT_RANGE
+STATUS_WORKING_SET_QUOTA
+STATUS_WRONG_PASSWORD
+STATUS_WRONG_PASSWORD_CORE
+STATUS_WRONG_VOLUME
+STATUS_WX86_BREAKPOINT
+STATUS_WX86_CONTINUE
+STATUS_WX86_CREATEWX86TIB
+STATUS_WX86_EXCEPTION_CHAIN
+STATUS_WX86_EXCEPTION_CONTINUE
+STATUS_WX86_EXCEPTION_LASTCHANCE
+STATUS_WX86_FLOAT_STACK_CHECK
+STATUS_WX86_INTERNAL_ERROR
+STATUS_WX86_SINGLE_STEP
+STATUS_WX86_UNSIMULATE

irc/ArchBlackmann/tech.txt

@@ -18,7 +18,7 @@ Don't you know going around dereferncing null pointers all day can be hazardous
 Well, duh!
 There's a bit in cr3 for problems like that.
 Just add a field to the %stru% to keep track of it!
-Don't worry about it... the garbage collector in the kernel will clean it up for you.
+Don't worry about it... the garbage collector in %module% will clean it up for you.
 Did I do that?
 Didn't %dev% fix that already?
 Yes, I think I've seen that bug before... no... that was another program.
@@ -43,7 +43,7 @@ Hmm.. that seems to have been introduced by my last commit... I bet CVS mixed up
 It can't possibly be my fault, so I don't care.
 I'm not experiencing that problem, perhaps it's all in your mind.
 Well... like a good friend of mine said... "Don't Panic!"
-It just shows you how far ReactOS has come along! A year ago a bug like that wouldn't have even been possible!
+It just shows you how far ReactOS has come along! A %period% ago a bug like that wouldn't have even been possible!
 Just surround the code with an #if 0/#endif block, it solves all my problems!
 You know.. if %dev% would just finish %module% for us, we wouldn't be having this problem.
 I say we move on to the next function, since we can't seem to figure this one out.
@@ -54,8 +54,20 @@ ask %dev%
 Thank you for that amazingly keen insight, Commander Obvious.
 Sorry, can't help you right now, trying to track down this bug %dev% caused in %module%
 I dont know about that, but I just fixed a problem in %module% for %dev%
-How should I know? I'm still trying to figure out this main() thing... ooh! wanna see what I did in the kernel?
+How should I know? I'm still trying to figure out this main() thing... ooh! wanna see what I did in %module%?
 lol!
 *wink*
+;)
 42
-It's gonna take me %period%s to fix all %dev%'s bugs in %module% :(
+It's gonna take me over %period% to fix all %dev%'s bugs in %module% :(
+How could %func% return %status%!? It bet %dev% broke it! I didn't touch it... honest!  no.. really! (me hides)
+It's fine if you get %status% there ... just ignore the destruction, and call %func% instead.
+%dev% said %status% isn't really an error in this context because we expect %module% to be toast by now
+heh, I'm still trying to figure out why %func% is returning %status% when I call it from %module%...
+%dev% said it's okay to ignore that as long as you're below %irql%
+erm, what do you mean?
+damn, I do that all the time
+if you want a reply that sounds right, I'd say that %func% support for that is vital to the future of %module%
+Sounds like you're having a problem with %func%. I hate that thing... don't talk to me about it.
+Just return %status% and forget about it. Someone else will fix it, later.
+Blah blah blah... sheesh... can't you figure out *anything*?

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/INSTALL

@@ -7,67 +7,72 @@ ReactOS from http://www.reactos.com.
 
 2. Building ReactOS
 
-To build from Windows run 'make' (wihout the quotes) from the top directory.
-To build from unix, edit rules.mak and change the PREFIX variable to the
-correct value for your cross-compiler. Run 'export HOST=mingw32-linux' to
-tell the ReactOS build system that it is building ReactOS on a linux machine.
-Now run 'make'.
+2.1 Building the binaries
+
+To build ReactOS run 'make' (wihout the quotes) if you are building on Linux
+or 'mingw32-make' if you are building on Windows (or ReactOS) from the top
+directory.
+
+
+2.2 Building a bootable CD image
+
+To build a bootable CD image run 'make bootcd' (wihout the quotes) if you are
+building on Linux or 'mingw32-make bootcd' if you are building on Windows (or
+ReactOS) from the top directory. This will create a CD image with a filename,
+ReactOS.iso, in the top directory.
 
 
 3. Installation
 
-The system can only be installed on the first partition on the first harddisk.
-The partition must be formatted as FAT16 or FAT32. The system can only be
-started from DOS and not from a Windows DOS-prompt.
+ReactOS can only be installed on a machine that has a FAT16 or FAT32 partition
+as the active (bootable) partition. The partition on which ReactOS is to be
+installed (which may or may not be the bootable partition) must also be
+formatted as FAT16 or FAT32. ReactOS Setup can format the partitions if
+needed.
 
-ReactOS can be installed from the source distribution or from the binary
+ReactOS can be installed from the source distribution or from the bootable CD
 distribution. The two ways to install ReactOS are explained below.
 
 
 3.1 Installation from sources
 
-To install ReactOS after building it, type 'make install'. This will create
-the directory 'reactos' in the top directory. Copy this directory to the root
-of your first partition on your first harddisk. This is usually c:\ on a
-Windows machine.
+If you don't have an existing ReactOS installation you want to upgrade, then
+build a bootable CD as described above. Burn the CD image, boot from it, and
+follow the instructions to install ReactOS.
 
-If you don't want to copy the files manually every time you run a 'make install',
-you can specify the directory where the files are to be copied to during
-installation.
+If you have an existing ReactOS installation you want to upgrade, then to
+install ReactOS after building it, type 'make install' or
+'mingw32-make install'. This will create the directory 'reactos' in the top
+directory. Copy the contents of this directory over the existing installation.
 
-In rules.mak find the variable INSTALL_DIR and change the assigned value to the
-name of the directory where the files are to be copied to. If you are using
-Windows this could be:
+If you don't want to copy the files manually every time you run a
+'make install' or 'mingw32-make install', then you can specify the directory
+where the files are to be copied to during installation.
 
-    INSTALL_DIR = c:\reactos
+Set the ROS_INSTALL environment variable. If you are on Windows this could be
+done by:
 
-If you are on linux this could be:
+  set ROS_INSTALL=c:\reactos
 
-    INSTALL_DIR = /mnt/windows/reactos
+If you are on Linux this could be done by:
 
-Save the changes to rules.mak and run 'make install' to install the files to
-the new location. If you don't want to change rules.mak, you can specify the
-installtion directory when invoking make. Run
-'make INSTALL_DIR=c:\reactos install' to install to c:\reactos.
+  export ROS_INSTALL=/mnt/windows/reactos
+
+Now run 'make install' or 'mingw32-make install' to install the files to the
+new location.
 
 
-3.2 Installation from binany distribution
+3.2 Installation from bootable CD distribution
 
-To install ReactOS from the binary distribution, extract the archive contents
-to c:\reactos. Remember to extract the files with full paths.
-
-
-4. Booting ReactOS
-
-Startup in DOS mode. 'cd' to c:\reactos and type 'boot' and press <enter>.
-A simple shell is started where you can use simple commands like 'cd' and 'dir'.
+To install ReactOS from the bootable CD distribution, extract the archive
+contents. Then burn the CD image, boot from it, and follow instructions.
 
 
 5. Help
 
 If you run into problems or have suggestions for making ReactOS better, please
-surf to the address below and subscribe to one or more of the mailing lists.
+visit the address below and subscribe to one or more of the mailing lists.
 
-http://www.reactos.com/index.php?tab=discussion&section=lists
+http://www.reactos.com/en/content/view/full/66
 
 ReactOS Development Team

reactos/Jamfile

@@ -1,5 +0,0 @@
-# Main jamfile for ReactOS
-
-SubDir ROS_TOP ;
-
-SubInclude ROS_TOP Lib ;

reactos/Jamrules

@@ -1,54 +0,0 @@
-# customization for ReactOS goes here
-
-# The SharedLibrary and SharedLibraryFromObjects rules were
-# borrowed from here:
-# http://www.differentpla.net/~roger/devel/jam/tutorial/shared_lib/index.html
-
-SUFSHR = .dll ;
-RM = rm ; # rm comes with MinGW, and the default del doesn't work in some cases
-
-rule SharedLibrary
-{
-	SharedLibraryFromObjects $(<) : $(>:S=$(SUFOBJ)) ;
-	Objects $(>) ;
-}
-
-rule SharedLibraryFromObjects
-{
-	local _s _t ;
-
-	# Add grist to file names
-	# Add suffix to dll
-
-	_s = [ FGristFiles $(>) ] ;
-	_t = [ FAppendSuffix $(<) : $(SUFSHR) ] ;
-
-	if $(_t) != $(<)
-	{
-	    DEPENDS $(<) : $(_t) ;
-	    NOTFILE $(<) ;
-	}
-
-	# make compiled sources a dependency of target
-
-	DEPENDS exe : $(_t) ;
-	DEPENDS $(_t) : $(_s) ;
-	MakeLocate $(_t) : $(LOCATE_TARGET) ;
-
-	Clean clean : $(_t) ;
-
-	Link $(_t) : $(_s) ;
-}
-
-# nasm needs to know the output file first, or it doesn't
-# recognize -I  :(
-actions As
-{
-	$(AS) -o $(<) $(ASFLAGS) -I$(HDRS) $(>)
-}
-
-AS = nasm ;
-
-# why isn't DEFINES working? :(
-#DEFINES += _M_IX86 ;
-CCFLAGS += -D_M_IX86 ;

reactos/ReactOS.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="config.xml">
+		<xi:fallback>
+			<xi:include href="config.template.xml" />
+		</xi:fallback>
+	</xi:include>
+
+	<xi:include href="baseaddress.xml" />
+
+	<define name="_M_IX86" />
+	<if property="MP" value="1">
+		<define name="CONFIG_SMP" value="1" />
+	</if>
+	<if property="DBG" value="1">
+		<define name="DBG" value="1" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	<if property="DBG" value="0">
+		<compilerflag>-Os</compilerflag>
+		<compilerflag>-Wno-strict-aliasing</compilerflag>
+		<compilerflag>-ftracer</compilerflag>
+		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
+		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
+	</if>
+	<if property="KDBG" value="1">
+		<define name="KDBG" value="1" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+
+	<include>include</include>
+	<include>w32api/include</include>
+	<include>w32api/include/ddk</include>
+
+	<directory name="apps">
+		<xi:include href="apps/directory.xml" />
+	</directory>
+	<directory name="boot">
+		<xi:include href="boot/boot.xml" />
+	</directory>
+	<directory name="bootdata">
+		<xi:include href="bootdata/bootdata.xml" />
+	</directory>
+	<directory name="drivers">
+		<xi:include href="drivers/directory.xml" />
+	</directory>
+	<directory name="hal">
+		<xi:include href="hal/directory.xml" />
+	</directory>
+	<directory name="include">
+		<xi:include href="include/directory.xml" />
+	</directory>
+	<directory name="lib">
+		<xi:include href="lib/directory.xml" />
+	</directory>
+	<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>
+	<directory name="regtests">
+		<xi:include href="regtests/directory.xml" />
+	</directory>
+	<directory name="services">
+		<xi:include href="services/directory.xml" />
+	</directory>
+	<directory name="subsys">
+		<xi:include href="subsys/directory.xml" />
+	</directory>
+</project>

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/directory.xml

@@ -0,0 +1,3 @@
+<directory name="utils">
+	<xi:include href="utils/directory.xml" />
+</directory>

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/Makefile

@@ -1,71 +0,0 @@
-#
-# ReactOS system utilities makefile
-#
-
-PATH_TO_TOP = ../..
-
-include $(PATH_TO_TOP)/rules.mak
-
-
-# Console system utilities
-# cabman cat net objdir partinfo pice ps sc stats
-UTIL_APPS = cat objdir partinfo pnpdump sc shutdown stats tickcount ps
-
-UTIL_NET_APPS = arp finger ftp ipconfig netstat ping route telnet whois
-
-
-all: $(UTIL_APPS) $(UTIL_NET_APPS)
-
-depends: 
-
-implib: $(UTIL_APPS:%=%_implib) \
-	$(UTIL_NET_APPS:%=%_implib)
-
-clean: 	$(UTIL_APPS:%=%_clean) \
-	$(UTIL_NET_APPS:%=%_clean)
-
-install: $(UTIL_APPS:%=%_install) \
-	 $(UTIL_NET_APPS:%=%_install)
-
-.PHONY: all depends implib clean install
-
-
-#
-# Utility Applications
-#
-$(UTIL_APPS): %:
-	$(MAKE) -C $*
-
-$(UTIL_APPS:%=%_implib): %_implib:
-	$(MAKE) -C $* implib
-
-$(UTIL_APPS:%=%_clean): %_clean:
-	$(MAKE) -C $* clean
-
-$(UTIL_APPS:%=%_install): %_install:
-	$(MAKE) -C $* install
-
-.PHONY: $(UTIL_APPS) $(UTIL_APPS:%=%_implib) $(UTIL_APPS:%=%_clean) $(UTIL_APPS:%=%_install)
-
-#
-# GUI Utility Applications
-#
-$(UTIL_NET_APPS): %:
-	$(MAKE) -C net/$*
-
-$(UTIL_NET_APPS:%=%_implib): %_implib:
-	$(MAKE) -C net/$* implib
-
-$(UTIL_NET_APPS:%=%_clean): %_clean:
-	$(MAKE) -C net/$* clean
-
-$(UTIL_NET_APPS:%=%_install): %_install:
-	$(MAKE) -C net/$* install
-
-.PHONY: $(UTIL_NET_APPS) $(UTIL_NET_APPS:%=%_implib) $(UTIL_NET_APPS:%=%_clean) $(UTIL_NET_APPS:%=%_install)
-
-
-etags:
-	find . -name "*.[ch]" -print | etags --language=c -
-
-# 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/cat.c

@@ -6,7 +6,7 @@ int main(int argc, char* argv[])
    int i;
    FILE* in;
    char ch;
-   
+
    for (i=1; i<argc; i++)
      {
 	in = fopen(argv[i],"r");
@@ -15,7 +15,7 @@ int main(int argc, char* argv[])
 	     printf("Failed to open file %s\n", argv[i]);
 	     return(0);
 	  }
-	
+
 	while ((ch = fgetc(in)) != EOF)
 	  {
 	     putchar(ch);

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

@@ -0,0 +1,10 @@
+<directory name="net">
+	<xi:include href="net/directory.xml" />
+</directory>
+<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/load.c

@@ -1,6 +1,6 @@
 /*
  * Load a device driver
- */ 
+ */
 #include <windows.h>
 #include <ntos/zw.h>
 

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/driver/unload/unload.c

@@ -1,6 +1,6 @@
 /*
  * Unload a device driver
- */ 
+ */
 #include <windows.h>
 #include <ntos/zw.h>
 

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

@@ -18,8 +18,8 @@
 #include "trace.h"
 
 
-VOID SNMP_FUNC_TYPE SnmpSvcInitUptime();
-DWORD SNMP_FUNC_TYPE SnmpSvcGetUptime();
+VOID WINSNMPAPI SnmpSvcInitUptime();
+DWORD WINSNMPAPI SnmpSvcGetUptime();
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
 
         DWORD dwUptime = SnmpSvcGetUptime();
 
-        _tprintf(_T("SNMP uptime: %d\n"), dwUptime);
+        _tprintf(_T("SNMP uptime: %ld\n"), dwUptime);
 
         SnmpUtilMemFree(pCache);
     } else {

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

@@ -0,0 +1,9 @@
+<module name="arp" type="win32cui" installbase="system32" installname="arp.exe">
+	<include base="arp">.</include>
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>snmpapi</library>
+	<file>arp.c</file>
+	<file>arp.rc</file>
+</module>

reactos/apps/utils/net/arp/makefile

@@ -1,19 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = arp
-
-TARGET_INSTALLDIR = system32
-
-TARGET_CFLAGS = -D__USE_W32API
-
-TARGET_SDKLIBS = user32.a snmpapi.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

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

@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Diagnostic Trace
 //
-#include <stdio.h> 
+#include <stdio.h>
 #include <stdarg.h>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

reactos/apps/utils/net/directory.xml

@@ -0,0 +1,30 @@
+<directory name="arp">
+	<xi:include href="arp/arp.xml" />
+</directory>
+<directory name="finger">
+	<xi:include href="finger/finger.xml" />
+</directory>
+<directory name="ftp">
+	<xi:include href="ftp/ftp.xml" />
+</directory>
+<directory name="ipconfig">
+	<xi:include href="ipconfig/ipconfig.xml" />
+</directory>
+<directory name="netstat">
+	<xi:include href="netstat/netstat.xml" />
+</directory>
+<directory name="ping">
+	<xi:include href="ping/ping.xml" />
+</directory>
+<directory name="route">
+	<xi:include href="route/route.xml" />
+</directory>
+<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.c

@@ -41,16 +41,6 @@
  *          Had to remove local handling.	 Otherwise, same as whois.
  */
 
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
-#endif /* not lint */
-
 /*
  * Finger prints out information about users.  It is not portable since
  * certain fields (e.g. the full user name, office, and phone numbers) are
@@ -161,10 +151,10 @@ userlist(int argc, char **argv)
 		fprintf(stderr, "Warning: Can't do local finger\n");
 	}
 
-	/* Start winsock */ 
+	/* Start winsock */
 	wVersionRequested = MAKEWORD( 1, 1 );
 	iErr = WSAStartup( wVersionRequested, &wsaData );
-	if ( iErr != 0 ) 
+	if ( iErr != 0 )
 	{
 		/* Tell the user that we couldn't find a usable */
 		/* WinSock DLL.                                  */

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

@@ -0,0 +1,12 @@
+<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>
+	<file>finger.c</file>
+	<file>err.c</file>
+	<file>getopt.c</file>
+	<file>net.c</file>
+	<file>finger.rc</file>
+</module>

reactos/apps/utils/net/finger/makefile

@@ -1,24 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = finger
-
-TARGET_SDKLIBS = ws2_32.a
-
-TARGET_INSTALLDIR = system32
-
-TARGET_CFLAGS = -D__USE_W32_SOCKETS
-
-TARGET_OBJECTS = $(TARGET_NAME).o \
-  err.o \
-  getopt.o \
-  net.o 
-
-TARGET_GCCLIBS = iberty
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

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

@@ -33,11 +33,6 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-
-#ifndef lint
-static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <winsock2.h>
 #include "unistd.h"
@@ -56,14 +51,14 @@ netfinger(char *name)
 	struct hostent *hp, def;
 	struct servent *sp;
 	struct sockaddr_in sin;
-	int s;
+	SOCKET s;
 	char *alist[1], *host;
 
 	/* If this is a local request */
 	if (!(host = rindex(name, '@')))
 		return;
 
-	*host++ = NULL;
+	*host++ = '\0';
 	if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) {
 		def.h_name = host;
 		def.h_addr_list = alist;
@@ -84,7 +79,7 @@ netfinger(char *name)
 	sin.sin_family = hp->h_addrtype;
 	bcopy(hp->h_addr, (char *)&sin.sin_addr, hp->h_length);
 	sin.sin_port = sp->s_port;
-	if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((s = socket(hp->h_addrtype, SOCK_STREAM, 0)) == INVALID_SOCKET) {
 		perror("finger: socket");
 		return;
 	}
@@ -115,7 +110,7 @@ netfinger(char *name)
 	 * Otherwise, all high bits are stripped; if it isn't printable and
 	 * it isn't a space, we can simply set the 7th bit.  Every ASCII
 	 * character with bit 7 set is printable.
-	 */ 
+	 */
 	lastc = 0;
 	while (recv(s, &c, 1, 0) == 1) {
 		c &= 0x7f;

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

@@ -165,7 +165,7 @@ struct	types {
 	{ "image",	"I",	TYPE_I,	0 },
 	{ "ebcdic",	"E",	TYPE_E,	0 },
 	{ "tenex",	"L",	TYPE_L,	bytename },
-	0
+	{0 }
 };
 
 /*
@@ -1276,7 +1276,7 @@ void mls(argc, argv)
  * Do a shell escape
  */
 /*ARGSUSED*/
-shell(argc, argv)
+int shell(argc, argv)
 	char *argv[];
 {
 #if 0
@@ -1405,7 +1405,7 @@ shell(argc, argv)
 /*
  * Send new user information (re-login)
  */
-user(argc, argv)
+int user(argc, argv)
 	int argc;
 	char **argv;
 {
@@ -1704,7 +1704,7 @@ void disconnect()
 	}
 }
 
-confirm(cmd, file)
+int confirm(cmd, file)
 	char *cmd, *file;
 {
 	char line[BUFSIZ];
@@ -1731,7 +1731,7 @@ void fatal(msg)
  * Can't control multiple values being expanded
  * from the expression, we return only the first.
  */
-globulize(cpp)
+int globulize(cpp)
 	char **cpp;
 {
 	char **globbed;
@@ -1810,7 +1810,7 @@ void doproxy(argc,argv)
 	void proxabort();
 	register struct cmd *c;
 	struct cmd *getcmd();
-	extern struct cmd cmdtab[];
+//	extern struct cmd cmdtab[];
 	extern jmp_buf abortprox;
 
 	if (argc < 2) {

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

@@ -36,9 +36,8 @@ void domacro(argc, argv)
 	register char *cp1, *cp2;
 	int count = 2, loopflg = 0;
 	char line2[200];
-	extern char **glob(), *globerr;
+	extern char **glob();
 	struct cmd *getcmd(), *c;
-	extern struct cmd cmdtab[];
 
 	if (argc < 2) {
 		(void) strcat(line, " ");

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

@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <winsock.h>
+#include "fake.h"
 #include "prototypes.h"
 
 #define MAX_ASCII 100
@@ -92,7 +93,7 @@ int fgetcSocket(int s)
 {
    static int index = 0;
    static int total = 0;
-   static unsigned char buffer[4096];
+   static char buffer[4096];
 
    if (index == total)
      {
@@ -142,7 +143,7 @@ int fputcSocket(int s, char putChar)
    buffer[1] = '\0';
 
    if(SOCKET_ERROR==send(s, buffer, 1, 0)) {
-	   int iret=WSAGetLastError (); 
+	   int iret=WSAGetLastError ();
 	   fprintf(stdout,"fputcSocket: %d\n",iret);
 	   return 0;
    }
@@ -154,9 +155,9 @@ int fputSocket(int s, char *buffer, int len)
 {
 	int iret;
 	while(len) {
-		if(SOCKET_ERROR==(iret=send(s, buffer, len, 0))) 
+		if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
 		{
-			iret=WSAGetLastError (); 
+			iret=WSAGetLastError ();
 			fprintf(stdout,"fputcSocket: %d\n",iret);
 			return 0;
 		}
@@ -187,7 +188,7 @@ char *fgetsSocket(int s, char *string)
       if (count == 1)
       {
 	 string[i] = buffer[0];
-	 
+
 	 if (i == MAX_ASCII - 3)
 	 {
 	    count = 0;
@@ -235,7 +236,7 @@ char *getpass (const char * prompt)
   static char input[256];
   HANDLE in;
   HANDLE err;
-  int    count;
+  DWORD    count;
 
   in = GetStdHandle (STD_INPUT_HANDLE);
   err = GetStdHandle (STD_ERROR_HANDLE);
@@ -305,12 +306,7 @@ int access(const char *filename, int accessmethod)
 #define EPOCHFILETIME (116444736000000000LL)
 #endif
 
-struct timezone {
-    int tz_minuteswest; /* minutes W of Greenwich */
-    int tz_dsttime;     /* type of dst correction */
-};
-
-__inline int gettimeofday(struct timeval *tv, struct timezone *tz)
+int gettimeofday(struct timeval *tv, struct timezone *tz)
 {
     FILETIME        ft;
     LARGE_INTEGER   li;

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

@@ -8,3 +8,10 @@
 
 #define strcasecmp strcmp
 #define strncasecmp strnicmp
+
+struct timezone {
+    int tz_minuteswest; /* minutes W of Greenwich */
+    int tz_dsttime;     /* type of dst correction */
+};
+
+int gettimeofday(struct timeval *tv, struct timezone *tz);

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

@@ -97,7 +97,7 @@ uid_t	getuid();
 sig_t	lostpeer();
 off_t	restart_point = 0;
 
-int cin, cout;
+SOCKET cin, cout;
 int	dataconn(char *mode);
 
 int command(char *fmt, ...);
@@ -113,7 +113,8 @@ void psabort(int sig);
 char *hookup(char *host, int port)
 {
 	register struct hostent *hp = 0;
-	int s,len;
+	int len;
+	SOCKET s;
 	static char hostnamebuf[80];
 
 	bzero((char *)&hisctladdr, sizeof (hisctladdr));
@@ -136,7 +137,7 @@ char *hookup(char *host, int port)
 	}
 	hostname = hostnamebuf;
 	s = socket(hisctladdr.sin_family, SOCK_STREAM, 0);
-	if (s < 0) {
+	if (s == INVALID_SOCKET) {
 		perror("ftp: socket");
 		code = -1;
 		return (0);
@@ -319,6 +320,7 @@ char reply_string[BUFSIZ];		/* last line of previous reply */
 
 #include <ctype.h>
 
+int
 getreply(expecteof)
 	int expecteof;
 {
@@ -370,7 +372,7 @@ getreply(expecteof)
 			if (c != '\r' && (verbose > 0 ||
 			    (verbose > -1 && n == '5' && dig > 4))) {
 				if (proxflag &&
-				   (dig == 1 || dig == 5 && verbose == 0))
+				   ((dig == 1 || dig == 5) && verbose == 0))
 					printf("%s:",hostname);
 				(void) putchar(c);
 				(void) fflush(stdout);
@@ -399,7 +401,7 @@ getreply(expecteof)
 			if (cp < &reply_string[sizeof(reply_string) - 1])
 				*cp++ = c;
 		}
-		if (verbose > 0 || verbose > -1 && n == '5') {
+		if (verbose > 0 || (verbose > -1 && n == '5')) {
 			(void) putchar(c);
 			(void) fflush (stdout);
 		}
@@ -420,6 +422,7 @@ getreply(expecteof)
 	}
 }
 
+int
 empty(mask, sec)
 	struct fd_set *mask;
 	int sec;
@@ -994,7 +997,7 @@ done:
 		}
 break2:
 		if (bare_lfs) {
-			printf("WARNING! %d bare linefeeds received in ASCII mode\n");
+			printf("WARNING! %d bare linefeeds received in ASCII mode\n", bare_lfs);
 			printf("File may not have transferred correctly.\n");
 			(void) fflush(stdout);
 		}
@@ -1133,6 +1136,7 @@ null();//	(void) signal(SIGINT,oldintr);
  */
 int sendport = -1;
 
+int
 initconn()
 {
 	register char *p, *a;
@@ -1327,8 +1331,8 @@ void pswitch(int flag)
 		char name[MAXHOSTNAMELEN];
 		struct sockaddr_in mctl;
 		struct sockaddr_in hctl;
-		FILE *in;
-		FILE *out;
+		SOCKET in;
+		SOCKET out;
 		int tpe;
 		int cpnd;
 		int sunqe;
@@ -1371,10 +1375,10 @@ void pswitch(int flag)
 	hisctladdr = op->hctl;
 	ip->mctl = myctladdr;
 	myctladdr = op->mctl;
-	(int) ip->in = cin; // What the hell am I looking at...?
-	cin = (int) op->in;
-	(int) ip->out = cout; // Same again...
-	cout = (int) op->out;
+	ip->in = cin;
+	cin = op->in;
+	ip->out = cout;
+	cout = op->out;
 	ip->tpe = type;
 	type = op->tpe;
 	if (!type)

reactos/apps/utils/net/ftp/ftp.xml

@@ -0,0 +1,16 @@
+<module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" warnings="true">
+	<include base="ftp">.</include>
+	<define name="__USE_W32API" />
+	<define name="lint" />
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<file>cmds.c</file>
+	<file>cmdtab.c</file>
+	<file>domacro.c</file>
+	<file>fake.c</file>
+	<file>ftp.c</file>
+	<file>main.c</file>
+	<file>ruserpass.c</file>
+	<file>ftp.rc</file>
+</module>

reactos/apps/utils/net/ftp/ftp_var.h

@@ -1,5 +1,5 @@
-#include "fake.h"
 #include <winsock.h>
+#include "fake.h"
 #include <setjmp.h>
 
 //typedef void (*Sig_t)(int);

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

@@ -127,7 +127,6 @@ int main(int argc, char *argv[])
 {
 	register char *cp;
 	int top;
-	struct passwd *pw = NULL;
 #if 0
 	char homedir[MAXPATHLEN];
 #endif
@@ -369,7 +368,7 @@ getcmd(name)
 	longest = 0;
 	nmatches = 0;
 	found = 0;
-	for (c = cmdtab; p = c->c_name; c++) {
+	for (c = cmdtab; (p = c->c_name); c++) {
 		for (q = name; *q == *p++; q++)
 			if (*q == 0)		/* exact match? */
 				return (c);
@@ -403,7 +402,7 @@ void makeargv()
 	stringbase = line;		/* scan from first of buffer */
 	argbase = argbuf;		/* store from first of buffer */
 	slrflag = 0;
-	while (*argp++ = slurpstring())
+	while ((*argp++ = slurpstring()))
 		margc++;
 }
 

reactos/apps/utils/net/ftp/makefile

@@ -1,27 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = ftp
-
-TARGET_INSTALLDIR = system32
-
-TARGET_SDKLIBS = ws2_32.a iphlpapi.a
-# ntdll.a
-
-TARGET_OBJECTS = \
-	cmds.o \
-	cmdtab.o \
-	domacro.o \
-	fake.o \
-	ftp.o \
-	main.o \
-	ruserpass.o
-
-TARGET_GCCLIBS = 
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

reactos/apps/utils/net/ftp/prototypes.h

@@ -28,5 +28,4 @@ void recvrequest(char *cmd, char *local, char *remote, char *mode,
 int confirm(char *cmd, char *file);
 void blkfree(char **av0);
 int getit(int argc, char *argv[], int restartit, char *mode);
-static int token(void);
 int sleep(int time);

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

@@ -53,17 +53,18 @@ static struct toktab {
 	char *tokstr;
 	int tval;
 } toktab[]= {
-	"default",	DEFAULT,
-	"login",	LOGIN,
-	"password",	PASSWD,
-	"passwd",	PASSWD,
-	"account",	ACCOUNT,
-	"machine",	MACH,
-	"macdef",	MACDEF,
-	0,		0
+	{"default",	DEFAULT},
+	{"login",	LOGIN},
+	{"password",	PASSWD},
+	{"passwd",	PASSWD},
+	{"account",	ACCOUNT},
+	{"machine",	MACH},
+	{"macdef",	MACDEF},
+	{0,		0}
 };
 
 extern char *hostname;
+static int token(void);
 
 int ruserpass(char *host, char **aname, char **apass, char **aacct)
 {
@@ -125,14 +126,15 @@ next:
 		while ((t = token()) && t != MACH && t != DEFAULT) switch(t) {
 
 		case LOGIN:
-			if (token())
-				if (*aname == 0) { 
+			if (token()) {
+				if (*aname == 0) {
 					*aname = malloc((unsigned) strlen(tokval) + 1);
 					(void) strcpy(*aname, tokval);
 				} else {
 					if (strcmp(*aname, tokval))
 						goto next;
 				}
+			}
 			break;
 		case PASSWD:
 			if (strcmp(*aname, "anonymous") &&
@@ -164,7 +166,7 @@ next:
 				(void) fclose(cfile);
 				return(0);
 			}
-			while ((c=getc(cfile)) != EOF && c == ' ' || c == '\t');
+			while ((c=getc(cfile)) != EOF && (c == ' ' || c == '\t'));
 			if (c == EOF || c == '\n') {
 				printf("Missing macdef name argument.\n");
 				goto bad;
@@ -237,7 +239,7 @@ static int token(void)
    char *cp;
    int c;
    struct toktab *t;
-   
+
    if (feof(cfile))
       return (0);
    while ((c = getc(cfile)) != EOF &&

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

@@ -52,7 +52,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 {
@@ -100,7 +100,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,10 +114,10 @@ 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);
@@ -127,24 +127,24 @@ static void ShowNetworkInterfaces()
 
     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;
     }
 /*
 typedef struct _IP_ADAPTER_INDEX_MAP {
-  ULONG Index;                     // adapter index 
-  WCHAR Name[MAX_ADAPTER_NAME];    // name of the adapter 
+  ULONG Index;                     // adapter index
+  WCHAR Name[MAX_ADAPTER_NAME];    // name of the adapter
 } IP_ADAPTER_INDEX_MAP, * PIP_ADAPTER_INDEX_MAP;
 
 typedef struct _IP_INTERFACE_INFO {
-  LONG NumAdapters;                 // number of adapters in array 
-  IP_ADAPTER_INDEX_MAP Adapter[1];  // adapter indices and names 
+  LONG NumAdapters;                 // number of adapters in array
+  IP_ADAPTER_INDEX_MAP Adapter[1];  // adapter indices and names
 } IP_INTERFACE_INFO,*PIP_INTERFACE_INFO;
  */
     result = GetInterfaceInfo(pIfTable, &dwOutBufLen);
     if (result == NO_ERROR) {
         int i;
-        _tprintf(_T("GetInterfaceInfo() returned with %d adaptor entries\n"), pIfTable->NumAdapters);
+        _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);
@@ -162,13 +162,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;
         }
     }
@@ -194,7 +194,7 @@ typedef struct _IP_ADAPTER_INFO {
   IP_ADDR_STRING PrimaryWinsServer;
   IP_ADDR_STRING SecondaryWinsServer;
 a  time_t LeaseObtained;
-b  time_t LeaseExpires; 
+b  time_t LeaseExpires;
 } IP_ADAPTER_INFO, *PIP_ADAPTER_INFO;
  */
 /*
@@ -227,8 +227,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);

reactos/apps/utils/net/ipconfig/ipconfig.xml

@@ -0,0 +1,10 @@
+<module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" warnings="true">
+	<include base="ipconfig">.</include>
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>iphlpapi</library>
+	<file>ipconfig.c</file>
+	<file>trace.c</file>
+	<file>ipconfig.rc</file>
+</module>

reactos/apps/utils/net/ipconfig/makefile

@@ -1,19 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = ipconfig
-
-TARGET_INSTALLDIR = system32
-
-TARGET_CFLAGS = -D__USE_W32API
-
-TARGET_SDKLIBS = user32.a iphlpapi.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

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

@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Diagnostic Trace
 //
-#include <stdio.h> 
+#include <stdio.h>
 #include <stdarg.h>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

reactos/apps/utils/net/netstat/makefile

@@ -1,22 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = netstat
-
-TARGET_INSTALLDIR = system32
-
-TARGET_CFLAGS = \
-	-D__USE_W32API \
-	-D_WIN32_IE=0x600 \
-	-D_WIN32_WINNT=0x501 
-
-TARGET_SDKLIBS = user32.a snmpapi.a iphlpapi.a ws2_32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

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>
@@ -52,35 +53,36 @@ static char TcpState[][32] = {
 VOID PrintError(DWORD ErrorCode)
 {
 	LPVOID lpMsgBuf;
- 
+
 	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 {
@@ -262,20 +265,20 @@ typedef struct {
 // Translate port numbers into their text equivalent if there is one
 //
 PCHAR
-GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen) 
+GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen)
 {
 	struct servent *psrvent;
 
 	if (Flags & FLAG_SHOW_NUMBERS) {
 		sprintf(name, "%d", htons((WORD)port));
 		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));
-	}		
+	}
 	return name;
 }
 
@@ -286,7 +289,7 @@ GetPortName(DWORD Flags, UINT port, PCHAR proto, PCHAR name, int namelen)
 // Translate IP addresses into their name-resolved form if possible.
 //
 PCHAR
-GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen) 
+GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen)
 {
 //	struct hostent *phostent;
 	UINT nipaddr;
@@ -294,7 +297,7 @@ GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen)
 	// Does the user want raw numbers?
 	nipaddr = htonl(ipaddr);
 	if (Flags & FLAG_SHOW_NUMBERS ) {
-		sprintf(name, "%d.%d.%d.%d", 
+		sprintf(name, "%d.%d.%d.%d",
 			(nipaddr >> 24) & 0xFF,
 			(nipaddr >> 16) & 0xFF,
 			(nipaddr >> 8) & 0xFF,
@@ -307,7 +310,7 @@ GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen)
 	// Try to translate to a name
 	if (!ipaddr) {
 		if (!local) {
-			sprintf(name, "%d.%d.%d.%d", 
+			sprintf(name, "%d.%d.%d.%d",
 				(nipaddr >> 24) & 0xFF,
 				(nipaddr >> 16) & 0xFF,
 				(nipaddr >> 8) & 0xFF,
@@ -339,7 +342,7 @@ GetIpHostName(DWORD Flags, BOOL local, UINT ipaddr, PCHAR name, int namelen)
 
 		sprintf(name, "%d.%d.%d.%d", i1,i2,i3,i4);
 #else
-		sprintf(name, "%d.%d.%d.%d", 
+		sprintf(name, "%d.%d.%d.%d",
 			((nipaddr >> 24) & 0x000000FF),
 			((nipaddr >> 16) & 0x000000FF),
 			((nipaddr >> 8) & 0x000000FF),
@@ -351,19 +354,19 @@ 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;
 }
 
 //
 // GetOptions
-// 
+//
 // Parses the command line arguments.
 //
-BOOLEAN 
+BOOLEAN
 GetOptions(int argc, char *argv[], PDWORD pFlags)
 {
 	int		i, j;
@@ -466,12 +469,12 @@ int main(int argc, char *argv[])
 		for (i = 0; i < tcpTable->dwNumEntries; i++) {
 			if (flags & FLAG_SHOW_ALL_ENDPOINTS ||
 				tcpTable->table[i].dwState == MIB_TCP_STATE_ESTAB) {
-				sprintf(localaddr, "%s:%s", 
-					GetIpHostName(flags, TRUE, tcpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), 
+				sprintf(localaddr, "%s:%s",
+					GetIpHostName(flags, TRUE, tcpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN),
 				    GetPortName(flags, tcpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN));
 				sprintf(remoteaddr, "%s:%s",
-					GetIpHostName(flags, FALSE, tcpTable->table[i].dwRemoteAddr, remotename, HOSTNAMELEN), 
-				    tcpTable->table[i].dwRemoteAddr ? 
+					GetIpHostName(flags, FALSE, tcpTable->table[i].dwRemoteAddr, remotename, HOSTNAMELEN),
+				    tcpTable->table[i].dwRemoteAddr ?
 					GetPortName(flags, tcpTable->table[i].dwRemotePort, "tcp", remoteport, PORTNAMELEN):
 					"0");
 				printf("%4s\tState:   %s\n", "[TCP]", TcpState[tcpTable->table[i].dwState]);
@@ -481,14 +484,14 @@ int main(int argc, char *argv[])
 		// Dump the UDP table
 		if (flags & FLAG_SHOW_ALL_ENDPOINTS) {
 			for (i = 0; i < udpTable->dwNumEntries; i++) {
-				sprintf(localaddr, "%s:%s", 
-					GetIpHostName(flags, TRUE, udpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN), 
+				sprintf(localaddr, "%s:%s",
+					GetIpHostName(flags, TRUE, udpTable->table[i].dwLocalAddr, localname, HOSTNAMELEN),
 					GetPortName(flags, udpTable->table[i].dwLocalPort, "tcp", localport, PORTNAMELEN));
 				printf("%4s", "[UDP]");
 				printf("       Local:   %s\n       Remote:  %s\n", localaddr, "*.*.*.*:*");
 			}
 		}
-	}	
+	}
 	printf("\n");
 	return 0;
 }

reactos/apps/utils/net/netstat/netstat.xml

@@ -0,0 +1,14 @@
+<module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" warnings="true">
+	<include base="netstat">.</include>
+	<define name="__USE_W32API" />
+	<define name="_WIN32_IE">0x600</define>
+	<define name="_WIN32_WINNT">0x501</define>
+	<library>kernel32</library>
+	<library>user32</library>
+	<library>ws2_32</library>
+	<library>snmpapi</library>
+	<library>iphlpapi</library>
+	<file>netstat.c</file>
+	<file>trace.c</file>
+	<file>netstat.rc</file>
+</module>

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

@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Diagnostic Trace
 //
-#include <stdio.h> 
+#include <stdio.h>
 #include <stdarg.h>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>

reactos/apps/utils/net/ping/makefile

@@ -1,19 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = ping
-
-TARGET_INSTALLDIR = system32
-
-TARGET_CFLAGS = -D__USE_W32_SOCKETS
-
-TARGET_SDKLIBS = ws2_32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

reactos/apps/utils/net/ping/ping.c

@@ -113,7 +113,7 @@ VOID DisplayBuffer(
     UINT i;
     PCHAR p;
 
-    printf("Buffer (0x%X)  Size (0x%X).\n", Buffer, Size);
+    printf("Buffer (0x%p)  Size (0x%lX).\n", Buffer, Size);
 
     p = (PCHAR)Buffer;
     for (i = 0; i < Size; i++) {
@@ -306,10 +306,10 @@ BOOL Setup(VOID)
     PHOSTENT phe;
 
     wVersionRequested = MAKEWORD(2, 2);
- 
+
     Status = WSAStartup(wVersionRequested, &WsaData);
     if (Status != 0) {
-        printf("Could not initialize winsock dll.\n");	
+        printf("Could not initialize winsock dll.\n");
         return FALSE;
     }
 
@@ -327,9 +327,9 @@ BOOL Setup(VOID)
         if (phe == NULL) {
             printf("Unknown host %s.\n", TargetName);
             return FALSE;
-        } 
+        }
     }
-	
+
     if (phe != NULL) {
         CopyMemory(&Target.sin_addr, phe->h_addr, phe->h_length);
     } else {
@@ -341,7 +341,7 @@ BOOL Setup(VOID)
     } else {
         Target.sin_family = AF_INET;
     }
-	
+
     TargetIP		= inet_ntoa(Target.sin_addr);
     CurrentSeqNum	= 0;
     SentCount		= 0;
@@ -386,12 +386,11 @@ VOID QueryTime(PLARGE_INTEGER Time)
 
 VOID TimeToMsString(LPSTR String, LARGE_INTEGER Time)
 {
-    UINT          i, Length;
     CHAR          Convstr[40];
     LARGE_INTEGER LargeTime;
 
     LargeTime.QuadPart = Time.QuadPart / TicksPerMs.QuadPart;
- 
+
     _i64toa(LargeTime.QuadPart, Convstr, 10);
 	strcpy(String, Convstr);
     strcat(String, "ms");
@@ -449,7 +448,7 @@ BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
     }
 
 
-    printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr), 
+    printf("Reply from %s: bytes=%d time%s%s TTL=%d\n", inet_ntoa(from->sin_addr),
       size - IphLength - sizeof(ICMP_ECHO_PACKET), Sign, Time, IpHeader->TTL);
     if (RelativeTime.QuadPart < MinRTT.QuadPart) {
 		  MinRTT.QuadPart = RelativeTime.QuadPart;
@@ -467,7 +466,7 @@ BOOL Ping(VOID)
 {
     INT                 Status;
     SOCKADDR            From;
-    UINT                Length;
+    INT                 Length;
     PVOID               Buffer;
     UINT                Size;
     PICMP_ECHO_PACKET   Packet;
@@ -586,7 +585,7 @@ int main(int argc, char* argv[])
 
         printf("\nPinging %s [%s] with %d bytes of data:\n\n",
             TargetName, TargetIP, DataSize);
-		
+
 		Count = 0;
 		while ((NeverStop) || (Count < PingCount)) {
 			Ping();

reactos/apps/utils/net/ping/ping.xml

@@ -0,0 +1,11 @@
+<module name="ping" type="win32cui" installbase="system32" installname="ping.exe">
+	<include base="ping">.</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>
+	<file>ping.c</file>
+	<file>ping.rc</file>
+</module>

reactos/apps/utils/net/roshttpd/include/list.h

@@ -25,7 +25,7 @@ public:
 	CListNode *GetPrev();
 private:
 	PVOID Element;
-	CListNode *Next; 
+	CListNode *Next;
 	CListNode *Prev;
     static HANDLE hHeap;
     static INT nRef;
@@ -37,7 +37,7 @@ public:
 	CList();
 	~CList();
 	CList& operator=(CList&);
-	
+
 	CIterator<Item> *CreateIterator() const;
 	LONG Count() const;
 	Item& Get(const LONG index) const;
@@ -82,7 +82,7 @@ CList<Item>::CList()
 // Default destructor
 template <class Item>
 CList<Item>::~CList()
-{	
+{
 	RemoveAll();
 	delete Trailer;
 	delete Header;
@@ -157,7 +157,7 @@ VOID CList<Item>::RemoveAll()
 		tmp = node->GetNext();
 		delete node;
 		node = tmp;
-	} 
+	}
 	Header->SetNext(Trailer);
 	Trailer->SetPrev(Header);
 	NodeCount = 0;

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/makefile

@@ -1,19 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = route
-
-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/route/route.c

@@ -20,7 +20,7 @@
 #define IN_ADDR_OF(x) *((struct in_addr *)&(x))
 
 int usage() {
-    fprintf( stderr, 
+    fprintf( stderr,
 	     "route usage:\n"
 	     "route print\n"
 	     "  prints the route table\n"
@@ -32,11 +32,10 @@ int usage() {
 }
 
 int print_routes() {
-    PMIB_IPFORWARDTABLE IpForwardTable;
+    PMIB_IPFORWARDTABLE IpForwardTable = NULL;
     DWORD Error;
     ULONG Size = 0;
-    char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF], 
-	Index[IPBUF], Metric[IPBUF];
+    char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF];
     int i;
 
     if( (Error = GetIpForwardTable( NULL, &Size, TRUE )) ==
@@ -46,7 +45,7 @@ int print_routes() {
     }
 
     if( Error == ERROR_SUCCESS ) {
-	printf( "%-16s%-16s%-16s%-10s%-10s\n", 
+	printf( "%-16s%-16s%-16s%-10s%-10s\n",
 		"Destination",
 		"Netmask",
 		"Gateway",
@@ -63,7 +62,7 @@ int print_routes() {
 		    inet_ntoa( IN_ADDR_OF(IpForwardTable->table[i].
 		    		dwForwardNextHop) ) );
 
-	    printf( "%-16s%-16s%-16s%-10d%-10d\n", 
+	    printf( "%-16s%-16s%-16s%-10ld%-10ld\n", 
 		    Destination,
 		    Netmask,
 		    Gateway,
@@ -80,7 +79,7 @@ int print_routes() {
     }
 }
 
-int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd, 
+int convert_add_cmd_line( PMIB_IPFORWARDROW RowToAdd,
 			  int argc, char **argv ) {
     int i;
 
@@ -106,7 +105,7 @@ int add_route( int argc, char **argv ) {
     DWORD Error;
 
     if( argc < 2 || !convert_add_cmd_line( &RowToAdd, argc, argv ) ) {
-	fprintf( stderr, 
+	fprintf( stderr,
 		 "route add usage:\n"
 		 "route add <target> [mask <mask>] <gw> [metric <m>]\n"
 		 "  Adds a route to the IP route table.\n"
@@ -116,10 +115,10 @@ int add_route( int argc, char **argv ) {
 		 "  <m>      is the metric to use (lower is preferred)\n" );
 	return 1;
     }
-    
-    if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS ) 
+
+    if( (Error = CreateIpForwardEntry( &RowToAdd )) == ERROR_SUCCESS )
 	return 0;
-    
+
     fprintf( stderr, "Route addition failed\n" );
     return Error;
 }
@@ -129,7 +128,7 @@ int del_route( int argc, char **argv ) {
     DWORD Error;
 
     if( argc < 2 || !convert_add_cmd_line( &RowToDel, argc, argv ) ) {
-	fprintf( stderr, 
+	fprintf( stderr,
 		 "route delete usage:\n"
 		 "route delete <target> <gw>\n"
 		 "  Removes a route from the IP route table.\n"
@@ -137,21 +136,21 @@ int del_route( int argc, char **argv ) {
 		 "  <gw>     is the gateway to remove the route from.\n" );
 	return 1;
     }
-    
-    if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS ) 
+
+    if( (Error = DeleteIpForwardEntry( &RowToDel )) == ERROR_SUCCESS )
 	return 0;
-    
+
     fprintf( stderr, "Route addition failed\n" );
     return Error;
 }
 
 int main( int argc, char **argv ) {
     if( argc < 2 ) return usage();
-    else if( !strcasecmp( argv[1], "print" ) ) 
+    else if( !strcasecmp( argv[1], "print" ) )
 	return print_routes();
-    else if( !strcasecmp( argv[1], "add" ) ) 
+    else if( !strcasecmp( argv[1], "add" ) )
 	return add_route( argc-2, argv+2 );
-    else if( !strcasecmp( argv[1], "delete" ) ) 
+    else if( !strcasecmp( argv[1], "delete" ) )
 	return del_route( argc-2, argv+2 );
     else return usage();
 }

reactos/apps/utils/net/route/route.xml

@@ -0,0 +1,9 @@
+<module name="route" type="win32cui" installbase="system32" installname="route.exe" warnings="true">
+	<include base="route">.</include>
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<library>iphlpapi</library>
+	<file>route.c</file>
+	<file>route.rc</file>
+</module>

reactos/apps/utils/net/telnet/Makefile

@@ -1,41 +0,0 @@
-PATH_TO_TOP = ../../../..
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = telnet
-
-TARGET_INSTALLDIR = system32
-
-TARGET_SDKLIBS = ws2_32.a
-
-TARGET_CPPFLAGS = -D__REACTOS__ -D__USE_W32API -Wall
-
-TARGET_GCCLIBS = stdc++
-
-TARGET_OBJECTS = \
-	src/ansiprsr.o \
-	src/keytrans.o \
-	src/tcharmap.o \
-	src/tconsole.o \
-	src/tkeydef.o \
-	src/tkeymap.o \
-	src/tmapldr.o \
-	src/tmouse.o \
-	src/tnclass.o \
-	src/tnclip.o \
-	src/tncon.o \
-	src/tnconfig.o \
-	src/tnerror.o \
-	src/tnetwork.o \
-	src/tnmain.o \
-	src/tnmisc.o \
-	src/tscript.o \
-	src/tscroll.o \
-	src/ttelhndl.o
-
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk

reactos/apps/utils/net/telnet/resource/tnmsg.h

@@ -97,7 +97,7 @@
 #define MSG_WSANO_DATA                  0x2AFC
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        101

reactos/apps/utils/net/telnet/src/ansiprsr.cpp

@@ -53,6 +53,8 @@
 #include <string.h>
 #include "ansiprsr.h"
 
+const int ANSIColors[] = {BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE};
+
 // The constructor now takes different arguments and initializes different
 // variables (Paul Brannan 6/15/98)
 TANSIParser::TANSIParser(TConsole &RefConsole, KeyTranslator &RefKeyTrans,

reactos/apps/utils/net/telnet/src/ansiprsr.h

@@ -10,7 +10,7 @@
 
 // added this color table to make things go faster (Paul Branann 5/8/98)
 enum Colors {BLACK=0, BLUE, GREEN, CYAN, RED, MAGENTA, YELLOW, WHITE};
-static const int ANSIColors[] = {BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE};
+extern const int ANSIColors[];
 
 // This should be greater than the largest conceivable window size
 // 200 should suffice
@@ -49,7 +49,7 @@ private:
 	void SaveCurY(int iY);
 
 	void resetTabStops();
-	
+
 	int iSavedCurX;
 	int iSavedCurY;
 	unsigned char iSavedAttributes;
@@ -77,7 +77,7 @@ public:
 	TANSIParser(TConsole &Console, KeyTranslator &RefKeyTrans,
 		TScroller &RefScroller, TNetwork &NetHandler, TCharmap &RefCharmap);
 	~TANSIParser();
-	
+
 	char* ParseBuffer(char* pszBuffer, char* pszBufferEnd);
 	static int StripBuffer(char* pszBuffer, char* pszBufferEnd, int width);
 };

reactos/apps/utils/net/telnet/src/keytrans.h

@@ -93,5 +93,5 @@ private:
 	int currentKeyMap, mainKeyMap;				// AVS
 
 };
-	
+
 #endif // __KEYTRANS_H

reactos/apps/utils/net/telnet/src/stl_bids.h

@@ -29,36 +29,36 @@ public:
 		growable(delta),
 		lowerbound(lower)
 	{ vector<T>::reserve(upper-lower + 1);}
-	
+
 	~TArrayAsVector( )
 	{ // This call is unnecessary?  (Paul Brannan 5/7/98)
 		// vector<T>::~vector( );
 	}
-	
+
 	int Add(const T& item)
 	{ if(!growable && vector<T>::size( ) == vector<T>::capacity( ))
 	return 0;
 	else
 		insert(vector<T>::end( ), item);
 	return 1; }
-	
+
 	int AddAt(const T& item, size_type index)
 	{ if(!growable &&
 	((vector<T>::size( ) == vector<T>::capacity( )) ||
 	(ZeroBase(index > vector<T>::capacity( )) )))
 	return 0;
 	if(ZeroBase(index) > vector<T>::capacity( )) // out of bounds
-	{ insert(vector<T>::end( ), 
+	{ insert(vector<T>::end( ),
 	ZeroBase(index) - vector<T>::size( ), T( ));
 	insert(vector<T>::end( ), item); }
 	else
 	{ insert(vector<T>::begin( ) + ZeroBase(index), item); }
 	return 1;
 	}
-	
+
 	size_type ArraySize( )
 	{ return vector<T>::capacity( ); }
-	
+
 	size_type BoundBase(size_type location) const
 	{ if(location == UINT_MAX)
 	return INT_MAX;
@@ -66,44 +66,44 @@ public:
 		return location + lowerbound; }
 	void Detach(size_type index)
 	{ erase(vector<T>::begin( ) + ZeroBase(index)); }
-	
+
 	void Detach(const T& item)
 	{ Destroy(Find(item)); }
-	
+
 	void Destroy(size_type index)
 	{ erase(vector<T>::begin( ) + ZeroBase(index)); }
-	
+
 	void Destroy(const T& item)
 	{ Destroy(Find(item)); }
-	
+
 	size_type Find(const T& item) const
-	{ const_iterator location = find(vector<T>::begin( ), 
+	{ const_iterator location = find(vector<T>::begin( ),
 	vector<T>::end( ), item);
 	if(location != vector<T>::end( ))
-		return BoundBase(size_type(location - 
+		return BoundBase(size_type(location -
 		vector<T>::begin( )));
 	else
 		return INT_MAX; }
-	
+
 	size_type GetItemsInContainer( )
 	{ return vector<T>::size( ); }
-	
+
 	void Grow(size_type index)
 	{ if( index < lowerbound )
-	Reallocate(ArraySize( ) + (index - 
+	Reallocate(ArraySize( ) + (index -
 	lowerbound));
 	else if( index >= BoundBase(vector<T>::size( )))
 		Reallocate(ZeroBase(index) ); }
-	
+
 	int HasMember(const T& item)
 	{ if(Find(item) != INT_MAX)
 	return 1;
 	else
 		return 0; }
-	
+
 	int IsEmpty( )
 	{ return vector<T>::empty( ); }
-	
+
 	int IsFull( )
 	{ if(growable)
 	return 0;
@@ -111,42 +111,42 @@ public:
 		return 1;
 	else
 		return 0; }
-	
+
 	size_type LowerBound( )
 	{ return lowerbound; }
-	
+
 	T& operator[] (size_type index)
 	{ return vector<T>::
 	operator[](ZeroBase(index)); }
-	
+
 	const T& operator[] (size_type index) const
 	{ return vector<T>::
 	operator[](ZeroBase(index)); }
-	
+
 	void Flush( )
 	{
 		vector<T>::clear();
 	}
-	
-	void Reallocate(size_type sz, 
+
+	void Reallocate(size_type sz,
 		size_type offset = 0)
 	{ if(offset)
 	insert(vector<T>::begin( ), offset, T( ));
 	vector<T>::reserve(sz);
 	erase(vector<T>::end( ) - offset, vector<T>::end( )); }
-	
+
 	void RemoveEntry(size_type index)
 	{ Detach(index); }
-	
+
 	void SetData(size_type index, const T& item)
 	{ (*this)[index] = item; }
-	
+
 	size_type UpperBound( )
 	{ return BoundBase(vector<T>::capacity( )) - 1; }
-	
+
 	size_type ZeroBase(size_type index) const
 	{ return index - lowerbound; }
-	
+
 	// The assignment operator is not inherited (Paul Brannan 5/25/98)
 	TArrayAsVector& operator=(const TArrayAsVector& v) {
 		vector<T>::operator=(v);

reactos/apps/utils/net/telnet/src/tconsole.h

@@ -25,9 +25,9 @@
  *              |              .            |            |      |
  *              |              .            | <-- OR --> |      |
  *              |              .            |            |      |
- *  CON_LEFT    |              .            | CON_RIGHT  |      
+ *  CON_LEFT    |              .            | CON_RIGHT  |
  *    (=0)      |              .            | (=CON_     |  CON_LINES
- *              |..............*            |   WIDTH)   |      
+ *              |..............*            |   WIDTH)   |
  *              |            (CON_CUR_X,    |            |      |
  *              |             CON_CUR_Y)    |            |      |
  *              |                           |            |      |
@@ -77,15 +77,15 @@ public:
 	void SetCursorPosition(int x, int y);
 	void SetCursorSize(int pct);
 	void MoveCursorPosition(int x, int y);
-	
+
 	// Screen mode/size routines
     int GetWidth() {return CON_COLS;}
     int GetHeight() {return CON_LINES;}
 	void SetExtendedMode(int iFunction, BOOL bEnable);
 	void SetWindowSize(int width, int height);	// Set the size of the window,
 												// but not the buffer
-   
-	// Color/attribute routines	
+
+	// Color/attribute routines
 	void SetAttrib(unsigned char wAttr) {wAttributes = wAttr;}
     unsigned char GetAttrib() {return wAttributes;}
     void Normal();								// Reset all attributes
@@ -130,13 +130,13 @@ public:
 	void index();
 	void reverse_index();
 	void setLineWrap(bool bEnabled){
-		if(!ini.get_lock_linewrap()) 
+		if(!ini.get_lock_linewrap())
 			ini.set_value("Wrap_Line", bEnabled ? "true" : "false");
 	}
 	bool getLineWrap() {return ini.get_wrapline();}
 
     // Insert/delete characters/lines
-	void InsertLine(int numlines);			// Added by Titus von Boxberg 30/3/97		
+	void InsertLine(int numlines);			// Added by Titus von Boxberg 30/3/97
     void InsertCharacter(int numchar);		// "
     void DeleteCharacter(int numchar);		// "
 	void InsertMode(int i) {insert_mode = i;}
@@ -148,7 +148,7 @@ protected:
 	HANDLE hConsole;
 
 	CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo;
-	
+
 	unsigned char wAttributes;
 	unsigned char fg, bg;
 	unsigned char defaultfg, defaultbg;
@@ -157,7 +157,7 @@ protected:
 	bool blink;
 	bool underline;
 	bool reverse;
-	
+
 	int iScrollStart;
 	int iScrollEnd;
 	int insert_mode;

reactos/apps/utils/net/telnet/src/tkeydef.h

@@ -39,20 +39,20 @@ private:
 	KeyDefType	uKeyDef;
 	DWORD		vk_code;
 	DWORD		dwState;
-	
+
 public:
 	TKeyDef();
 	TKeyDef(char *def, DWORD state, DWORD code);
 	TKeyDef(optype op, DWORD state, DWORD code);
 	TKeyDef(const TKeyDef &t);
-	
+
 	char *operator=(char *def);
 	DWORD  operator=(DWORD code);
 	TKeyDef& operator=(const TKeyDef &t);
 	const optype& operator=(optype op);
-		
+
 	~TKeyDef();
-	
+
 #ifdef __BORLANDC__
 	int operator==(TKeyDef &t);
 #else
@@ -61,7 +61,7 @@ public:
 	friend bool operator==(const TKeyDef &t1, const TKeyDef &t2);
 	friend bool operator<(const TKeyDef &t1, const TKeyDef &t2);
 #endif
-	
+
 	const char *GetszKey() { return uKeyDef.szKeyDef; }
 	const KeyDefType GetKeyDef() { return uKeyDef; }
 	DWORD GetCodeKey() { return vk_code; }

reactos/apps/utils/net/telnet/src/tnclass.h

@@ -26,7 +26,7 @@ public:
 	int Open(const char *szHost, const char *strPort = "23");
 	int Close();				// close current connection
 	int Resume();				// resume current session
-	
+
 	// changes to the keymap profile in the file
 	int LoadKeyMap( const char * file, const char * name);
 	void DisplayKeyMap();		// display available keymaps
@@ -35,7 +35,7 @@ private:
 	SOCKET Connect();
 	void telSetConsoleTitle(const char * szHost);
 	void DoInit();
-	
+
 	SOCKET Socket;
 	char strPort[32]; // int iPort;
 	char szHost[127];

reactos/apps/utils/net/telnet/src/tnmisc.h

@@ -2,7 +2,7 @@
 #define __TNMISC_H
 
 // Process-related functions
-BOOL CreateHiddenConsoleProcess(LPCTSTR szChildName, PROCESS_INFORMATION* ppi, 
+BOOL CreateHiddenConsoleProcess(LPCTSTR szChildName, PROCESS_INFORMATION* ppi,
                                 LPHANDLE phInWrite, LPHANDLE phOutRead,
                                 LPHANDLE phErrRead);
 BOOL SpawnProcess(char *cmd_line, PROCESS_INFORMATION *pi);

reactos/apps/utils/net/telnet/src/tnmsg.h

@@ -97,7 +97,7 @@
 #define MSG_WSANO_DATA                  0x2AFC
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        101

reactos/apps/utils/net/telnet/telnet.xml

@@ -0,0 +1,29 @@
+<module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe">
+	<include base="telnet">.</include>
+	<define name="__USE_W32API" />
+	<define name="__REACTOS__" />
+	<library>kernel32</library>
+	<library>ws2_32</library>
+	<directory name="src">
+		<file>ansiprsr.cpp</file>
+		<file>keytrans.cpp</file>
+		<file>tcharmap.cpp</file>
+		<file>tconsole.cpp</file>
+		<file>tkeydef.cpp</file>
+		<file>tkeymap.cpp</file>
+		<file>tmapldr.cpp</file>
+		<file>tmouse.cpp</file>
+		<file>tnclass.cpp</file>
+		<file>tnclip.cpp</file>
+		<file>tncon.cpp</file>
+		<file>tnconfig.cpp</file>
+		<file>tnerror.cpp</file>
+		<file>tnetwork.cpp</file>
+		<file>tnmain.cpp</file>
+		<file>tnmisc.cpp</file>
+		<file>tscript.cpp</file>
+		<file>tscroll.cpp</file>
+		<file>ttelhndl.cpp</file>
+	</directory>
+	<file>telnet.rc</file>
+</module>

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/makefile

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

reactos/apps/utils/net/whois/whois.c

@@ -36,22 +36,13 @@
  *          more convenient fdopen()/fprintf() to send()/recv().
  */
 
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 #include <sys/types.h>
 #include <winsock2.h>
 /* #include <sys/socket.h> */
 /* #include <netinet/in.h> */
 /* #include <netdb.h> */
 #include <stdio.h>
+#include <stdlib.h>
 
 /* #include <various.h> */
 #include <getopt.h>
@@ -92,10 +83,10 @@ int main(int argc, char **argv)
 	if (!argc)
 		usage();
 
-	/* Start winsock */ 
+	/* Start winsock */
 	wVersionRequested = MAKEWORD( 1, 1 );
 	err = WSAStartup( wVersionRequested, &wsaData );
-	if ( err != 0 ) 
+	if ( err != 0 )
 	{
 		/* Tell the user that we couldn't find a usable */
 		/* WinSock DLL.                                 */
@@ -160,6 +151,7 @@ int main(int argc, char **argv)
 		putchar(ch);
 
 	leave(0);
+	return 0;
 }
 
 void usage()

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

@@ -0,0 +1,8 @@
+<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>
+	<file>whois.c</file>
+	<file>whois.rc</file>
+</module>

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

@@ -1,19 +1,20 @@
 /* $Id$
- * 
+ *
  * Convert NTSTATUS codes to Win32 error codes: run it
  * on a NT box AND on a ROS box, then diff the results.
  *
  * This utility should help keeping correct how Ros
  * translates executive's errors codes into Win32 error
  * codes.
- * 
+ *
  * Usage: nts2w32err [MaxStatusCode] > log.txt
- * 
+ *
  * 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/objdir/objdir.c

@@ -35,7 +35,7 @@ RawUszAsz (
 	)
 {
 	register PCHAR a = szA;
-	
+
 	while (*szU) {*szA++ = (CHAR) (0x00ff & * szU++);}
 	*szA = '\0';
 	return a;
@@ -51,7 +51,7 @@ RawAszUsz (
 	)
 {
 	register PWCHAR w = szW;
-	
+
 	while (*szA) {*szW++ = (WCHAR) *szA++;}
 	*szW = L'\0';
 	return w;
@@ -64,7 +64,7 @@ STDCALL
 StatusToName (NTSTATUS Status)
 {
 	static char RawValue [16];
-	
+
 	switch (Status)
 	{
 		case STATUS_BUFFER_TOO_SMALL:
@@ -112,7 +112,7 @@ ExpandSymbolicLink (
 	Path.Buffer = PathBuffer;
 	Path.Length = 0;
 	Path.MaximumLength = sizeof PathBuffer;
-	
+
 	RtlCopyUnicodeString (& Path, DirectoryName);
 	if (L'\\' != Path.Buffer [(Path.Length / sizeof Path.Buffer[0]) - 1])
 	{
@@ -183,7 +183,7 @@ ListDirectory (
 	ULONG			Context = 0;
 	ULONG			ReturnLength = 0;
 	ULONG			EntryCount = 0;
-	
+
 	/* For expanding symbolic links */
 	WCHAR			TargetName [2 * MAX_PATH];
 	UNICODE_STRING		TargetObjectName = {
@@ -222,7 +222,7 @@ ListDirectory (
 		return (FALSE);
 	}
 	printf ("\n Directory of %s\n\n", DirectoryNameA);
-	
+
         for(;;)
         {
 	/*
@@ -355,7 +355,7 @@ int main(int argc, char* argv[])
 			return EXIT_FAILURE;
 		}
 		RawAszUsz (argv[2], DirectoryNameW);
-		Recurse = TRUE;	
+		Recurse = TRUE;
 		break;
 	default:
 		fprintf (