- Set "lake.bmp" as the default wallpaper

- Add a shortcut to "Download !" to the Desktop
- Change the version number for the Explorer start menu bitmap

svn path=/branches/ros-branch-0_3_4/; revision=31933

irc/TechBot/CHMLibrary/CHMLibrary.csproj

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>{72E5CCA1-6318-4D62-964D-CB23A5C743B5}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CHMLibrary</RootNamespace>
+    <AssemblyName>CHMLibrary</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+  </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>
+  <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>
+  -->
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Category.cs" />
+    <Compile Include="CHMDecoding\BinaryReaderHelp.cs" />
+    <Compile Include="CHMDecoding\CHMBtree.cs" />
+    <Compile Include="CHMDecoding\CHMFile.cs" />
+    <Compile Include="CHMDecoding\CHMIdxhdr.cs" />
+    <Compile Include="CHMDecoding\CHMStrings.cs" />
+    <Compile Include="CHMDecoding\CHMSystem.cs" />
+    <Compile Include="CHMDecoding\CHMTocidx.cs" />
+    <Compile Include="CHMDecoding\CHMTopics.cs" />
+    <Compile Include="CHMDecoding\CHMUrlstr.cs" />
+    <Compile Include="CHMDecoding\CHMUrltable.cs" />
+    <Compile Include="CHMDecoding\DumpingInfo.cs" />
+    <Compile Include="CHMDecoding\enumerations.cs" />
+    <Compile Include="CHMDecoding\FullTextEngine.cs" />
+    <Compile Include="CHMDecoding\HHCParser.cs" />
+    <Compile Include="CHMDecoding\HHCParser2.cs" />
+    <Compile Include="CHMDecoding\HHKParser.cs" />
+    <Compile Include="CHMDecoding\TopicEntry.cs" />
+    <Compile Include="CHMDecoding\UrlTableEntry.cs" />
+    <Compile Include="ChmFileInfo.cs" />
+    <Compile Include="HtmlHelpSystem.cs" />
+    <Compile Include="HttpUtility.cs" />
+    <Compile Include="Index.cs" />
+    <Compile Include="IndexItem.cs" />
+    <Compile Include="IndexTopic.cs" />
+    <Compile Include="InformationType.cs" />
+    <Compile Include="Storage\CHMStream.cs" />
+    <Compile Include="TableOfContents.cs" />
+    <Compile Include="TOCItem.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Compression\Compression.csproj">
+      <Project>{E32307F1-623A-4E62-826F-56CDD4B23A54}</Project>
+      <Name>Compression</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>

irc/TechBot/Compression/Compression.csproj

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>{E32307F1-623A-4E62-826F-56CDD4B23A54}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Compression</RootNamespace>
+    <AssemblyName>Compression</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+  </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>
+  <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>
+  -->
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Checksums\Adler32.cs" />
+    <Compile Include="Checksums\CRC32.cs" />
+    <Compile Include="Checksums\IChecksum.cs" />
+    <Compile Include="Checksums\StrangeCRC.cs" />
+    <Compile Include="Deflater.cs" />
+    <Compile Include="DeflaterConstants.cs" />
+    <Compile Include="DeflaterEngine.cs" />
+    <Compile Include="DeflaterHuffman.cs" />
+    <Compile Include="DeflaterPending.cs" />
+    <Compile Include="Inflater.cs" />
+    <Compile Include="InflaterDynHeader.cs" />
+    <Compile Include="InflaterHuffmanTree.cs" />
+    <Compile Include="PendingBuffer.cs" />
+    <Compile Include="Streams\DeflaterOutputStream.cs" />
+    <Compile Include="Streams\InflaterInputStream.cs" />
+    <Compile Include="Streams\OutputWindow.cs" />
+    <Compile Include="Streams\StreamManipulator.cs" />
+    <Compile Include="ZipException.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+</Project>

irc/TechBot/TechBot.Console/App.config

@@ -8,11 +8,6 @@
 		<add key="IRCBotPassword" value="MyPassword" />
 		<add key="ChmPath" value="C:\IRC\TechBot\CHM" />
 		<add key="MainChm" value="kmarch.chm" />
-		<add key="NtstatusXml" value="ntstatus.xml" />
-		<add key="WinerrorXml" value="winerror.xml" />
-		<add key="HresultXml" value="hresult.xml" />
-		<add key="WmXml" value="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}" />

irc/TechBot/TechBot.Console/Main.cs

@@ -217,11 +217,11 @@ namespace TechBot.Console
 			                                       IRCBotPassword,
 			                                       ChmPath,
 			                                       MainChm,
-			                                       NtstatusXml,
-			                                       WinerrorXml,
-			                                       HresultXml,
-			                                       WmXml,
-			                                       SvnCommand,
+                                                   //NtstatusXml,
+                                                   //WinerrorXml,
+                                                   //HresultXml,
+                                                   //WmXml,
+			                                       //SvnCommand,
 			                                       BugUrl,
 			                                       WineBugUrl,
 			                                       SambaBugUrl);
@@ -239,15 +239,15 @@ namespace TechBot.Console
 			System.Console.WriteLine("TechBot running console service...");
 			TechBotService service = new TechBotService(new ConsoleServiceOutput(),
 			                                            ChmPath,
-			                                            MainChm,
-			                                            NtstatusXml,
-			                                            WinerrorXml,
-			                                            HresultXml,
-			                                            WmXml,
-			                                            SvnCommand,
-			                                            BugUrl,
-			                                            WineBugUrl,
-			                                            SambaBugUrl);
+			                                            MainChm);
+                                                        //NtstatusXml,
+                                                        //WinerrorXml,
+                                                        //HresultXml,
+                                                        //WmXml,
+			                                            //SvnCommand,
+                                                        //BugUrl,
+                                                        //WineBugUrl,
+                                                        //SambaBugUrl);
 			service.Run();
 			while (true)
 			{

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

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>{44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TechBot.Console</RootNamespace>
+    <AssemblyName>TechBot.Console</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>
+  <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>
+  -->
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="Main.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\TechBot.IRCLibrary\TechBot.IRCLibrary.csproj">
+      <Project>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</Project>
+      <Name>TechBot.IRCLibrary</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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TechBot.IRCLibrary</RootNamespace>
+    <AssemblyName>TechBot.IRCLibrary</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+  </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>
+  <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>
+  -->
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="IRC.cs" />
+    <Compile Include="IrcChannel.cs" />
+    <Compile Include="IrcClient.cs" />
+    <Compile Include="IrcException.cs" />
+    <Compile Include="IrcMessage.cs" />
+    <Compile Include="IrcUser.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>

irc/TechBot/TechBot.Library/ApiCommand.cs

@@ -7,22 +7,17 @@ using HtmlHelp.ChmDecoding;
 
 namespace TechBot.Library
 {
-	public class ApiCommand : BaseCommand, ICommand
+	public class ApiCommand : Command
 	{
 		private const bool IsVerbose = false;
 
 		private HtmlHelpSystem chm;
-		private IServiceOutput serviceOutput;
 		private string chmPath;
 		private string mainChm;
-		
-		public ApiCommand(IServiceOutput serviceOutput,
-		                  string chmPath,
-		                  string mainChm)
+
+        public ApiCommand(TechBotService techBot)
+            : base(techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			this.chmPath = chmPath;
-			this.mainChm = mainChm;
 			Run();
 		}
 		
@@ -30,7 +25,7 @@ namespace TechBot.Library
 		                            string message)
 		{
 			if (IsVerbose)
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        message);
 		}
 
@@ -65,14 +60,21 @@ namespace TechBot.Library
 			Console.WriteLine(String.Format("Loaded {0} CHMs",
 			                                chm.FileList.Length));
 		}
-		
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "api" }; }
+        }
+
+        /*
 		public bool CanHandle(string commandName)
 		{
 			return CanHandle(commandName,
 			                 new string[] { "api" });
 		}
+*/
 		
-		public void Handle(MessageContext context,
+		public override void Handle(MessageContext context,
 		                   string commandName,
 		                   string parameters)
 		{
@@ -82,8 +84,8 @@ namespace TechBot.Library
 				Search(context,
 				       parameters);
 		}
-		
-		public string Help()
+
+        public override string Help()
 		{
 			return "!api <apiname>";
 		}
@@ -177,7 +179,7 @@ namespace TechBot.Library
 			if (prototype == null || prototype.Trim().Equals(String.Empty))
 				return false;
 			string formattedPrototype = FormatPrototype(prototype);
-			serviceOutput.WriteLine(context,
+            TechBot.ServiceOutput.WriteLine(context,
 			                        formattedPrototype);
 			return true;
 		}
@@ -203,7 +205,7 @@ namespace TechBot.Library
 					if (prototype == null || prototype.Trim().Equals(String.Empty))
 						continue;
 					string formattedPrototype = FormatPrototype(prototype);
-					serviceOutput.WriteLine(context,
+                    TechBot.ServiceOutput.WriteLine(context,
 					                        formattedPrototype);
 					return true;
 				}
@@ -214,14 +216,14 @@ namespace TechBot.Library
 		private void DisplayNoResult(MessageContext context,
 		                             string keyword)
 		{
-			serviceOutput.WriteLine(context,
+            TechBot.ServiceOutput.WriteLine(context,
 			                        String.Format("I don't know about keyword {0}",
 			                                      keyword));
 		}
 
 		private void DisplayNoKeyword(MessageContext context)
 		{
-			serviceOutput.WriteLine(context,
+            TechBot.ServiceOutput.WriteLine(context,
 			                        "Please give me a keyword.");
 		}
 

irc/TechBot/TechBot.Library/BugCommand.cs

@@ -2,70 +2,49 @@ using System;
 
 namespace TechBot.Library
 {
-	public class BugCommand : BaseCommand, ICommand
+	public abstract class BugCommand : Command//, ICommand
 	{
-		private IServiceOutput serviceOutput;
-		private string RosBugUrl;
-		private string WineBugUrl;
-		private string SambaBugUrl;
-
-		public BugCommand(IServiceOutput serviceOutput,
-		                  string RosBugUrl,
-		                  string WineBugUrl,
-		                  string SambaBugUrl)
+		public BugCommand(TechBotService techBot) : base (techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			this.RosBugUrl = RosBugUrl;
-			this.WineBugUrl = WineBugUrl;
-			this.SambaBugUrl = SambaBugUrl;
-		}
-		
-		public bool CanHandle(string commandName)
-		{
-			return CanHandle(commandName,
-			                 new string[] { "bug" });
 		}
 
-		public void Handle(MessageContext context,
-		                   string commandName,
-		                   string parameters)
-		{
-			string bugText = parameters;
-			if (bugText.Equals(String.Empty))
-			{
-				serviceOutput.WriteLine(context,
-				                        "Please provide a valid bug number.");
-				return;
-			}
+        public override void Handle(MessageContext context,
+                           string commandName,
+                           string parameters)
+        {
+            string bugText = parameters;
+            if (bugText.Equals(String.Empty))
+            {
+                TechBot.ServiceOutput.WriteLine(context,
+                                        "Please provide a valid bug number.");
+                return;
+            }
 
-			NumberParser np = new NumberParser();
-			long bug = np.Parse(bugText);
-			if (np.Error)
-			{
-				serviceOutput.WriteLine(context,
-				                        String.Format("{0} is not a valid bug number.",
-				                                      bugText));
-				return;
-			}
-			
-			string bugUrl = this.RosBugUrl;
+            NumberParser np = new NumberParser();
+            long bug = np.Parse(bugText);
+            if (np.Error)
+            {
+                TechBot.ServiceOutput.WriteLine(context,
+                                        String.Format("{0} is not a valid bug number.",
+                                                      bugText));
+                return;
+            }
 
-			if (context is ChannelMessageContext)
-			{
-				ChannelMessageContext channelContext = context as ChannelMessageContext;
-				if (channelContext.Channel.Name == "winehackers")
-					bugUrl = this.WineBugUrl;
-				else if (channelContext.Channel.Name == "samba-technical")
-					bugUrl = this.SambaBugUrl;
-			}
-			
-			serviceOutput.WriteLine(context,
-			                        String.Format(bugUrl, bug));
-		}
-		
-		public string Help()
-		{
-			return "!bug <number>";
-		}
+            /*
+            string bugUrl = this.RosBugUrl;
+
+            if (context is ChannelMessageContext)
+            {
+                ChannelMessageContext channelContext = context as ChannelMessageContext;
+                if (channelContext.Channel.Name == "winehackers")
+                    bugUrl = this.WineBugUrl;
+                else if (channelContext.Channel.Name == "samba-technical")
+                    bugUrl = this.SambaBugUrl;
+            }*/
+
+            TechBot.ServiceOutput.WriteLine(context, String.Format(BugUrl, bug));
+        }
+
+        protected abstract string BugUrl { get; }
 	}
 }

irc/TechBot/TechBot.Library/Command.cs

@@ -0,0 +1,53 @@
+using System;
+
+namespace TechBot.Library
+{
+    /*
+	public interface ICommand
+	{
+		bool CanHandle(string commandName);
+		void Handle(MessageContext context,
+		            string commandName,
+		            string parameters);
+		//string Help();
+	}*/
+
+    public abstract class Command
+    {
+        protected TechBotService m_TechBotService = null;
+
+        public Command(TechBotService techbot)
+        {
+            m_TechBotService = techbot;
+        }
+
+        public TechBotService TechBot
+        {
+            get { return m_TechBotService; }
+        }
+
+        public abstract string[] AvailableCommands { get; }
+
+        public abstract void Handle(MessageContext context,
+            string commandName,
+            string parameters);
+
+        /*
+        protected bool CanHandle(string commandName,
+                                 string[] availableCommands)
+        {
+            foreach (string availableCommand in availableCommands)
+            {
+                if (String.Compare(availableCommand, commandName, true) == 0)
+                    return true;
+            }
+            return false;
+        }
+        */
+
+        public virtual string Help()
+        {
+            return "No help is available for this command";
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+using System;
+using System.Xml;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TechBot.Library
+{
+    public abstract class XmlCommand : Command
+    {
+        protected XmlDocument m_XmlDocument;
+
+        public XmlCommand(TechBotService techBot)
+            : base(techBot)
+        {
+            m_XmlDocument = new XmlDocument();
+            m_XmlDocument.Load(XmlFile);
+        }
+
+        public abstract string XmlFile { get; }
+
+        public XmlDocument XmlDocument
+        {
+            get { return m_XmlDocument; }
+        }
+    }
+}

irc/TechBot/TechBot.Library/Default.build

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<project name="TechBot.Library" default="build">
-
-	<property name="output.dir" value="..\bin" />
-
-	<target name="build" description="Build component">
-		<mkdir dir="${output.dir}" />
-		<csc target="library"
-			output="${output.dir}\TechBot.Library.dll"
-			optimize="true"
-			debug="true"
-			doc="${output.dir}\TechBot.Library.xml"
-			warninglevel="0">
-			<sources>
-				<include name="*.cs" />
-			</sources>
-			<references>
-				<include name="${output.dir}\CHMLibrary.dll" />
-				<include name="${output.dir}\TechBot.IRCLibrary.dll" />
-			</references>
-		</csc>
-	</target>
-
-</project>

irc/TechBot/TechBot.Library/ErrorCommand.cs

@@ -4,30 +4,32 @@ using System.Collections;
 
 namespace TechBot.Library
 {
-	public class ErrorCommand : BaseCommand, ICommand
+	public class ErrorCommand : Command
 	{
-		private IServiceOutput serviceOutput;
 		private NtStatusCommand ntStatus;
 		private WinerrorCommand winerror;
-		private HresultCommand hresult;
+		private HResultCommand hresult;
 
-		public ErrorCommand(IServiceOutput serviceOutput, string ntstatusXml,
-									string winerrorXml, string hresultXml)
+        public ErrorCommand(TechBotService techBot)
+            : base(techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			this.ntStatus = new NtStatusCommand(serviceOutput,
-											 ntstatusXml);
-			this.winerror = new WinerrorCommand(serviceOutput,
-											winerrorXml);
-			this.hresult = new HresultCommand(serviceOutput,
-											hresultXml);
+			this.ntStatus = new NtStatusCommand(techBot);
+			this.winerror = new WinerrorCommand(techBot);
+			this.hresult = new HResultCommand(techBot);
 		}
 		
+        /*
 		public bool CanHandle(string commandName)
 		{
 			return CanHandle(commandName,
 			                 new string[] { "error" });
 		}
+        */
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "error" }; }
+        }
 
 		private static int GetSeverity(long error)
 		{
@@ -79,14 +81,14 @@ namespace TechBot.Library
 			return code.ToString();
 		}
 
-		public void Handle(MessageContext context,
+		public override  void Handle(MessageContext context,
 		                   string commandName,
 		                   string parameters)
 		{
 			string originalErrorText = parameters.Trim();
 			if (originalErrorText.Equals(String.Empty))
 			{
-				serviceOutput.WriteLine(context,
+				TechBot.ServiceOutput.WriteLine(context,
 				                        "Please provide an Error Code.");
 				return;
 			}
@@ -98,7 +100,7 @@ namespace TechBot.Library
 			long error = np.Parse(errorText);
 			if (np.Error)
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} is not a valid Error Code.",
 													  originalErrorText));
 				return;
@@ -173,30 +175,30 @@ namespace TechBot.Library
 					goto retry;
 				}
 
-				serviceOutput.WriteLine(context,
+                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];
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 										String.Format("{0} is {1}.",
 													  originalErrorText,
 													  description));
 			}
 			else
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} could be:",
 				                                      originalErrorText));
 				
 				foreach(string description in descriptions)
-					serviceOutput.WriteLine(context, String.Format("\t{0}", description));
+                    TechBot.ServiceOutput.WriteLine(context, String.Format("\t{0}", description));
 			}
 		}
-		
-		public string Help()
+
+        public override string Help()
 		{
 			return "!error <value>";
 		}

irc/TechBot/TechBot.Library/HelpCommand.cs

@@ -3,38 +3,33 @@ using System.Collections;
 
 namespace TechBot.Library
 {
-	public class HelpCommand : BaseCommand, ICommand
+	public class HelpCommand : Command
 	{
-		private IServiceOutput serviceOutput;
-		private ArrayList commands;
-		
-		public HelpCommand(IServiceOutput serviceOutput,
-		                   ArrayList commands)
+        public HelpCommand(TechBotService techBot)
+            : base(techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			this.commands = commands;
 		}
 
-		public bool CanHandle(string commandName)
-		{
-			return CanHandle(commandName,
-			                 new string[] { "help" });
-		}
-		
-		public void Handle(MessageContext context,
-		                   string commandName,
-		                   string parameters)
-		{
-			serviceOutput.WriteLine(context,
-			                        "I support the following commands:");
-			foreach (ICommand command in commands)
-			{
-				serviceOutput.WriteLine(context,
-				                        command.Help());
-			}
-		}
-		
-		public string Help()
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "help" }; }
+        }
+
+        public override void Handle(
+            MessageContext context,
+                           string commandName,
+                           string parameters)
+        {
+            TechBot.ServiceOutput.WriteLine(context, "I support the following commands:");
+
+            foreach (Command command in TechBot.Commands)
+            {
+                TechBot.ServiceOutput.WriteLine(context,
+                                        command.Help());
+            }
+        }
+
+        public override string Help()
 		{
 			return "!help";
 		}

irc/TechBot/TechBot.Library/HresultCommand.cs

@@ -3,33 +3,39 @@ using System.Xml;
 
 namespace TechBot.Library
 {
-	public class HresultCommand : BaseCommand, ICommand
+	public class HResultCommand : XmlCommand
 	{
-		private IServiceOutput serviceOutput;
-		private XmlDocument hresultXmlDocument;
-
-		public HresultCommand(IServiceOutput serviceOutput,
-		                      string hresultXml)
+        public HResultCommand(TechBotService techBot)
+            : base(techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			hresultXmlDocument = new XmlDocument();
-			hresultXmlDocument.Load(hresultXml);
 		}
-		
+
+        public override string XmlFile
+        {
+            get { return Settings.Default.HResultXml; }
+        }
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "hresult" }; }
+        }
+
+        /*
 		public bool CanHandle(string commandName)
 		{
 			return CanHandle(commandName,
 			                 new string[] { "hresult" });
 		}
+        */
 
-		public void Handle(MessageContext context,
+		public override void Handle(MessageContext context,
 		                   string commandName,
 		                   string parameters)
 		{
 			string hresultText = parameters;
 			if (hresultText.Equals(String.Empty))
 			{
-				serviceOutput.WriteLine(context,
+				TechBot.ServiceOutput.WriteLine(context,
 				                        "Please provide a valid HRESULT value.");
 				return;
 			}
@@ -38,7 +44,7 @@ namespace TechBot.Library
 			long hresult = np.Parse(hresultText);
 			if (np.Error)
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} is not a valid HRESULT value.",
 				                                      hresultText));
 				return;
@@ -47,27 +53,27 @@ namespace TechBot.Library
 			string description = GetHresultDescription(hresult);
 			if (description != null)
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} is {1}.",
 				                                      hresultText,
 				                                      description));
 			}
 			else
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("I don't know about HRESULT {0}.",
 				                                      hresultText));
 			}
 		}
 		
-		public string Help()
+		public override string Help()
 		{
 			return "!hresult <value>";
 		}
 		
 		public string GetHresultDescription(long hresult)
 		{
-			XmlElement root = hresultXmlDocument.DocumentElement;
+			XmlElement root = base.m_XmlDocument.DocumentElement;
 			XmlNode node = root.SelectSingleNode(String.Format("Hresult[@value='{0}']",
 			                                                   hresult.ToString("X8")));
 			if (node != null)

irc/TechBot/TechBot.Library/ICommand.cs

@@ -1,29 +0,0 @@
-using System;
-
-namespace TechBot.Library
-{
-	public interface ICommand
-	{
-		bool CanHandle(string commandName);
-		void Handle(MessageContext context,
-		            string commandName,
-		            string parameters);
-		string Help();
-	}
-
-	
-	
-	public class BaseCommand
-	{
-		protected bool CanHandle(string commandName,
-		                         string[] availableCommands)
-		{
-			foreach (string availableCommand in availableCommands)
-			{
-				if (String.Compare(availableCommand, commandName, true) == 0)
-					return true;
-			}
-			return false;
-		}
-	}
-}

irc/TechBot/TechBot.Library/IrcService.cs

@@ -1,6 +1,8 @@
 using System;
+using System.Text;
 using System.Collections;
 using System.Threading;
+
 using TechBot.IRCLibrary;
 
 namespace TechBot.Library
@@ -20,7 +22,7 @@ namespace TechBot.Library
 		private string wmXml;
 		private string svnCommand;
 		private string bugUrl, WineBugUrl, SambaBugUrl;
-		private IrcClient client;
+		private IrcClient m_IrcClient;
 		private ArrayList channels = new ArrayList(); /* IrcChannel */
 		private TechBotService service;
 		private bool isStopped = false;
@@ -32,11 +34,11 @@ namespace TechBot.Library
 		                  string password,
 		                  string chmPath,
 		                  string mainChm,
-		                  string ntstatusXml,
-		                  string winerrorXml,
-		                  string hresultXml,
-		                  string wmXml,
-		                  string svnCommand,
+                          //string ntstatusXml,
+                          //string winerrorXml,
+                          //string hresultXml,
+                          //string wmXml,
+		                  //string svnCommand,
 		                  string BugUrl,
 		                  string WineBugUrl,
 		                  string SambaBugUrl)
@@ -61,42 +63,43 @@ namespace TechBot.Library
 			this.SambaBugUrl = SambaBugUrl;
 		}
 
-		public void Run()
-		{
-			service = new TechBotService(this,
-			                             chmPath,
-			                             mainChm,
-			                             ntstatusXml,
-			                             winerrorXml,
-			                             hresultXml,
-			                             wmXml,
-			                             svnCommand,
-			                             bugUrl,
-			                             WineBugUrl,
-			                             SambaBugUrl);
-			service.Run();
+        public void Run()
+        {
+            service = new TechBotService(this,
+                                         chmPath,
+                                         mainChm);
+                                         //ntstatusXml,
+                                         //winerrorXml,
+                                         //hresultXml,
+                                         //wmXml,
+                                         //svnCommand,
+                                         //bugUrl,
+                                         //WineBugUrl,
+                                         //SambaBugUrl);
+            service.Run();
 
-			client = new IrcClient();
-			client.Encoding = System.Text.Encoding.GetEncoding("iso-8859-1");
-			client.MessageReceived += new MessageReceivedHandler(client_MessageReceived);
-			client.ChannelUserDatabaseChanged += new ChannelUserDatabaseChangedHandler(client_ChannelUserDatabaseChanged);
-			System.Console.WriteLine(String.Format("Connecting to {0} port {1}",
-			                                       hostname, port));
-			client.Connect(hostname, port);
-			System.Console.WriteLine("Connected...");
-			client.Register(botname, password, null);
-			System.Console.WriteLine(String.Format("Registered as {0}...", botname));
-			JoinChannels();
-			
-			while (!isStopped)
-			{
-				Thread.Sleep(1000);
-			}
+            m_IrcClient = new IrcClient();
+            m_IrcClient.Encoding = Encoding.GetEncoding("iso-8859-1");
+            m_IrcClient.MessageReceived += new MessageReceivedHandler(client_MessageReceived);
+            m_IrcClient.ChannelUserDatabaseChanged += new ChannelUserDatabaseChangedHandler(client_ChannelUserDatabaseChanged);
+            Console.WriteLine("Connecting to {0} port {1}",
+                                                   hostname,
+                                                   port);
+            m_IrcClient.Connect(hostname, port);
+            Console.WriteLine("Connected...");
+            m_IrcClient.Register(botname, password, null);
+            Console.WriteLine("Registered as {0}...", botname);
+            JoinChannels();
 
-			PartChannels();
-			client.Diconnect();
-			System.Console.WriteLine("Disconnected...");
-		}
+            while (!isStopped)
+            {
+                Thread.Sleep(1000);
+            }
+
+            PartChannels();
+            m_IrcClient.Diconnect();
+            Console.WriteLine("Disconnected...");
+        }
 
 		public void Stop()
 		{
@@ -107,7 +110,7 @@ namespace TechBot.Library
 		{
 			foreach (string channelname in channelnames.Split(new char[] { ';' }))
 			{
-				IrcChannel channel = client.JoinChannel(channelname);
+				IrcChannel channel = m_IrcClient.JoinChannel(channelname);
 				channels.Add(channel);
 				System.Console.WriteLine(String.Format("Joined channel #{0}...",
 				                                       channel.Name));
@@ -118,7 +121,7 @@ namespace TechBot.Library
 		{
 			foreach (IrcChannel channel in channels)
 			{
-				client.PartChannel(channel, "Caught in the bitstream...");
+				m_IrcClient.PartChannel(channel, "Caught in the bitstream...");
 				System.Console.WriteLine(String.Format("Parted channel #{0}...",
 				                                       channel.Name));
 			}
@@ -235,11 +238,11 @@ namespace TechBot.Library
 				else if (GetTargetNickname(message,
 				                           out nickname))
 				{
-					IrcUser targetUser = new IrcUser(client,
+					IrcUser targetUser = new IrcUser(m_IrcClient,
 					                                 nickname);
 					if (String.Compare(targetUser.Nickname, botname, true) == 0)
 					{
-						IrcUser sourceUser = new IrcUser(client,
+						IrcUser sourceUser = new IrcUser(m_IrcClient,
 						                                 message.PrefixNickname);
 						context = new UserMessageContext(sourceUser);
 						return true;

irc/TechBot/TechBot.Library/NtStatusCommand.cs

@@ -3,35 +3,37 @@ using System.Xml;
 
 namespace TechBot.Library
 {
-	public class NtStatusCommand : BaseCommand, ICommand
+	public class NtStatusCommand : XmlCommand
 	{
-		private IServiceOutput serviceOutput;
-		private string ntstatusXml;
-		private XmlDocument ntstatusXmlDocument;
-
-		public NtStatusCommand(IServiceOutput serviceOutput,
-		                       string ntstatusXml)
+        public NtStatusCommand(TechBotService techBot)
+            : base(techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			this.ntstatusXml = ntstatusXml;
-			ntstatusXmlDocument = new XmlDocument();
-			ntstatusXmlDocument.Load(ntstatusXml);
 		}
-		
+
+        public override string XmlFile
+        {
+            get { return Settings.Default.NtStatusXml; }
+        }
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "ntstatus" }; }
+        }
+/*		
 		public bool CanHandle(string commandName)
 		{
 			return CanHandle(commandName,
 			                 new string[] { "ntstatus" });
 		}
-
-		public void Handle(MessageContext context,
+*/
+		public override void Handle(MessageContext context,
 		                   string commandName,
 		                   string parameters)
 		{
 			string ntstatusText = parameters;
 			if (ntstatusText.Equals(String.Empty))
 			{
-				serviceOutput.WriteLine(context,
+				TechBot.ServiceOutput.WriteLine(context,
 				                        "Please provide a valid NTSTATUS value.");
 				return;
 			}
@@ -40,7 +42,7 @@ namespace TechBot.Library
 			long ntstatus = np.Parse(ntstatusText);
 			if (np.Error)
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} is not a valid NTSTATUS value.",
 				                                      ntstatusText));
 				return;
@@ -49,27 +51,27 @@ namespace TechBot.Library
 			string description = GetNtstatusDescription(ntstatus);
 			if (description != null)
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} is {1}.",
 				                                      ntstatusText,
 				                                      description));
 			}
 			else
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("I don't know about NTSTATUS {0}.",
 				                                      ntstatusText));
 			}
 		}
-		
-		public string Help()
+
+        public override string Help()
 		{
 			return "!ntstatus <value>";
 		}
 		
 		public string GetNtstatusDescription(long ntstatus)
 		{
-			XmlElement root = ntstatusXmlDocument.DocumentElement;
+			XmlElement root = base.m_XmlDocument.DocumentElement;
 			XmlNode node = root.SelectSingleNode(String.Format("Ntstatus[@value='{0}']",
 			                                                   ntstatus.ToString("X8")));
 			if (node != null)

irc/TechBot/TechBot.Library/Properties/AssemblyInfo.cs

@@ -1,32 +1,32 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following
-// attributes.
-//
-// change them to the information which is associated with the assembly
-// you compile.
-
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has following format :
-//
-// Major.Minor.Build.Revision
-//
-// You can specify all values by your own or you can build default build and revision
-// numbers with the '*' character (the default):
-
-[assembly: AssemblyVersion("1.0.*")]
-
-// The following attributes specify the key for the sign of your assembly. See the
-// .NET Framework documentation for more information about signing.
-// This is not required, if you don't want signing let these attributes like they're.
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// Information about this assembly is defined by the following
+// attributes.
+//
+// change them to the information which is associated with the assembly
+// you compile.
+
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// The assembly version has following format :
+//
+// Major.Minor.Build.Revision
+//
+// You can specify all values by your own or you can build default build and revision
+// numbers with the '*' character (the default):
+
+[assembly: AssemblyVersion("1.0.*")]
+
+// The following attributes specify the key for the sign of your assembly. See the
+// .NET Framework documentation for more information about signing.
+// This is not required, if you don't want signing let these attributes like they're.
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]

irc/TechBot/TechBot.Library/ReactOSBugUrl.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TechBot.Library
+{
+    class ReactOSBugUrl : BugCommand
+    {
+        public ReactOSBugUrl(TechBotService techBot)
+            : base(techBot)
+        {
+        }
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "rosbug" }; }
+        }
+
+        protected override string BugUrl
+        {
+            get { return "http://www.reactos.org/bugzilla/show_bug.cgi?id={0}"; }
+        }
+
+        public override string Help()
+        {
+            return "!rosbug <number>";
+        }
+    }
+}

irc/TechBot/TechBot.Library/SambaBugUrl.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TechBot.Library
+{
+    class SambaBugUrl : BugCommand
+    {
+        public SambaBugUrl(TechBotService techBot)
+            : base(techBot)
+        {
+        }
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "sambabug" }; }
+        }
+
+        protected override string BugUrl
+        {
+            get { return "https://bugzilla.samba.org/show_bug.cgi?id={0}"; }
+        }
+
+        public override string Help()
+        {
+            return "!sambabug <number>";
+        }
+    }
+}

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

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.832
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace TechBot.Library {
+    
+    
+    [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.Library/Settings.cs

@@ -0,0 +1,28 @@
+namespace TechBot.Library {
+    
+    
+    // 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.Library/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.Library" 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.Library/SvnCommand.cs

@@ -2,33 +2,29 @@ using System;
 
 namespace TechBot.Library
 {
-	public class SvnCommand : BaseCommand, ICommand
+	public class SvnCommand : Command
 	{
-		private IServiceOutput serviceOutput;
-		private string svnCommand;
+		private string m_SvnRoot;
 
-		public SvnCommand(IServiceOutput serviceOutput,
-		                       string svnCommand)
+        public SvnCommand(TechBotService techBot)
+            : base(techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			this.svnCommand = svnCommand;
+			m_SvnRoot = Settings.Default.SVNRoot;
 		}
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "svn" }; }
+        }
 		
-		public bool CanHandle(string commandName)
-		{
-			return CanHandle(commandName,
-			                 new string[] { "svn" });
-		}
-
-		public void Handle(MessageContext context,
+		public override void Handle(MessageContext context,
 		                   string commandName,
 		                   string parameters)
 		{
-			serviceOutput.WriteLine(context,
-			                        svnCommand);
+			TechBot.ServiceOutput.WriteLine(context, string.Format("svn co {0}" , m_SvnRoot));
 		}
-		
-		public string Help()
+
+        public override string Help()
 		{
 			return "!svn";
 		}

irc/TechBot/TechBot.Library/TechBot.Library.cmbx

@@ -1,16 +0,0 @@
-<Combine fileversion="1.0" name="TechBot.Library" description="">
-  <StartMode startupentry="TechBot.Library" single="True">
-    <Execute entry="TechBot.Library" type="None" />
-  </StartMode>
-  <Entries>
-    <Entry filename=".\.\TechBot.Library.prjx" />
-  </Entries>
-  <Configurations active="Debug">
-    <Configuration name="Release">
-      <Entry name="TechBot.Library" configurationname="Debug" build="False" />
-    </Configuration>
-    <Configuration name="Debug">
-      <Entry name="TechBot.Library" configurationname="Debug" build="False" />
-    </Configuration>
-  </Configurations>
-</Combine>

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

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>{1114F34D-F388-4F38-AE27-C0EE1B10B777}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TechBot.Library</RootNamespace>
+    <AssemblyName>TechBot.Library</AssemblyName>
+    <StartupObject>
+    </StartupObject>
+  </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>
+  <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>
+  -->
+  <ItemGroup>
+    <Compile Include="ApiCommand.cs" />
+    <Compile Include="BugCommand.cs" />
+    <Compile Include="Commands\Base\XmlCommand.cs" />
+    <Compile Include="SambaBugUrl.cs" />
+    <Compile Include="WineBugUrl.cs" />
+    <Compile Include="ErrorCommand.cs" />
+    <Compile Include="HelpCommand.cs" />
+    <Compile Include="HresultCommand.cs" />
+    <Compile Include="ICommand.cs" />
+    <Compile Include="IrcService.cs" />
+    <Compile Include="MessageContext.cs" />
+    <Compile Include="NtStatusCommand.cs" />
+    <Compile Include="NumberParser.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ReactOSBugUrl.cs" />
+    <Compile Include="ServiceOutput.cs" />
+    <Compile Include="Settings.cs" />
+    <Compile Include="Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
+    <Compile Include="SvnCommand.cs" />
+    <Compile Include="TechBotService.cs" />
+    <Compile Include="WinerrorCommand.cs" />
+    <Compile Include="WmCommand.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <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>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+</Project>

irc/TechBot/TechBot.Library/TechBot.Library.prjx

@@ -1,43 +0,0 @@
-<Project name="TechBot.Library" standardNamespace="TechBot.Library" description="" newfilesearch="None" enableviewstate="True" version="1.1" projecttype="C#">
-  <Contents>
-    <File name=".\AssemblyInfo.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\Default.build" subtype="Code" buildaction="Nothing" dependson="" data="" />
-    <File name=".\TechBotService.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\ServiceOutput.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\IrcService.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\ApiCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\ICommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\HelpCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\NtStatusCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\NumberParser.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\HresultCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\WinerrorCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\ErrorCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\SvnCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\BugCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\WmCommand.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-    <File name=".\MessageContext.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
-  </Contents>
-  <References>
-    <Reference type="Project" refto="CHMLibrary" localcopy="True" />
-    <Reference type="Project" refto="TechBot.IRCLibrary" localcopy="True" />
-  </References>
-  <DeploymentInformation target="" script="" strategy="File" />
-  <Configuration runwithwarnings="True" name="Debug">
-    <CodeGeneration runtime="MsNet" compiler="Csc" compilerversion="" warninglevel="4" nowarn="" includedebuginformation="True" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" target="Library" definesymbols="" generatexmldocumentation="False" win32Icon="" noconfig="False" nostdlib="False" />
-    <Execution commandlineparameters="" consolepause="False" />
-    <Output directory="..\bin\Debug" assembly="TechBot.Library" executeScript="" executeBeforeBuild="" executeAfterBuild="" executeBeforeBuildArguments="" executeAfterBuildArguments="" />
-  </Configuration>
-  <Configurations active="Debug">
-    <Configuration runwithwarnings="True" name="Debug">
-      <CodeGeneration runtime="MsNet" compiler="Csc" compilerversion="" warninglevel="4" nowarn="" includedebuginformation="True" optimize="False" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" target="Library" definesymbols="" generatexmldocumentation="False" win32Icon="" noconfig="False" nostdlib="False" />
-      <Execution commandlineparameters="" consolepause="False" />
-      <Output directory="..\bin\Debug" assembly="TechBot.Library" executeScript="" executeBeforeBuild="" executeAfterBuild="" executeBeforeBuildArguments="" executeAfterBuildArguments="" />
-    </Configuration>
-    <Configuration runwithwarnings="True" name="Release">
-      <CodeGeneration runtime="MsNet" compiler="Csc" compilerversion="" warninglevel="4" nowarn="" includedebuginformation="False" optimize="True" unsafecodeallowed="False" generateoverflowchecks="False" mainclass="" target="Library" definesymbols="" generatexmldocumentation="False" win32Icon="" noconfig="False" nostdlib="False" />
-      <Execution commandlineparameters="" consolepause="False" />
-      <Output directory="..\bin\Release" assembly="TechBot.Library" executeScript="" executeBeforeBuild="" executeAfterBuild="" executeBeforeBuildArguments="" executeAfterBuildArguments="" />
-    </Configuration>
-  </Configurations>
-</Project>

irc/TechBot/TechBot.Library/TechBotService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.IO;
 using System.Data;
 using System.Threading;
@@ -18,19 +19,19 @@ namespace TechBot.Library
 		private string wmXml;
 		private string svnCommand;
 		private string bugUrl, WineBugUrl, SambaBugUrl;
-		private ArrayList commands = new ArrayList();
+        private List<Command> commands = new List<Command>();
 		
 		public TechBotService(IServiceOutput serviceOutput,
 		                      string chmPath,
-		                      string mainChm,
-		                      string ntstatusXml,
-		                      string winerrorXml,
-		                      string hresultXml,
-		                      string wmXml,
-		                      string svnCommand,
-		                      string bugUrl,
-		                      string WineBugUrl,
-		                      string SambaBugUrl)
+		                      string mainChm)
+                              //string ntstatusXml,
+                              //string winerrorXml,
+                              //string hresultXml,
+                              //string wmXml,
+		                      //string svnCommand,
+                              //string bugUrl,
+                              //string WineBugUrl,
+                              //string SambaBugUrl)
 		{
 			this.serviceOutput = serviceOutput;
 			this.chmPath = chmPath;
@@ -44,33 +45,33 @@ namespace TechBot.Library
 			this.WineBugUrl = WineBugUrl;
 			this.SambaBugUrl = SambaBugUrl;
 		}
-		
-		public void Run()
-		{
-			commands.Add(new HelpCommand(serviceOutput,
-			                             commands));
-			/*commands.Add(new ApiCommand(serviceOutput,
-			                            chmPath,
-			                            mainChm));*/
-			commands.Add(new NtStatusCommand(serviceOutput,
-			                                 ntstatusXml));
-			commands.Add(new WinerrorCommand(serviceOutput,
-			                                 winerrorXml));
-			commands.Add(new HresultCommand(serviceOutput,
-			                                hresultXml));
-			commands.Add(new ErrorCommand(serviceOutput,
-											ntstatusXml,
-											winerrorXml,
-											hresultXml));
-			commands.Add(new WmCommand(serviceOutput,
-			                           wmXml));
-			commands.Add(new SvnCommand(serviceOutput,
-			                            svnCommand));
-			commands.Add(new BugCommand(serviceOutput,
-			                            bugUrl,
-			                            WineBugUrl,
-			                            SambaBugUrl));
-		}
+
+        public void Run()
+        {
+            commands.Add(new HelpCommand(this));
+            /*commands.Add(new ApiCommand(serviceOutput,
+                                        chmPath,
+                                        mainChm));*/
+            commands.Add(new NtStatusCommand(this));
+            commands.Add(new WinerrorCommand(this));
+            commands.Add(new HResultCommand(this));
+            commands.Add(new ErrorCommand(this));
+            commands.Add(new WMCommand(this));
+            commands.Add(new SvnCommand(this));
+            commands.Add(new ReactOSBugUrl(this));
+            commands.Add(new SambaBugUrl(this));
+            commands.Add(new WineBugUrl(this));
+        }
+
+        public IServiceOutput ServiceOutput
+        {
+            get { return serviceOutput; }
+        }
+
+        public IList<Command> Commands
+        {
+            get { return commands; }
+        }
 		
 		public void InjectMessage(MessageContext context,
 		                          string message)
@@ -94,23 +95,27 @@ namespace TechBot.Library
 			message = message.Substring(1).Trim();
 			int index = message.IndexOf(' ');
 			string commandName;
-			string parameters = "";
+			string commandParams = "";
 			if (index != -1)
 			{
 				commandName = message.Substring(0, index).Trim();
-				parameters = message.Substring(index).Trim();
+				commandParams = message.Substring(index).Trim();
 			}
 			else
 				commandName = message.Trim();
 
-			foreach (ICommand command in commands)
+			foreach (Command command in commands)
 			{
-				if (command.CanHandle(commandName))
-				{
-					command.Handle(context,
-					               commandName, parameters);
-					return;
-				}
+                foreach (string cmd in command.AvailableCommands)
+                {
+                    if (cmd == commandName)
+                    {
+                        command.Handle(context,
+                                       commandName, 
+                                       commandParams);
+                        return;
+                    }
+                }
 			}
 		}
 	}

irc/TechBot/TechBot.Library/WineBugUrl.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TechBot.Library
+{
+    class WineBugUrl : BugCommand
+    {
+        public WineBugUrl(TechBotService techBot)
+            : base(techBot)
+        {
+        }
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "winebug" }; }
+        }
+
+        protected override string BugUrl
+        {
+            get { return "http://bugs.winehq.org/show_bug.cgi?id={0}"; }
+        }
+
+        public override string Help()
+        {
+            return "!winebug <number>";
+        }
+    }
+}

irc/TechBot/TechBot.Library/WinerrorCommand.cs

@@ -3,35 +3,31 @@ using System.Xml;
 
 namespace TechBot.Library
 {
-	public class WinerrorCommand : BaseCommand, ICommand
+	public class WinerrorCommand : XmlCommand
 	{
-		private IServiceOutput serviceOutput;
-		private string winerrorXml;
-		private XmlDocument winerrorXmlDocument;
-
-		public WinerrorCommand(IServiceOutput serviceOutput,
-		                       string winerrorXml)
+        public WinerrorCommand(TechBotService techBot)
+            : base(techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			this.winerrorXml = winerrorXml;
-			winerrorXmlDocument = new XmlDocument();
-			winerrorXmlDocument.Load(winerrorXml);
-		}
-		
-		public bool CanHandle(string commandName)
-		{
-			return CanHandle(commandName,
-			                 new string[] { "winerror" });
 		}
 
-		public void Handle(MessageContext context,
+        public override string XmlFile
+        {
+            get { return Settings.Default.WinErrorXml; }
+        }
+
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "winerror" }; }
+        }
+
+		public override void Handle(MessageContext context,
 		                   string commandName,
 		                   string parameters)
 		{
 			string winerrorText = parameters;
 			if (winerrorText.Equals(String.Empty))
 			{
-				serviceOutput.WriteLine(context,
+				TechBot.ServiceOutput.WriteLine(context,
 				                        "Please provide a valid System Error Code value.");
 				return;
 			}
@@ -40,7 +36,7 @@ namespace TechBot.Library
 			long winerror = np.Parse(winerrorText);
 			if (np.Error)
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} is not a valid System Error Code value.",
 				                                      winerrorText));
 				return;
@@ -49,27 +45,27 @@ namespace TechBot.Library
 			string description = GetWinerrorDescription(winerror);
 			if (description != null)
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} is {1}.",
 				                                      winerrorText,
 				                                      description));
 			}
 			else
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("I don't know about System Error Code {0}.",
 				                                      winerrorText));
 			}
 		}
-		
-		public string Help()
+
+        public override string Help()
 		{
 			return "!winerror <value>";
 		}
 		
 		public string GetWinerrorDescription(long winerror)
 		{
-			XmlElement root = winerrorXmlDocument.DocumentElement;
+			XmlElement root = base.m_XmlDocument.DocumentElement;
 			XmlNode node = root.SelectSingleNode(String.Format("Winerror[@value='{0}']",
 			                                                   winerror));
 			if (node != null)

irc/TechBot/TechBot.Library/WmCommand.cs

@@ -3,35 +3,31 @@ using System.Xml;
 
 namespace TechBot.Library
 {
-	public class WmCommand : BaseCommand, ICommand
+	public class WMCommand : XmlCommand
 	{
-		private IServiceOutput serviceOutput;
-		private string wmXml;
-		private XmlDocument wmXmlDocument;
-
-		public WmCommand(IServiceOutput serviceOutput,
-		                 string wmXml)
+        public WMCommand(TechBotService techBot)
+            : base(techBot)
 		{
-			this.serviceOutput = serviceOutput;
-			this.wmXml = wmXml;
-			wmXmlDocument = new XmlDocument();
-			wmXmlDocument.Load(wmXml);
 		}
+
+        public override string XmlFile
+        {
+            get { return Settings.Default.WMXml; }
+        }
 		
-		public bool CanHandle(string commandName)
-		{
-			return CanHandle(commandName,
-			                 new string[] { "wm" });
-		}
+        public override string[] AvailableCommands
+        {
+            get { return new string[] { "wm" }; }
+        }
 
-		public void Handle(MessageContext context,
+		public override void Handle(MessageContext context,
 		                   string commandName,
 		                   string parameters)
 		{
 			string wmText = parameters;
 			if (wmText.Equals(String.Empty))
 			{
-				serviceOutput.WriteLine(context,
+				TechBot.ServiceOutput.WriteLine(context,
 				                        "Please provide a valid window message value or name.");
 				return;
 			}
@@ -51,27 +47,27 @@ namespace TechBot.Library
 
 			if (output != null)
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("{0} is {1}.",
 				                                      wmText,
 			        	                              output));
 			}
 			else
 			{
-				serviceOutput.WriteLine(context,
+                TechBot.ServiceOutput.WriteLine(context,
 				                        String.Format("I don't know about window message {0}.",
 			        	                              wmText));
 			}
 		}
-		
-		public string Help()
+
+        public override string Help()
 		{
 			return "!wm <value> or !wm <name>";
 		}
 		
 		private string GetWmDescription(long wm)
 		{
-			XmlElement root = wmXmlDocument.DocumentElement;
+			XmlElement root = base.m_XmlDocument.DocumentElement;
 			XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@value='{0}']",
 			                                                   wm));
 			if (node != null)
@@ -87,7 +83,7 @@ namespace TechBot.Library
 		
 		private string GetWmNumber(string wmName)
 		{
-			XmlElement root = wmXmlDocument.DocumentElement;
+			XmlElement root = base.m_XmlDocument.DocumentElement;
 			XmlNode node = root.SelectSingleNode(String.Format("WindowMessage[@text='{0}']",
 			                                                   wmName));
 			if (node != null)

irc/TechBot/TechBot.Library/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.Library.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <applicationSettings>
+        <TechBot.Library.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.Library.Settings>
+    </applicationSettings>
+</configuration>

irc/TechBot/TechBot.sln

@@ -0,0 +1,50 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot", "TechBot\TechBot.csproj", "{106F437D-424B-4758-A69C-862D08D26F3D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compression", "Compression\Compression.csproj", "{E32307F1-623A-4E62-826F-56CDD4B23A54}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CHMLibrary", "CHMLibrary\CHMLibrary.csproj", "{72E5CCA1-6318-4D62-964D-CB23A5C743B5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Console", "TechBot.Console\TechBot.Console.csproj", "{44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.IRCLibrary", "TechBot.IRCLibrary\TechBot.IRCLibrary.csproj", "{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TechBot.Library", "TechBot.Library\TechBot.Library.csproj", "{1114F34D-F388-4F38-AE27-C0EE1B10B777}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{106F437D-424B-4758-A69C-862D08D26F3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{106F437D-424B-4758-A69C-862D08D26F3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{106F437D-424B-4758-A69C-862D08D26F3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{106F437D-424B-4758-A69C-862D08D26F3D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E32307F1-623A-4E62-826F-56CDD4B23A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E32307F1-623A-4E62-826F-56CDD4B23A54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E32307F1-623A-4E62-826F-56CDD4B23A54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E32307F1-623A-4E62-826F-56CDD4B23A54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72E5CCA1-6318-4D62-964D-CB23A5C743B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72E5CCA1-6318-4D62-964D-CB23A5C743B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72E5CCA1-6318-4D62-964D-CB23A5C743B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72E5CCA1-6318-4D62-964D-CB23A5C743B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44258BA2-FFCB-4463-9CED-6DE5CC5CEBD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1114F34D-F388-4F38-AE27-C0EE1B10B777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

irc/TechBot/TechBot/ServiceThread.cs

@@ -58,11 +58,11 @@ namespace TechBot
 			                                       IRCBotPassword,
 			                                       ChmPath,
 			                                       MainChm,
-			                                       NtstatusXml,
-			                                       WinerrorXml,
-			                                       HresultXml,
-			                                       WmXml,
-			                                       SvnCommand,
+                                                   //NtstatusXml,
+                                                   //WinerrorXml,
+                                                   //HresultXml,
+                                                   //WmXml,
+			                                       //SvnCommand,
 			                                       BugUrl,
 			                                       WineBugUrl,
 			                                       SambaBugUrl);

irc/TechBot/TechBot/TechBot.csproj

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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>{106F437D-424B-4758-A69C-862D08D26F3D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TechBot</RootNamespace>
+    <AssemblyName>TechBot</AssemblyName>
+    <StartupObject>TechBot.TechBotService</StartupObject>
+  </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>
+  <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>
+  -->
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.cs" />
+    <Compile Include="ServiceThread.cs" />
+    <Compile Include="TechBotService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration.Install" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.ServiceProcess" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\TechBot.IRCLibrary\TechBot.IRCLibrary.csproj">
+      <Project>{D2A57931-DF04-4BC3-BD11-75DF4F3B0A88}</Project>
+      <Name>TechBot.IRCLibrary</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TechBot.Library\TechBot.Library.csproj">
+      <Project>{1114F34D-F388-4F38-AE27-C0EE1B10B777}</Project>
+      <Name>TechBot.Library</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+</Project>

reactos/CREDITS

@@ -7,11 +7,13 @@ Andrew Munger <waxdragon@gmail.com>
 Arindam Das
 Art Yerkes <ayerkes@speakeasy.net>
 Ariadne
-Brandon Turner (turnerb7@msu.edu)
+Brandon Turner <turnerb7@msu.edu>
 Brian Palmer <brianp@sginet.com>
 Casper S. Hornstrup <chorns@users.sourceforge.net>
-Christoph von Wittich (christoph_vw@reactos.org)
+Christoph von Wittich <christoph_vw@reactos.org>
+Daniel Reimer <reimer.daniel@freenet.de>
 David Welch <welch@cwcom.net>
+Dmitry Chapyshev <dmitry@reactos.org>
 Emanuele Aliberti <ea@iol.it>
 Eric Kohl <ekohl@rz-online.de>
 Eugene Ingerman <geneing@myrealbox.com>
@@ -19,6 +21,7 @@ Filip Navara <xnavara@volny.cz>
 Frederik Leemans
 Ge van Geldorp <ge@gse.nl>
 Ged Murphy <gedmurphy@reactos.org>
+Gregor Brunmar <gregor brunmar at home se>
 Guido de Jong
 Gunnar Andre' Dalsnes <hardon@online.no>
 Hans Kremer
@@ -38,16 +41,17 @@ Jurgen van Gael <jurgen.vangael@student.kuleuven.ac.be>
 KJK::Hyperion <noog@libero.it>
 Klemens R. Friedl <klemens_friedl@gmx.net>
 Maarten Bosma <maarten.paul@bosma.de>
-Magnus Olsen (magnus@greatlord.com)
+Magnus Olsen <magnus@greatlord.com>
 Mark Tempel <mtempel@visi.com>
 Mark Weaver <mark@npsl.co.uk>
 Martin Fuchs <martin-fuchs@gmx.net>
 Marty Dill <mdill@uvic.ca>
 Matt Pyne
-Mike Nordell ("tamlin")
+Mike Nordell <"tamlin">
 Nathan Woods <npwoods@mess.org>
 Pablo Borobia <pborobia@gmail.com>
 Paolo Pantaleo <paolopan@freemail.it>
+Peter Ward <dralnix@gmail.com>
 Phillip Susi <phreak@iag.net>
 Rex Jolliff <rex@lvcablemodem.com>
 Richard Campbell <betam4x@gmail.com>
@@ -65,5 +69,5 @@ Vizzini <vizzini@plasmic.com>
 Graphic Design from
 
 Mindflyer <mf@mufunyo.net> 
-Tango Desktop Project (http://tango-project.org)
-Everaldo (http://everaldo.com)
+Tango Desktop Project <http://tango-project.org>
+Everaldo <http://everaldo.com>

reactos/Doxyfile

@@ -85,7 +85,17 @@ REPEAT_BRIEF           = YES
 # "The $name file" "is" "provides" "specifies" "contains" 
 # "represents" "a" "an" "the"
 
-ABBREVIATE_BRIEF       = 
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
 # Doxygen will generate a detailed section even if there is only a brief 
@@ -477,9 +487,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = hal \
-                         subsystems \
-                         base
+INPUT                  =
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
@@ -495,8 +503,11 @@ INPUT_ENCODING         = UTF-8
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
 
-#FILE_PATTERNS          = *.c \
-                         *.h
+FILE_PATTERNS          = *.c \
+                         *.h \
+                         *.cpp \
+                         *.cc \
+                         *.cx
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 
@@ -638,7 +649,7 @@ USE_HTAGS              = NO
 # will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
 
-VERBATIM_HEADERS       = NO
+VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
@@ -775,7 +786,7 @@ ENUM_VALUES_PER_LINE   = 4
 # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
 # probably better off using the HTML help feature.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
 # used to set the initial width (in pixels) of the frame in which the tree 
@@ -937,7 +948,7 @@ MAN_LINKS              = NO
 # generate an XML file that captures the structure of 
 # the code including all documentation.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put. 
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
@@ -1129,7 +1140,7 @@ PERL_PATH              = /usr/bin/perl
 # fallback. It is recommended to install and use dot, since it yields more 
 # powerful graphs.
 
-CLASS_DIAGRAMS         = YES
+CLASS_DIAGRAMS         = NO
 
 # You can define message sequence charts within doxygen comments using the \msc 
 # command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to 
@@ -1150,7 +1161,7 @@ HIDE_UNDOC_RELATIONS   = NO
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default)
 
-HAVE_DOT               = YES
+HAVE_DOT               = NO
 
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
@@ -1295,4 +1306,4 @@ DOT_CLEANUP            = YES
 # The SEARCHENGINE tag specifies whether or not a search engine should be 
 # used. If set to NO the values of all tags below this one will be ignored.
 
-SEARCHENGINE           = YES
+SEARCHENGINE           = NO

reactos/Makefile

@@ -229,6 +229,7 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_TEST    =@echo $(QUOTE)[TEST]     $@$(QUOTE)
   ECHO_GENDIB  =@echo $(QUOTE)[GENDIB]   $@$(QUOTE)
   ECHO_STRIP   =@echo $(QUOTE)[STRIP]    $@$(QUOTE)
+  ECHO_RGENSTAT=@echo $(QUOTE)[RGENSTAT] $@$(QUOTE)
 else
   ECHO_CP      =
   ECHO_MKDIR   =
@@ -258,6 +259,7 @@ else
   ECHO_TEST    =
   ECHO_GENDIB  =
   ECHO_STRIP   =
+  ECHO_RGENSTAT=
 endif
 
 # Set host compiler/linker
@@ -305,7 +307,6 @@ ifeq ($(OSTYPE),msys)
   HOST=mingw32-linux
 endif
 ifeq ($(HOST),mingw32-linux)
-	export EXEPREFIX = ./
 	ifeq ($(OSTYPE),msys)
 		export EXEPOSTFIX = .exe
 	else
@@ -317,7 +318,6 @@ ifeq ($(HOST),mingw32-linux)
 	cp = $(Q)cp
 	NUL = /dev/null
 else # mingw32-windows
-	export EXEPREFIX =
 	export EXEPOSTFIX = .exe
 	ROS_EMPTY =
 	export SEP = \$(ROS_EMPTY)
@@ -372,15 +372,10 @@ $(OUTPUT):
 	${mkdir} $@
 endif
 
+$(TEMPORARY):
+	${mkdir} $@
 
-NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc
-KERNEL32_MC = dll$(SEP)win32$(SEP)kernel32$(SEP)kernel32.mc
 BUILDNO_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)buildno.h
-BUGCODES_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)bugcodes.h
-BUGCODES_RC = $(INTERMEDIATE_)ntoskrnl$(SEP)bugcodes.rc
-ERRCODES_H = $(INTERMEDIATE_)include$(SEP)reactos$(SEP)errcodes.h
-ERRCODES_RC = $(INTERMEDIATE_)dll$(SEP)win32$(SEP)kernel32$(SEP)errcodes.rc
-
 
 include lib/lib.mak
 include tools/tools.mak
@@ -391,10 +386,6 @@ PREAUTO := \
 	$(BIN2C_TARGET) \
 	$(BIN2RES_TARGET) \
 	$(BUILDNO_H) \
-	$(BUGCODES_H) \
-	$(BUGCODES_RC) \
-	$(ERRCODES_H) \
-	$(ERRCODES_RC) \
 	$(GENDIB_DIB_FILES) \
 	$(NCI_SERVICE_FILES)
 ifeq ($(ARCH),powerpc)
@@ -431,6 +422,10 @@ universe:
 sysregtest:
 	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg
 
+.PHONY: rgenstat
+rgenstat: $(RGENSTAT_TARGET)
+	$(ECHO_RGENSTAT)
+	$(Q)$(RGENSTAT_TARGET) apistatus.lst apistatus.xml
 
 .PHONY: cb
 cb: $(RBUILD_TARGET)
@@ -462,18 +457,6 @@ msvc: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) msvc
 
-$(BUGCODES_H) $(BUGCODES_RC): $(WMC_TARGET) $(NTOSKRNL_MC)
-	${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL)
-	${mkdir} $(INTERMEDIATE_)ntoskrnl 2>$(NUL)
-	$(ECHO_WMC)
-	$(Q)$(WMC_TARGET) -i -H $(BUGCODES_H) -o $(BUGCODES_RC) $(NTOSKRNL_MC)
-
-$(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC)
-	${mkdir} $(INTERMEDIATE_)include$(SEP)reactos 2>$(NUL)
-	${mkdir} $(INTERMEDIATE_)dll$(SEP)win32$(SEP)kernel32 2>$(NUL)
-	$(ECHO_WMC)
-	$(Q)$(WMC_TARGET) -i -U -H $(ERRCODES_H) -o $(ERRCODES_RC) $(KERNEL32_MC)
-
 .PHONY: msvc6
 msvc6: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)

reactos/ReactOS-generic.rbuild

@@ -3,17 +3,14 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="baseaddress.rbuild" />
 
-	<define name="__REACTOS__" />
-	<if property="MP" value="1">
-		<define name="CONFIG_SMP" value="1" />
-	</if>
+	<define name="__REACTOS__" overridable="true" />
 	<if property="DBG" value="1">
-		<define name="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" value="1" />
+		<define name="KDBG">1</define>
 		<property name="DBG_OR_KDBG" value="true" />
 	</if>
 

reactos/ReactOS-i386.rbuild

@@ -15,31 +15,25 @@
 
 	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
 
-	<if property="GDB" value="0">
-		<if property="OPTIMIZE" value="1">
-				<compilerflag>-Os</compilerflag>
-				<compilerflag>-ftracer</compilerflag>
-				<compilerflag>-momit-leaf-frame-pointer</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="2">
-				<compilerflag>-Os</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="3">
-				<compilerflag>-O1</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="4">
-				<compilerflag>-O2</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="5">
-				<compilerflag>-O3</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
+	<if property="OPTIMIZE" value="1">
+		<compilerflag>-Os</compilerflag>
+		<compilerflag>-ftracer</compilerflag>
+		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="2">
+		<compilerflag>-Os</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="3">
+		<compilerflag>-O1</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="4">
+		<compilerflag>-O2</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="5">
+		<compilerflag>-O3</compilerflag>
 	</if>
 
+	<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
 	<compilerflag>-Wpointer-arith</compilerflag>
 	<linkerflag>-enable-stdcall-fixup</linkerflag>

reactos/ReactOS-ppc.rbuild

@@ -9,30 +9,15 @@
 
 	<xi:include href="ReactOS-generic.rbuild" />
 
+	<property name="MKHIVE_OPTIONS" value="-be" />
 	<property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/>
-	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/>
+	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
 
-	<define name="_M_PPC" />
-	<define name="_PPC_" />
-	<define name="__PowerPC__" />
-	<define name="stdcall" empty="true" />
-	<define name="__stdcall__" empty="true" />
-	<define name="fastcall" empty="true" />
-	<define name="cdecl" empty="true" />
-	<define name="__cdecl__" empty="true" />
-	<define name="dllimport" empty="true" />
-	<define name="WORDS_BIGENDIAN" empty="true" />
-	<define name="__MSVCRT__" empty="true" />
-	<define name="__NO_CTYPE_INLINES" />
-	<define name="__DECLSPEC_SUPPORTED" />
-	<define name="__MINGW_IMPORT">extern</define>
-	<define name="_CRTIMP" empty="true" />
-	<define name="'__declspec(x)'" empty="true" />
+	<define name="__MSVCRT__"/>
 	<compilerflag>-fshort-wchar</compilerflag>
 	<compilerflag>-fsigned-char</compilerflag>
 	<compilerflag>-mfull-toc</compilerflag>
 	<compilerflag>-meabi</compilerflag>
 	<compilerflag>-O2</compilerflag>
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
-
 </project>

reactos/apistatus.lst

@@ -1,29 +1,30 @@
 ; Format:
 ;   COMPONENT_NAME PATH_TO_COMPONENT_SOURCES
-; COMPONENT_NAME            - Name of the component. Eg. kernel32.dll.
-; PATH_TO_COMPONENT_SOURCES - Relative path to sources (relative to
-;                             where rgenstat is run from).
-advapi32.dll reactos/dll/win32/advapi32
-crtdll.dll reactos/dll/win32/crtdll
-gdi32.dll reactos/dll/win32/gdi32
-gdiplus.dll reactos/dll/win32/gdiplus
-iphlpapi.dll reactos/dll/win32/iphlpapi
-kernel32.dll reactos/dll/win32/kernel32
-lz32.dll reactos/dll/win32/lzexpand
-msvcrt.dll reactos/dll/win32/msvcrt
-rpcrt4.dll reactos/dll/win32/rpcrt4
-secur32.dll reactos/dll/win32/secur32
-snmpapi.dll reactos/dll/win32/snmpapi
-user32.dll reactos/dll/win32/user32
-version.dll reactos/dll/win32/version
-winspool.dll reactos/dll/win32/winspool
-ws2_32.dll reactos/dll/win32/ws2_32
-wsock32.dll reactos/dll/win32/wsock32
-videoprt.dll reactos/drivers/video/videoprt
-ndis.sys reactos/drivers/network/ndis
-tdi.sys reactos/drivers/network/tdi
-class2.sys reactos/drivers/storage/class2
-scsiport.sys reactos/drivers/storage/scsiport
-ntoskrnl.exe reactos/ntoskrnl
-ntoskrnl.exe reactos/lib/rtl
-win32k.sys reactos/subsystems/win32/win32k
+; COMPONENT_NAME            - Name of the module. Eg. kernel32.
+; PATH_TO_COMPONENT_SOURCES - Relative path to sources (relative to where rgenstat is run from).
+
+advapi32 ../reactos/dll/win32/advapi32
+crtdll ../reactos/dll/win32/crtdll
+gdi32 ../reactos/dll/win32/gdi32
+gdiplus ../reactos/dll/win32/gdiplus
+iphlpapi ../reactos/dll/win32/iphlpapi
+kernel32 ../reactos/dll/win32/kernel32
+msvcrt ../reactos/dll/win32/msvcrt
+rasapi32 ../reactos/dll/win32/rasapi32
+rasdlg ../reactos/dll/win32/rasdlg
+rasman ../reactos/dll/win32/rasman
+rpcrt4 ../reactos/dll/win32/rpcrt4
+secur32 ../reactos/dll/win32/secur32
+snmpapi ../reactos/dll/win32/snmpapi
+user32 ../reactos/dll/win32/user32
+version ../reactos/dll/win32/version
+winspool ../reactos/dll/win32/winspool
+ws2_32 ../reactos/dll/win32/ws2_32
+wsock32 ../reactos/dll/win32/wsock32
+videoprt ../reactos/drivers/video/videoprt
+ndis ../reactos/drivers/network/ndis
+tdi ../reactos/drivers/network/tdi
+scsiport ../reactos/drivers/storage/scsiport
+ntoskrnl ../reactos/ntoskrnl
+rtl ../reactos/lib/rtl
+win32k ../reactos/subsystems/win32/win32k

reactos/base/applications/applications.rbuild

@@ -34,6 +34,9 @@
 <directory name="mscutils">
 	<xi:include href="mscutils/directory.rbuild" />
 </directory>
+<directory name="mstsc">
+	<xi:include href="mstsc/mstsc.rbuild" />
+</directory>
 <directory name="network">
 	<xi:include href="network/network.rbuild" />
 </directory>

reactos/base/applications/cacls/cacls.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" unicode="true">
 	<include base="cacls">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (ACL <20><><EFBFBD> <20><><EFBFBD>) <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\n\
 CACLS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD> [/T] [/E] [/C] [/G <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD> [...]] [/R <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [...]]\n\
@@ -70,5 +70,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
-
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "Mostra o modifica la llista de control d'acc<63>s (ACLs) dels fitxers\n\n\
 CACLS fitxer [/T] [/E] [/C] [/G user:perm [...]] [/R usuari [...]]\n\
@@ -71,4 +71,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -5,7 +5,7 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "<22>ndert Datei-ACLs (Access Control List) oder zeigt sie an.\n\n\
 CACLS Dateiname [/T] [/E] [/C] [/G Benutzer:Zugriff] [/R Benutzer [...]]\n\
@@ -76,4 +76,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> access control lists (ACLs) <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\n\
 CACLS <20><><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [/T] [/E] [/C] [/G <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [...]] [/R <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [...]]\n\
@@ -71,4 +71,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "Displays or modifies access control lists (ACLs) of files\n\n\
 CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
@@ -71,4 +71,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "Affiche ou change la liste des contr<74>les d'acc<63>s (ACLs) de fichiers\n\n\
 CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
@@ -12,17 +12,17 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
    /E            <20>dite les ACL au lieu de les remplacer.\n\
    /C            Continuer en cas de refus d'acc<63>s.\n\
    /G user:perm  Accorder des droit d'acc<63>s <20> l'utilisateur sp<73>cifi<66>.\n\
-                 Perm peut valoir: R  Lecture\n\
-                                   W  <20>criture\n\
-                                   C  Modification (<28>criture)\n\
-                                   F  Contr<74>le total\n\
+                 Perm peut valoir : R  Lecture\n\
+                                    W  <20>criture\n\
+                                    C  Modification (<28>criture)\n\
+                                    F  Contr<74>le total\n\
    /R user       Supprime les droits d'acc<63>s de l'utilisateur sp<73>cifi<66> (valide uniquement avec /E).\n\
    /P user:perm  Remplace les droits d'acc<63>s de l'utilisateur specifi<66>.\n\
-                 Perm peut valoir: N  Aucun \n\
-                                   R  Lecture\n\
-                                   W  <20>criture\n\
-                                   C  Modification (<28>criture)\n\
-                                   F  Contr<74>le total\n\
+                 Perm peut valoir : N  Aucun \n\
+                                    R  Lecture\n\
+                                    W  <20>criture\n\
+                                    C  Modification (<28>criture)\n\
+                                    F  Contr<74>le total\n\
    /D user       Interdit l'acc<63>s <20> l'utilisateur sp<73>cifi<66>.\n\
 Il est possible d'utiliser des caract<63>res joker pour s<>lectionner plus d'un fichier avec une commande.\n\
 Il est possible de sp<73>cifier plus d'un utilisateur dans une commande.\n\n\
@@ -71,4 +71,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "Menampilkan atau memodifikasi daftar kontrol akses (ACL) file\n\n\
 CACLS namafile [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
@@ -71,4 +71,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "Visualizza o modifica le liste di controllo di accesso ai file.\n\
 (access control lists ACLs)\n\n\
@@ -72,4 +72,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "Viser eller endrer tilgang kontroll lister (ACL) av filer\n\n\
 CACLS filnavn  [/T] [/E] [/C] [/G bruker:perm [...]] [/R user [...]]\n\
@@ -71,4 +71,4 @@ IDS_WRITE_DAC, "SKRIVE_DAC"
 IDS_READ_CONTROL, "LESE_KONTROLL"
 IDS_DELETE, "SLETT"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RETTIGHETER_ALT"
-}
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "ACL's (Access Control Lists, toegangslijsten) van bestanden weergeven\nof bewerken\n\nCACLS bestandsnaam [/T] [/E] [/C] [/G gebr:toeg] [/R gebruiker [...]]\n\
                    [/P gebr:toeg [...]] [/D gebruiker [...]]\n\
@@ -72,4 +72,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -8,7 +8,7 @@
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "Poka<6B> lub modyfikuj list<73> kontroli dost<73>pu (Access Control List) plik<69>w\n\n\
 CACLS nazwa pliku [/T] [/E] [/C] [/G u<>ytkownik:dost<73>p [...]] [/R u<>ytkownik [...]]\n\
@@ -80,4 +80,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -0,0 +1,76 @@
+LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "Exibe ou modifica as listas de controle de acesso (ACLs) de arquivos\n\n\
+CACLS nome-arquivo [/T] [/E] [/C] [/G usu<73>rio:perm] [/R usu<73>rio [...]]\n\
+                   [/P usu<73>rio:perm [...]] [/D usu<73>rio [...]]\n\
+   nome-arquivo     Exibe ACLs.\n\
+   /T               Altera ACLs de arquivos especificados\n\
+                    na pasta atual e em todas as subpastas.\n\
+   /E               Edita ACL em vez de substitu<74>-la.\n\
+   /C               Continua ao encontrar erros de acesso negado.\n\
+   /G usu<73>rio:perm  Concede os direitos de acesso ao usu<73>rio especificado.\n\
+                    Perm pode ser: R  Ler\n\
+                              W  Gravar\n\
+                              C  Alterar (gravar)\n\
+                              F  Controle total\n\
+   /R usu<73>rio       Revoga os direitos de acesso do usu<73>rio especificado\n\
+                    (v<>lido somente com /E).\n\
+   /P usu<73>rio:perm  Substitui os direitos de acesso do usu<73>rio especificado.\n\
+                    Perm pode ser: N  Nenhum\n\
+                              R  Ler\n\
+                              W  Gravar\n\
+                              C  Alterar (gravar)\n\
+                              F  Controle total\n\
+   /D usu<73>rio       Nega o acesso ao usu<73>rio especificado.\n\
+Caracteres curinga podem ser usados para especificar mais de um arquivo\n\
+em um comando.\n\
+Voc<EFBFBD> pode especificar mais de um usu<73>rio em um comando.\n\n\
+Abrevia<EFBFBD><EFBFBD>es:\n\
+   CI - Heran<61>a de recipiente.\n\
+        O ACE ser<65> herdado pelas pastas.\n\
+   OI - Heran<61>a de objeto.\n\
+        O ACE ser<65> herdado pelos arquivos.\n\
+   IO - Somente heran<61>a.\n\
+        O ACE n<>o se aplica ao arquivo/pasta atual.\n"
+
+IDS_ABBR_CI, "(CI)"
+IDS_ABBR_OI, "(OI)"
+IDS_ABBR_IO, "(IO)"
+IDS_ABBR_FULL, "F"
+IDS_ABBR_READ, "R"
+IDS_ABBR_WRITE, "W"
+IDS_ABBR_CHANGE, "C"
+IDS_ABBR_NONE, "N"
+IDS_ALLOW, ""
+IDS_DENY, "(DENY)"
+IDS_SPECIAL_ACCESS, "(special access:)"
+IDS_GENERIC_READ, "GENERIC_READ"
+IDS_GENERIC_WRITE, "GENERIC_WRITE"
+IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
+IDS_GENERIC_ALL, "GENERIC_ALL"
+IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
+IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
+IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
+IDS_FILE_READ_DATA, "FILE_READ_DATA"
+IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
+IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
+IDS_FILE_READ_EA, "FILE_READ_EA"
+IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
+IDS_FILE_EXECUTE, "FILE_EXECUTE"
+IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
+IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
+IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
+IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
+IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
+IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
+IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
+IDS_SYNCHRONIZE, "SYNCHRONIZE"
+IDS_WRITE_OWNER, "WRITE_OWNER"
+IDS_WRITE_DAC, "WRITE_DAC"
+IDS_READ_CONTROL, "READ_CONTROL"
+IDS_DELETE, "DELETE"
+IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
+END

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (ACLs) <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\n\
 CACLS <20><><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD> [/T] [/E] [/C] [/G <20><><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD> [...]] [/R <20><><EFBFBD> [...]]\n\
@@ -72,4 +72,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

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

@@ -0,0 +1,80 @@
+//Slovak language file by M<>rio Ka<4B>m<EFBFBD>r aka Kario (kario@szm.sk) 16-01-2008
+
+LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+
+IDS_HELP, "Zobraz<61> alebo zmen<65> zoznamy pr<70>stupov<6F>ch pr<70>v (Access Control List) s<>borov.\n\n\
+CACLS n<>zov_s<5F>boru [/T] [/E] [/C] [/G pou<6F><75>vate<74>:povolenia [...]]\n\
+                   [/R pou<6F><75>vate<74> [...]] [/P pou<6F><75>vate<74>:povolenia [...]]\n\
+                   [/D pou<6F><75>vate<74> [...]]\n\
+    n<>zov_s<5F>boru   Zobraz<61> zoznamy ACL.\n\
+    /T             Zmen<65> zoznamy ACL <20>pecifikovan<61>ch s<>borov\n\
+                   v aktu<74>lnom adres<65>ri a vo v<>etk<74>ch podadres<65>roch.\n\
+    /E             Uprav<61> zoznam ACL namiesto jeho nahradenia.\n\
+    /C             Pokra<72>ovanie pri chyb<79>ch odmietnutia pr<70>stupu.\n\
+    /G pou<6F><75>vate<74>:povolenia\n\
+                   Udel<65> <20>pecifikovan<61>mu pou<6F><75>vate<74>ovi pr<70>stupov<6F> pr<70>va.\n\
+                   Povolenia m<><6D>u by<62>: R  <20><>tanie\n\
+                                       W  z<>pis\n\
+                                       C  zmena (z<>pis)\n\
+                                       F  <20>pln<6C> pr<70>stup\n\
+    /R pou<6F><75>vate<74>  Odoberie <20>pecifikovan<61>m pou<6F><75>vate<74>om pr<70>stupov<6F> pr<70>va\n\
+                   (platn<74> iba s prep<65>na<6E>om /E).\n\
+    /P pou<6F><75>vate<74>:povolenia\n\
+                   Nahrad<61> <20>pecifikovan<61>m pou<6F><75>vate<74>om pr<70>stupov<6F> pr<70>va.\n\
+                   Povolenia m<><6D>u by<62>: N  <20>iadne\n\
+                                       R  <20><>tanie\n\
+                                       W  z<>pis\n\
+                                       C  zmena (z<>pis)\n\
+                                       F  <20>pln<6C> pr<70>stup\n\
+    /D pou<6F><75>vate<74>  Odoprie <20>pecifikovan<61>mu pou<6F><75>vate<74>ovi pr<70>stup.\n\
+N<EFBFBD>hradn<EFBFBD> znaky sa daj<61> pou<6F>i<EFBFBD> na <20>pecifikovanie viacer<65>ch s<>borov v jednom\n\
+pr<EFBFBD>kaze. Rovnako m<><6D>ete <20>pecifikova<76> aj viacer<65>ch pou<6F><75>vate<74>ov v pr<70>kaze.\n\n\
+Skratky:\n\
+    CI - Kontajn<6A>rov<6F> dedenie.\n\
+         ACE bud<75> zdeden<65> po adres<65>roch.\n\
+    OI - Objektov<6F> dedenie.\n\
+         ACE bud<75> zdeden<65> po s<>boroch.\n\
+    IO - Iba zdedi<64>.\n\
+         ACE sa neaplikuje na aktu<74>lny s<>bor alebo adres<65>r.\n"
+
+IDS_ABBR_CI, "(CI)"
+IDS_ABBR_OI, "(OI)"
+IDS_ABBR_IO, "(IO)"
+IDS_ABBR_FULL, "F"
+IDS_ABBR_READ, "R"
+IDS_ABBR_WRITE, "W"
+IDS_ABBR_CHANGE, "C"
+IDS_ABBR_NONE, "N"
+IDS_ALLOW, ""
+IDS_DENY, "(DENY)"
+IDS_SPECIAL_ACCESS, "(<28>peci<63>lny pr<70>stup:)"
+IDS_GENERIC_READ, "GENERIC_READ"
+IDS_GENERIC_WRITE, "GENERIC_WRITE"
+IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
+IDS_GENERIC_ALL, "GENERIC_ALL"
+IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
+IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
+IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
+IDS_FILE_READ_DATA, "FILE_READ_DATA"
+IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
+IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
+IDS_FILE_READ_EA, "FILE_READ_EA"
+IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
+IDS_FILE_EXECUTE, "FILE_EXECUTE"
+IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
+IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
+IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
+IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
+IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
+IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
+IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
+IDS_SYNCHRONIZE, "SYNCHRONIZE"
+IDS_WRITE_OWNER, "WRITE_OWNER"
+IDS_WRITE_DAC, "WRITE_DAC"
+IDS_READ_CONTROL, "READ_CONTROL"
+IDS_DELETE, "DELETE"
+IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
+END

reactos/base/applications/cacls/lang/uk-UA.rc

@@ -1,5 +1,5 @@
 /*
- * PROJECT:     ReactOS CACLS 
+ * PROJECT:     ReactOS CACLS
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        applications/cacls/lang/uk-UA.rc
  * PURPOSE:     Ukraianian Language File for PROJECT
@@ -9,7 +9,7 @@
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (ACLs) <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\n\
 CACLS <20><>'<27>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD> [/T] [/E] [/C] [/G <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD> [...]] [/R <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> [...]]\n\
@@ -78,4 +78,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

reactos/base/applications/cacls/lang/zh-CN.rc

@@ -22,7 +22,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "<22><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD>޸<EFBFBD><DEB8>ļ<EFBFBD><C4BC>ķ<EFBFBD><C4B7>ʿ<EFBFBD><CABF>Ʊ<EFBFBD> \n\n\
 CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
@@ -92,4 +92,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

reactos/base/applications/cacls/lang/zh-TW.rc

@@ -18,11 +18,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL 
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
 
 IDS_HELP, "<22><><EFBFBD>ܩΪ̭ק<CCAD><D7A7><EFBFBD><EFBFBD>󪺳X<F3AABAB3>ݱ<EFBFBD><DDB1><EFBFBD><EFBFBD><EFBFBD> \n\n\
 CACLS filename [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
@@ -92,4 +92,4 @@ IDS_WRITE_DAC, "WRITE_DAC"
 IDS_READ_CONTROL, "READ_CONTROL"
 IDS_DELETE, "DELETE"
 IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}
+END

reactos/base/applications/cacls/rsrc.rc

@@ -12,7 +12,9 @@
 #include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
 #include "lang/ru-RU.rc"
+#include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"
 #include "lang/zh-CN.rc"
 #include "lang/zh-TW.rc"

reactos/base/applications/calc/calc.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="calc" type="win32gui" installbase="system32" installname="calc.exe">
 	<include base="calc">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="WINVER">0x0501</define>
 	<define name="UNICODE" />

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

@@ -3,7 +3,7 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
    IDS_COPYRIGHT1,         "Calculator 5.0. Licensed under LGPL 2"
@@ -31,34 +31,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
    IDS_ERR_DIVIDE_BY_ZERO, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
    IDS_ERR_UNDEFINED,      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" 
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",     IDM_COPY
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",     IDM_COPY
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -72,21 +77,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",     IDM_COPY
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -101,42 +109,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "<22><><EFBFBD><EFBFBD>\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "<22><> GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>?",     IDM_WHATS_THIS
+   END
 END
 
-
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,   74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD, 109, 52, 30, 13, WS_TABSTOP | WS_GROUP
+END

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

@@ -25,7 +25,7 @@
 LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Calculadora"
 
    IDS_COPYRIGHT1,         "Calculadora 5.0. Sota llicenia LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Entrada inv<6E>lida per la funci<63>."
    IDS_ERR_DIVIDE_BY_ZERO, "No puc dividir per zero."
    IDS_ERR_UNDEFINED,      "El resultat de la funci<63> <20>s indefinit."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Edita" {
+BEGIN
+   POPUP "&Edita"
+   BEGIN
       MENUITEM "&Copia Ctrl+C",     IDM_COPY
       MENUITEM "E&nganxa Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Vista" {
+   END
+   POPUP "&Vista"
+   BEGIN
       MENUITEM "Estandard",         IDM_MODE_STANDARD
       MENUITEM "Cient<6E>fica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Agrupaci<63> de d<>gits",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Ajuda" {
+   END
+   POPUP "&Ajuda"
+   BEGIN
       MENUITEM "Temes d'ajuda",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "En quant a la Calculadora", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edita" {
+BEGIN
+   POPUP "&Edita"
+   BEGIN
       MENUITEM "&Copia Ctrl+C",     IDM_COPY
       MENUITEM "E&ngancxa Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Vista" {
+   END
+   POPUP "&Vista"
+   BEGIN
       MENUITEM "Estandard",         IDM_MODE_STANDARD
       MENUITEM "Cient<6E>fica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Graus\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Agrupaci<63> de digits",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Ajuda" {
+   END
+   POPUP "&Ajuda"
+   BEGIN
       MENUITEM "Temes d'ajuda",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "En quant a la Calculadora", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edita" {
+BEGIN
+   POPUP "&Edita"
+   BEGIN
       MENUITEM "&Copia Ctrl+C",     IDM_COPY
       MENUITEM "E&nganxa Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Vista" {
+   END
+   POPUP "&Vista"
+   BEGIN
       MENUITEM "Estandard",         IDM_MODE_STANDARD
       MENUITEM "Cientifica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,41 +131,42 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Agrupaci<63> de digits",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Ajuda" {
+   END
+   POPUP "&Ajuda"
+   BEGIN
       MENUITEM "Temes d'ajuda",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "En quant a la Calculadora", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "En quant a GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "Acceptar", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "Acceptar", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Qu<51> es aix<69>?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Cuadre Estad<61>stic"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&C<>RREGA", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&D"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+    POPUP "" BEGIN
+      MENUITEM "Qu<51> es aix<69>?",     IDM_WHATS_THIS
+   END
 END
 
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Cuadre Estad<61>stic"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,   74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD, 109, 52, 30, 13, WS_TABSTOP | WS_GROUP
+END

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

@@ -1,7 +1,7 @@
 /*
  * Czech language support
  *
- * WineCalc (En.rc)
+ * WineCalc (cs-CZ.rc)
  *
  * Copyright 2005 Denzil <d3nzil@gmail.com>
  *
@@ -27,7 +27,7 @@
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Kalkul<75>tor"
 
    IDS_COPYRIGHT1,         "Kalkul<75>tor 5.0. Licencov<6F>n pod LGPL 2"
@@ -55,34 +55,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Neplatn<74> vstup pro funkci."
    IDS_ERR_DIVIDE_BY_ZERO, "Nelze d<>lit nulou."
    IDS_ERR_UNDEFINED,      "V<>sledek funkce nen<65> definov<6F>n."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Editace" {
+BEGIN
+   POPUP "&Editace"
+   BEGIN
       MENUITEM "&Kop<6F>rovat Ctrl+C",     IDM_COPY
       MENUITEM "&Vlo<6C>it Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Zobrazen<65>" {
+   END
+   POPUP "&Zobrazen<65>"
+   BEGIN
       MENUITEM "Standartn<74>",         IDM_MODE_STANDARD
       MENUITEM "V<>deck<63>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Seskupov<6F>n<EFBFBD> <20><>slic",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Pomoc" {
+   END
+   POPUP "&Pomoc"
+   BEGIN
       MENUITEM "T<>mata n<>pov<6F>dy",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "O Kalkul<75>toru", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Editace" {
+BEGIN
+   POPUP "&Editace"
+   BEGIN
       MENUITEM "&Kop<6F>rovat Ctrl+C",     IDM_COPY
       MENUITEM "&Vlo<6C>it Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Zobrazen<65>" {
+   END
+   POPUP "&Zobrazen<65>"
+   BEGIN
       MENUITEM "Standartn<74>",         IDM_MODE_STANDARD
       MENUITEM "V<>deck<63>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -96,21 +101,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Grady\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Seskupov<6F>n<EFBFBD> <20><>slic",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Pomoc" {
+   END
+   POPUP "&Pomoc"
+   BEGIN
       MENUITEM "T<>mata n<>pov<6F>dy",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "O Kalkul<75>toru", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Editace" {
+BEGIN
+   POPUP "&Editace"
+   BEGIN
       MENUITEM "&Kop<6F>rovat Ctrl+C",     IDM_COPY
       MENUITEM "&Vlo<6C>it Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Zobrazen<65>" {
+   END
+   POPUP "&Zobrazen<65>"
+   BEGIN
       MENUITEM "Standartn<74>",         IDM_MODE_STANDARD
       MENUITEM "V<>deck<63>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -125,40 +133,42 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Seskupov<6F>n<EFBFBD> <20><>slic",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Pomoc" {
+   END
+   POPUP "&Pomoc"
+   BEGIN
       MENUITEM "T<>mata n<>pov<6F>dy",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "O Kalkul<75>toru", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "O GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Co je toto?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+    POPUP "" BEGIN
+      MENUITEM "Co je toto?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistics Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (DE.rc)
+ * WineCalc (de-DE.rc)
  *
  * Copyright 2005 Rouven Wessling
  *
@@ -25,7 +25,7 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Rechner"
 
    IDS_COPYRIGHT1,         "Rechner 5.0. Lizenziert unter der LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Ung<6E>ltige Eingabe f<>r Funktion."
    IDS_ERR_DIVIDE_BY_ZERO, "Teilen durch 0 unm<6E>glich."
    IDS_ERR_UNDEFINED,      "Das Ergebnis der Funktion ist undefiniert."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Bearbeiten" {
+BEGIN
+   POPUP "&Bearbeiten"
+   BEGIN
       MENUITEM "&Kopieren Ctrl+C",     IDM_COPY
       MENUITEM "&Einf<6E>gen Ctrl+V",     IDM_PASTE
-   }
-   POPUP "&Ansicht" {
+   END
+   POPUP "&Ansicht"
+   BEGIN
       MENUITEM "&Standard",            IDM_MODE_STANDARD
       MENUITEM "&Wissenschaftlich",    IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "&Zifferngruppierung",  IDM_DIGIT_GROUPING
-   }
-   POPUP "&?" {
+   END
+   POPUP "&?"
+   BEGIN
       MENUITEM "&Hilfethemen",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "&Info",                IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Bearbeiten" {
+BEGIN
+   POPUP "&Bearbeiten"
+   BEGIN
       MENUITEM "&Kopieren Ctrl+C",     IDM_COPY
       MENUITEM "&Einf<6E>gen Ctrl+V",     IDM_PASTE
-   }
-   POPUP "&Anzeige" {
+   END
+   POPUP "&Anzeige"
+   BEGIN
       MENUITEM "&Standard",            IDM_MODE_STANDARD
       MENUITEM "&Wissenschaftlich",    IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
       MENUITEM "&Grad\tF4",            ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Zifferngr&uppierung",  IDM_DIGIT_GROUPING
-   }
-   POPUP "&?" {
+   END
+   POPUP "&?"
+   BEGIN
       MENUITEM "&Hilfethemen",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "&Info",                IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Bearbeiten" {
+BEGIN
+   POPUP "&Bearbeiten"
+   BEGIN
       MENUITEM "&Kopieren Ctrl+C",     IDM_COPY
       MENUITEM "&Einf<6E>gen Ctrl+V",     IDM_PASTE
-   }
-   POPUP "&Anzeige" {
+   END
+   POPUP "&Anzeige"
+   BEGIN
       MENUITEM "&Standard",            IDM_MODE_STANDARD
       MENUITEM "&Wissenschaftlich",    IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,40 +131,42 @@ SCIWS_MENU MENU DISCARDABLE
       MENUITEM "&Byte\tF4",            ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "&Zifferngruppierung",  IDM_DIGIT_GROUPING
-   }
-   POPUP "&?" {
+   END
+   POPUP "&?"
+   BEGIN
       MENUITEM "&Hilfethemen",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "&Info",                IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "Info <20>ber GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Was ist das?", IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistik Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+    POPUP "" BEGIN
+      MENUITEM "Was ist das?", IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistik Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (Gr.rc)
+ * WineCalc (el-GR.rc)
  *
  * Copyright 2006 Dj Apal
  *
@@ -25,7 +25,7 @@
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
    IDS_COPYRIGHT1,         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 5.0. Licensed under LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
    IDS_ERR_DIVIDE_BY_ZERO, "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
    IDS_ERR_UNDEFINED,      "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",     IDM_COPY
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",     IDM_COPY
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Grads\tF4",   ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",     IDM_COPY
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -122,40 +130,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Grads\tF4",   ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "<22><><EFBFBD><EFBFBD> <20><><EFBFBD> GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "<22><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>;",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "<22><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>;",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistics Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (En.rc)
+ * WineCalc (en-US.rc)
  *
  * Copyright 2003 James Briggs
  *
@@ -25,7 +25,7 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Calculator"
 
    IDS_COPYRIGHT1,         "Calculator 5.0. Licensed under LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Invalid input for function."
    IDS_ERR_DIVIDE_BY_ZERO, "Cannot divide by zero."
    IDS_ERR_UNDEFINED,      "Result of function is undefined."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",     IDM_COPY
       MENUITEM "&Paste Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientific",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Digit Grouping",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help Topics",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "About Calculator", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",     IDM_COPY
       MENUITEM "&Paste Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientific",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Grads\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Digit Grouping",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help Topics",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "About Calculator", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",     IDM_COPY
       MENUITEM "&Paste Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientific",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,40 +131,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Digit Grouping",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help Topics",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "About Calculator", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "About GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "What's This?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "What's This?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistics Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -25,7 +25,7 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Calculadora"
 
    IDS_COPYRIGHT1,         "Calculadora 5.0. bajo licencia LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Entrada no v<>lida para la funci<63>n."
    IDS_ERR_DIVIDE_BY_ZERO, "No se puede dividir entre cero."
    IDS_ERR_UNDEFINED,      "El resultado de esta funci<63>n no est<73> definido."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Editar" {
+BEGIN
+   POPUP "&Editar"
+   BEGIN
       MENUITEM "&Copiar Ctrl+C",     IDM_COPY
       MENUITEM "&Pegar Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Ver" {
+   END
+   POPUP "&Ver"
+   BEGIN
       MENUITEM "Est<73>ndar",         IDM_MODE_STANDARD
       MENUITEM "Cient<6E>fica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Agrupaci<63>n de d<>gitos",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Ayuda" {
+   END
+   POPUP "Ayuda"
+   BEGIN
       MENUITEM "Temas de Ayuda",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Acerca de Calculadora", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Editar" {
+BEGIN
+   POPUP "&Editar"
+   BEGIN
       MENUITEM "&Copiar Ctrl+C",     IDM_COPY
       MENUITEM "&Pegar Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Ver" {
+   END
+   POPUP "&Ver"
+   BEGIN
       MENUITEM "Est<73>ndar",         IDM_MODE_STANDARD
       MENUITEM "Cient<6E>fica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Centesimal\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Agrupaci<63>n de d<>gitos",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Ayuda" {
+   END
+   POPUP "Ayuda"
+   BEGIN
       MENUITEM "Temas de Ayuda",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Acerca de Calculadora", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Editar" {
+BEGIN
+   POPUP "&Editar"
+   BEGIN
       MENUITEM "&Copiar Ctrl+C",     IDM_COPY
       MENUITEM "&Pegar Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Ver" {
+   END
+   POPUP "&Ver"
+   BEGIN
       MENUITEM "Est<73>ndar",         IDM_MODE_STANDARD
       MENUITEM "Cient<6E>fica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,40 +131,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Agrupaci<63>n de d<>gitos",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Ayuda" {
+   END
+   POPUP "Ayuda"
+   BEGIN
       MENUITEM "Temas de Ayuda",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Acerca de Calculadora", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "Acerca de GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "Aceptar", IDOK,       42, 60, 29, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "Aceptar", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "<22>Qu<51> es esto?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Cuadro de estad<61>sticas"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "Cargar", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "<22>Qu<51> es esto?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Cuadro de estad<61>sticas"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,   74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD, 109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,7 +1,7 @@
-LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Laskin"
 
    IDS_COPYRIGHT1,         "Calculator 5.0. Licensed under LGPL 2"
@@ -29,34 +29,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Väärä syöte funktiolle."
    IDS_ERR_DIVIDE_BY_ZERO, "Nollalla ei voi jakaa."
    IDS_ERR_UNDEFINED,      "Result of function is undefined."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Muokkaa" {
+BEGIN
+   POPUP "&Muokkaa"
+   BEGIN
       MENUITEM "K&opioi Ctrl+C",        IDM_COPY
       MENUITEM "L&iitä Ctrl+V",        IDM_PASTE
-   }
-   POPUP "&Näytä" {
+   END
+   POPUP "&Näytä"
+   BEGIN
       MENUITEM "Nelilaskin",            IDM_MODE_STANDARD
       MENUITEM "Funktiolaskin",         IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Lukujen ryhmittely",    IDM_DIGIT_GROUPING
-   }
-   POPUP "&Ohje" {
+   END
+   POPUP "&Ohje"
+   BEGIN
       MENUITEM "Ohjeen aiheet",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Tietoja Laskimesta",    IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Muokkaa" {
+BEGIN
+   POPUP "&Muokkaa"
+   BEGIN
       MENUITEM "K&opioi Ctrl+C",        IDM_COPY
       MENUITEM "L&iitä Ctrl+V",        IDM_PASTE
-   }
-   POPUP "&Näytä" {
+   END
+   POPUP "&Näytä"
+   BEGIN
       MENUITEM "Nelilaskin",            IDM_MODE_STANDARD
       MENUITEM "Funktiolaskin",         IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -70,21 +75,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Grads\tF4",         ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Lukujen ryhmittely",    IDM_DIGIT_GROUPING
-   }
-   POPUP "&Ohje" {
+   END
+   POPUP "&Ohje"
+   BEGIN
       MENUITEM "Ohjeen aiheet",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Tietoja Laskimesta",    IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Muokkaa" {
+BEGIN
+   POPUP "&Muokkaa"
+   BEGIN
       MENUITEM "K&opioi Ctrl+C",        IDM_COPY
       MENUITEM "L&iitä Ctrl+V",        IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Nelilaskin",            IDM_MODE_STANDARD
       MENUITEM "Funktiolaskin",         IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -99,40 +107,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",          ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Lukujen ryhmittely",    IDM_DIGIT_GROUPING
-   }
-   POPUP "&Ohje" {
+   END
+   POPUP "&Ohje"
+   BEGIN
       MENUITEM "Ohjeen aiheet",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Tietoja Laskimesta",    IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "About GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Mikä tämä on?",      IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "Mikä tämä on?",      IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistics Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (Fr.rc)
+ * WineCalc (fr-FR.rc)
  *
  * Copyright 2003 James Briggs
  *
@@ -19,7 +19,7 @@
  */
 /*
  * Translation made by Jerome Signouret, 2005.
- * Updated by Pierre Schweitzer, 2007. 
+ * Updated by Pierre Schweitzer, 2007.
  */
 #include "windows.h"
 #include "resource.h"
@@ -28,7 +28,7 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Calculatrice"
 
    IDS_COPYRIGHT1,         "Calculatrice 5.0. Licensed under LGPL 2"
@@ -56,34 +56,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Entr<74>e incorrecte pour l'op<6F>ration."
    IDS_ERR_DIVIDE_BY_ZERO, "Division par z<>ro impossble."
    IDS_ERR_UNDEFINED,      "R<>sultat non d<>fini."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&<26>dition" {
+BEGIN
+   POPUP "&<26>dition"
+   BEGIN
       MENUITEM "Co&pier Ctrl+C",     IDM_COPY
       MENUITEM "C&oller Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Affichage" {
+   END
+   POPUP "&Affichage"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientifique",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "S<>parateur",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Ai&de" {
+   END
+   POPUP "Ai&de"
+   BEGIN
       MENUITEM "Somaire",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "A propos", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26>dition" {
+BEGIN
+   POPUP "&<26>dition"
+   BEGIN
       MENUITEM "Co&pier Ctrl+C",     IDM_COPY
       MENUITEM "C&oller Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Affichage" {
+   END
+   POPUP "&Affichage"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientifique",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -97,21 +102,24 @@ SCIMS_MENU MENU DISCARDABLE
 	    MENUITEM "Grades\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "S<>parateur",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Ai&de" {
+   END
+   POPUP "Ai&de"
+   BEGIN
       MENUITEM "Sommaire",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22> propos", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26>dition" {
+BEGIN
+   POPUP "&<26>dition"
+   BEGIN
       MENUITEM "Co&pier Ctrl+C",     IDM_COPY
       MENUITEM "C&oller Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Affichage" {
+   END
+   POPUP "&Affichage"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientifique",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -126,40 +134,43 @@ SCIWS_MENU MENU DISCARDABLE
 	    MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "S<>parateur",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Ai&de" {
+   END
+   POPUP "Ai&de"
+   BEGIN
       MENUITEM "Sommaire",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22> propos", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "<22> propos de GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-   POPUP "" {
-      MENUITEM "Qu'est-ce ?",     IDM_WHATS_THIS
-  }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Outils Statistiques Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "Qu'est-ce ?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Outils Statistiques Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (Hu.rc)
+ * WineCalc (hu-HU.rc)
  *
  * Copyright 2003 James Briggs
  * Hungarian translation by Adam Medveczky
@@ -26,7 +26,7 @@
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Sz<53>mol<6F>g<EFBFBD>p"
 
    IDS_COPYRIGHT1,         "Calculator 5.0. Licensed under LGPL 2"
@@ -54,34 +54,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Hib<69>s bemenet."
    IDS_ERR_DIVIDE_BY_ZERO, "Nem tudok null<6C>val osztani."
    IDS_ERR_UNDEFINED,      "Result of function is undefined."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Szerkeszt<7A>s" {
+BEGIN
+   POPUP "&Szerkeszt<7A>s"
+   BEGIN
       MENUITEM "&M<>sol<6F>s Ctrl+C",     IDM_COPY
       MENUITEM "&Beilleszt<7A>s Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&N<>zet" {
+   END
+   POPUP "&N<>zet"
+   BEGIN
       MENUITEM "Alap",         IDM_MODE_STANDARD
       MENUITEM "Tudom<6F>nyos",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Sz<53>mjegyek csoportos<6F>t<EFBFBD>sa",   IDM_DIGIT_GROUPING
-   }
-   POPUP "S<>&g<>" {
+   END
+   POPUP "S<>&g<>"
+   BEGIN
       MENUITEM "&T<>mak<61>r<EFBFBD>k",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Sz<53>mol<6F>g<EFBFBD>p n<>vjegye", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Szerkeszt<7A>s" {
+BEGIN
+   POPUP "&Szerkeszt<7A>s"
+   BEGIN
       MENUITEM "&M<>sol<6F>s Ctrl+C",     IDM_COPY
       MENUITEM "&Beilleszt<7A>s Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&N<>zet" {
+   END
+   POPUP "&N<>zet"
+   BEGIN
       MENUITEM "Alap",         IDM_MODE_STANDARD
       MENUITEM "Tudom<6F>nyos",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -95,21 +100,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "<22>jfok\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Sz<53>mjegyek csoportos<6F>t<EFBFBD>sa",   IDM_DIGIT_GROUPING
-   }
-   POPUP "S<>&g<>" {
+   END
+   POPUP "S<>&g<>"
+   BEGIN
       MENUITEM "&T<>mak<61>r<EFBFBD>k",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Sz<53>mol<6F>g<EFBFBD>p n<>vjegye", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Szerkeszt<7A>s" {
+BEGIN
+   POPUP "&Szerkeszt<7A>s"
+   BEGIN
       MENUITEM "&M<>sol<6F>s Ctrl+C",     IDM_COPY
       MENUITEM "&Beilleszt<7A>s Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&N<>zet" {
+   END
+   POPUP "&N<>zet"
+   BEGIN
       MENUITEM "Alap",         IDM_MODE_STANDARD
       MENUITEM "Tudom<6F>nyos",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -124,40 +132,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "B<>jt\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Sz<53>mjegyek csoportos<6F>t<EFBFBD>sa",   IDM_DIGIT_GROUPING
-   }
-   POPUP "S<>&g<>" {
+   END
+   POPUP "S<>&g<>"
+   BEGIN
       MENUITEM "&T<>mak<61>r<EFBFBD>k",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Sz<53>mol<6F>g<EFBFBD>p n<>vjegye", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "GNU winecalc (sz<73>mol<6F>g<EFBFBD>p) n<>vjegye"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Mi ez?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statisztika"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "Mi ez?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statisztika"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -25,7 +25,7 @@
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Kalkulator"
 
    IDS_COPYRIGHT1,         "Kalkulator 5.0. Dilisensi di bawah LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Input untuk fungsi tidak benar."
    IDS_ERR_DIVIDE_BY_ZERO, "Tidak bisa membagi dengan nol."
    IDS_ERR_UNDEFINED,      "Hasil fungsi tidak terdefinisikan."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",        IDM_COPY
       MENUITEM "&Paste Ctrl+V",       IDM_PASTE
-   }
-   POPUP "&Lihat" {
+   END
+   POPUP "&Lihat"
+   BEGIN
       MENUITEM "Standar",             IDM_MODE_STANDARD
       MENUITEM "Sains",               IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Pengelompokan Digit", IDM_DIGIT_GROUPING
-   }
-   POPUP "&Bantuan" {
+   END
+   POPUP "&Bantuan"
+   BEGIN
       MENUITEM "Topik Bantuan",       IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Tentang Kalkulator",  IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",        IDM_COPY
       MENUITEM "&Paste Ctrl+V",       IDM_PASTE
-   }
-   POPUP "&Lihat" {
+   END
+   POPUP "&Lihat"
+   BEGIN
       MENUITEM "Standar",             IDM_MODE_STANDARD
       MENUITEM "Sains",               IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Grads\tF4",       ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Pengelompokan Digit", IDM_DIGIT_GROUPING
-   }
-   POPUP "&Bantuan" {
+   END
+   POPUP "&Bantuan"
+   BEGIN
       MENUITEM "Topik Bantuan",       IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Tentang Kalkulator",  IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",        IDM_COPY
       MENUITEM "&Paste Ctrl+V",       IDM_PASTE
-   }
-   POPUP "&Lihat" {
+   END
+   POPUP "&Lihat"
+   BEGIN
       MENUITEM "Standar",             IDM_MODE_STANDARD
       MENUITEM "Sains",               IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,40 +131,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",        ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Pengelompokan Digit", IDM_DIGIT_GROUPING
-   }
-   POPUP "&Bantuan" {
+   END
+   POPUP "&Bantuan"
+   BEGIN
       MENUITEM "Topik Bantuan",       IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Tentang Kalkulator",  IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP, VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "Tentang GNU WineCalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Apa Ini?", IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Kotak Statistik"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "Apa Ini?", IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Kotak Statistik"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (It.rc)
+ * WineCalc (it-IT.rc)
  *
  * Copyright 2006 Gabriel ilardi
  *
@@ -25,7 +25,7 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Calcolatrice"
 
    IDS_COPYRIGHT1,         "Calcolatrice 5.0. sotto licenza LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Input invalido per la funzione."
    IDS_ERR_DIVIDE_BY_ZERO, "Non si pu<70> dividere per zero."
    IDS_ERR_UNDEFINED,      "Il risultato della funzione <20> indefinito."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Modifica" {
+BEGIN
+   POPUP "&Modifica"
+   BEGIN
       MENUITEM "&Copia Ctrl+C",     IDM_COPY
       MENUITEM "I&ncolla Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Visualizza" {
+   END
+   POPUP "&Visualizza"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientifica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Raggruppamento cifre",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&?" {
+   END
+   POPUP "&?"
+   BEGIN
       MENUITEM "Guida in linea",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Informazioni su Calcolatrice", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Modifica" {
+BEGIN
+   POPUP "&Modifica"
+   BEGIN
       MENUITEM "&Copia Ctrl+C",     IDM_COPY
       MENUITEM "I&ncolla Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Visualizza" {
+   END
+   POPUP "&Visualizza"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientifica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Gradienti\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Raggruppamento cifre",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&?" {
+   END
+   POPUP "&?"
+   BEGIN
       MENUITEM "Guida in linea",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Informazioni su calcolatrice", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Modifica" {
+BEGIN
+   POPUP "&Modifica"
+   BEGIN
       MENUITEM "&Copia Ctrl+C",     IDM_COPY
       MENUITEM "I&ncolla Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Visualizza" {
+   END
+   POPUP "&Visualizza"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientifica",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,40 +131,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Raggruppamento cifre",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&?" {
+   END
+   POPUP "&?"
+   BEGIN
       MENUITEM "Guida in linea",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Informazioni su calcolatrice", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "Informazioni su GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Cos'<27> questo?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistiche"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "Cos'<27> questo?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistiche"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (Ja.rc)
+ * WineCalc (ja-JP.rc)
  *
  * Copyright 2003 James Briggs
  *
@@ -22,24 +22,9 @@
 #include "resource.h"
 #include "winecalc.h"
 
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Japanese resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-//#pragma code_page(932)
-#endif //_WIN32
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-MAIN_MENU MENU 
+MAIN_MENU MENU
 BEGIN
     POPUP "<22>ҏW(&E)"
     BEGIN
@@ -61,7 +46,7 @@ BEGIN
     END
 END
 
-SCIMS_MENU MENU 
+SCIMS_MENU MENU
 BEGIN
     POPUP "<22>ҏW(&E)"
     BEGIN
@@ -92,7 +77,7 @@ BEGIN
     END
 END
 
-SCIWS_MENU MENU 
+SCIWS_MENU MENU
 BEGIN
     POPUP "<22>ҏW(&E)"
     BEGIN
@@ -124,7 +109,7 @@ BEGIN
     END
 END
 
-WHATS_THIS_MENU MENU 
+WHATS_THIS_MENU MENU
 BEGIN
     POPUP ""
     BEGIN
@@ -133,47 +118,32 @@ BEGIN
 END
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-MAIN_MENU ACCELERATORS 
+MAIN_MENU ACCELERATORS
 BEGIN
-    VK_F1,          IDV_HELP,               VIRTKEY 
+    VK_F1,          IDV_HELP,               VIRTKEY
 END
 
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-DLG_ABOUT DIALOG  12, 0, 120, 82
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+DLG_ABOUT DIALOGEX  12, 0, 175, 90
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "GNU winecalc <20>ɂ‚<C982><C282><EFBFBD>"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,42,60,30,14
+    DEFPUSHBUTTON   "OK",IDOK,73,70,30,14
 END
 
-DLG_STATS DIALOG  12, 0, 125, 78
-STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD>v<EFBFBD>{<EFBFBD>b<EFBFBD>N<EFBFBD>X"
-FONT 9, "Tahoma"
+DLG_STATS DIALOGEX  12, 0, 145, 85
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "<22><><EFBFBD>v<EFBFBD>BEGIN<EFBFBD>b<EFBFBD>N<EFBFBD>X"
+FONT 8, "MS Shell Dlg"
 BEGIN
-    DEFPUSHBUTTON   "<22>߂<EFBFBD>(&R)",ID_STATS_RET,4,52,25,13,WS_GROUP
-    PUSHBUTTON      "<22><><EFBFBD>[<5B>h(&L)",ID_STATS_LOAD,34,52,25,13,WS_GROUP
-    PUSHBUTTON      "<22>N<EFBFBD><4E><EFBFBD>A(&C)",ID_STATS_CD,64,52,25,13,WS_GROUP
-    PUSHBUTTON      "<22><><EFBFBD>ׂăN<C483><4E><EFBFBD>A(&A)",ID_STATS_CAD,94,52,25,13,WS_GROUP
+    DEFPUSHBUTTON   "<22>߂<EFBFBD>(&R)",ID_STATS_RET,4,52,30,13,WS_GROUP
+    PUSHBUTTON      "<22><><EFBFBD>[<5B>h(&L)",ID_STATS_LOAD,39,52,30,13,WS_GROUP
+    PUSHBUTTON      "<22>N<EFBFBD><4E><EFBFBD>A(&C)",ID_STATS_CD,74,52,30,13,WS_GROUP
+    PUSHBUTTON      "<22><><EFBFBD>ׂăN<C483><4E><EFBFBD>A(&A)",ID_STATS_CAD,109,52,30,13,WS_GROUP
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_APPNAME             "<22>d<EFBFBD><64>"
     IDS_BTN_BACKSPACE       "Back"
@@ -194,9 +164,3 @@ BEGIN
     IDS_BTN_MEM_STATUS_M    "M"
     IDS_BTN_SQRT            "<22><>"
 END
-
-#endif    // Japanese resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (En.rc)
+ * WineCalc (nb-NO.rc)
  *
  * Copyright 2003 James Briggs
  *
@@ -25,7 +25,7 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Kalkulator"
 
    IDS_COPYRIGHT1,         "Kalkulator 5.0. Lisensert under LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Ugyldig informasjon for funksjon."
    IDS_ERR_DIVIDE_BY_ZERO, "Kan ikke dividere p<> null."
    IDS_ERR_UNDEFINED,      "Resultatet av funksjoner er ubestemt."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Rediger" {
+BEGIN
+   POPUP "&Rediger"
+   BEGIN
       MENUITEM "&Kopier Ctrl+C",     IDM_COPY
       MENUITEM "&Lim inn Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Vis" {
+   END
+   POPUP "&Vis"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Vitenskapelig",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Siffergruppering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Hjelp" {
+   END
+   POPUP "&Hjelp"
+   BEGIN
       MENUITEM "Emner i hjelp",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Om kalkulator", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Rediger" {
+BEGIN
+   POPUP "&Rediger"
+   BEGIN
       MENUITEM "&Kopiere Ctrl+C",     IDM_COPY
       MENUITEM "&Lim inn Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Vis" {
+   END
+   POPUP "&Vis"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Vitenskapelig",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Gradienter\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Siffergruppering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Hjelp" {
+   END
+   POPUP "&Hjelp"
+   BEGIN
       MENUITEM "Emner i hjelp",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Om Kalkulator", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Rediger" {
+BEGIN
+   POPUP "&Rediger"
+   BEGIN
       MENUITEM "&Kopier Ctrl+C",     IDM_COPY
       MENUITEM "&Lim inn Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Vis" {
+   END
+   POPUP "&Vis"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Vitenskapelig",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,40 +131,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Siffergruppering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Emner i hjelp",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Om Kalkulator", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "Om GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Hva er dette?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "Hva er dette?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistics Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,5 +1,5 @@
 /*
- * WineCalc (Nl.rc)
+ * WineCalc (nl-NL.rc)
  *
  * Copyright 2003 James Briggs
  *
@@ -25,7 +25,7 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL  //vertaald door Lionel Lowie
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Rekenmachine"
 
    IDS_COPYRIGHT1,         "Calculator 5.0. Licensed under LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Ongeldige invoer voor de functie."
    IDS_ERR_DIVIDE_BY_ZERO, "Kan niet delen door nul."
    IDS_ERR_UNDEFINED,      "Resultaat van de functie is onbepaald."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Bewerken" {
+BEGIN
+   POPUP "&Bewerken"
+   BEGIN
       MENUITEM "&Kopi<70>ren Ctrl+C",     IDM_COPY
       MENUITEM "&Plakken Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Beeld" {
+   END
+   POPUP "&Beeld"
+   BEGIN
       MENUITEM "Standaard",         IDM_MODE_STANDARD
       MENUITEM "Wetenschappelijk",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Cijfergroepering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help-onderwerpen",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Info", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Bewerken" {
+BEGIN
+   POPUP "&Bewerken"
+   BEGIN
       MENUITEM "&Kopi<70>ren Ctrl+C",     IDM_COPY
       MENUITEM "&Plakken Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Standaard",         IDM_MODE_STANDARD
       MENUITEM "Wetenschappelijk",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Gradi<64>nten\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Cijfergroepering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help-onderwerpen",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Info", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Bewerken" {
+BEGIN
+   POPUP "&Bewerken"
+   BEGIN
       MENUITEM "&Kopi<70>ren Ctrl+C",     IDM_COPY
       MENUITEM "&Plakken Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Standaard",         IDM_MODE_STANDARD
       MENUITEM "Wetenschappelijk",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,13 +131,14 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Cijfergroepering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help-onderwerpen",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Info", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
@@ -137,26 +146,28 @@ BEGIN
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-   POPUP "" {
+BEGIN
+   POPUP ""
+   BEGIN
       MENUITEM "Wat is dit?",     IDM_WHATS_THIS
-  }
-}
+   END
+END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "Over GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
-DLG_STATS DIALOG 12,0,125,78
+DLG_STATS DIALOGEX 12,0,145,85
 CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -12,7 +12,7 @@
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Kalkulator"
 
    IDS_COPYRIGHT1,         "Kalkulator 5.0. Na licencji LGPL 2"
@@ -33,34 +33,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Niew<65>a<EFBFBD>ciwy argument funkcji."
    IDS_ERR_DIVIDE_BY_ZERO, "Nie mo<6D>na dzieli<6C> przez zero."
    IDS_ERR_UNDEFINED,      "Nieokre<72>lony wynik funkcji."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Edytuj" {
+BEGIN
+   POPUP "&Edytuj"
+   BEGIN
       MENUITEM "&Kopiuj\tCtrl+C",     IDM_COPY
       MENUITEM "&Wklej\tCtrl+V",      IDM_PASTE
-   }
-   POPUP "&Widok" {
+   END
+   POPUP "&Widok"
+   BEGIN
       MENUITEM "&Standardowy",         IDM_MODE_STANDARD
       MENUITEM "&Naukowy",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "&Grupowanie cyfr",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Pomo&c" {
+   END
+   POPUP "Pomo&c"
+   BEGIN
       MENUITEM "&Tematy pomocy",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Kalkulator - &informacje", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edytuj" {
+BEGIN
+   POPUP "&Edytuj"
+   BEGIN
       MENUITEM "&Kopiuj\tCtrl+C",     IDM_COPY
       MENUITEM "&Wklej\tCtrl+V",    IDM_PASTE
-   }
-   POPUP "&Widok" {
+   END
+   POPUP "&Widok"
+   BEGIN
       MENUITEM "&Standardowy",         IDM_MODE_STANDARD
       MENUITEM "&Naukowy",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -74,21 +79,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "G&radusy\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "&Grupowanie cyfr",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Pomo&c" {
+   END
+   POPUP "Pomo&c"
+   BEGIN
       MENUITEM "&Tematy pomocy",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Kalkulator - &informacje", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edytuj" {
+BEGIN
+   POPUP "&Edytuj"
+   BEGIN
       MENUITEM "&Kopiuj\tCtrl+C",     IDM_COPY
       MENUITEM "&Wklej\tCtrl+V",    IDM_PASTE
-   }
-   POPUP "&Widok" {
+   END
+   POPUP "&Widok"
+   BEGIN
       MENUITEM "&Standardowy",         IDM_MODE_STANDARD
       MENUITEM "&Naukowy",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -103,40 +111,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "&Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "&Grupowanie cyfr",   IDM_DIGIT_GROUPING
-   }
-   POPUP "Pomo&c" {
+   END
+   POPUP "Pomo&c"
+   BEGIN
       MENUITEM "&Tematy pomocy",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "&Kalkulator - informacje", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "Informacje GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Co to?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "Co to?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistics Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -0,0 +1,173 @@
+/*
+ * WineCalc (pt-BR.rc)
+ *
+ * Copyright 2003 James Briggs
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "windows.h"
+#include "resource.h"
+#include "winecalc.h"
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
+
+STRINGTABLE DISCARDABLE
+BEGIN
+   IDS_APPNAME,            "Calculadora"
+
+   IDS_COPYRIGHT1,         "Calculadora 5.0. Licenciada sob LGPL 2"
+   IDS_COPYRIGHT2          "Copyright 2003, James Briggs"
+   IDS_COPYRIGHT3          "San Jose, California, USA"
+   IDS_COPYRIGHT4          "james@ActionMessage.com"
+   IDS_COPYRIGHT5          "http://www.ActionMessage.com/winecalc/"
+
+   IDS_BTN_BACKSPACE,      "Backspace"
+   IDS_BTN_CLEAR_ENTRY,    "CE"
+   IDS_BTN_CLEAR_ALL,      "C"
+   IDS_BTN_MEM_CLEAR,      "MC"
+   IDS_BTN_MEM_RECALL,     "MR"
+   IDS_BTN_MEM_STORE,      "MS"
+   IDS_BTN_MEM_PLUS,       "M+"
+   IDS_BTN_MEM_STATUS_M,   "M"
+   IDS_BTN_SQRT,           "sqrt"
+   IDS_BTN_DEGREES,        "Graus"
+   IDS_BTN_RADIANS,        "Radianos"
+   IDS_BTN_GRADS,          "Grados"
+   IDS_BTN_SHRT_HEX        "Hex"
+   IDS_BTN_SHRT_DEC        "Dec"
+   IDS_BTN_SHRT_OCT        "Oct"
+   IDS_BTN_SHRT_BIN        "Bin"
+   IDS_ERR_INVALID_INPUT,  "Valor inv<6E>lido para a fun<75><6E>o."
+   IDS_ERR_DIVIDE_BY_ZERO, "Imposs<73>vel dividir por 0."
+   IDS_ERR_UNDEFINED,      "O resultado da fun<75><6E>o <20> indefinido."
+END
+
+MAIN_MENU MENU DISCARDABLE
+BEGIN
+   POPUP "&Editar" 
+   BEGIN
+      MENUITEM "&Copiar Ctrl+C",   IDM_COPY
+      MENUITEM "Co&lar Ctrl+V",    IDM_PASTE
+   END
+   POPUP "E&xibir"
+   BEGIN
+      MENUITEM "&Padr<64>o",           IDM_MODE_STANDARD
+      MENUITEM "&Cient<6E>fica",       IDM_MODE_SCIENTIFIC
+      MENUITEM SEPARATOR
+      MENUITEM "&Agrupamento de d<>gitos",   IDM_DIGIT_GROUPING
+   END
+   POPUP "Aj&uda"
+   BEGIN
+      MENUITEM "&T<>pico de ajuda",      IDM_HELP_TOPICS
+      MENUITEM SEPARATOR
+      MENUITEM "So&bre a Calculadora", IDM_ABOUT
+   END
+END
+
+SCIMS_MENU MENU DISCARDABLE
+BEGIN
+   POPUP "&Editar"
+   BEGIN
+      MENUITEM "&Copiar Ctrl+C",   IDM_COPY
+      MENUITEM "Co&lar Ctrl+V",    IDM_PASTE
+   END
+   POPUP "E&xibir"
+   BEGIN
+      MENUITEM "&Padr<64>o",           IDM_MODE_STANDARD
+      MENUITEM "&Cient<6E>fica",       IDM_MODE_SCIENTIFIC
+      MENUITEM SEPARATOR
+	MENUITEM "&Hex\tF5",          ID_CALC_NS_HEX
+	MENUITEM "&Decimal\tF6",      ID_CALC_NS_DEC
+	MENUITEM "&Octal\tF7",        ID_CALC_NS_OCT
+	MENUITEM "&Bin<69>rio\tF8",       ID_CALC_NS_BIN
+      MENUITEM SEPARATOR
+      MENUITEM "Gra&us\tF2",      ID_CALC_MS_DEGREES
+      MENUITEM "&Radianos\tF3",      ID_CALC_MS_RADIANS
+	MENUITEM "&Grados\tF4",        ID_CALC_MS_GRADS
+      MENUITEM SEPARATOR
+      MENUITEM "&Agrupamento de d<>gitos",   IDM_DIGIT_GROUPING
+   END
+   POPUP "Aj&uda"
+   BEGIN
+      MENUITEM "&T<>pico de ajuda",      IDM_HELP_TOPICS
+      MENUITEM SEPARATOR
+      MENUITEM "So&bre a Calculadora", IDM_ABOUT
+   END
+END
+
+SCIWS_MENU MENU DISCARDABLE
+BEGIN
+   POPUP "&Editar"
+   BEGIN
+      MENUITEM "&Copiar Ctrl+C",   IDM_COPY
+      MENUITEM "Co&lar Ctrl+V",    IDM_PASTE
+   END
+   POPUP "E&xibir" 
+   BEGIN
+      MENUITEM "&Padr<64>o",           IDM_MODE_STANDARD
+      MENUITEM "&Cient<6E>fica",       IDM_MODE_SCIENTIFIC
+      MENUITEM SEPARATOR
+	MENUITEM "&Hex\tF5",          ID_CALC_NS_HEX
+	MENUITEM "&Decimal\tF6",      ID_CALC_NS_DEC
+	MENUITEM "&Octal\tF7",        ID_CALC_NS_OCT
+	MENUITEM "&Bin<69>rio\tF8",       ID_CALC_NS_BIN
+      MENUITEM SEPARATOR
+	MENUITEM "Qword\tF12",       ID_CALC_WS_QWORD
+	MENUITEM "Dword\tF2",        ID_CALC_WS_DWORD
+	MENUITEM "Word\tF3",         ID_CALC_WS_WORD
+	MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
+      MENUITEM SEPARATOR
+      MENUITEM "&Agrupamento de d<>gitos",   IDM_DIGIT_GROUPING
+   END
+   POPUP "Aj&uda"
+   BEGIN
+      MENUITEM "&T<>pico de ajuda",      IDM_HELP_TOPICS
+      MENUITEM SEPARATOR
+      MENUITEM "So&bre a Calculadora", IDM_ABOUT
+   END
+END
+
+MAIN_MENU ACCELERATORS
+BEGIN
+   VK_F1, IDV_HELP,     VIRTKEY
+END
+
+WHATS_THIS_MENU MENU DISCARDABLE
+BEGIN
+   POPUP ""
+   BEGIN
+      MENUITEM "O que <20> isto?",     IDM_WHATS_THIS
+  END
+END
+
+DLG_ABOUT DIALOGEX 12,0,175,90
+CAPTION "Sobre a Calculadora"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
+BEGIN
+   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistics Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+END

reactos/base/applications/calc/lang/pt-PT.rc

@@ -1,5 +1,5 @@
 /*
- * WineCalc (Pt.rc)
+ * WineCalc (pt-PT.rc)
  *
  * Copyright 2003 James Briggs
  *
@@ -22,10 +22,10 @@
 #include "resource.h"
 #include "winecalc.h"
 
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_PORTUGAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Calculator"
 
    IDS_COPYRIGHT1,         "Calculator 5.0. Licensed under LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Invalid input for function."
    IDS_ERR_DIVIDE_BY_ZERO, "Cannot divide by zero."
    IDS_ERR_UNDEFINED,      "Result of function is undefined."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",     IDM_COPY
       MENUITEM "&Paste Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientific",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Digit Grouping",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help Topics",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "About Calculator", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",     IDM_COPY
       MENUITEM "&Paste Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientific",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Grads\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Digit Grouping",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help Topics",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "About Calculator", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Edit" {
+BEGIN
+   POPUP "&Edit"
+   BEGIN
       MENUITEM "&Copy Ctrl+C",     IDM_COPY
       MENUITEM "&Paste Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&View" {
+   END
+   POPUP "&View"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Scientific",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,13 +131,14 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Digit Grouping",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Help" {
+   END
+   POPUP "&Help"
+   BEGIN
       MENUITEM "Help Topics",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "About Calculator", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
@@ -137,26 +146,28 @@ BEGIN
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-   POPUP "" {
+BEGIN
+   POPUP ""
+   BEGIN
       MENUITEM "What's This?",     IDM_WHATS_THIS
-  }
-}
+   END
+END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "About GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
-DLG_STATS DIALOG 12,0,125,78
+DLG_STATS DIALOGEX 12,0,145,85
 CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -1,11 +1,11 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
-   IDS_COPYRIGHT1,         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 5.0. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> LGPL 2"
-   IDS_COPYRIGHT2          "Copyright 2003, James Briggs"
+   IDS_COPYRIGHT1,         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 5.0. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> LGPL 2"
+   IDS_COPYRIGHT2          "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28>) 2003, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
    IDS_COPYRIGHT3          "<22><><EFBFBD>-<2D><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>"
    IDS_COPYRIGHT4          "james@ActionMessage.com"
    IDS_COPYRIGHT5          "http://www.ActionMessage.com/winecalc/"
@@ -29,34 +29,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
    IDS_ERR_DIVIDE_BY_ZERO, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
    IDS_ERR_UNDEFINED,      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",  IDM_COPY
       MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",            IDM_MODE_STANDARD
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",            IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD>", IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "&<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",        IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \tCtrl+C",  IDM_COPY
       MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> \tCtrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",            IDM_MODE_STANDARD
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",            IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -70,21 +75,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>\tF4",       ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD>", IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "&<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",        IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \tCtrl+C",  IDM_COPY
       MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> \tCtrl+V",    IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",            IDM_MODE_STANDARD
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",            IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -99,40 +107,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "8-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF4",    ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD>", IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "&<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",        IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,175,80
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "<22> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GNU WineCalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       5, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "<22><><EFBFBD> <20><><EFBFBD>?",            IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "<22><><EFBFBD> <20><><EFBFBD>?",            IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

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

@@ -12,7 +12,7 @@
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Kalkula<6C>ka"
 
    IDS_COPYRIGHT1,         "Kalkula<6C>ka 5.0. Licencovan<61> pod LGPL 2"
@@ -40,34 +40,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Neplatn<74> vstup pre funkciu."
    IDS_ERR_DIVIDE_BY_ZERO, "Nulou nemo<6D>no deli<6C>."
    IDS_ERR_UNDEFINED,      "V<>sledok funkcie je nedefinovan<61>."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "<22>pr&avy" {
+BEGIN
+   POPUP "<22>pr&avy"
+   BEGIN
       MENUITEM "&Kop<6F>rova<76> Ctrl+C",     IDM_COPY
       MENUITEM "Pri&lepi<70> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Zobrazi<7A>" {
+   END
+   POPUP "&Zobrazi<7A>"
+   BEGIN
       MENUITEM "<22>&tandardn<64>",         IDM_MODE_STANDARD
       MENUITEM "&Vedeck<63>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Zoskupov&a<> <20><>slice",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Pomocn<63>k" {
+   END
+   POPUP "&Pomocn<63>k"
+   BEGIN
       MENUITEM "&T<>my Pomocn<63>ka",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22>&o je Kalkula<6C>ka", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "<22>pr&avy" {
+BEGIN
+   POPUP "<22>pr&avy"
+   BEGIN
       MENUITEM "&Kop<6F>rova<76> Ctrl+C",     IDM_COPY
       MENUITEM "Pri&lepi<70> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Zobrazi<7A>" {
+   END
+   POPUP "&Zobrazi<7A>"
+   BEGIN
       MENUITEM "<22>&tandardn<64>",         IDM_MODE_STANDARD
       MENUITEM "&Vedeck<63>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -81,21 +86,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "&Grady\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Zoskupov&a<> <20><>slice",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Pomocn<63>k" {
+   END
+   POPUP "&Pomocn<63>k"
+   BEGIN
       MENUITEM "&T<>my Pomocn<63>ka",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22>&o je Kalkula<6C>ka", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "<22>pr&avy" {
+BEGIN
+   POPUP "<22>pr&avy"
+   BEGIN
       MENUITEM "&Kop<6F>rova<76> Ctrl+C",     IDM_COPY
       MENUITEM "Pri&lepi<70> Ctrl+V",    IDM_PASTE
-   }
-   POPUP "&Zobrazi<7A>" {
+   END
+   POPUP "&Zobrazi<7A>"
+   BEGIN
       MENUITEM "<22>&tandardn<64>",         IDM_MODE_STANDARD
       MENUITEM "&Vedeck<63>",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -110,40 +118,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "&Bajt\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Zoskupov&a<> <20><>slice",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Pomocn<63>k" {
+   END
+   POPUP "&Pomocn<63>k"
+   BEGIN
       MENUITEM "&T<>my Pomocn<63>ka",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22>&o je Kalkula<6C>ka", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "<22>o je Kalkula<6C>ka"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "<22>o je toto?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "<22>tatistika"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "<22>o je toto?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "<22>tatistika"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

reactos/base/applications/calc/lang/sv-SE.rc

@@ -1,5 +1,5 @@
 /*
- * WineCalc (En.rc)
+ * WineCalc (sv-SE.rc)
  *
  * Copyright 2005 David Nordenberg
  *
@@ -26,7 +26,7 @@
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "Kalkylatorn"
 
    IDS_COPYRIGHT1,         "Kalkylatorn 5.0. Licenserad under LGPL 2"
@@ -54,34 +54,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "Felaktig indata f<>r funktion."
    IDS_ERR_DIVIDE_BY_ZERO, "Kan inte dividera med noll."
    IDS_ERR_UNDEFINED,      "Funktionens resultat <20>r odefinerat."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&Redigera" {
+BEGIN
+   POPUP "&Redigera"
+   BEGIN
       MENUITEM "&Kopiera\tCtrl+C",     IDM_COPY
       MENUITEM "K&listra in\tCtrl+V",    IDM_PASTE
-   }
-   POPUP "&Visa" {
+   END
+   POPUP "&Visa"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Vetenskaplig",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "Siffergruppering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Hj<48>lp" {
+   END
+   POPUP "&Hj<48>lp"
+   BEGIN
       MENUITEM "Hj<48>lpavsnitt",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Om Kalkylatorn", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&Redigera" {
+BEGIN
+   POPUP "&Redigera"
+   BEGIN
       MENUITEM "&Kopiera\tCtrl+C",     IDM_COPY
       MENUITEM "K&listra in\tCtrl+V",    IDM_PASTE
-   }
-   POPUP "&Visa" {
+   END
+   POPUP "&Visa"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Vetenskaplig",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -95,21 +100,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "Gradienter\tF4",        ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "Siffergruppering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Hj<48>lp" {
+   END
+   POPUP "&Hj<48>lp"
+   BEGIN
       MENUITEM "Hj<48>lpavsnitt",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Om Kalkylatorn", IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&Redigera" {
+BEGIN
+   POPUP "&Redigera"
+   BEGIN
       MENUITEM "&Kopiera\tCtrl+C",     IDM_COPY
       MENUITEM "K&listra in\tCtrl+V",    IDM_PASTE
-   }
-   POPUP "&Visa" {
+   END
+   POPUP "&Visa"
+   BEGIN
       MENUITEM "Standard",         IDM_MODE_STANDARD
       MENUITEM "Vetenskaplig",       IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -124,40 +132,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "Siffergruppering",   IDM_DIGIT_GROUPING
-   }
-   POPUP "&Hj<48>lp" {
+   END
+   POPUP "&Hj<48>lp"
+   BEGIN
       MENUITEM "Hj<48>lpavsnitt",      IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "Om Kalkylatorn", IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "Om GNU Kalkylatorn (winecalc)"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "Vad <20>r det h<>r?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistikruta"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "Vad <20>r det h<>r?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistikruta"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

reactos/base/applications/calc/lang/th-TH.rc

@@ -25,7 +25,7 @@
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
     IDS_APPNAME,	"ʶҹ<CAB6>Ҿ<EFBFBD><D2BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
     IDS_COPYRIGHT1,	"<22><><EFBFBD><EFBFBD><EFBFBD>ͧ<EFBFBD>Դ<EFBFBD>Ţ 5.0. <20>Ԣ<EFBFBD>Է<EFBFBD><D4B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
     IDS_ERR_INVALID_INPUT,	"<22><>ҷ<EFBFBD><D2B7><EFBFBD><EFBFBD>͹<EFBFBD><CDB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ö<EFBFBD><C3B6><EFBFBD>㹡óչ<C3B3><D5B9><EFBFBD><EFBFBD><EFBFBD>"
     IDS_ERR_DIVIDE_BY_ZERO,	"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ö<EFBFBD><C3B6>ô<EFBFBD><C3B4><EFBFBD><EFBFBD>ٹ<EFBFBD><D9B9>"
     IDS_ERR_UNDEFINED,		"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ö<EFBFBD>ʴ<EFBFBD><CAB4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
         MENUITEM "<22>Ѵ<EFBFBD>͡ Ctrl+C",       IDM_COPY
         MENUITEM "<22>ҧ Ctrl+V",		IDM_PASTE
-    }
-    POPUP "&<26><><EFBFBD><EFBFBD>ͧ" {
+    END
+    POPUP "&<26><><EFBFBD><EFBFBD>ͧ"
+   BEGIN
         MENUITEM "Ẻ<>ҵðҹ",		IDM_MODE_STANDARD
         MENUITEM "Ẻ<>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>",      IDM_MODE_SCIENTIFIC
         MENUITEM SEPARATOR
         MENUITEM "<22>ʴ<EFBFBD><CAB4><EFBFBD>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD>Ţ",      IDM_DIGIT_GROUPING
-    }
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+    END
+    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>Ū<EFBFBD><C5AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",	IDM_HELP_TOPICS
         MENUITEM SEPARATOR
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>ǡѺ GNU WineCalc", IDM_ABOUT
-    }
-}
+    END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
         MENUITEM "<22>Ѵ<EFBFBD>͡ Ctrl+C",       IDM_COPY
         MENUITEM "<22>ҧ Ctrl+V",		IDM_PASTE
-    }
-    POPUP "<22><><EFBFBD><EFBFBD>ͧ" {
+    END
+    POPUP "<22><><EFBFBD><EFBFBD>ͧ"
+    BEGIN
         MENUITEM "Ẻ<>ҵðҹ",		IDM_MODE_STANDARD
         MENUITEM "Ẻ<>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>",      IDM_MODE_SCIENTIFIC
         MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¹\tF4",	ID_CALC_MS_GRADS
         MENUITEM SEPARATOR
         MENUITEM "<22>ʴ<EFBFBD><CAB4><EFBFBD>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD>Ţ",      IDM_DIGIT_GROUPING
-    }
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+    END
+    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>Ū<EFBFBD><C5AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",	IDM_HELP_TOPICS
         MENUITEM SEPARATOR
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>ǡѺ GNU WineCalc", IDM_ABOUT
-    }
-}
+    END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD>"
+    BEGIN
         MENUITEM "<22>Ѵ<EFBFBD>͡ Ctrl+C",       IDM_COPY
         MENUITEM "<22>ҧ Ctrl+V",		IDM_PASTE
-    }
-    POPUP "<22><><EFBFBD><EFBFBD>ͧ" {
+    END
+    POPUP "<22><><EFBFBD><EFBFBD>ͧ"
+    BEGIN
         MENUITEM "Ẻ<>ҵðҹ",		IDM_MODE_STANDARD
         MENUITEM "Ẻ<>Է<EFBFBD><D4B7><EFBFBD><EFBFBD>ʵ<EFBFBD><CAB5>",      IDM_MODE_SCIENTIFIC
         MENUITEM SEPARATOR
@@ -123,40 +131,43 @@ SCIWS_MENU MENU DISCARDABLE
         MENUITEM "Byte\tF4",		ID_CALC_WS_BYTE
         MENUITEM SEPARATOR
         MENUITEM "<22>ʴ<EFBFBD><CAB4><EFBFBD>ѡ<EFBFBD><D1A1><EFBFBD><EFBFBD>Ţ",      IDM_DIGIT_GROUPING
-    }
-    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+    END
+    POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    BEGIN
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>Ū<EFBFBD><C5AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",	IDM_HELP_TOPICS
         MENUITEM SEPARATOR
         MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>ǡѺ GNU WineCalc", IDM_ABOUT
-    }
-}
+    END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
     VK_F1, IDV_HELP, VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ǡѺ GNU WineCalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-    DEFPUSHBUTTON "<22><>ŧ", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+    DEFPUSHBUTTON "<22><>ŧ", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-        MENUITEM "<22><>觹<EFBFBD><E8A7B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?",	IDM_WHATS_THIS
-    }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "<22><><EFBFBD>ͧʶҹ<CAB6>"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-    DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-    PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-    PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-    PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+    POPUP ""
+    BEGIN
+        MENUITEM "<22><>觹<EFBFBD><E8A7B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ?",	IDM_WHATS_THIS
+    END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "<22><><EFBFBD>ͧʶҹ<CAB6>"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+    DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+    PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+    PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+    PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

reactos/base/applications/calc/lang/uk-UA.rc

@@ -1,5 +1,5 @@
 /*
- * WineCalc (Uk.rc)
+ * WineCalc (uk-UA.rc)
  *
  * Copyright 2006 Artem Reznikov
  *
@@ -25,7 +25,7 @@
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
    IDS_COPYRIGHT1,         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 5.0. ˳<><CBB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> LGPL 2"
@@ -53,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
    IDS_ERR_DIVIDE_BY_ZERO, "ij<><C4B3><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>."
    IDS_ERR_UNDEFINED,      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",      IDM_COPY
       MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",       IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",             IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>", IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                  IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "About Calculator",       IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",      IDM_COPY
       MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",       IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",             IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -94,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>\tF4",          ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>", IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                  IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",        IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+BEGIN
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Ctrl+C",      IDM_COPY
       MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> Ctrl+V",       IDM_PASTE
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              IDM_MODE_STANDARD
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",             IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -123,40 +131,43 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Byte\tF4",           ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "ʳ<><CAB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>", IDM_DIGIT_GROUPING
-   }
-   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
+   END
+   POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",                  IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",        IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
    VK_F1, IDV_HELP,     VIRTKEY
 END
 
-DLG_ABOUT DIALOG 12,0,120,82
+DLG_ABOUT DIALOGEX 12,0,175,90
 CAPTION "<22><><EFBFBD> GNU winecalc"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 BEGIN
-   DEFPUSHBUTTON "OK", IDOK,       42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+   DEFPUSHBUTTON "OK", IDOK,       73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
-      MENUITEM "<22><> <20><>?",     IDM_WHATS_THIS
-   }
-}
-
-DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistics Box"
-FONT 9, "Tahoma"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN
-   DEFPUSHBUTTON "&RET",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "&CD"    ID_STATS_CD,   64, 52, 25, 13, WS_TABSTOP | WS_GROUP
-   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  94, 52, 25, 13, WS_TABSTOP | WS_GROUP
+   POPUP ""
+   BEGIN
+      MENUITEM "<22><> <20><>?",     IDM_WHATS_THIS
+   END
+END
+
+DLG_STATS DIALOGEX 12,0,145,85
+CAPTION "Statistics Box"
+FONT 8, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+BEGIN
+   DEFPUSHBUTTON "&RET",  ID_STATS_RET,    4, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&LOAD", ID_STATS_LOAD,  39, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "&CD"    ID_STATS_CD,    74, 52, 30, 13, WS_TABSTOP | WS_GROUP
+   PUSHBUTTON    "C&AD",  ID_STATS_CAD,  109, 52, 30, 13, WS_TABSTOP | WS_GROUP
 END

reactos/base/applications/calc/lang/zh-CN.rc

@@ -22,12 +22,10 @@
 #include "resource.h"
 #include "winecalc.h"
 
-//#define IDC_STATIC    1000
-
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 STRINGTABLE DISCARDABLE
-{
+BEGIN
    IDS_APPNAME,            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 
    IDS_COPYRIGHT1,         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 5.0. <20><><EFBFBD><EFBFBD> LGPL 2 Э<><D0AD>"
@@ -55,34 +53,39 @@ STRINGTABLE DISCARDABLE
    IDS_ERR_INVALID_INPUT,  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD><D0A7>"
    IDS_ERR_DIVIDE_BY_ZERO, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD>㡣"
    IDS_ERR_UNDEFINED,      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD>塣"
-}
+END
 
 MAIN_MENU MENU DISCARDABLE
-{
-   POPUP "<22>༭(&E)" {
+BEGIN
+   POPUP "<22>༭(&E)"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD>(&C) Ctrl+C",       IDM_COPY
       MENUITEM "ճ<><D5B3>(&P) Ctrl+V",       IDM_PASTE
-   }
-   POPUP "<22>鿴(&V)" {
+   END
+   POPUP "<22>鿴(&V)"
+   BEGIN
       MENUITEM "<22><>׼<EFBFBD><D7BC>",                IDM_MODE_STANDARD
       MENUITEM "<22><>ѧ<EFBFBD><D1A7>",                IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>",              IDM_DIGIT_GROUPING
-   }
-   POPUP "<22><><EFBFBD><EFBFBD>(&H)" {
+   END
+   POPUP "<22><><EFBFBD><EFBFBD>(&H)"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD>ڼ<EFBFBD><DABC><EFBFBD><EFBFBD><EFBFBD>",            IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIMS_MENU MENU DISCARDABLE
-{
-   POPUP "<22>༭(&E)" {
+BEGIN
+   POPUP "<22>༭(&E)"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD>(&C) Ctrl+C",       IDM_COPY
       MENUITEM "ճ<><D5B3>(&P) Ctrl+V",       IDM_PASTE
-   }
-   POPUP "<22>鿴(&V)" {
+   END
+   POPUP "<22>鿴(&V)"
+   BEGIN
       MENUITEM "<22><>׼<EFBFBD><D7BC>",                IDM_MODE_STANDARD
       MENUITEM "<22><>ѧ<EFBFBD><D1A7>",                IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -96,21 +99,24 @@ SCIMS_MENU MENU DISCARDABLE
 	  MENUITEM "<22>ݶ<EFBFBD>\tF4",          ID_CALC_MS_GRADS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>",              IDM_DIGIT_GROUPING
-   }
-   POPUP "<22><><EFBFBD><EFBFBD>(&H)" {
+   END
+   POPUP "<22><><EFBFBD><EFBFBD>(&H)"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD>ڼ<EFBFBD><DABC><EFBFBD><EFBFBD><EFBFBD>",            IDM_ABOUT
-   }
-}
+   END
+END
 
 SCIWS_MENU MENU DISCARDABLE
-{
-   POPUP "<22>༭(&E)" {
+BEGIN
+   POPUP "<22>༭(&E)"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD>(&C) Ctrl+C",       IDM_COPY
       MENUITEM "ճ<><D5B3>(&P) Ctrl+V",       IDM_PASTE
-   }
-   POPUP "<22>鿴(&V)" {
+   END
+   POPUP "<22>鿴(&V)"
+   BEGIN
       MENUITEM "<22><>׼<EFBFBD><D7BC>",                IDM_MODE_STANDARD
       MENUITEM "<22><>ѧ<EFBFBD><D1A7>",                IDM_MODE_SCIENTIFIC
       MENUITEM SEPARATOR
@@ -125,13 +131,14 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "<22>ֽ<EFBFBD>\tF4",          ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>",              IDM_DIGIT_GROUPING
-   }
-   POPUP "<22><><EFBFBD><EFBFBD>(&H)" {
+   END
+   POPUP "<22><><EFBFBD><EFBFBD>(&H)"
+   BEGIN
       MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              IDM_HELP_TOPICS
       MENUITEM SEPARATOR
       MENUITEM "<22><><EFBFBD>ڼ<EFBFBD><DABC><EFBFBD><EFBFBD><EFBFBD>",            IDM_ABOUT
-   }
-}
+   END
+END
 
 MAIN_MENU ACCELERATORS
 BEGIN
@@ -140,26 +147,26 @@ END
 
 
 DLG_ABOUT DIALOGEX 12, 0, 140, 95
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "<22><><EFBFBD><EFBFBD> GNU winecalc"
-FONT 9, "MS Shell Dlg", 0, 0, 0x0
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     //LTEXT           "<22><><EFBFBD>ķ<EFBFBD><C4B7><EFBFBD>:<3A>ű<EFBFBD> (e_zb@21cn.com, ezb@mail.gywb.cn)",IDC_STATIC, 5, 57, 111, 25
     DEFPUSHBUTTON   "ȷ<><C8B7>",IDOK, 55, 75, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
 
 WHATS_THIS_MENU MENU DISCARDABLE
-{
-    POPUP "" {
+BEGIN
+   POPUP ""
+   BEGIN
       MENUITEM "What's This?",          IDM_WHATS_THIS
-   }
-}
+   END
+END
 
-DLG_STATS DIALOG 12,0,125,78
+DLG_STATS DIALOGEX 12,0,125,78
 CAPTION "ͳ<>ƿ<EFBFBD>"
-STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-FONT 9, "MS Shell Dlg"
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+FONT 8, "MS Shell Dlg"
 BEGIN
    DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD>(&R)",  ID_STATS_RET,   4, 52, 25, 13, WS_TABSTOP | WS_GROUP
    PUSHBUTTON    "<22><><EFBFBD><EFBFBD>(&L)", ID_STATS_LOAD,  34, 52, 25, 13, WS_TABSTOP | WS_GROUP

reactos/base/applications/calc/resource.h

@@ -32,7 +32,7 @@
 #define IDM_SEPARATOR3         1010
 #define IDM_WHATS_THIS         1011
 
-#define IDI_CALCICON           1050 
+#define IDI_CALCICON           1050
 
 /* strings */
 

reactos/base/applications/calc/rsrc.rc

@@ -41,6 +41,7 @@ IDI_CALCICON ICON "calculator.ico"
 #include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"
+#include "lang/pt-BR.rc"
 #include "lang/pt-PT.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"

reactos/base/applications/calc/winecalc.c

@@ -2948,16 +2948,16 @@ void calc_buffer_display(CALC *calc) {
     calcfloat real;
     static int old_base = NBASE_DECIMAL;
 
-   
+
     switch (calc->numBase) {
-    case NBASE_HEX:      
+    case NBASE_HEX:
         real = calc_atof(calc->buffer, old_base);
-        _stprintf(calc->display, _T("%lx"), (long)real);   
-        _stprintf(calc->buffer, _T("%lx"), (long)real);         
-        old_base = NBASE_HEX;        
+        _stprintf(calc->display, _T("%lx"), (long)real);
+        _stprintf(calc->buffer, _T("%lx"), (long)real);
+        old_base = NBASE_HEX;
         break;
 
-    case NBASE_OCTAL:  
+    case NBASE_OCTAL:
          real = calc_atof(calc->buffer, old_base);
         _stprintf(calc->display, TEXT("%lo"), (long)real);
         _stprintf(calc->buffer, TEXT("%lo"), (long)real);
@@ -2966,7 +2966,7 @@ void calc_buffer_display(CALC *calc) {
 
     case NBASE_BINARY:
         {
-          int buf=0;          
+          int buf=0;
           int t;
 
           if (calc->buffer[0]==_T('\0'))
@@ -2977,11 +2977,11 @@ void calc_buffer_display(CALC *calc) {
           {
             real = calc_atof(calc->buffer, old_base);
           }
-          
+
           calc->display[buf]=_T('0');
           calc->buffer[buf]=_T('0');
           for (t=31;t>=0;t--)
-          {                  
+          {
             if (((((long)real)>>t) & ~0xFFFFFFFE)==0)
             {
                 calc->display[buf]=_T('0');
@@ -2994,16 +2994,16 @@ void calc_buffer_display(CALC *calc) {
                 calc->buffer[buf]=_T('1');
                 buf++;
             }
-            
+
           }
-        
-          if (buf==0) 
+
+          if (buf==0)
           {
               buf++;
           }
-         
+
           calc->buffer[buf]=_T('\0');
-          calc->display[buf]=_T('\0');          
+          calc->display[buf]=_T('\0');
           old_base = NBASE_BINARY;
         }
         break;
@@ -3021,7 +3021,7 @@ void calc_buffer_display(CALC *calc) {
                 int lz = 0;
                 int exp = 0;
 
-                       
+
 
                 real = calc_atof(calc->buffer,old_base);
                 _stprintf(s, FMT_DESC_EXP, real);
@@ -3072,10 +3072,10 @@ void calc_buffer_display(CALC *calc) {
                 else
                 {
                     real = calc_atof(calc->buffer, old_base);
-                }           
-                _stprintf(calc->display, _T("%.f"), real);   
-                _stprintf(calc->buffer, _T("%.f"), real);               
-            }                              
+                }
+                _stprintf(calc->display, _T("%.f"), real);
+                _stprintf(calc->buffer, _T("%.f"), real);
+            }
 
             _tcscpy(s,calc->buffer);
             p = s;
@@ -3102,7 +3102,7 @@ void calc_buffer_display(CALC *calc) {
         }
         old_base = NBASE_DECIMAL;
     }
-   
+
     InvalidateRect(calc->hWnd, NULL, FALSE);
     UpdateWindow(calc->hWnd);
 }

reactos/base/applications/charmap/about.c

@@ -24,30 +24,34 @@ AboutDialogProc(HWND hDlg,
         case WM_INITDIALOG:
         {
             HWND  hLicenseEditWnd;
-            TCHAR strLicense[700];
+            WCHAR strLicense[700];
 
-            hIcon = LoadImage(hInstance,
-                              MAKEINTRESOURCE(IDI_ICON),
-                              IMAGE_ICON,
-                              16,
-                              16,
-                              0);
-
-            SendMessage(hDlg,
-                        WM_SETICON,
-                        ICON_SMALL,
-                        (LPARAM)hIcon);
+            hIcon = LoadImageW(hInstance,
+                               MAKEINTRESOURCEW(IDI_ICON),
+                               IMAGE_ICON,
+                               16,
+                               16,
+                               0);
+            if (hIcon)
+            {
+                SendMessageW(hDlg,
+                             WM_SETICON,
+                             ICON_SMALL,
+                             (LPARAM)hIcon);
+            }
 
             hLicenseEditWnd = GetDlgItem(hDlg,
                                          IDC_LICENSE_EDIT);
 
-            LoadString(hInstance,
-                       IDS_LICENSE,
-                       strLicense,
-                       sizeof(strLicense) / sizeof(TCHAR));
+            if (LoadStringW(hInstance,
+                            IDS_LICENSE,
+                            strLicense,
+                            sizeof(strLicense) / sizeof(WCHAR)))
+            {
+                SetWindowTextW(hLicenseEditWnd,
+                               strLicense);
+            }
 
-            SetWindowText(hLicenseEditWnd,
-                          strLicense);
             return TRUE;
         }
 
@@ -72,8 +76,8 @@ AboutDialogProc(HWND hDlg,
 VOID
 ShowAboutDlg(HWND hWndParent)
 {
-    DialogBox(hInstance,
-              MAKEINTRESOURCE(IDD_ABOUTBOX),
-              hWndParent,
-              AboutDialogProc);
+    DialogBoxW(hInstance,
+               MAKEINTRESOURCEW(IDD_ABOUTBOX),
+               hWndParent,
+               AboutDialogProc);
 }

reactos/base/applications/charmap/charmap.c

@@ -15,39 +15,39 @@ HINSTANCE hInstance;
 
 /* Font-enumeration callback */
 static int CALLBACK
-EnumFontNames(ENUMLOGFONTEX *lpelfe,
-              NEWTEXTMETRICEX *lpntme,
+EnumFontNames(ENUMLOGFONTEXW *lpelfe,
+              NEWTEXTMETRICEXW *lpntme,
               DWORD FontType,
               LPARAM lParam)
 {
     HWND hwndCombo = (HWND)lParam;
-    TCHAR *pszName  = lpelfe->elfLogFont.lfFaceName;
+    LPWSTR pszName  = lpelfe->elfLogFont.lfFaceName;
 
     /* make sure font doesn't already exist in our list */
-    if(SendMessage(hwndCombo,
-                   CB_FINDSTRING,
-                   0,
-                   (LPARAM)pszName) == CB_ERR)
+    if(SendMessageW(hwndCombo,
+                    CB_FINDSTRING,
+                    0,
+                    (LPARAM)pszName) == CB_ERR)
     {
         INT idx;
         BOOL fFixed;
         BOOL fTrueType;
 
         /* add the font */
-        idx = (INT)SendMessage(hwndCombo,
-                               CB_ADDSTRING,
-                               0,
-                               (LPARAM)pszName);
+        idx = (INT)SendMessageW(hwndCombo,
+                                CB_ADDSTRING,
+                                0,
+                                (LPARAM)pszName);
 
         /* record the font's attributes (Fixedwidth and Truetype) */
         fFixed = (lpelfe->elfLogFont.lfPitchAndFamily & FIXED_PITCH) ? TRUE : FALSE;
         fTrueType = (lpelfe->elfLogFont.lfOutPrecision == OUT_STROKE_PRECIS) ? TRUE : FALSE;
 
         /* store this information in the list-item's userdata area */
-        SendMessage(hwndCombo,
-                    CB_SETITEMDATA,
-                    idx,
-                    MAKEWPARAM(fFixed, fTrueType));
+        SendMessageW(hwndCombo,
+                     CB_SETITEMDATA,
+                     idx,
+                     MAKEWPARAM(fFixed, fTrueType));
     }
 
     return 1;
@@ -59,35 +59,34 @@ static VOID
 FillFontStyleComboList(HWND hwndCombo)
 {
     HDC hdc;
-    LOGFONT lf;
+    LOGFONTW lf;
 
     /* FIXME: for fun, draw each font in its own style */
     HFONT hFont = GetStockObject(DEFAULT_GUI_FONT);
-    SendMessage(hwndCombo,
-                WM_SETFONT,
-                (WPARAM)hFont,
-                0);
+    SendMessageW(hwndCombo,
+                 WM_SETFONT,
+                 (WPARAM)hFont,
+                 0);
 
+    ZeroMemory(&lf, sizeof(lf));
     lf.lfCharSet = DEFAULT_CHARSET;
-    lf.lfFaceName[0] = _T('\0');   // all fonts
-    lf.lfPitchAndFamily = 0;
 
     hdc = GetDC(hwndCombo);
 
     /* store the list of fonts in the combo */
-    EnumFontFamiliesEx(hdc,
-                       &lf,
-                       (FONTENUMPROC)EnumFontNames,
-                       (LPARAM)hwndCombo,
-                       0);
+    EnumFontFamiliesExW(hdc,
+                        &lf,
+                        (FONTENUMPROCW)EnumFontNames,
+                        (LPARAM)hwndCombo,
+                        0);
 
     ReleaseDC(hwndCombo,
               hdc);
 
-    SendMessage(hwndCombo,
-                CB_SETCURSEL,
-                0,
-                0);
+    SendMessageW(hwndCombo,
+                 CB_SETCURSEL,
+                 0,
+                 0);
 }
 
 
@@ -96,68 +95,72 @@ ChangeMapFont(HWND hDlg)
 {
     HWND hCombo;
     HWND hMap;
-    LPTSTR lpFontName;
+    LPWSTR lpFontName;
     INT Len;
 
     hCombo = GetDlgItem(hDlg, IDC_FONTCOMBO);
 
-    Len = GetWindowTextLength(hCombo);
+    Len = GetWindowTextLengthW(hCombo);
 
     if (Len != 0)
     {
         lpFontName = HeapAlloc(GetProcessHeap(),
                                0,
-                               (Len + 1) * sizeof(TCHAR));
+                               (Len + 1) * sizeof(WCHAR));
 
         if (lpFontName)
         {
-            SendMessage(hCombo,
-                        WM_GETTEXT,
-                        Len + 1,
-                        (LPARAM)lpFontName);
+            SendMessageW(hCombo,
+                         WM_GETTEXT,
+                         Len + 1,
+                         (LPARAM)lpFontName);
 
             hMap = GetDlgItem(hDlg, IDC_FONTMAP);
 
-            SendMessage(hMap,
-                        FM_SETFONT,
-                        0,
-                        (LPARAM)lpFontName);
+            SendMessageW(hMap,
+                         FM_SETFONT,
+                         0,
+                         (LPARAM)lpFontName);
         }
+
+        HeapFree(GetProcessHeap(),
+                 0,
+                 lpFontName);
     }
 }
 
 
 static VOID
 AddCharToSelection(HWND hText,
-                   TCHAR ch)
+                   WCHAR ch)
 {
-    LPTSTR lpText;
+    LPWSTR lpText;
     INT Len = GetWindowTextLength(hText);
 
     if (Len != 0)
     {
         lpText = HeapAlloc(GetProcessHeap(),
                            0,
-                           (Len + 2) * sizeof(TCHAR));
+                           (Len + 2) * sizeof(WCHAR));
 
         if (lpText)
         {
-            LPTSTR lpStr = lpText;
+            LPWSTR lpStr = lpText;
 
-            SendMessage(hText,
-                        WM_GETTEXT,
-                        Len + 1,
-                        (LPARAM)lpStr);
+            SendMessageW(hText,
+                         WM_GETTEXT,
+                         Len + 1,
+                         (LPARAM)lpStr);
 
             lpStr += Len;
             *lpStr = ch;
             lpStr++;
-            *lpStr = _T('\0');
+            *lpStr = L'\0';
 
-            SendMessage(hText,
-                        WM_SETTEXT,
-                        0,
-                        (LPARAM)lpText);
+            SendMessageW(hText,
+                         WM_SETTEXT,
+                         0,
+                         (LPARAM)lpText);
 
             HeapFree(GetProcessHeap(),
                      0,
@@ -166,15 +169,15 @@ AddCharToSelection(HWND hText,
     }
     else
     {
-        TCHAR szText[2];
+        WCHAR szText[2];
 
         szText[0] = ch;
-        szText[1] = _T('\0');
+        szText[1] = L'\0';
 
-        SendMessage(hText,
-                    WM_SETTEXT,
-                    0,
-                    (LPARAM)szText);
+        SendMessageW(hText,
+                     WM_SETTEXT,
+                     0,
+                     (LPARAM)szText);
     }
 }
 
@@ -185,35 +188,42 @@ DlgProc(HWND hDlg,
         WPARAM wParam,
         LPARAM lParam)
 {
+    static HICON hSmIcon;
+    static HICON hBgIcon;
+
     switch(Message)
     {
         case WM_INITDIALOG:
         {
-            HICON hSmIcon;
-            HICON hBgIcon;
             HMENU hSysMenu;
 
-            hSmIcon = LoadImage(hInstance,
-                                MAKEINTRESOURCE(IDI_ICON),
-                                IMAGE_ICON,
-                                16,
-                                16,
-                                0);
-            hBgIcon = LoadImage(hInstance,
-                                MAKEINTRESOURCE(IDI_ICON),
-                                IMAGE_ICON,
-                                32,
-                                32,
-                                0);
+            hSmIcon = LoadImageW(hInstance,
+                                 MAKEINTRESOURCEW(IDI_ICON),
+                                 IMAGE_ICON,
+                                 16,
+                                 16,
+                                 0);
+            if (hSmIcon)
+            {
+                 SendMessageW(hDlg,
+                              WM_SETICON,
+                              ICON_SMALL,
+                              (LPARAM)hSmIcon);
+            }
 
-            SendMessage(hDlg,
-                        WM_SETICON,
-                        ICON_SMALL,
-                        (LPARAM)hSmIcon);
-            SendMessage(hDlg,
-                        WM_SETICON,
-                        ICON_BIG,
-                        (LPARAM)hBgIcon);
+            hBgIcon = LoadImageW(hInstance,
+                                 MAKEINTRESOURCEW(IDI_ICON),
+                                 IMAGE_ICON,
+                                 32,
+                                 32,
+                                 0);
+            if (hBgIcon)
+            {
+                SendMessageW(hDlg,
+                             WM_SETICON,
+                             ICON_BIG,
+                             (LPARAM)hBgIcon);
+            }
 
             FillFontStyleComboList(GetDlgItem(hDlg,
                                               IDC_FONTCOMBO));
@@ -224,37 +234,42 @@ DlgProc(HWND hDlg,
                                      FALSE);
             if (hSysMenu != NULL)
             {
-                LPCTSTR lpAboutText = NULL;
+                LPCWSTR lpAboutText = NULL;
 
-                if (LoadString(hInstance,
-                               IDS_ABOUT,
-                               (LPTSTR)&lpAboutText,
-                               0))
+                if (LoadStringW(hInstance,
+                                IDS_ABOUT,
+                                (LPWSTR)&lpAboutText,
+                                0))
                 {
-                    AppendMenu(hSysMenu,
-                               MF_SEPARATOR,
-                               0,
-                               NULL);
-                    AppendMenu(hSysMenu,
-                               MF_STRING,
-                               ID_ABOUT,
-                               lpAboutText);
+                    AppendMenuW(hSysMenu,
+                                MF_SEPARATOR,
+                                0,
+                                NULL);
+                    AppendMenuW(hSysMenu,
+                                MF_STRING,
+                                ID_ABOUT,
+                                lpAboutText);
                 }
             }
             return TRUE;
         }
-        break;
-
-        case WM_CLOSE:
-        {
-            EndDialog(hDlg, 0);
-        }
-        break;
 
         case WM_COMMAND:
         {
             switch(LOWORD(wParam))
             {
+                case IDC_FONTMAP:
+                {
+                    switch (HIWORD(wParam))
+                    {
+                        case FM_SETCHAR:
+                            AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
+                                               LOWORD(lParam));
+                            break;
+                    }
+                }
+                break;
+
                 case IDC_FONTCOMBO:
                 {
                     if (HIWORD(wParam) == CBN_SELCHANGE)
@@ -266,10 +281,10 @@ DlgProc(HWND hDlg,
 
                 case IDC_SELECT:
                 {
-                    TCHAR ch;
+                    WCHAR ch;
                     HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
 
-                    ch = (TCHAR) SendMessage(hMap, FM_GETCHAR, 0, 0);
+                    ch = (WCHAR) SendMessageW(hMap, FM_GETCHAR, 0, 0);
 
                     if (ch)
                     {
@@ -281,6 +296,10 @@ DlgProc(HWND hDlg,
                 }
 
                 case IDOK:
+                    if (hSmIcon)
+                        DestroyIcon(hSmIcon);
+                    if (hBgIcon)
+                        DestroyIcon(hBgIcon);
                     EndDialog(hDlg, 0);
                 break;
             }
@@ -298,28 +317,13 @@ DlgProc(HWND hDlg,
         }
         break;
 
-        case WM_NOTIFY:
-        {
-            LPMAPNOTIFY lpnm = (LPMAPNOTIFY)lParam;
-
-            switch (lpnm->hdr.idFrom)
-            {
-                case IDC_FONTMAP:
-                {
-                    switch (lpnm->hdr.code)
-                    {
-                        case FM_SETCHAR:
-                        {
-                            AddCharToSelection(GetDlgItem(hDlg, IDC_TEXTBOX),
-                                               lpnm->ch);
-                        }
-                        break;
-                    }
-                }
-                break;
-            }
-        }
-        break;
+        case WM_CLOSE:
+            if (hSmIcon)
+                DestroyIcon(hSmIcon);
+            if (hBgIcon)
+                DestroyIcon(hBgIcon);
+            EndDialog(hDlg, 0);
+            break;
 
         default:
             return FALSE;
@@ -330,10 +334,10 @@ DlgProc(HWND hDlg,
 
 
 INT WINAPI
-_tWinMain(HINSTANCE hInst,
-          HINSTANCE hPrev,
-          LPTSTR Cmd,
-          int iCmd)
+wWinMain(HINSTANCE hInst,
+         HINSTANCE hPrev,
+         LPWSTR Cmd,
+         int iCmd)
 {
     INITCOMMONCONTROLSEX iccx;
     INT Ret = 1;
@@ -346,10 +350,10 @@ _tWinMain(HINSTANCE hInst,
 
     if (RegisterMapClasses(hInstance))
     {
-        Ret = DialogBox(hInstance,
-                        MAKEINTRESOURCE(IDD_CHARMAP),
-                        NULL,
-                        (DLGPROC)DlgProc) >= 0;
+        Ret = DialogBoxW(hInstance,
+                         MAKEINTRESOURCEW(IDD_CHARMAP),
+                         NULL,
+                         (DLGPROC)DlgProc) >= 0;
 
         UnregisterMapClasses(hInstance);
     }

reactos/base/applications/charmap/charmap.rbuild

@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
 	<include base="charmap">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>ntdll</library>

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

@@ -2,8 +2,8 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8,"MS Sans Serif",0,0
-STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
 BEGIN
   LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD> :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -11,16 +11,16 @@ BEGIN
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 3, 188, 75, 9
   EDITTEXT       IDC_TEXTBOX, 79, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>", IDC_SELECT, 194, 186, 46, 13
-  PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_COPY, 244, 186, 46, 13, WS_DISABLED
+  DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "<22>a<EFBFBD><61><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
 CAPTION "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8,"MS Sans Serif",0,0
-STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20>0,1\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
   PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDOK, 75, 162, 44, 15

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

@@ -2,8 +2,8 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 
 IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
 CAPTION "Mapa de car<61>cters"
-FONT 8,"MS Sans Serif",0,0
-STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
 BEGIN
   LTEXT         "Font :", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
@@ -11,16 +11,16 @@ BEGIN
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
   LTEXT         "Car<61>cters a copiar :", IDC_STATIC, 6, 188, 66, 9
   EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "Selecciona", IDC_SELECT, 194, 186, 46, 13
-  PUSHBUTTON    "Copia", IDC_COPY, 244, 186, 46, 13, WS_DISABLED
+  DEFPUSHBUTTON "Selecciona", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "Copia", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Vista avan<61>ada", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
 CAPTION "En quanta al Mapa de car<61>cters"
-FONT 8,"MS Sans Serif",0,0
-STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT         "Character Map v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
   PUSHBUTTON    "Tancar", IDOK, 75, 162, 44, 15

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

@@ -2,25 +2,25 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
 CAPTION "Zeichentabelle"
-FONT 8,"MS Sans Serif",0,0
-STYLE WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
 BEGIN
-  LTEXT         "Schrift :", IDC_STATIC, 6, 7, 24, 9
+  LTEXT         "Schrift:", IDC_STATIC, 6, 7, 24, 9
   COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
   PUSHBUTTON    "Hilfe", IDC_CMHELP, 249, 5, 35, 13
   CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "Zu kopierende Zeichen :", IDC_STATIC, 6, 188, 66, 9
+  LTEXT         "Zeichenauswahl:", IDC_STATIC, 6, 188, 66, 9
   EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "Ausw<73>hlen", IDC_SELECT, 194, 186, 46, 13
-  PUSHBUTTON    "Kopieren", IDC_COPY, 244, 186, 46, 13, WS_DISABLED
+  DEFPUSHBUTTON "Ausw<73>hlen", IDC_SELECT, 194, 186, 44, 13
+  PUSHBUTTON    "Kopieren", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
   //AUTOCHECKBOX  "Erweiterte Ansicht", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
 CAPTION "<22>ber Zeichentabelle"
-FONT 8,"MS Sans Serif",0,0
-STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
+FONT 8,"MS Shell Dlg",0,0
+STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT         "Zeichentabelle v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
   PUSHBUTTON    "Schlie<69>en", IDOK, 75, 162, 44, 15