Added missing file.

svn path=/branches/powerpc/; revision=29409

irc/ArchBlackmann/curse.txt

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

irc/TechBot/Resources/hresult.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" ?>
 <HresultList>
-	<Hresult text="S_OK" value="00000000" />
-	<Hresult text="S_FALSE" value="00000001" />
 	<Hresult text="STG_S_CONVERTED" value="00030200" />
 	<Hresult text="STG_S_BLOCK" value="00030201" />
 	<Hresult text="STG_S_RETRYNOW" value="00030202" />

irc/TechBot/Resources/ntstatus.xml

@@ -2,69 +2,8 @@
 <NtstatusList>
 	<Ntstatus text="STATUS_SUCCESS" value="00000000"></Ntstatus>
 	<Ntstatus text="STATUS_WAIT_0" value="00000000"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 1" value="00000001"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 2" value="00000002"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 3" value="00000003"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 4" value="00000004"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 5" value="00000005"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 6" value="00000006"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 7" value="00000007"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 8" value="00000008"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 9" value="00000009"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 10" value="0000000A"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 11" value="0000000B"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 12" value="0000000C"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 13" value="0000000D"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 14" value="0000000E"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 15" value="0000000F"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 16" value="00000010"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 17" value="00000011"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 18" value="00000012"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 19" value="00000013"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 20" value="00000014"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 21" value="00000015"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 22" value="00000016"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 23" value="00000017"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 24" value="00000018"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 25" value="00000019"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 26" value="0000001A"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 27" value="0000001B"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 28" value="0000001C"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 29" value="0000001D"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 30" value="0000001E"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 31" value="0000001F"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 32" value="00000020"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 33" value="00000021"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 34" value="00000022"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 35" value="00000023"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 36" value="00000024"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 37" value="00000025"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 38" value="00000026"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 39" value="00000027"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 40" value="00000028"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 41" value="00000029"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 42" value="0000002A"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 43" value="0000002B"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 44" value="0000002C"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 45" value="0000002D"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 46" value="0000002E"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 47" value="0000002F"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 48" value="00000030"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 49" value="00000031"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 50" value="00000032"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 51" value="00000033"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 52" value="00000034"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 53" value="00000035"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 54" value="00000036"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 55" value="00000037"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 56" value="00000038"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 57" value="00000039"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 58" value="0000003A"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 59" value="0000003B"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 60" value="0000003C"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 61" value="0000003D"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 62" value="0000003E"></Ntstatus>
-	<Ntstatus text="STATUS_WAIT_0 + 63" value="0000003F"></Ntstatus>
+	<Ntstatus text="STATUS_WAIT_1" value="00000001"></Ntstatus>
+	<Ntstatus text="STATUS_WAIT_63" value="0000003F"></Ntstatus>
 	<Ntstatus text="STATUS_ABANDONED" value="00000080"></Ntstatus>
 	<Ntstatus text="STATUS_ABANDONED_WAIT_0" value="00000080"></Ntstatus>
 	<Ntstatus text="STATUS_ABANDONED_WAIT_63" value="000000BF"></Ntstatus>

irc/TechBot/TechBot.Console/App.config

@@ -8,10 +8,10 @@
 		<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="NtstatusXml" value="C:\IRC\TechBot\ntstatus.xml" />
+		<add key="WinerrorXml" value="C:\IRC\TechBot\winerror.xml" />
+		<add key="HresultXml" value="C:\IRC\TechBot\hresult.xml" />
+		<add key="WmXml" value="C:\IRC\TechBot\wm.xml" />
 		<add key="SvnCommand" value="svn co svn://svn.reactos.org/trunk/reactos" />
 		<add key="BugUrl" value="http://www.reactos.org/bugzilla/show_bug.cgi?id={0}" />
 		<add key="WineBugUrl" value="http://bugs.winehq.org/show_bug.cgi?id={0}" />

irc/TechBot/TechBot.Library/ErrorCommand.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Xml;
-using System.Collections;
 
 namespace TechBot.Library
 {
@@ -29,170 +28,58 @@ namespace TechBot.Library
 			                 new string[] { "error" });
 		}
 
-		private static int GetSeverity(long error)
-		{
-			return (int)((error >> 30) & 0x3);
-		}
-
-		private static bool IsCustomer(long error)
-		{
-			return (error & 0x20000000) != 0;
-		}
-		
-		private static bool IsReserved(long error)
-		{
-			return (error & 0x10000000) != 0;
-		}
-
-		private static int GetFacility(long error)
-		{
-			return (int)((error >> 16) & 0xFFF);
-		}
-		
-		private static short GetCode(long error)
-		{
-			return (short)((error >> 0) & 0xFFFF);
-		}
-
-		private static string FormatSeverity(long error)
-		{
-			int severity = GetSeverity(error);
-			switch (severity)
-			{
-			case 0: return "SUCCESS";
-			case 1: return "INFORMATIONAL";
-			case 2: return "WARNING";
-			case 3: return "ERROR";
-			}
-			return null;
-		}
-
-		private static string FormatFacility(long error)
-		{
-			int facility = GetFacility(error);
-			return facility.ToString();
-		}
-
-		private static string FormatCode(long error)
-		{
-			int code = GetCode(error);
-			return code.ToString();
-		}
-
 		public void Handle(MessageContext context,
 		                   string commandName,
 		                   string parameters)
 		{
-			string originalErrorText = parameters.Trim();
-			if (originalErrorText.Equals(String.Empty))
+			string errorText = parameters;
+			if (errorText.Equals(String.Empty))
 			{
 				serviceOutput.WriteLine(context,
 				                        "Please provide an Error Code.");
 				return;
 			}
-			
-			string errorText = originalErrorText;
 
-		retry:
 			NumberParser np = new NumberParser();
 			long error = np.Parse(errorText);
 			if (np.Error)
 			{
 				serviceOutput.WriteLine(context,
 				                        String.Format("{0} is not a valid Error Code.",
-													  originalErrorText));
+													  errorText));
 				return;
 			}
-			
-			ArrayList descriptions = new ArrayList();
 
-			// Error is out of bounds
-			if ((ulong)error > uint.MaxValue)
+			string description = null;
+			if (winerror.GetWinerrorDescription(error) != null)
 			{
-				// Do nothing
-			}
-			// Error is outside of the range [0, 65535]: it cannot be a plain Win32 error code
-			else if ((ulong)error > ushort.MaxValue)
-			{
-				// Customer bit is set: custom error code
-				if (IsCustomer(error))
-				{
-					string description = String.Format("[custom, severity {0}, facility {1}, code {2}]",
-					                                   FormatSeverity(error),
-					                                   FormatFacility(error),
-					                                   FormatCode(error));
-					descriptions.Add(description);
-				}
-				// Reserved bit is set: HRESULT_FROM_NT(ntstatus)
-				else if (IsReserved(error))
-				{
-					int status = (int)(error & 0xCFFFFFFF);
-					string description = ntStatus.GetNtstatusDescription(status);
-					
-					if (description == null)
-						description = status.ToString("X");
-					
-					description = String.Format("HRESULT_FROM_NT({0})", description);
-					descriptions.Add(description);
-				}
-				// Win32 facility: HRESULT_FROM_WIN32(winerror)
-				else if (GetFacility(error) == 7)
-				{
-					// Must be an error code
-					if (GetSeverity(error) == 2)
-					{
-						short err = GetCode(error);
-						string description = winerror.GetWinerrorDescription(err);
-						
-						if (description == null)
-							description = err.ToString("D");
-						
-						description = String.Format("HRESULT_FROM_WIN32({0})", description);
-						descriptions.Add(description);
-					}
-				}
-			}
-
-			string winerrorDescription = winerror.GetWinerrorDescription(error);
-			string ntstatusDescription = ntStatus.GetNtstatusDescription(error);
-			string hresultDescription = hresult.GetHresultDescription(error);
-			
-			if (winerrorDescription != null)
-				descriptions.Add(winerrorDescription);
-			if (ntstatusDescription != null)
-				descriptions.Add(ntstatusDescription);
-			if (hresultDescription != null)
-				descriptions.Add(hresultDescription);
-
-			if (descriptions.Count == 0)
-			{
-				// Last chance heuristics: attempt to parse a 8-digit decimal as hexadecimal
-				if (errorText.Length == 8)
-				{
-					errorText = "0x" + errorText;
-					goto retry;
-				}
-
+				description = winerror.GetWinerrorDescription(error);
 				serviceOutput.WriteLine(context,
-										String.Format("I don't know about Error Code {0}.",
-													  originalErrorText));
+				                        String.Format("{0} is {1}.",
+													  error,
+				                                      description));
 			}
-			else if (descriptions.Count == 1)
+			if (ntStatus.GetNtstatusDescription(error) != null)
 			{
-				string description = (string)descriptions[0];
+				description = ntStatus.GetNtstatusDescription(error);
 				serviceOutput.WriteLine(context,
 										String.Format("{0} is {1}.",
-													  originalErrorText,
+													  errorText,
 													  description));
 			}
-			else
+			if (hresult.GetHresultDescription(error) != null)
+			{
+				description = hresult.GetHresultDescription(error);
+				serviceOutput.WriteLine(context,
+										String.Format("{0} is {1}.",
+													  errorText,
+													  description));
+			}
+			if(description == null)
 			{
 				serviceOutput.WriteLine(context,
-				                        String.Format("{0} could be:",
-				                                      originalErrorText));
-				
-				foreach(string description in descriptions)
-					serviceOutput.WriteLine(context, String.Format("\t{0}", description));
+										String.Format("I don't know about Error Code {0}.",
+													  errorText));
 			}
 		}
 		

irc/TechBot/TechBot.Library/HresultCommand.cs

@@ -6,12 +6,14 @@ namespace TechBot.Library
 	public class HresultCommand : BaseCommand, ICommand
 	{
 		private IServiceOutput serviceOutput;
+		private string hresultXml;
 		private XmlDocument hresultXmlDocument;
 
 		public HresultCommand(IServiceOutput serviceOutput,
 		                      string hresultXml)
 		{
 			this.serviceOutput = serviceOutput;
+			this.hresultXml = hresultXml;
 			hresultXmlDocument = new XmlDocument();
 			hresultXmlDocument.Load(hresultXml);
 		}

irc/TechBot/TechBot.Library/NumberParser.cs

@@ -9,7 +9,7 @@ namespace TechBot.Library
 		
 		private const string SpecialHexCharacters = "ABCDEF";
 
-		private static bool IsSpecialHexCharacter(char ch)
+		private bool IsSpecialHexCharacter(char ch)
 		{
 			foreach (char specialChar in SpecialHexCharacters)
 			{
@@ -19,7 +19,7 @@ namespace TechBot.Library
 			return false;
 		}
 
-		private static bool HasSpecialHexCharacters(string s)
+		private bool HasSpecialHexCharacters(string s)
 		{
 			foreach (char ch in s)
 			{
@@ -35,7 +35,7 @@ namespace TechBot.Library
 			{
 				Error = false;
 				bool useHex = false;
-				if (s.StartsWith("0x", StringComparison.InvariantCultureIgnoreCase))
+				if (s.StartsWith("0x"))
 				{
 					s = s.Substring(2);
 					useHex = true;

irc/TechBot/TechBot.Library/TechBotService.cs

@@ -49,9 +49,9 @@ namespace TechBot.Library
 		{
 			commands.Add(new HelpCommand(serviceOutput,
 			                             commands));
-			/*commands.Add(new ApiCommand(serviceOutput,
+			commands.Add(new ApiCommand(serviceOutput,
 			                            chmPath,
-			                            mainChm));*/
+			                            mainChm));
 			commands.Add(new NtStatusCommand(serviceOutput,
 			                                 ntstatusXml));
 			commands.Add(new WinerrorCommand(serviceOutput,

reactos/CREDITS

@@ -3,7 +3,6 @@ ReactOS is available thanks to the work of:
 Aleksey Bragin <aleksey@studiocerebral.com>
 Alex Ionescu <ionucu@videotron.ca>
 Andrew Greenwood <lists@silverblade.co.uk>
-Andrew Munger <waxdragon@gmail.com>
 Arindam Das
 Art Yerkes <ayerkes@speakeasy.net>
 Boudewijn Dekker <ariadne@xs4all.nl>
@@ -46,7 +45,6 @@ Marty Dill <mdill@uvic.ca>
 Matt Pyne
 Mike Nordell ("tamlin")
 Nathan Woods <npwoods@mess.org>
-Pablo Borobia <pborobia@gmail.com>
 Paolo Pantaleo <paolopan@freemail.it>
 Phillip Susi <phreak@iag.net>
 Rex Jolliff <rex@lvcablemodem.com>

reactos/Makefile

@@ -152,15 +152,11 @@ ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
 ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
 export OSTYPE = msys
 HOST=mingw32-linux
-CFLAGS+=-fshort-wchar
-CPPFLAGS+=-fshort-wchar
 else
 HOST=mingw32-windows
 endif
 else
 HOST=mingw32-linux
-CFLAGS+=-fshort-wchar
-CPPFLAGS+=-fshort-wchar
 endif
 endif
 
@@ -207,6 +203,7 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_RSYM    =@echo $(QUOTE)[RSYM]     $@$(QUOTE)
   ECHO_WMC     =@echo $(QUOTE)[WMC]      $@$(QUOTE)
   ECHO_NCI     =@echo $(QUOTE)[NCI]      $@$(QUOTE)
+  ECHO_OFW     =@echo $(QUOTE)[OFW]      $@$(QUOTE)
   ECHO_CABMAN  =@echo $(QUOTE)[CABMAN]   $<$(QUOTE)
   ECHO_CDMAKE  =@echo $(QUOTE)[CDMAKE]   $@$(QUOTE)
   ECHO_MKHIVE  =@echo $(QUOTE)[MKHIVE]   $@$(QUOTE)
@@ -374,13 +371,20 @@ PREAUTO := \
 	$(ERRCODES_H) \
 	$(ERRCODES_RC) \
 	$(NCI_SERVICE_FILES) \
-	$(GENDIB_DIB_FILES)
+	$(GENDIB_DIB_FILES) \
+	$(OFW_INTERFACE_SERVICE_FILES)
 
 $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) mingw
 
-world: all bootcd livecd
+world: all
+	$(MAKE) KDBG=$(KDBG) DBG=$(DBG) \
+		ROS_AUTOMAKE=$(ROS_AUTOMAKE) \
+		ROS_INSTALL=$(ROS_INSTALL) \
+		ROS_INTERMEDIATE=$(ROS_INTERMEDIATE) \
+		ROS_OUTPUT=$(ROS_OUTPUT) \
+		bootcd livecd
 
 universe:
 	$(MAKE) KDBG=1 DBG=1 \

reactos/README

@@ -1,6 +1,6 @@
 ========================
-ReactOS Version 0.3.x
-Updated Aug 21rd, 2005
+ReactOS Version 0.2.x
+Updated June 23rd, 2004
 ========================
 
 1. What is ReactOS?

reactos/ReactOS-ppc.rbuild

@@ -18,14 +18,21 @@
   <define name="_PPC_" />
   <define name="__PowerPC__" />
   <define name="_REACTOS_" />
-  <define name="__MINGW_IMPORT" empty="true" />
   <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" />
-  <compilerflag>-v</compilerflag>
+  <define name="WORDS_BIGENDIAN" empty="true" />
+  <define name="MB_CUR_MAX">1</define>
+  <compilerflag>-fshort-wchar</compilerflag>
+  <compilerflag>-fsigned-char</compilerflag>
+  <compilerflag>-mfull-toc</compilerflag>
+  <compilerflag>-meabi</compilerflag>
+  <compilerflag>-O2</compilerflag>
+  <compilerflag>-Wno-strict-aliasing</compilerflag>
+  <compilerflag>-Wno-trampolines</compilerflag>
   <if property="MP" value="1">
     <define name="CONFIG_SMP" value="1" />
   </if>
@@ -41,18 +48,16 @@
     <define name="KDBG" value="1" />
     <property name="DBG_OR_KDBG" value="true" />
   </if>
-  <compilerflag>-Wpointer-arith</compilerflag>
 
   <include>.</include>
   <include>include</include>
-  <include>include/reactos</include>
-  <include>include/libs</include>
-  <include>include/drivers</include>
-  <include>include/subsys</include>
-  <include>include/ndk</include>
-  <include>include</include>
   <include>include/crt</include>
   <include>include/ddk</include>
+  <include>include/GL</include>
+  <include>include/ndk</include>
+  <include>include/psdk</include>
+  <include>include/reactos</include>
+  <include>include/reactos/libs</include>
 
   <directory name="base">
     <xi:include href="base/base.rbuild" />

reactos/ReactOS.rbuild

@@ -36,7 +36,6 @@
 
   <include>.</include>
   <include>include</include>
-  <include>include/psdk</include>
   <include>include/crt</include>
   <include>include/ddk</include>
   <include>include/GL</include>

reactos/base/applications/applications.rbuild

@@ -19,9 +19,6 @@
 <directory name="games">
 	<xi:include href="games/games.rbuild" />
 </directory>
-<directory name="getfirefox">
-	<xi:include href="getfirefox/getfirefox.rbuild" />
-</directory>
 <directory name="hostname">
 	<xi:include href="hostname/hostname.rbuild" />
 </directory>

reactos/base/shell/shell.rbuild

@@ -4,8 +4,10 @@
   <directory name="cmd">
     <xi:include href="cmd/cmd.rbuild" />
   </directory>
-  <directory name="explorer">
-    <xi:include href="explorer/explorer.rbuild" />
-  </directory>
+  <if property="ARCH" value="x86">
+    <directory name="explorer">
+      <xi:include href="explorer/explorer.rbuild" />
+    </directory>
+  </if>
   </group>
 </rbuild>

reactos/baseaddress.rbuild

@@ -1,38 +1,34 @@
 <?xml version="1.0"?>
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
 <group>
+  <property name="BASEADDRESS_DPLAYX" value="0x5E080000" />
+  <property name="BASEADDRESS_DPLAY" value="0x71E80000" />
   <property name="BASEADDRESS_REGTESTS" value="0x07000000" />
   <property name="BASEADDRESS_NOTIFYHOOK" value="0x08000000" />
   <property name="BASEADDRESS_DEVENUM" value="0x35680000" />
-  <property name="BASEADDRESS_PWRCFG" value="0x587e0000" />
-  <property name="BASEADDRESS_MMSYS" value="0x588a0000" />
-  <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" />
-  <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" />
-  <property name="BASEADDRESS_OBJSEL" value="0x5b400000" />
-  <property name="BASEADDRESS_SLAYER" value="0x5c7e0000" />
-  <property name="BASEADDRESS_DPLAYX" value="0x5e080000" />
-  <property name="BASEADDRESS_DINPUT" value="0x5f580000" />
+  <property name="BASEADDRESS_MMSYS" value="0x588A0000" />
+  <property name="BASEADDRESS_PWRCFG" value="0x587E0000" />
+  <property name="BASEADDRESS_UXTHEME" value="0x5AD70000" />
+  <property name="BASEADDRESS_VDMDBG" value="0x5B0D0000" />
+  <property name="BASEADDRESS_OBJSEL" value="0x5B400000" />
+  <property name="BASEADDRESS_SLAYER" value="0x5C7E0000" />
+  <property name="BASEADDRESS_DINPUT" value="0x5F580000" />
   <property name="BASEADDRESS_MAPI32" value="0x62250000" />
-  <property name="BASEADDRESS_HDWWIZ" value="0x64d40000" />
-  <property name="BASEADDRESS_TIMEDATE" value="0x64da0000" />
-  <property name="BASEADDRESS_SYSDM" value="0x64dd0000" />
-  <property name="BASEADDRESS_NCPL" value="0x64ea0000" />
-  <property name="BASEADDRESS_MAIN" value="0x64f40000" />
-  <property name="BASEADDRESS_INTL" value="0x64fb0000" />
-  <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" />
+  <property name="BASEADDRESS_HDWWIZ" value="0x64D40000" />
+  <property name="BASEADDRESS_TIMEDATE" value="0x64DA0000" />
+  <property name="BASEADDRESS_SYSDM" value="0x64DD0000" />
+  <property name="BASEADDRESS_NCPL" value="0x64EA0000" />
+  <property name="BASEADDRESS_MAIN" value="0x64F40000" />
+  <property name="BASEADDRESS_INTL" value="0x64FB0000" />
   <property name="BASEADDRESS_DESK" value="0x65080000" />
   <property name="BASEADDRESS_APPWIZ" value="0x65100000" />
   <property name="BASEADDRESS_ACCESS" value="0x65180000" />
-  <property name="BASEADDRESS_WSHTCPIP" value="0x677b0000" />
-  <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" />
-  <property name="BASEADDRESS_HID" value="0x688f0000" />
+  <property name="BASEADDRESS_HID" value="0x688F0000" />
   <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" />
   <property name="BASEADDRESS_PSAPI" value="0x68f70000" />
   <property name="BASEADDRESS_OLEACC" value="0x69640000" />
-  <property name="BASEADDRESS_WINMM" value="0x697d0000" />
   <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" />
   <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" />
-  <property name="BASEADDRESS_SHELL32" value="0x6a360000" />
   <property name="BASEADDRESS_UNICODE" value="0x6b200000" />
   <property name="BASEADDRESS_ADVPACK" value="0x6b300000" />
   <property name="BASEADDRESS_CONTROL" value="0x6b310000" />
@@ -44,9 +40,9 @@
   <property name="BASEADDRESS_GLU32" value="0x6b370000" />
   <property name="BASEADDRESS_MESA32" value="0x6b380000" />
   <property name="BASEADDRESS_OPENGL32" value="0x6b390000" />
-  <property name="BASEADDRESS_SECUR32" value="0x6b3a0000" />
-  <property name="BASEADDRESS_SMDLL" value="0x6b3b0000" />
-  <property name="BASEADDRESS_URLMON" value="0x6b3c0000" />
+  <property name="BASEADDRESS_SECUR32" value="0x6b3A0000" />
+  <property name="BASEADDRESS_SMDLL" value="0x6b3B0000" />
+  <property name="BASEADDRESS_URLMON" value="0x6b3C0000" />
   <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" />
   <property name="BASEADDRESS_CLB" value="0x6f2b0000" />
   <property name="BASEADDRESS_CARDS" value="0x701a0000" />
@@ -58,26 +54,21 @@
   <property name="BASEADDRESS_WSOCK32" value="0x71ab0000" />
   <property name="BASEADDRESS_ACLEDIT" value="0x71b70000" />
   <property name="BASEADDRESS_NETAPI32" value="0x71c00000" />
-  <property name="BASEADDRESS_DPLAY" value="0x71e80000" />
-  <property name="BASEADDRESS_SECURITY" value="0x71f10000" />
+  <property name="BASEADDRESS_SECURITY" value="0x71F10000" />
   <property name="BASEADDRESS_WINFAX" value="0x722C0000" />
-  <property name="BASEADDRESS_WINSCARD" value="0x723d0000" />
+  <property name="BASEADDRESS_WINSCARD" value="0x723D0000" />
   <property name="BASEADDRESS_DEVMGR" value="0x72a90000" />
   <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" />
   <property name="BASEADDRESS_LZ32" value="0x73d80000" />
   <property name="BASEADDRESS_COREDLL" value="0x73d80000" />
-  <property name="BASEADDRESS_ICMP" value="0x741f0000" />
-  <property name="BASEADDRESS_UFAT" value="0x741f0000" />
+  <property name="BASEADDRESS_ICMP" value="0x741F0000" />
   <property name="BASEADDRESS_USERENV" value="0x74850000" />
-  <property name="BASEADDRESS_WS2_32" value="0x74aa0000" />
   <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" />
   <property name="BASEADDRESS_POWRPROF" value="0x74ad0000" />
-  <property name="BASEADDRESS_MMDRV" value="0x74c30000" />
   <property name="BASEADDRESS_OLEDLG" value="0x74d00000" />
   <property name="BASEADDRESS_SAMSRV" value="0x74f30000" />
   <property name="BASEADDRESS_SAMLIB" value="0x750C0000" />
   <property name="BASEADDRESS_CABINET" value="0x75120000" />
-  <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" />
   <property name="BASEADDRESS_MSGINA" value="0x75970000" />
   <property name="BASEADDRESS_IMM32" value="0x75e60000" />
   <property name="BASEADDRESS_COMMCTRL" value="0x75e60000" />
@@ -102,33 +93,38 @@
   <property name="BASEADDRESS_GDIPLUS" value="0x76a00000" />
   <property name="BASEADDRESS_WINTRUST" value="0x76c30000" />
   <property name="BASEADDRESS_IMAGEHLP" value="0x76c90000" />
-  <property name="BASEADDRESS_DHCPCSVC" value="0x76d80000" />
   <property name="BASEADDRESS_FMIFS" value="0x76df0000" />
+  <property name="BASEADDRESS_SHELL32" value="0x6a360000" />
+  <property name="BASEADDRESS_IPHLPAPI" value="0x75700000" />
   <property name="BASEADDRESS_MSVFW32" value="0x77400000" />
   <property name="BASEADDRESS_MSACM32" value="0x77400000" />
+  <property name="BASEADDRESS_MMDRV" value="0x74C30000" />
   <property name="BASEADDRESS_CRTDLL" value="0x77630000" />
   <property name="BASEADDRESS_AUTHZ" value="0x77690000" />
   <property name="BASEADDRESS_CFGMGR32" value="0x77700000" />
-  <property name="BASEADDRESS_SENSAPI" value="0x77700000" />
   <property name="BASEADDRESS_PACKET" value="0x77780000" />
   <property name="BASEADDRESS_MSAFD" value="0x77780000" />
-  <property name="BASEADDRESS_WINSPOOL" value="0x77800000" />
   <property name="BASEADDRESS_MSI" value="0x77790000" />
   <property name="BASEADDRESS_SNMPAPI" value="0x777a0000" />
   <property name="BASEADDRESS_IPRTPRIO" value="0x777c0000" />
+  <property name="BASEADDRESS_WSHTCPIP" value="0x677b0000" />
+  <property name="BASEADDRESS_WINMM" value="0x697d0000" />
   <property name="BASEADDRESS_WS2HELP" value="0x777e0000" />
   <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" />
+  <property name="BASEADDRESS_WINSPOOL" value="0x77800000" />
   <property name="BASEADDRESS_VERSION" value="0x77a40000" />
   <property name="BASEADDRESS_OLE32" value="0x77a50000" />
+  <property name="BASEADDRESS_WS2_32" value="0x74aa0000" />
   <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" />
+  <property name="BASEADDRESS_CRYPT32" value="0x67ab0000" />
   <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" />
-  <property name="BASEADDRESS_USER32" value="0x77e40000" />
+  <property name="BASEADDRESS_USER32" value="0x77e50000" />
   <property name="BASEADDRESS_GDI32" value="0x77f10000" />
   <property name="BASEADDRESS_DNSAPI" value="0x77f30000" />
   <property name="BASEADDRESS_MSVCRT" value="0x78000000" />
   <property name="BASEADDRESS_MSVCRT20" value="0x78500000" />
   <property name="BASEADDRESS_KERNEL32" value="0x7c800000" />
-  <property name="BASEADDRESS_NTDLL" value="0x7c900000" />
-  <property name="BASEADDRESS_FREETYPE" value="0x7f000000" />
+  <property name="BASEADDRESS_NTDLL" value="0x7C900000" />
+  <property name="BASEADDRESS_FREETYPE" value="0x7F000000" />
 </group>
 </rbuild>

reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild

@@ -1,2 +0,0 @@
-<module name="bootcdregtest" type="isoregtest">
-</module>

reactos/boot/bootdata/bootdata.rbuild

@@ -7,17 +7,10 @@
 <cdfile base="reactos">hivesft.inf</cdfile>
 <cdfile base="reactos">hivesys.inf</cdfile>
 <cdfile base="reactos">txtsetup.sif</cdfile>
-<!--<cdfile base="reactos">unattend.inf</cdfile>-->
 <directory name="bootcd">
 	<xi:include href="bootcd/bootcd.rbuild" />
 </directory>
 <directory name="livecd">
 	<xi:include href="livecd/livecd.rbuild" />
 </directory>
-<directory name="bootcdregtest">
-	<xi:include href="bootcdregtest/bootcdregtest.rbuild" />
-</directory>
-<directory name="livecdregtest">
-	<xi:include href="livecdregtest/livecdregtest.rbuild" />
-</directory>
 </group>

reactos/boot/bootdata/hivedef.inf

@@ -5,20 +5,11 @@ Signature="$ReactOS$
 
 HKCU,"Control Panel",,0x00000012
 HKCU,"Control Panel\Appearance",,0x00000012
-HKCU,"Control Panel\Mouse","MouseTrails",0x00010001,0x00000000
-HKCU,"Control Panel\Mouse","SnapToDefaultButton",0x00010001,0x00000000
-HKCU,"Control Panel\Mouse","MouseSpeed",0x00010001,0x00000001
-HKCU,"Control Panel\Mouse","MouseThreshold1",0x00010001,0x00000006
-HKCU,"Control Panel\Mouse","MouseThreshold2",0x00010001,0x0000000A
-HKCU,"Control Panel\Mouse","DoubleClickSpeed",0x00010001,0x000001E0
-HKCU,"Control Panel\Mouse","SwapMouseButtons",0x00010001,0x00000000
-
 HKCU,"Control Panel\Desktop","AutoEndTasks",0x00000002,"0"
 HKCU,"Control Panel\Desktop","CursorBlinkRate",0x00000002,"530"
 HKCU,"Control Panel\Desktop","DragFullWindows",0x00000002,"0"
 HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0"
 HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000"
-HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,""
 HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000"
 HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,""
 HKCU,"Control Panel\International",,0x00000012
@@ -84,11 +75,6 @@ HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\WINXP",
 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\WINXP","SPMajorVersion",0x00010001,0x00000001
 HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers\WINXP","SPMinorVersion",0x00010001,0x00000000
 
-; DEBUG: Windows Messages SPY configuration
-HKCU,"SOFTWARE\ReactOS\Debug","SpyInclude",0x00020000,"INCLUDEALL"
-;HKCU,"SOFTWARE\ReactOS\Debug","SpyExclude",0x00020000,""
-;HKCU,"SOFTWARE\ReactOS\Debug","SpyExcludeDWP",0x00020000,""
-
 ; GUI Setup
 
 HKCU, "Control Panel\Desktop\WindowMetrics","CaptionFont",0x00000001,f5,ff,ff,ff,00,00,00,\

reactos/boot/bootdata/hivesft.inf

@@ -37,15 +37,15 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList",,0x00000012
 
 ; Font substitutes
 ; SysFontSubstitutes are also returned by EnumFontFamilies, FontSubstitutes aren't
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"DejaVu Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"DejaVu Vera Sans Mono"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Bitstream Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"Bitstream Vera Sans Mono"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Marlett",0x00000000,"TGMarlett"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"DejaVu Vera Serif"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"DejaVu Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Vera Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"DejaVu Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Bitstream Vera Serif"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Bitstream Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Bitstream Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Bitstream Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Bitstream Vera Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Bitstream Vera Sans"
 
 ; Time zone settings
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones",,0x00000012
@@ -374,7 +374,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central Europe Sta
 0x00,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,\
 0x00,0x00,0x03,0x00,0x00,0x00,0x05,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00
 
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Display",0x00000000,"(GMT+01:00) Sarajevo, Skopje, Sofija, Warsaw, Zagreb"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Display",0x00000000,"(GMT+01:00) Sarajevo, Skopje, Sofija, Warschau, Zagreb"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Dlt",0x00000000,"Central European Daylight Time"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Std",0x00000000,"Central European Standard Time"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\Central European Standard Time","Index",0x00010001,100

reactos/boot/bootdata/hivesys.inf

@@ -249,105 +249,105 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","InstallLanguage",0x0000000
 ; If you add/uncomment an entry here, please also add the appropriate Language
 ; in the previous section.
 HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale",,0x00000012
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00000000,""
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00000000,"2"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000807",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c07",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001407",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000408",0x00000000,"4"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000409",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000809",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c09",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001009",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001409",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001809",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c09",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002009",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003009",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003409",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100a",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c0a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000200a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000240a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000280a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002c0a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000300a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000340a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000380a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003c0a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000400a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000440a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000480a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00004c0a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000500a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040b",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040c",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080c",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0c",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00000000,""
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x00000000,"2"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00000000,""
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00000000,""
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000414",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000814",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000415",0x00000000,"2"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000416",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000816",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000418",0x00000000,"2"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000419",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041a",0x00000000,"2"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081a",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c1a",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041b",0x00000000,"2"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00000000,"2"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00000000,""
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00000000,"6"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00000000,""
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000422",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000423",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000424",0x00000000,"2"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000425",0x00000000,"3"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x00000000,"3"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00000000,"3"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00000000,""
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00000000,""
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00000000,""
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00000000,"6"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00000000,""
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00000000,""
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x00000000,"1"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x00000000,"5"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000440",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000441",0x00000000,"1"
-;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000443",0x00000000,"6"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000843",0x00000000,"5"
-HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000456",0x00000000,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000402",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000403",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000404",0x00010001,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000405",0x00010001,"2"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000406",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000407",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000807",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c07",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001407",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000408",0x00010001,"4"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000409",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000809",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c09",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001009",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001409",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001809",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c09",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002009",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003009",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003409",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100a",0x00010001,"1"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00001c0a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000200a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000240a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000280a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00002c0a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000300a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000340a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000380a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00003c0a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000400a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000440a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000480a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00004c0a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000500a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040b",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040c",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000080c",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c0c",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000100c",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000140c",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000180c",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040d",0x00010001,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040e",0x00010001,"2"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000040f",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000410",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000810",0x00010001,"1"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000411",0x00010001,""
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000412",0x00010001,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000413",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000813",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000414",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000814",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000415",0x00010001,"2"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000416",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000816",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000418",0x00010001,"2"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000419",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041a",0x00010001,"2"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081a",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000c1a",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041b",0x00010001,"2"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041c",0x00010001,"2"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041d",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000081d",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041e",0x00010001,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000041f",0x00010001,"6"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000420",0x00010001,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000421",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000422",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000423",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000424",0x00010001,"2"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000425",0x00010001,"3"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000426",0x00010001,"3"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000427",0x00010001,"3"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000429",0x00010001,""
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042a",0x00010001,""
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042b",0x00010001,""
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042c",0x00010001,"6"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000082c",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042d",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000042f",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000436",0x00010001,"1"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000437",0x00010001,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000438",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000439",0x00010001,""
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043e",0x00010001,"1"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000083e",0x00010001,"1"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","0000043f",0x00010001,"5"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000440",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000441",0x00010001,"1"
+;HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000443",0x00010001,"6"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000843",0x00010001,"5"
+HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Locale","00000456",0x00010001,"1"
 
 ; Some installers check for SP6
 HKLM,"SYSTEM\CurrentControlSet\Control\Windows","CSDVersion",0x00010001,0x00000600
@@ -441,9 +441,6 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Vms",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\VMS SharedSection=128 Windows=Off SubSystemType=Text ServerDll=vmssrv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe"
 
-; WOW Support
-HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,""
-
 ; PNP Root device
 HKLM,"SYSTEM\CurrentControlSet\Enum\HTREE\ROOT\0","",0x00000000,""
 
@@ -527,7 +524,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Disk","Type",0x00010001,0x00000001
 
 ; Event logging service
-HKLM,"SYSTEM\CurrentControlSet\Services\EventLog",,0x00000010
 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Description",0x00000000,"Enables event log messages issued by Windows-based programs and components to be viewed in Event Viewer. This service cannot be stopped"
 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Group",0x00000000,"Event log"
@@ -535,13 +531,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","ImagePath",0x00020000,"%Syste
 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Start",0x00010001,0x00000002
 HKLM,"SYSTEM\CurrentControlSet\Services\EventLog","Type",0x00010001,0x00000010
 
-HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application",,0x00000010
-HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Application","File",0x00020000,"%SystemRoot%\system32\config\AppEvent.Evt"
-HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security",,0x00000010
-HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\Security","File",0x00020000,"%SystemRoot%\system32\config\SecEvent.Evt"
-HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System",,0x00000010
-HKLM,"SYSTEM\CurrentControlSet\Services\EventLog\System","File",0x00020000,"%SystemRoot%\system32\config\SysEvent.Evt"
-
 ; DHCP client service
 HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","Description",0x00000000,"Manages network configuration by registering and updating IP addresses and DNS names"
 HKLM,"SYSTEM\CurrentControlSet\Services\DHCP","ErrorControl",0x00010001,0x00000000
@@ -632,12 +621,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","ImagePath",0x00020000,"system32\d
 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Ndis","Type",0x00010001,0x00000001
 
-; NetLogon
-HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","ErrorControl",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","ImagePath",0x00020000,"%SystemRoot%\system32\lsass.exe"
-HKLM,"SYSTEM\CurrentControlSet\Services\NetLogon","Start",0x00010001,0x00000003
-HKLM,"SYSTEM\CurrentControlSet\Services\Netlogon","Type",0x00010001,0x00000020
-
 ; Named Pipe filesystem driver
 HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","ErrorControl",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Npfs","Group",0x00000000,"File System"
@@ -677,7 +660,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\PlugPlay","Type",0x00010001,0x00000010
 ; RPC service
 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Description",0x00000000,"Enables a computer to recognize and adapt to hardware changes with little or no user input"
 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ErrorControl",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Group",0x00000000," RPC Service"
 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","ImagePath",0x00020000,"%SystemRoot%\system32\rpcss.exe"
 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Start",0x00010001,0x00000004
 HKLM,"SYSTEM\CurrentControlSet\Services\Rpcss","Type",0x00010001,0x00000010

reactos/boot/bootdata/livecd.inf

@@ -17,7 +17,10 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Cdrom","Start",0x00010001,0x00000000
 HKLM,"SYSTEM\CurrentControlSet\Services\Ntfs","Start",0x00010001,0x00000004
 
 ; Shell
-HKLM,"SYSTEM\Setup","CmdLine",0x00020000,"setup -mini"
+HKLM,"SYSTEM\Setup","CmdLine",0x00020000,"%SystemRoot%\explorer.exe"
+
+; Serial mouse driver
+HKLM,"SYSTEM\CurrentControlSet\Services\Sermouse","Start",0x00010001,0x00000001
 
 ; User Profile List
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList",,0x00000012

reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild

@@ -1,2 +0,0 @@
-<module name="livecdregtest" type="liveisoregtest">
-</module>

reactos/boot/bootdata/packages/reactos.dff

@@ -32,8 +32,6 @@ Signature = "$ReactOS$"
 ; Base files
 base\applications\cacls\cacls.exe                   1
 base\applications\calc\calc.exe                     1
-base\applications\cmdutils\find\find.exe            1
-base\applications\cmdutils\more\more.exe            1
 base\applications\control\control.exe               1
 base\applications\devmgr\devmgrapp.exe              1
 base\applications\devmgmt\devmgmt.exe               1
@@ -61,11 +59,9 @@ base\applications\regedit\clb\clb.dll               1
 ;base\applications\reporterror\reporterror.exe      1
 base\applications\sc\sc.exe                         1
 base\applications\screenshot\screenshot.exe         1
-base\applications\screensavers\matrix\matrix.scr    1
 base\applications\servman\servman.exe               1
 base\applications\shutdown\shutdown.exe             1
-base\applications\sm\sm.exe                         1
-base\applications\sndvol32\sndvol32.exe             1
+;base\applications\sm\sm.exe                        1
 base\applications\taskmgr\taskmgr.exe               1
 ;base\applications\utils\rosperf\rosperf.exe        1
 ;base\applications\utils\ps\ps.exe                  1
@@ -174,7 +170,7 @@ dll\win32\imm32\imm32.dll                           1
 dll\win32\iphlpapi\iphlpapi.dll                     1
 dll\win32\kernel32\kernel32.dll                     1
 dll\win32\lsasrv\lsasrv.dll                         1
-dll\win32\lz32\lz32.dll                             1
+dll\win32\lzexpand\lz32.dll                         1
 dll\win32\mapi32\mapi32.dll                         1
 dll\win32\winmm\midimap\midimap.dll                 1
 dll\win32\mmdrv\mmdrv.dll                           1
@@ -202,7 +198,7 @@ dll\win32\opengl32\opengl32.dll                     1
 dll\win32\psapi\psapi.dll                           1
 dll\win32\powrprof\powrprof.dll                     1
 dll\win32\riched20\riched20.dll                     1
-dll\win32\riched32\riched32.dll                     1
+dll\win32\richedit\riched32.dll                     1
 dll\win32\rpcrt4\rpcrt4.dll                         1
 dll\win32\samlib\samlib.dll                         1
 dll\win32\samsrv\samsrv.dll                         1
@@ -215,7 +211,7 @@ dll\win32\shfolder\shfolder.dll                     1
 dll\win32\shlwapi\shlwapi.dll                       1
 dll\win32\smdll\smdll.dll                           1
 dll\win32\syssetup\syssetup.dll                     1
-dll\win32\twain_32\twain_32.dll                     1
+dll\win32\twain\twain_32.dll                        1
 dll\win32\ufat\ufat.dll                             1
 dll\win32\ufatx\ufatx.dll                           1   optional
 dll\win32\urlmon\urlmon.dll                         1
@@ -223,7 +219,6 @@ dll\win32\user32\user32.dll                         1
 dll\win32\userenv\userenv.dll                       1
 dll\win32\uxtheme\uxtheme.dll                       1
 dll\win32\version\version.dll                       1
-dll\win32\vdmdbg\vdmdbg.dll                         1
 dll\win32\wininet\wininet.dll                       1
 dll\win32\winmm\winmm.dll                           1
 dll\win32\winspool\winspool.drv                     1
@@ -441,7 +436,9 @@ modules\rosky\dll\win32\libskygi\libskygi.dll       1   optional
 modules\vms\server\vmssrv.dll                       1   optional
 modules\vms\dll\win32\vmsdll\vmsdll.dll             1   optional
 modules\rosapps\cmdutils\comp\comp.exe              1   optional
+modules\rosapps\cmdutils\find\find.exe              1   optional
 modules\rosapps\cmdutils\mode\mode.exe              1   optional
+modules\rosapps\cmdutils\more\more.exe              1   optional
 modules\rosapps\cmdutils\sort\sort.exe              1   optional
 modules\rosapps\cmdutils\tee\tee.exe                1   optional
 modules\rosapps\cmdutils\touch\touch.exe            1   optional
@@ -452,7 +449,7 @@ modules\rosapps\net\niclist\niclist.exe             1   optional
 modules\rosapps\notevil\notevil.exe                 1   optional
 modules\rosapps\packmgr\cmd-line\rosget.exe         1   optional
 modules\rosapps\packmgr\gui\packmgr.exe             1   optional
-modules\rosapps\packmgr\lib\package.dll             1   optional
+modules\rosapps\packmgr\dll\win32\package.dll       1   optional
 modules\rosapps\sysutils\ctm\ctm.exe                1   optional
 modules\rosapps\sysutils\lsdd\lsdd.exe              1   optional
 modules\rosapps\sysutils\man\man.exe                1   optional

reactos/boot/bootdata/txtsetup.sif

@@ -37,8 +37,8 @@ Cabinet=reactos.cab
 
 [SetupData]
 DefaultPath = \ReactOS
-;OsLoadOptions = "/NOGUIBOOT /NODEBUG"
-OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1 /BAUDRATE=19200 /IRQ=4"
+OsLoadOptions = "/NOGUIBOOT /NODEBUG"
+;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=COM1 /BAUDRATE=19200 /IRQ=4"
 ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=SCREEN"
 ;OsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"
 
@@ -70,16 +70,10 @@ halmp.dll    = 2,hal.dll
 vga = "VGA Display (640x480x8)",,Vga,640,480,8
 vbe_640x480x8 = "VESA Display (640x480x8)",,VBE,640,480,8
 vbe_640x480x16 = "VESA Display (640x480x16)",,VBE,640,480,16
-vbe_640x480x32 = "VESA Display (640x480x32)",,VBE,640,480,32
 vbe_800x600x8 = "VESA Display (800x600x8)",,VBE,800,600,8
 vbe = "VESA Display (800x600x16)",,VBE,800,600,16
-vbe_800x600x32 = "VESA Display (800x600x32)",,VBE,800,600,32
 vbe_1024x768x8 = "VESA Display (1024x768x8)",,VBE,1024,768,8
 vbe_1024x768x16 = "VESA Display (1024x768x16)",,VBE,1024,768,16
-vbe_1024x768x32 = "VESA Display (1024x768x32)",,VBE,1024,768,32
-
-
-
 
 
 [Map.Display]

reactos/boot/bootdata/unattend.inf.sample

@@ -28,4 +28,5 @@ AdminPassword="MyPassword"
 TimeZoneIndex=85
 
 ; enable this setting to disable daylight saving changes
-; DisableAutoDaylightTimeSet = 1
+; DisableAutoDaylightTimeSet = 1
+

reactos/boot/freeldr/bootsect/bootsect.rbuild

@@ -18,13 +18,3 @@
 	<bootstrap base="loader" nameoncd="isoboot.bin" />
 	<file>isoboot.asm</file>
 </module>
-<module name="isobtrt" type="bootsector">
-	<bootstrap base="loader" nameoncd="isobtrt.bin" />
-	<file>isobtrt.asm</file>
-</module>
-<if property="ARCH" value="powerpc">
-	<module name="ofwldr" type="bootprogram" payload="freeldr">
-		<bootstrap base="loader" nameoncd="boot/ofwldr" />
-		<file>ofwboot.s</file>
-	</module>
-</if>

reactos/boot/freeldr/bootsect/ofw_tests/ofwtest.s

@@ -0,0 +1,33 @@
+	.section .text
+
+_start:	
+	.long	0xe00000 + 12
+	.long	0
+	.long	0
+	
+	.globl ofw_dumpregs
+	
+	.globl _begin
+_begin:
+	sync                    
+	isync
+
+	lis     %r1,stack@ha    
+	addi    %r1,%r1,stack@l 
+	addi    %r1,%r1,16384 - 0x10
+          
+	/* Store ofw call addr */
+	mr	%r21,%r5
+	lis	%r8,_start@ha
+	addi	%r7,%r8,ofw_call_addr - _start
+	stw	%r21,0(%r7)
+
+	bl	ofw_dumpregs
+
+foo:
+	b	foo
+	
+	.org	0x1000
+stack:
+	.space	0x4000
+

reactos/boot/freeldr/freeldr/arch/powerpc/boot.s

@@ -1,3 +1,103 @@
+	.section ".text"
 	.extern PpcInit
+	.globl _start
+	.globl call_ofw
 _start:
-	b	PpcInit+4
+	sync                    
+	isync
+
+	lis     %r1,stackend@ha    
+	addi    %r1,%r1,stackend@l
+
+	/* Store ofw call addr */
+	mr	%r21,%r5
+	lis	%r10,ofw_call_addr@ha
+	stw	%r5,ofw_call_addr@l(%r10)
+
+	bl	zero_registers
+	
+	/* Zero CTR */
+	mtcr	%r31
+
+	lis	%r3,PpcInit@ha
+	addi	%r3,%r3,PpcInit@l
+	mtlr	%r3
+
+	/* Check for ofw */
+	lis	%r3,ofw_call_addr@ha
+	lwz	%r3,ofw_call_addr@l(%r3)
+	cmpw	%r3,%r31 /* Zero? */
+	mr	%r3,%r31
+	beq	bootme
+		
+	lis	%r3,call_ofw@ha
+	addi	%r3,%r3,call_ofw@l
+
+bootme:	
+	blr
+
+zero_registers:
+	xor	%r2,%r2,%r2
+	mr	%r0,%r2
+	mr	%r3,%r2
+	
+	mr	%r4,%r2
+	mr	%r5,%r2
+	mr	%r6,%r2
+	mr	%r7,%r2
+
+	mr	%r8,%r2
+	mr	%r9,%r2
+	mr	%r10,%r2
+	mr	%r11,%r2
+
+	mr	%r12,%r2
+	mr	%r13,%r2
+	mr	%r14,%r2
+	mr	%r15,%r2
+	
+	mr	%r12,%r2
+	mr	%r13,%r2
+	mr	%r14,%r2
+	mr	%r15,%r2
+	
+	mr	%r16,%r2
+	mr	%r17,%r2
+	mr	%r18,%r2
+	mr	%r19,%r2
+	
+	mr	%r20,%r2
+	mr	%r21,%r2
+	mr	%r22,%r2
+	mr	%r23,%r2
+	
+	mr	%r24,%r2
+	mr	%r25,%r2
+	mr	%r26,%r2
+	mr	%r27,%r2
+	
+	mr	%r28,%r2
+	mr	%r29,%r2
+	mr	%r30,%r2
+	mr	%r31,%r2
+
+	blr
+	
+ofw_memory_size:
+	.long	0
+	.long	0
+	.long	0
+	.long	0
+
+	.align	4
+stack:
+	.space	0x4000
+stackend:
+	.long	0,0,0,0
+	
+	.globl _bss
+	.section ".bss"
+_bss:
+	.long	0
+
+	.align	4

reactos/boot/freeldr/freeldr/arch/powerpc/compat.h

@@ -0,0 +1,108 @@
+#ifndef _FREELDR_ARCH_COMPAT_H
+#define _FREELDR_ARCH_COMPAT_H
+
+#define __init
+#define __initdata
+
+#define SPRN_MSSCR0     0x3f6   /* Memory Subsystem Control Register 0 */
+#define SPRN_MSSSR0     0x3f7   /* Memory Subsystem Status Register 1 */
+#define SPRN_LDSTCR     0x3f8   /* Load/Store control register */
+#define SPRN_LDSTDB     0x3f4   /* */
+#define SPRN_LR         0x008   /* Link Register */
+#ifndef SPRN_PIR
+#define SPRN_PIR        0x3FF   /* Processor Identification Register */
+#endif
+#define SPRN_PTEHI      0x3D5   /* 981 7450 PTE HI word (S/W TLB load) */
+#define SPRN_PTELO      0x3D6   /* 982 7450 PTE LO word (S/W TLB load) */
+#define SPRN_PURR       0x135   /* Processor Utilization of Resources Reg */
+#define SPRN_PVR        0x11F   /* Processor Version Register */
+#define SPRN_RPA        0x3D6   /* Required Physical Address Register */
+#define SPRN_SDA        0x3BF   /* Sampled Data Address Register */
+#define SPRN_SDR1       0x019   /* MMU Hash Base Register */
+#define SPRN_ASR        0x118   /* Address Space Register */
+#define SPRN_SIA        0x3BB   /* Sampled Instruction Address Register */
+#define SPRN_SPRG0      0x110   /* Special Purpose Register General 0 */
+#define SPRN_SPRG1      0x111   /* Special Purpose Register General 1 */
+#define SPRN_SPRG2      0x112   /* Special Purpose Register General 2 */
+#define SPRN_SPRG3      0x113   /* Special Purpose Register General 3 */
+#define SPRN_SPRG4      0x114   /* Special Purpose Register General 4 */
+#define SPRN_SPRG5      0x115   /* Special Purpose Register General 5 */
+#define SPRN_SPRG6      0x116   /* Special Purpose Register General 6 */
+#define SPRN_SPRG7      0x117   /* Special Purpose Register General 7 */
+#define SPRN_SRR0       0x01A   /* Save/Restore Register 0 */
+#define SPRN_SRR1       0x01B   /* Save/Restore Register 1 */
+#ifndef SPRN_SVR
+#define SPRN_SVR        0x11E   /* System Version Register */
+#endif
+#define SPRN_THRM1      0x3FC           /* Thermal Management Register 1 */
+/* these bits were defined in inverted endian sense originally, ugh, confusing */
+
+/* Values for PP (assumes Ks=0, Kp=1) */
+#define PP_RWXX 0       /* Supervisor read/write, User none */
+#define PP_RWRX 1       /* Supervisor read/write, User read */
+#define PP_RWRW 2       /* Supervisor read/write, User read/write */
+#define PP_RXRX 3       /* Supervisor read,       User read */
+
+/* Block size masks */
+#define BL_128K 0x000
+#define BL_256K 0x001
+#define BL_512K 0x003
+#define BL_1M   0x007
+#define BL_2M   0x00F
+#define BL_4M   0x01F
+#define BL_8M   0x03F
+#define BL_16M  0x07F
+#define BL_32M  0x0FF
+#define BL_64M  0x1FF
+#define BL_128M 0x3FF
+#define BL_256M 0x7FF
+
+/* BAT Access Protection */
+#define BPP_XX  0x00            /* No access */
+#define BPP_RX  0x01            /* Read only */
+#define BPP_RW  0x02            /* Read/write */
+
+/* Definitions for 40x embedded chips. */
+#define _PAGE_GUARDED   0x001   /* G: page is guarded from prefetch */
+#define _PAGE_FILE      0x001   /* when !present: nonlinear file mapping */
+#define _PAGE_PRESENT   0x002   /* software: PTE contains a translation */
+#define _PAGE_NO_CACHE  0x004   /* I: caching is inhibited */
+#define _PAGE_WRITETHRU 0x008   /* W: caching is write-through */
+#define _PAGE_USER      0x010   /* matches one of the zone permission bits */
+#define _PAGE_RW        0x040   /* software: Writes permitted */
+#define _PAGE_DIRTY     0x080   /* software: dirty page */
+#define _PAGE_HWWRITE   0x100   /* hardware: Dirty & RW, set in exception */
+#define _PAGE_HWEXEC    0x200   /* hardware: EX permission */
+#define _PAGE_ACCESSED  0x400   /* software: R: page referenced */
+
+#define _PMD_PRESENT    0x400   /* PMD points to page of PTEs */
+#define _PMD_BAD        0x802
+#define _PMD_SIZE       0x0e0   /* size field, != 0 for large-page PMD entry */
+#define _PMD_SIZE_4M    0x0c0
+#define _PMD_SIZE_16M   0x0e0
+#define PMD_PAGE_SIZE(pmdval)   (1024 << (((pmdval) & _PMD_SIZE) >> 4))
+
+#define PVR_VER(pvr)(((pvr) >>  16) & 0xFFFF) /* Version field */
+
+#define KERNELBASE 0x80000000
+
+typedef unsigned char __u8;
+typedef unsigned short __u16;
+typedef unsigned int __u32;
+
+typedef struct _pci_reg_property {
+    struct {
+	int a_hi, a_mid, a_lo;
+    } addr;
+    int size_hi, size_lo;
+} pci_reg_property;
+
+void btext_drawstring(const char *c);
+void btext_drawhex(unsigned long v);
+
+void *ioremap(__u32 phys, __u32 size);
+void iounmap(void *logical);
+
+__u32 GetPVR();
+
+#endif/*_FREELDR_ARCH_COMPAT_H*/

reactos/boot/freeldr/freeldr/arch/powerpc/mach.c

@@ -18,123 +18,32 @@
  */
 #include "freeldr.h"
 #include "machine.h"
+#include "mmu.h"
 #include "of.h"
+#include "ppcboot.h"
+#include "prep.h"
+#include "compat.h"
 
-extern void BootMain( char * );
-extern char *GetFreeLoaderVersionString();
+extern void BootMain( LPSTR CmdLine );
+extern PCHAR GetFreeLoaderVersionString();
+extern ULONG CacheSizeLimit;
 of_proxy ofproxy;
 void *PageDirectoryStart, *PageDirectoryEnd;
-static int chosen_package, stdin_handle, part_handle = -1;
+static int chosen_package, stdin_handle, stdout_handle, 
+  part_handle = -1, kernel_mem = 0;
+int mmu_handle = 0, FixedMemory = 0;
 BOOLEAN AcpiPresent = FALSE;
-char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { 0 };
+char BootPath[0x100] = { 0 }, BootPart[0x100] = { 0 }, CmdLine[0x100] = { "bootprep" };
 jmp_buf jmp;
+volatile char *video_mem = 0;
+boot_infos_t BootInfo;
 
-void le_swap( const void *start_addr_v, 
-              const void *end_addr_v, 
-              const void *target_addr_v ) {
-    long *start_addr = (long *)ROUND_DOWN((long)start_addr_v,8), 
-        *end_addr = (long *)ROUND_UP((long)end_addr_v,8), 
-        *target_addr = (long *)ROUND_DOWN((long)target_addr_v,8);
-    long tmp;
-    while( start_addr <= end_addr ) {
-        tmp = start_addr[0];
-        target_addr[0] = REV(start_addr[1]);
-        target_addr[1] = REV(tmp);
-        start_addr += 2;
-        target_addr += 2;
-    }
-}
-
-int ofw_finddevice( const char *name ) {
-    int ret, len;
-
-    len = strlen(name);
-    le_swap( name, name + len, name );
-    ret = ofproxy( 0, (char *)name, NULL, NULL, NULL );
-    le_swap( name, name + len, name );
-    return ret;
-}
-
-int ofw_getprop( int package, const char *name, void *buffer, int buflen ) {
-    int ret, len = strlen(name);
-    le_swap( name, name + len, name );
-    le_swap( buffer, (char *)buffer + buflen, buffer );
-    ret = ofproxy
-        ( 4, (void *)package, (char *)name, buffer, (void *)buflen );
-    le_swap( buffer, (char *)buffer + buflen, buffer );
-    le_swap( name, name + len, name );
-    return ret;
-}
-
-/* Since this is from external storage, it doesn't need swapping */
-int ofw_write( int handle, const char *data, int len ) {
-    int ret;
-    le_swap( data, data + len, data );
-    ret = ofproxy
-        ( 8, (void *)handle, (char *)data, (void *)len, NULL );
-    le_swap( data, data + len, data );
-    return ret;
-}
-
-/* Since this is from external storage, it doesn't need swapping */
-int ofw_read( int handle, const char *data, int len ) {
-    int ret;
-
-    le_swap( data, data + len, data );
-    ret = ofproxy
-        ( 12, (void *)handle, (char *)data, (void *)len, NULL );
-    le_swap( data, data + len, data );
-
-    return ret;
-}
-
-void ofw_exit() {
-    ofproxy( 16, NULL, NULL, NULL, NULL );
-}
-
-void ofw_dumpregs() {
-    ofproxy( 20, NULL, NULL, NULL, NULL );
-}
-
-void ofw_print_string( const char *str ) {
-    int len = strlen(str);
-    le_swap( (char *)str, str + len, (char *)str );
-    ofproxy( 24, (void *)str, NULL, NULL, NULL );
-    le_swap( (char *)str, str + len, (char *)str );
-}
-
-void ofw_print_number( int num ) {
-    ofproxy( 28, (void *)num, NULL, NULL, NULL );
-}
-
-int ofw_open( const char *name ) {
-    int ret, len;
-
-    len = strlen(name);
-    le_swap( name, name + len, name );
-    ret = ofproxy( 32, (char *)name, NULL, NULL, NULL );
-    le_swap( name, name + len, name );
-    return ret;
-}
-
-int ofw_child( int package ) {
-    return ofproxy( 36, (void *)package, NULL, NULL, NULL );
-}
-
-int ofw_peer( int package ) {
-    return ofproxy( 40, (void *)package, NULL, NULL, NULL );
-}
-
-int ofw_seek( int handle, long long location ) {
-    return ofproxy( 44, (void *)handle, (void *)(int)(location >> 32), (void *)(int)location, NULL );
-}
-
-void PpcPutChar( int ch ) {
+void PpcOfwPutChar( int ch ) {
     char buf[3];
     if( ch == 0x0a ) { buf[0] = 0x0d; buf[1] = 0x0a; } 
     else { buf[0] = ch; buf[1] = 0; }
     buf[2] = 0;
-    ofw_print_string( buf );
+    ofw_write(stdout_handle, buf, strlen(buf));
 }
 
 int PpcFindDevice( int depth, int parent, char *devname, int *nth ) {
@@ -156,7 +65,7 @@ int PpcFindDevice( int depth, int parent, char *devname, int *nth ) {
 
     if( !nth && match ) return parent;
 
-    for( i = 0; i < depth; i++ ) PpcPutChar( ' ' );
+    for( i = 0; i < depth; i++ ) PpcOfwPutChar( ' ' );
     
     if( depth == 1 ) {
 	if( gotname > 0 ) {
@@ -176,7 +85,7 @@ int PpcFindDevice( int depth, int parent, char *devname, int *nth ) {
 }
 
 BOOLEAN PpcConsKbHit() {
-    return TRUE;
+    return FALSE;
 }
 
 int PpcConsGetCh() {
@@ -186,29 +95,28 @@ int PpcConsGetCh() {
 }
 
 void PpcVideoClearScreen( UCHAR Attr ) {
-    ofw_print_string("ClearScreen\n");
 }
 
-VIDEODISPLAYMODE PpcVideoSetDisplayMode( char *DisplayMode, BOOLEAN Init ) {
-    printf( "DisplayMode: %s %s\n", DisplayMode, Init ? "true" : "false" );
-    return VideoGraphicsMode;
-}
-
-/* FIXME: Query */
 VOID PpcVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth ) {
-    ofw_print_string("GetDisplaySize\n");
-    *Width = 640;
-    *Height = 480;
-    *Depth = 8;
+    *Width = 80;
+    *Height = 25;
+    *Depth = 16;
 }
 
 ULONG PpcVideoGetBufferSize() {
     ULONG Width, Height, Depth;
-    ofw_print_string("PpcVideoGetBufferSize\n");
-    PpcVideoGetDisplaySize( &Width, &Height, &Depth );
+    MachVideoGetDisplaySize( &Width, &Height, &Depth );
     return Width * Height * Depth / 8;
 }
 
+VIDEODISPLAYMODE PpcVideoSetDisplayMode( char *DisplayMode, BOOLEAN Init ) {
+    //printf( "DisplayMode: %s %s\n", DisplayMode, Init ? "true" : "false" );
+    if( Init && !video_mem ) {
+	video_mem = MmAllocateMemory( PpcVideoGetBufferSize() );
+    }
+    return VideoTextMode;
+}
+
 VOID PpcVideoSetTextCursorPosition( ULONG X, ULONG Y ) {
     printf("SetTextCursorPosition(%d,%d)\n", X,Y);
 }
@@ -222,7 +130,22 @@ VOID PpcVideoPutChar( int Ch, UCHAR Attr, unsigned X, unsigned Y ) {
 }
 
 VOID PpcVideoCopyOffScreenBufferToVRAM( PVOID Buffer ) {
-    printf( "CopyOffScreenBufferToVRAM(%x)\n", Buffer );
+    int i,j;
+    ULONG w,h,d;
+    PCHAR ChBuf = Buffer;
+    int offset = 0;
+
+    MachVideoGetDisplaySize( &w, &h, &d );
+
+    for( i = 0; i < h; i++ ) {
+	for( j = 0; j < w; j++ ) {
+	    offset = (j * 2) + (i * w * 2);
+	    if( ChBuf[offset] != video_mem[offset] ) {
+		video_mem[offset] = ChBuf[offset];
+		MachVideoPutChar(ChBuf[offset],0,j+1,i+1);
+	    }
+	}
+    }
 }
 
 BOOLEAN PpcVideoIsPaletteFixed() {
@@ -243,27 +166,187 @@ VOID PpcVideoSync() {
     printf( "Sync\n" );
 }
 
-VOID PpcVideoPrepareForReactOS() {
-    printf( "PrepareForReactOS\n");
+static int prom_next_node(int *nodep)
+{
+	int node;
+
+	if ((node = *nodep) != 0
+	    && (*nodep = ofw_child(node)) != 0)
+		return 1;
+	if ((*nodep = ofw_peer(node)) != 0)
+		return 1;
+	for (;;) {
+		if ((node = ofw_parent(node)) == 0)
+			return 0;
+		if ((*nodep = ofw_peer(node)) != 0)
+			return 1;
+	}
 }
-/* XXX FIXME:
- * According to the linux people (this is backed up by my own experience),
- * the memory object in older ofw does not do getprop right.
- *
- * The "right" way is to probe the pci bridge. *sigh*
+
+/* Appropriated from linux' btext.c
+ * author:
+ * Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ */
+VOID PpcVideoPrepareForReactOS() {
+    int i, j, k, /* display_handle, */ display_package, display_size = 0;
+    int node, ret, elts;
+    int device_address;
+    //pci_reg_property display_regs[8];
+    char type[256], path[256], name[256];
+    char logo[] = {
+	"          "
+	"  XXXXXX  "
+	" X      X "
+	" X X  X X "
+	" X      X "
+	" X XXXX X "
+	" X  XX  X "
+	" X      X "
+	"  XXXXXX  "
+	"          "
+    };
+    int logo_x = 10, logo_y = 10;
+    int logo_scale_x = 8, logo_scale_y = 8;
+
+
+    for( node = ofw_finddevice("/"); prom_next_node(&node); ) {
+	memset(type, 0, sizeof(type));
+	memset(path, 0, sizeof(path));
+	
+	ret = ofw_getprop(node, "name", name, sizeof(name));
+
+	if(ofw_getprop(node, "device_type", type, sizeof(type)) <= 0) {
+	    printf("Could not get type for node %x\n", node);
+	    continue;
+	}
+
+	printf("Node %x ret %d name %s type %s\n", node, ret, name, type);
+
+	if(strcmp(type, "display") == 0) break;
+    }
+
+    if(!node) return;
+
+    if(ofw_package_to_path(node, path, sizeof(path)) < 0) {
+	printf("could not get path for display package %x\n", node);
+	return;
+    }
+
+    printf("Opening display package: %s\n", path);
+    display_package = ofw_finddevice(path);
+    printf("display package %x\n", display_package);
+
+    BootInfo.dispDeviceRect[0] = BootInfo.dispDeviceRect[1] = 0;
+
+    ofw_getprop(display_package, "width", 
+		(void *)&BootInfo.dispDeviceRect[2], sizeof(int));
+    ofw_getprop(display_package, "height",
+		(void *)&BootInfo.dispDeviceRect[3], sizeof(int));
+    ofw_getprop(display_package, "depth",
+		(void *)&BootInfo.dispDeviceDepth, sizeof(int));
+    ofw_getprop(display_package, "linebytes",
+		(void *)&BootInfo.dispDeviceRowBytes, sizeof(int));
+
+    BootInfo.dispDeviceRect[2] = BootInfo.dispDeviceRect[2];
+    BootInfo.dispDeviceRect[3] = BootInfo.dispDeviceRect[3];
+    BootInfo.dispDeviceDepth = BootInfo.dispDeviceDepth;
+    BootInfo.dispDeviceRowBytes = BootInfo.dispDeviceRowBytes;
+
+    if(ofw_getprop
+       (display_package,
+	"address",
+	(void *)&device_address,
+	sizeof(device_address)) < 1) {
+	printf("Could not get device base\n");
+	return;
+    }
+
+    BootInfo.dispDeviceBase = (PVOID)(device_address);
+
+    display_size = BootInfo.dispDeviceRowBytes * BootInfo.dispDeviceRect[3];
+
+    printf("Display size is %x bytes (%x per row times %x rows)\n",
+	   display_size, 
+	   BootInfo.dispDeviceRowBytes,
+	   BootInfo.dispDeviceRect[3]);
+
+    printf("display is at %x\n", BootInfo.dispDeviceBase);
+
+    for( i = 0; i < logo_y * logo_scale_y; i++ ) {
+	for( j = 0; j < logo_x * logo_scale_x; j++ ) {
+	    elts = (j/logo_scale_x) + ((i/logo_scale_y) * logo_x);
+
+	    for( k = 0; k < BootInfo.dispDeviceDepth/8; k++ ) {
+		SetPhysByte(((ULONG_PTR)BootInfo.dispDeviceBase)+
+			    k +
+			    ((j * (BootInfo.dispDeviceDepth/8)) + 
+			     (i * (BootInfo.dispDeviceRowBytes))),
+			    logo[elts] == ' ' ? 0 : 255);
+	    }
+	}
+    }
+}
+
+/* 
+ * Get memory the proper openfirmware way
  */
 ULONG PpcGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap,
                        ULONG MaxMemoryMapSize ) {
-    printf("GetMemoryMap(chosen=%x)\n", chosen_package);
+    int i, memhandle, returned, total = 0, slots = 0;
+    int memdata[0x40];
 
-    BiosMemoryMap[0].Type = BiosMemoryUsable;
-    BiosMemoryMap[0].BaseAddress = 0;
-    BiosMemoryMap[0].Length = 32 * 1024 * 1024; /* Assume 32 meg for now */
+    printf("PpcGetMemoryMap(%d)\n", MaxMemoryMapSize);
 
-    printf( "Returning memory map (%dk total)\n", 
-            (int)BiosMemoryMap[0].Length / 1024 );
+    memhandle = ofw_finddevice("/memory");
 
-    return 1;
+    returned = ofw_getprop(memhandle, "available", 
+			   (char *)memdata, sizeof(memdata));
+
+    printf("Returned data: %d\n", returned);
+    if( returned == -1 ) {
+	printf("getprop /memory[@reg] failed\n");
+	return 0;
+    }
+
+    for( i = 0; i < returned; i++ ) {
+	printf("%x ", memdata[i]);
+    }
+    printf("\n");
+
+    for( i = 0; i < returned / 2; i++ ) {
+	BiosMemoryMap[slots].Type = 1/*MEMTYPE_USABLE*/;
+	BiosMemoryMap[slots].BaseAddress = memdata[i*2];
+	BiosMemoryMap[slots].Length = memdata[i*2+1];
+	printf("MemoryMap[%d] = (%x:%x)\n", 
+	       i, 
+	       (int)BiosMemoryMap[slots].BaseAddress,
+	       (int)BiosMemoryMap[slots].Length);
+
+	/* Hack for pearpc */
+	if( kernel_mem ) {
+	    BiosMemoryMap[slots].Length = kernel_mem * 1024;
+	    if( !FixedMemory ) {
+		ofw_claim((int)BiosMemoryMap[slots].BaseAddress,
+			  (int)BiosMemoryMap[slots].Length,
+			  0x1000);
+		FixedMemory = BiosMemoryMap[slots].BaseAddress;
+	    }
+	    total += BiosMemoryMap[slots].Length;
+	    slots++;
+	    break;
+	/* Normal way */
+	} else if( BiosMemoryMap[slots].Length &&
+		   ofw_claim((int)BiosMemoryMap[slots].BaseAddress,
+			     (int)BiosMemoryMap[slots].Length,
+			     0x1000) ) {
+	    total += BiosMemoryMap[slots].Length;
+	    slots++;
+	}
+    }
+
+    printf( "Returning memory map (%dk total)\n", total / 1024 );
+
+    return slots;
 }
 
 /* Strategy:
@@ -288,7 +371,14 @@ BOOLEAN PpcDiskGetSystemVolume( char *SystemPath,
                              PULONGLONG StartSector, 
                              PULONGLONG SectorCount, 
                              int *FsType ) {
-    return FALSE;
+    char *remain = strchr(SystemPath, '\\');
+    if( remain ) {
+	strcpy( RemainingPath, remain+1 );
+    } else {
+	RemainingPath[0] = 0;
+    }
+    *Device = 0;
+    return MachDiskGetBootVolume(DriveNumber, StartSector, SectorCount, FsType);
 }
 
 BOOLEAN PpcDiskGetBootPath( char *OutBootPath, unsigned Size ) {
@@ -305,7 +395,7 @@ BOOLEAN PpcDiskBootingFromFloppy(VOID) {
 }
 
 BOOLEAN PpcDiskReadLogicalSectors( ULONG DriveNumber, ULONGLONG SectorNumber,
-                                ULONG SectorCount, PVOID Buffer ) {
+				   ULONG SectorCount, PVOID Buffer ) {
     int rlen = 0;
 
     if( part_handle == -1 ) {
@@ -322,11 +412,14 @@ BOOLEAN PpcDiskReadLogicalSectors( ULONG DriveNumber, ULONGLONG SectorNumber,
 	return FALSE;
     }
 
-    if( ofw_seek( part_handle, SectorNumber * 512 ) ) {
-	printf("Seek to %x failed\n", SectorNumber * 512);
+    if( ofw_seek( part_handle, 
+		   (ULONG)(SectorNumber >> 25), 
+		   (ULONG)((SectorNumber * 512) & 0xffffffff) ) ) {
+	printf("Seek to %x failed\n", (ULONG)(SectorNumber * 512));
 	return FALSE;
     }
-    rlen = ofw_read( part_handle, Buffer, SectorCount * 512 );
+
+    rlen = ofw_read( part_handle, Buffer, (ULONG)(SectorCount * 512) );
     return rlen > 0;
 }
 
@@ -351,31 +444,75 @@ ULONG PpcDiskGetCacheableBlockCount( ULONG DriveNumber ) {
 
 VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, 
                                PULONG Hour, PULONG Minute, PULONG Second ) {
-    printf("RTCGeturrentDateTime\n");
+    //printf("RTCGeturrentDateTime\n");
 }
 
 VOID PpcHwDetect() {
     printf("PpcHwDetect\n");
 }
 
+BOOLEAN PpcDiskNormalizeSystemPath(char *SystemPath, unsigned Size) {
+	CHAR BootPath[256];
+	ULONG PartitionNumber;
+	ULONG DriveNumber;
+	PARTITION_TABLE_ENTRY PartEntry;
+	char *p;
+
+	if (!DissectArcPath(SystemPath, BootPath, &DriveNumber, &PartitionNumber))
+	{
+		return FALSE;
+	}
+
+	if (0 != PartitionNumber)
+	{
+		return TRUE;
+	}
+
+	if (! DiskGetActivePartitionEntry(DriveNumber,
+	                                  &PartEntry,
+	                                  &PartitionNumber) ||
+	    PartitionNumber < 1 || 9 < PartitionNumber)
+	{
+		return FALSE;
+	}
+
+	p = SystemPath;
+	while ('\0' != *p && 0 != _strnicmp(p, "partition(", 10)) {
+		p++;
+	}
+	p = strchr(p, ')');
+	if (NULL == p || '0' != *(p - 1)) {
+		return FALSE;
+	}
+	*(p - 1) = '0' + PartitionNumber;
+
+	return TRUE;
+}
+
+extern int _bss;
 typedef unsigned int uint32_t;
 
-void PpcInit( of_proxy the_ofproxy ) {
-    int len;
-    ofproxy = the_ofproxy;
-
+void PpcOfwInit()
+{
     chosen_package = ofw_finddevice( "/chosen" );
 
+    ofw_getprop(chosen_package, "bootargs",
+		CmdLine, sizeof(CmdLine));
     ofw_getprop( chosen_package, "stdin",
-                 &stdin_handle, sizeof(stdin_handle) );
+		 (char *)&stdin_handle, sizeof(stdin_handle) );
+    ofw_getprop( chosen_package, "stdout",
+		 (char *)&stdout_handle, sizeof(stdout_handle) );
+    ofw_getprop( chosen_package, "mmu",
+		 (char *)&mmu_handle, sizeof(mmu_handle) );
 
-    stdin_handle = REV(stdin_handle);
-
-    MachVtbl.ConsPutChar = PpcPutChar;
+    MachVtbl.ConsPutChar = PpcOfwPutChar;
     MachVtbl.ConsKbHit   = PpcConsKbHit;
     MachVtbl.ConsGetCh   = PpcConsGetCh;
-    
-    printf( "stdin_handle is %x\n", stdin_handle );
+
+    printf( "chosen_package %x, stdin_handle is %x\n", 
+	    chosen_package, stdin_handle );
+    printf("virt2phys (0xe00000,D) -> %x\n", PpcVirt2phys(0xe00000,0));
+    printf("virt2phys (0xe01000,D) -> %x\n", PpcVirt2phys(0xe01000,0));
 
     MachVtbl.VideoClearScreen = PpcVideoClearScreen;
     MachVtbl.VideoSetDisplayMode = PpcVideoSetDisplayMode;
@@ -394,6 +531,7 @@ void PpcInit( of_proxy the_ofproxy ) {
 
     MachVtbl.GetMemoryMap = PpcGetMemoryMap;
 
+    MachVtbl.DiskNormalizeSystemPath = PpcDiskNormalizeSystemPath;
     MachVtbl.DiskGetBootVolume = PpcDiskGetBootVolume;
     MachVtbl.DiskGetSystemVolume = PpcDiskGetSystemVolume;
     MachVtbl.DiskGetBootPath = PpcDiskGetBootPath;
@@ -408,19 +546,27 @@ void PpcInit( of_proxy the_ofproxy ) {
 
     MachVtbl.HwDetect = PpcHwDetect;
 
+    // Allow forcing prep for broken OFW
+    if(!strncmp(CmdLine, "bootprep", 8))
+    {
+	printf("Going to PREP init...\n");
+	PpcPrepInit();
+	return;
+    }
+
     printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() );
 
-    len = ofw_getprop(chosen_package, "bootargs",
-		      CmdLine, sizeof(CmdLine));
-
-    if( len < 0 ) len = 0;
-    CmdLine[len] = 0;
-
     BootMain( CmdLine );
 }
 
+void PpcInit( of_proxy the_ofproxy ) {
+    ofproxy = the_ofproxy;
+    if(ofproxy) PpcOfwInit();
+    else PpcPrepInit();
+}
+
 void MachInit(const char *CmdLine) {
-    int len, i;
+    int i, len;
     char *sep;
 
     BootPart[0] = 0;
@@ -428,15 +574,19 @@ void MachInit(const char *CmdLine) {
 
     printf( "Determining boot device: [%s]\n", CmdLine );
 
-    printf( "Boot Args: %s\n", CmdLine );
     sep = NULL;
     for( i = 0; i < strlen(CmdLine); i++ ) {
 	if( strncmp(CmdLine + i, "boot=", 5) == 0) {
 	    strcpy(BootPart, CmdLine + i + 5);
-	    sep = strchr(BootPart, ' ');
+	    sep = strchr(BootPart, ',');
 	    if( sep )
 		*sep = 0;
-	    break;
+	    while(CmdLine[i] && CmdLine[i]!=',') i++;
+	}
+	if( strncmp(CmdLine + i, "mem=", 4) == 0) {
+	    kernel_mem = atoi(CmdLine+i+4);
+	    printf("Allocate %dk kernel memory\n", kernel_mem);
+	    while(CmdLine[i] && CmdLine[i]!=',') i++;
 	}
     }
 
@@ -464,10 +614,11 @@ void beep() {
 }
 
 UCHAR NTAPI READ_PORT_UCHAR(PUCHAR Address) {
-    return 0xff;
+    return GetPhysByte(((ULONG)Address)+0x80000000);
 }
 
 void WRITE_PORT_UCHAR(PUCHAR Address, UCHAR Value) {
+    SetPhysByte(((ULONG)Address)+0x80000000, Value);
 }
 
 void DiskStopFloppyMotor() {
@@ -484,3 +635,7 @@ void BootNewLinuxKernel() {
 void ChainLoadBiosBootSectorCode() {
     ofw_exit();
 }
+
+void DbgBreakPoint() {
+    ofw_exit();
+}

reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c

@@ -0,0 +1,398 @@
+#include <freeldr.h>
+#include "mmu.h"
+
+inline int GetMSR() {
+    register int res asm ("r3");
+    __asm__("mfmsr 3");
+    return res;
+}
+
+inline int GetDEC() {
+    register int res asm ("r3");
+    __asm__("mfdec 3");
+    return res;
+}
+
+__asm__("\t.globl GetPhys\n"
+	"GetPhys:\t\n"
+	"mflr  0\n\t"
+	"stwu  0,-16(1)\n\t"
+	"mfmsr 5\n\t"
+	"andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */
+	"mtmsr 6\n\t"
+	"isync\n\t"
+	"sync\n\t"
+	"lwz   3,0(3)\n\t"    /* Get actual value at phys addr r3 */
+	"mtmsr 5\n\t"
+	"isync\n\t"
+	"sync\n\t"
+	"lwz   0,0(1)\n\t"
+	"addi  1,1,16\n\t"
+	"mtlr  0\n\t"
+	"blr"
+    );
+
+__asm__("\t.globl GetPhysHalf\n"
+	"GetPhysHalf:\t\n"
+	"mflr  0\n\t"
+	"stwu  0,-16(1)\n\t"
+	"mfmsr 5\n\t"
+	"andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */
+	"mtmsr 6\n\t"
+	"isync\n\t"
+	"sync\n\t"
+	"lhz   3,0(3)\n\t"    /* Get actual value at phys addr r3 */
+	"mtmsr 5\n\t"
+	"isync\n\t"
+	"sync\n\t"
+	"lwz   0,0(1)\n\t"
+	"addi  1,1,16\n\t"
+	"mtlr  0\n\t"
+	"blr"
+    );
+
+__asm__("\t.globl GetPhysByte\n"
+	"GetPhysByte:\t\n"
+	"mflr  0\n\t"
+	"stwu  0,-16(1)\n\t"
+	"mfmsr 5\n\t"
+	"andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */
+	"mtmsr 6\n\t"
+	"isync\n\t"
+	"sync\n\t"
+	"lbz   3,0(3)\n\t"    /* Get actual value at phys addr r3 */
+	"mtmsr 5\n\t"
+	"isync\n\t"
+	"sync\n\t"
+	"lwz   0,0(1)\n\t"
+	"addi  1,1,16\n\t"
+	"mtlr  0\n\t"
+	"blr"
+    );
+
+__asm__("\t.globl SetPhys\n"
+	"SetPhys:\t\n"
+	"mflr  0\n\t"
+	"stwu  0,-16(1)\n\t"
+	"mfmsr 5\n\t"
+	"andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */
+	"mtmsr 6\n\t"
+	"sync\n\t"
+	"eieio\n\t"
+	"stw   4,0(3)\n\t"    /* Set actual value at phys addr r3 */
+	"dcbst 0,3\n\t"
+	"mtmsr 5\n\t"
+	"sync\n\t"
+	"eieio\n\t"
+	"mr    3,4\n\t"
+	"lwz   0,0(1)\n\t"
+	"addi  1,1,16\n\t"
+	"mtlr  0\n\t"
+	"blr"
+    );
+
+__asm__("\t.globl SetPhysHalf\n"
+	"SetPhysHalf:\t\n"
+	"mflr  0\n\t"
+	"stwu  0,-16(1)\n\t"
+	"mfmsr 5\n\t"
+	"andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */
+	"mtmsr 6\n\t"
+	"sync\n\t"
+	"eieio\n\t"
+	"sth   4,0(3)\n\t"    /* Set actual value at phys addr r3 */
+	"dcbst 0,3\n\t"
+	"mtmsr 5\n\t"
+	"sync\n\t"
+	"eieio\n\t"
+	"mr    3,4\n\t"
+	"lwz   0,0(1)\n\t"
+	"addi  1,1,16\n\t"
+	"mtlr  0\n\t"
+	"blr"
+    );
+
+__asm__("\t.globl SetPhysByte\n"
+	"SetPhysByte:\t\n"
+	"mflr  0\n\t"
+	"stwu  0,-16(1)\n\t"
+	"mfmsr 5\n\t"
+	"andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */
+	"mtmsr 6\n\t"
+	"sync\n\t"
+	"eieio\n\t"
+	"stb   4,0(3)\n\t"    /* Set actual value at phys addr r3 */
+	"dcbst 0,3\n\t"
+	"mtmsr 5\n\t"
+	"sync\n\t"
+	"eieio\n\t"
+	"mr    3,4\n\t"
+	"lwz   0,0(1)\n\t"
+	"addi  1,1,16\n\t"
+	"mtlr  0\n\t"
+	"blr"
+    );
+
+inline int GetSR(int n) {
+    register int res asm ("r3");
+    switch( n ) {
+    case 0:
+	__asm__("mfsr 3,0");
+	break;
+    case 1:
+	__asm__("mfsr 3,1");
+	break;
+    case 2:
+	__asm__("mfsr 3,2");
+	break;
+    case 3:
+	__asm__("mfsr 3,3");
+	break;
+    case 4:
+	__asm__("mfsr 3,4");
+	break;
+    case 5:
+	__asm__("mfsr 3,5");
+	break;
+    case 6:
+	__asm__("mfsr 3,6");
+	break;
+    case 7:
+	__asm__("mfsr 3,7");
+	break;
+    case 8:
+	__asm__("mfsr 3,8");
+	break;
+    case 9:
+	__asm__("mfsr 3,9");
+	break;
+    case 10:
+	__asm__("mfsr 3,10");
+	break;
+    case 11:
+	__asm__("mfsr 3,11");
+	break;
+    case 12:
+	__asm__("mfsr 3,12");
+	break;
+    case 13:
+	__asm__("mfsr 3,13");
+	break;
+    case 14:
+	__asm__("mfsr 3,14");
+	break;
+    case 15:
+	__asm__("mfsr 3,15");
+	break;
+    }
+    return res;
+}
+
+inline void GetBat( int bat, int inst, int *batHi, int *batLo ) {
+    register int bh asm("r3"), bl asm("r4");
+    if( inst ) {
+	switch( bat ) {
+	case 0:
+	    __asm__("mfibatu 3,0");
+	    __asm__("mfibatl 4,0");
+	    break;
+	case 1:
+	    __asm__("mfibatu 3,1");
+	    __asm__("mfibatl 4,1");
+	    break;
+	case 2:
+	    __asm__("mfibatu 3,2");
+	    __asm__("mfibatl 4,2");
+	    break;
+	case 3:
+	    __asm__("mfibatu 3,3");
+	    __asm__("mfibatl 4,3");
+	    break;
+	}
+    } else {
+	switch( bat ) {
+	case 0:
+	    __asm__("mfdbatu 3,0");
+	    __asm__("mfdbatl 4,0");
+	    break;
+	case 1:
+	    __asm__("mfdbatu 3,1");
+	    __asm__("mfdbatl 4,1");
+	    break;
+	case 2:
+	    __asm__("mfdbatu 3,2");
+	    __asm__("mfdbatl 4,2");
+	    break;
+	case 3:
+	    __asm__("mfdbatu 3,3");
+	    __asm__("mfdbatl 4,3");
+	    break;
+	}
+    }
+    *batHi = bh;
+    *batLo = bl;
+}
+
+inline void SetBat( int bat, int inst, int batHi, int batLo ) {
+    register int bh asm("r3"), bl asm("r4");
+    bh = batHi;
+    bl = batLo;
+    if( inst ) {
+	switch( bat ) {
+	case 0:
+	    __asm__("mtibatu 0,3");
+	    __asm__("mtibatl 0,4");
+	    break;
+	case 1:
+	    __asm__("mtibatu 1,3");
+	    __asm__("mtibatl 1,4");
+	    break;
+	case 2:
+	    __asm__("mtibatu 2,3");
+	    __asm__("mtibatl 2,4");
+	    break;
+	case 3:
+	    __asm__("mtibatu 3,3");
+	    __asm__("mtibatl 3,4");
+	    break;
+	}
+    } else {
+	switch( bat ) {
+	case 0:
+	    __asm__("mtdbatu 0,3");
+	    __asm__("mtdbatl 0,4");
+	    break;
+	case 1:
+	    __asm__("mtdbatu 1,3");
+	    __asm__("mtdbatl 1,4");
+	    break;
+	case 2:
+	    __asm__("mtdbatu 2,3");
+	    __asm__("mtdbatl 2,4");
+	    break;
+	case 3:
+	    __asm__("mtdbatu 3,3");
+	    __asm__("mtdbatl 3,4");
+	    break;
+	}
+    }
+    __asm__("isync\n\tsync");
+}
+
+inline int GetSDR1() {
+    register int res asm("r3");
+    __asm__("mfsdr1 3");
+    return res;
+}
+
+inline void SetSDR1( int sdr ) {
+#if 0
+    int i,j;
+#endif
+    __asm__("mtsdr1 3");
+#if 0
+    __asm__("sync");
+    __asm__("isync");
+    __asm__("ptesync");
+    
+    for( i = 0; i < 256; i++ ) {
+	j = i << 12;
+	__asm__("tlbie %0,0" : : "r" (j));
+    }
+    __asm__("eieio");
+    __asm__("tlbsync");
+    __asm__("ptesync");
+#endif
+}
+
+inline int BatHit( int bath, int batl, int virt ) {
+    int mask = 0xfffe0000 & ~((batl & 0x3f) << 17);
+    return (batl & 0x40) && ((virt & mask) == (bath & mask));
+}
+
+inline int BatTranslate( int bath, int batl, int virt ) {
+    return (virt & 0x007fffff) | (batl & 0xfffe0000);
+}
+
+/* translate address */
+int PpcVirt2phys( int virt, int inst ) {
+    int msr = GetMSR();
+    int txmask = inst ? 0x20 : 0x10;
+    int i, bath, batl, sr, sdr1, physbase, vahi, valo;
+    int npteg, hash, hashmask, ptehi, ptelo, ptegaddr;
+    int vsid, pteh, ptevsid, pteapi;
+		
+    if( msr & txmask ) {
+	sr = GetSR( virt >> 28 );
+	vsid = sr & 0xfffffff;
+	vahi = vsid >> 4;
+	valo = (vsid << 28) | (virt & 0xfffffff);
+	if( sr & 0x80000000 ) {
+	    return valo;
+	}
+
+	for( i = 0; i < 4; i++ ) {
+	    GetBat( i, inst, &bath, &batl );
+	    if( BatHit( bath, batl, virt ) ) {
+		return BatTranslate( bath, batl, virt );
+	    }
+	}
+
+	sdr1 = GetSDR1();
+
+	physbase = sdr1 & ~0xffff;
+	hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff;
+	hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff);
+	npteg = hashmask + 1;
+
+	for( pteh = 0; pteh < 0x80; pteh += 64, hash ^= 0x7ffff ) {
+	    ptegaddr = ((hashmask & hash) * 64) + physbase;
+
+	    for( i = 0; i < 8; i++ ) {
+		ptehi = GetPhys( ptegaddr + (i * 8) );
+		ptelo = GetPhys( ptegaddr + (i * 8) + 4 );
+
+		ptevsid = (ptehi >> 7) & 0xffffff;
+		pteapi = ptehi & 0x3f;
+
+		if( (ptehi & 64) != pteh ) continue;
+		if( ptevsid != (vsid & 0xffffff) ) continue;
+		if( pteapi != ((virt >> 22) & 0x3f) ) continue;
+		
+		return (ptelo & 0xfffff000) | (virt & 0xfff);
+	    }
+	}
+	return -1;
+    } else {
+	return virt;
+    }
+}
+
+/* Add a new page table entry for the indicated mapping */
+BOOLEAN InsertPageEntry( int virt, int phys, int slot, int _sdr1 ) {
+    int i, ptehi, ptelo;
+    int sdr1 = _sdr1 ? _sdr1 : GetSDR1();
+    int sr = GetSR( (virt >> 28) & 0xf );
+    int vsid = sr & 0xfffffff;
+    int physbase = sdr1 & ~0xffff;
+    int hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff;
+    int valo = (vsid << 28) | (virt & 0xfffffff);
+    int hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff);
+    int ptegaddr = ((hashmask & hash) * 64) + physbase;
+
+    for( i = 0; i < 8; i++ ) {
+	ptehi = GetPhys( ptegaddr + (i * 8) );
+	
+	if( (slot != i) && (ptehi & 0x80000000) ) continue;
+
+	ptehi = (1 << 31) | (vsid << 7) | ((virt >> 22) & 0x3f);
+	ptelo = phys & ~0xfff;
+
+	SetPhys( ptegaddr + (i * 8), ptehi );
+	SetPhys( ptegaddr + (i * 8) + 4, ptelo );
+
+	return TRUE;
+    }
+
+    return FALSE;
+}

reactos/boot/freeldr/freeldr/arch/powerpc/ofw_util.s

@@ -0,0 +1,49 @@
+	.section .text
+	.globl ofw_functions
+	.globl ofw_call_addr
+	.globl call_ofw
+call_ofw:	
+       /* R3 has the function offset to call (n * 4)
+        * Other arg registers are unchanged. */
+       subi    %r1,%r1,0x100
+       stw     %r8,24(%r1)
+       mflr    %r8
+       stw     %r8,0(%r1)
+       stw     %r3,4(%r1)
+       stw     %r4,8(%r1)
+       stw     %r5,12(%r1)
+       stw     %r6,16(%r1)
+       stw     %r7,20(%r1)
+       stw     %r9,28(%r1)
+       stw     %r10,32(%r1)
+       stw     %r20,36(%r1)
+
+       lis     %r10,ofw_functions@ha
+       addi    %r8,%r10,ofw_functions@l
+       add     %r8,%r3,%r8
+       lwz     %r9,0(%r8)
+       mtctr   %r9
+
+       mr      %r3,%r4
+       mr      %r4,%r5
+       mr      %r5,%r6
+       mr      %r6,%r7
+       mr      %r7,%r8
+       mr      %r8,%r9
+
+       /* Call ofw proxy function */
+       bctrl
+
+       lwz     %r8,0(%r1)
+       mtlr    %r8
+       lwz     %r4,8(%r1)
+       lwz     %r5,12(%r1)
+       lwz     %r6,16(%r1)
+       lwz     %r7,20(%r1)
+       lwz     %r8,24(%r1)
+       lwz     %r9,28(%r1)
+       lwz     %r10,32(%r1)
+       lwz     %r20,36(%r1)
+       addi    %r1,%r1,0x100
+       blr
+

reactos/boot/freeldr/freeldr/arch/powerpc/prep.c

@@ -0,0 +1,112 @@
+#include "freeldr.h"
+#include "machine.h"
+#include "mmu.h"
+#include "prep.h"
+
+int prep_serial = 0x800003f8;
+
+void sync() { __asm__("eieio\n\tsync"); }
+
+/* Simple serial */
+
+void PpcPrepPutChar( int ch ) {
+    if( ch == 0x0a ) {
+	SetPhysByte(prep_serial, 0x0d);
+	sync();
+    }
+    SetPhysByte(prep_serial, ch);
+    sync();
+}
+
+BOOLEAN PpcPrepDiskReadLogicalSectors
+( ULONG DriveNumber, ULONGLONG SectorNumber,
+  ULONG SectorCount, PVOID Buffer ) {
+    int secct;
+    
+    for(secct = 0; secct < SectorCount; secct++)
+    {
+	ide_seek(&ide1_desc, SectorNumber + secct, 0);
+	ide_read(&ide1_desc, ((PCHAR)Buffer) + secct * 512, 512);
+    }
+    /* Never give up! */
+    return TRUE;
+}
+
+BOOLEAN PpcPrepConsKbHit()
+{
+    return 1;
+    //return GetPhysByte(prep_serial+5) & 1;
+}
+
+int PpcPrepConsGetCh() 
+{
+    while(!PpcPrepConsKbHit());
+    return GetPhysByte(prep_serial);
+}
+
+void PpcPrepVideoClearScreen(UCHAR Attr)
+{
+    printf("\033c");
+}
+
+VIDEODISPLAYMODE PpcPrepVideoSetDisplayMode( char *DisplayMode, BOOLEAN Init )
+{
+    return VideoTextMode;
+}
+
+void PpcPrepVideoGetDisplaySize( PULONG Width, PULONG Height, PULONG Depth )
+{
+    *Width = 80;
+    *Height = 25;
+    *Depth = 16;
+}
+
+void PpcPrepVideoPrepareForReactOS()
+{
+    pci_setup(&pci1_desc);
+}
+
+int mmu_initialized = 0;
+
+ULONG PpcPrepGetMemoryMap( PBIOS_MEMORY_MAP BiosMemoryMap,
+			   ULONG MaxMemoryMapSize )
+{
+    // xxx fixme
+    BiosMemoryMap[0].Type = 1;
+    BiosMemoryMap[0].BaseAddress = 0xe80000;
+    BiosMemoryMap[0].Length = (64 * 1024 * 1024) - BiosMemoryMap[0].BaseAddress;
+    if(!mmu_initialized)
+    {
+	MmuInit();
+	mmu_initialized = 1;
+    }
+    MmuSetMemorySize(BiosMemoryMap[0].Length + BiosMemoryMap[0].BaseAddress);
+    return 1;
+}
+
+void PpcPrepInit()
+{
+    MachVtbl.ConsPutChar = PpcPrepPutChar;
+
+    printf("Serial on\n");
+
+    ide_setup( &ide1_desc );
+
+    MachVtbl.DiskReadLogicalSectors = PpcPrepDiskReadLogicalSectors;
+    
+    MachVtbl.ConsKbHit   = PpcPrepConsKbHit;
+    MachVtbl.ConsGetCh   = PpcPrepConsGetCh;
+
+    MachVtbl.VideoClearScreen = PpcPrepVideoClearScreen;
+    MachVtbl.VideoSetDisplayMode = PpcPrepVideoSetDisplayMode;
+    MachVtbl.VideoGetDisplaySize = PpcPrepVideoGetDisplaySize;
+
+    MachVtbl.VideoPrepareForReactOS = PpcPrepVideoPrepareForReactOS;
+
+    MachVtbl.GetMemoryMap = PpcPrepGetMemoryMap;
+
+    printf( "FreeLDR version [%s]\n", GetFreeLoaderVersionString() );
+
+    BootMain( "" );
+}
+

reactos/boot/freeldr/freeldr/arch/powerpc/prep.h

@@ -0,0 +1,24 @@
+#ifndef FREELDR_ARCH_POWERPC_PREP_H
+#define FREELDR_ARCH_POWERPC_PREP_H
+
+extern struct _pci_desc pci1_desc;
+extern struct _idectl_desc ide1_desc;
+extern struct _vga_desc vga1_desc;
+struct _pci_bar {
+    unsigned long data;
+};
+
+void sync();
+void PpcPrepInit();
+void ide_seek( void *extension, int low, int high );
+int  ide_read( void *extension, char *buffer, int bytes );
+void ide_setup( void *extension );
+
+void print_bar( struct _pci_bar *bar );
+void pci_setup( struct _pci_desc *pci_desc );
+void pci_read_bar( struct _pci_desc *pci_desc, int bus, int dev, int fn, int bar, struct _pci_bar *bar_data );
+
+void vga_setup( struct _pci_desc *pci_desc, struct _vga_desc *vga_desc, 
+		int bus, int dev, int fn );
+
+#endif//FREELDR_ARCH_POWERPC_PREP_H

reactos/boot/freeldr/freeldr/arch/powerpc/prep_ide.c

@@ -0,0 +1,106 @@
+#include "freeldr.h"
+#include "machine.h"
+#include "mmu.h"
+#include "prep.h"
+
+#define SWAP_W(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff))
+
+typedef struct _idectl_desc {
+    int port;
+    long long seekto;
+    int seek_cylinder, seek_head, seek_sector;
+    int cylinders, heads, sectors, bytespersec;
+} idectl_desc;
+
+idectl_desc ide1_desc = { 0x800001f0 };
+
+void ide_seek( void *extension, int low, int high ) {
+    idectl_desc *desc = (idectl_desc *)extension;
+    long long seekto = ((((long long)high) << 32) | (low & 0xffffffff));
+    /* order = sector, head, cylinder */
+    desc->seek_sector = seekto % desc->sectors;
+    seekto /= desc->sectors;
+    desc->seek_head = seekto % desc->heads;
+    seekto /= desc->heads;
+    desc->seek_cylinder = seekto;
+    desc->seekto = seekto;
+}
+
+/* Thanks chuck moore.  This is based on the color forth ide code */
+/* Wait for ready */
+void ide_rdy( void *extension ) {
+    idectl_desc *desc = (idectl_desc *)extension;
+    while( !(GetPhysByte(desc->port+7) & 0x40) ) sync(); 
+}
+
+void ide_drq( void *extension ) {
+    idectl_desc *desc = (idectl_desc *)extension;
+    while( !(GetPhysByte(desc->port+7) & 0x08) ) sync(); 
+}
+
+void ide_bsy( void *extension ) {
+    idectl_desc *desc = (idectl_desc *)extension;
+    while( GetPhysByte(desc->port+7) & 0x80 ) 
+    {
+	printf("Waiting for not busy\n");
+	sync(); 
+    }
+}
+
+int ide_read( void *extension, char *buffer, int bytes ) {
+    idectl_desc *desc = (idectl_desc *)extension;
+    short *databuf = (short *)buffer;
+    int inwords;
+
+    ide_bsy( extension );
+    SetPhysByte(desc->port+2, bytes / desc->bytespersec);
+    SetPhysByte(desc->port+3, desc->seek_sector + 1);
+    SetPhysByte(desc->port+4, desc->seek_cylinder);
+    SetPhysByte(desc->port+5, desc->seek_cylinder >> 8);
+    SetPhysByte(desc->port+6, desc->seek_head | 0xa0);
+    SetPhysByte(desc->port+7, 0x20);
+    
+    for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) {
+	databuf[inwords] = GetPhysHalf(desc->port);
+    }
+
+    desc->seekto += desc->bytespersec;
+    ide_seek( extension, desc->seekto, desc->seekto >> 32 );
+
+    return bytes - (bytes % desc->bytespersec);
+}
+
+void ide_setup( void *extension ) {
+    idectl_desc *desc = (idectl_desc *)extension;
+    short identbuffer[256];
+    char namebuf[41];
+    short *databuf = (short *)identbuffer, in;
+    int inwords;
+
+    ide_rdy( extension );
+    ide_bsy( extension );
+    desc->bytespersec = 512;
+    SetPhysByte(desc->port+2, 1);
+    SetPhysByte(desc->port+3, 0);
+    SetPhysByte(desc->port+4, 0);
+    SetPhysByte(desc->port+5, 0);
+    SetPhysByte(desc->port+6, 0);
+    SetPhysByte(desc->port+7, 0xec);
+    ide_drq( extension );
+
+    for( inwords = 0; inwords < desc->bytespersec / sizeof(short); inwords++ ) {
+	in = GetPhysHalf(desc->port);
+	databuf[inwords] = SWAP_W(in);
+	sync();
+    }
+
+    desc->cylinders = identbuffer[1];
+    desc->heads = identbuffer[3];
+    desc->sectors = identbuffer[6];
+
+    /* Debug: Write out hard disc model */
+
+    strncpy(namebuf, (char *)(identbuffer+0x1b), 41);
+    printf("HARD DISC MODEL: %s c,h,s %d,%d,%d\n", 
+	   namebuf, desc->cylinders, desc->heads, desc->sectors);
+}

reactos/boot/freeldr/freeldr/arch/powerpc/prep_pci.c

@@ -0,0 +1,127 @@
+#include <freeldr.h>
+#include "prep.h"
+
+typedef struct _pci_cfg {
+    unsigned long addr;
+    unsigned long data;
+} pci_cfg;
+
+typedef struct _pci_desc {
+    pci_cfg *cfg;
+} pci_desc;
+
+pci_desc pci1_desc = { (void *)0x80000cf8 };
+#define rev16(x) ((((x)>>8)&0xff)|(((x)&0xff)<<8))
+#define rev32(x) ((((x)>>24)&0xff)|(((x)>>8)&0xff00)|(((x)&0xff00)<<8)|(((x)&0xff)<<24))
+#define pci_addr(bus,dev,fn,reg) \
+         (0x80000000 | \
+          ((bus & 0xff) << 16) | \
+          ((dev & 0x1f) << 11) | \
+          ((fn & 7) << 8) | \
+          (reg & 0xfc))
+#if 0
+#define pci_cfg_addr(bus,dev,fn,reg) \
+        ((bus == 0) ? \
+         ((1 << (dev + 16)) | \
+          (dev << 11) | \
+          (fn << 8) | \
+          ((reg & 0xfc) | 1)) : pci_addr(bus,dev,fn,reg))
+#else
+#define pci_cfg_addr(bus,dev,fn,reg) pci_addr(bus,dev,fn,reg)
+#endif
+    unsigned long pci_read( pci_desc *desc, int bus, int dev, int fn, int reg, int len ) {
+	sync();
+	unsigned long save_state = desc->cfg->addr, ret = 0;
+	unsigned long addr = pci_cfg_addr(bus,dev,fn,reg);
+	unsigned long offset = reg & 3;
+	desc->cfg->addr = rev32(addr);
+	sync();
+	switch( len ) {
+	case 4:
+	    ret = desc->cfg->data;
+	    break;
+	case 2:
+	    ret = desc->cfg->data;
+	    ret = (ret >> (offset << 3)) & 0xffff;
+	    break;
+	case 1:
+	    ret = desc->cfg->data;
+	    ret = (ret >> (offset << 3)) & 0xff;
+	    break;
+	}
+	desc->cfg->addr = save_state;
+	sync();
+	return ret;
+    }
+
+void pci_read_bar( pci_desc *desc, int bus, int dev, int fn, int bar, 
+		   struct _pci_bar *bar_data ) {
+    bar_data->data = pci_read( desc, bus, dev, fn, 0x10 + (bar * 4), 4 );
+}
+
+/* 
+ * Imagine: offset 3, len 1
+ * let oldval = 0x12345678 and val = 0xabcd1234;
+ * mask = ((1 << 8) - 1) << 24; // 0xff000000
+ * oldval = (0x12345678 & 0x00ffffff) | (0xabcd1234 & 0xff000000) = 0xab345678;
+ */
+void pci_write( pci_desc *desc, int bus, int dev, int fn, int reg, int len, int val ) {
+    unsigned long save_state = desc->cfg->addr;
+    unsigned long addr = pci_cfg_addr(bus,dev,fn,reg);
+    unsigned long offset = reg & 3;
+    unsigned long oldval = pci_read( desc, bus, dev, fn, reg & ~3, 4 );
+    unsigned long mask = ((1 << (len * 8)) - 1) << (offset << 3);
+    oldval = (oldval & ~mask) | ((val << (offset << 3)) & mask);
+    desc->cfg->addr = rev32(addr);
+    sync();
+    desc->cfg->data = rev32(oldval);
+    sync();
+    desc->cfg->addr = save_state;
+    sync();
+}
+
+void pci_write_bar( pci_desc *desc, int bus, int dev, int fn, int bar, struct _pci_bar *bar_data ) {
+    pci_write( desc, bus, dev, fn, 0x10 + (bar * 4), 4, bar_data->data );
+}
+
+void print_bar( struct _pci_bar *bar ) {
+    printf("BAR: %x\n", bar->data);
+}
+
+#define PCI_VENDORID 0
+#define PCI_DEVICEID 2
+#define PCI_HEADER_TYPE 0xe
+#define PCI_BASECLASS   0xb
+
+void pci_setup( pci_desc *desc ) {
+    unsigned char type;
+    unsigned short vendor, device, devclass;
+    int funcs, bus, dev, fn;
+
+    pci1_desc.cfg = (pci_cfg *)0x80000cf8;
+
+    printf("PCI Bus:\n");
+    for( bus = 0; bus < 1; bus++ ) {
+        for( dev = 0; dev < 32; dev++ ) {
+            type = pci_read(desc,bus,dev,0,PCI_HEADER_TYPE,1);
+            vendor = pci_read(desc,bus,dev,0,PCI_VENDORID,2);
+            device = pci_read(desc,bus,dev,0,PCI_DEVICEID,2);
+            
+            if(vendor == 0 || vendor == 0xffff) continue;
+            if(type & 0x80) funcs = 8; else funcs = 1;
+
+            for( fn = 0; fn < funcs; fn++ ) {
+                devclass = pci_read(desc,bus,dev,fn,PCI_BASECLASS,1);
+		printf(" %d:%d -> vendor:device:class %x:%x:%x\n",
+		       bus, dev, vendor, device, devclass);
+                
+                if( devclass == 3 ) {
+		    printf("Setting up vga...\n");
+                    vga_setup(desc,&vga1_desc,bus,dev,fn);
+		    printf("Done with vga\n");
+                }
+            }
+        }
+    }
+    printf("^-- end PCI\n");
+}

reactos/boot/freeldr/freeldr/arch/powerpc/prep_vga.c

@@ -0,0 +1,30 @@
+#include <freeldr.h>
+#include "prep.h"
+#include "ppcboot.h"
+
+extern boot_infos_t BootInfo;
+
+struct _vga_desc {
+    char *port;
+    char *addr;
+};
+
+#define VGA_WIDTH 1024
+#define VGA_HEIGHT 768
+struct _vga_desc vga1_desc = { (char *)0x800003c0 };
+
+void vga_setup( struct _pci_desc *desc, struct _vga_desc *vga_desc, 
+		int bus, int dev, int fn ) {
+    struct _pci_bar bar_data;
+    int i;
+
+    for( i = 0; i < 6; i++ ) {
+        pci_read_bar( desc, bus, dev, fn, i, &bar_data );
+        print_bar( &bar_data );
+        if( (bar_data.data > 0x10000) || ((bar_data.data&1) == 1) ) {
+            vga_desc->addr = (char *)(0xc0000000 + (bar_data.data & ~0x7ff));
+	    BootInfo.dispDeviceBase = vga_desc->addr;
+            break;
+        }
+    }
+}

reactos/boot/freeldr/freeldr/cache/blocklist.c

@@ -77,7 +77,6 @@ PCACHE_BLOCK CacheInternalFindBlock(PCACHE_DRIVE CacheDrive, ULONG BlockNumber)
 				// Increment the blocks access count
 				//
 				CacheBlock->AccessCount++;
-
 				return CacheBlock;
 			}
 
@@ -164,6 +163,7 @@ BOOLEAN CacheInternalFreeBlock(PCACHE_DRIVE CacheDrive)
 	// so just return
 	if (CacheBlockToFree == NULL)
 	{
+	        printf("[cached] all cache blocks locked\n");
 		return FALSE;
 	}
 
@@ -207,6 +207,7 @@ VOID CacheInternalCheckCacheSizeLimits(PCACHE_DRIVE CacheDrive)
 
 VOID CacheInternalDumpBlockList(PCACHE_DRIVE CacheDrive)
 {
+#if 0
 	PCACHE_BLOCK	CacheBlock;
 
 	DbgPrint((DPRINT_CACHE, "Dumping block list for BIOS drive 0x%x.\n", CacheDrive->DriveNumber));
@@ -233,6 +234,7 @@ VOID CacheInternalDumpBlockList(PCACHE_DRIVE CacheDrive)
 
 		CacheBlock = (PCACHE_BLOCK)RtlListGetNext((PLIST_ITEM)CacheBlock);
 	}
+#endif
 }
 
 VOID CacheInternalOptimizeBlockList(PCACHE_DRIVE CacheDrive, PCACHE_BLOCK CacheBlock)

reactos/boot/freeldr/freeldr/cache/cache.c

@@ -284,7 +284,7 @@ BOOLEAN CacheForceDiskSectorsIntoCache(ULONG DiskNumber, ULONG StartSector, ULON
 		//
 		// Lock the sectors into the cache
 		//
-		CacheBlock->LockedInCache = TRUE;
+		CacheBlock->LockedInCache = FALSE; //TRUE;
 	}
 
 	return TRUE;

reactos/boot/freeldr/freeldr/drivemap.c

@@ -171,6 +171,7 @@ ULONG DriveMapGetBiosDriveNumber(PCSTR DeviceName)
 
 VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap)
 {
+#ifdef _M_IX86
 	ULONG*	RealModeIVT = (ULONG*)0x00000000;
 	USHORT*	BiosLowMemorySize = (USHORT*)0x00000413;
 
@@ -202,6 +203,7 @@ VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap)
 	RealModeIVT[0x13] = DriveMapHandlerSegOff;
 
 	CacheInvalidateCacheData();
+#endif
 	DriveMapInstalled = TRUE;
 }
 

reactos/boot/freeldr/freeldr/freeldr.rbuild

@@ -5,8 +5,8 @@
 	<library>freeldr_base</library>
 	<library>freeldr_arch</library>
 	<library>freeldr_main</library>
+	<library>cmlib</library>
 	<library>rossym</library>
 	<library>string</library>
-	<library>cmlib</library>
 	<library>rtl</library>
 </module>

reactos/boot/freeldr/freeldr/freeldr_arch.rbuild

@@ -48,6 +48,8 @@
 	<directory name="powerpc">
 		<if property="ARCH" value="powerpc">
 			<module name="freeldr_arch" type="objectlibrary">
+				<include base="ReactOS">include/psdk</include>
+				<include base="ReactOS">include/reactos/ppcmmu</include>
 				<include base="freeldr_base">include</include>
 				<include base="freeldr_base">cache</include>
 				<include base="ntoskrnl">include</include>
@@ -60,10 +62,21 @@
 				<compilerflag>-fno-builtin</compilerflag>
 				<compilerflag>-fno-inline</compilerflag>
 				<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
-				<compilerflag>-Os</compilerflag>
+				<compilerflag>-O0</compilerflag>
+				<compilerflag>-fPIC</compilerflag>
+<!--				<compilerflag>-mno-toc</compilerflag>
+				<compilerflag>-meabi</compilerflag> -->
 				<file>boot.s</file>
+				<file>ofw_calls.s</file>
+				<file>ofw_util.s</file>
+				<file>ofw.c</file>
 				<file>mach.c</file>
+				<file>prep.c</file>
+				<file>prep_ide.c</file>
+				<file>prep_pci.c</file>
+				<file>prep_vga.c</file>
 				<file>mboot.c</file>
+				<file>loader.c</file>
 			</module>
 		</if>
 	</directory>

reactos/boot/freeldr/freeldr/freeldr_base.rbuild

@@ -1,12 +1,11 @@
 <module name="freeldr_base" type="objectlibrary">
+	<include base="ReactOS">include/psdk</include>
 	<include base="freeldr_base">include</include>
 	<include base="freeldr_base">cache</include>
-	<include base="cmlib">.</include>
 	<include base="ntoskrnl">include</include>
+	<include base="cmlib">.</include>
 	<define name="__USE_W32API" />
-<!--	
 	<define name="DEBUG" />
--->
 	<define name="_NTHAL_" />
 	<define name="_NTSYSTEM_" />
 	<compilerflag>-ffreestanding</compilerflag>
@@ -47,12 +46,13 @@
 	</directory>
 	<directory name="reactos">
 		<file>registry.c</file>
-		<file>arcname.c</file>
 		<file>binhive.c</file>
+		<file>arcname.c</file>
 		<file>reactos.c</file>
 	</directory>
 	<directory name="rtl">
 		<file>list.c</file>
+		<file>libsupp.c</file>
 	</directory>
 	<directory name="ui">
 		<file>gui.c</file>

reactos/boot/freeldr/freeldr/freeldr_main.rbuild

@@ -1,10 +1,9 @@
 <module name="freeldr_main" type="objectlibrary">
+	<include base="ReactOS">include/psdk</include>
 	<include base="freeldr_main">include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="__USE_W32API" />
-<!--	
 	<define name="DEBUG" />
--->
 	<define name="_NTHAL_" />
 	<compilerflag>-ffreestanding</compilerflag>
 	<compilerflag>-fno-builtin</compilerflag>

reactos/boot/freeldr/freeldr/fs/fat.c

@@ -19,7 +19,7 @@
 
 #include <freeldr.h>
 
-#define NDEBUG
+//#define NDEBUG
 #include <debug.h>
 
 ULONG			BytesPerSector;			/* Number of bytes per sector */
@@ -37,6 +37,84 @@ ULONG			DataSectorStart;		/* Starting sector of the data area */
 ULONG			FatType = 0;			/* FAT12, FAT16, FAT32, FATX16 or FATX32 */
 ULONG			FatDriveNumber = 0;
 
+VOID FatSwapFatBootSector(PFAT_BOOTSECTOR Obj)
+{
+    SW(Obj, BytesPerSector);
+    SW(Obj, ReservedSectors);
+    SW(Obj, RootDirEntries);
+    SW(Obj, TotalSectors);
+    SW(Obj, SectorsPerFat);
+    SW(Obj, SectorsPerTrack);
+    SW(Obj, NumberOfHeads);
+    SD(Obj, HiddenSectors);
+    SD(Obj, TotalSectorsBig);
+    SD(Obj, VolumeSerialNumber);
+    SW(Obj, BootSectorMagic);
+}
+
+VOID FatSwapFat32BootSector(PFAT32_BOOTSECTOR Obj)
+{
+    SW(Obj, BytesPerSector);
+    SW(Obj, ReservedSectors);
+    SW(Obj, RootDirEntries);
+    SW(Obj, TotalSectors);
+    SW(Obj, SectorsPerFat);
+    SW(Obj, NumberOfHeads);
+    SD(Obj, HiddenSectors);
+    SD(Obj, TotalSectorsBig);
+    SD(Obj, SectorsPerFatBig);
+    SW(Obj, ExtendedFlags);
+    SW(Obj, FileSystemVersion);
+    SD(Obj, RootDirStartCluster);
+    SW(Obj, FsInfo);
+    SW(Obj, BackupBootSector);
+    SD(Obj, VolumeSerialNumber);
+    SW(Obj, BootSectorMagic);
+}
+
+VOID FatSwapFatXBootSector(PFATX_BOOTSECTOR Obj)
+{
+    SD(Obj, VolumeSerialNumber);
+    SD(Obj, SectorsPerCluster);
+    SW(Obj, NumberOfFats);
+}
+
+VOID FatSwapDirEntry(PDIRENTRY Obj)
+{
+    SW(Obj, CreateTime);
+    SW(Obj, CreateDate);
+    SW(Obj, LastAccessDate);
+    SW(Obj, ClusterHigh);
+    SW(Obj, Time);
+    SW(Obj, Date);
+    SW(Obj, ClusterLow);
+    SD(Obj, Size);
+}
+
+VOID FatSwapLFNDirEntry(PLFN_DIRENTRY Obj)
+{
+    int i;
+    SW(Obj, StartCluster);
+    for(i = 0; i < 5; i++)
+	Obj->Name0_4[i] = SWAPW(Obj->Name0_4[i]);
+    for(i = 0; i < 6; i++)
+	Obj->Name5_10[i] = SWAPW(Obj->Name5_10[i]);
+    for(i = 0; i < 2; i++)
+	Obj->Name11_12[i] = SWAPW(Obj->Name11_12[i]);
+}
+
+VOID FatSwapFatXDirEntry(PFATX_DIRENTRY Obj)
+{
+    SD(Obj, StartCluster);
+    SD(Obj, Size);
+    SW(Obj, Time);
+    SW(Obj, Date);
+    SW(Obj, CreateTime);
+    SW(Obj, CreateDate);
+    SW(Obj, LastAccessTime);
+    SW(Obj, LastAccessDate);
+}
+
 BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG PartitionSectorCount)
 {
 	char ErrMsg[80];
@@ -75,6 +153,7 @@ BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG Partitio
 	}
 	RtlCopyMemory(FatVolumeBootSector, (PVOID)DISKREADBUFFER, 512);
 
+
 	// Get the FAT type
 	FatType = FatDetermineFatType(FatVolumeBootSector, PartitionSectorCount);
 
@@ -84,6 +163,7 @@ BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG Partitio
 
 	if (ISFATX(FatType))
 	{
+	        FatSwapFatXBootSector(FatXVolumeBootSector);
 		DbgPrint((DPRINT_FILESYSTEM, "sizeof(FATX_BOOTSECTOR) = 0x%x.\n", sizeof(FATX_BOOTSECTOR)));
 
 		DbgPrint((DPRINT_FILESYSTEM, "FileSystemType: %c%c%c%c.\n", FatXVolumeBootSector->FileSystemType[0], FatXVolumeBootSector->FileSystemType[1], FatXVolumeBootSector->FileSystemType[2], FatXVolumeBootSector->FileSystemType[3]));
@@ -97,6 +177,7 @@ BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG Partitio
 	}
 	else if (FatType == FAT32)
 	{
+	        FatSwapFat32BootSector(Fat32VolumeBootSector);
 		DbgPrint((DPRINT_FILESYSTEM, "sizeof(FAT32_BOOTSECTOR) = 0x%x.\n", sizeof(FAT32_BOOTSECTOR)));
 
 		DbgPrint((DPRINT_FILESYSTEM, "JumpBoot: 0x%x 0x%x 0x%x\n", Fat32VolumeBootSector->JumpBoot[0], Fat32VolumeBootSector->JumpBoot[1], Fat32VolumeBootSector->JumpBoot[2]));
@@ -130,6 +211,7 @@ BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG Partitio
 	}
 	else
 	{
+	        FatSwapFatBootSector(FatVolumeBootSector);
 		DbgPrint((DPRINT_FILESYSTEM, "sizeof(FAT_BOOTSECTOR) = 0x%x.\n", sizeof(FAT_BOOTSECTOR)));
 
 		DbgPrint((DPRINT_FILESYSTEM, "JumpBoot: 0x%x 0x%x 0x%x\n", FatVolumeBootSector->JumpBoot[0], FatVolumeBootSector->JumpBoot[1], FatVolumeBootSector->JumpBoot[2]));
@@ -165,7 +247,7 @@ BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG Partitio
 	//
 	// Check the boot sector magic
 	//
-	if (! ISFATX(FatType) && FatVolumeBootSector->BootSectorMagic != 0xaa55)
+	if (! ISFATX(FatType) && SWAPW(FatVolumeBootSector->BootSectorMagic) != 0x55aa)
 	{
 		sprintf(ErrMsg, "Invalid boot sector magic on drive 0x%x (expected 0xaa55 found 0x%x)",
                         DriveNumber, FatVolumeBootSector->BootSectorMagic);
@@ -205,7 +287,7 @@ BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG Partitio
 	if (ISFATX(FatType))
 	{
 		BytesPerSector = 512;
-		SectorsPerCluster = FatXVolumeBootSector->SectorsPerCluster;
+		SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster);
 		FatSectorStart = (4096 / BytesPerSector);
 		ActiveFatSectorStart = FatSectorStart;
 		NumberOfFats = 1;
@@ -260,6 +342,7 @@ BOOLEAN FatOpenVolume(ULONG DriveNumber, ULONG VolumeStartSector, ULONG Partitio
 	//
 	// Initialize the disk cache for this drive
 	//
+	printf("About to do cache init\n");
 	if (!CacheInitializeDrive(DriveNumber))
 	{
 		return FALSE;
@@ -307,10 +390,10 @@ ULONG FatDetermineFatType(PFAT_BOOTSECTOR FatBootSector, ULONG PartitionSectorCo
 	}
 	else
 	{
-		RootDirSectors = ((FatBootSector->RootDirEntries * 32) + (FatBootSector->BytesPerSector - 1)) / FatBootSector->BytesPerSector;
-		SectorsPerFat = FatBootSector->SectorsPerFat ? FatBootSector->SectorsPerFat : Fat32BootSector->SectorsPerFatBig;
-		TotalSectors = FatBootSector->TotalSectors ? FatBootSector->TotalSectors : FatBootSector->TotalSectorsBig;
-		DataSectorCount = TotalSectors - (FatBootSector->ReservedSectors + (FatBootSector->NumberOfFats * SectorsPerFat) + RootDirSectors);
+		RootDirSectors = ((SWAPW(FatBootSector->RootDirEntries) * 32) + (SWAPW(FatBootSector->BytesPerSector) - 1)) / SWAPW(FatBootSector->BytesPerSector);
+		SectorsPerFat = SWAPW(FatBootSector->SectorsPerFat) ? SWAPW(FatBootSector->SectorsPerFat) : SWAPD(Fat32BootSector->SectorsPerFatBig);
+		TotalSectors = SWAPW(FatBootSector->TotalSectors) ? SWAPW(FatBootSector->TotalSectors) : SWAPD(FatBootSector->TotalSectorsBig);
+		DataSectorCount = TotalSectors - (SWAPW(FatBootSector->ReservedSectors) + (FatBootSector->NumberOfFats * SectorsPerFat) + RootDirSectors);
 
 //mjl
 		if (FatBootSector->SectorsPerCluster == 0)
@@ -402,11 +485,13 @@ BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySi
 {
 	ULONG		EntryCount;
 	ULONG		CurrentEntry;
-	PDIRENTRY	DirEntry;
-	PLFN_DIRENTRY	LfnDirEntry;
 	CHAR		LfnNameBuffer[265];
 	CHAR		ShortNameBuffer[20];
 	ULONG		StartCluster;
+	DIRENTRY        OurDirEntry;
+	LFN_DIRENTRY    OurLfnDirEntry;
+	PDIRENTRY	DirEntry = &OurDirEntry;
+	PLFN_DIRENTRY	LfnDirEntry = &OurLfnDirEntry;
 
 	EntryCount = DirectorySize / sizeof(DIRENTRY);
 
@@ -415,10 +500,12 @@ BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySi
 	memset(ShortNameBuffer, 0, 13 * sizeof(CHAR));
 	memset(LfnNameBuffer, 0, 261 * sizeof(CHAR));
 
-	DirEntry = (PDIRENTRY) DirectoryBuffer;
-	for (CurrentEntry=0; CurrentEntry<EntryCount; CurrentEntry++, DirEntry++)
+	for (CurrentEntry=0; CurrentEntry<EntryCount; CurrentEntry++, DirectoryBuffer = ((PDIRENTRY)DirectoryBuffer)+1)
 	{
-		LfnDirEntry = (PLFN_DIRENTRY)DirEntry;
+	        OurLfnDirEntry = *((PLFN_DIRENTRY) DirectoryBuffer);
+		FatSwapLFNDirEntry(LfnDirEntry);
+		OurDirEntry = *((PDIRENTRY) DirectoryBuffer);
+		FatSwapDirEntry(DirEntry);
 
 		//DbgPrint((DPRINT_FILESYSTEM, "Dumping directory entry %d:\n", CurrentEntry));
 		//DbgDumpBuffer(DPRINT_FILESYSTEM, DirEntry, sizeof(DIRENTRY));
@@ -431,7 +518,7 @@ BOOLEAN FatSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG DirectorySi
 		//
 		if (DirEntry->FileName[0] == '\0')
 		{
-			return FALSE;
+		        return FALSE;
 		}
 
 		//
@@ -613,17 +700,20 @@ static BOOLEAN FatXSearchDirectoryBufferForFile(PVOID DirectoryBuffer, ULONG Dir
 {
 	ULONG		EntryCount;
 	ULONG		CurrentEntry;
-	PFATX_DIRENTRY	DirEntry;
 	ULONG		FileNameLen;
+	FATX_DIRENTRY   OurDirEntry;
+	PFATX_DIRENTRY	DirEntry = &OurDirEntry;
 
 	EntryCount = DirectorySize / sizeof(FATX_DIRENTRY);
 
 	DbgPrint((DPRINT_FILESYSTEM, "FatXSearchDirectoryBufferForFile() DirectoryBuffer = 0x%x EntryCount = %d FileName = %s\n", DirectoryBuffer, EntryCount, FileName));
 
 	FileNameLen = strlen(FileName);
-	DirEntry = (PFATX_DIRENTRY) DirectoryBuffer;
-	for (CurrentEntry = 0; CurrentEntry < EntryCount; CurrentEntry++, DirEntry++)
+
+	for (CurrentEntry = 0; CurrentEntry < EntryCount; CurrentEntry++, DirectoryBuffer = ((PFATX_DIRENTRY)DirectoryBuffer)+1)
 	{
+	        OurDirEntry = *(PFATX_DIRENTRY) DirectoryBuffer;
+	        FatSwapFatXDirEntry(&OurDirEntry);
 		if (0xff == DirEntry->FileNameSize)
 		{
 			break;
@@ -721,6 +811,7 @@ BOOLEAN FatLookupFile(PCSTR FileName, PFAT_FILE_INFO FatFileInfoPointer)
 		// Buffer the directory contents
 		//
 		DirectoryBuffer = FatBufferDirectory(DirectoryStartCluster, &DirectorySize, (i == 0) );
+
 		if (DirectoryBuffer == NULL)
 		{
 			return FALSE;
@@ -854,6 +945,7 @@ BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
 		}
 
 		fat = *((USHORT *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset));
+		fat = SWAPW(fat);
 		if (Cluster & 0x0001)
 			fat = fat >> 4;	/* Cluster number is ODD */
 		else
@@ -874,6 +966,7 @@ BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
 		}
 
 		fat = *((USHORT *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset));
+		fat = SWAPW(fat);
 
 		break;
 
@@ -891,6 +984,7 @@ BOOLEAN FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
 
 		// Get the fat entry
 		fat = (*((ULONG *) ((ULONG_PTR)FILESYSBUFFER + ThisFatEntOffset))) & 0x0FFFFFFF;
+		fat = SWAPD(fat);
 
 		break;
 

reactos/boot/freeldr/freeldr/fs/fs.c

@@ -27,6 +27,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////
 
 ULONG			FsType = 0;	// Type of filesystem on boot device, set by FsOpenVolume()
+PVOID                   FsStaticBufferDisk = 0, FsStaticBufferData = 0;
 
 /////////////////////////////////////////////////////////////////////////////////////////////
 // FUNCTIONS
@@ -51,8 +52,20 @@ static BOOLEAN FsOpenVolume(ULONG DriveNumber, ULONGLONG StartSector, ULONGLONG
 {
 	CHAR ErrorText[80];
 
+	printf("FsOpenVolume: (disk=%d,start=%d,count=%d,type=%d)\n",
+	       DriveNumber, StartSector, SectorCount, Type);
+
 	FsType = Type;
 
+	if( !FsStaticBufferDisk )
+	    FsStaticBufferDisk = MmAllocateMemory( 0x20000 );
+	if( !FsStaticBufferDisk )
+	{
+	        FileSystemError("could not allocate filesystem static buffer");
+		return FALSE;
+	}
+	FsStaticBufferData = ((PCHAR)FsStaticBufferDisk) + 0x10000;
+	    
 	switch (FsType)
 	{
 	case FS_FAT:

reactos/boot/freeldr/freeldr/include/arch.h

@@ -34,11 +34,17 @@
 #define STACK16ADDR	0x7000	/* The 16-bit stack top will be at 0000:7000 */
 #define STACK32ADDR	0x78000	/* The 32-bit stack top will be at 7000:8000, or 0x78000 */
 
+#ifdef _M_IX86
 #define BIOSCALLBUFFER		0x78000	/* Buffer to store temporary data for any Int386() call */
 #define BIOSCALLBUFSEGMENT	0x7800	/* Buffer to store temporary data for any Int386() call */
 #define BIOSCALLBUFOFFSET	0x0000	/* Buffer to store temporary data for any Int386() call */
 #define FILESYSBUFFER		0x80000	/* Buffer to store file system data (e.g. cluster buffer for FAT) */
 #define DISKREADBUFFER		0x90000	/* Buffer to store data read in from the disk via the BIOS */
+#elif defined(_M_PPC)
+extern PVOID FsStaticBufferDisk, FsStaticBufferData;
+#define DISKREADBUFFER		FsStaticBufferDisk
+#define FILESYSBUFFER           FsStaticBufferData
+#endif
 
 /* Makes "x" a global variable or label */
 #define EXTERN(x)	.global x; x:

reactos/boot/freeldr/freeldr/include/arch/powerpc/compat.h

@@ -0,0 +1,6 @@
+#ifndef FREELDR_ARCH_POWERPC_COMPAT_H
+#define FREELDR_ARCH_POWERPC_COMPAT_H
+
+#include <string.h>
+
+#endif/*FREELDR_ARCH_POWERPC_COMPAT_H*/

reactos/boot/freeldr/freeldr/include/freeldr.h

@@ -66,6 +66,8 @@
 #include <arch/i386/machpc.h>
 #include <arch/i386/machxbox.h>
 #include <internal/i386/ke.h>
+#elif defined(_PPC_)
+#include <arch/powerpc/compat.h>
 #endif
 /* misc files */
 #include <keycodes.h>
@@ -84,6 +86,8 @@
 #include <reactos/helper.h>
 /* Needed if debuging is enabled */
 #include <comm.h>
+/* endianness utilities */
+#include <bytesex.h>
 
 #define Ke386EraseFlags(x)     __asm__ __volatile__("pushl $0 ; popfl\n")
 

reactos/boot/freeldr/freeldr/include/fs.h

@@ -34,7 +34,7 @@
 
 VOID	FileSystemError(PCSTR ErrorString);
 BOOLEAN	FsOpenBootVolume();
-BOOLEAN	FsOpenSystemVolume(PCHAR SystemPath, PCHAR RemainingPath, PULONG BootDevice);
+BOOLEAN	FsOpenSystemVolume(char *SystemPath, char *RemainingPath, PULONG BootDevice);
 PFILE	FsOpenFile(PCSTR FileName);
 VOID	FsCloseFile(PFILE FileHandle);
 BOOLEAN	FsReadFile(PFILE FileHandle, ULONG BytesToRead, ULONG* BytesRead, PVOID Buffer);

reactos/boot/freeldr/freeldr/include/of.h

@@ -4,23 +4,14 @@
 #define OF_FAILED 0
 #define ERR_NOT_FOUND 0xc0000010
 
-#define REV(x) (((x)>>24)&0xff)|(((x)>>8)&0xff00)|(((x)<<24)&0xff000000)|(((x)<<8)&0xff0000)
+#include "of_call.h"
+#include <string.h>
 
 typedef int (*of_proxy)
-    ( int table_off, void *arg1, void *arg2, void *arg3, void *arg4 );
+    ( int table_off, void *arg1, void *arg2, void *arg3, void *arg4, void *arg5, void *arg6 );
 typedef long jmp_buf[100];
-
 extern of_proxy ofproxy;
 
-int ofw_finddevice( const char *name );
-int ofw_getprop( int package, const char *name, void *buffer, int size );
-int ofw_open( const char *name );
-int ofw_write( int handle, const char *buffer, int size );
-int ofw_read( int handle, const char *buffer, int size );
-void ofw_print_string(const char *);
-void ofw_print_number(int);
-void ofw_exit();
-
 int setjmp( jmp_buf buf );
 int longjmp( jmp_buf buf, int retval );
 

reactos/boot/freeldr/freeldr/include/reactos.h

@@ -62,6 +62,7 @@ VOID FASTCALL FrLdrGetPaeMode(VOID);
 BOOLEAN NTAPI FrLdrMapKernel(FILE *KernelImage);
 ULONG_PTR NTAPI FrLdrCreateModule(LPCSTR ModuleName);
 ULONG_PTR NTAPI FrLdrLoadModule(FILE *ModuleImage, LPCSTR ModuleName, PULONG ModuleSize);
+BOOLEAN NTAPI FrLdrMapModule(FILE *ModuleImage, PCHAR ModuleName, PCHAR MemLoadAddr, ULONG KernelAddr);
 BOOLEAN NTAPI FrLdrCloseModule(ULONG_PTR ModuleBase, ULONG dwModuleSize);
 VOID NTAPI FrLdrStartup(ULONG Magic);
 typedef VOID (FASTCALL *ASMCODE)(ULONG Magic, PROS_LOADER_PARAMETER_BLOCK LoaderBlock);

reactos/boot/freeldr/freeldr/mm/mm.c

@@ -18,6 +18,9 @@
  */
 
 #include <freeldr.h>
+#ifdef _M_PPC
+#include "of.h"
+#endif
 
 #define NDEBUG
 #include <debug.h>
@@ -63,7 +66,7 @@ PVOID MmAllocateMemory(ULONG MemorySize)
 {
 	ULONG	PagesNeeded;
 	ULONG	FirstFreePageFromEnd;
-	PVOID	MemPointer;
+	PVOID	MemPointer = NULL;
 
 	if (MemorySize == 0)
 	{
@@ -88,9 +91,21 @@ PVOID MmAllocateMemory(ULONG MemorySize)
 	// then return NULL
 	if (FreePagesInLookupTable < PagesNeeded)
 	{
-		DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount));
-		UiMessageBoxCritical("Memory allocation failed: out of memory.");
-		return NULL;
+#ifdef _M_PPC
+		ULONG ptr;
+	        printf("Allocating %d bytes directly ...\n", MemorySize);
+	        ptr = ofw_claim(0,MemorySize,MM_PAGE_SIZE);
+		MemPointer = (PVOID)(ptr);
+#endif
+		if( !MemPointer ) 
+		{
+		    DbgPrint((DPRINT_MEMORY, "Memory allocation failed. Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount));
+		    UiMessageBoxCritical("Memory allocation failed: out of memory.");
+		    while(1);
+		    return NULL;
+		} 
+		else
+		    return MemPointer;
 	}
 
 	FirstFreePageFromEnd = MmFindAvailablePages(PageLookupTableAddress, TotalPagesInLookupTable, PagesNeeded, AllocateFromEnd);

reactos/boot/freeldr/freeldr/reactos/reactos.c

@@ -30,8 +30,14 @@ LOADER_MODULE			reactos_modules[64];		// Array to hold boot module info loaded f
 char					reactos_module_strings[64][256];	// Array to hold module names
 unsigned long			reactos_memory_map_descriptor_size;
 memory_map_t			reactos_memory_map[32];		// Memory map
-
+ARC_DISK_SIGNATURE      reactos_arc_disk_info[32]; // ARC Disk Information
+char                    reactos_arc_strings[32][256];
+unsigned long           reactos_disk_count = 0;
+CHAR szHalName[255];
+CHAR szBootPath[255];
+CHAR SystemRoot[255];
 static CHAR szLoadingMsg[] = "Loading ReactOS...";
+BOOLEAN FrLdrBootType;
 
 static BOOLEAN
 NTAPI
@@ -123,6 +129,7 @@ LoadKernelSymbols(PCHAR szKernelName, int nPos)
   PROSSYM_INFO RosSymInfo;
   ULONG Size;
   ULONG_PTR Base;
+  //return TRUE;
 
   RosSymInit(&FreeldrCallbacks);
 
@@ -193,6 +200,8 @@ FrLdrLoadNlsFiles(PCHAR szSystemRoot,
     CHAR szFileName[256];
     ULONG BufferSize;
 
+    strcpy(SystemRoot, szSystemRoot);
+
     /* open the codepage key */
     rc = RegOpenKey(NULL,
                     L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\NLS\\CodePage",
@@ -294,7 +303,7 @@ FrLdrLoadNlsFiles(PCHAR szSystemRoot,
     return(TRUE);
 }
 
-static BOOLEAN
+BOOLEAN
 FrLdrLoadDriver(PCHAR szFileName,
                 INT nPos)
 {
@@ -302,9 +311,30 @@ FrLdrLoadDriver(PCHAR szFileName,
     CHAR value[256];
     LPSTR p;
 
+    printf("Loading driver %s\n", szFileName);
+
     /* Open the Driver */
     FilePointer = FsOpenFile(szFileName);
 
+    /* Try under the system root in the main dir and drivers */
+    if (FilePointer == NULL)
+    {
+	strcpy(value, SystemRoot);
+	strcat(value, "SYSTEM32\\");
+	strcat(value, szFileName);
+	printf("Trying %s\n", value);
+	FilePointer = FsOpenFile(value);
+    }
+
+    if (FilePointer == NULL)
+    {
+	strcpy(value, SystemRoot);
+	strcat(value, "SYSTEM32\\DRIVERS\\");
+	strcat(value, szFileName);
+	printf("Trying %s\n", value);
+	FilePointer = FsOpenFile(value);
+    }
+
     /* Make sure we did */
     if (FilePointer == NULL) {
 
@@ -330,7 +360,7 @@ FrLdrLoadDriver(PCHAR szFileName,
     UiDrawStatusText(value);
 
     /* Load the driver */
-    FrLdrLoadModule(FilePointer, szFileName, NULL);
+    FrLdrMapModule(FilePointer, szFileName, 0, 0);
 
     /* Update status and return */
     UiDrawProgressBarCenter(nPos, 100, szLoadingMsg);
@@ -409,6 +439,11 @@ FrLdrLoadBootDrivers(PCHAR szSystemRoot,
         rc = RegQueryValue(hOrderKey, GroupName, NULL, (PUCHAR)OrderList, &BufferSize);
         if (rc != ERROR_SUCCESS) OrderList[0] = 0;
 
+#ifdef _M_PPC
+	for (TagIndex = 0; TagIndex < BufferSize / sizeof(OrderList[0]); TagIndex++)
+	    OrderList[TagIndex] = SWAPD(OrderList[TagIndex]);
+#endif
+
         /* enumerate all drivers */
         for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) {
 
@@ -447,6 +482,11 @@ FrLdrLoadBootDrivers(PCHAR szSystemRoot,
                     rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize);
                     DbgPrint((DPRINT_REACTOS, "  Group: '%S'  \n", DriverGroup));
 
+#ifdef _M_PPC
+		    StartValue = SWAPD(StartValue);
+		    TagValue = SWAPD(TagValue);
+#endif
+
                     /* Make sure it should be started */
                     if ((StartValue == 0) &&
                         (TagValue == OrderList[TagIndex]) &&
@@ -562,14 +602,12 @@ VOID
 LoadAndBootReactOS(PCSTR OperatingSystemName)
 {
 	PFILE FilePointer;
-	CHAR  name[1024];
-	CHAR  value[1024];
-	CHAR  SystemPath[1024];
-	CHAR  szKernelName[1024];
-	CHAR  szHalName[1024];
-	CHAR  szFileName[1024];
-	CHAR  szBootPath[256];
-	UINT   i;
+	CHAR name[255];
+	CHAR value[255];
+	CHAR SystemPath[255];
+	CHAR szKernelName[255];
+	CHAR szFileName[255];
+	UINT i;
 	CHAR  MsgBuffer[256];
 	ULONG SectionId;
 
@@ -595,6 +633,8 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
 	UiDrawStatusText("Detecting Hardware...");
     UiDrawProgressBarCenter(1, 100, szLoadingMsg);
 
+    printf("LoadAndBootReactOS\n");
+
 	/*
 	 * Setup multiboot information structure
 	 */
@@ -602,17 +642,21 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
 	LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart;
 	LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd;
 	LoaderBlock.BootDevice = 0xffffffff;
-	LoaderBlock.CommandLine = (unsigned long)reactos_kernel_cmdline;
+	LoaderBlock.CommandLine = (ULONG)reactos_kernel_cmdline;
 	LoaderBlock.ModsCount = 0;
-	LoaderBlock.ModsAddr = (unsigned long)reactos_modules;
+	LoaderBlock.ModsAddr = (ULONG)reactos_modules;
+	LoaderBlock.DrivesAddr = (ULONG)reactos_arc_disk_info;
 	LoaderBlock.MmapLength = (unsigned long)MachGetMemoryMap((PBIOS_MEMORY_MAP)(PVOID)&reactos_memory_map, 32) * sizeof(memory_map_t);
+	printf("Got memory map length: %d\n", LoaderBlock.MmapLength);
 	if (LoaderBlock.MmapLength)
 	{
 		LoaderBlock.MmapAddr = (unsigned long)&reactos_memory_map;
 		LoaderBlock.Flags |= MB_FLAGS_MEM_INFO | MB_FLAGS_MMAP_INFO;
-		reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24
+		*((PULONG)(LoaderBlock.MmapAddr - sizeof(ULONG))) = 
+		    reactos_memory_map_descriptor_size = sizeof(memory_map_t); // GetBiosMemoryMap uses a fixed value of 24
 		DbgPrint((DPRINT_REACTOS, "memory map length: %d\n", LoaderBlock.MmapLength));
 		DbgPrint((DPRINT_REACTOS, "dumping memory map:\n"));
+		printf("memory map length: %d\n", LoaderBlock.MmapLength);
 		for (i=0; i<(LoaderBlock.MmapLength/sizeof(memory_map_t)); i++)
 		{
 			if (BiosMemoryUsable == reactos_memory_map[i].type &&
@@ -634,6 +678,10 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
 			          reactos_memory_map[i].base_addr_low,
 				  reactos_memory_map[i].length_low,
 				  reactos_memory_map[i].type));
+			printf("start: %x size: %x type %d\n",
+			          reactos_memory_map[i].base_addr_low,
+				  reactos_memory_map[i].length_low,
+				  reactos_memory_map[i].type);
 		}
 	}
 	DbgPrint((DPRINT_REACTOS, "low_mem = %d\n", LoaderBlock.MemLower));
@@ -679,7 +727,7 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
 	/*
 	 * Read the optional kernel parameters (if any)
 	 */
-	if (IniReadSettingByName(SectionId, "Options", value, 1024))
+	if (IniReadSettingByName(SectionId, "Options", value, sizeof(value)))
 	{
 		strcat(reactos_kernel_cmdline, " ");
 		strcat(reactos_kernel_cmdline, value);
@@ -692,6 +740,7 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
     UiDrawProgressBarCenter(5, 100, szLoadingMsg);
 
 	if (AcpiPresent) LoaderBlock.Flags |= MB_FLAGS_ACPI_TABLE;
+    LoaderBlock.DrivesCount = reactos_disk_count;
 
 	UiDrawStatusText("Loading...");
 
@@ -715,7 +764,7 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
 	 * Find the kernel image name
 	 * and try to load the kernel off the disk
 	 */
-	if(IniReadSettingByName(SectionId, "Kernel", value, 1024))
+	if(IniReadSettingByName(SectionId, "Kernel", value, sizeof(value)))
 	{
 		/*
 		 * Set the name and
@@ -739,13 +788,11 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
 		strcat(szKernelName, value);
 	}
 
-    if (!FrLdrLoadKernel(szKernelName, 5)) return;
-
 	/*
 	 * Find the HAL image name
 	 * and try to load the kernel off the disk
 	 */
-	if(IniReadSettingByName(SectionId, "Hal", value, 1024))
+	if(IniReadSettingByName(SectionId, "Hal", value, sizeof(value)))
 	{
 		/*
 		 * Set the name and
@@ -769,19 +816,10 @@ LoadAndBootReactOS(PCSTR OperatingSystemName)
 		strcat(szHalName, value);
 	}
 
-	if (!FrLdrLoadDriver(szHalName, 10))
-		return;
+    /* Load the kernel */
+    if (!FrLdrLoadKernel(szKernelName, 5)) return;
+    if (!FrLdrLoadDriver(szHalName, 6)) return;
 
-#if 0
-    /* Load bootvid */
-		strcpy(value, "INBV.DLL");
-		strcpy(szHalName, szBootPath);
-		strcat(szHalName, "SYSTEM32\\");
-		strcat(szHalName, value);
-
-	if (!FrLdrLoadDriver(szHalName, 10))
-		return;
-#endif
 	/*
 	 * Load the System hive from disk
 	 */

reactos/boot/freeldr/freeldr/reactos/registry.c

@@ -141,6 +141,10 @@ RegInitCurrentControlSet(BOOLEAN LastKnownGood)
 
   CurrentSet = (LastKnownGood == TRUE) ? LastKnownGoodSet : DefaultSet;
   wcscpy(ControlSetKeyName, L"ControlSet");
+  // Swap this binary value for now.  We'll decide on a policy for these later
+#ifdef _M_PPC
+  CurrentSet = SWAPD(CurrentSet);
+#endif
   switch(CurrentSet)
     {
       case 1:

reactos/boot/freeldr/freeldr/rtl/libsupp.c

@@ -1,6 +1,7 @@
-/* 
- *  ReactOS W32 Subsystem
- *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team
+/*
+ *  FreeLoader
+ *  Copyright (C) 1998-2003 Brian Palmer   <brianp@sginet.com>
+ *  Copyright (C) 2006      Aleksey Bragin <aleksey@reactos.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,36 +17,30 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: */
 
-#include <w32k.h>
+#include <freeldr.h>
 
-#define NDEBUG
-#include <debug.h>
-
-VOID
-DIB_32BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c)
+#ifdef DBG
+VOID FASTCALL
+CHECK_PAGED_CODE_RTL(char *file, int line)
 {
-  PBYTE byteaddr = (ULONG_PTR)SurfObj->pvScan0 + y * SurfObj->lDelta;  
-  PDWORD addr = (PDWORD)byteaddr + x1;		
-  LONG cx = x1;
-  while(cx < x2) 
-  {
-    *addr = (DWORD)c;
-    ++addr;
-    ++cx;
-   }	  
+	// boot-code is always ok
+}
+#endif
+
+PVOID
+STDCALL
+RtlpAllocateMemory(ULONG Bytes,
+                   ULONG Tag)
+{
+	return MmAllocateMemory(Bytes);
 }
 
-BOOLEAN 
-DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color)
-{			 
-  ULONG DestY;	
 
-  for (DestY = DestRect->top; DestY< DestRect->bottom; DestY++)
-  {
-    DIB_32BPP_HLine (DestSurface, DestRect->left, DestRect->right, DestY, color);
-  }
-
-  return TRUE;
-}
+VOID
+STDCALL
+RtlpFreeMemory(PVOID Mem,
+               ULONG Tag)
+{
+	return MmFreeMemory(Mem);
+}

reactos/boot/freeldr/freeldr/setupldr.rbuild

@@ -7,6 +7,5 @@
 	<library>setupldr_main</library>
 	<library>rossym</library>
 	<library>string</library>
-	<library>cmlib</library>
 	<library>rtl</library>
 </module>

reactos/boot/freeldr/freeldr/ui/tui.c

@@ -22,6 +22,8 @@
 PVOID	TextVideoBuffer = NULL;
 extern BOOLEAN UiDrawTime;
 extern BOOLEAN UiMinimal;
+extern void ofw_print_string(const char *);
+extern void ofw_print_number(int x);
 
 /*
  * printf() - prints formatted text to stdout
@@ -43,19 +45,20 @@ int printf(const char *format, ... )
 		{
 			switch (c = *(format++))
 			{
-			case 'd': case 'u': case 'x':
-                if (c == 'x')
-                    *_itoa(va_arg(ap, unsigned long), str, 16) = 0;
-                else
-                    *_itoa(va_arg(ap, unsigned long), str, 10) = 0;
+			case 'd': case 'u': case 'x': {
+				unsigned long x = va_arg(ap, unsigned long);
+                		if (c == 'x')
+                		    _itoa(x, str, 16);
+                		else
+                    		    _itoa(x, str, 10);
 
 				ptr = str;
 
 				while (*ptr)
 				{
-					MachConsPutChar(*(ptr++));
+				    MachConsPutChar(*(ptr++));
 				}
-				break;
+			} break;
 
 			case 'c': MachConsPutChar((va_arg(ap,int))&0xff); break;
 

reactos/boot/freeldr/freeldr/windows/conversion.c

@@ -10,6 +10,10 @@
 
 #include <freeldr.h>
 
+#ifdef _M_PPC
+#include <ppcmmu/mmu.h>
+#include <of.h>
+#endif
 //#include <ndk/ldrtypes.h>
 
 #define NDEBUG

reactos/boot/freeldr/freeldr/windows/peloader.c

@@ -21,6 +21,15 @@
 
 /* FUNCTIONS **************************************************************/
 
+BOOLEAN
+WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock,
+                        IN PCH DllName,
+                        OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry)
+{
+	return FALSE;
+}
+
+
 BOOLEAN
 WinLdrScanImportDescriptorTable(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock,
                                 IN PCCH DirectoryPath,

reactos/boot/freeldr/freeldr/windows/winldr.c

@@ -26,8 +26,25 @@
 //#define NDEBUG
 #include <debug.h>
 
+//FIXME: Do a better way to retrieve Arc disk information
+extern ULONG reactos_disk_count;
+extern ARC_DISK_SIGNATURE reactos_arc_disk_info[];
+extern char reactos_arc_strings[32][256];
+
+ARC_DISK_SIGNATURE BldrDiskInfo[32];
+CHAR BldrArcNames[32][256];
+
+BOOLEAN
+WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock,
+                        IN PCH DllName,
+                        OUT PLDR_DATA_TABLE_ENTRY *LoadedEntry);
+
+// debug stuff
 VOID DumpMemoryAllocMap(VOID);
 VOID WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock);
+VOID WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock);
+VOID WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock);
+
 
 void InitializeHWConfig(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
@@ -85,6 +102,14 @@ AllocateAndInitLPB(PLOADER_PARAMETER_BLOCK *OutLoaderBlock)
 	InitializeListHead(&LoaderBlock->MemoryDescriptorListHead);
 	InitializeListHead(&LoaderBlock->BootDriverListHead);
 
+	/* Alloc space for NLS (it will be converted to VA in WinLdrLoadNLS) */
+	LoaderBlock->NlsData = MmAllocateMemory(sizeof(NLS_DATA_BLOCK));
+	if (LoaderBlock->NlsData == NULL)
+	{
+		UiMessageBox("Failed to allocate memory for NLS table data!");
+		return;
+	}
+	RtlZeroMemory(LoaderBlock->NlsData, sizeof(NLS_DATA_BLOCK));
 
 	*OutLoaderBlock = LoaderBlock;
 }
@@ -95,11 +120,12 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
 	//CHAR	Options[] = "/CRASHDEBUG /DEBUGPORT=COM1 /BAUDRATE=115200";
 	CHAR	Options[] = "/NODEBUG";
-	CHAR	SystemRoot[] = "\\WINNT";
+	CHAR	SystemRoot[] = "\\WINNT\\";
 	CHAR	HalPath[] = "\\";
 	CHAR	ArcBoot[] = "multi(0)disk(0)rdisk(1)partition(1)";
 	CHAR	ArcHal[] = "multi(0)disk(0)rdisk(1)partition(1)";
 
+	ULONG i;
 	PLOADER_PARAMETER_EXTENSION Extension;
 
 	LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support
@@ -132,18 +158,32 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock)
 	/* Arc devices */
 	LoaderBlock->ArcDiskInformation = (PARC_DISK_INFORMATION)MmAllocateMemory(sizeof(ARC_DISK_INFORMATION));
 	InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead);
+
+	/* Convert ARC disk information from freeldr to a correct format */
+	for (i = 0; i < reactos_disk_count; i++)
+	{
+		PARC_DISK_SIGNATURE ArcDiskInfo;
+
+		/* Get the ARC structure */
+		ArcDiskInfo = &BldrDiskInfo[i];
+
+		/* Copy the data over */
+		ArcDiskInfo->Signature = reactos_arc_disk_info[i].Signature;
+		ArcDiskInfo->CheckSum = reactos_arc_disk_info[i].CheckSum;
+
+		/* Copy the ARC Name */
+		strcpy(BldrArcNames[i], reactos_arc_disk_info[i].ArcName);
+		ArcDiskInfo->ArcName = BldrArcNames[i];
+
+		/* Insert into the list */
+		InsertTailList(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead,
+			&ArcDiskInfo->ListEntry);
+	}
+
+	/* Convert the list to virtual address */
 	List_PaToVa(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead);
 	LoaderBlock->ArcDiskInformation = PaToVa(LoaderBlock->ArcDiskInformation);
 
-	/* Alloc space for NLS (it will be converted to VA in WinLdrLoadNLS) */
-	LoaderBlock->NlsData = MmAllocateMemory(sizeof(NLS_DATA_BLOCK));
-	if (LoaderBlock->NlsData == NULL)
-	{
-		UiMessageBox("Failed to allocate memory for NLS table data!");
-		return;
-	}
-	RtlZeroMemory(LoaderBlock->NlsData, sizeof(NLS_DATA_BLOCK));
-
 	/* Create configuration entries */
 	InitializeHWConfig(LoaderBlock);
 
@@ -224,6 +264,111 @@ void WinLdrSetupForNt(PLOADER_PARAMETER_BLOCK LoaderBlock,
 	RtlZeroMemory(*GdtIdt, NumPages << MM_PAGE_SHIFT);
 }
 
+BOOLEAN
+WinLdrLoadDeviceDriver(PLOADER_PARAMETER_BLOCK LoaderBlock,
+                       LPSTR BootPath,
+                       PUNICODE_STRING FilePath,
+                       ULONG Flags,
+                       PLDR_DATA_TABLE_ENTRY *DriverDTE)
+{
+	CHAR FullPath[1024];
+	CHAR DriverPath[1024];
+	CHAR DllName[1024];
+	PCHAR DriverNamePos;
+	BOOLEAN Status;
+	PVOID DriverBase;
+
+	// Separate the path to file name and directory path
+	sprintf(DriverPath, "%wZ", FilePath);
+	DriverNamePos = strrchr(DriverPath, '\\');
+	if (DriverNamePos != NULL)
+	{
+		// Copy the name
+		strcpy(DllName, DriverNamePos+1);
+
+		// Cut out the name from the path
+		*(DriverNamePos+1) = 0;
+	}
+
+	DbgPrint((DPRINT_WINDOWS, "DriverPath: %s, DllName: %s, LPB %p\n", DriverPath, DllName, LoaderBlock));
+
+
+	// Check if driver is already loaded
+	Status = WinLdrCheckForLoadedDll(LoaderBlock, DllName, DriverDTE);
+	if (Status)
+	{
+		// We've got the pointer to its DTE, just return success
+		return TRUE;
+	}
+
+	// It's not loaded, we have to load it
+	sprintf(FullPath,"%s%wZ", BootPath, FilePath);
+	Status = WinLdrLoadImage(FullPath, &DriverBase);
+	if (!Status)
+		return FALSE;
+
+	// Allocate a DTE for it
+	Status = WinLdrAllocateDataTableEntry(LoaderBlock, DllName, DllName, DriverBase, DriverDTE);
+	if (!Status)
+	{
+		DbgPrint((DPRINT_WINDOWS, "WinLdrAllocateDataTableEntry() failed\n"));
+		return FALSE;
+	}
+
+	// Modify any flags, if needed
+	(*DriverDTE)->Flags |= Flags;
+
+	// Look for any dependencies it may have, and load them too
+	sprintf(FullPath,"%s%s", BootPath, DriverPath);
+	Status = WinLdrScanImportDescriptorTable(LoaderBlock, FullPath, *DriverDTE);
+	if (!Status)
+	{
+		DbgPrint((DPRINT_WINDOWS, "WinLdrScanImportDescriptorTable() failed for %s\n",
+			FullPath));
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+BOOLEAN
+WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock,
+                      LPSTR BootPath)
+{
+	PLIST_ENTRY NextBd;
+	PBOOT_DRIVER_LIST_ENTRY BootDriver;
+	BOOLEAN Status;
+
+	// Walk through the boot drivers list
+	NextBd = LoaderBlock->BootDriverListHead.Flink;
+
+	while (NextBd != &LoaderBlock->BootDriverListHead)
+	{
+		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry);
+
+		//DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath,
+		//	BootDriver->DataTableEntry, &BootDriver->RegistryPath));
+
+		// Paths are relative (FIXME: Are they always relative?)
+
+		// Load it
+		Status = WinLdrLoadDeviceDriver(LoaderBlock, BootPath, &BootDriver->FilePath,
+			0, &BootDriver->DataTableEntry);
+
+		// If loading failed - cry loudly
+		//FIXME: Maybe remove it from the list and try to continue?
+		if (!Status)
+		{
+			UiMessageBox("Can't load boot driver!");
+			return FALSE;
+		}
+
+		NextBd = BootDriver->ListEntry.Flink;
+	}
+
+	return TRUE;
+}
+
 VOID
 LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion)
 {
@@ -243,8 +388,6 @@ LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion)
 	ULONG PcrBasePage=0;
 	ULONG TssBasePage=0;
 
-
-
 	//sprintf(MsgBuffer,"Booting Microsoft(R) Windows(R) OS version '%04x' is not implemented yet", OperatingSystemVersion);
 	//UiMessageBox(MsgBuffer);
 
@@ -257,6 +400,13 @@ LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion)
 		return;
 	}
 
+	UiDrawBackdrop();
+	UiDrawStatusText("Detecting Hardware...");
+	UiDrawProgressBarCenter(1, 100, "Loading Windows...");
+
+	//FIXME: This is needed only for MachHwDetect() which performs registry operations!
+	RegInitializeRegistry();
+
 	/* Make sure the system path is set in the .ini file */
 	if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath)))
 	{
@@ -271,6 +421,9 @@ LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion)
 		return;
 	}
 
+	/* Detect hardware */
+	MachHwDetect();
+
 	UiDrawStatusText("Loading...");
 
 	/* Try to open system drive */
@@ -331,17 +484,16 @@ LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion)
 	if (KdComDTE)
 		WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE);
 
-	/* Initialize Phase 1 - before NLS */
-	WinLdrInitializePhase1(LoaderBlock);
-
 	/* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */
 	Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath);
 	DbgPrint((DPRINT_WINDOWS, "SYSTEM hive loaded and scanned with status %d\n", Status));
 
-	/* FIXME: Load OEM HAL font, should be moved to WinLdrLoadAndScanSystemHive() */
-
 	/* Load boot drivers */
-	//WinLdrLoadBootDrivers();
+	Status = WinLdrLoadBootDrivers(LoaderBlock, BootPath);
+	DbgPrint((DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status));
+
+	/* Initialize Phase 1 - no drivers loading anymore */
+	WinLdrInitializePhase1(LoaderBlock);
 
 	/* Alloc PCR, TSS, do magic things with the GDT/IDT */
 	WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage);
@@ -361,6 +513,8 @@ LoadAndBootWindows(PCSTR OperatingSystemName, WORD OperatingSystemVersion)
 		KiSystemStartup, LoaderBlockVA));
 
 	WinLdrpDumpMemoryDescriptors(LoaderBlockVA);
+	WinLdrpDumpBootDriver(LoaderBlockVA);
+	WinLdrpDumpArcDisks(LoaderBlockVA);
 
 	//FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below
 	//while (1) {};
@@ -394,3 +548,41 @@ WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock)
 		NextMd = MemoryDescriptor->ListEntry.Flink;
 	}
 }
+
+VOID
+WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock)
+{
+	PLIST_ENTRY NextBd;
+	PBOOT_DRIVER_LIST_ENTRY BootDriver;
+
+	NextBd = LoaderBlock->BootDriverListHead.Flink;
+
+	while (NextBd != &LoaderBlock->BootDriverListHead)
+	{
+		BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, ListEntry);
+
+		DbgPrint((DPRINT_WINDOWS, "BootDriver %wZ DTE %08X RegPath: %wZ\n", &BootDriver->FilePath,
+			BootDriver->DataTableEntry, &BootDriver->RegistryPath));
+
+		NextBd = BootDriver->ListEntry.Flink;
+	}
+}
+
+VOID
+WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock)
+{
+	PLIST_ENTRY NextBd;
+	PARC_DISK_SIGNATURE ArcDisk;
+
+	NextBd = LoaderBlock->ArcDiskInformation->DiskSignatureListHead.Flink;
+
+	while (NextBd != &LoaderBlock->ArcDiskInformation->DiskSignatureListHead)
+	{
+		ArcDisk = CONTAINING_RECORD(NextBd, ARC_DISK_SIGNATURE, ListEntry);
+
+		DbgPrint((DPRINT_WINDOWS, "ArcDisk %s checksum: 0x%X, signature: 0x%X\n",
+			ArcDisk->ArcName, ArcDisk->CheckSum, ArcDisk->Signature));
+
+		NextBd = ArcDisk->ListEntry.Flink;
+	}
+}

reactos/boot/freeldr/freeldr/windows/wlmemory.c

@@ -15,6 +15,8 @@
 #define NDEBUG
 #include <debug.h>
 
+extern ULONG TotalNLSSize;
+
 // This is needed because headers define wrong one for ReactOS
 #undef KIP0PCRADDRESS
 #define KIP0PCRADDRESS                      0xffdff000
@@ -123,6 +125,7 @@ ULONG MadCount = 0;
 BOOLEAN
 MempAllocatePageTables()
 {
+#ifdef _M_IX86
 	ULONG NumPageTables, TotalSize;
 	PUCHAR Buffer;
 	// It's better to allocate PDE + PTEs contigiuos
@@ -171,7 +174,7 @@ MempAllocatePageTables()
 	// Zero counters of page tables used
 	PhysicalPageTables = 0;
 	KernelPageTables = 0;
-
+#endif
 	return TRUE;
 }
 
@@ -181,6 +184,7 @@ MempAllocatePTE(ULONG Entry, PHARDWARE_PTE *PhysicalPT, PHARDWARE_PTE *KernelPT)
 	//Print(L"Creating PDE Entry %X\n", Entry);
 
 	// Identity mapping
+#ifdef _M_IX86
 	*PhysicalPT = (PHARDWARE_PTE)&PhysicalPageTablesBuffer[PhysicalPageTables*MM_PAGE_SIZE];
 	PhysicalPageTables++;
 
@@ -200,12 +204,14 @@ MempAllocatePTE(ULONG Entry, PHARDWARE_PTE *PhysicalPT, PHARDWARE_PTE *KernelPT)
 	PDE[Entry+(KSEG0_BASE >> 22)].PageFrameNumber = ((ULONG)*KernelPT >> MM_PAGE_SHIFT);
 	PDE[Entry+(KSEG0_BASE >> 22)].Valid = 1;
 	PDE[Entry+(KSEG0_BASE >> 22)].Write = 1;
+#endif
 }
 
 BOOLEAN
 MempSetupPaging(IN ULONG StartPage,
 				IN ULONG NumberOfPages)
 {
+#ifdef _M_IX86
 	PHARDWARE_PTE PhysicalPT;
 	PHARDWARE_PTE KernelPT;
 	ULONG Entry, Page;
@@ -261,7 +267,7 @@ MempSetupPaging(IN ULONG StartPage,
 			KernelPT[Page & 0x3ff].Write = 1;
 		}
 	}
-
+#endif
 	return TRUE;
 }
 
@@ -271,8 +277,8 @@ MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
                    UINT64 PageCount,
                    ULONG Type)
 {
+#ifdef _M_IX86
 	BOOLEAN Status;
-
 	//
 	// Check for some weird stuff at the top
 	//
@@ -294,7 +300,7 @@ MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 	// Check if it's more than the allowed for OS loader
 	// if yes - don't map the pages, just add as FirmwareTemporary
 	//
-	if (BasePage + PageCount > LOADER_HIGH_ZONE)
+	if (BasePage + PageCount > LOADER_HIGH_ZONE && (Type != LoaderNlsData))
 	{
 		Mad[MadCount].MemoryType = LoaderFirmwareTemporary;
 
@@ -347,24 +353,9 @@ MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 	else
 	{
 		//
-		// Now choose memory type as usual. FIXME!!!
+		// Set memory type
 		//
-		if (Type == 0)
-		{
-			Mad[MadCount].MemoryType = LoaderFree;
-		}
-		else if (Type != 0 && Type != 1)
-		{
-			Mad[MadCount].MemoryType = LoaderFirmwarePermanent;
-		}
-		else if (Type == 1)
-		{
-			Mad[MadCount].MemoryType = LoaderSystemCode;
-		}
-		else
-		{
-			Mad[MadCount].MemoryType = LoaderFirmwarePermanent;
-		}
+		Mad[MadCount].MemoryType = Type;
 
 		//
 		// Add descriptor
@@ -382,6 +373,7 @@ MempAddMemoryBlock(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 			return;
 		}
 	}
+#endif
 }
 
 BOOLEAN
@@ -391,10 +383,14 @@ WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
                    PVOID GdtIdt)
 {
 	ULONG i, PagesCount;
-	ULONG LastPageIndex, LastPageType;
+	ULONG LastPageIndex, LastPageType, NtType;
 	PPAGE_LOOKUP_TABLE_ITEM MemoryMap;
 	ULONG NoEntries;
+#if 0
 	PKTSS Tss;
+#endif
+	PVOID NlsBase = VaToPa(((PNLS_DATA_BLOCK)VaToPa(LoaderBlock->NlsData))->AnsiCodePageData);
+	ULONG NlsBasePage = (ULONG_PTR)NlsBase >> PAGE_SHIFT;
 
 	//
 	// Creating a suitable memory map for the Windows can be tricky, so let's
@@ -431,7 +427,8 @@ WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 		return FALSE;
 	}
 
-	DbgPrint((DPRINT_WINDOWS, "Got memory map with %d entries\n"));
+	DbgPrint((DPRINT_WINDOWS, "Got memory map with %d entries, NlsBasePage 0x%X\n",
+		NoEntries, NlsBasePage));
 
 	// Construct a good memory map from what we've got
 	PagesCount = 1;
@@ -439,14 +436,67 @@ WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 	LastPageType = MemoryMap[0].PageAllocated;
 	for(i=1;i<NoEntries;i++)
 	{
-		if (MemoryMap[i].PageAllocated == LastPageType)
+		if (MemoryMap[i].PageAllocated == LastPageType &&
+			(i < NlsBasePage || i > NlsBasePage+TotalNLSSize) && (i != NoEntries-1) )
 		{
 			PagesCount++;
 		}
+		else if (i == NlsBasePage)
+		{
+			// This is NLS data, map it accordingly
+			// It's VERY important for NT kernel - it calculates size of NLS
+			// tables based on NlsData memory type descriptors!
+
+			// Firstly map what we already have (if we have any)
+			// Convert mem types
+			if (LastPageType == 0)
+				NtType = LoaderFree;
+			else if (LastPageType != 0 && LastPageType != 1)
+				NtType = LoaderFirmwarePermanent;
+			else if (LastPageType == 1)
+				NtType = LoaderSystemCode;
+			else
+				NtType = LoaderFirmwarePermanent;
+
+			if (PagesCount > 0)
+				MempAddMemoryBlock(LoaderBlock, LastPageIndex, PagesCount, NtType);
+
+			// Then map nls data
+			MempAddMemoryBlock(LoaderBlock, NlsBasePage, TotalNLSSize, LoaderNlsData);
+
+			// skip them
+			i += TotalNLSSize;
+
+			// Reset our counter vars
+			LastPageIndex = i;
+			LastPageType = MemoryMap[i].PageAllocated;
+			PagesCount = 1;
+
+			continue;
+		}
 		else
 		{
-			// Add the region
-			MempAddMemoryBlock(LoaderBlock, LastPageIndex, PagesCount, LastPageType);
+			// Add the resulting region
+
+			// Convert mem types
+			if (LastPageType == 0)
+			{
+				NtType = LoaderFree;
+			}
+			else if (LastPageType != 0 && LastPageType != 1)
+			{
+				NtType = LoaderFirmwarePermanent;
+			}
+			else if (LastPageType == 1)
+			{
+				NtType = LoaderSystemCode;
+			}
+			else
+			{
+				NtType = LoaderFirmwarePermanent;
+			}
+
+			MempAddMemoryBlock(LoaderBlock, LastPageIndex, PagesCount, NtType);
 
 			// Reset our counter vars
 			LastPageIndex = i;
@@ -472,6 +522,7 @@ WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 
 	// Page Tables have been setup, make special handling for PCR and TSS
 	// (which is done in BlSetupFotNt in usual ntldr)
+#ifdef _M_IX86
 	HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1;
 	HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1;
 	HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1;
@@ -485,6 +536,7 @@ WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 	//DbgPrint((DPRINT_WINDOWS, "VideoMemoryBase: 0x%X\n", VideoMemoryBase));
 
 	Tss = (PKTSS)(KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT));
+#endif
 
 	// Fill the memory descriptor list and 
 	//PrepareMemoryDescriptorList();
@@ -517,19 +569,25 @@ WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 	//BS->ExitBootServices(ImageHandle,MapKey);
 
 	// Disable Interrupts
-	Ke386DisableInterrupts();
+	_disable();
 
 	// Re-initalize EFLAGS
+#ifdef _M_IX86
 	Ke386EraseFlags();
+#endif
 
 	// Set the PDBR
-	Ke386SetPageTableDirectory((ULONG_PTR)PDE);
+#ifdef _M_IX86
+	__writecr3((ULONG_PTR)PDE);
+#endif
 
 	// Enable paging by modifying CR0
-	Ke386SetCr0(Ke386GetCr0() | CR0_PG);
+#ifdef _M_IX86
+	__writecr0(__readcr0() | CR0_PG);
+#endif
 
 	// Set processor context
-	WinLdrSetProcessorContext(GdtIdt, KIP0PCRADDRESS, KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT));
+	WinLdrSetProcessorContext(GdtIdt, KIP0PCRADDRESS, 0/*KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)*/);
 
 	// Zero KI_USER_SHARED_DATA page
 	memset((PVOID)KI_USER_SHARED_DATA, 0, MM_PAGE_SIZE);
@@ -606,10 +664,12 @@ WinLdrInsertDescriptor(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 VOID
 WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss)
 {
+#ifdef _M_IX86
 	GDTIDT GdtDesc, IdtDesc, OldIdt;
 	PKGDTENTRY	pGdt;
 	PKIDTENTRY	pIdt;
 	ULONG Ldt = 0;
+#endif
 	//ULONG i;
 
 	DbgPrint((DPRINT_WINDOWS, "GDtIdt %p, Pcr %p, Tss 0x%08X\n",
@@ -619,6 +679,7 @@ WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss)
 	// FIXME: Why zero it here when we can zero it right after allocation?
 	RtlZeroMemory((PVOID)Pcr, MM_PAGE_SIZE); //FIXME: Why zero only 1 page when we allocate 2?
 
+#ifdef _M_IX86
 	// Get old values of GDT and IDT
 	Ke386GetGlobalDescriptorTable(GdtDesc);
 	Ke386GetInterruptDescriptorTable(IdtDesc);
@@ -791,6 +852,7 @@ WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss)
 	//
 	// Fill IDT with Traps
 	//
+#endif
 #if 0
 	pIdt[0].Offset = (i386DivideByZero | KSEG0_BASE) & 0xFFFF;
 	pIdt[0].ExtendedOffset = 0x8; // Selector
@@ -881,7 +943,6 @@ WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss)
 	pIdt[17].Offset = (i386AlignmentCheck | KSEG0_BASE) & 0xFFFF;
 	pIdt[17].ExtendedOffset = 0x8; // Selector
 	pIdt[17].Access = 0x8F00;
-#endif
 
 	/*for (i=0; i<16; i++)
 	{
@@ -945,4 +1006,5 @@ WinLdrSetProcessorContext(PVOID GdtIdt, IN ULONG Pcr, IN ULONG Tss)
 		pop ebp;
 		ret
 		*/
+#endif
 }

reactos/boot/freeldr/freeldr/windows/wlregistry.c

@@ -10,9 +10,30 @@
 
 #include <freeldr.h>
 
+#ifdef _M_PPC
+#include <of.h>
+#endif
+
 #define NDEBUG
 #include <debug.h>
 
+// The only global var here, used to mark mem pages as NLS in WinLdrTurnOnPaging()
+ULONG TotalNLSSize = 0;
+
+BOOLEAN WinLdrGetNLSNames(LPSTR AnsiName,
+                          LPSTR OemName,
+                          LPSTR LangName);
+
+VOID
+WinLdrScanRegistry(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
+                   IN LPCSTR DirectoryPath);
+
+BOOLEAN
+WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
+                      LPWSTR RegistryPath,
+                      LPWSTR ImagePath,
+                      LPWSTR ServiceName);
+
 BOOLEAN
 WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
                   IN LPCSTR DirectoryPath,
@@ -69,7 +90,11 @@ WinLdrLoadSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 	}
 
 	/* Convert address to virtual */
+#ifdef _M_IX86
 	HiveDataVirtual = (PVOID)(KSEG0_BASE | HiveDataPhysical);
+#elif defined(_M_PPC)
+	HiveDataVirtual = (PVOID)HiveDataPhysical;
+#endif
 
 	/* Fill LoaderBlock's entries */
 	LoaderBlock->RegistryLength = HiveFileSize;
@@ -87,6 +112,9 @@ WinLdrLoadSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 	return TRUE;
 }
 
+
+/* PRIVATE FUNCTIONS ******************************************************/
+
 // Queries registry for those three file names
 BOOLEAN WinLdrGetNLSNames(LPSTR AnsiName,
                           LPSTR OemName,
@@ -306,12 +334,19 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
 		MM_SIZE_TO_PAGES(OemFileSize)  +
 		MM_SIZE_TO_PAGES(LanguageFileSize);
 
+	/* Store it for later marking the pages as NlsData type */
+	TotalNLSSize = TotalSize;
+
 	NlsDataBase = (ULONG_PTR)MmAllocateMemory(TotalSize*MM_PAGE_SIZE);
 
 	if (NlsDataBase == 0)
 		goto Failure;
 
+#ifdef _M_IX86
 	NlsVirtual = (PVOID)(KSEG0_BASE | NlsDataBase);
+#elif defined(_M_PPC)
+	NlsVirtual = (PVOID)NlsDataBase;
+#endif
 	LoaderBlock->NlsData->AnsiCodePageData = NlsVirtual;
 	LoaderBlock->NlsData->OemCodePageData = (PVOID)((PUCHAR)NlsVirtual +
 		(MM_SIZE_TO_PAGES(AnsiFileSize) << MM_PAGE_SHIFT));
@@ -388,3 +423,317 @@ Failure:
 	UiMessageBox("Error reading NLS file!");
 	return FALSE;
 }
+
+VOID
+WinLdrScanRegistry(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
+                   IN LPCSTR DirectoryPath)
+{
+	LONG rc = 0;
+	FRLDRHKEY hGroupKey, hOrderKey, hServiceKey, hDriverKey;
+	WCHAR GroupNameBuffer[512];
+	WCHAR ServiceName[256];
+	ULONG OrderList[128];
+	ULONG BufferSize;
+	ULONG Index;
+	ULONG TagIndex;
+	LPWSTR GroupName;
+
+	ULONG ValueSize;
+	ULONG ValueType;
+	ULONG StartValue;
+	ULONG TagValue;
+	WCHAR DriverGroup[256];
+	ULONG DriverGroupSize;
+
+	CHAR ImagePath[256];
+	WCHAR TempImagePath[256];
+
+	BOOLEAN Status;
+
+	/* get 'service group order' key */
+	rc = RegOpenKey(NULL,
+		L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\ServiceGroupOrder",
+		&hGroupKey);
+	if (rc != ERROR_SUCCESS) {
+
+		DbgPrint((DPRINT_REACTOS, "Failed to open the 'ServiceGroupOrder' key (rc %d)\n", (int)rc));
+		return;
+	}
+
+	/* get 'group order list' key */
+	rc = RegOpenKey(NULL,
+		L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\GroupOrderList",
+		&hOrderKey);
+	if (rc != ERROR_SUCCESS) {
+
+		DbgPrint((DPRINT_REACTOS, "Failed to open the 'GroupOrderList' key (rc %d)\n", (int)rc));
+		return;
+	}
+
+	/* enumerate drivers */
+	rc = RegOpenKey(NULL,
+		L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Services",
+		&hServiceKey);
+	if (rc != ERROR_SUCCESS)  {
+
+		DbgPrint((DPRINT_REACTOS, "Failed to open the 'Services' key (rc %d)\n", (int)rc));
+		return;
+	}
+
+	/* Get the Name Group */
+	BufferSize = sizeof(GroupNameBuffer);
+	rc = RegQueryValue(hGroupKey, L"List", NULL, (PUCHAR)GroupNameBuffer, &BufferSize);
+	DbgPrint((DPRINT_REACTOS, "RegQueryValue(): rc %d\n", (int)rc));
+	if (rc != ERROR_SUCCESS)
+		return;
+	DbgPrint((DPRINT_REACTOS, "BufferSize: %d \n", (int)BufferSize));
+	DbgPrint((DPRINT_REACTOS, "GroupNameBuffer: '%S' \n", GroupNameBuffer));
+
+	/* Loop through each group */
+	GroupName = GroupNameBuffer;
+	while (*GroupName)
+	{
+		DbgPrint((DPRINT_WINDOWS, "Driver group: '%S'\n", GroupName));
+
+		/* Query the Order */
+		BufferSize = sizeof(OrderList);
+		rc = RegQueryValue(hOrderKey, GroupName, NULL, (PUCHAR)OrderList, &BufferSize);
+		if (rc != ERROR_SUCCESS) OrderList[0] = 0;
+
+		/* enumerate all drivers */
+		for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++)
+		{
+			Index = 0;
+
+			while (TRUE)
+			{
+				/* Get the Driver's Name */
+				ValueSize = sizeof(ServiceName);
+				rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize);
+				//DbgPrint((DPRINT_REACTOS, "RegEnumKey(): rc %d\n", (int)rc));
+
+				/* Makre sure it's valid, and check if we're done */
+				if (rc == ERROR_NO_MORE_ITEMS)
+					break;
+				if (rc != ERROR_SUCCESS)
+					return;
+				//DbgPrint((DPRINT_REACTOS, "Service %d: '%S'\n", (int)Index, ServiceName));
+
+				/* open driver Key */
+				rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey);
+				if (rc == ERROR_SUCCESS)
+				{
+					/* Read the Start Value */
+					ValueSize = sizeof(ULONG);
+					rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize);
+					if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1;
+					//DbgPrint((DPRINT_REACTOS, "  Start: %x  \n", (int)StartValue));
+
+					/* Read the Tag */
+					ValueSize = sizeof(ULONG);
+					rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize);
+					if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1;
+					//DbgPrint((DPRINT_REACTOS, "  Tag:   %x  \n", (int)TagValue));
+
+					/* Read the driver's group */
+					DriverGroupSize = sizeof(DriverGroup);
+					rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize);
+					//DbgPrint((DPRINT_REACTOS, "  Group: '%S'  \n", DriverGroup));
+
+					/* Make sure it should be started */
+					if ((StartValue == 0) &&
+						(TagValue == OrderList[TagIndex]) &&
+						(_wcsicmp(DriverGroup, GroupName) == 0)) {
+
+							/* Get the Driver's Location */
+							ValueSize = sizeof(TempImagePath);
+							rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize);
+
+							/* Write the whole path if it suceeded, else prepare to fail */
+							if (rc != ERROR_SUCCESS) {
+								DbgPrint((DPRINT_REACTOS, "  ImagePath: not found\n"));
+								TempImagePath[0] = 0;
+								sprintf(ImagePath, "%s\\system32\\drivers\\%S.sys", DirectoryPath, ServiceName);
+							} else if (TempImagePath[0] != L'\\') {
+								sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath);
+							} else {
+								sprintf(ImagePath, "%S", TempImagePath);
+								DbgPrint((DPRINT_REACTOS, "  ImagePath: '%s'\n", ImagePath));
+							}
+
+							DbgPrint((DPRINT_WINDOWS, "  Adding boot driver: '%s'\n", ImagePath));
+
+							Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead,
+								L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
+								TempImagePath,
+								ServiceName);
+
+							if (!Status)
+								DbgPrint((DPRINT_WINDOWS, " Failed to add boot driver\n"));
+					} else
+					{
+						//DbgPrint((DPRINT_REACTOS, "  Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current Tag %d, current group '%S')\n",
+						//	ServiceName, StartValue, TagValue, DriverGroup, OrderList[TagIndex], GroupName));
+					}
+				}
+
+				Index++;
+			}
+		}
+
+		Index = 0;
+		while (TRUE)
+		{
+			/* Get the Driver's Name */
+			ValueSize = sizeof(ServiceName);
+			rc = RegEnumKey(hServiceKey, Index, ServiceName, &ValueSize);
+
+			//DbgPrint((DPRINT_REACTOS, "RegEnumKey(): rc %d\n", (int)rc));
+			if (rc == ERROR_NO_MORE_ITEMS)
+				break;
+			if (rc != ERROR_SUCCESS)
+				return;
+			//DbgPrint((DPRINT_REACTOS, "Service %d: '%S'\n", (int)Index, ServiceName));
+
+			/* open driver Key */
+			rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey);
+			if (rc == ERROR_SUCCESS)
+			{
+				/* Read the Start Value */
+				ValueSize = sizeof(ULONG);
+				rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize);
+				if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1;
+				//DbgPrint((DPRINT_REACTOS, "  Start: %x  \n", (int)StartValue));
+
+				/* Read the Tag */
+				ValueSize = sizeof(ULONG);
+				rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize);
+				if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1;
+				//DbgPrint((DPRINT_REACTOS, "  Tag:   %x  \n", (int)TagValue));
+
+				/* Read the driver's group */
+				DriverGroupSize = sizeof(DriverGroup);
+				rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize);
+				//DbgPrint((DPRINT_REACTOS, "  Group: '%S'  \n", DriverGroup));
+
+				for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) {
+					if (TagValue == OrderList[TagIndex]) break;
+				}
+
+				if ((StartValue == 0) &&
+					(TagIndex > OrderList[0]) &&
+					(_wcsicmp(DriverGroup, GroupName) == 0)) {
+
+						ValueSize = sizeof(TempImagePath);
+						rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize);
+						if (rc != ERROR_SUCCESS) {
+							DbgPrint((DPRINT_REACTOS, "  ImagePath: not found\n"));
+							TempImagePath[0] = 0;
+							sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", DirectoryPath, ServiceName);
+						} else if (TempImagePath[0] != L'\\') {
+							sprintf(ImagePath, "%s%S", DirectoryPath, TempImagePath);
+						} else {
+							sprintf(ImagePath, "%S", TempImagePath);
+							DbgPrint((DPRINT_REACTOS, "  ImagePath: '%s'\n", ImagePath));
+						}
+						DbgPrint((DPRINT_WINDOWS, "  Adding boot driver: '%s'\n", ImagePath));
+
+						Status = WinLdrAddDriverToList(&LoaderBlock->BootDriverListHead,
+							L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\",
+							TempImagePath,
+							ServiceName);
+
+						if (!Status)
+							DbgPrint((DPRINT_WINDOWS, " Failed to add boot driver\n"));
+				} else
+				{
+					//DbgPrint((DPRINT_REACTOS, "  Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current group '%S')\n",
+					//	ServiceName, StartValue, TagValue, DriverGroup, GroupName));
+				}
+			}
+
+			Index++;
+		}
+
+		/* Move to the next group name */
+		GroupName = GroupName + wcslen(GroupName) + 1;
+	}
+}
+
+BOOLEAN
+WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead,
+                      LPWSTR RegistryPath,
+                      LPWSTR ImagePath,
+                      LPWSTR ServiceName)
+{
+	PBOOT_DRIVER_LIST_ENTRY BootDriverEntry;
+	NTSTATUS Status;
+	ULONG PathLength;
+
+	BootDriverEntry = MmAllocateMemory(sizeof(BOOT_DRIVER_LIST_ENTRY));
+
+	if (!BootDriverEntry)
+		return FALSE;
+
+	// DTE will be filled during actual load of the driver
+	BootDriverEntry->DataTableEntry = NULL;
+
+	// Check - if we have a valid ImagePath, if not - we need to build it
+	// like "System32\\Drivers\\blah.sys"
+	if (ImagePath && (wcslen(ImagePath) > 0))
+	{
+		// Just copy ImagePath to the corresponding field in the structure
+		PathLength = wcslen(ImagePath) * sizeof(WCHAR);
+
+		BootDriverEntry->FilePath.Length = 0;
+		BootDriverEntry->FilePath.MaximumLength = PathLength + sizeof(WCHAR);
+		BootDriverEntry->FilePath.Buffer = MmAllocateMemory(PathLength);
+
+		if (!BootDriverEntry->FilePath.Buffer)
+			return FALSE;
+
+		Status = RtlAppendUnicodeToString(&BootDriverEntry->FilePath, ImagePath);
+		if (!NT_SUCCESS(Status))
+			return FALSE;
+	}
+	else
+	{
+		// we have to construct ImagePath ourselves
+		PathLength = wcslen(ServiceName)*sizeof(WCHAR) + sizeof(L"system32\\drivers\\.sys");;
+		BootDriverEntry->FilePath.Length = 0;
+		BootDriverEntry->FilePath.MaximumLength = PathLength+sizeof(WCHAR);
+		BootDriverEntry->FilePath.Buffer = MmAllocateMemory(PathLength);
+
+		if (!BootDriverEntry->FilePath.Buffer)
+			return FALSE;
+
+		Status = RtlAppendUnicodeToString(&BootDriverEntry->FilePath, L"system32\\drivers\\");
+		if (!NT_SUCCESS(Status))
+			return FALSE;
+
+		Status = RtlAppendUnicodeToString(&BootDriverEntry->FilePath, ServiceName);
+		if (!NT_SUCCESS(Status))
+			return FALSE;
+
+		Status = RtlAppendUnicodeToString(&BootDriverEntry->FilePath, L".sys");
+		if (!NT_SUCCESS(Status))
+			return FALSE;
+	}
+
+	// Add registry path
+	PathLength = wcslen(RegistryPath)*sizeof(WCHAR);
+	BootDriverEntry->RegistryPath.Length = 0;
+	BootDriverEntry->RegistryPath.MaximumLength = PathLength+sizeof(WCHAR);
+	BootDriverEntry->RegistryPath.Buffer = MmAllocateMemory(PathLength);
+	if (!BootDriverEntry->RegistryPath.Buffer)
+		return FALSE;
+
+	Status = RtlAppendUnicodeToString(&BootDriverEntry->RegistryPath, RegistryPath);
+	if (!NT_SUCCESS(Status))
+		return FALSE;
+
+	// Insert entry at top of the list
+	InsertHeadList(BootDriverListHead, &BootDriverEntry->ListEntry);
+
+	return TRUE;
+}

reactos/config-ppc.template.rbuild

@@ -53,13 +53,4 @@
 -->
 <property name="DBG" value="1" />
 
-
-<!--
-  Whether to compile apps/libs with features covered software patents or not.
-  If you live in a country where software patents are valid/apply, don't
-  enable this (except they/you purchased a license from the patent owner).
-  This settings is disabled (0) by default.
--->
-<property name="NSWPAT" value="0" />
-
 </rbuild>

reactos/config.template.rbuild

@@ -60,13 +60,4 @@
 -->
 <property name="GDB" value="0" />
 
-
-<!--
-  Whether to compile apps/libs with features covered software patents or not.
-  If you live in a country where software patents are valid/apply, don't
-  enable this (except they/you purchased a license from the patent owner).
-  This settings is disabled (0) by default.
--->
-<property name="NSWPAT" value="0" />
-
 </rbuild>

reactos/dll/3rdparty/freetype/devel/ftoption.h

@@ -436,7 +436,7 @@ FT_BEGIN_HEADER
   /*   Do not #undef this macro here, since the build system might         */
   /*   define it for certain configurations only.                          */
   /*                                                                       */
-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/

reactos/dll/3rdparty/freetype/freetype.rbuild

@@ -1,4 +1,4 @@
-<module name="freetype" type="kernelmodedll" entrypoint="0" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" allowwarnings="true">
+<module name="freetype" type="kernelmodedll" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" entrypoint="0" allowwarnings="true">
 	<importlibrary definition="freetype.def" />
 	<include base="freetype">include</include>
 	<define name="_DISABLE_TIDENTS" />
@@ -6,9 +6,6 @@
 	<define name="__NTDRIVER__" />
 	<define name="__NO_CTYPE_INLINES" />
 	<define name="__USE_W32API" />
-	<if property="NSWPAT" value="1">
-		<define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" />
-	</if>
 	<library>ntoskrnl</library>
 	<library>hal</library>
 	<directory name="i386">

reactos/dll/3rdparty/mesa32/mesa32.rbuild

@@ -1,11 +1,9 @@
 <!-- Autogeneratd by Makefile.ReactOS -->
-<module name="mesa32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true">
+<module name="mesa32" type="win32dll" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true">
  	<importlibrary definition="src/drivers/windows/icd/mesa.def" />
  	<linkerflag>-Wl,--enable-stdcall-fixup</linkerflag>
  	<library>ntdll</library>
  	<library>kernel32</library>
- 	<library>msvcrt</library>
- 	<library>user32</library>
  	<define name="__USE_W32API" />
  	<define name="USE_EXTERNAL_DXTN_LIB" />
  	<!-- The following is autogenrated by Makefile.ReactOS -->

reactos/dll/cpl/access/De.rc

@@ -10,18 +10,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Tastatur"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Einrastfunktion",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Benutzen Sie die Feststellfunktion um Kombinationen mit Shift, Strg oder Alt als Tastenfolge eingeben zu k<>nnen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Einrastfunktion a&ktivieren",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+4,14
-  PUSHBUTTON "&Einstellungen",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Verz<72>gerung",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Benutzen Sie die Anschl<68>gsverz<72>gerung, wenn ReactOS kurze oder wiederholte Anschl<68>ge ignorieren oder die Wiederholungsrate verringern soll.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Verz<72>gerung aktivieren",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "E&instellungen",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Signalfunktion",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Benutzen Sie die Signalfunktion, wenn Sie einen Signalton h<>ren wollen, wenn Sie Caps-, Num-, oder Scroll-Lock dr<64>cken.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Signalfunktion benutzen",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  PUSHBUTTON "Ei&nstellungen",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Einrastfunktion",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Benutzen Sie die Feststellfunktion um Kombinationen mit Shift, Strg oder Alt als Tastenfolge eingeben zu k<>nnen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Einrastfunktion a&ktivieren",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING)+4,14
+  PUSHBUTTON "&Einstellungen",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Verz<72>gerung",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Benutzen Sie die Anschl<68>gsverz<72>gerung, wenn ReactOS kurze oder wiederholte Anschl<68>ge ignorieren oder die Wiederholungsrate verringern soll.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Verz<72>gerung aktivieren",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "E&instellungen",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Signalfunktion",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Benutzen Sie die Signalfunktion, wenn Sie einen Signalton h<>ren wollen, wenn Sie Caps-, Num-, oder Scroll-Lock dr<64>cken.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Signalfunktion benutzen",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "Ei&nstellungen",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "Extra Tastaturhilfe in den P&rogrammen anzeigen ",IDC_KEYBOARD_EXTRA
 END
 
@@ -31,14 +31,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Sound"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Darstellungsoption",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Benutzen Sie die Sounddarstellung, wenn ReactOS Sounds visuell darstellen soll.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+15,14
-  PUSHBUTTON "&Einstellungen",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Darstellungsoption",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Benutzen Sie die Sounddarstellung, wenn ReactOS Sounds visuell darstellen soll.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Darstellungsoption aktivieren",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING)+15,14
+  PUSHBUTTON "&Einstellungen",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "Sounddarstellung",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Benutzen Sie die Sounddarstellung, damit die Programme Sprachausgaben und Sounds schriftlich darstellen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "Sounddarstellung",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Benutzen Sie die Sounddarstellung, damit die Programme Sprachausgaben und Sounds schriftlich darstellen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Sounddarstellung aktivieren",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -47,10 +47,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Anzeige"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "Hoher Kontrast",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Aktivieren Sie diese Option, damit ReactOS Farben und Schrift besonders leserlich darstellt.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Hohen Kontrast aktivieren",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15)+5,14
-  PUSHBUTTON "&Einstellungen",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Hoher Kontrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Aktivieren Sie diese Option, damit ReactOS Farben und Schrift besonders leserlich darstellt.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Hohen Kontrast aktivieren",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING)+5,14
+  PUSHBUTTON "&Einstellungen",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -60,10 +60,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Maus"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Tastaturmaus",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Aktivieren Sie diese Option, um den Mauszeiger mit dem Nummernpad der Tastatur zu steuern.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Tastaturmaus aktivieren",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Einstellungen",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Tastaturmaus",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Aktivieren Sie diese Option, um den Mauszeiger mit dem Nummernpad der Tastatur zu steuern.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Tastaturmaus aktivieren",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Einstellungen",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -72,8 +72,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Automatischer Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Ei&ngabehilfen automatisch deaktivieren nach:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "Automatischer Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Ei&ngabehilfen automatisch deaktivieren nach:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -85,20 +85,20 @@ BEGIN
   //  MENUITEM "30 Minuten", IDC_RESET_30
   //}
 
-  GROUPBOX "Benachrichtigung",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Warnsignal ausgeben, wenn eine Funktion eingeschaltet wird",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+15,LABELLINE(2)
-  CHECKBOX "Soundsignal beim Ein- und Ausschalten einer Funktion ausgeben",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+25,LABELLINE(1)
+  GROUPBOX "Benachrichtigung",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Warnsignal ausgeben, wenn eine Funktion eingeschaltet wird",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE+15,LABELLINE(2)
+  CHECKBOX "Soundsignal beim Ein- und Ausschalten einer Funktion ausgeben",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE+25,LABELLINE(1)
 
  
-  GROUPBOX "Externe Eingabehilfen",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "Externe Eingabehilfen bieten alternativen Zugriff auf Tastatur- und Mausfunktionen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "E&xterne Eingabehilfen aktivieren",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Externe Eingabehilfen",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "Externe Eingabehilfen bieten alternativen Zugriff auf Tastatur- und Mausfunktionen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "E&xterne Eingabehilfen aktivieren",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "&Einstellungen",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "Verwaltungsoptionen",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "&Alle Einstellungen auf dem Anmeldebildschrim anwenden",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Alle Einstellungen als &Standart f<>r neue Benutzer anwenden",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE+10,LABELLINE(1)
+  GROUPBOX "Verwaltungsoptionen",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "&Alle Einstellungen auf dem Anmeldebildschrim anwenden",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Alle Einstellungen als &Standart f<>r neue Benutzer anwenden",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE+10,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/En.rc

@@ -8,18 +8,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Keyboard"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "StickyKeys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use StickyKeys if you want to use Shift, Ctrl, or Alt key by pressing one key at at time.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Use StickyKeys",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Settings",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "FilterKeys",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Use &FilterKeys",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "S&ettings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Use &ToggleKeys",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  PUSHBUTTON "Setti&ngs",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "StickyKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use StickyKeys if you want to use Shift, Ctrl, or Alt key by pressing one key at at time.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Use StickyKeys",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "FilterKeys",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use &FilterKeys",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "S&ettings",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "ToggleKeys",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use ToggleKeys if you want to hear tones when pressing Caps Lock, Num Lock, and Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Use &ToggleKeys",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "Setti&ngs",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA
 END
 
@@ -29,14 +29,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Sound"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "SoundSentry",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Settings",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "SoundSentry",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use &SoundSentry",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "ShowSounds",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "ShowSounds",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Use ShowSounds to tell your programs to display captions for the speech and sounds they make.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use S&howSounds",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -45,10 +45,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Display"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "High Contrast",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Use High Contrast",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Settings",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "High Contrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Use High Contrast",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -58,10 +58,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Mouse"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "MouseKeys",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use this option if you want to control the pointer with the numeric keypad on your keyboard.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Use &MouseKeys",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Settings",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "MouseKeys",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use this option if you want to control the pointer with the numeric keypad on your keyboard.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use &MouseKeys",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Settings",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -70,8 +70,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "&Turn off accessibility features after idle for:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -83,21 +83,21 @@ BEGIN
   //  MENUITEM "30 Minutes", IDC_RESET_30
   //}
 
-  GROUPBOX "Notification",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Notification",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Give warning message when turning a feature on",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Make a sound when turning a feature on or off",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
  
-  GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "SerialKey Devices",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "SerialKey devices allow alternative access to keyboard and mouse features.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Support &SerialKey devices",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "S&ettings",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "Administrative options",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
+  GROUPBOX "Administrative options",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
 
-  CHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  CHECKBOX "Apply all settings to l&ogon desktop",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Apply all settings to &defaults for new users",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/Es.rc

@@ -12,18 +12,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Teclado"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Teclas Pegajosas",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use Teclas Pegajosas si quiere utilizar las llaves Shift, Ctrl, <20> Alt presionando una tecla a la vez.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Usar Teclas Pegajosas",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Opciones",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Filtro de Teclas",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Use Teclas Filtradas si desea que Reactos ignore presionadas de teclas quebradas o repetidas, o hacer m<>s corto la repetici<63>n de teclas.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Usar Teclas &Filtradas",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "Opcion&es",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Teclas Activas",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use &Teclas Activas si desea escuchar tonos al presionar Caps Lock, Num Lock, y Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Usar Teclas Activas",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  PUSHBUTTON "Opcio&nes",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Teclas Pegajosas",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use Teclas Pegajosas si quiere utilizar las llaves Shift, Ctrl, <20> Alt presionando una tecla a la vez.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Usar Teclas Pegajosas",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Opciones",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Filtro de Teclas",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Use Teclas Filtradas si desea que Reactos ignore presionadas de teclas quebradas o repetidas, o hacer m<>s corto la repetici<63>n de teclas.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Usar Teclas &Filtradas",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "Opcion&es",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Teclas Activas",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use &Teclas Activas si desea escuchar tonos al presionar Caps Lock, Num Lock, y Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Usar Teclas Activas",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "Opcio&nes",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA
 END
 
@@ -33,14 +33,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Sonidos"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Vigilante Auditivo",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use el Vigilante Auditivo si desea que Reactos genere avisos visuales cuando sus systema haga un sonido.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Usar Vigilante Auditivo",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "Opcione&s",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Vigilante Auditivo",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use el Vigilante Auditivo si desea que Reactos genere avisos visuales cuando sus systema haga un sonido.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Usar Vigilante Auditivo",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "Opcione&s",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que ense<73>en texto por las voces y sonidos que utilizen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "Despliegue Sonidos",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Use el Despliegue de Sonidos para decirle a sus programas que ense<73>en texto por las voces y sonidos que utilizen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Usar Despliegue de Sonidos",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -49,10 +49,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Despliegue"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "Alto Contraste",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use esta opci<63>n si desea que Reactos use colores y letras dese<73>adas para lectura f<>cil.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Usar Alto Contraste",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "Opcione&s",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Alto Contraste",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use esta opci<63>n si desea que Reactos use colores y letras dese<73>adas para lectura f<>cil.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Usar Alto Contraste",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "Opcione&s",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -62,10 +62,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Raton"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Raton de teclas",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Use esta opci<63>n si desea controlar el cursor con el teclado numerico de su teclado.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Usar Raton de Teclas",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "Opcione&s",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Raton de teclas",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Use esta opci<63>n si desea controlar el cursor con el teclado numerico de su teclado.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Usar Raton de Teclas",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "Opcione&s",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -74,8 +74,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "General"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Apagar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "Automatic Reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Apagar las opciones de accesibilidad despues de estar inactivo por:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -87,21 +87,21 @@ BEGIN
   //  MENUITEM "30 Minutos", IDC_RESET_30
   //}
 
-  GROUPBOX "Notificaci<63>n",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Dar mensage de aviso al activar unacaracter<65>stica",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Hacer un sonido al activar una caracter<65>stica",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Notificaci<63>n",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Dar mensage de aviso al activar unacaracter<65>stica",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Hacer un sonido al activar una caracter<65>stica",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
  
-  GROUPBOX "Dispositivos de Teclados Seriales",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "Los Dispositivos de Teclados Seriales te permiten una alternativa de acceso de teclado y raton.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Apoyar Dispositivos de Teclados &Seriales",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Dispositivos de Teclados Seriales",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "Los Dispositivos de Teclados Seriales te permiten una alternativa de acceso de teclado y raton.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Apoyar Dispositivos de Teclados &Seriales",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "Opcion&es",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "Opciones Administrativas",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
+  GROUPBOX "Opciones Administrativas",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
 
-  CHECKBOX "Applicar todas las opciones al escritorio de inicio",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Applicar todas las opciones al escritorio de nuevos usuarios",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  CHECKBOX "Applicar todas las opciones al escritorio de inicio",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Applicar todas las opciones al escritorio de nuevos usuarios",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/Fr.rc

@@ -9,18 +9,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Clavier"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Touches r<>manantes",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Utilisez les touches r<>manentes si vous voulez utiliser les touches Maj, Ctrl, Alt en appuyant sur une touche <20> la fois.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Utiliser les touches r<>manentes",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(18),14
-  PUSHBUTTON "&Param<61>tres",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Touches filtres",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Utilisez les touches filtres si vous voulez que ReactOS ignore les frappes br<62>ves ou r<>p<EFBFBD>t<EFBFBD>es ou si vous voulez diminuer la fr<66>quence de r<>p<EFBFBD>tition.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Utiliser les touches &filtre",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "P&aram<61>tres",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Touches bascules",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Utilisez les touches &bascules si vous voulez entendre un son <20>mis <20> chaques fois que vous appuyez sur Verr. maj, Verr. num, et Arr<72>t d<>fil.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Utiliser les touches bascules",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  PUSHBUTTON "Para&m<>tres",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Touches r<>manantes",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Utilisez les touches r<>manentes si vous voulez utiliser les touches Maj, Ctrl, Alt en appuyant sur une touche <20> la fois.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Utiliser les touches r<>manentes",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Param<61>tres",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Touches filtres",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Utilisez les touches filtres si vous voulez que ReactOS ignore les frappes br<62>ves ou r<>p<EFBFBD>t<EFBFBD>es ou si vous voulez diminuer la fr<66>quence de r<>p<EFBFBD>tition.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Utiliser les touches &filtre",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "P&aram<61>tres",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Touches bascules",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Utilisez les touches &bascules si vous voulez entendre un son <20>mis <20> chaques fois que vous appuyez sur Verr. maj, Verr. num, et Arr<72>t d<>fil.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Utiliser les touches bascules",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "Para&m<>tres",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "&Afficher l'aide suppl<70>mentaire sur le clavier dans les programmes",IDC_KEYBOARD_EXTRA
 END
 
@@ -30,14 +30,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Son"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Sons visuels",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Utilisez les sons visuels si vous voulez que Reactos g<>n<EFBFBD>re un avertissement visuel lorsque votre syst<73>me <20>met un son.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Utiliser les &sons visuels",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Param<61>tres",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Sons visuels",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Utilisez les sons visuels si vous voulez que Reactos g<>n<EFBFBD>re un avertissement visuel lorsque votre syst<73>me <20>met un son.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Utiliser les &sons visuels",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Param<61>tres",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "Sons texte",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Utilisez les sons texte pour que vos programmes affichent le texte des paroles et des sons qu'il g<>n<EFBFBD>rent.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "Sons texte",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Utilisez les sons texte pour que vos programmes affichent le texte des paroles et des sons qu'il g<>n<EFBFBD>rent.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Utiliser les sons &texte",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -46,10 +46,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Display"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "Contraste <20>lev<65>",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Utilisez cette option si vous voulez que ReactOS utilise les couleurs et les polices con<6F>ues pour une lecture facilit<69>e.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Utiliser un contraste <20>lev<65>",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(18),14
-  PUSHBUTTON "&Param<61>tres",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Contraste <20>lev<65>",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Utilisez cette option si vous voulez que ReactOS utilise les couleurs et les polices con<6F>ues pour une lecture facilit<69>e.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Utiliser un contraste <20>lev<65>",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Param<61>tres",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -59,10 +59,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Souris"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Touches souris",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Utilisez les touches souris si vous voulez contr<74>ler le pointeur avec le pav<61> num<75>rique de votre clavier.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Utiliser les touches &souris",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(18),14
-  PUSHBUTTON "&Param<61>tres",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Touches souris",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Utilisez les touches souris si vous voulez contr<74>ler le pointeur avec le pav<61> num<75>rique de votre clavier.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Utiliser les touches &souris",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Param<61>tres",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -71,8 +71,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "G<>n<EFBFBD>ral"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "R<>initialisation automatique",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "&D<>sactiver les fonctionnalit<69>s d'accessibilit<69> apr<70>s un d<>lai d'inactivit<69> de<64>:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "R<>initialisation automatique",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "&D<>sactiver les fonctionnalit<69>s d'accessibilit<69> apr<70>s un d<>lai d'inactivit<69> de<64>:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -84,21 +84,21 @@ BEGIN
   //  MENUITEM "30 Minutes", IDC_RESET_30
   //}
 
-  GROUPBOX "Avertissement",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Afficher un message d'avertissement lors de l'activation d'une fonctionnalit<69>",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "<22>mettre un son lors de l'activation/d<>sactivation d'une fonctionnalit<69>",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Avertissement",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Afficher un message d'avertissement lors de l'activation d'une fonctionnalit<69>",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "<22>mettre un son lors de l'activation/d<>sactivation d'une fonctionnalit<69>",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
  
-  GROUPBOX "P<>riph<70>riques Touches s<>rie",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "Les p<>riph<70>riques Touches s<>rie repr<70>sentent un une alternative pour acc<63>der aux fonctionnalit<69>s du clavier et de la souris.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "U&tiliser les touches s<>rie",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "P<>riph<70>riques Touches s<>rie",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "Les p<>riph<70>riques Touches s<>rie repr<70>sentent un une alternative pour acc<63>der aux fonctionnalit<69>s du clavier et de la souris.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "U&tiliser les touches s<>rie",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "&Param<61>tres",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "Options d'administration",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
+  GROUPBOX "Options d'administration",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
 
-  CHECKBOX "Appliquer tous les param<61>tres au Bureau d'ou&verture de session",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Appliq&uer tous les param<61>tres par d<>faut aux nouveaux utilisateurs",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  CHECKBOX "Appliquer tous les param<61>tres au Bureau d'ou&verture de session",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Appliq&uer tous les param<61>tres par d<>faut aux nouveaux utilisateurs",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/Hu.rc

@@ -9,18 +9,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Billenty<74>zet"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Beragad<61> billenty<74>k",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Haszn<7A>lja a Beragad<61> billenyt<79>k lehet<65>s<EFBFBD>get, ha a Shift, Ctrl, vagy Alt billenyt<79>ket egy billenty<74> lenyom<6F>s<EFBFBD>val akarja haszn<7A>lni.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Beragad<61> billenty<74>k haszn<7A>lata",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Be<42>ll<6C>t<EFBFBD>sok",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(8),14
-  GROUPBOX "FilterKeys",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Use &FilterKeys",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "B&e<>ll<6C>t<EFBFBD>sok",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(8),14
-  GROUPBOX "<22>ll<6C>sjelz<6C> hangok",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Ha a Caps Lock, Num Lock, <20>s Scroll Lock billenty<74>k lenyom<6F>sakor hangot szeretne hallani, haszn<7A>lja az <20>ll<6C>sjelz<6C> hangok lehet<65>s<EFBFBD>get.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>ll<6C>sjelz<6C> hangok haszn<7A>lata",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  PUSHBUTTON "Be<42>ll<6C>t<EFBFBD>&sok",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(8),14
+  GROUPBOX "Beragad<61> billenty<74>k",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Haszn<7A>lja a Beragad<61> billenyt<79>k lehet<65>s<EFBFBD>get, ha a Shift, Ctrl, vagy Alt billenyt<79>ket egy billenty<74> lenyom<6F>s<EFBFBD>val akarja haszn<7A>lni.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Beragad<61> billenty<74>k haszn<7A>lata",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Be<42>ll<6C>t<EFBFBD>sok",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "FilterKeys",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Use &FilterKeys",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "B&e<>ll<6C>t<EFBFBD>sok",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "<22>ll<6C>sjelz<6C> hangok",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Ha a Caps Lock, Num Lock, <20>s Scroll Lock billenty<74>k lenyom<6F>sakor hangot szeretne hallani, haszn<7A>lja az <20>ll<6C>sjelz<6C> hangok lehet<65>s<EFBFBD>get.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "<22>ll<6C>sjelz<6C> hangok haszn<7A>lata",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "Be<42>ll<6C>t<EFBFBD>&sok",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "Kib<69>v<EFBFBD>tett billenty<74>zet seg<65>ts<74>g megjelen<65>t<EFBFBD>se a programokban",IDC_KEYBOARD_EXTRA
 END
 
@@ -30,14 +30,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Hang"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "HangFigyel<65>",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Ezt a funkci<63>t akkor haszn<7A>lja, ha szeretn<74>, hogy a Reactos l<>that<61> figyelmeztet<65>seket k<>ldj<64>n olyankor, amikor a rendszer hangjelz<6C>st ad.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&HangFigyel<65> haszn<7A>lata",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Be<42>ll<6C>t<EFBFBD>sok",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(8),14
+  GROUPBOX "HangFigyel<65>",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Ezt a funkci<63>t akkor haszn<7A>lja, ha szeretn<74>, hogy a Reactos l<>that<61> figyelmeztet<65>seket k<>ldj<64>n olyankor, amikor a rendszer hangjelz<6C>st ad.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&HangFigyel<65> haszn<7A>lata",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Be<42>ll<6C>t<EFBFBD>sok",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "HangFeliratok",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "Ezzel a funkci<63>val adhatja meg programjainak, hogy a hangokhoz jelen<65>tsenek meg feliratokat is.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Hang&Feliratok haszn<7A>lata",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "HangFeliratok",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "Ezzel a funkci<63>val adhatja meg programjainak, hogy a hangokhoz jelen<65>tsenek meg feliratokat is.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Hang&Feliratok haszn<7A>lata",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -46,10 +46,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "K<>perny<6E>"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "Nagy kontraszt",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Ha azt szeretn<74>, hogy a Reactos olyan sz<73>neket haszn<7A>ljon, amelyek a k<>nny<6E> olvas<61>st teszik lehet<65>v<EFBFBD>, akkor v<>lassza ki ezt a lehet<65>s<EFBFBD>get.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Nagy kontraszt haszn<7A>lata",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17),14
-  PUSHBUTTON "&Bell<6C>t<EFBFBD>sok",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(8),14
+  GROUPBOX "Nagy kontraszt",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Ha azt szeretn<74>, hogy a Reactos olyan sz<73>neket haszn<7A>ljon, amelyek a k<>nny<6E> olvas<61>st teszik lehet<65>v<EFBFBD>, akkor v<>lassza ki ezt a lehet<65>s<EFBFBD>get.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Nagy kontraszt haszn<7A>lata",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Bell<6C>t<EFBFBD>sok",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -59,10 +59,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Eg<45>r"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Billenty<74>Eg<45>r",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "Akkor haszn<7A>lja ezt a lehet<65>s<EFBFBD>get, ha az eger<65>t a numerikus billenty<74>zettel szeretn<74> ir<69>ny<6E>tani.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Billenty<74>Eg<45>r &Haszn<7A>lata",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17),14
-  PUSHBUTTON "&Be<42>ll<6C>t<EFBFBD>sok",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(8),14
+  GROUPBOX "Billenty<74>Eg<45>r",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "Akkor haszn<7A>lja ezt a lehet<65>s<EFBFBD>get, ha az eger<65>t a numerikus billenty<74>zettel szeretn<74> ir<69>ny<6E>tani.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Billenty<74>Eg<45>r &Haszn<7A>lata",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Be<42>ll<6C>t<EFBFBD>sok",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -71,8 +71,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22>ltal<61>nos"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Automatikus vissza<7A>ll<6C>t<EFBFBD>s",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "&Kapcsolja ki a kiseg<65>t<EFBFBD> lehet<65>s<EFBFBD>geket egy bizonyos idej<65> t<>tlens<6E>g ut<75>n:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "Automatikus vissza<7A>ll<6C>t<EFBFBD>s",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "&Kapcsolja ki a kiseg<65>t<EFBFBD> lehet<65>s<EFBFBD>geket egy bizonyos idej<65> t<>tlens<6E>g ut<75>n:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -84,21 +84,21 @@ BEGIN
   //  MENUITEM "30 perc", IDC_RESET_30
   //}
 
-  GROUPBOX "&Figyelmeztet<65>s",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Fi&gyelmeztet<65> <20>zenet ki<6B>r<EFBFBD>sa egy funkci<63> bekapcsol<6F>sakor",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "&Hangjelz<6C>s haszn<7A>lata egy funkci<63> be- vagy kikapcsol<6F>sakor",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "&Figyelmeztet<65>s",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Fi&gyelmeztet<65> <20>zenet ki<6B>r<EFBFBD>sa egy funkci<63> bekapcsol<6F>sakor",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "&Hangjelz<6C>s haszn<7A>lata egy funkci<63> be- vagy kikapcsol<6F>sakor",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
  
-  GROUPBOX "Sorosgomb eszk<7A>z<EFBFBD>k",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "A Sorosgomb eszk<7A>z<EFBFBD>k a billenty<74>zet <20>s eg<65>r funkci<63>inak elt<6C>r<EFBFBD> el<65>r<EFBFBD>s<EFBFBD>t teszik lehet<65>v<EFBFBD>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "&Sorosgomb eszk<7A>z<EFBFBD>k t<>mogat<61>sa",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Sorosgomb eszk<7A>z<EFBFBD>k",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "A Sorosgomb eszk<7A>z<EFBFBD>k a billenty<74>zet <20>s eg<65>r funkci<63>inak elt<6C>r<EFBFBD> el<65>r<EFBFBD>s<EFBFBD>t teszik lehet<65>v<EFBFBD>.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "&Sorosgomb eszk<7A>z<EFBFBD>k t<>mogat<61>sa",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "B&e<>ll<6C>t<EFBFBD>sok",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "Fel<65>gyeleti be<62>ll<6C>t<EFBFBD>sok",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
+  GROUPBOX "Fel<65>gyeleti be<62>ll<6C>t<EFBFBD>sok",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
 
-  CHECKBOX "&Minden be<62>ll<6C>t<EFBFBD>s alkalmaz<61>sa a bejelentkez<65> k<>perny<6E>re is",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "&A be<62>ll<6C>t<EFBFBD>sok alkalmaz<61>sa az <20>j felhaszn<7A>l<EFBFBD>kn<6B>l",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  CHECKBOX "&Minden be<62>ll<6C>t<EFBFBD>s alkalmaz<61>sa a bejelentkez<65> k<>perny<6E>re is",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "&A be<62>ll<6C>t<EFBFBD>sok alkalmaz<61>sa az <20>j felhaszn<7A>l<EFBFBD>kn<6B>l",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/Ja.rc

@@ -8,18 +8,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22>L<EFBFBD>[<5B>{<7B>[<5B>h"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-  GROUPBOX "<22>Œ<EFBFBD><C592>L<EFBFBD>[<5B>@<40>\\",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22>Œ<EFBFBD><C592>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁA<C681>L<EFBFBD>[<5B>𓯎<EFBFBD><F093AF8E>ɉ<EFBFBD><C989><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>Ă<EFBFBD><C482>AShift<66>ACtrl<72>AAlt <20>L<EFBFBD>[<5B>̋@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82>B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>Œ<EFBFBD><C592>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67>(&U)",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "<22>ݒ<EFBFBD>(&S)",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "<22>t<EFBFBD>B<EFBFBD><42><EFBFBD>^ <20>L<EFBFBD>[<5B>@<40>\\",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "<22>t<EFBFBD>B<EFBFBD><42><EFBFBD>^ <20>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁA<C681><41><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD>[<5B><><EFBFBD>͂<EFBFBD><CD82>J<EFBFBD><4A><EFBFBD>Ԃ<EFBFBD><D482>ꂽ<EFBFBD>L<EFBFBD>[<5B><><EFBFBD>͂𖳎<CD82><F096B38E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>J<EFBFBD><4A><EFBFBD>Ԃ<EFBFBD><D482><EFBFBD><EFBFBD>͂̊Ԋu<D48A>𒷂<EFBFBD><F092B782><EFBFBD><EFBFBD><EFBFBD><EFBFBD>肷<EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>t<EFBFBD>B<EFBFBD><42><EFBFBD>^ <20>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67>(&F)",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "<22>ݒ<EFBFBD>(&E)",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "<22>؂<EFBFBD><D882>ւ<EFBFBD><D682>L<EFBFBD>[<5B>@<40>\\",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22>؂<EFBFBD><D882>ւ<EFBFBD><D682>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁACapsLock<63>ANumLock<63>AScrollLock <20>L<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>ɉ<EFBFBD><C989><EFBFBD><EFBFBD>‚炵<C282>܂<EFBFBD><DC82>B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "<22>؂<EFBFBD><D882>ւ<EFBFBD><D682>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67>(&T)",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  PUSHBUTTON "<22>ݒ<EFBFBD>(&N)",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "<22>Œ<EFBFBD><C592>L<EFBFBD>[<5B>@<40>\\",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22>Œ<EFBFBD><C592>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁA<C681>L<EFBFBD>[<5B>𓯎<EFBFBD><F093AF8E>ɉ<EFBFBD><C989><EFBFBD><EFBFBD>Ȃ<EFBFBD><C882>Ă<EFBFBD><C482>AShift<66>ACtrl<72>AAlt <20>L<EFBFBD>[<5B>̋@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82>B",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22>Œ<EFBFBD><C592>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67>(&U)",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "<22>ݒ<EFBFBD>(&S)",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "<22>t<EFBFBD>B<EFBFBD><42><EFBFBD>^ <20>L<EFBFBD>[<5B>@<40>\\",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "<22>t<EFBFBD>B<EFBFBD><42><EFBFBD>^ <20>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁA<C681><41><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD>[<5B><><EFBFBD>͂<EFBFBD><CD82>J<EFBFBD><4A><EFBFBD>Ԃ<EFBFBD><D482>ꂽ<EFBFBD>L<EFBFBD>[<5B><><EFBFBD>͂𖳎<CD82><F096B38E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>J<EFBFBD><4A><EFBFBD>Ԃ<EFBFBD><D482><EFBFBD><EFBFBD>͂̊Ԋu<D48A>𒷂<EFBFBD><F092B782><EFBFBD><EFBFBD><EFBFBD><EFBFBD>肷<EFBFBD>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22>t<EFBFBD>B<EFBFBD><42><EFBFBD>^ <20>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67>(&F)",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "<22>ݒ<EFBFBD>(&E)",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "<22>؂<EFBFBD><D882>ւ<EFBFBD><D682>L<EFBFBD>[<5B>@<40>\\",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22>؂<EFBFBD><D882>ւ<EFBFBD><D682>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁACapsLock<63>ANumLock<63>AScrollLock <20>L<EFBFBD>[<5B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>ɉ<EFBFBD><C989><EFBFBD><EFBFBD>‚炵<C282>܂<EFBFBD><DC82>B",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "<22>؂<EFBFBD><D882>ւ<EFBFBD><D682>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67>(&T)",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "<22>ݒ<EFBFBD>(&N)",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "<22>v<EFBFBD><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Œlj<C592><C789>̃L<CC83>[<5B>{<7B>[<5B>h <20>w<EFBFBD><77><EFBFBD>v<EFBFBD><76><EFBFBD>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&W)",IDC_KEYBOARD_EXTRA
 END
 
@@ -29,14 +29,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-  GROUPBOX "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h<EFBFBD>ʒm",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22>V<EFBFBD>X<EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>‚炷<C282>Ƃ<EFBFBD><C682>A<EFBFBD><41><EFBFBD>o<EFBFBD>I<EFBFBD>ɒʒm<CA92><6D><EFBFBD>o<EFBFBD><6F><EFBFBD>܂<EFBFBD><DC82>B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h<EFBFBD>ʒm<CA92><6D><EFBFBD>g<EFBFBD><67>(&S)",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "<22>ݒ<EFBFBD>(&S)",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h<EFBFBD>ʒm",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22>V<EFBFBD>X<EFBFBD>e<EFBFBD><65><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>‚炷<C282>Ƃ<EFBFBD><C682>A<EFBFBD><41><EFBFBD>o<EFBFBD>I<EFBFBD>ɒʒm<CA92><6D><EFBFBD>o<EFBFBD><6F><EFBFBD>܂<EFBFBD><DC82>B",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h<EFBFBD>ʒm<CA92><6D><EFBFBD>g<EFBFBD><67>(&S)",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "<22>ݒ<EFBFBD>(&S)",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "<22>v<EFBFBD><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>‚炷<C282>Ƃ<EFBFBD><C682>A<EFBFBD>‚炷<C282><E782B7><EFBFBD>ɂ‚<C982><C282>ĉ<EFBFBD><C489><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\\<5C><><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD>(&H)",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "<22>v<EFBFBD><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>‚炷<C282>Ƃ<EFBFBD><C682>A<EFBFBD>‚炷<C282><E782B7><EFBFBD>ɂ‚<C982><C282>ĉ<EFBFBD><C489><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\\<5C><><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82>B",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22>T<EFBFBD>E<EFBFBD><45><EFBFBD>h<EFBFBD><68><EFBFBD><EFBFBD>(&H)",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -45,10 +45,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22><><EFBFBD><EFBFBD>"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "<22>n<EFBFBD>C<EFBFBD>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>X<EFBFBD>g",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22><><EFBFBD>̋@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁA<C681><41><EFBFBD>ʕ\\<5C><><EFBFBD>ɓǂ݂₷<DD82><E282B7><EFBFBD>z<EFBFBD>F<EFBFBD>ƃt<C683>H<EFBFBD><48><EFBFBD>g<EFBFBD><67><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82>B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>n<EFBFBD>C<EFBFBD>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>X<EFBFBD>g<EFBFBD><67><EFBFBD>g<EFBFBD><67>(&U)",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "<22>ݒ<EFBFBD>(&S)",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "<22>n<EFBFBD>C<EFBFBD>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>X<EFBFBD>g",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22><><EFBFBD>̋@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁA<C681><41><EFBFBD>ʕ\\<5C><><EFBFBD>ɓǂ݂₷<DD82><E282B7><EFBFBD>z<EFBFBD>F<EFBFBD>ƃt<C683>H<EFBFBD><48><EFBFBD>g<EFBFBD><67><EFBFBD>g<EFBFBD><67><EFBFBD>܂<EFBFBD><DC82>B",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22>n<EFBFBD>C<EFBFBD>R<EFBFBD><52><EFBFBD>g<EFBFBD><67><EFBFBD>X<EFBFBD>g<EFBFBD><67><EFBFBD>g<EFBFBD><67>(&U)",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "<22>ݒ<EFBFBD>(&S)",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -58,10 +58,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22>}<7D>E<EFBFBD>X"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-  GROUPBOX "<22>}<7D>E<EFBFBD>X <20>L<EFBFBD>[<5B>@<40>\\",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22>}<7D>E<EFBFBD>X <20>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁA<C681>e<EFBFBD><65><EFBFBD>L<EFBFBD>[<5B><><EFBFBD>g<EFBFBD><67><EFBFBD>ă}<7D>E<EFBFBD>X <20>|<7C>C<EFBFBD><43><EFBFBD>^<5E>𑀍<EFBFBD><F091808D>ł<EFBFBD><C582>܂<EFBFBD><DC82>B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>}<7D>E<EFBFBD>X <20>L<EFBFBD>[<5B>@<40>\\(&M)",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "<22>ݒ<EFBFBD>(&S)",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "<22>}<7D>E<EFBFBD>X <20>L<EFBFBD>[<5B>@<40>\\",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22>}<7D>E<EFBFBD>X <20>L<EFBFBD>[<5B>@<40>\\<5C><><EFBFBD>g<EFBFBD><67><EFBFBD>ƁA<C681>e<EFBFBD><65><EFBFBD>L<EFBFBD>[<5B><><EFBFBD>g<EFBFBD><67><EFBFBD>ă}<7D>E<EFBFBD>X <20>|<7C>C<EFBFBD><43><EFBFBD>^<5E>𑀍<EFBFBD><F091808D>ł<EFBFBD><C582>܂<EFBFBD><DC82>B",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22>}<7D>E<EFBFBD>X <20>L<EFBFBD>[<5B>@<40>\\(&M)",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "<22>ݒ<EFBFBD>(&S)",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -70,8 +70,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22>S<EFBFBD><53>"
 FONT 9, "MS UI Gothic", 0, 0, 0x0
 BEGIN
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Z<EFBFBD>b<EFBFBD>g",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "<22><><EFBFBD>[<5B>U<EFBFBD>[<5B>⏕<EFBFBD>𖳌<EFBFBD><F096B38C>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂ł̑҂<CC91><D282><EFBFBD><EFBFBD><EFBFBD>(&T):",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Z<EFBFBD>b<EFBFBD>g",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "<22><><EFBFBD>[<5B>U<EFBFBD>[<5B>⏕<EFBFBD>𖳌<EFBFBD><F096B38C>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>܂ł̑҂<CC91><D282><EFBFBD><EFBFBD><EFBFBD>(&T):",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -83,21 +83,21 @@ BEGIN
   //  MENUITEM "30 Minutes", IDC_RESET_30
   //}
 
-  GROUPBOX "<22>ʒm",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "<22><><EFBFBD>[<5B>U<EFBFBD>[<5B>⏕<EFBFBD><E28F95><EFBFBD>L<EFBFBD><4C><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>A<EFBFBD><41><EFBFBD>b<EFBFBD>Z<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD>o<EFBFBD><6F>",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "<22><><EFBFBD>[<5B>U<EFBFBD>[<5B>⏕<EFBFBD><E28F95><EFBFBD>L<EFBFBD><4C><EFBFBD>܂<EFBFBD><DC82>͖<EFBFBD><CD96><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>‚炷",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "<22>ʒm",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "<22><><EFBFBD>[<5B>U<EFBFBD>[<5B>⏕<EFBFBD><E28F95><EFBFBD>L<EFBFBD><4C><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>A<EFBFBD><41><EFBFBD>b<EFBFBD>Z<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD>o<EFBFBD><6F>",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "<22><><EFBFBD>[<5B>U<EFBFBD>[<5B>⏕<EFBFBD><E28F95><EFBFBD>L<EFBFBD><4C><EFBFBD>܂<EFBFBD><DC82>͖<EFBFBD><CD96><EFBFBD><EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>‚炷",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
  
-  GROUPBOX "<22>V<EFBFBD><56><EFBFBD>A<EFBFBD><41><EFBFBD>L<EFBFBD>[ <20>f<EFBFBD>o<EFBFBD>C<EFBFBD>X",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "<22>V<EFBFBD><56><EFBFBD>A<EFBFBD><41><EFBFBD>L<EFBFBD>[ <20>f<EFBFBD>o<EFBFBD>C<EFBFBD>X<EFBFBD><58><EFBFBD>L<EFBFBD>[<5B>{<7B>[<5B>h<EFBFBD><68><EFBFBD>}<7D>E<EFBFBD>X<EFBFBD>̑<EFBFBD><CC91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ɏg<C98E><67><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "<22>V<EFBFBD><56><EFBFBD>A<EFBFBD><41><EFBFBD>L<EFBFBD>[ <20>f<EFBFBD>o<EFBFBD>C<EFBFBD>X<EFBFBD><58><EFBFBD>g<EFBFBD><67>(&S)",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "<22>V<EFBFBD><56><EFBFBD>A<EFBFBD><41><EFBFBD>L<EFBFBD>[ <20>f<EFBFBD>o<EFBFBD>C<EFBFBD>X",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "<22>V<EFBFBD><56><EFBFBD>A<EFBFBD><41><EFBFBD>L<EFBFBD>[ <20>f<EFBFBD>o<EFBFBD>C<EFBFBD>X<EFBFBD><58><EFBFBD>L<EFBFBD>[<5B>{<7B>[<5B>h<EFBFBD><68><EFBFBD>}<7D>E<EFBFBD>X<EFBFBD>̑<EFBFBD><CC91><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ɏg<C98E><67><EFBFBD><EFBFBD><EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "<22>V<EFBFBD><56><EFBFBD>A<EFBFBD><41><EFBFBD>L<EFBFBD>[ <20>f<EFBFBD>o<EFBFBD>C<EFBFBD>X<EFBFBD><58><EFBFBD>g<EFBFBD><67>(&S)",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "<22>ݒ<EFBFBD>(&E)",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "<22>Ǘ<EFBFBD><C797>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
+  GROUPBOX "<22>Ǘ<EFBFBD><C797>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
 
-  CHECKBOX "<22>ݒ肷<DD92>ׂĂ<D782><C482><EFBFBD><EFBFBD>O<EFBFBD>I<EFBFBD><49><EFBFBD><EFBFBD><EFBFBD>ɓK<C993>p<EFBFBD><70><EFBFBD><EFBFBD>(&O)",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "<22>ݒ肷<DD92>ׂĂ<D782><C482>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>U<EFBFBD>[<5B>̋K<CC8B><4B><EFBFBD>l<EFBFBD>Ƃ<EFBFBD><C682><EFBFBD>(&D)",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  CHECKBOX "<22>ݒ肷<DD92>ׂĂ<D782><C482><EFBFBD><EFBFBD>O<EFBFBD>I<EFBFBD><49><EFBFBD><EFBFBD><EFBFBD>ɓK<C993>p<EFBFBD><70><EFBFBD><EFBFBD>(&O)",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "<22>ݒ肷<DD92>ׂĂ<D782><C482>V<EFBFBD><56><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>[<5B>U<EFBFBD>[<5B>̋K<CC8B><4B><EFBFBD>l<EFBFBD>Ƃ<EFBFBD><C682><EFBFBD>(&D)",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/Nl.rc

@@ -8,18 +8,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Toetsenbord"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Plaktoetsen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U kunt Plaktoetsen gebruiken als u Shift, Ctrl of Alt wilt gebruiken, maar slechts <20><>n toets tegelijkertijd wilt indrukken.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Plaktoetsen Gebruiken",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Instellingen...",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Filtertoetsen",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "U kunt Filertoetsen gebruiken als u wilt dat Reactos korte of herhaalde toetsaanslagen negeert, of als u de herhalingssnelheid wilt verlagen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Filtertoetsen gebruiken",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "I&nstellingen...",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Schakeltoetsen",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U kunt schakeltoetsen gebruiken als u wilt dat er een geluid wordt weergegeven als u CapsLock, NumLock of ScrollLock indrukt.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Schakeltoetsen gebruiken",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  PUSHBUTTON "Inst&ellingen...",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Plaktoetsen",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U kunt Plaktoetsen gebruiken als u Shift, Ctrl of Alt wilt gebruiken, maar slechts <20><>n toets tegelijkertijd wilt indrukken..",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Plaktoetsen Gebruiken",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Instellingen...",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Filtertoetsen",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "U kunt Filertoetsen gebruiken als u wilt dat Reactos korte of herhaalde toetsaanslagen negeert, of als u de herhalingssnelheid wilt verlagen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Filtertoetsen gebruiken",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "I&nstellingen...",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Schakeltoetsen",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U kunt schakeltoetsen gebruiken als u wilt dat er een geluid wordt weergegeven als u CapsLock, NumLock of ScrollLock indrukt..",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Schakeltoetsen gebruiken",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "Inst&ellingen...",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "Extra hulp voor toetsenborden weergeven in programma's",IDC_KEYBOARD_EXTRA
 END
 
@@ -29,14 +29,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Geluid"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Geluidswaarschuwingen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U kunt Geluidswaarschuwingen gebruiken als u wilt dat Reactos visuele visuele waarschuwingen weergeeft wanneer het systeem een geluid laat horen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Geluidswaarschuwingen gebruiken",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "Inst&ellingen...",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Geluidswaarschuwingen",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U kunt Geluidswaarschuwingen gebruiken als u wilt dat Reactos visuele visuele waarschuwingen weergeeft wanneer het systeem een geluid laat horen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Geluidswaarschuwingen gebruiken",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "Inst&ellingen...",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "Geluidsbeschrijving",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "U kunt geluidsbeschrijving gebruiken als u uw programma's bijschriften wilt laten weergeven voor spraak en andere geluiden.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Geluids&beschrijving gebruiken",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "Geluidsbeschrijving",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "U kunt geluidsbeschrijving gebruiken als u uw programma's bijschriften wilt laten weergeven voor spraak en andere geluiden.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Geluids&beschrijving gebruiken",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -45,10 +45,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Weergave"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "Hoog Contrast",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U kunt deze optie gebruiken als u wilt dat Reactos kleuren en lettertypen zodanig instelt dat deze gemakkelijk te lezen zijn.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Hoog contrast gebruiken",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "Inst&ellingen...",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Hoog Contrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U kunt deze optie gebruiken als u wilt dat Reactos kleuren en lettertypen zodanig instelt dat deze gemakkelijk te lezen zijn.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Hoog contrast gebruiken",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "Inst&ellingen...",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -58,10 +58,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Muis"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Muistoetsen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U kunt muistoetsen gebruiken als u de aanwijzer via het nummerieke toetsenblok wilt bedienen.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&Muistoetsen gebruiken",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "Inst&ellingen...",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Muistoetsen",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U kunt muistoetsen gebruiken als u de aanwijzer via het nummerieke toetsenblok wilt bedienen.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&Muistoetsen gebruiken",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "Inst&ellingen...",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -70,8 +70,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Algemeen"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Beginwaarden automatisch instellen",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "T&oegankelijkheidsfuncties uitschakelen wanneer deze niet gebruikte worden gedurende:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "Beginwaarden automatisch instellen",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "T&oegankelijkheidsfuncties uitschakelen wanneer deze niet gebruikte worden gedurende:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -83,21 +83,21 @@ BEGIN
   //  MENUITEM "30 Minuten", IDC_RESET_30
   //}
 
-  GROUPBOX "Melding",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Waarsc&huwing weergeven als een functie wordt ingeschakeld",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "&Geluid laten horen als een functie wordt in- of uitgeschakeld",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(4)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Melding",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Waarsc&huwing weergeven als een functie wordt ingeschakeld",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "&Geluid laten horen als een functie wordt in- of uitgeschakeld",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
  
-  GROUPBOX "Serietoetsenapparaten",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "Serietoetsenapparaten maken het mogelijk toetsenbord- en muisfuncties op alternatieve manieren te gebruiken.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Serietoetsenapparaten on&dersteunen",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Serietoetsenapparaten",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "Serietoetsenapparaten maken het mogelijk toetsenbord- en muisfuncties op alternatieve manieren te gebruiken.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Serietoetsenapparaten on&dersteunen",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "Inst&ellingen",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "Beheeropties",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
+  GROUPBOX "Beheeropties",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
 
-  CHECKBOX "&Alle instellingen toepassen op bureaublad bij aanmelden.",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Alle instellingen &standaard toepassen op nieuwe gebruikers.",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  CHECKBOX "&Alle instellingen toepassen op bureaublad bij aanmelden.",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Alle instellingen &standaard toepassen op nieuwe gebruikers.",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/Pl.rc

@@ -10,18 +10,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Klawiatura"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Klawisze Trwa<77>e",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U<>yj funkcji Klawisze trwa<77>e je<6A>li chcesz u<>ywa<77> Shifta, Ctrl-a albo Alta naciskaj<61>c je tylko raz.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&U<>yj Klawiszy Trwa<77>ych",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "U&stawienia",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Klawisze Filtra",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "U<>yj funkcji Klawisze Filtra, je<6A>li chcesz, <20>eby ReactOS ignorowa<77> kr<6B>tkie albo powtarzaj<61>ce si<73> wci<63>ni<6E>cia klawiszy albo zmniejsza<7A> cz<63>sto<74><6F> powtarzania.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "Klawisze &Filtra",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "Us&tawienia",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "Klawisze Prze<7A><65>czaj<61>ce",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U<>yj funkcji &Klawisze Prze<7A><65>czaj<61>ce, je<6A>li chcesz s<>ysze<7A> d<>wi<77>k przy naciskaniu klawiszy Caps Lock, Num Lock albo Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "U<>yj Klawiszy Prze<7A><65>czaj<61>cych",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  PUSHBUTTON "Ustawie&nia",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Klawisze Trwa<77>e",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U<>yj funkcji Klawisze trwa<77>e je<6A>li chcesz u<>ywa<77> Shifta, Ctrl-a albo Alta naciskaj<61>c je tylko raz.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&U<>yj Klawiszy Trwa<77>ych",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "U&stawienia",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Klawisze Filtra",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "U<>yj funkcji Klawisze Filtra, je<6A>li chcesz, <20>eby ReactOS ignorowa<77> kr<6B>tkie albo powtarzaj<61>ce si<73> wci<63>ni<6E>cia klawiszy albo zmniejsza<7A> cz<63>sto<74><6F> powtarzania.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "Klawisze &Filtra",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "Us&tawienia",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "Klawisze Prze<7A><65>czaj<61>ce",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U<>yj funkcji &Klawisze Prze<7A><65>czaj<61>ce, je<6A>li chcesz s<>ysze<7A> d<>wi<77>k przy naciskaniu klawiszy Caps Lock, Num Lock albo Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "U<>yj Klawiszy Prze<7A><65>czaj<61>cych",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "Ustawie&nia",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "Sho&w extra keyboard help in programs",IDC_KEYBOARD_EXTRA
 END
 
@@ -31,14 +31,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "D<>wi<77>k"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Wartownik D<>wi<77>ku",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U<>yj funkcji Wartownik D<>wi<77>ku je<6A>li chcesz, <20>eby ReactOS pokazywa<77> wizualne ostrze<7A>enia w chwili generacji d<>wi<77>ku.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "U<>yj funkcji &Wartownik D<>wi<77>ku",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&Ustawienia",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Wartownik D<>wi<77>ku",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U<>yj funkcji Wartownik D<>wi<77>ku je<6A>li chcesz, <20>eby ReactOS pokazywa<77> wizualne ostrze<7A>enia w chwili generacji d<>wi<77>ku.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "U<>yj funkcji &Wartownik D<>wi<77>ku",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&Ustawienia",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "Poka<6B> D<>wi<77>ki",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "U<>yj funkcji Poka<6B> D<>wi<77>ki, aby nakaza<7A> swoim programom wy<77>wietlanie napis<69>w w chwili generacji d<>wi<77>ku lub mowy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "U<>yj funkcji &Poka<6B> D<>wi<77>ki",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "Poka<6B> D<>wi<77>ki",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "U<>yj funkcji Poka<6B> D<>wi<77>ki, aby nakaza<7A> swoim programom wy<77>wietlanie napis<69>w w chwili generacji d<>wi<77>ku lub mowy.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "U<>yj funkcji &Poka<6B> D<>wi<77>ki",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -47,10 +47,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Ekran"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "Wysoki Kontrast",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U<>yj tej funkcji, je<6A>li chcesz, <20>eby Reactos u<>ywa<77> kolor<6F>w i czcionek zaprojektowanych do <20>atwego czytania",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&U<>yj funkcji Wysoki Kontrast",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "U&stawienia",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Wysoki Kontrast",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U<>yj tej funkcji, je<6A>li chcesz, <20>eby Reactos u<>ywa<77> kolor<6F>w i czcionek zaprojektowanych do <20>atwego czytania",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&U<>yj funkcji Wysoki Kontrast",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "U&stawienia",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -60,10 +60,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Mysz"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Klawisze Myszy",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "U<>yj tej opcji, je<6A>li chcesz kontrolowa<77> wska<6B>nik myszy przy pomocy klawiatury numerycznej.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "U<>yj funkcji Klawisze &Myszy",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17),14
-  PUSHBUTTON "U&stawienia",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "Klawisze Myszy",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "U<>yj tej opcji, je<6A>li chcesz kontrolowa<77> wska<6B>nik myszy przy pomocy klawiatury numerycznej.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "U<>yj funkcji Klawisze &Myszy",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "U&stawienia",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -72,8 +72,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Og<4F>lne"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "Automatyczny reset",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "&Wy<57><79>cz funkcje u<>atwiaj<61>ce dost<73>p kiedy komputer nie jest u<>ywany przez:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "Automatyczny reset",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "&Wy<57><79>cz funkcje u<>atwiaj<61>ce dost<73>p kiedy komputer nie jest u<>ywany przez:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -85,20 +85,20 @@ BEGIN
   //  MENUITEM "30 minut", IDC_RESET_30
   //}
 
-  GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "Ostrzegaj kiedy funkcja jest w<><77>czana",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Odgrywaj d<>wi<77>k, kiedy funkcja jest w<><77>czana albo wy<77><79>czana",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Powiadomienia",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "Ostrzegaj kiedy funkcja jest w<><77>czana",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Odgrywaj d<>wi<77>k, kiedy funkcja jest w<><77>czana albo wy<77><79>czana",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
  
-  GROUPBOX "Urz<72>dzenia klawiszy szeregowych",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "Urz<72>dzenia klawiszy szeregowych zapewniaj<61> alternatywny dost<73>p do funkcji klawiatury lub myszy.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Wspieraj urz<72>dzenia klawi&szy szeregowych",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "Urz<72>dzenia klawiszy szeregowych",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "Urz<72>dzenia klawiszy szeregowych zapewniaj<61> alternatywny dost<73>p do funkcji klawiatury lub myszy.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Wspieraj urz<72>dzenia klawi&szy szeregowych",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "&Ustawienia",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "Opcje zarz<72>dzania",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
+  GROUPBOX "Opcje zarz<72>dzania",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
 
-  CHECKBOX "Zastosuj wszystkie ustawienia do pu&lpitu logowania",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "Zastosuj wszystkie ustawienia do &domy<6D>lnego profilu dla nowych u<>ytkownik<69>w",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  CHECKBOX "Zastosuj wszystkie ustawienia do pu&lpitu logowania",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "Zastosuj wszystkie ustawienia do &domy<6D>lnego profilu dla nowych u<>ytkownik<69>w",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/Ru.rc

@@ -8,18 +8,18 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Shift, Ctrl <20><><EFBFBD> Alt <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STICKY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STICKY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",IDC_FILTER_BOX,PROPSHEETPADDING(4),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_FILTER_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(13)+2,PROPSHEETPADDING(15),14
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(16)+3,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Caps Lock, Num Lock <20> Scroll Lock.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_TOGGLE_BOX,PROPSHEETPADDING(4),LABELLINE(20)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  PUSHBUTTON "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(20)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Shift, Ctrl <20><><EFBFBD> Alt <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STICKY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STICKY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",IDC_FILTER_BOX,(4*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_FILTER_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(13)+2,(15*PROPSHEETPADDING),14
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(16)+3,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Caps Lock, Num Lock <20> Scroll Lock.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(18)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_TOGGLE_BOX,(4*PROPSHEETPADDING),LABELLINE(20)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  PUSHBUTTON "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_TOGGLE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(20)+2,(15*PROPSHEETPADDING),14
 //  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_KEYBOARD_EXTRA
 END
 
@@ -29,14 +29,14 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22><><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_SENTRY_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_SENTRY_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_SENTRY_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(7)+2
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_SSHOW_BOX,PROPSHEETPADDING(4),LABELLINE(12)+2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(8)+5,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(7)+2
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(10)-3,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_SSHOW_BOX,(4*PROPSHEETPADDING),LABELLINE(12)+2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
 END
 
 
@@ -45,10 +45,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN  
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_CONTRAST_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_CONTRAST_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -58,10 +58,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22><><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(6)+PROPSHEETPADDING(1)
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3)
-  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_MOUSE_BOX,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(15),14
-  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(6)+PROPSHEETPADDING
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(3)
+  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_MOUSE_BOX,(4*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
+  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_MOUSE_BUTTON,PROPSHEETWIDTH-(17*PROPSHEETPADDING),LABELLINE(5)+2,(15*PROPSHEETPADDING),14
 END
 
 
@@ -70,8 +70,8 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(1),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_RESET_BOX,PROPSHEETPADDING(2),LABELLINE(2)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(1),PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_RESET_BOX,(2*PROPSHEETPADDING),LABELLINE(2)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
 
   //POPUP IDC_RESET_POPUP, GRAYED
   //{
@@ -83,21 +83,21 @@ BEGIN
   //  MENUITEM "30 <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_RESET_30
   //}
 
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(7)-2,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_NOTIFICATION_MESSAGE,PROPSHEETPADDING(2),LABELLINE(8)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>&<26><><EFBFBD><EFBFBD><EFBFBD>",IDC_NOTIFICATION_SOUND,PROPSHEETPADDING(2),LABELLINE(10)-2,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(7)-2,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_NOTIFICATION_MESSAGE,(2*PROPSHEETPADDING),LABELLINE(8)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>&<26><><EFBFBD><EFBFBD><EFBFBD>",IDC_NOTIFICATION_SOUND,(2*PROPSHEETPADDING),LABELLINE(10)-2,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
  
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(13)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",IDC_SERIAL_BOX,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(13)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",-1,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(14)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",IDC_SERIAL_BOX,(4*PROPSHEETPADDING)+ICONSIZE,LABELLINE(16)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 
   PUSHBUTTON "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_SERIAL_BUTTON,180,LABELLINE(16)-4,50,LABELLINE(1)  
 
-  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING(1),LABELLINE(19)-4,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(5)
+  GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",-1,PROPSHEETPADDING,LABELLINE(19)-4,PROPSHEETWIDTH-(2*PROPSHEETPADDING),LABELLINE(5)
 
-  CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_ADMIN_LOGON_BOX,PROPSHEETPADDING(2),LABELLINE(20)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(2)
-  CHECKBOX "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_ADMIN_USERS_BOX,PROPSHEETPADDING(2),LABELLINE(22)-4,PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(1)
+  CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_ADMIN_LOGON_BOX,(PROPSHEETPADDING*2),LABELLINE(20)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(2)
+  CHECKBOX "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_ADMIN_USERS_BOX,(2*PROPSHEETPADDING),LABELLINE(22)-4,PROPSHEETWIDTH-(6*PROPSHEETPADDING)-ICONSIZE,LABELLINE(1)
 END
 
 

reactos/dll/cpl/access/access.c

@@ -52,7 +52,7 @@ PropSheetProc(
 	LPARAM lParam
 )
 {
-  UNREFERENCED_PARAMETER(hwndDlg);
+  UNREFERENCED_PARAMETER(hwndDlg)
   switch(uMsg)
   {
     case PSCB_BUTTONPRESSED:
@@ -118,7 +118,7 @@ CPlApplet(
 	LPARAM lParam2)
 {
   int i = (int)lParam1;
-  UNREFERENCED_PARAMETER(hwndCPl);
+  UNREFERENCED_PARAMETER(hwndCPl)
 
   switch(uMsg)
   {
@@ -155,7 +155,7 @@ DllMain(
 	DWORD     dwReason,
 	LPVOID    lpvReserved)
 {
-  UNREFERENCED_PARAMETER(lpvReserved);
+  UNREFERENCED_PARAMETER(lpvReserved)
   switch(dwReason)
   {
     case DLL_PROCESS_ATTACH:

reactos/dll/cpl/access/access.def

@@ -1,6 +1,6 @@
-LIBRARY access.cpl
+LIBRARY cplsample.cpl
 
 EXPORTS
-CPlApplet
+CPlApplet@16
 
 ; EOF

reactos/dll/cpl/access/access.rbuild

@@ -10,7 +10,6 @@
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
-	<library>msvcrt</library>
 	<file>access.c</file>
 	<file>display.c</file>
 	<file>general.c</file>

reactos/dll/cpl/access/display.c

@@ -22,8 +22,8 @@ DisplayPageProc(
   LPARAM lParam
 )
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
+  UNREFERENCED_PARAMETER(lParam)
+  UNREFERENCED_PARAMETER(hwndDlg)
   switch(uMsg)
   {
     case WM_INITDIALOG:

reactos/dll/cpl/access/general.c

@@ -22,8 +22,6 @@ GeneralPageProc(
   LPARAM lParam
 )
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
   switch(uMsg)
   {
     case WM_INITDIALOG:

reactos/dll/cpl/access/keyboard.c

@@ -22,8 +22,8 @@ KeyboardPageProc(
   LPARAM lParam
 )
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
+  UNREFERENCED_PARAMETER(lParam)
+  UNREFERENCED_PARAMETER(hwndDlg)
   switch(uMsg)
   {
     case WM_INITDIALOG:

reactos/dll/cpl/access/mouse.c

@@ -22,8 +22,8 @@ MousePageProc(
   LPARAM lParam
 )
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
+  UNREFERENCED_PARAMETER(lParam)
+  UNREFERENCED_PARAMETER(hwndDlg)
   switch(uMsg)
   {
     case WM_INITDIALOG:

reactos/dll/cpl/access/resource.h

@@ -4,11 +4,9 @@
 /* metrics */
 #define PROPSHEETWIDTH  246
 #define PROPSHEETHEIGHT 228
-#define PROPSHEETPADDING(x)  (x+x+x+x+x+x)
-#define SYSTEM_COLUMN   (18*PROPSHEETPADDING)
-#define LABELLINE(x)  (x+x+x+2+x+x+x+x+x+x)
-
-
+#define PROPSHEETPADDING        6
+#define SYSTEM_COLUMN   (18 * PROPSHEETPADDING)
+#define LABELLINE(x)    (((PROPSHEETPADDING + 2) * x) + (x + 2))
 #define ICONSIZE        16
 
 /* ids */

reactos/dll/cpl/access/sound.c

@@ -22,8 +22,8 @@ SoundPageProc(
   LPARAM lParam
 )
 {
-  UNREFERENCED_PARAMETER(lParam);
-  UNREFERENCED_PARAMETER(hwndDlg);
+  UNREFERENCED_PARAMETER(lParam)
+  UNREFERENCED_PARAMETER(hwndDlg)
   switch(uMsg)
   {
     case WM_INITDIALOG:

reactos/dll/cpl/appwiz/De.rc

@@ -19,7 +19,7 @@ END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "ReactOS Setup"
+CAPTION "Reactos Setup"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 

reactos/dll/cpl/appwiz/En.rc

@@ -19,7 +19,7 @@ END
 
 IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "ReactOS Setup"
+CAPTION "Reactos Setup"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 

reactos/dll/cpl/appwiz/Fr.rc

@@ -1,53 +1,53 @@
-/* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Ajout/Supression de programmes"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16
-  LTEXT "Pour installer un nouveau programme, cliquez sur Installer",-1,36,18,PROPSHEETWIDTH-48,8
-  PUSHBUTTON "&Installer...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14
-  LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN
-  
-  ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
-  CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
-  LTEXT "Les logiciels suivant peuvent <20>tre supprim<69>s automatiquement. Pour supprimer un programme ou modifier ses composantes install<6C>es, s<>lectionnez-le dans la liste et cliquez sur Ajouter/Supprimer.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
-  PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
-END
-
-IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Configuration de ReactOS"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-
-END
-
-IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Cr<43>er un raccourci"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  LTEXT "Texte 1", -1, 115, 15, 160, 24
-  LTEXT "Texte 2", -1, 115, 35, 160, 17
-END
-
-IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Cr<43>er un raccourci"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  LTEXT "Texte 1",-1,10,0,225,40
-  LTEXT "Texte 2",-1,10,40,120,20
-  LTEXT "Texte 3",-1,10,55,120,20
-END
-
-STRINGTABLE 
-BEGIN
-  IDS_CPLSYSTEMNAME "Ajout/Supression de programmes"
-  IDS_CPLSYSTEMDESCRIPTION "Installe et supprime les programmes et les composantes de ReactOS, ainsi que les raccourcis."
-END
+/* French translation by Benoit Plante 2005 (cmoibenlepro AT hotmail DOT com) */
+
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Ajout/Supression de programmes"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16
+  LTEXT "Pour installer un nouveau programme, cliquez sur Installer",-1,36,18,PROPSHEETWIDTH-48,8
+  PUSHBUTTON "&Installer...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14
+  LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN
+  
+  ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
+  CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
+  LTEXT "Les logiciels suivant peuvent <20>tre supprim<69>s automatiquement. Pour supprimer un programme ou modifier ses composantes install<6C>es, s<>lectionnez-le dans la liste et cliquez sur Ajouter/Supprimer.",-1,36,72,PROPSHEETWIDTH-48,32
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "Ajouter/Supp&rimer", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
+END
+
+IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Configuration de ReactOS"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+
+END
+
+IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Cr<43>er un raccourci"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "Texte 1", -1, 115, 15, 160, 24
+  LTEXT "Texte 2", -1, 115, 35, 160, 17
+END
+
+IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Cr<43>er un raccourci"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "Texte 1",-1,10,0,225,40
+  LTEXT "Texte 2",-1,10,40,120,20
+  LTEXT "Texte 3",-1,10,55,120,20
+END
+
+STRINGTABLE 
+BEGIN
+  IDS_CPLSYSTEMNAME "Ajout/Supression de programmes"
+  IDS_CPLSYSTEMDESCRIPTION "Installe et supprime les programmes et les composantes de ReactOS, ainsi que les raccourcis."
+END

reactos/dll/cpl/appwiz/Hu.rc

@@ -1,52 +1,52 @@
-// Hungarian resource file by Robert Horvath - talley at cubeclub.hu
-LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
-
-IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Telep<65>t<EFBFBD>s <20>s elt<6C>vol<6F>t<EFBFBD>s"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16
-  LTEXT "Egy <20>j program telep<65>t<EFBFBD>s<EFBFBD>hez kattints a Telep<65>t<EFBFBD>s gombra",-1,36,18,PROPSHEETWIDTH-48,8
-  PUSHBUTTON "&Telep<65>t<EFBFBD>s...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14
-  LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN
-  
-  ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
-  CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
-  LTEXT "A k<>vetkez<65> szoftvereket lehet elt<6C>vol<6F>tani. A szoftver t<>rl<72>s<EFBFBD>hez vagy <20>sszetev<65>inek modos<6F>t<EFBFBD>s<EFBFBD>hoz kattints a szoftverre a list<73>ban, majd kattints a Hozz<7A>ad<61>s/elt<6C>vol<6F>t<EFBFBD>s gombra.",-1,36,72,PROPSHEETWIDTH-48,32
-  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
-  PUSHBUTTON "Hozz<7A>ad<61>s/elt<6C>vol<6F>t<EFBFBD>s", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
-END
-
-IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Reactos Telep<65>t<EFBFBD>"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-
-END
-
-IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Create link"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  LTEXT "Text1", -1, 115, 15, 160, 24
-  LTEXT "Text2", -1, 115, 35, 160, 17
-END
-
-IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Create link"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  LTEXT "Text1",-1,10,0,225,40
-  LTEXT "Text2",-1,10,40,120,20
-  LTEXT "Text3",-1,10,55,120,20
-END
-
-STRINGTABLE 
-BEGIN
-  IDS_CPLSYSTEMNAME "Szoftverek hozz<7A>ad<61>sa <20>s elt<6C>vol<6F>t<EFBFBD>sa"
-  IDS_CPLSYSTEMDESCRIPTION "Telep<65>ti a szoftvert <20>s l<>trehozza a parancsikonokat hozz<7A>."
-END
+// Hungarian resource file by Robert Horvath - talley at cubeclub.hu
+LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
+
+IDD_PROPPAGEINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Telep<65>t<EFBFBD>s <20>s elt<6C>vol<6F>t<EFBFBD>s"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,18,16,16
+  LTEXT "Egy <20>j program telep<65>t<EFBFBD>s<EFBFBD>hez kattints a Telep<65>t<EFBFBD>s gombra",-1,36,18,PROPSHEETWIDTH-48,8
+  PUSHBUTTON "&Telep<65>t<EFBFBD>s...", IDC_INSTALL, PROPSHEETWIDTH-(72), 36, 60, 14
+  LTEXT "", -1, PROPSHEETPADDING, 63, PROPSHEETWIDTH-12, 1, NOT WS_GROUP | SS_SUNKEN
+  
+  ICON            IDI_CPLSYSTEM,-1,PROPSHEETPADDING,76,16,16
+  CONTROL "&Show updates",IDC_SHOWUPDATES,"button",BS_AUTOCHECKBOX | WS_TABSTOP,PROPSHEETPADDING, 105, 119, 18
+  LTEXT "A k<>vetkez<65> szoftvereket lehet elt<6C>vol<6F>tani. A szoftver t<>rl<72>s<EFBFBD>hez vagy <20>sszetev<65>inek modos<6F>t<EFBFBD>s<EFBFBD>hoz kattints a szoftverre a list<73>ban, majd kattints a Hozz<7A>ad<61>s/elt<6C>vol<6F>t<EFBFBD>s gombra.",-1,36,72,PROPSHEETWIDTH-48,32
+  LISTBOX IDC_SOFTWARELIST, PROPSHEETPADDING, 123, PROPSHEETWIDTH-12, 75, LBS_STANDARD | WS_TABSTOP | LBS_NOINTEGRALHEIGHT
+  PUSHBUTTON "Hozz<7A>ad<61>s/elt<6C>vol<6F>t<EFBFBD>s", IDC_ADDREMOVE, PROPSHEETWIDTH-72, 200, 60, 14
+END
+
+IDD_PROPPAGEROSSETUP DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Reactos Telep<65>t<EFBFBD>"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+
+END
+
+IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Create link"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "Text1", -1, 115, 15, 160, 24
+  LTEXT "Text2", -1, 115, 35, 160, 17
+END
+
+IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
+CAPTION "Create link"
+FONT 8, "MS Shell Dlg", 0, 0, 0x0
+BEGIN
+  LTEXT "Text1",-1,10,0,225,40
+  LTEXT "Text2",-1,10,40,120,20
+  LTEXT "Text3",-1,10,55,120,20
+END
+
+STRINGTABLE 
+BEGIN
+  IDS_CPLSYSTEMNAME "Szoftverek hozz<7A>ad<61>sa <20>s elt<6C>vol<6F>t<EFBFBD>sa"
+  IDS_CPLSYSTEMDESCRIPTION "Telep<65>ti a szoftvert <20>s l<>trehozza a parancsikonokat hozz<7A>."
+END