change to "RELEASE"

svn path=/branches/ros-branch-0_2_8/; revision=18832

cis/ReactOS.ApiStatus/Default.build

@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+   Copyright (C) 2005 Casper S. Hornstrup
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<project name="ReactOS.ApiStatus" default="publish">
+
+	<property name="reactos.dir" value="reactos" />
+	<property name="apistatus.xsl" value="rapistatus.xsl" />
+	<property name="apistatus.xml" value="rapistatus.xml" />
+	<property name="apistatus.html" value="index2.html" />
+	<include buildfile="config.include" />
+
+	<target name="publish">
+		<delete dir="${reactos.dir}" if="${directory::exists(reactos.dir)}" />
+		<exec program="svn" commandline="export -r HEAD ${source.url} ${reactos.dir}" />
+		<exec program="rgenstat" commandline="reactos\apistatus.lst ${apistatus.xml}" />
+		<style style="${apistatus.xsl}" destdir="${reactos.dir}" in="${apistatus.xml}" out="${apistatus.html}" />
+		<copy todir="${publish.dir}" overwrite="true">
+			<fileset basedir=".">
+				<include name="${apistatus.xml}" />
+				<include name="${apistatus.html}" />
+			</fileset>
+		</copy>
+		<delete>
+			<fileset basedir=".">
+				<include name="${apistatus.xml}" />
+				<include name="${apistatus.html}" />
+			</fileset>
+		</delete>
+		<delete dir="${reactos.dir}" if="${directory::exists(reactos.dir)}" />
+	</target>
+</project>

cis/ReactOS.ApiStatus/config.template.include

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright (C) 2005 Casper S. Hornstrup
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<project>
+	<property name="source.url" value="svn://svn.reactos.com/trunk/reactos" />
+	<property name="publish.dir" value="C:\api" />
+</project>

cis/ReactOS.ApiStatus/rapistatus.xsl

@@ -76,22 +76,28 @@
 			<xsl:call-template name="ELEMENT">
 				<xsl:with-param name="class">c</xsl:with-param>
 			</xsl:call-template>
-			<xsl:apply-templates/>
+			<xsl:apply-templates>
+				<xsl:with-param name="base"><xsl:value-of select="@base"/></xsl:with-param>
+			</xsl:apply-templates>
 		</DIV>
 	</xsl:template>
 
 
 	<!-- function -->
 	<xsl:template match="functions">
-		<xsl:apply-templates select="function">
-			<xsl:sort select="@name"/>
+		<xsl:param name="base"/>
+		<xsl:apply-templates select="f">
+			<xsl:sort select="@n"/>
+			<xsl:with-param name="base"><xsl:value-of select="$base"/></xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
 
-	<xsl:template match="functions/function">
+	<xsl:template match="functions/f">
+		<xsl:param name="base"/>
 		<DIV>
 			<xsl:call-template name="ELEMENT">
 				<xsl:with-param name="class">f</xsl:with-param>
+				<xsl:with-param name="base"><xsl:value-of select="$base"/></xsl:with-param>
 			</xsl:call-template>
 			<xsl:apply-templates/>
 		</DIV>
@@ -102,6 +108,7 @@
 
 	<xsl:template name="ELEMENT">
 		<xsl:param name="class"/>
+		<xsl:param name="base"/>
 		<xsl:param name="image"/>
 			<xsl:attribute name="class">
 	  		<xsl:value-of select="$class"/>
@@ -109,17 +116,17 @@
 			</xsl:attribute>
 			<xsl:call-template name="toggle"/>
 			<xsl:choose>
-				<xsl:when test="./node() and local-name() != 'component' and @implemented = 'true'">
-          <img src="i.gif" class="i"/>
+				<xsl:when test="local-name() != 'component' and @i = 'true'">
+					<img src="i.gif" class="i"/>
 				</xsl:when>
-				<xsl:when test="./node() and local-name() != 'component' and @implemented = 'false'">
-          <img src="u.gif" class="u"/>
+				<xsl:when test="local-name() != 'component' and @i = 'false'">
+					<img src="u.gif" class="u"/>
 				</xsl:when>
-				<xsl:when test="./node() and local-name() = 'component' and @complete >= 100">
-          <img src="sc.gif"/>
+				<xsl:when test="local-name() = 'component' and @complete >= 100">
+					<img src="sc.gif"/>
 				</xsl:when>
 				<xsl:otherwise>
-          <img src="tb.gif" with="12" height="12"/>
+					<xsl:value-of select="@i"/><img src="tb.gif" with="12" height="12"/>
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:choose>
@@ -131,7 +138,10 @@
 				</xsl:otherwise>
 			</xsl:choose>
 			<xsl:call-template name="name"/>
- 			<xsl:call-template name="file"/>
+			<xsl:call-template name="n"/>
+ 			<xsl:call-template name="file">
+				<xsl:with-param name="base"><xsl:value-of select="$base"/></xsl:with-param>
+			</xsl:call-template>
 			<xsl:call-template name="status"/>
 	</xsl:template>
 
@@ -173,9 +183,16 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="n">
+		<xsl:if test="@n">
+			<SPAN class="l"><xsl:value-of select="@n"/></SPAN>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="file">
-		<xsl:if test="@file">
-			<SPAN class="h"><xsl:value-of select="@file"/></SPAN>
+		<xsl:param name="base"/>
+		<xsl:if test="@f">
+			<SPAN class="h"><xsl:value-of select="$base"/><xsl:value-of select="@f"/></SPAN>
 		</xsl:if>
 	</xsl:template>
 

cis/ReactOS.RevisionISO/config.template.php

@@ -0,0 +1,8 @@
+<?php
+
+/* Rename to config.php */
+
+define(ISO_BASE_URL, "http://www.server.com/iso/");
+define(ISO_PATH, "C:\\iso\\");
+
+?>

cis/ReactOS.RevisionISO/index.php

@@ -0,0 +1,230 @@
+<?php
+
+include ('config.php');
+
+function dm_usort_cmp ($a, $b) {
+  if ($a == $b) return 0;
+  return ($a > $b) ? -1 : 1;
+}
+
+function dm_usort_cmp_desc ($a, $b) {
+  if ($a == $b) return 0;
+  return ($a > $b) ? 1 : -1;
+}
+
+function printHeader()
+{
+?>
+<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<title>ReactOS Revison ISOs</title>
+<meta name="generator" content="Editpad">
+<meta name="keywords" content="OS, ReactOS, operating system">
+<meta name="author" content="ReactOS Project (ros-dev@reactos.com)">
+<style>
+.box
+{
+	padding: 0px;
+	background-color: #88aadd;
+	border-left: 1px solid #f0f0f0;
+	border-right: 1px solid #000000;
+	border-top: 1px solid #f0f0f0;
+	border-bottom: 1px solid #000000;
+}
+</style>
+</head>
+<body bgcolor="#88aadd">
+<form method="post" action="">
+<?php
+}
+
+function printMenu($revision)
+{
+?>
+<table border="0" class="box" cellpadding="5">
+<tr>
+<td height="2px">
+</td>
+</tr>
+<tr>
+<td>
+
+<table border="0" cellpadding="0" cellspacing="0">
+<tr>
+	<td>
+		<b>Branch:</b>
+	</td>
+	<td>
+		<select name="branch" tabindex="1">
+<?php
+
+    $d = dir(ISO_PATH);
+    $i = 0;
+    $dirlist = array();
+    while (false !== ($entry = $d->read())) {
+      if ((strcasecmp($entry, ".") != 0) && (strcasecmp($entry, "..") != 0) && is_dir(ISO_PATH . "\\" . $entry) == "dir") {
+        $dirlist[$i++] = $entry;
+      }
+    }
+    $d->close();
+
+    if (is_array($dirlist)) {
+      usort($dirlist, "dm_usort_cmp");
+      reset($dirlist);
+      while (list($key, $val) = each($dirlist)) {
+        $branch = $val;
+	if ($branch == $_POST["branch"] || (!isset($_POST["branch"]) && $branch == "trunk"))
+		$selected = " selected";
+	else
+		$selected = "";
+	echo "<option$selected>$branch</option>";
+      }
+    }
+	
+?>
+		</select>
+	</td>
+	<td>
+		&nbsp;
+	</td>
+	<td>
+		<b>Revision:</b>
+	</td>
+	<td>
+<?php
+	echo "<input type=\"text\" name=\"revision\" size=\"10\" maxlength=\"10\" tabindex=\"2\" value=\"" . $revision . "\"></input>";
+?>
+	</td>
+	<td>
+		&nbsp;
+	</td>
+	<td>
+		<input type="submit" name="getiso" value="Download" tabindex="3" style="border: 1px solid #000000"></input>
+	</td>
+</tr>
+<tr>
+	<td colspan="7">
+		<hr size="2" width="100%" />
+	</td>
+</tr>
+<tr>
+	<td colspan="4">
+		<input type="submit" name="getnextiso" value="Next ISO" tabindex="4" style="border: 1px solid #000000"></input>
+	</td>
+	<td colspan="3" align="right">
+		<input type="submit" name="getlatestiso" value="Latest ISO" tabindex="5" style="border: 1px solid #000000"></input>
+	</td>
+</tr>
+</table>
+
+</td>
+</tr>
+<tr>
+<td height="2px">
+</td>
+</tr>
+</table>
+<?php
+}
+
+function printFooter()
+{
+?>
+</form>
+
+<script>
+var revision = document.getElementById('revision');
+if (revision) revision.focus();
+</script>
+</body>
+</html>
+<?php
+}
+
+function locateRevisionISO($branch, $revision, $latest)
+{
+	$revision = intval($revision);
+	$path = ISO_PATH . "\\" . $branch;
+	$d = dir($path);
+	$i = 0;
+	$filelist = array();
+	while (false !== ($entry = $d->read())) {
+		if (is_dir($path . "\\" . $entry) != "dir")
+			$filelist[$i++] = $entry;
+	}
+	$d->close();
+	
+	if (is_array($filelist)) {
+		$sortFunction = $latest ? "dm_usort_cmp" : "dm_usort_cmp_desc";
+		usort($filelist, $sortFunction);
+		reset($filelist);
+		while (list($key, $filename) = each($filelist)) {
+			if (ereg('ReactOS-' . $branch . '-r([0-9]*).iso', $filename, $regs))
+			{
+				$thisRevision = intval($regs[1]);
+				if (($latest) && ($thisRevision < $revision))
+					return $regs[1];
+				else if ($thisRevision > $revision)
+					return $regs[1];
+				$lastRevision = $thisRevision;
+			}
+		}
+	}
+
+	return "";
+}
+
+function getNextRevisionISO($branch, $revision)
+{
+	return locateRevisionISO($branch, $revision, false);
+}
+
+function getLatestRevisionISO($branch)
+{
+	return locateRevisionISO($branch, 999999, true);
+}
+
+function main()
+{
+	$branch = $_POST["branch"];
+	$revision = $_POST["revision"];
+
+	$filename = "ReactOS-" . $branch . "-r" . $revision . ".iso";
+	if (file_exists(ISO_PATH . $branch . "\\" . $filename))
+	{
+		$location = ISO_BASE_URL . $branch . "/" . $filename;
+		header("Location: $location");
+		return;
+	}
+	else
+	{
+		printHeader();
+		printMenu($_POST["revision"]);
+		echo "<br><b>No ISO exist for branch '" . $branch . "' and revision " . $revision . ".</b><br><br>";
+		printFooter();
+	}
+}
+
+if (!empty($_POST["getiso"]) && !empty($_POST["branch"]) && !empty($_POST["revision"]) && is_numeric($_POST["revision"]))
+	main();
+else if (!empty($_POST["getnextiso"]) && !empty($_POST["branch"]) && !empty($_POST["revision"]) && is_numeric($_POST["revision"]))
+{
+	printHeader();
+	printMenu(getNextRevisionISO($_POST["branch"], $_POST["revision"]));
+	printFooter();
+}
+else if (!empty($_POST["getlatestiso"]) && !empty($_POST["branch"]))
+{
+	printHeader();
+	printMenu(getLatestRevisionISO($_POST["branch"]));
+	printFooter();
+}
+else
+{
+	printHeader();
+	printMenu($_POST["revision"]);
+	printFooter();
+}
+
+?>

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,33 @@ 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 )
+	{
+		std::vector<std::string>::iterator it = ops.begin();
+		for ( ; it != ops.end(); it++ )
+		{
+			if ( *it == user )
+			{
+				printf ( "remove '%s' to ops list\n", user.c_str() );
+				ops.erase ( it );
+			}
+		}
+		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 +233,270 @@ 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 );
+				}
+				std::vector<std::string>::iterator it = list.list.begin();
+				for ( ; it != list.list.end(); it++ )
+				{
+					if ( *it == s )
+					{
+						list.list.erase ( it );
+						{
+							File f ( ssprintf("%s.txt",list.name.c_str()), "w" );
+							it = list.list.begin();
+							for ( ; it < list.list.end(); it++ )
+								f.printf ( "%s\n", it->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' )
+					{
+						std::vector<std::string>::iterator it = ops.begin();
+						for ( ; it != ops.end(); it++ )
+						{
+							if ( *it == target )
+							{
+								printf ( "remove '%s' to ops list\n", target.c_str() );
+								ops.erase ( it );
+							}
+						}
+						break;
+					}
+				}
+			}
+		}
 		return true;
 	}
 	bool OnMode ( const string& user, const string& mode )
@@ -135,64 +506,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/File.cpp

@@ -14,8 +14,8 @@
 #define nelem(x) (  sizeof(x) / sizeof(x[0])  )
 #endif//nelem
 
-using File::filesize_t;
-using File::fileoff_t;
+typedef File::filesize_t filesize_t;
+typedef File::fileoff_t fileoff_t;
 
 
 fileoff_t File::seek ( fileoff_t offset )

irc/ArchBlackmann/File.h

@@ -18,7 +18,7 @@
 class File
 {
 public:
-#ifdef _MSC_VER
+#ifdef WIN32
 	typedef __int64 fileoff_t;
 	typedef unsigned __int64 filesize_t;
 #else//_MSC_VER

irc/ArchBlackmann/IRCClient.cpp

@@ -10,12 +10,13 @@
 #include <sstream>
 
 #include "IRCClient.h"
-#include "md5.h"
+#include "MD5.h"
 #include "cram_md5.h"
 #include "trim.h"
 #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/auto_vector.h

@@ -53,7 +53,7 @@ public:
 	{
 		ASSERT ( i < _end );
 		reserve ( i + 1 );
-		_arr[i].reset ( ptr );
+		_arr[i].reset ( p );
 	}
 
 	void push_back ( auto_ptr<T>& p )

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/cram_md5.cpp

@@ -2,7 +2,7 @@
 // This file is (C) 2004 Royce Mitchell III
 // and released under the BSD & LGPL licenses
 
-#include "md5.h"
+#include "MD5.h"
 #include "cram_md5.h"
 #include "base64.h"
 

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

@@ -0,0 +1,38 @@
+TARGET := ArchBlackmann.exe
+
+.PHONY: all
+
+all: $(TARGET)
+
+CPP=mingw32-g++
+CFLAGS := -DWIN32 -D_DEBUG -D_CONSOLE -D_MBCS
+LFLAGS :=
+LIBS := -lstdc++ -lws2_32
+
+SRCS := ArchBlackmann.cpp \
+	base64.cpp \
+	chomp.cpp \
+	cram_md5.cpp \
+	File.cpp \
+	IRCClient.cpp \
+	MD5.cpp \
+	panic.cpp \
+	ReliMT.cpp \
+	SockUtils.cpp \
+	SplitJoin.cpp \
+	ssprintf.cpp \
+	ThreadPool.cpp \
+	trim.cpp
+
+OBJS := $(SRCS:.cpp=.o)
+
+$(TARGET): $(OBJS)
+	$(CPP) $(LFLAGS) -o $@ $(OBJS) $(LIBS)
+
+.cpp.o: $<
+	$(CPP) $(CFLAGS) -c $< -o $@
+
+.PHONY: clean
+clean:
+	-@del $(TARGET)
+	-@del $(OBJS)

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 sentences ArchBlackmann says when he finds his name 
+  - curse - this are the curses he looks for 
+  - cursecop - this the responces to them
+  - grovel - this is said when an 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/ssprintf.cpp

@@ -551,7 +551,7 @@ static bool numberfl(std::string& f, long double __n, char exp_sign,  int size,
 	return true;
 }
 
-static int string(std::string& f, const char* s, int len, int field_width, int precision, int flags)
+static int stringa(std::string& f, const char* s, int len, int field_width, int precision, int flags)
 {
 	int i, done = 0;
 	if (s == NULL)
@@ -654,7 +654,7 @@ std::string ssvprintf ( const char *fmt, va_list args )
 	long double _ldouble;
 	double _double;
 	const char *s;
-	const unsigned short* sw;
+	const wchar_t* sw;
 	int result;
 	std::string f;
 
@@ -793,12 +793,12 @@ std::string ssvprintf ( const char *fmt, va_list args )
 		case 's':
 			if (qualifier == 'l' || qualifier == 'w') {
 				/* print unicode string */
-				sw = va_arg(args, wchar_t *);
+				sw = (const wchar_t*)va_arg(args, wchar_t *);
 				result = stringw(f, sw, -1, field_width, precision, flags);
 			} else {
 				/* print ascii string */
 				s = va_arg(args, char *);
-				result = string(f, s, -1, field_width, precision, flags);
+				result = stringa(f, s, -1, field_width, precision, flags);
 			}
 			if (result < 0)
 			{
@@ -811,10 +811,10 @@ std::string ssvprintf ( const char *fmt, va_list args )
 			if (qualifier == 'h') {
 				/* print ascii string */
 				s = va_arg(args, char *);
-				result = string(f, s, -1, field_width, precision, flags);
+				result = stringa(f, s, -1, field_width, precision, flags);
 			} else {
 				/* print unicode string */
-				sw = va_arg(args, wchar_t *);
+				sw = (const wchar_t*)va_arg(args, wchar_t *);
 				result = stringw(f, sw, -1, field_width, precision, flags);
 			}
 			if (result < 0)
@@ -846,7 +846,7 @@ std::string ssvprintf ( const char *fmt, va_list args )
 					s = pas->Buffer;
 					len = pas->Length;
 				}
-				result = string(f, s, -1, field_width, precision, flags);
+				result = stringa(f, s, -1, field_width, precision, flags);
 			}
 			if (result < 0)
 				return -1;

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*?

os2/apps/bepslep/.cvsignore

@@ -1,3 +0,0 @@
-*.exe
-*.o
-*.sym

os2/apps/directory.xml

@@ -0,0 +1,5 @@
+<group>
+	<directory name="bepslep">
+		<xi:include href="bepslep/bepslep.xml" />
+	</directory>
+</group>

os2/copying

@@ -0,0 +1,340 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

os2/directory.xml

@@ -0,0 +1,11 @@
+<group>
+	<directory name="apps">
+		<xi:include href="apps/directory.xml" />
+	</directory>
+	<directory name="lib">
+		<xi:include href="lib/directory.xml" />
+	</directory>
+	<directory name="server">
+		<xi:include href="server/os2srv.xml" />
+	</directory>
+</group>

os2/lib/directory.xml

@@ -0,0 +1,5 @@
+<group>
+	<directory name="doscalls">
+		<xi:include href="doscalls/doscalls.xml" />
+	</directory>
+</group>

os2/lib/doscalls/.cvsignore

@@ -1,5 +0,0 @@
-*.exe
-*.o
-*.sym
-*.dll
-*.coff

os2/lib/doscalls/devices/.cvsignore

@@ -1 +0,0 @@
-*.o

os2/lib/doscalls/devices/devices.cpp

@@ -1,4 +1,4 @@
-/* $Id: devices.cpp,v 1.5 2004/01/31 01:29:11 robertk Exp $
+/* $Id$
 */
 /*
  *

os2/lib/doscalls/doscalls.rc

@@ -1,38 +1,4 @@
-#include <defines.h>
-#include <reactos/resource.h>
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-VS_VERSION_INFO VERSIONINFO
-	FILEVERSION	RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
-	PRODUCTVERSION	RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD	
-	FILEFLAGSMASK	0x3fL
-#ifdef _DEBUG
-	FILEFLAGS	0x1L
-#else
-	FILEFLAGS	0x0L
-#endif
-	FILEOS		0x40004L
-	FILETYPE	0x2L
-	FILESUBTYPE	0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName",	RES_STR_COMPANY_NAME
-            VALUE "FileDescription",	"OS2 subsystem base services\0"
-            VALUE "FileVersion",	RES_STR_FILE_VERSION
-            VALUE "InternalName",	"doscalls\0"
-            VALUE "LegalCopyright",	RES_STR_LEGAL_COPYRIGHT
-            VALUE "OriginalFilename",	"doscalls.dll\0"
-            VALUE "ProductName",	RES_STR_PRODUCT_NAME
-            VALUE "ProductVersion",	RES_STR_PRODUCT_VERSION
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS-OS/2 subsystem base services\0"
+#define REACTOS_STR_INTERNAL_NAME	"doscalls\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"doscalls.dll\0"
+#include <reactos/version.rc>

os2/lib/doscalls/doscalls.xml

@@ -0,0 +1,23 @@
+<module name="doscalls" type="nativedll">
+	<importlibrary definition="doscalls.def" />
+	<include base="doscalls">../../include</include>
+	<linkerflag>-lgcc</linkerflag>
+	<directory name="devices">
+		<file>devices.cpp</file>
+		<file>ioctl_async.cpp</file>
+	</directory>
+	<directory name="file">
+		<file>directory.cpp</file>
+		<file>openclose.cpp</file>
+	</directory>
+	<directory name="memory">
+		<file>memory.cpp</file>
+	</directory>
+	<directory name="misc">
+		<file>doscalls.cpp</file>
+		<file>error.cpp</file>
+	</directory>
+	<directory name="run">
+		<file>process.cpp</file>
+	</directory>
+</module>

os2/lib/doscalls/file/.cvsignore

@@ -1 +0,0 @@
-*.o

os2/lib/doscalls/file/directory.cpp

@@ -1,4 +1,4 @@
-/* $Id: directory.cpp,v 1.1 2002/09/04 22:19:47 robertk Exp $
+/* $Id$
 */
 /*
  *

os2/lib/doscalls/file/openclose.cpp

@@ -1,4 +1,4 @@
-/* $Id: openclose.cpp,v 1.5 2004/01/31 01:29:11 robertk Exp $
+/* $Id$
 */
 /*
  *

os2/lib/doscalls/memory/memory.cpp

@@ -0,0 +1,40 @@
+
+
+
+// TODO: HEader: To be pasted
+
+
+
+
+// INCL_DOSMEMMGR || !INCL_NOCOMMON 
+#define  INCL_DOSMEMMGR 
+#undefine INCL_NOCOMMON
+
+#include <os2.h>
+
+
+// TODO: Expain that this is for memory alloc/free funcs of Os2 api
+
+
+
+// TODO: Implement functions and give them bodies
+ULONG DosAllocMem (PPVOID pBaseAddress, ULONG ulObjectSize,
+    ULONG ulAllocationFlags);
+ULONG DosAllocSharedMem (PPVOID pBaseAddress, PCSZ pszName,
+    ULONG ulObjectSize, ULONG ulAllocationFlags);
+ULONG DosFreeMem (PVOID pBaseAddress);
+ULONG DosGetNamedSharedMem (PPVOID pBaseAddress, PCSZ pszSharedMemName,
+    ULONG ulAttributeFlags);
+ULONG DosGetSharedMem (CPVOID pBaseAddress, ULONG ulAttributeFlags);
+ULONG DosGiveSharedMem (CPVOID pBaseAddress, PID idProcessId,
+    ULONG ulAttributeFlags);
+ULONG DosQueryMem (CPVOID pBaseAddress, PULONG pulRegionSize,
+    PULONG pulAllocationFlags);
+ULONG DosSetMem (CPVOID pBaseAddress, ULONG ulRegionSize,
+    ULONG ulAttributeFlags);
+ULONG DosSubAllocMem (PVOID pOffset, PPVOID pBlockOffset, ULONG ulSize);
+ULONG DosSubFreeMem (PVOID pOffset, PVOID pBlockOffset, ULONG ulSize);
+ULONG DosSubSetMem (PVOID pOffset, ULONG ulFlags, ULONG ulSize);
+ULONG DosSubUnsetMem (PVOID pOffset);
+
+// TODO: Add file to makefile

os2/lib/doscalls/misc/.cvsignore

@@ -1 +0,0 @@
-*.o

os2/lib/doscalls/misc/doscalls.cpp

@@ -1,4 +1,4 @@
-/* $Id: doscalls.cpp,v 1.1 2002/07/26 00:23:13 robertk Exp $
+/* $Id$
 */
 /*
  *

os2/lib/doscalls/misc/error.cpp

@@ -1,4 +1,4 @@
-/* $Id: error.cpp,v 1.3 2003/01/07 16:23:11 robd Exp $
+/* $Id$
 */
 /*
  *

os2/lib/doscalls/run/.cvsignore

@@ -1 +0,0 @@
-*.o

os2/lib/doscalls/run/process.cpp

@@ -1,4 +1,4 @@
-/* $Id: process.cpp,v 1.6 2003/01/07 16:23:11 robd Exp $
+/* $Id$
 */
 /*
  *
@@ -31,7 +31,7 @@ APIRET STDCALL DosSleep(ULONG msec)
 }
 
 
-/* $Id: process.cpp,v 1.6 2003/01/07 16:23:11 robd Exp $ */
+/* $Id$ */
 /* Terminates the current thread or the current Process.
 	Decission is made by action 
 	FIXME:	move this code to OS2.EXE */

os2/makefile

@@ -0,0 +1,14 @@
+all: 
+	@echo To build "os2" there are two paths:
+	@echo ---
+	@echo 1. copy the os2 folder into the reactos\modules folder
+	@echo 2. link reactos/modules/os2 to os2
+	@echo    UNIX
+	@echo         cd $${ROS_SRC_ROOT}/reactos/modules
+	@echo         ln -s $${ROS_SRC_ROOT}/os2 os2
+	@echo    WINDOWS
+	@echo         cd %%ROS_SRC_ROOT%%\reactos\modules
+	@echo         junction os2 %%ROS_SRC_ROOT%%\os2
+	@echo ---
+	@echo Eventually you can run "make depends" in the %%ROS_SRC_ROOT%%\reactos
+	@echo directory to compile it.

os2/server/.cvsignore

@@ -1,3 +0,0 @@
-*.exe
-*.o
-*.sym

os2/server/dllmain.c

@@ -0,0 +1,50 @@
+/* $Id$
+ *
+ * dllmain.c - OS/2 Enviroment Subsystem Server
+ * 
+ * ReactOS Operating System
+ * 
+ * --------------------------------------------------------------------
+ *
+ * This software is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.LIB. If not, write
+ * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+ * MA 02139, USA.  
+ *
+ * --------------------------------------------------------------------
+ */
+#include "os2srv.h"
+
+#define NDEBUG
+#include <debug.h>
+
+/* DLL entry point */
+
+HANDLE Os2SrvDllHandle = 0;
+
+/* FUNCTIONS *****************************************************************/
+
+BOOL STDCALL
+DllMain(HANDLE hDll,
+	DWORD dwReason,
+	LPVOID lpReserved)
+{
+  if (DLL_PROCESS_ATTACH == dwReason)
+    {
+      Os2SrvDllHandle = hDll;
+    }
+
+  return TRUE;
+}
+
+/* EOF */

os2/server/makefile

@@ -1,34 +0,0 @@
-# $Id: makefile,v 1.3 2003/01/12 02:03:06 robd Exp $
-
-PATH_TO_TOP = ../../reactos
-
-TARGET_TYPE = program
-
-TARGET_NORC = yes
-
-TARGET_APPTYPE = native
-
-TARGET_NAME = os2ss
-
-TARGET_INSTALLDIR = system32
-
-TARGET_CFLAGS = -D__NTAPP__
-
-TARGET_SDKLIBS = ntdll.a kernel32.a csrss.a
-
-TARGET_GCCLIBS = stdc++
-
-OBJECTS_API = 
-
-OBJECTS_MISC = \
-  $(TARGET_NAME).o 
-
-TARGET_OBJECTS = \
-  $(OBJECTS_API) \
-  $(OBJECTS_MISC)
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF

os2/server/os2srv.def

@@ -0,0 +1,3 @@
+LIBRARY os2srv.dll
+EXPORTS
+ServerDllInitialization@8

os2/server/os2srv.h

@@ -0,0 +1,13 @@
+#ifndef _OS2SS_H_INCLUDED_
+#define _OS2SS_H_INCLUDED_
+
+/* PSDK/NDK Headers */
+#include <stdio.h>
+#include <windows.h>
+
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
+#include <csr/server.h>
+
+#endif /* ndef _OS2SS_H_INCLUDED_ */

os2/server/os2srv.rc

@@ -0,0 +1,4 @@
+#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS-OS/2 Environment Subsystem Server\0"
+#define REACTOS_STR_INTERNAL_NAME	"os2srv\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"os2srv.dll\0"
+#include <reactos/version.rc>

os2/server/os2srv.xml

@@ -0,0 +1,11 @@
+<module name="os2srv" type="nativedll">
+	<importlibrary definition="os2srv.def" />
+	<include base="os2srv">.</include>
+	<define name="__USE_W32API" />
+	<define name="_DISABLE_TIDENTS" />
+	<library>ntdll</library>
+	<library>csrsrv</library>
+	<file>dllmain.c</file>
+	<file>server.c</file>
+	<file>os2srv.rc</file>
+</module>

os2/server/os2ss.cpp

@@ -1,157 +0,0 @@
-/* $Id: os2ss.cpp,v 1.2 2003/01/07 16:23:12 robd Exp $
- *
- * reactos/subsys/csrss/api/process.c
- *
- * "\windows\ApiPort" port process management functions
- *
- * ReactOS Operating System
- */
- // TODO: Rewrite the whole file. This is just a copy
-
-#include <ddk/ntddk.h>
-#include <ntdll/rtl.h>
-#include <ntos/synch.h>
-
-extern "C" {
-BOOL CsrServerInitialization(ULONG ArgumentCount, PWSTR *ArgumentArray);
-VOID DisplayString(LPCWSTR lpwString);
-//BOOL STDCALL CsrServerInitialization (ULONG ArgumentCount, PWSTR *ArgumentArray);
-//VOID STDCALL DisplayString(LPCWSTR lpwString);
-//VOID STDCALL PrintString (char* fmt, ...);
-//NTSTATUS STDCALL NtDisplayString(IN PUNICODE_STRING DisplayString);
-
-void
-DisplayString(LPCWSTR lpwString)
-{
-  UNICODE_STRING us;
-
-  RtlInitUnicodeString(&us, lpwString);
-  NtDisplayString(&us);
-}
-
-/*
-void
-PrintString(char* fmt,...)
-{
-  char buffer[512];
-  va_list ap;
-  UNICODE_STRING UnicodeString;
-  ANSI_STRING AnsiString;
-
-  va_start(ap, fmt);
-  vsprintf(buffer, fmt, ap);
-  va_end(ap);
-
-  RtlInitAnsiString(&AnsiString, buffer);
-  RtlAnsiStringToUnicodeString(&UnicodeString,
-			       &AnsiString,
-			       TRUE);
-  NtDisplayString(&UnicodeString);
-  RtlFreeUnicodeString(&UnicodeString);
-}
- */
-
-}
-
-/* server variables */
-
-int NumProcesses;
-
-
-
-/* Native image's entry point */
-
-void NtProcessStartup (PPEB Peb)
-{
-   PRTL_USER_PROCESS_PARAMETERS ProcParams;
-   PWSTR ArgBuffer;
-   PWSTR *argv;
-   ULONG argc = 0;
-   int i = 0;
-   int afterlastspace = 0;
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   HANDLE CsrssInitEvent;
-   UNICODE_STRING UnicodeString;
-   NTSTATUS Status;
-
-   ProcParams = RtlNormalizeProcessParams (Peb->ProcessParameters);
-
-   argv = (PWSTR *)RtlAllocateHeap (Peb->ProcessHeap,
-                                    0, 512 * sizeof(PWSTR));
-   ArgBuffer = (PWSTR)RtlAllocateHeap (Peb->ProcessHeap,
-                                       0,
-                                       ProcParams->CommandLine.Length + sizeof(WCHAR));
-   memcpy (ArgBuffer,
-           ProcParams->CommandLine.Buffer,
-           ProcParams->CommandLine.Length + sizeof(WCHAR));
-
-   while (ArgBuffer[i])
-     {
-        if (ArgBuffer[i] == L' ')
-          {
-             argc++;
-             ArgBuffer[i] = L'\0';
-             argv[argc-1] = &(ArgBuffer[afterlastspace]);
-             i++;
-             while (ArgBuffer[i] == L' ')
-                i++;
-             afterlastspace = i;
-          }
-        else
-          {
-             i++;
-          }
-     }
-
-   if (ArgBuffer[afterlastspace] != L'\0')
-     {
-        argc++;
-        ArgBuffer[i] = L'\0';
-        argv[argc-1] = &(ArgBuffer[afterlastspace]);
-     }
-   
-   RtlInitUnicodeString(&UnicodeString,
-                        L"\\CsrssInitDone");
-   InitializeObjectAttributes(&ObjectAttributes,
-                              &UnicodeString,
-                              EVENT_ALL_ACCESS,
-                              0,
-                              NULL);
-   Status = NtOpenEvent(&CsrssInitEvent,
-                        EVENT_ALL_ACCESS,
-                        &ObjectAttributes);
-   if (!NT_SUCCESS(Status))
-     {
-        DbgPrint("CSR: Failed to open csrss notification event\n");
-     }
-   if (CsrServerInitialization (argc, argv) == TRUE)
-     {
-
-        NtSetEvent(CsrssInitEvent,
-                   NULL);
-        
-        RtlFreeHeap (Peb->ProcessHeap,
-                     0, argv);
-        RtlFreeHeap (Peb->ProcessHeap,
-                     0,
-                     ArgBuffer);
-
-        /* terminate the current thread only */
-        NtTerminateThread( NtCurrentThread(), 0 );
-     }
-   else
-     {
-        DisplayString( L"CSR: Subsystem initialization failed.\n" );
-
-        RtlFreeHeap (Peb->ProcessHeap,
-                     0, argv);
-        RtlFreeHeap (Peb->ProcessHeap,
-                     0,
-                     ArgBuffer);
-
-        /*
-         * Tell SM we failed.
-         */
-        NtTerminateProcess( NtCurrentProcess(), 0 );
-   }
-}

os2/server/server.c

@@ -0,0 +1,84 @@
+/* $Id$
+ *
+ * server.c - OS/2 Enviroment Subsystem Server - Initialization
+ * 
+ * ReactOS Operating System
+ * 
+ * --------------------------------------------------------------------
+ *
+ * This software is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this software; see the file COPYING.LIB. If not, write
+ * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+ * MA 02139, USA.  
+ *
+ * --------------------------------------------------------------------
+ */
+#include "os2srv.h"
+
+//#define NDEBUG
+#include <debug.h>
+
+HANDLE Os2ApiPort = NULL;
+
+/**********************************************************************
+ * NAME							PRIVATE
+ * 	Os2StaticServerThread/1
+ */
+VOID STDCALL Os2StaticServerThread (PVOID x)
+{
+	NTSTATUS Status = STATUS_SUCCESS;
+	PPORT_MESSAGE Request = (PPORT_MESSAGE) x;
+	PPORT_MESSAGE Reply = NULL;
+	ULONG MessageType = 0;
+
+	DPRINT("VMSSRV: %s called\n", __FUNCTION__);
+
+	MessageType = Request->u2.s2.Type;
+	DPRINT("VMSSRV: %s received a message (Type=%d)\n",
+		__FUNCTION__, MessageType);
+	switch (MessageType)
+	{
+		default:
+			Reply = Request;
+			Status = NtReplyPort (Os2ApiPort, Reply);
+			break;
+	}
+}
+
+/*=====================================================================
+ * 	PUBLIC API
+ *===================================================================*/
+
+NTSTATUS STDCALL ServerDllInitialization (ULONG ArgumentCount,
+					  LPWSTR *Argument)
+{
+	NTSTATUS Status = STATUS_SUCCESS;
+	
+	DPRINT("VMSSRV: %s called\n", __FUNCTION__);
+
+	// Get the listening port from csrsrv.dll
+	Os2ApiPort = CsrQueryApiPort ();
+	if (NULL == Os2ApiPort)
+	{
+		return STATUS_UNSUCCESSFUL;
+	}
+	// Register our message dispatcher
+	Status = CsrAddStaticServerThread (Os2StaticServerThread);
+	if (NT_SUCCESS(Status))
+	{
+		//TODO: perform the real OS/2 server internal initialization here
+	}
+	return Status;
+}
+
+/* EOF */

posix/Makefile

@@ -1,154 +1,14 @@
-# $Id: Makefile,v 1.7 2003/01/05 18:29:41 robd Exp $
-#
-# ReactOS POSIX+ Personality
-#
-
-PATH_TO_TOP = ../reactos
-
-include $(PATH_TO_TOP)/rules.mak
-
-
-POSIX_OTHER = server #lib
-
-POSIX_TOOLS = mksystab
-
-POSIX_LIBS = psxdll psxx
-
-POSIX_APPS = baresh posixw32
-
-POSIX_MODULES = $(POSIX_OTHER) $(POSIX_TOOLS) $(POSIX_LIBS) $(POSIX_APPS)
-
-all:  implib $(POSIX_MODULES)
-
-implib: $(POSIX_MODULES:%=%_implib)
-
-clean: $(POSIX_MODULES:%=%_clean)
-
-install: $(POSIX_MODULES:%=%_install)
-
-#dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \
-#      $(POSIX_MODULES:%=%_dist)
-
-.PHONY: all implib clean
-#.PHONY: all implib install dist
-
-
-#
-# Other POSIX+ Modules
-#
-$(POSIX_OTHER): %:
-	make -f Makefile -C $(POSIX_PATH)/$*
-
-$(POSIX_OTHER:%=%_implib): %_implib:
-	make -f Makefile -C $(POSIX_PATH)/$* implib
-
-$(POSIX_OTHER:%=%_clean): %_clean:
-	make -f Makefile -C $(POSIX_PATH)/$* clean
-
-$(POSIX_OTHER:%=%_dist): %_dist:
-	make -f Makefile -C $(POSIX_PATH)/$* dist
-
-$(POSIX_OTHER:%=%_install): %_install:
-	make -f Makefile -C $(POSIX_PATH)/$* install
-
-.PHONY: $(POSIX_OTHER) $(POSIX_OTHER:%=%_implib) $(POSIX_OTHER:%=%_clean) $(POSIX_OTHER:%=%_install) $(POSIX_OTHER:%=%_dist)
-
-
-#
-# POSIX+ Tools
-#
-$(POSIX_TOOLS): %:
-	make -f Makefile -C $(POSIX_PATH)/tools/$*
-
-$(POSIX_TOOLS:%=%_implib): %_implib:
-	make -f Makefile -C $(POSIX_PATH)/tools/$* implib
-
-$(POSIX_TOOLS:%=%_clean): %_clean:
-	make -f Makefile -C $(POSIX_PATH)/tools/$* clean
-
-$(POSIX_TOOLS:%=%_dist): %_dist:
-	make -f Makefile -C $(POSIX_PATH)/tools/$* dist
-
-$(POSIX_TOOLS:%=%_install): %_install:
-	make -f Makefile -C $(POSIX_PATH)/tools/$* install
-
-.PHONY: $(POSIX_LIBS) $(POSIX_LIBS:%=%_implib) $(POSIX_LIBS:%=%_clean) $(POSIX_LIBS:%=%_install) $(POSIX_LIBS:%=%_dist)
-
-
-#
-# POSIX+ DLLs
-#
-$(POSIX_LIBS): %:
-	make -f Makefile -C $(POSIX_PATH)/lib/$*
-
-$(POSIX_LIBS:%=%_implib): %_implib:
-	make -f Makefile -C $(POSIX_PATH)/lib/$* implib
-
-$(POSIX_LIBS:%=%_clean): %_clean:
-	make -f Makefile -C $(POSIX_PATH)/lib/$* clean
-
-$(POSIX_LIBS:%=%_dist): %_dist:
-	make -f Makefile -C $(POSIX_PATH)/lib/$* dist
-
-$(POSIX_LIBS:%=%_install): %_install:
-	make -f Makefile -C $(POSIX_PATH)/lib/$* install
-
-.PHONY: $(POSIX_LIBS) $(POSIX_LIBS:%=%_implib) $(POSIX_LIBS:%=%_clean) $(POSIX_LIBS:%=%_install) $(POSIX_LIBS:%=%_dist)
-
-
-#
-# POSIX+ Programs
-#
-$(POSIX_APPS): %:
-	make -f Makefile -C $(POSIX_PATH)/apps/$*
-
-$(POSIX_APPS:%=%_implib): %_implib:
-	make -f Makefile -C $(POSIX_PATH)/apps/$* implib
-
-$(POSIX_APPS:%=%_clean): %_clean:
-	make -f Makefile -C $(POSIX_PATH)/apps/$* clean
-
-$(POSIX_APPS:%=%_dist): %_dist:
-	make -f Makefile -C $(POSIX_PATH)/apps/$* dist
-
-$(POSIX_APPS:%=%_install): %_install:
-	make -f Makefile -C $(POSIX_PATH)/apps/$* install
-
-.PHONY: $(POSIX_APPS) $(POSIX_APPS:%=%_implib) $(POSIX_APPS:%=%_clean) $(POSIX_APPS:%=%_install) $(POSIX_APPS:%=%_dist)
-
-
-etags:
-	find . -name "*.[ch]" -print | etags --language=c -
-
-# EOF
-
-
-
-#CFLAGS=-Iinclude
-
-#all: lib/crt0w32.o
-#	make -C tools
-#	make -C lib
-#	make -C server
-#	make -C lib/psxdll
-#	make -C lib/psxx
-#	make -C apps/baresh
-#	make -C apps/posixw32
-
-#lib/crt0w32.o: lib/crt0w32.c
-
-#implib:
-
-#clean:
-#	make -C lib clean
-#	make -C tools clean
-#	make -C server clean
-#	make -C lib/psxdll clean
-#	make -C lib/psxx clean
-#	make -C apps/baresh clean
-#	make -C apps/posixw32 clean
-#	- $(RM) lib/crt0w32.o
-
-#include $(PATH_TO_TOP)/rules.mak
-
-# EOF
+all: 
+	@echo To build "posix" there are two paths:
+	@echo ---
+	@echo 1. copy the posix folder into the reactos\modules folder
+	@echo 2. link reactos/modules/posix to posix
+	@echo    UNIX
+	@echo         cd $${ROS_SRC_ROOT}/reactos/modules
+	@echo         ln -s $${ROS_SRC_ROOT}/posix posix
+	@echo    WINDOWS
+	@echo         cd %%ROS_SRC_ROOT%%\reactos\modules
+	@echo         junction posix %%ROS_SRC_ROOT%%\posix
+	@echo ---
+	@echo Eventually you can run "make depends" in the %%ROS_SRC_ROOT%%\reactos
+	@echo directory to compile it.

posix/copying

@@ -0,0 +1,340 @@
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          675 Mass Ave, Cambridge, MA 02139, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

posix/directory.xml

@@ -0,0 +1,14 @@
+<group>
+	<directory name="tools">
+		<xi:include href="tools/directory.xml" />
+	</directory>
+	<directory name="apps">
+		<xi:include href="apps/directory.xml" />
+	</directory>
+	<directory name="lib">
+		<xi:include href="lib/directory.xml" />
+	</directory>
+	<directory name="server">
+		<xi:include href="server/psxsrv.xml" />
+	</directory>
+</group>

reactos/CREDITS

@@ -4,7 +4,7 @@ Emanuele Aliberti <ea@iol.it>
 Robert Bergkvist <fragdance@hotmail.com>
 Hartmut Birr <hartmut.birr@gmx.de>
 Aleksey Bragin <aleksey@studiocerebral.com>
-Richard Campbell <eek2121@comcast.net>
+Richard Campbell <betam4x@gmail.com>
 Gunnar Andre' Dalsnes <hardon@online.no>
 Arindam Das
 Boudewijn Dekker <ariadne@xs4all.nl>
@@ -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,80 @@
+<?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>
+	<compilerflag>-Wpointer-arith</compilerflag>
+
+	<include>include</include>
+	<include>include/reactos</include>
+	<include>include/libs</include>
+	<include>include/drivers</include>
+	<include>include/subsys</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 consw 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/patch.c

@@ -0,0 +1,615 @@
+#include <conio.h>
+#include <io.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+/** DEFINES *******************************************************************/
+
+#define PATCH_BUFFER_SIZE           4096    /* Maximum size of a patch */
+#define PATCH_BUFFER_MAGIC          "\xde\xad\xbe\xef MaGiC MaRk "
+#define SIZEOF_PATCH_BUFFER_MAGIC   (sizeof (PATCH_BUFFER_MAGIC) - 1)
+
+/** TYPES *********************************************************************/
+
+typedef struct _PatchedByte
+{
+   int            offset;    /*!< File offset of the patched byte. */
+   unsigned char  expected;  /*!< Expected (original) value of the byte. */
+   unsigned char  patched;   /*!< Patched (new) value for the byte. */
+} PatchedByte;
+
+typedef struct _PatchedFile
+{
+   const char  *name;        /*!< Name of the file to be patched. */
+   int          fileSize;    /*!< Size of the file in bytes. */
+   int          patchCount;  /*!< Number of patches for the file. */
+   PatchedByte *patches;     /*!< Patches for the file. */
+} PatchedFile;
+
+typedef struct _Patch
+{
+   const char   *name;       /*!< Name of the patch. */
+   int           fileCount;  /*!< Number of files in the patch. */
+   PatchedFile  *files;      /*!< Files for the patch. */
+} Patch;
+
+/** FUNCTION PROTOTYPES *******************************************************/
+
+static void printUsage();
+
+/** GLOBALS *******************************************************************/
+
+static Patch m_patch = { NULL, 0, NULL };
+static int m_argc = 0;
+static char **m_argv = NULL;
+
+/* patch buffer where we put the patch info into */
+static unsigned char m_patchBuffer[SIZEOF_PATCH_BUFFER_MAGIC + PATCH_BUFFER_SIZE] =
+   PATCH_BUFFER_MAGIC;
+
+/** HELPER FUNCTIONS **********************************************************/
+
+static void *
+loadFile(const char *fileName, int *fileSize_)
+{
+   FILE *f;
+   struct stat sb;
+   int fileSize;
+   void *p;
+   
+   /* Open the file */
+   f = fopen(fileName, "rb");
+   if (f == NULL)
+   {
+      printf("Couldn't open file %s for reading!\n", fileName);
+      return NULL;
+   }
+   
+   /* Get file size */
+   if (fstat(fileno(f), &sb) < 0)
+   {
+      fclose(f);
+      printf("Couldn't get size of file %s!\n", fileName);
+      return NULL;
+   }
+   fileSize = sb.st_size;
+   
+   /* Load file */
+   p = malloc(fileSize);
+   if (p == NULL)
+   {
+      fclose(f);
+      printf("Couldn't allocate %d bytes for file %s!\n", fileSize, fileName);
+      return NULL;
+   }
+   
+   if (fread(p, fileSize, 1, f) != 1)
+   {
+      fclose(f);
+      free(p);
+      printf("Couldn't read file %s into memory!\n", fileName);
+      return NULL;
+   }
+   
+   /* Close file */
+   fclose(f);
+   
+   *fileSize_ = fileSize;
+   return p;
+}
+
+
+static int
+saveFile(const char *fileName, void *file, int fileSize)
+{
+   FILE *f;
+
+   /* Open the file */
+   f = fopen(fileName, "wb");
+   if (f == NULL)
+   {
+      printf("Couldn't open file %s for writing!\n", fileName);
+      return -1;
+   }
+
+   /* Write file */
+   if (fwrite(file, fileSize, 1, f) != 1)
+   {
+      fclose(f);
+      printf("Couldn't write file %s!\n", fileName);
+      return -1;
+   }
+
+   /* Close file */
+   fclose(f);
+   return 0;
+}
+
+
+static int
+compareFiles(
+   PatchedFile *patchedFile,
+   const char *originalFileName)
+{
+   const char *patchedFileName = patchedFile->name;
+   unsigned char *origChunk, *patchedChunk;
+   int origSize, patchedSize, i, patchCount;
+   PatchedByte *patches = NULL;
+   int patchesArrayCount = 0;
+   
+   /* Load both files */
+   origChunk = loadFile(originalFileName, &origSize);
+   if (origChunk == NULL)
+      return -1;
+   patchedChunk = loadFile(patchedFileName, &patchedSize);
+   if (patchedChunk == NULL)
+   {
+      free(origChunk);
+      return -1;
+   }
+   if (origSize != patchedSize)
+   {
+      free(origChunk);
+      free(patchedChunk);
+      printf("File size of %s and %s differs (%d != %d)\n",
+             originalFileName, patchedFileName,
+             origSize, patchedSize);
+      return -1;
+   }
+   
+   /* Compare the files and record any differences */
+   printf("Comparing %s to %s", originalFileName, patchedFileName);
+   for (i = 0, patchCount = 0; i < origSize; i++)
+   {
+      if (origChunk[i] != patchedChunk[i])
+      {
+         patchCount++;
+         
+         /* Resize patches array if needed */
+         if (patchesArrayCount < patchCount)
+         {
+            PatchedByte *newPatches;
+            newPatches = realloc(patches, patchCount * sizeof (PatchedByte));
+            if (newPatches == NULL)
+            {
+              if (patches != NULL)
+                free(patches);
+              free(origChunk);
+              free(patchedChunk);
+              printf("\nOut of memory (tried to allocated %d bytes)\n",
+                     patchCount * sizeof (PatchedByte));
+              return -1;
+            }
+            patches = newPatches;
+         }
+         
+         /* Fill in patch info */
+         patches[patchCount - 1].offset = i;
+         patches[patchCount - 1].expected = origChunk[i];
+         patches[patchCount - 1].patched = patchedChunk[i];
+      }
+      if ((i % (origSize / 40)) == 0)
+         printf(".");
+   }
+   printf(" %d changed bytes found.\n", patchCount);
+   
+   /* Unload the files */
+   free(origChunk);
+   free(patchedChunk);
+   
+   /* Save patch info */
+   patchedFile->fileSize = patchedSize;
+   patchedFile->patchCount = patchCount;
+   patchedFile->patches = patches;
+   
+   return 0;
+}
+
+
+static int
+outputPatch(const char *outputFileName)
+{
+   unsigned char *patchExe, *patchBuffer;
+   int i, size, patchExeSize, patchSize, stringSize, stringOffset, patchOffset;
+   Patch *patch;
+   PatchedFile *files;
+   
+   printf("Putting patch into %s...\n", outputFileName);
+   
+   /* Calculate size of the patch */
+   patchSize = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount;
+   stringSize = strlen(m_patch.name) + 1;
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      stringSize += strlen(m_patch.files[i].name) + 1;
+      patchSize += sizeof (PatchedByte) * m_patch.files[i].patchCount;
+   }
+   if ((stringSize + patchSize) > PATCH_BUFFER_SIZE)
+   {
+      printf("Patch is too big - %d bytes maximum, %d bytes needed\n",
+             PATCH_BUFFER_SIZE, stringSize + patchSize);
+      return -1;
+   }
+
+   /* Load patch.exe file into memory... */
+   patchExe = loadFile(m_argv[0], &patchExeSize);
+   if (patchExe == NULL)
+   {
+      return -1;
+   }
+   
+   /* Try to find the magic mark for the patch buffer */
+   for (i = 0; i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC); i++)
+   {
+      if (memcmp(patchExe + i, m_patchBuffer, SIZEOF_PATCH_BUFFER_MAGIC) == 0)
+      {
+         patchBuffer = patchExe + i + SIZEOF_PATCH_BUFFER_MAGIC;
+         
+         break;
+      }
+   }
+   if (!(i < (patchExeSize - SIZEOF_PATCH_BUFFER_MAGIC)))
+   {
+      free(patchExe);
+      printf("Couldn't find patch buffer magic in file %s - this shouldn't happen!!!\n", m_argv[0]);
+      return -1;
+   }
+   
+   /* Pack patch together and replace string pointers by offsets */
+   patch = (Patch *)patchBuffer;
+   files = (PatchedFile *)(patchBuffer + sizeof (Patch));
+   patchOffset = sizeof (Patch) + sizeof (PatchedFile) * m_patch.fileCount;
+   stringOffset = patchSize;
+   
+   patch->fileCount = m_patch.fileCount;
+   patch->files = (PatchedFile *)sizeof (Patch);
+
+   patch->name = (const char *)stringOffset;
+   strcpy(patchBuffer + stringOffset, m_patch.name);
+   stringOffset += strlen(m_patch.name) + 1;
+   
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      files[i].fileSize = m_patch.files[i].fileSize;
+      files[i].patchCount = m_patch.files[i].patchCount;
+      
+      files[i].name = (const char *)stringOffset;
+      strcpy(patchBuffer + stringOffset, m_patch.files[i].name);
+      stringOffset += strlen(m_patch.files[i].name) + 1;
+      
+      size = files[i].patchCount * sizeof (PatchedByte);
+      files[i].patches = (PatchedByte *)patchOffset;
+      memcpy(patchBuffer + patchOffset, m_patch.files[i].patches, size);
+      patchOffset += size;
+   }
+   size = patchSize + stringSize;
+   memset(patchBuffer + size, 0, PATCH_BUFFER_SIZE - size);
+
+   /* Save file */
+   if (saveFile(outputFileName, patchExe, patchExeSize) < 0)
+   {
+      free(patchExe);
+      return -1;
+   }
+   free(patchExe);
+
+   printf("Patch saved!\n");
+   return 0;
+}
+
+
+static int
+loadPatch()
+{
+   char *p;
+   Patch *patch;
+   int i;
+   
+   p = m_patchBuffer + SIZEOF_PATCH_BUFFER_MAGIC;
+   patch = (Patch *)p;
+   
+   if (patch->name == NULL)
+   {
+      return -1;
+   }
+   
+   m_patch.name = p + (int)patch->name;
+   m_patch.fileCount = patch->fileCount;
+   m_patch.files = (PatchedFile *)(p + (int)patch->files);
+
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      m_patch.files[i].name = p + (int)m_patch.files[i].name;
+      m_patch.files[i].patches = (PatchedByte *)(p + (int)m_patch.files[i].patches);
+   }
+   
+   printf("Patch %s loaded...\n", m_patch.name);
+   return 0;
+}
+
+
+/** MAIN FUNCTIONS ************************************************************/
+
+static int
+createPatch()
+{
+   int i, status;
+   const char *outputFileName;
+
+   /* Check argument count */
+   if (m_argc < 6 || (m_argc % 2) != 0)
+   {
+      printUsage();
+      return -1;
+   }
+
+   outputFileName = m_argv[3];
+   m_patch.name = m_argv[2];
+
+   /* Allocate PatchedFiles array */
+   m_patch.fileCount = (m_argc - 4) / 2;
+   m_patch.files = malloc(m_patch.fileCount * sizeof (PatchedFile));
+   if (m_patch.files == NULL)
+   {
+      printf("Out of memory!\n");
+      return -1;
+   }
+   memset(m_patch.files, 0, m_patch.fileCount * sizeof (PatchedFile));
+
+   /* Compare original to patched files and fill m_patch.files array */
+   for (i = 0; i < m_patch.fileCount; i++)
+   {
+      m_patch.files[i].name = m_argv[4 + (i * 2) + 1];
+      status = compareFiles(m_patch.files + i, m_argv[4 + (i * 2) + 0]);
+      if (status < 0)
+      {
+         for (i = 0; i < m_patch.fileCount; i++)
+         {
+            if (m_patch.files[i].patches != NULL)
+               free(m_patch.files[i].patches);
+         }
+         free(m_patch.files);
+         m_patch.files = NULL;
+         m_patch.fileCount = 0;
+         return status;
+      }
+   }
+   
+   /* Output patch */
+   return outputPatch(outputFileName);
+}
+
+
+static int
+applyPatch()
+{
+   int c, i, j, fileSize, makeBackup;
+   unsigned char *file;
+   char *p;
+   const char *fileName;
+   char buffer[MAX_PATH];
+   
+
+   if (m_argc > 1 && strcmp(m_argv[1], "-d") != 0)
+   {
+      printUsage();
+      return -1;
+   }
+
+   /* Load patch */
+   if (loadPatch() < 0)
+   {
+      printf("This executable doesn't contain a patch, use -c to create one.\n");
+      return -1;
+   }
+
+   if (m_argc > 1)
+   {
+      /* Dump patch */
+      printf("Patch name: %s\n", m_patch.name);
+      printf("File count: %d\n", m_patch.fileCount);
+      for (i = 0; i < m_patch.fileCount; i++)
+      {
+         printf("----------------------\n"
+                "File name:   %s\n"
+                "File size:   %d bytes\n",
+                m_patch.files[i].name, m_patch.files[i].fileSize);
+         printf("Patch count: %d\n", m_patch.files[i].patchCount);
+         for (j = 0; j < m_patch.files[i].patchCount; j++)
+         {
+            printf("  Offset 0x%x   0x%02x -> 0x%02x\n",
+                   m_patch.files[i].patches[j].offset,
+                   m_patch.files[i].patches[j].expected,
+                   m_patch.files[i].patches[j].patched);
+         }
+      }
+   }
+   else
+   {
+      /* Apply patch */
+      printf("Applying patch...\n");
+      for (i = 0; i < m_patch.fileCount; i++)
+      {
+         /* Load original file */
+         fileName = m_patch.files[i].name;
+applyPatch_retry_file:
+         file = loadFile(fileName, &fileSize);
+         if (file == NULL)
+         {
+            printf("File %s not found! ", fileName);
+applyPatch_file_open_error:
+            printf("(S)kip, (R)etry, (A)bort, (M)anually enter filename");
+            do
+            {
+               c = getch();
+            }
+            while (c != 's' && c != 'r' && c != 'a' && c != 'm');
+            printf("\n");
+            if (c == 's')
+            {
+               continue;
+            }
+            else if (c == 'r')
+            {
+               goto applyPatch_retry_file;
+            }
+            else if (c == 'a')
+            {
+               return 0;
+            }
+            else if (c == 'm')
+            {
+               if (fgets(buffer, sizeof (buffer), stdin) == NULL)
+               {
+                  printf("fgets() failed!\n");
+                  return -1;
+               }
+               p = strchr(buffer, '\r');
+               if (p != NULL)
+                  *p = '\0';
+               p = strchr(buffer, '\n');
+               if (p != NULL)
+                  *p = '\0';
+
+               fileName = buffer;
+               goto applyPatch_retry_file;
+            }
+         }
+
+         /* Check file size */
+         if (fileSize != m_patch.files[i].fileSize)
+         {
+            free(file);
+            printf("File %s has unexpected filesize of %d bytes (%d bytes expected)\n",
+                   fileName, fileSize, m_patch.files[i].fileSize);
+            if (fileName != m_patch.files[i].name) /* manually entered filename */
+            {
+               goto applyPatch_file_open_error;
+            }
+            return -1;
+         }
+         
+         /* Ask for backup */
+         printf("Do you want to make a backup of %s? (Y)es, (N)o, (A)bort", fileName);
+         do
+         {
+            c = getch();
+         }
+         while (c != 'y' && c != 'n' && c != 'a');
+         printf("\n");
+         if (c == 'y')
+         {
+            char buffer[MAX_PATH];
+            snprintf(buffer, MAX_PATH, "%s.bak", fileName);
+            buffer[MAX_PATH-1] = '\0';
+            makeBackup = 1;
+            if (access(buffer, 0) >= 0) /* file exists */
+            {
+               printf("File %s already exists, overwrite? (Y)es, (N)o, (A)bort", buffer);
+               do
+               {
+                  c = getch();
+               }
+               while (c != 'y' && c != 'n' && c != 'a');
+               printf("\n");
+               if (c == 'n')
+                  makeBackup = 0;
+               else if (c == 'a')
+               {
+                  free(file);
+                  return 0;
+               }
+            }
+            if (makeBackup && saveFile(buffer, file, fileSize) < 0)
+            {
+               free(file);
+               return -1;
+            }
+         }
+         else if (c == 'a')
+         {
+            free(file);
+            return 0;
+         }
+         
+         /* Patch file */
+         for (j = 0; j < m_patch.files[i].patchCount; j++)
+         {
+            int offset = m_patch.files[i].patches[j].offset;
+            if (file[offset] != m_patch.files[i].patches[j].expected)
+            {
+               printf("Unexpected value in file %s at offset 0x%x: expected = 0x%02x, found = 0x%02x\n",
+                      fileName, offset, m_patch.files[i].patches[j].expected, file[offset]);
+               free(file);
+               return -1;
+            }
+            file[offset] = m_patch.files[i].patches[j].patched;
+         }
+         
+         /* Save file */
+         if (saveFile(fileName, file, fileSize) < 0)
+         {
+            free(file);
+            return -1;
+         }
+         free(file);
+      }
+      
+      printf("Patch applied sucessfully!\n");
+   }
+
+   return 0;
+}
+
+
+static void
+printUsage()
+{
+   printf("Usage:\n"
+          "%s -c     - Create patch\n"
+          "%s -d     - Dump patch\n"
+          "%s        - Apply patch\n"
+          "\n"
+          "A patch can be created like this:\n"
+          "%s -c \"patch name\" output.exe file1.orig file1.patched[ file2.orig file2.patched[ ...]]\n",
+          m_argv[0], m_argv[0], m_argv[0], m_argv[0]);
+}
+
+
+int
+main(
+   int argc,
+   char *argv[])
+{
+   m_argc = argc;
+   m_argv = argv;
+
+   if (argc >= 2 && (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0))
+   {
+      printUsage();
+      return 0;
+   }
+   else if (argc >= 2 && argv[1][0] == '-')
+   {
+      if (strcmp(argv[1], "-c") == 0)
+      {
+         return createPatch();
+      }
+      else if (strcmp(argv[1], "-d") == 0)
+      {
+         return applyPatch();
+      }
+      else
+      {
+         printf("Unknown option: %s\n"
+                "Use -h for help.\n",
+                argv[1]);
+         return -1;
+      }
+   }
+   
+   return applyPatch();
+}
+

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/consw/consw.c

@@ -1,30 +0,0 @@
-/* $Id$
- *
- * DESCRIPTION: Console mode switcher
- * PROGRAMMER:  Art Yerkes
- * REVISIONS
- * 	2003-07-26 (arty)
- */
-
-#include <windows.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void STDCALL SetConsoleHardwareState( HANDLE conhandle,
-				      DWORD flags,
-				      DWORD state );
-
-int main(int argc, char* argv[])
-{
-  if( argc > 1 ) {
-    SetConsoleHardwareState( GetStdHandle( STD_INPUT_HANDLE ), 
-			     0,
-			     !strcmp( argv[1], "hw" ) );
-  }
-  return 0;
-}
-
-
-/* EOF */

reactos/apps/utils/consw/makefile

@@ -1,23 +0,0 @@
-# $Id$
-
-PATH_TO_TOP = ../../..
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = console
-
-TARGET_NAME = consw
-
-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/consw/runprg.bat

@@ -1,5 +0,0 @@
-@echo off
-rem Turn off cosole, run a program, turn console on
-\reactos\bin\consw sw
-"%1" "%2" "%3" "%4" "%5" "%6" "%7" "%8" "%9"
-\reactos\bin\consw hw

reactos/apps/utils/directory.xml

@@ -0,0 +1,11 @@
+<group>
+<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>
+</group>

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/dumprecbin/dumprecbin.c

@@ -0,0 +1,733 @@
+/* 
+ *
+ *  dumprecbin - dumps a recycle bin database
+ *
+ *  Copyright (c) 2005 by Thomas Weidenmueller <w3seek@reactos.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * TODO: - Support for Vista recycle bins (read the DeleteInfo NTFS streams, also NT 5.x)
+ *       - Support for INFO databases (win95)
+ */
+#include <windows.h>
+#include <winternl.h>
+#include <sddl.h>
+#include <ntsecapi.h>
+#include <stdio.h>
+#include <ctype.h>
+#include <tchar.h>
+
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(status) ((LONG)(status) >= 0)
+#endif
+
+typedef struct _RECYCLE_BIN
+{
+    struct _RECYCLE_BIN *Next;
+    PSID Sid;
+    WCHAR User[255];
+    WCHAR Path[MAX_PATH + 1];
+} RECYCLE_BIN, *PRECYCLE_BIN;
+
+typedef enum
+{
+    ivUnknown = 0,
+    ivINFO2
+} INFO_VERSION, *PINFO_VERSION;
+
+typedef struct _INFO2_HEADER
+{
+    DWORD Version;
+    DWORD Zero1;
+    DWORD Zero2;
+    DWORD RecordSize;
+} INFO2_HEADER, *PINFO2_HEADER;
+
+typedef struct _INFO2_RECORD
+{
+    DWORD Unknown;
+    CHAR AnsiFileName[MAX_PATH];
+    DWORD RecordNumber;
+    DWORD DriveLetter;
+    FILETIME DeletionTime;
+    DWORD DeletedPhysicalSize;
+    WCHAR FileName[MAX_PATH - 2];
+} INFO2_RECORD, *PINFO2_RECORD;
+
+static HANDLE
+OpenAndMapInfoDatabase(IN LPTSTR szFileName,
+                       OUT PVOID *MappingBasePtr,
+                       OUT PLARGE_INTEGER FileSize)
+{
+    HANDLE hFile, hMapping = INVALID_HANDLE_VALUE;
+
+    hFile = CreateFile(szFileName,
+                       FILE_READ_DATA,
+                       FILE_SHARE_READ,
+                       NULL,
+                       OPEN_EXISTING,
+                       FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM,
+                       NULL);
+    if (hFile != INVALID_HANDLE_VALUE)
+    {
+        if (GetFileSizeEx(hFile,
+                          FileSize) &&
+            FileSize->QuadPart >= 0xF)
+        {
+            hMapping = CreateFileMapping(hFile,
+                                         NULL,
+                                         PAGE_READONLY,
+                                         0,
+                                         0,
+                                         NULL);
+            if (hMapping == NULL ||
+                !(*MappingBasePtr = MapViewOfFile(hMapping,
+                                                  FILE_MAP_READ,
+                                                  0,
+                                                  0,
+                                                  0)))
+            {
+                if (hMapping != NULL)
+                {
+                    CloseHandle(hMapping);
+                }
+                hMapping = INVALID_HANDLE_VALUE;
+            }
+        }
+        CloseHandle(hFile);
+    }
+    
+    return hMapping;
+}
+
+static VOID
+UnmapAndCloseDatabase(IN HANDLE hMapping,
+                      IN PVOID MappingBasePtr)
+{
+    UnmapViewOfFile(MappingBasePtr);
+    CloseHandle(hMapping);
+}
+
+static INFO_VERSION
+DetectDatabaseVersion(PVOID Header)
+{
+    PINFO2_HEADER Info2 = (PINFO2_HEADER)Header;
+    INFO_VERSION Version = ivUnknown;
+
+    if (Info2->Version == 5 &&
+        Info2->Zero1 == 0 &&
+        Info2->Zero2 == 0 &&
+        Info2->RecordSize == 0x320)
+    {
+        Version = ivINFO2;
+    }
+    
+    return Version;
+}
+
+static BOOL
+IsValidRecycleBin(IN LPTSTR szPath)
+{
+    TCHAR szFile[MAX_PATH + 1];
+    TCHAR szClsId[48];
+    INFO_VERSION DbVersion = ivUnknown;
+    
+    _stprintf(szFile,
+              _T("%s\\desktop.ini"),
+              szPath);
+
+    /* check if directory contains a valid desktop.ini for the recycle bin */
+    if (GetPrivateProfileString(TEXT(".ShellClassInfo"),
+                                TEXT("CLSID"),
+                                NULL,
+                                szClsId,
+                                sizeof(szClsId) / sizeof(szClsId[0]),
+                                szFile) &&
+        !_tcsicmp(_T("{645FF040-5081-101B-9F08-00AA002F954E}"),
+                  szClsId))
+    {
+        HANDLE hDb;
+        LARGE_INTEGER FileSize;
+        PVOID pDbBase = NULL;
+
+        /* open the database and check the signature */
+        _stprintf(szFile,
+                  _T("%s\\INFO2"),
+                  szPath);
+        hDb = OpenAndMapInfoDatabase(szFile,
+                                     &pDbBase,
+                                     &FileSize);
+        if (hDb != INVALID_HANDLE_VALUE)
+        {
+            DbVersion = DetectDatabaseVersion(pDbBase);
+            UnmapAndCloseDatabase(hDb,
+                                  pDbBase);
+        }
+    }
+
+    return DbVersion != ivUnknown;
+}
+
+static BOOL
+OpenLocalLSAPolicyHandle(IN ACCESS_MASK DesiredAccess,
+                         OUT PLSA_HANDLE PolicyHandle)
+{
+    LSA_OBJECT_ATTRIBUTES LsaObjectAttributes = {0};
+    NTSTATUS Status;
+
+    Status = LsaOpenPolicy(NULL,
+                           &LsaObjectAttributes,
+                           DesiredAccess,
+                           PolicyHandle);
+    if (!NT_SUCCESS(Status))
+    {
+        SetLastError(LsaNtStatusToWinError(Status));
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+static BOOL
+ConvertSIDToAccountName(IN PSID Sid,
+                        OUT LPWSTR User)
+{
+    DWORD AccountNameLen = 0;
+    DWORD DomainNameLen = 0;
+    SID_NAME_USE NameUse;
+    DWORD Error = ERROR_SUCCESS;
+    LPWSTR AccountName, DomainName;
+    BOOL Ret = FALSE;
+
+    if (!LookupAccountSidW(NULL,
+                           Sid,
+                           NULL,
+                           &AccountNameLen,
+                           NULL,
+                           &DomainNameLen,
+                           &NameUse))
+    {
+        Error = GetLastError();
+        if (Error == ERROR_NONE_MAPPED ||
+            Error != ERROR_INSUFFICIENT_BUFFER)
+        {
+            /* some unexpected error occured! */
+            goto ConvertSID;
+        }
+    }
+    
+    AccountName = (LPWSTR)HeapAlloc(GetProcessHeap(),
+                                    0,
+                                    (AccountNameLen + DomainNameLen) * sizeof(WCHAR));
+    if (AccountName != NULL)
+    {
+        LSA_HANDLE PolicyHandle;
+        DomainName = AccountName + AccountNameLen;
+        
+        if (!LookupAccountSidW(NULL,
+                               Sid,
+                               AccountName,
+                               &AccountNameLen,
+                               DomainName,
+                               &DomainNameLen,
+                               &NameUse))
+        {
+            goto BailFreeAccountName;
+        }
+        
+        wcscpy(User,
+               AccountName);
+        Ret = TRUE;
+        
+        if (OpenLocalLSAPolicyHandle(POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION,
+                                     &PolicyHandle))
+        {
+            PLSA_REFERENCED_DOMAIN_LIST ReferencedDomain;
+            PLSA_TRANSLATED_NAME Names;
+            PLSA_TRUST_INFORMATION Domain;
+            PLSA_UNICODE_STRING DomainName;
+            PPOLICY_ACCOUNT_DOMAIN_INFO PolicyAccountDomainInfo = NULL;
+            NTSTATUS Status;
+            
+            Status = LsaLookupSids(PolicyHandle,
+                                   1,
+                                   &Sid,
+                                   &ReferencedDomain,
+                                   &Names);
+            if (NT_SUCCESS(Status))
+            {
+                if (ReferencedDomain != NULL &&
+                    Names->DomainIndex >= 0)
+                {
+                    Domain = &ReferencedDomain->Domains[Names->DomainIndex];
+                    DomainName = &Domain->Name;
+                }
+                else
+                {
+                    Domain = NULL;
+                    DomainName = NULL;
+                }
+                
+                switch (Names->Use)
+                {
+                    case SidTypeAlias:
+                        if (Domain != NULL)
+                        {
+                            /* query the domain name for BUILTIN accounts */
+                            Status = LsaQueryInformationPolicy(PolicyHandle,
+                                                               PolicyAccountDomainInformation,
+                                                               (PVOID*)&PolicyAccountDomainInfo);
+                            if (NT_SUCCESS(Status))
+                            {
+                                DomainName = &PolicyAccountDomainInfo->DomainName;
+                            }
+                        }
+                        /* fall through */
+
+                    case SidTypeUser:
+                    {
+                        if (Domain != NULL)
+                        {
+                            WCHAR *s;
+
+                            /* NOTE: LSA_UNICODE_STRINGs are not always NULL-terminated! */
+
+                            wcscpy(User,
+                                   AccountName);
+                            wcscat(User,
+                                   L" (");
+                            s = User + wcslen(User);
+                            CopyMemory(s,
+                                       DomainName->Buffer,
+                                       DomainName->Length);
+                            s += DomainName->Length / sizeof(WCHAR);
+                            *(s++) = L'\\';
+                            CopyMemory(s,
+                                       Names->Name.Buffer,
+                                       Names->Name.Length);
+                            s += Names->Name.Length / sizeof(WCHAR);
+                            *(s++) = L')';
+                            *s = L'\0';
+                        }
+                        break;
+                    }
+
+                    case SidTypeWellKnownGroup:
+                    {
+                        break;
+                    }
+
+                    default:
+                    {
+                        _ftprintf(stderr,
+                                  _T("Unhandled SID type: 0x%x\n"),
+                                  Names->Use);
+                        break;
+                    }
+                }
+
+                if (PolicyAccountDomainInfo != NULL)
+                {
+                    LsaFreeMemory(PolicyAccountDomainInfo);
+                }
+
+                LsaFreeMemory(ReferencedDomain);
+                LsaFreeMemory(Names);
+            }
+
+            LsaClose(PolicyHandle);
+            
+            if (!NT_SUCCESS(Status))
+            {
+                Ret = FALSE;
+                goto BailFreeAccountName;
+            }
+        }
+        else
+        {
+BailFreeAccountName:
+            HeapFree(GetProcessHeap(),
+                     0,
+                     AccountName);
+            goto ConvertSID;
+        }
+    }
+    
+ConvertSID:
+    if (!Ret)
+    {
+        LPWSTR StrSid;
+        Ret = ConvertSidToStringSidW(Sid,
+                                     &StrSid);
+        if (Ret)
+        {
+            wcscpy(User,
+                   StrSid);
+            LocalFree((HLOCAL)StrSid);
+        }
+    }
+
+    return Ret;
+}
+
+static VOID
+FreeRecycleBinsList(IN OUT PRECYCLE_BIN *RecycleBinsListHead)
+{
+    PRECYCLE_BIN CurrentBin, NextBin;
+
+    CurrentBin = *RecycleBinsListHead;
+    while (CurrentBin != NULL)
+    {
+        NextBin = CurrentBin->Next;
+        LocalFree((HLOCAL)CurrentBin->Sid);
+        HeapFree(GetProcessHeap(),
+                 0,
+                 CurrentBin);
+        CurrentBin = NextBin;
+    }
+
+    *RecycleBinsListHead = NULL;
+}
+
+static BOOL
+LocateRecycleBins(IN LPWSTR szDrive,
+                  OUT PRECYCLE_BIN *RecycleBinsListHead)
+{
+    TCHAR szRecBinPath[MAX_PATH + 1];
+    HANDLE FindResult;
+    WIN32_FIND_DATA FindData;
+    PRECYCLE_BIN NewBin;
+    BOOL Ret = FALSE;
+    
+    FreeRecycleBinsList(RecycleBinsListHead);
+    
+    /*
+     * search for recycle bins on volumes that support file security (NTFS)
+     */
+    _stprintf(szRecBinPath,
+              _T("%lS\\RECYCLER\\*"),
+              szDrive);
+    FindResult = FindFirstFile(szRecBinPath,
+                               &FindData);
+    if (FindResult != INVALID_HANDLE_VALUE)
+    {
+        do
+        {
+            if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY &&
+                _tcscmp(FindData.cFileName,
+                        _T("..")) &&
+                _tcscmp(FindData.cFileName,
+                        _T(".")))
+            {
+                PSID Sid;
+                
+                if (ConvertStringSidToSid(FindData.cFileName,
+                                          &Sid))
+                {
+                    _stprintf(szRecBinPath,
+                              _T("%s\\RECYCLER\\%s"),
+                              szDrive,
+                              FindData.cFileName);
+                    if (IsValidRecycleBin(szRecBinPath))
+                    {
+                        NewBin = (PRECYCLE_BIN)HeapAlloc(GetProcessHeap(),
+                                                         HEAP_ZERO_MEMORY,
+                                                         sizeof(RECYCLE_BIN));
+                        if (NewBin != NULL)
+                        {
+                            _tcscpy(NewBin->Path,
+                                    szRecBinPath);
+
+                            /* convert the SID to an account name */
+                            ConvertSIDToAccountName(Sid,
+                                                    NewBin->User);
+
+                            /* append the recycle bin */
+                            *RecycleBinsListHead = NewBin;
+                            RecycleBinsListHead = &NewBin->Next;
+                            
+                            Ret = TRUE;
+                        }
+                        else
+                            goto ContinueFreeSid;
+                    }
+                    else
+                    {
+ContinueFreeSid:
+                        LocalFree((HLOCAL)Sid);
+                    }
+                }
+            }
+        } while (FindNextFile(FindResult,
+                              &FindData));
+
+        FindClose(FindResult);
+    }
+    
+    /*
+     * search for recycle bins on volumes that don't support file security (FAT)
+     */
+    _stprintf(szRecBinPath,
+              _T("%s\\Recycled"),
+              szDrive);
+    FindResult = FindFirstFile(szRecBinPath,
+                               &FindData);
+    if (FindResult != INVALID_HANDLE_VALUE)
+    {
+        if (IsValidRecycleBin(szRecBinPath))
+        {
+            SID_IDENTIFIER_AUTHORITY WorldSia = {SECURITY_WORLD_SID_AUTHORITY};
+            PSID EveryoneSid;
+            
+            /* create an Everyone SID */
+            if (AllocateAndInitializeSid(&WorldSia,
+                                         1,
+                                         SECURITY_WORLD_RID,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         0,
+                                         &EveryoneSid))
+            {
+                NewBin = (PRECYCLE_BIN)HeapAlloc(GetProcessHeap(),
+                                                 HEAP_ZERO_MEMORY,
+                                                 sizeof(RECYCLE_BIN));
+                if (NewBin != NULL)
+                {
+                    _tcscpy(NewBin->Path,
+                            szRecBinPath);
+
+                    /* convert the SID to an account name */
+                    ConvertSIDToAccountName(EveryoneSid,
+                                            NewBin->User);
+
+                    /* append the recycle bin */
+                    *RecycleBinsListHead = NewBin;
+                    RecycleBinsListHead = &NewBin->Next;
+
+                    Ret = TRUE;
+                }
+                else
+                    FreeSid(EveryoneSid);
+            }
+        }
+        FindClose(FindResult);
+    }
+
+    return Ret;
+}
+
+static VOID
+DiskFileNameFromRecord(OUT LPTSTR szShortFileName,
+                       IN DWORD RecordNumber,
+                       IN WCHAR cDriveLetter,
+                       IN LPWSTR szFileName)
+{
+    LPWSTR FileExt;
+    
+    FileExt = wcsrchr(szFileName,
+                      L'.');
+    if (FileExt != NULL)
+    {
+        _stprintf(szShortFileName,
+                  _T("D%lC%d%lS"),
+                  cDriveLetter,
+                  RecordNumber,
+                  FileExt);
+    }
+    else
+    {
+        _stprintf(szShortFileName,
+                  _T("D%lC%d"),
+                  cDriveLetter,
+                  RecordNumber);
+    }
+}
+
+static BOOL
+DumpRecycleBin(IN PRECYCLE_BIN RecycleBin)
+{
+    WCHAR szFile[MAX_PATH + 1];
+    HANDLE hDb;
+    LARGE_INTEGER FileSize;
+    PVOID pDbBase = NULL;
+    INFO_VERSION Version = ivUnknown;
+
+    _tprintf(_T("Dumping recycle bin of \"%lS\":\n"),
+             RecycleBin->User);
+    _tprintf(_T("Directory: %lS\n\n"),
+             RecycleBin->Path);
+
+    _stprintf(szFile,
+              _T("%s\\INFO2"),
+              RecycleBin->Path);
+    hDb = OpenAndMapInfoDatabase(szFile,
+                                 &pDbBase,
+                                 &FileSize);
+    if (hDb != INVALID_HANDLE_VALUE)
+    {
+        Version = DetectDatabaseVersion(pDbBase);
+
+        /* dump the INFO2 database */
+        switch (Version)
+        {
+            case ivINFO2:
+            {
+                DWORD nRecords;
+                PINFO2_HEADER Info2Header = (PINFO2_HEADER)pDbBase;
+                PINFO2_RECORD Info2 = (PINFO2_RECORD)(Info2Header + 1);
+                int i = 0;
+
+                nRecords = (FileSize.QuadPart - sizeof(INFO2_HEADER)) / Info2Header->RecordSize;
+                
+                while (nRecords != 0)
+                {
+                    /* if the first character of the AnsiFileName is zero, the record
+                       is considered deleted */
+                    if (Info2->AnsiFileName[0] != '\0')
+                    {
+                        _tprintf(_T(" [%d] Record: #%d \"%lS\"\n"),
+                                 ++i,
+                                 Info2->RecordNumber,
+                                 Info2->FileName);
+
+                        DiskFileNameFromRecord(szFile,
+                                               Info2->RecordNumber,
+                                               (WCHAR)Info2->DriveLetter + L'a',
+                                               Info2->FileName);
+                        _tprintf(_T("      Name on disk: \"%s\"\n"),
+                                 szFile);
+                        _tprintf(_T("      Deleted size on disk: %d KB\n"),
+                                 Info2->DeletedPhysicalSize / 1024);
+                    }
+                    nRecords--;
+                    Info2++;
+                }
+                
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        UnmapAndCloseDatabase(hDb,
+                              pDbBase);
+    }
+
+    return FALSE;
+}
+
+static BOOL
+SelectRecycleBin(IN LPWSTR szDrive)
+{
+    BOOL Ret;
+    PRECYCLE_BIN RecycleBinsList = NULL;
+    
+    Ret = LocateRecycleBins(szDrive,
+                            &RecycleBinsList);
+    if (Ret)
+    {
+        if (RecycleBinsList->Next != NULL)
+        {
+            PRECYCLE_BIN CurrentBin = RecycleBinsList;
+            int n = 0, i = 0;
+
+            /* if there are multiple recycle bins ask the user which one to dump */
+            _tprintf(_T("There are several recycle bins on this drive. Select one:\n"));
+            
+            while (CurrentBin != NULL)
+            {
+                _tprintf(_T("  [%d] %lS\n"),
+                         ++i,
+                         CurrentBin->User);
+                CurrentBin = CurrentBin->Next;
+                n++;
+            }
+
+            _tprintf(_T("Enter the number: "));
+DisplayPrompt:
+            _tscanf(_T("%d"),
+                    &i);
+            if (i > n || i < 1)
+            {
+                _tprintf(_T("Please enter a number between 1 and %d: "),
+                         n);
+                goto DisplayPrompt;
+            }
+            
+            /* walk to the selected recycle bin */
+            CurrentBin = RecycleBinsList;
+            while (CurrentBin != NULL && i != 1)
+            {
+                CurrentBin = CurrentBin->Next;
+                i--;
+            }
+            
+            /* dump it */
+            Ret = DumpRecycleBin(CurrentBin);
+        }
+        else
+        {
+            /* dump the first (and only) recycle bin */
+            Ret = DumpRecycleBin(RecycleBinsList);
+        }
+    }
+    else
+    {
+        _ftprintf(stderr,
+                  _T("No recycle bins on this volume!\n"));
+    }
+    
+    FreeRecycleBinsList(&RecycleBinsList);
+
+    return Ret;
+}
+
+static VOID
+PrintHelp(VOID)
+{
+    _ftprintf(stderr,
+              _T("Usage: dumprecbin C:\n"));
+}
+
+int
+main(int argc,
+     char *argv[])
+{
+    if (argc != 2 ||
+        strlen(argv[1]) != 2 || argv[1][1] != ':' ||
+        toupper(argv[1][0]) < 'A' || toupper(argv[1][0]) > 'Z')
+    {
+        PrintHelp();
+        return 1;
+    }
+    else
+    {
+        WCHAR szDrive[3];
+        _stprintf(szDrive,
+                  _T("%lC:"),
+                  argv[1][0]);
+
+        if (!SelectRecycleBin(szDrive))
+            return 1;
+        else
+            return 0;
+    }
+}
+

reactos/apps/utils/dumprecbin/dumprecbin.xml

@@ -0,0 +1,13 @@
+<module name="dumprecbin" type="win32cui" installbase="bin" installname="dumprecbin.exe">
+	<include base="dumprecbin">.</include>
+	<define name="__USE_W32API" />
+	<define name="UNICODE" />
+	<define name="_UNICODE" />
+	<define name="_WIN32_IE">0x0500</define>
+	<define name="_WIN32_WINNT">0x0600</define>
+	<define name="WINVER">0x0600</define>
+	<library>advapi32</library>
+	<library>kernel32</library>
+	<library>ntdll</library>
+	<file>dumprecbin.c</file>
+</module>

reactos/apps/utils/infinst/makefile

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

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

@@ -1,99 +1,602 @@
 /*
- * arp - display ARP cache from the IP stack parameters.
+ *  ReactOS Win32 Applications
+ *  Copyright (C) 2005 ReactOS Team
  *
- * This source code is in the PUBLIC DOMAIN and has NO WARRANTY.
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
- * Robert Dickenson <robd@reactos.org>, August 15, 2002.
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <stdio.h>
+
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS arp utility
+ * FILE:        apps/utils/net/arp/arp.c
+ * PURPOSE:     view and manipulate the ARP cache
+ * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
+ * REVISIONS:
+ *   GM 27/06/05 Created
+ *
+ */
+
 #include <windows.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <tchar.h>
-#include <time.h>
-
-#include <iptypes.h>
-#include <ipexport.h>
+#include <string.h>
+#include <ctype.h>
+#include <winsock2.h>
 #include <iphlpapi.h>
-#include <snmp.h>
 
-#include "trace.h"
+#define WIN32_LEAN_AND_MEAN
+#define UNICODE
+#define _UNICODE
+
+/*
+ * Globals
+ */
+const char SEPERATOR = '-';
+int _CRT_glob = 0; // stop * from listing dir files in arp -d *
 
 
-VOID SNMP_FUNC_TYPE SnmpSvcInitUptime();
-DWORD SNMP_FUNC_TYPE SnmpSvcGetUptime();
+/*
+ * function declerations
+ */
+DWORD DoFormatMessage(DWORD ErrorCode);
+INT PrintEntries(PMIB_IPNETROW pIpAddRow);
+INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr);
+INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr);
+INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr);
+VOID Usage(VOID);
 
-////////////////////////////////////////////////////////////////////////////////
 
-const char szUsage[] = { "\n" \
-    "Displays and modifies the IP Protocol to physical address translation tables\n" \
-    "used by address resolution protocol (ARP).\n" \
-    "\n" \
-    "ARP -s inet_addr eth_addr [if_addr]\n" \
-    "ARP -d inet_addr [if_addr]\n" \
-    "ARP -a [inet_addr] [-N if_addr]\n" \
-    "\n" \
-    "  -a            Displays the active ARP table by querying the current protocol\n" \
-    "                data. If inet_addr is specified, the IP and physical addresses\n" \
-    "                for the specified address are displayed. If more than one\n" \
-    "                network interface is using ARP, each interfaces ARP table is\n" \
-    "                displayed.\n" \
-    "  -g            Indentical to -a.\n" \
-    "  inet_addr     Specifies the IP address.\n" \
-    "  -N if_addr    Displays the ARP table for the specified interface only\n" \
-    "  -d            Deletes the host entry specified by inet_addr. inet_addr may be\n" \
-    "                wildcarded with * to delete all host entries in the ARP table.\n" \
-    "  -s            Adds the host and associates the IP address inet_addr with the\n" \
-    "                physical address eth_addr. The physical address must be specified\n" \
-    "                as 6 hexadecimal characters delimited by hyphens. The new entry\n" \
-    "                will become permanent in the ARP table.\n" \
-    "  eth_addr      Specifies the interface physical address.\n" \
-    "  if_addr       If present, this specifies the IP address of the interface whose\n" \
-    "                address translation table should be modified. If not present, the\n" \
-    "                first applicable interface will be used.\n" \
-    "Example:\n" \
-    "  > arp -s 192.168.0.12   55-AA-55-01-02-03   .... Static entry creation.\n" \
-    "  > arp -a                                    .... ARP table display.\n" \
-    "  > arp -d *                                  .... Delete all ARP table entries.\n"
-};
-
-void usage(void)
+/*
+ * convert error code into meaningful message
+ */
+DWORD DoFormatMessage(DWORD ErrorCode)
 {
-//	fprintf(stderr,"USAGE:\n");
-	fputs(szUsage, stderr);
+    LPVOID lpMsgBuf;
+    DWORD RetVal;
+    /* double brackets to silence the assignment warning message */
+    if ((RetVal = FormatMessage(
+            FORMAT_MESSAGE_ALLOCATE_BUFFER |
+            FORMAT_MESSAGE_FROM_SYSTEM |
+            FORMAT_MESSAGE_IGNORE_INSERTS,
+            NULL,
+            ErrorCode,
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
+            (LPTSTR) &lpMsgBuf,
+            0,
+            NULL ))) {
+        _tprintf(_T("%s"), (LPTSTR)lpMsgBuf);
+
+        LocalFree(lpMsgBuf);
+        /* return number of TCHAR's stored in output buffer
+         * excluding '\0' - as FormatMessage does*/
+        return RetVal;
+    }
+    else
+        return 0;
 }
 
-int main(int argc, char *argv[])
+
+
+/*
+ *
+ * Takes an ARP entry and prints the IP address,
+ * the MAC address and the entry type to screen
+ *
+ */
+INT PrintEntries(PMIB_IPNETROW pIpAddRow)
 {
-    TCHAR szComputerName[50];
-    DWORD dwSize = 50;
+    IN_ADDR inaddr;
+    TCHAR cMacAddr[20];
 
-    int nBytes = 500;
-    BYTE* pCache;
+    /* print IP addresses */
+    inaddr.S_un.S_addr = pIpAddRow->dwAddr;
+    _tprintf(_T("  %-22s"), inet_ntoa(inaddr));
 
-    if (argc > 1) {
-        usage();
-        return 1;
+    /* print MAC address */
+    _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"),
+        pIpAddRow->bPhysAddr[0],
+        pIpAddRow->bPhysAddr[1],
+        pIpAddRow->bPhysAddr[2],
+        pIpAddRow->bPhysAddr[3],
+        pIpAddRow->bPhysAddr[4],
+        pIpAddRow->bPhysAddr[5]);
+    _tprintf(_T("%-22s"), cMacAddr);
+
+    /* print cache type */
+    switch (pIpAddRow->dwType)
+    {
+        case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n"));
+                                      break;
+        case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n"));
+                                      break;
+        case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n"));
+                                      break;
+        case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n"));
+                                      break;
     }
-
-    SnmpSvcInitUptime();
-
-    GetComputerName(szComputerName, &dwSize);
-    _tprintf(_T("ReactOS ARP cache on Computer Name: %s\n"), szComputerName);
-
-    pCache = (BYTE*)SnmpUtilMemAlloc(nBytes);
-
-        Sleep(2500);
-
-    if (pCache != NULL) {
-
-        DWORD dwUptime = SnmpSvcGetUptime();
-
-        _tprintf(_T("SNMP uptime: %d\n"), dwUptime);
-
-        SnmpUtilMemFree(pCache);
-    } else {
-        _tprintf(_T("ERROR: call to SnmpUtilMemAlloc() failed\n"));
-        return 1;
-    }
-	return 0;
+    return EXIT_SUCCESS;
 }
 
+
+/*
+ *
+ * Takes optional parameters of an internet address and interface address.
+ * Retrieve all entries in the ARP cache. If an internet address is
+ * specified, display the ARP entry relating to that address. If an
+ * interface address is specified, display all entries relating to
+ * that interface.
+ *
+ */
+/* FIXME: allow user to specify an interface address, via pszIfAddr */
+INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
+{
+    INT iRet;
+    UINT i, k;
+    PMIB_IPNETTABLE pIpNetTable;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    ULONG ulSize = 0;
+    struct in_addr inaddr, inaddr2;
+    DWORD dwSize = 0;
+    PTCHAR pszIpAddr;
+    TCHAR szIntIpAddr[20];
+
+    /* Return required buffer size */
+    GetIpNetTable(NULL, &ulSize, 0);
+
+    /* allocate memory for ARP address table */
+    pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE));
+    ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
+
+    /* get Arp address table */
+    if (pIpNetTable != NULL)
+        GetIpNetTable(pIpNetTable, &ulSize, TRUE);
+    else
+    {
+        _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
+        free(pIpNetTable);
+        exit(EXIT_FAILURE);
+    }
+
+    /* check there are entries in the table */
+    if (pIpNetTable->dwNumEntries == 0)
+    {
+        _tprintf(_T("No ARP entires found\n"));
+        free(pIpNetTable);
+        exit(EXIT_FAILURE);
+    }
+
+
+
+    /* try doing this in the way it's done above, it's clearer */
+    /* Retrieve the interface-to-ip address mapping
+     * table to get the IP address for adapter */
+    pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+    GetIpAddrTable(pIpAddrTable, &dwSize, 0);   // NULL ?
+
+
+    pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+    //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable));
+
+    if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR)
+    {
+        _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
+        _tprintf(_T("error: %d\n"), WSAGetLastError());
+    }
+
+
+    for (k=0; k < pIpAddrTable->dwNumEntries; k++)
+    {
+        if (pIpNetTable->table[0].dwIndex == pIpAddrTable->table[k].dwIndex)
+        {
+            //printf("debug print: pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex);
+            inaddr2.s_addr = pIpAddrTable->table[k].dwAddr;
+            pszIpAddr = inet_ntoa(inaddr2);
+            strcpy(szIntIpAddr, pszIpAddr);
+        }
+    }
+
+
+    /* print header, including interface IP address and index number */
+    _tprintf(_T("\nInterface: %s --- 0x%lx \n"), szIntIpAddr, pIpNetTable->table[0].dwIndex);
+    _tprintf(_T("  Internet Address      Physical Address      Type\n"));
+
+    /* go through all ARP entries */
+    for (i=0; i < pIpNetTable->dwNumEntries; i++)
+    {
+
+        /* if the user has supplied their own internet addesss *
+         * only print the arp entry which matches that */
+        if (pszInetAddr)
+        {
+            inaddr.S_un.S_addr = pIpNetTable->table[i].dwAddr;
+            pszIpAddr = inet_ntoa(inaddr);
+
+            /* check if it matches, print it */
+            if (strcmp(pszIpAddr, pszInetAddr) == 0)
+                PrintEntries(&pIpNetTable->table[i]);
+        }
+        else
+            /* if an address is not supplied, print all entries */
+            PrintEntries(&pIpNetTable->table[i]);
+    }
+
+    free(pIpNetTable);
+    free(pIpAddrTable);
+
+    return EXIT_SUCCESS;
+}
+
+
+/*
+ *
+ * Takes an internet address, a MAC address and an optional interface
+ * address as arguments and checks their validity.
+ * Fill out an MIB_IPNETROW structure and insert the data into the
+ * ARP cache as a static entry.
+ *
+ */
+INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
+{
+    PMIB_IPNETROW pAddHost;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    PMIB_IPNETTABLE pIpNetTable;
+    DWORD dwIpAddr = 0;
+    DWORD dwSize = 0;
+    ULONG ulSize = 0;
+    INT iRet, i, val;
+    TCHAR c;
+
+    /* error checking */
+
+    /* check IP address */
+    if (pszInetAddr != NULL)
+    {
+        if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE)
+        {
+            _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr);
+            exit(EXIT_FAILURE);
+        }
+    }
+    else
+    {
+        Usage();
+        exit(EXIT_FAILURE);
+    }
+
+    /* check MAC address */
+    if (strlen(pszEthAddr) != 17)
+    {
+        _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr);
+        exit(EXIT_FAILURE);
+    }
+    for (i=0; i<17; i++)
+    {
+        if (pszEthAddr[i] == SEPERATOR)
+            continue;
+
+        if (!isxdigit(pszEthAddr[i]))
+        {
+            _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr);
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    /* We need the IpNetTable to get the adapter index */
+    /* Return required buffer size */
+    GetIpNetTable(NULL, &ulSize, 0);
+    /* allocate memory for ARP address table */
+    pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE));
+    ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
+    /* get Arp address table */
+    if (pIpNetTable != NULL)
+        GetIpNetTable(pIpNetTable, &ulSize, TRUE);
+    else
+    {
+        _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
+        free(pIpNetTable);
+        return -1;
+    }
+
+
+    /* reserve memory on heap and zero */
+    pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW));
+    ZeroMemory(pAddHost, sizeof(MIB_IPNETROW));
+
+    /* set dwIndex field to the index of a local IP address to
+     * indicate the network on which the ARP entry applies */
+    if (pszIfAddr)
+        sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex);
+    else
+    {
+        /* map the IP to the index */
+        pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+        GetIpAddrTable(pIpAddrTable, &dwSize, 0);
+
+        pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+
+        if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR)
+        {
+            _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
+            _tprintf(_T("error: %d\n"), WSAGetLastError());
+        }
+        //printf("debug print: pIpNetTable->table[0].dwIndex = %lx\n", pIpNetTable->table[0].dwIndex);
+        /* needs testing. I get the correct index on my machine, but need others
+         * to test their card index.  Any problems and we can use GetAdaptersInfo instead */
+        pAddHost->dwIndex = pIpNetTable->table[0].dwIndex;
+
+        free(pIpAddrTable);
+    }
+
+    /* Set MAC address to 6 bytes (typical) */
+    pAddHost->dwPhysAddrLen = 6;
+
+
+    /* Encode bPhysAddr into correct byte array */
+    for (i=0; i<6; i++)
+    {
+        val =0;
+        c = toupper(pszEthAddr[i*3]);
+        c = c - (isdigit(c) ? '0' : ('A' - 10));
+        val += c;
+        val = (val << 4);
+        c = toupper(pszEthAddr[i*3 + 1]);
+        c = c - (isdigit(c) ? '0' : ('A' - 10));
+        val += c;
+        pAddHost->bPhysAddr[i] = val;
+    }
+
+
+    /* copy converted IP address */
+    pAddHost->dwAddr = dwIpAddr;
+
+
+    /* set type to static */
+    pAddHost->dwType = MIB_IPNET_TYPE_STATIC;
+
+
+    /* Add the ARP entry */
+    if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR)
+    {
+        DoFormatMessage(iRet);
+        free(pAddHost);
+        exit(EXIT_FAILURE);
+    }
+
+    free(pAddHost);
+
+    return EXIT_SUCCESS;
+}
+
+
+/*
+ *
+ * Takes an internet address and an optional interface address as
+ * arguments and checks their validity.
+ * Add the interface number and IP to an MIB_IPNETROW structure
+ * and remove the entry from the ARP cache.
+ *
+ */
+INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
+{
+    PMIB_IPNETROW pDelHost;
+    PMIB_IPADDRTABLE pIpAddrTable;
+    PMIB_IPNETTABLE pIpNetTable;
+    ULONG ulSize = 0;
+    DWORD dwIpAddr = 0;
+    DWORD dwSize = 0;
+    INT iRet;
+    BOOL bFlushTable = FALSE;
+
+    /* error checking */
+
+    /* check IP address */
+    if (pszInetAddr != NULL)
+    {
+        /* if wildcard is given, set flag to delete all hosts */
+        if (strncmp(pszInetAddr, "*", 1) == 0)
+            bFlushTable = TRUE;
+        else if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE)
+        {
+            _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr);
+            exit(EXIT_FAILURE);
+        }
+    }
+    else
+    {
+        Usage();
+        exit(EXIT_FAILURE);
+    }
+
+    /* We need the IpNetTable to get the adapter index */
+    /* Return required buffer size */
+    GetIpNetTable(NULL, &ulSize, 0);
+    /* allocate memory for ARP address table */
+    pIpNetTable = (PMIB_IPNETTABLE) malloc(ulSize * sizeof(BYTE));
+    ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
+    /* get Arp address table */
+    if (pIpNetTable != NULL)
+        GetIpNetTable(pIpNetTable, &ulSize, TRUE);
+    else
+    {
+        _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
+        free(pIpNetTable);
+        return -1;
+    }
+
+
+     pIpAddrTable = (MIB_IPADDRTABLE*) malloc(sizeof(MIB_IPADDRTABLE));
+     pDelHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW));
+     ZeroMemory(pIpAddrTable, sizeof(MIB_IPADDRTABLE));
+     ZeroMemory(pDelHost, sizeof(MIB_IPNETROW));
+    /* set dwIndex field to the index of a local IP address to
+     * indicate the network on which the ARP entry applies */
+    if (pszIfAddr)
+        sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex);
+    else
+    {
+        /* map the IP to the index */
+        if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER)
+            pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
+
+        if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR)
+        {
+            _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
+            _tprintf(_T("error: %d\n"), WSAGetLastError());
+        }
+        /* needs testing. I get the correct index on my machine, but need others
+         * to test their card index. Any problems and we can use GetAdaptersInfo instead */
+        pDelHost->dwIndex = pIpNetTable->table[0].dwIndex;
+    }
+
+    if (bFlushTable == TRUE)
+    {
+        /* delete arp cache */
+        if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR)
+        {
+            DoFormatMessage(iRet);
+            free(pIpAddrTable);
+            free(pDelHost);
+            return EXIT_FAILURE;
+        }
+        else
+        {
+            free(pIpAddrTable);
+            free(pDelHost);
+            return EXIT_SUCCESS;
+        }
+    }
+    else
+        /* copy converted IP address */
+        pDelHost->dwAddr = dwIpAddr;
+
+    /* Add the ARP entry */
+    if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR)
+    {
+
+        DoFormatMessage(iRet);
+        free(pIpAddrTable);
+        free(pDelHost);
+        exit(EXIT_FAILURE);
+    }
+
+    free(pIpAddrTable);
+    free(pDelHost);
+
+    return EXIT_SUCCESS;
+}
+
+
+
+/*
+ *
+ * print program usage to screen
+ *
+ */
+VOID Usage(VOID)
+{
+    _tprintf(_T("\nDisplays and modifies the IP-to-Physical address translation tables used by\n"
+                "address resolution protocol (ARP).\n"
+                "\n"
+                "ARP -s inet_addr eth_addr [if_addr]\n"
+                "ARP -d inet_addr [if_addr]\n"
+                "ARP -a [inet_addr] [-N if_addr]\n"
+                "\n"
+                "  -a            Displays current ARP entries by interrogating the current\n"
+                "                protocol data.  If inet_addr is specified, the IP and Physical\n"
+                "                addresses for only the specified computer are displayed.  If\n"
+                "                more than one network interface uses ARP, entries for each ARP\n"
+                "                table are displayed.\n"
+                "  -g            Same as -a.\n"
+                "  inet_addr     Specifies an internet address.\n"
+                "  -N if_addr    Displays the ARP entries for the network interface specified\n"
+                "                by if_addr.\n"
+                "  -d            Deletes the host specified by inet_addr. inet_addr may be\n"
+                "                wildcarded with * to delete all hosts.\n"
+                "  -s            Adds the host and associates the Internet address inet_addr\n"
+                "                with the Physical address eth_addr.  The Physical address is\n"
+                "                given as 6 hexadecimal bytes separated by hyphens. The entry\n"
+                "                is permanent.\n"
+                "  eth_addr      Specifies a physical address.\n"
+                "  if_addr       If present, this specifies the Internet address of the\n"
+                "                interface whose address translation table should be modified.\n"
+                "                If not present, the first applicable interface will be used.\n"
+                "Example:\n"
+                "  > arp -s 157.55.85.212   00-aa-00-62-c6-09  .... Adds a static entry.\n"
+                "  > arp -a                                    .... Displays the arp table.\n\n"));
+}
+
+
+
+/*
+ *
+ * Program entry.
+ * Parse command line and call the required function
+ *
+ */
+INT main(int argc, char* argv[])
+{
+    if ((argc < 2) || (argc > 5))
+    {
+       Usage();
+       return EXIT_FAILURE;
+    }
+
+    if (argv[1][0] == '-')
+    {
+        switch (argv[1][1])
+        {
+           case 'a': /* fall through */
+           case 'g':
+                     if (argc == 2)
+                         DisplayArpEntries(NULL, NULL);
+                     else if (argc == 3)
+                         DisplayArpEntries(argv[2], NULL);
+                     else if ((argc == 4) && ((strcmp(argv[2], "-N")) == 0))
+                         DisplayArpEntries(NULL, argv[3]);
+                     else if ((argc == 5) && ((strcmp(argv[3], "-N")) == 0))
+                         DisplayArpEntries(argv[2], argv[4]);
+                     else
+                         Usage();
+                         return EXIT_FAILURE;
+                     break;
+           case 'd': if (argc == 3)
+                         Deletehost(argv[2], NULL);
+                     else if (argc == 4)
+                         Deletehost(argv[2], argv[3]);
+                     else
+                         Usage();
+                         return EXIT_FAILURE;
+                     break;
+           case 's': if (argc == 4)
+                         Addhost(argv[2], argv[3], NULL);
+                     else if (argc == 5)
+                         Addhost(argv[2], argv[3], argv[4]);
+                     else
+                         Usage();
+                         return EXIT_FAILURE;
+                     break;
+           default:
+              Usage();
+              return EXIT_FAILURE;
+        }
+    }
+    else
+        Usage();
+
+    return EXIT_SUCCESS;
+} /*
+warning: suggest parentheses around assignment used as truth value
+warning: char format, void arg (arg 2)*/

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

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

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

@@ -0,0 +1,11 @@
+<module name="arp" type="win32cui" installbase="system32" installname="arp.exe">
+	<include base="arp">.</include>
+	<define name="__USE_W32API" />
+	<library>kernel32</library>
+	<library>iphlpapi</library>
+	<library>ws2_32</library>
+	<library>shlwapi</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,53 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Diagnostic Trace
-//
-#include <stdio.h> 
-#include <stdarg.h>
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <tchar.h>
-#include "trace.h"
-
-
-#ifdef _DEBUG
-
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-
-void _DebugBreak(void)
-{
-    DebugBreak();
-}
-
-void Trace(TCHAR* lpszFormat, ...)
-{
-    va_list args;
-    int nBuf;
-    TCHAR szBuffer[512];
-
-    va_start(args, lpszFormat);
-    nBuf = _vsntprintf(szBuffer, sizeof(szBuffer)/sizeof(TCHAR), lpszFormat, args);
-    OutputDebugString(szBuffer);
-    // was there an error? was the expanded string too long?
-    //ASSERT(nBuf >= 0);
-    va_end(args);
-}
-
-void Assert(void* assert, TCHAR* file, int line, void* msg)
-{
-    if (msg == NULL) {
-        printf("ASSERT -- %s occured on line %u of file %s.\n",
-               assert, line, file);
-    } else {
-        printf("ASSERT -- %s occured on line %u of file %s: Message = %s.\n",
-               assert, line, file, msg);
-    }
-}
-
-#else
-
-void Trace(TCHAR* lpszFormat, ...) { };
-void Assert(void* assert, TCHAR* file, int line, void* msg) { };
-
-#endif //_DEBUG
-/////////////////////////////////////////////////////////////////////////////

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

@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Diagnostic Trace
-//
-#ifndef __TRACE_H__
-#define __TRACE_H__
-
-#ifdef _DEBUG
-
-#ifdef _X86_
-#define BreakPoint()        _asm { int 3h }
-#else
-#define BreakPoint()        _DebugBreak()
-#endif
-
-#ifndef ASSERT
-#define ASSERT(exp)                                 \
-{                                                   \
-    if (!(exp)) {                                   \
-        Assert(#exp, __FILE__, __LINE__, NULL);     \
-        BreakPoint();                               \
-    }                                               \
-}                                                   \
-
-#define ASSERTMSG(exp, msg)                         \
-{                                                   \
-    if (!(exp)) {                                   \
-        Assert(#exp, __FILE__, __LINE__, msg);      \
-        BreakPoint();                               \
-    }                                               \
-}
-#endif
-
-//=============================================================================
-//  MACRO: TRACE()
-//=============================================================================
-
-#define TRACE  Trace
-
-
-#else   // _DEBUG
-
-//=============================================================================
-//  Define away MACRO's ASSERT() and TRACE() in non debug builds
-//=============================================================================
-
-#ifndef ASSERT
-#define ASSERT(exp)
-#define ASSERTMSG(exp, msg)
-#endif
-
-#define TRACE 0 ? (void)0 : Trace
-
-#endif // !_DEBUG
-
-
-void Assert(void* assert, TCHAR* file, int line, void* msg);
-void Trace(TCHAR* lpszFormat, ...);
-
-
-#endif // __TRACE_H__
-/////////////////////////////////////////////////////////////////////////////

reactos/apps/utils/net/directory.xml

@@ -0,0 +1,33 @@
+<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="tcpsvcs">
+    <xi:include href="tcpsvcs/tcpsvcs.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
@@ -84,7 +74,6 @@ int lflag, mflag, pplan, sflag;
 
 static void userlist(int, char **);
 void usage();
-void netfinger(char *);
 
 int
 main(int argc, char **argv)
@@ -161,10 +150,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/getopt.c

@@ -42,6 +42,8 @@ static char sccsid[] = "@(#)getopt.c	4.13 (Berkeley) 2/23/91";
 #include <stdlib.h>
 #include <string.h>
 
+#include "getopt.h"
+
 /*
  * get option letter from argument vector
  */

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,15 +51,15 @@ 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;
-	if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1) {
+	*host++ = '\0';
+	if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != (unsigned long)-1) {
 		def.h_name = host;
 		def.h_addr_list = alist;
 		def.h_addr = (char *)&defaddr;
@@ -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/finger/various.h

@@ -31,4 +31,6 @@ typedef long uid_t;  // SunOS 5.5
 #define index(s, c)  strchr(s, c)
 #define rindex(s, c)  strrchr(s, c)
 
+void netfinger(char *);
+
 #endif