Scale down the wallpaper to 800x600. For some reason, scaling down the image through the "Stretch" option of the Desktop doesn't seem to work.

svn path=/branches/ros-branch-0_3_11-clt2010/; revision=46087

reactos/CREDITS

@@ -16,7 +16,7 @@ Daniel Reimer <reimer.daniel@freenet.de>
 David Welch <welch@cwcom.net>
 Dmitry Chapyshev <dmitry@reactos.org>
 Emanuele Aliberti <ea@iol.it>
-Eric Kohl
+Eric Kohl <ekohl@rz-online.de>
 Eugene Ingerman <geneing@myrealbox.com>
 Filip Navara <xnavara@volny.cz>
 Frederik Leemans
@@ -31,7 +31,7 @@ Hartmut Birr <hartmut.birr@gmx.de>
 Hernan Ochoa
 Herve Poussineau <hpoussin@reactos.com>
 Iwan Fatahi <i_fatahi@hotmail.com>
-James Tabor <james.tabor@reactos.org> <jimtabor.rosdev@gmail.com> <jamestabor_rosdev@yahoo.com>
+James B. Tabor <jimtabor.rosdev@gmail.com> <jimtabor@adsl-64-217-116-74.dsl.hstntx.swbell.net>
 Jason Eager
 Jason Filby <jasonfilby@yahoo.com>
 Jason Weiler
@@ -66,7 +66,7 @@ Royce Mitchell III <royce3@ev1.net>
 Samuel Serapi<70>n <samdwise51@gmail.com>
 Saveliy Tretiakov <saveliyt@mail.ru>
 Stefan Ginsberg <stefan__100__@hotmail.com>
-Steven Edwards <winehacker@gmail.com>
+Steven Edwards <steven_ed4153@yahoo.com>
 Thomas Weidenmueller <w3seek@users.sourceforge.net>
 Timo Kreuzer <timo.kreuzer@reactos.org>
 Victor Kirhenshtein <sauros@iname.com>

reactos/Doxyfile

@@ -1,4 +1,4 @@
-# Doxyfile 1.6.2
+# Doxyfile 1.5.8
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -54,11 +54,11 @@ CREATE_SUBDIRS         = YES
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
 # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, 
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English 
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, 
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, 
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+# Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
@@ -124,7 +124,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = 
+STRIP_FROM_PATH        = .
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
@@ -169,13 +169,13 @@ MULTILINE_CPP_IS_BRIEF = NO
 # member inherits the documentation from any documented member that it 
 # re-implements.
 
-INHERIT_DOCS           = YES
+INHERIT_DOCS           = NO
 
 # If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
 # a new page for each member. If set to NO, the documentation of a member will 
 # be part of the file/class/namespace that contains it.
 
-SEPARATE_MEMBER_PAGES  = YES
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
@@ -224,8 +224,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
 # Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
 # .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set
-# FILE_PATTERNS otherwise the files are not read by doxygen.
+# use: inc=Fortran f=C
 
 EXTENSION_MAPPING      = 
 
@@ -397,12 +396,6 @@ HIDE_SCOPE_NAMES       = NO
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen 
-# will list include files with double quotes in the documentation 
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES   = NO
-
 # If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
 # is inserted in the documentation for inline members.
 
@@ -422,16 +415,6 @@ SORT_MEMBER_DOCS       = YES
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
 # hierarchy of group names into alphabetical order. If set to NO (the default) 
 # the group names will appear in their defined order.
@@ -608,13 +591,11 @@ INPUT_ENCODING         = UTF-8
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
 FILE_PATTERNS          = *.c \
-                         *.cc \
                          *.cxx \
                          *.cpp \
                          *.c++ \
                          *.h \
                          *.hh \
-                         *.hxx \
                          *.hpp \
                          *.idl
 
@@ -663,7 +644,7 @@ EXAMPLE_PATH           =
 # and *.h) to filter out the source-files in the directories. If left 
 # blank all files are included.
 
-EXAMPLE_PATTERNS       = *
+EXAMPLE_PATTERNS       = 
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
 # searched for input files to be used with the \include or \dontinclude 
@@ -729,7 +710,7 @@ STRIP_CODE_COMMENTS    = YES
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
-REFERENCED_BY_RELATION = YES
+REFERENCED_BY_RELATION = NO
 
 # If the REFERENCES_RELATION tag is set to YES 
 # then for each documented function all documented entities 
@@ -756,7 +737,7 @@ USE_HTAGS              = NO
 # will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
 
-VERBATIM_HEADERS       = NO
+VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the alphabetical class index
@@ -823,12 +804,6 @@ HTML_FOOTER            = Doxygen/footer.html
 
 HTML_STYLESHEET        = 
 
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML 
-# page will contain the date and time when the page was generated. Setting 
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP         = NO
-
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
 # files or namespaces will be aligned in HTML using tables. If set to 
 # NO a bullet list will be used.
@@ -962,23 +937,6 @@ QHP_SECT_FILTER_ATTRS  =
 
 QHG_LOCATION           = 
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files  
-# will be generated, which together with the HTML files, form an Eclipse help  
-# plugin. To install this plugin and make it available under the help contents 
-# menu in Eclipse, the contents of the directory containing the HTML and XML 
-# files needs to be copied into the plugins directory of eclipse. The name of 
-# the directory within the plugins directory should be the same as 
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin 
-# the directory name containing the HTML and XML files should also have 
-# this name.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
@@ -992,18 +950,20 @@ ENUM_VALUES_PER_LINE   = 4
 
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
 # structure should be generated to display hierarchical information. 
-# If the tag value is set to YES, a side panel will be generated 
+# If the tag value is set to FRAME, a side panel will be generated 
 # containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). 
-# Windows users are probably better off using the HTML help feature.
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list; 
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+# disables this behavior completely. For backwards compatibility with previous 
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+# respectively.
 
-GENERATE_TREEVIEW      = NO
-
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories, 
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES       = NO
+GENERATE_TREEVIEW      = NONE
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
 # used to set the initial width (in pixels) of the frame in which the tree 
@@ -1019,26 +979,6 @@ TREEVIEW_WIDTH         = 250
 
 FORMULA_FONTSIZE       = 10
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript 
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should 
-# typically be disabled. For large projects the javascript based search engine 
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index 
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvances is that it is more difficult to setup 
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH    = YES
-
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -1055,10 +995,7 @@ GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
-# invoked. If left blank `latex' will be used as the default command name. 
-# Note that when enabling USE_PDFLATEX this option is only used for 
-# generating bitmaps for formulas in the HTML output, but not in the 
-# Makefile that is written to the output directory.
+# invoked. If left blank `latex' will be used as the default command name.
 
 LATEX_CMD_NAME         = latex
 
@@ -1118,13 +1055,6 @@ LATEX_BATCHMODE        = NO
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE      = NO
-
 #---------------------------------------------------------------------------
 # configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1276,14 +1206,14 @@ PERLMOD_PRETTY         = YES
 PERLMOD_MAKEVAR_PREFIX = 
 
 #---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor   
 #---------------------------------------------------------------------------
 
 # If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
 # evaluate all C-preprocessor directives found in the sources and include 
 # files.
 
-ENABLE_PREPROCESSING   = YES
+ENABLE_PREPROCESSING   = NO
 
 # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
 # names in the source code. If set to NO (the default) only conditional 
@@ -1342,7 +1272,7 @@ EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references   
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. 
@@ -1385,7 +1315,7 @@ EXTERNAL_GROUPS        = YES
 PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool   
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
@@ -1577,3 +1507,12 @@ GENERATE_LEGEND        = YES
 # the various graphs.
 
 DOT_CLEANUP            = YES
+
+#---------------------------------------------------------------------------
+# Options related to the search engine
+#---------------------------------------------------------------------------
+
+# The SEARCHENGINE tag specifies whether or not a search engine should be 
+# used. If set to NO the values of all tags below this one will be ignored.
+
+SEARCHENGINE           = YES

reactos/Makefile

@@ -349,7 +349,6 @@ ifeq ($(HOST),mingw32-linux)
 	endif
 	export SEP = /
 	mkdir = -$(Q)mkdir -p
-	checkpoint = $(Q)touch
 	rm = $(Q)rm -f
 	cp = $(Q)cp
 	NUL = /dev/null
@@ -358,7 +357,6 @@ else # mingw32-windows
 	ROS_EMPTY =
 	export SEP = \$(ROS_EMPTY)
 	mkdir = -$(Q)mkdir
-	checkpoint = $(Q)copy /y NUL
 	rm = $(Q)del /f /q
 	cp = $(Q)copy /y
 	NUL = NUL
@@ -527,11 +525,6 @@ msvc9: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
 	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc
 
-.PHONY: msvc10
-msvc10: $(ROS_BUILDENGINE)
-	$(ECHO_RBUILD)
-	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs10.00 -voversionconfiguration msvc
-
 .PHONY: msvc6_clean
 msvc6_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
@@ -557,11 +550,6 @@ msvc9_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)
 	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc
 
-.PHONY: msvc10_clean
-msvc10_clean: $(ROS_BUILDENGINE)
-	$(ECHO_RBUILD)
-	$(Q)$(ROS_BUILDENGINE) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs10.00 -voversionconfiguration msvc
-
 .PHONY: msvc_clean
 msvc_clean: $(ROS_BUILDENGINE)
 	$(ECHO_RBUILD)

reactos/ReactOS-amd64.rbuild

@@ -7,8 +7,6 @@
 		</xi:fallback>
 	</xi:include>
 
-	<xi:include href="ReactOS-generic.rbuild" />
-
 	<define name="_M_AMD64" />
 	<define name="_AMD64_" />
 	<define name="_M_AXP64" />
@@ -23,31 +21,132 @@
 	<property name="usewrc" value="false"/>
 	<property name="WINEBUILD_FLAGS" value="--kill-at"/>
 
-	<group compilerset="gcc">
-		<if property="OPTIMIZE" value="1">
-			<compilerflag>-ftracer</compilerflag>
-			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
-		</if>
-		<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
-		<compilerflag compiler="midl">-m64 --win64</compilerflag>
-		<!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag -->
-		<!-- compilerflag compiler="as">-gstabs+</compilerflag -->
-		<compilerflag>-U_X86_</compilerflag>
-		<compilerflag>-Wno-format</compilerflag>
-	</group>
+	<if property="OPTIMIZE" value="1">
+		<compilerflag>-Os</compilerflag>
+		<compilerflag>-ftracer</compilerflag>
+		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="2">
+		<compilerflag>-Os</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="3">
+		<compilerflag>-O1</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="4">
+		<compilerflag>-O2</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="5">
+		<compilerflag>-O3</compilerflag>
+	</if>
+
+	<compilerflag>-U_X86_</compilerflag>
+	<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
+	<compilerflag>-fno-strict-aliasing</compilerflag>
+	<compilerflag>-Wno-strict-aliasing</compilerflag>
+	<compilerflag>-Wpointer-arith</compilerflag>
+	<compilerflag>-Wno-multichar</compilerflag>
+	<compilerflag>-Wno-format</compilerflag>
+	<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
 
 	<group linkerset="ld">
 		<linkerflag>-disable-stdcall-fixup</linkerflag>
+		<linkerflag>-static</linkerflag>
+		<linkerflag>--unique=.eh_frame</linkerflag>
 		<linkerflag>-file-alignment=0x1000</linkerflag>
 		<linkerflag>-section-alignment=0x1000</linkerflag>
-		<linkerflag>--unique=.eh_frame</linkerflag>
-		<linkerflag>-static</linkerflag>
 	</group>
 
+<!-- Here starts <xi:include href="ReactOS-generic.rbuild" /> -->
+
+	<xi:include href="baseaddress.rbuild" />
+
+	<define name="__REACTOS__" />
+	<define name="__REACTOS__" host="true" />
+
+	<if property="DBG" value="1">
+		<define name="DBG">1</define>
+		<define name="_SEH_ENABLE_TRACE" />
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+	<if property="DBG" value="0">
+		<define name="DBG">0</define>
+	</if>
+
+	<if property="KDBG" value="1">
+		<define name="KDBG">1</define>
+		<property name="DBG_OR_KDBG" value="true" />
+	</if>
+
+	<!-- The version target valid values are: Nt4 , NT5 , NT51 -->
+	<property name="VERSION_TARGET" value="NT52" />
+
+	<if property="VERSION_TARGET" value="NT4">
+		<define name="WINVER">0x400</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x400</define>
+		<define name="_WIN32_WINDOWS">0x400</define>
+		<define name="_SETUPAPI_VER">0x400</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT5">
+		<define name="WINVER">0x500</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x500</define>
+		<define name="_WIN32_WINDOWS">0x500</define>
+		<define name="_SETUPAPI_VER">0x500</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT51">
+		<define name="WINVER">0x501</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x501</define>
+		<define name="_WIN32_WINDOWS">0x501</define>
+		<define name="_SETUPAPI_VER">0x501</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT52">
+		<define name="WINVER">0x502</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x502</define>
+		<define name="_WIN32_WINDOWS">0x502</define>
+		<define name="_SETUPAPI_VER">0x502</define>
+	</if>
+
+	<if property="VERSION_TARGET" value="NT6">
+		<define name="WINVER">0x600</define>
+		<define name="_WIN32_IE">0x600</define>
+		<define name="_WIN32_WINNT">0x600</define>
+		<define name="_WIN32_WINDOWS">0x600</define>
+		<define name="_SETUPAPI_VER">0x600</define>
+	</if>
+
+	<include>.</include>
+	<include>include</include>
+	<include root="intermediate">include</include>
+	<include>include/psdk</include>
+	<include root="intermediate">include/psdk</include>
+	<include>include/dxsdk</include>
+	<include root="intermediate">include/dxsdk</include>
+	<include>include/crt</include>
+	<include>include/crt/mingw32</include>
+	<include>include/ddk</include>
+	<include>include/GL</include>
+	<include>include/ndk</include>
+	<include>include/reactos</include>
+	<include root="intermediate">include/reactos</include>
+	<include root="intermediate">include/reactos/mc</include>
+	<include>include/reactos/libs</include>
+
+	<include host="true">include</include>
+	<include host="true" root="intermediate">include</include>
+	<include host="true">include/reactos</include>
+	<include host="true">include/reactos/wine</include>
+
 	<if property="USERMODE" value="1">
 		<directory name="base">
 			<xi:include href="base/base.rbuild" />
 		</directory>
+
 		<directory name="dll">
 			<xi:include href="dll/dll.rbuild" />
 		</directory>
@@ -56,35 +155,173 @@
 	<directory name="boot">
 		<xi:include href="boot/boot.rbuild" />
 	</directory>
+
 	<directory name="drivers">
-		<xi:include href="drivers/drivers.rbuild" />
+		<directory name="base">
+			<xi:include href="drivers/base/directory.rbuild" />
+		</directory>
+		<directory name="bus">
+			<xi:include href="drivers/bus/directory.rbuild" />
+		</directory>
+		<directory name="directx">
+			<xi:include href="drivers/directx/directory.rbuild" />
+		</directory>
+		<directory name="filesystems">
+			<xi:include href="drivers/filesystems/directory.rbuild" />
+		</directory>
+		<directory name="input">
+			<xi:include href="drivers/input/directory.rbuild" />
+		</directory>
+		<directory name="ksfilter">
+			<xi:include href="drivers/ksfilter/directory.rbuild" />
+		</directory>
+
+		<!-- directory name="multimedia">
+			<xi:include href="drivers/multimedia/directory.rbuild" />
+		</directory -->
+
+		<directory name="network">
+			<xi:include href="drivers/network/directory.rbuild" />
+		</directory>
+		<directory name="parallel">
+			<xi:include href="drivers/parallel/directory.rbuild" />
+		</directory>
+		<directory name="serial">
+			<xi:include href="drivers/serial/directory.rbuild" />
+		</directory>
+		<directory name="setup">
+			<xi:include href="drivers/setup/directory.rbuild" />
+		</directory>
+		<directory name="storage">
+            <xi:include href="drivers/storage/directory.rbuild" />
+		</directory>
+		<directory name="usb">
+			<xi:include href="drivers/usb/directory.rbuild" />
+		</directory>
+		<directory name="video">
+			<xi:include href="drivers/video/directory.rbuild" />
+		</directory>
+			<directory name="wdm">
+			<xi:include href="drivers/wdm/wdm.rbuild" />
+		</directory>
+		<directory name="wmi">
+			<xi:include href="drivers/wmi/wmilib.rbuild" />
+		</directory>
 	</directory>
+
 	<directory name="hal">
 		<xi:include href="hal/hal.rbuild" />
 	</directory>
+
 	<directory name="include">
 		<xi:include href="include/directory.rbuild" />
 	</directory>
+
 	<directory name="lib">
-		<xi:include href="lib/lib.rbuild" />
+		<directory name="3rdparty">
+			<directory name="adns">
+				<xi:include href="lib/3rdparty/adns/adns.rbuild" />
+			</directory>
+			<directory name="bzip2">
+				<xi:include href="lib/3rdparty/bzip2/bzip2.rbuild" />
+			</directory>
+			<directory name="cardlib">
+				<xi:include href="lib/3rdparty/cardlib/cardlib.rbuild" />
+			</directory>
+			<directory name="expat">
+				<xi:include href="lib/3rdparty/expat/expat.rbuild" />
+			</directory>
+			<directory name="freetype">
+				<xi:include href="lib/3rdparty/freetype/freetype.rbuild" />
+			</directory>
+			<directory name="icu4ros">
+				<xi:include href="lib/3rdparty/icu4ros/icu4ros.rbuild" />
+			</directory>
+			<directory name="libsamplerate">
+				<xi:include href="lib/3rdparty/libsamplerate/libsamplerate.rbuild" />
+			</directory>
+			<directory name="libwine">
+				<xi:include href="lib/3rdparty/libwine/libwine.rbuild" />
+			</directory>
+			<directory name="libxml2">
+				<xi:include href="lib/3rdparty/libxml2/libxml2.rbuild" />
+			</directory>
+
+			<if property="USERMODE" value="1">
+				<directory name="mingw">
+					<xi:include href="lib/3rdparty/mingw/mingw.rbuild" />
+				</directory>
+			</if>
+			<directory name="zlib">
+				<xi:include href="lib/3rdparty/zlib/zlib.rbuild" />
+			</directory>
+		</directory>
+		<directory name="sdk">
+			<xi:include href="lib/sdk/sdk.rbuild" />
+		</directory>
+		<directory name="cmlib">
+			<xi:include href="lib/cmlib/cmlib.rbuild" />
+		</directory>
+		<directory name="debugsup">
+			<xi:include href="lib/debugsup/debugsup.rbuild" />
+		</directory>
+		<directory name="drivers">
+			<xi:include href="lib/drivers/directory.rbuild" />
+		</directory>
+		<directory name="epsapi">
+			<xi:include href="lib/epsapi/epsapi.rbuild" />
+		</directory>
+		<directory name="fslib">
+			<xi:include href="lib/fslib/directory.rbuild" />
+		</directory>
+		<directory name="host">
+			<xi:include href="lib/host/directory.rbuild" />
+		</directory>
+		<directory name="inflib">
+			<xi:include href="lib/inflib/inflib.rbuild" />
+		</directory>
+		<directory name="nls">
+			<xi:include href="lib/nls/nls.rbuild" />
+		</directory>
+		<directory name="ntdllsys">
+			<xi:include href="lib/ntdllsys/ntdllsys.rbuild" />
+		</directory>
+		<directory name="pseh">
+			<xi:include href="lib/pseh/pseh.rbuild" />
+		</directory>
+		<directory name="recyclebin">
+			<xi:include href="lib/recyclebin/recyclebin.rbuild" />
+		</directory>
+		<directory name="rossym">
+			<xi:include href="lib/rossym/rossym.rbuild" />
+		</directory>
+		<directory name="rtl">
+			<xi:include href="lib/rtl/rtl.rbuild" />
+		</directory>
+		<directory name="smlib">
+			<xi:include href="lib/smlib/smlib.rbuild" />
+		</directory>
+		<directory name="win32ksys">
+			<xi:include href="lib/win32ksys/win32ksys.rbuild" />
+		</directory>
 	</directory>
+
 	<directory name="media">
 		<xi:include href="media/media.rbuild" />
 	</directory>
-	<directory name="modules">
-		<xi:include href="modules/directory.rbuild" />
-	</directory>
+
 	<directory name="ntoskrnl">
 		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
-		<if property="BUILD_MP" value="1">
-			<xi:include href="ntoskrnl/ntkrnlmp.rbuild" />
-		</if>
 	</directory>
+
 	<directory name="subsystems">
 		<xi:include href="subsystems/subsystems.rbuild" />
 	</directory>
+
 	<directory name="tools">
 		<xi:include href="tools/tools.rbuild" />
 	</directory>
 
+<!-- Here ends <xi:include href="ReactOS-generic.rbuild" /> -->
+
 </project>

reactos/ReactOS-arm.rbuild

@@ -29,8 +29,6 @@
 			<compilerflag>-ftracer</compilerflag>
 		</if>
         <compilerflag>-Wno-attributes</compilerflag>
-        <compilerflag>-U_UNICODE</compilerflag>
-        <compilerflag>-UUNICODE</compilerflag>
 	</group>
 
 
@@ -111,7 +109,17 @@
 		<xi:include href="ntoskrnl/ntoskrnl.rbuild" />
 	</directory>
 	<directory name="hal">
-		<xi:include href="hal/hal.rbuild" />
+		<directory name="halarm">
+			<directory name="generic">
+				<xi:include href="hal/halarm/generic/generic.rbuild" />
+			</directory>
+			<directory name="up">
+				<xi:include href="hal/halarm/up/halup.rbuild" />
+			</directory>
+		</directory>
+		<directory name="hal">
+			<xi:include href="hal/hal/hal.rbuild" />
+		</directory>
 	</directory>
 	<directory name="boot">
 		<xi:include href="boot/boot.rbuild" />

reactos/ReactOS-generic.rbuild

@@ -89,6 +89,8 @@
 	<group compilerset="gcc">
 		<compilerflag>-Wall</compilerflag>
 		<compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag>
+		<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
+		<compilerflag compiler="as">-gstabs+</compilerflag>
 	</group>
 
 	<group compilerset="msc">
@@ -117,9 +119,9 @@
 		</if>
 
 		<compilerflag>-fno-strict-aliasing</compilerflag>
+		<compilerflag>-Wno-strict-aliasing</compilerflag>
 		<compilerflag>-Wpointer-arith</compilerflag>
 		<compilerflag>-Wno-multichar</compilerflag>
-		<compilerflag>-Wno-error=uninitialized</compilerflag>
 		<!-- compilerflag>-H</compilerflag>    enable this for header traces -->
 	</group>
 
@@ -149,4 +151,5 @@
 		<compilerflag>/GS-</compilerflag>
 	</group>
 
+	<define name="_USE_32BIT_TIME_T" />
 </group>

reactos/ReactOS-i386.rbuild

@@ -15,7 +15,6 @@
 	<define name="TARGET_i386" host="true" />
 
 	<define name="USE_COMPILER_EXCEPTIONS" />
-	<define name="_USE_32BIT_TIME_T" />
 
 	<property name="PLATFORM" value="PC"/>
 
@@ -26,8 +25,6 @@
 		</if>
 		<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
 		<compilerflag compiler="midl">-m32 --win32</compilerflag>
-		<compilerflag compiler="cc,cxx">-gstabs+</compilerflag>
-		<compilerflag compiler="as">-gstabs+</compilerflag>
 	</group>
 
 	<group linkerset="ld">

reactos/base/applications/applications.rbuild

@@ -79,9 +79,6 @@
 	<directory name="shutdown">
 		<xi:include href="shutdown/shutdown.rbuild" />
 	</directory>
-	<directory name="sndrec32">
-		<xi:include href="sndrec32/sndrec32.rbuild" />
-	</directory>
 	<directory name="sndvol32">
 		<xi:include href="sndvol32/sndvol32.rbuild" />
 	</directory>

reactos/base/applications/cacls/cacls.c

@@ -180,14 +180,14 @@ BOOL
 PrintFileDacl(IN LPTSTR FilePath,
               IN LPTSTR FileName)
 {
-    SIZE_T Length;
+    SIZE_T Indent;
     PSECURITY_DESCRIPTOR SecurityDescriptor;
     DWORD SDSize = 0;
     TCHAR FullFileName[MAX_PATH + 1];
     BOOL Error = FALSE, Ret = FALSE;
 
-    Length = _tcslen(FilePath) + _tcslen(FileName);
-    if (Length > MAX_PATH)
+    Indent = _tcslen(FilePath) + _tcslen(FileName);
+    if (Indent++ > MAX_PATH - 1)
     {
         /* file name too long */
         SetLastError(ERROR_FILE_NOT_FOUND);

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>
+	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>ntdll</library>
 	<library>user32</library>

reactos/base/applications/calc/calc.rbuild

@@ -4,6 +4,7 @@
 	<include base="calc">.</include>
 	<define name="DISABLE_HTMLHELP_SUPPORT">1</define>
 	<library>advapi32</library>
+	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<file>about.c</file>

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

@@ -324,7 +324,7 @@ END
 
 IDD_DIALOG_STAT DIALOGEX DISCARDABLE  0, 0, 163, 85
 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Statistikbox"
+CAPTION "Statistik Box"
 FONT 8, "MS Shell Dlg"
 BEGIN
     LISTBOX         IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | 
@@ -465,11 +465,11 @@ END
 // FL<46>CHENTYPEN
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_AREA_ACRES                  "Acre"
-    IDS_AREA_ACRES_BRAZIL           "Acre (Brasilien)"
-    IDS_AREA_ACRES_FRANCE           "Acre (Frankreich)"
-    IDS_AREA_ACRES_SCOTS            "Acre (Schottland)"
-    IDS_AREA_ACRES_US               "Acre (USA)"
+    IDS_AREA_ACRES                  "Acres"
+    IDS_AREA_ACRES_BRAZIL           "Acres (Brasilien)"
+    IDS_AREA_ACRES_FRANCE           "Acres (Frankreich)"
+    IDS_AREA_ACRES_SCOTS            "Acres (Schottland)"
+    IDS_AREA_ACRES_US               "Acres (USA)"
     IDS_AREA_ARES                   "Ar"
     IDS_AREA_CHOU                   "Chou"
     IDS_AREA_DANBO                  "Danbo"
@@ -482,21 +482,21 @@ BEGIN
     IDS_AREA_PYEONGBANGJA           "Pyeongbangja"
     IDS_AREA_RAI                    "Rai"
     IDS_AREA_SE                     "Se"
-    IDS_AREA_SQUARE_CHR             "Quadratchr"
-    IDS_AREA_SQUARE_FATHOMS         "Quadratfathom"
-    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Quadratfathom (Ungarn)"
-    IDS_AREA_SQUARE_FEET            "Quadratfu<EFBFBD>"
-    IDS_AREA_SQUARE_KILOMETERS      "Quadratkilometer"
-    IDS_AREA_SQUARE_LAR             "Quadratlar"
-    IDS_AREA_SQUARE_METER           "Quadratmeter"
-    IDS_AREA_SQUARE_MILES           "Quadratmeilen"
-    IDS_AREA_SQUARE_MILLIMETERS     "Quadratmillimeter"
-    IDS_AREA_SQUARE_SHAKU           "Quadratshaku"
-    IDS_AREA_SQUARE_TSUEN           "Quadrattsuen"
-    IDS_AREA_SQUARE_VA              "Quadratva"
-    IDS_AREA_SQUARE_YARD            "Quadratyard"
+    IDS_AREA_SQUARE_CHR             "Qaudratchr"
+    IDS_AREA_SQUARE_FATHOMS         "Qaudratfathom"
+    IDS_AREA_SQUARE_FATHOMS_HUNGARY "Qaudratfathom (Ungarn)"
+    IDS_AREA_SQUARE_FEET            "Qaudratfu<EFBFBD>"
+    IDS_AREA_SQUARE_KILOMETERS      "Qaudratkilometer"
+    IDS_AREA_SQUARE_LAR             "Qaudratlar"
+    IDS_AREA_SQUARE_METER           "Qaudratmeter"
+    IDS_AREA_SQUARE_MILES           "Qaudratmeilen"
+    IDS_AREA_SQUARE_MILLIMETERS     "Qaudratmillimeter"
+    IDS_AREA_SQUARE_SHAKU           "Qaudratshaku"
+    IDS_AREA_SQUARE_TSUEN           "Qaudrattsuen"
+    IDS_AREA_SQUARE_VA              "Qaudratva"
+    IDS_AREA_SQUARE_YARD            "Qaudratyard"
     IDS_AREA_SQUARE_CENTIMETERS     "Quadratzentimeter"
-    IDS_AREA_SQUARE_INCHES          "Quadratzoll"
+    IDS_AREA_SQUARE_INCHES          "Qaudratzoll"
     IDS_AREA_TAN                    "Tan"
     IDS_AREA_TSUBO                  "Tsubo"
 END
@@ -517,7 +517,7 @@ BEGIN
     IDS_CURRENCY_DEUTSCHE_MARK      "Deutsche Mark"
     IDS_CURRENCY_EURO               "Euro"
     IDS_CURRENCY_FINNISH_MARKKA     "Finnische Mark"
-    IDS_CURRENCY_FRENCH_FRANC       "Franz<6E>schische Franc"
+    IDS_CURRENCY_FRENCH_FRANC       "Franz<6E>schishe Franc"
     IDS_CURRENCY_GREEK_DRACHMA      "Griechische Drachme"
     IDS_CURRENCY_IRISH_POUND        "Irische Pfund"
     IDS_CURRENCY_ITALIAN_LIRA       "Italienische Lire"

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

@@ -703,7 +703,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_WEIGHT_BAHT                 "Baht"
-    IDS_WEIGHT_CARATS               "Karaat"
+    IDS_WEIGHT_CARATS               "Carats"
     IDS_WEIGHT_CHUNG                "Chung"
     IDS_WEIGHT_DON                  "Don"
     IDS_WEIGHT_GEUN                 "Geun"

reactos/base/applications/charmap/charmap.rbuild

@@ -3,6 +3,7 @@
 <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes">
 	<include base="charmap">.</include>
 	<library>gdi32</library>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<compilationunit name="unit.c">

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

@@ -1,7 +1,7 @@
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\"
+CAPTION "<22>L<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>^<5E>[ <20>}<7D>b<EFBFBD>v"
 FONT 9,"MS UI Gothic",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
 BEGIN
@@ -18,11 +18,11 @@ BEGIN
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\<EFBFBD>ɂ‚<EFBFBD><EFBFBD><EFBFBD>"
+CAPTION "<22>L<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>^<5E>[ <20>}<7D>b<EFBFBD>v<EFBFBD>ɂ‚<EFBFBD><EFBFBD><EFBFBD>"
 FONT 9,"MS UI Gothic",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD>R<EFBFBD>[<5B>h<EFBFBD>\\ v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
+  LTEXT         "<22>L<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>N<EFBFBD>^<5E>[ <20>}<7D>b<EFBFBD>v v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
   PUSHBUTTON    "<22>‚<EFBFBD><C282><EFBFBD>", IDOK, 75, 162, 44, 15
   ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE

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

@@ -21,12 +21,12 @@ BEGIN
   EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_SELECT, 194, 186, 44, 13
   PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
+  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
   //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
+CAPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
@@ -38,6 +38,6 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>䳿 <20><> <20><>, <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><D2B2> <20><><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
-  IDS_ABOUT     "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
+  IDS_LICENSE   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> (<28><><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>䳿 <20><> <20><>, <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><D2B2> <20><><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_ABOUT     "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>..."
 END

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

@@ -1,37 +0,0 @@
-// Chinese (Simplified) language resource file (Elton Chung, elton328@gmail.com)
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "<22>ַ<EFBFBD><D6B7><EFBFBD>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
-BEGIN
-  LTEXT         "<22><><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 7, 24, 9
-  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "˵<><CBB5>", IDC_CMHELP, 249, 5, 35, 13
-  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "<22><><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5>ַ<EFBFBD>:", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "ѡ<><D1A1>", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><D6B7><EFBFBD>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT         "<22>ַ<EFBFBD><D6B7><EFBFBD> v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-  PUSHBUTTON    "<22>ر<EFBFBD>", IDOK, 75, 162, 44, 15
-  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE   "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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
-  IDS_ABOUT     "<22><><EFBFBD><EFBFBD>(&A)..."
-END

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

@@ -1,37 +0,0 @@
-// Chinese (Traditional) language resource file (Elton Chung, elton328@gmail.com)
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233
-CAPTION "<22>r<EFBFBD>Ū<EFBFBD>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_SYSMENU | WS_MINIMIZEBOX
-BEGIN
-  LTEXT         "<22>r<EFBFBD><72><EFBFBD>G", IDC_STATIC, 6, 7, 24, 9
-  COMBOBOX      IDC_FONTCOMBO, 36, 5, 210, 210, WS_CHILD | WS_VISIBLE | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT | CBS_HASSTRINGS
-  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDC_CMHELP, 249, 5, 35, 13
-  CONTROL       "", IDC_FONTMAP, "FontMapWnd", WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL, 20, 22, 266, 156
-  LTEXT         "<22>ݽƻs<C6BB><73><EFBFBD>r<EFBFBD>šG", IDC_STATIC, 6, 188, 66, 9
-  EDITTEXT       IDC_TEXTBOX, 74, 186, 114, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD>", IDC_SELECT, 194, 186, 44, 13
-  PUSHBUTTON    "<22>ƻs", IDC_COPY, 242, 186, 44, 13, WS_DISABLED
-  //AUTOCHECKBOX  "Advanced view", IDC_ADVVIEW, 10, 204, 64, 9, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  //EDITTEXT      IDC_DISPLAY,  8, 217, 278, 13, WS_VISIBLE | WS_TABSTOP | ES_READONLY
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,210,182
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>r<EFBFBD>Ū<EFBFBD>"
-FONT 8,"MS Shell Dlg",0,0
-STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT         "<22>r<EFBFBD>Ū<EFBFBD> v0.1\nCopyright (C) 2007 Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 150, 36
-  PUSHBUTTON    "<22><><EFBFBD><EFBFBD>", IDOK, 75, 162, 44, 15
-  ICON          IDI_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT      IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LICENSE   "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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
-  IDS_ABOUT     "<22><><EFBFBD><EFBFBD>(&A)..."
-END

reactos/base/applications/charmap/rsrc.rc

@@ -25,5 +25,3 @@ IDI_ICON ICON "res/charmap.ico"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"
-#include "lang/zh-CN.rc"
-#include "lang/zh-TW.rc"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
+	<library>kernel32</library>
 	<file>dbgprint.c</file>
 </module>

reactos/base/applications/cmdutils/doskey/doskey.rbuild

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

reactos/base/applications/cmdutils/doskey/doskey.rc

@@ -5,8 +5,5 @@
 
 #include <windows.h>
 #include "doskey.h"
-
-#include "lang/bg-BG.rc"
-#include "lang/de-DE.rc"
 #include "lang/en-US.rc"
 #include "lang/uk-UA.rc"

reactos/base/applications/cmdutils/doskey/lang/bg-BG.rc

@@ -1,27 +0,0 @@
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "<22><><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> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-\n\
-DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>]\n\
-       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=<3D><><EFBFBD><EFBFBD>] [macroname=[<5B><><EFBFBD><EFBFBD><EFBFBD>]]\n\
-\n\
-  /INSERT             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /OVERSTRIKE         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /EXENAME=<3D><><EFBFBD><EFBFBD><EFBFBD>exe   <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                      <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> cmd.exe.\n\
-  /HISTORY            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /LISTSIZE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>      <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /REINSTALL          <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS             <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS:<3A><><EFBFBD><EFBFBD><EFBFBD>exe     <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROS:ALL         <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /MACROFILE=<3D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD>.\n\
-  macroname           <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  text                <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n"
-
-IDS_INVALID_MACRO_DEF, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>: %s\n"
-
-END

reactos/base/applications/cmdutils/doskey/lang/de-DE.rc

@@ -1,28 +0,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-BEGIN
-
-IDS_HELP, "Verwaltet Einstellungen, Verlauf und Makros der Kommandozeile.\n\
-\n\
-DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
-       [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\
-\n\
-  /INSERT             Aktiviert den Einfügemodus.\n\
-  /OVERSTRIKE         Deaktiviert den Einfügemodus.\n\
-  /EXENAME=exename    Legt den Namen der Anwendung, auf die die Einstel-\n\
-                      lungen angewendet werden sollen, fest. Der Standard-\n\
-                      wert ist cmd.exe.\n\
-  /HISTORY            Zeigt den Befehlsverlauf an.\n\
-  /LISTSIZE=size      Legt die Anzahl der Befehle per Verlaufspuffer fest.\n\
-  /REINSTALL          Leert den Befehlsverlauf.\n\
-  /MACROS             Zeigt Makrodefinitionen an.\n\
-  /MACROS:exename     Zeigt Makrodefinitionen für eine Anwendung an.\n\
-  /MACROS:ALL         Zeigt Makrodefinitionen für alle Anwendungen an.\n\
-  /MACROFILE=file     Lädt Makrodefinitionen aus einer Datei.\n\
-  macroname           Legt den Namen eines zu erstellenden Makros fest.\n\
-  text                Legt den ersetzenden Text des Makros fest.\n"
-
-IDS_INVALID_MACRO_DEF, "Ungültige Makrodefinition: %s\n"
-
-END

reactos/base/applications/cmdutils/doskey/lang/en-US.rc

@@ -18,7 +18,7 @@ DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\
   /MACROS             Displays macro definitions.\n\
   /MACROS:exename     Displays macro definitions for a specific program.\n\
   /MACROS:ALL         Displays macro definitions for all programs.\n\
-  /MACROFILE=file     Loads macro definitions from a file.\n\
+  /MACROFILE=filename Loads macro definitions from a file.\n\
   macroname           Specifies the name of a macro to create.\n\
   text                Specifies the replacement text for the macro.\n"
 

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">
+	<library>kernel32</library>
 	<library>user32</library>
 	<file>find.c</file>
 	<file>find.rc</file>

reactos/base/applications/cmdutils/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">
+	<library>kernel32</library>
 	<file>hostname.c</file>
 	<file>hostname.rc</file>
 </module>

reactos/base/applications/cmdutils/lodctr/lodctr.rbuild

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="lodctr" type="win32cui" installbase="system32" installname="lodctr.exe" unicode="yes">
+	<library>kernel32</library>
 	<library>loadperf</library>
 	<library>wine</library>
 	<file>lodctr_main.c</file>

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

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

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

@@ -35,6 +35,6 @@ STRINGTABLE
     STRING_SUCCESS, "Der Vorgang wurde erfolgreich abgeschlossen\n"
     STRING_INVALID_KEY, "Fehler: Ungültiger Schlüssel\n"
     STRING_INVALID_CMDLINE, "Fehler: Ungültige Befehlszeilenargumente\n"
-    STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum entfernten Rechner hinzufügen\n"
+    STRING_NO_REMOTE, "Fehler: Konnte Schlüssel nicht zum remote Rechner hinzufügen\n"
     STRING_CANNOT_FIND, "Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n"
 }

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

@@ -31,9 +31,4 @@ STRINGTABLE
     STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve] [/t <тип>] [/s <разделитель>] [/d данные] [/f]\n"
     STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> | /ve | /va] [/f]\n"
     STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n"
-    STRING_SUCCESS, "Операция успешно завершена\n"
-    STRING_INVALID_KEY, "Ошибка: неправильное имя ключа\n"
-    STRING_INVALID_CMDLINE, "Ошибка: неправильные параметры командной строки\n"
-    STRING_NO_REMOTE, "Ошибка: невозможно добавить ключи на удаленной машине\n"
-    STRING_CANNOT_FIND, "Ошибка: не удалось найти указанный ключ реестра или значение\n"
 }

reactos/base/applications/cmdutils/reg/reg.c

@@ -255,8 +255,7 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
         /* FIXME:  Prompt for delete */
     }
 
-    /* Delete subtree only if no /v* option is given */
-    if (!value_name && !value_empty && !value_all)
+    if (!value_name)
     {
         if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS)
         {
@@ -280,6 +279,13 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
         DWORD count;
         LONG rc;
 
+        if (value_name)
+        {
+            RegCloseKey(subkey);
+            reg_message(STRING_INVALID_CMDLINE);
+            return 1;
+        }
+
         rc = RegQueryInfoKeyW(subkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
             &maxValue, NULL, NULL, NULL);
         if (rc != ERROR_SUCCESS)
@@ -294,10 +300,10 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty,
         while (1)
         {
             count = maxValue;
-            rc = RegEnumValueW(subkey, 0, szValue, &count, NULL, NULL, NULL, NULL);
+            rc = RegEnumValueW(subkey, 0, value_name, &count, NULL, NULL, NULL, NULL);
             if (rc == ERROR_SUCCESS)
             {
-                rc = RegDeleteValueW(subkey, szValue);
+                rc = RegDeleteValueW(subkey,value_name);
                 if (rc != ERROR_SUCCESS)
                     break;
             }

reactos/base/applications/cmdutils/reg/reg.rbuild

@@ -4,6 +4,7 @@
 	<library>wine</library>
 	<library>advapi32</library>
 	<library>user32</library>
+	<library>kernel32</library>
 	<file>reg.c</file>
 	<file>rsrc.rc</file>
 </module>

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

@@ -75,7 +75,7 @@ Mit:\n\
 [/C]  Nach Fehlern den Kopiervorgang fortsetzen\n\
 [/A]  Nur Dateien mit Archivbit kopieren\n\
 [/M]  Nur Dateien mit Archivbit kopieren, danach Archivbit löschen\n\
-[/D | /D:M-T-J] Kopiere neue Dateien und Dateien, die neuer als das\n\
+[/D | /D:m-d-y] Kopiere neue Dateien und Dateien, die neuer als das\n\
 \t\tangegebene Datum sind. Wird kein Datum angegegebn, werden nur\n\
 \t\tQuelldateien kopiert, die neuer sind als die Zieldatei\n\n"
 

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

@@ -1,84 +0,0 @@
-/*
- * XCOPY - Wine-compatible xcopy program
- * Italian language support
- *
- * Copyright (C) 2010 Luca Bennati
- *
- * 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 "xcopy.h"
-
-/*UTF-8*/
-#pragma code_page(65001)
-
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-
-STRINGTABLE
-{
-    STRING_INVPARMS, "Numero non valido di parametri - Digita xcopy /? per l'aiuto\n"
-    STRING_INVPARM,  "Parametro '%s' non valido -  Digita xcopy /? per l'aiuto\n"
-    STRING_PAUSE,    "Premi Invio per iniziare a copiare\n"
-    STRING_SIMCOPY,  "%d file(s) sarebbero copiati\n"
-    STRING_COPY,     "%d file(s) copiati\n"
-    STRING_QISDIR,   "'%s' è il nome di un file o una cartella\n" \
-                     "sull'obiettivo?\n" \
-                     "(F - File, C - Cartella)\n"
-    STRING_SRCPROMPT,"%s? (Sì|No)\n"
-    STRING_OVERWRITE,"Sovrascrivere %s? (Sì|No|Tutti)\n"
-    STRING_COPYFAIL, "La copia di '%s' in '%s' è fallita con r/c %d\n"
-    STRING_OPENFAIL, "Impossibile aprire '%s'\n"
-    STRING_READFAIL, "Errore durante la lettura di '%s'\n"
-    STRING_YES_CHAR, "S"
-    STRING_NO_CHAR,  "N"
-    STRING_ALL_CHAR, "T"
-    STRING_FILE_CHAR,"F"
-    STRING_DIR_CHAR, "C"
-
-    STRING_HELP,
-"XCOPY - Copia file(s) e alberi di cartelle sorgenti in una destinazione\n\
-\n\
-Sintassi:\n\
-XCOPY sorgente [destinazione] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
-\t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
-\n\
-Dove:\n\
-\n\
-[/I]  Assumi una cartella se la destinazione non esiste e sono copiati 2 o\n\
-\tpiù files\n\
-[/S]  Copia le cartelle e le sottocartelle\n\
-[/E]  Copia le cartelle e le sottocartelle, includendo quelle vuote\n\
-[/Q]  Non mostrare i nomi durante la copia, modalità silenziosa.\n\
-[/F]  Mostra i nomi completi della sorgente e della destinazione durante la copia\n\
-[/L]  Simula l'operazione, mostrando i nome che sarebbero copiati\n\
-[/W]  Prompts before beginning the copy operation\n\
-[/T]  Crea la struttura di cartelle vuote ma non copia i files\n\
-[/Y]  Disabilita le conferme quando sono sovrascritti files\n\
-[/-Y] Abilita le conferme quando sono sovrascritti files\n\
-[/P]  Chiede conferma per ogni file sorgente prima di copiare\n\
-[/N]  Copia usando gli short names\n\
-[/U]  Copia solo files che sono già presenti nella destinazione\n\
-[/R]  Sovrascrivi ogni file che abbia l'attributo Sola Lettura\n\
-[/H]  Includi files nascosti e di sistema nella copia\n\
-[/C]  Continua anche se accade un errore durante la copia\n\
-[/A]  Copia solo files che abbiano l'attributo Archivio\n\
-[/M]  Copia solo files che abbiano l'attributo Archivio, rimuovendo\n\
-\tl'attributo\n\
-[/D | /D:m-g-a] Copia i nuovi files o quelli modificati dopo la data fornita.\n\
-\t\tSe nessuna data è stata fornita, copia solo se la destinazione è più vecchia\n\
-\t\tdella sorgente\n\n"
-
-}
-#pragma code_page(default)

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

@@ -1,85 +0,0 @@
-/*
- * XCOPY - Wine-compatible xcopy program
- * Ukrainian language support
- *
- * Copyright (C) 2007 J. Edmeades
- * Copyright (C) 2010 I. Paliychuk
- *
- * 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 "xcopy.h"
-
-/* UTF-8 */
-#pragma code_page(65001)
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-STRINGTABLE
-{
-    STRING_INVPARMS, "Невірна кількість параметрів - Введіть xcopy /? для довідки\n"
-    STRING_INVPARM,  "Невірний параметр '%s' -  Введіть xcopy /? для довідки\n"
-    STRING_PAUSE,    "Натисніть <enter> щоб почати копіювання\n"
-    STRING_SIMCOPY,  "%d файл(ів) буде скопійовано\n"
-    STRING_COPY,     "%d файл(ів) скопійовано\n"
-    STRING_QISDIR,   "'%s' є файлом чи директорією\n" \
-                     "on the target?\n" \
-                     "(F - Файл, D - Директорія)\n"
-    STRING_SRCPROMPT,"%s? (Yes|No)\n"
-    STRING_OVERWRITE,"Переписати %s? (Yes|No|All)\n"
-    STRING_COPYFAIL, "Під час копіювання '%s' в '%s' сталась помилка r/c %d\n"
-    STRING_OPENFAIL, "Не вдалось відкрити '%s'\n"
-    STRING_READFAIL, "Помилка читання '%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 - Копіює файли та дерева директорій за призначенням\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]  Копіює директорії та піддиректорії\n\
-[/E]  Копіює директорії та піддиректорії, включно з порожніми\n\
-[/Q]  Do not list names during copy, ie quiet.\n\
-[/F]  Під час копіювання відображає повні імена початкових і кінцевих файлів\n\
-[/L]  Simulate operation, showing names which would be copied\n\
-[/W]  Питає підтвердження перед початком копіювання\n\
-[/T]  Створює структуру каталогів але не копіює файли\n\
-[/Y]  Suppress prompting when overwriting files\n\
-[/-Y] Питає підтвердження на перезапис файлів\n\
-[/P]  Prompts on each source file before copying\n\
-[/N]  Копіює, використовуючи короткі імена\n\
-[/U]  Copy only files which already exist in destination\n\
-[/R]  Перезаписує файли, доступні лише для читання\n\
-[/H]  Include hidden and system files in the copy\n\
-[/C]  Продовжує роботу, навіть якщо при копіюванні виникла помилка\n\
-[/A]  Копіює лише файли з властивістю АРХІВНИЙ\n\
-[/M]  Копіює лише файли з властивістю АРХІВНИЙ, видаляє\n\
-\властивість АРХІВНИЙ\n\
-[/D | /D:m-d-y] Копіює лише нові файли або ті, які були змінені після вказаної дати.\n\
-\t\tЯкщо дата не вказана, only copy if destination is older\n\
-\t\tthan source\n\n"
-
-}
-#pragma code_page(default)

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

@@ -30,7 +30,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "De.rc"
 #include "En.rc"
 #include "Fr.rc"
-#include "It.rc"
 #include "Ja.rc"
 #include "Ko.rc"
 #include "Lt.rc"
@@ -40,4 +39,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "Pt.rc"
 #include "Ru.rc"
 #include "Si.rc"
-#include "Uk.rc"

reactos/base/applications/cmdutils/xcopy/xcopy.c

@@ -261,10 +261,10 @@ int wmain (int argc, WCHAR *argvW[])
     WINE_TRACE("Destination : '%s'\n", wine_dbgstr_w(supplieddestination));
 
     /* Extract required information from source specification */
-    XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags);
+    rc = XCOPY_ProcessSourceParm(suppliedsource, sourcestem, sourcespec, flags);
 
     /* Extract required information from destination specification */
-    XCOPY_ProcessDestParm(supplieddestination, destinationstem,
+    rc = XCOPY_ProcessDestParm(supplieddestination, destinationstem,
                                destinationspec, sourcespec, flags);
 
     /* Trace out the resulting information */

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

@@ -5,6 +5,7 @@
 	<library>wine</library>
 	<library>shell32</library>
 	<library>user32</library>
+	<library>kernel32</library>
 	<file>xcopy.c</file>
 	<file>rsrc.rc</file>
 	<metadata description="xcopy command-line tool" />

reactos/base/applications/control/control.rbuild

@@ -3,6 +3,7 @@
 <module name="control" type="win32gui" baseaddress="${BASEADDRESS_CONTROL}" installbase="system32" installname="control.exe" unicode="yes">
 	<include base="control">.</include>
 	<library>advapi32</library>
+	<library>kernel32</library>
 	<library>shell32</library>
 	<file>control.c</file>
 	<file>control.rc</file>

reactos/base/applications/downloader/downloader.rbuild

@@ -5,6 +5,7 @@
 		<include base="downloader">.</include>
 		<include base="expat">.</include>
 
+		<library>kernel32</library>
 		<library>advapi32</library>
 		<library>ntdll</library>
 		<library>user32</library>

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

@@ -15,11 +15,11 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_BORDER | WS_CAPTION | WS_POPUP | WS_SYSMENU
 CAPTION "Einstellungen"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT "Downloadordner:", -1, 6, 10, 140, 8
+    LTEXT "Download Ordner:", -1, 6, 10, 140, 8
     EDITTEXT IDC_DOWNLOAD_FOLDER_EDIT, 6, 20, 205, 14, WS_VISIBLE | WS_TABSTOP
     PUSHBUTTON "W&<26>hle...", IDC_CHOOSE_BUTTON, 216, 20, 45, 14
     AUTOCHECKBOX "&Installationsdateien nach dem Setup l<>schen", IDC_DELINST_FILES_CHECKBOX, 8, 40, 210, 10, WS_GROUP
-    LTEXT "Updateserver:", -1, 6, 55, 140, 8
+    LTEXT "Update Server:", -1, 6, 55, 140, 8
     EDITTEXT IDC_UPDATE_SERVER_EDIT, 6, 65, 255, 14, WS_VISIBLE | WS_TABSTOP
     DEFPUSHBUTTON "&OK", IDOK, 147, 90, 54, 15
     PUSHBUTTON "&Abbrechen", IDCANCEL, 207, 90, 54, 15
@@ -31,7 +31,7 @@ BEGIN
     IDS_WELCOME_TITLE        "Willkommen im ReactOS Downloader"
     IDS_WELCOME              "Bitte w<>hlen Sie links eine Kategorie. Dies ist Version 1.1."
     IDS_NO_APP_TITLE         "Keine Anwendung ausgew<65>hlt"
-    IDS_NO_APP               "Bitte w<>hlen Sie eine Anwendung aus, bevor Sie die Download-Schaltfl<66>che bet<65>tigen. Wenn Sie Hilfe ben<65>tigen, dr<64>cken Sie die Hilfe-Schaltfl<66>che in der oberen rechten Ecke."
+    IDS_NO_APP               "Bitte w<>hlen Sie eine Anwendung, bevor Sie die Download-Schaltfl<66>che bet<65>tigen. Wenn Sie Hilfe ben<65>tigen, dr<64>cken Sie die Hilfe-Schaltfl<66>che in der oberen rechten Ecke."
     IDS_UPDATE_TITLE         "Update"
     IDS_UPDATE               "Diese Funktion wurde noch nicht implementiert."
     IDS_HELP_TITLE           "Hilfe"
@@ -41,20 +41,20 @@ BEGIN
     IDS_CHOOSE_SUB           "Bitte w<>hlen Sie eine Unterkategorie."
     IDS_CHOOSE_CATEGORY      "Bitte w<>hlen Sie eine Kategorie."
     IDS_CHOOSE_BOTH          "Bitte w<>hlen Sie eine Unterkategorie oder eine Anwendung."
-    IDS_XMLERROR_1           "XML-Datei nicht gefunden!"
-    IDS_XMLERROR_2           "XML-Datei kann nicht verarbeitet werden!"
+    IDS_XMLERROR_1           "XML Datei nicht gefunden!"
+    IDS_XMLERROR_2           "XML Datei kann nicht verarbeitet werden!"
     IDS_DOWNLOAD_ERROR       "Die Datei konnte nicht heruntergeladen werden.\nBitte pr<70>fen sie, ob eine Verbindung zum Internet besteht."
     IDS_VERSION              "Version: "
     IDS_LICENCE              "Lizenz: "
     IDS_MAINTAINER           "Maintainer: "
     IDS_APPS_TITLE           "Anwendungen"
     IDS_CATS_TITLE           "Kategorien"
-    IDS_CHOOSE_FOLDER        "Bitte w<>hlen Sie den Ordner aus..."
+    IDS_CHOOSE_FOLDER        "Bitte w<>hlen Sie den Ordner..."
     IDS_NOTCREATE_REGKEY     "Registryschl<68>ssel k<>nnte nicht erstellt werden."
     IDS_DOWNLOAD_FOLDER      "Downloader"
     IDS_UNABLECREATE_FOLDER  "Es konnte kein Ordner mit diesem Namen erstellt werden!"
     IDS_UPDATE_URL           "http://svn.reactos.org"
-    IDS_INSTALL_DEP          "%s wird ben<65>tigt, um %s ausf<73>hren zu k<>nnen. Soll %s jetzt installiert werden?"
+    IDS_INSTALL_DEP          "%s wird ben<65>tigt um %s ausf<73>hren zu k<>nnen. Soll %s jetzt installiert werden?"
     TTT_HELPBUTTON           "Hilfe <20>ber den Downloader"
     TTT_UPDATEBUTTON         "Noch nicht vorhanden"
     TTT_PROFBUTTON           "Konfiguriert den Downloader"

reactos/base/applications/dxdiag/dxdiag.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dxdiag" type="win32gui" installbase="system32" installname="dxdiag.exe" unicode="yes">
 	<include base="dxdiag">.</include>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>comctl32</library>

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

@@ -148,9 +148,9 @@ IDD_INPUT_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX "DirectInput-Ger<EFBFBD>te", -1, 10, 10, 452, 80
+    GROUPBOX "DirectInput Ger<EFBFBD>te", -1, 10, 10, 452, 80
     CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "Eingabeger<EFBFBD>te", -1, 10, 100, 452, 60
+    GROUPBOX "Eingabebezogene Ger<EFBFBD>te", -1, 10, 100, 452, 60
     CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
     GROUPBOX "Hinweis", -1, 10, 170, 452, 50
     EDITTEXT  IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
@@ -172,7 +172,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-	IDS_MAIN_DIALOG "ReactX-Diagnoseprogramm"
+	IDS_MAIN_DIALOG "ReactX Diagnoseprogramm"
 	IDS_SYSTEM_DIALOG "System"
 	IDS_DISPLAY_DIALOG "Anzeige"
 	IDS_SOUND_DIALOG "Sound"
@@ -193,7 +193,7 @@ BEGIN
 	IDS_DEVICE_CONTROLLER "Controllererkennung"
 	IDS_DEVICE_MANUFACTURER "Herstellererkennung"
 	IDS_DEVICE_PRODUCT "Produkterkennung"
-	IDS_DEVICE_FORCEFEEDBACK "Force-Feedback-Treiber"
+	IDS_DEVICE_FORCEFEEDBACK "Force Feedback-Treiber"
 	IDS_NOT_APPLICABLE "Nicht zutreffend"
 	IDS_OPTION_YES "Ja"
 	IDS_DIRECTPLAY_COL_NAME1 "Name"
@@ -204,20 +204,20 @@ BEGIN
 	IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 serieller Dienstanbieter"
 	IDS_DIRECTPLAY8_IPXSP "DirectPlay8-IPX-Dienstanbieter"
 	IDS_DIRECTPLAY8_TCPSP "DirectPlay8-TCP/IP-Dienstanbieter"
-	IDS_DIRECTPLAY_TCPCONN "TCP/IP-Verbindung f<>r DirectPlay"
-	IDS_DIRECTPLAY_IPXCONN "IPX-Verbindung f<>r DirectPlay"
+	IDS_DIRECTPLAY_TCPCONN "TCP/IP Verbindung f<>r DirectPlay"
+	IDS_DIRECTPLAY_IPXCONN "IPX Verbindung f<>r DirectPlay"
 	IDS_DIRECTPLAY_MODEMCONN "Modemverbindung f<>r DirectPlay"
 	IDS_DIRECTPLAY_SERIALCONN "Serielle Verbindung f<>r DirectPlay"
 	IDS_REG_SUCCESS "OK"
 	IDS_REG_FAIL "Fehler"
-	IDS_DDTEST_ERROR "Test fehlgeschlagen!"
-	IDS_DDTEST_DESCRIPTION "Dies wird den DirectDraw-Interfacetest starten. Fortfahren?"
-	IDS_DDPRIMARY_DESCRIPTION "Dieser Test wird DirectDraw benutzen, um auf Ihrem prim<69>ren Bildschirm etwas darzustellen. Schwarze und wei<EFBFBD>e Rechtecke sollten zu sehen sein. Fortfahren?"
-	IDS_DDPRIMARY_RESULT "Haben Sie schwarze und wei<EFBFBD>e Rechtecke gesehen?"
-	IDS_DDOFFSCREEN_DESCRIPTION "Dieser Test wird DirectDraw benutzen, um im Offscreen-Buffer zu zeichnen. Ein bewegtes wei<65>es Rechteck sollte zu sehen sein. Fortfahren?"
-	IDS_DDOFFSCREEN_RESULT "Haben Sie das bewegte wei<65>e Rechteck gesehen?"
-	IDS_DDFULLSCREEN_DESCRIPTION "Dieser Test wird DirectDraw benutzen, um im Vollbildmodus zu zeichnen. Ein bewegtes wei<65>es Rechteck sollte zu sehen sein. Fortfahren?"
-	IDS_DDFULLSCREEN_RESULT "Haben Sie das bewegte wei<65>e Rechteck im Vollbildmodus gesehen?"
+	IDS_DDTEST_ERROR "Test failed!"
+	IDS_DDTEST_DESCRIPTION "This will start DirecDraw interface test. Continue?"
+	IDS_DDPRIMARY_DESCRIPTION "This test will use DirectDraw to draw on primary surface. Black and white rectangles should be drawn. Continue?"
+	IDS_DDPRIMARY_RESULT "Did you see black and white rectangles?"
+	IDS_DDOFFSCREEN_DESCRIPTION "This test will use DirectDraw to draw in an offscreen buffer. Moving white rectangle should be drawn. Continue?"
+	IDS_DDOFFSCREEN_RESULT "Did you see white moving reactangle?"
+	IDS_DDFULLSCREEN_DESCRIPTION "This test will use DirectDraw to draw in a fullscreen mode. Moving white rectangle should be drawn. Continue?"
+	IDS_DDFULLSCREEN_RESULT "Did you see white moving reactangle in a fullscreen mode?"
 	IDS_FORMAT_ADAPTER_MEM "%u MB"
 	IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)"
 	IDS_OPTION_NO "Nein"

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

@@ -26,7 +26,7 @@ BEGIN
     LTEXT "Operating System:", -1, 70, 90, 80, 10, SS_RIGHT
     LTEXT "Language:", -1, 70, 100, 80, 10, SS_RIGHT
     LTEXT "System Manufacturer:", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "System Model:", -1, 70, 120, 80, 10, SS_RIGHT
+    LTEXT "System Modell:", -1, 70, 120, 80, 10, SS_RIGHT
     LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
     LTEXT "Processor:", -1, 70, 140, 80, 10, SS_RIGHT
     LTEXT "Memory:", -1, 70, 150, 80, 10, SS_RIGHT

reactos/base/applications/dxdiag/lang/ua-UA.rc

@@ -1,232 +0,0 @@
-/*
- * PROJECT:     ReactOS dxdiag
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/dxdiag/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for ReactOS dxdiag
- * TRANSLATOR:  Sakara Yevhen
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-IDD_MAIN_DIALOG DIALOGEX DISCARDABLE  0, 0, 478, 280
-STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
-    WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
-    WS_THICKFRAME
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactX"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250
-    PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BUTTON_HELP, 2, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BUTTON_NEXT, 203, 260, 94, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", IDC_BUTTON_SAVE_INFO, 301, 260, 120, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD>", IDC_BUTTON_EXIT, 425, 260, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 190
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactX.", -1, 10, 10, 443, 17
-    LTEXT "<22><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ""<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><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> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.", -1, 10, 30, 443, 25
-    GROUPBOX "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 10, 58, 443, 130, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20> <20><><EFBFBD><EFBFBD>:", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "<22><>'<27> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>:", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 50, 90, 100, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD>:", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>:", -1, 50, 110, 100, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>:", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS:", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD>'<27><><EFBFBD>:", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactX:", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
-END
-
-IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 10, 10, 220, 100
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 25, 70, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 35, 70, 10
-    RTEXT "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 45, 70, 10
-    RTEXT "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DAC:", -1, 15, 55, 75, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>'<27><><EFBFBD>:", -1, 20, 65, 70, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 75, 70, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 130, 10
-
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 240, 10, 220, 100
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 245, 30, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 245, 40, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD>:", -1, 245, 50, 55, 10
-    RTEXT "ϳ<><CFB3><EFBFBD><EFBFBD>:", -1, 245, 60, 55, 10
-    RTEXT "̳<><CCB3>-VDD:", -1, 245, 70, 55, 10
-    RTEXT "VDD:", -1, 245, 80, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DDI:", -1, 245, 90, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 305, 30, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 305, 40, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 305, 50, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 305, 60, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 305, 70, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 305, 80, 130, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 305, 90, 130, 10
-
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactX", -1, 10, 115, 450, 65
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectDraw:", -1, 15, 130, 110, 12
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Direct3D:", -1, 15, 145, 110, 12
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AGP:", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BUTTON_DDRAW, 170, 126, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BUTTON_D3D, 170, 142, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_BUTTON_AGP, 170, 158, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectDraw", IDC_BUTTON_TESTDD, 250, 126, 80, 14
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Direct3D", IDC_BUTTON_TEST3D, 250, 142, 80, 14, WS_DISABLED
-
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 10, 185, 450, 34
-    EDITTEXT  IDC_TEXT_INFO, 20, 195, 432, 18, WS_DISABLED | WS_TABSTOP
-END
-
-
-IDD_SOUND_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 10, 10, 250, 100
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 25, 70, 10
-    RTEXT "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 35, 70, 10
-    RTEXT "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 45, 70, 10
-    RTEXT "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 55, 70, 10
-    RTEXT "<22><><EFBFBD>:", -1, 20, 65, 70, 10
-    RTEXT "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 270, 10, 190, 100
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>:", -1, 275, 25, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 275, 35, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD>:", -1, 275, 45, 55, 10
-    RTEXT "ϳ<><CFB3><EFBFBD><EFBFBD>:", -1, 275, 55, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>:", -1, 275, 65, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactX", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "г<><D0B3><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", -1, 20, 135, 90, 20
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectSound", IDC_BUTTON_TESTDSOUND, 270, 130, 80, 14
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 10, 180, 450, 40
-    EDITTEXT  IDC_TEXT_DSOUNDINFO, 20, 190, 432, 20, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-
-IDD_INPUT_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectInput", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 20, 432, 60
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 10, 100, 452, 60
-    CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 110, 432, 40, 0x00000200
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 10, 170, 452, 50
-    EDITTEXT  IDC_RICH_INFO, 20, 180, 432, 30, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectPlay", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-END
-
-IDD_HELP_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-	IDS_MAIN_DIALOG "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactX"
-	IDS_SYSTEM_DIALOG "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DISPLAY_DIALOG "<22><><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_SOUND_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_MUSIC_DIALOG "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_INPUT_DIALOG "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_NETWORK_DIALOG "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_HELP_DIALOG "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_FORMAT_MB "%I64u<34><75> <20><><EFBFBD>"
-	IDS_FORMAT_SWAP "%I64u <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, %I64u <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_FORMAT_UNIPROC "%s (%u <20><>)"
-	IDS_FORMAT_MPPROC  "%s (%u <20><>)"
-	IDS_VERSION_UNKNOWN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_STATUS_ATTACHED "ϳ<>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_STATUS_MISSING "³<>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_STATUS_UNKNOWN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_NAME "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_STATUS "<22><><EFBFBD><EFBFBD>"
-	IDS_DEVICE_CONTROLLER "ID <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_MANUFACTURER "ID <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_PRODUCT "ID <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_FORCEFEEDBACK "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Force Feedback"
-	IDS_NOT_APPLICABLE "<22>/<2F>"
-	IDS_OPTION_YES "<22><><EFBFBD>"
-	IDS_DIRECTPLAY_COL_NAME1 "<22><><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY_COL_NAME2 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY_COL_NAME3 "<22><><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY_COL_NAME4 "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY8_MODEMSP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectPlay8"
-	IDS_DIRECTPLAY8_SERIALSP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD> DirectPlay8"
-	IDS_DIRECTPLAY8_IPXSP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IPX DirectPlay8"
-	IDS_DIRECTPLAY8_TCPSP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> TCP/IP DirectPlay8"
-	IDS_DIRECTPLAY_TCPCONN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> TCP/IP <20><><EFBFBD> DirectPlay"
-	IDS_DIRECTPLAY_IPXCONN "IPX <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> DirectPlay"
-	IDS_DIRECTPLAY_MODEMCONN "ϳ<><CFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> DirectPlay"
-	IDS_DIRECTPLAY_SERIALCONN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> DirectPlay"
-	IDS_REG_SUCCESS "<22><><EFBFBD>"
-	IDS_REG_FAIL "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DDTEST_ERROR "<22><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
-	IDS_DDTEST_DESCRIPTION "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirecDraw <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
-	IDS_DDPRIMARY_DESCRIPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectDraw <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
-	IDS_DDPRIMARY_RESULT "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
-	IDS_DDOFFSCREEN_DESCRIPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectDraw <20><><EFBFBD> <20><><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><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
-	IDS_DDOFFSCREEN_RESULT "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
-	IDS_DDFULLSCREEN_DESCRIPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DirectDraw <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
-	IDS_DDFULLSCREEN_RESULT "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><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><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
-	IDS_FORMAT_ADAPTER_MEM "%u <20><>"
-	IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u <20><><EFBFBD>)(%u<><75>)"
-	IDS_OPTION_NO "ͳ"
-END

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

@@ -1,234 +0,0 @@
-/*
- * PROJECT:     ReactOS ReactX-Diagnostic program
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/dxdiag/lang/zh-CN.rc
- * PURPOSE:     Chinese (Simplified) Language File for ReactX-Diagnostic program
- * TRANSLATOR:  Elton Chung <elton328@gmail.com>
- */
- 
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
-IDD_MAIN_DIALOG DIALOGEX DISCARDABLE  0, 0, 478, 280
-STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
-    WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
-    WS_THICKFRAME
-CAPTION "ReactX <20><><EFBFBD>ϳ<EFBFBD>ʽ"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250 
-    PUSHBUTTON "˵<><CBB5>(&H)", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "<22><>һҳ(&N)", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѷ(&S)...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD>(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT "<22>˹<EFBFBD><CBB9>߻ᱨ<DFBB>氲װ<E6B0B2><D7B0><EFBFBD><EFBFBD>ϵͳ<CFB5><CDB3>ReactX Ԫ<><D4AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD><EFBFBD><EFBFBD>ϸ<EFBFBD><CFB8><EFBFBD>ϡ<EFBFBD>", -1, 10, 10, 443, 17
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֪<EFBFBD><D6AA><EFBFBD>Ǹ<EFBFBD><C7B8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⣬<EFBFBD><E2A3AC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӧ<EFBFBD>ı<EFBFBD>ǩ<EFBFBD><C7A9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʹ<EFBFBD>á<EFBFBD><C3A1><EFBFBD>һҳ<D2BB><D2B3><EFBFBD><EFBFBD>ť<EFBFBD><C5A5>˳<EFBFBD><CBB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿһҳ<D2BB><D2B3> ", -1, 10, 30, 443, 25
-    GROUPBOX "ϵͳ<CFB5><CDB3>Ѷ", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "Ŀǰ<C4BF><C7B0><EFBFBD><EFBFBD>/ʱ<>䣺", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƣ<EFBFBD>", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD>ϵͳ<CFB5><CDB3>", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD>ԣ<EFBFBD>", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "ϵͳ<CFB5><CDB3><EFBFBD><EFBFBD><EFBFBD>̣<EFBFBD>", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "ϵͳ<CFB5>ͺţ<CDBA>", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS<4F><53>", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "<22>ڴ棺", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "<22><>ҳ<EFBFBD><D2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX <20>汾<EFBFBD><E6B1BE>", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
-END
-
-IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "װ<><D7B0>", -1, 10, 10, 250, 100 
-    RTEXT "<22><><EFBFBD>ƣ<EFBFBD>", -1, 20, 25, 70, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>̣<EFBFBD>", -1, 20, 35, 70, 10
-    RTEXT "<22><>Ƭ<EFBFBD><C6AC><EFBFBD>ͣ<EFBFBD>", -1, 20, 45, 70, 10
-    RTEXT "DAC <20><><EFBFBD>ͣ<EFBFBD>", -1, 20, 55, 70, 10
-    RTEXT "<22>ڴ<EFBFBD><DAB4>ܼ<EFBFBD>Լ<EFBFBD><D4BC>", -1, 20, 65, 70, 10
-    RTEXT "Ŀǰ<C4BF><C7B0>ʾģʽ<C4A3><CABD>", -1, 20, 75, 70, 10
-    RTEXT "<22><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD>", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ", -1, 270, 10, 190, 100
-    RTEXT "<22><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ<EFBFBD><CABD>", -1, 275, 25, 55, 10
-    RTEXT "<22>汾<EFBFBD><E6B1BE>", -1, 275, 35, 55, 10
-    RTEXT "<22><><EFBFBD>ڣ<EFBFBD>", -1, 275, 45, 55, 10
-    RTEXT "WHQL <20><>־<EFBFBD><D6BE>", -1, 275, 55, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD> VDD<44><44>", -1, 275, 65, 55, 10
-    RTEXT "VDD<44><44>", -1, 275, 75, 55, 10
-    RTEXT "DDI <20>汾<EFBFBD><E6B1BE>", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-
-    GROUPBOX "ReactX <20><><EFBFBD><EFBFBD>", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw <20><><EFBFBD>٣<EFBFBD>", -1, 15, 130, 110, 12
-    RTEXT "Direct3D <20><><EFBFBD>٣<EFBFBD>", -1, 15, 145, 110, 12
-    RTEXT "AGP <20><><EFBFBD>ʼ<EFBFBD><CABC>٣<EFBFBD>", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD>", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD>", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD>", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD>DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD>Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-
-    GROUPBOX "<22><>ע", -1, 10, 180, 450, 40
-    EDITTEXT  IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
-END
-
-
-IDD_SOUND_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "װ<><D7B0>", -1, 10, 10, 250, 100
-    RTEXT "<22><><EFBFBD>ƣ<EFBFBD>", -1, 20, 25, 70, 10
-    RTEXT "װ<><D7B0>ʶ<EFBFBD><CAB6><EFBFBD>룺", -1, 20, 35, 70, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD>룺", -1, 20, 45, 70, 10
-    RTEXT "<22><>Ʒʶ<C6B7><CAB6><EFBFBD>룺", -1, 20, 55, 70, 10
-    RTEXT "<22><><EFBFBD>ͣ<EFBFBD>", -1, 20, 65, 70, 10
-    RTEXT "Ԥ<><D4A4>װ<EFBFBD><D7B0>:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ", -1, 270, 10, 190, 100
-    RTEXT "<22><><EFBFBD>ƣ<EFBFBD>", -1, 275, 25, 55, 10
-    RTEXT "<22>汾<EFBFBD><E6B1BE>", -1, 275, 35, 55, 10
-    RTEXT "<22><><EFBFBD>ڣ<EFBFBD>", -1, 275, 45, 55, 10
-    RTEXT "WHQL <20><>־<EFBFBD><D6BE>", -1, 275, 55, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 275, 65, 55, 10
-    RTEXT "<22>ṩ<EFBFBD>ߣ<EFBFBD>", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX <20><><EFBFBD><EFBFBD>", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "Ӳ<><D3B2><EFBFBD><EFBFBD>Ч\n<><6E><EFBFBD>ٵȼ<D9B5><C8BC><EFBFBD>", -1, 20, 135, 90, 20
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD> DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "<22><>ע", -1, 10, 180, 450, 40
-    EDITTEXT  IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-
-IDD_INPUT_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "DirectInput װ<><D7B0>", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "<22><><EFBFBD><EFBFBD>װ<EFBFBD><D7B0>", -1, 10, 100, 452, 60
-    CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "<22><>Ѷ", -1, 10, 170, 452, 50
-    EDITTEXT  IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "<22><>ע<EFBFBD><D7A2><EFBFBD><EFBFBD> DirectPlay <20><><EFBFBD><EFBFBD><EFBFBD>ṩ<EFBFBD>ߣ<EFBFBD>", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-END
-
-IDD_HELP_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-	IDS_MAIN_DIALOG "ReactX <20><><EFBFBD>Ϲ<EFBFBD><CFB9><EFBFBD>"
-	IDS_SYSTEM_DIALOG "ϵͳ"
-	IDS_DISPLAY_DIALOG "<22><>ʾ"
-	IDS_SOUND_DIALOG "<22><>Ч"
-	IDS_MUSIC_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_INPUT_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_NETWORK_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_HELP_DIALOG "˵<><CBB5>"
-	IDS_FORMAT_MB "%I64uMB RAM"
-	IDS_FORMAT_SWAP "<22><>ʹ<EFBFBD><CAB9> %I64u MB<4D><42><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %I64u MB <20><><EFBFBD><EFBFBD>"
-	IDS_FORMAT_UNIPROC "%s (%u CPU)"
-	IDS_FORMAT_MPPROC  "%s (%u CPUs)"
-	IDS_VERSION_UNKNOWN "δ֪<CEB4>汾"
-	IDS_DEVICE_STATUS_ATTACHED "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_STATUS_MISSING "<22><><EFBFBD>ж<EFBFBD><D0B6><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_STATUS_UNKNOWN "δ֪"
-	IDS_DEVICE_NAME "װ<><D7B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_STATUS "״̬"
-	IDS_DEVICE_CONTROLLER "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD><EFBFBD>"
-	IDS_DEVICE_MANUFACTURER "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʶ<EFBFBD><CAB6><EFBFBD><EFBFBD>"
-	IDS_DEVICE_PRODUCT "<22><>Ʒʶ<C6B7><CAB6><EFBFBD><EFBFBD>"
-	IDS_DEVICE_FORCEFEEDBACK "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʽ"
-	IDS_NOT_APPLICABLE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_OPTION_YES "<22><>"
-	IDS_DIRECTPLAY_COL_NAME1 "<22><><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY_COL_NAME2 "<22><>¼"
-	IDS_DIRECTPLAY_COL_NAME3 "<22><><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY_COL_NAME4 "<22>汾"
-	IDS_DIRECTPLAY8_MODEMSP "DirectPlay8 <20><><EFBFBD>ݻ<EFBFBD><DDBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ṩ<EFBFBD><E1B9A9>"
-	IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 <20><><EFBFBD>з<EFBFBD><D0B7><EFBFBD><EFBFBD>ṩ<EFBFBD><E1B9A9>"
-	IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX <20><><EFBFBD><EFBFBD><EFBFBD>ṩ<EFBFBD><E1B9A9>"
-	IDS_DIRECTPLAY8_TCPSP "DirectPlay8 TCP/IP <20><><EFBFBD><EFBFBD><EFBFBD>ṩ<EFBFBD><E1B9A9>"
-	IDS_DIRECTPLAY_TCPCONN "DirectPlay <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> TCP/IP <20><><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY_IPXCONN "DirectPlay IPX <20><><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY_MODEMCONN "DirectPlay <20><><EFBFBD>ݻ<EFBFBD><DDBB><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY_SERIALCONN "DirectPlay <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_REG_SUCCESS "ȷ<><C8B7>"
-	IDS_REG_FAIL "<22><><EFBFBD><EFBFBD>"
-	IDS_DDTEST_ERROR "<22><><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>"
-	IDS_DDTEST_DESCRIPTION "<22>⽫<EFBFBD><E2BDAB><EFBFBD><EFBFBD> DirectDraw <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԡ<EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DDPRIMARY_DESCRIPTION "<22>˲<EFBFBD><CBB2>Խ<EFBFBD>ʹ<EFBFBD><CAB9> DirectDraw <20><><EFBFBD><EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ϻ<EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD>Ӧ<EFBFBD>ῴ<EFBFBD><E1BFB4><EFBFBD><EFBFBD>ɫ<EFBFBD>Ͱ<EFBFBD>ɫ<EFBFBD>ľ<EFBFBD><C4BE>Ρ<EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DDPRIMARY_RESULT "<22>㿴<EFBFBD><E3BFB4><EFBFBD><EFBFBD>ɫ<EFBFBD>Ͱ<EFBFBD>ɫ<EFBFBD>ľ<EFBFBD><C4BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DDOFFSCREEN_DESCRIPTION "<22>˲<EFBFBD><CBB2>Խ<EFBFBD>ʹ<EFBFBD><CAB9> DirectDraw <20><>Ļ<EFBFBD><C4BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϻ<EFBFBD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD>Ӧ<EFBFBD>ῴ<EFBFBD><E1BFB4><EFBFBD><EFBFBD><EFBFBD>ƶ<EFBFBD><C6B6>İ<EFBFBD>ɫ<EFBFBD><C9AB><EFBFBD>Ρ<EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DDOFFSCREEN_RESULT "<22>㿴<EFBFBD><E3BFB4><EFBFBD><EFBFBD><EFBFBD>ƶ<EFBFBD><C6B6>İ<EFBFBD>ɫ<EFBFBD><C9AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DDFULLSCREEN_DESCRIPTION "<22>˲<EFBFBD><CBB2>Խ<EFBFBD>ʹ<EFBFBD><CAB9> DirectDraw <20><>ȫөĻģʽ<C4A3><CABD>ͼ<EFBFBD><CDBC><EFBFBD><EFBFBD>Ӧ<EFBFBD>ῴ<EFBFBD><E1BFB4><EFBFBD><EFBFBD><EFBFBD>ƶ<EFBFBD><C6B6>İ<EFBFBD>ɫ<EFBFBD><C9AB><EFBFBD>Ρ<EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DDFULLSCREEN_RESULT "<22><><EFBFBD><EFBFBD>ȫөĻģʽ<C4A3>п<EFBFBD><D0BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƶ<EFBFBD><C6B6>İ<EFBFBD>ɫ<EFBFBD><C9AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_FORMAT_ADAPTER_MEM "%u MB"
-	IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)"
-	IDS_OPTION_NO "<22><>"
-	IDS_D3DTEST_DESCRIPTION "<22>⽫<EFBFBD><E2BDAB><EFBFBD><EFBFBD> Direct3D <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԡ<EFBFBD>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_D3DTEST_D3Dx "<22>˲<EFBFBD><CBB2>Խ<EFBFBD>ʹ<EFBFBD><CAB9>Ӳ<EFBFBD><D3B2><EFBFBD><EFBFBD><EFBFBD>ٵ<EFBFBD> Direct3D %u <20><><EFBFBD>档"
-END

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

@@ -1,234 +0,0 @@
-/*
- * PROJECT:     ReactOS ReactX-Diagnostic program
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/dxdiag/lang/zh-TW.rc
- * PURPOSE:     Chinese (Traditional) Language File for ReactX-Diagnostic program
- * TRANSLATOR:  Elton Chung <elton328@gmail.com>
- */
- 
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-IDD_MAIN_DIALOG DIALOGEX DISCARDABLE  0, 0, 478, 280
-STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
-    WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
-    WS_THICKFRAME
-CAPTION "ReactX <20>E<EFBFBD>_<EFBFBD>{<7B><>"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Tab1",IDC_TAB_CONTROL,"SysTabControl32",WS_TABSTOP,2,2,474,250
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD>(&H)", IDC_BUTTON_HELP, 2, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    DEFPUSHBUTTON "<22>U<EFBFBD>@<40><>(&N)", IDC_BUTTON_NEXT, 257, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "<22>x<EFBFBD>s<EFBFBD>Ҧ<EFBFBD><D2A6><EFBFBD><EFBFBD>T(&S)...", IDC_BUTTON_SAVE_INFO, 311, 261, 110, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD>(&E)", IDC_BUTTON_EXIT, 425, 261, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_SYSTEM_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT "<22><><EFBFBD>u<EFBFBD><75><EFBFBD>|<7C><><EFBFBD>i<EFBFBD>w<EFBFBD>˦b<CBA6>z<EFBFBD>t<EFBFBD>Ϊ<EFBFBD> ReactX <20><><EFBFBD><EFBFBD><EFBFBD>M<EFBFBD>X<EFBFBD>ʵ{<7B><><EFBFBD><EFBFBD><EFBFBD>ԲӸ<D4B2><D3B8>ơC", -1, 10, 10, 443, 17
-    LTEXT "<22>p<EFBFBD>G<EFBFBD>A<EFBFBD><41><EFBFBD>D<EFBFBD><44><EFBFBD>Ӱϰ<D3B0><CFB0>y<EFBFBD><79><EFBFBD><EFBFBD><EFBFBD>D<EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҡC<D2A1>_<EFBFBD>h<EFBFBD>A<EFBFBD>A<EFBFBD>i<EFBFBD>H<EFBFBD>ϥΡu<CEA1>U<EFBFBD>@<40><><EFBFBD>v<EFBFBD><76><EFBFBD>s<EFBFBD>Ӷ<EFBFBD><D3B6>dzX<C7B3>ݨC<DDA8>@<40><><EFBFBD>C", -1, 10, 30, 443, 25
-    GROUPBOX "<22>t<EFBFBD>θ<EFBFBD><CEB8>T", -1, 10, 55, 443, 130, SS_RIGHT
-    LTEXT "<22>ثe<D8AB><65><EFBFBD><EFBFBD>/<2F>ɶ<EFBFBD><C9B6>G", -1, 70, 70, 80, 10, SS_RIGHT
-    LTEXT "<22>q<EFBFBD><71><EFBFBD>W<EFBFBD>١G", -1, 70, 80, 80, 10, SS_RIGHT
-    LTEXT "<22>ާ@<40>t<EFBFBD>ΡG", -1, 70, 90, 80, 10, SS_RIGHT
-    LTEXT "<22>y<EFBFBD><79><EFBFBD>G", -1, 70, 100, 80, 10, SS_RIGHT
-    LTEXT "<22>t<EFBFBD>λs<CEBB>y<EFBFBD>ӡG", -1, 70, 110, 80, 10, SS_RIGHT
-    LTEXT "<22>t<EFBFBD>Ϋ<EFBFBD><CEAB><EFBFBD><EFBFBD>G", -1, 70, 120, 80, 10, SS_RIGHT
-    LTEXT "BIOS<4F>G", -1, 70, 130, 80, 10, SS_RIGHT
-    LTEXT "<22>B<EFBFBD>z<EFBFBD><7A><EFBFBD>G", -1, 70, 140, 80, 10, SS_RIGHT
-    LTEXT "<22>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>G", -1, 70, 150, 80, 10, SS_RIGHT
-    LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>ɮסG", -1, 70, 160, 80, 10, SS_RIGHT
-    LTEXT "ReactX <20><><EFBFBD><EFBFBD><EFBFBD>G", -1, 70, 170, 80, 10, SS_RIGHT
-    LTEXT "", IDC_STATIC_TIME, 155, 70, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_COMPUTER, 155, 80, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_OS, 155, 90, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_LANG, 155, 100, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MANU, 155, 110, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MODEL, 155, 120, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_BIOS, 155, 130, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_PROC, 155, 140, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_MEM, 155, 150, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_SWAP, 155, 160, 195, 10, SS_LEFT
-    LTEXT "", IDC_STATIC_VERSION, 155, 170, 195, 10, SS_LEFT
-END
-
-IDD_DISPLAY_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "<22>˸m", -1, 10, 10, 250, 100
-    RTEXT "<22>W<EFBFBD>١G", -1, 20, 25, 70, 10
-    RTEXT "<22>s<EFBFBD>y<EFBFBD>ӡG", -1, 20, 35, 70, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>G", -1, 20, 45, 70, 10
-    RTEXT "DAC <20><><EFBFBD><EFBFBD><EFBFBD>G", -1, 20, 55, 70, 10
-    RTEXT "<22>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>`<60>p<EFBFBD><70><EFBFBD>G", -1, 20, 65, 70, 10
-    RTEXT "<22>ثe<D8AB><65><EFBFBD>ܼҦ<DCBC><D2A6>G", -1, 20, 75, 70, 10
-    RTEXT "<22><><EFBFBD>ܾ<EFBFBD><DCBE>G", -1, 20, 85, 70, 10
-    LTEXT "", IDC_STATIC_ADAPTER_ID, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VENDOR, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_CHIP, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DAC, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MEM, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MODE, 95, 75, 150, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MONITOR, 95, 85, 150, 10
-
-    GROUPBOX "<22>X<EFBFBD>ʵ{<7B><>", -1, 270, 10, 190, 100
-    RTEXT "<22>D<EFBFBD>n<EFBFBD>X<EFBFBD>ʵ{<7B><><EFBFBD>G", -1, 275, 25, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>G", -1, 275, 35, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>G", -1, 275, 45, 55, 10
-    RTEXT "WHQL <20>лx<D0BB>G", -1, 275, 55, 55, 10
-    RTEXT "<22>g<EFBFBD>A VDD<44>G", -1, 275, 65, 55, 10
-    RTEXT "VDD<44>G", -1, 275, 75, 55, 10
-    RTEXT "DDI <20><><EFBFBD><EFBFBD><EFBFBD>G", -1, 275, 85, 55, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DRIVER, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_MINIVDD, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_VDD, 335, 75, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_DDI, 335, 85, 100, 10
-
-    GROUPBOX "ReactX <20>\<5C><>", -1, 10, 115, 450, 60
-    RTEXT "DirectDraw <20>[<5B>t<EFBFBD>G", -1, 15, 130, 110, 12
-    RTEXT "Direct3D <20>[<5B>t<EFBFBD>G", -1, 15, 145, 110, 12
-    RTEXT "AGP <20><><EFBFBD><EFBFBD><EFBFBD>[<5B>t<EFBFBD>G", -1, 15, 160, 110, 12
-    LTEXT "", IDC_STATIC_DDSTATE, 130, 130, 40, 10
-    LTEXT "", IDC_STATIC_D3DSTATE, 130, 145, 40, 10
-    LTEXT "", IDC_STATIC_AGPSTATE, 130, 160, 40, 10
-    PUSHBUTTON "<22>ҥ<EFBFBD>", IDC_BUTTON_DDRAW, 170, 124, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22>ҥ<EFBFBD>", IDC_BUTTON_D3D, 170, 140, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22>ҥ<EFBFBD>", IDC_BUTTON_AGP, 170, 156, 60, 14, WS_DISABLED
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD> DirectDraw", IDC_BUTTON_TESTDD, 250, 124, 80, 14
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD> Direct3D", IDC_BUTTON_TEST3D, 250, 140, 80, 14
-
-    GROUPBOX "<22>Ƶ<EFBFBD>", -1, 10, 180, 450, 40
-    EDITTEXT  IDC_TEXT_INFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
-END
-
-
-IDD_SOUND_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "<22>˸m", -1, 10, 10, 250, 100
-    RTEXT "<22>W<EFBFBD>١G", -1, 20, 25, 70, 10
-    RTEXT "<22>˸m<CBB8>ѧO<D1A7>X<EFBFBD>G", -1, 20, 35, 70, 10
-    RTEXT "<22>s<EFBFBD>y<EFBFBD><79><EFBFBD>ѧO<D1A7>X<EFBFBD>G", -1, 20, 45, 70, 10
-    RTEXT "<22><><EFBFBD>~<7E>ѧO<D1A7>X<EFBFBD>G", -1, 20, 55, 70, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>G", -1, 20, 65, 70, 10
-    RTEXT "<22>w<EFBFBD>]<5D>˸m:", -1, 20, 75, 70, 10
-    LTEXT "", IDC_STATIC_DSOUND_NAME, 95, 25, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_DEVICEID, 95, 35, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_VENDORID, 95, 45, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_PRODUCTID, 95, 55, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_TYPE, 95, 65, 150, 10
-    LTEXT "", IDC_STATIC_DSOUND_STANDARD, 95, 75, 150, 10
-    GROUPBOX "<22>X<EFBFBD>ʵ{<7B><>", -1, 270, 10, 190, 100
-    RTEXT "<22>W<EFBFBD>١G", -1, 275, 25, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>G", -1, 275, 35, 55, 10
-    RTEXT "<22><><EFBFBD><EFBFBD><EFBFBD>G", -1, 275, 45, 55, 10
-    RTEXT "WHQL <20>лx<D0BB>G", -1, 275, 55, 55, 10
-    RTEXT "<22><><EFBFBD>L<EFBFBD>ɮסG", -1, 275, 65, 55, 10
-    RTEXT "<22><><EFBFBD>Ѫ̡G", -1, 275, 75, 55, 10
-    LTEXT "", IDC_STATIC_DSOUND_DRIVER, 335, 25, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_VERSION, 335, 35, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_DATE, 335, 45, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_LOGO, 335, 55, 100, 10
-    LTEXT "", IDC_STATIC_DSOUND_FILES, 335, 65, 100, 10
-    LTEXT "", IDC_STATIC_ADAPTER_PROVIDER, 335, 75, 100, 10
-    GROUPBOX "ReactX <20>\<5C><>", -1, 10, 115, 450, 60
-    CONTROL "", IDC_SLIDER_DSOUND, "msctls_trackbar32", TBS_BOTTOM | TBS_AUTOTICKS | WS_TABSTOP, 120, 135, 80, 17
-    RTEXT "<22>w<EFBFBD>魵<EFBFBD><E9ADB5>\n<>[<5B>t<EFBFBD><74><EFBFBD>šG", -1, 20, 135, 90, 20
-    PUSHBUTTON "<22><><EFBFBD><EFBFBD> DirectSound", IDC_BUTTON_TESTDSOUND, 270, 134, 80, 14
-    GROUPBOX "<22>Ƶ<EFBFBD>", -1, 10, 180, 450, 40
-    EDITTEXT  IDC_TEXT_DSOUNDINFO, 20, 192, 432, 20, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_MUSIC_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-
-IDD_INPUT_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "DirectInput <20>˸m", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_DEVICE, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-    GROUPBOX "<22><><EFBFBD>J<EFBFBD>˸m", -1, 10, 100, 452, 60
-    CONTROL "", IDC_TREE_PORT, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 20, 112, 432, 40, 0x00000200
-    GROUPBOX "<22><><EFBFBD>T", -1, 10, 170, 452, 50
-    EDITTEXT  IDC_RICH_INFO, 20, 182, 432, 30, WS_DISABLED | WS_TABSTOP
-END
-
-IDD_NETWORK_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX "<22>w<EFBFBD><77><EFBFBD>U<EFBFBD><55> DirectPlay <20>A<EFBFBD>ȴ<EFBFBD><C8B4>Ѫ̡G", -1, 10, 10, 452, 80
-    CONTROL "", IDC_LIST_PROVIDER, "SysListView32", LVS_REPORT | WS_CHILD | WS_BORDER | WS_TABSTOP, 20, 22, 432, 60
-END
-
-IDD_HELP_DIALOG DIALOGEX DISCARDABLE  0, 0, 462, 220
-STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-	IDS_MAIN_DIALOG "ReactX <20>E<EFBFBD>_<EFBFBD>u<EFBFBD><75>"
-	IDS_SYSTEM_DIALOG "<22>t<EFBFBD><74>"
-	IDS_DISPLAY_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_SOUND_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_MUSIC_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_INPUT_DIALOG "<22><><EFBFBD>J"
-	IDS_NETWORK_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_HELP_DIALOG "<22><><EFBFBD><EFBFBD>"
-	IDS_FORMAT_MB "%I64uMB RAM"
-	IDS_FORMAT_SWAP "<22>w<EFBFBD>ϥ<EFBFBD> %I64u MB<4D>A<EFBFBD>٦<EFBFBD> %I64u MB <20>i<EFBFBD><69>"
-	IDS_FORMAT_UNIPROC "%s (%u CPU)"
-	IDS_FORMAT_MPPROC  "%s (%u CPUs)"
-	IDS_VERSION_UNKNOWN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	IDS_DEVICE_STATUS_ATTACHED "<22>w<EFBFBD>s<EFBFBD><73>"
-	IDS_DEVICE_STATUS_MISSING "<22>w<EFBFBD><77><EFBFBD>_<EFBFBD>s<EFBFBD><73>"
-	IDS_DEVICE_STATUS_UNKNOWN "<22><><EFBFBD><EFBFBD>"
-	IDS_DEVICE_NAME "<22>˸m<CBB8>W<EFBFBD><57>"
-	IDS_DEVICE_STATUS "<22><><EFBFBD>A"
-	IDS_DEVICE_CONTROLLER "<22><><EFBFBD><EFBFBD>ѧO<D1A7>X"
-	IDS_DEVICE_MANUFACTURER "<22>s<EFBFBD>y<EFBFBD><79><EFBFBD>ѧO<D1A7>X"
-	IDS_DEVICE_PRODUCT "<22><><EFBFBD>~<7E>ѧO<D1A7>X"
-	IDS_DEVICE_FORCEFEEDBACK "<22>ʤO<CAA4>^<5E>X<EFBFBD>X<EFBFBD>ʵ{<7B><>"
-	IDS_NOT_APPLICABLE "<22><><EFBFBD>A<EFBFBD><41>"
-	IDS_OPTION_YES "<22>O"
-	IDS_DIRECTPLAY_COL_NAME1 "<22>W<EFBFBD><57>"
-	IDS_DIRECTPLAY_COL_NAME2 "<22>n<EFBFBD><6E>"
-	IDS_DIRECTPLAY_COL_NAME3 "<22>ɮ<EFBFBD>"
-	IDS_DIRECTPLAY_COL_NAME4 "<22><><EFBFBD><EFBFBD>"
-	IDS_DIRECTPLAY8_MODEMSP "DirectPlay8 <20>ƾھ<C6BE><DABE>A<EFBFBD>ȴ<EFBFBD><C8B4>Ѫ<EFBFBD>"
-	IDS_DIRECTPLAY8_SERIALSP "DirectPlay8 <20>ǦC<C7A6>A<EFBFBD>ȴ<EFBFBD><C8B4>Ѫ<EFBFBD>"
-	IDS_DIRECTPLAY8_IPXSP "DirectPlay8 IPX <20>A<EFBFBD>ȴ<EFBFBD><C8B4>Ѫ<EFBFBD>"
-	IDS_DIRECTPLAY8_TCPSP "DirectPlay8 TCP/IP <20>A<EFBFBD>ȴ<EFBFBD><C8B4>Ѫ<EFBFBD>"
-	IDS_DIRECTPLAY_TCPCONN "DirectPlay <20><><EFBFBD>ں<EFBFBD><DABA><EFBFBD> TCP/IP <20>s<EFBFBD><73>"
-	IDS_DIRECTPLAY_IPXCONN "DirectPlay IPX <20>s<EFBFBD><73>"
-	IDS_DIRECTPLAY_MODEMCONN "DirectPlay <20>ƾھ<C6BE><DABE>s<EFBFBD><73>"
-	IDS_DIRECTPLAY_SERIALCONN "DirectPlay <20>ǦC<C7A6>s<EFBFBD><73>"
-	IDS_REG_SUCCESS "<22>T<EFBFBD>{"
-	IDS_REG_FAIL "<22><><EFBFBD>~"
-	IDS_DDTEST_ERROR "<22><><EFBFBD>ե<EFBFBD><D5A5>ѡI"
-	IDS_DDTEST_DESCRIPTION "<22>o<EFBFBD>N<EFBFBD>Ұ<EFBFBD> DirectDraw <20>ɭ<EFBFBD><C9AD><EFBFBD><EFBFBD>աC<D5A1>n<EFBFBD>~<7E><><EFBFBD>H"
-	IDS_DDPRIMARY_DESCRIPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ձN<D5B1>ϥ<EFBFBD> DirectDraw <20>b<EFBFBD>D<EFBFBD>n<EFBFBD><6E><EFBFBD><EFBFBD><EFBFBD>Wø<57>ϡC<CFA1>z<EFBFBD><7A><EFBFBD>|<7C>ݨ<EFBFBD><DDA8>¦<EFBFBD><C2A6>M<EFBFBD>զ⪺<D5A6>x<EFBFBD>ΡC<CEA1>n<EFBFBD>~<7E><><EFBFBD>H"
-	IDS_DDPRIMARY_RESULT "<22>A<EFBFBD>ݨ<EFBFBD><DDA8>¦<EFBFBD><C2A6>M<EFBFBD>զ⪺<D5A6>x<EFBFBD>ζܡH"
-	IDS_DDOFFSCREEN_DESCRIPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ձN<D5B1>ϥ<EFBFBD> DirectDraw <20>b<EFBFBD><62><EFBFBD>~<7E><><EFBFBD><EFBFBD><EFBFBD>Wø<57>ϡC<CFA1>z<EFBFBD><7A><EFBFBD>|<7C>ݨ<EFBFBD><DDA8>b<EFBFBD><62><EFBFBD>ʪ<EFBFBD><CAAA>զ<EFBFBD><D5A6>x<EFBFBD>ΡC<CEA1>n<EFBFBD>~<7E><><EFBFBD>H"
-	IDS_DDOFFSCREEN_RESULT "<22>A<EFBFBD>ݨ<EFBFBD><DDA8>b<EFBFBD><62><EFBFBD>ʪ<EFBFBD><CAAA>զ<EFBFBD><D5A6>x<EFBFBD>ζܡH"
-	IDS_DDFULLSCREEN_DESCRIPTION "<22><><EFBFBD><EFBFBD><EFBFBD>ձN<D5B1>ϥ<EFBFBD> DirectDraw <20>b<EFBFBD><62><EFBFBD>ù<EFBFBD><C3B9>Ҧ<EFBFBD>ø<EFBFBD>ϡC<CFA1>z<EFBFBD><7A><EFBFBD>|<7C>ݨ<EFBFBD><DDA8>b<EFBFBD><62><EFBFBD>ʪ<EFBFBD><CAAA>զ<EFBFBD><D5A6>x<EFBFBD>ΡC<CEA1>n<EFBFBD>~<7E><><EFBFBD>H"
-	IDS_DDFULLSCREEN_RESULT "<22>A<EFBFBD>b<EFBFBD><62><EFBFBD>ù<EFBFBD><C3B9>Ҧ<EFBFBD><D2A6><EFBFBD><EFBFBD>ݨ<EFBFBD><DDA8>b<EFBFBD><62><EFBFBD>ʪ<EFBFBD><CAAA>զ<EFBFBD><D5A6>x<EFBFBD>ζܡH"
-	IDS_FORMAT_ADAPTER_MEM "%u MB"
-	IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)"
-	IDS_OPTION_NO "<22>_"
-	IDS_D3DTEST_DESCRIPTION "<22>o<EFBFBD>N<EFBFBD>Ұ<EFBFBD> Direct3D <20>ɭ<EFBFBD><C9AD><EFBFBD><EFBFBD>աC<D5A1>n<EFBFBD>~<7E><><EFBFBD>H"
-	IDS_D3DTEST_D3Dx "<22><><EFBFBD><EFBFBD><EFBFBD>ձN<D5B1>ϥεw<CEB5><77><EFBFBD>[<5B>t<EFBFBD><74> Direct3D %u <20>ɭ<EFBFBD><C9AD>C"
-END

reactos/base/applications/dxdiag/rsrc.rc

@@ -17,6 +17,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
-#include "lang/ua-UA.rc"
-#include "lang/zh-CN.rc"
-//#include "lang/zh-TW.rc"

reactos/base/applications/fontview/fontview.rbuild

@@ -3,6 +3,7 @@
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>shell32</library>
+	<library>kernel32</library>
 	<file>fontview.c</file>
 	<file>display.c</file>
 	<file>fontview.rc</file>

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

@@ -8,7 +8,7 @@ BEGIN
 	IDS_ERROR, "Fehler"
 	IDS_ERROR_NOMEM, "Es steht nicht gen<65>gend Speicher zur Verf<72>gung."
 	IDS_ERROR_NOFONT, "Die angegebene Datei %1 ist keine g<>ltige Schriftartendatei."
-	IDS_ERROR_NOCLASS, "Fehler beim Initialisieren der Fensterklasse."
+	IDS_ERROR_NOCLASS, "Fehler beim initialisieren der Fensterklasse."
 	IDS_ERROR_BADCMD, "Keine Schriftartendatei angegeben.\nSyntax:\n  fontview.exe <Schriftdatei>"
 END
 

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

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     ReactOS FontView
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/fontview/lang/zh-TW.rc
+ * FILE:        rosapps/fontview/lang/zh-TW.rc
  * PURPOSE:     Chinese (Traditional) Language File for FontView
  * TRANSLATOR:  Elton Chung <elton328@gmail.com>
  */
@@ -19,3 +19,4 @@ BEGIN
 	IDS_ERROR_NOCLASS, "<22><><EFBFBD>f<EFBFBD>L<EFBFBD>k<EFBFBD><6B><EFBFBD>l<EFBFBD>ơC"
 	IDS_ERROR_BADCMD, "<22>S<EFBFBD><53><EFBFBD><EFBFBD><EFBFBD>Ѧr<D1A6><72><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>C\n<>y<EFBFBD>k<EFBFBD>G\n  fontview.exe <<3C>r<EFBFBD><72><EFBFBD>ɮ<EFBFBD>>"
 END
+

reactos/base/applications/games/solitaire/lang/de-DE.rc

@@ -57,7 +57,7 @@ BEGIN
     IDS_SOL_NAME    "Solit<69>r"
     IDS_SOL_ABOUT   "Solit<69>r von J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Laufendes Spiel beenden?"
-    IDS_SOL_WIN     "Gl<47>ckwunsch, Sie haben gewonnen!"
+    IDS_SOL_WIN     "Gl<47>ckwunsch, Sie haben Gewonnen!"
     IDS_SOL_DEAL    "Neu geben?"
 END
 

reactos/base/applications/games/solitaire/lang/uk-UA.rc

@@ -18,8 +18,8 @@ CAPTION "
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "<22><><EFBFBD><EFBFBD><EFBFBD>", -1, 7, 7, 65, 40
-    AUTORADIOBUTTON "<22><> &<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "<22><> &<EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
+    AUTORADIOBUTTON "&<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "<22>&<EFBFBD> <20><><EFBFBD>", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
 
     AUTOCHECKBOX    "&<26><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
     AUTOCHECKBOX    "&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
@@ -58,7 +58,7 @@ BEGIN
     IDS_SOL_ABOUT   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> J Brown\n\nCardLib <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1.0."
     IDS_SOL_QUIT    "<22><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>?"
     IDS_SOL_WIN     "³<><C2B3><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!!"
-    IDS_SOL_DEAL    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>?"
+    IDS_SOL_DEAL    "Deal again?"
 END
 
 
@@ -71,14 +71,14 @@ BEGIN
         MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\tF2",          IDM_GAME_NEW
         MENUITEM SEPARATOR
         MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",                  IDM_GAME_DECK
-        MENUITEM "<22><>&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",               IDM_GAME_OPTIONS
+        MENUITEM "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",               IDM_GAME_OPTIONS
         MENUITEM SEPARATOR
         MENUITEM "<22>&<26><><EFBFBD><EFBFBD>",                      IDM_GAME_EXIT
     END
     POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     BEGIN
         MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>\tF1",                  IDM_HELP_CONTENTS
-        MENUITEM "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",                        IDM_HELP_ABOUT
+        MENUITEM "&<26><><EFBFBD>",                        IDM_HELP_ABOUT
     END
 END
 

reactos/base/applications/games/spider/lang/bg-BG.rc

@@ -1,89 +0,0 @@
-/*
- * PROJECT:      Spider Solitaire
- * LICENSE:      See COPYING in top level directory
- * FILE:         base/applications/games/spider/lang/en-US.rc
- * PURPOSE:      English Language File for Spider Solitaire
- * TRANSLATOR:   Gregor Schneider
- */
- 
-#include "resource.h"
-
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
-
-/* Dialogs */
-
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-BEGIN
-    CONTROL       "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 
-    CONTROL       "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>", IDOK, 66, 84, 54, 13
-    PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 126, 84, 54, 13
-END
-
-IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",    IDC_DIF_ONECOLOR,   8, 10, 90, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_DIF_TWOCOLORS,  8, 23, 90, 10
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",  IDC_DIF_FOURCOLORS, 8, 36, 96, 10
-
-    DEFPUSHBUTTON   "<22><><EFBFBD><EFBFBD><EFBFBD>", IDOK, 8, 58, 40, 14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 58, 58, 40, 14
-END
-
-/* Strings */
-
-STRINGTABLE
-BEGIN
-    IDS_SPI_NAME    "<22><><EFBFBD><EFBFBD>"
-    IDS_SPI_ABOUT   "Spider Solitaire by Gregor Schneider\n\nCardLib version 1.0"
-    IDS_SPI_QUIT    "<22><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>?"
-    IDS_SPI_WIN     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
-    IDS_SPI_DEAL    "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
-END
-
-
-/* Menus */
-
-IDR_MENU1 MENU DISCARDABLE
-BEGIN
-    POPUP "&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\tF2",               IDM_GAME_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>",                    IDM_GAME_DECK
-        MENUITEM SEPARATOR
-        MENUITEM "<22><>&<26><><EFBFBD>",                       IDM_GAME_EXIT
-    END
-    POPUP "<22><><EFBFBD><EFBFBD>&<26>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF1",               IDM_HELP_CONTENTS
-        MENUITEM "&<26><>",                      IDM_HELP_ABOUT
-    END
-END
-
-
-
-/* Accelerator */
-
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
-BEGIN
-    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
-    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
-END

reactos/base/applications/games/spider/lang/de-DE.rc

@@ -54,7 +54,7 @@ BEGIN
     IDS_SPI_NAME    "Spider"
     IDS_SPI_ABOUT   "Spider Solitaire von Gregor Schneider\n\nCardLib Version 1.0"
     IDS_SPI_QUIT    "Laufendes Spiel beenden?"
-    IDS_SPI_WIN     "Gl<EFBFBD>ckwunsch, Sie haben gewonnen!"
+    IDS_SPI_WIN     "Gratulation, Sie haben gewonnen!"
     IDS_SPI_DEAL    "Neu geben?"
 END
 

reactos/base/applications/games/spider/lang/es-ES.rc

@@ -30,7 +30,7 @@ BEGIN
     CONTROL       "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
     CONTROL       "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
     CONTROL       "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Aceptar", IDOK, 66, 84, 54, 13
+    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
     PUSHBUTTON    "Cancelar", IDCANCEL, 126, 84, 54, 13
 END
 
@@ -39,11 +39,11 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Dificultad"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "F<>cil: &Un Palo", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Medio: &Dos Palos", IDC_DIF_TWOCOLORS, 8, 23, 80, 10
-    AUTORADIOBUTTON "Dif<69>cil: &Cuatro Palos", IDC_DIF_FOURCOLORS, 8, 36, 90, 10
+    AUTORADIOBUTTON "F<>cil: &Un Color", IDC_DIF_ONECOLOR, 8, 10, 80, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "Medio: &Dos Colores", IDC_DIF_TWOCOLORS, 8, 23, 80, 10
+    AUTORADIOBUTTON "Dif<69>cil: &Cuatro Colores", IDC_DIF_FOURCOLORS, 8, 36, 90, 10
 
-    DEFPUSHBUTTON   "Aceptar", IDOK, 8, 58, 40, 14
+    DEFPUSHBUTTON   "OK", IDOK, 8, 58, 40, 14
     PUSHBUTTON      "Cancelar", IDCANCEL, 58, 58, 40, 14
 END
 

reactos/base/applications/games/spider/lang/ru-RU.rc

@@ -34,17 +34,17 @@ BEGIN
     PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 126, 84, 54, 13
 END
 
-IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 112, 80
+IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>", IDC_DIF_ONECOLOR,   8, 10, 102, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_DIF_TWOCOLORS,  8, 23, 102, 10
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_DIF_FOURCOLORS, 8, 36, 102, 10
+    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>", IDC_DIF_ONECOLOR,   8, 10, 80, 10, WS_GROUP | WS_TABSTOP
+    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_DIF_TWOCOLORS,  8, 23, 80, 10
+    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", IDC_DIF_FOURCOLORS, 8, 36, 80, 10
 
     DEFPUSHBUTTON   "OK", IDOK, 8, 58, 40, 14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 63, 58, 40, 14
+    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 58, 58, 40, 14
 END
 
 /* Strings */

reactos/base/applications/games/spider/lang/uk-UA.rc

@@ -1,91 +0,0 @@
-/*
- * PROJECT:    ReactOS Spider
- * LICENSE:    GPL - See COPYING in the top level directory
- * FILE:    base/applications/games/spider/lang/uk-UA.rc
- * PURPOSE:    Ukraianian Language File for ReactOS  Spider
- * TRANSLATOR:    Sakara Yevhen
- */
-
- 
-#include "resource.h"
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-
-
-/* Dialogs */
-
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-BEGIN
-    CONTROL       "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32 
-    CONTROL       "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "OK", IDOK, 66, 84, 54, 13
-    PUSHBUTTON    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 126, 84, 54, 13
-END
-
-IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-CAPTION "г<><D0B3><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",    IDC_DIF_ONECOLOR,   8, 10, 80, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_DIF_TWOCOLORS,  8, 23, 80, 10
-    AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  IDC_DIF_FOURCOLORS, 8, 36, 80, 10
-
-    DEFPUSHBUTTON   "OK", IDOK, 8, 58, 40, 14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 58, 58, 40, 14
-END
-
-/* Strings */
-
-STRINGTABLE
-BEGIN
-    IDS_SPI_NAME    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-    IDS_SPI_ABOUT   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, Gregor Schneider\n\nCardLib <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1.0"
-    IDS_SPI_QUIT    "<22><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>?"
-    IDS_SPI_WIN     "³<><C2B3><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
-    IDS_SPI_DEAL    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>?"
-END
-
-
-/* Menus */
-
-IDR_MENU1 MENU DISCARDABLE
-BEGIN
-    POPUP "&<26><><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD> <20><><EFBFBD>\tF2",               IDM_GAME_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",                    IDM_GAME_DECK
-        MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>",                       IDM_GAME_EXIT
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF1",               IDM_HELP_CONTENTS
-        MENUITEM "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",                      IDM_HELP_ABOUT
-    END
-END
-
-
-
-/* Accelerator */
-
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
-BEGIN
-    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
-    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
-END

reactos/base/applications/games/spider/rsrc.rc

@@ -5,16 +5,14 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 IDI_SPIDER ICON DISCARDABLE "spider.ico"
 
-#include "lang/bg-BG.rc"
 #include "lang/de-DE.rc"
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/hu-HU.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
 #include "lang/nl-NL.rc"
+#include "lang/ja-JP.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
-#include "lang/uk-UA.rc"
 

reactos/base/applications/games/spider/spider.cpp

@@ -50,7 +50,7 @@ void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt)
     lstrcpy(ptr + 1, szExt);
 }
 
-INT_PTR CALLBACK DifficultyDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+BOOL CALLBACK DifficultyDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
@@ -236,7 +236,7 @@ CardImageWndProc(HWND hwnd,
 }
 
 
-INT_PTR CALLBACK CardBackDlgProc(HWND hDlg,
+BOOL CALLBACK CardBackDlgProc(HWND hDlg,
                               UINT uMsg,
                               WPARAM wParam,
                               LPARAM lParam)

reactos/base/applications/games/spider/spigame.cpp

@@ -201,8 +201,6 @@ bool CARDLIBPROC StackDragProc(CardRegion &stackobj, int numDragCards)
 /* Game finished successfully */
 void GameFinished()
 {
-    SpiderWnd.EmptyStacks();
-
     MessageBox(SpiderWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION);
     if( IDYES == MessageBox(SpiderWnd, MsgDeal, szAppName, MB_YESNO | MB_ICONQUESTION) )
     {
@@ -210,6 +208,7 @@ void GameFinished()
     }
     else
     {
+        SpiderWnd.EmptyStacks();
         fGameStarted = false;
     }
 }

reactos/base/applications/games/winemine/lang/bg-BG.rc

@@ -48,7 +48,7 @@ BEGIN
 	LTEXT           "",                  IDC_NAME2, 132,  30,  55,   8
 	LTEXT           "",                  IDC_NAME3, 132,  40,  55,   8
 	DEFPUSHBUTTON   "<22><><EFBFBD><EFBFBD><EFBFBD>",             IDOK,      127,  57,  50,  15
-	PUSHBUTTON      "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     IDRESET,    18,  57,  67,  15
+	PUSHBUTTON      "&Reset Scores",     IDRESET,    18,  57,  67,  15
 END
 
 IDD_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60

reactos/base/applications/games/winemine/lang/de-DE.rc

@@ -56,7 +56,7 @@ STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL
 CAPTION "Gl<47>ckwunsch!"
 FONT 8, "MS Shell Dlg"
 BEGIN
-	LTEXT           "Bitte geben Sie Ihren Namen ein", IDIGNORE,      25,  10, 150,  10
+	LTEXT           "Bitte geben Sie ihren Namen ein", IDIGNORE,      25,  10, 150,  10
 	EDITTEXT                                           IDC_EDITNAME,  25,  20, 110,  12
 	DEFPUSHBUTTON   "OK",                              IDOK,          60,  40,  40,  15
 END

reactos/base/applications/games/winemine/lang/uk-UA.rc

@@ -19,15 +19,15 @@ END
 
 IDM_WINEMINE MENU DISCARDABLE
 BEGIN
-	POPUP "&<EFBFBD><EFBFBD><EFBFBD>"
+	POPUP "&Game"
         BEGIN
 		MENUITEM "&<26><><EFBFBD><EFBFBD>\tF2",      IDM_NEW
 		MENUITEM SEPARATOR
 		MENUITEM "&̳<><CCB3><EFBFBD> (?)",     IDM_MARKQ
 		MENUITEM SEPARATOR
-		MENUITEM "<22><><EFBFBD><EFBFBD>&<EFBFBD><EFBFBD><EFBFBD>",       IDM_BEGINNER
+		MENUITEM "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       IDM_BEGINNER
 		MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",        IDM_ADVANCED
-		MENUITEM "<22><><EFBFBD>&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDM_EXPERT
+		MENUITEM "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDM_EXPERT
 		MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",   IDM_CUSTOM
 		MENUITEM SEPARATOR
 		MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",   IDM_TIMES
@@ -55,7 +55,7 @@ BEGIN
 	LTEXT           "",              IDC_NAME1, 132,  20,  55,   8
 	LTEXT           "",              IDC_NAME2, 132,  30,  55,   8
 	LTEXT           "",              IDC_NAME3, 132,  40,  55,   8
-	DEFPUSHBUTTON   "OK",           IDOK,      127,  57,  50,  15
+	DEFPUSHBUTTON   "OK",            IDOK,      127,  57,  50,  15
 	PUSHBUTTON      "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDRESET,    18,  57,  67,  15
 END
 
@@ -66,7 +66,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>'<27>", IDIGNORE,      25,  10, 150,  10
 	EDITTEXT                             IDC_EDITNAME,  25,  20, 110,  12
-	DEFPUSHBUTTON   "OK",               IDOK,          60,  40,  40,  15
+	DEFPUSHBUTTON   "OK",                IDOK,          60,  40,  40,  15
 END
 
 IDD_CUSTOM DIALOGEX DISCARDABLE  0, 0, 139, 80

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" unicode="yes">
 	<include base="winemine">.</include>
+	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>advapi32</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>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>main.c</file>

reactos/base/applications/iexplore/iexplore.rbuild

@@ -2,9 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="iexplore" type="win32gui" installbase="system32" installname="iexplore.exe" unicode="no">
 	<include base="iexplore">.</include>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
-	<library>shdocvw</library>
+        <library>shdocvw</library>
 	<file>main.c</file>
 	<file>version.rc</file>
 </module>

reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild

@@ -3,6 +3,7 @@
 <module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes">
 	<importlibrary definition="kbsdll.spec" />
 	<include base="kbsdll">.</include>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<file>kbsdll.c</file>

reactos/base/applications/kbswitch/kbswitch.rbuild

@@ -2,6 +2,7 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes">
 	<include base="kbswitch">.</include>
+	<library>kernel32</library>
 	<library>advapi32</library>
 	<library>user32</library>
 	<library>shell32</library>

reactos/base/applications/logoff/logoff.rbuild

@@ -4,6 +4,7 @@
 	<include base="logoff">.</include>
 	<library>advapi32</library>
 	<library>user32</library>
+	<library>kernel32</library>
 	<file>misc.c</file>
 	<file>logoff.c</file>
 	<file>logoff.rc</file>

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

@@ -1,64 +0,0 @@
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-IDC_MAGNIFIER MENU
-BEGIN
-    POPUP "<22>t<EFBFBD>@<40>C<EFBFBD><43>(&F)"
-    BEGIN
-        MENUITEM "<22>I<EFBFBD><49>(&X)",                    IDM_EXIT
-        MENUITEM "<22>I<EFBFBD>v<EFBFBD>V<EFBFBD><56><EFBFBD><EFBFBD>(&O)",              IDM_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "<22>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(&A) ...",      IDM_ABOUT
-    END
-END
-
-IDC_MAGNIFIER ACCELERATORS
-BEGIN
-    "?",            IDM_ABOUT,              ASCII,  ALT
-    "/",            IDM_ABOUT,              ASCII,  ALT
-END
-
-IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
-CAPTION "<22>g<EFBFBD>勾<EFBFBD>ɂ‚<C982><C282><EFBFBD>"
-FONT 9, "MS UI Gothic", 0, 0, 0x0
-BEGIN
-    ICON            IDI_ICON,IDC_MYICON,14,9,20,20
-    LTEXT           "<22>g<EFBFBD>勾 <20>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD> 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
-    LTEXT           "Copyright (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,48,24,125,22
-    PUSHBUTTON      "OK",IDOK,162,48,50,14
-END
-
-IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "<22>g<EFBFBD>勾<EFBFBD>̐ݒ<CC90>"
-FONT 9, "MS UI Gothic", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "<22>I<EFBFBD><49>",IDOK,96,161,50,14
-    PUSHBUTTON      "<22>w<EFBFBD><77><EFBFBD>v",IDC_BUTTON_HELP,38,161,50,14
-    LTEXT           "<22>g<EFBFBD>嗦:",IDC_STATIC,6,8,68,8
-    COMBOBOX        IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "<22>g<EFBFBD><67><EFBFBD>̑Ώ<CC91>",IDC_STATIC,7,25,139,59
-    GROUPBOX        "<22>\\<5C><>",IDC_STATIC,7,87,139,57
-    CONTROL         "<22>}<7D>E<EFBFBD>X <20>J<EFBFBD>[<5B>\\<5C><><EFBFBD>̓<EFBFBD><CC93><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǂ<EFBFBD>",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10
-    CONTROL         "<22>L<EFBFBD>[<5B>{<7B>[<5B>h<EFBFBD>̃t<CC83>H<EFBFBD>[<5B>J<EFBFBD>X<EFBFBD><58><EFBFBD>ǂ<EFBFBD>",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10
-    CONTROL         "<22>ҏW<D28F><57><EFBFBD>̃e<CC83>L<EFBFBD>X<EFBFBD>g<EFBFBD><67><EFBFBD>ǂ<EFBFBD>",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10
-    CONTROL         "<22>F<EFBFBD>𔽓]<5D><><EFBFBD><EFBFBD>",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10
-    CONTROL         "<22>ŏ<EFBFBD><C58F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĊJ<C48A>n<EFBFBD><6E><EFBFBD><EFBFBD>",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10
-    CONTROL         "<22>g<EFBFBD>勾<EFBFBD><E58BBE><EFBFBD>\\<5C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10
-END
-
-IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "ReactOS <20>g<EFBFBD>勾"
-FONT 9, "MS UI Gothic", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,193,76,50,14
-    ICON            IDI_ICON,IDC_STATIC,7,17,20,20
-    LTEXT           "<22>g<EFBFBD>勾<EFBFBD>͌y<CD8C><79><EFBFBD><EFBFBD><EFBFBD>o<EFBFBD><6F><EFBFBD>Q<EFBFBD><51><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɍŒ<C98D><C592><EFBFBD><EFBFBD>̋@<40>\\<5C><><EFBFBD>񋟂<EFBFBD><F18B9F82><EFBFBD><EFBFBD>悤<EFBFBD>ɐ݌v<DD8C><76><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482>܂<EFBFBD><DC82>B<EFBFBD>قƂ<D982><C682>ǂ̎<C782><CC8E>o<EFBFBD><6F><EFBFBD>Q<EFBFBD>҂̕<D282><CC95>̏ꍇ<CC8F>A<EFBFBD><41><EFBFBD>험<EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>ɂ͂<C982><CD82>荂<EFBFBD>@<40>\\<5C>Ȋg<C88A>僆<EFBFBD>[<5B>e<EFBFBD>B<EFBFBD><42><EFBFBD>e<EFBFBD>B<EFBFBD><42><EFBFBD>K<EFBFBD>v<EFBFBD>ƂȂ<C682><C882>܂<EFBFBD><DC82>B",IDC_STATIC,36,7,207,33
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD><41><EFBFBD>̃<EFBFBD><CC83>b<EFBFBD>Z<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD>\\<5C><><EFBFBD><EFBFBD><EFBFBD>Ȃ<EFBFBD>",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
-END
-
-STRINGTABLE
-BEGIN
-    IDS_APP_TITLE           "<22>g<EFBFBD>勾"
-END

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

@@ -1,72 +0,0 @@
-/*
- * PROJECT:     ReactOS Magnifier
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/magnify/lang/zh-CN.rc
- * PURPOSE:     Chinese (Simplified) Language File for Magnifier
- * TRANSLATOR:  Elton Chung <elton328@gmail.com>
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
-IDC_MAGNIFIER MENU
-BEGIN
-    POPUP "<22><><EFBFBD><EFBFBD>(&F)"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD>(&X)",                       IDM_EXIT
-        MENUITEM "ѡ<><D1A1>(&O)",                    IDM_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD>(&A)...",                  IDM_ABOUT
-    END
-END
-
-IDC_MAGNIFIER ACCELERATORS
-BEGIN
-    "?",            IDM_ABOUT,              ASCII,  ALT
-    "/",            IDM_ABOUT,              ASCII,  ALT
-END
-
-IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON            IDI_ICON,IDC_MYICON,14,9,20,20
-    LTEXT           "<22>Ŵ󾵰汾 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
-    LTEXT           "<22><>Ȩ<EFBFBD><C8A8><EFBFBD><EFBFBD> (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,48,24,125,22
-    PUSHBUTTON      "ȷ<><C8B7>",IDOK,162,48,50,14
-END
-
-IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "<22>Ŵ<EFBFBD><C5B4><EFBFBD><EFBFBD>趨"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "<22><><EFBFBD><EFBFBD>",IDOK,96,161,50,14
-    PUSHBUTTON      "˵<><CBB5>",IDC_BUTTON_HELP,38,161,50,14
-    LTEXT           "<22>Ŵ<EFBFBD><C5B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,6,8,68,8
-    COMBOBOX        IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "׷<><D7B7>",IDC_STATIC,7,25,139,59
-    GROUPBOX        "չʾ",IDC_STATIC,7,87,139,57
-    CONTROL         "<22><><EFBFBD>滬<EFBFBD><E6BBAC><EFBFBD>α<EFBFBD>",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̽<EFBFBD><CCBD><EFBFBD>",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10
-    CONTROL         "<22><><EFBFBD><EFBFBD><EFBFBD>ı<EFBFBD><C4B1>༭",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10
-    CONTROL         "ɫ<>ʶԻ<CAB6>",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10
-    CONTROL         "<22><>ʼʱ<CABC><CAB1><EFBFBD><EFBFBD>",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10
-    CONTROL         "<22><>ʾ<EFBFBD>Ŵ<EFBFBD><C5B4><EFBFBD>",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10
-END
-
-IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "ReactOS <20>Ŵ<EFBFBD><C5B4><EFBFBD>"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "ȷ<><C8B7>",IDOK,193,76,50,14
-    ICON            IDI_ICON,IDC_STATIC,7,17,20,20
-    LTEXT           "<22>Ŵ<EFBFBD><C5B4><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><CEAA><EFBFBD><EFBFBD>΢<EFBFBD>Ӿ<EFBFBD><D3BE>ϰ<EFBFBD><CFB0><EFBFBD><EFBFBD>û<EFBFBD><C3BB>ṩ<EFBFBD><E1B9A9>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޶ȵĹ<C8B5><C4B9>ܡ<EFBFBD><DCA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ӿ<EFBFBD><D3BE>ϰ<EFBFBD><CFB0><EFBFBD><EFBFBD>û<EFBFBD><C3BB><EFBFBD>Ҫһ<D2AA><D2BB><EFBFBD>ϸ߹<CFB8><DFB9><EFBFBD><EFBFBD>ԵķŴ<C4B7><C5B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ճ<EFBFBD>ʹ<EFBFBD>á<EFBFBD>",IDC_STATIC,36,7,207,33
-    CONTROL         "<22><>Ҫ<EFBFBD>ٴ<EFBFBD><D9B4><EFBFBD>ʾ<EFBFBD><CABE>ѶϢ",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
-END
-
-STRINGTABLE
-BEGIN
-    IDS_APP_TITLE           "<22>Ŵ<EFBFBD><C5B4><EFBFBD>"
-END

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

@@ -1,72 +0,0 @@
-/*
- * PROJECT:     ReactOS Magnifier
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/magnify/lang/zh-TW.rc
- * PURPOSE:     Chinese (Traditional) Language File for Magnifier
- * TRANSLATOR:  Elton Chung <elton328@gmail.com>
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-IDC_MAGNIFIER MENU
-BEGIN
-    POPUP "<22>ɮ<EFBFBD>(&F)"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD>(&X)",                       IDM_EXIT
-        MENUITEM "<22>ﶵ(&O)",                    IDM_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD>(&A)...",                  IDM_ABOUT
-    END
-END
-
-IDC_MAGNIFIER ACCELERATORS
-BEGIN
-    "?",            IDM_ABOUT,              ASCII,  ALT
-    "/",            IDM_ABOUT,              ASCII,  ALT
-END
-
-IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON            IDI_ICON,IDC_MYICON,14,9,20,20
-    LTEXT           "<22><><EFBFBD>j<EFBFBD>誩<EFBFBD><E8AAA9> 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
-    LTEXT           "<22><><EFBFBD>v<EFBFBD>Ҧ<EFBFBD> (C) 2007 Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,48,24,125,22
-    PUSHBUTTON      "<22>T<EFBFBD>w",IDOK,162,48,50,14
-END
-
-IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD>j<EFBFBD><6A><EFBFBD>]<5D>w"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "<22><><EFBFBD><EFBFBD>",IDOK,96,161,50,14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD>",IDC_BUTTON_HELP,38,161,50,14
-    LTEXT           "<22><><EFBFBD>j<EFBFBD><6A><EFBFBD>ơG",IDC_STATIC,6,8,68,8
-    COMBOBOX        IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "<22>l<EFBFBD><6C>",IDC_STATIC,7,25,139,59
-    GROUPBOX        "<22>i<EFBFBD><69>",IDC_STATIC,7,87,139,57
-    CONTROL         "<22><><EFBFBD>H<EFBFBD>ƹ<EFBFBD><C6B9><EFBFBD><EFBFBD><EFBFBD>",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10
-    CONTROL         "<22><><EFBFBD>H<EFBFBD><48><EFBFBD>L<EFBFBD>J<EFBFBD>I",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10
-    CONTROL         "<22><><EFBFBD>H<EFBFBD><48><EFBFBD>r<EFBFBD>s<EFBFBD><73>",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10
-    CONTROL         "<22><><EFBFBD>m<EFBFBD>ﴫ",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10
-    CONTROL         "<22>}<7D>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10
-    CONTROL         "<22><><EFBFBD>ܩ<EFBFBD><DCA9>j<EFBFBD><6A>",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10
-END
-
-IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "ReactOS <20><><EFBFBD>j<EFBFBD><6A>"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "<22>T<EFBFBD>w",IDOK,193,76,50,14
-    ICON            IDI_ICON,IDC_STATIC,7,17,20,20
-    LTEXT           "<22><><EFBFBD>j<EFBFBD><6A><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>L<EFBFBD><4C>ı<EFBFBD><C4B1>ê<EFBFBD><C3AA><EFBFBD>Τᴣ<CEA4>Ѫ<EFBFBD><D1AA>@<40>ӳ̧C<CCA7><43><EFBFBD>ת<EFBFBD><D7AA>\<5C><><EFBFBD>C<EFBFBD>j<EFBFBD>h<EFBFBD>Ʀ<EFBFBD><C6A6><EFBFBD>ı<EFBFBD><C4B1>ê<EFBFBD><C3AA><EFBFBD>Τ<EFBFBD><CEA4>ݭn<DDAD>@<40>Ӹ<EFBFBD><D3B8><EFBFBD><EFBFBD>\<5C><><EFBFBD>ʪ<EFBFBD><CAAA><EFBFBD><EFBFBD>j<EFBFBD><6A><EFBFBD>@<40><><EFBFBD>`<60>ϥΡC",IDC_STATIC,36,7,207,33
-    CONTROL         "<22><><EFBFBD>n<EFBFBD>A<EFBFBD><41><EFBFBD><EFBFBD><EFBFBD>ܦ<EFBFBD><DCA6>T<EFBFBD><54>",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
-END
-
-STRINGTABLE
-BEGIN
-    IDS_APP_TITLE           "<22><><EFBFBD>j<EFBFBD><6A>"
-END

reactos/base/applications/magnify/magnify.rbuild

@@ -6,6 +6,7 @@
 	<library>gdi32</library>
 	<library>advapi32</library>
 	<library>shell32</library>
+	<library>kernel32</library>
 	<file>magnifier.c</file>
 	<file>settings.c</file>
 	<file>magnify.rc</file>

reactos/base/applications/magnify/rsrc.rc

@@ -7,12 +7,9 @@
 #include "lang/de-DE.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ro-RO.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"
-#include "lang/zh-CN.rc"
-#include "lang/zh-TW.rc"

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

@@ -1,29 +0,0 @@
-/*
- * PROJECT:     ReactOS Management Console
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mmc/lang/zh-CN.rc
- * PURPOSE:     Chinese (Simplified) Language File for Management Console
- * TRANSLATOR:  Elton Chung <elton328@gmail.com>
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-
-IDM_CONSOLEROOT MENU DISCARDABLE
-BEGIN
-    POPUP "<22><><EFBFBD><EFBFBD>(&F)"
-    BEGIN
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD>(&X)\tAlt+F4", ID_FILE_EXIT
-    END
-
-    POPUP "˵<><CBB5>(&H)"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD> ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̨(&A)...", ID_HELP_ABOUT
-    END
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̨"
-    IDS_CONSOLETITLE "<22><><EFBFBD><EFBFBD>̨%1!u!"
-END

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

@@ -1,29 +0,0 @@
-/*
- * PROJECT:     ReactOS Management Console
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mmc/lang/zh-TW.rc
- * PURPOSE:     Chinese (Traditional) Language File for Management Console
- * TRANSLATOR:  Elton Chung <elton328@gmail.com>
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
-
-IDM_CONSOLEROOT MENU DISCARDABLE
-BEGIN
-    POPUP "<22>ɮ<EFBFBD>(&F)"
-    BEGIN
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD><EFBFBD>(&X)\tAlt+F4", ID_FILE_EXIT
-    END
-
-    POPUP "<22><><EFBFBD><EFBFBD>(&H)"
-    BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD> ReactOS <20>޲z<DEB2><7A><EFBFBD><EFBFBD><EFBFBD>x(&A)...", ID_HELP_ABOUT
-    END
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_APPTITLE "ReactOS <20>޲z<DEB2><7A><EFBFBD><EFBFBD><EFBFBD>x"
-    IDS_CONSOLETITLE "<22><><EFBFBD><EFBFBD><EFBFBD>x%1!u!"
-END

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>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>comdlg32</library>

reactos/base/applications/mmc/rsrc.rc

@@ -18,8 +18,6 @@
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"
 #include "lang/uk-UA.rc"
-#include "lang/zh-CN.rc"
-#include "lang/zh-TW.rc"
 
 
 

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

@@ -17,8 +17,8 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-	IDS_ALL_TYPES_FILTER "Alle unterst<EFBFBD>tzten (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
-	IDS_TOOLTIP_PLAY "Wiedergabe"
+	IDS_ALL_TYPES_FILTER "Alle Unterst<EFBFBD>tzten (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
+	IDS_TOOLTIP_PLAY "wiedergabe"
 	IDS_TOOLTIP_STOP "Stopp"
 	IDS_TOOLTIP_EJECT "Auswerfen"
 	IDS_TOOLTIP_BACKWARD "Zur<75>ck"

reactos/base/applications/mplay32/mplay32.rbuild

@@ -3,6 +3,7 @@
 	<library>advapi32</library>
 	<library>comctl32</library>
 	<library>comdlg32</library>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
 	<library>winmm</library>

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

@@ -83,7 +83,7 @@ BEGIN
    PUSHBUTTON    "A&ls Standard", IDC_BTN_SET_DEFAULT_BOOT, 120, 65, 63, 12
    PUSHBUTTON    "Nach &oben", IDC_BTN_MOVE_UP_BOOT_OPTION, 203, 65, 63, 12
    PUSHBUTTON    "Nach &unten", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 286, 65, 63, 12
-   GROUPBOX "Bootoptionen", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
+   GROUPBOX "Boot Optionen", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
    CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
    CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
    CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
@@ -149,7 +149,7 @@ BEGIN
     IDS_TOOLS_CMD_CMD        "cmd.exe"
 
     IDS_TOOLS_INFO_NAME      "Version"
-    IDS_TOOLS_INFO_DESCR     "Zeigt die installierte ReactOS-Version an."
+    IDS_TOOLS_INFO_DESCR     "Zeigt die installierte ReactOS Version an."
     IDS_TOOLS_INFO_CMD       "winver.exe"
 
     IDS_TOOLS_REGEDIT_NAME   "Registrierungs-Editor"

reactos/base/applications/msconfig/msconfig.rbuild

@@ -2,6 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="msconfig" type="win32gui" installbase="system32" installname="msconfig.exe" unicode="yes">
 	<include base="msconfig">.</include>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>
 	<library>version</library>

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

@@ -5,6 +5,7 @@
 	<library>ntdll</library>
 	<library>setupapi</library>
 	<library>gdi32</library>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>advapi32</library>

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

@@ -51,7 +51,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/mscutils/devmgmt/lang/ja-JP.rc

@@ -51,7 +51,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE "<EFBFBD><EFBFBD><EFBFBD>̃v<EFBFBD><EFBFBD><EFBFBD>O<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̓t<EFBFBD><EFBFBD><EFBFBD>[<5B>\\<5C>t<EFBFBD>g<EFBFBD>E<EFBFBD>F<EFBFBD>A<EFBFBD>ł<EFBFBD><C582>B<EFBFBD><42><EFBFBD>Ȃ<EFBFBD><C882>͂<EFBFBD><CD82><EFBFBD><EFBFBD><EFBFBD><EFBFBD>A<EFBFBD>t<EFBFBD><74><EFBFBD>[<5B>\\<5C>t<EFBFBD>g<EFBFBD>E<EFBFBD>F<EFBFBD>A<EFBFBD><41><EFBFBD>c<EFBFBD>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ĕ<EFBFBD><C494>s<EFBFBD><73><EFBFBD>ꂽ GNU<4E><55><EFBFBD>ʌ<EFBFBD><CA8C>O<EFBFBD><4F><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD>(<28>o<EFBFBD>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD>2<EFBFBD><32><EFBFBD>A<EFBFBD><41><EFBFBD>]<5D>ɂ<EFBFBD><C982><EFBFBD><EFBFBD>Ă͂<C482><CD82><EFBFBD><EFBFBD>ȍ~<7E>̃o<CC83>[<5B>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>̂<EFBFBD><CC82><EFBFBD><EFBFBD>ǂꂩ)<29>̒<EFBFBD><CC92>߂<EFBFBD><DF82><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̉<EFBFBD><CC89>ōĔЕz<D095>܂<EFBFBD><DC82>͉<EFBFBD><CD89>ς<EFBFBD><CF82>邱<EFBFBD>Ƃ<EFBFBD><C682>ł<EFBFBD><C582>܂<EFBFBD><DC82>B\r\n\r\n<><6E><EFBFBD>̃v<CC83><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>͗L<CD97>p<EFBFBD>ł<EFBFBD><C582>邱<EFBFBD>Ƃ<EFBFBD><C682><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĕz<C494>z<EFBFBD><7A><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD><EFBFBD>A*<2A>S<EFBFBD><53><EFBFBD>̖<EFBFBD><CC96>ۏ<EFBFBD>* <20>ł<EFBFBD><C582>B*<2A><><EFBFBD>Ɖ”\\<5C><><EFBFBD>̕ۏ<CC95>*<2A><>*<2A><><EFBFBD><EFBFBD><EFBFBD>̖ړI<DA93>ւ̓K<CC93><4B><EFBFBD><EFBFBD>*<2A>́A<CD81><41><EFBFBD>O<EFBFBD>Ɏ<EFBFBD><C98E><EFBFBD><EFBFBD>ꂽ<EFBFBD><EA82BD><EFBFBD>̂<EFBFBD><CC82>܂ߑS<DF91><53><EFBFBD><EFBFBD><EFBFBD>݂<EFBFBD><DD82>܂<EFBFBD><DC82><EFBFBD><EFBFBD>B<EFBFBD>ڂ<EFBFBD><DA82><EFBFBD><EFBFBD><EFBFBD>GNU<4E><55><EFBFBD>ʌ<EFBFBD><CA8C>O<EFBFBD><4F><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>񏑂<EFBFBD><F18F9182><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>B\r\n\r\n<><6E><EFBFBD>Ȃ<EFBFBD><C882>͂<EFBFBD><CD82>̃v<CC83><76><EFBFBD>O<EFBFBD><4F><EFBFBD><EFBFBD><EFBFBD>Ƌ<EFBFBD><C68B>ɁAGNU<4E><55><EFBFBD>ʌ<EFBFBD><CA8C>O<EFBFBD><4F><EFBFBD>p<EFBFBD><70><EFBFBD><EFBFBD><EFBFBD>_<EFBFBD>񏑂̕<F18F9182><CC95><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ꕔ<EFBFBD>󂯎<EFBFBD><F382AF8E><EFBFBD><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82>ł<EFBFBD><C582>B<EFBFBD><42><EFBFBD><EFBFBD><EFBFBD>󂯎<EFBFBD><F382AF8E><EFBFBD><EFBFBD>Ă<EFBFBD><C482>Ȃ<EFBFBD><C882><EFBFBD><EFBFBD>΁A<CE81>t<EFBFBD><74><EFBFBD>[<5B>\\<5C>t<EFBFBD>g<EFBFBD>E<EFBFBD>F<EFBFBD>A<EFBFBD><41><EFBFBD>c<EFBFBD>܂Ő<DC82><C590><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA)<29>B"
 END
 
 STRINGTABLE DISCARDABLE

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

@@ -59,7 +59,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE "<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>; <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 2 <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\r\n\r\n<><6E> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><>䳿 <20><> <20><>, <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD>-<2D><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><D2B2> <20><><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU.\r\n\r\n<><6E><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> GNU. <20><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/mscutils/devmgmt/mainwnd.c

@@ -342,21 +342,12 @@ OnNotify(PMAIN_WND_INFO Info,
         case NM_DBLCLK:
         {
             HTREEITEM hSelected = TreeView_GetSelection(Info->hTreeView);
-            TV_HITTESTINFO HitTest;
 
             if (!TreeView_GetChild(Info->hTreeView,
                                    hSelected))
             {
-                if (GetCursorPos(&HitTest.pt) &&
-                    ScreenToClient(Info->hTreeView, &HitTest.pt))
-                {
-                    if (TreeView_HitTest(Info->hTreeView, &HitTest))
-                    {
-                        if (HitTest.hItem == hSelected)
-                            OpenPropSheet(Info->hTreeView,
-                                          hSelected);
-                    }
-                }
+                OpenPropSheet(Info->hTreeView,
+                              hSelected);
             }
         }
         break;

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

@@ -2,6 +2,7 @@
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="eventvwr" type="win32gui" installbase="system32" installname="eventvwr.exe" unicode="yes">
 	<include base="eventvwr">.</include>
+	<library>kernel32</library>
 	<library>user32</library>
 	<library>comctl32</library>
 	<library>advapi32</library>

reactos/base/applications/mscutils/servman/control.c

@@ -2,183 +2,156 @@
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/mscutils/servman/control.c
- * PURPOSE:     Pauses and resumes a service
- * COPYRIGHT:   Copyright 2006-2010 Ged Murphy <gedmurphy@reactos.org>
+ * PURPOSE:     Stops, pauses and resumes a service
+ * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
  *
  */
 
 #include "precomp.h"
 
-static BOOL
-DoControl(PMAIN_WND_INFO Info,
-          HWND hProgress,
-          DWORD Control)
+BOOL
+Control(PMAIN_WND_INFO Info,
+        HWND hProgDlg,
+        DWORD Control)
 {
     SC_HANDLE hSCManager;
-    SC_HANDLE hService;
+    SC_HANDLE hSc;
     SERVICE_STATUS_PROCESS ServiceStatus = {0};
     SERVICE_STATUS Status;
     DWORD BytesNeeded = 0;
-    DWORD dwStartTickCount;
-    DWORD dwOldCheckPoint;
-    DWORD dwWaitTime;
-    DWORD dwMaxWait;
-    DWORD dwReqState;
     BOOL bRet = FALSE;
-
-    /* Set the state we're interested in */
-    switch (Control)
-    {
-        case SERVICE_CONTROL_PAUSE:
-            dwReqState = SERVICE_PAUSED;
-            break;
-        case SERVICE_CONTROL_CONTINUE:
-            dwReqState = SERVICE_RUNNING;
-            break;
-        default:
-            /* Unhandled control code */
-            return FALSE;
-    }
+    BOOL bDispErr = TRUE;
 
     hSCManager = OpenSCManager(NULL,
                                NULL,
-                               SC_MANAGER_CONNECT);
-    if (hSCManager)
+                               SC_MANAGER_ALL_ACCESS);
+    if (hSCManager != NULL)
     {
-        hService = OpenService(hSCManager,
-                               Info->pCurrentService->lpServiceName,
-                               SERVICE_PAUSE_CONTINUE | SERVICE_INTERROGATE | SERVICE_QUERY_STATUS);
-        if (hService)
+        hSc = OpenService(hSCManager,
+                          Info->pCurrentService->lpServiceName,
+                          SERVICE_ALL_ACCESS);
+        if (hSc != NULL)
         {
-            if (hProgress)
-            {
-                /* Increment the progress bar */
-                IncrementProgressBar(hProgress, DEFAULT_STEP);
-            }
-
-            /* Send the control message to the service */
-            if (ControlService(hService,
+            if (ControlService(hSc,
                                Control,
                                &Status))
             {
-                /* Get the service status */
-                if (QueryServiceStatusEx(hService,
+                bDispErr = FALSE;
+
+                if (QueryServiceStatusEx(hSc,
                                          SC_STATUS_PROCESS_INFO,
                                          (LPBYTE)&ServiceStatus,
                                          sizeof(SERVICE_STATUS_PROCESS),
                                          &BytesNeeded))
                 {
-                    /* We don't want to wait for more than 30 seconds */
-                    dwMaxWait = 30000;
-                    dwStartTickCount = GetTickCount();
+                    DWORD dwStartTickCount = GetTickCount();
+                    DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint;
+                    DWORD dwMaxWait = 2000 * 60; // wait for 2 mins
 
-                    /* Loop until it's at the correct state */
-                    while (ServiceStatus.dwCurrentState != dwReqState)
+                    IncrementProgressBar(hProgDlg);
+
+                    while (ServiceStatus.dwCurrentState != Control)
                     {
-                        dwOldCheckPoint = ServiceStatus.dwCheckPoint;
-                        dwWaitTime = ServiceStatus.dwWaitHint / 10;
+                        DWORD dwWaitTime = ServiceStatus.dwWaitHint / 10;
 
-                        /* Get the latest status info */
-                        if (!QueryServiceStatusEx(hService,
+                        if (!QueryServiceStatusEx(hSc,
                                                   SC_STATUS_PROCESS_INFO,
                                                   (LPBYTE)&ServiceStatus,
                                                   sizeof(SERVICE_STATUS_PROCESS),
                                                   &BytesNeeded))
                         {
-                            /* Something went wrong... */
                             break;
                         }
 
-                        /* Is the service making progress? */
                         if (ServiceStatus.dwCheckPoint > dwOldCheckPoint)
                         {
-                            /* It is, get the latest tickcount to reset the max wait time */
+                            /* The service is making progress, increment the progress bar */
+                            IncrementProgressBar(hProgDlg);
                             dwStartTickCount = GetTickCount();
                             dwOldCheckPoint = ServiceStatus.dwCheckPoint;
-                            IncrementProgressBar(hProgress, DEFAULT_STEP);
                         }
                         else
                         {
-                            /* It's not, make sure we haven't exceeded our wait time */
                             if(GetTickCount() >= dwStartTickCount + dwMaxWait)
                             {
-                                /* We have, give up */
+                                /* give up */
                                 break;
                             }
                         }
 
-                        /* Adjust the wait hint times */
-                        if (dwWaitTime < 200)
+                        if(dwWaitTime < 200)
                             dwWaitTime = 200;
                         else if (dwWaitTime > 10000)
                             dwWaitTime = 10000;
 
-                        /* Wait before trying again */
                         Sleep(dwWaitTime);
                     }
                 }
-
-                if (ServiceStatus.dwCurrentState == dwReqState)
-                {
-                    bRet = TRUE;
-                }
             }
 
-            CloseServiceHandle(hService);
+            CloseServiceHandle(hSc);
         }
 
         CloseServiceHandle(hSCManager);
     }
 
-    return bRet;
-}
-
-
-BOOL
-DoPause(PMAIN_WND_INFO Info)
-{
-    HWND hProgress;
-    BOOL bRet = FALSE;
-
-    /* Create a progress window to track the progress of the pausing service */
-    hProgress = CreateProgressDialog(Info->hMainWnd,
-                                     IDS_PROGRESS_INFO_PAUSE);
-    if (hProgress)
+    if (ServiceStatus.dwCurrentState == Control)
     {
-        /* Set the service name and reset the progress bag */
-        InitializeProgressDialog(hProgress, Info->pCurrentService->lpServiceName);
-
-        /* Resume the requested service */
-        bRet = DoControl(Info, hProgress, SERVICE_CONTROL_PAUSE);
-
-        /* Complete and destroy the progress bar */
-        DestroyProgressDialog(hProgress, bRet);
+        CompleteProgressBar(hProgDlg);
+        Sleep(500);
+        bRet = TRUE;
+    }
+    else
+    {
+        if (bDispErr)
+            GetError();
+        else
+            DisplayString(_T("The service failed to start"));
     }
 
     return bRet;
+
+
 }
 
 
-BOOL
-DoResume(PMAIN_WND_INFO Info)
+BOOL DoPause(PMAIN_WND_INFO Info)
 {
-    HWND hProgress;
-    BOOL bRet = FALSE;
+    BOOL ret = FALSE;
+    HWND hProgDlg;
 
-    /* Create a progress window to track the progress of the resuming service */
-    hProgress = CreateProgressDialog(Info->hMainWnd,
-                                     IDS_PROGRESS_INFO_RESUME);
-    if (hProgress)
+    hProgDlg = CreateProgressDialog(Info->hMainWnd,
+                                    Info->pCurrentService->lpServiceName,
+                                    IDS_PROGRESS_INFO_PAUSE);
+    if (hProgDlg)
     {
-        /* Set the service name and reset the progress bag */
-        InitializeProgressDialog(hProgress, Info->pCurrentService->lpServiceName);
+        ret = Control(Info,
+                      hProgDlg,
+                      SERVICE_CONTROL_PAUSE);
 
-        /* Resume the requested service */
-        bRet = DoControl(Info, hProgress, SERVICE_CONTROL_CONTINUE);
-
-        /* Complete and destroy the progress bar */
-        DestroyProgressDialog(hProgress, bRet);
+        DestroyWindow(hProgDlg);
     }
 
-    return bRet;
+    return ret;
+}
+
+
+BOOL DoResume(PMAIN_WND_INFO Info)
+{
+    BOOL ret = FALSE;
+    HWND hProgDlg;
+
+    hProgDlg = CreateProgressDialog(Info->hMainWnd,
+                                    Info->pCurrentService->lpServiceName,
+                                    IDS_PROGRESS_INFO_RESUME);
+    if (hProgDlg)
+    {
+        ret = Control(Info,
+                      hProgDlg,
+                      SERVICE_CONTROL_CONTINUE);
+
+        DestroyWindow(hProgDlg);
+    }
+
+    return ret;
 }

reactos/base/applications/mscutils/servman/dependencies.c

@@ -0,0 +1,298 @@
+/*
+ * PROJECT:     ReactOS Services
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/mscutils/servman/dependencies.c
+ * PURPOSE:     Helper functions for service dependents
+ * COPYRIGHT:   Copyright 2006-2009 Ged Murphy <gedmurphy@reactos.org>
+ *
+ */
+
+#include "precomp.h"
+
+
+/*
+ * Services which depend on the given service.
+ * The return components depend on this service
+ */
+LPTSTR
+GetDependentServices(SC_HANDLE hService)
+{
+    LPQUERY_SERVICE_CONFIG lpServiceConfig;
+    LPTSTR lpStr = NULL;
+    DWORD bytesNeeded;
+    DWORD bytes;
+
+    if (!QueryServiceConfig(hService,
+                            NULL,
+                            0,
+                            &bytesNeeded) &&
+        GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+    {
+        lpServiceConfig = HeapAlloc(ProcessHeap,
+                                    0,
+                                    bytesNeeded);
+        if (lpServiceConfig)
+        {
+            if (QueryServiceConfig(hService,
+                                   lpServiceConfig,
+                                   bytesNeeded,
+                                   &bytesNeeded))
+            {
+                if (lpServiceConfig)
+                {
+                    lpStr = lpServiceConfig->lpDependencies;
+                    bytes = 0;
+
+                    while (TRUE)
+                    {
+                        bytes++;
+
+                        if (!*lpStr && !*(lpStr + 1))
+                        {
+                            bytes++;
+                            break;
+                        }
+
+                        lpStr++;
+                    }
+
+                    bytes *= sizeof(TCHAR);
+                    lpStr = HeapAlloc(ProcessHeap,
+                                      0,
+                                      bytes);
+                    if (lpStr)
+                    {
+                        CopyMemory(lpStr,
+                                   lpServiceConfig->lpDependencies,
+                                   bytes);
+                    }
+                }
+            }
+        }
+    }
+
+    return lpStr;
+}
+
+
+/*
+ * Services which the given service depends on (1st treeview)
+ * The service depends on the return components 
+ */
+LPENUM_SERVICE_STATUS
+GetServiceDependents(SC_HANDLE hService,
+                     LPDWORD lpdwCount)
+{
+    LPENUM_SERVICE_STATUS lpDependencies;
+    DWORD dwBytesNeeded;
+    DWORD dwCount;
+
+    if (EnumDependentServices(hService,
+                              SERVICE_STATE_ALL,
+                              NULL,
+                              0,
+                              &dwBytesNeeded,
+                              &dwCount))
+    {
+        /* There are no dependent services */
+         return NULL;
+    }
+    else
+    {
+        if (GetLastError() != ERROR_MORE_DATA)
+            return NULL; /* Unexpected error */
+
+        lpDependencies = (LPENUM_SERVICE_STATUS)HeapAlloc(GetProcessHeap(),
+                                                          0,
+                                                          dwBytesNeeded);
+        if (lpDependencies)
+        {
+            if (EnumDependentServices(hService,
+                                       SERVICE_STATE_ALL,
+                                       lpDependencies,
+                                       dwBytesNeeded,
+                                       &dwBytesNeeded,
+                                       &dwCount))
+            {
+                *lpdwCount = dwCount;
+            }
+            else
+            {
+                HeapFree(ProcessHeap,
+                         0,
+                         lpDependencies);
+
+                lpDependencies = NULL;
+            }
+        }
+    }
+
+    return lpDependencies;
+
+}
+
+
+BOOL
+HasDependentServices(SC_HANDLE hService)
+{
+    DWORD dwBytesNeeded, dwCount;
+    BOOL bRet = FALSE;
+
+    if (hService)
+    {
+        if (!EnumDependentServices(hService,
+                                   SERVICE_STATE_ALL,
+                                   NULL,
+                                   0,
+                                   &dwBytesNeeded,
+                                   &dwCount))
+        {
+             if (GetLastError() == ERROR_MORE_DATA)
+                 bRet = TRUE;
+        }
+    }
+
+    return bRet;
+}
+
+static BOOL
+DoInitDependsDialog(PSTOP_INFO pStopInfo,
+                    HWND hDlg)
+{
+    LPENUM_SERVICE_STATUS lpDependencies;
+    DWORD dwCount;
+    LPTSTR lpPartialStr, lpStr;
+    DWORD fullLen;
+    HICON hIcon = NULL;
+    BOOL bRet = FALSE;
+
+    if (pStopInfo)
+    {
+        SetWindowLongPtr(hDlg,
+                         GWLP_USERDATA,
+                         (LONG_PTR)pStopInfo);
+
+        hIcon = (HICON)LoadImage(hInstance,
+                                 MAKEINTRESOURCE(IDI_SM_ICON),
+                                 IMAGE_ICON,
+                                 16,
+                                 16,
+                                 0);
+        if (hIcon)
+        {
+            SendMessage(hDlg,
+                        WM_SETICON,
+                        ICON_SMALL,
+                        (LPARAM)hIcon);
+            DestroyIcon(hIcon);
+        }
+
+        /* Add the label */
+        if (AllocAndLoadString(&lpPartialStr,
+                               hInstance,
+                               IDS_STOP_DEPENDS))
+        {
+            fullLen = _tcslen(lpPartialStr) + _tcslen(pStopInfo->pInfo->pCurrentService->lpDisplayName) + 1;
+
+            lpStr = HeapAlloc(ProcessHeap,
+                              0,
+                              fullLen * sizeof(TCHAR));
+            if (lpStr)
+            {
+                _sntprintf(lpStr, fullLen, lpPartialStr, pStopInfo->pInfo->pCurrentService->lpDisplayName);
+
+                SendDlgItemMessage(hDlg,
+                                   IDC_STOP_DEPENDS,
+                                   WM_SETTEXT,
+                                   0,
+                                   (LPARAM)lpStr);
+
+                bRet = TRUE;
+
+                HeapFree(ProcessHeap,
+                         0,
+                         lpStr);
+            }
+
+            HeapFree(ProcessHeap,
+                     0,
+                     lpPartialStr);
+        }
+
+        /* Get the list of dependencies */
+        lpDependencies = GetServiceDependents(pStopInfo->hMainService, &dwCount);
+        if (lpDependencies)
+        {
+            LPENUM_SERVICE_STATUS lpEnumServiceStatus;
+            DWORD i;
+
+            for (i = 0; i < dwCount; i++)
+            {
+                lpEnumServiceStatus = &lpDependencies[i];
+
+                /* Add the service to the listbox */
+                SendDlgItemMessage(hDlg,
+                                   IDC_STOP_DEPENDS_LB,
+                                   LB_ADDSTRING,
+                                   0,
+                                   (LPARAM)lpEnumServiceStatus->lpDisplayName);
+            }
+
+            HeapFree(ProcessHeap,
+                     0,
+                     lpDependencies);
+        }
+    }
+
+    return bRet;
+}
+
+
+INT_PTR CALLBACK
+StopDependsDialogProc(HWND hDlg,
+                      UINT message,
+                      WPARAM wParam,
+                      LPARAM lParam)
+{
+    PSTOP_INFO pStopInfo = NULL;
+
+    /* Get the window context */
+    pStopInfo = (PSTOP_INFO)GetWindowLongPtr(hDlg,
+                                             GWLP_USERDATA);
+    if (pStopInfo == NULL && message != WM_INITDIALOG)
+    {
+        return FALSE;
+    }
+
+    switch (message)
+    {
+        case WM_INITDIALOG:
+        {
+            BOOL bRet = FALSE;
+
+            pStopInfo = (PSTOP_INFO)lParam;
+            if (pStopInfo != NULL)
+            {
+                bRet = DoInitDependsDialog(pStopInfo, hDlg);
+            }
+
+            return bRet;
+        }
+
+        case WM_COMMAND:
+        {
+            switch (LOWORD(wParam))
+            {
+                case IDOK:
+                case IDCANCEL:
+                {
+                    EndDialog(hDlg,
+                              LOWORD(wParam));
+                    return TRUE;
+                }
+            }
+        }
+    }
+
+    return FALSE;
+}

reactos/base/applications/mscutils/servman/dependencies_tv1.c

@@ -1,206 +0,0 @@
-/*
- * PROJECT:     ReactOS Services
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/tv1_dependencies.c
- * PURPOSE:     Helper functions for service dependents
- * COPYRIGHT:   Copyright 2009 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-#include "precomp.h"
-
-
-LPTSTR
-TV1_GetDependants(PSERVICEPROPSHEET pDlgInfo,
-                  SC_HANDLE hService)
-{
-    LPQUERY_SERVICE_CONFIG lpServiceConfig;
-    LPTSTR lpStr = NULL;
-    DWORD bytesNeeded;
-    DWORD bytes;
-
-    /* Get the info for this service */
-    if (!QueryServiceConfig(hService,
-                            NULL,
-                            0,
-                            &bytesNeeded) &&
-        GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-    {
-        lpServiceConfig = HeapAlloc(ProcessHeap,
-                                    0,
-                                    bytesNeeded);
-        if (lpServiceConfig)
-        {
-            if (QueryServiceConfig(hService,
-                                   lpServiceConfig,
-                                   bytesNeeded,
-                                   &bytesNeeded))
-            {
-                /* Does this service have any dependencies? */
-                if (lpServiceConfig->lpDependencies &&
-                    *lpServiceConfig->lpDependencies != '\0')
-                {
-                    lpStr = lpServiceConfig->lpDependencies;
-                    bytes = 0;
-
-                    /* Work out how many bytes we need to hold the list */
-                    while (TRUE)
-                    {
-                        bytes++;
-
-                        if (!*lpStr && !*(lpStr + 1))
-                        {
-                            bytes++;
-                            break;
-                        }
-
-                        lpStr++;
-                    }
-
-                    /* Allocate and copy the list */
-                    bytes *= sizeof(TCHAR);
-                    lpStr = HeapAlloc(ProcessHeap,
-                                      0,
-                                      bytes);
-                    if (lpStr)
-                    {
-                        CopyMemory(lpStr,
-                                   lpServiceConfig->lpDependencies,
-                                   bytes);
-                    }
-                }
-            }
-
-            HeapFree(GetProcessHeap(),
-                     0,
-                     lpServiceConfig);
-        }
-    }
-
-    return lpStr;
-}
-
-VOID
-TV1_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo,
-                        HTREEITEM hParent,
-                        LPTSTR lpServiceName)
-{
-    SC_HANDLE hSCManager;
-    SC_HANDLE hService;
-    LPQUERY_SERVICE_CONFIG lpServiceConfig;
-    LPTSTR lpDependants;
-    LPTSTR lpStr;
-    LPTSTR lpNoDepends;
-    BOOL bHasChildren;
-
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ALL_ACCESS);
-    if (hSCManager)
-    {
-        hService = OpenService(hSCManager,
-                               lpServiceName,
-                               SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG);
-        if (hService)
-        {
-            /* Get a list of service dependents */
-            lpDependants = TV1_GetDependants(pDlgInfo, hService);
-            if (lpDependants)
-            {
-                lpStr = lpDependants;
-
-                /* Make sure this isn't the end of the list */
-                while (*lpStr)
-                {
-                    /* Get the info for this service */
-                    lpServiceConfig = GetServiceConfig(lpStr);
-                    if (lpServiceConfig)
-                    {
-                        /* Does this item need a +/- box? */
-                        if (lpServiceConfig->lpDependencies &&
-                            *lpServiceConfig->lpDependencies != '\0')
-                        {
-                            bHasChildren = TRUE;
-                        }
-                        else
-                        {
-                            bHasChildren = FALSE;
-                        }
-
-                        /* Add it */
-                        AddItemToTreeView(pDlgInfo->hDependsTreeView1,
-                                          hParent,
-                                          lpServiceConfig->lpDisplayName,
-                                          lpStr,
-                                          lpServiceConfig->dwServiceType,
-                                          bHasChildren);
-
-                        HeapFree(GetProcessHeap(),
-                                 0,
-                                 lpServiceConfig);
-                    }
-
-                    /* Move to the end of the string */
-                    while (*lpStr++)
-                        ;
-                }
-
-                HeapFree(GetProcessHeap(),
-                         0,
-                         lpDependants);
-            }
-            else
-            {
-                /* If there is no parent, set the tree to 'no dependencies' */
-                if (!hParent)
-                {
-                    /* Load the 'No dependencies' string */
-                    AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS);
-
-                    AddItemToTreeView(pDlgInfo->hDependsTreeView1,
-                                      NULL,
-                                      lpNoDepends,
-                                      NULL,
-                                      0,
-                                      FALSE);
-
-                    HeapFree(ProcessHeap,
-                             0,
-                             lpNoDepends);
-
-                    /* Disable the window */
-                    EnableWindow(pDlgInfo->hDependsTreeView1, FALSE);
-                }
-            }
-
-            CloseServiceHandle(hService);
-        }
-
-        CloseServiceHandle(hSCManager);
-    }
-}
-
-
-BOOL
-TV1_Initialize(PSERVICEPROPSHEET pDlgInfo,
-               LPTSTR lpServiceName)
-{
-    BOOL bRet = FALSE;
-
-    /* Accociate the imagelist with TV1 */
-    pDlgInfo->hDependsTreeView1 = GetDlgItem(pDlgInfo->hDependsWnd, IDC_DEPEND_TREE1);
-    if (!pDlgInfo->hDependsTreeView1)
-    {
-        ImageList_Destroy(pDlgInfo->hDependsImageList);
-        pDlgInfo->hDependsImageList = NULL;
-        return FALSE;
-    }
-    (void)TreeView_SetImageList(pDlgInfo->hDependsTreeView1,
-                                pDlgInfo->hDependsImageList,
-                                TVSIL_NORMAL);
-
-    /* Set the first items in the control */
-    TV1_AddDependantsToTree(pDlgInfo, NULL, lpServiceName);
-
-    return bRet;
-}

reactos/base/applications/mscutils/servman/dependencies_tv2.c

@@ -1,201 +0,0 @@
-/*
- * PROJECT:     ReactOS Services
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/tv2_dependencies.c
- * PURPOSE:     Helper functions for service dependents
- * COPYRIGHT:   Copyright 2009 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-#include "precomp.h"
-
-
-BOOL
-TV2_HasDependantServices(LPWSTR lpServiceName)
-{
-    HANDLE hSCManager;
-    HANDLE hService;
-    DWORD dwBytesNeeded, dwCount;
-    BOOL bRet = FALSE;
-
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ALL_ACCESS);
-    if (hSCManager)
-    {
-        hService = OpenService(hSCManager,
-                               lpServiceName,
-                               SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS);
-        if (hService)
-        {
-            /* Does this have any dependencies? */
-            if (!EnumDependentServices(hService,
-                                       SERVICE_STATE_ALL,
-                                       NULL,
-                                       0,
-                                       &dwBytesNeeded,
-                                       &dwCount))
-            {
-                 if (GetLastError() == ERROR_MORE_DATA)
-                 {
-                     /* It does, return TRUE */
-                     bRet = TRUE;
-                 }
-            }
-        }
-
-        CloseServiceHandle(hSCManager);
-    }
-
-    return bRet;
-}
-
-
-LPENUM_SERVICE_STATUS
-TV2_GetDependants(LPWSTR lpServiceName,
-                  LPDWORD lpdwCount)
-{
-    SC_HANDLE hSCManager;
-    SC_HANDLE hService;
-    LPENUM_SERVICE_STATUSW lpDependencies = NULL;
-    DWORD dwBytesNeeded;
-    DWORD dwCount;
-
-    /* Set the first items in each tree view */
-    hSCManager = OpenSCManagerW(NULL,
-                                NULL,
-                                SC_MANAGER_ALL_ACCESS);
-    if (hSCManager)
-    {
-        hService = OpenServiceW(hSCManager,
-                                lpServiceName,
-                                SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS | SERVICE_QUERY_CONFIG);
-        if (hService)
-        {
-            /* Does this have any dependencies? */
-            if (!EnumDependentServicesW(hService,
-                                        SERVICE_STATE_ALL,
-                                        NULL,
-                                        0,
-                                        &dwBytesNeeded,
-                                        &dwCount) &&
-                GetLastError() == ERROR_MORE_DATA)
-            {
-                lpDependencies = (LPENUM_SERVICE_STATUSW)HeapAlloc(GetProcessHeap(),
-                                                                  0,
-                                                                  dwBytesNeeded);
-                if (lpDependencies)
-                {
-                    /* Get the list of dependents */
-                    if (EnumDependentServicesW(hService,
-                                               SERVICE_STATE_ALL,
-                                               lpDependencies,
-                                               dwBytesNeeded,
-                                               &dwBytesNeeded,
-                                               &dwCount))
-                    {
-                        /* Set the count */
-                        *lpdwCount = dwCount;
-                    }
-                    else
-                    {
-                        HeapFree(ProcessHeap,
-                                 0,
-                                 lpDependencies);
-
-                        lpDependencies = NULL;
-                    }
-                }
-            }
-
-            CloseServiceHandle(hService);
-        }
-
-        CloseServiceHandle(hSCManager);
-    }
-
-    return lpDependencies;
-}
-
-
-VOID
-TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo,
-                        HTREEITEM hParent,
-                        LPTSTR lpServiceName)
-{
-
-    LPENUM_SERVICE_STATUSW lpServiceStatus;
-    LPTSTR lpNoDepends;
-    DWORD count, i;
-    BOOL bHasChildren;
-
-    /* Get a list of service dependents */
-    lpServiceStatus = TV2_GetDependants(lpServiceName, &count);
-    if (lpServiceStatus)
-    {
-        for (i = 0; i < count; i++)
-        {
-            /* Does this item need a +/- box? */
-            bHasChildren = TV2_HasDependantServices(lpServiceStatus[i].lpServiceName);
-
-            /* Add it */
-            AddItemToTreeView(pDlgInfo->hDependsTreeView2,
-                              hParent,
-                              lpServiceStatus[i].lpDisplayName,
-                              lpServiceStatus[i].lpServiceName,
-                              lpServiceStatus[i].ServiceStatus.dwServiceType,
-                              bHasChildren);
-        }
-
-        HeapFree(GetProcessHeap(),
-                 0,
-                 lpServiceStatus);
-    }
-    else
-    {
-        /* If there is no parent, set the tree to 'no dependencies' */
-        if (!hParent)
-        {
-            /* Load the 'No dependencies' string */
-            AllocAndLoadString(&lpNoDepends, hInstance, IDS_NO_DEPENDS);
-
-            AddItemToTreeView(pDlgInfo->hDependsTreeView2,
-                              NULL,
-                              lpNoDepends,
-                              NULL,
-                              0,
-                              FALSE);
-
-            HeapFree(ProcessHeap,
-                     0,
-                     lpNoDepends);
-
-            /* Disable the window */
-            EnableWindow(pDlgInfo->hDependsTreeView2, FALSE);
-        }
-    }
-}
-
-BOOL
-TV2_Initialize(PSERVICEPROPSHEET pDlgInfo,
-               LPTSTR lpServiceName)
-{
-    BOOL bRet = FALSE;
-
-    /* Accociate the imagelist with TV2 */
-    pDlgInfo->hDependsTreeView2 = GetDlgItem(pDlgInfo->hDependsWnd, IDC_DEPEND_TREE2);
-    if (!pDlgInfo->hDependsTreeView2)
-    {
-        ImageList_Destroy(pDlgInfo->hDependsImageList);
-        pDlgInfo->hDependsImageList = NULL;
-        return FALSE;
-    }
-    (void)TreeView_SetImageList(pDlgInfo->hDependsTreeView2,
-                                pDlgInfo->hDependsImageList,
-                                TVSIL_NORMAL);
-
-    /* Set the first items in the control */
-    TV2_AddDependantsToTree(pDlgInfo, NULL, lpServiceName);
-
-    return bRet;
-}

reactos/base/applications/mscutils/servman/lang/bg-BG.rc

@@ -93,7 +93,7 @@ BEGIN
   LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 4, 51, 110, 11
   LTEXT "<22><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 73, 110, 9
 /* startup type*/
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 108, 110, 11
+  LTEXT "<22><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 108, 110, 11
   LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 4, 138, 110, 11
   LTEXT "", IDC_SERV_STATUS, 120, 138, 176, 11, WS_CHILD | WS_VISIBLE
 /*  LTEXT "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC, 6,177,240,15 */
@@ -107,8 +107,8 @@ CAPTION "
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
 /*  LTEXT "Some services depend on other services, system drivers and load order groups. If a system component is stopped or it is not running properly, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26 */
   LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (driver) <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.", IDC_STATIC,8, 7, 238, 26
   LTEXT "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_STATIC, 8, 57, 236, 9

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

@@ -106,8 +106,8 @@ CAPTION "Abh
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
   LTEXT "Einige Dienste sind von anderen Diensten, Systemtreibern und Ladegruppen abh<62>ngig. Falls eine Systemkomponente anh<6E>lt oder nicht einwandfrei ausgef<65>hrt wird, kann dies Auswirkungen auf abh<62>ngige Dienste haben.", IDC_STATIC,8, 7, 238, 38
   LTEXT "Dieser Dienst ist von diesen Systemkomponenten abh<62>ngig", IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13
@@ -193,7 +193,7 @@ BEGIN
   IDS_NUM_SERVICES "Anzahl der Dienste: %d"
   IDS_STOP_DEPENDS "When %s stops, these other services will also stop"
   IDS_NO_DEPENDS "<No Dependencies>"
-  IDS_LICENSE "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE DISCARDABLE

reactos/base/applications/mscutils/servman/lang/el-GR.rc

@@ -106,8 +106,8 @@ CAPTION "
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
   LTEXT "Some services depend on other services, system drivers and load order groups. If a system component is stopped or it is not running properly, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26
   LTEXT "This service depends on the following components", IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

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

@@ -106,8 +106,8 @@ CAPTION "Dependencies"
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
   LTEXT "Some services depend on other services, system drivers and load order groups. If a system component is stopped or it is not running properly, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26
   LTEXT "This service depends on the following components", IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

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

@@ -106,8 +106,8 @@ CAPTION "Dependencias"
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
   LTEXT "Algunos servicios dependen de otros servicios, controladores de sistemas y grupos de orden de carga. Si un componente de sistema se detiene o no funciona correctamente, es posible que otros servicios dependientes resulten afectados.", IDC_STATIC,8, 7, 238, 26
   LTEXT "Este servicio depende de los siguientes componentes", IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13

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

@@ -107,8 +107,8 @@ CAPTION "D
 FONT 8, "MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
 BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" , WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 70, 236, 68
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", WS_BORDER | WS_CHILDWINDOW | WS_VISIBLE | WS_TABSTOP | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP, 8, 151, 234, 67
+  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
+  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
   LTEXT "Certains services d<>pendent d'autres services, pilotes syst<73>me et groupes d'ordre de chargement. Si un composant syst<73>me est arr<72>t<EFBFBD> ou ne fonctionne pas correctement, les services d<>pendants peuvent <20>tre affect<63>s.", IDC_STATIC,8, 7, 238, 36
   LTEXT "Ce service d<>pend des composants syst<73>me suivants", IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13