- move platform settings like included build languages to a user configurable rbuild file with fallback to platform.template.rbuild if no one is present.

svn path=/branches/rbuild/; revision=33684

reactos/CREDITS

@@ -1,69 +0,0 @@
-ReactOS is available thanks to the work of:
-
-Aleksey Bragin <aleksey at reactos org>
-Alex Ionescu <alex.ionescu@reactos.org>
-Andrew Greenwood <lists@silverblade.co.uk>
-Andrew Munger <waxdragon@gmail.com>
-Arindam Das
-Art Yerkes <ayerkes@speakeasy.net>
-Ariadne
-Brandon Turner (turnerb7@msu.edu)
-Brian Palmer <brianp@sginet.com>
-Casper S. Hornstrup <chorns@users.sourceforge.net>
-Christoph von Wittich (christoph_vw@reactos.org)
-David Welch <welch@cwcom.net>
-Emanuele Aliberti <ea@iol.it>
-Eric Kohl <ekohl@rz-online.de>
-Eugene Ingerman <geneing@myrealbox.com>
-Filip Navara <xnavara@volny.cz>
-Frederik Leemans
-Ge van Geldorp <ge@gse.nl>
-Ged Murphy <gedmurphy@reactos.org>
-Guido de Jong
-Gunnar Andre' Dalsnes <hardon@online.no>
-Hans Kremer
-Hartmut Birr <hartmut.birr@gmx.de>
-Hernan Ochoa
-Herve Poussineau <hpoussin@reactos.com>
-Iwan Fatahi <i_fatahi@hotmail.com>
-James B. Tabor <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
-Jason Eager
-Jason Filby <jasonfilby@yahoo.com>
-Jason Weiler
-Jean Michault
-Jim Noeth
-Johannes Anderwald <johannes.anderwald@student.tugraz.at> 
-Jonathan Wilson <jonwil@tpgi.com.au>
-Jurgen van Gael <jurgen.vangael@student.kuleuven.ac.be>
-KJK::Hyperion <noog@libero.it>
-Klemens R. Friedl <klemens_friedl@gmx.net>
-Maarten Bosma <maarten.paul@bosma.de>
-Magnus Olsen (magnus@greatlord.com)
-Mark Tempel <mtempel@visi.com>
-Mark Weaver <mark@npsl.co.uk>
-Martin Fuchs <martin-fuchs@gmx.net>
-Marty Dill <mdill@uvic.ca>
-Matt Pyne
-Mike Nordell ("tamlin")
-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>
-Richard Campbell <betam4x@gmail.com>
-Robert Bergkvist <fragdance@hotmail.com>
-Robert Dickenson <robd@reactos.org>
-Royce Mitchell III <royce3@ev1.net>
-Saveliy Tretiakov <saveliyt@mail.ru>
-Steven Edwards <steven_ed4153@yahoo.com>
-Thomas Weidenmueller <w3seek@users.sourceforge.net>
-Timo Kreuzer <timo.kreuzer@reactos.org>
-Victor Kirhenshtein <sauros@iname.com>
-Vizzini <vizzini@plasmic.com>
-
-
-Graphic Design from
-
-Mindflyer <mf@mufunyo.net> 
-Tango Desktop Project (http://tango-project.org)
-Everaldo (http://everaldo.com)

reactos/Makefile

@@ -46,6 +46,8 @@
 #        This is faster than the depends target which does a complete dependency
 #        check of the ReactOS codebase.
 #
+#    families
+#        A list will be shown with all available build families.
 #
 # Accepted environment variables:
 #

reactos/ReactOS-generic.rbuild

@@ -2,6 +2,10 @@
 <!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="baseaddress.rbuild" />
+	<xi:include href="buildfamilies.rbuild" />
+	<xi:include href="contributors.rbuild" />
+	<xi:include href="installfolders.rbuild" />
+	<xi:include href="languages.rbuild" />
 
 	<define name="__REACTOS__" overridable="true" />
 	<if property="MP" value="1">
@@ -66,4 +70,9 @@
 		<xi:include href="subsystems/subsystems.rbuild" />
 	</directory>
 
+	<xi:include href="platform.rbuild">
+		<xi:fallback>
+			<xi:include href="platform.template.rbuild" />
+		</xi:fallback>
+	</xi:include>
 </group>

reactos/ReactOS-i386.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile.auto" architecture="i386" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config.rbuild">
 		<xi:fallback>
 			<xi:include href="config.template.rbuild" />
@@ -14,7 +14,7 @@
 	<define name="__i386__" />
 
 	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
-
+	
 	<if property="GDB" value="0">
 		<if property="OPTIMIZE" value="1">
 				<compilerflag>-Os</compilerflag>
@@ -43,5 +43,4 @@
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
 	<compilerflag>-Wpointer-arith</compilerflag>
 	<linkerflag>-enable-stdcall-fixup</linkerflag>
-
 </project>

reactos/ReactOS-ppc.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile.ppc" architecture="powerpc" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<xi:include href="config-ppc.rbuild">
 		<xi:fallback>
 			<xi:include href="config-ppc.template.rbuild" />
@@ -9,11 +9,27 @@
 
 	<xi:include href="ReactOS-generic.rbuild" />
 
+	<define name="_M_PPC" />
+	<define name="_PPC_" />
+	<define name="__PowerPC__" />
+
 	<property name="MKHIVE_OPTIONS" value="-be" />
 	<property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -nostdlib -nostartfiles -lgcc -Wl,-e,__start -Wl,-Ttext,0xe00000 -N"/>
 	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles"/>
 
+	<define name="stdcall"/>
+	<define name="__stdcall__"/>
+	<define name="fastcall"/>
+	<define name="cdecl"/>
+	<define name="__cdecl__"/>
+	<define name="dllimport"/>
+	<define name="WORDS_BIGENDIAN"/>
 	<define name="__MSVCRT__"/>
+	<define name="__NO_CTYPE_INLINES" />
+	<!-- <define name="__DECLSPEC_SUPPORTED" /> -->
+	<define name="__MINGW_IMPORT">extern</define>
+	<define name="_CRTIMP"/>
+	<define name="'__declspec(x)'"/>
 	<compilerflag>-fshort-wchar</compilerflag>
 	<compilerflag>-fsigned-char</compilerflag>
 	<compilerflag>-mfull-toc</compilerflag>

reactos/base/applications/cacls/cacls.rbuild

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

reactos/base/applications/calc/calc.rbuild

@@ -2,10 +2,13 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="calc" type="win32gui" installbase="system32" installname="calc.exe">
 	<include base="calc">.</include>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="WINVER">0x0501</define>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
+	<family>applications</family>
+	<family>guiapplications</family>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

reactos/base/applications/charmap/charmap.rbuild

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

reactos/base/applications/cmdutils/cmdutils.rbuild

@@ -10,7 +10,4 @@
 	<directory name="more">
 		<xi:include href="more/more.rbuild" />
 	</directory>
-	<directory name="xcopy">
-		<xi:include href="xcopy/xcopy.rbuild" />
-	</directory>
 </group>

reactos/base/applications/cmdutils/dbgprint/dbgprint.rbuild

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

reactos/base/applications/cmdutils/find/find.rbuild

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="find" type="win32cui" installbase="system32" installname="find.exe">
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

reactos/base/applications/cmdutils/more/more.rbuild

@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="more" type="win32cui" installbase="system32" installname="more.exe">
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
+	<family>applications</family>
+	<family>cuiapplications</family>
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>

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

@@ -1,79 +0,0 @@
-/*
- * XCOPY - Wine-compatible xcopy program
- * German language support
- *
- * Copyright (C) 2007 Daniel Reimer
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-{
-    STRING_INVPARMS, "Ung<6E>ltige Anzahl an Parametern - Nutze xcopy /? f<>r Hilfe\n"
-    STRING_INVPARM,  "Ung<6E>ltiger Parameter '%s' -  Nutze xcopy /? f<>r Hilfe\n"
-    STRING_PAUSE,    "Dr<44>cke <Enter> um den Kopiervorgang zu starten\n"
-    STRING_SIMCOPY,  "%d Datei(en) w<>rden kopiert werden\n"
-    STRING_COPY,     "%d Datei(en) kopiert\n"
-    STRING_QISDIR,   "Ist '%s' eine Datei oder ein Ordner\n" \
-                     "im Zielordner?\n" \
-                     "(D - Datei, O - Ordner)\n"
-    STRING_SRCPROMPT,"%s? (Ja|Nein)\n"
-    STRING_OVERWRITE,"<22>berschreibe %s? (Ja|Nein|Alle)\n"
-    STRING_COPYFAIL, "Kopieren von '%s' nach '%s' fehlgeschlagen mit r/c %d\n"
-    STRING_OPENFAIL, "<22>ffnen von '%s' fehlgeschlagen\n"
-    STRING_READFAIL, "Lesen von '%s' fehlgeschlagen\n"
-    STRING_YES_CHAR, "J"
-    STRING_NO_CHAR,  "N"
-    STRING_ALL_CHAR, "A"
-    STRING_FILE_CHAR,"D"
-    STRING_DIR_CHAR, "O"
-
-    STRING_HELP,
-"XCOPY - Kopiert Quelldaten oder Verzeichnisb<73>ume and einen Ort\n\
-\n\
-Syntax:\n\
-XCOPY Quelle [Ziel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
-\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
-\n\
-Wo:\n\
-\n\
-[/I]  Falls Ziel nicht vorhanden ist und mehrere Dateien kopiert \n\
-\twerden, nimmt XCOPY an, dass das Ziel ein Verzeichnis ist\n\
-[/S]  Kopiert Verzeichnisse und Unterverzeichnisse, die nicht leer sind\n\
-[/E]  Kopiert alle Unterverzeichnisse, eingeschlossen leere\n\
-[/Q]  Zeigt beim Kopieren keine Dateinamen an\n\
-[/F]  Zeigt die Namen der Quell- und Zieldateien beim Kopieren an\n\
-[/L]  Listet lediglich die Dateien auf, die kopiert werden w<>rden\n\
-[/W]  Fordert vor dem Beginn des Kopiervorgangs eine Best<73>tigung\n\
-[/T]  Erstellt die Verzeichnisstruktur, kopiert aber keine Dateien\n\
-[/Y]  Unterdr<64>cke eine Best<73>tigung vor dem <20>berschreiben einer Datei\n\
-[/-Y] Fordert vor dem <20>berschreiben einer Datei eine Best<73>tigung\n\
-[/P]  Fordert vor jedem Kopiervorgang eine Best<73>tigung\n\
-[/N]  Kurznamen beim kopieren verwenden\n\
-[/U]  Kopiert nur Dateien, die im Zielverzeichnis vorhanden sind\n\
-[/R]  Schreibgesch<63>tzte Dateien <20>berschreiben\n\
-[/H]  Verstecke und Systemdateien in den Kopiervorgang miteinbeziehen\n\
-[/C]  Kopiervorgang selbst nach Fehlern fortsetzen\n\
-[/A]  Nur Dateien mit gestztem Archiv Attribut kopieren\n\
-[/M]  Nur Dateien mit gestztem Archiv Attribut kopieren und \n\
-\tdieses entfernen\n\
-[/D | /D:m-d-y] Kopiert nur die an oder nach dem Datum ge<67>nderten Dateien.\n\
-\t\tIst kein Datum angegeben, werden nur Dateien kopiert,\n\
-\t\tdie neuer als die bestehenden Zieldateien sind.\n\n"
-
-}

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

@@ -1,79 +0,0 @@
-/*
- * XCOPY - Wine-compatible xcopy program
- * English language support
- *
- * Copyright (C) 2007 J. Edmeades
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE
-{
-    STRING_INVPARMS, "Invalid number of parameters - Use xcopy /? for help\n"
-    STRING_INVPARM,  "Invalid parameter '%s' -  Use xcopy /? for help\n"
-    STRING_PAUSE,    "Press <enter> to begin copying\n"
-    STRING_SIMCOPY,  "%d file(s) would be copied\n"
-    STRING_COPY,     "%d file(s) copied\n"
-    STRING_QISDIR,   "Is '%s' a filename or directory\n" \
-                     "on the target?\n" \
-                     "(F - File, D - Directory)\n"
-    STRING_SRCPROMPT,"%s? (Yes|No)\n"
-    STRING_OVERWRITE,"Overwrite %s? (Yes|No|All)\n"
-    STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n"
-    STRING_OPENFAIL, "Failed to open '%s'\n"
-    STRING_READFAIL, "Failed during reading of '%s'\n"
-    STRING_YES_CHAR, "Y"
-    STRING_NO_CHAR,  "N"
-    STRING_ALL_CHAR, "A"
-    STRING_FILE_CHAR,"F"
-    STRING_DIR_CHAR, "D"
-
-    STRING_HELP,
-"XCOPY - Copies source files or directory trees to a destination\n\
-\n\
-Syntax:\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
-\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
-\n\
-Where:\n\
-\n\
-[/I]  Assume directory if destination does not exist and copying 2 or \n\
-\tmore files\n\
-[/S]  Copy directories and subdirectories\n\
-[/E]  Copy directories and subdirectories, including any empty ones\n\
-[/Q]  Do not list names during copy, ie quiet.\n\
-[/F]  Show full source and destination names during copy\n\
-[/L]  Simulate operation, showing names which would be copied\n\
-[/W]  Prompts before beginning the copy operation\n\
-[/T]  Creates empty directory structure but does not copy files\n\
-[/Y]  Suppress prompting when overwriting files\n\
-[/-Y] Enable prompting when overwriting files\n\
-[/P]  Prompts on each source file before copying\n\
-[/N]  Copy using short names\n\
-[/U]  Copy only files which already exist in destination\n\
-[/R]  Overwrite any read only files\n\
-[/H]  Include hidden and system files in the copy\n\
-[/C]  Continue even if an error occurs during the copy\n\
-[/A]  Only copy files with archive attribute set\n\
-[/M]  Only copy files with archive attribute set, removes \n\
-\tarchive attribute\n\
-[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
-\t\tIf no date is supplied, only copy if destination is older\n\
-\t\tthan source\n\n"
-
-}

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

@@ -1,80 +0,0 @@
-/*
- * XCOPY - Wine-compatible xcopy program
- * Korean language support
- *
- * Copyright (C) 2007 J. Edmeades
- * Copyright (C) 2007 YunSong Hwang(hys545@dreamwiz.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-{
-    STRING_INVPARMS, "<22>ùٸ<C3B9><D9B8><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ű<EFBFBD><C5B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> - xcopy /?<3F><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ÿ<EFBFBD>\n"
-    STRING_INVPARM,  "<22>ùٸ<C3B9><D9B8><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ű<EFBFBD><C5B0><EFBFBD><EFBFBD><EFBFBD> '%s' -  xcopy /?<3F><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>ÿ<EFBFBD>\n"
-    STRING_PAUSE,    "<enter> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>簡 <20><><EFBFBD>۵<EFBFBD> <20><><EFBFBD>Դϴ<D4B4>\n"
-    STRING_SIMCOPY,  "%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>Դϴ<D4B4>\n"
-    STRING_COPY,     "%d <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE><EFBFBD><EFBFBD>ϴ<EFBFBD>\n"
-    STRING_QISDIR,   "'%s'<27><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>̳<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮?\n" \
-                     "<22>Դϱ<D4B4>?\n" \
-                     "(F - <20><><EFBFBD><EFBFBD>, D - <20><><EFBFBD><EFBFBD><EFBFBD>丮)\n"
-    STRING_SRCPROMPT,"%s? (<28><>|<7C>ƴϿ<C6B4>)\n"
-    STRING_OVERWRITE,"%s<><73> <20><><EFBFBD><EFBFBD>ڽ<EFBFBD><DABD>ϱ<EFBFBD>? (<28><>|<7C>ƴϿ<C6B4>|<7C><><EFBFBD><EFBFBD>)\n"
-    STRING_COPYFAIL, "Copying of '%s' to '%s' failed with r/c %d\n"
-    STRING_OPENFAIL, "'%s' <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
-    STRING_READFAIL, "'%s<><73> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>߽<EFBFBD><DFBD>ϴ<EFBFBD>'\n"
-    STRING_YES_CHAR, "Y"
-    STRING_NO_CHAR,  "N"
-    STRING_ALL_CHAR, "A"
-    STRING_FILE_CHAR,"F"
-    STRING_DIR_CHAR, "D"
-
-    STRING_HELP,
-"XCOPY - <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>̳<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-\n\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n\
-XCOPY <20><><EFBFBD><EFBFBD> [<5B><><EFBFBD><EFBFBD>] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
-\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
-\n\
-Where:\n\
-\n\
-[/I]  Assume directory if destination does not exist and copying 2 or \n\
-\tmore files\n\
-[/S]  <20><><EFBFBD><EFBFBD><EFBFBD>丮<EFBFBD>ϰ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮 <20><><EFBFBD><EFBFBD>\n\
-[/E]  <20><> <20><><EFBFBD><EFBFBD><EFBFBD>丮<EFBFBD><E4B8AE> <20><><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮<EFBFBD><E4B8AE> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮 <20><><EFBFBD><EFBFBD>\n\
-[/Q]  <20><><EFBFBD><EFBFBD><EFBFBD>ϰ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǵ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>̳<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮<EFBFBD><E4B8AE> ǥ<><C7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʰ<EFBFBD> <20><><EFBFBD><EFBFBD>.\n\
-[/F]  <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ֱ<EFBFBD>\n\
-[/L]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ָ鼭 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>۾<EFBFBD>\n\
-[/W]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ϱ<EFBFBD> <20><><EFBFBD><EFBFBD> Ȯ<><C8AE><EFBFBD>ϱ<EFBFBD>\n\
-[/T]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʰ<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>丮 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-[/Y]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><> Ȯ<><C8AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ʱ<EFBFBD>\n\
-[/-Y] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><> Ȯ<><C8AE><EFBFBD>ϱ<EFBFBD>\n\
-[/P]  <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD> <20><><EFBFBD>ȿ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD> Ȯ<><C8AE>\n\
-[/N]  ª<><C2AA> <20≯<EFBFBD><CCB8><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-[/U]  <20>̹<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>丮<EFBFBD><E4B8AE> <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD> <20><><EFBFBD>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-[/R]  <20>б<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD>ϵ<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-[/H]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>̳<EFBFBD> <20>ý<EFBFBD><C3BD><EFBFBD> <20><><EFBFBD>ϵ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ؼ<EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-[/C]  <20><><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD> <20><><EFBFBD>ȿ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>߻<EFBFBD><DFBB>ص<EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-[/A]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE>ִ<EFBFBD> <20><><EFBFBD>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD>\n\
-[/M]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ϸ鼭  <20><><EFBFBD><EFBFBD> <20>Ӽ<EFBFBD><D3BC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ǿ<EFBFBD><C7BE>ִ<EFBFBD>  \n\
-\<5C><><EFBFBD>ϸ<EFBFBD> <20><><EFBFBD><EFBFBD> \n\
-[/D | /D:m-d-y] Copy new files or those modified after the supplied date.\n\
-\t\tIf no date is supplied, only copy if destination is older\n\
-\t\tthan source\n\n"
-
-}

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

@@ -1,79 +0,0 @@
-/*
- * XCOPY - Wine-compatible xcopy program
- * Polish language support
- *
- * Copyright (C) 2007 J. Edmeades
- * Copyright (C) 2007 Mikolaj Zalewski
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-STRINGTABLE
-{
-    STRING_INVPARMS, "Niew<65>a<EFBFBD>ciwa liczba parametr<74>w - uruchom xcopy /? aby wy<77>wietli<6C> pomoc\n"
-    STRING_INVPARM,  "Nieznany parameter '%s' -  uruchom xcopy /? aby wy<77>wietli<6C> pomoc\n"
-    STRING_PAUSE,    "Naci<63>nij <enter> aby rozpocz<63><7A> kopiowanie\n"
-    STRING_SIMCOPY,  "%d plik(<28>w) zosta<74>oby skopiowanych\n"
-    STRING_COPY,     "%d plik(<28>w) skopiowanych\n"
-    STRING_QISDIR,   "Czy '%s' jest nazw<7A> pliku czy katalogu\n" \
-                     "docelowego?\n" \
-                     "(P - plik, K - katalog)\n"
-    STRING_SRCPROMPT,"%s? (Tak|Nie)\n"
-    STRING_OVERWRITE,"Zast<73>pi<70> %s? (Tak|Nie|Wszystkie)\n"
-    STRING_COPYFAIL, "Kopiowanie '%s' do '%s' nie powiod<6F>o si<73> - kod b<><62>du %d\n"
-    STRING_OPENFAIL, "Nie uda<64>o si<73> otworzy<7A> '%s'\n"
-    STRING_READFAIL, "B<><42>d podczas czytania '%s'\n"
-    STRING_YES_CHAR, "T"
-    STRING_NO_CHAR,  "N"
-    STRING_ALL_CHAR, "W"
-    STRING_FILE_CHAR,"P"
-    STRING_DIR_CHAR, "K"
-
-    STRING_HELP,
-"XCOPY - kopiuje pliki lub drzewa katalog<6F>w\n\
-\n\
-Sk<EFBFBD>adnia:\n\
-XCOPY <20>r<EFBFBD>d<EFBFBD>o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
-\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
-\n\
-Gdzie:\n\
-\n\
-[/I]  Je<4A>eli \"cel\" nie istnieje i kopiowane s<> co najmniej dwa pliki,\n\
-\tzak<61>ada, <20>e \"cel\" powien by<62> katalogiem\n\
-[/S]  Kopiuje katalogi i podkatalogi\n\
-[/E]  Kopiuje katalogi i podkatalogi, <20><>cznie z pustymi\n\
-[/Q]  Nie wypisuje nazw plik<69>w podczas kopiowania (tryb cichy)\n\
-[/F]  Wypisuje pe<70>ne <20>cie<69>ki <20>r<EFBFBD>d<EFBFBD>owe i docelowe podczas kopiowania\n\
-[/L]  Jedynie symuluje operacj<63>, pokazuj<75>c pliki, kt<6B>re by<62>yby kopiowane\n\
-[/W]  Prosi o potwierdzenie przed rozpocz<63>ciem kopiowania\n\
-[/T]  Tworzy puste katalogi, ale nie kopiuje plik<69>w\n\
-[/Y]  Zast<73>puje pliki bez pro<72>by o potwierdzenie\n\
-[/-Y] Zawsze prosi o potwierdzenie przed zast<73>pieniem pliku\n\
-[/P]  Prosi o potwierdzenie przed skopiowaniem ka<6B>dego pliku\n\
-[/N]  Kopiuje u<>ywaj<61>c kr<6B>tkich nazw plik<69>w\n\
-[/U]  Kopiuje tylko pliki, kt<6B>re ju<6A> istniej<65> w miejscu docelowym\n\
-[/R]  Zast<73>puje pliki tylko do odczytu\n\
-[/H]  Kopiuje r<>wnie<69> pliki ukryte i systemowe\n\
-[/C]  Kontynuuje nawet je<6A>eli podczas kopiowania wyst<73>pi<70>y b<><62>dy\n\
-[/A]  Kopiuje tylko pliki z atrybutem archiwalny\n\
-[/M]  Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\
-[/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\
-\t\tJe<4A>eli nie podano <20>adnej daty, to kopiowane s<> pliki, kt<6B>re s<>\n\
-\t\tnowsze ni<6E> w katalogu docelowym\n\n"
-
-}

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

@@ -1,82 +0,0 @@
-/*
- * XCOPY - Wine-compatible xcopy program
- * Russian language support
- *
- * Copyright (C) 2007 J. Edmeades
- * Copyright (C) 2007 Kirill K. Smirnov
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-{
-    STRING_INVPARMS,
-"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'xcopy /?' <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-    STRING_INVPARM,
-"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 'xcopy /?' <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-    STRING_PAUSE,    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <enter>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-    STRING_SIMCOPY,  "%d <20><><EFBFBD><EFBFBD>(<28><>) <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-    STRING_COPY,     "%d <20><><EFBFBD><EFBFBD>(<28><>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-    STRING_QISDIR,   "'%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?\n" \
-                     "(F - <20><><EFBFBD><EFBFBD>, D - <20><><EFBFBD><EFBFBD><EFBFBD>)\n"
-    STRING_SRCPROMPT,"%s? (Yes|No)\n"
-    STRING_OVERWRITE,"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s? (Yes|No|All)\n"
-    STRING_COPYFAIL, "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20> '%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %d\n"
-    STRING_OPENFAIL, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'\n"
-    STRING_READFAIL, "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
-    STRING_YES_CHAR, "Y"
-    STRING_NO_CHAR,  "N"
-    STRING_ALL_CHAR, "A"
-    STRING_FILE_CHAR,"F"
-    STRING_DIR_CHAR, "D"
-
-    STRING_HELP,
-"XCOPY - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n\
-\n\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n\
-XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U] \n\
-\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
-\n\
-<EFBFBD><EFBFBD><EFBFBD>:\n\
-\n\
-[/I]  <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, \n\
-      <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/S]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/E]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/Q]  <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/F]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/L]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/W]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/T]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/Y]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/-Y] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/P]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/N]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/U]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/R]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/H]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/C]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/A]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\". \n\
-[/M]  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> \"<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\",\n\
-      <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-[/D | /D:m-d-y] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                <20><> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n"
-}

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

@@ -1,29 +0,0 @@
-/*
- * Copyright 2007 Jason Edmeades
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <windef.h>
-
-#include "xcopy.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#include "De.rc"
-#include "En.rc"
-#include "Ko.rc"
-#include "Pl.rc"
-#include "Ru.rc"

reactos/base/applications/cmdutils/xcopy/xcopy.h

@@ -1,68 +0,0 @@
-/*
- * XCOPY - Wine-compatible xcopy program
- *
- * Copyright (C) 2007 J. Edmeades
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* Local #defines */
-#define RC_OK         0
-#define RC_NOFILES    1
-#define RC_CTRLC      2
-#define RC_INITERROR  4
-#define RC_WRITEERROR 5
-
-#define OPT_ASSUMEDIR    0x00000001
-#define OPT_RECURSIVE    0x00000002
-#define OPT_EMPTYDIR     0x00000004
-#define OPT_QUIET        0x00000008
-#define OPT_FULL         0x00000010
-#define OPT_SIMULATE     0x00000020
-#define OPT_PAUSE        0x00000040
-#define OPT_NOCOPY       0x00000080
-#define OPT_NOPROMPT     0x00000100
-#define OPT_SHORTNAME    0x00000200
-#define OPT_MUSTEXIST    0x00000400
-#define OPT_REPLACEREAD  0x00000800
-#define OPT_COPYHIDSYS   0x00001000
-#define OPT_IGNOREERRORS 0x00002000
-#define OPT_SRCPROMPT    0x00004000
-#define OPT_ARCHIVEONLY  0x00008000
-#define OPT_REMOVEARCH   0x00010000
-#define OPT_EXCLUDELIST  0x00020000
-#define OPT_DATERANGE    0x00040000
-#define OPT_DATENEWER    0x00080000
-
-#define MAXSTRING 8192
-
-/* Translation ids */
-#define STRING_INVPARMS         101
-#define STRING_INVPARM          102
-#define STRING_PAUSE            103
-#define STRING_SIMCOPY          104
-#define STRING_COPY             105
-#define STRING_QISDIR           106
-#define STRING_SRCPROMPT        107
-#define STRING_OVERWRITE        108
-#define STRING_COPYFAIL         109
-#define STRING_OPENFAIL         110
-#define STRING_READFAIL         111
-#define STRING_YES_CHAR         112
-#define STRING_NO_CHAR          113
-#define STRING_ALL_CHAR         114
-#define STRING_FILE_CHAR        115
-#define STRING_DIR_CHAR         116
-#define STRING_HELP             117

reactos/base/applications/cmdutils/xcopy/xcopy.rbuild

@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="xcopy" type="win32cui" installbase="system32" installname="xcopy.exe" allowwarnings="true" unicode="true">
-	<include base="xcopy">.</include>
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<library>user32</library>
-	<file>xcopy.c</file>
-	<file>xcopy.rc</file>
-	<metadata description="xcopy command-line tool" />
-</module>

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

@@ -1,17 +0,0 @@
-#include <windows.h>
-#include <commctrl.h>
-
-#include "resource.h"
-
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION	"xcopy command\0"
-#define REACTOS_STR_INTERNAL_NAME	"xcopy\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"xcopy.exe\0"
-#include <reactos/version.rc>
-
-#include "rsrc.rc"
-
-

reactos/base/applications/control/control.rbuild

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

reactos/base/applications/games/solitaire/solitaire.rbuild

@@ -4,8 +4,12 @@
 	<include base="sol">.</include>
 	<include base="sol">cardlib</include>
 	<linkerflag>-lstdc++</linkerflag>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
+	<family>applications</family>
+	<family>guiapplications</family>
+	<family>games</family>
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

reactos/base/applications/games/winemine/winemine.rbuild

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

reactos/base/applications/hh/hh.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hh" type="win32gui" installbase="system32" installname="hh.exe" unicode="no">
 	<include base="hh">.</include>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

reactos/base/applications/hostname/hostname.rbuild

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe" allowwarnings="true">
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<file>hostname.c</file>
 	<file>hostname.rc</file>

reactos/base/applications/logoff/logoff.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="logoff" type="win32cui" installbase="system32" installname="logoff.exe">
 	<include base="logoff">.</include>
+	<define name="__USE_W32API" />
 	<define name="WINVER">0x0501</define>
 	<library>advapi32</library>
 	<library>user32</library>

reactos/base/applications/mmc/mmc.rbuild

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

reactos/base/applications/msconfig/msconfig.rbuild

@@ -4,6 +4,7 @@
 	<include base="msconfig">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>

reactos/base/applications/mscutils/devmgmt/devmgmt.rbuild

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

reactos/base/applications/mscutils/eventvwr/eventvwr.rbuild

@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
-<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
-<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" allowwarnings="true">
+<module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe">
 	<include base="eventvwr">.</include>
+	<include base="eventvwr" root="intermediate">.</include>
 	<define name="__REACTOS__" />
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>
@@ -11,5 +12,23 @@
 	<library>advapi32</library>
 	<file>eventvwr.c</file>
 	<file>eventvwr.rc</file>
-</module>
-</rbuild>
+
+	<!-- Auto generated stuff -->
+	<automanifest>manifest.xml</automanifest>
+	<autoresource>auto.rc</autoresource>
+
+	<!-- Authors -->
+	<developer>mpiulachs</developer>
+	<translator>cfinck</translator>
+	<translator>fireball</translator>
+	<translator>mpiulachs</translator>
+
+	<metadata description="ReactOS Event Log Viewer" />
+
+	<!-- Avialable localizations for this module -->
+	<localization isoname="de-DE">lang/de-DE.rc</localization>
+	<localization isoname="en-US">lang/en-US.rc</localization>
+	<localization isoname="es-ES">lang/es-ES.rc</localization>
+	<localization isoname="fr-FR">lang/fr-FR.rc</localization>
+	<localization isoname="ru-RU">lang/ru-RU.rc</localization>
+</module>

reactos/base/applications/mscutils/eventvwr/eventvwr.rc

@@ -2,12 +2,12 @@
 #include <commctrl.h>
 #include "resource.h"
 
+// Shared icons
+IDI_EVENTVWR            ICON  "res/eventvwr.ico"
+IDI_WARNINGICON         ICON  "res/warning.ico"
+IDI_INFORMATIONICON     ICON  "res/info.ico"
+IDI_ERRORICON           ICON  "res/error.ico"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Event Log Viewer\0"
-#define REACTOS_STR_INTERNAL_NAME     "eventvwr\0"
-#define REACTOS_STR_ORIGINAL_FILENAME "eventvwr.exe\0"
-#include <reactos/version.rc>
-
-#include "rsrc.rc"
+#include "auto.rc"
 
 

reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc

@@ -1,11 +1,3 @@
-/*
- * PROJECT:     ReactOS Event Viewer
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/eventvwr/lang/de-DE.rc
- * PURPOSE:     German Language File for ReactOS Event Viewer
- * TRANSLATORS: Daniel Reimer
- */
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDC_EVENTVWR MENU
@@ -53,7 +45,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
 CAPTION "Bitte warten.."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	CTEXT           "Ereignis-Protokolle werden geladen. Bitte warten...",IDC_STATIC,0,15,230,8,SS_NOPREFIX
+	LTEXT           "Ereignis-Protokolle werden geladen. Bitte warten...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX
 END
 
 IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282

reactos/base/applications/mscutils/eventvwr/lang/en-US.rc

@@ -1,11 +1,3 @@
-/*
- * PROJECT:     ReactOS Event Viewer
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/eventvwr/lang/en-US.rc
- * PURPOSE:     English Language File for ReactOS Event Viewer
- * TRANSLATORS: Marc Piulachs
- */
-
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 IDC_EVENTVWR MENU
@@ -53,7 +45,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
 CAPTION "Wait.."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	CTEXT           "Loading Event Logs. Please wait ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX
+	LTEXT           "Loading Event Logs. Please wait ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX
 END
 
 IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282

reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc

@@ -1,11 +1,3 @@
-/*
- * PROJECT:     ReactOS Event Viewer
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/eventvwr/lang/es-ES.rc
- * PURPOSE:     Spanish Language File for ReactOS Event Viewer
- * TRANSLATORS: Marc Piulachs
- */
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDC_EVENTVWR MENU 
@@ -43,7 +35,7 @@ CAPTION "About"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
 	ICON            IDI_EVENTVWR,IDC_MYICON,14,9,21,20
-	LTEXT           "ReactOS Visor de sucesos Versi<EFBFBD>n 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
+	LTEXT           "ReactOS Visor de sucesos Version 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
 	LTEXT           "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,49,20,119,22
 	DEFPUSHBUTTON   "OK",IDOK,90,48,42,16,WS_GROUP
 END
@@ -53,7 +45,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
 CAPTION "Wait.."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	CTEXT           "Recuperando eventos. Por favor, espere ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX
+	LTEXT           "Recuperando eventos. Por favor, espere ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX
 END
 
 IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282
@@ -93,7 +85,7 @@ END
 STRINGTABLE 
 BEGIN
 	IDS_APP_TITLE                  "Visor de sucesos"
-	IDC_EVENTSTRINGIDNOTFOUND      "La descripci<63>n para el evento con ID ( %lu ) y origen ( %s ) no pudo ser recuperada.El equipo local puede no tener la informaci<63>n necesaria en el registro o las DLLs requeridas para mostrar los mensajes de un equipo remoto."
+	IDC_EVENTSTRINGIDNOTFOUND      "La descripci<63>n para el evento con ID ( %lu ) con origen ( %s ) no pudo ser recuperada.El equipo local puede no tener la informaci<63>n necesaria en el registro o las DLLs requeridas para mostrar los mensajes de un equipo remoto."
 	IDC_EVENTLOG_ERROR_TYPE        "Error"
 	IDC_EVENTLOG_WARNING_TYPE      "Advertencia"
 	IDC_EVENTLOG_INFORMATION_TYPE  "Informaci<63>n"

reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc

@@ -1,11 +1,3 @@
-/*
- * PROJECT:     ReactOS Event Viewer
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/eventvwr/lang/fr-FR.rc
- * PURPOSE:     French Language File for ReactOS Event Viewer
- * TRANSLATORS: Pierre Schweitzer
- */
-
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 IDC_EVENTVWR MENU
@@ -53,7 +45,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
 CAPTION "Patientez.."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	CTEXT           "Chargement des journaux d'<27>v<EFBFBD>nements. Veuillez patienter ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX
+	LTEXT           "Chargement des journaux d'<27>v<EFBFBD>nements. Veuillez patienter ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX
 END
 
 IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282

reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc

@@ -1,11 +1,3 @@
-/*
- * PROJECT:     ReactOS Event Viewer
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/eventvwr/lang/ru-RU.rc
- * PURPOSE:     Russian Language File for ReactOS Event Viewer
- * TRANSLATORS: Dmitry Chapyshev
- */
-
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDC_EVENTVWR MENU
@@ -37,7 +29,7 @@ BEGIN
 	"/",            IDM_ABOUT,              ASCII,  ALT
 END
 
-IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75
+IDD_ABOUTBOX DIALOGEX 0, 0, 200, 75
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU
 CAPTION "<22> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -45,7 +37,7 @@ BEGIN
 	ICON            IDI_EVENTVWR,IDC_MYICON,14,9,21,20
 	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
 	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28>) 2007 <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (marc.piulachs@codexchange.net)",IDC_STATIC,49,20,140,22
-	DEFPUSHBUTTON   "OK",IDOK,90,48,42,16,WS_GROUP
+	DEFPUSHBUTTON   "OK",IDOK,80,48,42,16,WS_GROUP
 END
 
 IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40
@@ -53,7 +45,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.."
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-	CTEXT           "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX
+	LTEXT           "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ...",IDC_STATIC,0,15,230,8,SS_CENTER | SS_NOPREFIX
 END
 
 IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282

reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc

@@ -1,104 +0,0 @@
-/*
- * PROJECT:     ReactOS Event Viewer
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/eventvwr/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for ReactOS Event Viewer
- * TRANSLATORS: Rostislav Zabolotny
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-IDC_EVENTVWR MENU 
-BEGIN
-	POPUP	"&<26><><EFBFBD><EFBFBD>"
-	BEGIN
-		MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 ID_LOG_APPLICATION, CHECKED
-		MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                   ID_LOG_SECURITY
-		MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  ID_LOG_SYSTEM
-		MENUITEM SEPARATOR
-		MENUITEM "<22>&<26><><EFBFBD><EFBFBD>",                    IDM_EXIT
-	END
-	POPUP	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	BEGIN
-		MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  IDM_REFRESH
-	END
-	MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                ID_OPTIONS
-	POPUP	"&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	BEGIN
-		MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                 IDM_HELP
-		MENUITEM SEPARATOR
-		MENUITEM "&<26><><EFBFBD>...",                   IDM_ABOUT
-	END
-END
-
-IDC_EVENTVWR ACCELERATORS 
-BEGIN
-	"?",            IDM_ABOUT,              ASCII,  ALT
-	"/",            IDM_ABOUT,              ASCII,  ALT
-END
-
-IDD_ABOUTBOX DIALOGEX 0, 0, 230, 75
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD>..."
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-	ICON            IDI_EVENTVWR,IDC_MYICON,14,9,21,20
-	LTEXT           "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
-	LTEXT           "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,49,20,119,22
-	DEFPUSHBUTTON   "OK",IDOK,90,48,42,16,WS_GROUP
-END
-
-IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER 
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.."
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-	CTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ...",IDC_STATIC,0,15,230,8,SS_NOPREFIX
-END
-
-IDD_EVENTDETAILDIALOG DIALOGEX 0, 0, 276, 282
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_CONTEXTHELP
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>䳿"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-	DEFPUSHBUTTON   "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDOK,12,258,50,14
-	PUSHBUTTON      "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDPREVIOUS,78,258,50,14
-	PUSHBUTTON      "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDNEXT,144,258,50,14
-	PUSHBUTTON      "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDHELP,210,258,50,14
-	EDITTEXT        IDC_EVENTTEXTEDIT,14,81,247,108,ES_MULTILINE | ES_READONLY
-	LTEXT           "&<26><><EFBFBD><EFBFBD>:",IDC_STATIC,15,70,39,8
-	LTEXT           "<22><><EFBFBD><EFBFBD>:",IDC_STATIC,14,14,36,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EVENTDATESTATIC,56,14,72,8
-	LTEXT           "<22><><EFBFBD>:",IDC_STATIC,14,27,36,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EVENTTIMESTATIC,56,27,72,8
-	LTEXT           "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,14,41,36,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EVENTUSERSTATIC,56,41,72,8
-	LTEXT           "<22><>&<26><>'<27><><EFBFBD><EFBFBD>:",IDC_STATIC,14,54,36,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EVENTCOMPUTERSTATIC,56,54,72,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD>. <20><>䳿:",IDC_STATIC,133,15,36,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EVENTIDSTATIC,175,15,87,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,133,28,36,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EVENTSOURCESTATIC,175,28,87,8
-	LTEXT           "<22><><EFBFBD>:",IDC_STATIC,133,42,36,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EVENTTYPESTATIC,175,42,87,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,133,55,36,8
-	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EVENTCATEGORYSTATIC,175,55,87,8
-	EDITTEXT        IDC_EVENTDATAEDIT,14,204,247,44,ES_MULTILINE | ES_READONLY
-	LTEXT           "<22>&a<><61>",IDC_STATIC,14,194,16,8
-	CONTROL         "&<26><><EFBFBD><EFBFBD>",IDC_BYTESRADIO,"Button",BS_AUTORADIOBUTTON,39,194,34,10
-	CONTROL         "&<26><><EFBFBD><EFBFBD><EFBFBD>",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10
-END
-
-STRINGTABLE
-BEGIN
-	IDS_APP_TITLE                  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-	IDC_EVENTSTRINGIDNOTFOUND      "<22><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>䳿( %lu ) <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>( %s ) <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> DLL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>."
-	IDC_EVENTLOG_ERROR_TYPE        "Error"
-	IDC_EVENTLOG_WARNING_TYPE      "Warning"
-	IDC_EVENTLOG_INFORMATION_TYPE  "Information"
-	IDC_EVENTLOG_AUDIT_SUCCESS     "Audit Success"
-	IDC_EVENTLOG_AUDIT_FAILURE     "Audit Failure"
-	IDC_EVENTLOG_SUCCESS           "Success"
-	IDC_EVENTLOG_UNKNOWN_TYPE      "Unknown Event"
-END

reactos/base/applications/mscutils/eventvwr/manifest.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly
-  xmlns="urn:schemas-microsoft-com:asm.v1"
-  manifestVersion="1.0">
-<assemblyIdentity
-    name="Win32 Application.default.App"
-    processorArchitecture="x86"
-    version="1.0.0.0"
-    type="win32"/>
-<description>ReactOS EventLog Viewer</description>
-<dependency>
-    <dependentAssembly>
-        <assemblyIdentity
-            type="win32"
-            name="Microsoft.Windows.Common-Controls"
-            version="6.0.0.0"
-            processorArchitecture="x86"
-            publicKeyToken="6595b64144ccf1df"
-            language="*"
-        />
-    </dependentAssembly>
-</dependency>
-</assembly>

reactos/base/applications/mscutils/eventvwr/rsrc.rc

@@ -1,19 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-1 24 DISCARDABLE "manifest.xml"
-
-// Shared icons
-IDI_EVENTVWR            ICON  "res/eventvwr.ico"
-IDI_WARNINGICON         ICON  "res/warning.ico"
-IDI_INFORMATIONICON     ICON  "res/info.ico"
-IDI_ERRORICON           ICON  "res/error.ico"
-
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/ru-RU.rc"
-#include "lang/uk-UA.rc"

reactos/base/applications/mscutils/servman/servman.rbuild

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

reactos/base/applications/network/arp/arp.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="arp" type="win32cui" installbase="system32" installname="arp.exe">
 	<include base="arp">.</include>
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<library>ws2_32</library>

reactos/base/applications/network/dwnl/dwnl.rbuild

@@ -6,6 +6,7 @@
 	<library>urlmon</library>
 	<library>wininet</library>
 	<library>uuid</library>
+	<define name="__USE_W32API" />
 	<define name="WINVER">0x0501</define>
 	<define name="_WIN32_IE">0x0600</define>
 	<file>dwnl.c</file>

reactos/base/applications/network/finger/finger.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="finger" type="win32cui" installbase="system32" installname="finger.exe">
 	<include base="finger">.</include>
+	<define name="__USE_W32API" />
 	<define name="__USE_W32_SOCKETS" />
 	<library>kernel32</library>
 	<library>ws2_32</library>

reactos/base/applications/network/ftp/ftp.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="ftp" type="win32cui" installbase="system32" installname="ftp.exe" allowwarnings="true">
 	<include base="ftp">.</include>
+	<define name="__USE_W32API" />
 	<define name="lint" />
 	<library>kernel32</library>
 	<library>ws2_32</library>

reactos/base/applications/network/ipconfig/ipconfig.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="ipconfig" type="win32cui" installbase="system32" installname="ipconfig.exe" allowwarnings="true">
 	<include base="ipconfig">.</include>
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>iphlpapi</library>

reactos/base/applications/network/net/net.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="net" type="win32cui" installbase="system32" installname="net.exe">
 	<include base="ping">.</include>
+	<define name="__USE_W32API" />
 	<define name="__USE_W32_SOCKETS" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>

reactos/base/applications/network/netstat/netstat.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="netstat" type="win32cui" installbase="system32" installname="netstat.exe" allowwarnings="true">
 	<include base="netstat">.</include>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>
 	<library>kernel32</library>

reactos/base/applications/network/ping/ping.rbuild

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

reactos/base/applications/network/route/route.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="route" type="win32cui" installbase="system32" installname="route.exe">
 	<include base="route">.</include>
+	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<library>kernel32</library>

reactos/base/applications/network/telnet/telnet.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="telnet" type="win32cui" installbase="system32" installname="telnet.exe" allowwarnings ="true">
 	<include base="telnet">.</include>
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>user32</library>

reactos/base/applications/network/tracert/tracert.rbuild

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

reactos/base/applications/network/whois/whois.rbuild

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="whois" type="win32cui" installbase="system32" installname="whois.exe">
+	<define name="__USE_W32API" />
 	<include base="whois">.</include>
 	<library>kernel32</library>
 	<library>ws2_32</library>

reactos/base/applications/notepad/notepad.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="notepad" type="win32gui" installbase="system32" installname="notepad.exe" unicode="yes">
 	<include base="notepad">.</include>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<library>kernel32</library>
 	<library>user32</library>
@@ -16,4 +17,5 @@
 	<file>settings.c</file>
 	<file>rsrc.rc</file>
 	<pch>notepad.h</pch>
+	<installcomponent>setup/notepad.inf</installcomponent>
 </module>

reactos/base/applications/notepad/setup/notepad.inf

@@ -0,0 +1,123 @@
+;Sample INF file to create a desktop shortcut to the notepad.exe file
+
+[Version]
+Signature  = "$Windows NT$"
+
+[DefaultInstall]
+ProfileItems = NotepadDesktopItemAdd
+
+[NotepadDesktopItemAdd]
+Name       = %NOTEPAD_NAME%, 0x0000008, 16409
+CmdLine    = 11,,"notepad.exe"
+InfoTip    = %NOTEPAD_DESC%
+WorkingDir = "%HOMEDRIVE%%HOMEPATH%"
+
+; Localizable Strings
+
+[Strings]		
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0401]      ; Arabic
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0403]      ; Catalan
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Permet crear i editar documents de text simples."
+
+[Strings.0404]      ; Chinese (Traditional)
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0804]      ; Chinese (Simplified)
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0405]      ; Czech
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0406]      ; Danish
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0413]      ; Dutch
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0409]      ; English
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.040B]      ; Finnish
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.040C]      ; French
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0407]      ; German
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0408]      ; Greek
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.040D]      ; Hebrew
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.040E]      ; Hungerian 
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0410]      ; Italian
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0411]      ; Japanese
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0412]      ; Korean
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0814]      ; Norwegian
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0415]      ; Polish
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0416]      ; Portugese
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.0419]      ; Russian
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.041B]      ; Slovak 
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.040A]      ; Spanish
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Crea y editar documents de texto con formateo b<>sico."
+
+[Strings.041D]      ; Swedish
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.041E]      ; Thai
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."
+
+[Strings.041F]      ; Turkish (Turkce)
+NOTEPAD_NAME = "Notepad"
+NOTEPAD_DESC = "Creates and edits text files using basic text formatting."

reactos/base/applications/regedit/clb/clb.rbuild

@@ -5,6 +5,7 @@
 	<include base="clb">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
 	<define name="WINVER">0x0600</define>

reactos/base/applications/regedit/regedit.rbuild

@@ -3,6 +3,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="regedit" type="win32gui" installname="regedit.exe">
 	<include base="regedit">.</include>
+	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0501</define>

reactos/base/applications/sc/sc.rbuild

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="sc" type="win32cui" installbase="system32" installname="sc.exe">
+	<define name="__USE_W32API" />
 	<define name="DEFINE_GUID" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />

reactos/base/applications/screensavers/3dtext/3dtext.c

@@ -1,426 +0,0 @@
-/*
- *  Copyright 2000 Jeff Molofee http://nehe.gamedev.net/ (Original code)
- *  Copyright 2006 Eric Kohl
- *  Copyright 2007 Marc Piulachs (marc.piulachs@codexchange.net) - minor modifications , converted to screensaver
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <windows.h>	// Header File For Windows
-#include <math.h>		// Header File For Windows Math Library
-#include <GL/gl.h>		// Header File For The OpenGL32 Library
-#include <GL/glu.h>		// Header File For The GLu32 Library
-#include <tchar.h>
-
-#include "resource.h"
-#include "3dtext.h"
-
-static	HGLRC hRC;		// Permanent Rendering Context
-static	HDC hDC;		// Private GDI Device Context
-
-GLuint	base;			// Base Display List For The Font Set
-GLfloat	rot;			// Used To Rotate The Text
-
-#define APPNAME _T("3DText")
-
-HINSTANCE hInstance;
-BOOL fullscreen = FALSE;
-
-GLvoid BuildFont(GLvoid)								// Build Our Bitmap Font
-{
-	GLYPHMETRICSFLOAT	gmf[256];						// Address Buffer For Font Storage
-	HFONT	font;										// Windows Font ID
-
-	base = glGenLists(256);								// Storage For 256 Characters
-
-	font = CreateFont(	-12,							// Height Of Font
-						0,								// Width Of Font
-						0,								// Angle Of Escapement
-						0,								// Orientation Angle
-						FW_BOLD,						// Font Weight
-						FALSE,							// Italic
-						FALSE,							// Underline
-						FALSE,							// Strikeout
-						ANSI_CHARSET,					// Character Set Identifier
-						OUT_TT_PRECIS,					// Output Precision
-						CLIP_DEFAULT_PRECIS,			// Clipping Precision
-						ANTIALIASED_QUALITY,			// Output Quality
-						FF_DONTCARE|DEFAULT_PITCH,		// Family And Pitch
-						"Tahoma");				// Font Name
-
-	SelectObject(hDC, font);							// Selects The Font We Created
-
-	wglUseFontOutlines(	hDC,							// Select The Current DC
-						0,								// Starting Character
-						255,							// Number Of Display Lists To Build
-						base,							// Starting Display Lists
-						0.0f,							// Deviation From The True Outlines
-						0.2f,							// Font Thickness In The Z Direction
-						WGL_FONT_POLYGONS,				// Use Polygons, Not Lines
-						gmf);							// Address Of Buffer To Recieve Data
-}
-
-GLvoid KillFont(GLvoid)									// Delete The Font
-{
-  glDeleteLists(base, 256);								// Delete All 256 Characters
-}
-
-GLvoid glPrint(char *text)								// Custom GL "Print" Routine
-{
-  if (text == NULL)										// If There's No Text
-    return;												// Do Nothing
-
-  glPushAttrib(GL_LIST_BIT);							// Pushes The Display List Bits
-  glListBase(base);										// Sets The Base Character to 32
-  glCallLists(strlen(text), GL_UNSIGNED_BYTE, text);	// Draws The Display List Text
-  glPopAttrib();										// Pops The Display List Bits
-}
-
-GLvoid InitGL(GLsizei Width, GLsizei Height)	// Will Be Called Right After The GL Window Is Created
-{
-	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);		// Clear The Background Color To Black
-	glClearDepth(1.0);							// Enables Clearing Of The Depth Buffer
-	glDepthFunc(GL_LESS);						// The Type Of Depth Test To Do
-	glEnable(GL_DEPTH_TEST);					// Enables Depth Testing
-	glShadeModel(GL_SMOOTH);					// Enables Smooth Color Shading
-
-	glMatrixMode(GL_PROJECTION);				// Select The Projection Matrix
-	glLoadIdentity();							// Reset The Projection Matrix
-
-	// Calculate The Aspect Ratio Of The Window
-	gluPerspective(45.0f,(GLfloat)Width/(GLfloat)Height,0.1f,100.0f);
-
-	glMatrixMode(GL_MODELVIEW);					// Select The Modelview Matrix
-
-	BuildFont();								// Build The Font
-	glEnable(GL_LIGHT0);						// Enable Default Light (Quick And Dirty)
-	glEnable(GL_LIGHTING);						// Enable Lighting
-	glEnable(GL_COLOR_MATERIAL);				// Enable Coloring Of Material
-}
-
-GLvoid ReSizeGLScene(GLsizei Width, GLsizei Height)	// Handles Window Resizing
-{
-	if (Height==0)									// Is Window Too Small (Divide By Zero Error)
-		Height=1;									// If So Make It One Pixel Tall
-
-	// Reset The Current Viewport And Perspective Transformation
-	glViewport(0, 0, Width, Height);
-
-	glMatrixMode(GL_PROJECTION);					// Select The Projection Matrix
-	glLoadIdentity();								// Reset The Projection Matrix
-
-	// Calculate The Aspect Ratio Of The Window
-	gluPerspective(45.0f,(GLfloat)Width/(GLfloat)Height,0.1f,100.0f);
-	glMatrixMode(GL_MODELVIEW);						// Select The Modelview Matrix
-}
-
-GLvoid DrawGLScene(GLvoid)									// Handles Rendering
-{
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);		// Clear The Screen And The Depth Buffer
-	glLoadIdentity();										// Reset The View
-	glTranslatef(0.0f,0.0f,-10.0f);							// Move One Unit Into The Screen
-	glRotatef(rot,1.0f,0.0f,0.0f);							// Rotate On The X Axis
-	glRotatef(rot*1.2f,0.0f,1.0f,0.0f);						// Rotate On The Y Axis
-	glRotatef(rot*1.4f,0.0f,0.0f,1.0f);						// Rotate On The Z Axis
-	glTranslatef(-3.5f,0.0f,0.0f);							// Move To The Left Before Drawing
-	// Pulsing Colors Based On The Rotation
-	glColor3f(
-		(1.0f*(cos(rot/20.0f))),
-		(1.0f*(sin(rot/25.0f))),
-		(1.0f-0.5f*(cos(rot/17.0f))));
- 	glPrint(m_Text);							// Print GL Text To The Screen
-	glColor3f(0.0f,0.0f,1.0f);								// Make The Text Blue
-	rot+=0.1f;												// Increase The Rotation Variable
-}
-
-LRESULT CALLBACK WndProc(	HWND	hWnd,
-							UINT	message,
-							WPARAM	wParam,
-							LPARAM	lParam)
-{
-	static POINT ptLast;
-	static POINT ptCursor;
-	static BOOL  fFirstTime = TRUE;
-	RECT	Screen;							// Used Later On To Get The Size Of The Window
-	GLuint	PixelFormat;					// Pixel Format Storage
-	static	PIXELFORMATDESCRIPTOR pfd=		// Pixel Format Descriptor
-	{
-		sizeof(PIXELFORMATDESCRIPTOR),		// Size Of This Pixel Format Descriptor
-		1,									// Version Number (?)
-		PFD_DRAW_TO_WINDOW |				// Format Must Support Window
-		PFD_SUPPORT_OPENGL |				// Format Must Support OpenGL
-		PFD_DOUBLEBUFFER,					// Must Support Double Buffering
-		PFD_TYPE_RGBA,						// Request An RGBA Format
-		16,									// Select A 16Bit Color Depth
-		0, 0, 0, 0, 0, 0,					// Color Bits Ignored (?)
-		0,									// No Alpha Buffer
-		0,									// Shift Bit Ignored (?)
-		0,									// No Accumulation Buffer
-		0, 0, 0, 0,							// Accumulation Bits Ignored (?)
-		16,									// 16Bit Z-Buffer (Depth Buffer)  
-		0,									// No Stencil Buffer
-		0,									// No Auxiliary Buffer (?)
-		PFD_MAIN_PLANE,						// Main Drawing Layer
-		0,									// Reserved (?)
-		0, 0, 0								// Layer Masks Ignored (?)
-	};
-
-	switch (message)						// Tells Windows We Want To Check The Message
-	{
-		case WM_CREATE:										// Window Creation
-			hDC = GetDC(hWnd);								// Gets A Device Context For The Window
-			PixelFormat = ChoosePixelFormat(hDC, &pfd);		// Finds The Closest Match To The Pixel Format We Set Above
-
-			if (!PixelFormat)								// No Matching Pixel Format?
-			{
-				MessageBox(0,"Can't Find A Suitable PixelFormat.","Error",MB_OK|MB_ICONERROR);
-				PostQuitMessage(0);			// This Sends A 'Message' Telling The Program To Quit
-				break;						// Prevents The Rest Of The Code From Running
-			}
-
-			if(!SetPixelFormat(hDC,PixelFormat,&pfd))		// Can We Set The Pixel Mode?
-			{
-				MessageBox(0,"Can't Set The PixelFormat.","Error",MB_OK|MB_ICONERROR);
-				PostQuitMessage(0);			// This Sends A 'Message' Telling The Program To Quit
-				break;						// Prevents The Rest Of The Code From Running
-			}
-
-			hRC = wglCreateContext(hDC);					// Grab A Rendering Context
-			if(!hRC)										// Did We Get One?
-			{
-				MessageBox(0,"Can't Create A GL Rendering Context.","Error",MB_OK|MB_ICONERROR);
-				PostQuitMessage(0);			// This Sends A 'Message' Telling The Program To Quit
-				break;						// Prevents The Rest Of The Code From Running
-			}
-
-			if(!wglMakeCurrent(hDC, hRC))					// Can We Make The RC Active?
-			{
-				MessageBox(0,"Can't Activate GLRC.","Error",MB_OK|MB_ICONERROR);
-				PostQuitMessage(0);			// This Sends A 'Message' Telling The Program To Quit
-				break;						// Prevents The Rest Of The Code From Running
-			}
-
-			GetClientRect(hWnd, &Screen);					// Grab Screen Info For The Current Window
-			InitGL(Screen.right, Screen.bottom);			// Initialize The GL Screen Using Screen Info
-			break;
-
-		case WM_DESTROY:									// Windows Being Destroyed
-		case WM_CLOSE:										// Windows Being Closed
-			{
-				ChangeDisplaySettings(NULL, 0);					// Disable Fullscreen Mode
-				KillFont();										// Deletes The Font Display List
-
-				wglMakeCurrent(hDC,NULL);						// Make The DC Current
-				wglDeleteContext(hRC);							// Kill The RC
-				ReleaseDC(hWnd,hDC);							// Free The DC
-
-				PostQuitMessage(0);								// Quit The Program
-			}
-			break;
-		case WM_PAINT:
-		{
-			DrawGLScene();
-			SwapBuffers(hDC);
-			break;
-		}
-		case WM_NOTIFY:
-		case WM_SYSKEYDOWN:
-			PostMessage(hWnd, WM_CLOSE, 0, 0);
-			break;
-		case WM_LBUTTONDOWN:
-		case WM_LBUTTONUP:
-		case WM_RBUTTONDOWN:
-		case WM_RBUTTONUP:
-		case WM_MBUTTONDOWN:
-		case WM_MBUTTONUP:
-		case WM_MOUSEMOVE:
-			{
-				// If we've got a parent then we must be a preview
-				if(GetParent(hWnd) != 0)
-					return 0;
-
-				if(fFirstTime)
-				{
-					GetCursorPos(&ptLast);
-					fFirstTime = FALSE;
-				}
-
-				GetCursorPos(&ptCursor);
-
-				// if the mouse has moved more than 3 pixels then exit
-				if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3)
-					PostMessage(hWnd, WM_CLOSE, 0, 0);
-
-				ptLast = ptCursor;
-
-				return 0;
-			}
-		case WM_SIZE:										// Resizing The Screen
-			ReSizeGLScene(LOWORD(lParam),HIWORD(lParam));	// Resize To The New Window Size
-			break;
-
-		default:
-			return (DefWindowProc(hWnd, message, wParam, lParam));	// Pass Windows Messages
-	}
-return (0);
-}
-
-void InitSaver(HWND hwndParent)
-{
-	WNDCLASS wc;
-	ZeroMemory(&wc, sizeof(wc));
-	wc.style            = CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc      = WndProc;
-	wc.lpszClassName    = APPNAME;
-	RegisterClass(&wc);
-
-	if (hwndParent != 0)
-	{
-		RECT rect;
-		GetClientRect(hwndParent, &rect);
-		CreateWindow(APPNAME, APPNAME,
-		             WS_VISIBLE | WS_CHILD,
-		             0, 0,
-		             rect.right,
-		             rect.bottom,
-		             hwndParent, 0,
-		             hInstance, NULL);
-		fullscreen = FALSE;
-	} else {
-		HWND hwnd;
-		hwnd = CreateWindow(APPNAME, APPNAME,
-		                    WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST,
-		                    0, 0,
-		                    GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
-		                    HWND_DESKTOP, 0,
-		                    hInstance, NULL);
-		ShowWindow(hwnd, SW_SHOWMAXIMIZED);
-		ShowCursor(FALSE);
-		fullscreen = TRUE;
-	}
-}
-
-void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
-{
-	int ch;
-	
-	if (!strlen(szCmdLine))
-		return;
-
-	ch = *szCmdLine++;
-
-	if(ch == '-' || ch == '/')
-		ch = *szCmdLine++;
-
-	if(ch >= 'A' && ch <= 'Z')
-		ch += 'a' - 'A';
-
-	*chOption = ch;
-
-	if (ch == 's' || ch == 'c')
-		return;
-
-	ch = *szCmdLine++;
-
-	if(ch == ':')
-		ch = *szCmdLine++;
-
-	while(ch == ' ' || ch == '\t')
-		ch = *szCmdLine++;
-
-	if(isdigit(ch))
-	{
-		unsigned int i = atoi(szCmdLine - 1);
-		*hwndParent = (HWND)i;
-	}
-	else
-		*hwndParent = 0;
-}
-
-//
-//	Dialogbox procedure for Configuration window
-//
-BOOL CALLBACK ConfigDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	switch(uMsg)
-	{
-        case WM_INITDIALOG:
-			SetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text);
-			return TRUE;
-        case WM_COMMAND:
-            switch(LOWORD(wParam))
-            {
-                case IDOK:
-					GetDlgItemText(hwnd, IDC_MESSAGE_TEXT, m_Text, MAX_PATH);
-					SaveSettings();
-                    EndDialog(hwnd, IDOK);
-                break;
-                case IDCANCEL:
-                    EndDialog(hwnd, IDCANCEL);
-                break;
-            }
-			return FALSE;
-		case WM_CLOSE:
-			EndDialog(hwnd, 0);
-			break;
-        default:
-            return FALSE;
-	}
-
-	return TRUE;
-}
-
-void Configure(void)
-{
-	DialogBox(hInstance, MAKEINTRESOURCE(IDD_CONFIG), NULL , (DLGPROC)ConfigDlgProc);	
-}
-
-int WINAPI WinMain (HINSTANCE hInst,
-                    HINSTANCE hPrev,
-                    LPSTR lpCmdLine,
-                    int iCmdShow)
-{
-	HWND	hwndParent = 0;
-	int	chOption = 0;
-	MSG	Message;
-
-	hInstance = hInst;
-
-	ParseCommandLine(lpCmdLine, &chOption, &hwndParent);
-
-	LoadSettings();
-
-	switch(chOption)
-	{
-		case 's':
-			InitSaver(0);
-			break;
-
-		case 'p':
-			InitSaver(hwndParent);
-			break;
-
-		case 'c':
-		default:
-			Configure();
-			return 0;
-	}
-
-	while (GetMessage(&Message, 0, 0, 0))
-		DispatchMessage(&Message);
-
-	return Message.wParam;
-}
-

reactos/base/applications/screensavers/3dtext/3dtext.h

@@ -1,26 +0,0 @@
-/*
- * 3D Text OpenGL Screensaver (3dtext.h)
- *
- * Copyright 2007 Marc Piulachs
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-//////////////////////////////////////////////////////////////////
-
-TCHAR m_Text[MAX_PATH];
-
-void LoadSettings();
-void SaveSettings();

reactos/base/applications/screensavers/3dtext/3dtext.rbuild

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
-<module name="3dtext" type="win32scr" installbase="system32" installname="3dtext.scr">
-	<define name="__USE_W32API" />
-	<library>kernel32</library>
-	<library>user32</library>
-	<library>gdi32</library>
-	<library>opengl32</library>
-	<library>glu32</library>
-	<library>advapi32</library>
-
-	<file>3dtext.c</file>
-	<file>settings.c</file>
-	<file>rsrc.rc</file>
-
-	<metadata description="3D text OpenGL screensaver" />
-</module>

reactos/base/applications/screensavers/3dtext/lang/de-DE.rc

@@ -1,19 +0,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-IDD_CONFIG DIALOGEX 0, 0, 273, 178
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "3D Text Bildschirmschoner Einstellungen"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,216,7,50,14
-    PUSHBUTTON      "Abbrechen",IDCANCEL,216,24,50,14
-    EDITTEXT        IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL
-    LTEXT           "Eigener Text",IDC_STATIC_TEXT,18,17,65,8
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_DESCRIPTION "3D Text Bildschirmschoner"
-    IDS_TITLE       "<22>ber"
-    IDS_TEXT        "Keine Einstellungen n<>tig."
-END

reactos/base/applications/screensavers/3dtext/lang/en-US.rc

@@ -1,19 +0,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-IDD_CONFIG DIALOGEX 0, 0, 273, 178
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "3D Text Screensaver Settings"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,216,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,216,24,50,14
-    EDITTEXT        IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL
-    LTEXT           "Custom text",IDC_STATIC_TEXT,18,17,65,8
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_DESCRIPTION "3D Text ScreenSaver"
-    IDS_TITLE       "About"
-    IDS_TEXT        "No options need to be set."
-END

reactos/base/applications/screensavers/3dtext/lang/es-ES.rc

@@ -1,19 +0,0 @@
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-IDD_CONFIG DIALOGEX 0, 0, 273, 178
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "3D Text Screensaver Settings"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "Aceptar",IDOK,216,7,50,14
-    PUSHBUTTON      "Cancelar",IDCANCEL,216,24,50,14
-    EDITTEXT        IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL
-    LTEXT           "Texto personalizado",IDC_STATIC_TEXT,18,17,65,8
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_DESCRIPTION "3D Text ScreenSaver"
-    IDS_TITLE       "Acerca de.."
-    IDS_TEXT        "No options need to be set."
-END

reactos/base/applications/screensavers/3dtext/lang/sk-SK.rc

@@ -1,23 +0,0 @@
-/* TRANSLATOR:  Kario (kario@szm.sk)
- * DATE OF TR:  27-10-2007
- */
-
-LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
-
-IDD_CONFIG DIALOGEX 0, 0, 273, 178
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Nastavenie <20>etri<72>a obrazovky 3D text"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,216,7,50,14
-    PUSHBUTTON      "Zru<72>i<EFBFBD>",IDCANCEL,216,24,50,14
-    EDITTEXT        IDC_MESSAGE_TEXT,18,28,122,14,ES_AUTOHSCROLL
-    LTEXT           "<22>ubovo<76>n<EFBFBD> text",IDC_STATIC_TEXT,18,17,65,8
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_DESCRIPTION "3D text - <20>etri<72> obrazovky"
-    IDS_TITLE       "<22>o je ..."
-    IDS_TEXT        "Nie s<> potrebn<62> <20>iadne nastavenia."
-END

reactos/base/applications/screensavers/3dtext/resource.h

@@ -1,23 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by en-US.rc
-//
-#define IDD_CONFIG                      9
-#define IDD_DIALOG1                     101
-#define IDC_MESSAGE_TEXT                        1001
-#define IDC_STATIC_TEXT                 1002
-
-#define IDS_DESCRIPTION 1
-#define IDS_TITLE       2
-#define IDS_TEXT        3
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1003
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

reactos/base/applications/screensavers/3dtext/rsrc.rc

@@ -1,16 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#define REACTOS_VERSION_DLL
-#define REACTOS_STR_FILE_DESCRIPTION    "OpenGL 3DText ScreenSaver\0"
-#define REACTOS_STR_INTERNAL_NAME       "ss3dtext\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "ss3dtext.scr\0"
-
-#include <reactos/version.rc>
-
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/sk-SK.rc"

reactos/base/applications/screensavers/3dtext/settings.c

@@ -1,55 +0,0 @@
-/*
- * 3D Text OpenGL Screensaver (settings.c)
- *
- * Copyright 2007 Marc Piulachs
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-//////////////////////////////////////////////////////////////////
-
-#include <windows.h>
-#include <tchar.h>
-#include "3dtext.h"
-
-TCHAR m_Text[MAX_PATH];
-
-void LoadSettings()
-{
-	HKEY hkey;
-	DWORD len = MAX_PATH;
-
-	RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0,
-		_T(""), 0, KEY_READ, NULL, &hkey, NULL);
-
-	if(RegQueryValueEx(hkey, _T("DisplayString"),  0, 0, (LPBYTE)m_Text, &len) != ERROR_SUCCESS)
-	{
-		strcpy(m_Text  , "ReactOS Rocks!");
-	}
-
-	RegCloseKey(hkey);
-}
-
-void SaveSettings()
-{
-	HKEY hkey;
-
-	RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0,
-		_T(""), 0, KEY_WRITE, NULL, &hkey, NULL);
-
-	RegSetValueEx(hkey, _T("DisplayString"), 0, REG_SZ, (BYTE *)&m_Text, sizeof (m_Text));
-
-	RegCloseKey(hkey);
-}

reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild

@@ -1,9 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="cylfrac" type="win32scr" installbase="system32" installname="cylfrac.scr">
+	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 
+	<family>screensavers</family>
+
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

reactos/base/applications/screensavers/logon/lang/sk-SK.rc

@@ -8,5 +8,5 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DESCRIPTION "Logon - <20>etri<72> obrazovky"
     IDS_TITLE       "<22>o je ..."
-    IDS_TEXT        "Nie s<> potrebn<62> <20>iadne nastavenia."
+    IDS_TEXT        "Nie s<> potrebn<62> <20>iadn<EFBFBD> nastavenia."
 END

reactos/base/applications/screensavers/logon/logon.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="logon" type="win32scr" installbase="system32" installname="logon.scr">
 	<include base="logon">.</include>
+	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 

reactos/base/applications/screensavers/matrix/lang/sk-SK.rc

@@ -1,6 +1,6 @@
 /*
  * PROJECT:     Matrix ScreenSaver
- * FILE:        base/applications/screensavers/matrix/lang/
+ * FILE:        base/applications/screensavers\matrix\lang\
  * PURPOSE:     Slovak Language File Matrix ScreenSaver
  * TRANSLATOR:  Kario (kario@szm.sk)
  * DATE OF TR:  25-07-2007
@@ -42,17 +42,17 @@ BEGIN
                     SS_CENTERIMAGE | WS_GROUP,154,39,116,72
     PUSHBUTTON      "Prid&a<>",IDC_ADD,280,41,44,18
     PUSHBUTTON      "O&dstr<74>ni<6E>",IDC_REMOVE,280,66,44,18
+    CONTROL         "&N<>hodn<64> poradie spr<70>v",IDC_RANDOM,"Button",BS_AUTOCHECKBOX |
+                    WS_TABSTOP,151,134,85,10
+    DEFPUSHBUTTON   "OK",IDOK,222,162,50,14
+    PUSHBUTTON      "Zru<72>i<EFBFBD>",IDCANCEL,283,162,50,14
     LTEXT           "Typ &p<>sma:",IDC_STATIC,151,118,40,8
     COMBOBOX        IDC_COMBO2,195,116,130,71,CBS_DROPDOWNLIST | CBS_SORT |
                     WS_VSCROLL | WS_TABSTOP
-    CONTROL         "&N<>hodn<64> poradie spr<70>v",IDC_RANDOM,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,151,134,90,10
     CONTROL         "&Tu<54>n<EFBFBD> p<>smo",IDC_BOLD,"Button",BS_AUTOCHECKBOX |
                     BS_MULTILINE | WS_TABSTOP,247,134,55,10
     CTEXT           "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,140,
                     158,75,18
-    DEFPUSHBUTTON   "OK",IDOK,222,162,50,14
-    PUSHBUTTON      "Zru<72>i<EFBFBD>",IDCANCEL,283,162,50,14
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/screensavers/matrix/matrix.rbuild

@@ -3,6 +3,7 @@
 <module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true">
 	<include base="matrix">.</include>
 
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="UNICODE" />

reactos/base/applications/screensavers/screensavers.rbuild

@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="3dtext">
-		<xi:include href="3dtext/3dtext.rbuild" />
-	</directory>
 	<directory name="cylfrac">
 		<xi:include href="cylfrac/cylfrac.rbuild" />
 	</directory>

reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc

@@ -8,5 +8,5 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DESCRIPTION "Predvolen<65> <20>etri<72> obrazovky"
     IDS_TITLE       "<22>o je ..."
-    IDS_TEXT        "Nie s<> potrebn<62> <20>iadne nastavenia."
+    IDS_TEXT        "Nie s<> potrebn<62> <20>iadn<EFBFBD> nastavenia."
 END

reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="scrnsave" type="win32scr" installbase="system32" installname="scrnsave.scr">
+	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 

reactos/base/applications/screensavers/starfield/lang/sk-SK.rc

@@ -8,5 +8,5 @@ STRINGTABLE DISCARDABLE
 BEGIN
     IDS_DESCRIPTION "Hviezdne pole - <20>etri<72> obrazovky"
     IDS_TITLE       "<22>o je ..."
-    IDS_TEXT        "Nie s<> potrebn<62> <20>iadne nastavenia."
+    IDS_TEXT        "Nie s<> potrebn<62> <20>iadn<EFBFBD> nastavenia."
 END

reactos/base/applications/screensavers/starfield/starfield.rbuild

@@ -1,9 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="starfield" type="win32scr" installbase="system32" installname="starfield.scr">
+	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 
+	<family>screensavers</family>
+
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>

reactos/base/applications/shutdown/shutdown.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="shutdown" type="win32cui" installbase="system32" installname="shutdown.exe">
 	<include base="shutdown">.</include>
+	<define name="__USE_W32API" />
 	<define name="WINVER">0x0501</define>
 	<library>advapi32</library>
 	<library>user32</library>

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

@@ -1,49 +0,0 @@
-
-/*
-	Translated by:
-	   Mateus de Lima (aka wavemaster) <mateusloliveira [@] hotmail.com>
-*/
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
-
-IDM_MAINMENU MENU DISCARDABLE
-BEGIN
-    POPUP "&Op<4F><70>es"
-    BEGIN
-        MENUITEM "&Propriedades", IDC_PROPERTIES
-        MENUITEM "&Controles avan<61>ados", IDC_ADVANCED_CONTROLS
-        MENUITEM SEPARATOR
-        MENUITEM "Sai&r", IDC_EXIT
-    END
-    POPUP "Aj&uda"
-    BEGIN
-        MENUITEM "T<>picos de &ajuda", IDC_HELP_TOPICS
-        MENUITEM SEPARATOR
-        MENUITEM "Sobre o &Controle de Volume", IDC_ABOUT
-    END
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_SNDVOL32       "Controle de Volume"
-    IDS_NOMIXERDEVICES "N<>o h<> dispositivos de mixagem dispon<6F>veis! O aplicativo ir<69> sair agora."
-END
-
-IDD_PREFERENCES DIALOGEX 0, 0, 224, 250
-STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Propriedades"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  LTEXT "Dispositivo de &mixagem:", -1, 7,8,48,9
-  COMBOBOX IDC_MIXERDEVICE, 55,8,162,80, CBS_DROPDOWNLIST | WS_TABSTOP
-  GROUPBOX "Ajustar volume para:", -1, 7,25,211,77
-  PUSHBUTTON "&Reprodu<64><75>o", IDC_PLAYBACK, 13,43,47,8, BS_AUTORADIOBUTTON
-  PUSHBUTTON "&Grava<76><61>o", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON
-  PUSHBUTTON "&Outros:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED
-  COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
-  LTEXT "Mostar os seguintes controles de volume:", IDC_LABELCONTROLS, 7, 109, 162, 8
-  CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96
-
-  PUSHBUTTON "OK", IDOK, 114,226,50,14
-  PUSHBUTTON "Cancelar", IDCANCEL, 168,226,50,14
-END

reactos/base/applications/sndvol32/rsrc.rc

@@ -20,7 +20,6 @@ IDI_MAINAPP ICON DISCARDABLE resources/sndvol32.ico
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"
-#include "lang/pt-BR.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
 #include "lang/sv-SE.rc"

reactos/base/applications/sndvol32/sndvol32.rbuild

@@ -3,6 +3,7 @@
 <module name="sndvol32" type="win32gui" installbase="system32" installname="sndvol32.exe">
 	<include base="ReactOS">include/wine</include>
 	<include base="sndvol32">.</include>
+	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
 	<define name="_WIN32_IE">0x0500</define>

reactos/base/applications/taskmgr/taskmgr.rbuild

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

reactos/base/applications/winhelp/winhelp.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="winhelp" type="win32gui" installbase="system32" installname="winhelp.exe" unicode="no">
 	<include base="winhelp">.</include>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>wine</library>

reactos/base/applications/wordpad/wordpad.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" unicode="yes" allowwarnings="true">
 	<include base="wordpad">.</include>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

reactos/base/services/audiosrv/audiosrv.rbuild

@@ -2,8 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="audiosrv" type="win32cui" installbase="system32" installname="audiosrv.exe" unicode="yes" allowwarnings="true">
 	<include base="audiosrv">.</include>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="WINVER">0x0501</define>
+	<family>services</family>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>

reactos/base/services/dhcp/dhcp.rbuild

@@ -3,12 +3,14 @@
 <module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe" allowwarnings="true">
 	<include base="dhcp">.</include>
 	<include base="dhcp">include</include>
+	<define name="__USE_W32API" />
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
 	<library>advapi32</library>
+	<family>services</family>
 	<pch>include/rosdhcp.h</pch>
 	<file>adapter.c</file>
 	<file>alloc.c</file>

reactos/base/services/eventlog/eventlog.rbuild

@@ -5,12 +5,14 @@
 	<include base="eventlog_server">.</include>
 	<define name="UNICODE" />
 	<define name="_UNICODE" />
+	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>eventlog_server</library>
 	<library>rpcrt4</library>
 	<library>pseh</library>
+	<family>services</family>
 	<file>eventlog.c</file>
 	<file>logport.c</file>
 	<file>eventlog.rc</file>

reactos/base/services/rpcss/rpcss.rbuild

@@ -2,8 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="rpcss" type="win32cui" installbase="system32" installname="rpcss.exe">
 	<include base="rpcss">.</include>
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
+	<family>services</family>
 	<file>rpcss.c</file>
 	<file>endpoint.c</file>
 	<file>rpcss.rc</file>

reactos/base/services/svchost/svchost.c

@@ -1,257 +0,0 @@
-/*
- * PROJECT:			ReactOS SvcHost
- * LICENSE:			GPL - See COPYING in the top level directory
- * FILE:			/base/services/svchost/svchost.c
- * PURPOSE:			Provide dll service loader
- * PROGRAMMERS:		Gregor Brunmar (gregor.brunmar@home.se)
- */
-
-/* INCLUDES ******************************************************************/
-
-#include "svchost.h"
-#include <debug.h>
-
-#ifdef _MSC_VER
-#undef DPRINT1
-#define DPRINT1
-#endif
-
-/* DEFINES *******************************************************************/
-
-static LPCTSTR SVCHOST_REG_KEY	= _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\SvcHost");
-static LPCTSTR SERVICE_KEY		= _T("SYSTEM\\CurrentControlSet\\Services\\");
-static LPCTSTR PARAMETERS_KEY	= _T("\\Parameters");
-
-#define SERVICE_KEY_LENGTH	_tcslen(SERVICE_KEY);
-#define REG_MAX_DATA_SIZE	2048
-
-static PSERVICE FirstService = NULL;
-
-/* FUNCTIONS *****************************************************************/
-
-BOOL PrepareService(LPCTSTR ServiceName)
-{
-	HKEY hServiceKey;
-	TCHAR ServiceKeyBuffer[MAX_PATH + 1];
-	DWORD LeftOfBuffer = sizeof(ServiceKeyBuffer) / sizeof(ServiceKeyBuffer[0]);
-	DWORD KeyType;
-	PTSTR Buffer = NULL;
-	DWORD BufferSize = MAX_PATH + 1;
-	LONG RetVal;
-	HINSTANCE hServiceDll;
-	TCHAR DllPath[MAX_PATH + 2]; /* See MSDN on ExpandEnvironmentStrings() for ANSI strings for more details on + 2 */
-	LPSERVICE_MAIN_FUNCTION ServiceMainFunc;
-	PSERVICE Service;
-
-	/* Compose the registry path to the service's "Parameter" key */
-	_tcsncpy(ServiceKeyBuffer, SERVICE_KEY, LeftOfBuffer);
-	LeftOfBuffer -= _tcslen(SERVICE_KEY);
-	_tcsncat(ServiceKeyBuffer, ServiceName, LeftOfBuffer);
-	LeftOfBuffer -= _tcslen(ServiceName);
-	_tcsncat(ServiceKeyBuffer, PARAMETERS_KEY, LeftOfBuffer);
-	LeftOfBuffer -= _tcslen(PARAMETERS_KEY);
-
-	if (LeftOfBuffer < 0)
-	{
-		DPRINT1("Buffer overflow for service name: '%s'\n", ServiceName);
-		return FALSE;
-	}
-
-	/* Open the service registry key to find the dll name */
-	if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, ServiceKeyBuffer, 0, KEY_READ, &hServiceKey))
-	{
-		DPRINT1("Could not open service key (%s)\n", ServiceKeyBuffer);
-		return FALSE;
-	}
-
-	do
-	{
-		if (Buffer)
-			HeapFree(GetProcessHeap(), 0, Buffer);
-
-		Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize);
-		if (NULL == Buffer)
-		{
-			DPRINT1("Not enough memory for service: %s\n", ServiceName);
-			return FALSE;
-		}
-
-		RetVal = RegQueryValueEx(hServiceKey, _T("ServiceDll"), NULL, &KeyType, (LPBYTE)Buffer, &BufferSize);
-
-	} while (ERROR_MORE_DATA == RetVal);
-
-
-	RegCloseKey(hServiceKey);
-
-	if (ERROR_SUCCESS != RetVal || 0 == BufferSize)
-	{
-		DPRINT1("Could not read 'ServiceDll' value from service: %s, ErrorCode: 0x%x\n", ServiceName, RetVal);
-		HeapFree(GetProcessHeap(), 0, Buffer);
-		return FALSE;
-	}
-
-	/* Convert possible %SystemRoot% to a real path */
-	BufferSize = ExpandEnvironmentStrings(Buffer, DllPath, sizeof(DllPath));
-	if (0 == BufferSize)
-	{
-		DPRINT1("Invalid ServiceDll path: %s\n", Buffer);
-		HeapFree(GetProcessHeap(), 0, Buffer);
-		return FALSE;
-	}
-
-	HeapFree(GetProcessHeap(), 0, Buffer);
-
-	/* Load the service dll */
-	hServiceDll = LoadLibrary(DllPath);
-
-	if (NULL == hServiceDll)
-	{
-		DPRINT1("Unable to load ServiceDll: %s\n", DllPath);
-		return FALSE;
-	}
-
-	ServiceMainFunc = (LPSERVICE_MAIN_FUNCTION)GetProcAddress(hServiceDll, "ServiceMain");
-
-	/* Allocate a service node in the linked list */
-	Service = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE));
-	if (NULL == Service)
-	{
-		DPRINT1("Not enough memory for service: %s\n", ServiceName);
-		return FALSE;
-	}
-
-	memset(Service, 0, sizeof(SERVICE));
-	Service->Name = HeapAlloc(GetProcessHeap(), 0, _tcslen(ServiceName) + sizeof(TCHAR));
-	if (NULL == Service->Name)
-	{
-		DPRINT1("Not enough memory for service: %s\n", ServiceName);
-		HeapFree(GetProcessHeap(), 0, Service);
-		return FALSE;
-	}
-	_tcscpy(Service->Name, ServiceName);
-
-	Service->hServiceDll = hServiceDll;
-	Service->ServiceMainFunc = ServiceMainFunc;
-
-	Service->Next = FirstService;
-	FirstService = Service;
-
-	return TRUE;
-}
-
-VOID FreeServices()
-{
-	while (FirstService)
-	{
-		PSERVICE Service = FirstService;
-		FirstService = Service->Next;
-
-		FreeLibrary(Service->hServiceDll);
-
-		HeapFree(GetProcessHeap(), 0, Service->Name);
-		HeapFree(GetProcessHeap(), 0, Service);
-	}
-}
-
-/*
- * Returns the number of services successfully loaded from the category
- */
-DWORD LoadServiceCategory(LPCTSTR ServiceCategory)
-{
-	HKEY hServicesKey;
-	DWORD KeyType;
-	DWORD BufferSize = REG_MAX_DATA_SIZE;
-	TCHAR Buffer[REG_MAX_DATA_SIZE];
-	LPCTSTR ServiceName;
-	DWORD BufferIndex = 0;
-	DWORD NrOfServices = 0;
-
-	/* Get all the services in this category */
-	if (ERROR_SUCCESS != RegOpenKeyEx(HKEY_LOCAL_MACHINE, SVCHOST_REG_KEY, 0, KEY_READ, &hServicesKey))
-	{
-		DPRINT1("Could not open service category: %s\n", ServiceCategory);
-		return 0;
-	}
-
-	if (ERROR_SUCCESS != RegQueryValueEx(hServicesKey, ServiceCategory, NULL, &KeyType, (LPBYTE)Buffer, &BufferSize))
-	{
-		DPRINT1("Could not open service category (2): %s\n", ServiceCategory);
-		RegCloseKey(hServicesKey);
-		return 0;
-	}
-
-	/* Clean up */
-	RegCloseKey(hServicesKey);
-
-	/* Load services in the category */
-	ServiceName = Buffer;
-	while (_T('\0') != ServiceName[0])
-	{
-		size_t Length;
-		
-		Length = _tcslen(ServiceName);
-		if (0 == Length)
-			break;
-
-		if (TRUE == PrepareService(ServiceName))
-			++NrOfServices;
-
-		BufferIndex += (Length + 1) * sizeof(TCHAR);
-
-		ServiceName = &Buffer[BufferIndex];
-	}
-
-	return NrOfServices;
-}
-
-int _tmain (int argc, LPTSTR argv [])
-{
-	DWORD NrOfServices;
-	LPSERVICE_TABLE_ENTRY ServiceTable;
-	DWORD i;
-
-	if (argc < 3)
-	{
-		/* MS svchost.exe doesn't seem to print help, should we? */
-		return 1;
-	}
-
-	if (_tcscmp(argv[1], _T("-k")) != 0)
-	{
-		/* For now, we only handle "-k" */
-		return 1;
-	}
-
-	NrOfServices = LoadServiceCategory(argv[2]);
-
-	if (0 == NrOfServices)
-		return 1;
-
-	ServiceTable = HeapAlloc(GetProcessHeap(), 0, sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1));
-
-	if (NULL != ServiceTable)
-	{
-		PSERVICE Service = FirstService;
-
-		for (i = 0; i < NrOfServices; ++i)
-		{
-			ServiceTable[i].lpServiceName = Service->Name;
-			ServiceTable[i].lpServiceProc = Service->ServiceMainFunc;
-			Service = Service->Next;
-		}
-
-		StartServiceCtrlDispatcher(ServiceTable);
-
-		HeapFree(GetProcessHeap(), 0, ServiceTable);
-	}
-	else
-	{
-		DPRINT1("Not enough memory for the service table, trying to allocate %u bytes\n", sizeof(SERVICE_TABLE_ENTRY) * (NrOfServices + 1));
-	}
-
-	FreeServices();
-
-    return 0;
-}
-
-/* EOF */

reactos/base/services/svchost/svchost.h

@@ -1,38 +0,0 @@
-/*
- * PROJECT:			ReactOS SvcHost
- * LICENSE:			GPL - See COPYING in the top level directory
- * FILE:			/base/services/svchost/svchost.h
- * PURPOSE:			Provide dll service loader
- * PROGRAMMERS:		Gregor Brunmar (gregor.brunmar@home.se)
- */
-#ifndef __SVCHOST_H__
-#define __SVCHOST_H__
-
-/* INCLUDES ******************************************************************/
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-
-#include <stdio.h>
-#include <winsock2.h>
-#include <tchar.h>
-
-/* DEFINES *******************************************************************/
-
-#define CS_TIMEOUT	1000
-
-typedef struct _SERVICE {
-    PTSTR		Name;
-	HINSTANCE	hServiceDll;	
-    LPSERVICE_MAIN_FUNCTION	ServiceMainFunc;
-	struct _SERVICE	*Next;
-} SERVICE, *PSERVICE;
-
-
-/* FUNCTIONS *****************************************************************/
-
-#endif /* __SVCHOST_H__ */
-
-/* EOF */
-

reactos/base/services/svchost/svchost.rbuild

@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="svchost" type="win32cui" installbase="system32" installname="svchost.exe">
-	<include base="svchost">.</include>
-	<define name="__USE_W32API" />
-	<library>kernel32</library>
-	<library>advapi32</library>
-	<file>svchost.c</file>
-	<file>svchost.rc</file>
-</module>

reactos/base/services/svchost/svchost.rc

@@ -1,6 +0,0 @@
-/* $Id: svchost.rc 21279 2007-10-22 06:09:58Z gbrunmar $ */
-
-#define REACTOS_STR_FILE_DESCRIPTION	"SvcHost subsystem\0"
-#define REACTOS_STR_INTERNAL_NAME	"SvcHost\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"SvcHost.exe\0"
-#include <reactos/version.rc>

reactos/base/services/tcpsvcs/tcpsvcs.rbuild

@@ -2,12 +2,14 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="tcpsvcs" type="win32cui" installbase="system32" installname="tcpsvcs.exe">
 	<include base="arp">.</include>
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>iphlpapi</library>
 	<library>ws2_32</library>
 	<library>shlwapi</library>
 	<library>advapi32</library>
 	<library>user32</library>
+	<family>services</family>
 	<file>tcpsvcs.c</file>
 	<file>skelserver.c</file>
 	<file>echo.c</file>

reactos/base/services/umpnpmgr/umpnpmgr.rbuild

@@ -4,6 +4,7 @@
 	<include base="umpnpmgr">.</include>
 	<include base="pnp_server">.</include>
 	<include base="pnp_client">.</include>
+	<define name="__USE_W32API" />
 	<define name="WINVER">0x600</define>
 	<define name="_WIN32_IE">0x0500</define>
 	<define name="_WIN32_WINNT">0x0600</define>
@@ -16,6 +17,7 @@
 	<library>rpcrt4</library>
 	<library>pseh</library>
 	<library>wdmguid</library>
+	<family>services</family>
 	<file>umpnpmgr.c</file>
 	<file>umpnpmgr.rc</file>
 </module>

reactos/base/setup/reactos/lang/es-ES.rc

@@ -1,13 +1,13 @@
-/*
- *  Spanish language file by Javier Remacha <2007-09-21>
- */
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-/* String Tables */
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_CAPTION  "Instalaci<63>n de ReactOS"
-    IDS_TEXT     "<22>No puede instalar ReactOS directamente desde este CD!\n\nPor favor, reinicie su equipo sin retirar este CD para proceder con la instalaci<EFBFBD>n de ReactOS."
-END
-
-/* EOF */
+/*
+ *  Spanish language file by Javier Remacha <2007-09-21>
+ */
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+/* String Tables */
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_CAPTION  "Instalaci<63>n de ReactOS"
+    IDS_TEXT     "<22>No puedes instalar ReactOS directamente desde este CD!\n\nPor favor reinicia tu computadora desde este CD para proceder a instalar ReactOS."
+END
+
+/* EOF */

reactos/base/setup/reactos/reactos.rbuild

@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="reactos" type="win32gui">
-	<bootstrap installbase="$(CDOUTPUT)" />
+	<bootstrap />
 	<include base="reactos">.</include>
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
+	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>

reactos/base/setup/setup/setup.rbuild

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

reactos/base/setup/usetup/bootsup.c

@@ -1836,7 +1836,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 
 		/* Copy FreeLoader to the boot partition */
 		wcscpy(SrcPath, SourceRootPath->Buffer);
-		wcscat(SrcPath, L"\\loader\\freeldr.sys");
+		wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\freeldr.sys");
 		wcscpy(DstPath, SystemRootPath->Buffer);
 		wcscat(DstPath, L"\\freeldr.sys");
 
@@ -1870,7 +1870,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 			{
 				/* Install FAT32 bootcode */
 				wcscpy(SrcPath, SourceRootPath->Buffer);
-				wcscat(SrcPath, L"\\loader\\fat32.bin");
+				wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat32.bin");
 				wcscpy(DstPath, SystemRootPath->Buffer);
 				wcscat(DstPath, L"\\bootsect.ros");
 
@@ -1888,7 +1888,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 			{
 				/* Install FAT16 bootcode */
 				wcscpy(SrcPath, SourceRootPath->Buffer);
-				wcscat(SrcPath, L"\\loader\\fat.bin");
+				wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin");
 				wcscpy(DstPath, SystemRootPath->Buffer);
 				wcscat(DstPath, L"\\bootsect.ros");
 
@@ -1941,7 +1941,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 
 		/* Copy FreeLoader to the boot partition */
 		wcscpy(SrcPath, SourceRootPath->Buffer);
-		wcscat(SrcPath, L"\\loader\\freeldr.sys");
+		wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\freeldr.sys");
 		wcscpy(DstPath, SystemRootPath->Buffer);
 		wcscat(DstPath, L"\\freeldr.sys");
 
@@ -1988,7 +1988,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 				PartitionType == PARTITION_FAT32_XINT13)
 			{
 				wcscpy(SrcPath, SourceRootPath->Buffer);
-				wcscat(SrcPath, L"\\loader\\fat32.bin");
+				wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat32.bin");
 
 				DPRINT1("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer);
 				Status = InstallFat32BootCodeToDisk(SrcPath,
@@ -2002,7 +2002,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 			else
 			{
 				wcscpy(SrcPath, SourceRootPath->Buffer);
-				wcscat(SrcPath, L"\\loader\\fat.bin");
+				wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin");
 
 				DPRINT1("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer);
 				Status = InstallFat16BootCodeToDisk(SrcPath,
@@ -2036,7 +2036,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 
 		/* Copy FreeLoader to the boot partition */
 		wcscpy(SrcPath, SourceRootPath->Buffer);
-		wcscat(SrcPath, L"\\loader\\freeldr.sys");
+		wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\freeldr.sys");
 		wcscpy(DstPath, SystemRootPath->Buffer);
 		wcscat(DstPath, L"\\freeldr.sys");
 
@@ -2083,7 +2083,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 				PartitionType == PARTITION_FAT32_XINT13)
 			{
 				wcscpy(SrcPath, SourceRootPath->Buffer);
-				wcscat(SrcPath, L"\\loader\\fat32.bin");
+				wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat32.bin");
 
 				DPRINT("Install FAT32 bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer);
 				Status = InstallFat32BootCodeToDisk(SrcPath,
@@ -2097,7 +2097,7 @@ InstallFatBootcodeToPartition(PUNICODE_STRING SystemRootPath,
 			else
 			{
 				wcscpy(SrcPath, SourceRootPath->Buffer);
-				wcscat(SrcPath, L"\\loader\\fat.bin");
+				wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin");
 
 				DPRINT("Install FAT bootcode: %S ==> %S\n", SrcPath, SystemRootPath->Buffer);
 				Status = InstallFat16BootCodeToDisk(SrcPath,
@@ -2143,7 +2143,7 @@ InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath,
 
   /* Copy FreeLoader to the boot partition */
   wcscpy(SrcPath, SourceRootPath->Buffer);
-  wcscat(SrcPath, L"\\loader\\freeldr.sys");
+  wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\freeldr.sys");
 
   wcscpy(DstPath, L"\\Device\\Floppy0\\freeldr.sys");
 
@@ -2169,7 +2169,7 @@ InstallFatBootcodeToFloppy(PUNICODE_STRING SourceRootPath,
 
   /* Install FAT12/16 boosector */
   wcscpy(SrcPath, SourceRootPath->Buffer);
-  wcscat(SrcPath, L"\\loader\\fat.bin");
+  wcscat(SrcPath, L"\\" ARCH_CD_ROOT "\\loader\\fat.bin");
 
   wcscpy(DstPath, L"\\Device\\Floppy0");