version -> release

svn path=/branches/ros-branch-0_2_9/; revision=20302

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.CustomRevisionAction/App.config

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<configuration>
+	<appSettings>
+		<add key="publishPath" value="c:\iso" /> <!-- c:\iso or ftp://ftp.server.com/iso -->
+		<add key="smtpServer" value="localhost" />
+		<add key="errorEmail" value="mailbox@somewhere-on-the-net" />
+		<add key="makeParameters" value="" />
+		<add key="fastDisk" value="" />
+	</appSettings>
+</configuration>

cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs

@@ -0,0 +1,14 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("ReactOS Sin Custom Revision Action")]
+[assembly: AssemblyDescription("ReactOS Sin Custom Revision Action")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("ReactOS Project")]
+[assembly: AssemblyProduct("React Operating System")]
+[assembly: AssemblyCopyright("Copyright 2005 ReactOS Project")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]

cis/ReactOS.CustomRevisionAction/Default.build

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<project name="ReactOS.CustomRevisionAction" default="build">
+
+	<property name="output.dir" value="bin" />
+
+	<target name="build" description="Build component">
+		<mkdir dir="${output.dir}" />
+		<csc target="exe"
+			output="${output.dir}\ReactOS.CustomRevisionAction.exe"
+			optimize="true"
+			debug="true"
+			doc="${output.dir}\ReactOS.CustomRevisionAction.xml"
+			warninglevel="0">
+			<sources>
+				<include name="*.cs" />
+			</sources>
+		</csc>
+	</target>
+
+</project>

cis/ReactOS.CustomRevisionAction/Main.cs

@@ -0,0 +1,340 @@
+using System;
+using System.IO;
+using System.Diagnostics;
+using System.Configuration;
+using System.Web.Mail;
+
+namespace ReactOS.CustomRevisionAction
+{
+	public class MainClass
+	{
+		/// <summary>
+		/// Path to store published binaries at.
+		/// </summary>
+		private static string publishPath;
+
+		/// <summary>
+		/// Whether or not to publish ISOs to a remote destination via FTP.
+		/// </summary>
+		private static bool PublishToRemoteFtpLocation
+		{
+			get
+			{
+				return publishPath.StartsWith("ftp://");
+			}
+		}
+
+		/// <summary>
+		/// Run the application.
+		/// </summary>
+		/// <param name="script">Script to run.</param>
+		/// <param name="args">Arguments to pass to script.</param>
+		/// <param name="workingDirectory">Working directory.</param>
+		/// <param name="standardOutput">Receives standard output.</param>
+		/// <param name="standardError">Receives standard error.</param>
+		/// <returns>
+		/// Exit code.
+		/// </returns>
+		private static int RunScript(string script,
+		                             string args,
+		                             string workingDirectory,
+		                             out string standardOutput,
+		                             out string standardError)
+		{
+			ProcessStartInfo scriptProcessStartInfo = new ProcessStartInfo(script,
+			                                                               args);
+			scriptProcessStartInfo.CreateNoWindow = true;
+			/*
+			 * All standard streams must be redirected.
+			 * Otherwise DuplicateHandle() will fail.
+			 */
+			scriptProcessStartInfo.RedirectStandardInput = true;
+			scriptProcessStartInfo.RedirectStandardError = true;
+			scriptProcessStartInfo.RedirectStandardOutput = true;
+			scriptProcessStartInfo.UseShellExecute = false;
+			scriptProcessStartInfo.WorkingDirectory = workingDirectory;
+			RedirectableProcess redirectableProcess = new RedirectableProcess(scriptProcessStartInfo);
+			standardOutput = redirectableProcess.ProcessOutput;
+			standardError = redirectableProcess.ProcessError;
+			return redirectableProcess.ExitCode;
+		}
+
+		/// <summary>
+		/// Retrieve value of configuration from configuration file.
+		/// </summary>
+		/// <param name="name">Name of configuration option.</param>
+		/// <param name="defaultValue">
+		/// Default value to be returned if the option does not exist.
+		/// </param>
+		/// <returns>
+		/// Value of configuration option or null if the option does not
+		/// exist and no default value is provided.
+		/// </returns>
+		private static string GetConfigurationOption(string name,
+		                                             string defaultValue)
+		{
+			if (ConfigurationSettings.AppSettings[name] != null)
+				return ConfigurationSettings.AppSettings[name];
+			else
+				return defaultValue;
+		}
+		
+		/// <summary>
+		/// Send an email.
+		/// </summary>
+		/// <param name="subject">Subject of the email.</param>
+		/// <param name="body">Content of the email.</param>
+		private static void SendErrorMail(string subject, string body)
+		{
+			try
+			{
+				string smtpServer = GetConfigurationOption("smtpServer", "localhost");
+				string toEmail = GetConfigurationOption("errorEmail", null);
+				if (toEmail == null)
+					return;
+				string fromEmail = GetConfigurationOption("fromEmail", null);
+				if (fromEmail == null)
+					fromEmail = toEmail;
+				MailMessage mm = new MailMessage();
+				mm.Priority = MailPriority.Normal;
+				mm.From = toEmail;
+				mm.To = toEmail;
+				mm.Subject = subject;
+				mm.Body += body;
+				mm.Body += "<br>";
+				mm.BodyFormat = MailFormat.Html;
+				SmtpMail.SmtpServer = smtpServer;
+				SmtpMail.Send(mm);
+			}
+			catch (Exception ex)
+			{
+				Console.Error.WriteLine(ex.Message);
+			}
+		}
+
+		/// <summary>
+		/// Fail with an error message.
+		/// </summary>
+		/// <param name="revision">Repository revision.</param>
+		/// <param name="text">Error message.</param>
+		private static void Fail(int revision,
+		                         string text)
+		{
+			Console.WriteLine(text);
+			Console.Error.WriteLine(text);
+			SendErrorMail(String.Format("[{0}] ReactOS Publish Error", revision), text);
+		}
+
+		/// <summary>
+		/// Fail with an error message.
+		/// </summary>
+		/// <param name="text">Error message.</param>
+		private static void Fail(string text)
+		{
+			Console.WriteLine(text);
+			Console.Error.WriteLine(text);
+			SendErrorMail("ReactOS Publish Error", text);
+		}
+
+		/// <summary>
+		/// Generate filename of distribution.
+		/// </summary>
+		/// <param name="branch">Branch.</param>
+		/// <param name="revision">Revision.</param>
+		private static string GetDistributionFilename(string branch,
+		                                              int revision)
+		{
+			return String.Format("ReactOS-{0}-r{1}.iso",
+			                     branch,
+			                     revision);
+		}
+
+		private static void SplitRemotePublishPath(string publishPath,
+		                                           out string server,
+		                                           out string directory)
+		{
+			string searchString = "://";
+			int index = publishPath.IndexOf(searchString);
+			if (index == -1)
+				throw new InvalidOperationException();
+			int endOfProtocolIndex = index + searchString.Length;
+			string withoutProtocol = publishPath.Remove(0, endOfProtocolIndex);
+			index = withoutProtocol.IndexOf("/");
+			if (index == -1)
+			{
+				server = withoutProtocol;
+				directory = "";
+			}
+			else
+			{
+				server = withoutProtocol.Substring(0, index);
+				directory = withoutProtocol.Remove(0, index + 1);
+			}
+		}
+
+		/// <summary>
+		/// Copy ISO to the (remote) destination.
+		/// </summary>
+		/// <param name="sourceFilename">Name of source ISO file to copy.</param>
+		/// <param name="branch">Branch.</param>
+		/// <param name="revision">Revision.</param>
+		/// <remarks>
+		/// Structure is ftp://ftp.server.com/whereever/<branch>/ReactOS-<branch>-r<revision>.iso.
+		/// </remarks>
+		private static void CopyISOToRemoteFtpDestination(string sourceFilename,
+		                                                  string branch,
+		                                                  int revision)
+		{
+			string distributionFilename = GetDistributionFilename(branch,
+			                                                      revision);
+			string destinationFilename = Path.Combine(Path.GetDirectoryName(sourceFilename),
+			                                          distributionFilename);
+			File.Move(sourceFilename, destinationFilename);
+			string server;
+			string directory;
+			SplitRemotePublishPath(publishPath, out server, out directory);
+			FtpClient ftpClient = new FtpClient(server, "anonymous", "sin@svn.reactos.com");
+			ftpClient.Login();
+			if (directory != "")
+				ftpClient.ChangeDir(directory);
+			/* Create destination directory if it does not already exist */
+			if (!ftpClient.DirectoryExists(branch))
+				ftpClient.MakeDir(branch);
+			ftpClient.ChangeDir(branch);
+			ftpClient.Upload(destinationFilename);
+			ftpClient.Close();
+		}
+
+		/// <summary>
+		/// Copy ISO to the (local) destination.
+		/// </summary>
+		/// <param name="sourceFilename">Name of source ISO file to copy.</param>
+		/// <param name="branch">Branch.</param>
+		/// <param name="revision">Revision.</param>
+		/// <remarks>
+		/// Structure is <branch>\ReactOS-<branch>-r<revision>.iso.
+		/// </remarks>
+		private static void CopyISOToLocalDestination(string sourceFilename,
+		                                              string branch,
+		                                              int revision)
+		{
+			string distributionFilename = GetDistributionFilename(branch,
+			                                                      revision);
+			string destinationDirectory = Path.Combine(publishPath,
+			                                           branch);
+			string destinationFilename = Path.Combine(destinationDirectory,
+			                                          distributionFilename);
+			if (!Directory.Exists(destinationDirectory))
+				Directory.CreateDirectory(destinationDirectory);
+			File.Copy(sourceFilename,
+			          destinationFilename);
+		}
+
+		/// <summary>
+		/// Copy ISO to the destination.
+		/// </summary>
+		/// <param name="sourceFilename">Name of source ISO file to copy.</param>
+		/// <param name="branch">Branch.</param>
+		/// <param name="revision">Revision.</param>
+		/// <remarks>
+		/// Structure is <branch>\ReactOS-<branch>-r<revision>.iso.
+		/// </remarks>
+		private static void CopyISOToDestination(string sourceFilename,
+		                                         string branch,
+		                                         int revision)
+		{
+			if (PublishToRemoteFtpLocation)
+				CopyISOToRemoteFtpDestination(sourceFilename, branch, revision);
+			else
+				CopyISOToLocalDestination(sourceFilename, branch, revision);
+		}
+
+		/// <summary>
+		/// Publish a revision of ReactOS.
+		/// </summary>
+		/// <param name="text">Error message.</param>
+		private static int Publish(string branch,
+		                           int revision,
+		                           string workingDirectory)
+		{
+			string make = "mingw32-make";
+			string makeParameters = GetConfigurationOption("makeParameters", "");
+			string reactosDirectory = Path.Combine(workingDirectory,
+			                                       "reactos");
+			Console.WriteLine(String.Format("ReactOS directory is {0}",
+			                                reactosDirectory));
+			string standardOutput;
+			string standardError;
+			int exitCode = RunScript(make,
+			                         makeParameters + " bootcd",
+			                         reactosDirectory,
+			                         out standardOutput,
+			                         out standardError);
+			if (exitCode != 0)
+			{
+				Fail(revision,
+				     String.Format("make bootcd failed: (error: {0}) {1}",
+				                   standardError,
+				                   standardOutput));
+				return exitCode;
+			}
+
+			string sourceFilename = Path.Combine(reactosDirectory,
+			                                     "ReactOS.iso");
+			if (File.Exists(sourceFilename))
+				CopyISOToDestination(sourceFilename,
+				                     branch,
+				                     revision);
+			else
+			{
+				Fail(revision,
+				     "make bootcd produced no ReactOS.iso");
+				return exitCode;
+			}
+
+			return exitCode;
+		}
+
+		/// <summary>
+		/// Program entry point.
+		/// </summary>
+		/// <param name="args">Arguments from command line.</param>
+		/// <remarks>
+		/// If exit code is 0, then the commit was processed successfully.
+		/// If exit code is 1, then the commit was not processed successfully.
+		/// </remarks>
+		public static void Main(string[] args)
+		{
+			try
+			{
+				System.Environment.ExitCode = 1;
+
+				publishPath = ConfigurationSettings.AppSettings["publishPath"];
+				if (publishPath == null)
+				{
+					Fail("PublishPath option not set.");
+					return;
+				}
+
+				if (args.Length < 3)
+				{
+					Fail("Usage: ReactOS.CustomRevisionAction action branch revision");
+					return;
+				}
+
+				string action = args[0]; /* bootcd */
+				string branch = args[1];
+				int revision = Int32.Parse(args[2]);
+				
+				System.Environment.ExitCode = Publish(branch,
+				                                      revision,
+				                                      System.Environment.CurrentDirectory);
+			}
+			catch (Exception ex)
+			{
+				Fail(String.Format("Exception: {0}", ex));
+				System.Environment.ExitCode = 1;
+			}
+		}
+	}
+}

cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs

@@ -0,0 +1,145 @@
+/*
+ * When using the ProcessStartInfo.RedirectStandardXxx properties there is a chance of
+ * the parent and child process blocking due to a race condition. This class handles the
+ * problem.
+ * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemdiagnosticsprocessstartinfoclassredirectstandardoutputtopic.asp
+ */
+using System;
+using System.IO;
+using System.Threading;
+using System.Diagnostics;
+
+namespace ReactOS.CustomRevisionAction
+{
+	/// <summary>
+	/// Process that redirects standard output and standard error streams.
+	/// </summary>
+	public class RedirectableProcess
+	{
+		/// <summary>
+		/// Process.
+		/// </summary>
+		private Process process;
+
+		/// <summary>
+		/// Redirected standard error stream.
+		/// </summary>
+		private string processError;
+
+		/// <summary>
+		/// Redirected standard output stream.
+		/// </summary>
+		private string processOutput;
+
+		/// <summary>
+		/// Exit code.
+		/// </summary>
+		private int exitCode;
+
+		/// <summary>
+		/// Redirected standard error stream.
+		/// </summary>
+		public string ProcessError
+		{
+			get
+			{
+				return processError;
+			}
+		}
+
+		/// <summary>
+		/// Redirected standard output stream.
+		/// </summary>
+		public string ProcessOutput
+		{
+			get
+			{
+				return processOutput;
+			}
+		}
+
+		/// <summary>
+		/// Exit code.
+		/// </summary>
+		public int ExitCode
+		{
+			get
+			{
+				return exitCode;
+			}
+		}
+
+		/// <summary>
+		/// Run an excutable and redirect standard error and/or standard output safely.
+		/// </summary>
+		public RedirectableProcess(ProcessStartInfo processStartInfo)
+		{
+			Run(processStartInfo, null);
+		}
+
+		/// <summary>
+		/// Run an excutable and redirect standard error and/or standard output safely.
+		/// </summary>
+		public RedirectableProcess(ProcessStartInfo processStartInfo, string input)
+		{
+			Run(processStartInfo, input);
+		}
+		
+		private void Run(ProcessStartInfo processStartInfo, string input)
+		{
+			process = new Process();
+			process.StartInfo = processStartInfo;
+			process.Start();
+			if (processStartInfo.RedirectStandardInput && input != null)
+			{
+				process.StandardInput.AutoFlush = true;
+				process.StandardInput.WriteLine(input);
+			}
+			Thread readStandardError = null;
+			if (processStartInfo.RedirectStandardError)
+			{
+				readStandardError = new Thread(new ThreadStart(ReadStandardError));
+				readStandardError.Start();
+			}
+			Thread readStandardOutput = null;
+			if (processStartInfo.RedirectStandardOutput)
+			{
+				readStandardOutput = new Thread(new ThreadStart(ReadStandardOutput));
+				readStandardOutput.Start();
+			}
+			if (processStartInfo.RedirectStandardError)
+			{
+				readStandardError.Join();
+			}
+			if (processStartInfo.RedirectStandardOutput)
+			{
+				readStandardOutput.Join();
+			}
+			process.WaitForExit();
+			exitCode = process.ExitCode;
+			process = null;
+		}
+
+		/// <summary>
+		/// Read standard error thread entry-point.
+		/// </summary>		
+		private void ReadStandardError()
+		{
+			if (process != null)
+			{
+				processError = process.StandardError.ReadToEnd();
+			}
+		}
+
+		/// <summary>
+		/// Read standard output thread entry-point.
+		/// </summary>		
+		private void ReadStandardOutput()
+		{
+			if (process != null)
+			{
+				processOutput = process.StandardOutput.ReadToEnd();
+			}
+		}
+	}
+}

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();
+}
+
+?>

cis/ReactOS.Verify/App.config

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<configuration>
+	<appSettings>
+		<add key="smtpServer" value="localhost" />
+		<add key="errorEmail" value="mailbox@somewhere-on-the-net" />
+		<add key="makeParameters" value="" />
+		<add key="fastDisk" value="" />
+	</appSettings>
+</configuration>

cis/ReactOS.Verify/AssemblyInfo.cs

@@ -0,0 +1,14 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("ReactOS Sin Verifier")]
+[assembly: AssemblyDescription("ReactOS Sin Verifier")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("ReactOS Project")]
+[assembly: AssemblyProduct("React Operating System")]
+[assembly: AssemblyCopyright("Copyright 2005 ReactOS Project")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]

cis/ReactOS.Verify/Default.build

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<project name="ReactOS.Verify" default="build">
+
+	<property name="output.dir" value="bin" />
+
+	<target name="build" description="Build component">
+		<mkdir dir="${output.dir}" />
+		<csc target="exe"
+			output="${output.dir}\ReactOS.Verify.exe"
+			optimize="true"
+			debug="true"
+			doc="${output.dir}\ReactOS.Verify.xml"
+			warninglevel="0">
+			<sources>
+				<include name="*.cs" />
+			</sources>
+		</csc>
+	</target>
+
+</project>

cis/ReactOS.Verify/Main.cs

@@ -0,0 +1,279 @@
+using System;
+using System.IO;
+using System.Diagnostics;
+using System.Configuration;
+using System.Web.Mail;
+using System.Collections;
+using System.Collections.Specialized;
+
+namespace ReactOS.Verify
+{
+	public class MainClass
+	{
+		/// <summary>
+		/// Run the application.
+		/// </summary>
+		/// <param name="script">Script to run.</param>
+		/// <param name="args">Arguments to pass to script.</param>
+		/// <param name="workingDirectory">Working directory.</param>
+		/// <param name="standardOutput">Receives standard output.</param>
+		/// <param name="standardError">Receives standard error.</param>
+		/// <returns>
+		/// Exit code.
+		/// </returns>
+		private static int RunScript(string script,
+		                             string args,
+		                             string workingDirectory,
+		                             StringDictionary environmentVarables,
+		                             out string standardOutput,
+		                             out string standardError)
+		{
+			ProcessStartInfo scriptProcessStartInfo = new ProcessStartInfo(script,
+			                                                               args);
+			scriptProcessStartInfo.CreateNoWindow = true;
+			/*
+			 * All standard streams must be redirected.
+			 * Otherwise DuplicateHandle() will fail.
+			 */
+			scriptProcessStartInfo.RedirectStandardInput = true;
+			scriptProcessStartInfo.RedirectStandardError = true;
+			scriptProcessStartInfo.RedirectStandardOutput = true;
+			scriptProcessStartInfo.UseShellExecute = false;
+			scriptProcessStartInfo.WorkingDirectory = workingDirectory;
+			if (environmentVarables != null)
+			{
+				foreach (DictionaryEntry de in environmentVarables)
+					scriptProcessStartInfo.EnvironmentVariables.Add(de.Key as string, de.Value as string);
+			}
+			RedirectableProcess redirectableProcess = new RedirectableProcess(scriptProcessStartInfo);
+			standardOutput = redirectableProcess.ProcessOutput;
+			standardError = redirectableProcess.ProcessError;
+			return redirectableProcess.ExitCode;
+		}
+
+		/// <summary>
+		/// Retrieve value of configuration from configuration file.
+		/// </summary>
+		/// <param name="name">Name of configuration option.</param>
+		/// <param name="defaultValue">
+		/// Default value to be returned if the option does not exist.
+		/// </param>
+		/// <returns>
+		/// Value of configuration option or null if the option does not
+		/// exist and no default value is provided.
+		/// </returns>
+		private static string GetConfigurationOption(string name,
+		                                             string defaultValue)
+		{
+			if (ConfigurationSettings.AppSettings[name] != null)
+			{
+				string s = ConfigurationSettings.AppSettings[name].Trim();
+				return s.Equals(String.Empty) ? defaultValue : s;
+			}
+			else
+				return defaultValue;
+		}
+
+		/// <summary>
+		/// Send an email.
+		/// </summary>
+		/// <param name="subject">Subject of the email.</param>
+		/// <param name="body">Content of the email.</param>
+		private static void SendErrorMail(string subject, string body)
+		{
+			try
+			{
+				string smtpServer = GetConfigurationOption("smtpServer", "localhost");
+				string email = GetConfigurationOption("errorEmail", null);
+				if (email == null)
+					return;
+				MailMessage mm = new MailMessage();
+				mm.Priority = MailPriority.Normal;
+				mm.From = email;
+				mm.To = email;
+				mm.Subject = subject;
+				mm.Body += body;
+				mm.Body += "<br>";
+				mm.BodyFormat = MailFormat.Html;
+				SmtpMail.SmtpServer = smtpServer;
+				SmtpMail.Send(mm);
+			}
+			catch (Exception ex)
+			{
+				Console.Error.WriteLine(ex.Message);
+			}
+		}
+
+		/// <summary>
+		/// Fail with an error message.
+		/// </summary>
+		/// <param name="text">Error message.</param>
+		private static void Fail(string text)
+		{
+			Console.WriteLine(text);
+		}
+		
+		/// <summary>
+		/// Paths to fast disk for temporary files.
+		/// </summary>
+		private static string TemporaryFastDisk
+		{
+			get
+			{
+				string temporaryFastDisk = GetConfigurationOption("temporaryFastDisk", null);
+				if (temporaryFastDisk == null || temporaryFastDisk.Trim().Equals(String.Empty))
+					return null;
+				return temporaryFastDisk.Trim();
+			}
+		}
+
+		/// <summary>
+		/// Paths to fast disk for intermediate files.
+		/// </summary>
+		private static string IntermediateFastDisk
+		{
+			get
+			{
+				string intermediateFastDisk = GetConfigurationOption("intermediateFastDisk", null);
+				if (intermediateFastDisk == null || intermediateFastDisk.Trim().Equals(String.Empty))
+					return null;
+				return intermediateFastDisk.Trim();
+			}
+		}
+
+		/// <summary>
+		/// Paths to fast disk for output files.
+		/// </summary>
+		private static string OutputFastDisk
+		{
+			get
+			{
+				string outputFastDisk = GetConfigurationOption("outputFastDisk", null);
+				if (outputFastDisk == null || outputFastDisk.Trim().Equals(String.Empty))
+					return null;
+				return outputFastDisk.Trim();
+			}
+		}
+
+		/// <summary>
+		/// Return collection of environment variables.
+		/// </summary>
+		/// <returns>Collection of environment variables or null if there is none.</returns>
+		private static StringDictionary GetEnvironmentVarables()
+		{
+			StringDictionary environmentVarables = new StringDictionary();
+			if (TemporaryFastDisk != null)
+				environmentVarables.Add("ROS_TEMPORARY", TemporaryFastDisk);
+			if (IntermediateFastDisk != null)
+				environmentVarables.Add("ROS_INTERMEDIATE", IntermediateFastDisk);
+			if (OutputFastDisk != null)
+				environmentVarables.Add("ROS_OUTPUT", OutputFastDisk);
+			return environmentVarables;
+		}
+		
+		/// <summary>
+		/// Run make.
+		/// </summary>
+		/// <param name="arguments">Arguments.</param>
+		/// <param name="standardOutput">Receives standard output.</param>
+		/// <param name="standardError">Receives standard error.</param>
+		/// <returns>Make exit code.</returns>
+		private static int RunMake(string arguments,
+		                           out string standardOutput,
+		                           out string standardError)
+		{
+			string make = "mingw32-make";
+			string makeParameters = GetConfigurationOption("makeParameters", "");
+			string reactosDirectory = Path.Combine(System.Environment.CurrentDirectory,
+			                                       "reactos");
+			return RunScript(make,
+			                 makeParameters + " " + arguments,
+			                 reactosDirectory,
+			                 GetEnvironmentVarables(),
+			                 out standardOutput,
+			                 out standardError);
+		}
+		
+		/// <summary>
+		/// Verify a revision of ReactOS by building it all.
+		/// </summary>
+		private static int VerifyFull()
+		{
+			string standardOutput;
+			string standardError;
+			int exitCode = RunMake("bootcd",
+			                       out standardOutput,
+			                       out standardError);
+			if (exitCode != 0)
+			{
+				Fail(String.Format("make bootcd failed: (error: {0}) {1}",
+				                   standardError,
+				                   standardOutput));
+				return exitCode;
+			}
+			
+			string reactosDirectory = Path.Combine(System.Environment.CurrentDirectory,
+			                                       "reactos");
+			string isoFilename = Path.Combine(reactosDirectory,
+			                                  "ReactOS.iso");
+			if (!File.Exists(isoFilename))
+				Fail("make bootcd produced no ReactOS.iso");
+
+			return exitCode;
+		}
+
+		/// <summary>
+		/// Verify a revision of ReactOS by building parts.
+		/// </summary>
+		/// <param name="components">Comma separated list of components to build.</param>
+		private static int VerifyPartial(string components)
+		{
+			string standardOutput;
+			string standardError;
+			string componentParameters = "\"" + components.Replace(",", "\" \"") + "\"";
+			int exitCode = RunMake(componentParameters,
+			                       out standardOutput,
+			                       out standardError);
+			if (exitCode != 0)
+				Fail(String.Format("make failed for targets {0}: (error: {1}) {2}",
+				                   componentParameters,
+				                   standardError,
+				                   standardOutput));
+			return exitCode;
+		}
+
+		/// <summary>
+		/// Verify a revision of ReactOS.
+		/// </summary>
+		/// <param name="args">Arguments from command line.</param>
+		private static int Verify(string[] args)
+		{
+			if (args.Length > 0)
+				return VerifyPartial(args[0]);
+			else
+				return VerifyFull();
+		}
+
+		/// <summary>
+		/// Program entry point.
+		/// </summary>
+		/// <param name="args">Arguments from command line.</param>
+		/// <remarks>
+		/// If exit code is 0, then the commit was processed successfully.
+		/// If exit code is 1, then the commit was not processed successfully.
+		/// </remarks>
+		public static void Main(string[] args)
+		{
+			try
+			{
+				System.Environment.ExitCode = Verify(args);
+			}
+			catch (Exception ex)
+			{
+				string text = String.Format("Exception: {0}", ex);
+				SendErrorMail("ReactOS Verify Error", text);
+				System.Environment.ExitCode = 1;
+			}
+		}
+	}
+}

cis/ReactOS.Verify/RedirectableProcess.cs

@@ -0,0 +1,145 @@
+/*
+ * When using the ProcessStartInfo.RedirectStandardXxx properties there is a chance of
+ * the parent and child process blocking due to a race condition. This class handles the
+ * problem.
+ * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfsystemdiagnosticsprocessstartinfoclassredirectstandardoutputtopic.asp
+ */
+using System;
+using System.IO;
+using System.Threading;
+using System.Diagnostics;
+
+namespace ReactOS.Verify
+{
+	/// <summary>
+	/// Process that redirects standard output and standard error streams.
+	/// </summary>
+	public class RedirectableProcess
+	{
+		/// <summary>
+		/// Process.
+		/// </summary>
+		private Process process;
+
+		/// <summary>
+		/// Redirected standard error stream.
+		/// </summary>
+		private string processError;
+
+		/// <summary>
+		/// Redirected standard output stream.
+		/// </summary>
+		private string processOutput;
+
+		/// <summary>
+		/// Exit code.
+		/// </summary>
+		private int exitCode;
+
+		/// <summary>
+		/// Redirected standard error stream.
+		/// </summary>
+		public string ProcessError
+		{
+			get
+			{
+				return processError;
+			}
+		}
+
+		/// <summary>
+		/// Redirected standard output stream.
+		/// </summary>
+		public string ProcessOutput
+		{
+			get
+			{
+				return processOutput;
+			}
+		}
+
+		/// <summary>
+		/// Exit code.
+		/// </summary>
+		public int ExitCode
+		{
+			get
+			{
+				return exitCode;
+			}
+		}
+
+		/// <summary>
+		/// Run an excutable and redirect standard error and/or standard output safely.
+		/// </summary>
+		public RedirectableProcess(ProcessStartInfo processStartInfo)
+		{
+			Run(processStartInfo, null);
+		}
+
+		/// <summary>
+		/// Run an excutable and redirect standard error and/or standard output safely.
+		/// </summary>
+		public RedirectableProcess(ProcessStartInfo processStartInfo, string input)
+		{
+			Run(processStartInfo, input);
+		}
+		
+		private void Run(ProcessStartInfo processStartInfo, string input)
+		{
+			process = new Process();
+			process.StartInfo = processStartInfo;
+			process.Start();
+			if (processStartInfo.RedirectStandardInput && input != null)
+			{
+				process.StandardInput.AutoFlush = true;
+				process.StandardInput.WriteLine(input);
+			}
+			Thread readStandardError = null;
+			if (processStartInfo.RedirectStandardError)
+			{
+				readStandardError = new Thread(new ThreadStart(ReadStandardError));
+				readStandardError.Start();
+			}
+			Thread readStandardOutput = null;
+			if (processStartInfo.RedirectStandardOutput)
+			{
+				readStandardOutput = new Thread(new ThreadStart(ReadStandardOutput));
+				readStandardOutput.Start();
+			}
+			if (processStartInfo.RedirectStandardError)
+			{
+				readStandardError.Join();
+			}
+			if (processStartInfo.RedirectStandardOutput)
+			{
+				readStandardOutput.Join();
+			}
+			process.WaitForExit();
+			exitCode = process.ExitCode;
+			process = null;
+		}
+
+		/// <summary>
+		/// Read standard error thread entry-point.
+		/// </summary>		
+		private void ReadStandardError()
+		{
+			if (process != null)
+			{
+				processError = process.StandardError.ReadToEnd();
+			}
+		}
+
+		/// <summary>
+		/// Read standard output thread entry-point.
+		/// </summary>		
+		private void ReadStandardOutput()
+		{
+			if (process != null)
+			{
+				processOutput = process.StandardOutput.ReadToEnd();
+			}
+		}
+	}
+}

irc/ArchBlackmann/ArchBlackmann.cpp

@@ -203,12 +203,13 @@ public:
 	}
 	bool OnPart ( const std::string& user, const std::string& channel )
 	{
-		for ( int i = 0; i < ops.size(); i++ )
+		std::vector<std::string>::iterator it = ops.begin();
+		for ( ; it != ops.end(); it++ )
 		{
-			if ( ops[i] == user )
+			if ( *it == user )
 			{
 				printf ( "remove '%s' to ops list\n", user.c_str() );
-				ops.erase ( &ops[i] );
+				ops.erase ( it );
 			}
 		}
 		return true;
@@ -394,15 +395,17 @@ public:
 						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++ )
+				std::vector<std::string>::iterator it = list.list.begin();
+				for ( ; it != list.list.end(); it++ )
 				{
-					if ( list.list[i] == s )
+					if ( *it == s )
 					{
-						list.list.erase ( &list.list[i] );
+						list.list.erase ( it );
 						{
-								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() );
+							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()) );
 					}
@@ -480,12 +483,13 @@ public:
 				{
 					if ( *p == 'o' )
 					{
-						for ( int i = 0; i < ops.size(); i++ )
+						std::vector<std::string>::iterator it = ops.begin();
+						for ( ; it != ops.end(); it++ )
 						{
-							if ( ops[i] == target )
+							if ( *it == target )
 							{
 								printf ( "remove '%s' to ops list\n", target.c_str() );
-								ops.erase ( &ops[i] );
+								ops.erase ( it );
 							}
 						}
 						break;

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

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/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/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/readme.txt

@@ -21,10 +21,10 @@ ArchBlackmann know what he should say from some text files. They can be found on
 
 List that are used directly to create responses are:
   
-  - tech - here are the sentces ArchBlackmann sais when he finds his name 
+  - 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 a op does the grovel command
+  - 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.

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;

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

@@ -1,46 +1,50 @@
-/* $Id: $
- *
- * vmsss.c - VMS 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 "vmsss.h"
-
-#define NDEBUG
-#include <debug.h>
-
-/* Native image's entry point */
-
-VOID STDCALL
-NtProcessStartup(PPEB Peb)
-{
-	NTSTATUS Status = STATUS_SUCCESS;
-
-	Status = VmsInitializeServer();
-	if(STATUS_SUCCESS != Status)
-	{
-		DPRINT("VMS: VmsInitializeServer failed! Aborting. (Status=%lx)\n", Status);
-	}
-	Status = VmsRunServer();
-	NtTerminateProcess(NtCurrentProcess(),Status);
-}
-/* EOF */
+/* $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/COPYING

@@ -3,7 +3,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -280,7 +280,7 @@ POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
-	Appendix: How to Apply These Terms to Your New Programs
+	    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
@@ -292,7 +292,7 @@ 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>
+    Copyright (C) <year>  <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
@@ -306,14 +306,15 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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.
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  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 version 69, Copyright (C) year 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.

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>

reactos/LGPL.txt

@@ -2,7 +2,7 @@
 		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 

reactos/Makefile

@@ -105,17 +105,48 @@
 #            -dm{module}  Check only automatic dependencies for this module.
 #            -mi          Let make handle creation of install directories. Rbuild will not generate the directories.
 #            -ps          Generate proxy makefiles in source tree instead of the output tree.
+#            -ud          Disable compilation units.
+#            -r           Input XML
+#
+#    ROS_AUTOMAKE
+#        Alternate name of makefile.auto
+#
+
+# check for versions of make that don't have features we need...
+# the function "eval" is only available in 3.80+, which happens to be the minimum
+# version that has the features we use...
+# THIS CHECK IS BORROWED FROM THE "GMSL" PROJECT, AND IS COVERED BY THE GPL LICENSE
+# YOU CAN FIND OUT MORE ABOUT GMSL - A VERY COOL PROJECT - AT:
+# http://gmsl.sourceforge.net/
+
+__gmsl_have_eval :=
+__gmsl_ignore := $(eval __gmsl_have_eval := T)
+
+ifndef __gmsl_have_eval
+$(error ReactOS's makefiles use GNU Make 3.80+ features, you have $(MAKE_VERSION), you MUST UPGRADE in order to build ReactOS - Sorry)
+endif
+# END of code borrowed from GMSL ( http://gmsl.sourceforge.net/ )
 
 .PHONY: all
 .PHONY: clean
-all: makefile.auto
+
+ifeq ($(ROS_AUTOMAKE),)
+ROS_AUTOMAKE=makefile.auto
+endif
+
+all: $(ROS_AUTOMAKE)
 
 
 .SUFFIXES:
 
 ifeq ($(HOST),)
 ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
+ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
+export OSTYPE = msys
+HOST=mingw32-linux
+else
 HOST=mingw32-windows
+endif
 else
 HOST=mingw32-linux
 endif
@@ -207,9 +238,13 @@ host_ld = $(Q)ld
 host_ar = $(Q)ar
 host_objcopy = $(Q)objcopy
 ifeq ($(HOST),mingw32-linux)
-	EXEPREFIX = ./
-	EXEPOSTFIX =
-	SEP = /
+	export EXEPREFIX = ./
+ifeq ($(OSTYPE),msys)
+	export EXEPOSTFIX = .exe
+else
+	export EXEPOSTFIX =
+endif
+	export SEP = /
 	mkdir = -$(Q)mkdir -p
 	gcc = $(Q)$(PREFIX)-gcc
 	gpp = $(Q)$(PREFIX)-g++
@@ -224,10 +259,29 @@ ifeq ($(HOST),mingw32-linux)
 	cp = $(Q)cp
 	NUL = /dev/null
 else # mingw32-windows
-	EXEPREFIX =
-	EXEPOSTFIX = .exe
+  ifeq ($(OSTYPE),msys)
+	HOST=mingw32-linux
+	export EXEPREFIX = ./
+	export EXEPOSTFIX = .exe
+	export SEP = /
+	mkdir = -$(Q)mkdir -p
+	gcc = $(Q)gcc
+	gpp = $(Q)g++
+	ld = $(Q)ld
+	nm = $(Q)nm
+	objdump = $(Q)objdump
+	ar = $(Q)ar
+	objcopy = $(Q)objcopy
+	dlltool = $(Q)dlltool
+	windres = $(Q)windres
+	rm = $(Q)rm -f
+	cp = $(Q)cp
+	NUL = /dev/null
+  else
+	export EXEPREFIX =
+	export EXEPOSTFIX = .exe
 	ROS_EMPTY =
-	SEP = \$(ROS_EMPTY)
+	export SEP = \$(ROS_EMPTY)
 	mkdir = -$(Q)mkdir
 	gcc = $(Q)gcc
 	gpp = $(Q)g++
@@ -241,6 +295,7 @@ else # mingw32-windows
 	rm = $(Q)del /f /q
 	cp = $(Q)copy /y
 	NUL = NUL
+  endif
 endif
 
 ifneq ($(ROS_INTERMEDIATE),)
@@ -290,9 +345,11 @@ ERRCODES_RC = lib$(SEP)kernel32$(SEP)errcodes.rc
 
 include lib/lib.mak
 include tools/tools.mak
--include makefile.auto
+include boot/freeldr/bootsect/bootsect.mak
+-include $(ROS_AUTOMAKE)
 
 PREAUTO := \
+	$(BIN2C_TARGET) \
 	$(BIN2RES_TARGET) \
 	$(BUILDNO_H) \
 	$(BUGCODES_H) \
@@ -302,10 +359,14 @@ PREAUTO := \
 	$(NCI_SERVICE_FILES) \
 	$(GENDIB_DIB_FILES)
 
-makefile.auto: $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
+$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw
 
+.PHONY: msvc
+msvc: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) msvc
 
 $(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC)
 	$(ECHO_WMC)
@@ -313,11 +374,31 @@ $(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC)
 
 $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC)
 	$(ECHO_WMC)
-	$(Q)$(WMC_TARGET) -i -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC)
+	$(Q)$(WMC_TARGET) -i -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC)
+
+.PHONY: msvc6
+msvc6: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc
+
+.PHONY: msvc7
+msvc7: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc
+
+.PHONY: msvc71
+msvc71: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc
+
+.PHONY: msvc8
+msvc8: $(RBUILD_TARGET)
+	$(ECHO_RBUILD)
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc
 
 .PHONY: makefile_auto_clean
 makefile_auto_clean:
-	-@$(rm) makefile.auto $(PREAUTO) 2>$(NUL)
+	-@$(rm) $(ROS_AUTOMAKE) $(PREAUTO) 2>$(NUL)
 
 .PHONY: clean
 clean: makefile_auto_clean

reactos/ReactOS-ppc.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0"?>
+<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
+<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<xi:include href="config-ppc.xml">
+		<xi:fallback>
+			<xi:include href="config.template.xml" />
+		</xi:fallback>
+	</xi:include>
+
+	<xi:include href="baseaddress.xml" />
+
+	<property name="BOOTPROG_PREPARE" value="ppc-le2be" />
+	<property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" />
+	<property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" />
+	<property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" />
+
+	<define name="_M_PPC" />
+	<define name="_PPC_" />
+	<define name="__PowerPC__" />
+	<define name="_REACTOS_" />
+	<define name="__MINGW_IMPORT" empty="true" />
+	<define name="__restrict__" empty="true" />
+	<compilerflag>-v</compilerflag>
+	<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>
+	</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>
+	<include>include/reactos</include>
+	<include>include/libs</include>
+	<include>include/drivers</include>
+	<include>include/subsys</include>
+	<include>include/ndk</include>
+	<include>w32api/include</include>
+	<include>w32api/include/crt</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/ReactOS.xml

@@ -1,77 +1,86 @@
-<?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>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>
+<?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" />
+	<define name="_X86_" />
+	<define name="__i386__" />
+	<define name="_REACTOS_" />
+	<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>
+	<include>include/reactos</include>
+	<include>include/libs</include>
+	<include>include/drivers</include>
+	<include>include/subsys</include>
+	<include>include/ndk</include>
+	<include>w32api/include</include>
+	<include>w32api/include/crt</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/directory.xml

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

reactos/apps/utils/directory.xml

@@ -1,10 +1,14 @@
-<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>
+<directory name="net">
+	<xi:include href="net/directory.xml" />
+</directory>
+<directory name="shutdown">
+	<xi:include href="shutdown/shutdown.xml" />
+</directory>
+<directory name="ps">
+	<xi:include href="ps/ps.xml" />
+</directory>
+<directory name="rosperf">
+	<xi:include href="rosperf/rosperf.xml" />
+</directory>
+</group>

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/net/arp/arp.c

@@ -1,4 +1,23 @@
-/* 
+/*
+ *  ReactOS Win32 Applications
+ *  Copyright (C) 2005 ReactOS Team
+ *
+ *  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.
+ */
+
+/*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS arp utility
  * FILE:        apps/utils/net/arp/arp.c
@@ -8,8 +27,8 @@
  *   GM 27/06/05 Created
  *
  */
- 
- 
+
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,29 +37,100 @@
 #include <ctype.h>
 #include <winsock2.h>
 #include <iphlpapi.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 *
+
+
 /*
  * function declerations
- */ 
-INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr);
+ */
+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);
- 
- 
- 
+
+
+/*
+ * convert error code into meaningful message
+ */
+DWORD DoFormatMessage(DWORD ErrorCode)
+{
+    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;
+}
+
+
+
+/*
+ *
+ * Takes an ARP entry and prints the IP address,
+ * the MAC address and the entry type to screen
+ *
+ */
+INT PrintEntries(PMIB_IPNETROW pIpAddRow)
+{
+    IN_ADDR inaddr;
+    TCHAR cMacAddr[20];
+
+    /* print IP addresses */
+    inaddr.S_un.S_addr = pIpAddRow->dwAddr;
+    _tprintf(_T("  %-22s"), inet_ntoa(inaddr));
+
+    /* print MAC address */
+    _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"),
+        pIpAddRow->bPhysAddr[0],
+        pIpAddRow->bPhysAddr[1],
+        pIpAddRow->bPhysAddr[2],
+        pIpAddRow->bPhysAddr[3],
+        pIpAddRow->bPhysAddr[4],
+        pIpAddRow->bPhysAddr[5]);
+    _tprintf(_T("%-22s"), cMacAddr);
+
+    /* print cache type */
+    switch (pIpAddRow->dwType)
+    {
+        case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n"));
+                                      break;
+        case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n"));
+                                      break;
+        case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n"));
+                                      break;
+        case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n"));
+                                      break;
+    }
+    return EXIT_SUCCESS;
+}
+
+
 /*
  *
  * Takes optional parameters of an internet address and interface address.
@@ -62,136 +152,99 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
     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) {
+    if (pIpNetTable != NULL)
         GetIpNetTable(pIpNetTable, &ulSize, TRUE);
-    } else {
+    else
+    {
         _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
         free(pIpNetTable);
-        return -1;
+        exit(EXIT_FAILURE);
     }
- 
-    /* check there are entries in the table */ 
-    if (pIpNetTable->dwNumEntries == 0) {
+
+    /* check there are entries in the table */
+    if (pIpNetTable->dwNumEntries == 0)
+    {
         _tprintf(_T("No ARP entires found\n"));
         free(pIpNetTable);
-        return -1;
+        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 */    
+     * table to get the IP address for adapter */
     pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
     GetIpAddrTable(pIpAddrTable, &dwSize, 0);   // NULL ?
- 
+
 
     pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
     //ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable));
- 
-    if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0
+
+    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("printing pIpAddrTable->table[?].dwIndex = %lx\n", pIpNetTable->table[k].dwIndex);
+
+
+    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++) {
- 
+    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;        
+        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) {
+            if (strcmp(pszIpAddr, pszInetAddr) == 0)
                 PrintEntries(&pIpNetTable->table[i]);
-            }
-        } else {
+        }
+        else
             /* if an address is not supplied, print all entries */
             PrintEntries(&pIpNetTable->table[i]);
-        }
- 
     }
- 
+
     free(pIpNetTable);
     free(pIpAddrTable);
- 
-    return 0;
+
+    return EXIT_SUCCESS;
 }
- 
- 
- 
-/*
- *
- * Takes an ARP entry and prints the IP address,
- * the MAC address and the entry type to screen
- *
- */
-INT PrintEntries(PMIB_IPNETROW pIpAddRow)
-{
-    IN_ADDR inaddr;
-    TCHAR cMacAddr[20];
- 
-    /* print IP addresses */
-    inaddr.S_un.S_addr = pIpAddRow->dwAddr;        
-    _tprintf(_T("  %-22s"), inet_ntoa(inaddr));  //error checking
- 
-    /* print MAC address */
-    _stprintf(cMacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"),
-        pIpAddRow->bPhysAddr[0],
-        pIpAddRow->bPhysAddr[1],
-        pIpAddRow->bPhysAddr[2],
-        pIpAddRow->bPhysAddr[3],
-        pIpAddRow->bPhysAddr[4],
-        pIpAddRow->bPhysAddr[5]);
-    _tprintf(_T("%-22s"), cMacAddr);
- 
-    /* print cache type */
-    switch (pIpAddRow->dwType) {
-        case MIB_IPNET_TYPE_DYNAMIC : _tprintf(_T("dynamic\n"));
-                                      break;
-        case MIB_IPNET_TYPE_STATIC : _tprintf(_T("static\n"));
-                                      break;
-        case MIB_IPNET_TYPE_INVALID : _tprintf(_T("invalid\n"));
-                                      break;
-        case MIB_IPNET_TYPE_OTHER : _tprintf(_T("other\n"));
-                                      break;
-    }
-    return 0;
-}
- 
- 
- 
+
+
 /*
  *
  * Takes an internet address, a MAC address and an optional interface
  * address as arguments and checks their validity.
- * Fill out an MIB_IPNETROW structure and insert the data into the 
+ * Fill out an MIB_IPNETROW structure and insert the data into the
  * ARP cache as a static entry.
  *
  */
@@ -199,73 +252,101 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
 {
     PMIB_IPNETROW pAddHost;
     PMIB_IPADDRTABLE pIpAddrTable;
-    DWORD dwIpAddr;
+    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) {
+    if (pszInetAddr != NULL)
+    {
+        if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE)
+        {
             _tprintf(_T("ARP: bad IP address: %s\n"), pszInetAddr);
-            return -1;
+            exit(EXIT_FAILURE);
         }
-    } else {
+    }
+    else
+    {
         Usage();
-        return -1;
+        exit(EXIT_FAILURE);
     }
- 
+
     /* check MAC address */
-    if (strlen(pszEthAddr) != 17) {
+    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;
     }
-    for (i=0; i<17; i++) {
-        if (pszEthAddr[i] == SEPERATOR) {
-            continue;
-        }
-        if (!isxdigit(pszEthAddr[i])) {
-            _tprintf(_T("ARP: bad argument: %s\n"), pszEthAddr);
-            return -1;
-        }
-    }
- 
+
+
     /* reserve memory on heap and zero */
     pAddHost = (MIB_IPNETROW *) malloc(sizeof(MIB_IPNETROW));
     ZeroMemory(pAddHost, sizeof(MIB_IPNETROW));
- 
- 
- 
- 
-    /* set dwIndex field to the index of a local IP address to 
+
+    /* set dwIndex field to the index of a local IP address to
      * indicate the network on which the ARP entry applies */
-    if (pszIfAddr) {
+    if (pszIfAddr)
         sscanf(pszIfAddr, "%lx", &pAddHost->dwIndex);
-    } else {
-        /* map the IP to the index */  
+    else
+    {
+        /* map the IP to the index */
         pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
         GetIpAddrTable(pIpAddrTable, &dwSize, 0);
- 
+
         pIpAddrTable = (MIB_IPADDRTABLE *) malloc(dwSize);
- 
-        if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR) { // NO_ERROR = 0
+
+        if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR)
+        {
             _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
             _tprintf(_T("error: %d\n"), WSAGetLastError());
         }
-        printf("printing pIpAddrTable->table[0].dwIndex = %lx\n", pIpAddrTable->table[0].dwIndex);
-        pAddHost->dwIndex = 4;
+        //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++) {
+    for (i=0; i<6; i++)
+    {
         val =0;
         c = toupper(pszEthAddr[i*3]);
         c = c - (isdigit(c) ? '0' : ('A' - 10));
@@ -275,103 +356,155 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
         c = c - (isdigit(c) ? '0' : ('A' - 10));
         val += c;
         pAddHost->bPhysAddr[i] = val;
- 
     }
- 
- 
+
+
     /* copy converted IP address */
     pAddHost->dwAddr = dwIpAddr;
- 
- 
+
+
     /* set type to static */
     pAddHost->dwType = MIB_IPNET_TYPE_STATIC;
- 
- 
+
+
     /* Add the ARP entry */
-    if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) {
-        _tprintf(_T("The ARP entry addition failed: %d\n"), iRet);
-        return -1;
+    if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR)
+    {
+        DoFormatMessage(iRet);
+        free(pAddHost);
+        exit(EXIT_FAILURE);
     }
- 
+
     free(pAddHost);
- 
-    return 0;
+
+    return EXIT_SUCCESS;
 }
- 
- 
- 
+
+
 /*
  *
- * Takes an internet address and an optional interface address as 
+ * Takes an internet address and an optional interface address as
  * arguments and checks their validity.
- * Add the interface number and IP to an MIB_IPNETROW structure 
- * and remove the entrty from the ARP cache.
+ * 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;
-    DWORD dwIpAddr;
+    PMIB_IPNETTABLE pIpNetTable;
+    ULONG ulSize = 0;
+    DWORD dwIpAddr = 0;
     DWORD dwSize = 0;
-    INT iret;
- 
+    INT iRet;
+    BOOL bFlushTable = FALSE;
+
     /* error checking */
- 
+
     /* check IP address */
-    if (pszInetAddr != NULL) {
-        if ((dwIpAddr = inet_addr(pszInetAddr)) == INADDR_NONE) {
+    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);
-            return -1;
+            exit(EXIT_FAILURE);
         }
-    } else {
+    }
+    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 
+    /* set dwIndex field to the index of a local IP address to
      * indicate the network on which the ARP entry applies */
-    if (pszIfAddr) {
+    if (pszIfAddr)
         sscanf(pszIfAddr, "%lx", &pDelHost->dwIndex);
-    } else {
+    else
+    {
         /* map the IP to the index */
-        if (GetIpAddrTable(pIpAddrTable, &dwSize, 0) == ERROR_INSUFFICIENT_BUFFER) {
+        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);
+
+        if ((iRet = GetIpAddrTable(pIpAddrTable, &dwSize, TRUE)) != NO_ERROR)
+        {
+            _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
             _tprintf(_T("error: %d\n"), WSAGetLastError());
         }
-        pDelHost->dwIndex = 4; //pIpAddrTable->table[0].dwIndex;
-    }    
- 
-    /* copy converted IP address */
-    pDelHost->dwAddr = dwIpAddr; 
- 
-    /* Add the ARP entry */
-    if ((iret = DeleteIpNetEntry(pDelHost)) != NO_ERROR) {
-        _tprintf(_T("The ARP entry deletion failed: %d\n"), iret);
-        return -1;
+        /* 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 0;
+
+    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"
@@ -404,10 +537,10 @@ VOID Usage(VOID)
                 "  > 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
@@ -415,35 +548,37 @@ VOID Usage(VOID)
  */
 INT main(int argc, char* argv[])
 {
-    const char N[] = "-N";
- 
-    if ((argc < 2) || (argc > 5)) 
+    if ((argc < 2) || (argc > 5))
     {
        Usage();
-       return FALSE;
+       return EXIT_FAILURE;
     }
- 
- 
-    if (argv[1][0] == '-') {
-        switch (argv[1][1]) {
-           /* FIX ME */
-           /* need better control for -a, as -N might not be arg 4 */
-           case 'a': if (argc == 2)
+
+    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 == 5) && ((strcmp(argv[3], N)) == 0))
+                     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 'g': 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);
@@ -451,15 +586,17 @@ INT main(int argc, char* argv[])
                          Addhost(argv[2], argv[3], argv[4]);
                      else
                          Usage();
+                         return EXIT_FAILURE;
                      break;
            default:
               Usage();
-              return -1;
+              return EXIT_FAILURE;
         }
-    } else {
-        Usage();
-        return -1;
     }
- 
-    return 0;
-}
+    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.xml

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

@@ -1,30 +1,30 @@
-<directory name="arp">
-	<xi:include href="arp/arp.xml" />
-</directory>
-<directory name="finger">
-	<xi:include href="finger/finger.xml" />
-</directory>
-<directory name="ftp">
-	<xi:include href="ftp/ftp.xml" />
-</directory>
-<directory name="ipconfig">
-	<xi:include href="ipconfig/ipconfig.xml" />
-</directory>
-<directory name="netstat">
-	<xi:include href="netstat/netstat.xml" />
-</directory>
-<directory name="ping">
-	<xi:include href="ping/ping.xml" />
-</directory>
-<directory name="route">
-	<xi:include href="route/route.xml" />
-</directory>
-<directory name="telnet">
-	<xi:include href="telnet/telnet.xml" />
-</directory>
-<directory name="tracert">
-	<xi:include href="tracert/tracert.xml" />
-</directory>
-<directory name="whois">
-	<xi:include href="whois/whois.xml" />
-</directory>
+<directory name="arp">
+    <xi:include href="arp/arp.xml" />
+</directory>
+<directory name="finger">
+    <xi:include href="finger/finger.xml" />
+</directory>
+<directory name="ftp">
+    <xi:include href="ftp/ftp.xml" />
+</directory>
+<directory name="ipconfig">
+    <xi:include href="ipconfig/ipconfig.xml" />
+</directory>
+<directory name="netstat">
+    <xi:include href="netstat/netstat.xml" />
+</directory>
+<directory name="ping">
+    <xi:include href="ping/ping.xml" />
+</directory>
+<directory name="route">
+    <xi:include href="route/route.xml" />
+</directory>
+<directory name="telnet">
+    <xi:include href="telnet/telnet.xml" />
+</directory>
+<directory name="tracert">
+    <xi:include href="tracert/tracert.xml" />
+</directory>
+<directory name="whois">
+    <xi:include href="whois/whois.xml" />
+</directory>

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

@@ -50,21 +50,10 @@ static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
 extern char *__progname;		/* Program name, from crt0. */
 
 void
-#ifdef __STDC__
 err(int eval, const char *fmt, ...)
-#else
-err(eval, fmt, va_alist)
-	int eval;
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	verr(eval, fmt, ap);
 	va_end(ap);
 }
@@ -85,21 +74,10 @@ verr(int eval, const char *fmt, va_list ap)
 }
 
 void
-#if __STDC__
 errx(int eval, const char *fmt, ...)
-#else
-errx(eval, fmt, va_alist)
-	int eval;
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	verrx(eval, fmt, ap);
 	va_end(ap);
 }
@@ -115,20 +93,10 @@ verrx(int eval, const char *fmt, va_list ap)
 }
 
 void
-#if __STDC__
 warn(const char *fmt, ...)
-#else
-warn(fmt, va_alist)
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#if __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vwarn(fmt, ap);
 	va_end(ap);
 }
@@ -150,20 +118,10 @@ vwarn(fmt, ap)
 }
 
 void
-#ifdef __STDC__
 warnx(const char *fmt, ...)
-#else
-warnx(fmt, va_alist)
-	const char *fmt;
-	va_dcl
-#endif
 {
 	va_list ap;
-#ifdef __STDC__
 	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
 	vwarnx(fmt, ap);
 	va_end(ap);
 }

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

@@ -62,7 +62,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "unistd.h"
 
 #include "various.h"
 #include "getopt.h"
@@ -74,7 +73,6 @@ int lflag, mflag, pplan, sflag;
 
 static void userlist(int, char **);
 void usage();
-void netfinger(char *);
 
 int
 main(int argc, char **argv)

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

@@ -1,12 +1,12 @@
-<module name="finger" type="win32cui" installbase="system32" installname="finger.exe">
-	<include base="finger">.</include>
+<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>
+	<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,13 +42,15 @@ 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
  */
 int	opterr = 1,		/* if error message should be printed */
 	optind = 1,		/* index into parent argv vector */
 	optopt;			/* character checked for validity */
-char	*optarg;		/* argument associated with option */
+const char	*optarg;		/* argument associated with option */
 
 #define	BADCH	(int)'?'
 #define	EMSG	""
@@ -56,7 +58,7 @@ char	*optarg;		/* argument associated with option */
 int
 getopt(int nargc, char * const *nargv, const char *ostr)
 {
-	static char *place = EMSG;		/* option letter processing */
+	static const char *place = EMSG;		/* option letter processing */
 	register char *oli;			/* option letter list index */
 	char *p;
 

reactos/apps/utils/net/finger/getopt.h

@@ -1,6 +1,6 @@
 /* getopt.h */
 
-extern char *optarg;
+extern const char *optarg;
 extern int optind;
 
 int

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

@@ -35,13 +35,15 @@
  */
 #include <sys/types.h>
 #include <winsock2.h>
-#include "unistd.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
 #include "various.h"
 
+int close(int);
+
 void
 netfinger(char *name)
 {

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

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

@@ -25,7 +25,7 @@ static char sccsid[] = "@(#)cmds.c	5.18 (Berkeley) 4/20/89";
 //#include <sys/param.h>
 //#include <sys/wait.h>
 #include <sys/stat.h>
-#if !defined(WIN32)
+#ifndef _WIN32
 #include <sys/socket.h>
 #include <arpa/ftp.h>
 #include <netinet/in.h>
@@ -46,7 +46,6 @@ static char sccsid[] = "@(#)cmds.c	5.18 (Berkeley) 4/20/89";
 #include "prototypes.h"
 
 extern	char *globerr;
-extern	char **glob();
 extern	char home[];
 extern	char *remglob();
 extern	char *getenv();
@@ -54,9 +53,9 @@ extern	int allbinary;
 extern off_t restart_point;
 extern char reply_string[];
 
-char *mname;
+const char *mname;
 jmp_buf jabort;
-char *dotrans(), *domap();
+const char *dotrans(), *domap();
 
 extern short portnum;
 extern char *hostname;
@@ -65,9 +64,9 @@ extern int autologin;
  * Connect to peer server and
  * auto-login, if possible.
  */
-void setpeer(int argc, char *argv[])
+void setpeer(int argc, const char *argv[])
 {
-	char *host, *hookup();
+	char *host;
 
 	if (connected) {
 		printf("Already connected to %s, use close first.\n",
@@ -155,8 +154,8 @@ void setpeer(int argc, char *argv[])
 }
 
 struct	types {
-	char	*t_name;
-	char	*t_mode;
+	const char	*t_name;
+	const char	*t_mode;
 	int	t_type;
 	char	*t_arg;
 } types[] = {
@@ -172,13 +171,13 @@ struct	types {
  * Set transfer type.
  */
 void settype(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	register struct types *p;
 	int comret;
 
 	if (argc > 2) {
-		char *sep;
+		const char *sep;
 
 		printf("usage: %s [", argv[0]);
 		sep = " ";
@@ -217,7 +216,7 @@ void settype(argc, argv)
 	}
 }
 
-char *stype[] = {
+const char *stype[] = {
 	"type",
 	"",
 	0
@@ -266,9 +265,9 @@ void setebcdic()
 /*
  * Set file transfer mode.
  */
-#if 0
+
 /*ARGSUSED*/
-void setmode(argc, argv)
+void fsetmode(argc, argv)
 	char *argv[];
 {
 
@@ -276,7 +275,7 @@ void setmode(argc, argv)
 	(void) fflush(stdout);
 	code = -1;
 }
-#endif
+
 
 /*
  * Set file transfer format.
@@ -309,11 +308,11 @@ void setstruct(argc, argv)
  */
 void put(argc, argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
-	char *cmd;
+	const char *cmd;
 	int loc = 0;
-	char *oldargv1, *oldargv2;
+	const char *oldargv1, *oldargv2;
 
 	if (argc == 2) {
 		argc++;
@@ -375,13 +374,12 @@ usage:
  * Send multiple files.
  */
 void mput(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	register int i;
 	int ointer;
-	void mabort();
 	extern jmp_buf jabort;
-	char *tp;
+	const char *tp;
 
 	if (argc < 2) {
 		(void) strcat(line, " ");
@@ -507,13 +505,13 @@ void mput(argc, argv)
 }
 
 void reget(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	(void) getit(argc, argv, 1, "r+w");
 }
 
 void get(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	(void) getit(argc, argv, 0, restart_point ? "r+w" : "w" );
 }
@@ -522,11 +520,11 @@ void get(argc, argv)
  * Receive one file.
  */
 int getit(argc, argv, restartit, mode)
-	char *argv[];
-	char *mode;
+	const char *argv[];
+	const char *mode;
 {
 	int loc = 0;
-	char *oldargv1, *oldargv2;
+	const char *oldargv1, *oldargv2;
 
 	if (argc == 2) {
 		argc++;
@@ -567,7 +565,8 @@ usage:
 		return (0);
 	}
 	if (loc && mcase) {
-		char *tp = argv[1], *tp2, tmpbuf[MAXPATHLEN];
+		const char *tp = argv[1];
+        char *tp2, tmpbuf[MAXPATHLEN];
 
 		while (*tp && !islower(*tp)) {
 			tp++;
@@ -650,7 +649,8 @@ usage:
 	return (0);
 }
 
-void
+#if 0
+static void
 mabort()
 {
 	int ointer;
@@ -670,16 +670,17 @@ mabort()
 	mflag = 0;
 	longjmp(jabort,0);
 }
+#endif
 
 /*
  * Get multiple files.
  */
 void mget(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
-	char *cp, *tp, *tp2, tmpbuf[MAXPATHLEN];
+	const char *cp, *tp;
+    char *tp2, tmpbuf[MAXPATHLEN];
 	int ointer;
-	void mabort();
 	extern jmp_buf jabort;
 
 	if (argc < 2) {
@@ -757,7 +758,8 @@ remglob(argv,doswitch)
 	static FILE *ftemp = NULL;
 	static char **args;
 	int oldverbose, oldhash;
-	char *cp, *mode;
+	char *cp;
+    const char *mode;
 
 	if (!mflag) {
 		if (!doglob) {
@@ -809,7 +811,7 @@ remglob(argv,doswitch)
 	return (buf);
 }
 
-char *
+static const char *
 onoff(bool)
 	int bool;
 {
@@ -1003,7 +1005,7 @@ void setdebug(argc, argv)
  * on remote machine.
  */
 void cd(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1035,7 +1037,7 @@ void cd(argc, argv)
  * on local machine.
  */
 void lcd(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	char buf[MAXPATHLEN];
 
@@ -1065,7 +1067,7 @@ void lcd(argc, argv)
  * Delete a single file.
  */
 void delete(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1090,11 +1092,10 @@ void delete(argc, argv)
  * Delete multiple files.
  */
 void mdelete(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	char *cp;
 	int ointer;
-	void  mabort();
 	extern jmp_buf jabort;
 
 	if (argc < 2) {
@@ -1141,7 +1142,7 @@ void mdelete(argc, argv)
  * Rename a remote file.
  */
 void renamefile(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1180,9 +1181,9 @@ usage:
  * of remote files.
  */
 void ls(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
-	char *cmd;
+	const char *cmd;
 
 	if (argc < 2)
 		argc++, argv[1] = NULL;
@@ -1213,11 +1214,11 @@ void ls(argc, argv)
  * of multiple remote files.
  */
 void mls(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
-	char *cmd, mode[1], *dest;
+	const char *cmd, *dest;
+	char mode[1];
 	int ointer, i;
-	void mabort();
 	extern jmp_buf jabort;
 
 	if (argc < 2) {
@@ -1276,7 +1277,7 @@ void mls(argc, argv)
  * Do a shell escape
  */
 /*ARGSUSED*/
-int shell(argc, argv)
+void shell(argc, argv)
 	char *argv[];
 {
 #if 0
@@ -1344,7 +1345,7 @@ int shell(argc, argv)
 
     if (NumBytes == 0)
     {
-        return(-1);
+        return;
     }
 
     AppName = ShellCmd;
@@ -1391,23 +1392,14 @@ int shell(argc, argv)
 
         CloseHandle( ProcessInformation.hProcess);
     }
-
-    if (Result)
-    {
-        return(-1);
-    }
-    else
-    {
-        return(0);
-    }
 }
 
 /*
  * Send new user information (re-login)
  */
-int user(argc, argv)
+void user(argc, argv)
 	int argc;
-	char **argv;
+	const char **argv;
 {
 	char acct[80], *getpass();
 	int n, aflag = 0;
@@ -1425,7 +1417,7 @@ int user(argc, argv)
 		printf("usage: %s username [password] [account]\n", argv[0]);
 		(void) fflush(stdout);
 		code = -1;
-		return (0);
+		return;
 	}
 	n = command("USER %s", argv[1]);
 	if (n == CONTINUE) {
@@ -1447,12 +1439,11 @@ int user(argc, argv)
 	if (n != COMPLETE) {
 		fprintf(stdout, "Login failed.\n");
 		(void) fflush(stdout);
-		return (0);
+		return;
 	}
 	if (!aflag && argc == 4) {
 		(void) command("ACCT %s", argv[3]);
 	}
-	return (1);
 }
 
 /*
@@ -1479,7 +1470,7 @@ void pwd()
  * Make a directory.
  */
 void makedir(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1510,7 +1501,7 @@ void makedir(argc, argv)
  * Remove a directory.
  */
 void removedir(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -1541,7 +1532,7 @@ void removedir(argc, argv)
  * Send a line, verbatim, to the remote machine.
  */
 void quote(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	int i;
 	char buf[BUFSIZ];
@@ -1578,7 +1569,7 @@ void quote(argc, argv)
  */
 
 void site(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	int i;
 	char buf[BUFSIZ];
@@ -1610,7 +1601,7 @@ void site(argc, argv)
 }
 
 void do_chmod(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	if (argc == 2) {
 		printf("usage: %s mode file-name\n", argv[0]);
@@ -1705,7 +1696,7 @@ void disconnect()
 }
 
 int confirm(cmd, file)
-	char *cmd, *file;
+	const char *cmd, *file;
 {
 	char line[BUFSIZ];
 
@@ -1717,13 +1708,15 @@ int confirm(cmd, file)
 	return (*line != 'n' && *line != 'N');
 }
 
-void fatal(msg)
+#if 0
+static void fatal(msg)
 	char *msg;
 {
 
 	fprintf(stderr, "ftp: %s\n", msg);
 	exit(1);
 }
+#endif
 
 /*
  * Glob a local file name specification with
@@ -1732,7 +1725,7 @@ void fatal(msg)
  * from the expression, we return only the first.
  */
 int globulize(cpp)
-	char **cpp;
+	const char **cpp;
 {
 	char **globbed;
 
@@ -1785,7 +1778,8 @@ void account(argc,argv)
 
 jmp_buf abortprox;
 
-void
+#if 0
+static void
 proxabort()
 {
 	extern int proxy;
@@ -1802,12 +1796,12 @@ proxabort()
 	pswitch(0);
 	longjmp(abortprox,1);
 }
+#endif
 
 void doproxy(argc,argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
-	void proxabort();
 	register struct cmd *c;
 	struct cmd *getcmd();
 //	extern struct cmd cmdtab[];
@@ -1911,12 +1905,13 @@ void setntrans(argc,argv)
 	ntout[16] = '\0';
 }
 
-char *
+const char *
 dotrans(name)
-	char *name;
+	const char *name;
 {
 	static char new[MAXPATHLEN];
-	char *cp1, *cp2 = new;
+	const char *cp1;
+    char *cp2 = new;
 	register int i, ostop, found;
 
 	for (ostop = 0; *(ntout + ostop) && ostop < 16; ostop++);
@@ -1953,7 +1948,7 @@ setpassive(argc, argv)
 
 void setnmap(argc, argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
 	char *cp;
 
@@ -1993,13 +1988,14 @@ void setnmap(argc, argv)
 	(void) strncpy(mapout, cp, MAXPATHLEN - 1);
 }
 
-char *
+const char *
 domap(name)
-	char *name;
+	const char *name;
 {
 	static char new[MAXPATHLEN];
-	register char *cp1 = name, *cp2 = mapin;
-	char *tp[9], *te[9];
+	const char *cp1 = name;
+    char *cpn, *cp2 = mapin;
+	const char *tp[9], *te[9];
 	int i, toks[9], toknum = 0, match = 1;
 
 	for (i=0; i < 9; ++i) {
@@ -2042,33 +2038,34 @@ domap(name)
 	{
 		toks[toknum] = 0;
 	}
-	cp1 = new;
-	*cp1 = '\0';
+
+	cpn = new;
+	*cpn = '\0';
 	cp2 = mapout;
 	while (*cp2) {
 		match = 0;
 		switch (*cp2) {
 			case '\\':
 				if (*(cp2 + 1)) {
-					*cp1++ = *++cp2;
+					*cpn++ = *++cp2;
 				}
 				break;
 			case '[':
 LOOP:
 				if (*++cp2 == '$' && isdigit(*(cp2+1))) {
 					if (*++cp2 == '0') {
-						char *cp3 = name;
+						const char *cp3 = name;
 
 						while (*cp3) {
-							*cp1++ = *cp3++;
+							*cpn++ = *cp3++;
 						}
 						match = 1;
 					}
 					else if (toks[toknum = *cp2 - '1']) {
-						char *cp3 = tp[toknum];
+						const char *cp3 = tp[toknum];
 
 						while (cp3 != te[toknum]) {
-							*cp1++ = *cp3++;
+							*cpn++ = *cp3++;
 						}
 						match = 1;
 					}
@@ -2082,24 +2079,24 @@ LOOP:
 						else if (*cp2 == '$' &&
    						        isdigit(*(cp2+1))) {
 							if (*++cp2 == '0') {
-							   char *cp3 = name;
+							   const char *cp3 = name;
 
 							   while (*cp3) {
-								*cp1++ = *cp3++;
+								*cpn++ = *cp3++;
 							   }
 							}
 							else if (toks[toknum =
 							    *cp2 - '1']) {
-							   char *cp3=tp[toknum];
+							   const char *cp3=tp[toknum];
 
 							   while (cp3 !=
 								  te[toknum]) {
-								*cp1++ = *cp3++;
+								*cpn++ = *cp3++;
 							   }
 							}
 						}
 						else if (*cp2) {
-							*cp1++ = *cp2++;
+							*cpn++ = *cp2++;
 						}
 					}
 					if (!*cp2) {
@@ -2136,29 +2133,29 @@ LOOP:
 			case '$':
 				if (isdigit(*(cp2 + 1))) {
 					if (*++cp2 == '0') {
-						char *cp3 = name;
+						const char *cp3 = name;
 
 						while (*cp3) {
-							*cp1++ = *cp3++;
+							*cpn++ = *cp3++;
 						}
 					}
 					else if (toks[toknum = *cp2 - '1']) {
-						char *cp3 = tp[toknum];
+						const char *cp3 = tp[toknum];
 
 						while (cp3 != te[toknum]) {
-							*cp1++ = *cp3++;
+							*cpn++ = *cp3++;
 						}
 					}
 					break;
 				}
 				/* intentional drop through */
 			default:
-				*cp1++ = *cp2;
+				*cpn++ = *cp2;
 				break;
 		}
 		cp2++;
 	}
-	*cp1 = '\0';
+	*cpn = '\0';
 	if (!*new) {
 		return(name);
 	}
@@ -2217,7 +2214,7 @@ void syst()
 
 void macdef(argc, argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
 	char *tmp;
 	int c;
@@ -2293,7 +2290,7 @@ void macdef(argc, argv)
  * get size of file on remote machine
  */
 void sizecmd(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 
 	if (argc < 2) {
@@ -2318,7 +2315,7 @@ void sizecmd(argc, argv)
  * get last modification time of file on remote machine
  */
 void modtime(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	int overbose;
 
@@ -2357,7 +2354,7 @@ void modtime(argc, argv)
  * show status on reomte machine
  */
 void rmtstatus(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	(void) command(argc > 1 ? "STAT %s" : "STAT" , argv[1]);
 }
@@ -2366,7 +2363,7 @@ void rmtstatus(argc, argv)
  * get file if modtime is more recent than current file
  */
 void newer(argc, argv)
-	char *argv[];
+	const char *argv[];
 {
 	if (getit(argc, argv, -1, "w")) {
 		printf("Local file \"%s\" is newer than remote file \"%s\"\n",

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

@@ -24,20 +24,6 @@ static char sccsid[] = "@(#)cmdtab.c	5.9 (Berkeley) 3/21/89";
 /*
  * User FTP -- Command Tables.
  */
-int	setascii(), setbell(), setbinary(), setdebug(), setform();
-int	setglob(), sethash(), setmode(), setpeer(), setpassive(), setport();
-int	setprompt(), setstruct();
-int	settenex(), settrace(), settype(), setverbose();
-int	disconnect(), restart(), reget(), syst();
-int	cd(), lcd(), delete(), mdelete(), user();
-int	ls(), mls(), get(), mget(), help(), append(), put(), mput();
-int	quit(), renamefile(), status();
-int	quote(), rmthelp(), shell(), site();
-int	pwd(), makedir(), removedir(), setcr();
-int	account(), doproxy(), reset(), setcase(), setntrans(), setnmap();
-int	setsunique(), setrunique(), cdup(), macdef(), domacro();
-int	sizecmd(), modtime(), newer(), rmtstatus();
-int	do_chmod(), do_umask(), idle();
 
 char	accounthelp[] =	"send account command to remote server";
 char	appendhelp[] =	"append to a file";
@@ -140,7 +126,7 @@ struct cmd cmdtab[] = {
 	{ "mget",	mgethelp,	1,	1,	1,	mget },
 	{ "mkdir",	mkdirhelp,	0,	1,	1,	makedir },
 	{ "mls",	mlshelp,	1,	1,	1,	mls },
-	{ "mode",	modehelp,	0,	1,	1,	setmode },
+	{ "mode",	modehelp,	0,	1,	1,	fsetmode },
 	{ "modtime",	modtimehelp,	0,	1,	1,	modtime },
 	{ "mput",	mputhelp,	1,	1,	1,	mput },
 	{ "newer",	newerhelp,	1,	1,	1,	newer },

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

@@ -30,13 +30,13 @@ static char sccsid[] = "@(#)domacro.c	1.6 (Berkeley) 2/28/89";
 
 void domacro(argc, argv)
 	int argc;
-	char *argv[];
+	const char *argv[];
 {
-	register int i, j;
-	register char *cp1, *cp2;
+	int i, j;
+	const char *cp1;
+    char *cp2;
 	int count = 2, loopflg = 0;
 	char line2[200];
-	extern char **glob();
 	struct cmd *getcmd(), *c;
 
 	if (argc < 2) {

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

@@ -35,12 +35,11 @@ void blkfree(char **av0)
 		free(*av++);
 }
 
-char *glob(register char *v)
+char **glob(register char *v)
 {
    return NULL;
 }
 
-
 int sleep(int time)
 {
    return time;
@@ -50,8 +49,8 @@ int herror(char *string)
 {
    return 0;
 }
-#if 0
 
+#if 0
 int gettimeofday(struct timeval *timenow,
 				 struct timezone *zone)
 {
@@ -114,7 +113,7 @@ int fgetcSocket(int s)
 
 #endif
 
-char *fprintfSocket(int s, char *format, ...)
+const char *fprintfSocket(int s, const char *format, ...)
 {
    va_list argptr;
    char buffer[10009];
@@ -128,7 +127,7 @@ char *fprintfSocket(int s, char *format, ...)
    return NULL;
 }
 
-char *fputsSocket(char *format, int s)
+const char *fputsSocket(const char *format, int s)
 {
    send(s, format, strlen(format), 0);
 
@@ -294,11 +293,13 @@ char *getpass (const char * prompt)
   return NULL;
 }
 
+#if 0
 // Stubbed out here. Should be changed in Source code...
 int access(const char *filename, int accessmethod)
 {
    return 0;
 }
+#endif
 
 #ifndef __GNUC__
 #define EPOCHFILETIME (116444736000000000i64)

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

@@ -25,7 +25,7 @@ static char sccsid[] = "@(#)ftp.c	5.28 (Berkeley) 4/20/89";
 
 #include <sys/stat.h>
 
-#if !defined(WIN32)
+#ifndef _WIN32
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -98,9 +98,9 @@ sig_t	lostpeer();
 off_t	restart_point = 0;
 
 SOCKET cin, cout;
-int	dataconn(char *mode);
+int	dataconn(const char *mode);
 
-int command(char *fmt, ...);
+int command(const char *fmt, ...);
 
 char *hostname;
 
@@ -203,19 +203,23 @@ bad:
 	return ((char *)0);
 }
 
-int login(char *host)
+int login(const char *host)
 {
 	char tmp[80];
-	char *user, *pass, *acct;
+	char *puser, *ppass, *pacct;
+	const char *user, *pass, *acct;
 	int n, aflag = 0;
 
 	user = pass = acct = 0;
-	if (ruserpass(host, &user, &pass, &acct) < 0) {
+	if (ruserpass(host, &puser, &ppass, &pacct) < 0) {
 		code = -1;
 		return(0);
 	}
+	user = puser;
+	pass = ppass;
+	acct = pacct;
 	while (user == NULL) {
-           char *myname = "none"; // This needs to become the usename env
+           const char *myname = "none"; // This needs to become the usename env
 
            if (myname)
               printf("Name (%s:%s): ", host, myname);
@@ -260,7 +264,7 @@ int login(char *host)
 	return (1);
 }
 
-void
+static void
 cmdabort(int sig)
 {
 	extern jmp_buf ptabort;
@@ -273,7 +277,7 @@ cmdabort(int sig)
 }
 
 /*VARARGS1*/
-int command(char *fmt, ...)
+int command(const char *fmt, ...)
 {
 	va_list ap;
 	int r;
@@ -422,7 +426,7 @@ getreply(expecteof)
 	}
 }
 
-int
+static int
 empty(mask, sec)
 	struct fd_set *mask;
 	int sec;
@@ -436,6 +440,7 @@ empty(mask, sec)
 
 jmp_buf	sendabort;
 
+#if 0
 void abortsend()
 {
 
@@ -445,22 +450,22 @@ void abortsend()
 	(void) fflush(stdout);
 	longjmp(sendabort, 1);
 }
+#endif
 
 #define HASHBYTES 1024
 
-void sendrequest(char *cmd, char *local, char *remote, int printnames)
+void sendrequest(const char *cmd, const char *local, const char *remote, int printnames)
 {
 	FILE *fin;
         int dout = 0;
 	int (*closefunc)(), _pclose(), fclose();
 	sig_t (*oldintr)(), (*oldintp)();
-	void abortsend();
 	char buf[BUFSIZ], *bufp;
 	long bytes = 0, hashbytes = HASHBYTES;
 	register int c, d;
 	struct stat st;
 	struct timeval start, stop;
-	char *mode;
+	const char *mode;
 
 	if (verbose && printnames) {
 		if (local && *local != '-')
@@ -710,7 +715,7 @@ null();//		(void) signal(SIGPIPE, oldintp);
 
 jmp_buf	recvabort;
 
-
+#if 0
 void abortrecv()
 {
 
@@ -720,17 +725,17 @@ void abortrecv()
 	(void) fflush(stdout);
 	longjmp(recvabort, 1);
 }
+#endif
 
-void recvrequest(char *cmd, char *local, char *remote, char *mode,
+void recvrequest(const char *cmd, const char *local, const char *remote, const char *mode,
                 int printnames)
 {
-	FILE *fout;
+	FILE *fout = stdout;
         int din = 0;
 	int (*closefunc)(), _pclose(), fclose();
 	void (*oldintr)(int), (*oldintp)(int);
-	void abortrecv();
-	int oldverbose, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0;
-	char *gunique(), msg;
+	int oldverbose = 0, oldtype = 0, is_retr, tcrflag, nfnd, bare_lfs = 0;
+	char msg;
 //	static char *buf; // Szurgot: Shouldn't this go SOMEWHERE?
         char buf[1024];
 	static int bufsize = 1024;
@@ -1252,7 +1257,7 @@ bad:
 	return (1);
 }
 
-int dataconn(char *mode)
+int dataconn(const char *mode)
 {
    struct sockaddr_in from;
    int s, fromlen = sizeof (from);
@@ -1277,7 +1282,7 @@ int dataconn(char *mode)
 }
 
 void ptransfer(direction, bytes, t0, t1)
-	char *direction;
+	const char *direction;
 	long bytes;
 	struct timeval *t0, *t1;
 {
@@ -1417,6 +1422,7 @@ void pswitch(int flag)
 jmp_buf ptabort;
 int ptabflg;
 
+#if 0
 void
 abortpt()
 {
@@ -1427,15 +1433,15 @@ abortpt()
 	abrtflag = 0;
 	longjmp(ptabort, 1);
 }
+#endif
 
 void proxtrans(cmd, local, remote)
-	char *cmd, *local, *remote;
+	const char *cmd, *local, *remote;
 {
 //	void (*oldintr)(int);
-	//void abortpt(int);
 	int tmptype, oldtype = 0, secndflag = 0, nfnd;
 	extern jmp_buf ptabort;
-	char *cmd2;
+	const char *cmd2;
 //	struct
 	fd_set mask;
 
@@ -1756,6 +1762,7 @@ void reset()
 	}
 }
 
+#if 0
 char *
 gunique(local)
 	char *local;
@@ -1802,6 +1809,7 @@ gunique(local)
 	}
 	return(new);
 }
+#endif
 
 int null(void)
 {

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

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

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

@@ -1,18 +1,10 @@
 #include <winsock.h>
 #include "fake.h"
+#include "prototypes.h"
 #include <setjmp.h>
 
 //typedef void (*Sig_t)(int);
 
-int fgetcSocket(int s);
-char *fputsSocket(char *format, int s);
-
-char *fprintfSocket(int s, char *format, ...);
-
-int fputcSocket(int s, char putChar);
-int fputSocket(int s, char *putChar, int len);
-char *fgetsSocket(int s, char *string);
-
 /* The following defines are from ftp.h and telnet.h from bsd.h */
 /* All relevent copyrights below apply.                         */
 
@@ -138,7 +130,7 @@ extern char	*stringbase;		/* current scan point in line buffer */
 extern char	argbuf[200];		/* argument storage buffer */
 extern char	*argbase;		/* current storage point in arg buffer */
 extern int	margc;			/* count of arguments on input line */
-extern char	*margv[20];		/* args parsed from input line */
+extern const char	*margv[20];		/* args parsed from input line */
 extern int     cpend;                  /* flag: if != 0, then pending server reply */
 extern int	mflag;			/* flag: if != 0, then active multi command */
 
@@ -148,12 +140,12 @@ extern int	options;		/* used during socket creation */
  * Format of command table.
  */
 struct cmd {
-	char	*c_name;	/* name of command */
-	char	*c_help;	/* help string */
+	const char	*c_name;	/* name of command */
+	const char	*c_help;	/* help string */
 	char	c_bell;		/* give bell when command completes */
 	char	c_conn;		/* must be connected to use command */
 	char	c_proxy;	/* proxy server may execute */
-	int	(*c_handler)();	/* function to call */
+	void	(*c_handler)();	/* function to call */
 };
 
 struct macel {
@@ -166,11 +158,6 @@ int macnum;			/* number of defined macros */
 struct macel macros[16];
 char macbuf[4096];
 
-extern	char *tail();
-extern	char *remglob();
-extern	int errno;
-extern	char *mktemp();
-
 #if	defined(__ANSI__) || defined(sparc)
 typedef void sig_t;
 #else
@@ -178,4 +165,4 @@ typedef int sig_t;
 #endif
 
 typedef int uid_t;
-int herror(char *s);
+

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

@@ -28,7 +28,7 @@ static char sccsid[] = "@(#)main.c	based on 5.13 (Berkeley) 3/14/89";
 /*
  * FTP User Program -- Command Interface.
  */
-#if !defined(WIN32)
+#ifndef _WIN32
 #include <netdb.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
@@ -115,17 +115,18 @@ char	*stringbase;		/* current scan point in line buffer */
 char	argbuf[200];		/* argument storage buffer */
 char	*argbase;		/* current storage point in arg buffer */
 int	margc;			/* count of arguments on input line */
-char	*margv[20];		/* args parsed from input line */
+const char	*margv[20];		/* args parsed from input line */
 int     cpend;                  /* flag: if != 0, then pending server reply */
 int	mflag;			/* flag: if != 0, then active multi command */
 
 int	options;		/* used during socket creation */
 
+static const char *slurpstring();
 
 
-int main(int argc, char *argv[])
+int main(int argc, const char *argv[])
 {
-	register char *cp;
+	const char *cp;
 	int top;
 #if 0
 	char homedir[MAXPATHLEN];
@@ -310,8 +311,6 @@ void cmdscanner(top)
 	int top;
 {
 	register struct cmd *c;
-	struct cmd *getcmd();
-	extern int help();
 
 	if (!top)
 		(void) putchar('\n');
@@ -358,12 +357,12 @@ void cmdscanner(top)
 
 struct cmd *
 getcmd(name)
-	register char *name;
+	const char *name;
 {
 	extern struct cmd cmdtab[];
-	register char *p, *q;
-	register struct cmd *c, *found;
-	register int nmatches, longest;
+	const char *p, *q;
+	struct cmd *c, *found;
+	int nmatches, longest;
 
 	longest = 0;
 	nmatches = 0;
@@ -394,8 +393,7 @@ int slrflag;
 
 void makeargv()
 {
-	char **argp;
-	char *slurpstring();
+	const char **argp;
 
 	margc = 0;
 	argp = margv;
@@ -411,7 +409,7 @@ void makeargv()
  * implemented with FSM to
  * handle quoting and strings
  */
-char *
+static const char *
 slurpstring()
 {
 	int got_one = 0;
@@ -535,7 +533,7 @@ OUT1:
  * Help command.
  * Call each command handler with argc == 0 and argv[0] == name.
  */
-int help(argc, argv)
+void help(argc, argv)
 	int argc;
 	char *argv[];
 {
@@ -582,7 +580,7 @@ int help(argc, argv)
 			}
 		}
 		(void) fflush(stdout);
-		return 0;
+		return;
 	}
 	while (--argc > 0) {
 		register char *arg;
@@ -597,5 +595,4 @@ int help(argc, argv)
 				c->c_name, c->c_help);
 	}
 	(void) fflush(stdout);
-	return 0;
 }

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

@@ -1,31 +1,66 @@
 
+int fgetcSocket(int s);
+const char *fputsSocket(const char *format, int s);
+
+const char *fprintfSocket(int s, const char *format, ...);
+
+int fputcSocket(int s, char putChar);
+int fputSocket(int s, char *putChar, int len);
+char *fgetsSocket(int s, char *string);
+
+char *hookup();
+char **glob();
+int herror(char *s);
+
 int getreply(int expecteof);
-int ruserpass(char *host, char **aname, char **apass, char **aacct);
+int ruserpass(const char *host, char **aname, char **apass, char **aacct);
 char *getpass(const char *prompt);
 void makeargv(void);
-void domacro(int argc, char *argv[]);
-void proxtrans(char *cmd, char *local, char *remote);
+void domacro(int argc, const char *argv[]);
+void proxtrans(const char *cmd, const char *local, const char *remote);
 int null(void);
 int initconn(void);
 void disconnect(void);
-void ptransfer(char *direction, long bytes, struct timeval *t0, struct timeval *t1);
+void ptransfer(const char *direction, long bytes, struct timeval *t0, struct timeval *t1);
 void setascii(void);
 void setbinary(void);
 void setebcdic(void);
 void settenex(void);
 void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
 void setpassive(int argc, char *argv[]);
-void setpeer(int argc, char *argv[]);
+void setpeer(int argc, const char *argv[]);
 void cmdscanner(int top);
 void pswitch(int flag);
 void quit(void);
-int login(char *host);
-int command(char *fmt, ...);
-int globulize(char **cpp);
-void sendrequest(char *cmd, char *local, char *remote, int printnames);
-void recvrequest(char *cmd, char *local, char *remote, char *mode,
+int login(const char *host);
+int command(const char *fmt, ...);
+int globulize(const char **cpp);
+void sendrequest(const char *cmd, const char *local, const char *remote, int printnames);
+void recvrequest(const char *cmd, const char *local, const char *remote, const char *mode,
                 int printnames);
-int confirm(char *cmd, char *file);
+int confirm(const char *cmd, const char *file);
 void blkfree(char **av0);
-int getit(int argc, char *argv[], int restartit, char *mode);
+int getit(int argc, const char *argv[], int restartit, const char *mode);
 int sleep(int time);
+
+char *tail();
+int errno;
+char *mktemp();
+void	setbell(), setdebug();
+void	setglob(), sethash(), setport();
+void	setprompt();
+void	settrace(), setverbose();
+void	settype(), setform(), setstruct();
+void	restart(), syst();
+void	cd(), lcd(), delete(), mdelete();
+void	ls(), mls(), get(), mget(), help(), append(), put(), mput(), reget();
+void	status();
+void	renamefile();
+void	quote(), rmthelp(), site();
+void	pwd(), makedir(), removedir(), setcr();
+void	account(), doproxy(), reset(), setcase(), setntrans(), setnmap();
+void	setsunique(), setrunique(), cdup(), macdef();
+void	sizecmd(), modtime(), newer(), rmtstatus();
+void	do_chmod(), do_umask(), idle();
+void	shell(), user(), fsetmode();
+struct cmd	*getcmd();

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

@@ -50,7 +50,7 @@ static	FILE *cfile;
 static char tokval[100];
 
 static struct toktab {
-	char *tokstr;
+	const char *tokstr;
 	int tval;
 } toktab[]= {
 	{"default",	DEFAULT},
@@ -66,10 +66,11 @@ static struct toktab {
 extern char *hostname;
 static int token(void);
 
-int ruserpass(char *host, char **aname, char **apass, char **aacct)
+int ruserpass(const char *host, char **aname, char **apass, char **aacct)
 {
-	char *hdir, buf[BUFSIZ], *tmp;
-	char myname[MAXHOSTNAMELEN], *mydomain;
+	const char *hdir, *mydomain;
+    char buf[BUFSIZ], *tmp;
+	char myname[MAXHOSTNAMELEN];
 	int t, i, c, usedefault = 0;
 	struct stat stb;
 	extern int errno;

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

@@ -1,380 +1,423 @@
-/* $Id: ipconfig.c
- *
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS Ipconfig utility
- * FILE:            apps/utils/net/ipconfig/ipconfig.c
- * PURPOSE:         Show and set network interface IP parameters
- */ 
 /*
- *  History:
+ * ReactOS Win32 Applications
+ * Copyright (C) 2005 ReactOS Team
  *
- *      15/8/2002 (Robert Dickenson <robd@reactos.org>)
- *          Original version (PUBLIC DOMAIN and NO WARRANTY)
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS arp utility
+ * FILE:        apps/utils/net/ipconfig/ipconfig.c
+ * PURPOSE:
+ * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
+ * REVISIONS:
+ *   GM 14/09/05 Created
  *
- *      26/6/2005 (Tim Jobling <tjob800@yahoo.co.uk>)
- *          Relicense to GPL. 
- *          Display NodeType with meaningfull Human readable names.
- *          Exclusively use TCHAR strings.
- *          Display Physical Address, DHCP enabled state, IP Addresses/Netmasks,
- *          Default Gateway, DHCP server and DHCP Lease times.
- *          Parse command line options.
- *          Default to only showing the IP/SM/DG is no options specified
- *          Handel option: /All and /?
- *          Display message about all unimplemented options.
- *          Changed C++ style commenting to C style
- *   
-*/ 
- 
-#include <stdio.h>
+ */
+/*
+ * TODO:
+ * fix renew / release
+ * implement flushdns, registerdns, displaydns, showclassid, setclassid
+ * allow globbing on adapter names
+ */
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#include <tchar.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
-
-#include <iptypes.h>
-#include <ipexport.h>
+#include <tchar.h>
+#include <string.h>
+#include <ctype.h>
+#include <winsock2.h>
 #include <iphlpapi.h>
 
-#ifdef _DEBUG
-#include "trace.h"
-#endif
+#define UNICODE
+#define _UNICODE
 
-/* imported from iphlpapi.dll
 
-GetAdapterOrderMap
-GetInterfaceInfo
-GetIpStatsFromStack
-NhGetInterfaceNameFromGuid
-NhpAllocateAndGetInterfaceInfoFromStack
 
- */
-
-static TCHAR* GetNodeTypeName(UINT nNodeType)
+LPCTSTR GetNodeTypeName(UINT NodeType)
 {
-    switch (nNodeType) {
-    case 1:  return _T("Broadcast");
-    case 2:  return _T("Peer To Peer");
-    case 4:  return _T("Mixed");
-    case 8:  return _T("Hybrid");
-    default: return _T("unknown");
+    switch (NodeType) {
+        case 1: return _T("Broadcast");
+        case 2: return _T("Peer To Peer");
+        case 4: return _T("Mixed");
+        case 8: return _T("Hybrid");
+        default : return _T("unknown");
     }
 }
 
-static TCHAR* GetInterfaceTypeName(UINT nInterfaceType)
+LPCTSTR GetInterfaceTypeName(UINT InterfaceType)
 {
-    switch (nInterfaceType) {
-    case MIB_IF_TYPE_OTHER:     return _T("Other");
-    case MIB_IF_TYPE_ETHERNET:  return _T("Ethernet");
-    case MIB_IF_TYPE_TOKENRING: return _T("Token Ring");
-    case MIB_IF_TYPE_FDDI:      return _T("FDDI");
-    case MIB_IF_TYPE_PPP:       return _T("PPP");
-    case MIB_IF_TYPE_LOOPBACK:  return _T("Loopback");
-    case MIB_IF_TYPE_SLIP:      return _T("SLIP");
-    default: return _T("unknown");
+    switch (InterfaceType) {
+        case MIB_IF_TYPE_OTHER:     return _T("Other Type Of Adapter");
+        case MIB_IF_TYPE_ETHERNET:  return _T("Ethernet Adapter");
+        case MIB_IF_TYPE_TOKENRING: return _T("Token Ring Adapter");
+        case MIB_IF_TYPE_FDDI:      return _T("FDDI Adapter");
+        case MIB_IF_TYPE_PPP:       return _T("PPP Adapter");
+        case MIB_IF_TYPE_LOOPBACK:  return _T("Loopback Adapter");
+        case MIB_IF_TYPE_SLIP:      return _T("SLIP Adapter");
+        default: return _T("unknown");
     }
 }
 
-void PrintPhysicalAddr(PBYTE Addr, UINT len)
+/* print MAC address */
+PTCHAR PrintMacAddr(PBYTE Mac)
 {
-    UINT i=0;
-    for (i=0; i<len; i++)
+    static TCHAR MacAddr[20];
+
+    _stprintf(MacAddr, _T("%02x-%02x-%02x-%02x-%02x-%02x"),
+        Mac[0], Mac[1], Mac[2], Mac[3], Mac[4],  Mac[5]);
+
+    return MacAddr;
+}
+
+DWORD DoFormatMessage(DWORD ErrorCode)
+{
+    LPVOID lpMsgBuf;
+    DWORD RetVal;
+
+    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 ShowInfo(BOOL bAll)
+{
+    PIP_ADAPTER_INFO pAdapterInfo = NULL;
+    PIP_ADAPTER_INFO pAdapter = NULL;
+    ULONG    adaptOutBufLen;
+
+    PFIXED_INFO pFixedInfo;
+    ULONG    netOutBufLen;
+    PIP_ADDR_STRING pIPAddr = NULL;
+
+	DWORD ErrRet = 0;
+
+    /* assign memory for call to GetNetworkParams */
+    pFixedInfo = (FIXED_INFO *) GlobalAlloc( GPTR, sizeof( FIXED_INFO ) );
+    netOutBufLen = sizeof(FIXED_INFO);
+
+    /* assign memory for call to GetAdapterInfo */
+    pAdapterInfo = (IP_ADAPTER_INFO *) malloc( sizeof(IP_ADAPTER_INFO) );
+    adaptOutBufLen = sizeof(IP_ADAPTER_INFO);
+
+    /* set required buffer size */
+    if(GetNetworkParams(pFixedInfo, &netOutBufLen) == ERROR_BUFFER_OVERFLOW) 
+	{
+        GlobalFree(pFixedInfo);
+        pFixedInfo = (FIXED_INFO *) GlobalAlloc(GPTR, netOutBufLen);
+    }
+
+    /* set required buffer size */
+    if (GetAdaptersInfo( pAdapterInfo, &adaptOutBufLen) == ERROR_BUFFER_OVERFLOW) 
+	{
+       free(pAdapterInfo);
+       pAdapterInfo = (IP_ADAPTER_INFO *) malloc (adaptOutBufLen);
+    }
+
+    if ((ErrRet = GetAdaptersInfo(pAdapterInfo, &adaptOutBufLen)) != NO_ERROR)
+	{
+		_tprintf(_T("GetAdaptersInfo failed : "));
+		DoFormatMessage(ErrRet);
+		return EXIT_FAILURE;
+	}
+
+    if ((ErrRet = GetNetworkParams(pFixedInfo, &netOutBufLen)) != NO_ERROR)
+	{
+		_tprintf(_T("GetNetworkParams failed : "));
+		DoFormatMessage(ErrRet);
+		return EXIT_FAILURE;
+	}
+    
+    pAdapter = pAdapterInfo;
+        //HKEY hKey;
+        //LPCTSTR lpSubKey = _T("SYSTEM\\ControlSet\\Control\\Network");
+
+    _tprintf(_T("\nReactOS IP Configuration\n\n"));
+
+
+    if (bAll)
     {
-        _tprintf(_T("%02X"), Addr[i]);
-        if ((i+1)<len)
-            _tprintf(_T("-"));
+        _tprintf(_T("\tHost Name . . . . . . . . . . . . : %s\n"), pFixedInfo->HostName);
+        _tprintf(_T("\tPrimary DNS Suffix. . . . . . . . : \n"));
+        _tprintf(_T("\tNode Type . . . . . . . . . . . . : %s\n"), GetNodeTypeName(pFixedInfo->NodeType));
+        if (pFixedInfo->EnableRouting)
+            _tprintf(_T("\tIP Routing Enabled. . . . . . . . : Yes\n"));
+        else
+            _tprintf(_T("\tIP Routing Enabled. . . . . . . . : No\n"));
+        if (pAdapter->HaveWins)
+            _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : Yes\n"));
+        else
+            _tprintf(_T("\tWINS Proxy enabled. . . . . . . . : No\n"));
+        _tprintf(_T("\tDNS Suffix Search List. . . . . . : %s\n"), pFixedInfo->DomainName);
     }
-    _tprintf(_T("\n"));
-}
 
-static void ShowNetworkFixedInfo()
-{
-    FIXED_INFO* pFixedInfo = NULL;
-    ULONG OutBufLen = 0;
-    DWORD result;
+	while (pAdapter)
+	{
 
-    result = GetNetworkParams(NULL, &OutBufLen);
-    if (result == ERROR_BUFFER_OVERFLOW) {
-        pFixedInfo = (FIXED_INFO*)malloc(OutBufLen);
-        if (!pFixedInfo) {
-            _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), OutBufLen);
-            return;
+        _tprintf(_T("\n%s ...... : \n\n"), GetInterfaceTypeName(pAdapter->Type));
+        
+        /* check if the adapter is connected to the media */
+        if (_tcscmp(pAdapter->IpAddressList.IpAddress.String, "0.0.0.0") == 0)
+        {
+            _tprintf(_T("\tMedia State . . . . . . . . . . . : Media disconnected\n"));
+            pAdapter = pAdapter->Next;
+            continue;
         }
-    } else {
-        _tprintf(_T("ERROR: GetNetworkParams() failed to report required buffer size.\n"));
-        return;
-    }
+        
+        _tprintf(_T("\tConnection-specific DNS Suffix. . : %s\n"), pFixedInfo->DomainName);
 
-    result = GetNetworkParams(pFixedInfo, &OutBufLen);
-    if (result == ERROR_SUCCESS) {
-        IP_ADDR_STRING* pIPAddr;
+        if (bAll)
+        {
+            _tprintf(_T("\tDescription . . . . . . . . . . . : %s\n"), pAdapter->Description);
+            _tprintf(_T("\tPhysical Address. . . . . . . . . : %s\n"), PrintMacAddr(pAdapter->Address));
+            if (pAdapter->DhcpEnabled)
+                _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n"));
+            else
+                _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : No\n"));
+            _tprintf(_T("\tAutoconfiguration Enabled . . . . : \n"));
+        }
 
-             _tprintf(_T("\tHostName. . . . . . . . . . . : %s\n"),  pFixedInfo->HostName);
-             _tprintf(_T("\tDomainName. . . . . . . . . . : %s\n"),  pFixedInfo->DomainName);
+        _tprintf(_T("\tIP Address. . . . . . . . . . . . : %s\n"), pAdapter->IpAddressList.IpAddress.String);
+        _tprintf(_T("\tSubnet Mask . . . . . . . . . . . : %s\n"), pAdapter->IpAddressList.IpMask.String);
+        _tprintf(_T("\tDefault Gateway . . . . . . . . . : %s\n"), pAdapter->GatewayList.IpAddress.String);
 
-             _tprintf(_T("\tDNS Servers . . . . . . . . . : %s\n"),  pFixedInfo->DnsServerList.IpAddress.String);
-             pIPAddr = pFixedInfo->DnsServerList.Next;
-             while (pIPAddr) {
-                 _tprintf(_T("\t\t\t\t      : %s\n"),  pIPAddr->IpAddress.String);
-                 pIPAddr = pIPAddr->Next;
-             }
+        if (bAll)
+        {
+            if (pAdapter->DhcpEnabled)
+               _tprintf(_T("\tDHCP Server . . . . . . . . . . . : %s\n"), pAdapter->DhcpServer.IpAddress.String);
 
-        _tprintf(_T("\tNodeType. . . . . . . . . . . : %d (%s)\n"), pFixedInfo->NodeType, GetNodeTypeName(pFixedInfo->NodeType));
-        _tprintf(_T("\tScopeId . . . . . . . . . . . : %s\n"),  pFixedInfo->ScopeId);
-        _tprintf(_T("\tEnableRouting . . . . . . . . : %s\n"), pFixedInfo->EnableRouting ? _T("yes") : _T("no"));
-        _tprintf(_T("\tEnableProxy . . . . . . . . . : %s\n"), pFixedInfo->EnableProxy ? _T("yes") : _T("no"));
-        _tprintf(_T("\tEnableDns . . . . . . . . . . : %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));
+            _tprintf(_T("\tDNS Servers . . . . . . . . . . . : "));
+            _tprintf(_T("%s\n"), pFixedInfo->DnsServerList.IpAddress.String);
+            pIPAddr = pFixedInfo -> DnsServerList.Next;
+            while (pIPAddr)
+            {
+                _tprintf(_T("\t\t\t\t\t    %s\n"), pIPAddr ->IpAddress.String );
+                pIPAddr = pIPAddr ->Next;
+            }
+            if (pAdapter->HaveWins)
+            {
+                _tprintf(_T("\tPrimary WINS Server . . . . . . . : %s\n"), pAdapter->PrimaryWinsServer.IpAddress.String);
+                _tprintf(_T("\tSecondard WINS Server . . . . . . : %s\n"), pAdapter->SecondaryWinsServer.IpAddress.String);
+            }
+            if (pAdapter->DhcpEnabled)
+            {
+                _tprintf(_T("\tLease Obtained. . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseObtained)));
+                _tprintf(_T("\tLease Expires . . . . . . . . . . : %s"), _tasctime(localtime(&pAdapter->LeaseExpires)));
+            }
+        }
         _tprintf(_T("\n"));
-/*        
-        _tprintf(_T("\n"),);
-        _tprintf(_T("GetNetworkParams() returned with %d\n"), pIfTable->NumAdapters);
+        
+		pAdapter = pAdapter->Next;
 
-      _tprintf(_T("\tConnection specific DNS suffix: %s\n"), pFixedInfo->EnableDns ? _T("yes") : _T("no"));
-*/
-    } else {
-        switch (result) {
-        case ERROR_BUFFER_OVERFLOW:
-            _tprintf(_T("The buffer size indicated by the pOutBufLen parameter is too small to hold the adapter information. The pOutBufLen parameter points to the required size\n"));
-            break;
-        case ERROR_INVALID_PARAMETER:
-            _tprintf(_T("The pOutBufLen parameter is NULL, or the calling process does not have read/write access to the memory pointed to by pOutBufLen, or the calling process does not have write access to the memory pointed to by the pAdapterInfo parameter\n"));
-            break;
-        case ERROR_NO_DATA:
-            _tprintf(_T("No adapter information exists for the local computer\n"));
-            break;
-        case ERROR_NOT_SUPPORTED:
-            _tprintf(_T("This function is not supported on the operating system in use on the local system\n"));
-            break;
-        default:
-            _tprintf(_T("0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
-            break;
-        }
     }
+ 
+    return 0;
 }
 
-static void ShowNetworkInterfaces()
+INT Release(TCHAR Index)
 {
-    IP_INTERFACE_INFO* pIfTable = NULL;
-    DWORD result;
-    DWORD dwNumIf;
-    DWORD dwOutBufLen = 0;
+    IP_ADAPTER_INDEX_MAP AdapterInfo;
+    DWORD dwRetVal = 0;
 
-    if ((result = GetNumberOfInterfaces(&dwNumIf)) != NO_ERROR) {
-        _tprintf(_T("GetNumberOfInterfaces() failed with code 0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
-        return;
-    } else {
-        _tprintf(_T("GetNumberOfInterfaces() returned %lu\n"), dwNumIf);
-    }
+    /* if interface is not given, query GetInterfaceInfo */
+    if (Index == (TCHAR)NULL)
+    {
+        PIP_INTERFACE_INFO pInfo;
+        ULONG ulOutBufLen;
+        pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO));
+        ulOutBufLen = 0;
 
-    result = GetInterfaceInfo(pIfTable, &dwOutBufLen);
-/*
-    dwOutBufLen = sizeof(IP_INTERFACE_INFO) + dwNumIf * sizeof(IP_ADAPTER_INDEX_MAP);
-    _tprintf(_T("GetNumberOfInterfaces() returned %d, dwOutBufLen %d\n"), dwNumIf, dwOutBufLen);
-    _tprintf(_T("sizeof(IP_INTERFACE_INFO) %d, sizeof(IP_ADAPTER_INDEX_MAP) %d\n"), sizeof(IP_INTERFACE_INFO), sizeof(IP_ADAPTER_INDEX_MAP));
-*/
-    pIfTable = (IP_INTERFACE_INFO*)malloc(dwOutBufLen);
-    if (!pIfTable) {
-        _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), dwOutBufLen);
-        return;
-    }
-/*
-typedef struct _IP_ADAPTER_INDEX_MAP {
-  ULONG Index;                     // adapter index
-  WCHAR Name[MAX_ADAPTER_NAME];    // name of the adapter
-} IP_ADAPTER_INDEX_MAP, * PIP_ADAPTER_INDEX_MAP;
-
-typedef struct _IP_INTERFACE_INFO {
-  LONG NumAdapters;                 // number of adapters in array
-  IP_ADAPTER_INDEX_MAP Adapter[1];  // adapter indices and names
-} IP_INTERFACE_INFO,*PIP_INTERFACE_INFO;
- */
-    result = GetInterfaceInfo(pIfTable, &dwOutBufLen);
-    if (result == NO_ERROR) {
-        UINT i;
-        _tprintf(_T("GetInterfaceInfo() returned with %ld adaptor entries\n"), pIfTable->NumAdapters);
-        for (i = 0; i < pIfTable->NumAdapters; i++) {
-           wprintf(L"[%d] %s\n", i + 1, pIfTable->Adapter[i].Name);
-           /*wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name);*/
-
-/*HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\NetBT\Parameters\Interfaces\Tcpip_{DB0E61C1-3498-4C5F-B599-59CDE8A1E357}*/
+        /* Make an initial call to GetInterfaceInfo to get
+         * the necessary size into the ulOutBufLen variable */
+        if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER)
+        {
+            GlobalFree(pInfo);
+            pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen);
         }
-    } else {
-        switch (result) {
-        case ERROR_INVALID_PARAMETER:
-            _tprintf(_T("The dwOutBufLen parameter is NULL, or GetInterfaceInterface is unable to write to the memory pointed to by the dwOutBufLen parameter\n"));
-            break;
-        case ERROR_INSUFFICIENT_BUFFER:
-            _tprintf(_T("The buffer pointed to by the pIfTable parameter is not large enough. The required size is returned in the DWORD variable pointed to by the dwOutBufLen parameter\n"));
-            _tprintf(_T("\tdwOutBufLen: %lu\n"), dwOutBufLen);
-            break;
-        case ERROR_NOT_SUPPORTED:
-            _tprintf(_T("This function is not supported on the operating system in use on the local system\n"));
-            break;
-        default:
-            _tprintf(_T("0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result);
-            break;
+
+        /* Make a second call to GetInterfaceInfo to get the actual data we want */
+        if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR )
+        {
+            AdapterInfo = pInfo->Adapter[0];
+            _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name);
+        }
+        else
+        {
+            _tprintf(_T("\nGetInterfaceInfo failed : "));
+            DoFormatMessage(dwRetVal);
         }
     }
-    free(pIfTable);
+    else
+    {
+        ;
+        /* we need to be able to release connections by name with support for globbing
+         * i.e. ipconfig /release Eth* will release all cards starting with Eth...
+         *      ipconfig /release *con* will release all cards with 'con' in their name
+         */
+    }
+
+
+    /* Call IpReleaseAddress to release the IP address on the specified adapter. */
+    if ((dwRetVal = IpReleaseAddress(&AdapterInfo)) != NO_ERROR)
+    {
+        _tprintf(_T("\nAn error occured while releasing interface %s : "), _T("*name*"));
+        DoFormatMessage(dwRetVal);
+    }
+    return 0;
 }
 
-/*
-typedef struct _IP_ADAPTER_INFO {
-  struct _IP_ADAPTER_INFO* Next;
-  DWORD ComboIndex;
-  char AdapterName[MAX_ADAPTER_NAME_LENGTH + 4];
-1  char Description[MAX_ADAPTER_DESCRIPTION_LENGTH + 4];
-  UINT AddressLength;
-2  BYTE Address[MAX_ADAPTER_ADDRESS_LENGTH];
-  DWORD Index;
-  UINT Type;
-3  UINT DhcpEnabled;
-5  PIP_ADDR_STRING CurrentIpAddress;
-  IP_ADDR_STRING IpAddressList;
-7  IP_ADDR_STRING GatewayList;
-8  IP_ADDR_STRING DhcpServer;
-  BOOL HaveWins;
-  IP_ADDR_STRING PrimaryWinsServer;
-  IP_ADDR_STRING SecondaryWinsServer;
-a  time_t LeaseObtained;
-b  time_t LeaseExpires;
-} IP_ADAPTER_INFO, *PIP_ADAPTER_INFO;
- */
-/*
-Ethernet adapter VMware Virtual Ethernet Adapter (Network Address Translation (NAT) for VMnet8):
 
-        Connection-specific DNS Suffix  . :
-1        Description . . . . . . . . . . . : VMware Virtual Ethernet Adapter (Network Address Translation (NAT) for VMnet8)
-2        Physical Address. . . . . . . . . : 00-50-56-C0-00-08
-3        DHCP Enabled. . . . . . . . . . . : Yes
-        Autoconfiguration Enabled . . . . : Yes
-5        IP Address. . . . . . . . . . . . : 192.168.136.1
-        Subnet Mask . . . . . . . . . . . : 255.255.255.0
-7        Default Gateway . . . . . . . . . :
-8        DHCP Server . . . . . . . . . . . : 192.168.136.254
-        DNS Servers . . . . . . . . . . . :
-a        Lease Obtained. . . . . . . . . . : Monday, 30 December 2002 5:56:53 PM
-b        Lease Expires . . . . . . . . . . : Monday, 30 December 2002 6:26:53 PM
- */
-static void ShowAdapterInfo(BOOL ShowAll)
+
+
+INT Renew(TCHAR Index)
 {
-    IP_ADAPTER_INFO* pAdaptorInfo;
+    IP_ADAPTER_INDEX_MAP AdapterInfo;
+    DWORD dwRetVal = 0;
+
+    /* if interface is not given, query GetInterfaceInfo */
+    if (Index == (TCHAR)NULL)
+    {
+        PIP_INTERFACE_INFO pInfo;
+        ULONG ulOutBufLen;
+        pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO));
+        ulOutBufLen = 0;
+
+        /* Make an initial call to GetInterfaceInfo to get
+         * the necessary size into the ulOutBufLen variable */
+        if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER)
+        {
+            GlobalFree(pInfo);
+            pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen);
+        }
+
+        /* Make a second call to GetInterfaceInfo to get the actual data we want */
+        if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR )
+        {
+            AdapterInfo = pInfo->Adapter[0];
+            _tprintf(_T("name - %S\n"), pInfo->Adapter[0].Name);
+        } else {
+            _tprintf(_T("\nGetInterfaceInfo failed : "));
+            DoFormatMessage(dwRetVal);
+        }
+    }
+    else
+    {
+        ;
+        /* we need to be able to renew connections by name with support for globbing
+         * i.e. ipconfig /renew Eth* will renew all cards starting with Eth...
+         *      ipconfig /renew *con* will renew all cards with 'con' in their name
+         */
+    }
+
+
+    /* Call IpRenewAddress to renew the IP address on the specified adapter. */
+    if ((dwRetVal = IpRenewAddress(&AdapterInfo)) != NO_ERROR)
+    {
+        _tprintf(_T("\nAn error occured while renew interface %s : "), _T("*name*"));
+        DoFormatMessage(dwRetVal);
+    }
+    return 0;
+}
+
+/* temp func for testing purposes */
+VOID Info()
+{
+     // Declare and initialize variables
+    PIP_INTERFACE_INFO pInfo;
     ULONG ulOutBufLen;
     DWORD dwRetVal;
-    PIP_ADDR_STRING pIpAddrString;
-    struct tm *LeaseTime;
+
+    pInfo = (IP_INTERFACE_INFO *) malloc( sizeof(IP_INTERFACE_INFO) );
+    ulOutBufLen = sizeof(IP_INTERFACE_INFO);
+    dwRetVal = 0;
 
 
-    if (ShowAll)
+    // Make an initial call to GetInterfaceInfo to get
+    // the necessary size in the ulOutBufLen variable
+    if ( GetInterfaceInfo(pInfo, &ulOutBufLen) == ERROR_INSUFFICIENT_BUFFER)
     {
-        _tprintf(_T("\nAdaptor Information\t\n"));
+        free(pInfo);
+        pInfo = (IP_INTERFACE_INFO *) malloc (ulOutBufLen);
     }
 
-    pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, sizeof(IP_ADAPTER_INFO));
-    ulOutBufLen = sizeof(IP_ADAPTER_INFO);
-
-    if (ERROR_BUFFER_OVERFLOW == GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen)) {
-        GlobalFree(pAdaptorInfo);
-        pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, ulOutBufLen);
-    }
-    if ((dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen))) {
-        _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal);
-    } else {
-        while (pAdaptorInfo) {
-
-            /* print the type of interface before the Name of it */
-            _tprintf(_T("\n%s Adapter %s:\n\n"), GetInterfaceTypeName(pAdaptorInfo->Type), pAdaptorInfo->AdapterName);
-
-            if (ShowAll)
-            {
-                _tprintf(_T("\tDescription. . . . . . : %s\n"), pAdaptorInfo->Description);
-
-                /* print the Physical address to the screen*/
-                _tprintf(_T("\tPhysical Address . . . : "));
-                PrintPhysicalAddr(pAdaptorInfo->Address, pAdaptorInfo->AddressLength);
-
-                /* Now the DHCP state */
-                _tprintf(_T("\tDHCP Enabled . . . . . : %s\n"), pAdaptorInfo->DhcpEnabled ? _T("Yes") : _T("No"));
-            }
-            
-            /* IP Addresses/Netmasks, there may be more than one */
-            pIpAddrString = &pAdaptorInfo->IpAddressList;
-
-            do{
-                _tprintf(_T("\tIP Address . . . . . . : %s\n"), pIpAddrString->IpAddress.String);
-                _tprintf(_T("\tSubnet Mask. . . . . . : %s\n"), pIpAddrString->IpMask.String);
-                pIpAddrString = pIpAddrString->Next;
-            }while (pIpAddrString!=NULL);
-
-            /* Default Gateway */
-            pIpAddrString = &pAdaptorInfo->GatewayList;
-            _tprintf(_T("\tDefault Gateway. . . . : %s\n"), pIpAddrString->IpAddress.String);
-
-            /* Print some stuff that is only relevant it dhcp is enabled */
-            if((pAdaptorInfo->DhcpEnabled)&&(ShowAll))
-            {
-                /* Display the DHCP server address */
-                pIpAddrString = &pAdaptorInfo->DhcpServer;
-                _tprintf(_T("\tDHCP Server. . . . . . : %s\n"), pIpAddrString->IpAddress.String);
-
-                /* Display the Lease times*/
-                LeaseTime = localtime(&pAdaptorInfo->LeaseObtained);
-                _tprintf(_T("\tLease Obtained . . . . : %s"), asctime(LeaseTime));
-
-                LeaseTime = localtime(&pAdaptorInfo->LeaseExpires);
-                _tprintf(_T("\tLease Expieres . . . . : %s"), asctime(LeaseTime));
-
-            }
-
-            pAdaptorInfo = pAdaptorInfo->Next;
+    // Make a second call to GetInterfaceInfo to get
+    // the actual data we need
+    if ((dwRetVal = GetInterfaceInfo(pInfo, &ulOutBufLen)) == NO_ERROR )
+    {
+        int i;
+        for (i=0; i<pInfo->NumAdapters; i++)
+        {
+            printf("\tAdapter Name: %S\n", pInfo->Adapter[i].Name);
+            printf("\tAdapter Index: %ld\n", pInfo->Adapter[i].Index);
+            printf("\tNum Adapters: %ld\n", pInfo->NumAdapters);
         }
     }
+    else
+    {
+        printf("GetInterfaceInfo failed.\n");
+        DoFormatMessage(dwRetVal);
+    }
 }
 
-const TCHAR szUsage[] = { _T("USAGE:\n" \
-    "   ipconfig [/? | /all | /release [adapter] | /renew [adapter]\n" \
-    "            | /flushdns | /registerdns\n" \
-    "            | /showclassid adapter\n" \
-    "            | /showclassid adapter\n" \
-    "            | /setclassid adapter [classidtoset] ]\n" \
-    "\n" \
-    "adapter    Full name or pattern with '*' and '?' to 'match',\n" \
-    "           * matches any character, ? matches one character.\n" \
-    "   Options\n" \
-    "       /?           Display this help message.\n" \
-    "       /all         Display full configuration information.\n" \
-    "       /release     Release the IP address for the specified adapter.\n" \
-    "       /renew       Renew the IP address for the specified adapter.\n" \
-    "       /flushdns    Purges the DNS Resolver cache.\n" \
-    "       /registerdns Refreshes all DHCP leases and re-registers DNS names\n" \
-    "       /displaydns  Display the contents of the DNS Resolver Cache.\n" \
-    "       /showclassid Displays all the dhcp class IDs allowed for adapter.\n" \
-    "       /setclassid  Modifies the dhcp class id.\n" \
-    "\n" \
-    "The default is to display only the IP address, subnet mask and\n" \
-    "default gateway for each adapter bound to TCP/IP.\n")
-};
-/*
-    "\n" \
-    "For Release and Renew, if no adapter name is specified, then the IP address\n" \
-    "leases for all adapters bound to TCP/IP will be released or renewed.\n" \
-    "\n" \
-    "For SetClassID, if no class id is specified, then the classid is removed.\n" \
-    "\n" \
-    "Examples:\n" \
-    "    > ipconfig                       ... Show information.\n" \
-    "    > ipconfig /all                  ... Show detailed information\n" \
-    "    > ipconfig /renew                ... renew all adapaters\n" \
-    "    > ipconfig /renew EL*            ... renew adapters named EL....\n" \
-    "    > ipconfig /release *ELINK?21*   ... release all matching adapters,\n" \
-                                         eg. ELINK-21, myELELINKi21adapter.\n"
- */
 
-static void usage(void)
+VOID Usage(VOID)
 {
-    _fputts(szUsage, stderr);
+    _tprintf(_T("\nUSAGE:\n"
+    "    ipconfig [/? | /all | /renew [adapter] | /release [adapter] |\n"
+    "              /flushdns | /displaydns | /registerdns |\n"
+    "              /showclassid adapter |\n"
+    "              /setclassid adapter [classid] ]\n"
+    "\n"
+    "where\n"
+    "    adapter         Connection name\n"
+    "                   (wildcard characters * and ? allowed, see examples)\n"
+    "\n"
+    "    Options:\n"
+    "       /?           Display this help message\n"
+    "       /all         Display full configuration information.\n"
+    "       /release     Release the IP address for the specified adapter.\n"
+    "       /renew       Renew the IP address for the specified adapter.\n"
+    "       /flushdns    Purges the DNS Resolver cache.\n"
+    "       /registerdns Refreshes all DHCP leases and re-registers DNS names.\n"
+    "       /displaydns  Display the contents of the DNS Resolver Cache.\n"
+    "       /showclassid Displays all the dhcp class IDs allowed for adapter.\n"
+    "       /setclassid  Modifies the dhcp class id.\n"
+    "\n"
+    "The default is to display only the IP address, subnet mask and\n"
+    "default gateway for each adapter bound to TCP/IP.\n"
+    "\n"
+    "For Release and Renew, if no adapter name is specified, then the IP address\n"
+    "leases for all adapters bound to TCP/IP will be released or renewed.\n"
+    "\n"
+    "For Setclassid, if no ClassId is specified, then the ClassId is removed.\n"
+    "\n"
+    "Examples:\n"
+    "    > ipconfig                   ... Show information.\n"
+    "    > ipconfig /all              ... Show detailed information\n"
+    "    > ipconfig /renew            ... renew all adapters\n"
+    "    > ipconfig /renew EL*        ... renew any connection that has its\n"
+    "                                     name starting with EL\n"
+    "    > ipconfig /release *Con*    ... release all matching connections,\n"
+    "                                     eg. \"Local Area Connection 1\" or\n"
+    "                                         \"Local Area Connection 2\"\n"));
 }
 
-
-int _tmain(int argc, TCHAR *argv[])
+int main(int argc, char *argv[])
 {
     BOOL DoUsage=FALSE;
     BOOL DoAll=FALSE;
@@ -384,14 +427,10 @@ int _tmain(int argc, TCHAR *argv[])
     BOOL DoRegisterdns=FALSE;
     BOOL DoDisplaydns=FALSE;
     BOOL DoShowclassid=FALSE;
-    BOOL DoSetclassid=FALSE;  
+    BOOL DoSetclassid=FALSE;
 
-    _tprintf(_T("\nReactOS IP Configuration\n\n"));
-
-    /* 
-       Parse command line for options we have been given. 
-    */
-    if ( ((argc > 1))&&((argv[1][0]=='/')||(argv[1][0]=='-')) )
+    /* Parse command line for options we have been given. */
+    if ( (argc > 1)&&(argv[1][0]=='/') )
     {
         if( !_tcsicmp( &argv[1][1], _T("?") ))
         {
@@ -400,11 +439,11 @@ int _tmain(int argc, TCHAR *argv[])
         else if( !_tcsnicmp( &argv[1][1], _T("ALL"), _tcslen(&argv[1][1]) ))
         {
            DoAll = TRUE;
-        } 
+        }
         else if( !_tcsnicmp( &argv[1][1], _T("RELEASE"), _tcslen(&argv[1][1]) ))
         {
-            DoRelease = TRUE; 
-        } 
+            DoRelease = TRUE;
+        }
         else if( ! _tcsnicmp( &argv[1][1], _T("RENEW"), _tcslen(&argv[1][1]) ))
         {
             DoRenew = TRUE;
@@ -413,7 +452,7 @@ int _tmain(int argc, TCHAR *argv[])
         {
             DoFlushdns = TRUE;
         }
-        else if( ! _tcsnicmp( &argv[1][1], _T("REGISTERDNS"), _tcslen(&argv[1][1]) ))
+        else if( ! _tcsnicmp( &argv[1][1], _T("FLUSHREGISTERDNS"), _tcslen(&argv[1][1]) ))
         {
             DoRegisterdns = TRUE;
         }
@@ -431,52 +470,50 @@ int _tmain(int argc, TCHAR *argv[])
         }
     }
 
-
-    switch (argc) 
+    switch (argc)
     {
-        case 1:  /* Default behaviour if options are given specified*/
-            ShowAdapterInfo(FALSE);
+        case 1:  /* Default behaviour if no options are given*/
+            ShowInfo(FALSE);
             break;
         case 2:  /* Process all the options that take no paramiters */
-            if ( DoUsage)
-                usage();
-            else if ( DoAll)
-            {
-                ShowNetworkFixedInfo();
-                ShowNetworkInterfaces();
-                ShowAdapterInfo(TRUE);
-            }
-            else if ( DoRelease)
-                printf("\nSorry /Release is not implemented yet\n");
-            else if ( DoRenew)
-                printf("\nSorry /Renew is not implemented yet\n");
-            else if ( DoFlushdns)
-                printf("\nSorry /Flushdns is not implemented yet\n");
-            else if ( DoRegisterdns)
-                printf("\nSorry /Registerdns is not implemented yet\n");
-            else if ( DoDisplaydns)
-                printf("\nSorry /Displaydns is not implemented yet\n");
+            if (DoUsage)
+                Usage();
+            else if (DoAll)
+                ShowInfo(TRUE);
+            else if (DoRelease)
+                Release((TCHAR)NULL);
+            else if (DoRenew)
+                Renew((TCHAR)NULL);
+            else if (DoFlushdns)
+                _tprintf(_T("\nSorry /flushdns is not implemented yet\n"));
+            else if (DoRegisterdns)
+                _tprintf(_T("\nSorry /registerdns is not implemented yet\n"));
+            else if (DoDisplaydns)
+                _tprintf(_T("\nSorry /displaydns is not implemented yet\n"));
             else
-                usage();
+                Usage();
             break;
         case 3: /* Process all the options that can have 1 paramiters */
-            if ( DoRelease)
-                printf("\nSorry /Release is not implemented yet\n");
-            else if ( DoRenew)
-                printf("\nSorry /Renew is not implemented yet\n");
-            else if ( DoShowclassid)
-                printf("\nSorry /Showclassid is not implemented yet\n");
+            if (DoRelease)
+                _tprintf(_T("\nSorry /release [adapter] is not implemented yet\n"));
+                //Release(argv[2]);
+            else if (DoRenew)
+                _tprintf(_T("\nSorry /renew [adapter] is not implemented yet\n"));
+            else if (DoShowclassid)
+                _tprintf(_T("\nSorry /showclassid adapter is not implemented yet\n"));
+            else if (DoSetclassid)
+                _tprintf(_T("\nSorry /setclassid adapter is not implemented yet\n"));
             else
-                usage();
+                Usage();
             break;
         case 4:  /* Process all the options that can have 2 paramiters */
-            if ( DoSetclassid)
-                printf("\nSorry /Setclassid is not implemented yet\n");
+            if (DoSetclassid)
+                _tprintf(_T("\nSorry /setclassid adapter [classid]is not implemented yet\n"));
             else
-                usage();
+                Usage();
             break;
         default:
-            usage();
+            Usage();
     }
 
     return 0;

reactos/apps/utils/net/ipconfig/ipconfig.rc

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

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

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

reactos/apps/utils/net/ipconfig/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/ipconfig/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/netstat/netstat.h

@@ -0,0 +1,60 @@
+
+/* Maximum string lengths for ASCII ip address and port names */
+#define HOSTNAMELEN     256
+#define PORTNAMELEN     256
+#define ADDRESSLEN      HOSTNAMELEN+PORTNAMELEN
+
+/* command line options */
+BOOL bNoOptions        = FALSE; // print default
+BOOL bDoShowAllCons    = FALSE; // -a
+BOOL bDoShowEthStats   = FALSE; // -e
+BOOL bDoShowNumbers    = FALSE; // -n
+BOOL bDoShowProtoCons  = FALSE; // -p
+BOOL bDoShowRouteTable = FALSE; // -r
+BOOL bDoShowProtoStats = FALSE; // -s
+BOOL bDoDispSeqComp    = FALSE; // -v
+BOOL bLoopOutput       = FALSE; // interval
+
+
+/* Undocumented extended information structures available only on XP and higher */
+typedef struct {
+  DWORD dwState;        // state of the connection
+  DWORD dwLocalAddr;    // address on local computer
+  DWORD dwLocalPort;    // port number on local computer
+  DWORD dwRemoteAddr;   // address on remote computer
+  DWORD dwRemotePort;   // port number on remote computer
+  DWORD dwProcessId;
+} MIB_TCPEXROW, *PMIB_TCPEXROW;
+
+typedef struct {
+    DWORD dwNumEntries;
+    MIB_TCPEXROW table;
+} MIB_TCPEXTABLE, *PMIB_TCPEXTABLE;
+
+typedef struct {
+  DWORD   dwLocalAddr;    // address on local computer
+  DWORD   dwLocalPort;    // port number on local computer
+  DWORD   dwProcessId;
+} MIB_UDPEXROW, *PMIB_UDPEXROW;
+
+typedef struct {
+    DWORD dwNumEntries;
+    MIB_UDPEXROW table;
+} MIB_UDPEXTABLE, *PMIB_UDPEXTABLE;
+
+
+/* function declerations */
+BOOL ParseCmdline(int argc, char* argv[]);
+BOOL DisplayOutput(VOID);
+DWORD DoFormatMessage(DWORD ErrorCode);
+VOID ShowIpStatistics(VOID);
+VOID ShowIcmpStatistics(VOID);
+VOID ShowTcpStatistics(VOID);
+VOID ShowUdpStatistics(VOID);
+VOID ShowEthernetStatistics(VOID);
+VOID ShowTcpTable(VOID);
+VOID ShowUdpTable(VOID);
+PCHAR GetPortName(UINT Port, PCSTR Proto, CHAR Name[PORTNAMELEN], INT NameLen);
+PCHAR GetIpHostName(BOOL local, UINT ipaddr, CHAR name[HOSTNAMELEN], int namelen);
+VOID Usage(VOID);
+

reactos/apps/utils/net/netstat/netstat.rc

@@ -1,40 +1,7 @@
-/* $Id$ */
-
-#include <windows.h>
-#include "resource.h"
-
-#define REACTOS_STR_FILE_DESCRIPTION	"ReactOS TCP/IPv4 Win32 netstat\0"
-#define REACTOS_STR_INTERNAL_NAME	"netstat\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"netstat.exe\0"
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS TCP/IPv4 Win32 netstat\0"
+#define REACTOS_STR_INTERNAL_NAME   "netstat\0"
+#define REACTOS_STR_ORIGINAL_FILENAME   "netstat.exe\0"
+#define REACTOS_STR_ORIGINAL_COPYRIGHT  "Ged Murphy (gedmurphy@gmail.com)\0"
 #include <reactos/version.rc>
 
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-#ifdef __GNUC__
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_APP_TITLE           "ReactOS netstat"
-    IDS_APP_USAGE           "\n"\
-                            "Displays current TCP/IP protocol statistics and network connections.\n\n"\
-                            "NETSTAT [-a] [-e] [-n] [-s] [-p proto] [-r] [interval]\n\n"\
-                            "  -a            Displays all connections and listening ports.\n"\
-                            "  -e            Displays Ethernet statistics. May be combined with -s\n"\
-                            "  -n            Displays address and port numbers in numeric form.\n"\
-                            "  -p proto      Shows connections for protocol 'proto' TCP or UDP.\n"\
-                            "                If used with the -s option to display\n"\
-                            "                per-protocol statistics, 'proto' may be TCP, UDP, or IP.\n"\
-                            "  -r            Displays the current routing table.\n"\
-                            "  -s            Displays per-protocol statistics. Statistics are shown for\n"\
-                            "                TCP, UDP and IP by default; use -p option to display\n"\
-                            "                information about a subset of the protocols only.\n"\
-                            "  interval      Redisplays selected statistics every 'interval' seconds.\n"\
-                            "                Press CTRL+C to stop redisplaying. By default netstat will\n"\
-                            "                print the current information only once.\n"
-END
-#endif
 

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

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

reactos/apps/utils/net/netstat/resource.h

@@ -1,7 +0,0 @@
-
-#define RES_FIRST_INDEX 1
-#define RES_LAST_INDEX  25
-
-#define IDS_APP_TITLE  100
-#define IDS_APP_USAGE  101
-