Remove all non-working applications from "downloader.xml"

svn path=/branches/ros-branch-0_3_5/; revision=34195

irc/TechBot/TechBot.Commands.Common/Base/BugCommand.cs

@@ -1,25 +1,26 @@
 using System;
 
-namespace TechBot.Library
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
 {
 	public abstract class BugCommand : Command
 	{
-        private string m_BugID = null;
+//        private string m_BugID = null;
 
 		public BugCommand()
 		{
 		}
 
-        [CommandParameter("id", "The bug ID")]
         public string BugID
         {
-            get { return m_BugID; }
-            set { m_BugID = value; }
+            get { return Parameters; }
+            set { Parameters = value; }
         }
 
         public override void ExecuteCommand()
         {
-            if (BugID == null)
+            if (string.IsNullOrEmpty(BugID))
             {
                 Say("Please provide a valid bug number.");
             }

irc/TechBot/TechBot.Commands.Common/ErrorCommand.cs

@@ -2,7 +2,9 @@ using System;
 using System.Xml;
 using System.Collections;
 
-namespace TechBot.Library
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
 {
     [Command("error", Help = "!error <value>")]
 	public class ErrorCommand : Command
@@ -68,27 +70,24 @@ namespace TechBot.Library
 			return code.ToString();
 		}
 
-		public override  void Handle(MessageContext context)
-		{
-            if (Text.Equals(String.Empty))
+		public override void  ExecuteCommand()
+        {
+            if (Parameters.Equals(String.Empty))
 			{
-				TechBot.ServiceOutput.WriteLine(context,
-				                        "Please provide an Error Code.");
+				Say("Please provide an Error Code.");
 				return;
 			}
 			
-			string errorText = originalErrorText;
+			string errorText = Parameters;
 
 		retry:
 			NumberParser np = new NumberParser();
 			long error = np.Parse(errorText);
-			if (np.Error)
-			{
-                TechBot.ServiceOutput.WriteLine(context,
-				                        String.Format("{0} is not a valid Error Code.",
-													  originalErrorText));
-				return;
-			}
+            if (np.Error)
+            {
+                Say("{0} is not a valid Error Code.", Parameters);
+                return;
+            }
 			
 			ArrayList descriptions = new ArrayList();
 
@@ -159,27 +158,23 @@ namespace TechBot.Library
 					goto retry;
 				}
 
-                TechBot.ServiceOutput.WriteLine(context,
-										String.Format("I don't know about Error Code {0}.",
-													  originalErrorText));
-			}
-			else if (descriptions.Count == 1)
-			{
-				string description = (string)descriptions[0];
-                TechBot.ServiceOutput.WriteLine(context,
-										String.Format("{0} is {1}.",
-													  originalErrorText,
-													  description));
-			}
-			else
-			{
-                TechBot.ServiceOutput.WriteLine(context,
-				                        String.Format("{0} could be:",
-				                                      originalErrorText));
-				
-				foreach(string description in descriptions)
-                    TechBot.ServiceOutput.WriteLine(context, String.Format("\t{0}", description));
+                Say("I don't know about Error Code {0}.",
+                                                      Parameters);
 			}
+            else if (descriptions.Count == 1)
+            {
+                string description = (string)descriptions[0];
+                Say("{0} is {1}.",
+                                                      Parameters,
+                                                      description);
+            }
+            else
+            {
+                Say("{0} could be:", Parameters);
+
+                foreach (string description in descriptions)
+                    Say("\t{0}", description);
+            }
 		}
 	}
 }

irc/TechBot/TechBot.Commands.Common/HResultCommand.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Xml;
+
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
+{
+    [Command("hresult", Help = "!hresult <value>")]
+    public class HResultCommand : XmlLookupCommand
+	{
+        public HResultCommand()
+		{
+		}
+
+        public override string XmlFile
+        {
+            get { return Settings.Default.HResultXml; }
+        }
+
+		public override void ExecuteCommand()
+		{
+            if (string.IsNullOrEmpty(Text))
+            {
+                Say("Please provide a valid HRESULT value.");
+            }
+            else
+            {
+                NumberParser np = new NumberParser();
+                long hresult = np.Parse(Text);
+                if (np.Error)
+                {
+                    Say("{0} is not a valid HRESULT value.", Text);
+                    return;
+                }
+
+                string description = GetHresultDescription(hresult);
+                if (description != null)
+                {
+                    Say("{0} is {1}.",
+                        Text,
+                        description);
+                }
+                else
+                {
+                    Say("I don't know about HRESULT {0}.", Text);
+                }
+            }
+		}
+		
+		public string GetHresultDescription(long hresult)
+		{
+			XmlElement root = base.m_XmlDocument.DocumentElement;
+			XmlNode node = root.SelectSingleNode(String.Format("Hresult[@value='{0}']",
+			                                                   hresult.ToString("X8")));
+			if (node != null)
+			{
+				XmlAttribute text = node.Attributes["text"];
+				if (text == null)
+					throw new Exception("Node has no text attribute.");
+				return text.Value;
+			}
+			else
+				return null;
+		}
+	}
+}

irc/TechBot/TechBot.Commands.Common/NtStatusCommand.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Xml;
+
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
+{
+    [Command("ntstatus", Help = "!ntstatus <value>")]
+	public class NtStatusCommand : XmlLookupCommand
+	{
+        public NtStatusCommand()
+		{
+		}
+
+        public override string XmlFile
+        {
+            get { return Settings.Default.NtStatusXml; }
+        }
+
+		public override void ExecuteCommand()
+		{
+            if (string.IsNullOrEmpty(Text))
+            {
+                Say("Please provide a valid NTSTATUS value.");
+            }
+            else
+            {
+                NumberParser np = new NumberParser();
+                long ntstatus = np.Parse(Text);
+                if (np.Error)
+                {
+                    Say("{0} is not a valid NTSTATUS value.", Text);
+                    return;
+                }
+
+                string description = GetNtstatusDescription(ntstatus);
+                if (description != null)
+                {
+                    Say("{0} is {1}.",
+                        Text,
+                        description);
+                }
+                else
+                {
+                    Say("I don't know about NTSTATUS {0}.", Text);
+                }
+            }
+		}
+		
+		public string GetNtstatusDescription(long ntstatus)
+		{
+			XmlElement root = base.m_XmlDocument.DocumentElement;
+			XmlNode node = root.SelectSingleNode(String.Format("Ntstatus[@value='{0}']",
+			                                                   ntstatus.ToString("X8")));
+			if (node != null)
+			{
+				XmlAttribute text = node.Attributes["text"];
+				if (text == null)
+					throw new Exception("Node has no text attribute.");
+				return text.Value;
+			}
+			else
+				return null;
+		}
+	}
+}

irc/TechBot/TechBot.Commands.Common/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TechBot.Commands.Common")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Sand")]
+[assembly: AssemblyProduct("TechBot.Commands.Common")]
+[assembly: AssemblyCopyright("Copyright © Sand 2008")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("5d39d6f8-37fb-423b-ba88-1d5d8e5a1317")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

irc/TechBot/TechBot.Commands.Common/ReactOSBugUrl.cs

@@ -2,9 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TechBot.Library
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
 {
-    [Command("rosbug", Help = "!rosbug <number>")]
+    [Command("rosbug", Help = "!rosbug <number>", Description = "Will give you a link to the reqested ReactOS bug")]
     class ReactOSBugUrl : BugCommand
     {
         public ReactOSBugUrl()

irc/TechBot/TechBot.Commands.Common/SambaBugUrl.cs

@@ -2,9 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TechBot.Library
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
 {
-    [Command("sambabug", Help = "!sambabug <number>")]
+    [Command("sambabug", Help = "!sambabug <number>", Description = "Will give you a link to the reqested Samba bug")]
     class SambaBugUrl : BugCommand
     {
         public SambaBugUrl()

irc/TechBot/TechBot.Commands.Common/Settings.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace TechBot.Commands.Common {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("C:\\Ros\\current\\irc\\TechBot\\Resources\\ntstatus.xml")]
+        public string NtStatusXml {
+            get {
+                return ((string)(this["NtStatusXml"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("C:\\Ros\\current\\irc\\TechBot\\Resources\\winerror.xml")]
+        public string WinErrorXml {
+            get {
+                return ((string)(this["WinErrorXml"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("C:\\Ros\\current\\irc\\TechBot\\Resources\\hresult.xml")]
+        public string HResultXml {
+            get {
+                return ((string)(this["HResultXml"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("C:\\Ros\\current\\irc\\TechBot\\Resources\\wm.xml")]
+        public string WMXml {
+            get {
+                return ((string)(this["WMXml"]));
+            }
+        }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("svn://svn.reactos.org/trunk/reactos")]
+        public string SVNRoot {
+            get {
+                return ((string)(this["SVNRoot"]));
+            }
+        }
+    }
+}

irc/TechBot/TechBot.Commands.Common/Settings.cs

@@ -0,0 +1,28 @@
+namespace TechBot.Commands.Common {
+    
+    
+    // This class allows you to handle specific events on the settings class:
+    //  The SettingChanging event is raised before a setting's value is changed.
+    //  The PropertyChanged event is raised after a setting's value is changed.
+    //  The SettingsLoaded event is raised after the setting values are loaded.
+    //  The SettingsSaving event is raised before the setting values are saved.
+    internal sealed partial class Settings {
+        
+        public Settings() {
+            // // To add event handlers for saving and changing settings, uncomment the lines below:
+            //
+            // this.SettingChanging += this.SettingChangingEventHandler;
+            //
+            // this.SettingsSaving += this.SettingsSavingEventHandler;
+            //
+        }
+        
+        private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
+            // Add code to handle the SettingChangingEvent event here.
+        }
+        
+        private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+            // Add code to handle the SettingsSaving event here.
+        }
+    }
+}

irc/TechBot/TechBot.Commands.Common/Settings.settings

@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="TechBot.Commands.Common" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="NtStatusXml" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\ntstatus.xml</Value>
+    </Setting>
+    <Setting Name="WinErrorXml" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\winerror.xml</Value>
+    </Setting>
+    <Setting Name="HResultXml" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\hresult.xml</Value>
+    </Setting>
+    <Setting Name="WMXml" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">C:\Ros\current\irc\TechBot\Resources\wm.xml</Value>
+    </Setting>
+    <Setting Name="SVNRoot" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">svn://svn.reactos.org/trunk/reactos</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>

irc/TechBot/TechBot.Commands.Common/SvnCommand.cs

@@ -1,8 +1,10 @@
 using System;
 
-namespace TechBot.Library
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
 {
-    [Command("svn", Help = "!svn")]
+    [Command("svn", Help = "!svn" , Description="Where the ROS SVN repository is located")]
 	public class SvnCommand : Command
 	{
 		private string m_SvnRoot;

irc/TechBot/TechBot.Commands.Common/TechBot.Commands.Common.csproj

@@ -0,0 +1,75 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{041B5F06-BF97-4981-B024-3A7B6DD9F6AE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TechBot.Commands.Common</RootNamespace>
+    <AssemblyName>TechBot.Commands.Common</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Base\BugCommand.cs" />
+    <Compile Include="ErrorCommand.cs" />
+    <Compile Include="HResultCommand.cs" />
+    <Compile Include="NtStatusCommand.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReactOSBugUrl.cs" />
+    <Compile Include="SambaBugUrl.cs" />
+    <Compile Include="Settings.cs" />
+    <Compile Include="Settings.Designer.cs">
+      <DependentUpon>Settings.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="SvnCommand.cs" />
+    <Compile Include="WineBugUrl.cs" />
+    <Compile Include="WinerrorCommand.cs" />
+    <Compile Include="WMCommand.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\TechBot.Library\TechBot.Library.csproj">
+      <Project>{1114F34D-F388-4F38-AE27-C0EE1B10B777}</Project>
+      <Name>TechBot.Library</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

irc/TechBot/TechBot.Commands.Common/WMCommand.cs

@@ -1,13 +1,13 @@
 using System;
 using System.Xml;
 
-namespace TechBot.Library
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
 {
     [Command("wm" , Help = "!wm <value> or !wm <name>")]
 	public class WMCommand : XmlCommand
 	{
-        private string m_WMText = null;
-
         public WMCommand()
 		{
 		}
@@ -17,48 +17,46 @@ namespace TechBot.Library
             get { return Settings.Default.WMXml; }
         }
 		
-        [CommandParameter("wm", "The windows message to check")]
+        [CommandParameter("wm", "The windows message to check" , DefaultParameter = true)]
         public string WMText
         {
-            get { return m_WMText; }
-            set { m_WMText = value; }
+            get { return Parameters; }
+            set { Parameters = value; }
         }
 
 		public override void ExecuteCommand()
 		{
-            if (WMText.Equals(String.Empty))
-			{
-				TechBot.ServiceOutput.WriteLine(Context,
-				                        "Please provide a valid window message value or name.");
-				return;
-			}
+            if (string.IsNullOrEmpty(WMText))
+            {
+                Say("Please provide a valid window message value or name.");
 
-			NumberParser np = new NumberParser();
-            long wm = np.Parse(WMText);
-			string output;
-			if (np.Error)
-			{
-				// Assume "!wm <name>" form.
-                output = GetWmNumber(WMText);
-			}
-			else
-			{
-				output = GetWmDescription(wm);
-			}
+            }
+            else
+            {
+                NumberParser np = new NumberParser();
+                long wm = np.Parse(WMText);
+                string output;
+                if (np.Error)
+                {
+                    // Assume "!wm <name>" form.
+                    output = GetWmNumber(WMText);
+                }
+                else
+                {
+                    output = GetWmDescription(wm);
+                }
 
-			if (output != null)
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("{0} is {1}.",
-                                                      WMText,
-			        	                              output));
-			}
-			else
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("I don't know about window message {0}.",
-                                                      WMText));
-			}
+                if (output != null)
+                {
+                    Say("{0} is {1}.",
+                         WMText,
+                         output);
+                }
+                else
+                {
+                    Say("I don't know about window message {0}.", WMText);
+                }
+            }
 		}
 
 		private string GetWmDescription(long wm)

irc/TechBot/TechBot.Commands.Common/WineBugUrl.cs

@@ -2,9 +2,11 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace TechBot.Library
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
 {
-    [Command("winebug", Help = "!winebug <number>")]
+    [Command("winebug", Help = "!winebug <number>" , Description="Will give you a link to the reqested Wine bug")]
     class WineBugUrl : BugCommand
     {
         public WineBugUrl()

irc/TechBot/TechBot.Commands.Common/WinerrorCommand.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Xml;
+
+using TechBot.Library;
+
+namespace TechBot.Commands.Common
+{
+    [Command("winerror", Help = "!winerror <value>")]
+    public class WinErrorCommand : XmlLookupCommand
+	{
+        public WinErrorCommand()
+		{
+		}
+
+        public override string XmlFile
+        {
+            get { return Settings.Default.WinErrorXml; }
+        }
+
+		public override void ExecuteCommand()
+		{
+            if (string.IsNullOrEmpty(Text))
+            {
+                Say("Please provide a valid System Error Code value.");
+            }
+            else
+            {
+                NumberParser np = new NumberParser();
+                long winerror = np.Parse(Text);
+                if (np.Error)
+                {
+                    Say("{0} is not a valid System Error Code value.", Text);
+                    return;
+                }
+
+                string description = GetWinerrorDescription(winerror);
+                if (description != null)
+                {
+                    Say("{0} is {1}.",
+                        Text,
+                        description);
+                }
+                else
+                {
+                    Say("I don't know about System Error Code {0}.", Text);
+                }
+            }
+		}
+
+		public string GetWinerrorDescription(long winerror)
+		{
+			XmlElement root = base.m_XmlDocument.DocumentElement;
+			XmlNode node = root.SelectSingleNode(String.Format("Winerror[@value='{0}']",
+                                                               winerror.ToString()));
+			if (node != null)
+			{
+				XmlAttribute text = node.Attributes["text"];
+				if (text == null)
+					throw new Exception("Node has no text attribute.");
+				return text.Value;
+			}
+			else
+				return null;
+		}
+	}
+}

irc/TechBot/TechBot.Commands.Common/app.config

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="TechBot.Commands.Common.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <applicationSettings>
+        <TechBot.Commands.Common.Settings>
+            <setting name="NtStatusXml" serializeAs="String">
+                <value>C:\Ros\current\irc\TechBot\Resources\ntstatus.xml</value>
+            </setting>
+            <setting name="WinErrorXml" serializeAs="String">
+                <value>C:\Ros\current\irc\TechBot\Resources\winerror.xml</value>
+            </setting>
+            <setting name="HResultXml" serializeAs="String">
+                <value>C:\Ros\current\irc\TechBot\Resources\hresult.xml</value>
+            </setting>
+            <setting name="WMXml" serializeAs="String">
+                <value>C:\Ros\current\irc\TechBot\Resources\wm.xml</value>
+            </setting>
+            <setting name="SVNRoot" serializeAs="String">
+                <value>svn://svn.reactos.org/trunk/reactos</value>
+            </setting>
+        </TechBot.Commands.Common.Settings>
+    </applicationSettings>
+</configuration>

irc/TechBot/TechBot.Commands.MSDN/ApiCommand.cs

@@ -2,46 +2,52 @@ using System;
 using System.IO;
 using System.Data;
 using System.Text.RegularExpressions;
+
 using HtmlHelp;
 using HtmlHelp.ChmDecoding;
 
-namespace TechBot.Library
+using TechBot.Library;
+
+namespace TechBot.Commands.MSDN
 {
     [Command("api", Help = "!api <apiname>")]
 	public class ApiCommand : Command
 	{
-		private const bool IsVerbose = false;
+		private bool IsVerbose = false;
 
 		private HtmlHelpSystem chm;
-		private string chmPath;
-		private string mainChm;
 
         public ApiCommand()
 		{
-			Run();
-		}
-		
-		private void WriteIfVerbose(MessageContext context,
-		                            string message)
-		{
-			if (IsVerbose)
-                TechBot.ServiceOutput.WriteLine(context,
-				                        message);
+			LoadCHM();
 		}
 
-		private void Run()
+        [CommandParameter("api", "The API name")]
+        public string API
+        {
+            get { return Parameters; }
+            set { Parameters = value; }
+        }
+		
+		private void WriteIfVerbose(string message)
 		{
-			string CHMFilename = Path.Combine(chmPath, mainChm);
+			if (IsVerbose)
+                Say(message);
+		}
+
+		private void LoadCHM()
+		{
+			string CHMFilename = Path.Combine(Settings.Default.ChmPath, Settings.Default.MainChm);
 			chm = new HtmlHelpSystem();
 			chm.OpenFile(CHMFilename, null);
 			
 			Console.WriteLine(String.Format("Loaded main CHM: {0}",
 			                                Path.GetFileName(CHMFilename)));
-			foreach (string filename in Directory.GetFiles(chmPath))
+            foreach (string filename in Directory.GetFiles(Settings.Default.ChmPath))
 			{
 				if (!Path.GetExtension(filename).ToLower().Equals(".chm"))
 					continue;
-				if (Path.GetFileName(filename).ToLower().Equals(mainChm))
+                if (Path.GetFileName(filename).ToLower().Equals(Settings.Default.MainChm))
 					continue;
 
 				Console.WriteLine(String.Format("Loading CHM: {0}",
@@ -61,50 +67,48 @@ namespace TechBot.Library
 			                                chm.FileList.Length));
 		}
 
-		public override void Handle(MessageContext context)
-		{
-			if (parameters.Trim().Equals(String.Empty))
-				DisplayNoKeyword(context);
-			else
-				Search(context,
-				       parameters);
-		}
+        public override void ExecuteCommand()
+        {
+            if (Name.Trim().Equals(String.Empty))
+            {
+                Say("Please give me a keyword.");
+            }
+            else
+            {
+                Search(Name);
+            }
+        }
 
-		private bool SearchIndex(MessageContext context,
-		                         string keyword)
-		{
-			if (chm.HasIndex)
-			{
-				IndexItem item = chm.Index.SearchIndex(keyword,
-				                                       IndexType.KeywordLinks);
-				if (item != null && item.Topics.Count > 0)
-				{
-					WriteIfVerbose(context,
-					               String.Format("Keyword {0} found in index",
-					                             item.KeyWord));
-					IndexTopic indexTopic = item.Topics[0] as IndexTopic;
-					return DisplayResult(context,
-					                     keyword,
-					                     indexTopic);
-				}
-				else
-				{
-					WriteIfVerbose(context,
-					               String.Format("Keyword {0} not found in index",
-					                             keyword));
-					return false;
-				}
-			}
-			else
-				return false;
-		}
+        private bool SearchIndex(
+                                 string keyword)
+        {
+            if (chm.HasIndex)
+            {
+                IndexItem item = chm.Index.SearchIndex(keyword,
+                                                       IndexType.KeywordLinks);
+                if (item != null && item.Topics.Count > 0)
+                {
+                    WriteIfVerbose(String.Format("Keyword {0} found in index",
+                                                 item.KeyWord));
+                    IndexTopic indexTopic = item.Topics[0] as IndexTopic;
+                    return DisplayResult(                                         keyword,
+                                         indexTopic);
+                }
+                else
+                {
+                    WriteIfVerbose(String.Format("Keyword {0} not found in index",
+                                                 keyword));
+                    return false;
+                }
+            }
+            else
+                return false;
+        }
 
-		private void SearchFullText(MessageContext context,
-		                            string keyword)
+		private void SearchFullText(string keyword)
 		{
 			string sort = "Rating ASC";
-			WriteIfVerbose(context,
-			               String.Format("Searching fulltext database for {0}",
+			WriteIfVerbose(String.Format("Searching fulltext database for {0}",
                                          keyword));
 
 			bool partialMatches = false;
@@ -114,58 +118,46 @@ namespace TechBot.Library
 			                                      maxResults,
 			                                      partialMatches,
 			                                      titlesOnly);
-			WriteIfVerbose(context,
-			               String.Format("results.Rows.Count = {0}",
+			WriteIfVerbose(String.Format("results.Rows.Count = {0}",
 			                             results != null ?
 			                             results.Rows.Count.ToString() : "(none)"));
 			if (results != null && results.Rows.Count > 0)
 			{
 				results.DefaultView.Sort = sort;
-				if (!DisplayResult(context,
-				                   keyword,
+				if (!DisplayResult(keyword,
 				                   results))
 				{
-					DisplayNoResult(context,
-					                keyword);
+                    Say("No result");
 				}
 			}
 			else
 			{
-				DisplayNoResult(context,
-				                keyword);
+                Say("No result");
 			}
 		}
 
-		private void Search(MessageContext context,
-		                    string keyword)
+		private void Search(string keyword)
 		{
-			if (!SearchIndex(context,
-			                 keyword))
-				SearchFullText(context,
-				               keyword);
+			if (!SearchIndex(keyword))
+				SearchFullText(keyword);
 		}
 		
-		private bool DisplayResult(MessageContext context,
-		                           string keyword,
+		private bool DisplayResult(string keyword,
 		                           IndexTopic indexTopic)
 		{
 			keyword = keyword.Trim().ToLower();
 			string url = indexTopic.URL;
-			WriteIfVerbose(context,
-			               String.Format("URL from index search {0}",
+			WriteIfVerbose(String.Format("URL from index search {0}",
                                          url));
-			string prototype = ExtractPrototype(context,
-			                                    url);
+			string prototype = ExtractPrototype(url);
 			if (prototype == null || prototype.Trim().Equals(String.Empty))
 				return false;
 			string formattedPrototype = FormatPrototype(prototype);
-            TechBot.ServiceOutput.WriteLine(context,
-			                        formattedPrototype);
+            Say(formattedPrototype);
 			return true;
 		}
 		
-		private bool DisplayResult(MessageContext context,
-		                           string keyword,
+		private bool DisplayResult(string keyword,
 		                           DataTable results)
 		{
 			keyword = keyword.Trim().ToLower();
@@ -173,20 +165,17 @@ namespace TechBot.Library
 			{
 				DataRowView row = results.DefaultView[i];
 				string title = row["Title"].ToString();
-				WriteIfVerbose(context,
-				               String.Format("Examining {0}", title));
+				WriteIfVerbose(String.Format("Examining {0}", title));
 				if (title.Trim().ToLower().Equals(keyword))
 				{
 					string location = row["Location"].ToString();
 					string rating = row["Rating"].ToString();
 					string url = row["Url"].ToString();
-					string prototype = ExtractPrototype(context,
-					                                    url);
+					string prototype = ExtractPrototype(url);
 					if (prototype == null || prototype.Trim().Equals(String.Empty))
 						continue;
 					string formattedPrototype = FormatPrototype(prototype);
-                    TechBot.ServiceOutput.WriteLine(context,
-					                        formattedPrototype);
+                    Say(formattedPrototype);
 					return true;
 				}
 			}
@@ -201,12 +190,6 @@ namespace TechBot.Library
 			                                      keyword));
 		}
 
-		private void DisplayNoKeyword(MessageContext context)
-		{
-            TechBot.ServiceOutput.WriteLine(context,
-			                        "Please give me a keyword.");
-		}
-
 		private string ReplaceComments(string s)
 		{
 			return Regex.Replace(s, "//(.+)\r\n", "");
@@ -248,11 +231,9 @@ namespace TechBot.Library
 			return s;
 		}
 		
-		private string ExtractPrototype(MessageContext context,
-		                                string url)
+		private string ExtractPrototype(string url)
 		{
-			string page = GetPage(context,
-			                      url);
+			string page = GetPage(url);
 			Match match = Regex.Match(page,
 			                          "<PRE class=\"?syntax\"?>(.+)</PRE>",
 			                          RegexOptions.Multiline |
@@ -282,8 +263,7 @@ namespace TechBot.Library
 			return Regex.Replace(html, @"<(.|\n)*?>", String.Empty);
 		}
 
-		private string GetPage(MessageContext context,
-		                       string url)
+		private string GetPage(string url)
 		{
 			string CHMFileName = "";
 			string topicName = "";
@@ -298,8 +278,7 @@ namespace TechBot.Library
 			}
 			else
 			{
-				baseStream = GetBaseStreamFromCHMFileName(context,
-				                                          CHMFileName);
+				baseStream = GetBaseStreamFromCHMFileName(CHMFileName);
 			}
 
 			if ((topicName == "") || (CHMFileName == "") || (baseStream == null))
@@ -310,13 +289,11 @@ namespace TechBot.Library
 			return baseStream.ExtractTextFile(topicName);
 		}
 
-		private CHMStream.CHMStream GetBaseStreamFromCHMFileName(MessageContext context,
-		                                                         string CHMFileName)
+        private CHMStream.CHMStream GetBaseStreamFromCHMFileName(string CHMFileName)
 		{
 			foreach (CHMFile file in chm.FileList)
 			{
-				WriteIfVerbose(context,
-				               String.Format("Compare: {0} <> {1}",
+				WriteIfVerbose(String.Format("Compare: {0} <> {1}",
 				                             file.ChmFilePath,
 				                             CHMFileName));
 				if (file.ChmFilePath.ToLower().Equals(CHMFileName.ToLower()))
@@ -324,8 +301,7 @@ namespace TechBot.Library
 					return file.BaseStream;
 				}
 			}
-			WriteIfVerbose(context,
-			               String.Format("Could not find loaded CHM file in list: {0}",
+			WriteIfVerbose(String.Format("Could not find loaded CHM file in list: {0}",
 			                             CHMFileName));
 			return null;
 		}

irc/TechBot/TechBot.Commands.MSDN/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TechBot.Commands.MSDN")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Sand")]
+[assembly: AssemblyProduct("TechBot.Commands.MSDN")]
+[assembly: AssemblyCopyright("Copyright © Sand 2008")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8a6332ce-82e3-4fbd-a799-8f4b8d025955")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

irc/TechBot/TechBot.Commands.MSDN/Settings.Designer.cs

@@ -0,0 +1,50 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace TechBot.Commands.MSDN {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("C:\\IRC\\TechBot\\CHM")]
+        public string ChmPath {
+            get {
+                return ((string)(this["ChmPath"]));
+            }
+            set {
+                this["ChmPath"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("kmarch.chm")]
+        public string MainChm {
+            get {
+                return ((string)(this["MainChm"]));
+            }
+            set {
+                this["MainChm"] = value;
+            }
+        }
+    }
+}

irc/TechBot/TechBot.Commands.MSDN/Settings.settings

@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="TechBot.Commands.MSDN" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="ChmPath" Type="System.String" Scope="User">
+      <Value Profile="(Default)">C:\IRC\TechBot\CHM</Value>
+    </Setting>
+    <Setting Name="MainChm" Type="System.String" Scope="User">
+      <Value Profile="(Default)">kmarch.chm</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>

irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj

@@ -0,0 +1,69 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{ADBF1ED6-A586-4707-BD59-4CD53448D0FE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TechBot.Commands.MSDN</RootNamespace>
+    <AssemblyName>TechBot.Commands.MSDN</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ApiCommand.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CHMLibrary\CHMLibrary.csproj">
+      <Project>{72E5CCA1-6318-4D62-964D-CB23A5C743B5}</Project>
+      <Name>CHMLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TechBot.Library\TechBot.Library.csproj">
+      <Project>{1114F34D-F388-4F38-AE27-C0EE1B10B777}</Project>
+      <Name>TechBot.Library</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

irc/TechBot/TechBot.Commands.MSDN/TechBot.Commands.MSDN.csproj.user

@@ -0,0 +1,5 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectView>ProjectFiles</ProjectView>
+  </PropertyGroup>
+</Project>

irc/TechBot/TechBot.Commands.MSDN/app.config

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="TechBot.Commands.MSDN.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <TechBot.Commands.MSDN.Settings>
+            <setting name="ChmPath" serializeAs="String">
+                <value>C:\IRC\TechBot\CHM</value>
+            </setting>
+            <setting name="MainChm" serializeAs="String">
+                <value>kmarch.chm</value>
+            </setting>
+        </TechBot.Commands.MSDN.Settings>
+    </userSettings>
+</configuration>

irc/TechBot/TechBot.Console/App.config

@@ -1,15 +1,27 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<appSettings>
-		<add key="IRCServerHostName" value="irc.eu.freenode.net" />
-		<add key="IRCServerHostPort" value="6667" />
-		<add key="IRCChannelNames" value="channel1;channel2" />
-		<add key="IRCBotName" value="MyBot" />
-		<add key="IRCBotPassword" value="MyPassword" />
-		<add key="ChmPath" value="C:\IRC\TechBot\CHM" />
-		<add key="MainChm" value="kmarch.chm" />
-		<add key="BugUrl" value="http://www.reactos.org/bugzilla/show_bug.cgi?id={0}" />
-		<add key="WineBugUrl" value="http://bugs.winehq.org/show_bug.cgi?id={0}" />
-		<add key="SambaBugUrl" value="https://bugzilla.samba.org/show_bug.cgi?id={0}" />
-	</appSettings>
-</configuration>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="TechBot.Console.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <TechBot.Console.Settings>
+            <setting name="IRCServerHostName" serializeAs="String">
+                <value>irc.eu.freenode.net</value>
+            </setting>
+            <setting name="IRCChannelNames" serializeAs="String">
+                <value>rbuildbottest2</value>
+            </setting>
+            <setting name="IRCBotName" serializeAs="String">
+                <value>RBuildBot2</value>
+            </setting>
+            <setting name="IRCBotPassword" serializeAs="String">
+                <value>qwerty</value>
+            </setting>
+            <setting name="IRCServerHostPort" serializeAs="String">
+                <value>6667</value>
+            </setting>
+        </TechBot.Console.Settings>
+    </userSettings>
+</configuration>

irc/TechBot/TechBot.Console/ConsoleTechBotService.cs

@@ -17,11 +17,10 @@ namespace TechBot.Console
 
     public class ConsoleTechBotService : TechBotService
     {
-        public ConsoleTechBotService(
-                          string chmPath,
-                          string mainChm)
-            : base(new ConsoleServiceOutput(), chmPath, mainChm)
+        public ConsoleTechBotService()
+            : base(new ConsoleServiceOutput())
         {
+            System.Console.WriteLine("TechBot running console service...");
         }
 
         public override void Run()
@@ -31,8 +30,7 @@ namespace TechBot.Console
 
             while (true)
             {
-                string s = System.Console.ReadLine();
-                InjectMessage(null, s);
+                InjectMessage(System.Console.ReadLine());
             }
         }
     }

irc/TechBot/TechBot.Console/Main.cs

@@ -1,240 +1,29 @@
-using System;
-using System.Configuration;
-using TechBot.Library;
-
-namespace TechBot.Console
-{
-	class MainClass
-	{
-		private static void VerifyRequiredOption(string optionName,
-		                                         string optionValue)
-		{
-			if (optionValue == null)
-			{
-				throw new Exception(String.Format("Option '{0}' not set.",
-				                                  optionName));
-			}
-		}
-		
-		private static string IRCServerHostName
-		{
-			get
-			{
-				string optionName = "IRCServerHostName";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static int IRCServerHostPort
-		{
-			get
-			{
-				string optionName = "IRCServerHostPort";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return Int32.Parse(s);
-			}
-		}
-
-		private static string IRCChannelNames
-		{
-			get
-			{
-				string optionName = "IRCChannelNames";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string IRCBotName
-		{
-			get
-			{
-				string optionName = "IRCBotName";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string IRCBotPassword
-		{
-			get
-			{
-				string optionName = "IRCBotPassword";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string ChmPath
-		{
-			get
-			{
-				string optionName = "ChmPath";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-		
-		private static string MainChm
-		{
-			get
-			{
-				string optionName = "MainChm";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string NtstatusXml
-		{
-			get
-			{
-				string optionName = "NtstatusXml";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string WinerrorXml
-		{
-			get
-			{
-				string optionName = "WinerrorXml";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string HresultXml
-		{
-			get
-			{
-				string optionName = "HresultXml";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string WmXml
-		{
-			get
-			{
-				string optionName = "WmXml";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string SvnCommand
-		{
-			get
-			{
-				string optionName = "SvnCommand";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string BugUrl
-		{
-			get
-			{
-				string optionName = "BugUrl";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-		private static string WineBugUrl
-		{
-			get
-			{
-				string optionName = "WineBugUrl";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-
-		private static string SambaBugUrl
-		{
-			get
-			{
-				string optionName = "SambaBugUrl";
-				string s = ConfigurationSettings.AppSettings[optionName];
-				VerifyRequiredOption(optionName,
-				                     s);
-				return s;
-			}
-		}
-
-
-        //private static void RunIrcService()
-        //{
-        //    IrcTechBotService ircService = new IrcTechBotService(IRCServerHostName,
-        //                                           IRCServerHostPort,
-        //                                           IRCChannelNames,
-        //                                           IRCBotName,
-        //                                           IRCBotPassword,
-        //                                           ChmPath,
-        //                                           MainChm);
-        //    ircService.Run();
-        //}
-
-        public static void Main(string[] args)
-        {
-            TechBotService m_TechBot = null;
-
-            if (args.Length > 0 && args[0].ToLower().Equals("irc"))
-            {
-                m_TechBot = new IrcTechBotService(IRCServerHostName,
-                                                                   IRCServerHostPort,
-                                                                   IRCChannelNames,
-                                                                   IRCBotName,
-                                                                   IRCBotPassword,
-                                                                   ChmPath,
-                                                                   MainChm);
-            }
-            else
-            {
-                System.Console.WriteLine("TechBot running console service...");
-                m_TechBot = new ConsoleTechBotService(
-                                                            ChmPath,
-                                                            MainChm);
-
-
-            }
-
-            m_TechBot.Run();
-        }
-	}
+using System;
+using System.Configuration;
+using TechBot.Library;
+
+namespace TechBot.Console
+{
+	class MainClass
+	{
+        public static void Main(string[] args)
+        {
+            TechBotService m_TechBot = null;
+
+            if (args.Length > 0 && args[0].ToLower().Equals("irc"))
+            {
+                m_TechBot = new IrcTechBotService(Settings.Default.IRCServerHostName,
+                                                  Settings.Default.IRCServerHostPort,
+                                                  Settings.Default.IRCChannelNames,
+                                                  Settings.Default.IRCBotName,
+                                                  Settings.Default.IRCBotPassword);
+            }
+            else
+            {
+                m_TechBot = new ConsoleTechBotService();
+            }
+
+            m_TechBot.Run();
+        }
+	}
 }

irc/TechBot/TechBot.Console/Settings.Designer.cs

@@ -0,0 +1,86 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace TechBot.Console {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("irc.eu.freenode.net")]
+        public string IRCServerHostName {
+            get {
+                return ((string)(this["IRCServerHostName"]));
+            }
+            set {
+                this["IRCServerHostName"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("rbuildbottest2")]
+        public string IRCChannelNames {
+            get {
+                return ((string)(this["IRCChannelNames"]));
+            }
+            set {
+                this["IRCChannelNames"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("RBuildBot2")]
+        public string IRCBotName {
+            get {
+                return ((string)(this["IRCBotName"]));
+            }
+            set {
+                this["IRCBotName"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("qwerty")]
+        public string IRCBotPassword {
+            get {
+                return ((string)(this["IRCBotPassword"]));
+            }
+            set {
+                this["IRCBotPassword"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("6667")]
+        public int IRCServerHostPort {
+            get {
+                return ((int)(this["IRCServerHostPort"]));
+            }
+            set {
+                this["IRCServerHostPort"] = value;
+            }
+        }
+    }
+}

irc/TechBot/TechBot.Console/Settings.settings

@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="TechBot.Console" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="IRCServerHostName" Type="System.String" Scope="User">
+      <Value Profile="(Default)">irc.eu.freenode.net</Value>
+    </Setting>
+    <Setting Name="IRCChannelNames" Type="System.String" Scope="User">
+      <Value Profile="(Default)">rbuildbottest2</Value>
+    </Setting>
+    <Setting Name="IRCBotName" Type="System.String" Scope="User">
+      <Value Profile="(Default)">RBuildBot2</Value>
+    </Setting>
+    <Setting Name="IRCBotPassword" Type="System.String" Scope="User">
+      <Value Profile="(Default)">qwerty</Value>
+    </Setting>
+    <Setting Name="IRCServerHostPort" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">6667</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>

irc/TechBot/TechBot.Console/TechBot.Console.csproj

@@ -40,11 +40,24 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="ConsoleTechBotService.cs" />
     <Compile Include="Main.cs" />
+    <Compile Include="Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\TechBot.Commands.Common\TechBot.Commands.Common.csproj">
+      <Project>{041B5F06-BF97-4981-B024-3A7B6DD9F6AE}</Project>
+      <Name>TechBot.Commands.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TechBot.Commands.RBuild\TechBot.Commands.RBuild.csproj">
+      <Project>{D676FEDE-62DD-4B4D-94C6-308598E827F9}</Project>
+      <Name>TechBot.Commands.RBuild</Name>
+    </ProjectReference>
     <ProjectReference Include="..\TechBot.IRCLibrary\TechBot.IRCLibrary.csproj">
       <Project>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</Project>
       <Name>TechBot.IRCLibrary</Name>
@@ -55,7 +68,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="app.config" />
+    <None Include="Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

irc/TechBot/TechBot.IRCLibrary/TechBot.IRCLibrary.csproj

@@ -50,6 +50,9 @@
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>

irc/TechBot/TechBot.IRCLibrary/app.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="TechBot.IRCLibrary.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <userSettings>
+        <TechBot.IRCLibrary.Settings>
+            <setting name="CommandPrefix" serializeAs="String">
+                <value>@</value>
+            </setting>
+        </TechBot.IRCLibrary.Settings>
+    </userSettings>
+</configuration>

irc/TechBot/TechBot.Library/Attributes/CommandParameterAttribute.cs

@@ -13,6 +13,7 @@ namespace TechBot.Library
 		private string m_name = "";
 		private string m_description = "";
         private bool m_Required = true;
+        private bool m_Default = false;
 		#endregion
 
 		#region Public Properties
@@ -26,6 +27,12 @@ namespace TechBot.Library
 
         public bool Required { get { return m_Required; } }
 
+        public bool DefaultParameter 
+        {
+            get { return m_Default; }
+            set { m_Default = value; }
+        }
+
 		#endregion
 
 		#region Constructors

irc/TechBot/TechBot.Library/Commands/Base/Command.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.RegularExpressions;
 
 namespace TechBot.Library
 {
@@ -6,6 +7,7 @@ namespace TechBot.Library
     {
         protected TechBotService m_TechBotService = null;
         protected MessageContext m_Context = null;
+        protected string m_Params = null;
 
         public TechBotService TechBot
         {
@@ -19,6 +21,11 @@ namespace TechBot.Library
             set { m_Context = value; }
         }
 
+        public virtual bool AnswerInPublic
+        {
+            get { return true; }
+        }
+
         public string Name
         {
             get
@@ -30,10 +37,15 @@ namespace TechBot.Library
             }
         }
 
-        public void ParseParameters(string paramaters)
+        public string Parameters
         {
-            ParametersParser parser = new ParametersParser(paramaters, this);
-            parser.Parse();
+            get { return m_Params; }
+            set { m_Params = value; }
+        }
+
+        protected virtual void Say()
+        {
+            TechBot.ServiceOutput.WriteLine(Context, string.Empty);
         }
 
         protected virtual void Say(string message)
@@ -46,6 +58,33 @@ namespace TechBot.Library
             TechBot.ServiceOutput.WriteLine(Context, String.Format(format, args));
         }
 
+        public void Run()
+        {
+            if (Context is ChannelMessageContext)
+            {
+                if (AnswerInPublic)
+                {
+                    ExecuteCommand();
+                }
+                else
+                {
+                    Say("Sorry, I only respond '{0}' in private , PM me!", Name);
+                }
+            }
+            else
+            {
+                ExecuteCommand();
+            }
+        }
+
         public abstract void ExecuteCommand();
+
+        public virtual void Initialize()
+        {
+        }
+
+        public virtual void DeInitialize()
+        {
+        }
     }
 }

irc/TechBot/TechBot.Library/Commands/Base/XmlLookupCommand.cs

@@ -6,13 +6,10 @@ namespace TechBot.Library
 {
     public abstract class XmlLookupCommand : XmlCommand
     {
-        private string m_Text = null;
-
-        [CommandParameter("text", "The value to check")]
-        public string Text
+        public virtual string Text
         {
-            get { return m_Text; }
-            set { m_Text = value; }
+            get { return Parameters; }
+            set { Parameters = value; }
         }
     }
 }

irc/TechBot/TechBot.Library/Commands/HelpCommand.cs

@@ -1,33 +1,38 @@
 using System;
+using System.Reflection;
 using System.Collections;
 
 namespace TechBot.Library
 {
-    [Command("help", Help = "!help")]
+    [Command("help", Help = "!help or !help -name:[CommandName]", Description = "Shows this help , type 'help -name:[CommandName]'")]
 	public class HelpCommand : Command
 	{
-        private string m_CommandName = null;
-
         public HelpCommand()
 		{
 		}
 
-        [CommandParameter("Name", "The command name to show help")]
+		public override bool AnswerInPublic
+		{
+			get { return false; }
+		}
+
+		[CommandParameter("Name", "The command name to show help")]
         public string CommandName
         {
-            get { return m_CommandName; }
-            set { m_CommandName = value; }
+            get { return Parameters; }
+            set { Parameters = value; }
         }
 
         public override void ExecuteCommand()
         {
-            if (CommandName == null)
+            if (string.IsNullOrEmpty(CommandName))
             {
                 Say("I support the following commands:");
 
                 foreach (CommandBuilder command in TechBot.Commands)
                 {
-                    Say("!{0} - {1}",
+                    Say("{0}{1} - {2}",
+                        Settings.Default.CommandPrefix,
                         command.Name,
                         command.Description);
                 }
@@ -43,7 +48,29 @@ namespace TechBot.Library
                 else
                 {
                     Say("Command '{0}' help:", CommandName);
-                    Say("");
+                    Say();
+                    Say(cmdBuilder.Description);
+                    Say();
+                    Say(cmdBuilder.Help);
+                    Say();
+                    Say("Parameters :");
+                    Say();
+
+                    PropertyInfo[] propertyInfoArray = cmdBuilder.Type.GetProperties(BindingFlags.Public | BindingFlags.Instance);
+                    foreach (PropertyInfo propertyInfo in propertyInfoArray)
+                    {
+                        CommandParameterAttribute[] commandAttributes = (CommandParameterAttribute[])
+                            Attribute.GetCustomAttributes(propertyInfo, typeof(CommandParameterAttribute));
+
+                        foreach (CommandParameterAttribute parameter in commandAttributes)
+                        {
+                            Say("\t-{0}: [{1}]", 
+                                parameter.Name, 
+                                parameter.Description);
+                        }
+                    }
+
+                    Say();
                 }
             }
         }

irc/TechBot/TechBot.Library/Commands/HresultCommand.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Xml;
-
-namespace TechBot.Library
-{
-    [Command("hresult", Help = "!hresult <value>")]
-    public class HResultCommand : XmlLookupCommand
-	{
-        public HResultCommand()
-		{
-		}
-
-        public override string XmlFile
-        {
-            get { return Settings.Default.HResultXml; }
-        }
-
-		public override void ExecuteCommand()
-		{
-            if (Text.Equals(String.Empty))
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        "Please provide a valid HRESULT value.");
-				return;
-			}
-
-			NumberParser np = new NumberParser();
-            long hresult = np.Parse(Text);
-			if (np.Error)
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("{0} is not a valid HRESULT value.",
-                                                      Text));
-				return;
-			}
-			
-			string description = GetHresultDescription(hresult);
-			if (description != null)
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("{0} is {1}.",
-                                                      Text,
-				                                      description));
-			}
-			else
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("I don't know about HRESULT {0}.",
-                                                      Text));
-			}
-		}
-		
-		public string GetHresultDescription(long hresult)
-		{
-			XmlElement root = base.m_XmlDocument.DocumentElement;
-			XmlNode node = root.SelectSingleNode(String.Format("Hresult[@value='{0}']",
-			                                                   hresult.ToString("X8")));
-			if (node != null)
-			{
-				XmlAttribute text = node.Attributes["text"];
-				if (text == null)
-					throw new Exception("Node has no text attribute.");
-				return text.Value;
-			}
-			else
-				return null;
-		}
-	}
-}

irc/TechBot/TechBot.Library/Commands/NtStatusCommand.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Xml;
-
-namespace TechBot.Library
-{
-    [Command("ntstatus", Help = "!ntstatus <value>")]
-	public class NtStatusCommand : XmlLookupCommand
-	{
-        public NtStatusCommand()
-		{
-		}
-
-        public override string XmlFile
-        {
-            get { return Settings.Default.NtStatusXml; }
-        }
-
-		public override void ExecuteCommand()
-		{
-            if (Text.Equals(String.Empty))
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        "Please provide a valid NTSTATUS value.");
-				return;
-			}
-
-			NumberParser np = new NumberParser();
-            long ntstatus = np.Parse(Text);
-			if (np.Error)
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("{0} is not a valid NTSTATUS value.",
-                                                      Text));
-				return;
-			}
-			
-			string description = GetNtstatusDescription(ntstatus);
-			if (description != null)
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("{0} is {1}.",
-                                                      Text,
-				                                      description));
-			}
-			else
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("I don't know about NTSTATUS {0}.",
-                                                      Text));
-			}
-		}
-		
-		public string GetNtstatusDescription(long ntstatus)
-		{
-			XmlElement root = base.m_XmlDocument.DocumentElement;
-			XmlNode node = root.SelectSingleNode(String.Format("Ntstatus[@value='{0}']",
-			                                                   ntstatus.ToString("X8")));
-			if (node != null)
-			{
-				XmlAttribute text = node.Attributes["text"];
-				if (text == null)
-					throw new Exception("Node has no text attribute.");
-				return text.Value;
-			}
-			else
-				return null;
-		}
-	}
-}

irc/TechBot/TechBot.Library/Commands/WinerrorCommand.cs

@@ -1,69 +0,0 @@
-using System;
-using System.Xml;
-
-namespace TechBot.Library
-{
-    [Command("winerror", Help = "!winerror <value>")]
-    public class WinErrorCommand : XmlLookupCommand
-	{
-        public WinErrorCommand()
-		{
-		}
-
-        public override string XmlFile
-        {
-            get { return Settings.Default.WinErrorXml; }
-        }
-
-		public override void ExecuteCommand()
-		{
-			if (Text.Equals(String.Empty))
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        "Please provide a valid System Error Code value.");
-				return;
-			}
-
-			NumberParser np = new NumberParser();
-            long winerror = np.Parse(Text);
-			if (np.Error)
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("{0} is not a valid System Error Code value.",
-                                                      Text));
-				return;
-			}
-			
-			string description = GetWinerrorDescription(winerror);
-			if (description != null)
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("{0} is {1}.",
-                                                      Text,
-				                                      description));
-			}
-			else
-			{
-                TechBot.ServiceOutput.WriteLine(Context,
-				                        String.Format("I don't know about System Error Code {0}.",
-                                                      Text));
-			}
-		}
-
-		public string GetWinerrorDescription(long winerror)
-		{
-			XmlElement root = base.m_XmlDocument.DocumentElement;
-			XmlNode node = root.SelectSingleNode(String.Format("Winerror[@value='{0}']",
-                                                               Text));
-			if (node != null)
-			{
-				XmlAttribute text = node.Attributes["text"];
-				if (text == null)
-					throw new Exception("Node has no text attribute.");
-				return text.Value;
-			}
-			else
-				return null;
-		}
-	}
-}

irc/TechBot/TechBot.Library/Factory/CommandFactory.cs

@@ -28,6 +28,8 @@ namespace TechBot.Library
         {
             Assembly assPlugin = Assembly.LoadFile(sFile);
 
+            Console.WriteLine("Loading plugins from : {0}", assPlugin.Location);
+
             if (assPlugin != null)
             {
                 foreach (Type pluginType in assPlugin.GetTypes())
@@ -36,6 +38,12 @@ namespace TechBot.Library
                     {
                         if (pluginType.IsAbstract == false)
                         {
+                            CommandBuilder cmdBuilder = new CommandBuilder(pluginType);
+
+                            Console.WriteLine("{0}:{1}", 
+                                cmdBuilder.Name,
+                                cmdBuilder.Description);
+
                             //Add it to the list.
                             Commands.Add(new CommandBuilder(pluginType));
                         }

irc/TechBot/TechBot.Library/ParametersParser.cs

@@ -1,537 +0,0 @@
-using System;
-using System.Text.RegularExpressions;
-
-//Code taken from : http://www.codeproject.com/KB/recipes/commandlineparser.aspx
-
-namespace TechBot.Library
-{
-	/// <summary>Implementation of a command-line parsing class.  Is capable of
-	/// having switches registered with it directly or can examine a registered
-	/// class for any properties with the appropriate attributes appended to
-	/// them.</summary>
-	public class ParametersParser
-	{
-		/// <summary>A simple internal class for passing back to the caller
-		/// some information about the switch.  The internals/implementation
-		/// of this class has privillaged access to the contents of the
-		/// SwitchRecord class.</summary>
-		public class SwitchInfo 
-		{
-			#region Private Variables
-			private object m_Switch = null;
-			#endregion
-
-			#region Public Properties
-			public string Name				{ get { return (m_Switch as SwitchRecord).Name; } }
-			public string Description		{ get { return (m_Switch as SwitchRecord).Description; } }
-			public string[] Aliases			{ get { return (m_Switch as SwitchRecord).Aliases; } }
-			public System.Type Type			{ get { return (m_Switch as SwitchRecord).Type; } }
-			public object Value				{ get { return (m_Switch as SwitchRecord).Value; } }
-			public object InternalValue	{ get { return (m_Switch as SwitchRecord).InternalValue; } }
-			public bool   IsEnum				{ get { return (m_Switch as SwitchRecord).Type.IsEnum; } }
-			public string[] Enumerations	{ get { return (m_Switch as SwitchRecord).Enumerations; } }
-			#endregion
-
-			/// <summary>
-			/// Constructor for the SwitchInfo class.  Note, in order to hide to the outside world
-			/// information not necessary to know, the constructor takes a System.Object (aka
-			/// object) as it's registering type.  If the type isn't of the correct type, an exception
-			/// is thrown.
-			/// </summary>
-			/// <param name="rec">The SwitchRecord for which this class store information.</param>
-			/// <exception cref="ArgumentException">Thrown if the rec parameter is not of
-			/// the type SwitchRecord.</exception>
-			public SwitchInfo( object rec )
-			{
-				if ( rec is SwitchRecord )
-					m_Switch = rec;
-				else
-					throw new ArgumentException();
-			}
-		}
-
-		/// <summary>
-		/// The SwitchRecord is stored within the parser's collection of registered
-		/// switches.  This class is private to the outside world.
-		/// </summary>
-		private class SwitchRecord
-		{
-			#region Private Variables
-			private string m_name = "";
-			private string m_description = "";
-			private object m_value = null;
-			private System.Type m_switchType = typeof(bool);
-			private System.Collections.ArrayList m_Aliases = null;
-			private string m_Pattern = "";
-
-			// The following advanced functions allow for callbacks to be
-			// made to manipulate the associated data type.
-			private System.Reflection.MethodInfo m_SetMethod = null;
-			private System.Reflection.MethodInfo m_GetMethod = null;
-			private object m_PropertyOwner = null;
-			#endregion
-
-			#region Private Utility Functions
-			private void Initialize( string name, string description )
-			{
-				m_name = name;
-				m_description = description;
-
-				BuildPattern();
-			}
-
-			private void BuildPattern()
-			{
-				string matchString = Name;
-
-				if ( Aliases != null && Aliases.Length > 0 )
-					foreach( string s in Aliases )
-						matchString += "|" + s;
-
-				string strPatternStart = @"(\s|^)(?<match>(-{1,2}|/)(";
-				string strPatternEnd;  // To be defined below.
-
-				// The common suffix ensures that the switches are followed by
-				// a white-space OR the end of the string.  This will stop
-				// switches such as /help matching /helpme
-				//
-				string strCommonSuffix = @"(?=(\s|$))";
-
-				if ( Type == typeof(bool) )
-					strPatternEnd = @")(?<value>(\+|-){0,1}))";
-				else if ( Type == typeof(string) )
-					strPatternEnd = @")(?::|\s+))((?:"")(?<value>.+)(?:"")|(?<value>\S+))";
-				else if ( Type == typeof(int) )
-					strPatternEnd = @")(?::|\s+))((?<value>(-|\+)[0-9]+)|(?<value>[0-9]+))";
-				else if ( Type.IsEnum )
-				{
-					string[] enumNames = Enumerations;
-					string e_str = enumNames[0];
-					for ( int e=1; e<enumNames.Length; e++ )
-						e_str += "|" + enumNames[e];
-					strPatternEnd = @")(?::|\s+))(?<value>" + e_str + @")";
-				}
-				else
-					throw new System.ArgumentException();
-
-				// Set the internal regular expression pattern.
-				m_Pattern = strPatternStart + matchString + strPatternEnd + strCommonSuffix;
-			}
-			#endregion
-
-			#region Public Properties
-			public object Value 
-			{
-				get 
-				{
-					if ( ReadValue != null )
-						return ReadValue;
-					else
-						return m_value;
-				}
-			}
-
-			public object InternalValue 
-			{
-				get { return m_value; }
-			}
-
-			public string Name 
-			{
-				get { return m_name;  }
-				set { m_name = value; }
-			}
-
-			public string Description 
-			{
-				get { return m_description;  }
-				set { m_description = value; }
-			}
-
-			public System.Type Type 
-			{
-				get { return m_switchType; }
-			}
-
-			public string[] Aliases 
-			{
-				get { return (m_Aliases != null) ? (string[])m_Aliases.ToArray(typeof(string)): null; }
-			}
-
-			public string Pattern 
-			{
-				get { return m_Pattern; }
-			}
-			
-			public System.Reflection.MethodInfo SetMethod 
-			{
-				set { m_SetMethod = value; }
-			}
-			
-			public System.Reflection.MethodInfo GetMethod 
-			{
-				set { m_GetMethod = value; }
-			}
-
-			public object PropertyOwner 
-			{
-				set { m_PropertyOwner = value; }
-			}
-
-			public object ReadValue 
-			{
-				get 
-				{
-					object o = null;
-					if ( m_PropertyOwner != null && m_GetMethod != null )
-						o = m_GetMethod.Invoke( m_PropertyOwner, null );
-					return o;
-				}
-			}
-
-			public string[] Enumerations 
-			{
-				get 
-				{
-					if ( m_switchType.IsEnum )
-						return System.Enum.GetNames( m_switchType );
-					else
-						return null;
-				}
-			}
-			#endregion
-
-			#region Constructors
-			public SwitchRecord( string name, string description )
-			{
-				Initialize( name, description );
-			}
-
-			public SwitchRecord( string name, string description, System.Type type )
-			{
-				if ( type == typeof(bool)   ||
-					  type == typeof(string) ||
-					  type == typeof(int)    ||
-					  type.IsEnum )
-				{
-					m_switchType = type;
-					Initialize( name, description );
-				}
-				else
-					throw new ArgumentException("Currently only Ints, Bool and Strings are supported");
-			}
-			#endregion
-
-			#region Public Methods
-			public void AddAlias( string alias )
-			{
-				if ( m_Aliases == null )
-					m_Aliases = new System.Collections.ArrayList();
-				m_Aliases.Add( alias );
-
-				BuildPattern();
-			}
-
-			public void Notify( object value )
-			{
-				if ( m_PropertyOwner != null && m_SetMethod != null )
-				{
-					object[] parameters = new object[1];
-					parameters[0] = value;
-					m_SetMethod.Invoke( m_PropertyOwner, parameters );
-				}
-				m_value = value;
-			}
-			
-			#endregion
-		}
-
-
-		#region Private Variables
-		private string m_commandLine = "";
-		private string m_workingString = "";
-		private string m_applicationName = "";
-		private string[] m_splitParameters = null;
-		private System.Collections.ArrayList m_switches = null;
-		#endregion
-
-		#region Private Utility Functions
-		private void ExtractApplicationName()
-		{
-			Regex r = new Regex(@"^(?<commandLine>("".+""|(\S)+))(?<remainder>.+)",
-				RegexOptions.ExplicitCapture);
-			Match m = r.Match(m_commandLine);
-			if ( m != null && m.Groups["commandLine"] != null )
-			{
-				m_applicationName = m.Groups["commandLine"].Value;
-				m_workingString = m.Groups["remainder"].Value;
-			}
-		}
-
-		private void SplitParameters()
-		{
-			// Populate the split parameters array with the remaining parameters.
-			// Note that if quotes are used, the quotes are removed.
-			// e.g.   one two three "four five six"
-			//						0 - one
-			//						1 - two
-			//						2 - three
-			//						3 - four five six
-			// (e.g. 3 is not in quotes).
-			Regex r = new Regex(@"((\s*(""(?<param>.+?)""|(?<param>\S+))))",
-				RegexOptions.ExplicitCapture);
-			MatchCollection m = r.Matches( m_workingString );
-
-			if ( m != null )
-			{
-				m_splitParameters = new string[ m.Count ];
-				for ( int i=0; i < m.Count; i++ )
-					m_splitParameters[i] = m[i].Groups["param"].Value;
-			}
-		}
-
-		private void HandleSwitches()
-		{
-			if ( m_switches != null )
-			{
-				foreach ( SwitchRecord s in m_switches )
-				{
-					Regex r = new Regex( s.Pattern,
-						RegexOptions.ExplicitCapture
-						| RegexOptions.IgnoreCase );
-					MatchCollection m = r.Matches( m_workingString );
-					if ( m != null )
-					{
-						for ( int i=0; i < m.Count; i++ )
-						{
-							string value = null;
-							if ( m[i].Groups != null && m[i].Groups["value"] != null )
-								value = m[i].Groups["value"].Value;
-
-							if ( s.Type == typeof(bool))
-							{
-								bool state = true;
-								// The value string may indicate what value we want.
-								if ( m[i].Groups != null && m[i].Groups["value"] != null )
-								{
-									switch ( value )
-									{
-										case "+": state = true;
-											break;
-										case "-": state = false;
-											break;
-										case "":  if ( s.ReadValue != null )
-														 state = !(bool)s.ReadValue;
-											break;
-										default:  break;
-									}
-								}
-								s.Notify( state );
-								break;
-							}
-							else if ( s.Type == typeof(string) )
-								s.Notify( value );
-							else if ( s.Type == typeof(int) )
-								s.Notify( int.Parse( value ) );
-							else if ( s.Type.IsEnum )
-								s.Notify( System.Enum.Parse(s.Type,value,true) );
-						}
-					}
-
-					m_workingString = r.Replace(m_workingString, " ");
-				}
-			}
-		}
-
-		#endregion
-
-		#region Public Properties
-		public string ApplicationName 
-		{
-			get { return m_applicationName; }
-		}
-
-		public string[] Parameters 
-		{
-			get { return m_splitParameters; }
-		}
-
-		public SwitchInfo[] Switches 
-		{
-			get 
-			{
-				if ( m_switches == null )
-					return null;
-				else
-				{
-					SwitchInfo[] si = new SwitchInfo[ m_switches.Count ];
-					for ( int i=0; i<m_switches.Count; i++ )
-						si[i] = new SwitchInfo( m_switches[i] );
-					return si;
-				}
-			}
-		}
-
-		public object this[string name] 
-		{
-			get
-			{
-				if ( m_switches != null )
-					for ( int i=0; i<m_switches.Count; i++ )
-						if ( string.Compare( (m_switches[i] as SwitchRecord).Name, name, true )==0 )
-							return (m_switches[i] as SwitchRecord).Value;
-				return null;
-			}
-		}
-
-		/// <summary>This function returns a list of the unhandled switches
-		/// that the parser has seen, but not processed.</summary>
-		/// <remark>The unhandled switches are not removed from the remainder
-		/// of the command-line.</remark>
-		public string[] UnhandledSwitches 
-		{
-			get
-			{
-				string switchPattern = @"(\s|^)(?<match>(-{1,2}|/)(.+?))(?=(\s|$))";
-				Regex r = new Regex( switchPattern,
-					RegexOptions.ExplicitCapture
-					| RegexOptions.IgnoreCase );
-				MatchCollection m = r.Matches( m_workingString );
-
-				if ( m != null )
-				{
-					string[] unhandled = new string[ m.Count ];
-					for ( int i=0; i < m.Count; i++ )
-						unhandled[i] = m[i].Groups["match"].Value;
-					return unhandled;
-				}
-				else
-					return null;
-			}
-		}
-		#endregion
-
-		#region Public Methods
-		public void AddSwitch( string name, string description )
-		{
-			if ( m_switches == null )
-				m_switches = new System.Collections.ArrayList();
-
-			SwitchRecord rec = new SwitchRecord( name, description );
-			m_switches.Add( rec );
-		}
-
-		public void AddSwitch( string[] names, string description )
-		{
-			if ( m_switches == null )
-				m_switches = new System.Collections.ArrayList();
-			SwitchRecord rec = new SwitchRecord( names[0], description );
-			for ( int s=1; s<names.Length; s++ )
-				rec.AddAlias( names[s] );
-			m_switches.Add( rec );
-		}
-
-		public bool Parse()
-		{
-			ExtractApplicationName();
-
-			// Remove switches and associated info.
-			HandleSwitches();
-
-			// Split parameters.
-			SplitParameters();
-
-			return true;
-		}
-
-		public object InternalValue(string name)
-		{
-			if ( m_switches != null )
-				for ( int i=0; i<m_switches.Count; i++ )
-					if ( string.Compare( (m_switches[i] as SwitchRecord).Name, name, true )==0 )
-						return (m_switches[i] as SwitchRecord).InternalValue;
-			return null;
-		}
-		#endregion
-
-		#region Constructors
-		public ParametersParser( string commandLine )
-		{
-			m_commandLine = commandLine;
-		}
-
-		public ParametersParser( string commandLine,
-							object classForAutoAttributes )
-		{
-			m_commandLine = commandLine;
-
-			Type type = classForAutoAttributes.GetType();
-			System.Reflection.MemberInfo[] members = type.GetMembers();
-
-			for(int i=0; i<members.Length; i++)
-			{
-				object[] attributes = members[i].GetCustomAttributes(false);
-				if(attributes.Length > 0)
-				{
-					SwitchRecord rec = null;
-
-					foreach ( Attribute attribute in attributes )
-					{
-						if ( attribute is CommandParameterAttribute )
-						{
-							CommandParameterAttribute switchAttrib =
-								(CommandParameterAttribute) attribute;
-
-							// Get the property information.  We're only handling
-							// properties at the moment!
-							if ( members[i] is System.Reflection.PropertyInfo )
-							{
-								System.Reflection.PropertyInfo pi = (System.Reflection.PropertyInfo) members[i];
-
-								rec = new SwitchRecord( switchAttrib.Name,
-																switchAttrib.Description,
-																pi.PropertyType );
-
-								// Map in the Get/Set methods.
-								rec.SetMethod = pi.GetSetMethod();
-								rec.GetMethod = pi.GetGetMethod();
-								rec.PropertyOwner = classForAutoAttributes;
-
-								// Can only handle a single switch for each property
-								// (otherwise the parsing of aliases gets silly...)
-								break;
-							}
-						}
-					}
-
-					// See if any aliases are required.  We can only do this after
-					// a switch has been registered and the framework doesn't make
-					// any guarantees about the order of attributes, so we have to
-					// walk the collection a second time.
-					if ( rec != null )
-					{
-						foreach ( Attribute attribute in attributes )
-						{
-                            if (attribute is CommandParameterAliasAttribute)
-							{
-                                CommandParameterAliasAttribute aliasAttrib =
-                                    (CommandParameterAliasAttribute)attribute;
-								rec.AddAlias( aliasAttrib.Alias );
-							}
-						}
-					}
-
-					// Assuming we have a switch record (that may or may not have
-					// aliases), add it to the collection of switches.
-					if ( rec != null )
-					{
-						if ( m_switches == null )
-							m_switches = new System.Collections.ArrayList();
-						m_switches.Add( rec );
-					}
-				}
-			}
-		}
-		#endregion
-	}
-}

irc/TechBot/TechBot.Library/Settings.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.832
+//     Runtime Version:2.0.50727.1433
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -67,5 +67,14 @@ namespace TechBot.Library {
                 return ((string)(this["SVNRoot"]));
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("@")]
+        public string CommandPrefix {
+            get {
+                return ((string)(this["CommandPrefix"]));
+            }
+        }
     }
 }

irc/TechBot/TechBot.Library/Settings.settings

@@ -17,5 +17,8 @@
     <Setting Name="SVNRoot" Type="System.String" Scope="Application">
       <Value Profile="(Default)">svn://svn.reactos.org/trunk/reactos</Value>
     </Setting>
+    <Setting Name="CommandPrefix" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">@</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

irc/TechBot/TechBot.Library/TechBot.Library.csproj

@@ -48,19 +48,9 @@
     <Compile Include="Factory\CommandFactory.cs" />
     <Compile Include="Commands\Base\Command.cs" />
     <Compile Include="Commands\Base\XmlCommand.cs" />
-    <Compile Include="Commands\BugCommand.cs" />
     <Compile Include="Commands\HelpCommand.cs" />
-    <Compile Include="Commands\HResultCommand.cs" />
-    <Compile Include="Commands\NtStatusCommand.cs" />
-    <Compile Include="Commands\ReactOSBugUrl.cs" />
-    <Compile Include="Commands\SambaBugUrl.cs" />
-    <Compile Include="Commands\SvnCommand.cs" />
-    <Compile Include="Commands\WineBugUrl.cs" />
-    <Compile Include="Commands\WinerrorCommand.cs" />
-    <Compile Include="Commands\WMCommand.cs" />
     <Compile Include="MessageContext.cs" />
     <Compile Include="NumberParser.cs" />
-    <Compile Include="ParametersParser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceOutput.cs" />
     <Compile Include="Settings.cs" />
@@ -78,10 +68,6 @@
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CHMLibrary\CHMLibrary.csproj">
-      <Project>{72E5CCA1-6318-4D62-964D-CB23A5C743B5}</Project>
-      <Name>CHMLibrary</Name>
-    </ProjectReference>
     <ProjectReference Include="..\TechBot.IRCLibrary\TechBot.IRCLibrary.csproj">
       <Project>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</Project>
       <Name>TechBot.IRCLibrary</Name>

irc/TechBot/TechBot.Library/TechBotIrcService.cs

@@ -14,6 +14,7 @@ namespace TechBot.Library
         {
             if (context is ChannelMessageContext)
             {
+                Thread.Sleep (500);
                 ChannelMessageContext channelContext = context as ChannelMessageContext;
                 channelContext.Channel.Talk(message);
             }
@@ -37,8 +38,6 @@ namespace TechBot.Library
 		private string channelnames;
 		private string botname;
 		private string password;
-        private string chmPath;
-        private string mainChm;
 		private IrcClient m_IrcClient;
 		private ArrayList channels = new ArrayList();
 		private bool isStopped = false;
@@ -47,10 +46,8 @@ namespace TechBot.Library
 		                  int port,
 		                  string channelnames,
 		                  string botname,
-		                  string password,
-		                  string chmPath,
-		                  string mainChm)
-            : base (new IrcServiceOutput() , chmPath , mainChm)
+		                  string password)
+            : base (new IrcServiceOutput())
 		{
 			this.hostname = hostname;
 			this.port = port;
@@ -60,8 +57,6 @@ namespace TechBot.Library
 				this.password = null;
 			else
 				this.password = password;
-			this.chmPath = chmPath;
-			this.mainChm = mainChm;
 		}
 
         public override void Run()

irc/TechBot/TechBot.Library/TechBotService.cs

@@ -1,88 +1,101 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Data;
-using System.Threading;
-
-using TechBot.IRCLibrary;
-
-namespace TechBot.Library
-{
-	public abstract class TechBotService
-	{
-		protected IServiceOutput serviceOutput;
-		private string chmPath;
-		private string mainChm;
-		
-		public TechBotService(IServiceOutput serviceOutput,
-		                      string chmPath,
-		                      string mainChm)
-		{
-			this.serviceOutput = serviceOutput;
-			this.chmPath = chmPath;
-			this.mainChm = mainChm;
-		}
-
-        public virtual void Run()
-        {
-            CommandFactory.LoadPlugins();
-        }
-
-        public IServiceOutput ServiceOutput
-        {
-            get { return serviceOutput; }
-        }
-
-        public CommandBuilderCollection Commands
-        {
-            get { return CommandFactory.Commands; }
-        }
-
-        public void InjectMessage(MessageContext context, string message)
-        {
-            ParseCommandMessage(context,
-                                message);
-        }
-		
-		private bool IsCommandMessage(string message)
-		{
-			return message.StartsWith("!");
-		}
-
-		public void ParseCommandMessage(MessageContext context,
-		                                string message)
-		{
-			if (!IsCommandMessage(message))
-				return;
-
-			message = message.Substring(1).Trim();
-			int index = message.IndexOf(' ');
-			string commandName;
-			string commandParams = "";
-			if (index != -1)
-			{
-				commandName = message.Substring(0, index).Trim();
-				commandParams = message.Substring(index).Trim();
-			}
-			else
-				commandName = message.Trim();
-
-            foreach (CommandBuilder command in Commands)
-            {
-                if (command.Name == commandName)
-                {
-                    //Create a new instance of the required command type
-                    Command cmd = command.CreateCommand();
-
-                    cmd.TechBot = this;
-                    cmd.Context = context;
-                    cmd.ParseParameters(message);
-                    cmd.ExecuteCommand();
-
-                    return;
-                }
-            }
-		}
-	}
-}
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Data;
+using System.Threading;
+
+using TechBot.IRCLibrary;
+
+namespace TechBot.Library
+{
+	public abstract class TechBotService
+	{
+		protected IServiceOutput m_ServiceOutput;
+		
+		public TechBotService(IServiceOutput serviceOutput)
+		{
+			m_ServiceOutput = serviceOutput;
+		}
+
+        public virtual void Run()
+        {
+            CommandFactory.LoadPlugins();
+        }
+
+        public IServiceOutput ServiceOutput
+        {
+            get { return m_ServiceOutput; }
+        }
+
+        public CommandBuilderCollection Commands
+        {
+            get { return CommandFactory.Commands; }
+        }
+
+        public void InjectMessage(MessageContext context, string message)
+        {
+            ParseCommandMessage(context,
+                                message);
+        }
+		
+		private bool IsCommandMessage(string message)
+		{
+            return message.StartsWith(Settings.Default.CommandPrefix);
+		}
+
+        public void InjectMessage(string message)
+        {
+            ParseCommandMessage(null, message);
+        }
+
+		public void ParseCommandMessage(MessageContext context,
+		                                string message)
+		{
+			if (!IsCommandMessage(message))
+				return;
+
+			message = message.Substring(1).Trim();
+			int index = message.IndexOf(' ');
+			string commandName;
+			string commandParams = "";
+			if (index != -1)
+			{
+				commandName = message.Substring(0, index).Trim();
+				commandParams = message.Substring(index).Trim();
+			}
+			else
+				commandName = message.Trim();
+
+            foreach (CommandBuilder command in Commands)
+            {
+                if (command.Name == commandName)
+                {
+                    //Create a new instance of the required command type
+                    Command cmd = command.CreateCommand();
+
+                    cmd.TechBot = this;
+                    cmd.Context = context;
+                    cmd.Parameters = commandParams;
+
+                    try
+                    {
+                        cmd.Initialize();
+                        cmd.Run();
+                        cmd.DeInitialize();
+                    }
+                    catch (Exception e)
+                    {
+                        ServiceOutput.WriteLine(context, string.Format("Uops! Just crashed with exception '{0}' at {1}",
+                            e.Message,
+                            e.Source));
+
+                        ServiceOutput.WriteLine(context, e.StackTrace);
+                    }
+
+                    return;
+                }
+            }
+		}
+	}
+}

irc/TechBot/TechBot.Library/app.config

@@ -22,6 +22,9 @@
             <setting name="SVNRoot" serializeAs="String">
                 <value>svn://svn.reactos.org/trunk/reactos</value>
             </setting>
+            <setting name="CommandPrefix" serializeAs="String">
+                <value>@</value>
+            </setting>
         </TechBot.Library.Settings>
     </applicationSettings>
 </configuration>

irc/TechBot/TechBot.sln

@@ -13,6 +13,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.IRCLibrary", "TechB
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Library", "TechBot.Library\TechBot.Library.csproj", "{1114F34D-F388-4F38-AE27-C0EE1B10B777}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Commands.Common", "TechBot.Commands.Common\TechBot.Commands.Common.csproj", "{041B5F06-BF97-4981-B024-3A7B6DD9F6AE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Commands.MSDN", "TechBot.Commands.MSDN\TechBot.Commands.MSDN.csproj", "{ADBF1ED6-A586-4707-BD59-4CD53448D0FE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Commands.RBuild", "TechBot.Commands.RBuild\TechBot.Commands.RBuild.csproj", "{D676FEDE-62DD-4B4D-94C6-308598E827F9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,6 +49,18 @@ Global
 		{1114F34D-F388-4F38-AE27-C0EE1B10B777}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1114F34D-F388-4F38-AE27-C0EE1B10B777}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1114F34D-F388-4F38-AE27-C0EE1B10B777}.Release|Any CPU.Build.0 = Release|Any CPU
+		{041B5F06-BF97-4981-B024-3A7B6DD9F6AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{041B5F06-BF97-4981-B024-3A7B6DD9F6AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{041B5F06-BF97-4981-B024-3A7B6DD9F6AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{041B5F06-BF97-4981-B024-3A7B6DD9F6AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADBF1ED6-A586-4707-BD59-4CD53448D0FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADBF1ED6-A586-4707-BD59-4CD53448D0FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADBF1ED6-A586-4707-BD59-4CD53448D0FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADBF1ED6-A586-4707-BD59-4CD53448D0FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D676FEDE-62DD-4B4D-94C6-308598E827F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D676FEDE-62DD-4B4D-94C6-308598E827F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D676FEDE-62DD-4B4D-94C6-308598E827F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D676FEDE-62DD-4B4D-94C6-308598E827F9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

irc/TechBot/TechBot/App.config

@@ -1,20 +1,44 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<appSettings>
-		<add key="IRCServerHostName" value="irc.eu.freenode.net" />
-		<add key="IRCServerHostPort" value="6667" />
-		<add key="IRCChannelNames" value="channel1;channel2" />
-		<add key="IRCBotName" value="MyBot" />
-		<add key="IRCBotPassword" value="MyPassword" />
-		<add key="ChmPath" value="C:\IRC\TechBot\CHM" />
-		<add key="MainChm" value="kmarch.chm" />
-		<add key="NtstatusXml" value="C:\IRC\TechBot\ntstatus.xml" />
-		<add key="WinerrorXml" value="C:\IRC\TechBot\winerror.xml" />
-		<add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" />
-		<add key="WmXml" value="C:\IRC\TechBot\wm.xml" />
-		<add key="SvnCommand" value="svn co svn://svn.reactos.org/trunk/reactos" />
-		<add key="BugUrl" value="http://www.reactos.org/bugzilla/show_bug.cgi?id={0}" />
-		<add key="WineBugUrl" value="http://bugs.winehq.org/show_bug.cgi?id={0}" />
-		<add key="SambaBugUrl" value="https://bugzilla.samba.org/show_bug.cgi?id={0}" />
-	</appSettings>
-</configuration>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<configSections>
+  <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+   <section name="TechBot.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+  </sectionGroup>
+ </configSections>
+ <appSettings>
+		<add key="IRCServerHostName" value="irc.eu.freenode.net" />
+		<add key="IRCServerHostPort" value="6667" />
+		<add key="IRCChannelNames" value="channel1;channel2" />
+		<add key="IRCBotName" value="MyBot" />
+		<add key="IRCBotPassword" value="MyPassword" />
+		<add key="ChmPath" value="C:\IRC\TechBot\CHM" />
+		<add key="MainChm" value="kmarch.chm" />
+		<add key="NtstatusXml" value="C:\IRC\TechBot\ntstatus.xml" />
+		<add key="WinerrorXml" value="C:\IRC\TechBot\winerror.xml" />
+		<add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" />
+		<add key="WmXml" value="C:\IRC\TechBot\wm.xml" />
+		<add key="SvnCommand" value="svn co svn://svn.reactos.org/trunk/reactos" />
+		<add key="BugUrl" value="http://www.reactos.org/bugzilla/show_bug.cgi?id={0}" />
+		<add key="WineBugUrl" value="http://bugs.winehq.org/show_bug.cgi?id={0}" />
+		<add key="SambaBugUrl" value="https://bugzilla.samba.org/show_bug.cgi?id={0}" />
+	</appSettings>
+ <userSettings>
+  <TechBot.Settings>
+   <setting name="IRCServerHostName" serializeAs="String">
+    <value>irc.eu.freenode.net</value>
+   </setting>
+   <setting name="IRCChannelNames" serializeAs="String">
+    <value>rbuildbottest</value>
+   </setting>
+   <setting name="IRCBotName" serializeAs="String">
+    <value>RBuildBot</value>
+   </setting>
+   <setting name="IRCBotPassword" serializeAs="String">
+    <value>qwerty</value>
+   </setting>
+   <setting name="IRCServerHostPort" serializeAs="String">
+    <value>6667</value>
+   </setting>
+  </TechBot.Settings>
+ </userSettings>
+</configuration>

irc/TechBot/TechBot/ServiceThread.cs

@@ -1,84 +1,43 @@
-using System;
-using System.Configuration;
-using System.Diagnostics;
-using TechBot.Library;
-
-namespace TechBot
-{
-	public class ServiceThread
-	{
-		private string IRCServerHostName;
-		private int IRCServerHostPort;
-		private string IRCChannelNames;
-		private string IRCBotName;
-		private string IRCBotPassword;
-		private string ChmPath;
-		private string MainChm;
-		private string NtstatusXml;
-		private string HresultXml;
-		private string WmXml;
-		private string WinerrorXml;
-		private string SvnCommand;
-		private string BugUrl, WineBugUrl, SambaBugUrl;
-		private EventLog eventLog;
-		
-		public ServiceThread(EventLog eventLog)
-		{
-			this.eventLog = eventLog;
-		}
-		
-		private void SetupConfiguration()
-		{
-			IRCServerHostName = ConfigurationSettings.AppSettings["IRCServerHostName"];
-			IRCServerHostPort = Int32.Parse(ConfigurationSettings.AppSettings["IRCServerHostPort"]);
-			IRCChannelNames = ConfigurationSettings.AppSettings["IRCChannelNames"];
-			IRCBotName = ConfigurationSettings.AppSettings["IRCBotName"];
-			IRCBotPassword = ConfigurationSettings.AppSettings["IRCBotPassword"];
-			ChmPath = ConfigurationSettings.AppSettings["ChmPath"];
-			MainChm = ConfigurationSettings.AppSettings["MainChm"];
-			NtstatusXml = ConfigurationSettings.AppSettings["NtstatusXml"];
-			HresultXml = ConfigurationSettings.AppSettings["HresultXml"];
-			WmXml = ConfigurationSettings.AppSettings["WmXml"];
-			WinerrorXml = ConfigurationSettings.AppSettings["WinerrorXml"];
-			SvnCommand = ConfigurationSettings.AppSettings["SvnCommand"];
-			BugUrl = ConfigurationSettings.AppSettings["BugUrl"];
-			WineBugUrl = ConfigurationSettings.AppSettings["WineBugUrl"];
-			SambaBugUrl = ConfigurationSettings.AppSettings["SambaBugUrl"];
-		}
-		
-		public void Run()
-		{
-			SetupConfiguration();
-			System.Console.WriteLine("TechBot irc service...");
-			
-			IrcTechBotService ircService = new IrcTechBotService(IRCServerHostName,
-			                                       IRCServerHostPort,
-			                                       IRCChannelNames,
-			                                       IRCBotName,
-			                                       IRCBotPassword,
-			                                       ChmPath,
-			                                       MainChm);
-                                                   //NtstatusXml,
-                                                   //WinerrorXml,
-                                                   //HresultXml,
-                                                   //WmXml,
-			                                       //SvnCommand,
-                                                   //BugUrl,
-                                                   //WineBugUrl,
-                                                   //SambaBugUrl);
-			ircService.Run();
-		}
-		
-		public void Start()
-		{
-			try
-			{
-				Run();
-			}
-			catch (Exception ex)
-			{
-				eventLog.WriteEntry(String.Format("Ex. {0}", ex));
-			}
-		}
-	}
-}
+using System;
+using System.Configuration;
+using System.Diagnostics;
+using TechBot.Library;
+
+namespace TechBot
+{
+	public class ServiceThread
+	{
+		private EventLog m_EventLog;
+		
+		public ServiceThread(EventLog eventLog)
+		{
+			m_EventLog = eventLog;
+		}
+
+        public void Run()
+        {
+            System.Console.WriteLine("TechBot irc service...");
+
+            IrcTechBotService ircService = new IrcTechBotService(
+                Settings.Default.IRCServerHostName,
+                Settings.Default.IRCServerHostPort,
+                Settings.Default.IRCChannelNames,
+                Settings.Default.IRCBotName,
+                Settings.Default.IRCBotPassword);
+
+            ircService.Run();
+        }
+		
+		public void Start()
+		{
+			try
+			{
+				Run();
+			}
+			catch (Exception ex)
+			{
+				m_EventLog.WriteEntry(String.Format("Ex. {0}", ex));
+			}
+		}
+	}
+}

irc/TechBot/TechBot/Settings.Designer.cs

@@ -0,0 +1,86 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.1433
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace TechBot {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("irc.eu.freenode.net")]
+        public string IRCServerHostName {
+            get {
+                return ((string)(this["IRCServerHostName"]));
+            }
+            set {
+                this["IRCServerHostName"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("rbuildbottest")]
+        public string IRCChannelNames {
+            get {
+                return ((string)(this["IRCChannelNames"]));
+            }
+            set {
+                this["IRCChannelNames"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("RBuildBot")]
+        public string IRCBotName {
+            get {
+                return ((string)(this["IRCBotName"]));
+            }
+            set {
+                this["IRCBotName"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("qwerty")]
+        public string IRCBotPassword {
+            get {
+                return ((string)(this["IRCBotPassword"]));
+            }
+            set {
+                this["IRCBotPassword"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("6667")]
+        public int IRCServerHostPort {
+            get {
+                return ((int)(this["IRCServerHostPort"]));
+            }
+            set {
+                this["IRCServerHostPort"] = value;
+            }
+        }
+    }
+}

irc/TechBot/TechBot/Settings.settings

@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="TechBot" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="IRCServerHostName" Type="System.String" Scope="User">
+      <Value Profile="(Default)">irc.eu.freenode.net</Value>
+    </Setting>
+    <Setting Name="IRCChannelNames" Type="System.String" Scope="User">
+      <Value Profile="(Default)">rbuildbottest</Value>
+    </Setting>
+    <Setting Name="IRCBotName" Type="System.String" Scope="User">
+      <Value Profile="(Default)">RBuildBot</Value>
+    </Setting>
+    <Setting Name="IRCBotPassword" Type="System.String" Scope="User">
+      <Value Profile="(Default)">qwerty</Value>
+    </Setting>
+    <Setting Name="IRCServerHostPort" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">6667</Value>
+    </Setting>
+  </Settings>
+</SettingsFile>

irc/TechBot/TechBot/TechBot.csproj

@@ -39,6 +39,10 @@
   -->
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
@@ -46,6 +50,11 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="ServiceThread.cs" />
+    <Compile Include="Settings.Designer.cs">
+      <DependentUpon>Settings.settings</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
     <Compile Include="TechBotService.cs">
       <SubType>Component</SubType>
     </Compile>

reactos/CREDITS

@@ -29,11 +29,12 @@ Hartmut Birr <hartmut.birr@gmx.de>
 Hernan Ochoa
 Herve Poussineau <hpoussin@reactos.com>
 Iwan Fatahi <i_fatahi@hotmail.com>
-James B. Tabor <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
+James B. Tabor <jimtabor.rosdev@gmail.com> <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
 Jason Eager
 Jason Filby <jasonfilby@yahoo.com>
 Jason Weiler
 Jean Michault
+Jeffrey Morlan <mrnobo1024@yahoo.com> 
 Jim Noeth
 Johannes Anderwald <johannes.anderwald@student.tugraz.at> 
 Jonathan Wilson <jonwil@tpgi.com.au>
@@ -59,6 +60,7 @@ Robert Bergkvist <fragdance@hotmail.com>
 Robert Dickenson <robd@reactos.org>
 Royce Mitchell III <royce3@ev1.net>
 Saveliy Tretiakov <saveliyt@mail.ru>
+Stefan Ginsberg <stefan__100__@hotmail.com>
 Steven Edwards <steven_ed4153@yahoo.com>
 Thomas Weidenmueller <w3seek@users.sourceforge.net>
 Timo Kreuzer <timo.kreuzer@reactos.org>

reactos/Makefile

@@ -126,6 +126,9 @@
 #    ROS_AUTOMAKE
 #        Alternate name of makefile.auto
 #
+#    ROS_BUILDENGINE
+#        The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET)
+#
 
 # 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
@@ -386,7 +389,6 @@ BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h
 
 include lib/lib.mak
 include tools/tools.mak
-include boot/freeldr/bootsect/bootsect.mak
 -include $(ROS_AUTOMAKE)
 
 PREAUTO := \
@@ -395,14 +397,19 @@ PREAUTO := \
 	$(BUILDNO_H) \
 	$(GENDIB_DIB_FILES) \
 	$(NCI_SERVICE_FILES)
+
 ifeq ($(ARCH),powerpc)
 PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS)
 endif
 
-$(ROS_AUTOMAKE): $(RBUILD_TARGET) $(XMLBUILDFILES) | $(PREAUTO)
+ifeq ($(ROS_BUILDENGINE),)
+ROS_BUILDENGINE=$(RBUILD_TARGET)
+endif
+
+$(ROS_AUTOMAKE): $(ROS_BUILDENGINE) $(XMLBUILDFILES) | $(PREAUTO)
 	${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
 
 world: all bootcd livecd
 
@@ -435,143 +442,143 @@ rgenstat: $(RGENSTAT_TARGET)
 	$(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml
 
 .PHONY: cb
-cb: $(RBUILD_TARGET)
+cb: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) cb
 
 .PHONY: msbuild
-msbuild: $(RBUILD_TARGET)
+msbuild: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msbuild
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msbuild
 
 .PHONY: msbuild_clean
-msbuild_clean: $(RBUILD_TARGET)
+msbuild_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msbuild
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msbuild
 
 .PHONY: depmap
-depmap: $(RBUILD_TARGET)
+depmap: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) depmap
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) depmap
 
 .PHONY: vreport
-vreport:$(RBUILD_TARGET)
+vreport:$(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) vreport
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) vreport
 
 .PHONY: msvc
-msvc: $(RBUILD_TARGET)
+msvc: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msvc
 
 .PHONY: msvc6
-msvc6: $(RBUILD_TARGET)
+msvc6: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs6.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs6.00 -voversionconfiguration msvc
 
 .PHONY: msvc7
-msvc7: $(RBUILD_TARGET)
+msvc7: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -voversionconfiguration msvc
 
 .PHONY: msvc71
-msvc71: $(RBUILD_TARGET)
+msvc71: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -voversionconfiguration msvc
 
 .PHONY: msvc8
-msvc8: $(RBUILD_TARGET)
+msvc8: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc
 
 .PHONY: msvc9
-msvc9: $(RBUILD_TARGET)
+msvc9: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc
 
 .PHONY: msvc6_clean
-msvc6_clean: $(RBUILD_TARGET)
+msvc6_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc
 
 .PHONY: msvc7_clean
-msvc7_clean: $(RBUILD_TARGET)
+msvc7_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc
 
 .PHONY: msvc71_clean
-msvc71_clean: $(RBUILD_TARGET)
+msvc71_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc
 
 .PHONY: msvc8_clean
-msvc8_clean: $(RBUILD_TARGET)
+msvc8_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc
 
 .PHONY: msvc9_clean
-msvc9_clean: $(RBUILD_TARGET)
+msvc9_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc
 
 .PHONY: msvc_clean
-msvc_clean: $(RBUILD_TARGET)
+msvc_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c msvc
 
 .PHONY: msvc_clean_all
-msvc_clean_all: $(RBUILD_TARGET)
+msvc_clean_all: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.10 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.10 -voversionconfiguration msvc
 
 .PHONY: msvc7_install_debug
-msvc7_install_debug: $(RBUILD_TARGET)
+msvc7_install_debug: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug -voversionconfiguration msvc
 
 .PHONY: msvc7_install_release
-msvc7_install_release: $(RBUILD_TARGET)
+msvc7_install_release: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease -voversionconfiguration msvc
 
 .PHONY: msvc7_install_speed
-msvc7_install_speed: $(RBUILD_TARGET)
+msvc7_install_speed: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed -voversionconfiguration msvc
 
 .PHONY: msvc71_install_debug
-msvc71_install_debug: $(RBUILD_TARGET)
+msvc71_install_debug: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug -voversionconfiguration msvc
 
 .PHONY: msvc71_install_release
-msvc71_install_release: $(RBUILD_TARGET)
+msvc71_install_release: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease -voversionconfiguration msvc
 
 
 .PHONY: msvc71_install_speed
-msvc71_install_speed: $(RBUILD_TARGET)
+msvc71_install_speed: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed -voversionconfiguration msvc
 
 .PHONY: msvc8_install_debug
-msvc8_install_debug: $(RBUILD_TARGET)
+msvc8_install_debug: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug -voversionconfiguration msvc
 
 .PHONY: msvc8_install_release
-msvc8_install_release: $(RBUILD_TARGET)
+msvc8_install_release: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease -voversionconfiguration msvc
 
 .PHONY: msvc8_install_speed
-msvc8_install_speed: $(RBUILD_TARGET)
+msvc8_install_speed: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed -voversionconfiguration msvc
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed -voversionconfiguration msvc
 
 .PHONY: makefile_auto_clean
 makefile_auto_clean:
@@ -581,6 +588,6 @@ makefile_auto_clean:
 clean: makefile_auto_clean
 
 .PHONY: depends
-depends: $(RBUILD_TARGET)
+depends: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw
+	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) mingw

reactos/ReactOS-arm.rbuild

@@ -7,14 +7,47 @@
 		</xi:fallback>
 	</xi:include>
 
-	<xi:include href="ReactOS-generic.rbuild" />
+	<xi:include href="baseaddress.rbuild" />
 
+	<define name="__REACTOS__" />
 	<define name="_ARM_" />
 	<define name="__arm__" />
 
+	<if property="DBG" value="1">
+		<define name="DBG">1</define>
+		<define name="_SEH_ENABLE_TRACE" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	<if property="KDBG" value="1">
+		<define name="KDBG">1</define>
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	
+	<include>.</include>
+	<include>include</include>
+	<include root="intermediate">include</include>
+	<include>include/psdk</include>
+	<include root="intermediate">include/psdk</include>
+	<include>include/dxsdk</include>
+	<include root="intermediate">include/dxsdk</include>
+	<include>include/crt</include>
+	<include>include/crt/mingw32</include>
+	<include>include/ddk</include>
+	<include>include/GL</include>
+	<include>include/ndk</include>
+	<include>include/reactos</include>
+	<include root="intermediate">include/reactos</include>
+	<include root="intermediate">include/reactos/mc</include>
+	<include>include/reactos/libs</include>
+	<include>include/reactos/arm</include>
+
 	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
 	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
 
+	<if property="SARCH" value="versatile">
+		<define name="BOARD_CONFIG_VERSATILE"/>
+	</if>
+
 	<if property="OPTIMIZE" value="1">
 		<compilerflag>-Os</compilerflag>
 		<compilerflag>-ftracer</compilerflag>
@@ -37,4 +70,124 @@
 	<linkerflag>-s</linkerflag>
 	<linkerflag>-lgcc</linkerflag>
 	<linkerflag>-static</linkerflag>
+	
+	<directory name="media">
+		<directory name="nls">
+			<xi:include href="media/nls/nls.rbuild" />
+		</directory>	
+	</directory>
+	<directory name="lib">
+		<directory name="drivers">
+			<directory name="csq">
+				<xi:include href="lib/drivers/csq/csq.rbuild" />
+            </directory>
+		</directory>
+		<directory name="debugsup">
+			<xi:include href="lib/debugsup/debugsup.rbuild" />
+		</directory>
+		<directory name="3rdparty">
+			<directory name="zlib">
+				<xi:include href="lib/3rdparty/zlib/zlib.rbuild" />
+			</directory>
+		</directory>
+		<directory name="rtl">
+			<xi:include href="lib/rtl/rtl.rbuild" />
+		</directory>
+		<directory name="host">
+			<directory name="wcsfuncs">
+				<xi:include href="lib/host/wcsfuncs/wcsfuncs.rbuild" />
+			</directory>
+		</directory>
+		<directory name="inflib">
+			<xi:include href="lib/inflib/inflib.rbuild" />
+		</directory>
+		<directory name="cmlib">
+			<xi:include href="lib/cmlib/cmlib.rbuild" />
+		</directory>
+		<directory name="pseh">
+			<xi:include href="lib/pseh/pseh.rbuild" />
+		</directory>
+		<directory name="rossym">
+			<xi:include href="lib/rossym/rossym.rbuild" />
+		</directory>
+		<directory name="sdk">
+			<directory name="crt">
+				<xi:include href="lib/sdk/crt/crt.rbuild" />
+				<xi:include href="lib/sdk/crt/libcntpr.rbuild" />
+			</directory>
+			<directory name="wdmguid">
+				<xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" />
+			</directory>
+		</directory>
+	</directory>
+	<directory name="include">
+		<xi:include href="include/directory.rbuild" />
+	</directory>
+	<directory name="tools">
+		<xi:include href="tools/tools.rbuild" />
+	</directory>
+	<directory name="ntoskrnl">
+		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
+	</directory>
+	<directory name="hal">
+		<directory name="halarm">
+			<directory name="generic">
+				<xi:include href="hal/halarm/generic/generic.rbuild" />
+			</directory>
+			<directory name="up">
+				<xi:include href="hal/halarm/up/halup.rbuild" />
+			</directory>
+		</directory>
+		<directory name="hal">
+			<xi:include href="hal/hal/hal.rbuild" />
+		</directory>
+	</directory>
+	<directory name="boot">
+		<xi:include href="boot/boot.rbuild" />
+	</directory>
+	<directory name="drivers">
+		<directory name="storage">
+			<directory name="scsiport">
+				<xi:include href="drivers/storage/scsiport/scsiport.rbuild" />			
+			</directory>
+			<directory name="port">
+				<directory name="buslogic">
+					<xi:include href="drivers/storage/port/buslogic/buslogic.rbuild" />			
+				</directory>
+			</directory>
+			<directory name="ide">
+				<directory name="atapi">
+					<xi:include href="drivers/storage/ide/atapi/atapi.rbuild" />			
+				</directory>
+			</directory>
+			<directory name="class">
+				<directory name="class2">
+					<xi:include href="drivers/storage/class/class2/class2.rbuild" />			
+				</directory>
+				<directory name="disk">
+					<xi:include href="drivers/storage/class/disk/disk.rbuild" />			
+				</directory>
+			</directory>
+		</directory>
+		<directory name="filesystems">
+			<directory name="fastfat">
+				<xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" />			
+			</directory>
+		</directory>
+		<directory name="network">
+			<directory name="ndis">
+				<xi:include href="drivers/network/ndis/ndis.rbuild" />			
+			</directory>
+		</directory>
+		<directory name="base">
+			<directory name="kdcom">
+				<xi:include href="drivers/base/kdcom/kdcom.rbuild" />
+			</directory>
+			<directory name="bootvid">
+				<xi:include href="drivers/base/bootvid/bootvid.rbuild" />
+			</directory>
+		</directory>
+	</directory>
+
+	
 </project>

reactos/ReactOS-generic.rbuild

@@ -28,6 +28,7 @@
 	<include>include/ndk</include>
 	<include>include/reactos</include>
 	<include root="intermediate">include/reactos</include>
+	<include root="intermediate">include/reactos/mc</include>
 	<include>include/reactos/libs</include>
 
 	<directory name="base">
@@ -57,6 +58,9 @@
 	<directory name="modules">
 		<xi:include href="modules/directory.rbuild" />
 	</directory>
+	<!--<directory name="nls">
+		<xi:include href="nls/nls.rbuild" />
+	</directory>-->
 	<directory name="ntoskrnl">
 		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
 		<!-- <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> -->

reactos/base/applications/applications.rbuild

@@ -25,6 +25,11 @@
 	<directory name="hh">
 		<xi:include href="hh/hh.rbuild" />
 	</directory>
+<!--
+	<directory name="iexplore">
+		<xi:include href="iexplore/iexplore.rbuild" />
+	</directory>
+-->
 	<directory name="kbswitch">
 		<xi:include href="kbswitch/kbswitch.rbuild" />
 	</directory>
@@ -49,6 +54,9 @@
 	<directory name="regedit">
 		<xi:include href="regedit/regedit.rbuild" />
 	</directory>
+	<directory name="regedt32">
+		<xi:include href="regedt32/regedt32.rbuild" />
+	</directory>
 	<directory name="sc">
 		<xi:include href="sc/sc.rbuild" />
 	</directory>
@@ -64,8 +72,8 @@
 	<directory name="taskmgr">
 		<xi:include href="taskmgr/taskmgr.rbuild" />
 	</directory>
-	<directory name="winhelp">
-		<xi:include href="winhelp/winhelp.rbuild" />
+	<directory name="winhlp32">
+		<xi:include href="winhlp32/winhlp32.rbuild" />
 	</directory>
 	<directory name="wordpad">
 		<xi:include href="wordpad/wordpad.rbuild" />

reactos/base/applications/cacls/rsrc.rc

@@ -10,7 +10,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ko-KO.rc"
+#include "lang/ko-KR.rc"
 #include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

reactos/base/applications/calc/lang/ru-RU.rc

@@ -240,7 +240,7 @@ BEGIN
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS",IDC_STATIC,120,12,132,8,
                     SS_CENTERIMAGE
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE
-    LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,120,32,132,8,
+    LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,120,32,132,8,
                     SS_CENTERIMAGE
     GROUPBOX        "",IDC_STATIC,112,0,148,52
     GROUPBOX        "",IDC_STATIC,4,56,256,88

reactos/base/applications/charmap/rsrc.rc

@@ -14,7 +14,7 @@ IDI_ICON ICON "res/charmap.ico"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/ko-KO.rc"
+#include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

reactos/base/applications/cmdutils/xcopy/Da.rc

@@ -47,7 +47,7 @@ STRINGTABLE
 "XCOPY - Kopierer filer eller katalogtre til en m<>lplassering\n\
 \n\
 Syntaks:\n\
-XCOPY kilde [m<>l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY kilde [m<>l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 hvor:\n\
@@ -69,7 +69,7 @@ hvor:\n\
 [/H]  Kopier skjulte filer og systemfiler\n\
 [/C]  Forts<74>t selv om det opst<73>r fejl under kopieringen\n\
 [/A]  Kopier ikke filer som er markeret som arkiv\n\
-[/M]  Kopier kun filer som er markeret som akriv; fjerner denne markering \n\
+[/M]  Kopier kun filer som er markeret som akriv; fjerner denne markering\n\
 [/D | /D:m-d-<2D>] Kopier kun nye filer eller dem som er <20>ndret efter\n\
       \t\tden opgivne dato.\n\
       \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\

reactos/base/applications/cmdutils/xcopy/De.rc

@@ -2,7 +2,8 @@
  * XCOPY - Wine-compatible xcopy program
  * German language support
  *
- * Copyright (C) 2007 Daniel Reimer
+ * Copyright (C) 2007 J. Edmeades
+ * Copyright (C) 2008 M. Karcher
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,57 +24,56 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
-BEGIN
-    STRING_INVPARMS, "Ung<EFBFBD>ltige Anzahl an Parametern - Nutze xcopy /? f<EFBFBD>r Hilfe\n"
-    STRING_INVPARM,  "Ung<EFBFBD>ltiger Parameter '%s' -  Nutze xcopy /? f<EFBFBD>r Hilfe\n"
-    STRING_PAUSE,    "Dr<EFBFBD>cke <Enter> um den Kopiervorgang zu starten\n"
-    STRING_SIMCOPY,  "%d Datei(en) w<>rden kopiert werden\n"
+{
+    STRING_INVPARMS, "Falsche Parameteranzahl -  xcopy /? zeigt Hilfe an\n"
+    STRING_INVPARM,  "Unbekannter Parameter '%s' - xcopy /? zeigt Hilfe an\n"
+    STRING_PAUSE,    "Eingabetaste bet<65>tigen, um mit dem Kopieren zu beginnen\n"
+    STRING_SIMCOPY,  "%d Datei(en) w<>rden kopiert\n"
     STRING_COPY,     "%d Datei(en) kopiert\n"
-    STRING_QISDIR,   "Ist '%s' eine Datei oder ein Ordner\n" \
-                     "im Zielordner?\n" \
-                     "(D - Datei, O - Ordner)\n"
+    STRING_QISDIR,   "Ist '%s' eine Datei oder ein Verzeichnis\n" \
+                     "am Zielsort?\n" \
+                     "(D - Datei, V - Verzeichnis)\n"
     STRING_SRCPROMPT,"%s? (Ja|Nein)\n"
-    STRING_OVERWRITE,"<22>berschreibe %s? (Ja|Nein|Alle)\n"
-    STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen mit r/c %d\n"
-    STRING_OPENFAIL, "<22>ffnen von '%s' fehlgeschlagen\n"
-    STRING_READFAIL, "Lesen von '%s' fehlgeschlagen\n"
+    STRING_OVERWRITE,"%s <EFBFBD>berschreiben? (Ja|Nein|Alle)\n"
+    STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen. Fehlernummer: %d\n"
+    STRING_OPENFAIL, "Fehler beim <EFBFBD>ffnen von '%s'\n"
+    STRING_READFAIL, "Fehler beim Lesen von '%s'\n"
     STRING_YES_CHAR, "J"
     STRING_NO_CHAR,  "N"
     STRING_ALL_CHAR, "A"
     STRING_FILE_CHAR,"D"
-    STRING_DIR_CHAR, "O"
+    STRING_DIR_CHAR, "V"
 
     STRING_HELP,
-"XCOPY - Kopiert Quelldaten oder Verzeichnisb<EFBFBD>ume and einen Ort\n\
+"XCOPY - Kopiert Dateien oder Verzeichnisse an einen Zielort\n\
 \n\
 Syntax:\n\
-XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
-Wo:\n\
+Mit:\n\
 \n\
-[/I]  Falls Ziel nicht vorhanden ist und mehrere Dateien kopiert \n\
-\twerden, nimmt XCOPY an, dass das Ziel ein Verzeichnis ist\n\
-[/S]  Kopiert Verzeichnisse und Unterverzeichnisse, die nicht leer sind\n\
-[/E]  Kopiert alle Unterverzeichnisse, eingeschlossen leere\n\
-[/Q]  Zeigt beim Kopieren keine Dateinamen an\n\
-[/F]  Zeigt die Namen der Quell- und Zieldateien beim Kopieren an\n\
-[/L]  Listet lediglich die Dateien auf, die kopiert werden w<EFBFBD>rden\n\
-[/W]  Fordert vor dem Beginn des Kopiervorgangs eine Best<73>tigung\n\
-[/T]  Erstellt die Verzeichnisstruktur, kopiert aber keine Dateien\n\
-[/Y]  Unterdr<EFBFBD>cke eine Best<73>tigung vor dem <20>berschreiben einer Datei\n\
-[/-Y] Fordert vor dem <20>berschreiben einer Datei eine Best<73>tigung\n\
-[/P]  Fordert vor jedem Kopiervorgang eine Best<73>tigung\n\
-[/N]  Kurznamen beim Kopieren verwenden\n\
-[/U]  Kopiert nur Dateien, die im Zielverzeichnis vorhanden sind\n\
-[/R]  Schreibgesch<EFBFBD>tzte Dateien <20>berschreiben\n\
-[/H]  Verstecke und Systemdateien in den Kopiervorgang miteinbeziehen\n\
-[/C]  Kopiervorgang selbst nach Fehlern fortsetzen\n\
-[/A]  Nur Dateien mit gesetztem Archiv Attribut kopieren\n\
-[/M]  Nur Dateien mit gesetztem Archiv Attribut kopieren und \n\
-\tdieses entfernen\n\
-[/D | /D:m-d-y] Kopiert nur die an oder nach dem Datum ge<67>nderten Dateien.\n\
-\t\tIst kein Datum angegeben, werden nur Dateien kopiert,\n\
-\t\tdie neuer als die bestehenden Zieldateien sind.\n\n"
+[/I]  Behandle Ziel als Verzeichnisnamen, wenn es nicht existiert und\n\
+\tmehrere Dateien kopiert werden.\n\
+[/S]  Kopiere Verzeichnisse und Unterverzeichnisse\n\
+[/E]  Kopiere Verzeichnisse und Unterverzeichnisse, auch leere\n\
+[/Q]  Zeige die Dateinamen beim Kopieren nicht an\n\
+[/F]  Zeige vollst<73>ndige Dateinamen von Quelle und Ziel an\n\
+[/L]  Simulation: Zeige die Namen der Datein, die kopiert w<>rden\n\
+[/W]  Wartet vor Beginn des Kopierens auf Best<73>tigung\n\
+[/T]  Erzeuge eine leere Verzeichnisstruktur, ohne Dateien zu kopieren\n\
+[/Y]  Keine Nachfrage vor dem <20>berschreiben von Dateien\n\
+[/-Y] Nachrage vor dem <20>berschreiben von Dateien\n\
+[/P]  Fragt f<>r jede Quelldatei, ob sie kopiert werden soll\n\
+[/N]  Kopiert die Dateien unter ihrem Kurznamen\n\
+[/U]  Kopiert nur Dateien, die am Ziel bereits existieren\n\
+[/R]  <EFBFBD>berschreibt schreibgesch<EFBFBD>tzte Dateien\n\
+[/H]  Kopiere auch versteckte und Systemdateien\n\
+[/C]  Nach Fehlern den Kopiervorgang fortsetzen\n\
+[/A]  Nur Dateien mit Archivbit kopieren\n\
+[/M]  Nur Dateien mit Archivbit kopieren, danach Archivbit l<>schen\n\
+[/D | /D:m-d-y] Kopiere neue Dateien und Dateien, die neuer als das\n\
+\t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\
+\t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"
 
-END
+}

reactos/base/applications/cmdutils/xcopy/En.rc

@@ -47,12 +47,12 @@ STRINGTABLE
 "XCOPY - Copies source files or directory trees to a destination\n\
 \n\
 Syntax:\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or \n\
+[/I]  Assume directory if destination does not exist and copying 2 or\n\
 \tmore files\n\
 [/S]  Copy directories and subdirectories\n\
 [/E]  Copy directories and subdirectories, including any empty ones\n\
@@ -70,7 +70,7 @@ Where:\n\
 [/H]  Include hidden and system files in the copy\n\
 [/C]  Continue even if an error occurs during the copy\n\
 [/A]  Only copy files with archive attribute set\n\
-[/M]  Only copy files with archive attribute set, removes \n\
+[/M]  Only copy files with archive attribute set, removes\n\
 \tarchive attribute\n\
 [/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
 \t\tIf no date is supplied, only copy if destination is older\n\

reactos/base/applications/cmdutils/xcopy/Fr.rc

@@ -48,7 +48,7 @@ STRINGTABLE
 "XCOPY - Copie les fichiers ou répertoires source vers une destination\n\
 \n\
 Syntaxe :\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Où :\n\
@@ -71,7 +71,7 @@ Où :\n\
 [/H]  Inclure les fichiers cachés et système dans la copie\n\
 [/C]  Continue même si une erreur survient pendant la copie\n\
 [/A]  Copie uniquement les fichiers qui ont l'attribut archive défini\n\
-[/M]  Copie uniquement les fichiers qui ont l'attribut archive défini, supprime \n\
+[/M]  Copie uniquement les fichiers qui ont l'attribut archive défini, supprime\n\
 \tensuite l'attribut\n\
 [/D | /D:m-d-y] Copie uniquement les fichiers nouveaux ou ceux modifiés après la date spécifiée.\n\
 \t\tSi aucune date n'est spécifiée, copie uniquement lorsque le fichier de destination est plus vieux\n\

reactos/base/applications/cmdutils/xcopy/It.rc

@@ -0,0 +1,79 @@
+/*
+ * XCOPY - Wine-compatible xcopy program
+ * English language support
+ *
+ * Copyright (C) 2007 J. Edmeades
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+{
+    STRING_INVPARMS, "Numero di parametri non valido - Usare xcopy /? per l'aiuto\n"
+    STRING_INVPARM,  "Parametro non valido '%s' -  Usare xcopy /? per l'aiuto\n"
+    STRING_PAUSE,    "Premeress <invio> per iniziare la copia\n"
+    STRING_SIMCOPY,  "%d file(s) saranno copiati\n"
+    STRING_COPY,     "%d file(s) copiati\n"
+    STRING_QISDIR,   "'%s' <20> un file o una cartella ?\n" \
+                     "sulla destinazione?\n" \
+                     "(F - File, C - Cartella)\n"
+    STRING_SRCPROMPT,"%s? (Si|No)\n"
+    STRING_OVERWRITE,"Sovrascrivere %s? (Si|No|Tutti)\n"
+    STRING_COPYFAIL, "Copia di '%s' su '%s' fallitocon r/c %d\n"
+    STRING_OPENFAIL, "Impossibile aprire '%s'\n"
+    STRING_READFAIL, "Impossibile leggre '%s'\n"
+    STRING_YES_CHAR, "S"
+    STRING_NO_CHAR,  "N"
+    STRING_ALL_CHAR, "T"
+    STRING_FILE_CHAR,"F"
+    STRING_DIR_CHAR, "C"
+
+    STRING_HELP,
+"XCOPY - Copia i file sorgenti o un albero di cartelle su una destinazione\n\
+\n\
+Sintassi:\n\
+XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
+\n\
+Dove:\n\
+\n\
+[/I]  Assumere che sia una cartella se la destinazione non esiste e vengono \n\
+\t\tcopiati due o pi<70> file\n\
+[/S]  Copiare cartelle e sottocartelle\n\
+[/E]  Copiare cartelle e sottocartelle, comprese quelle vuote\n\
+[/Q]  Non elencare i nomi dei file durante la copia.\n\
+[/F]  Mostrare il percorso completo di sorgente e destinazione durante la copia\n\
+[/L]  Simulare l'operazione, mostrare i nomi dei file che sarebbero copiati\n\
+[/W]  Chidere conferma prima di iniziare la copia\n\
+[/T]  Creare una strutture di cartelle vuota senza copiare i file\n\
+[/Y]  Supprimere la richiesta di conferma per la sovrascrittura dei file\n\
+[/-Y] Abilitare la richiesta di conferma per la sovrascrittura dei file\n\
+[/P]  Chiedere conferma prima della copia di ogni file\n\
+[/N]  Copiare usando i nomi corti\n\
+[/U]  Copiare solo i file che esistono gi<67> nella destinazione\n\
+[/R]  Sovrascrivere i file in sola lettura\n\
+[/H]  Includere nella copia i file nascosti e quelli di sistema\n\
+[/C]  Continuare nella copia anche se si verificano errori\n\
+[/A]  Copiare solo i file con l'attributo di archivio attivo\n\
+[/M]  Copiare solo i file con l'attributo di archivio attivo e poi \n\
+\t\tlo disattiva\n\
+[/D | /D:m-d-y] Copiare i file nuovi o modificati dopo la data indicata.\n\
+\t\tSe non <20> indicata una data copiare solo se la destinazione e meno recente\n\
+\t\tdella sorgente\n\n"
+
+}

reactos/base/applications/cmdutils/xcopy/Ko.rc

@@ -48,12 +48,12 @@ STRINGTABLE
 "XCOPY - <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>̳<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n\
 \n\
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n\
-XCOPY <20><><EFBFBD><EFBFBD> [<5B><><EFBFBD><EFBFBD>] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY <20><><EFBFBD><EFBFBD> [<5B><><EFBFBD><EFBFBD>] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Assume directory if destination does not exist and copying 2 or \n\
+[/I]  Assume directory if destination does not exist and copying 2 or\n\
 \tmore files\n\
 [/S]  <20><><EFBFBD><EFBFBD><EFBFBD>丮<EFBFBD>ϰ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮 <20><><EFBFBD><EFBFBD>\n\
 [/E]  <20><> <20><><EFBFBD><EFBFBD><EFBFBD>丮<EFBFBD><E4B8AE> <20><><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮<EFBFBD><E4B8AE> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮 <20><><EFBFBD><EFBFBD>\n\
@@ -71,10 +71,10 @@ Where:\n\
 [/H]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>̳<EFBFBD> <20>ý<EFBFBD><C3BD><EFBFBD> <20><><EFBFBD>ϵ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD> <20><><EFBFBD><EFBFBD>\n\
 [/C]  <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD> <20><><EFBFBD>ȿ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>߻<EFBFBD><DFBB>ص<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n\
 [/A]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE>ִ<EFBFBD> <20><><EFBFBD>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-[/M]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϸ鼭  <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE>ִ<EFBFBD>  \n\
-\<5C><><EFBFBD>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD> \n\
+[/M]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϸ鼭  <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE>ִ<EFBFBD>\n\
+\<5C><><EFBFBD>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD>\n\
 [/D | /D:m-d-y] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>¥ <20>Ŀ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ǰų<C7B0> <20><><EFBFBD>ο<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>.\n\
-\t\tI<74><49><EFBFBD><EFBFBD> <20><EFBFBD><EEB6B0> <20><>¥<EFBFBD><C2A5> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \n\
+\t\tI<74><49><EFBFBD><EFBFBD> <20><EFBFBD><EEB6B0> <20><>¥<EFBFBD><C2A5> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<2C><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
 \t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>͸<EFBFBD> <20><><EFBFBD><EFBFBD>\n\n"
 
 }

reactos/base/applications/cmdutils/xcopy/Nl.rc

@@ -47,7 +47,7 @@ STRINGTABLE
 "XCOPY - Copiëerd bron bestanden of directory bomen naar een bestemming\n\
 \n\
 Gebruik:\n\
-XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY bron [bestemming] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Parameters:\n\
@@ -70,7 +70,7 @@ Parameters:\n\
 [/H]  Inclusief verborgen en systeem bestanden\n\
 [/C]  Ga door zelfs als er een fout optreed tijdens het copiëren\n\
 [/A]  Copiëer alleen bestanden met archiverings attribuut aan\n\
-[/M]  Copiëer alleen bestanden met archiverings attribuut aan, verwijderd \n\
+[/M]  Copiëer alleen bestanden met archiverings attribuut aan, verwijderd\n\
 \tdit archiverings attribuut\n\
 [/D | /D:m-d-y] Copiëer nieuwe bestanden of die gewijzigd zijn na de opgegeven\n\
 \t\tdatum. Als geen detum wordt gegeven, copiëer alleen als bron nieuwer is.\n\n"

reactos/base/applications/cmdutils/xcopy/No.rc

@@ -47,7 +47,7 @@ STRINGTABLE
 "XCOPY - Kopierer filer eller katalogtre til en m<>lplassering\n\
 \n\
 Syntax:\n\
-XCOPY kilde [m<>l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY kilde [m<>l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
@@ -70,7 +70,7 @@ Where:\n\
 [/H]  Kopier skjulte filer og systemfiler\n\
 [/C]  Fortsett selv om det oppst<73>r feil under kopieringen\n\
 [/A]  Ikke kopier filer som er markert som arkiv\n\
-[/M]  Bare kopier filer som er markert som akriv; fjerner denne merkingen \n\
+[/M]  Bare kopier filer som er markert som akriv; fjerner denne merkingen\n\
 [/D | /D:m-d-<2D>] Kopier nye filer eller de som er endret etter\n\
       \t\tden oppgitte datoen.\n\
       \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\

reactos/base/applications/cmdutils/xcopy/Pl.rc

@@ -48,7 +48,7 @@ STRINGTABLE
 "XCOPY - kopiuje pliki lub drzewa katalog<6F>w\n\
 \n\
 Sk<EFBFBD>adnia:\n\
-XCOPY <20>r<EFBFBD>d<EFBFBD>o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY <20>r<EFBFBD>d<EFBFBD>o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Gdzie:\n\

reactos/base/applications/cmdutils/xcopy/Ru.rc

@@ -51,12 +51,12 @@ STRINGTABLE
 "XCOPY - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n\
 \n\
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 <EFBFBD><EFBFBD><EFBFBD>:\n\
 \n\
-[/I]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, \n\
+[/I]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>,\n\
       <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
 [/S]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
 [/E]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
@@ -73,7 +73,7 @@ XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
 [/R]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
 [/H]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
 [/C]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/A]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\". \n\
+[/A]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\".\n\
 [/M]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\",\n\
       <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
 [/D | /D:m-d-y] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\

reactos/base/applications/cmdutils/xcopy/Si.rc

@@ -30,7 +30,7 @@ STRINGTABLE
     STRING_PAUSE,    "Za začetek kopiranja pritisnite <enter>\n"
     STRING_SIMCOPY,  "Prekopiral bom %d datotek\n"
     STRING_COPY,     "Prekopiral sem %d datotek\n"
-    STRING_QISDIR,   "Ali je '%s' ime ciljne datoteke \n" \
+    STRING_QISDIR,   "Ali je '%s' ime ciljne datoteke\n" \
                      "ali mape?\n" \
                      "(D - Datoteka, M - Mapa)\n"
     STRING_SRCPROMPT,"%s? (Da|Ne)\n"
@@ -48,12 +48,12 @@ STRINGTABLE
 "XCOPY - kopira navedene izvorne datoteke oz. mape v naveden cilj\n\
 \n\
 Sintaksa:\n\
-XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
+XCOPY izvor [cilj] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Če cilj ne obstaja in gre za kopiranje dveh ali več datotek, predpostavi, \n\
+[/I]  Če cilj ne obstaja in gre za kopiranje dveh ali več datotek, predpostavi,\n\
 \da je cilj mapa\n\
 [/S]  Kopiraj mape in podmape\n\
 [/E]  Kopiraj mape in podmape, vključno s praznimi mapami\n\

reactos/base/applications/cmdutils/xcopy/rsrc.rc

@@ -28,6 +28,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "El.rc"
 #include "En.rc"
 #include "Fr.rc"
+#include "It.rc"
 #include "Ko.rc"
 #include "Nl.rc"
 #include "No.rc"

reactos/base/applications/control/control.c

@@ -1,458 +1,126 @@
 /*
- *  ReactOS
- *  Copyright (C) 2004 ReactOS Team
- *  Copyright (C) 2004 GkWare e.K.
- *
- *  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.
- */
-/* $Id$
- *
  * PROJECT:         ReactOS System Control Panel
- * FILE:            lib/cpl/system/control.c
+ * FILE:            base/applications/control/control.c
  * PURPOSE:         ReactOS System Control Panel
- * PROGRAMMER:      Gero Kuehn (reactos.filter@gkware.com)
- * UPDATE HISTORY:
- *      06-13-2004  Created
+ * PROGRAMMERS:     Gero Kuehn (reactos.filter@gkware.com)
+ *                  Colin Finck (mail@colinfinck.de)
  */
-#include <windows.h>
-#include <commctrl.h>
-#include <cpl.h>
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <tchar.h>
+#include "control.h"
 
-#include "resource.h"
+static const TCHAR szWindowClass[] = _T("DummyControlClass");
 
-//#define CONTROL_DEBUG_ENABLE
-
-#ifdef CONTROL_DEBUG_ENABLE
-#define CTL_DEBUG(x) dbgprint x
-#else
-#define CTL_DEBUG(x)
-#endif
-
-#define MYWNDCLASS _T("CTLPANELCLASS")
-
-typedef LONG (CALLBACK *CPLAPPLETFUNC)(HWND hwndCPL, UINT uMsg, LPARAM lParam1, LPARAM lParam2);
-
-typedef struct CPLLISTENTRY
-{
-	TCHAR pszPath[MAX_PATH];
-	HMODULE hDll;
-	CPLAPPLETFUNC pFunc;
-	CPLINFO CplInfo;
-	int nIndex;
-} CPLLISTENTRY, *PCPLLISTENTRY;
-
-
-HWND hListView;
+HANDLE hProcessHeap;
 HINSTANCE hInst;
-HWND hMainWnd;
-DEVMODE pDevMode;
-
-VOID dbgprint(TCHAR *format,...)
-{
-	TCHAR buf[1000];
-	va_list va;
-
-	va_start(va,format);
-	_vstprintf(buf,format,va);
-	OutputDebugString(buf);
-	va_end(va);
-}
-
-VOID PopulateCPLList(HWND hLisCtrl)
-{
-	WIN32_FIND_DATA fd;
-	HANDLE hFind;
-	TCHAR pszSearchPath[MAX_PATH];
-	HIMAGELIST hImgListSmall;
-	HIMAGELIST hImgListLarge;
-	int ColorDepth;
-	HMODULE hDll;
-	CPLAPPLETFUNC pFunc;
-	TCHAR pszPath[MAX_PATH];
-
-	/* Icon drawing mode */
-	pDevMode.dmSize = sizeof(DEVMODE);
-	pDevMode.dmDriverExtra = 0;
-
-	EnumDisplaySettings(NULL,ENUM_CURRENT_SETTINGS,&pDevMode);
-	switch (pDevMode.dmBitsPerPel)
-	{
-		case 32: ColorDepth = ILC_COLOR32; break;
-		case 24: ColorDepth = ILC_COLOR24; break;
-		case 16: ColorDepth = ILC_COLOR16; break;
-		case  8: ColorDepth = ILC_COLOR8;  break;
-		case  4: ColorDepth = ILC_COLOR4;  break;
-		default: ColorDepth = ILC_COLOR;  break;
-	}
-
-	hImgListSmall = ImageList_Create(16,16,ColorDepth | ILC_MASK,5,5);
-	hImgListLarge = ImageList_Create(32,32,ColorDepth | ILC_MASK,5,5);
-
-	GetSystemDirectory(pszSearchPath,MAX_PATH);
-	_tcscat(pszSearchPath,_T("\\*.cpl"));
-
-	hFind = FindFirstFile(pszSearchPath,&fd);
-	while (hFind != INVALID_HANDLE_VALUE)
-	{
-		PCPLLISTENTRY pEntry;
-		CTL_DEBUG((_T("Found %s\r\n"), fd.cFileName));
-
-		_tcscpy(pszPath, pszSearchPath);
-		*_tcsrchr(pszPath, '\\')=0;
-		_tcscat(pszPath, _T("\\"));
-		_tcscat(pszPath, fd.cFileName);
-
-		hDll = LoadLibrary(pszPath);
-		CTL_DEBUG((_T("Handle %08X\r\n"), hDll));
-
-		pFunc = (CPLAPPLETFUNC)GetProcAddress(hDll, "CPlApplet");
-		CTL_DEBUG((_T("CPLFunc %08X\r\n"), pFunc));
-
-		if (pFunc && pFunc(hLisCtrl, CPL_INIT, 0, 0))
-		{
-			UINT i, uPanelCount;
-
-			uPanelCount = (UINT)pFunc(hLisCtrl, CPL_GETCOUNT, 0, 0);
-			for (i = 0; i < uPanelCount; i++)
-			{
-				HICON hIcon;
-				TCHAR Name[MAX_PATH];
-				int index;
-
-				pEntry = (PCPLLISTENTRY)malloc(sizeof(CPLLISTENTRY));
-				if (pEntry == NULL)
-					return;
-
-				memset(pEntry, 0, sizeof(CPLLISTENTRY));
-				pEntry->hDll = hDll;
-				pEntry->pFunc = pFunc;
-				_tcscpy(pEntry->pszPath, pszPath);
-
-				pEntry->pFunc(hLisCtrl, CPL_INQUIRE, (LPARAM)i, (LPARAM)&pEntry->CplInfo);
-				hIcon = LoadImage(pEntry->hDll,MAKEINTRESOURCE(pEntry->CplInfo.idIcon),IMAGE_ICON,16,16,LR_DEFAULTCOLOR);
-				index = ImageList_AddIcon(hImgListSmall,hIcon);
-				DestroyIcon(hIcon);
-				hIcon = LoadImage(pEntry->hDll,MAKEINTRESOURCE(pEntry->CplInfo.idIcon),IMAGE_ICON,32,32,LR_DEFAULTCOLOR);
-				ImageList_AddIcon(hImgListLarge,hIcon);
-				DestroyIcon(hIcon);
-
-				if (LoadString(pEntry->hDll, pEntry->CplInfo.idName, Name, MAX_PATH))
-				{
-					LV_ITEM lvi;
-
-					memset(&lvi,0x00,sizeof(lvi));
-					lvi.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE;
-					lvi.pszText = Name;
-					lvi.state = 0;
-					lvi.iImage = index;
-					lvi.lParam = (LPARAM)pEntry;
-					pEntry->nIndex = ListView_InsertItem(hLisCtrl,&lvi);
-
-					if (LoadString(pEntry->hDll, pEntry->CplInfo.idInfo, Name, MAX_PATH))
-						ListView_SetItemText(hLisCtrl, pEntry->nIndex, 1, Name);
-				}
-			}
-		}
-
-		if (!FindNextFile(hFind,&fd))
-			hFind = INVALID_HANDLE_VALUE;
-	}
-
-	(void)ListView_SetImageList(hLisCtrl,hImgListSmall,LVSIL_SMALL);
-	(void)ListView_SetImageList(hLisCtrl,hImgListLarge,LVSIL_NORMAL);
-}
-
-LRESULT CALLBACK MyWindowProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
-{
-	TCHAR szBuf[1024];
-
-	switch (uMsg)
-	{
-	case WM_CREATE:
-		{
-			RECT rect;
-			LV_COLUMN column;
-
-			GetClientRect(hWnd,&rect);
-			hListView = CreateWindow(WC_LISTVIEW,_T(""),LVS_REPORT | LVS_ALIGNLEFT | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_SINGLESEL | WS_VISIBLE | WS_CHILD | WS_TABSTOP,0,0,rect.right ,rect.bottom,hWnd,NULL,hInst,0);
-			CTL_DEBUG((_T("Listview Window %08X\r\n"),hListView));
-
-			memset(&column,0x00,sizeof(column));
-			column.mask = LVCF_FMT | LVCF_WIDTH | LVCF_SUBITEM | LVCF_TEXT;
-			column.fmt = LVCFMT_LEFT;
-			column.cx = (rect.right - rect.left) / 3;
-			column.iSubItem = 0;
-			LoadString(hInst, IDS_NAME, szBuf, sizeof(szBuf) / sizeof(TCHAR));
-			column.pszText = szBuf;
-			(void)ListView_InsertColumn(hListView,0,&column);
-			column.cx = (rect.right - rect.left) - ((rect.right - rect.left) / 3) - 1;
-			column.iSubItem = 1;
-			LoadString(hInst, IDS_COMMENT, szBuf, sizeof(szBuf) / sizeof(TCHAR));
-			column.pszText = szBuf;
-			(void)ListView_InsertColumn(hListView,1,&column);
-			PopulateCPLList(hListView);
-			(void)ListView_SetColumnWidth(hListView,2,LVSCW_AUTOSIZE_USEHEADER);
-			(void)ListView_Update(hListView,0);
-
-			SetFocus(hListView);
-		}
-		break;
-
-	case WM_DESTROY:
-		PostQuitMessage(0);
-		break;
-
-	case WM_SIZE:
-		{
-			RECT rect;
-
-			GetClientRect(hWnd,&rect);
-			MoveWindow(hListView,0,0,rect.right,rect.bottom,TRUE);
-		}
-		break;
-
-	case WM_NOTIFY:
-		{
-			NMHDR *phdr;
-			phdr = (NMHDR*)lParam;
-			switch(phdr->code)
-			{
-			case NM_RETURN:
-			case NM_DBLCLK:
-				{
-					int nSelect;
-					LV_ITEM lvi;
-					PCPLLISTENTRY pEntry;
-
-					nSelect=SendMessage(hListView,LVM_GETNEXTITEM,(WPARAM)-1,LVNI_FOCUSED);
-
-					if (nSelect==-1)
-					{
-						/* no items */
-						LoadString(hInst, IDS_NO_ITEMS, szBuf, sizeof(szBuf) / sizeof(TCHAR));
-						MessageBox(hWnd,(LPCTSTR)szBuf,NULL,MB_OK|MB_ICONINFORMATION);
-						break;
-					}
-
-					CTL_DEBUG((_T("Select %d\r\n"),nSelect));
-					memset(&lvi,0x00,sizeof(lvi));
-					lvi.iItem = nSelect;
-					lvi.mask = LVIF_PARAM;
-					(void)ListView_GetItem(hListView,&lvi);
-					pEntry = (PCPLLISTENTRY)lvi.lParam;
-					CTL_DEBUG((_T("Listview DblClk Entry %08X\r\n"),pEntry));
-					if (pEntry)
-					{
-						CTL_DEBUG((_T("Listview DblClk Entry Func %08X\r\n"),pEntry->pFunc));
-					}
-
-					if (pEntry && pEntry->pFunc)
-						pEntry->pFunc(hListView,CPL_DBLCLK,pEntry->CplInfo.lData,0);
-				}
-			}
-		}
-		break;
-
-	case WM_COMMAND:
-		switch (LOWORD(wParam))
-		{
-		case IDM_LARGEICONS:
-			SetWindowLong(hListView,GWL_STYLE,LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP);
-			break;
-		case IDM_SMALLICONS:
-			SetWindowLong(hListView,GWL_STYLE,LVS_SMALLICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP);
-			break;
-		case IDM_LIST:
-			SetWindowLong(hListView,GWL_STYLE,LVS_LIST | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP);
-			break;
-		case IDM_DETAILS:
-			SetWindowLong(hListView,GWL_STYLE,LVS_REPORT | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL   | WS_VISIBLE | WS_CHILD|WS_BORDER|WS_TABSTOP);
-			break;
-		case IDM_CLOSE:
-			DestroyWindow(hWnd);
-			break;
-		case IDM_ABOUT:
-			{
-				TCHAR Title[256];
-				
-				LoadString(hInst, IDS_ABOUT, szBuf, sizeof(szBuf) / sizeof(TCHAR));
-				LoadString(hInst, IDS_ABOUT_TITLE, Title, sizeof(Title) / sizeof(TCHAR));
-				
-				MessageBox(hWnd,(LPCTSTR)szBuf,(LPCTSTR)Title,MB_OK | MB_ICONINFORMATION);
-			}
-			break;
-		}
-		break;
-
-	default:
-		return DefWindowProc(hWnd,uMsg,wParam,lParam);
-	}
-
-	return 0;
-}
-
 
 static INT
-RunControlPanelWindow(int nCmdShow)
+OpenShellFolder(LPTSTR lpFolderCLSID)
 {
-  MSG msg;
-  WNDCLASS wc;
-  TCHAR szBuf[256];
+    TCHAR szParameters[MAX_PATH];
 
-  memset(&wc,0x00,sizeof(wc));
-  wc.hIcon = LoadIcon(hInst,MAKEINTRESOURCE(IDI_MAINICON));
-  wc.lpszClassName = MYWNDCLASS;
-  wc.lpszMenuName = _T("MAINMENU");
-  wc.lpfnWndProc = MyWindowProc;
-  RegisterClass(&wc);
+    /* Open a shell folder using "explorer.exe".
+       The passed CLSID's are all subfolders of the "Control Panel" shell folder. */
+    _tcscpy(szParameters, _T("/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"));
+    _tcscat(szParameters, lpFolderCLSID);
 
-  InitCommonControls();
-  
-  LoadString(hInst, IDS_WINDOW_TITLE, szBuf, sizeof(szBuf) / sizeof(TCHAR));
-  hMainWnd = CreateWindowEx(WS_EX_CLIENTEDGE,
-			    MYWNDCLASS,
-			    (LPCTSTR)szBuf,
-			    WS_OVERLAPPEDWINDOW,
-			    CW_USEDEFAULT,
-			    CW_USEDEFAULT,
-			    CW_USEDEFAULT,
-			    CW_USEDEFAULT,
-			    NULL,
-			    LoadMenu(hInst, MAKEINTRESOURCE(IDM_MAINMENU)),
-			    hInst,
-			    0);
-  if (!hMainWnd)
-    {
-      CTL_DEBUG((_T("Unable to create window\r\n")));
-      return -1;
-    }
-
-  ShowWindow(hMainWnd, nCmdShow);
-  while (GetMessage(&msg, 0, 0, 0))
-    {
-      TranslateMessage(&msg);
-      DispatchMessage(&msg);
-    }
-
-  return 0;
+    return (int)ShellExecute(NULL, _T("open"), _T("explorer.exe"), szParameters, NULL, SW_SHOWDEFAULT) > 32;
 }
 
-
 static INT
-RunControlPanel(LPCTSTR lpName, UINT uIndex)
+RunControlPanel(LPTSTR lpCmd)
 {
-  CPLINFO CplInfo;
-  HMODULE hDll;
-  CPLAPPLETFUNC pFunc;
-  UINT uPanelCount;
+    TCHAR szParameters[MAX_PATH];
 
-  hDll = LoadLibrary(lpName);
-  if (hDll == 0)
-    {
-      return -1;
-    }
-  CTL_DEBUG((_T("Handle %08X\r\n"), hDll));
+    _tcscpy(szParameters, _T("shell32.dll,Control_RunDLL "));
+    _tcscat(szParameters, lpCmd);
 
-  pFunc = (CPLAPPLETFUNC)GetProcAddress(hDll, "CPlApplet");
-  if (pFunc == NULL)
-    {
-      FreeLibrary(hDll);
-      return -1;
-    }
-  CTL_DEBUG((_T("CPLFunc %08X\r\n"), pFunc));
-
-  if (!pFunc(NULL, CPL_INIT, 0, 0))
-    {
-      FreeLibrary(hDll);
-      return -1;
-    }
-
-  uPanelCount = (UINT)pFunc(NULL, CPL_GETCOUNT, 0, 0);
-  if (uIndex >= uPanelCount)
-    {
-      FreeLibrary(hDll);
-      return -1;
-    }
-
-  pFunc(NULL, CPL_INQUIRE, (LPARAM)uIndex, (LPARAM)&CplInfo);
-
-  pFunc(NULL, CPL_DBLCLK, CplInfo.lData, 0);
-
-  FreeLibrary(hDll);
-
-  return 0;
+    return RUNDLL(szParameters);
 }
 
-int
-_tmain(int argc, const TCHAR *argv[])
+int WINAPI
+_tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow)
 {
-  STARTUPINFO si;
-  TCHAR * szExt;
+    HKEY hKey;
 
-  si.cb = sizeof(si);
-  GetStartupInfo(&si);
+    hInst = hInstance;
+    hProcessHeap = GetProcessHeap();
 
-  hInst = GetModuleHandle(NULL);
+    /* Show the control panel window if no argument or "panel" was passed */
+    if(lpCmdLine[0] == 0 || !_tcsicmp(lpCmdLine, _T("panel")))
+        return OpenShellFolder(_T(""));
 
-  if (argc <= 1)
-    {
-      /* No argument on the command line */
-      return RunControlPanelWindow(si.wShowWindow);
-    }
+    /* Check one of the built-in control panel handlers */
+    if (!_tcsicmp(lpCmdLine, _T("admintools")))           return OpenShellFolder(_T("\\::{D20EA4E1-3957-11d2-A40B-0C5020524153}"));
+    else if (!_tcsicmp(lpCmdLine, _T("color")))           return RunControlPanel(_T("desk.cpl"));       /* TODO: Switch to the "Apperance" tab */
+    else if (!_tcsicmp(lpCmdLine, _T("date/time")))       return RunControlPanel(_T("timedate.cpl"));
+    else if (!_tcsicmp(lpCmdLine, _T("desktop")))         return RunControlPanel(_T("desk.cpl"));
+    else if (!_tcsicmp(lpCmdLine, _T("folders")))         return RUNDLL(_T("shell32.dll,Options_RunDLL"));
+    else if (!_tcsicmp(lpCmdLine, _T("fonts")))           return OpenShellFolder(_T("\\::{D20EA4E1-3957-11d2-A40B-0C5020524152}"));
+    else if (!_tcsicmp(lpCmdLine, _T("infrared")))        return RunControlPanel(_T("irprops.cpl"));
+    else if (!_tcsicmp(lpCmdLine, _T("international")))   return RunControlPanel(_T("intl.cpl"));
+    else if (!_tcsicmp(lpCmdLine, _T("keyboard")))        return RunControlPanel(_T("main.cpl @1"));
+    else if (!_tcsicmp(lpCmdLine, _T("mouse")))           return RunControlPanel(_T("main.cpl @0"));
+    else if (!_tcsicmp(lpCmdLine, _T("netconnections")))  return OpenShellFolder(_T("\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}"));
+    else if (!_tcsicmp(lpCmdLine, _T("netware")))         return RunControlPanel(_T("nwc.cpl"));
+    else if (!_tcsicmp(lpCmdLine, _T("ports")))           return RunControlPanel(_T("sysdm.cpl"));      /* TODO: Switch to the "Computer Name" tab */
+    else if (!_tcsicmp(lpCmdLine, _T("printers")))        return OpenShellFolder(_T("\\::{2227A280-3AEA-1069-A2DE-08002B30309D}"));
+    else if (!_tcsicmp(lpCmdLine, _T("scannercamera")))   return OpenShellFolder(_T("\\::{E211B736-43FD-11D1-9EFB-0000F8757FCD}"));
+    else if (!_tcsicmp(lpCmdLine, _T("schedtasks")))      return OpenShellFolder(_T("\\::{D6277990-4C6A-11CF-8D87-00AA0060F5BF}"));
+    else if (!_tcsicmp(lpCmdLine, _T("telephony")))       return RunControlPanel(_T("telephon.cpl"));
+    else if (!_tcsicmp(lpCmdLine, _T("userpasswords")))   return RunControlPanel(_T("nusrmgr.cpl"));       /* Graphical User Account Manager */
+    else if (!_tcsicmp(lpCmdLine, _T("userpasswords2")))  return RUNDLL(_T("netplwiz.dll,UsersRunDll"));   /* Dialog based advanced User Account Manager */
 
-  if (_tcsicmp(argv[1], _T("desktop")) == 0)
+    /* It is none of them, so look for a handler in the registry */
+    if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cpls"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
     {
-      return RunControlPanel(_T("desk.cpl"), 0);
-    }
-  else if (_tcsicmp(argv[1], _T("date/time")) == 0)
-    {
-      return RunControlPanel(_T("timedate.cpl"), 0);
-    }
-  else if (_tcsicmp(argv[1], _T("international")) == 0)
-    {
-      return RunControlPanel(_T("intl.cpl"), 0);
-    }
-  else if (_tcsicmp(argv[1], _T("mouse")) == 0)
-    {
-      return RunControlPanel(_T("main.cpl"), 0);
-    }
-  else if (_tcsicmp(argv[1], _T("keyboard")) == 0)
-    {
-      return RunControlPanel(_T("main.cpl"), 1);
-    }
-  else if ((szExt = _tcsstr(argv[1], _T(".cpl"))))
-    {
-      TCHAR * szSep;
-      TCHAR szCPL[MAX_PATH];
-      UINT selPage = 0;    
+        DWORD dwIndex;
 
-      _tcscpy(szCPL, argv[1]);
-      szSep = _tcsstr(szCPL, _T(".cpl,"));
-
-      if (szSep)
+        for(dwIndex = 0; ; ++dwIndex)
         {
-          /* FIXME for now ignore page index */
-          szSep[4] = _T('\0');
+            DWORD dwDataSize;
+            DWORD dwValueSize = MAX_VALUE_NAME;
+            TCHAR szValueName[MAX_VALUE_NAME];
+
+            /* Get the value name and data size */
+            if(RegEnumValue(hKey, dwIndex, szValueName, &dwValueSize, 0, NULL, NULL, &dwDataSize) != ERROR_SUCCESS)
+                break;
+
+            /* Check if the parameter is the value name */
+            if(!_tcsicmp(lpCmdLine, szValueName))
+            {
+                LPTSTR pszData;
+
+                /* Allocate memory for the data plus two more characters, so we can quote the file name if required */
+                pszData = (LPTSTR) HeapAlloc(hProcessHeap, 0, dwDataSize + 2 * sizeof(TCHAR));
+                ++pszData;
+
+                /* This value is the one we are looking for, so get the data. It is the path to a .cpl file */
+                if(RegQueryValueEx(hKey, szValueName, 0, NULL, (LPBYTE)pszData, &dwDataSize) == ERROR_SUCCESS)
+                {
+                    INT nReturnValue;
+
+                    /* Quote the file name if required */
+                    if(*pszData != '\"')
+                    {
+                        *(--pszData) = '\"';
+                        pszData[dwDataSize / sizeof(TCHAR)] = '\"';
+                        pszData[(dwDataSize / sizeof(TCHAR)) + 1] = 0;
+                    }
+
+                    nReturnValue = RunControlPanel(pszData);
+                    HeapFree(hProcessHeap, 0, pszData);
+                    RegCloseKey(hKey);
+
+                    return nReturnValue;
+                }
+
+                HeapFree(hProcessHeap, 0, pszData);
+            }
         }
-      return RunControlPanel(szCPL, selPage);
+
+        RegCloseKey(hKey);
     }
 
-  return 0;
+    /* It's none of the known parameters, so interpret the parameter as the file name of a control panel applet */
+    return RunControlPanel(lpCmdLine);
 }

reactos/base/applications/control/control.h

@@ -0,0 +1,18 @@
+/*
+ * PROJECT:         ReactOS System Control Panel
+ * FILE:            base/applications/control/control.h
+ * PURPOSE:         ReactOS System Control Panel
+ * PROGRAMMERS:     Gero Kuehn (reactos.filter@gkware.com)
+ *                  Colin Finck (mail@colinfinck.de)
+ */
+
+#include <windows.h>
+#include <tchar.h>
+#include "resource.h"
+
+#define CCH_UINT_MAX   11
+#define MAX_VALUE_NAME 16383
+
+/* Macro for calling "rundll32.exe"
+   According to MSDN, ShellExecute returns a value greater than 32 if the operation was successful. */
+#define RUNDLL(param)   ((int)ShellExecute(NULL, _T("open"), _T("rundll32.exe"), (param), NULL, SW_SHOWDEFAULT) > 32)

reactos/base/applications/control/control.rbuild

@@ -2,11 +2,9 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe" unicode="yes">
 	<include base="control">.</include>
-	<define name="_WIN32_IE">0x600</define>
-	<define name="_WIN32_WINNT">0x501</define>
+	<library>advapi32</library>
 	<library>kernel32</library>
-	<library>user32</library>
-	<library>comctl32</library>
+	<library>shell32</library>
 	<file>control.c</file>
 	<file>control.rc</file>
 </module>

reactos/base/applications/control/control.rc

@@ -1,23 +1,8 @@
-//Microsoft Developer Studio generated resource script.
-//
 #include "resource.h"
-#include <windows.h>
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS System Control Panel\0"
 #define REACTOS_STR_INTERNAL_NAME	"control\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"control.exe\0"
 #include <reactos/version.rc>
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
 IDI_MAINICON            ICON    DISCARDABLE     "resources/config.ico"
-/////////////////////////////////////////////////////////////////////////////
-
-
-#include "rsrc.rc"

reactos/base/applications/control/lang/bg-BG.rc

@@ -1,37 +0,0 @@
-// Bulgarian language resource file
-
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                      IDM_CLOSE
-    END
-    POPUP "<22><>&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_LARGEICONS
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_SMALLICONS
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                        IDM_LIST
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                     IDM_DETAILS
-    END
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><>",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "<22><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_ABOUT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\r<><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> GPL"
-	IDS_ABOUT_TITLE "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_NO_ITEMS "<22> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_NAME "<22><><EFBFBD>"
-	IDS_COMMENT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END

reactos/base/applications/control/lang/ca-ES.rc

@@ -1,37 +0,0 @@
-// Catalan language resource file (Hiper, equip Capdellu<6C>)
-
-LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Fitxer"
-    BEGIN
-        MENUITEM "&Tancar",                     IDM_CLOSE
-    END
-    POPUP "&Veure"
-    BEGIN
-        MENUITEM "Icones grans",                IDM_LARGEICONS
-        MENUITEM "Icones petites",              IDM_SMALLICONS
-        MENUITEM "Llista",                      IDM_LIST
-        MENUITEM "Detalls",                     IDM_DETAILS
-    END
-    POPUP "Ajuda"
-    BEGIN
-        MENUITEM "En quant a",                  IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/cs-CZ.rc

@@ -1,37 +0,0 @@
-// Czech language resource file (potapnik, 2005-04-30)
-
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Soubor"
-    BEGIN
-        MENUITEM "&Zav<61><76>t",                      IDM_CLOSE
-    END
-    POPUP "&Zobrazen<65>"
-    BEGIN
-        MENUITEM "&Velk<6C> ikony",                 IDM_LARGEICONS
-        MENUITEM "&Mal<61> ikony",                 IDM_SMALLICONS
-        MENUITEM "&Seznam",                        IDM_LIST
-        MENUITEM "&Detaily",                     IDM_DETAILS
-    END
-    POPUP "&N<>pov<6F>da"
-    BEGIN
-        MENUITEM "&O aplikaci...",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/da-DK.rc

@@ -1,36 +0,0 @@
-// Danish language resource file (Thomas Larsen, 2005-03-11)
-
-LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Fil"
-    BEGIN
-        MENUITEM "&Luk",                        IDM_CLOSE
-    END
-    POPUP "&Vis"
-    BEGIN
-        MENUITEM "Store Ikoner",                IDM_LARGEICONS
-        MENUITEM "Sm<53> Ikoner",                  IDM_SMALLICONS
-        MENUITEM "Liste",                       IDM_LIST
-        MENUITEM "Detaljer",                    IDM_DETAILS
-    END
-    POPUP "Hj<48>lp"
-    BEGIN
-        MENUITEM "Om",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/de-DE.rc

@@ -1,37 +0,0 @@
-// German language resource file (frik85, 2005-03-08)
-
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Datei"
-    BEGIN
-        MENUITEM "&Beenden",                     IDM_CLOSE
-    END
-    POPUP "&Ansicht"
-    BEGIN
-        MENUITEM "Gro<72>e Symbole",                IDM_LARGEICONS
-        MENUITEM "Kleine Symbole",               IDM_SMALLICONS
-        MENUITEM "Liste",                        IDM_LIST
-        MENUITEM "Details",                      IDM_DETAILS
-    END
-    POPUP "&?"
-    BEGIN
-        MENUITEM "Inf&o",                        IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Systemsteuerung"
-	IDS_ABOUT "Einfache Systemsteuerung (nicht Shell-namespace basiert)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rVer<65>ffentlicht unter der GPL"
-	IDS_ABOUT_TITLE "<22>ber Systemsteuerung"
-	IDS_NO_ITEMS "Keine Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Kommentar"
-END

reactos/base/applications/control/lang/el-GR.rc

@@ -1,37 +0,0 @@
-// Greek language resource file (Dj_Apal<61>, 2005-11-14)
-
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                      IDM_CLOSE
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",               IDM_LARGEICONS
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                IDM_SMALLICONS
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                          IDM_LIST
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                   IDM_DETAILS
-    END
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/en-US.rc

@@ -1,37 +0,0 @@
-// English language resource file (frik85, 2005-03-08)
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&Close",                      IDM_CLOSE
-    END
-    POPUP "&View"
-    BEGIN
-        MENUITEM "Large Icons",                 IDM_LARGEICONS
-        MENUITEM "Small Icons",                 IDM_SMALLICONS
-        MENUITEM "List",                        IDM_LIST
-        MENUITEM "Details",                     IDM_DETAILS
-    END
-    POPUP "Help"
-    BEGIN
-        MENUITEM "About",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/es-ES.rc

@@ -1,41 +0,0 @@
-/*
- *Spanish Language resource file
- *ReactOs (c) 2005 Samuel Serapi<70>n Vega
- */
-
-
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Archivo"
-    BEGIN
-        MENUITEM "&Cerrar",                      IDM_CLOSE
-    END
-    POPUP "&Ver"
-    BEGIN
-        MENUITEM "Iconos Grandes",               IDM_LARGEICONS
-        MENUITEM "Iconos Peque<75>os",              IDM_SMALLICONS
-        MENUITEM "Lista",                        IDM_LIST
-        MENUITEM "Detalles",                     IDM_DETAILS
-    END
-    POPUP "Ayuda"
-    BEGIN
-        MENUITEM "Acerca de",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Panel de Control"
-	IDS_ABOUT "Panel de Control Simple (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "Acerca del Panel de Control"
-	IDS_NO_ITEMS "Sin elementos en la lista"
-	IDS_NAME "Nombre"
-	IDS_COMMENT "Comentario"
-END

reactos/base/applications/control/lang/fi-FI.rc

@@ -1,37 +0,0 @@
-// English language resource file (frik85, 2005-03-08)
-
-LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Tiedosto"
-    BEGIN
-        MENUITEM "&Sulje",                      IDM_CLOSE
-    END
-    POPUP "&N<>yt<79>"
-    BEGIN
-        MENUITEM "Suuret kuvakkeet",                 IDM_LARGEICONS
-        MENUITEM "Pienet kuvakkeet",                 IDM_SMALLICONS
-        MENUITEM "Luettelo",                        IDM_LIST
-        MENUITEM "Tiedot",                     IDM_DETAILS
-    END
-    POPUP "Ohje"
-    BEGIN
-        MENUITEM "Tietoja",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/fr-FR.rc

@@ -1,37 +0,0 @@
-// French language resource file (Heis Spiter, 2006-11-28)
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Fichier"
-    BEGIN
-        MENUITEM "&Fermer",                      IDM_CLOSE
-    END
-    POPUP "&Affichage"
-    BEGIN
-        MENUITEM "Grandes Ic<49>nes",                 IDM_LARGEICONS
-        MENUITEM "Petites Ic<49>nes",                 IDM_SMALLICONS
-        MENUITEM "Liste",                        IDM_LIST
-        MENUITEM "D<>tails",                     IDM_DETAILS
-    END
-    POPUP "Aide"
-    BEGIN
-        MENUITEM "<22> propos",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-	IDS_WINDOW_TITLE "Panneau de configuration"
-	IDS_ABOUT "Panneau de configuration simple (non bas<61> sur Shell-namespace)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rSous licence GPL"
-	IDS_ABOUT_TITLE "<22> propos du panneau de configuration"
-	IDS_NO_ITEMS "Aucun <20>l<EFBFBD>ment dans la ListView"
-	IDS_NAME "Nom"
-	IDS_COMMENT "Commentaire"
-END

reactos/base/applications/control/lang/hu-HU.rc

@@ -1,37 +0,0 @@
-// Hungarian language resource file (talley, 2005-10-12)
-
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&F<>jl"
-    BEGIN
-        MENUITEM "&Bez<65>r<EFBFBD>s",                      IDM_CLOSE
-    END
-    POPUP "&N<>zet"
-    BEGIN
-        MENUITEM "Nagy ikonok",                 IDM_LARGEICONS
-        MENUITEM "Kis ikonok",                 IDM_SMALLICONS
-        MENUITEM "Lista",                        IDM_LIST
-        MENUITEM "R<>szletek",                     IDM_DETAILS
-    END
-    POPUP "S<>g<EFBFBD>"
-    BEGIN
-        MENUITEM "N<>vjegy",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/id-ID.rc

@@ -1,37 +0,0 @@
-// Indonesian language resource file (adezm, 2007-02-15)
-
-LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&Tutup",                    IDM_CLOSE
-    END
-    POPUP "&Lihat"
-    BEGIN
-        MENUITEM "Ikon Besar",                IDM_LARGEICONS
-        MENUITEM "Ikon Kecil",                IDM_SMALLICONS
-        MENUITEM "Daftar",                    IDM_LIST
-        MENUITEM "Detil",                     IDM_DETAILS
-    END
-    POPUP "Bantuan"
-    BEGIN
-        MENUITEM "Tentang",                   IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/it-IT.rc

@@ -1,37 +0,0 @@
-// Italian language resource file Gabriel ilardi, september 4th 2006
-
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "C&hiudi",                      IDM_CLOSE
-    END
-    POPUP "&Visualizza"
-    BEGIN
-        MENUITEM "Titoli",                 	 IDM_LARGEICONS
-        MENUITEM "Icone",                 	 IDM_SMALLICONS
-        MENUITEM "Elenco",                       IDM_LIST
-        MENUITEM "Dettagli",                     IDM_DETAILS
-    END
-    POPUP "?"
-    BEGIN
-        MENUITEM "Informazioni",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/ja-JP.rc

@@ -1,37 +0,0 @@
-// Japanese language resource file
-
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "<22>t<EFBFBD>@<40>C<EFBFBD><43>(&F)"
-    BEGIN
-        MENUITEM "<22>‚<EFBFBD><C282><EFBFBD>(&C)",                  IDM_CLOSE
-    END
-    POPUP "<22>\\<5C><>(&V)"
-    BEGIN
-        MENUITEM "<22>傫<EFBFBD><E582AB><EFBFBD>A<EFBFBD>C<EFBFBD>R<EFBFBD><52>",              IDM_LARGEICONS
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>C<EFBFBD>R<EFBFBD><52>",              IDM_SMALLICONS
-        MENUITEM "<22>ꗗ",                        IDM_LIST
-        MENUITEM "<22>ڍ<EFBFBD>",                        IDM_DETAILS
-    END
-    POPUP "<22>w<EFBFBD><77><EFBFBD>v"
-    BEGIN
-        MENUITEM "About",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/ko-KO.rc

@@ -1,39 +0,0 @@
-/*
- *Korean translation by manatails007(www.manatails007.org)
- */
-
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "<22><><EFBFBD><EFBFBD>(&F)"
-    BEGIN
-        MENUITEM "<22>ݱ<EFBFBD>(&C)",                      IDM_CLOSE
-    END
-    POPUP "<22><><EFBFBD><EFBFBD>(&V)"
-    BEGIN
-        MENUITEM "ū <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_LARGEICONS
-        MENUITEM "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_SMALLICONS
-        MENUITEM "<22><><EFBFBD><EFBFBD>Ʈ",                        IDM_LIST
-        MENUITEM "<22>ڼ<EFBFBD><DABC><EFBFBD>",                     IDM_DETAILS
-    END
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD>",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "<22><><EFBFBD><EFBFBD><EFBFBD>ǿ<EFBFBD> <20><><EFBFBD>Ͽ<EFBFBD>"
-	IDS_NO_ITEMS "<22><><EFBFBD><EFBFBD>Ʈ <20>信 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-	IDS_NAME "<22≯<EFBFBD>"
-	IDS_COMMENT "<22>ڸ<EFBFBD>Ʈ"
-END

reactos/base/applications/control/lang/lt-LT.rc

@@ -1,39 +0,0 @@
-/*
- * PROJECT:     ReactOS System Control Panel
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/control/lang/lt-LT.rc
- * PURPOSE:     Lithuanian Language File
- * TRANSLATOR:  Vytis "CMan" Gird<72>ijauskas (cman@cman.us)
- * DATE:        2008-01-21
- */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Byla"
-    BEGIN
-        MENUITEM "&Baigti",                     IDM_CLOSE
-    END
-    POPUP "&Rodymas"
-    BEGIN
-        MENUITEM "Didel<65>s piktogramos",         IDM_LARGEICONS
-        MENUITEM "Ma<4D>os piktogramos",           IDM_SMALLICONS
-        MENUITEM "S<>ra<72>as",                     IDM_LIST
-        MENUITEM "Detalus s<>ra<72>as",             IDM_DETAILS
-    END
-    POPUP "&Pagalba"
-    BEGIN
-        MENUITEM "&Apie",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-  IDS_WINDOW_TITLE "Valdymo skydelis"
-	IDS_ABOUT "Paprastas valdymo skydelis (nepagr<67>stas 'Shell-namespace')\rAutoriaus teis<69>s 2004 GkWare e.K.\rhttp://www.gkware.com\rI<72>leista su GPL"
-	IDS_ABOUT_TITLE "Apie valdymo skydel<65>"
-	IDS_NO_ITEMS "S<>ra<72>e n<>ra element<6E>"
-	IDS_NAME "Pavadinimas"
-	IDS_COMMENT "Komentaras"
-END

reactos/base/applications/control/lang/nb-NO.rc

@@ -1,43 +0,0 @@
-/*
- * PROJECT:     ReactOS Control Application
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/control/No.rc
- * PURPOSE:     Norwegian translation
- * TRANSLATOR:  LMH1
- *               
- */
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE 
-BEGIN
-    POPUP "&Fil"
-    BEGIN
-        MENUITEM "&Avslutt",                      IDM_CLOSE
-    END
-    POPUP "&Vis"
-    BEGIN
-        MENUITEM "St<53>rre Ikoner",                 IDM_LARGEICONS
-        MENUITEM "Mindre Ikoner",                 IDM_SMALLICONS
-        MENUITEM "Liste",                        IDM_LIST
-        MENUITEM "Detaljer",                     IDM_DETAILS
-    END
-    POPUP "Hjelp"
-    BEGIN
-        MENUITEM "Om",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/nl-NL.rc

@@ -1,38 +0,0 @@
-// Dutch language resource file (frik85, 2005-03-08)
-
-LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL  //vertaald door Lionel Lowie
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Bestand"
-    BEGIN
-        MENUITEM "&Sluiten",                    IDM_CLOSE
-    END
-    POPUP "Beel&d"
-    BEGIN
-        MENUITEM "&Grote pictogrammen",         IDM_LARGEICONS
-        MENUITEM "&Kleine pictogrammen",        IDM_SMALLICONS
-        MENUITEM "&Lijstweergave",              IDM_LIST
-        MENUITEM "&Details",                    IDM_DETAILS
-    END
-    POPUP "Help"
-    BEGIN
-        MENUITEM "&Info",                       IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/pl-PL.rc

@@ -1,44 +0,0 @@
-/*
- *	Polish language resource file (Sebastian Gasiorek, 2005-07-06)
- *      translation update by Caemyr - Olaf Siejka (Dec,2007)
- *      Use ReactOS forum PM or IRC to contact me
- *      http://www.reactos.org
- *      IRC: irc.freenode.net #reactos-pl
- */
-
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Plik"
-    BEGIN
-        MENUITEM "&Zamknij",                    IDM_CLOSE
-    END
-    POPUP "&Widok"
-    BEGIN
-        MENUITEM "Du<44>e ikony",                  IDM_LARGEICONS
-        MENUITEM "Ma<4D>e ikony",                  IDM_SMALLICONS
-        MENUITEM "Lista",                       IDM_LIST
-        MENUITEM "Szczeg<65><67>y",                   IDM_DETAILS
-    END
-    POPUP "Pomoc"
-    BEGIN
-        MENUITEM "O programie",                 IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Panel Sterowania"
-	IDS_ABOUT "Podstawowy Panel Sterowania (nie oparty o Shell-namespace)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rPodlega licencji GPL"
-	IDS_ABOUT_TITLE "O Panelu Sterowania"
-	IDS_NO_ITEMS "Brak sk<73>adnik<69>w"
-	IDS_NAME "Nazwa"
-	IDS_COMMENT "Komentarz"
-END

reactos/base/applications/control/lang/pt-BR.rc

@@ -1,37 +0,0 @@
-// Brazilian language resource file (Wagner Leandro Bueno Angelo, 2007-07-09)
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Arquivo"
-    BEGIN
-        MENUITEM "&Fechar",                      IDM_CLOSE
-    END
-    POPUP "&Visualizar"
-    BEGIN
-        MENUITEM "<22>cones grandes",               IDM_LARGEICONS
-        MENUITEM "<22>cones pequenos",              IDM_SMALLICONS
-        MENUITEM "Lista",                        IDM_LIST
-        MENUITEM "Detalhes",                     IDM_DETAILS
-    END
-    POPUP "Aj&uda"
-    BEGIN
-        MENUITEM "Sobre...",                     IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Control Panel"
-	IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL"
-	IDS_ABOUT_TITLE "About the Control Panel"
-	IDS_NO_ITEMS "No Items in ListView"
-	IDS_NAME "Name"
-	IDS_COMMENT "Comment"
-END

reactos/base/applications/control/lang/ru-RU.rc

@@ -1,37 +0,0 @@
-// Russian language resource file (unC0Rr, 2005-03-11)
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>",                       IDM_CLOSE
-    END
-    POPUP "&<26><><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><>&<26><><EFBFBD><EFBFBD>",                      IDM_LARGEICONS
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                      IDM_SMALLICONS
-        MENUITEM "<22><><EFBFBD><EFBFBD>&<26><>",                      IDM_LIST
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                     IDM_DETAILS
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_ABOUT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)\r<><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> 2004 GkWare e.K.\rhttp://www.gkware.com\r<><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> GPL"
-	IDS_ABOUT_TITLE "<22> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_NO_ITEMS "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_NAME "<22><><EFBFBD>"
-	IDS_COMMENT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END

reactos/base/applications/control/lang/sk-SK.rc

@@ -1,37 +0,0 @@
-// Slovak language resource file (Kario, 2007-02-25) <kario@szm.sk>
-
-LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&S<>bor"
-    BEGIN
-        MENUITEM "&Zavrie<69>",                    IDM_CLOSE
-    END
-    POPUP "&Zobrazenia"
-    BEGIN
-        MENUITEM "&Ve<56>k<EFBFBD> ikony",                IDM_LARGEICONS
-        MENUITEM "&Mal<61> ikony",                 IDM_SMALLICONS
-        MENUITEM "&Zoznam",                     IDM_LIST
-        MENUITEM "&Podrobnosti",                IDM_DETAILS
-    END
-    POPUP "&Pomocn<63>k"
-    BEGIN
-        MENUITEM "<22>&o je...",                   IDM_ABOUT
-    END
-END
-
-STRINGTABLE
-BEGIN
-    IDS_WINDOW_TITLE "Ovl<76>dac<61> panel"
-	IDS_ABOUT "Jednoduch<63> ovl<76>dac<61> panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rVydan<61> pod GPL licenciou"
-	IDS_ABOUT_TITLE "<22>o je Ovl<76>dac<61> panel"
-	IDS_NO_ITEMS "<22>iadne polo<6C>ky v zozname"
-	IDS_NAME "N<>zov"
-	IDS_COMMENT "Koment<6E>r" //Comment
-END