- Disable NHF dialog for VMWare SCSI controller's driver (if user clicks "Yes", drivers are installed but currently unsupported by ReactOS).

svn path=/branches/ros-branch-0_3_3-new/; revision=29009

reactos/Makefile

@@ -38,7 +38,7 @@
 #        This can require several minutes to complete. If you only need to check
 #        dependencies for a single or few modules then you can use the
 #        module_depends targets instead. This target can also repair a damaged or
-#        missing makefile-{ROS_ARCH}.auto if needed.
+#        missing makefile.auto if needed.
 #
 #    module_depends
 #        These targets do a dependency check of individual modules. Replace module
@@ -65,13 +65,13 @@
 #        files are generated files that are needed to generate the final
 #        output files. Examples of intermediate files include *.o, *.a, and
 #        *.coff. N.B. Don't put a path separator at the end. The variable
-#        defaults to .\obj-{ROS_ARCH}.
+#        defaults to .\obj-i386.
 #
 #    ROS_OUTPUT
 #        This variable controls where to put output files. Output files are
 #        generated files that makes up the result of the build process.
 #        Examples of output files include *.exe, *.dll, and *.sys. N.B. Don't
-#        put a path separator at the end. The variable defaults to .\output-{ROS_ARCH}.
+#        put a path separator at the end. The variable defaults to .\output-i386.
 #
 #    ROS_CDOUTPUT
 #        This variable controls the name of the ReactOS directory on cdrom.
@@ -89,7 +89,7 @@
 #    ROS_INSTALL
 #        This variable controls where to install output files to when using
 #        'make install'. N.B. Don't put a path separator at the end. The variable
-#        defaults to .\{ROS_CDOUTPUT}.
+#        defaults to .\reactos.
 #
 #    ROS_BUILDMAP
 #        This variable controls if map files are to be generated for executable
@@ -147,12 +147,6 @@ endif
 .PHONY: world
 .PHONY: universe
 
-ifneq ($(ROS_ARCH),)
-  ARCH := $(ROS_ARCH)
-else
-  ARCH := i386
-endif
-
 ifeq ($(ROS_AUTOMAKE),)
 ROS_AUTOMAKE=makefile.auto
 endif
@@ -167,15 +161,15 @@ ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32)
 ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
 export OSTYPE = msys
 HOST=mingw32-linux
-HOST_CFLAGS+=-fshort-wchar
-HOST_CPPFLAGS+=-fshort-wchar
+CFLAGS+=-fshort-wchar
+CPPFLAGS+=-fshort-wchar
 else
 HOST=mingw32-windows
 endif
 else
 HOST=mingw32-linux
-HOST_CFLAGS+=-fshort-wchar
-HOST_CPPFLAGS+=-fshort-wchar
+CFLAGS+=-fshort-wchar
+CPPFLAGS+=-fshort-wchar
 endif
 endif
 
@@ -333,17 +327,31 @@ else # mingw32-windows
 	endif
 endif
 
+ifneq ($(ROS_ARCH),)
+  ARCH := $(ROS_ARCH)
+else
+  ARCH := i386
+endif
+
 ifneq ($(ROS_INTERMEDIATE),)
   INTERMEDIATE := $(ROS_INTERMEDIATE)
 else
-  INTERMEDIATE := obj-$(ARCH)
+  ifneq ($(ROS_CDOUTPUT),)
+    INTERMEDIATE := obj-$(ROS_CDOUTPUT)
+  else
+    INTERMEDIATE := obj-$(ARCH)
+  endif
 endif
 INTERMEDIATE_ := $(INTERMEDIATE)$(SEP)
 
 ifneq ($(ROS_OUTPUT),)
   OUTPUT := $(ROS_OUTPUT)
 else
-  OUTPUT := output-$(ARCH)
+  ifneq ($(ROS_CDOUTPUT),)
+    OUTPUT := output-$(ROS_CDOUTPUT)
+  else
+    OUTPUT := output-$(ARCH)
+  endif
 endif
 OUTPUT_ := $(OUTPUT)$(SEP)
 
@@ -357,14 +365,18 @@ CDOUTPUT_ := $(CDOUTPUT)$(SEP)
 ifneq ($(ROS_TEMPORARY),)
   TEMPORARY := $(ROS_TEMPORARY)
 else
-  TEMPORARY := .
+  TEMPORARY :=
 endif
 TEMPORARY_ := $(TEMPORARY)$(SEP)
 
 ifneq ($(ROS_INSTALL),)
   INSTALL := $(ROS_INSTALL)
 else
-  INSTALL := $(CDOUTPUT)
+  ifneq ($(ROS_CDOUTPUT),)
+    INSTALL := reactos.$(ROS_CDOUTPUT)
+  else
+    INSTALL := reactos
+  endif
 endif
 INSTALL_ := $(INSTALL)$(SEP)
 
@@ -403,9 +415,6 @@ PREAUTO := \
 	$(ERRCODES_RC) \
 	$(GENDIB_DIB_FILES) \
 	$(NCI_SERVICE_FILES)
-ifeq ($(ARCH),powerpc)
-PREAUTO += $(OFW_INTERFACE_SERVICE_FILES) $(PPCMMU_TARGETS)
-endif
 
 $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
 	${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL)
@@ -435,9 +444,26 @@ universe:
 		world
 
 sysregtest:
-	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg
-	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg
-	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg
+	-mkdir $(OUTPUT_)cd$(SEP)reactos
+	$(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample boot$(SEP)bootdata$(SEP)unattend.inf
+	$(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf
+	$(cp) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat.sample boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat
+	$(MAKE) dbgprint
+	$(MAKE) bootcdregtest
+	$(MAKE) sysreg
+	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg rosboot
+	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)secstage.cfg rosboot
+	$(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)runonce.cfg rosboot
+
+sysregtest_clean:
+	$(rm) boot$(SEP)bootdata$(SEP)unattend.inf
+	$(rm) boot$(SEP)bootdata$(SEP)bootcdregtest$(SEP)testboot.bat
+	$(rm) $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf
+
+regtest:
+	$(cp) boot$(SEP)bootdata$(SEP)unattend.inf.sample $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf
+	$(MAKE) bootcdregtest
+	$(rm) $(OUTPUT_)cd$(SEP)reactos$(SEP)unattend.inf
 
 .PHONY: cb
 cb: $(RBUILD_TARGET)

reactos/ReactOS-generic.rbuild

@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <xi:include href="baseaddress.rbuild" />
-
-  <define name="_REACTOS_" />
-  <if property="MP" value="1">
-    <define name="CONFIG_SMP" value="1" />
-  </if>
-  <if property="DBG" value="1">
-    <define name="DBG" value="1" />
-    <define name="_SEH_ENABLE_TRACE" />
-    <property name="DBG_OR_KDBG" value="true" />
-  </if>
-  <if property="KDBG" value="1">
-    <define name="KDBG" value="1" />
-    <property name="DBG_OR_KDBG" value="true" />
-  </if>
-
-  <include>.</include>
-  <include>include</include>
-  <include root="intermediate">include</include>
-  <include>include/psdk</include>
-  <include root="intermediate">include/psdk</include>
-  <include>include/dxsdk</include>
-  <include>include/crt</include>
-  <include>include/ddk</include>
-  <include>include/GL</include>
-  <include>include/ndk</include>
-  <include>include/reactos</include>
-  <include root="intermediate">include/reactos</include>
-  <include>include/reactos/libs</include>
-
-  <directory name="base">
-    <xi:include href="base/base.rbuild" />
-  </directory>
-  <directory name="boot">
-    <xi:include href="boot/boot.rbuild" />
-  </directory>
-  <directory name="dll">
-    <xi:include href="dll/dll.rbuild" />
-  </directory>
-  <directory name="drivers">
-    <xi:include href="drivers/drivers.rbuild" />
-  </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>
-  <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" />
-  </directory>
-  <directory name="subsystems">
-    <xi:include href="subsystems/subsystems.rbuild" />
-  </directory>
-
-</project>

reactos/ReactOS-i386.rbuild

@@ -7,11 +7,24 @@
     </xi:fallback>
   </xi:include>
 
-  <xi:include href="ReactOS-generic.rbuild" />
+  <xi:include href="baseaddress.rbuild" />
 
   <define name="_M_IX86" />
   <define name="_X86_" />
   <define name="__i386__" />
+  <define name="_REACTOS_" />
+  <if property="MP" value="1">
+    <define name="CONFIG_SMP" value="1" />
+  </if>
+  <if property="DBG" value="1">
+    <define name="DBG" value="1" />
+	<define name="_SEH_ENABLE_TRACE" />
+    <property name="DBG_OR_KDBG" value="true" />
+  </if>
+  <if property="KDBG" value="1">
+    <define name="KDBG" value="1" />
+    <property name="DBG_OR_KDBG" value="true" />
+  </if>
 
   <if property="GDB" value="0">
     <if property="OPTIMIZE" value="1">
@@ -42,4 +55,52 @@
   <compilerflag>-Wpointer-arith</compilerflag>
   <linkerflag>-enable-stdcall-fixup</linkerflag>
 
+  <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>include/crt</include>
+  <include>include/ddk</include>
+  <include>include/GL</include>
+  <include>include/ndk</include>
+  <include>include/reactos</include>
+  <include root="intermediate">include/reactos</include>
+  <include>include/reactos/libs</include>
+
+  <directory name="base">
+    <xi:include href="base/base.rbuild" />
+  </directory>
+  <directory name="boot">
+    <xi:include href="boot/boot.rbuild" />
+  </directory>
+  <directory name="dll">
+    <xi:include href="dll/dll.rbuild" />
+  </directory>
+  <directory name="drivers">
+    <xi:include href="drivers/drivers.rbuild" />
+  </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>
+  <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" />
+  </directory>
+  <directory name="subsystems">
+    <xi:include href="subsystems/subsystems.rbuild" />
+  </directory>
+
 </project>

reactos/ReactOS-ppc.rbuild

@@ -7,29 +7,88 @@
     </xi:fallback>
   </xi:include>
 
-  <xi:include href="ReactOS-generic.rbuild" />
+  <xi:include href="baseaddress.rbuild" />
 
-  <property name="OFWLDR_LINKFORMAT" value="-L$(INTERMEDIATE)/lib/ppcmmu -lppcmmu_code -lppcmmu -nostdlib -nostartfiles"/>
+  <property name="BOOTPROG_PREPARE" value="ppc-le2be" />
+  <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" />
+  <property name="BOOTPROG_LINKFORMAT" value="-melf32ppc --no-omagic -Ttext 0xe00000 -Tdata 0xe10000" />
+  <property name="BOOTPROG_COPYFORMAT" value="--only-section=.text --only-section=.data --only-section=.bss -O aixcoff-rs6000" />
 
   <define name="_M_PPC" />
   <define name="_PPC_" />
   <define name="__PowerPC__" />
   <define name="_REACTOS_" />
+  <define name="__MINGW_IMPORT" empty="true" />
   <define name="stdcall" empty="true" />	
   <define name="__stdcall__" empty="true" />
   <define name="fastcall" empty="true" />
   <define name="cdecl" empty="true" />
   <define name="__cdecl__" empty="true" />
   <define name="dllimport" empty="true" />
-  <define name="WORDS_BIGENDIAN" empty="true" />
-  <define name="MB_CUR_MAX">1</define>
-  <define name="_BSDTYPES_DEFINED"/>
-  <compilerflag>-fshort-wchar</compilerflag>
-  <compilerflag>-fsigned-char</compilerflag>
-  <compilerflag>-mfull-toc</compilerflag>
-  <compilerflag>-meabi</compilerflag>
-  <compilerflag>-O2</compilerflag>
-  <compilerflag>-Wno-strict-aliasing</compilerflag>
-  <compilerflag>-Wno-trampolines</compilerflag>
+  <compilerflag>-v</compilerflag>
+  <if property="MP" value="1">
+    <define name="CONFIG_SMP" value="1" />
+  </if>
+  <if property="DBG" value="1">
+    <define name="DBG" value="1" />
+    <property name="DBG_OR_KDBG" value="true" />
+  </if>
+  <if property="DBG" value="0">
+    <compilerflag>-Os</compilerflag>
+    <compilerflag>-Wno-strict-aliasing</compilerflag>
+  </if>
+  <if property="KDBG" value="1">
+    <define name="KDBG" value="1" />
+    <property name="DBG_OR_KDBG" value="true" />
+  </if>
+  <compilerflag>-Wpointer-arith</compilerflag>
+
+  <include>.</include>
+  <include>include</include>
+  <include>include/reactos</include>
+  <include>include/libs</include>
+  <include>include/drivers</include>
+  <include>include/subsys</include>
+  <include>include/ndk</include>
+  <include>include</include>
+  <include>include/crt</include>
+  <include>include/ddk</include>
+
+  <directory name="base">
+    <xi:include href="base/base.rbuild" />
+  </directory>
+  <directory name="boot">
+    <xi:include href="boot/boot.rbuild" />
+  </directory>
+  <directory name="dll">
+    <xi:include href="dll/dll.rbuild" />
+  </directory>
+  <directory name="drivers">
+    <xi:include href="drivers/drivers.rbuild" />
+  </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>
+  <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" />
+  </directory>
+  <directory name="regtests">
+    <xi:include href="regtests/directory.rbuild" />
+  </directory>  
+  <directory name="subsystems">
+    <xi:include href="subsystems/subsystems.rbuild" />
+  </directory>
 
 </project>

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

@@ -10,7 +10,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 {
 
-IDS_HELP, "Poka<6B> lub modyfikuj list<73> kontroli dost<73>pu (Access Control List) plik<69>w\n\n\
+IDS_HELP, "Poka<6B> albo modyfikuj list<73> kontroli dost<73>pu (Access Control List) plik<69>w\n\n\
 CACLS nazwa pliku [/T] [/E] [/C] [/G u<>ytkownik:dost<73>p [...]] [/R u<>ytkownik [...]]\n\
                [/P u<>ytkownik:dost<73>p [...]] [/D u<>ytkownik [...]]\n\
    filename      Poka<6B> ACL.\n\
@@ -24,7 +24,7 @@ CACLS nazwa pliku [/T] [/E] [/C] [/G u
                               W  Zapisu\n\
                               C  Zmiany (zapis)\n\
                               F  Pe<50>en dost<73>p\n\
-   /R u<>ytkownik         Odwo<77>aj okre<72>lonemu u<>ytkownikowi prawa dost<73>pu (wa<77>ny tylko z /E).\n\
+   /R u<>ytkownik         Odwo<77>aj okre<72>lonemu u<>ytkownikowi prawa dost<73>pu (tylko wa<EFBFBD>ny z /E).\n\
    /P u<>ytkownik:dost<73>p  Zast<73>p okre<72>lonemu u<>ytkownikowi prawa dost<73>pu.\n\
                          Dost<73>p ma by<62> tylko do:\n\
                               N  <20>adnego\n\

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

@@ -30,7 +30,7 @@ STRINGTABLE DISCARDABLE
    IDS_BTN_MEM_PLUS,       "M+"
    IDS_BTN_MEM_STATUS_M,   "M"
    IDS_BTN_SQRT,           "sqrt"
-   IDS_ERR_INVALID_INPUT,  "Niew<EFBFBD>a<EFBFBD>ciwy argument funkcji."
+   IDS_ERR_INVALID_INPUT,  "Niewa<77>ne wej<65>cie dla funkcji."
    IDS_ERR_DIVIDE_BY_ZERO, "Nie mo<6D>na dzieli<6C> przez zero."
    IDS_ERR_UNDEFINED,      "Nieokre<72>lony wynik funkcji."
 }
@@ -102,7 +102,7 @@ SCIWS_MENU MENU DISCARDABLE
 	  MENUITEM "Wo&rd\tF3",         ID_CALC_WS_WORD
 	  MENUITEM "&Byte\tF4",         ID_CALC_WS_BYTE
       MENUITEM SEPARATOR
-      MENUITEM "&Grupowanie cyfr",   IDM_DIGIT_GROUPING
+      MENUITEM "Digit Grouping",   IDM_DIGIT_GROUPING
    }
    POPUP "Pomo&c" {
       MENUITEM "&Tematy pomocy",      IDM_HELP_TOPICS

reactos/base/applications/cmdutils/cmdutils.rbuild

@@ -1,7 +1,4 @@
 <group>
-<directory name="dbgprint">
-    <xi:include href="dbgprint/dbgprint.rbuild" />
-</directory>
 <directory name="find">
     <xi:include href="find/find.rbuild" />
 </directory>

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

@@ -1,8 +0,0 @@
-<module name="dbgprint" type="win32cui" installbase="system32" installname="dbgprint.exe">
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<library>kernel32</library>
-	<library>ntdll</library>
-	<file>dbgprint.c</file>
-</module>

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

@@ -1,17 +0,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_USAGE, "Sucht in einer Datei nach einer Zeichenfolge.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\
-    /C  Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\
-    /I  Ignoriert Gro<72>-/Kleinbuchstaben bei der Suche.\n\
-    /N  Zeigt die Zeilen mit ihren Zeilennummern an.\n\
-    /V  Zeigt alle Zeilen an, die die Zeichenfolge NICHT enhalten."
-    
-IDS_NO_SUCH_FILE, "Datei %s nicht gefunden\n"
-
-IDS_CANNOT_OPEN, "Datei %s kann nicht ge<67>ffnet werden.\n"
-
-}

reactos/base/applications/cmdutils/find/lang/uk-UA.rc

@@ -1,25 +0,0 @@
-/*
- * PROJECT:     Find
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/cmdutils/find/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for find
- * TRANSLATOR:  Artem Reznikov
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_USAGE, "FIND: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\n\
-  FIND [ /C ] [ /I ] [ /N ] [ /V ] \"<22><><EFBFBD><EFBFBD><EFBFBD>\" [ <20><><EFBFBD><EFBFBD>... ]\n\
-    /C  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n\
-    /I  <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-    /N  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> 1)\n\
-    /V  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    
-IDS_NO_SUCH_FILE, "FIND: %s: <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>\n"
-
-IDS_CANNOT_OPEN, "FIND: %s: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>\n"
-
-}

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

@@ -1,7 +1,5 @@
 #include <windows.h>
 #include "resource.h"
 
-#include "lang/de-DE.rc"
 #include "lang/en-US.rc"
 #include "lang/ru-RU.rc"
-#include "lang/uk-UA.rc"

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

@@ -1,16 +0,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_USAGE, "Zeigt Daten seitenweise auf dem Bildschirm an.\n\n\
-  MORE < [Laufwerk:][Pfad]Dateiname\n\
-  Befehl | MORE \n\
-  MORE [Laufwerk:][Pfad]Dateiname\n\n\
-  [Laufwerk:][Pfad]Dateiname Eine Datei, deren Inhalt angezeigt werden soll.\n\
-  Befehl\t\t     Ein Befehl, dessen Ausgabe angezeigt werden soll.\n\n\
-  An der Eingabeaufforderung ""-- Fortsetzung --"" kann eine beliebige\n\
-  Taste gedr<64>ckt werden, um die n<>chste Seite anzuzeigen.\n"
-
-  IDS_CONTINUE, " -- Fortsetzung (100%) -- "
-  IDS_FILE_ACCESS, "Auf die Datei %s kann nicht zugegriffen werden."
-}

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

@@ -1,15 +0,0 @@
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_USAGE, "Displays data page-by-page on the screen.\n\n\
-  MORE < [Drive:][Path]File name\n\
-  Command | MORE \n\
-  MORE [Drive:][Path]File name\n\n\
-  [Drive:][Path]File name    A file, whose content shall be displayed.\n\
-  Command\t\t     A command, whose output shall be displayed.\n\n\
-  At the prompt ""-- Continue --"" you can press any key to show the next page.\n"
-
-  IDS_CONTINUE, " -- Continue (100%) -- "
-  IDS_FILE_ACCESS, "Cannot access the file %s."
-}

reactos/base/applications/cmdutils/more/lang/fr-FR.rc

@@ -1,15 +0,0 @@
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-{
-    IDS_USAGE, "Affiche les donn<6E>es page par page <20> l'<27>cran.\n\n\
-  MORE < [Lecteur:][Chemin]Nom du fichier\n\
-  Commande | MORE \n\
-  MORE [Lecteur:][Chemin]Nom du fichier\n\n\
-  [Lecteur:][Chemin]Nom du fichier    Un fichier, dont le contenu sera affich<63>.\n\
-  Commande\t\t     Une commande, dont la sortie sera affich<63>.\n\n\
-  <20> l'invite ""-- Continuer --"" you pouvez appuyer sur n'importe quelle touche pour afficher la page suivante.\n"
-
-  IDS_CONTINUE, " -- Continuer (100%) -- "
-  IDS_FILE_ACCESS, "Impossible d'acc<63>der au fichier %s."
-}

reactos/base/applications/cmdutils/more/more.c

@@ -13,12 +13,11 @@
 #include <windows.h>
 #include <malloc.h>
 #include <tchar.h>
-#include <stdio.h>
-#include "resource.h"
 
-static TCHAR szCont[128];
-static DWORD szContLength;
-static HINSTANCE hApp;
+
+DWORD len;
+LPTSTR msg = _T("--- continue ---");
+
 
 /*handle for file and console*/
 HANDLE hStdIn;
@@ -30,11 +29,11 @@ HANDLE hKeyboard;
 static VOID
 GetScreenSize (PSHORT maxx, PSHORT maxy)
 {
-   CONSOLE_SCREEN_BUFFER_INFO csbi;
+	CONSOLE_SCREEN_BUFFER_INFO csbi;
 
-   GetConsoleScreenBufferInfo (hStdOut, &csbi);
-      *maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1;
-      *maxy = (csbi.srWindow.Bottom  - csbi.srWindow.Top) - 4;
+	GetConsoleScreenBufferInfo (hStdOut, &csbi);
+		*maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1;
+		*maxy = (csbi.srWindow.Bottom  - csbi.srWindow.Top) - 4;
 
 }
 
@@ -42,40 +41,40 @@ GetScreenSize (PSHORT maxx, PSHORT maxy)
 static
 VOID ConOutPuts (LPTSTR szText)
 {
-   DWORD dwWritten;
-   
-   WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL);
-   WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL);
+	DWORD dwWritten;
+
+	WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL);
+	WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL);
 }
 
 
 static VOID
 ConInKey (VOID)
 {
-   INPUT_RECORD ir;
-   DWORD dwRead;
+	INPUT_RECORD ir;
+	DWORD dwRead;
 
-   do
-   {
-      ReadConsoleInput (hKeyboard, &ir, 1, &dwRead);
-      if ((ir.EventType == KEY_EVENT) &&
-         (ir.Event.KeyEvent.bKeyDown == TRUE))
-         return;
-   }
-   while (TRUE);
+	do
+	{
+		ReadConsoleInput (hKeyboard, &ir, 1, &dwRead);
+		if ((ir.EventType == KEY_EVENT) &&
+			(ir.Event.KeyEvent.bKeyDown == TRUE))
+			return;
+	}
+	while (TRUE);
 }
 
 
 static VOID
 WaitForKey (VOID)
 {
-   DWORD dwWritten;
+	DWORD dwWritten;
 
-    WriteFile (hStdErr, szCont , szContLength, &dwWritten, NULL);
+	WriteFile (hStdErr,msg , len, &dwWritten, NULL);
 
-   ConInKey();
+	ConInKey();
 
-   WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL);
+	WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL);
 
 //	FlushConsoleInputBuffer (hConsoleIn);
 }
@@ -84,125 +83,91 @@ WaitForKey (VOID)
 //INT CommandMore (LPTSTR cmd, LPTSTR param)
 int main (int argc, char **argv)
 {
-   SHORT maxx,maxy;
-   SHORT line_count=0,ch_count=0;
-   DWORD i, last;
-   HANDLE hFile = INVALID_HANDLE_VALUE;
-   TCHAR szFullPath[MAX_PATH];
-    TCHAR szMsg[1024];
-   /*reading/writing buffer*/
-   TCHAR *buff;
+	SHORT maxx,maxy;
+	SHORT line_count=0,ch_count=0;
+	DWORD i, last;
+	HANDLE hFile = INVALID_HANDLE_VALUE;
+	TCHAR szFullPath[MAX_PATH];
 
-   /*bytes written by WriteFile and ReadFile*/
-   DWORD dwRead,dwWritten;
+	/*reading/writing buffer*/
+	TCHAR *buff;
 
-   /*ReadFile() return value*/
-   BOOL bRet;
+	/*bytes written by WriteFile and ReadFile*/
+	DWORD dwRead,dwWritten;
 
+	/*ReadFile() return value*/
+	BOOL bRet;
 
-   hStdIn = GetStdHandle(STD_INPUT_HANDLE);
-   hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
-   hStdErr = GetStdHandle(STD_ERROR_HANDLE);
-    hApp = GetModuleHandle(NULL);
+	len = _tcslen (msg);
+	hStdIn = GetStdHandle(STD_INPUT_HANDLE);
+	hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
+	hStdErr = GetStdHandle(STD_ERROR_HANDLE);
 
-   buff=malloc(4096);
-   if (!buff)
-   {
-      ConOutPuts(_T("Error: no memory"));
-      return 1;
-   }
+	if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0)
+	{
+		ConOutPuts(_T("Help text still missing!!"));
+		return 0;
+	}
 
-   if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0)
-   {
-      if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < 4096 / sizeof(TCHAR))
-      {
-         CharToOem(buff, buff);
-         ConOutPuts(buff);
-      }
+	hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ,
+	                        0,NULL,OPEN_ALWAYS,0,0);
 
-      free(buff);
-      return 0;
-   }
+	GetScreenSize(&maxx,&maxy);
 
-   hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ,
-                           0,NULL,OPEN_ALWAYS,0,0);
+	buff=malloc(4096);
 
-   GetScreenSize(&maxx,&maxy);
+	FlushConsoleInputBuffer (hKeyboard);
 
+	if(argc > 1)
+	{
+		GetFullPathName(argv[1], MAX_PATH, szFullPath, NULL);
+		hFile = CreateFile (szFullPath, GENERIC_READ,
+	                        0,NULL,OPEN_ALWAYS,0,0);
+        
+		if (hFile == INVALID_HANDLE_VALUE)
+		{
+			ConOutPuts(_T("The file could not be opened"));
+			return 0;
+		}
+	}
+	else
+	{
+		hFile = hStdIn;
+	}
 
+	do
+	{
+		bRet = ReadFile(hFile,buff,4096,&dwRead,NULL);
 
-   FlushConsoleInputBuffer (hKeyboard);
+		for(last=i=0;i<dwRead && bRet;i++)
+		{
+			ch_count++;
+			if(buff[i] == _T('\n') || ch_count == maxx)
+			{
+				ch_count=0;
+				line_count++;
+				if (line_count == maxy)
+				{
+					line_count = 0;
+					WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL);
+					last=i+1;
+					FlushFileBuffers (hStdOut);
+					WaitForKey ();
+				}
+			}
+		}
+		if (last<dwRead && bRet)
+			WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL);
 
-   if(argc > 1)
-   {
-      GetFullPathNameA(argv[1], MAX_PATH, szFullPath, NULL);
-      hFile = CreateFile (szFullPath, 
-                            GENERIC_READ,
-                           0,
-                            NULL,
-                            OPEN_EXISTING,
-                            0,
-                            0);
-      if (hFile == INVALID_HANDLE_VALUE)
-      {
-         if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < sizeof(szMsg) / sizeof(TCHAR))
-         {
-            _stprintf(buff, szMsg, szFullPath);
-            CharToOem(buff, buff);
-            ConOutPuts(buff);
-         }
+	}
+	while(dwRead>0 && bRet);
 
-         free(buff);
-         return 0;
-      }
-   }
-   else
-   {
-      hFile = hStdIn;
-   }
+	free (buff);
+	CloseHandle (hKeyboard);
+	if (hFile != hStdIn)
+		CloseHandle (hFile);
 
-    if (!LoadString(hApp, IDS_CONTINUE, szCont, sizeof(szCont) / sizeof(TCHAR)))
-    {
-        /* Shouldn't happen, so exit */
-        return 1;
-    }
-    szContLength = _tcslen(szCont);
-
-
-
-   do
-   {
-      bRet = ReadFile(hFile,buff,4096,&dwRead,NULL);
-
-      for(last=i=0;i<dwRead && bRet;i++)
-      {
-         ch_count++;
-         if(buff[i] == _T('\n') || ch_count == maxx)
-         {
-            ch_count=0;
-            line_count++;
-            if (line_count == maxy)
-            {
-               line_count = 0;
-               WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL);
-               last=i+1;
-               FlushFileBuffers (hStdOut);
-               WaitForKey ();
-            }
-         }
-      }
-      if (last<dwRead && bRet)
-         WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL);
-
-   }
-   while(dwRead>0 && bRet);
-
-   free (buff);
-   CloseHandle (hKeyboard);
-   if (hFile != hStdIn)
-      CloseHandle (hFile);
-
-   return 0;
+	return 0;
 }
 
 /* EOF */

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

@@ -4,7 +4,6 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>
 	<library>ntdll</library>
-	<library>user32</library>
 	<file>more.c</file>
 	<file>more.rc</file>
 </module>

reactos/base/applications/cmdutils/more/more.rc

@@ -4,5 +4,3 @@
 #define REACTOS_STR_INTERNAL_NAME	"more\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"more.exe\0"
 #include <reactos/version.rc>
-
-#include "rsrc.rc"

reactos/base/applications/cmdutils/more/resource.h

@@ -1,20 +0,0 @@
-#ifndef RESOURCE_H__ /* resource.h */
-#define RESOURCE_H__
-
-#define IDS_USAGE           100
-#define IDS_CONTINUE        101
-#define IDS_FILE_ACCESS     102
-
-
-
-
-
-
-
-
-
-
-
-
-
-#endif /* EOF of resource.h */

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

@@ -1,6 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/fr-FR.rc"

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

@@ -1,8 +1,8 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/lang/bg-BG.rc
- * PURPOSE:     Bulgarian Language File for Solitaire
+ * FILE:        base/applications/games/solitaire/en.rc
+ * PURPOSE:     English Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */
 #include "resource.h"
@@ -21,9 +21,6 @@ BEGIN
     AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD>", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD>", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
 
-    AUTOCHECKBOX    "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP
-    AUTOCHECKBOX    "<22><><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP
-
     AUTOCHECKBOX    "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP | WS_DISABLED
     AUTOCHECKBOX    "<22><><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP
 
@@ -32,7 +29,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -40,8 +37,8 @@ BEGIN
     CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
-    DEFPUSHBUTTON "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 162, 77, 54, 13
+    DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
+    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
 END
 
 

reactos/base/applications/games/solitaire/lang/ca-CA.rc

@@ -1,85 +0,0 @@
-/*
- * PROJECT:     Solitaire
- * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/ca-CA.rc
- * PURPOSE:     Catalan Language File for Solitaire
- * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
- */
-#include "resource.h"
-
-LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
-
-
-/* Dialogs */
-
-IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-CAPTION "Options"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX        "Cartes", -1, 7, 7, 65, 40
-    AUTORADIOBUTTON "Treu-ne &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Treu-ne &Tres", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
-
-    AUTOCHECKBOX    "&Mostra el temps", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "&Barra d'estat", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
-
-    DEFPUSHBUTTON   "Acceptar", IDOK, 35, 97, 50, 14
-    PUSHBUTTON      "Cancel·lar", IDCANCEL, 101, 97, 50, 14
-END
-
-
-IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Seleccioneu l'anvers"
-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, 50, 61
-    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61
-    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
-    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
-    DEFPUSHBUTTON "Acceptar", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Cancel·lar", IDCANCEL, 162, 77, 54, 13
-END
-
-
-/* Strings */
-
-STRINGTABLE
-BEGIN
-    IDS_SOL_NAME    "Solitari"
-    IDS_SOL_ABOUT   "Solitari per J Brown\n\nCardLib versio 1.0."
-    IDS_SOL_QUIT    "Voleu sortir del joc actual?"
-    IDS_SOL_WIN     "Felicitats, heu guanyat!!"
-END
-
-
-/* Menus */
-
-IDR_MENU1 MENU DISCARDABLE
-BEGIN
-    POPUP "&Joc"
-    BEGIN
-        MENUITEM "R&eparteix\tF2",                   IDM_GAME_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Barallar...",                    IDM_GAME_DECK
-        MENUITEM "&Opcions...",                 IDM_GAME_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Sortida",                       IDM_GAME_EXIT
-    END
-    POPUP "&Ajuda"
-    BEGIN
-        MENUITEM "&Contingut\tF1",               IDM_HELP_CONTENTS
-        MENUITEM "E&n quant a",                      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/solitaire/lang/de-DE.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/lang/de-DE.rc
+ * FILE:        base/applications/games/solitaire/de.rc
  * PURPOSE:     German Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */

reactos/base/applications/games/solitaire/lang/en-US.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/lang/en-US.rc
+ * FILE:        base/applications/games/solitaire/en.rc
  * PURPOSE:     English Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */

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

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/lang/es-ES.rc
+ * FILE:        base/applications/games/solitaire/en.rc
  * PURPOSE:     Spanish Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */

reactos/base/applications/games/solitaire/lang/fr-FR.rc

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/lang/fr-FR.rc
+ * FILE:        base/applications/games/solitaire/fr.rc
  * PURPOSE:     French Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */
@@ -29,7 +29,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "S<EFBFBD>lectionnez le tarot des cartes"
+CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -38,7 +38,7 @@ BEGIN
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
     DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Annuler", IDCANCEL, 162, 77, 54, 13
+    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
 END
 
 

reactos/base/applications/games/solitaire/lang/it-IT.rc

@@ -15,7 +15,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-CAPTION "Opzioni"
+CAPTION "Options"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Carte", -1, 7, 7, 65, 40
@@ -30,7 +30,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Scegli il retro delle carte"
+CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -39,7 +39,7 @@ BEGIN
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
     DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Annulla", IDCANCEL, 162, 77, 54, 13
+    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
 END
 
 
@@ -50,7 +50,7 @@ BEGIN
     IDS_SOL_NAME    "Solitario"
     IDS_SOL_ABOUT   "Solitario by J Brown\n\nCardLib versione 1.0."
     IDS_SOL_QUIT    "Chiudere la partita in corso?"
-    IDS_SOL_WIN     "Congratulazioni, hai vinto!!"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

reactos/base/applications/games/solitaire/lang/lt-LT.rc

@@ -1,86 +0,0 @@
-/*
- * PROJECT:     Solitaire
- * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/lang/lt-LT.rc
- * PURPOSE:     Lithuanian Language File for Solitaire
- * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
- * TRANSLATORS: Vytis "CMan" Gird<72>ijauskas (cman@cman.us) 
- */
-#include "resource.h"
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-
-/* Dialogs */
-
-IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-CAPTION "Nuostatos"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX        "Kortos", -1, 7, 7, 75, 40
-    AUTORADIOBUTTON "Dalinti po &vien<65>", IDC_OPT_DRAWONE, 14, 19, 60, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Dalinti po &tris", IDC_OPT_DRAWTHREE, 14, 32, 60, 10
-
-    AUTOCHECKBOX    "&Rodyti laik<69>", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "&B<>senos juosta", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
-
-    DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
-    PUSHBUTTON      "At<41>aukti", IDCANCEL, 101, 97, 50, 14
-END
-
-
-IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Kort<72> vir<69>elio pasirinkimas"
-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, 50, 61
-    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61
-    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
-    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
-    DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "At<41>aukti", IDCANCEL, 162, 77, 54, 13
-END
-
-
-/* Strings */
-
-STRINGTABLE
-BEGIN
-    IDS_SOL_NAME    "Solitaire"
-    IDS_SOL_ABOUT   "Solitaire\n\nSukurta J Brown\n\nCardLib version 1.0."
-    IDS_SOL_QUIT    "Baigti <20>aidim<69>?"
-    IDS_SOL_WIN     "Sveikiname, j<>s laim<69>jote!!"
-END
-
-
-/* Menus */
-
-IDR_MENU1 MENU DISCARDABLE
-BEGIN
-    POPUP "&<26>aidimas"
-    BEGIN
-        MENUITEM "&Dalinti\tF2",                   IDM_GAME_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Malka...",                    IDM_GAME_DECK
-        MENUITEM "&Nuostatos...",                 IDM_GAME_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Baigti",                       IDM_GAME_EXIT
-    END
-    POPUP "&Pagalba"
-    BEGIN
-        MENUITEM "&Turinys\tF1",               IDM_HELP_CONTENTS
-        MENUITEM "&Apie",                      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/solitaire/lang/pl-PL.rc

@@ -28,7 +28,7 @@ BEGIN
 END
 
 IDD_CARDBACK DIALOGEX 6, 6, 221, 96
-CAPTION "Wybieranie koszulki karty"
+CAPTION "Select Card Back"
 FONT 8, "MS Shell Dlg"
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 BEGIN
@@ -37,7 +37,7 @@ BEGIN
     CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61
     CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61
     DEFPUSHBUTTON "OK", IDOK, 104, 77, 54, 13
-    PUSHBUTTON    "Anuluj", IDCANCEL, 162, 77, 54, 13
+    PUSHBUTTON    "Cancel", IDCANCEL, 162, 77, 54, 13
 END
 
 
@@ -46,9 +46,9 @@ END
 STRINGTABLE
 BEGIN
     IDS_SOL_NAME    "Pasjans"
-    IDS_SOL_ABOUT   "Solitaire by J. Brown\n\nCardLib version 1.0."
+    IDS_SOL_ABOUT   "Solitaire by J Brown\n\nCardLib version 1.0."
     IDS_SOL_QUIT    "Zako<6B>czy<7A> aktualn<6C> gr<67>?"
-    IDS_SOL_WIN     "Gratulacje, wygra<72>e<EFBFBD>!"
+    IDS_SOL_WIN     "Congratulations, you win!!"
 END
 
 

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

@@ -1,7 +1,7 @@
 /*
  * PROJECT:     Solitaire
  * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/lang/uk-UA.rc
+ * FILE:        base/applications/games/solitaire/uk.rc
  * PURPOSE:     Ukraianian Language File for Solitaire
  * TRANSLATOR:  Artem Reznikov
  */

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

@@ -6,7 +6,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 
 #include "lang/bg-BG.rc"
-#include "lang/ca-CA.rc"
 #include "lang/de-DE.rc"
 #include "lang/el-GR.rc"
 #include "lang/en-US.rc"
@@ -14,7 +13,6 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/lt-LT.rc"
 #include "lang/nb-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"

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

@@ -12,7 +12,7 @@ MENU_WINEMINE MENU DISCARDABLE
     POPUP "&<26><><EFBFBD><EFBFBD>" {
         MENUITEM "&<26><><EFBFBD><EFBFBD>",           IDM_NEW
         MENUITEM SEPARATOR
-        MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (?)", IDM_MARKQ
+        MENUITEM "&Mark Question", IDM_MARKQ
         MENUITEM SEPARATOR
         MENUITEM "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      IDM_BEGINNER
         MENUITEM "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      IDM_ADVANCED
@@ -28,10 +28,9 @@ MENU_WINEMINE MENU DISCARDABLE
 }
 
 DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "<22><><EFBFBD>- <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 {
     GROUPBOX        "<22><><EFBFBD>- <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDNONE,  10,  10, 140,  45
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      IDNONE,  20,  20,  40,   8
@@ -47,10 +46,9 @@ EXSTYLE DS_SHELLFONT
 }
 
 DLG_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 {
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>", IDIGNORE,  10,  10, 150,  10
     EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
@@ -58,10 +56,9 @@ EXSTYLE DS_SHELLFONT
 }
 
 DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 {
     LTEXT           "<22><><EFBFBD><EFBFBD>",   IDNONE,   5,   5,  30,  10
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDNONE,   5,  35,  30,  10
@@ -74,14 +71,13 @@ EXSTYLE DS_SHELLFONT
 }
 
 DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
+STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
 CAPTION "<22><>"
 FONT 8, "MS Shell Dlg"
-EXSTYLE DS_SHELLFONT
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
+    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "under the Wine license", IDNONE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDNONE,  10,  25,  20,  20
+    ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
     DEFPUSHBUTTON                             "<22><><EFBFBD><EFBFBD><EFBFBD>", IDOK,      50,  60,  55,  15
 }

reactos/base/applications/games/winemine/lang/lt-LT.rc

@@ -1,85 +0,0 @@
-/* Translation by Vytis "CMan" Gird<72>ijauskas (cman@cman.us) */
-
-#include "resource.h"
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-STRINGTABLE {
-     IDS_APPNAME, "WineMine"
-
-}
-
-MENU_WINEMINE MENU DISCARDABLE
-{
-    POPUP "&<26>aidimas" {
-        MENUITEM "&Naujas <20>aidimas",           IDM_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "<22>ym<79>ti &sp<73>jamus (?)", IDM_MARKQ
-        MENUITEM SEPARATOR
-        MENUITEM "&Pradedantis",      IDM_BEGINNER
-        MENUITEM "Pa&<26>eng<6E>s",      IDM_ADVANCED
-        MENUITEM "&Ekspertas",        IDM_EXPERT
-        MENUITEM "Pasi&rinktas",        IDM_CUSTOM
-        MENUITEM SEPARATOR
-        MENUITEM "&Baigti",          IDM_EXIT
-    }
-    POPUP "&Informacija" {
-        MENUITEM "&Grei<65>iausi laikai",    IDM_TIMES
-        MENUITEM "&Apie",         IDM_ABOUT
-    }
-}
-
-DLG_TIMES DIALOGEX DISCARDABLE 0, 0, 160, 80
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-CAPTION "Grei<65>iausi laikai"
-FONT 8, "MS Shell Dlg"
-{
-    GROUPBOX        "Grei<65>iausi laikai", IDNONE,  10,  10, 140,  45
-    LTEXT           "Pradedantis",      IDNONE,  20,  20,  40,   8
-    LTEXT           "Pa<50>eng<6E>s",      IDNONE,  20,  30,  40,   8
-    LTEXT           "Ekspertas",        IDNONE,  20,  40,  40,   8
-    LTEXT           "999",          IDC_TIME1,  70,  20,  15,   8
-    LTEXT           "999",          IDC_TIME2,  70,  30,  15,   8
-    LTEXT           "999",          IDC_TIME3,  70,  40,  15,   8
-    LTEXT           "",             IDC_NAME1,  90,  20,  55,   8
-    LTEXT           "",             IDC_NAME2,  90,  30,  55,   8
-    LTEXT           "",             IDC_NAME3,  90,  40,  55,   8
-    DEFPUSHBUTTON   "OK",                IDOK,  55,  60,  50,  15
-}
-
-DLG_CONGRATS DIALOGEX DISCARDABLE  0, 0, 160, 60
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-CAPTION "Sveikiname!"
-FONT 8, "MS Shell Dlg"
-{
-    LTEXT           "Pra<72>ome <20>ra<72>yti savo vard<72>", IDIGNORE,  10,  10, 150,  10
-    EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
-    DEFPUSHBUTTON   "OK",                         IDOK,  60,  40,  40,  15
-}
-
-DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-CAPTION "Pasirinktas <20>aidimas"
-FONT 8, "MS Shell Dlg"
-{
-    LTEXT           "Eilut<75>s",   IDNONE,   5,   5,  30,  10
-    LTEXT           "Stulpeliai",   IDNONE,   5,  35,  30,  10
-    LTEXT           "Minos",  IDNONE,   5,  65,  30,  10
-    EDITTEXT              IDC_EDITROWS,   5,  15,  20,  12, ES_NUMBER
-    EDITTEXT              IDC_EDITCOLS,   5,  45,  20,  12, ES_NUMBER
-    EDITTEXT             IDC_EDITMINES,   5,  75,  20,  12, ES_NUMBER
-    DEFPUSHBUTTON   "OK",     IDOK,      40,  30,  50,  15
-    PUSHBUTTON      "At<41>aukti", IDCANCEL,  40,  50,  50,  15
-}
-
-DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
-STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-CAPTION "Apie"
-FONT 8, "MS Shell Dlg"
-{
-    LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
-    LTEXT                 "under the Wine license", IDNONE,  35,  35, 100,  10
-    ICON                              IDI_WINEMINE, IDNONE,  10,  25,  20,  20
-    DEFPUSHBUTTON                             "OK", IDOK,      50,  60,  55,  15
-}

reactos/base/applications/games/winemine/lang/pl-PL.rc

@@ -41,7 +41,7 @@ FONT 8, "MS Shell Dlg"
 {
     GROUPBOX        "Najlepsze czasy", IDNONE,  10,  10, 140,  45
     LTEXT           "Pocz<63>tkuj<75>cy",      IDNONE,  20,  20,  40,   8
-    LTEXT           "Zaawansowany",      IDNONE,  20,  30,  40,   8
+    LTEXT           "zaawansowany",      IDNONE,  20,  30,  40,   8
     LTEXT           "Ekspert",        IDNONE,  20,  40,  40,   8
     LTEXT           "999",          IDC_TIME1,  70,  20,  15,   8
     LTEXT           "999",          IDC_TIME2,  70,  30,  15,   8
@@ -59,7 +59,7 @@ FONT 8, "MS Shell Dlg"
 {
     LTEXT           "Wpisz swoje imi<6D>", IDNONE,  10,  10, 150,  10
     EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
-    DEFPUSHBUTTON   "OK",                         IDOK,  60,  40,  40,  15
+    DEFPUSHBUTTON   "Ok",                         IDOK,  60,  40,  40,  15
 }
 
 DLG_CUSTOM DIALOGEX DISCARDABLE  0, 0, 100, 100
@@ -73,8 +73,8 @@ FONT 8, "MS Shell Dlg"
     EDITTEXT              IDC_EDITROWS,   5,  15,  20,  12, ES_NUMBER
     EDITTEXT              IDC_EDITCOLS,   5,  45,  20,  12, ES_NUMBER
     EDITTEXT             IDC_EDITMINES,   5,  75,  20,  12, ES_NUMBER
-    DEFPUSHBUTTON   "OK",     IDOK,      40,  30,  50,  15
-    PUSHBUTTON      "Anuluj", IDCANCEL,  40,  50,  50,  15
+    DEFPUSHBUTTON   "Ok",     IDOK,      40,  30,  50,  15
+    PUSHBUTTON      "Wycofaj", IDCANCEL,  40,  50,  50,  15
 }
 
 DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 145, 80
@@ -86,5 +86,5 @@ FONT 8, "MS Shell Dlg"
     LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 110,  10
     LTEXT                 "Na licencji Wine", IDNONE,  35,  35, 100,  10
     ICON                                IDI_WINEMINE, IDNONE,  10,  25,  20,  20
-    DEFPUSHBUTTON                             "OK", IDOK,      50,  60,  55,  15
+    DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55,  15
 }

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

@@ -19,7 +19,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-#include "lang/lt-LT.rc"
 #include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

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

@@ -1,15 +0,0 @@
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_USAGE, "Beendet eine Sitzung.\n\n\
-  /v\t\tZeigt Informationen zu den Aktionen an, die gerade ausgef<65>hrt werden.\n\
-  /?\t\tZeigt diese Informationen an.\n\n"
-
-IDS_LOGOFF_REMOTE, "Beendet eine Sitzung auf einem Server."
-IDS_LOGOFF_LOCAL, "Beendet eine Sitzung auf dem aktuellen Server."
-
-IDS_ILLEGAL_PARAM, "Ung<6E>ltige(r) Parameter\n"
-}
-/* EOF */

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

@@ -1,15 +0,0 @@
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_USAGE, "Termine une session.\n\n\
-  /v\t\tAffiche des informations sur les actions r<>alis<69>es.\n\
-  /?\t\tAffiche ces informations.\n\n"
-
-IDS_LOGOFF_REMOTE, "Termine une session sur une machine distante."
-IDS_LOGOFF_LOCAL, "Termine la session courante sur cette machine."
-
-IDS_ILLEGAL_PARAM, "Param<61>tre(s) invalide(s)\n"
-}
-/* EOF */

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

@@ -1,17 +0,0 @@
-/* Translation by Vytis "CMan" Gird<72>ijauskas (cman@cman.us) */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_USAGE, "U<>baigia seans<6E>.\n\n\
-  /v\t\tParodo informacij<69> apie atliktus veiksmus.\n\
-  /?\t\tParodo <20>i<EFBFBD> informacij<69>.\n\n"
-
-IDS_LOGOFF_REMOTE, "U<>baigia seans<6E> nutolusioje ma<6D>inoje."
-IDS_LOGOFF_LOCAL, "U<>baigia einam<61>j<EFBFBD> seans<6E> <20>ioje ma<6D>inoje."
-
-IDS_ILLEGAL_PARAM, "Neteisingas(i) parametras(ai)\n"
-}
-/* EOF */

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

@@ -1,23 +0,0 @@
-/*
- * PROJECT:     ReactOS logoff utility
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/logoff/lang/ru-RU.rc
- * PURPOSE:     Russian Language File for logoff
- * TRANSLATOR:  Artem Reznikov
- */
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_USAGE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n\
-  /v\t\t<><74><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><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-  /?\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n"
-
-IDS_LOGOFF_REMOTE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-IDS_LOGOFF_LOCAL, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-
-IDS_ILLEGAL_PARAM, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
-}
-/* EOF */

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

@@ -1,23 +0,0 @@
-/*
- * PROJECT:     ReactOS logoff utility
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/logoff/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for logoff
- * TRANSLATOR:  Artem Reznikov
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_USAGE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n\
-  /v\t\t³<74><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 䳿.\n\
-  /?\t\t³<74><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n"
-
-IDS_LOGOFF_REMOTE, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-IDS_LOGOFF_LOCAL, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-
-IDS_ILLEGAL_PARAM, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n"
-}
-/* EOF */

reactos/base/applications/logoff/rsrc.rc

@@ -1,10 +1,5 @@
 #include <windows.h>
 #include "resource.h"
 
-#include "lang/de-DE.rc"
 #include "lang/en-US.rc"
-#include "lang/fr-FR.rc"
-#include "lang/lt-LT.rc"
 #include "lang/nb-NO.rc"
-#include "lang/ru-RU.rc"
-#include "lang/uk-UA.rc"

reactos/base/applications/msconfig/lang/ca-CA.rc

@@ -1,174 +0,0 @@
-LANGUAGE LANG_CATALAN, SUBLANG_NEUTRAL
-
-IDD_MSCONFIG_DIALOG DIALOG DISCARDABLE  0, 0, 378, 220
-STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
-    WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
-    WS_THICKFRAME
-CAPTION "Progrma de configuracio del sistema"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
-    DEFPUSHBUTTON "Acceptar", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Ajuda", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Cancel<65>lar", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Aplicar", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
-    PUSHBUTTON      "A&ctivar-ho tot",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
-    PUSHBUTTON      "&Deactivar-ho tot",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14
-END
-
-IDD_SYSTEM_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-   CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148
-    PUSHBUTTON      "P&uja", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
-    PUSHBUTTON      "&Baixa", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
-
-    PUSHBUTTON      "Ac&tiva", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
-    PUSHBUTTON      "D&esactiva", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
-
-    PUSHBUTTON      "&Busca", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
-    PUSHBUTTON      "&Nou", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
-    PUSHBUTTON      "Ed&ita", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
-
-    PUSHBUTTON      "A&ctivar-ho tot", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
-    PUSHBUTTON      "&Deactivar-ho tot",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
-END
-
-IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134
-    EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY
-    PUSHBUTTON "&Executa", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-END
-
-IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
-    PUSHBUTTON      "A&ctivar-ho tot",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
-    PUSHBUTTON      "&Deactivar-ho tot",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14
-END
-
-IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
- GROUPBOX "Seleccio d'arrencada", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
- CONTROL "Arrencada &Normal - Carrega tots els serveis i controladors", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
- CONTROL "Arrencada de &Diagnostic - Nomes carrega els seveis i controladors basics", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
- CONTROL "Seleccio &Manual", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
- CHECKBOX "&Processos del fitxer SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
- CHECKBOX "&Serveis del sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
- CHECKBOX "P&rogrames del menu inici", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
-END
-
-IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-   CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
-   PUSHBUTTON    "&Prova camins d'arrencada", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-   PUSHBUTTON    "&Fes-ho per defecte", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12
-   PUSHBUTTON    "P&uja", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
-   PUSHBUTTON    "&Baixa", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
-   GROUPBOX "&Opcions d'arrencada", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
-   CHECKBOX "/&SAFEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10
-   CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10
-   CHECKBOX "/BOO&TLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
-   CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
-   CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
-   PUSHBUTTON "Op&cions Avan<61>ades...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 
-   LTEXT "Temps:", -1, 280, 91, 30, 10
-   EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-   LTEXT "sec.", -1, 340, 91, 15, 10
-END
-
-IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
-BEGIN
-   CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
-   EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
-   CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11
-   CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10
-   COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-   CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10
-   CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10
-   CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12
-   EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT
-   CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10
-   CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10
-   COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-   CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10
-   COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-   CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10
-   EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT
-   CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11
-   PUSHBUTTON "Acceptar", IDC_OK, 20, 160, 50, 12
-   PUSHBUTTON "Cancel<65>lar", IDC_CANCEL, 100, 160, 50, 12
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_MSCONFIG             "Programa de configuracio de sistema"
-    IDS_TAB_GENERAL          "General"
-    IDS_TAB_SYSTEM           "SYSTEM.INI"
-    IDS_TAB_FREELDR          "FREELDR.INI"   
-    IDS_TAB_SERVICES         "Serveis" 
-    IDS_TAB_STARTUP          "Arrencada" 
-    IDS_TAB_TOOLS            "Eines"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_SERVICES_COLUMN_SERVICE "Servei"
-    IDS_SERVICES_COLUMN_REQ     "Obligatori"
-    IDS_SERVICES_COLUMN_VENDOR  "Fabricant"
-    IDS_SERVICES_COLUMN_STATUS  "Estat"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOOLS_COLUMN_NAME    "Nom"
-    IDS_TOOLS_COLUMN_DESCR   "Descripcio"
-
-    IDS_TOOLS_CMD_NAME       "Consola"
-    IDS_TOOLS_CMD_DESCR      ""
-    IDS_TOOLS_CMD_CMD        "cmd.exe"
-
-    IDS_TOOLS_INFO_NAME      "Versio"
-    IDS_TOOLS_INFO_DESCR     "Mostra informacio de la versio."
-    IDS_TOOLS_INFO_CMD       "winver.exe"
-
-    IDS_TOOLS_REGEDIT_NAME   "Editor del registre"
-    IDS_TOOLS_REGEDIT_DESCR  "Obre l'editor del registre."
-    IDS_TOOLS_REGEDIT_CMD    "regedit.exe"
-
-    IDS_TOOLS_SYSDM_NAME     "Propietats del sistema"
-    IDS_TOOLS_SYSDM_DESCR    "Mostra la informacio d'aquest ordinador."
-    IDS_TOOLS_SYSDM_CMD      "control"
-    IDS_TOOLS_SYSDM_PARAM    "sysdm.cpl"
-
-    IDS_STARTUP_COLUMN_ELEMENT "Element"
-    IDS_STARTUP_COLUMN_CMD     "Command"
-    IDS_STARTUP_COLUMN_PATH    "Path"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_SERVICES_STATUS_RUNNING "En marxa"
-    IDS_SERVICES_STATUS_STOPPED "Parat"
-    IDS_SERVICES_YES "Si"
-    IDS_SERVICES_UNKNOWN "Indeterminat" 
-END

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

@@ -28,18 +28,18 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148
-    PUSHBUTTON      "&Sposta su", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
-    PUSHBUTTON      "S&posta gi<67>", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
 
-    PUSHBUTTON      "&Attiva", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
-    PUSHBUTTON      "&Disattiva", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
+    PUSHBUTTON      "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
+    PUSHBUTTON      "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
 
-    PUSHBUTTON      "&Trova", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
-    PUSHBUTTON      "&Nuovo", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
-    PUSHBUTTON      "&Modifica", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
+    PUSHBUTTON      "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
+    PUSHBUTTON      "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
+    PUSHBUTTON      "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
 
-    PUSHBUTTON      "A&bilita tutto", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
-    PUSHBUTTON      "Disabi&lita tutto",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
+    PUSHBUTTON      "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
+    PUSHBUTTON      "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
 END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
@@ -65,30 +65,30 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
  GROUPBOX "Selezione avvio", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
- CONTROL "Avvio &normale: carica tutti i driver di periferica e i servizi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 205, 10
- CONTROL "Avvio &diagnostico: carica soltanto le periferiche e i servizi di base", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 230, 10
+ CONTROL "Avvio &normale: carica tutti i driver di periferica e i servizi", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
+ CONTROL "Avvio &diagnostico: carica soltanto le periferiche e i servizi di base", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
  CONTROL "Avvio &selettivo", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
  CHECKBOX "&Elabora il file SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
  CHECKBOX "&Carica servizi di sistema", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
- CHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 95, 10
+ CHECKBOX "Carica elemen&ti di avvio", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10
 END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
-   CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 3, 2, 354, 58, 0x00000200
-   PUSHBUTTON    "Ve&rifica percorsi di avvio", IDC_BTN_CHECK_BOOT_PATH, 3, 64, 85, 14
-   PUSHBUTTON    "&Imposta come predefinito", IDC_BTN_SET_DEFAULT_BOOT, 93, 64, 85, 14
-   PUSHBUTTON    "&Sposta su", IDC_BTN_MOVE_UP_BOOT_OPTION, 183, 64, 85, 14
-   PUSHBUTTON    "S&posta gi<67>", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 273, 64, 85, 14
-   GROUPBOX "Opzioni di Avvio", -1, 3, 80, 250, 90,0,WS_EX_TRANSPARENT
-   CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 92, 55, 10
-   CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 107, 60, 10
-   CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 122, 50, 10
-   CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 137, 55, 10
-   CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 152, 50, 10
-   PUSHBUTTON "Op&zioni avanzate...", IDC_BTN_ADVANCED_OPTIONS, 100, 148, 70, 16 
+   CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
+   PUSHBUTTON    "Ve&rifica percorsi di avvio", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
+   PUSHBUTTON    "&Imposta come predefinito", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12
+   PUSHBUTTON    "&Sposta su", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
+   PUSHBUTTON    "S&posta gi<67>", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
+   GROUPBOX "Opzioni di Avvio", -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
+   CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
+   CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
+   PUSHBUTTON "Op&zioni avanzate...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 
    LTEXT "&Timeout:", -1, 280, 91, 30, 10
    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
    LTEXT "sec.", -1, 340, 91, 15, 10

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

@@ -34,18 +34,18 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
 FONT 8, "MS Shell Dlg"
 BEGIN
    CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148
-    PUSHBUTTON      "Przenie<EFBFBD> w &g<>r<EFBFBD>", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
-    PUSHBUTTON      "Przenie<EFBFBD> w &d<><64>", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
+    PUSHBUTTON      "Move &Up", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14
+    PUSHBUTTON      "Move &Down", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14
 
-    PUSHBUTTON      "W<EFBFBD><EFBFBD>&cz", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
-    PUSHBUTTON      "W&y<><79>cz", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
+    PUSHBUTTON      "&Enable", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14
+    PUSHBUTTON      "D&isable", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14
 
-    PUSHBUTTON      "&Znajd<EFBFBD>", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
-    PUSHBUTTON      "&Nowa", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
-    PUSHBUTTON      "Edy&tuj", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
+    PUSHBUTTON      "&Find", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14
+    PUSHBUTTON      "&New", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14
+    PUSHBUTTON      "Edi&t", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14
 
-    PUSHBUTTON      "&W<><57>cz wszystkie", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
-    PUSHBUTTON      "Wy<EFBFBD><EFBFBD>cz wszy&stkie",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
+    PUSHBUTTON      "Ena&ble All", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14
+    PUSHBUTTON      "Disable A&ll",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14
 END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
@@ -94,10 +94,10 @@ BEGIN
    CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
    CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
    CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
-   PUSHBUTTON "&Opcje zaawansowane...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 
+   PUSHBUTTON "&Opcje zaawansowane....", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 
    LTEXT "&Limit czasu:", -1, 280, 91, 30, 10
    EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-   LTEXT "s", -1, 340, 91, 15, 10
+   LTEXT "s.", -1, 340, 91, 15, 10
 END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
@@ -157,7 +157,7 @@ BEGIN
     IDS_TOOLS_INFO_DESCR     "Wy<57>wietla informacje o wersji."
     IDS_TOOLS_INFO_CMD       "winver.exe"
 
-    IDS_TOOLS_REGEDIT_NAME   "Edytor rejestru"
+    IDS_TOOLS_REGEDIT_NAME   "Edytor-Rejestru"
     IDS_TOOLS_REGEDIT_DESCR  ""
     IDS_TOOLS_REGEDIT_CMD    "regedit.exe"
 
@@ -174,7 +174,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_SERVICES_STATUS_RUNNING "Dzia<69>a"
-    IDS_SERVICES_STATUS_STOPPED "Zatrzymano"
+    IDS_SERVICES_STATUS_STOPPED "Zatrzymany"
     IDS_SERVICES_YES "Tak"
     IDS_SERVICES_UNKNOWN "Nieznany" 
 END

reactos/base/applications/msconfig/rsrc.rc

@@ -10,7 +10,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 /* include localised resources */
 
 #include "lang/bg-BG.rc"
-#include "lang/ca-CA.rc"
 #include "lang/cs-CZ.rc"
 #include "lang/de-DE.rc"
 #include "lang/en-US.rc"

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

@@ -11,7 +11,6 @@
 
 HINSTANCE hInstance;
 HANDLE ProcessHeap;
-HANDLE hMutex;
 
 int WINAPI
 _tWinMain(HINSTANCE hThisInstance,
@@ -25,18 +24,6 @@ _tWinMain(HINSTANCE hThisInstance,
     int Ret = 1;
     INITCOMMONCONTROLSEX icex;
 
-    hMutex = CreateMutex(NULL, TRUE, _T("devmgmt_mutex"));
-    if (hMutex == NULL || GetLastError() == ERROR_ALREADY_EXISTS)
-    {
-        if (hMutex)
-        {
-            CloseHandle(hMutex);
-        }
-        return 0;
-    }
-
-
-
     hInstance = hThisInstance;
     ProcessHeap = GetProcessHeap();
 
@@ -72,7 +59,7 @@ _tWinMain(HINSTANCE hThisInstance,
     }
 
     LocalFree((HLOCAL)lpAppName);
-    CloseHandle(hMutex);
+
     return Ret;
 }
 

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

@@ -1,9 +1,9 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/about.c
+ * FILE:        base/system/servman/about.c
  * PURPOSE:     About dialog box message handler
- * COPYRIGHT:   Copyright 2005-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2005 - 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
@@ -20,33 +20,28 @@ AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     {
     case WM_INITDIALOG:
 
-        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);
-        }
+        hIcon = (HICON) LoadImage(hInstance,
+                          MAKEINTRESOURCE(IDI_SM_ICON),
+                          IMAGE_ICON,
+                          16,
+                          16,
+                          0);
+
+        SendMessage(hDlg,
+                    WM_SETICON,
+                    ICON_SMALL,
+                    (LPARAM)hIcon);
 
         hLicenseEditWnd = GetDlgItem(hDlg,
                                      IDC_LICENSE_EDIT);
-        if (hLicenseEditWnd)
-        {
-            LoadString(hInstance,
-                       IDS_LICENSE,
-                       strLicense,
-                       sizeof(strLicense) / sizeof(TCHAR));
 
-            SetWindowText(hLicenseEditWnd,
-                          strLicense);
-        }
+        LoadString(hInstance,
+                   IDS_LICENSE,
+                   strLicense,
+                   sizeof(strLicense) / sizeof(TCHAR));
+
+        SetWindowText(hLicenseEditWnd,
+                      strLicense);
 
         return TRUE;
 
@@ -54,6 +49,7 @@ AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
         if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
         {
+            DestroyIcon(hIcon);
             EndDialog(hDlg,
                       LOWORD(wParam));
             return TRUE;

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

@@ -1,19 +1,19 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/control.c
+ * FILE:        base/system/servman/control
  * PURPOSE:     Stops, pauses and resumes a service
- * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2005 - 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
 #include "precomp.h"
 
-static BOOL
+BOOL
 Control(PMAIN_WND_INFO Info,
-        HWND hProgDlg,
         DWORD Control)
 {
+    HWND hProgBar;
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
     SERVICE_STATUS_PROCESS ServiceStatus;
@@ -29,6 +29,19 @@ Control(PMAIN_WND_INFO Info,
                 0,
                 (LPARAM)&item);
 
+    /* set the progress bar range and step */
+    hProgBar = GetDlgItem(Info->hProgDlg,
+                          IDC_SERVCON_PROGRESS);
+    SendMessage(hProgBar,
+                PBM_SETRANGE,
+                0,
+                MAKELPARAM(0, PROGRESSRANGE));
+
+    SendMessage(hProgBar,
+                PBM_SETSTEP,
+                (WPARAM)1,
+                0);
+
     /* open handle to the SCM */
     hSCManager = OpenSCManager(NULL,
                                NULL,
@@ -41,7 +54,7 @@ Control(PMAIN_WND_INFO Info,
 
     /* open handle to the service */
     hSc = OpenService(hSCManager,
-                      Info->pCurrentService->lpServiceName,
+                      Info->CurrentService->lpServiceName,
                       SC_MANAGER_ALL_ACCESS);
     if (hSc == NULL)
     {
@@ -87,7 +100,11 @@ Control(PMAIN_WND_INFO Info,
         else if (dwWaitTime > 5000)
             dwWaitTime = 5000;
 
-        IncrementProgressBar(hProgDlg);
+        /* increment the progress bar */
+        SendMessage(hProgBar,
+                    PBM_STEPIT,
+                    0,
+                    0);
 
         /* wait before checking status */
         Sleep(dwWaitTime);
@@ -105,7 +122,11 @@ Control(PMAIN_WND_INFO Info,
 
         if (ServiceStatus.dwCheckPoint > dwOldCheckPoint)
         {
-            IncrementProgressBar(hProgDlg);
+            /* The service is making progress. increment the progress bar */
+            SendMessage(hProgBar,
+                        PBM_STEPIT,
+                        0,
+                        0);
             dwStartTickCount = GetTickCount();
             dwOldCheckPoint = ServiceStatus.dwCheckPoint;
         }
@@ -123,7 +144,10 @@ Control(PMAIN_WND_INFO Info,
 
     if (ServiceStatus.dwCurrentState == Control)
     {
-        CompleteProgressBar(hProgDlg);
+        SendMessage(hProgBar,
+                    PBM_DELTAPOS,
+                    PROGRESSRANGE,
+                    0);
         Sleep(1000);
         return TRUE;
     }
@@ -131,64 +155,3 @@ Control(PMAIN_WND_INFO Info,
         return FALSE;
 
 }
-
-BOOL DoStop(PMAIN_WND_INFO Info)
-{
-    BOOL ret = FALSE;
-    HWND hProgDlg;
-
-    hProgDlg = CreateProgressDialog(Info->hMainWnd,
-                                    Info->pCurrentService->lpServiceName,
-                                    IDS_PROGRESS_INFO_STOP);
-    if (hProgDlg)
-    {
-        ret = Control(Info,
-                      hProgDlg,
-                      SERVICE_CONTROL_STOP);
-
-        SendMessage(hProgDlg, WM_DESTROY, 0, 0);
-    }
-
-    return ret;
-}
-
-BOOL DoPause(PMAIN_WND_INFO Info)
-{
-    BOOL ret = FALSE;
-    HWND hProgDlg;
-
-    hProgDlg = CreateProgressDialog(Info->hMainWnd,
-                                    Info->pCurrentService->lpServiceName,
-                                    IDS_PROGRESS_INFO_PAUSE);
-    if (hProgDlg)
-    {
-        ret = Control(Info,
-                      hProgDlg,
-                      SERVICE_CONTROL_PAUSE);
-
-        SendMessage(hProgDlg, WM_DESTROY, 0, 0);
-    }
-
-    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);
-
-        SendMessage(hProgDlg, WM_DESTROY, 0, 0);
-    }
-
-    return ret;
-}
-

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

@@ -1,9 +1,9 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/create.c
+ * FILE:        base/system/servman/create.c
  * PURPOSE:     Create a new service
- * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
@@ -27,111 +27,196 @@ DoCreate(PCREATE_DATA Data)
 {
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
-    BOOL bRet = FALSE;
+    TCHAR Buf[32];
 
     /* open handle to the SCM */
     hSCManager = OpenSCManager(NULL,
                                NULL,
                                SC_MANAGER_ALL_ACCESS);
-    if (hSCManager)
+    if (hSCManager == NULL)
     {
-        hSc = CreateService(hSCManager,
-                            Data->ServiceName,
-                            Data->DisplayName,
-                            SERVICE_ALL_ACCESS,
-                            SERVICE_WIN32_OWN_PROCESS,
-                            SERVICE_DEMAND_START,
-                            SERVICE_ERROR_NORMAL,
-                            Data->BinPath,
-                            NULL,
-                            NULL,
-                            NULL,
-                            NULL,
-                            NULL);
+        GetError();
+        return FALSE;
+    }
 
-        if (hSc)
-        {
-            LPTSTR lpSuccess;
-
-            /* Set the service description as CreateService
-               does not do this for us */
-            SetServiceDescription(Data->ServiceName,
-                                  Data->Description);
-
-            /* report success to user */
-            if (AllocAndLoadString(&lpSuccess,
-                                   hInstance,
-                                   IDS_CREATE_SUCCESS))
-            {
-                DisplayString(lpSuccess);
-
-                HeapFree(ProcessHeap,
-                         0,
-                         lpSuccess);
-            }
-
-            CloseServiceHandle(hSc);
-            bRet = TRUE;
-        }
+    hSc = CreateService(hSCManager,
+                        Data->ServiceName,
+                        Data->DisplayName,
+                        SERVICE_ALL_ACCESS,
+                        SERVICE_WIN32_OWN_PROCESS,
+                        SERVICE_DEMAND_START,
+                        SERVICE_ERROR_NORMAL,
+                        Data->BinPath,
+                        NULL,
+                        NULL,
+                        NULL,
+                        NULL,
+                        NULL);
 
+    if (hSc == NULL)
+    {
+        GetError();
         CloseServiceHandle(hSCManager);
+        return FALSE;
     }
 
-    return bRet;
-}
+    /* Set the service description in the registry
+     * CreateService does not do this for us */
+    SetDescription(Data->ServiceName,
+                   Data->Description);
 
+    /* report success to user */
+    LoadString(hInstance,
+               IDS_CREATE_SUCCESS,
+               Buf,
+               sizeof(Buf) / sizeof(TCHAR));
+	DisplayString(Buf);
 
-static LPTSTR
-GetStringFromDialog(PCREATE_DATA Data,
-                    UINT id)
-{
-    HWND hwnd;
-    LPTSTR lpString = NULL;
-    INT iLen = 0;
+	CloseServiceHandle(hSCManager);
+    CloseServiceHandle(hSc);
 
-    hwnd = GetDlgItem(Data->hSelf,
-                      id);
-    if (hwnd)
-    {
-        iLen = GetWindowTextLength(hwnd);
-        if (iLen)
-        {
-            lpString = (LPTSTR)HeapAlloc(ProcessHeap,
-                                         0,
-                                         (iLen + 1) * sizeof(TCHAR));
-            if (lpString)
-            {
-                GetWindowText(hwnd,
-                              lpString,
-                              iLen + 1);
-            }
-        }
-    }
-
-    return lpString;
+    return TRUE;
 }
 
 
 static BOOL
 GetDataFromDialog(PCREATE_DATA Data)
 {
-    BOOL bRet = FALSE;
+    HWND hwnd;
+    TCHAR Buf[64];
+    INT iLen = 0;
 
-    if ((Data->ServiceName = GetStringFromDialog(Data, IDC_CREATE_SERVNAME)))
+    /* get service name */
+    hwnd = GetDlgItem(Data->hSelf,
+                      IDC_CREATE_SERVNAME);
+    iLen = GetWindowTextLength(hwnd);
+    if (iLen != 0)
     {
-        if ((Data->DisplayName = GetStringFromDialog(Data, IDC_CREATE_DISPNAME)))
+        Data->ServiceName = (TCHAR*) HeapAlloc(ProcessHeap,
+                                      0,
+                                      (iLen+1) * sizeof(TCHAR));
+        if (Data->ServiceName != NULL)
         {
-            if ((Data->BinPath = GetStringFromDialog(Data, IDC_CREATE_PATH)))
-            {
-                Data->Description = GetStringFromDialog(Data, IDC_CREATE_DESC);
-                Data->Options = GetStringFromDialog(Data, IDC_CREATE_OPTIONS);
-
-                bRet = TRUE;
-            }
+            GetWindowText(hwnd,
+                          Data->ServiceName,
+                          iLen+1);
         }
+        else
+            return FALSE;
+    }
+    else
+    {
+        LoadString(hInstance,
+                   IDS_CREATE_REQ,
+                   Buf,
+                   sizeof(Buf));
+        DisplayString(Buf);
+        SetFocus(hwnd);
+        return FALSE;
     }
 
-    return bRet;
+    /* get display name */
+    iLen = 0;
+    hwnd = GetDlgItem(Data->hSelf,
+                      IDC_CREATE_DISPNAME);
+    iLen = GetWindowTextLength(hwnd);
+    if (iLen != 0)
+    {
+        Data->DisplayName = (TCHAR*) HeapAlloc(ProcessHeap,
+                                      0,
+                                      (iLen+1) * sizeof(TCHAR));
+        if (Data->DisplayName != NULL)
+        {
+            GetWindowText(hwnd,
+                          Data->DisplayName,
+                          iLen+1);
+        }
+        else
+            return FALSE;
+    }
+    else
+    {
+        LoadString(hInstance,
+                   IDS_CREATE_REQ,
+                   Buf,
+                   sizeof(Buf));
+        DisplayString(Buf);
+        SetFocus(hwnd);
+        return FALSE;
+    }
+
+    /* get binary path */
+    iLen = 0;
+    hwnd = GetDlgItem(Data->hSelf,
+                      IDC_CREATE_PATH);
+    iLen = GetWindowTextLength(hwnd);
+    if (iLen != 0)
+    {
+        Data->BinPath = (TCHAR*) HeapAlloc(ProcessHeap,
+                                  0,
+                                  (iLen+1) * sizeof(TCHAR));
+        if (Data->BinPath != NULL)
+        {
+            GetWindowText(hwnd,
+                          Data->BinPath,
+                          iLen+1);
+        }
+        else
+            return FALSE;
+    }
+    else
+    {
+        LoadString(hInstance,
+                   IDS_CREATE_REQ,
+                   Buf,
+                   sizeof(Buf));
+        DisplayString(Buf);
+        SetFocus(hwnd);
+        return FALSE;
+    }
+
+    /* get description */
+    iLen = 0;
+    hwnd = GetDlgItem(Data->hSelf,
+                      IDC_CREATE_DESC);
+    iLen = GetWindowTextLength(hwnd);
+    if (iLen != 0)
+    {
+        Data->Description = (TCHAR*) HeapAlloc(ProcessHeap,
+                                      0,
+                                      (iLen+1) * sizeof(TCHAR));
+        if (Data->Description != NULL)
+        {
+            GetWindowText(hwnd,
+                          Data->Description,
+                          iLen+1);
+        }
+        else
+            return FALSE;
+    }
+
+
+    /* get options */
+    iLen = 0;
+    hwnd = GetDlgItem(Data->hSelf,
+                      IDC_CREATE_PATH);
+    iLen = GetWindowTextLength(hwnd);
+    if (iLen != 0)
+    {
+        Data->Options = (TCHAR*) HeapAlloc(ProcessHeap,
+                                  0,
+                                  (iLen+1) * sizeof(TCHAR));
+        if (Data->Options != NULL)
+        {
+            GetWindowText(hwnd,
+                          Data->Options,
+                          iLen+1);
+        }
+        else
+            return FALSE;
+    }
+
+    return TRUE;
 }
 
 static VOID
@@ -233,21 +318,17 @@ CreateDialogProc(HWND hDlg,
     {
         case WM_INITDIALOG:
         {
-            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);
-            }
+            hIcon = (HICON) LoadImage(hInstance,
+                              MAKEINTRESOURCE(IDI_SM_ICON),
+                              IMAGE_ICON,
+                              16,
+                              16,
+                              0);
 
+            SendMessage(hDlg,
+                        WM_SETICON,
+                        ICON_SMALL,
+                        (LPARAM)hIcon);
             return TRUE;
         }
 
@@ -259,10 +340,10 @@ CreateDialogProc(HWND hDlg,
                 {
                     PCREATE_DATA Data;
 
-                    Data = (PCREATE_DATA)HeapAlloc(ProcessHeap,
-                                                   HEAP_ZERO_MEMORY,
-                                                   sizeof(CREATE_DATA));
-                    if (Data)
+                    Data = (PCREATE_DATA) HeapAlloc(ProcessHeap,
+                                     HEAP_ZERO_MEMORY,
+                                     sizeof(CREATE_DATA));
+                    if (Data != NULL)
                     {
                         Data->hSelf = hDlg;
 
@@ -281,6 +362,7 @@ CreateDialogProc(HWND hDlg,
                         FreeMemory(Data);
                     }
 
+                    DestroyIcon(hIcon);
                     EndDialog(hDlg,
                               LOWORD(wParam));
                     return TRUE;
@@ -288,6 +370,7 @@ CreateDialogProc(HWND hDlg,
 
                 case IDCANCEL:
                 {
+                    DestroyIcon(hIcon);
                     EndDialog(hDlg,
                               LOWORD(wParam));
                     return TRUE;

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

@@ -1,9 +1,9 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/delete.c
+ * FILE:        base/system/servman/delete.c
  * PURPOSE:     Delete an existing service
- * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
@@ -15,44 +15,42 @@ DoDeleteService(PMAIN_WND_INFO Info,
 {
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
-    BOOL bRet = FALSE;
 
+    /* open handle to the SCM */
     hSCManager = OpenSCManager(NULL,
                                NULL,
                                SC_MANAGER_ALL_ACCESS);
-    if (hSCManager)
+    if (hSCManager == NULL)
     {
-        hSc = OpenService(hSCManager,
-                          Info->pCurrentService->lpServiceName,
-                          DELETE);
-        if (hSc)
-        {
-            if (DeleteService(hSc))
-            {
-                LPTSTR lpSuccess;
-
-                /* report success to user */
-                if (AllocAndLoadString(&lpSuccess,
-                                       hInstance,
-                                       IDS_DELETE_SUCCESS))
-                {
-                    DisplayString(lpSuccess);
-
-                    HeapFree(ProcessHeap,
-                             0,
-                             lpSuccess);
-                }
-
-                bRet = TRUE;
-            }
-
-            CloseServiceHandle(hSc);
-        }
-
-        CloseServiceHandle(hSCManager);
+        GetError();
+        return FALSE;
     }
 
-    return bRet;
+    /* get a handle to the service requested for deleting */
+    hSc = OpenService(hSCManager,
+                      Info->CurrentService->lpServiceName,
+                      DELETE);
+    if (hSc == NULL)
+    {
+        GetError();
+        CloseServiceHandle(hSCManager);
+        return FALSE;
+    }
+
+    /* delete the service opened */
+    if (! DeleteService(hSc))
+    {
+        GetError();
+        CloseServiceHandle(hSCManager);
+        CloseServiceHandle(hSc);
+        return FALSE;
+    }
+
+
+    CloseServiceHandle(hSCManager);
+    CloseServiceHandle(hSc);
+
+    return TRUE;
 }
 
 
@@ -64,66 +62,53 @@ DeleteDialogProc(HWND hDlg,
 {
     PMAIN_WND_INFO Info = NULL;
     HICON hIcon = NULL;
-
-    /* Get the window context */
-    Info = (PMAIN_WND_INFO)GetWindowLongPtr(hDlg,
-                                            GWLP_USERDATA);
-    if (Info == NULL && message != WM_INITDIALOG)
-    {
-        return FALSE;
-    }
+    TCHAR Buf[1000];
+    LVITEM item;
 
     switch (message)
     {
         case WM_INITDIALOG:
         {
-            LPTSTR lpDescription;
-
             Info = (PMAIN_WND_INFO)lParam;
-            if (Info != NULL)
-            {
-                SetWindowLongPtr(hDlg,
-                                 GWLP_USERDATA,
-                                 (LONG_PTR)Info);
 
-                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);
-                }
+            hIcon = (HICON) LoadImage(hInstance,
+                              MAKEINTRESOURCE(IDI_SM_ICON),
+                              IMAGE_ICON,
+                              16,
+                              16,
+                              0);
 
-                SendDlgItemMessage(hDlg,
-                                   IDC_DEL_NAME,
-                                   WM_SETTEXT,
-                                   0,
-                                   (LPARAM)Info->pCurrentService->lpDisplayName);
+            SendMessage(hDlg,
+                        WM_SETICON,
+                        ICON_SMALL,
+                        (LPARAM)hIcon);
 
-                lpDescription = GetServiceDescription(Info->pCurrentService->lpServiceName);
-                if (lpDescription)
-                {
-                    SendDlgItemMessage(hDlg,
-                                       IDC_DEL_DESC,
-                                       WM_SETTEXT,
-                                       0,
-                                       (LPARAM)lpDescription);
-                    HeapFree(ProcessHeap,
-                             0,
-                             lpDescription);
-                }
+            SendDlgItemMessage(hDlg,
+                               IDC_DEL_NAME,
+                               WM_SETTEXT,
+                               0,
+                               (LPARAM)Info->CurrentService->lpDisplayName);
 
-                return TRUE;
-            }
 
-            return FALSE;
+            item.mask = LVIF_TEXT;
+            item.iItem = Info->SelectedItem;
+            item.iSubItem = 1;
+            item.pszText = Buf;
+            item.cchTextMax = sizeof(Buf);
+            SendMessage(Info->hListView,
+                        LVM_GETITEM,
+                        0,
+                        (LPARAM)&item);
+
+            SendDlgItemMessage(hDlg,
+                               IDC_DEL_DESC,
+                               WM_SETTEXT,
+                               0,
+                               (LPARAM)Buf);
+
+            SetFocus(GetDlgItem(hDlg, IDCANCEL));
+
+            return TRUE;
         }
 
         case WM_COMMAND:
@@ -133,11 +118,10 @@ DeleteDialogProc(HWND hDlg,
                 case IDOK:
                 {
                     if (DoDeleteService(Info, hDlg))
-                    {
                         (void)ListView_DeleteItem(Info->hListView,
                                                   Info->SelectedItem);
-                        UpdateServiceCount(Info);
-                    }
+
+                    DestroyIcon(hIcon);
                     EndDialog(hDlg,
                               LOWORD(wParam));
                     return TRUE;
@@ -145,6 +129,7 @@ DeleteDialogProc(HWND hDlg,
 
                 case IDCANCEL:
                 {
+                    DestroyIcon(hIcon);
                     EndDialog(hDlg,
                               LOWORD(wParam));
                     return TRUE;

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

@@ -36,10 +36,10 @@ static BOOL
 SaveServicesToFile(PMAIN_WND_INFO Info,
                    LPCTSTR pszFileName)
 {
-    HANDLE hFile;
-    BOOL bSuccess = FALSE;
+	HANDLE hFile;
+	BOOL bSuccess = FALSE;
 
-    hFile = CreateFile(pszFileName,
+	hFile = CreateFile(pszFileName,
                        GENERIC_WRITE,
                        0,
                        NULL,
@@ -47,21 +47,21 @@ SaveServicesToFile(PMAIN_WND_INFO Info,
                        FILE_ATTRIBUTE_NORMAL,
                        NULL);
 
-    if(hFile != INVALID_HANDLE_VALUE)
-    {
+	if(hFile != INVALID_HANDLE_VALUE)
+	{
         TCHAR LVText[500];
         TCHAR newl = _T('\n');
         TCHAR tab = _T('\t');
-        DWORD dwTextLength, dwWritten;
-        INT NumListedServ = 0;
-        INT i, k;
+		DWORD dwTextLength, dwWritten;
+		INT NumListedServ = 0;
+		INT i, k;
 
-        NumListedServ = ListView_GetItemCount(Info->hListView);
+		NumListedServ = ListView_GetItemCount(Info->hListView);
 
-        for (i=0; i < NumListedServ; i++)
-        {
-            for (k=0; k<5; k++)
-            {
+		for (i=0; i < NumListedServ; i++)
+		{
+		    for (k=0; k<5; k++)
+		    {
                 dwTextLength = GetTextFromListView(Info,
                                                    LVText,
                                                    i,
@@ -80,43 +80,46 @@ SaveServicesToFile(PMAIN_WND_INFO Info,
                               &dwWritten,
                               NULL);
                 }
-            }
-            WriteFile(hFile,
+		    }
+		    WriteFile(hFile,
                       &newl,
                       sizeof(TCHAR),
                       &dwWritten,
                       NULL);
-        }
+		}
 
-        CloseHandle(hFile);
-        bSuccess = TRUE;
-    }
+		CloseHandle(hFile);
+		bSuccess = TRUE;
+	}
 
-    return bSuccess;
+	return bSuccess;
 }
 
 
 VOID ExportFile(PMAIN_WND_INFO Info)
 {
-    OPENFILENAME ofn;
-    TCHAR szFileName[MAX_PATH] = _T("");
+	OPENFILENAME ofn;
+	TCHAR szFileName[MAX_PATH] = _T("");
 
-    ZeroMemory(&ofn, sizeof(ofn));
+	ZeroMemory(&ofn, sizeof(ofn));
 
-    ofn.lStructSize = sizeof(OPENFILENAME);
-    ofn.hwndOwner = Info->hMainWnd;
-    ofn.lpstrFilter = _T("Text (Tab Delimited)(*.txt)\0*.txt\0Text (Comma Delimited)(*.csv)\0*.csv\0");
-    ofn.lpstrFile = szFileName;
-    ofn.nMaxFile = MAX_PATH;
-    ofn.lpstrDefExt = _T("txt");
-    ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
+	ofn.lStructSize = sizeof(OPENFILENAME);
+	ofn.hwndOwner = Info->hMainWnd;
+	ofn.lpstrFilter = _T("Text (Tab Delimited)(*.txt)\0*.txt\0Text (Comma Delimited)(*.csv)\0*.csv\0");
+	ofn.lpstrFile = szFileName;
+	ofn.nMaxFile = MAX_PATH;
+	ofn.lpstrDefExt = _T("txt");
+	ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
 
-    if(GetSaveFileName(&ofn))
-    {
-        if (SaveServicesToFile(Info, szFileName))
+	if(GetSaveFileName(&ofn))
+	{
+		if (SaveServicesToFile(Info, szFileName))
             return;
-    }
+	}
 
-    if (CommDlgExtendedError() != CDERR_GENERALCODES)
+	if (CommDlgExtendedError() != CDERR_GENERALCODES)
         MessageBox(NULL, _T("Export to file failed"), NULL, 0);
 }
+
+
+

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

@@ -21,7 +21,7 @@ BEGIN
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     ID_REFRESH
     MENUITEM SEPARATOR
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",     ID_EDIT, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",   ID_CREATE, GRAYED
+    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",   ID_CREATE
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",   ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_PROP, GRAYED
@@ -68,13 +68,13 @@ CAPTION "
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
   ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-IDD_DLG_GENERAL DIALOGEX 6,6,253,232
+IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "<22><><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
@@ -100,7 +100,6 @@ BEGIN
   LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD>.",IDC_STATIC, 6,177,240,15
   LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 200, 58, 11
   EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
@@ -147,7 +146,7 @@ BEGIN
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
   PUSHBUTTON "<22><>", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "<22><>", IDCANCEL, 102, 129, 54, 13
+  PUSHBUTTON "<22><>", IDCANCEL, 102, 129, 54, 13
 END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
@@ -209,16 +208,15 @@ BEGIN
   IDS_TOOLTIP_STOP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_TOOLTIP_PAUSE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>) <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_TOOLTIP_RESTART "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  IDS_TOOLTIP_HELP "<22><><EFBFBD><EFBFBD><EFBFBD>"
+  IDS_TOOLTIP_EXIT "<22><><EFBFBD><EFBFBD><EFBFBD>"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_PROGRESS_INFO_START "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_PROGRESS_INFO_STOP  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS is attempting to pause the following service"
-  IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service"
   IDS_CREATE_SUCCESS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_DELETE_SUCCESS "Service Deleted Succesfully"
   IDS_CREATE_REQ "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> \n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_DELETE_STOP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 END
@@ -228,7 +226,30 @@ BEGIN
 /*  IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n" */
   IDS_HELP_OPTIONS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\r\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n"
 END
+#define IDS_HINT_BLANK          20000
+#define IDS_HINT_EXPORT         20001
+#define IDS_HINT_EXIT           20002
 
+#define IDS_HINT_CONNECT        20011
+#define IDS_HINT_START          20012
+#define IDS_HINT_STOP           21013
+#define IDS_HINT_PAUSE          21014
+#define IDS_HINT_RESUME         20015
+#define IDS_HINT_RESTART        20016
+#define IDS_HINT_REFRESH        20017
+#define IDS_HINT_EDIT           20018
+#define IDS_HINT_CREATE         20019
+#define IDS_HINT_DELETE         20020
+#define IDS_HINT_PROP           20021
+
+#define IDS_HINT_LARGE          20030
+#define IDS_HINT_SMALL          20031
+#define IDS_HINT_LIST           20032
+#define IDS_HINT_DETAILS        20033
+#define IDS_HINT_CUST           20034
+
+#define IDS_HINT_HELP           20040
+#define IDS_HINT_ABOUT          20041
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN

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

@@ -21,7 +21,7 @@ BEGIN
     MENUITEM "Aktualisieren",     ID_REFRESH
     MENUITEM SEPARATOR
     MENUITEM "Bearbeiten...",     ID_EDIT, GRAYED
-    MENUITEM "Erstellen...",   ID_CREATE, GRAYED
+    MENUITEM "Erstellen...",   ID_CREATE
     MENUITEM "L<>schen...",   ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Eigenschaften...", ID_PROP, GRAYED
@@ -68,13 +68,13 @@ CAPTION "Info
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Dienst-Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Dienst-Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "Schlie<69>en", IDOK, 75, 162, 44, 15
   ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-IDD_DLG_GENERAL DIALOGEX 6,6,253,232
+IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "Allgemein"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
@@ -98,7 +98,6 @@ BEGIN
   LTEXT "Sie k<>nnen die Startparameter angeben, die <20>bernommen werden sollen, wenn der Dienst von hier aus gestartet wird.",IDC_STATIC, 6,177,240,20
   LTEXT "Startparameter:", IDC_STATIC, 6, 200, 58, 11
   EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
@@ -144,7 +143,7 @@ BEGIN
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
   PUSHBUTTON "Ja", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "Nein", IDCANCEL, 102, 129, 54, 13
+  PUSHBUTTON "Nein", IDCANCEL, 102, 129, 54, 13
 END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
@@ -205,16 +204,15 @@ BEGIN
   IDS_TOOLTIP_STOP "Dienst beenden"
   IDS_TOOLTIP_PAUSE "Dienst anhalten"
   IDS_TOOLTIP_RESTART "Dienst neu starten"
+  IDS_TOOLTIP_HELP "Hilfe"
+  IDS_TOOLTIP_EXIT "Beenden"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_PROGRESS_INFO_START "ReactOS versucht den folgenden Dienst zu starten"
   IDS_PROGRESS_INFO_STOP  "ReactOS versucht den folgenden Dienst zu beenden"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS versucht den folgenden Dienst zu pausieren"
-  IDS_PROGRESS_INFO_RESUME "ReactOS versucht den folgenden Dienst fortzusetzen"
-  IDS_CREATE_SUCCESS "Der Dienst wurde erfolgreich erstellt"
-  IDS_DELETE_SUCCESS "Der Dienst wurde erfolgreich gel<65>scht"
+  IDS_CREATE_SUCCESS "Dienst wurde erfolgreich erstellt"
   IDS_CREATE_REQ "Mit einem Sternchen gekennzeichnete Felder sind erforderlich"
   IDS_DELETE_STOP "Sie m<>ssen den Dienst manuell beenden, bevor er gel<65>scht werden kann!"
 END
@@ -223,7 +221,30 @@ STRINGTABLE DISCARDABLE
 BEGIN
   IDS_HELP_OPTIONS "ERSTELLOPTIONEN:\r\nBEACHTEN SIE: Der Optionsname enth<74>lt das Gleichheitszeichen.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (Standard = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (Standard = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (Standard = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Abh<62>ngigkeiten (getrennt durch / (Schr<68>gstrich))>\r\n obj= <KontoName|ObjektName>\r\n       (Standard = LocalSystem)\r\n password= <Passwort>\r\n"
 END
+#define IDS_HINT_BLANK          20000
+#define IDS_HINT_EXPORT         20001
+#define IDS_HINT_EXIT           20002
 
+#define IDS_HINT_CONNECT        20011
+#define IDS_HINT_START          20012
+#define IDS_HINT_STOP           21013
+#define IDS_HINT_PAUSE          21014
+#define IDS_HINT_RESUME         20015
+#define IDS_HINT_RESTART        20016
+#define IDS_HINT_REFRESH        20017
+#define IDS_HINT_EDIT           20018
+#define IDS_HINT_CREATE         20019
+#define IDS_HINT_DELETE         20020
+#define IDS_HINT_PROP           20021
+
+#define IDS_HINT_LARGE          20030
+#define IDS_HINT_SMALL          20031
+#define IDS_HINT_LIST           20032
+#define IDS_HINT_DETAILS        20033
+#define IDS_HINT_CUST           20034
+
+#define IDS_HINT_HELP           20040
+#define IDS_HINT_ABOUT          20041
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN

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

@@ -21,7 +21,7 @@ BEGIN
     MENUITEM "Refresh",     ID_REFRESH
     MENUITEM SEPARATOR
     MENUITEM "Edit...",     ID_EDIT, GRAYED
-    MENUITEM "Create...",   ID_CREATE, GRAYED
+    MENUITEM "Create...",   ID_CREATE
     MENUITEM "Delete...",   ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Properties...", ID_PROP, GRAYED
@@ -68,13 +68,13 @@ CAPTION "About Service Manager"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Service Manager v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "Close", IDOK, 75, 162, 44, 15
   ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
+IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "General"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
@@ -98,7 +98,6 @@ BEGIN
   LTEXT "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC, 6,177,240,15
   LTEXT "Start parameters:", IDC_STATIC, 6, 200, 58, 11
   EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
@@ -144,7 +143,7 @@ BEGIN
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
   PUSHBUTTON "Yes", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13
+  PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13
 END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
@@ -205,16 +204,15 @@ BEGIN
   IDS_TOOLTIP_STOP "Stop service"
   IDS_TOOLTIP_PAUSE "Pause service"
   IDS_TOOLTIP_RESTART "Restart service"
+  IDS_TOOLTIP_HELP "Help"
+  IDS_TOOLTIP_EXIT "Exit"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_PROGRESS_INFO_START  "ReactOS is attempting to start the following service"
-  IDS_PROGRESS_INFO_STOP   "ReactOS is attempting to stop the following service"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS is attempting to pause the following service"
-  IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service"
+  IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service"
+  IDS_PROGRESS_INFO_STOP  "ReactOS is attempting to stop the following service"
   IDS_CREATE_SUCCESS "Service Created Succesfully"
-  IDS_DELETE_SUCCESS "Service Deleted Succesfully"
   IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory"
   IDS_DELETE_STOP "You must manually stop the service before deleting!"
 END
@@ -223,7 +221,30 @@ STRINGTABLE DISCARDABLE
 BEGIN
   IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n"
 END
+#define IDS_HINT_BLANK          20000
+#define IDS_HINT_EXPORT         20001
+#define IDS_HINT_EXIT           20002
 
+#define IDS_HINT_CONNECT        20011
+#define IDS_HINT_START          20012
+#define IDS_HINT_STOP           21013
+#define IDS_HINT_PAUSE          21014
+#define IDS_HINT_RESUME         20015
+#define IDS_HINT_RESTART        20016
+#define IDS_HINT_REFRESH        20017
+#define IDS_HINT_EDIT           20018
+#define IDS_HINT_CREATE         20019
+#define IDS_HINT_DELETE         20020
+#define IDS_HINT_PROP           20021
+
+#define IDS_HINT_LARGE          20030
+#define IDS_HINT_SMALL          20031
+#define IDS_HINT_LIST           20032
+#define IDS_HINT_DETAILS        20033
+#define IDS_HINT_CUST           20034
+
+#define IDS_HINT_HELP           20040
+#define IDS_HINT_ABOUT          20041
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN

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

@@ -22,7 +22,7 @@ BEGIN
     MENUITEM "Rafra<72>chir",     ID_REFRESH
     MENUITEM SEPARATOR
     MENUITEM "<22>diter...",     ID_EDIT, GRAYED
-    MENUITEM "Cr<43>er...",   ID_CREATE, GRAYED
+    MENUITEM "Cr<43>er...",   ID_CREATE
     MENUITEM "Supprimer...",   ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Propri<72>t<EFBFBD>s...", ID_PROP, GRAYED
@@ -69,13 +69,13 @@ CAPTION "
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Gestionnaire de services v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Gestionnaire de services v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15
   ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-IDD_DLG_GENERAL DIALOGEX 6,6,253,232
+IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "G<>n<EFBFBD>ral"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
@@ -99,7 +99,6 @@ BEGIN
   LTEXT "Vous pouvez d<>finir les param<61>tres pass<73>s au service lorsque vous le d<>marrez.",IDC_STATIC, 6,177,240,15
   LTEXT "Param<61>tres:", IDC_STATIC, 6, 200, 58, 11
   EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "<22>diter", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
@@ -145,7 +144,7 @@ BEGIN
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
   PUSHBUTTON "Oui", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "Non", IDCANCEL, 102, 129, 54, 13
+  PUSHBUTTON "Non", IDCANCEL, 102, 129, 54, 13
 END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
@@ -209,16 +208,15 @@ BEGIN
   IDS_TOOLTIP_STOP "Arr<72>ter le service"
   IDS_TOOLTIP_PAUSE "Suspendre le service"
   IDS_TOOLTIP_RESTART "Red<65>marrer le service"
+  IDS_TOOLTIP_HELP "Aide"
+  IDS_TOOLTIP_EXIT "Quitter"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_PROGRESS_INFO_START "ReactOS essaye de d<>marrer le service suivant"
   IDS_PROGRESS_INFO_STOP  "ReactOS essaye d'arr<72>ter le service suivant"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS essaye de suspendre le service suivant"
-  IDS_PROGRESS_INFO_RESUME "ReactOS essaye de relancer le service suivant"
   IDS_CREATE_SUCCESS "Service cr<63><72>"
-  IDS_DELETE_SUCCESS "Service Deleted Succesfully"
   IDS_CREATE_REQ "Les champs marqu<71>s d'une ast<73>risque\nasont obligatoires"
   IDS_DELETE_STOP "Vous devez arr<72>ter le service avant de le supprimer!"
 END
@@ -227,7 +225,30 @@ STRINGTABLE DISCARDABLE
 BEGIN
   IDS_HELP_OPTIONS "OPTIONS DE CREATION:\r\nNOTE: le nom de l'option inclue le signe =.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n"
 END
+#define IDS_HINT_BLANK          20000
+#define IDS_HINT_EXPORT         20001
+#define IDS_HINT_EXIT           20002
 
+#define IDS_HINT_CONNECT        20011
+#define IDS_HINT_START          20012
+#define IDS_HINT_STOP           21013
+#define IDS_HINT_PAUSE          21014
+#define IDS_HINT_RESUME         20015
+#define IDS_HINT_RESTART        20016
+#define IDS_HINT_REFRESH        20017
+#define IDS_HINT_EDIT           20018
+#define IDS_HINT_CREATE         20019
+#define IDS_HINT_DELETE         20020
+#define IDS_HINT_PROP           20021
+
+#define IDS_HINT_LARGE          20030
+#define IDS_HINT_SMALL          20031
+#define IDS_HINT_LIST           20032
+#define IDS_HINT_DETAILS        20033
+#define IDS_HINT_CUST           20034
+
+#define IDS_HINT_HELP           20040
+#define IDS_HINT_ABOUT          20041
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -254,7 +275,7 @@ BEGIN
   IDS_HINT_CUST         " Personnaliser l'affichage."
 
   IDS_HINT_HELP         " Affiche la fen<65>tre d'aide."
-  IDS_HINT_ABOUT        " <EFBFBD> propos du gestionnaire de Services ReactOS."
+  IDS_HINT_ABOUT        " A Propos du gestionnaire de Services ReactOS."
 
   IDS_HINT_SYS_RESTORE  " Restaurer la taille de la fen<65>tre."
   IDS_HINT_SYS_MOVE     " D<>placer la fen<65>tre."

reactos/base/applications/mscutils/servman/lang/id-ID.rc

@@ -21,7 +21,7 @@ BEGIN
     MENUITEM "Segarkan",      ID_REFRESH
     MENUITEM SEPARATOR
     MENUITEM "Edit...",       ID_EDIT, GRAYED
-    MENUITEM "Buat...",       ID_CREATE, GRAYED
+    MENUITEM "Buat...",       ID_CREATE
     MENUITEM "Hapus...",      ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Properti...",   ID_PROP, GRAYED
@@ -68,13 +68,13 @@ CAPTION "Tentang Manajer Layanan"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Manajer Layanan v0.8\nHak Cipta (C) 2005-2007\noleh Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Manajer Layanan v0.5.1\nHak Cipta (C) 2005-2006\noleh Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15
   ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-IDD_DLG_GENERAL DIALOGEX 6,6,253,232
+IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "Umum"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
@@ -98,7 +98,6 @@ BEGIN
   LTEXT "Anda menetapkan parameter mulai yang diterapkan ketika anda memulai layanan dari sini.",IDC_STATIC, 6,177,240,15
   LTEXT "Parameter Mulai:", IDC_STATIC, 6, 200, 58, 11
   EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
@@ -144,7 +143,7 @@ BEGIN
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
   PUSHBUTTON "Ya", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "Tidak", IDCANCEL, 102, 129, 54, 13
+  PUSHBUTTON "Tidak", IDCANCEL, 102, 129, 54, 13
 END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
@@ -205,16 +204,15 @@ BEGIN
   IDS_TOOLTIP_STOP    "Menghentikan layanan"
   IDS_TOOLTIP_PAUSE   "Mengistirahatkan layanan"
   IDS_TOOLTIP_RESTART "Memulai lagi layanan"
+  IDS_TOOLTIP_HELP    "Bantuan"
+  IDS_TOOLTIP_EXIT    "Keluar"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_PROGRESS_INFO_START "ReactOS sedang mencoba untuk memulai layanan berikut"
   IDS_PROGRESS_INFO_STOP  "ReactOS sedang mencoba untuk menghentikan layanan berikut"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS is attempting to pause the following service"
-  IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service"
   IDS_CREATE_SUCCESS      "Layanan Dibuat Dengan Sukses"
-  IDS_DELETE_SUCCESS "Service Deleted Succesfully"
   IDS_CREATE_REQ          "Field yang ditandai dengan\nbintang adalah mandatori"
   IDS_DELETE_STOP         "Anda harus menghentikan layanan sebelum menghapus!"
 END
@@ -223,7 +221,30 @@ STRINGTABLE DISCARDABLE
 BEGIN
   IDS_HELP_OPTIONS "OPSI BUAT:\r\nCATATAN: Nama opsi termasuk tanda sama dengan.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (standar = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (standar = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (standar = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(dipisahkan oleh / (garis miring))>\r\n obj= <AccountName|ObjectName>\r\n       (standar = LocalSystem)\r\n password= <password>\r\n"
 END
+#define IDS_HINT_BLANK          20000
+#define IDS_HINT_EXPORT         20001
+#define IDS_HINT_EXIT           20002
 
+#define IDS_HINT_CONNECT        20011
+#define IDS_HINT_START          20012
+#define IDS_HINT_STOP           21013
+#define IDS_HINT_PAUSE          21014
+#define IDS_HINT_RESUME         20015
+#define IDS_HINT_RESTART        20016
+#define IDS_HINT_REFRESH        20017
+#define IDS_HINT_EDIT           20018
+#define IDS_HINT_CREATE         20019
+#define IDS_HINT_DELETE         20020
+#define IDS_HINT_PROP           20021
+
+#define IDS_HINT_LARGE          20030
+#define IDS_HINT_SMALL          20031
+#define IDS_HINT_LIST           20032
+#define IDS_HINT_DETAILS        20033
+#define IDS_HINT_CUST           20034
+
+#define IDS_HINT_HELP           20040
+#define IDS_HINT_ABOUT          20041
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN

reactos/base/applications/mscutils/servman/lang/it-IT.rc

@@ -21,7 +21,7 @@ BEGIN
     MENUITEM "Aggiorna",     ID_REFRESH
     MENUITEM SEPARATOR
     MENUITEM "Modifica...",  ID_EDIT, GRAYED
-    MENUITEM "Crea...",      ID_CREATE, GRAYED
+    MENUITEM "Crea...",      ID_CREATE
     MENUITEM "Cancella...",  ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Propriet<65>...", ID_PROP, GRAYED
@@ -68,13 +68,13 @@ CAPTION "Informazioni su Gestione Servizi"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Gestione Servizi v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Gestione Servizi v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "Chiudi", IDOK, 75, 162, 44, 15
   ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-IDD_DLG_GENERAL DIALOGEX 6,6,253,232
+IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "General"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
@@ -98,7 +98,6 @@ BEGIN
   LTEXT "Puoi indicarei parametri in uso quando il servizio <20> avviato da qui.",IDC_STATIC, 6,177,240,15
   LTEXT "Parametri di avvio:", IDC_STATIC, 6, 200, 58, 11
   EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
@@ -144,7 +143,7 @@ BEGIN
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
   PUSHBUTTON "Si", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13
+  PUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13
 END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
@@ -205,16 +204,15 @@ BEGIN
   IDS_TOOLTIP_STOP "Ferma servizio"
   IDS_TOOLTIP_PAUSE "Pausa servizio"
   IDS_TOOLTIP_RESTART "Riavvia servizio"
+  IDS_TOOLTIP_HELP "Aiuto"
+  IDS_TOOLTIP_EXIT "Esci"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_PROGRESS_INFO_START "ReactOS sta avviando il seguente  servizio"
   IDS_PROGRESS_INFO_STOP  "ReactOS sta fermando il seguente  servizio"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS is attempting to pause the following service"
-  IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service"
   IDS_CREATE_SUCCESS "Servizio creato regolarmente"
-  IDS_DELETE_SUCCESS "Service Deleted Succesfully"
   IDS_CREATE_REQ "I campi marcati con un asterisco\nsono obbligatori"
   IDS_DELETE_STOP "Devi fermare il servizio prima di cancellare!"
 END
@@ -223,7 +221,30 @@ STRINGTABLE DISCARDABLE
 BEGIN
   IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTA: Il nome dell'ozione comprende il simbolo di uguale.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n"
 END
+#define IDS_HINT_BLANK          20000
+#define IDS_HINT_EXPORT         20001
+#define IDS_HINT_EXIT           20002
 
+#define IDS_HINT_CONNECT        20011
+#define IDS_HINT_START          20012
+#define IDS_HINT_STOP           21013
+#define IDS_HINT_PAUSE          21014
+#define IDS_HINT_RESUME         20015
+#define IDS_HINT_RESTART        20016
+#define IDS_HINT_REFRESH        20017
+#define IDS_HINT_EDIT           20018
+#define IDS_HINT_CREATE         20019
+#define IDS_HINT_DELETE         20020
+#define IDS_HINT_PROP           20021
+
+#define IDS_HINT_LARGE          20030
+#define IDS_HINT_SMALL          20031
+#define IDS_HINT_LIST           20032
+#define IDS_HINT_DETAILS        20033
+#define IDS_HINT_CUST           20034
+
+#define IDS_HINT_HELP           20040
+#define IDS_HINT_ABOUT          20041
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN

reactos/base/applications/mscutils/servman/lang/pl-PL.rc

@@ -35,8 +35,8 @@ BEGIN
   END
   POPUP "Widok"
   BEGIN
-    MENUITEM "Du<44>e ikony", ID_VIEW_LARGE
-    MENUITEM "Ma<4D>e ikony", ID_VIEW_SMALL
+    MENUITEM "Du<44>e Ikony", ID_VIEW_LARGE
+    MENUITEM "Ma<4D>e Ikony", ID_VIEW_SMALL
     MENUITEM "Lista",        ID_VIEW_LIST
     MENUITEM "Szczeg<65><67>y",     ID_VIEW_DETAILS
     MENUITEM SEPARATOR
@@ -96,13 +96,13 @@ BEGIN
   PUSHBUTTON "Wzn<7A>w", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED
   PUSHBUTTON "Uruchom ponownie", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED
   LTEXT "Nazwa us<75>ugi:", IDC_STATIC, 4, 11, 53, 11
-  LTEXT "Nazwa wy<77>wietlana:", IDC_STATIC, 4, 29, 53, 11
+  LTEXT "Nazwa wy<77>wietlania:", IDC_STATIC, 4, 29, 53, 11
   LTEXT "Opis:", IDC_STATIC, 4, 51, 53, 11
   LTEXT "<22>cie<69>ka do aplikacji", IDC_STATIC, 6, 73, 82, 9
   LTEXT "Typ uruchomienia:", IDC_STATIC, 6, 108, 53, 11
   LTEXT "Stan us<75>ugi:", IDC_STATIC, 4, 138, 53, 11
   LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE
-  LTEXT "Mo<4D>esz okre<72>li<EFBFBD> parametry pocz<63>tkowe, kt<6B>re b<>d<EFBFBD> u<>yte przy uruchomieniu us<75>ugi z tego miejsca.",IDC_STATIC, 6,177,240,15
+  LTEXT "Mo<4D>esz okre<72>li parametry pocz<63>tkowe, kt<6B>re b<>d<EFBFBD> u<>yte przy uruchomieniu us<75>ugi z tego miejsca.",IDC_STATIC, 6,177,240,15
   LTEXT "Parametry uruchomienia:", IDC_STATIC, 6, 200, 58, 11
   EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
@@ -114,7 +114,7 @@ STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GRO
 BEGIN
   CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
   CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
-  LTEXT "Niekt<6B>re us<75>ugi s<> zale<6C>ne od innych us<75>ug, sterownik<69>w systemowych i grup kolejno<6E>ci <20>adowania. Je<4A>eli sk<73>adnik systemu jest zatrzymany lub nie dzia<69>a prawid<69>owo, mo<6D>e to mie<69>.", IDC_STATIC,8, 7, 238, 26
+  LTEXT "Niekt<6B>re us<75><EFBFBD>gi s<> zale<6C>ne od innych us<75>ug, sterownik<69>w systemowych i gup kolejno<6E>ci <20>adowania. Je<4A>eli sk<73>adniki systemu jest zatrzymany lub nie dzia<69>a prawid<69>owo, mo<6D>e to mie<69>.", IDC_STATIC,8, 7, 238, 26
   LTEXT "Ta us<75>uga jest zale<6C>na od nast<73>puj<75>cych sk<73>adnik<69>w systemu", IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13
 END
@@ -129,13 +129,13 @@ BEGIN
   EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE
   EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE
   EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE
-  LTEXT "*Nazwa us<75>ugi", IDC_STATIC, 12, 12, 54, 9
-  LTEXT "*Nazwa wy<77>wietlana", IDC_STATIC, 12, 33, 54, 9
-  LTEXT "*<2A>cie<69>ka do aplikacji", IDC_STATIC, 10, 51, 68, 9
-  LTEXT "Opis", IDC_STATIC, 12, 86, 44, 9
+  LTEXT "*Nazwa us<75>ugi :", IDC_STATIC, 12, 12, 54, 9
+  LTEXT "*Nazwa wy<77>wietlania :", IDC_STATIC, 12, 33, 54, 9
+  LTEXT "*<2A>cie<69>ka do aplikacji :", IDC_STATIC, 10, 51, 68, 9
+  LTEXT "Opis :", IDC_STATIC, 12, 86, 44, 9
   PUSHBUTTON "OK", IDOK, 126, 192, 44, 13
   PUSHBUTTON "Anuluj", IDCANCEL, 176, 192, 46, 13
-  LTEXT "Dodatkowe opcje (kliknij Pomoc, aby zobaczy<7A> szczeg<65><67>y)", IDC_STATIC, 10, 151, 134, 9
+  LTEXT "Dodatkowe opcje (kliknij pomoc aby zobaczy<7A> szczeg<65><67><EFBFBD>w)", IDC_STATIC, 10, 151, 134, 9
   PUSHBUTTON "Pomoc", ID_CREATE_HELP, 6, 192, 44, 13
 END
 
@@ -145,7 +145,7 @@ FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME
 BEGIN
   ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22
-  LTEXT "Czy na pewno chcesz usun<75><6E> nast<73>puj<75>c<EFBFBD> us<75>ug<75>?", IDC_STATIC, 50, 6, 125, 25
+  LTEXT "Czy jeste<EFBFBD> pewny <20>e chcesz usun<75><6E> nast<73>puj<75>c<EFBFBD> us<75>ug<75>?", IDC_STATIC, 50, 6, 125, 25
   LTEXT "Nazwa us<75>ugi:",IDC_STATIC, 6, 40, 80, 9
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
@@ -181,14 +181,14 @@ BEGIN
   IDS_FIRSTCOLUMN "Nazwa"
   IDS_SECONDCOLUMN "Opis"
   IDS_THIRDCOLUMN "Status"
-  IDS_FOURTHCOLUMN "Typ uruchomienia"
-  IDS_FITHCOLUMN "Logowanie jako"
+  IDS_FOURTHCOLUMN "Typ uruchomienie"
+  IDS_FITHCOLUMN "Zaloguj si<73> jako"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_SERVICES_STARTED "Uruchomiono"
-  IDS_SERVICES_STOPPED "Zatrzymano"
+  IDS_SERVICES_STARTED "Zacz<EFBFBD><EFBFBD>"
+  IDS_SERVICES_STOPPED "Zatrzyma<EFBFBD>"
   IDS_SERVICES_AUTO "Automatyczny"
   IDS_SERVICES_MAN "R<>czny"
   IDS_SERVICES_DIS "Wy<57><79>czony"
@@ -197,7 +197,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_NUM_SERVICES "Numer us<75>ugi: %d"
-  IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; mo<6D>esz go rozprowadza<7A> dalej i/lub modyfikowa<77> na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacj<63> Wolnego Oprogramowania - wed<65>ug wersji 2 tej Licencji lub (wed<65>ug Twojego wyboru) kt<6B>rej<65> z p<><70>niejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej<65>, i<> b<>dzie on u<>yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domy<6D>lnej gwarancji PRZYDATNO<4E>CI HANDLOWEJ albo PRZYDATNO<4E>CI DO OKRE<52>LONYCH ZASTOSOWA<57>. W celu uzyskania bli<6C>szych informacji si<73>gnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewno<6E>ci<63> wraz z niniejszym programem otrzyma<6D>e<EFBFBD> te<74> egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); je<6A>li nie - napisz do Free Software Foundation, Inc., 59 Temple Place, Fifth Floor, Boston, MA  02110-1301  USA."
+  IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; mo<6D>esz go rozprowadza<7A> dalej i/lub modyfikowa<77> na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacj<63> Wolnego Oprogramowania - wed<65>ug wersji 2 tej Licencji lub (wed<65>ug twojego wyboru) kt<6B>rej<65> z p<><70>niejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej<65>, i<> b<>dzie on u<>yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domy<6D>lnej gwarancji PRZYDATNO<4E>CI HANDLOWEJ albo PRZYDATNO<4E>CI DO OKRE<52>LONYCH ZASTOSOWA<57>. W celu uzyskania bli<6C>szych informacji si<73>gnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewno<6E>ci<63> wraz z niniejszym programem otrzyma<6D>e<EFBFBD> te<74> egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); je<6A>li nie - napisz do Free Software Foundation, Inc., 59 Temple Place, Fifth Floor, Boston, MA  02110-1301  USA."
 END
 
 STRINGTABLE DISCARDABLE
@@ -211,6 +211,8 @@ BEGIN
   IDS_TOOLTIP_STOP "Zatrzymaj us<75>ug<75>"
   IDS_TOOLTIP_PAUSE "Wstrzymaj us<75>ug<75>"
   IDS_TOOLTIP_RESTART "Wzn<7A>w us<75>ug<75>"
+  IDS_TOOLTIP_HELP "Pomoc"
+  IDS_TOOLTIP_EXIT "Zako<6B>cz"
 END
 
 STRINGTABLE DISCARDABLE
@@ -218,13 +220,13 @@ BEGIN
   IDS_PROGRESS_INFO_START "ReactOS usi<73>uje uruchomi<6D> nast<73>puj<75>c<EFBFBD> us<75>ug<75>"
   IDS_PROGRESS_INFO_STOP  "ReactOS usi<73>uje zatrzyma<6D> nast<73>puj<75>c<EFBFBD> us<75>ug<75>"
   IDS_CREATE_SUCCESS "Us<55>uga utworzona pomy<6D>lnie"
-  IDS_CREATE_REQ "Pola oznaczone gwiazdkami\ns<6E> obowi<77>zkowe"
+  IDS_CREATE_REQ "Pole zaznaczone wraz z \ nasterix jest obowi<77>zkowy"
   IDS_DELETE_STOP "Musisz r<>cznie zatrzyma<6D> us<75>ug<75> przed usuwaniem!"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_HELP_OPTIONS "OPCJE TWORZENIA:\r\nUWAGA: Nazwa opcji zawiera znak r<>wno<6E>ci.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n"
+  IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: Nazwa opcji zawiera znak r<>wno<6E>ci.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n"
 END
 #define IDS_HINT_BLANK          20000
 #define IDS_HINT_EXPORT         20001
@@ -254,10 +256,10 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_HINT_BLANK        " "
-  IDS_HINT_EXPORT       " Eksportuj aktualn<6C> list<73> do pliku."
-  IDS_HINT_EXIT         " Wyjd<EFBFBD> z programu."
+  IDS_HINT_EXPORT       " Eksportowa<EFBFBD> aktualn<6C> list<73> do pliku."
+  IDS_HINT_EXIT         " Wyj<EFBFBD><EFBFBD> z programu."
 
-  IDS_HINT_CONNECT      " Zarz<72>dzaj r<><72>nymi komputerami."
+  IDS_HINT_CONNECT      " Zarz<72>dza<EFBFBD> r<><72>nymi komputerami."
   IDS_HINT_START        " Uruchom wybran<61> us<75>ug<75>."
   IDS_HINT_STOP         " Zatrzymaj wybran<61> us<75>ug<75>."
   IDS_HINT_PAUSE        " Wstrzymaj wybran<61> us<75>ug<75>."
@@ -265,13 +267,13 @@ BEGIN
   IDS_HINT_RESTART      " Zatrzymaj i uruchom wybran<61> us<75>ug<75>."
   IDS_HINT_REFRESH      " Od<4F>wie<69> list<73> us<75>ug."
   IDS_HINT_EDIT         " Edytuj w<>a<EFBFBD>ciwo<77>ci wybranej us<75>ugi."
-  IDS_HINT_CREATE       " Utw<74>rz now<6F> us<75>ug<75>."
+  IDS_HINT_CREATE       " Utw<74>rz now<6F> us<75>ug<75>"
   IDS_HINT_DELETE       " Usu<73> wybran<61> us<75>ug<75>."
   IDS_HINT_PROP         " Otwarty wykaz w<>a<EFBFBD>ciwo<77>ci dla aktualnej selekcji."
 
-  IDS_HINT_LARGE        " Poka<6B> elementy przy u<>yciu du<64>ych ikon."
-  IDS_HINT_SMALL        " Poka<6B> elementy przy u<>yciu ma<6D>ych ikon."
-  IDS_HINT_LIST         " Poka<6B> elementy w postaci listy."
+  IDS_HINT_LARGE        " Poka<6B> elementy przy u<>ywaniu du<64>ych ikon."
+  IDS_HINT_SMALL        " Poka<6B> elementy przy u<>ywaniu ma<6D>ych ikon."
+  IDS_HINT_LIST         " Poka<6B> elementy w li<EFBFBD>cie."
   IDS_HINT_DETAILS      " Pokazuj informacje o ka<6B>dym elemencie w oknie."
   IDS_HINT_CUST         " Dostosuj widok."
 

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

@@ -21,7 +21,7 @@ BEGIN
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",    ID_REFRESH
     MENUITEM SEPARATOR
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_EDIT, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",  ID_CREATE, GRAYED
+    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",  ID_CREATE
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",  ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_PROP, GRAYED
@@ -67,13 +67,13 @@ CAPTION "
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> v0.8\nCopyright (C) 2005-2007\n<><6E> Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 30
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> v0.5\nCopyright (C) 2005-2006\n<><6E> Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 30
   PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDOK, 75, 162, 44, 15
   ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-IDD_DLG_GENERAL DIALOGEX 6,6,253,232
+IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
@@ -97,7 +97,6 @@ BEGIN
   LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><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> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",IDC_STATIC, 6,177,240,15
   LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 200, 73, 11
   EDITTEXT IDC_START_PARAM, 78, 199, 168, 11, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
@@ -143,7 +142,7 @@ BEGIN
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
   PUSHBUTTON "<22><>", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "<22><><EFBFBD>", IDCANCEL, 102, 129, 54, 13
+  PUSHBUTTON "<22><><EFBFBD>", IDCANCEL, 102, 129, 54, 13
 END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
@@ -204,16 +203,15 @@ BEGIN
   IDS_TOOLTIP_STOP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_TOOLTIP_PAUSE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_TOOLTIP_RESTART "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  IDS_TOOLTIP_HELP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  IDS_TOOLTIP_EXIT "<22><><EFBFBD><EFBFBD><EFBFBD>"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_PROGRESS_INFO_START "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_PROGRESS_INFO_STOP  "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS is attempting to pause the following service"
-  IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service"
   IDS_CREATE_SUCCESS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_DELETE_SUCCESS "Service Deleted Succesfully"
   IDS_CREATE_REQ "* = <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
   IDS_DELETE_STOP "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
 END
@@ -223,6 +221,31 @@ BEGIN
   IDS_HELP_OPTIONS "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\r\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> ""<22><><EFBFBD><EFBFBD><EFBFBD>"".\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> / (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>))>\r\n obj= <AccountName|ObjectName>\r\n       (<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = LocalSystem)\r\n password= <password>\r\n"
 END
 
+#define IDS_HINT_BLANK          20000
+#define IDS_HINT_EXPORT         20001
+#define IDS_HINT_EXIT           20002
+
+#define IDS_HINT_CONNECT        20011
+#define IDS_HINT_START          20012
+#define IDS_HINT_STOP           21013
+#define IDS_HINT_PAUSE          21014
+#define IDS_HINT_RESUME         20015
+#define IDS_HINT_RESTART        20016
+#define IDS_HINT_REFRESH        20017
+#define IDS_HINT_EDIT           20018
+#define IDS_HINT_CREATE         20019
+#define IDS_HINT_DELETE         20020
+#define IDS_HINT_PROP           20021
+
+#define IDS_HINT_LARGE          20030
+#define IDS_HINT_SMALL          20031
+#define IDS_HINT_LIST           20032
+#define IDS_HINT_DETAILS        20033
+#define IDS_HINT_CUST           20034
+
+#define IDS_HINT_HELP           20040
+#define IDS_HINT_ABOUT          20041
+
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN

reactos/base/applications/mscutils/servman/lang/th-TH.rc

@@ -3,7 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/applications/mscutils/servman/lang/th-TH.rc
  * PURPOSE:     Thai resources
- * TRANSLATOR:  Sumath Aowsakulsutthi
+ * COPYRIGHT:   Copyright 2007 Sumath Aowsakulsutthi
  *
  */
 
@@ -30,7 +30,7 @@ BEGIN
     MENUITEM "<22><>鹿<EFBFBD>",            ID_REFRESH
     MENUITEM SEPARATOR
     MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>...",          ID_EDIT, GRAYED
-    MENUITEM "<22><><EFBFBD>ҧ...",          ID_CREATE, GRAYED
+    MENUITEM "<22><><EFBFBD>ҧ...",          ID_CREATE
     MENUITEM "ź...",             ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "<22>س<EFBFBD><D8B3><EFBFBD>ѵ<EFBFBD>...",      ID_PROP, GRAYED
@@ -77,13 +77,13 @@ CAPTION "
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ú<EFBFBD>ԡ<EFBFBD>èѴ<C3A8><D1B4><EFBFBD> <20><><EFBFBD><EFBFBD> 0.8\n<>Ԣ<EFBFBD>Է<EFBFBD><D4B7><EFBFBD> (C) 2005-2007\n<><6E><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ú<EFBFBD>ԡ<EFBFBD>èѴ<C3A8><D1B4><EFBFBD> <20><><EFBFBD><EFBFBD> 0.5.1\n<>Ԣ<EFBFBD>Է<EFBFBD><D4B7><EFBFBD> (C) 2005-2006\n<><6E><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
   PUSHBUTTON "<22>Դ", IDOK, 75, 162, 44, 15
   ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-IDD_DLG_GENERAL DIALOGEX 6,6,253,232
+IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 FONT 8, "MS Shell Dlg",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
@@ -107,7 +107,6 @@ BEGIN
   LTEXT "<22>س<EFBFBD><D8B3><EFBFBD><EFBFBD>ö<EFBFBD><C3B6>˹<EFBFBD><CBB9><EFBFBD>ҵ<EFBFBD><D2B5><EFBFBD><EFBFBD>õ<EFBFBD>ҧ<EFBFBD>㹵͹<E3B9B5><CDB9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>鹡<EFBFBD><E9B9A1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ҹ <20><><EFBFBD><EFBFBD>ͤس<CDA4><D8B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ԡ<EFBFBD>÷<EFBFBD><C3B7><EFBFBD>ç<EFBFBD><C3A7><EFBFBD>.",IDC_STATIC, 6,177,240,15
   LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>鹤<EFBFBD>ҵ<EFBFBD><D2B5><EFBFBD><EFBFBD>õ<EFBFBD>ҧ<EFBFBD>:", IDC_STATIC, 6, 200, 58, 11
   EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
 END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
@@ -153,7 +152,7 @@ BEGIN
   LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
   EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
   PUSHBUTTON "<22><><EFBFBD>", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 102, 129, 54, 13
+  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 102, 129, 54, 13
 END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
@@ -214,16 +213,15 @@ BEGIN
   IDS_TOOLTIP_STOP "Stop service"
   IDS_TOOLTIP_PAUSE "Pause service"
   IDS_TOOLTIP_RESTART "Restart service"
+  IDS_TOOLTIP_HELP "Help"
+  IDS_TOOLTIP_EXIT "Exit"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
   IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service"
   IDS_PROGRESS_INFO_STOP  "ReactOS is attempting to stop the following service"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS is attempting to pause the following service"
-  IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service"
   IDS_CREATE_SUCCESS "Service Created Succesfully"
-  IDS_DELETE_SUCCESS "Service Deleted Succesfully"
   IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory"
   IDS_DELETE_STOP "You must manually stop the service before deleting!"
 END
@@ -232,7 +230,30 @@ STRINGTABLE DISCARDABLE
 BEGIN
   IDS_HELP_OPTIONS "CREATE OPTIONS:\r\nNOTE: The option name includes the equal sign.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n"
 END
+#define IDS_HINT_BLANK          20000
+#define IDS_HINT_EXPORT         20001
+#define IDS_HINT_EXIT           20002
 
+#define IDS_HINT_CONNECT        20011
+#define IDS_HINT_START          20012
+#define IDS_HINT_STOP           21013
+#define IDS_HINT_PAUSE          21014
+#define IDS_HINT_RESUME         20015
+#define IDS_HINT_RESTART        20016
+#define IDS_HINT_REFRESH        20017
+#define IDS_HINT_EDIT           20018
+#define IDS_HINT_CREATE         20019
+#define IDS_HINT_DELETE         20020
+#define IDS_HINT_PROP           20021
+
+#define IDS_HINT_LARGE          20030
+#define IDS_HINT_SMALL          20031
+#define IDS_HINT_LIST           20032
+#define IDS_HINT_DETAILS        20033
+#define IDS_HINT_CUST           20034
+
+#define IDS_HINT_HELP           20040
+#define IDS_HINT_ABOUT          20041
 /* Hints */
 STRINGTABLE DISCARDABLE
 BEGIN

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

@@ -1,275 +0,0 @@
-/*
- * PROJECT:     ReactOS Device Management
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for devmgmt
- * TRANSLATOR:  Artem Reznikov
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-IDR_MAINMENU MENU
-BEGIN
-  POPUP "&<26><><EFBFBD><EFBFBD>"
-  BEGIN
-    MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_EXPORT
-    MENUITEM SEPARATOR
-    MENUITEM "<22>&<26><><EFBFBD><EFBFBD>",      ID_EXIT
-  END
-  POPUP "ij<>"
-  BEGIN
-    MENUITEM "<22>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>...", ID_CONNECT, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      ID_START, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",    ID_STOP, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",       ID_PAUSE, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  ID_RESUME, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  ID_RESTART, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     ID_REFRESH
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",   ID_EDIT, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_CREATE, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_DELETE, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_PROP, GRAYED
-  END
-  POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  BEGIN
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", ID_VIEW_LARGE
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", ID_VIEW_SMALL
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      ID_VIEW_LIST
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   ID_VIEW_DETAILS
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",ID_VIEW_CUST, GRAYED
-  END
-  POPUP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  BEGIN
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     ID_HELP
-    MENUITEM "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       ID_ABOUT
-  END
-END
-
-IDR_POPUP MENU
-BEGIN
-  POPUP "popup"
-  BEGIN
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      ID_START, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   ID_STOP, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>",       ID_PAUSE, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  ID_RESUME, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  ID_RESTART, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     ID_REFRESH
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",   ID_EDIT, GRAYED
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_DELETE, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", ID_PROP, GRAYED
-    MENUITEM SEPARATOR
-    MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",  ID_HELP
-  END
-END
-
-IDD_ABOUTBOX DIALOGEX 22,16,190,182
-CAPTION "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ""<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"""
-FONT 8, "MS Shell Dlg",0,0
-STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-BEGIN
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> v0.8\nCopyright (C) 2005-2007\nby Ged Murphy (gedmurphy@reactos.org)", IDC_STATIC, 48, 7, 130, 26
-  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDOK, 75, 162, 44, 15
-  ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30
-  EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
-END
-
-IDD_DLG_GENERAL DIALOGEX 6, 6, 253, 232
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
-STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
-BEGIN
-  LTEXT "", IDC_SERV_NAME, 70,11,176,11, WS_CHILD | WS_VISIBLE
-  EDITTEXT IDC_DISP_NAME, 70, 29, 176, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY
-  EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY
-  EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY
-  COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
-  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_START, 6, 155, 54, 15, WS_DISABLED
-  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_STOP, 68, 155, 54, 15, WS_DISABLED
-  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED
-  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED
-  LTEXT "<22><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 4, 11, 53, 11
-  LTEXT "<22><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 4, 29, 53, 11
-  LTEXT "<22><><EFBFBD><EFBFBD>:", IDC_STATIC, 4, 51, 53, 11
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 73, 82, 9
-  LTEXT "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 108, 53, 11
-  LTEXT "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 4, 138, 53, 11
-  LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE
-  LTEXT "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.",IDC_STATIC, 6,177,240,15
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", IDC_STATIC, 6, 200, 58, 11
-  EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
-END
-
-IDD_DLG_DEPEND DIALOGEX 6,6,253,225
-CAPTION "Dependencies"
-FONT 8, "MS Shell Dlg",0,0
-STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
-BEGIN
-  CONTROL "", IDC_DEPEND_TREE1, "SysTreeView32" ,0x50010007, 8, 70, 236, 68, 0x00000200
-  CONTROL "", IDC_DEPEND_TREE2, "SysTreeView32", 0x50010007, 8, 151, 234, 67, 0x00000200
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.", IDC_STATIC,8, 7, 238, 26
-  LTEXT "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_STATIC, 8, 57, 236, 9
-  LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13
-END
-
-IDD_DLG_CREATE DIALOGEX 6,6,225,209
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
-STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
-BEGIN
-  EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE
-  EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE
-  EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE
-  EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE
-  EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE
-  LTEXT "*<2A><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> :", IDC_STATIC, 12, 12, 54, 9
-  LTEXT "*<2A><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> :", IDC_STATIC, 12, 33, 54, 9
-  LTEXT "*<2A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> :", IDC_STATIC, 10, 51, 68, 9
-  LTEXT "<22><><EFBFBD><EFBFBD> :", IDC_STATIC, 12, 86, 44, 9
-  PUSHBUTTON "OK", IDOK, 126, 192, 44, 13
-  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 176, 192, 46, 13
-  LTEXT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ""<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"" <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)", IDC_STATIC, 10, 151, 134, 9
-  PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", ID_CREATE_HELP, 6, 192, 44, 13
-END
-
-IDD_DLG_DELETE DIALOGEX 6,6,185,148
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
-STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME
-BEGIN
-  ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22
-  LTEXT "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>? <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!", IDC_STATIC, 50, 6, 125, 25
-  LTEXT "<22><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC, 6, 40, 80, 9
-  LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
-  EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
-  PUSHBUTTON "<22><><EFBFBD>", IDOK, 26, 129, 54, 13
-  DEFPUSHBUTTON "ͳ", IDCANCEL, 102, 129, 54, 13
-END
-
-IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
-STYLE 0x10CF0000
-BEGIN
-  LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150
-  PUSHBUTTON "Ok", IDOK, 75, 130, 44, 13
-END
-
-IDD_DLG_PROGRESS DIALOGEX 6,6,255,89
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
-STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
-EXSTYLE WS_EX_TOOLWINDOW
-BEGIN
-  CONTROL "", IDC_SERVCON_PROGRESS, "msctls_progress32", 0x50000000, 8, 46, 238, 13
-  LTEXT "", IDC_SERVCON_INFO, 8, 5, 236, 11
-  LTEXT "", IDC_SERVCON_NAME, 8, 25, 66, 11
-  PUSHBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDOK, 100, 70, 54, 13
-END
-
-
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_FIRSTCOLUMN "<22><>'<27>"
-  IDS_SECONDCOLUMN "<22><><EFBFBD><EFBFBD>"
-  IDS_THIRDCOLUMN "<22><><EFBFBD><EFBFBD>"
-  IDS_FOURTHCOLUMN "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_FITHCOLUMN "<22><><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_SERVICES_STARTED "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_SERVICES_STOPPED "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_SERVICES_AUTO "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_SERVICES_MAN "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_SERVICES_DIS "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_NUM_SERVICES "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %d"
-  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."
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_TOOLTIP_PROP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_REFRESH "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_EXPORT "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_CREATE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_DELETE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_START "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_STOP "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_PAUSE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_RESTART "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_PROGRESS_INFO_START  "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_PROGRESS_INFO_STOP   "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_PROGRESS_INFO_PAUSE  "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_PROGRESS_INFO_RESUME "ReactOS <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_CREATE_SUCCESS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_DELETE_SUCCESS "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_CREATE_REQ "<22><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n<> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_DELETE_STOP "<22><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_HELP_OPTIONS "<22><>ֲ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\r\n<><6E><EFBFBD>̲<EFBFBD><CCB2><EFBFBD>: <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\r\n type= <own|share|interact|kernel|filesys|rec>\r\n       (default = own)\r\n start= <boot|system|auto|demand|disabled>\r\n       (default = demand) \r\n error= <normal|severe|critical|ignore>\r\n       (default = normal)\r\n group= <LoadOrderGroup>\r\n tag= <yes|no>\r\n depend= <Dependencies(separated by / (forward slash))>\r\n obj= <AccountName|ObjectName>\r\n       (default = LocalSystem)\r\n password= <password>\r\n"
-END
-
-/* Hints */
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_HINT_BLANK        " "
-  IDS_HINT_EXPORT       " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD>."
-  IDS_HINT_EXIT         " <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-
-  IDS_HINT_CONNECT      " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_START        " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_STOP         " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_PAUSE        " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_RESUME       " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_RESTART      " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_REFRESH      " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_EDIT         " <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_CREATE       " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_DELETE       " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_PROP         " ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-
-  IDS_HINT_LARGE        " <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SMALL        " <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_LIST         " <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_DETAILS      " <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_CUST         " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-
-  IDS_HINT_HELP         " ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_ABOUT        " <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS."
-
-  IDS_HINT_SYS_RESTORE  " ³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_MOVE     " <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_SIZE     " <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_MINIMIZE " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_MAXIMIZE " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_CLOSE    " <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
-END
-
-/* Application title */
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_APPNAME "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS"
-END

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

@@ -1,505 +0,0 @@
-/*
- * PROJECT:     ReactOS Services
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/listview.c
- * PURPOSE:     service listview manipulation functions
- * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
- *
- */
-
-#include "precomp.h"
-
-
-VOID
-SetListViewStyle(HWND hListView,
-                 DWORD View)
-{
-    DWORD Style = GetWindowLong(hListView, GWL_STYLE);
-
-    if ((Style & LVS_TYPEMASK) != View)
-    {
-        SetWindowLong(hListView,
-                      GWL_STYLE,
-                      (Style & ~LVS_TYPEMASK) | View);
-    }
-}
-
-
-VOID
-ListViewSelectionChanged(PMAIN_WND_INFO Info,
-                         LPNMLISTVIEW pnmv)
-{
-    HMENU hMainMenu;
-
-    /* get handle to menu */
-    hMainMenu = GetMenu(Info->hMainWnd);
-
-    /* activate properties menu item, if not already */
-    if (GetMenuState(hMainMenu,
-                     ID_PROP,
-                     MF_BYCOMMAND) != MF_ENABLED)
-    {
-        EnableMenuItem(hMainMenu,
-                       ID_PROP,
-                       MF_ENABLED);
-        EnableMenuItem(Info->hShortcutMenu,
-                       ID_PROP,
-                       MF_ENABLED);
-        SetMenuDefaultItem(Info->hShortcutMenu,
-                           ID_PROP,
-                           MF_BYCOMMAND);
-    }
-
-    /* activate delete menu item, if not already */
-    if (GetMenuState(hMainMenu,
-                     ID_DELETE,
-                     MF_BYCOMMAND) != MF_ENABLED)
-    {
-        EnableMenuItem(hMainMenu,
-                       ID_DELETE,
-                       MF_ENABLED);
-        EnableMenuItem(Info->hShortcutMenu,
-                       ID_DELETE,
-                       MF_ENABLED);
-    }
-
-    /* set selected service */
-    Info->SelectedItem = pnmv->iItem;
-
-    /* get pointer to selected service */
-    Info->pCurrentService = GetSelectedService(Info);
-
-    /* set current selected service in the status bar */
-    SendMessage(Info->hStatus,
-                SB_SETTEXT,
-                1,
-                (LPARAM)Info->pCurrentService->lpDisplayName);
-
-    /* show the properties button */
-    SendMessage(Info->hTool,
-                TB_SETSTATE,
-                ID_PROP,
-                (LPARAM)MAKELONG(TBSTATE_ENABLED, 0));
-}
-
-
-VOID
-ChangeListViewText(PMAIN_WND_INFO Info,
-                   ENUM_SERVICE_STATUS_PROCESS* pService,
-                   UINT Column)
-{
-    LVFINDINFO lvfi;
-    LVITEM lvItem;
-    INT index;
-
-    lvfi.flags = LVFI_PARAM;
-    lvfi.lParam = (LPARAM)pService;
-    index = ListView_FindItem(Info->hListView,
-                              -1,
-                              &lvfi);
-    if (index != -1)
-    {
-        lvItem.iItem = index;
-        lvItem.iSubItem = Column;
-
-        switch (Column)
-        {
-            case LVNAME:
-            {
-                LPQUERY_SERVICE_CONFIG lpServiceConfig;
-
-                lpServiceConfig = GetServiceConfig(pService->lpServiceName);
-                if (lpServiceConfig)
-                {
-                    lvItem.pszText = lpServiceConfig->lpDisplayName;
-                    SendMessage(Info->hListView,
-                                LVM_SETITEMTEXT,
-                                lvItem.iItem,
-                                (LPARAM)&lvItem);
-
-                    HeapFree(ProcessHeap,
-                             0,
-                             lpServiceConfig);
-                }
-            }
-            break;
-
-            case LVDESC:
-            {
-                LPTSTR lpDescription;
-
-                lpDescription = GetServiceDescription(pService->lpServiceName);
-
-                lvItem.pszText = lpDescription;
-                SendMessage(Info->hListView,
-                            LVM_SETITEMTEXT,
-                            lvItem.iItem,
-                            (LPARAM) &lvItem);
-
-                HeapFree(ProcessHeap,
-                         0,
-                         lpDescription);
-            }
-            break;
-
-            case LVSTATUS:
-            {
-                TCHAR szStatus[64];
-
-                if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING)
-                {
-                    LoadString(hInstance,
-                               IDS_SERVICES_STARTED,
-                               szStatus,
-                               sizeof(szStatus) / sizeof(TCHAR));
-                }
-                else
-                {
-                    szStatus[0] = 0;
-                }
-
-                lvItem.pszText = szStatus;
-                SendMessage(Info->hListView,
-                            LVM_SETITEMTEXT,
-                            lvItem.iItem,
-                            (LPARAM) &lvItem);
-            }
-            break;
-
-            case LVSTARTUP:
-            {
-                LPQUERY_SERVICE_CONFIG lpServiceConfig;
-                LPTSTR lpStartup = NULL;
-                DWORD StringId = 0;
-
-                lpServiceConfig = GetServiceConfig(pService->lpServiceName);
-
-                switch (lpServiceConfig->dwStartType)
-                {
-                    case 2: StringId = IDS_SERVICES_AUTO; break;
-                    case 3: StringId = IDS_SERVICES_MAN; break;
-                    case 4: StringId = IDS_SERVICES_DIS; break;
-                }
-
-                if (StringId)
-                    AllocAndLoadString(&lpStartup,
-                                       hInstance,
-                                       StringId);
-
-                lvItem.pszText = lpStartup;
-                SendMessage(Info->hListView,
-                            LVM_SETITEMTEXT,
-                            lvItem.iItem,
-                            (LPARAM)&lvItem);
-
-                HeapFree(ProcessHeap,
-                         0,
-                         lpStartup);
-                HeapFree(ProcessHeap,
-                         0,
-                         lpServiceConfig);
-            }
-            break;
-
-            case LVLOGONAS:
-            {
-                LPQUERY_SERVICE_CONFIG lpServiceConfig;
-
-                lpServiceConfig = GetServiceConfig(pService->lpServiceName);
-                if (lpServiceConfig)
-                {
-                    lvItem.pszText = lpServiceConfig->lpServiceStartName;
-                    SendMessage(Info->hListView,
-                                LVM_SETITEMTEXT,
-                                lvItem.iItem,
-                                (LPARAM)&lvItem);
-
-                    HeapFree(ProcessHeap,
-                             0,
-                             lpServiceConfig);
-                }
-            }
-            break;
-        }
-    }
-}
-
-
-BOOL
-RefreshServiceList(PMAIN_WND_INFO Info)
-{
-    ENUM_SERVICE_STATUS_PROCESS *pService;
-    LPTSTR lpDescription;
-    LVITEM lvItem;
-    TCHAR szStatus[64];
-    DWORD NumServices;
-    DWORD Index;
-
-    (void)ListView_DeleteAllItems(Info->hListView);
-
-    if (GetServiceList(Info, &NumServices))
-    {
-        for (Index = 0; Index < NumServices; Index++)
-        {
-            LPQUERY_SERVICE_CONFIG pServiceConfig;
-
-            pService = &Info->pAllServices[Index];
-
-            /* set the display name */
-            ZeroMemory(&lvItem, sizeof(LVITEM));
-            lvItem.mask = LVIF_TEXT | LVIF_PARAM;
-            lvItem.pszText = pService->lpDisplayName;
-
-            /* Add the service pointer */
-            lvItem.lParam = (LPARAM)pService;
-
-            /* add it to the listview */
-            lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem);
-
-            /* set the description */
-            if ((lpDescription = GetServiceDescription(pService->lpServiceName)))
-            {
-                lvItem.pszText = lpDescription;
-                lvItem.iSubItem = LVDESC;
-                SendMessage(Info->hListView,
-                            LVM_SETITEMTEXT,
-                            lvItem.iItem,
-                            (LPARAM)&lvItem);
-
-                HeapFree(ProcessHeap,
-                         0,
-                         lpDescription);
-            }
-
-            /* set the status */
-            if (pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING)
-            {
-                LoadString(hInstance,
-                           IDS_SERVICES_STARTED,
-                           szStatus,
-                           sizeof(szStatus) / sizeof(TCHAR));
-                lvItem.pszText = szStatus;
-                lvItem.iSubItem = LVSTATUS;
-                SendMessage(Info->hListView,
-                            LVM_SETITEMTEXT,
-                            lvItem.iItem,
-                            (LPARAM)&lvItem);
-            }
-
-            pServiceConfig = GetServiceConfig(pService->lpServiceName);
-            if (pServiceConfig)
-            {
-                DWORD StringId = 0;
-                LPTSTR lpStartup;
-
-                /* set the startup type */
-                switch (pServiceConfig->dwStartType)
-                {
-                    case 2: StringId = IDS_SERVICES_AUTO; break;
-                    case 3: StringId = IDS_SERVICES_MAN; break;
-                    case 4: StringId = IDS_SERVICES_DIS; break;
-                }
-
-                if (StringId)
-                    AllocAndLoadString(&lpStartup,
-                                       hInstance,
-                                       StringId);
-
-                lvItem.pszText = lpStartup;
-                lvItem.iSubItem = LVSTARTUP;
-                SendMessage(Info->hListView,
-                            LVM_SETITEMTEXT,
-                            lvItem.iItem,
-                            (LPARAM)&lvItem);
-
-                HeapFree(ProcessHeap,
-                         0,
-                         lpStartup);
-
-                /* set Log On As */
-                lvItem.pszText = pServiceConfig->lpServiceStartName;
-                lvItem.iSubItem = LVLOGONAS;
-                SendMessage(Info->hListView,
-                            LVM_SETITEMTEXT,
-                            lvItem.iItem,
-                            (LPARAM)&lvItem);
-
-                HeapFree(ProcessHeap,
-                         0,
-                         pServiceConfig);
-            }
-        }
-
-        UpdateServiceCount(Info);
-    }
-
-    /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */
-    SendMessage (Info->hListView,
-                 WM_SETREDRAW,
-                 TRUE,
-                 0);
-
-    return TRUE;
-}
-
-
-static VOID
-InitListViewImage(PMAIN_WND_INFO Info)
-{
-    HICON hSmIconItem, hLgIconItem;
-    HIMAGELIST hSmall, hLarge;
-
-    hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON),
-                              GetSystemMetrics(SM_CYSMICON),
-                              ILC_MASK | ILC_COLOR32,
-                              1,
-                              1);
-    if (hSmall)
-    {
-        hSmIconItem = LoadImage(hInstance,
-                                MAKEINTRESOURCE(IDI_SM_ICON),
-                                IMAGE_ICON,
-                                16,
-                                16,
-                                0);
-        if (hSmIconItem)
-        {
-            ImageList_AddIcon(hSmall,
-                              hSmIconItem);
-            (void)ListView_SetImageList(Info->hListView,
-                                        hSmall,
-                                        LVSIL_SMALL);
-
-            DestroyIcon(hSmIconItem);
-        }
-    }
-
-    hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON),
-                              GetSystemMetrics(SM_CYICON),
-                              ILC_MASK | ILC_COLOR32,
-                              1,
-                              1);
-    if (hLarge)
-    {
-        hLgIconItem = LoadImage(hInstance,
-                                MAKEINTRESOURCE(IDI_SM_ICON),
-                                IMAGE_ICON,
-                                32,
-                                32,
-                                0);
-        if (hLgIconItem)
-        {
-            ImageList_AddIcon(hLarge,
-                              hLgIconItem);
-            (void)ListView_SetImageList(Info->hListView,
-                                        hLarge,
-                                        LVSIL_NORMAL);
-            DestroyIcon(hLgIconItem);
-        }
-    }
-}
-
-
-BOOL
-CreateListView(PMAIN_WND_INFO Info)
-{
-    LVCOLUMN lvc = { 0 };
-    TCHAR szTemp[256];
-
-    Info->hListView = CreateWindowEx(WS_EX_CLIENTEDGE,
-                                     WC_LISTVIEW,
-                                     NULL,
-                                     WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER |
-                                        LBS_NOTIFY | LVS_SORTASCENDING | LBS_NOREDRAW,
-                                     0, 0, 0, 0,
-                                     Info->hMainWnd,
-                                     (HMENU) IDC_SERVLIST,
-                                     hInstance,
-                                     NULL);
-    if (Info->hListView == NULL)
-    {
-        MessageBox(Info->hMainWnd,
-                   _T("Could not create List View."),
-                   _T("Error"),
-                   MB_OK | MB_ICONERROR);
-        return FALSE;
-    }
-
-    (void)ListView_SetExtendedListViewStyle(Info->hListView,
-                                            LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);/*LVS_EX_GRIDLINES |*/
-
-    lvc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH  | LVCF_FMT;
-    lvc.fmt  = LVCFMT_LEFT;
-
-    /* Add columns to the list-view */
-    /* name */
-    lvc.iSubItem = LVNAME;
-    lvc.cx       = 150;
-    LoadString(hInstance,
-               IDS_FIRSTCOLUMN,
-               szTemp,
-               sizeof(szTemp) / sizeof(TCHAR));
-    lvc.pszText  = szTemp;
-    (void)ListView_InsertColumn(Info->hListView,
-                                0,
-                                &lvc);
-
-    /* description */
-    lvc.iSubItem = LVDESC;
-    lvc.cx       = 240;
-    LoadString(hInstance,
-               IDS_SECONDCOLUMN,
-               szTemp,
-               sizeof(szTemp) / sizeof(TCHAR));
-    lvc.pszText  = szTemp;
-    (void)ListView_InsertColumn(Info->hListView,
-                                1,
-                                &lvc);
-
-    /* status */
-    lvc.iSubItem = LVSTATUS;
-    lvc.cx       = 55;
-    LoadString(hInstance,
-               IDS_THIRDCOLUMN,
-               szTemp,
-               sizeof(szTemp) / sizeof(TCHAR));
-    lvc.pszText  = szTemp;
-    (void)ListView_InsertColumn(Info->hListView,
-                                2,
-                                &lvc);
-
-    /* startup type */
-    lvc.iSubItem = LVSTARTUP;
-    lvc.cx       = 80;
-    LoadString(hInstance,
-               IDS_FOURTHCOLUMN,
-               szTemp,
-               sizeof(szTemp) / sizeof(TCHAR));
-    lvc.pszText  = szTemp;
-    (void)ListView_InsertColumn(Info->hListView,
-                                3,
-                                &lvc);
-
-    /* logon as */
-    lvc.iSubItem = LVLOGONAS;
-    lvc.cx       = 100;
-    LoadString(hInstance,
-               IDS_FITHCOLUMN,
-               szTemp,
-               sizeof(szTemp) / sizeof(TCHAR));
-    lvc.pszText  = szTemp;
-    (void)ListView_InsertColumn(Info->hListView,
-                                4,
-                                &lvc);
-
-    InitListViewImage(Info);
-
-    /* check the details view menu item */
-    CheckMenuRadioItem(GetMenu(Info->hMainWnd),
-                       ID_VIEW_LARGE,
-                       ID_VIEW_DETAILS,
-                       ID_VIEW_DETAILS,
-                       MF_BYCOMMAND);
-
-    return TRUE;
-}

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

@@ -1,9 +1,9 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/mainwnd.c
+ * FILE:        base/system/servman/mainwnd.c
  * PURPOSE:     Main window message handler
- * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2005 - 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
@@ -15,7 +15,7 @@ BOOL bSortAscending = TRUE;
 
 
 /* Toolbar buttons */
-static const TBBUTTON Buttons [] =
+TBBUTTON Buttons [NUM_BUTTONS] =
 {   /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */
     {TBICON_PROP,    ID_PROP,    TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0},    /* properties */
     {TBICON_REFRESH, ID_REFRESH, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0},          /* refresh */
@@ -24,7 +24,7 @@ static const TBBUTTON Buttons [] =
     /* Note: First item for a seperator is its width in pixels */
     {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},                                  /* separator */
 
-    {TBICON_CREATE,  ID_CREATE,  TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 },         /* create */
+    {TBICON_CREATE,  ID_CREATE,  TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 },         /* create */
     {TBICON_DELETE,  ID_DELETE,  TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 },   /* delete */
 
     {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},                                  /* separator */
@@ -33,6 +33,12 @@ static const TBBUTTON Buttons [] =
     {TBICON_STOP,    ID_STOP,    TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 },   /* stop */
     {TBICON_PAUSE,   ID_PAUSE,   TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 },   /* pause */
     {TBICON_RESTART, ID_RESTART, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 },   /* restart */
+
+    {15, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},                                  /* separator */
+
+    {TBICON_HELP,    ID_HELP,    TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 },         /* help */
+    {TBICON_EXIT,    ID_EXIT,   TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 },          /* exit */
+
 };
 
 
@@ -116,37 +122,23 @@ UpdateMainStatusBar(PMAIN_WND_INFO Info)
     {
         SendMessage(Info->hStatus,
                     SB_SIMPLE,
-                    (WPARAM)Info->bInMenuLoop,
+                    (WPARAM)Info->InMenuLoop,
                     0);
     }
 }
 
-VOID
-UpdateServiceCount(PMAIN_WND_INFO Info)
+
+static VOID
+SetListViewStyle(HWND hListView,
+                 DWORD View)
 {
-    LPTSTR lpNumServices;
+    DWORD Style = GetWindowLong(hListView, GWL_STYLE);
 
-    if (AllocAndLoadString(&lpNumServices,
-                           hInstance,
-                           IDS_NUM_SERVICES))
+    if ((Style & LVS_TYPEMASK) != View)
     {
-        TCHAR szNumServices[32];
-
-        INT NumListedServ = ListView_GetItemCount(Info->hListView);
-
-        _sntprintf(szNumServices,
-                   31,
-                   lpNumServices,
-                   NumListedServ);
-
-        SendMessage(Info->hStatus,
-                    SB_SETTEXT,
-                    0,
-                    (LPARAM)szNumServices);
-
-        HeapFree(ProcessHeap,
-                 0,
-                 lpNumServices);
+        SetWindowLong(hListView,
+                      GWL_STYLE,
+                      (Style & ~LVS_TYPEMASK) | View);
     }
 }
 
@@ -155,33 +147,42 @@ VOID SetMenuAndButtonStates(PMAIN_WND_INFO Info)
 {
     HMENU hMainMenu;
     DWORD Flags, State;
-    UINT i;
 
     /* get handle to menu */
     hMainMenu = GetMenu(Info->hMainWnd);
 
     /* set all to greyed */
-    for (i = ID_START; i <= ID_RESTART; i++)
-    {
-        EnableMenuItem(hMainMenu, i, MF_GRAYED);
-        EnableMenuItem(Info->hShortcutMenu, ID_START, MF_GRAYED);
-        SendMessage(Info->hTool, TB_SETSTATE, i,
-                    (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0));
-    }
+    EnableMenuItem(hMainMenu, ID_START, MF_GRAYED);
+    EnableMenuItem(hMainMenu, ID_STOP, MF_GRAYED);
+    EnableMenuItem(hMainMenu, ID_PAUSE, MF_GRAYED);
+    EnableMenuItem(hMainMenu, ID_RESUME, MF_GRAYED);
+    EnableMenuItem(hMainMenu, ID_RESTART, MF_GRAYED);
+
+    EnableMenuItem(Info->hShortcutMenu, ID_START, MF_GRAYED);
+    EnableMenuItem(Info->hShortcutMenu, ID_STOP, MF_GRAYED);
+    EnableMenuItem(Info->hShortcutMenu, ID_PAUSE, MF_GRAYED);
+    EnableMenuItem(Info->hShortcutMenu, ID_RESUME, MF_GRAYED);
+    EnableMenuItem(Info->hShortcutMenu, ID_RESTART, MF_GRAYED);
+
+    SendMessage(Info->hTool, TB_SETSTATE, ID_START,
+                   (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0));
+    SendMessage(Info->hTool, TB_SETSTATE, ID_STOP,
+                   (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0));
+    SendMessage(Info->hTool, TB_SETSTATE, ID_PAUSE,
+                   (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0));
+    SendMessage(Info->hTool, TB_SETSTATE, ID_RESTART,
+                   (LPARAM)MAKELONG(TBSTATE_INDETERMINATE, 0));
 
     if (Info->SelectedItem != NO_ITEM_SELECTED)
     {
         /* allow user to delete service */
-        if (Info->bIsUserAnAdmin)
-        {
-            SendMessage(Info->hTool, TB_SETSTATE, ID_DELETE,
-                       (LPARAM)MAKELONG(TBSTATE_ENABLED, 0));
-            EnableMenuItem(hMainMenu, ID_DELETE, MF_ENABLED);
-            EnableMenuItem(Info->hShortcutMenu, ID_DELETE, MF_ENABLED);
-        }
+        SendMessage(Info->hTool, TB_SETSTATE, ID_DELETE,
+                   (LPARAM)MAKELONG(TBSTATE_ENABLED, 0));
+        EnableMenuItem(hMainMenu, ID_DELETE, MF_ENABLED);
+        EnableMenuItem(Info->hShortcutMenu, ID_DELETE, MF_ENABLED);
 
-        Flags = Info->pCurrentService->ServiceStatusProcess.dwControlsAccepted;
-        State = Info->pCurrentService->ServiceStatusProcess.dwCurrentState;
+        Flags = Info->CurrentService->ServiceStatusProcess.dwControlsAccepted;
+        State = Info->CurrentService->ServiceStatusProcess.dwCurrentState;
 
         if (State == SERVICE_STOPPED)
         {
@@ -254,7 +255,7 @@ CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)
 static BOOL
 pCreateToolbar(PMAIN_WND_INFO Info)
 {
-    INT numButtons = sizeof(Buttons) / sizeof(Buttons[0]);
+    INT NumButtons = sizeof(Buttons) / sizeof(Buttons[0]);
 
     Info->hTool = CreateWindowEx(0,
                                  TOOLBARCLASSNAME,
@@ -280,7 +281,7 @@ pCreateToolbar(PMAIN_WND_INFO Info)
                     0);
 
         hImageList = InitImageList(IDB_PROP,
-                                   IDB_RESTART,
+                                   IDB_EXIT,
                                    16,
                                    16);
         if (hImageList == NULL)
@@ -293,7 +294,7 @@ pCreateToolbar(PMAIN_WND_INFO Info)
 
         SendMessage(Info->hTool,
                     TB_ADDBUTTONS,
-                    numButtons,
+                    NumButtons,
                     (LPARAM)Buttons);
 
         return TRUE;
@@ -302,6 +303,110 @@ pCreateToolbar(PMAIN_WND_INFO Info)
     return FALSE;
 }
 
+
+static BOOL
+CreateListView(PMAIN_WND_INFO Info)
+{
+    LVCOLUMN lvc = { 0 };
+    TCHAR szTemp[256];
+
+    Info->hListView = CreateWindowEx(WS_EX_CLIENTEDGE,
+                                     WC_LISTVIEW,
+                                     NULL,
+                                     WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER |
+                                        LBS_NOTIFY | LVS_SORTASCENDING | LBS_NOREDRAW,
+                                     0, 0, 0, 0,
+                                     Info->hMainWnd,
+                                     (HMENU) IDC_SERVLIST,
+                                     hInstance,
+                                     NULL);
+    if (Info->hListView == NULL)
+    {
+        MessageBox(Info->hMainWnd,
+                   _T("Could not create List View."),
+                   _T("Error"),
+                   MB_OK | MB_ICONERROR);
+        return FALSE;
+    }
+
+    (void)ListView_SetExtendedListViewStyle(Info->hListView,
+                                            LVS_EX_FULLROWSELECT | LVS_EX_HEADERDRAGDROP);/*LVS_EX_GRIDLINES |*/
+
+    lvc.mask = LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH  | LVCF_FMT;
+    lvc.fmt  = LVCFMT_LEFT;
+
+    /* Add columns to the list-view */
+
+    /* name */
+    lvc.iSubItem = 0;
+    lvc.cx       = 150;
+    LoadString(hInstance,
+               IDS_FIRSTCOLUMN,
+               szTemp,
+               sizeof(szTemp) / sizeof(TCHAR));
+    lvc.pszText  = szTemp;
+    (void)ListView_InsertColumn(Info->hListView,
+                                0,
+                                &lvc);
+
+    /* description */
+    lvc.iSubItem = 1;
+    lvc.cx       = 240;
+    LoadString(hInstance,
+               IDS_SECONDCOLUMN,
+               szTemp,
+               sizeof(szTemp) / sizeof(TCHAR));
+    lvc.pszText  = szTemp;
+    (void)ListView_InsertColumn(Info->hListView,
+                                1,
+                                &lvc);
+
+    /* status */
+    lvc.iSubItem = 2;
+    lvc.cx       = 55;
+    LoadString(hInstance,
+               IDS_THIRDCOLUMN,
+               szTemp,
+               sizeof(szTemp) / sizeof(TCHAR));
+    lvc.pszText  = szTemp;
+    (void)ListView_InsertColumn(Info->hListView,
+                                2,
+                                &lvc);
+
+    /* startup type */
+    lvc.iSubItem = 3;
+    lvc.cx       = 80;
+    LoadString(hInstance,
+               IDS_FOURTHCOLUMN,
+               szTemp,
+               sizeof(szTemp) / sizeof(TCHAR));
+    lvc.pszText  = szTemp;
+    (void)ListView_InsertColumn(Info->hListView,
+                                3,
+                                &lvc);
+
+    /* logon as */
+    lvc.iSubItem = 4;
+    lvc.cx       = 100;
+    LoadString(hInstance,
+               IDS_FITHCOLUMN,
+               szTemp,
+               sizeof(szTemp) / sizeof(TCHAR));
+    lvc.pszText  = szTemp;
+    (void)ListView_InsertColumn(Info->hListView,
+                                4,
+                                &lvc);
+
+    /* check the details view menu item */
+    CheckMenuRadioItem(GetMenu(Info->hMainWnd),
+                       ID_VIEW_LARGE,
+                       ID_VIEW_DETAILS,
+                       ID_VIEW_DETAILS,
+                       MF_BYCOMMAND);
+
+    return TRUE;
+}
+
 static BOOL
 CreateStatusBar(PMAIN_WND_INFO Info)
 {
@@ -319,6 +424,7 @@ CreateStatusBar(PMAIN_WND_INFO Info)
     if(Info->hStatus == NULL)
         return FALSE;
 
+
     SendMessage(Info->hStatus,
                 SB_SETPARTS,
                 sizeof(StatWidths) / sizeof(INT),
@@ -327,20 +433,78 @@ CreateStatusBar(PMAIN_WND_INFO Info)
     return TRUE;
 }
 
+static VOID
+ListViewSelectionChanged(PMAIN_WND_INFO Info,
+                         LPNMLISTVIEW pnmv)
+{
 
-static BOOL
+    HMENU hMainMenu;
+
+    /* get handle to menu */
+    hMainMenu = GetMenu(Info->hMainWnd);
+
+    /* activate properties menu item, if not already */
+    if (GetMenuState(hMainMenu,
+                     ID_PROP,
+                     MF_BYCOMMAND) != MF_ENABLED)
+    {
+        EnableMenuItem(hMainMenu,
+                       ID_PROP,
+                       MF_ENABLED);
+        EnableMenuItem(Info->hShortcutMenu,
+                       ID_PROP,
+                       MF_ENABLED);
+        SetMenuDefaultItem(Info->hShortcutMenu,
+                           ID_PROP,
+                           MF_BYCOMMAND);
+    }
+
+    /* activate delete menu item, if not already */
+    if (GetMenuState(hMainMenu,
+                     ID_DELETE,
+                     MF_BYCOMMAND) != MF_ENABLED)
+    {
+        EnableMenuItem(hMainMenu,
+                       ID_DELETE,
+                       MF_ENABLED);
+        EnableMenuItem(Info->hShortcutMenu,
+                       ID_DELETE,
+                       MF_ENABLED);
+    }
+
+    /* set selected service */
+    Info->SelectedItem = pnmv->iItem;
+
+    /* get pointer to selected service */
+    Info->CurrentService = GetSelectedService(Info);
+
+    /* alter options for the service */
+    SetMenuAndButtonStates(Info);
+
+    /* set current selected service in the status bar */
+    SendMessage(Info->hStatus,
+                SB_SETTEXT,
+                1,
+                (LPARAM)Info->CurrentService->lpDisplayName);
+
+    /* show the properties button */
+    SendMessage(Info->hTool,
+                TB_SETSTATE,
+                ID_PROP,
+                (LPARAM)MAKELONG(TBSTATE_ENABLED, 0));
+}
+
+
+static VOID
 InitMainWnd(PMAIN_WND_INFO Info)
 {
     if (!pCreateToolbar(Info))
-    {
         DisplayString(_T("error creating toolbar"));
-        return FALSE;
-    }
 
     if (!CreateListView(Info))
     {
         DisplayString(_T("error creating list view"));
-        return FALSE;
+        return;
     }
 
     if (!CreateStatusBar(Info))
@@ -351,28 +515,6 @@ InitMainWnd(PMAIN_WND_INFO Info)
                                    MAKEINTRESOURCE(IDR_POPUP));
     Info->hShortcutMenu = GetSubMenu(Info->hShortcutMenu,
                                      0);
-
-    Info->bIsUserAnAdmin = IsUserAnAdmin();
-    if (Info->bIsUserAnAdmin)
-    {
-        HMENU hMainMenu = GetMenu(Info->hMainWnd);
-
-        SendMessage(Info->hTool,
-                    TB_SETSTATE,
-                    ID_CREATE,
-                    (LPARAM)MAKELONG(TBSTATE_ENABLED, 0));
-        if (hMainMenu)
-        {
-            EnableMenuItem(hMainMenu,
-                           ID_CREATE,
-                           MF_ENABLED);
-        }
-        EnableMenuItem(Info->hShortcutMenu,
-                       ID_CREATE,
-                       MF_ENABLED);
-    }
-
-    return TRUE;
 }
 
 
@@ -389,9 +531,22 @@ MainWndCommand(PMAIN_WND_INFO Info,
         {
             if (Info->SelectedItem != NO_ITEM_SELECTED)
             {
-                Info->bDlgOpen = TRUE;
-                OpenPropSheet(Info);
-                Info->bDlgOpen = FALSE;
+                PPROP_DLG_INFO PropSheet;
+
+                PropSheet = (PROP_DLG_INFO*) HeapAlloc(ProcessHeap,
+                                      HEAP_ZERO_MEMORY,
+                                      sizeof(PROP_DLG_INFO));
+                if (PropSheet != NULL)
+                {
+                    Info->PropSheet = PropSheet;
+                    OpenPropSheet(Info);
+                }
+
+                HeapFree(ProcessHeap,
+                         0,
+                         PropSheet);
+
+                Info->PropSheet = NULL;
             }
         }
         break;
@@ -421,15 +576,11 @@ MainWndCommand(PMAIN_WND_INFO Info,
 
         case ID_CREATE:
         {
-            INT ret;
-
-            ret = DialogBoxParam(hInstance,
-                                 MAKEINTRESOURCE(IDD_DLG_CREATE),
-                                 Info->hMainWnd,
-                                 (DLGPROC)CreateDialogProc,
-                                 (LPARAM)Info);
-            if (ret == IDOK)
-                RefreshServiceList(Info);
+            DialogBoxParam(hInstance,
+                           MAKEINTRESOURCE(IDD_DLG_CREATE),
+                           Info->hMainWnd,
+                           (DLGPROC)CreateDialogProc,
+                           (LPARAM)Info);
 
             SetFocus(Info->hListView);
         }
@@ -437,7 +588,7 @@ MainWndCommand(PMAIN_WND_INFO Info,
 
         case ID_DELETE:
         {
-            if (Info->pCurrentService->ServiceStatusProcess.dwCurrentState != SERVICE_RUNNING)
+            if (Info->CurrentService->ServiceStatusProcess.dwCurrentState != SERVICE_RUNNING)
             {
                 DialogBoxParam(hInstance,
                                MAKEINTRESOURCE(IDD_DLG_DELETE),
@@ -462,43 +613,42 @@ MainWndCommand(PMAIN_WND_INFO Info,
 
         case ID_START:
         {
-            if (DoStart(Info))
-            {
-                UpdateServiceStatus(Info->pCurrentService);
-                ChangeListViewText(Info, Info->pCurrentService, LVSTATUS);
-                SetMenuAndButtonStates(Info);
-                SetFocus(Info->hListView);
-            }
+            DoStart(Info);
         }
         break;
 
         case ID_STOP:
-            if (DoStop(Info))
-            {
-                UpdateServiceStatus(Info->pCurrentService);
-                ChangeListViewText(Info, Info->pCurrentService, LVSTATUS);
-                SetMenuAndButtonStates(Info);
-                SetFocus(Info->hListView);
-            }
+        {
+            DoStop(Info);
+        }
         break;
 
         case ID_PAUSE:
-            DoPause(Info);
+        {
+            Control(Info,
+                    SERVICE_CONTROL_PAUSE);
+        }
         break;
 
         case ID_RESUME:
-            DoResume(Info);
+        {
+            Control(Info,
+                    SERVICE_CONTROL_CONTINUE );
+        }
         break;
 
         case ID_RESTART:
-            if (DoStop(Info))
-            {
-                DoStart(Info);
-                UpdateServiceStatus(Info->pCurrentService);
-                ChangeListViewText(Info, Info->pCurrentService, LVSTATUS);
-                SetMenuAndButtonStates(Info);
-                SetFocus(Info->hListView);
-            }
+        {
+            /* FIXME: remove this hack */
+            SendMessage(Info->hMainWnd,
+                        WM_COMMAND,
+                        0,
+                        ID_STOP);
+            SendMessage(Info->hMainWnd,
+                        WM_COMMAND,
+                        0,
+                        ID_START);
+        }
         break;
 
         case ID_HELP:
@@ -633,8 +783,7 @@ MainWndProc(HWND hwnd,
                              GWLP_USERDATA,
                              (LONG_PTR)Info);
 
-            if (!InitMainWnd(Info))
-                return -1;
+            InitMainWnd(Info);
 
             /* Show the window */
             ShowWindow(hwnd,
@@ -644,61 +793,60 @@ MainWndProc(HWND hwnd,
         }
         break;
 
-        case WM_SIZE:
-        {
+	    case WM_SIZE:
+	    {
             MainWndResize(Info,
                           LOWORD(lParam),
                           HIWORD(lParam));
-        }
-        break;
+	    }
+	    break;
 
-        case WM_NOTIFY:
+	    case WM_NOTIFY:
         {
             LPNMHDR pnmhdr = (LPNMHDR)lParam;
 
             switch (pnmhdr->code)
             {
-                case NM_DBLCLK:
-                {
-                    POINT pt;
-                    RECT rect;
+	            case NM_DBLCLK:
+	            {
+	                POINT pt;
+	                RECT rect;
 
-                    GetCursorPos(&pt);
-                    GetWindowRect(Info->hListView, &rect);
+	                GetCursorPos(&pt);
+	                GetWindowRect(Info->hListView, &rect);
 
-                    if (PtInRect(&rect, pt))
-                    {
+	                if (PtInRect(&rect, pt))
+	                {
                         SendMessage(hwnd,
                                     WM_COMMAND,
                                     //ID_PROP,
                                     MAKEWPARAM((WORD)ID_PROP, (WORD)0),
                                     0);
-                    }
+	                }
 
                     //OpenPropSheet(Info);
-                }
-                break;
+	            }
+			    break;
 
-                case LVN_COLUMNCLICK:
-                {
+			    case LVN_COLUMNCLICK:
+			    {
                     LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam;
 
                     (void)ListView_SortItems(Info->hListView,
                                              CompareFunc,
                                              pnmv->iSubItem);
                     bSortAscending = !bSortAscending;
-                }
+			    }
                 break;
 
-                case LVN_ITEMCHANGED:
-                {
-                    LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam;
+			    case LVN_ITEMCHANGED:
+			    {
+			        LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam;
 
-                    ListViewSelectionChanged(Info, pnmv);
-                    SetMenuAndButtonStates(Info);
+			        ListViewSelectionChanged(Info, pnmv);
 
-                }
-                break;
+			    }
+			    break;
 
                 case TTN_GETDISPINFO:
                 {
@@ -747,6 +895,15 @@ MainWndProc(HWND hwnd,
                         case ID_RESTART:
                             lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_RESTART);
                         break;
+
+                        case ID_HELP:
+                            lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP);
+                        break;
+
+                        case ID_EXIT:
+                            lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT);
+                        break;
+
                     }
                 }
                 break;
@@ -808,31 +965,34 @@ MainWndProc(HWND hwnd,
 
         case WM_ENTERMENULOOP:
         {
-            Info->bInMenuLoop = TRUE;
+            Info->InMenuLoop = TRUE;
             UpdateMainStatusBar(Info);
             break;
         }
 
         case WM_EXITMENULOOP:
         {
-            Info->bInMenuLoop = FALSE;
+            Info->InMenuLoop = FALSE;
             UpdateMainStatusBar(Info);
             break;
         }
 
-        case WM_CLOSE:
-        {
+	    case WM_CLOSE:
+	    {
+            /* Free service array */
             HeapFree(ProcessHeap,
                      0,
-                     Info->pAllServices);
+                     Info->pServiceStatus);
 
             DestroyMenu(Info->hShortcutMenu);
-            DestroyWindow(hwnd);
-        }
-        break;
+		    DestroyWindow(hwnd);
+	    }
+	    break;
 
-        case WM_DESTROY:
+	    case WM_DESTROY:
         {
+            //DestroyMainWnd(Info);
+
             HeapFree(ProcessHeap,
                      0,
                      Info);
@@ -840,22 +1000,22 @@ MainWndProc(HWND hwnd,
                              GWLP_USERDATA,
                              0);
 
+            /* Break the message queue loop */
             PostQuitMessage(0);
         }
-        break;
+	    break;
 
-        default:
-        {
+	    default:
+	    {
 HandleDefaultMessage:
 
             Ret = DefWindowProc(hwnd,
                                 msg,
                                 wParam,
                                 lParam);
-        }
-        break;
+	    }
+	    break;
     }
-
     return Ret;
 }
 
@@ -934,3 +1094,4 @@ UninitMainWindowImpl(VOID)
     UnregisterClass(szMainWndClass,
                     hInstance);
 }
+

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

@@ -3,8 +3,7 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/system/servman/misc.c
  * PURPOSE:     miscallanous functions
- * COPYRIGHT:   Copyright 2005 Thomas Weidenmueller <w3seek@reactos.org>
- *              Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
+ * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 

reactos/base/applications/mscutils/servman/precomp.h

@@ -7,21 +7,35 @@
 #include <stdio.h>
 #include <tchar.h>
 #include <commctrl.h>
-#include <shlobj.h>
 #include "resource.h"
 
 #ifdef _MSC_VER
 #pragma warning(disable : 4100)
 #endif
 
+#ifndef SB_SIMPLEID
+#define SB_SIMPLEID 0xFF
+#endif
+
 #define NO_ITEM_SELECTED -1
 #define MAX_KEY_LENGTH 256
+#define NUM_BUTTONS 14
+#define PROGRESSRANGE 8
 
-#define LVNAME 0
-#define LVDESC 1
-#define LVSTATUS 2
-#define LVSTARTUP 3
-#define LVLOGONAS 4
+
+typedef struct _PROP_DLG_INFO
+{
+    HWND   hwndGenDlg;
+    HWND   hwndDepDlg;
+    LPTSTR lpServiceName;
+    LPTSTR lpDisplayName;
+    LPTSTR lpDescription;
+    LPTSTR lpPathToExe;
+    TCHAR  szStartupType;
+    TCHAR  szServiceStatus[25];
+    LPTSTR lpStartParams;
+
+} PROP_DLG_INFO, *PPROP_DLG_INFO;
 
 typedef struct _MAIN_WND_INFO
 {
@@ -29,16 +43,23 @@ typedef struct _MAIN_WND_INFO
     HWND  hListView;
     HWND  hStatus;
     HWND  hTool;
+    HWND  hProgDlg;
     HMENU hShortcutMenu;
     int   nCmdShow;
 
-    ENUM_SERVICE_STATUS_PROCESS *pAllServices;
-    ENUM_SERVICE_STATUS_PROCESS *pCurrentService;
+    /* Stores the complete services array */
+    ENUM_SERVICE_STATUS_PROCESS *pServiceStatus;
 
-    INT SelectedItem;/* selection number in the list view */
-    BOOL bDlgOpen;
-    BOOL bInMenuLoop;
-    BOOL bIsUserAnAdmin;
+    /* Stores the current selected service */
+    ENUM_SERVICE_STATUS_PROCESS *CurrentService;
+
+    /* selection number in the list view */
+    INT SelectedItem;
+
+    struct _PROP_DLG_INFO *PropSheet;
+
+    /* status flags */
+    BOOL InMenuLoop : 1;
 
 } MAIN_WND_INFO, *PMAIN_WND_INFO;
 
@@ -60,43 +81,26 @@ typedef struct _MENU_HINT
     UINT HintId;
 } MENU_HINT, *PMENU_HINT;
 
-VOID UpdateServiceCount(PMAIN_WND_INFO Info);
-VOID ChangeListViewText(PMAIN_WND_INFO Info, ENUM_SERVICE_STATUS_PROCESS* pService, UINT Column);
 BOOL InitMainWindowImpl(VOID);
 VOID UninitMainWindowImpl(VOID);
 HWND CreateMainWindow(LPCTSTR lpCaption, int nCmdShow);
 
-/* listview.c */
-VOID SetListViewStyle(HWND hListView, DWORD View);
-VOID ListViewSelectionChanged(PMAIN_WND_INFO Info, LPNMLISTVIEW pnmv);
-BOOL CreateListView(PMAIN_WND_INFO Info);
-
 /* start */
 BOOL DoStart(PMAIN_WND_INFO Info);
 
-/* control */
+/* stop */
 BOOL DoStop(PMAIN_WND_INFO Info);
-BOOL DoPause(PMAIN_WND_INFO Info);
-BOOL DoResume(PMAIN_WND_INFO Info);
 
-/* progress.c */
-HWND CreateProgressDialog(HWND hParent, LPTSTR lpServiceName, UINT Event);
-VOID IncrementProgressBar(HWND hProgDlg);
-VOID CompleteProgressBar(HWND hProgDlg);
+/* control */
+BOOL Control(PMAIN_WND_INFO Info, DWORD Control);
 
 /* query.c */
 ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info);
-LPQUERY_SERVICE_CONFIG GetServiceConfig(LPTSTR lpServiceName);
-BOOL SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig, LPTSTR lpServiceName, LPTSTR lpPassword);
-LPTSTR GetServiceDescription(LPTSTR lpServiceName);
-BOOL SetServiceDescription(LPTSTR lpServiceName, LPTSTR lpDescription);
-LPTSTR GetExecutablePath(LPTSTR lpServiceName);
-BOOL RefreshServiceList(PMAIN_WND_INFO Info);
-BOOL UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService);
-BOOL GetServiceList(PMAIN_WND_INFO Info, DWORD *NumServices);
-
-/* reg */
 BOOL SetDescription(LPTSTR, LPTSTR);
+BOOL GetDescription(LPTSTR, LPTSTR *);
+BOOL GetExecutablePath(PMAIN_WND_INFO Info, LPTSTR *);
+BOOL RefreshServiceList(PMAIN_WND_INFO Info);
+DWORD GetServiceList(PMAIN_WND_INFO Info);
 
 /* propsheet.c */
 LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info);
@@ -108,27 +112,35 @@ VOID ExportFile(PMAIN_WND_INFO Info);
 INT AllocAndLoadString(OUT LPTSTR *lpTarget,
                        IN HINSTANCE hInst,
                        IN UINT uID);
+
 DWORD LoadAndFormatString(IN HINSTANCE hInstance,
                           IN UINT uID,
                           OUT LPTSTR *lpTarget,
                           ...);
+
 BOOL StatusBarLoadAndFormatString(IN HWND hStatusBar,
                                   IN INT PartId,
                                   IN HINSTANCE hInstance,
                                   IN UINT uID,
                                   ...);
+
 BOOL StatusBarLoadString(IN HWND hStatusBar,
                          IN INT PartId,
                          IN HINSTANCE hInstance,
                          IN UINT uID);
+
 INT GetTextFromEdit(OUT LPTSTR lpString,
                     IN HWND hDlg,
                     IN UINT Res);
+
 VOID GetError(VOID);
+
 VOID DisplayString(PTCHAR);
+
 HIMAGELIST InitImageList(UINT NumButtons,
                          UINT StartResource,
                          UINT Width,
                          UINT Height);
 
+
 #endif /* __SERVMAN_PRECOMP_H */

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

@@ -1,75 +1,20 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/progress.c
+ * FILE:        base/system/servman/progress.c
  * PURPOSE:     Progress dialog box message handler
- * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
 #include "precomp.h"
 
-#define PROGRESSRANGE 8
-
-VOID
-CompleteProgressBar(HWND hProgDlg)
-{
-    HWND hProgBar;
-
-    hProgBar = GetDlgItem(hProgDlg,
-                          IDC_SERVCON_PROGRESS);
-
-    if (hProgBar)
-    {
-        SendMessage(hProgBar,
-                    PBM_DELTAPOS,
-                    PROGRESSRANGE,
-                    0);
-    }
-}
-
-VOID
-IncrementProgressBar(HWND hProgDlg)
-{
-    HWND hProgBar;
-
-    hProgBar = GetDlgItem(hProgDlg,
-                          IDC_SERVCON_PROGRESS);
-
-    if (hProgBar)
-    {
-        SendMessage(hProgBar,
-                    PBM_STEPIT,
-                    0,
-                    0);
-    }
-}
-
-BOOL CALLBACK
-ProgressDialogProc(HWND hDlg,
-                   UINT Message,
-                   WPARAM wParam,
-                   LPARAM lParam)
+BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam)
 {
     switch(Message)
     {
         case WM_INITDIALOG:
-        {
-            HWND hProgBar;
 
-            /* set the progress bar range and step */
-            hProgBar = GetDlgItem(hDlg,
-                                  IDC_SERVCON_PROGRESS);
-            SendMessage(hProgBar,
-                        PBM_SETRANGE,
-                        0,
-                        MAKELPARAM(0, PROGRESSRANGE));
-
-            SendMessage(hProgBar,
-                        PBM_SETSTEP,
-                        (WPARAM)1,
-                        0);
-        }
         break;
 
         case WM_COMMAND:
@@ -94,43 +39,3 @@ ProgressDialogProc(HWND hDlg,
 
 }
 
-HWND
-CreateProgressDialog(HWND hParent,
-                     LPTSTR lpServiceName,
-                     UINT Event)
-{
-    HWND hProgDlg;
-    TCHAR ProgDlgBuf[100];
-
-    /* open the progress dialog */
-    hProgDlg = CreateDialog(hInstance,
-                            MAKEINTRESOURCE(IDD_DLG_PROGRESS),
-                            hParent,
-                            (DLGPROC)ProgressDialogProc);
-    if (hProgDlg != NULL)
-    {
-        ShowWindow(hProgDlg,
-                   SW_SHOW);
-
-        /* write the  info to the progress dialog */
-        LoadString(hInstance,
-                   Event,
-                   ProgDlgBuf,
-                   sizeof(ProgDlgBuf) / sizeof(TCHAR));
-
-        SendDlgItemMessage(hProgDlg,
-                           IDC_SERVCON_INFO,
-                           WM_SETTEXT,
-                           0,
-                           (LPARAM)ProgDlgBuf);
-
-        /* write the service name to the progress dialog */
-        SendDlgItemMessage(hProgDlg,
-                           IDC_SERVCON_NAME,
-                           WM_SETTEXT,
-                           0,
-                           (LPARAM)lpServiceName);
-    }
-
-    return hProgDlg;
-}

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

@@ -1,84 +1,45 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/propsheet.c
+ * FILE:        base/system/servman/propsheet.c
  * PURPOSE:     Property dialog box message handler
- * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2005 - 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
 #include "precomp.h"
 
-typedef struct _SERVICEPROPSHEET
-{
-    PMAIN_WND_INFO Info;
-    ENUM_SERVICE_STATUS_PROCESS *pService;
-} SERVICEPROPSHEET, *PSERVICEPROPSHEET;
-
-
 static VOID
-SetButtonStates(PSERVICEPROPSHEET dlgInfo,
-                HWND hwndDlg)
+SetButtonStates(PMAIN_WND_INFO Info)
 {
     HWND hButton;
     DWORD Flags, State;
-    UINT i;
 
-    Flags = dlgInfo->pService->ServiceStatusProcess.dwControlsAccepted;
-    State = dlgInfo->pService->ServiceStatusProcess.dwCurrentState;
-
-    for (i = IDC_START; i <= IDC_RESUME; i++)
-    {
-        hButton = GetDlgItem(hwndDlg, i);
-        EnableWindow (hButton, FALSE);
-    }
+    Flags = Info->CurrentService->ServiceStatusProcess.dwControlsAccepted;
+    State = Info->CurrentService->ServiceStatusProcess.dwCurrentState;
 
     if (State == SERVICE_STOPPED)
     {
-        hButton = GetDlgItem(hwndDlg, IDC_START);
+        hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_START);
         EnableWindow (hButton, TRUE);
     }
-    else if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) )
+
+    if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) )
     {
-        hButton = GetDlgItem(hwndDlg, IDC_STOP);
+        hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_STOP);
         EnableWindow (hButton, TRUE);
     }
-    else if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) )
+
+    if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) )
     {
-        hButton = GetDlgItem(hwndDlg, IDC_PAUSE);
+        hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_PAUSE);
         EnableWindow (hButton, TRUE);
     }
-}
 
-
-static VOID
-SetServiceStatusText(PSERVICEPROPSHEET dlgInfo,
-                     HWND hwndDlg)
-{
-    LPTSTR lpStatus;
-    UINT id;
-
-    if (dlgInfo->pService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING)
+    if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) )
     {
-        id = IDS_SERVICES_STARTED;
-    }
-    else
-    {
-        id = IDS_SERVICES_STOPPED;
-    }
-
-    if (AllocAndLoadString(&lpStatus,
-                           hInstance,
-                           id))
-    {
-        SendDlgItemMessage(hwndDlg,
-                           IDC_SERV_STATUS,
-                           WM_SETTEXT,
-                           0,
-                           (LPARAM)lpStatus);
-        HeapFree(ProcessHeap,
-                 0,
-                 lpStatus);
+        hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_PAUSE);
+        EnableWindow (hButton, TRUE);
     }
 }
 
@@ -87,53 +48,56 @@ SetServiceStatusText(PSERVICEPROPSHEET dlgInfo,
  * values and sets it to value of the selected item
  */
 static VOID
-SetStartupType(LPTSTR lpServiceName,
-               HWND hwndDlg)
+SetStartupType(PMAIN_WND_INFO Info)
 {
     HWND hList;
-    LPQUERY_SERVICE_CONFIG pServiceConfig;
-    LPTSTR lpBuf;
+    HKEY hKey;
+    TCHAR buf[25];
+    DWORD dwValueSize = 0;
     DWORD StartUp = 0;
-    UINT i;
+    LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s");
+    TCHAR KeyBuf[300];
 
-    hList = GetDlgItem(hwndDlg, IDC_START_TYPE);
+    /* open the registry key for the service */
+    _sntprintf(KeyBuf,
+               sizeof(KeyBuf) / sizeof(TCHAR),
+               Path,
+               Info->CurrentService->lpServiceName);
 
-    for (i = IDS_SERVICES_AUTO; i <= IDS_SERVICES_DIS; i++)
-    {
-        if (AllocAndLoadString(&lpBuf,
-                               hInstance,
-                               i))
-        {
-            SendMessage(hList,
-                        CB_ADDSTRING,
-                        0,
-                        (LPARAM)lpBuf);
-            HeapFree(ProcessHeap,
-                     0,
-                     lpBuf);
-        }
-    }
-
-    pServiceConfig = GetServiceConfig(lpServiceName);
-
-    if (pServiceConfig)
-    {
-        switch (pServiceConfig->dwStartType)
-        {
-            case SERVICE_AUTO_START:   StartUp = 0; break;
-            case SERVICE_DEMAND_START: StartUp = 1; break;
-            case SERVICE_DISABLED:     StartUp = 2; break;
-        }
-
-        SendMessage(hList,
-                    CB_SETCURSEL,
-                    StartUp,
-                    0);
-
-        HeapFree(ProcessHeap,
+    RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                 KeyBuf,
                  0,
-                 pServiceConfig);
+                 KEY_READ,
+                 &hKey);
+
+    hList = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_START_TYPE);
+
+    LoadString(hInstance, IDS_SERVICES_AUTO, buf, sizeof(buf) / sizeof(TCHAR));
+    SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf);
+    LoadString(hInstance, IDS_SERVICES_MAN, buf, sizeof(buf) / sizeof(TCHAR));
+    SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf);
+    LoadString(hInstance, IDS_SERVICES_DIS, buf, sizeof(buf) / sizeof(TCHAR));
+    SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf);
+
+    dwValueSize = sizeof(DWORD);
+    if (RegQueryValueEx(hKey,
+                        _T("Start"),
+                        NULL,
+                        NULL,
+                        (LPBYTE)&StartUp,
+                        &dwValueSize))
+    {
+        RegCloseKey(hKey);
+        return;
     }
+
+    if (StartUp == 0x02)
+        SendMessage(hList, CB_SETCURSEL, 0, 0);
+    else if (StartUp == 0x03)
+        SendMessage(hList, CB_SETCURSEL, 1, 0);
+    else if (StartUp == 0x04)
+        SendMessage(hList, CB_SETCURSEL, 2, 0);
+
 }
 
 
@@ -142,110 +106,74 @@ SetStartupType(LPTSTR lpServiceName,
  * the relevant service information
  */
 static VOID
-InitGeneralPage(PSERVICEPROPSHEET dlgInfo,
-                HWND hwndDlg)
+GetDlgInfo(PMAIN_WND_INFO Info)
 {
-    LPQUERY_SERVICE_CONFIG pServiceConfig;
-    LPTSTR lpDescription;
-
     /* set the service name */
-    SendDlgItemMessage(hwndDlg,
+    Info->PropSheet->lpServiceName = Info->CurrentService->lpServiceName;
+    SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
                        IDC_SERV_NAME,
                        WM_SETTEXT,
                        0,
-                       (LPARAM)dlgInfo->pService->lpServiceName);
+                       (LPARAM)Info->PropSheet->lpServiceName);
 
     /* set the display name */
-    SendDlgItemMessage(hwndDlg,
+    Info->PropSheet->lpDisplayName = Info->CurrentService->lpDisplayName;
+    SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
                        IDC_DISP_NAME,
                        WM_SETTEXT,
                        0,
-                       (LPARAM)dlgInfo->pService->lpDisplayName);
+                       (LPARAM)Info->PropSheet->lpDisplayName);
 
     /* set the description */
-    if ((lpDescription = GetServiceDescription(dlgInfo->pService->lpServiceName)))
-    {
-        SendDlgItemMessage(hwndDlg,
+    if (GetDescription(Info->CurrentService->lpServiceName, &Info->PropSheet->lpDescription))
+        SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
                            IDC_DESCRIPTION,
                            WM_SETTEXT,
                            0,
-                           (LPARAM)lpDescription);
+                           (LPARAM)Info->PropSheet->lpDescription);
 
-        HeapFree(ProcessHeap,
-                 0,
-                 lpDescription);
-    }
-
-    pServiceConfig = GetServiceConfig(dlgInfo->pService->lpServiceName);
-    if (pServiceConfig)
-    {
-        SendDlgItemMessage(hwndDlg,
+    /* set the executable path */
+    if (GetExecutablePath(Info, &Info->PropSheet->lpPathToExe))
+        SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
                            IDC_EXEPATH,
                            WM_SETTEXT,
                            0,
-                           (LPARAM)pServiceConfig->lpBinaryPathName);
-    }
-
+                           (LPARAM)Info->PropSheet->lpPathToExe);
 
     /* set startup type */
-    SetStartupType(dlgInfo->pService->lpServiceName, hwndDlg);
+    SetStartupType(Info);
 
-    SetServiceStatusText(dlgInfo,
-                         hwndDlg);
-
-    if (dlgInfo->Info->bIsUserAnAdmin)
+    /* set service status */
+    if (Info->CurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING)
     {
-        HWND hEdit = GetDlgItem(hwndDlg,
-                                IDC_EDIT);
-        EnableWindow(hEdit,
-                     TRUE);
+        LoadString(hInstance,
+                   IDS_SERVICES_STARTED,
+                   Info->PropSheet->szServiceStatus,
+                   sizeof(Info->PropSheet->szServiceStatus) / sizeof(TCHAR));
+
+        SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
+                           IDC_SERV_STATUS,
+                           WM_SETTEXT,
+                           0,
+                           (LPARAM)Info->PropSheet->szServiceStatus);
     }
+    else
+    {
+        LoadString(hInstance,
+                   IDS_SERVICES_STOPPED,
+                   Info->PropSheet->szServiceStatus,
+                   sizeof(Info->PropSheet->szServiceStatus) / sizeof(TCHAR));
+
+        SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
+                           IDC_SERV_STATUS,
+                           WM_SETTEXT,
+                           0,
+                           (LPARAM)Info->PropSheet->szServiceStatus);
+    }
+
 }
 
 
-VOID
-SaveDlgInfo(PSERVICEPROPSHEET dlgInfo,
-            HWND hwndDlg)
-{
-    LPQUERY_SERVICE_CONFIG pServiceConfig = NULL;
-    HWND hList;
-    DWORD StartUp;
-
-    pServiceConfig = HeapAlloc(ProcessHeap,
-                               HEAP_ZERO_MEMORY,
-                               sizeof(*pServiceConfig));
-    if (pServiceConfig)
-    {
-        pServiceConfig->dwServiceType = SERVICE_NO_CHANGE;
-        pServiceConfig->dwErrorControl = SERVICE_NO_CHANGE;
-
-        hList = GetDlgItem(hwndDlg, IDC_START_TYPE);
-        StartUp = SendMessage(hList,
-                              CB_GETCURSEL,
-                              0,
-                              0);
-        switch (StartUp)
-        {
-            case 0: pServiceConfig->dwStartType = SERVICE_AUTO_START; break;
-            case 1: pServiceConfig->dwStartType = SERVICE_DEMAND_START; break;
-            case 2: pServiceConfig->dwStartType = SERVICE_DISABLED; break;
-        }
-
-        if (SetServiceConfig(pServiceConfig,
-                             dlgInfo->pService->lpServiceName,
-                             NULL))
-        {
-            ChangeListViewText(dlgInfo->Info,
-                               dlgInfo->pService,
-                               LVSTARTUP);
-        }
-
-        HeapFree(ProcessHeap,
-                 0,
-                 pServiceConfig);
-    }
-}
-
 
 /*
  * General Property dialog callback.
@@ -254,15 +182,16 @@ SaveDlgInfo(PSERVICEPROPSHEET dlgInfo,
 static INT_PTR CALLBACK
 GeneralPageProc(HWND hwndDlg,
                 UINT uMsg,
-                WPARAM wParam,
-                LPARAM lParam)
+		        WPARAM wParam,
+		        LPARAM lParam)
 {
-    PSERVICEPROPSHEET dlgInfo;
+    PMAIN_WND_INFO Info;
 
     /* Get the window context */
-    dlgInfo = (PSERVICEPROPSHEET)GetWindowLongPtr(hwndDlg,
-                                                  GWLP_USERDATA);
-    if (dlgInfo == NULL && uMsg != WM_INITDIALOG)
+    Info = (PMAIN_WND_INFO)GetWindowLongPtr(hwndDlg,
+                                            GWLP_USERDATA);
+
+    if (Info == NULL && uMsg != WM_INITDIALOG)
     {
         return FALSE;
     }
@@ -271,14 +200,16 @@ GeneralPageProc(HWND hwndDlg,
     {
         case WM_INITDIALOG:
         {
-            dlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam);
-            if (dlgInfo != NULL)
+            Info = (PMAIN_WND_INFO)(((LPPROPSHEETPAGE)lParam)->lParam);
+            if (Info != NULL)
             {
+                Info->PropSheet->hwndGenDlg = hwndDlg;
+
                 SetWindowLongPtr(hwndDlg,
                                  GWLP_USERDATA,
-                                 (LONG_PTR)dlgInfo);
-                InitGeneralPage(dlgInfo, hwndDlg);
-                SetButtonStates(dlgInfo, hwndDlg);
+                                 (LONG_PTR)Info);
+                GetDlgInfo(Info);
+                SetButtonStates(Info);
             }
         }
         break;
@@ -287,78 +218,46 @@ GeneralPageProc(HWND hwndDlg,
             switch(LOWORD(wParam))
             {
                 case IDC_START_TYPE:
-                    if (HIWORD(wParam) == CBN_SELCHANGE)
-                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                    /* Enable the 'Apply' button */
+                    //PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                 break;
 
                 case IDC_START:
-                    if (DoStart(dlgInfo->Info))
-                    {
-                        UpdateServiceStatus(dlgInfo->pService);
-                        ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS);
-                        SetButtonStates(dlgInfo, hwndDlg);
-                        SetServiceStatusText(dlgInfo, hwndDlg);
-                    }
+                    SendMessage(Info->hMainWnd, WM_COMMAND, ID_START, 0);
                 break;
 
                 case IDC_STOP:
-                    if (DoStop(dlgInfo->Info))
-                    {
-                        UpdateServiceStatus(dlgInfo->pService);
-                        ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS);
-                        SetButtonStates(dlgInfo, hwndDlg);
-                        SetServiceStatusText(dlgInfo, hwndDlg);
-                    }
+                    SendMessage(Info->hMainWnd, WM_COMMAND, ID_STOP, 0);
                 break;
 
                 case IDC_PAUSE:
-                    if (DoPause(dlgInfo->Info))
-                    {
-                        UpdateServiceStatus(dlgInfo->pService);
-                        ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS);
-                        SetButtonStates(dlgInfo, hwndDlg);
-                        SetServiceStatusText(dlgInfo, hwndDlg);
-                    }
+                    SendMessage(Info->hMainWnd, WM_COMMAND, ID_PAUSE, 0);
                 break;
 
                 case IDC_RESUME:
-                    if (DoResume(dlgInfo->Info))
-                    {
-                        UpdateServiceStatus(dlgInfo->pService);
-                        ChangeListViewText(dlgInfo->Info, dlgInfo->pService, LVSTATUS);
-                        SetButtonStates(dlgInfo, hwndDlg);
-                        SetServiceStatusText(dlgInfo, hwndDlg);
-                    }
-                break;
-
-                case IDC_EDIT:
-                {
-                    HWND hName, hDesc, hExePath;
-
-                    hName = GetDlgItem(hwndDlg, IDC_DISP_NAME);
-                    hDesc = GetDlgItem(hwndDlg, IDC_DESCRIPTION);
-                    hExePath = GetDlgItem(hwndDlg, IDC_EXEPATH);
-
-                    SendMessage(hName, EM_SETREADONLY, FALSE, 0);
-                    SendMessage(hDesc, EM_SETREADONLY, FALSE, 0);
-                    SendMessage(hExePath, EM_SETREADONLY, FALSE, 0);
-                }
+                    SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0);
                 break;
 
                 case IDC_START_PARAM:
-                    PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
+                    /* Enable the 'Apply' button */
+                    //PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                 break;
+
             }
             break;
 
+        case WM_DESTROY:
+        break;
+
         case WM_NOTIFY:
             {
                 LPNMHDR lpnm = (LPNMHDR)lParam;
 
                 switch (lpnm->code)
                 {
-                    case PSN_APPLY:
-                        SaveDlgInfo(dlgInfo, hwndDlg);
+                    case MCN_SELECT:
+                        /* Enable the 'Apply' button */
+                        PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     break;
                 }
             }
@@ -367,33 +266,26 @@ GeneralPageProc(HWND hwndDlg,
 
     return FALSE;
 }
+
+
+
 /*
-static VOID
-InitDependPage(PSERVICEPROPSHEET dlgInfo,
-               HWND hwndDlg)
-{
-
-
-}
-
-
-
-*
  * Dependancies Property dialog callback.
  * Controls messages to the Dependancies dialog
- *
+ */
 static INT_PTR CALLBACK
 DependanciesPageProc(HWND hwndDlg,
                      UINT uMsg,
-                     WPARAM wParam,
-                     LPARAM lParam)
+		             WPARAM wParam,
+		             LPARAM lParam)
 {
-    PSERVICEPROPSHEET dlgInfo;
+    PMAIN_WND_INFO Info;
 
-    dlgInfo = (PSERVICEPROPSHEET)GetWindowLongPtr(hwndDlg,
-                                                  GWLP_USERDATA);
+    /* Get the window context */
+    Info = (PMAIN_WND_INFO)GetWindowLongPtr(hwndDlg,
+                                            GWLP_USERDATA);
 
-    if (dlgInfo == NULL && uMsg != WM_INITDIALOG)
+    if (Info == NULL && uMsg != WM_INITDIALOG)
     {
         return FALSE;
     }
@@ -402,14 +294,14 @@ DependanciesPageProc(HWND hwndDlg,
     {
         case WM_INITDIALOG:
         {
-            dlgInfo = (PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam);
-            if (dlgInfo != NULL)
+            Info = (PMAIN_WND_INFO)(((LPPROPSHEETPAGE)lParam)->lParam);
+            if (Info != NULL)
             {
+                Info->PropSheet->hwndDepDlg = hwndDlg;
+
                 SetWindowLongPtr(hwndDlg,
                                  GWLP_USERDATA,
-                                 (LONG_PTR)dlgInfo);
-
-                InitDependPage(dlgInfo, hwndDlg);
+                                 (LONG_PTR)Info);
             }
         }
         break;
@@ -420,15 +312,62 @@ DependanciesPageProc(HWND hwndDlg,
 
             }
             break;
+
+        case WM_DESTROY:
+            break;
+
+        case WM_NOTIFY:
+            {
+                LPNMHDR lpnm = (LPNMHDR)lParam;
+
+                switch (lpnm->code)
+                {
+
+                }
+
+            }
+            break;
     }
 
     return FALSE;
 }
-*/
+
+
+static INT CALLBACK
+AddEditButton(HWND hwnd, UINT message, LPARAM lParam)
+{
+    HWND hEditButton;
+
+    switch (message)
+    {
+        case PSCB_PRECREATE:
+            /*hEditButton = CreateWindowEx(0,
+                                         WC_BUTTON,
+                                         NULL,
+                                         WS_CHILD | WS_VISIBLE,
+                                         20, 300, 30, 15,
+                                         hwnd,
+                                         NULL,
+                                         hInstance,
+                                         NULL);
+            if (hEditButton == NULL)
+                GetError(0);*/
+
+            hEditButton = GetDlgItem(hwnd, PSBTN_OK);
+            DestroyWindow(hEditButton);
+            //SetWindowText(hEditButton, _T("test"));
+
+            return TRUE;
+    }
+    return TRUE;
+}
+
+
+
 
 static VOID
 InitPropSheetPage(PROPSHEETPAGE *psp,
-                  PSERVICEPROPSHEET dlgInfo,
+                  PMAIN_WND_INFO Info,
                   WORD idDlg,
                   DLGPROC DlgProc)
 {
@@ -438,7 +377,7 @@ InitPropSheetPage(PROPSHEETPAGE *psp,
   psp->hInstance = hInstance;
   psp->pszTemplate = MAKEINTRESOURCE(idDlg);
   psp->pfnDlgProc = DlgProc;
-  psp->lParam = (LPARAM)dlgInfo;
+  psp->lParam = (LPARAM)Info;
 }
 
 
@@ -446,43 +385,26 @@ LONG APIENTRY
 OpenPropSheet(PMAIN_WND_INFO Info)
 {
     PROPSHEETHEADER psh;
-    PROPSHEETPAGE psp[1];
-    PSERVICEPROPSHEET pServicePropSheet;
-    LONG Ret = 0;
+    PROPSHEETPAGE psp[2];
 
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
-    psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_USECALLBACK;// | PSH_MODELESS;
+    psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_USECALLBACK;
     psh.hwndParent = Info->hMainWnd;
     psh.hInstance = hInstance;
     psh.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON));
-    psh.pszCaption = Info->pCurrentService->lpDisplayName;
+    psh.pszCaption = Info->CurrentService->lpDisplayName;
     psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
     psh.nStartPage = 0;
+    psh.pfnCallback = AddEditButton;
     psh.ppsp = psp;
 
 
-    pServicePropSheet = HeapAlloc(ProcessHeap,
-                                  0,
-                                  sizeof(*pServicePropSheet));
-    if (pServicePropSheet)
-    {
-        /* save current service, as it could change while the dialog is open */
-        pServicePropSheet->pService = Info->pCurrentService;
-        pServicePropSheet->Info = Info;
+    InitPropSheetPage(&psp[0], Info, IDD_DLG_GENERAL, GeneralPageProc);
+    //InitPropSheetPage(&psp[1], Info, IDD_DLG_GENERAL, LogonPageProc);
+    //InitPropSheetPage(&psp[2], Info, IDD_DLG_GENERAL, RecoveryPageProc);
+    InitPropSheetPage(&psp[1], Info, IDD_DLG_DEPEND, DependanciesPageProc);
 
-        InitPropSheetPage(&psp[0], pServicePropSheet, IDD_DLG_GENERAL, GeneralPageProc);
-        //InitPropSheetPage(&psp[1], Info, IDD_DLG_GENERAL, LogonPageProc);
-        //InitPropSheetPage(&psp[2], Info, IDD_DLG_GENERAL, RecoveryPageProc);
-        //InitPropSheetPage(&psp[1], pServicePropSheet, IDD_DLG_DEPEND, DependanciesPageProc);
-
-        Ret = (LONG)(PropertySheet(&psh) != -1);
-
-        HeapFree(ProcessHeap,
-                 0,
-                 pServicePropSheet);
-    }
-
-    return Ret;
+    return (LONG)(PropertySheet(&psh) != -1);
 }
 

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

@@ -1,9 +1,9 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/query.c
+ * FILE:        base/system/servman/query.c
  * PURPOSE:     Query service information
- * COPYRIGHT:   Copyright 2006-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2005 - 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
@@ -27,25 +27,129 @@ GetSelectedService(PMAIN_WND_INFO Info)
 }
 
 
-LPQUERY_SERVICE_CONFIG
-GetServiceConfig(LPTSTR lpServiceName)
+/* Sets the service description in the registry */
+BOOL SetDescription(LPTSTR ServiceName, LPTSTR Description)
+{
+    HKEY hKey;
+    LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s");
+    TCHAR buf[300];
+    TCHAR szBuf[MAX_PATH];
+    LONG val;
+
+
+   /* open the registry key for the service */
+    _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, ServiceName);
+    RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                 buf,
+                 0,
+                 KEY_WRITE,
+                 &hKey);
+
+
+   if ((val = RegSetValueEx(hKey,
+                     _T("Description"),
+                     0,
+                     REG_SZ,
+                     (LPBYTE)Description,
+                     (DWORD)lstrlen(szBuf)+1)) != ERROR_SUCCESS)
+   {
+       //GetError(val);
+       return FALSE;
+   }
+
+
+    RegCloseKey(hKey);
+    return TRUE;
+}
+
+
+
+/* Retrives the service description from the registry */
+BOOL GetDescription(LPTSTR lpServiceName, LPTSTR *retDescription)
+{
+    HKEY hKey;
+    LPTSTR Description = NULL;
+    DWORD dwValueSize = 0;
+    LONG ret;
+    LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s");
+    TCHAR buf[300];
+
+    /* open the registry key for the service */
+    _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, lpServiceName);
+    RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                 buf,
+                 0,
+                 KEY_READ,
+                 &hKey);
+
+    ret = RegQueryValueEx(hKey,
+                          _T("Description"),
+                          NULL,
+                          NULL,
+                          NULL,
+                          &dwValueSize);
+    if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND && ret != ERROR_INVALID_HANDLE)
+    {
+        RegCloseKey(hKey);
+        return FALSE;
+    }
+
+    if (ret != ERROR_FILE_NOT_FOUND)
+    {
+        Description = HeapAlloc(ProcessHeap,
+                                HEAP_ZERO_MEMORY,
+                                dwValueSize);
+        if (Description == NULL)
+        {
+            RegCloseKey(hKey);
+            return FALSE;
+        }
+
+        if(RegQueryValueEx(hKey,
+                           _T("Description"),
+                           NULL,
+                           NULL,
+                           (LPBYTE)Description,
+                           &dwValueSize))
+        {
+            HeapFree(ProcessHeap,
+                     0,
+                     Description);
+            RegCloseKey(hKey);
+            return FALSE;
+        }
+    }
+
+    /* copy pointer over */
+    *retDescription = Description;
+
+    return TRUE;
+}
+
+
+/* get vendor of service binary */
+BOOL
+GetExecutablePath(PMAIN_WND_INFO Info,
+                  LPTSTR *ExePath)
 {
     SC_HANDLE hSCManager = NULL;
     SC_HANDLE hSc = NULL;
     LPQUERY_SERVICE_CONFIG pServiceConfig = NULL;
     DWORD BytesNeeded = 0;
 
+    /* open handle to the SCM */
     hSCManager = OpenSCManager(NULL,
                                NULL,
                                SC_MANAGER_ENUMERATE_SERVICE);
     if (hSCManager == NULL)
     {
         GetError();
-        return NULL;
+        return FALSE;
     }
 
+    /* get a handle to the service requested for starting */
     hSc = OpenService(hSCManager,
-                      lpServiceName,
+                      Info->CurrentService->lpServiceName,
                       SERVICE_QUERY_CONFIG);
     if (hSc == NULL)
     {
@@ -53,6 +157,7 @@ GetServiceConfig(LPTSTR lpServiceName)
         goto cleanup;
     }
 
+
     if (!QueryServiceConfig(hSc,
                             pServiceConfig,
                             0,
@@ -60,9 +165,10 @@ GetServiceConfig(LPTSTR lpServiceName)
     {
         if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
         {
-            pServiceConfig = (LPQUERY_SERVICE_CONFIG) HeapAlloc(ProcessHeap,
-                                                                0,
-                                                                BytesNeeded);
+            pServiceConfig = (LPQUERY_SERVICE_CONFIG)
+                             HeapAlloc(ProcessHeap,
+                                       0,
+                                       BytesNeeded);
             if (pServiceConfig == NULL)
                 goto cleanup;
 
@@ -74,290 +180,369 @@ GetServiceConfig(LPTSTR lpServiceName)
                 HeapFree(ProcessHeap,
                          0,
                          pServiceConfig);
-
-                pServiceConfig = NULL;
+                goto cleanup;
             }
         }
+        else /* exit on failure */
+        {
+            goto cleanup;
+        }
     }
 
+    *ExePath = pServiceConfig->lpBinaryPathName;
+
+    CloseServiceHandle(hSCManager);
+    CloseServiceHandle(hSc);
+
+    return TRUE;
+
 cleanup:
     if (hSCManager != NULL)
         CloseServiceHandle(hSCManager);
     if (hSc != NULL)
         CloseServiceHandle(hSc);
-
-    return pServiceConfig;
+    return FALSE;
 }
 
 
+static VOID
+InitListViewImage(PMAIN_WND_INFO Info)
+{
+    HICON hSmIconItem, hLgIconItem;    /* icon for list-view items */
+    HIMAGELIST hSmall, hLarge;  /* image list for other views */
+
+
+    /* Create the icon image lists */
+    hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON),
+                              GetSystemMetrics(SM_CYSMICON),
+                              ILC_MASK | ILC_COLOR32,
+                              1,
+                              1);
+
+    hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON),
+                              GetSystemMetrics(SM_CYICON),
+                              ILC_MASK | ILC_COLOR32,
+                              1,
+                              1);
+
+    /* Add an icon to each image list */
+    hSmIconItem = LoadImage(hInstance,
+                            MAKEINTRESOURCE(IDI_SM_ICON),
+                            IMAGE_ICON,
+                            16,
+                            16,
+                            0);
+
+    ImageList_AddIcon(hSmall,
+                      hSmIconItem);
+
+    hLgIconItem = LoadImage(hInstance,
+                            MAKEINTRESOURCE(IDI_SM_ICON),
+                            IMAGE_ICON,
+                            32,
+                            32,
+                            0);
+
+    ImageList_AddIcon(hLarge,
+                      hLgIconItem);
+
+    /* assign the image to the list view */
+    (void)ListView_SetImageList(Info->hListView,
+                                hSmall,
+                                LVSIL_SMALL);
+    (void)ListView_SetImageList(Info->hListView,
+                                hLarge,
+                                LVSIL_NORMAL);
+
+}
+
+
+
 BOOL
-SetServiceConfig(LPQUERY_SERVICE_CONFIG pServiceConfig,
-                 LPTSTR lpServiceName,
-                 LPTSTR lpPassword)
+RefreshServiceList(PMAIN_WND_INFO Info)
 {
-    SC_HANDLE hSCManager;
-    SC_HANDLE hSc;
-    SC_LOCK scLock;
-    BOOL bRet = FALSE;
+    LVITEM lvItem;
+    TCHAR szNumServices[32];
+    TCHAR szStatus[64];
+    DWORD NumServices = 0;
+    DWORD Index;
+    LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s");
 
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_LOCK);
-    if (hSCManager)
+    (void)ListView_DeleteAllItems(Info->hListView);
+
+    InitListViewImage(Info);
+
+    NumServices = GetServiceList(Info);
+
+    if (NumServices)
     {
-        scLock = LockServiceDatabase(hSCManager);
-        if (scLock)
+        TCHAR buf[300];     /* buffer to hold key path */
+        INT NumListedServ = 0; /* how many services were listed */
+
+        for (Index = 0; Index < NumServices; Index++)
         {
-            hSc = OpenService(hSCManager,
-                              lpServiceName,
-                              SERVICE_CHANGE_CONFIG);
-            if (hSc)
+            HKEY hKey = NULL;
+            LPTSTR Description = NULL;
+            LPTSTR LogOnAs = NULL;
+            DWORD StartUp = 0;
+            DWORD dwValueSize;
+
+             /* open the registry key for the service */
+            _sntprintf(buf,
+                       300,
+                       Path,
+                       Info->pServiceStatus[Index].lpServiceName);
+
+            RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                         buf,
+                         0,
+                         KEY_READ,
+                         &hKey);
+
+
+            /* set the display name */
+            ZeroMemory(&lvItem, sizeof(LVITEM));
+            lvItem.mask = LVIF_TEXT | LVIF_PARAM;
+            lvItem.pszText = Info->pServiceStatus[Index].lpDisplayName;
+
+            /* Set a pointer for each service so we can query it later.
+             * Not all services are added to the list, so we can't query
+             * the item number as they become out of sync with the array */
+            lvItem.lParam = (LPARAM)&Info->pServiceStatus[Index];
+
+            lvItem.iItem = ListView_GetItemCount(Info->hListView);
+            lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem);
+
+
+
+            /* set the description */
+            if (GetDescription(Info->pServiceStatus[Index].lpServiceName, &Description))
             {
-                if (ChangeServiceConfig(hSc,
-                                        pServiceConfig->dwServiceType,
-                                        pServiceConfig->dwStartType,
-                                        pServiceConfig->dwErrorControl,
-                                        pServiceConfig->lpBinaryPathName,
-                                        pServiceConfig->lpLoadOrderGroup,
-                                        pServiceConfig->dwTagId ? &pServiceConfig->dwTagId : NULL,
-                                        pServiceConfig->lpDependencies,
-                                        pServiceConfig->lpServiceStartName,
-                                        lpPassword,
-                                        pServiceConfig->lpDisplayName))
-                {
-                    bRet = TRUE;
-                }
+                lvItem.pszText = Description;
+                lvItem.iSubItem = 1;
+                SendMessage(Info->hListView,
+                            LVM_SETITEMTEXT,
+                            lvItem.iItem,
+                            (LPARAM)&lvItem);
+
+                HeapFree(ProcessHeap,
+                         0,
+                         Description);
             }
 
-            UnlockServiceDatabase(scLock);
+
+            /* set the status */
+            if (Info->pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING)
+            {
+                LoadString(hInstance,
+                           IDS_SERVICES_STARTED,
+                           szStatus,
+                           sizeof(szStatus) / sizeof(TCHAR));
+                lvItem.pszText = szStatus;
+                lvItem.iSubItem = 2;
+                SendMessage(Info->hListView,
+                            LVM_SETITEMTEXT,
+                            lvItem.iItem,
+                            (LPARAM)&lvItem);
+            }
+
+
+
+            /* set the startup type */
+            dwValueSize = sizeof(DWORD);
+            if (RegQueryValueEx(hKey,
+                                _T("Start"),
+                                NULL,
+                                NULL,
+                                (LPBYTE)&StartUp,
+                                &dwValueSize))
+            {
+                RegCloseKey(hKey);
+                continue;
+            }
+
+            if (StartUp == 0x02)
+            {
+                LoadString(hInstance,
+                           IDS_SERVICES_AUTO,
+                           szStatus,
+                           sizeof(szStatus) / sizeof(TCHAR));
+                lvItem.pszText = szStatus;
+                lvItem.iSubItem = 3;
+                SendMessage(Info->hListView,
+                            LVM_SETITEMTEXT,
+                            lvItem.iItem,
+                            (LPARAM)&lvItem);
+            }
+            else if (StartUp == 0x03)
+            {
+                LoadString(hInstance,
+                           IDS_SERVICES_MAN,
+                           szStatus,
+                           sizeof(szStatus) / sizeof(TCHAR));
+                lvItem.pszText = szStatus;
+                lvItem.iSubItem = 3;
+                SendMessage(Info->hListView,
+                            LVM_SETITEMTEXT,
+                            lvItem.iItem,
+                            (LPARAM)&lvItem);
+            }
+            else if (StartUp == 0x04)
+            {
+                LoadString(hInstance,
+                           IDS_SERVICES_DIS,
+                           szStatus,
+                           sizeof(szStatus) / sizeof(TCHAR));
+                lvItem.pszText = szStatus;
+                lvItem.iSubItem = 3;
+                SendMessage(Info->hListView,
+                            LVM_SETITEMTEXT,
+                            lvItem.iItem,
+                            (LPARAM)&lvItem);
+            }
+
+
+
+            /* set Log On As */
+            dwValueSize = 0;
+            if (RegQueryValueEx(hKey,
+                                _T("ObjectName"),
+                                NULL,
+                                NULL,
+                                NULL,
+                                &dwValueSize))
+            {
+                RegCloseKey(hKey);
+                continue;
+            }
+
+            LogOnAs = HeapAlloc(ProcessHeap,
+                                HEAP_ZERO_MEMORY,
+                                dwValueSize);
+            if (LogOnAs == NULL)
+            {
+                RegCloseKey(hKey);
+                return FALSE;
+            }
+            if(RegQueryValueEx(hKey,
+                               _T("ObjectName"),
+                               NULL,
+                               NULL,
+                               (LPBYTE)LogOnAs,
+                               &dwValueSize))
+            {
+                HeapFree(ProcessHeap,
+                         0,
+                         LogOnAs);
+                RegCloseKey(hKey);
+                continue;
+            }
+
+            lvItem.pszText = LogOnAs;
+            lvItem.iSubItem = 4;
+            SendMessage(Info->hListView,
+                        LVM_SETITEMTEXT,
+                        lvItem.iItem,
+                        (LPARAM)&lvItem);
+
+            HeapFree(ProcessHeap,
+                     0,
+                     LogOnAs);
+
+            RegCloseKey(hKey);
+
         }
+
+        NumListedServ = ListView_GetItemCount(Info->hListView);
+
+        /* set the number of listed services in the status bar */
+        LoadString(hInstance,
+                   IDS_NUM_SERVICES,
+                   szNumServices,
+                   sizeof(szNumServices) / sizeof(TCHAR));
+
+        _sntprintf(buf,
+                   300,
+                   szNumServices,
+                   NumListedServ);
+
+        SendMessage(Info->hStatus,
+                    SB_SETTEXT,
+                    0,
+                    (LPARAM)buf);
     }
 
-    if (!bRet)
-        GetError();
+    /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */
+    SendMessage (Info->hListView,
+                 WM_SETREDRAW,
+                 TRUE,
+                 0) ;
 
-    return bRet;
+    return TRUE;
 }
 
 
-LPTSTR
-GetServiceDescription(LPTSTR lpServiceName)
-{
-    SC_HANDLE hSCManager = NULL;
-    SC_HANDLE hSc = NULL;
-    SERVICE_DESCRIPTION *pServiceDescription = NULL;
-    LPTSTR lpDescription = NULL;
-    DWORD BytesNeeded = 0;
-
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ENUMERATE_SERVICE);
-    if (hSCManager == NULL)
-    {
-        GetError();
-        return NULL;
-    }
-
-    hSc = OpenService(hSCManager,
-                      lpServiceName,
-                      SERVICE_QUERY_CONFIG);
-    if (hSc)
-    {
-        if (!QueryServiceConfig2(hSc,
-                                 SERVICE_CONFIG_DESCRIPTION,
-                                 NULL,
-                                 0,
-                                 &BytesNeeded))
-        {
-            if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-            {
-                pServiceDescription = (SERVICE_DESCRIPTION *) HeapAlloc(ProcessHeap,
-                                                                        0,
-                                                                        BytesNeeded);
-                if (pServiceDescription == NULL)
-                    goto cleanup;
-
-                if (QueryServiceConfig2(hSc,
-                                        SERVICE_CONFIG_DESCRIPTION,
-                                        (LPBYTE)pServiceDescription,
-                                        BytesNeeded,
-                                        &BytesNeeded))
-                {
-                    if (pServiceDescription->lpDescription)
-                    {
-                        lpDescription = HeapAlloc(ProcessHeap,
-                                                  0,
-                                                  (_tcslen(pServiceDescription->lpDescription) + 1) * sizeof(TCHAR));
-                        if (lpDescription)
-                            _tcscpy(lpDescription,
-                                    pServiceDescription->lpDescription);
-                    }
-                }
-            }
-        }
-    }
-
-cleanup:
-    if (pServiceDescription)
-        HeapFree(ProcessHeap,
-                 0,
-                 pServiceDescription);
-    if (hSCManager != NULL)
-        CloseServiceHandle(hSCManager);
-    if (hSc != NULL)
-        CloseServiceHandle(hSc);
-
-    return lpDescription;
-}
 
 
-BOOL
-SetServiceDescription(LPTSTR lpServiceName,
-                      LPTSTR lpDescription)
-{
-    SC_HANDLE hSCManager;
-    SC_HANDLE hSc;
-    SC_LOCK scLock;
-    SERVICE_DESCRIPTION ServiceDescription;
-    BOOL bRet = FALSE;
-
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_LOCK);
-    if (hSCManager)
-    {
-        scLock = LockServiceDatabase(hSCManager);
-        if (scLock)
-        {
-            hSc = OpenService(hSCManager,
-                              lpServiceName,
-                              SERVICE_CHANGE_CONFIG);
-            if (hSc)
-            {
-                ServiceDescription.lpDescription = lpDescription;
-
-                if (ChangeServiceConfig2(hSc,
-                                         SERVICE_CONFIG_DESCRIPTION,
-                                         &ServiceDescription))
-                {
-                    bRet = TRUE;
-                }
-
-                CloseServiceHandle(hSc);
-            }
-
-            UnlockServiceDatabase(scLock);
-        }
-
-        CloseServiceHandle(hSCManager);
-    }
-
-    if (!bRet)
-        GetError();
-
-    return bRet;
-}
-
-
-BOOL
-GetServiceList(PMAIN_WND_INFO Info,
-               DWORD *NumServices)
+DWORD
+GetServiceList(PMAIN_WND_INFO Info)
 {
     SC_HANDLE ScHandle;
-    BOOL bRet = FALSE;
 
     DWORD BytesNeeded = 0;
     DWORD ResumeHandle = 0;
+    DWORD NumServices = 0;
 
-    *NumServices = 0;
-
-    ScHandle = OpenSCManager(NULL,
-                             NULL,
-                             SC_MANAGER_ENUMERATE_SERVICE);
+    ScHandle = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE);
     if (ScHandle != INVALID_HANDLE_VALUE)
     {
-        if (!EnumServicesStatusEx(ScHandle,
-                                  SC_ENUM_PROCESS_INFO,
-                                  SERVICE_WIN32,
-                                  SERVICE_STATE_ALL,
-                                  NULL,
-                                  0,
-                                  &BytesNeeded,
-                                  NumServices,
-                                  &ResumeHandle,
-                                  0))
+        if (EnumServicesStatusEx(ScHandle,
+                                 SC_ENUM_PROCESS_INFO,
+                                 SERVICE_WIN32,
+                                 SERVICE_STATE_ALL,
+                                 (LPBYTE)Info->pServiceStatus,
+                                 0, &BytesNeeded,
+                                 &NumServices,
+                                 &ResumeHandle,
+                                 0) == FALSE)
         {
             /* Call function again if required size was returned */
             if (GetLastError() == ERROR_MORE_DATA)
             {
                 /* reserve memory for service info array */
-                Info->pAllServices = (ENUM_SERVICE_STATUS_PROCESS *) HeapAlloc(ProcessHeap,
-                                                                         0,
-                                                                         BytesNeeded);
-                if (Info->pAllServices)
+                Info->pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *)
+                        HeapAlloc(ProcessHeap,
+                                  0,
+                                  BytesNeeded);
+                if (Info->pServiceStatus == NULL)
+			        return FALSE;
+
+                /* fill array with service info */
+                if (EnumServicesStatusEx(ScHandle,
+                                         SC_ENUM_PROCESS_INFO,
+                                         SERVICE_WIN32,
+                                         SERVICE_STATE_ALL,
+                                         (LPBYTE)Info->pServiceStatus,
+                                         BytesNeeded,
+                                         &BytesNeeded,
+                                         &NumServices,
+                                         &ResumeHandle,
+                                         0) == FALSE)
                 {
-                    /* fill array with service info */
-                    if (EnumServicesStatusEx(ScHandle,
-                                             SC_ENUM_PROCESS_INFO,
-                                             SERVICE_WIN32,
-                                             SERVICE_STATE_ALL,
-                                             (LPBYTE)Info->pAllServices,
-                                             BytesNeeded,
-                                             &BytesNeeded,
-                                             NumServices,
-                                             &ResumeHandle,
-                                             0))
-                    {
-                        bRet = TRUE;
-                    }
+                    HeapFree(ProcessHeap,
+                             0,
+                             Info->pServiceStatus);
+                    return FALSE;
                 }
             }
+            else /* exit on failure */
+            {
+                return FALSE;
+            }
         }
     }
 
-    if (ScHandle)
-        CloseServiceHandle(ScHandle);
+    CloseServiceHandle(ScHandle);
 
-    if (!bRet)
-    {
-        HeapFree(ProcessHeap,
-                 0,
-                 Info->pAllServices);
-    }
-
-    return bRet;
-}
-
-
-BOOL
-UpdateServiceStatus(ENUM_SERVICE_STATUS_PROCESS* pService)
-{
-    SC_HANDLE hScm;
-    BOOL bRet = FALSE;
-
-    hScm = OpenSCManager(NULL,
-                             NULL,
-                             SC_MANAGER_ENUMERATE_SERVICE);
-    if (hScm != INVALID_HANDLE_VALUE)
-    {
-        SC_HANDLE hService;
-
-        hService = OpenService(hScm,
-                               pService->lpServiceName,
-                               SERVICE_QUERY_STATUS);
-        if (hService)
-        {
-            DWORD size;
-
-            QueryServiceStatusEx(hService,
-                                 SC_STATUS_PROCESS_INFO,
-                                 (LPBYTE)&pService->ServiceStatusProcess,
-                                 sizeof(*pService),
-                                 &size);
-
-            bRet = TRUE;
-        }
-    }
-
-    return bRet;
+    return NumServices;
 }

reactos/base/applications/mscutils/servman/resource.h

@@ -51,6 +51,8 @@
 #define IDS_TOOLTIP_STOP    6006
 #define IDS_TOOLTIP_PAUSE   6007
 #define IDS_TOOLTIP_RESTART 6008
+#define IDS_TOOLTIP_HELP    6009
+#define IDS_TOOLTIP_EXIT    6010
 
 #define IDS_SERVICES_STARTED 5000
 #define IDS_SERVICES_STOPPED 5001
@@ -71,6 +73,8 @@
 #define IDB_STOP            10006
 #define IDB_PAUSE           10007
 #define IDB_RESTART         10008
+#define IDB_HELP            10009
+#define IDB_EXIT            10010
 
 /* toolbar buttons */
 #define TBICON_PROP         0
@@ -82,6 +86,8 @@
 #define TBICON_STOP         6
 #define TBICON_PAUSE        7
 #define TBICON_RESTART      8
+#define TBICON_HELP         9
+#define TBICON_EXIT         10
 
 
 /* menu hints */
@@ -121,18 +127,17 @@
 
 /* properties dialog */
 #define IDD_DLG_GENERAL     10001
-#define IDC_SERV_NAME       10002
-#define IDC_DISP_NAME       10003
-#define IDC_DESCRIPTION     10004
-#define IDC_EXEPATH         10005
-#define IDC_START_TYPE      10006
-#define IDC_SERV_STATUS     10007
-#define IDC_START_PARAM     10008
-#define IDC_EDIT            10009
-#define IDC_START           10101
-#define IDC_STOP            10102
-#define IDC_PAUSE           10103
-#define IDC_RESUME          10104
+#define IDC_SERV_NAME       10041
+#define IDC_DISP_NAME       10051
+#define IDC_DESCRIPTION     10061
+#define IDC_EXEPATH         10062
+#define IDC_START_TYPE      10101
+#define IDC_SERV_STATUS     10121
+#define IDC_START           10131
+#define IDC_STOP            10141
+#define IDC_PAUSE           10151
+#define IDC_RESUME          10161
+#define IDC_START_PARAM     10191
 
 /* dependancies dialog */
 #define IDD_DLG_DEPEND      20001
@@ -162,15 +167,14 @@
 #define IDC_DEL_NAME        9002
 #define IDC_DEL_DESC        9003
 #define IDS_DELETE_STOP     9010
-#define IDS_DELETE_SUCCESS  9011
 
 
 /* progress bar */
-#define IDD_DLG_PROGRESS         7000
-#define IDC_SERVCON_PROGRESS     7001
-#define IDC_SERVCON_INFO         7002
-#define IDC_SERVCON_NAME         7003
-#define IDS_PROGRESS_INFO_START  7004
-#define IDS_PROGRESS_INFO_STOP   7005
-#define IDS_PROGRESS_INFO_PAUSE  7006
-#define IDS_PROGRESS_INFO_RESUME 7007
+#define IDD_DLG_PROGRESS    7000
+#define IDC_SERVCON_PROGRESS 7001
+#define IDC_SERVCON_INFO    7002
+#define IDC_SERVCON_NAME    7003
+#define IDS_PROGRESS_INFO_START 7004
+#define IDS_PROGRESS_INFO_STOP 7005
+
+

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

@@ -17,6 +17,8 @@ IDB_START   BITMAP DISCARDABLE "res/start.bmp"
 IDB_STOP    BITMAP DISCARDABLE "res/stop.bmp"
 IDB_PAUSE   BITMAP DISCARDABLE "res/pause.bmp"
 IDB_RESTART BITMAP DISCARDABLE "res/restart.bmp"
+IDB_HELP    BITMAP DISCARDABLE "res/help.bmp"
+IDB_EXIT    BITMAP DISCARDABLE "res/exit.bmp"
 
 #include "lang/bg-BG.rc"
 #include "lang/de-DE.rc"
@@ -27,4 +29,5 @@ IDB_RESTART BITMAP DISCARDABLE "res/restart.bmp"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/th-TH.rc"
-#include "lang/uk-UA.rc"
+
+

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

@@ -64,3 +64,6 @@ _tWinMain(HINSTANCE hThisInstance,
 
     return Ret;
 }
+
+
+

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

@@ -20,14 +20,14 @@
       <file>create.c</file>
       <file>delete.c</file>
       <file>export.c</file>
-      <file>listview.c</file>
       <file>mainwnd.c</file>
       <file>misc.c</file>
       <file>progress.c</file>
       <file>propsheet.c</file>
       <file>query.c</file>
       <file>servman.c</file>
-      <file>start.c</file>
+      <file>start.c</file>	
+      <file>stop.c</file>	
     </compilationunit>
     <file>servman.rc</file>
     <pch>precomp.h</pch>

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

@@ -1,127 +1,225 @@
 /*
  * PROJECT:     ReactOS Services
  * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/mscutils/servman/start.c
+ * FILE:        base/system/servman/start.c
  * PURPOSE:     Start a service
- * COPYRIGHT:   Copyright 2005-2007 Ged Murphy <gedmurphy@reactos.org>
+ * COPYRIGHT:   Copyright 2005 - 2006 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
 #include "precomp.h"
 
 static BOOL
-DoStartService(PMAIN_WND_INFO Info,
-               HWND hProgDlg)
+DoStartService(PMAIN_WND_INFO Info)
 {
+    HWND hProgBar;
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
     SERVICE_STATUS_PROCESS ServiceStatus;
     DWORD BytesNeeded = 0;
-    BOOL bRet = FALSE;
+    INT ArgCount = 0;
+    DWORD dwStartTickCount, dwOldCheckPoint;
 
+
+    /* set the progress bar range and step */
+    hProgBar = GetDlgItem(Info->hProgDlg,
+                          IDC_SERVCON_PROGRESS);
+
+    SendMessage(hProgBar,
+                PBM_SETRANGE,
+                0,
+                MAKELPARAM(0, PROGRESSRANGE));
+
+    SendMessage(hProgBar,
+                PBM_SETSTEP,
+                (WPARAM)1,
+                0);
+
+    /* open handle to the SCM */
     hSCManager = OpenSCManager(NULL,
                                NULL,
                                SC_MANAGER_ALL_ACCESS);
-    if (hSCManager != NULL)
+    if (hSCManager == NULL)
     {
-        hSc = OpenService(hSCManager,
-                          Info->pCurrentService->lpServiceName,
-                          SERVICE_ALL_ACCESS);
-        if (hSc != NULL)
+        GetError();
+        return FALSE;
+    }
+
+    /* get a handle to the service requested for starting */
+    hSc = OpenService(hSCManager,
+                      Info->CurrentService->lpServiceName,
+                      SERVICE_ALL_ACCESS);
+    if (hSc == NULL)
+    {
+        GetError();
+        return FALSE;
+    }
+
+    /* start the service opened */
+    if (! StartService(hSc,
+                       ArgCount,
+                       NULL))
+    {
+        GetError();
+        return FALSE;
+    }
+
+    /* query the state of the service */
+    if (! QueryServiceStatusEx(hSc,
+                               SC_STATUS_PROCESS_INFO,
+                               (LPBYTE)&ServiceStatus,
+                               sizeof(SERVICE_STATUS_PROCESS),
+                               &BytesNeeded))
+    {
+        GetError();
+        return FALSE;
+    }
+
+    /* Save the tick count and initial checkpoint. */
+    dwStartTickCount = GetTickCount();
+    dwOldCheckPoint = ServiceStatus.dwCheckPoint;
+
+    /* loop whilst service is not running */
+    /* FIXME: needs more control adding. 'Loop' is temparary */
+    while (ServiceStatus.dwCurrentState != SERVICE_RUNNING)
+    {
+        DWORD dwWaitTime;
+
+        dwWaitTime = ServiceStatus.dwWaitHint / 10;
+
+        if( dwWaitTime < 500 )
+            dwWaitTime = 500;
+        else if ( dwWaitTime > 5000 )
+            dwWaitTime = 5000;
+
+        /* increment the progress bar */
+        SendMessage(hProgBar, PBM_STEPIT, 0, 0);
+
+        /* wait before checking status */
+        Sleep(ServiceStatus.dwWaitHint / 8);
+
+        /* check status again */
+        if (! QueryServiceStatusEx(hSc,
+                                   SC_STATUS_PROCESS_INFO,
+                                   (LPBYTE)&ServiceStatus,
+                                   sizeof(SERVICE_STATUS_PROCESS),
+                                   &BytesNeeded))
         {
-            if (StartService(hSc,
-                              0,
-                              NULL))
-            {
-                if (QueryServiceStatusEx(hSc,
-                                         SC_STATUS_PROCESS_INFO,
-                                         (LPBYTE)&ServiceStatus,
-                                         sizeof(SERVICE_STATUS_PROCESS),
-                                         &BytesNeeded))
-                {
-                    DWORD dwStartTickCount = GetTickCount();
-                    DWORD dwOldCheckPoint = ServiceStatus.dwCheckPoint;
-
-                    while (ServiceStatus.dwCurrentState != SERVICE_RUNNING)
-                    {
-                        DWORD dwWaitTime = ServiceStatus.dwWaitHint / 10;
-
-                        if(dwWaitTime < 1000)
-                            dwWaitTime = 500;
-                        else if (dwWaitTime > 10000)
-                            dwWaitTime = 10000;
-
-                        IncrementProgressBar(hProgDlg);
-                        Sleep(dwWaitTime );
-                        IncrementProgressBar(hProgDlg);
-
-                        if (!QueryServiceStatusEx(hSc,
-                                                  SC_STATUS_PROCESS_INFO,
-                                                  (LPBYTE)&ServiceStatus,
-                                                  sizeof(SERVICE_STATUS_PROCESS),
-                                                  &BytesNeeded))
-                        {
-                            break;
-                        }
-
-                        if (ServiceStatus.dwCheckPoint > dwOldCheckPoint)
-                        {
-                            /* The service is making progress, increment the progress bar */
-                            IncrementProgressBar(hProgDlg);
-                            dwStartTickCount = GetTickCount();
-                            dwOldCheckPoint = ServiceStatus.dwCheckPoint;
-                        }
-                        else
-                        {
-                            if(GetTickCount() - dwStartTickCount > ServiceStatus.dwWaitHint)
-                            {
-                                /* No progress made within the wait hint */
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            
-            CloseServiceHandle(hSc);
+            GetError();
+            return FALSE;
         }
 
-        CloseServiceHandle(hSCManager);
+        if (ServiceStatus.dwCheckPoint > dwOldCheckPoint)
+        {
+            /* The service is making progress. increment the progress bar */
+            SendMessage(hProgBar, PBM_STEPIT, 0, 0);
+            dwStartTickCount = GetTickCount();
+            dwOldCheckPoint = ServiceStatus.dwCheckPoint;
+        }
+        else
+        {
+            if(GetTickCount() - dwStartTickCount > ServiceStatus.dwWaitHint)
+            {
+                /* No progress made within the wait hint */
+                break;
+            }
+        }
     }
 
+    CloseServiceHandle(hSc);
+
     if (ServiceStatus.dwCurrentState == SERVICE_RUNNING)
     {
-        CompleteProgressBar(hProgDlg);
+        SendMessage(hProgBar,
+                    PBM_DELTAPOS,
+                    PROGRESSRANGE,
+                    0);
         Sleep(1000);
-        bRet = TRUE;
+        return TRUE;
     }
     else
-        GetError();
+        return FALSE;
 
-    return bRet;
 }
 
 
+
+
 BOOL
 DoStart(PMAIN_WND_INFO Info)
 {
     HWND hProgDlg;
-    BOOL bRet = FALSE;
+    TCHAR ProgDlgBuf[100];
 
-    hProgDlg = CreateProgressDialog(Info->hMainWnd,
-                                    Info->pCurrentService->lpServiceName,
-                                    IDS_PROGRESS_INFO_START);
-
-    if (hProgDlg)
+    /* open the progress dialog */
+    hProgDlg = CreateDialog(hInstance,
+                            MAKEINTRESOURCE(IDD_DLG_PROGRESS),
+                            Info->hMainWnd,
+                            (DLGPROC)ProgressDialogProc);
+    if (hProgDlg != NULL)
     {
-        bRet = DoStartService(Info,
-                              hProgDlg);
+        ShowWindow(hProgDlg,
+                   SW_SHOW);
 
-        SendMessage(hProgDlg,
-                    WM_DESTROY,
-                    0,
-                    0);
+        /* write the info to the progress dialog */
+        LoadString(hInstance,
+                   IDS_PROGRESS_INFO_START,
+                   ProgDlgBuf,
+                   sizeof(ProgDlgBuf) / sizeof(TCHAR));
+
+        SendDlgItemMessage(hProgDlg,
+                           IDC_SERVCON_INFO,
+                           WM_SETTEXT,
+                           0,
+                           (LPARAM)ProgDlgBuf);
+
+        /* write the service name to the progress dialog */
+        SendDlgItemMessage(hProgDlg,
+                           IDC_SERVCON_NAME,
+                           WM_SETTEXT,
+                           0,
+                           (LPARAM)Info->CurrentService->lpServiceName);
     }
 
-    return bRet;
+    /* start the service */
+    if ( DoStartService(Info) )
+    {
+        LVITEM item;
+        TCHAR szStatus[64];
+        TCHAR buf[25];
+
+        LoadString(hInstance,
+                   IDS_SERVICES_STARTED,
+                   szStatus,
+                   sizeof(szStatus) / sizeof(TCHAR));
+        item.pszText = szStatus;
+        item.iItem = Info->SelectedItem;
+        item.iSubItem = 2;
+        SendMessage(Info->hListView,
+                    LVM_SETITEMTEXT,
+                    item.iItem,
+                    (LPARAM) &item);
+
+        /* change dialog status */
+        if (Info->PropSheet != NULL)
+        {
+            LoadString(hInstance,
+                      IDS_SERVICES_STARTED,
+                      buf,
+                      sizeof(buf) / sizeof(TCHAR));
+
+            SendDlgItemMessageW(Info->PropSheet->hwndGenDlg,
+                                IDC_SERV_STATUS,
+                                WM_SETTEXT,
+                                0,
+                                (LPARAM)buf);
+        }
+    }
+
+    SendMessage(hProgDlg,
+                WM_DESTROY,
+                0,
+                0);
+
+    return TRUE;
 }

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

@@ -0,0 +1,78 @@
+/*
+ * PROJECT:     ReactOS Services
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/system/servman/stop.c
+ * PURPOSE:     Stops a service
+ * COPYRIGHT:   Copyright 2005 - 2006 Ged Murphy <gedmurphy@gmail.com>
+ *
+ */
+
+#include "precomp.h"
+
+BOOL DoStop(PMAIN_WND_INFO Info)
+{
+    HWND hProgDlg;
+    TCHAR ProgDlgBuf[100];
+
+    /* open the progress dialog */
+    hProgDlg = CreateDialog(hInstance,
+                            MAKEINTRESOURCE(IDD_DLG_PROGRESS),
+                            Info->hMainWnd,
+                            (DLGPROC)ProgressDialogProc);
+    if (hProgDlg != NULL)
+    {
+        ShowWindow(hProgDlg,
+                   SW_SHOW);
+
+        /* write the  info to the progress dialog */
+        LoadString(hInstance,
+                   IDS_PROGRESS_INFO_STOP,
+                   ProgDlgBuf,
+                   sizeof(ProgDlgBuf) / sizeof(TCHAR));
+
+        SendDlgItemMessage(hProgDlg,
+                           IDC_SERVCON_INFO,
+                           WM_SETTEXT,
+                           0,
+                           (LPARAM)ProgDlgBuf);
+
+        /* write the service name to the progress dialog */
+        SendDlgItemMessage(hProgDlg,
+                           IDC_SERVCON_NAME,
+                           WM_SETTEXT,
+                           0,
+                           (LPARAM)Info->CurrentService->lpServiceName);
+    }
+
+    if ( Control(Info, SERVICE_CONTROL_STOP) )
+    {
+        LVITEM item;
+        TCHAR buf[25];
+
+        item.pszText = _T('\0');
+        item.iItem = Info->SelectedItem;
+        item.iSubItem = 2;
+        SendMessage(Info->hListView,
+                    LVM_SETITEMTEXT,
+                    item.iItem,
+                    (LPARAM) &item);
+
+        /* change dialog status */
+        if (Info->PropSheet != NULL)
+        {
+            LoadString(hInstance,
+                       IDS_SERVICES_STOPPED,
+                       buf,
+                       sizeof(buf) / sizeof(TCHAR));
+
+            SendDlgItemMessageW(Info->PropSheet->hwndGenDlg,
+                                IDC_SERV_STATUS, WM_SETTEXT,
+                                0,
+                                (LPARAM)buf);
+        }
+    }
+
+    SendMessage(hProgDlg, WM_DESTROY, 0, 0);
+
+    return TRUE;
+}

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

@@ -1,205 +0,0 @@
-/*
- *  Notepad (Lithuanian resources)
- *
- *  Copyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>
- *  Proofread 1998 by David Lee Lambert <lamber45@egr.msu.edu>
- *  Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
- * Translation by Vytis "CMan" Gird<72>ijauskas (cman@cman.us) 
- */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-ID_ACCEL ACCELERATORS
-{
-    "^A", CMD_SELECT_ALL
-    "^C", CMD_COPY
-    "^F", CMD_SEARCH
-    "^G", CMD_GOTO
-    "H", CMD_REPLACE, VIRTKEY, CONTROL 
-    "^O", CMD_OPEN
-    "^S", CMD_SAVE
-    "^V", CMD_PASTE
-    "^X", CMD_CUT
-    "^Z", CMD_UNDO
-    VK_F3, CMD_SEARCH_NEXT, VIRTKEY
-    VK_F5, CMD_TIME_DATE, VIRTKEY
-}
-
-MAIN_MENU MENU
-BEGIN
-	POPUP "&Byla"
-	BEGIN
-		MENUITEM "&Nauja...",           CMD_NEW
-		MENUITEM "&Atverti\tCtrl+O",     CMD_OPEN
-		MENUITEM "<22>&ra<72>yti\tCtrl+S",     CMD_SAVE
-		MENUITEM "<22>ra<72>yti &kaip...",       CMD_SAVE_AS
-		MENUITEM SEPARATOR
-		MENUITEM "P&uslapio nuostatos...",    CMD_PAGE_SETUP
-		MENUITEM "&Spausdinti",            CMD_PRINT
-		MENUITEM "S&pausdintuvo nuostatos...", CMD_PRINTER_SETUP
-		MENUITEM SEPARATOR
-		MENUITEM "&Baigti",             CMD_EXIT
-	END
-	POPUP "&Redaguoti"
-	BEGIN
-		MENUITEM "&At<41>aukti\tCtrl+Z",     CMD_UNDO
-		MENUITEM SEPARATOR
-		MENUITEM "&I<>kirpti\tCtrl+X",      CMD_CUT
-		MENUITEM "&Kopijuoti\tCtrl+C",     CMD_COPY
-		MENUITEM "<22>&d<>ti\tCtrl+V",    CMD_PASTE
-		MENUITEM "&Trinti\tDel",      CMD_DELETE
-		MENUITEM SEPARATOR
-		MENUITEM "I&e<>koti...\tCtrl+F",  CMD_SEARCH
-		MENUITEM "Ie<49>k&oti toliau\tF3",    CMD_SEARCH_NEXT
-		MENUITEM "Pakeisti\tCtrl+H",   CMD_REPLACE
-		MENUITEM "Eiti <20>...\tCtrl+G",  CMD_GOTO
-		MENUITEM SEPARATOR
-		MENUITEM "Pa<50>ym<79>ti &visk<73>\tCtrl+A",       CMD_SELECT_ALL
-		MENUITEM "&Laikas ir data\tF5",    CMD_TIME_DATE
-	END
-	POPUP "&Formatas"
-	BEGIN
-		MENUITEM "&Lau<61>yti eilutes",  CMD_WRAP
-		MENUITEM "<22>&riftas...",          CMD_FONT
-	END
-	POPUP "R&odymas"
-	BEGIN
-		MENUITEM "&B<>senos juosta",    CMD_STATUSBAR
-	END
-	POPUP "&Pagalba"
-	BEGIN
-		MENUITEM "&Turinys",         CMD_HELP_CONTENTS
-		MENUITEM "&Ie<49>koti...",        CMD_HELP_SEARCH
-		MENUITEM "&Pagalba",     CMD_HELP_ON_HELP
-		MENUITEM SEPARATOR
-		MENUITEM "&Apie Notepad"             CMD_ABOUT
-		MENUITEM "Apie &Wine",      CMD_ABOUT_WINE
-	END
-END
-
-/* Dialog `Page setup' */
-
-DIALOG_PAGESETUP DIALOG 0, 0, 225, 95
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
-CAPTION "Puslapio nuostatos"
-{
-LTEXT    "&Antra<72>t<EFBFBD>:",  0x140,   10, 07, 40, 15
-EDITTEXT                         0x141,       60, 05,110, 12, WS_BORDER | WS_TABSTOP
-LTEXT    "&Pora<72>t<EFBFBD>:",  0x142,   10, 24, 40, 15
-EDITTEXT                         0x143,       60, 22,110, 12, WS_BORDER | WS_TABSTOP
-
-GROUPBOX "Pa&ra<72>t<EFBFBD>s:",      0x144,     10, 43,160, 45
-LTEXT    "&Kair<69>:",        0x145,   20, 55, 30, 10, WS_CHILD
-EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/   0x147,       50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-LTEXT    "&Vir<69>us:",         0x148,    20, 73, 30, 10, WS_CHILD
-EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/    0x14A,        50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-LTEXT    "&De<44>in<69>:",       0x14B, 100, 55, 30, 10, WS_CHILD
-EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/  0x14D,     130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-LTEXT    "Apa<70>&ia:",      0x14E,100, 73, 30, 10, WS_CHILD
-EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150,    130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
-
-DEFPUSHBUTTON "OK",         IDOK,                   180,  3, 40, 15, WS_TABSTOP
-PUSHBUTTON    "At<41>aukti",     IDCANCEL,               180, 21, 40, 15, WS_TABSTOP
-PUSHBUTTON    "Pagalba",       IDHELP,                180, 39, 40, 15, WS_TABSTOP
-}
-
-/* Dialog `Encoding' */
-DIALOG_ENCODING DIALOG 0, 0, 256, 44
-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | 
-    WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
-CAPTION "Koduot<6F>"
-{
-COMBOBOX        ID_ENCODING,73,0,138,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-LTEXT           "Koduot<6F>:",0x155,5,2,41,12
-COMBOBOX        ID_EOLN,73,18,138,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-LTEXT           "Eilut<75>s pabaiga:",0x156,5,20,53,12
-}
-
-/* Dialog 'Go To' */
-DIALOG_GOTO DIALOG 0,0,165,50
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
-CAPTION "Eiti <20> eilut<75>"
-{
-EDITTEXT        ID_LINENUMBER,64,10,96,12,WS_CHILD | WS_BORDER | WS_TABSTOP
-LTEXT           "Eilut<75>s numeris:",0x155,5,12,54,12,WS_CHILD | WS_TABSTOP | ES_NUMBER
-DEFPUSHBUTTON   "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP
-PUSHBUTTON      "At<41>aukti", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP
-}
-
-IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,290,170
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "Apie ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    CONTROL         "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur@g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack@looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n",
-                    -1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,46,7,238,39
-    CONTROL         " ",
-                    -1,"Static",0x50000000,8,48,272,11
-    DEFPUSHBUTTON   "U<>verti",IDOK,123,149,44,15,WS_GROUP
-    ICON            IDI_NPICON,-1,12,9,20,30
-    EDITTEXT        IDC_LICENSE,8,64,275,81,ES_MULTILINE |
-                    ES_READONLY | WS_VSCROLL
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  STRING_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."
-END
-
-STRINGTABLE DISCARDABLE
-{
-STRING_PAGESETUP_HEADERVALUE,   "&n"        /* FIXME */
-STRING_PAGESETUP_FOOTERVALUE,   "Puslapis &s"   /* FIXME */
-STRING_PAGESETUP_LEFTVALUE,             "20 mm"     /* FIXME */
-STRING_PAGESETUP_RIGHTVALUE,    "20 mm"     /* FIXME */
-STRING_PAGESETUP_TOPVALUE,              "25 mm"     /* FIXME */
-STRING_PAGESETUP_BOTTOMVALUE,   "25 mm"     /* FIXME */
-
-STRING_NOTEPAD,                                 "Notepad"
-STRING_ERROR,                                   "KLAIDA"
-STRING_WARNING,                                 "<22>SP<53>JIMAS"
-STRING_INFO,                                    "Informacija"
-
-STRING_UNTITLED,                                "(bevardis)"
-
-STRING_ALL_FILES,                               "Visos bylos (*.*)"
-STRING_TEXT_FILES_TXT,                  "Tekstin<69>s bylos (*.txt)"
-
-STRING_TOOLARGE,                                "Byla '%s' yra perdidel<65>.\n \
-Pra<EFBFBD>ome naudotis kitu redaktoriumi."
-STRING_NOTEXT,                                  "J<>s neived<65>te jokio teksto. \
-\nPra<72>ome para<72>yti k<> nors ir bandyti dar kart<72>"
-STRING_DOESNOTEXIST,                            "Byla '%s'\nneegzistuoja\n\n \
-Ar norite sukurti nauj<75> byl<79>?"
-STRING_NOTSAVED,                                "Byla '%s'\nbuvo pakeista\n\n \
-Ar norite i<>saugoti pakeitimus?"
-STRING_NOTFOUND,                                        "'%s' nerastas."
-STRING_OUT_OF_MEMORY,                   "Nepakanka atminties u<>duoties u<>baigimui. \
-\nU<6E>verkite vien<65> ar kelias programas, kad padidintum<75>te \nlaisvos atminties kiek<65>."
-STRING_CANNOTFIND                               "Nepavyko rasti '%s'"
-STRING_ANSI,                                    "ANSI"
-STRING_UNICODE,                                 "Unicode"
-STRING_UNICODE_BE,                              "Unicode (big endian)"
-STRING_UTF8,                                    "UTF-8"
-STRING_CRLF,                                    "Windows"
-STRING_LF,                                      "Unix"
-STRING_CR,                                      "Mac"
-}

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

@@ -133,7 +133,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  STRING_LICENSE, "Niniejszy program jest wolnym oprogramowaniem; mo<6D>esz go rozprowadza<7A> dalej i/lub modyfikowa<77> na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacj<63> Wolnego Oprogramowania - wed<65>ug wersji 2 tej Licencji lub (wed<65>ug Twojego wyboru) kt<6B>rej<65> z p<><70>niejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej<65>, i<> b<>dzie on u<>yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domy<6D>lnej gwarancji PRZYDATNO<4E>CI HANDLOWEJ albo PRZYDATNO<4E>CI DO OKRE<52>LONYCH ZASTOSOWA<57>. W celu uzyskania bli<6C>szych informacji si<73>gnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewno<6E>ci<63> wraz z niniejszym programem otrzyma<6D>e<EFBFBD> te<74> egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); je<6A>li nie - napisz do Free Software Foundation, Inc., 59 Temple Place, Fifth Floor, Boston, MA  02110-1301  USA."
+  STRING_LICENSE, "Niniejszy program jest wolnym oprogramowaniem; mo<6D>esz go rozprowadza<7A> dalej i/lub modyfikowa<77> na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacj<63> Wolnego Oprogramowania - wed<65>ug wersji 2 tej Licencji lub (wed<65>ug twojego wyboru) kt<6B>rej<65> z p<><70>niejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej<65>, i<> b<>dzie on u<>yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domy<6D>lnej gwarancji PRZYDATNO<4E>CI HANDLOWEJ albo PRZYDATNO<4E>CI DO OKRE<52>LONYCH ZASTOSOWA<57>. W celu uzyskania bli<6C>szych informacji si<73>gnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewno<6E>ci<63> wraz z niniejszym programem otrzyma<6D>e<EFBFBD> te<74> egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); je<6A>li nie - napisz do Free Software Foundation, Inc., 59 Temple Place, Fifth Floor, Boston, MA  02110-1301  USA."
 END
 
 STRINGTABLE DISCARDABLE
@@ -152,19 +152,19 @@ STRING_INFO,                                    "Informacja"
 
 STRING_UNTITLED,                                "(bez tytu<74>u)"
 
-STRING_ALL_FILES,                               "Wszystkie pliki (*.*)"
+STRING_ALL_FILES,                               "Wszystkie piki (*.*)"
 STRING_TEXT_FILES_TXT,                  "Pliki tekstowe (*.txt)"
 
-STRING_TOOLARGE,                                "Plik '%s' jest za du<64>y dla Notatnika.\n \
+STRING_TOOLARGE,                                "Plik '%s' jest za du<64>y dla notatnika.\n \
 Prosz<EFBFBD> u<>y<EFBFBD> innego edytora."
 STRING_NOTEXT,                                  "Nie wprowadzi<7A>e<EFBFBD> <20>adnego tekstu. \
 \nProsz<73> co<63> wpisa<73> i spr<70>bowa<77> ponownie."
 STRING_DOESNOTEXIST,                            "Plik '%s' nie istnieje\n\n \
-Czy chcesz utworzy<7A> nowy plik?"
+Czy chcesz utworzy<7A> nowy plik ?"
 STRING_NOTSAVED,                                "Plik '%s'\nzosta<74> zmodyfikowany\n\n \
-Czy chcesz zachowa<77> zmiany?"
+Czy chcesz zachowa<77> zmiany ?"
 STRING_NOTFOUND,                                        "Nie mo<6D>na odnale<6C><65> '%s'."
 STRING_OUT_OF_MEMORY,                   "Za ma<6D>o pami<6D>ci do wykonania tego zadania.\n \
-Zamknij jedn<64> lub wi<77>cej aplikacji, by zwi<77>kszy<7A> ilo<6C><6F> wolnej pami<6D>ci."
+Zamknij jedn<64> lub wi<77>cej aplikacji aby zwi<77>kszy<7A> ilo<6C><6F> wolnej pami<6D>ci."
 
 }

reactos/base/applications/notepad/rsrc.rc

@@ -40,7 +40,6 @@ IDI_NPICON ICON "res/notepad.ico"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
 #include "lang/ja-JP.rc"
-#include "lang/lt-LT.rc"
 #include "lang/nb-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

reactos/base/applications/regedit/clb/lang/bg-BG.rc

@@ -1,27 +0,0 @@
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
-
-IDD_COLUMNLISTBOXSTYLES DIALOGEX 0, 0, 227, 215
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-   GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", -1, 6, 7, 158, 71
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", 1710, 10, 20, 42, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD>", 1713, 10, 30, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", 1705, 10, 40, 26, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", 1706, 10, 50, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", 1707, 10, 60, 64, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", -1, 79, 20, 72, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED
-   CHECKBOX "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", -1, 79, 30, 77, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP | WS_DISABLED
-   CHECKBOX "<22><>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", 1714, 79, 40, 68, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", 1715, 79, 50, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   GROUPBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", -1, 6, 80, 158, 34
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD>", 1701, 10, 92, 34, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD>", 1702, 10, 102, 41, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD>", 1703, 79, 92, 32, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&Tab Stop", 1704, 79, 102, 44, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-   PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>", IDOK, 37, 125, 40, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
-   PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 93, 125, 40, 14, BS_PUSHBUTTON | WS_GROUP | WS_TABSTOP
-   CHECKBOX "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", 1708, 79, 60, 66, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
-END
-

reactos/base/applications/regedit/clb/rsrc.rc

@@ -28,7 +28,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 /* include localised resources */
 
-#include "lang/bg-BG.rc"
 #include "lang/el-GR.rc"
 #include "lang/en-US.rc"
 #include "lang/id-ID.rc"
@@ -39,4 +38,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "lang/th-TH.rc"
 #include "lang/uk-UA.rc"
 
-

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

@@ -41,7 +41,7 @@ BEGIN
     END
     POPUP "Pomo&c"
     BEGIN
-        MENUITEM "&Informacje...",                ID_HELP_ABOUT
+        MENUITEM "&Informacje ...",                ID_HELP_ABOUT
     END
 END
 
@@ -125,7 +125,7 @@ BEGIN
   BEGIN
         POPUP "&Nowy"
         BEGIN
-            MENUITEM "&Klucz",                    ID_EDIT_NEW_KEY
+            MENUITEM "&Kklucz",                    ID_EDIT_NEW_KEY
             MENUITEM SEPARATOR
             MENUITEM "&Warto<74><6F> ci<63>gu",             ID_EDIT_NEW_STRINGVALUE
             MENUITEM "Warto<74><6F> &binarna",           ID_EDIT_NEW_BINARYVALUE
@@ -237,7 +237,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     ID_REGISTRY_MENU        "Zawiera polecenia do pracy z ca<63>ym rejestrem"
-    ID_EDIT_MENU            "Zawiera polecenia do edycji warto<74>ci lub kluczy"
+    ID_EDIT_MENU            "Zawiera polecenia do edycji warto<74>ci lub klucz"
     ID_VIEW_MENU            "Zawiera polecenia do dostosowywania okien rejestru"
     ID_FAVOURITES_MENU      "Zawiera polecenia dla dost<73>pu do cz<63>sto u<>ywanych klawiszy"
     ID_HELP_MENU            "Zawiera polecenia do wy<77>wietlania Pomocy oraz informacji o Edytorze rejestru"
@@ -265,7 +265,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    ID_REGISTRY_EXIT        "Ko<EFBFBD>czy dzia<69>anie Edytora rejestru"
+    ID_REGISTRY_EXIT        "Konczy dzia<69>anie Edytora rejestru"
     ID_FAVOURITES_ADDTOFAVOURITES "Dodaje klawisze do listy element<6E>w ulubionych"
     ID_FAVOURITES_REMOVEFAVOURITE "Usuwa klawisze z listy element<6E>w ulubionych"
     ID_VIEW_STATUSBAR       "Pokazuje lub ukrywa pasek stanu"
@@ -273,7 +273,7 @@ BEGIN
     ID_VIEW_REFRESH         "Od<4F>wie<69>a okno"
     ID_EDIT_DELETE          "Usuwa zaznaczenie"
     ID_EDIT_RENAME          "Zmienia nazw<7A> zaznaczenia"
-    ID_EDIT_COPYKEYNAME     "Kopiuje nazw<7A> wybranego klucza do schowka"
+    ID_EDIT_COPYKEYNAME     "Kopiuje nazw<7A> wybranego klucza do Schowka"
     ID_EDIT_FIND            "Znajduje ci<63>g tekstowy w kluczu, warto<74>ci lub danych"
     ID_EDIT_FINDNEXT        "Znajduje nast<73>pne wyst<73>pienie tekstu okre<72>lonego przy poprzednim szukaniu"
 END
@@ -288,7 +288,7 @@ BEGIN
     IDS_MULTI_SZ_EMPTY_STRING "Dane typu REG_MULTI_SZ nie mog<6F> zawiera<72> pustych ci<63>g<EFBFBD>w.\nPusty ci<63>g zosta<74> usuni<6E>ty z listy."
     IDS_QUERY_DELETE_KEY_ONE    "Czy na pewno chcesz usun<75><6E> ten klucz?"
     IDS_QUERY_DELETE_KEY_MORE   "Czy na pewno chcesz usun<75><6E> te klucze?"
-    IDS_QUERY_DELETE_KEY_CONFIRM "Potwierdzanie usuni<6E>cia klucza"
+    IDS_QUERY_DELETE_KEY_CONFIRM "Potwierdzenie usuni<6E>cia klucza"
     IDS_QUERY_DELETE_ONE    "Czy na pewno chcesz usun<75><6E> t<> warto<74><6F>?"
     IDS_QUERY_DELETE_MORE   "Czy na pewno chcesz usun<75><6E> te warto<74>ci?"
     IDS_QUERY_DELETE_CONFIRM "Potwierdzanie usuni<6E>cia warto<74>ci"
@@ -303,7 +303,7 @@ END
 STRINGTABLE DISCARDABLE
 BEGIN
     IDS_BINARY_EMPTY	    "(warto<74><6F> binarna o d<>ugo<67>ci zero)"
-    IDS_DEFAULT_VALUE_NAME  "(domy<EFBFBD>lna)"
+    IDS_DEFAULT_VALUE_NAME  "(Domy<EFBFBD>lna)"
     IDS_VALUE_NOT_SET       "(warto<74><6F> nie ustalona)"
     IDS_UNKNOWN_TYPE        "Nieznany typ: (0x%lx)"
     IDS_MY_COMPUTER         "M<>j komputer"

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

@@ -1,7 +1,7 @@
 /*
  * Regedit (Ukrainian resources)
  *
- * Copyright 2006,2007 Artem Reznikov
+ * Copyright 2006 Artem Reznikov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -57,10 +57,10 @@ BEGIN
 		MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>...",		ID_REGISTRY_LOADHIVE, GRAYED
 		MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>...",		ID_REGISTRY_UNLOADHIVE, GRAYED
 		MENUITEM SEPARATOR
-        MENUITEM "&ϳ<><CFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",
+        MENUITEM "&ϳ<><CFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",
                                                 ID_REGISTRY_CONNECTNETWORKREGISTRY
 
-        MENUITEM "&³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",
+        MENUITEM "&³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",
                                                 ID_REGISTRY_DISCONNECTNETWORKREGISTRY
         , GRAYED
         MENUITEM SEPARATOR
@@ -112,7 +112,7 @@ BEGIN
     BEGIN
         MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>\tF1",                  ID_HELP_HELPTOPICS
         MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       ID_HELP_ABOUT
+        MENUITEM "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",       ID_HELP_ABOUT
     END
 END
 
@@ -238,18 +238,18 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_APP_TITLE           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_APP_TITLE           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDC_REGEDIT             "REGEDIT"
     IDC_REGEDIT_FRAME       "REGEDIT_FRAME"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    ID_REGISTRY_MENU        "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    ID_REGISTRY_MENU        "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_EDIT_MENU            "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    ID_VIEW_MENU            "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    ID_VIEW_MENU            "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_FAVOURITES_MENU      "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    ID_HELP_MENU            "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><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> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    ID_HELP_MENU            "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><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> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_EDIT_NEW_MENU        "̳<><CCB3><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 END
 
@@ -260,21 +260,21 @@ BEGIN
     ID_EDIT_NEW_STRINGVALUE "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_EDIT_NEW_BINARYVALUE "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_EDIT_NEW_DWORDVALUE  "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> DWORD-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    ID_REGISTRY_IMPORTREGISTRYFILE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    ID_REGISTRY_IMPORTREGISTRYFILE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_REGISTRY_EXPORTREGISTRYFILE
-                            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
+                            "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
     ID_REGISTRY_CONNECTNETWORKREGISTRY
-                            "ϳ<><CFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>"
+                            "ϳ<><CFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>"
     ID_REGISTRY_DISCONNECTNETWORKREGISTRY
-                            "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>"
-    ID_REGISTRY_PRINT       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-/*    ID_HELP_HELPTOPICS      "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" */
+                            "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>"
+    ID_REGISTRY_PRINT       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+/*    ID_HELP_HELPTOPICS      "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" */
     ID_HELP_ABOUT           "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    ID_REGISTRY_EXIT        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    ID_REGISTRY_EXIT        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_FAVOURITES_ADDTOFAVOURITES "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_FAVOURITES_REMOVEFAVOURITE "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     ID_VIEW_STATUSBAR       "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
@@ -295,7 +295,7 @@ BEGIN
     IDS_BAD_VALUE           "<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'"
     IDS_UNSUPPORTED_TYPE    "<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> (%ld)"
     IDS_TOO_BIG_VALUE       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (%ld)"
-    IDS_MULTI_SZ_EMPTY_STRING "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> REG_MULTI_SZ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+    IDS_MULTI_SZ_EMPTY_STRING "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> REG_MULTI_SZ <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n<><6E><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>-<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
     IDS_QUERY_DELETE_KEY_ONE    "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
     IDS_QUERY_DELETE_KEY_MORE   "<22><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
     IDS_QUERY_DELETE_KEY_CONFIRM "ϳ<><CFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -304,8 +304,8 @@ BEGIN
     IDS_QUERY_DELETE_CONFIRM "ϳ<><CFB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_ERR_DELVAL_CAPTION  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_ERR_DELETEVALUE     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>!"
-    IDS_ERR_RENVAL_CAPTION  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_ERR_RENVAL_TOEMPTY  "<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s. <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><>'<27> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+    IDS_ERR_RENVAL_CAPTION  "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_ERR_RENVAL_TOEMPTY  "<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> %s. <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>-<EFBFBD><EFBFBD> <20><>'<27> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
     IDS_NEW_KEY             "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #%d"
     IDS_NEW_VALUE           "<22><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #%d"
 END
@@ -317,16 +317,16 @@ BEGIN
     IDS_VALUE_NOT_SET       "(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
     IDS_UNKNOWN_TYPE        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>: (0x%lx)"
     IDS_MY_COMPUTER         "̳<> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD>"
-    IDS_IMPORT_REG_FILE     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_EXPORT_REG_FILE     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_IMPORT_REG_FILE     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_EXPORT_REG_FILE     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_INVALID_DWORD       "(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DWORD)"
 END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-    IDS_FLT_REGFILES        "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+    IDS_FLT_REGFILES        "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
     IDS_FLT_REGFILES_FLT    "*.reg"
-    IDS_FLT_REGEDIT4        "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Win9x/NT4 (REGEDIT4)"
+    IDS_FLT_REGEDIT4        "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Win9x/NT4 (REGEDIT4)"
     IDS_FLT_REGEDIT4_FLT    "*.reg"
     IDS_FLT_ALLFILES        "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> (*.*)"
     IDS_FLT_ALLFILES_FLT    "*.*"
@@ -360,7 +360,7 @@ BEGIN
   IDS_EXPAND                     "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_COLLAPSE                   "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
   IDS_GOTO_SUGGESTED_KEY         "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> '%s'"
-  IDS_FINISHEDFIND               "<22><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+  IDS_FINISHEDFIND               "<22><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
 END
 
 /*****************************************************************/
@@ -376,7 +376,7 @@ STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
 FONT 8, "MS Sans Serif"
 BEGIN
    GROUPBOX "ij<><C4B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,2,0,366,48
-   CONTROL "&<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11
+   CONTROL "&<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11
    CONTROL "<22><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11
    EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12
 END
@@ -434,7 +434,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     ICON            IDI_REGEDIT,IDC_STATIC,7,7,20,20
     PUSHBUTTON      "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDCANCEL,93,29,45,14
-    LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",IDC_STATIC,33,12,83,8
+    LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",IDC_STATIC,33,12,83,8
 END
 
 /*
@@ -455,7 +455,7 @@ END
 /*
  *STRINGTABLE DISCARDABLE
  *BEGIN
- *    ID_HELP_HELPTOPICS      "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+ *    ID_HELP_HELPTOPICS      "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
  *    ID_HELP_ABOUT           "³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
  *END
  */

reactos/base/applications/screensavers/logon/logon.c

@@ -155,7 +155,6 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			{
 				KillTimer (hwnd, APP_TIMER);
 				DeleteObject(bitmap);
-				ShowCursor(TRUE);
 				PostQuitMessage(0);
 				break;	
 			}
@@ -224,20 +223,14 @@ void InitSaver(HWND hwndParent)
 	else
 	{
 		HWND hwnd;
-		hwnd = CreateWindowEx(WS_EX_TOPMOST,
-                          APPNAME, 
-                          APPNAME,
-                          WS_VISIBLE | WS_POPUP,
-                          0, 0,
-                          GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
-                          HWND_DESKTOP, 0,
-                          hInstance, NULL);
-        
-    SetWindowPos(hwnd, 
-                 0, 0, 0, 0, 0, 
-                 SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW);
-
-    ShowCursor(FALSE);
+		hwnd = CreateWindow(APPNAME, APPNAME,
+		                    WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST,
+		                    0, 0,
+		                    GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+		                    HWND_DESKTOP, 0,
+		                    hInstance, NULL);
+		ShowWindow(hwnd, SW_SHOWMAXIMIZED);
+		ShowCursor(FALSE);
 		fullscreen = TRUE;
 	}
 }

reactos/base/applications/screensavers/matrix/lang/bg-BG.rc

@@ -1,6 +1,30 @@
+//Microsoft Developer Studio generated resource script.
+//
 #include "resource.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Bulgarian (BG) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
 
 IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -47,7 +71,97 @@ BEGIN
                     158,75,18
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_DESCRIPTION         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Matrix"
 END
+
+#endif    // Bulgarian (BG) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

reactos/base/applications/screensavers/matrix/lang/de-DE.rc

@@ -1,10 +1,34 @@
+//Microsoft Developer Studio generated resource script.
+//
 #include "resource.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// German (Germany) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
 
 IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Matrix Bildschirmschoner-Konfiguration"
+CAPTION "Matrix ScreenSaver Konfiguration"
 FONT 8, "MS Shell Dlg"
 BEGIN
     GROUPBOX        "Dekodierung&sgeschwindigkeit",IDC_STATIC,7,7,133,36
@@ -46,7 +70,97 @@ BEGIN
     CTEXT           "Matrix ScreenSaver www.catch22.org.uk",IDC_ABOUT,143, 158, 75, 18
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
 STRINGTABLE DISCARDABLE 
 BEGIN
-    IDS_DESCRIPTION         "Matrix Bildschirmschoner"
+    IDS_DESCRIPTION         "Matrix ScreenSaver"
 END
+
+#endif    // German (Germany) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

reactos/base/applications/screensavers/matrix/lang/en-US.rc

@@ -1,6 +1,30 @@
+//Microsoft Developer Studio generated resource script.
+//
 #include "resource.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
 
 IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -47,7 +71,97 @@ BEGIN
                     158,75,18
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_DESCRIPTION         "Matrix ScreenSaver"
 END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

reactos/base/applications/screensavers/matrix/lang/fr-FR.rc

@@ -1,6 +1,30 @@
+//Microsoft Developer Studio generated resource script.
+//
 #include "resource.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// French resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
+#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
 
 IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -47,7 +71,97 @@ BEGIN
                     158,75,18
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_DESCRIPTION         "Matrix ScreenSaver"
 END
+
+#endif    // French resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

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

@@ -6,9 +6,33 @@
  * DATE OF TR:  25-07-2007
  */
 
+//Microsoft Developer Studio generated resource script.
+//
 #include "resource.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Slovak resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+#pragma code_page(1250)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
 
 IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -55,7 +79,97 @@ BEGIN
                     158,75,18
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_DESCRIPTION         "Matrix - <20>etri<72> obrazovky"
 END
+
+#endif    // Slovak resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

reactos/base/applications/screensavers/matrix/lang/th-TH.rc

@@ -1,6 +1,30 @@
+//Microsoft Developer Studio generated resource script.
+//
 #include "resource.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Thai resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
+#pragma code_page(874)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
 
 IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
@@ -47,7 +71,97 @@ BEGIN
                     158,75,18
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_DESCRIPTION         "Matrix ScreenSaver"
 END
+
+#endif    // Thai resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

reactos/base/applications/screensavers/matrix/lang/uk-UA.rc

@@ -1,21 +1,37 @@
-/*
- * PROJECT:     Matrix ScreenSaver
- * LICENSE:     Public Domain
- * FILE:        base/applications/screensavers/matrix/lang/uk-UA.rc
- * PURPOSE:     Ukraianian Language File for Matrix ScreenSaver
- * TRANSLATOR:  Artem Reznikov
- */
-
+//Microsoft Developer Studio generated resource script.
+//
 #include "resource.h"
 
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Ukrainian resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
 
 IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ""<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"""
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,7,7,128,36
+    GROUPBOX        "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Decode",IDC_STATIC,7,7,128,36
     LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,13,24,22,8
     CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | 
                     TBS_BOTH | WS_TABSTOP,38,17,62,22
@@ -55,7 +71,97 @@ BEGIN
                     158,75,18
 END
 
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_CONFIG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 333
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+IDB_BITMAP1             BITMAP  DISCARDABLE     "matrix.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+IDC_BLANKCURSOR         CURSOR  DISCARDABLE     "cursor1.cur"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON    DISCARDABLE     "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_DESCRIPTION         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ""<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"""
 END
+
+#endif    // Ukrainian resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

reactos/base/applications/screensavers/matrix/matrix.c

@@ -304,7 +304,7 @@ LRESULT WINAPI MatrixWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	static POINT ptLast;
 	static POINT ptCursor;
 	static BOOL  fFirstTime = TRUE;
-
+	
 	MATRIX *matrix = GetMatrix(hwnd);
 
 	switch(msg)
@@ -432,7 +432,7 @@ void InitScreenSaveClass(BOOL fPreview)
 	wcx.hbrBackground	= (HBRUSH)GetStockObject(BLACK_BRUSH);
 	wcx.lpszMenuName	= 0;
 	wcx.lpszClassName	= APPNAME;
-	wcx.hIconSm			= 0;
+	wcx.hIconSm			= 0;	
 
 	if(fPreview)
 		wcx.hCursor			= LoadCursor(0, IDC_ARROW);

reactos/base/applications/screensavers/matrix/resource.h

@@ -1,5 +1,7 @@
-#define IDC_STATIC                      -1
-
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by matrix.rc
+//
 #define IDS_DESCRIPTION                 1
 #define IDD_CONFIG                      101
 #define IDB_BITMAP1                     104
@@ -20,3 +22,14 @@
 #define IDC_COMBO2                      1020
 #define IDC_MSGSPEEDGRP                 1021
 #define IDC_ABOUT                       1022
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        109
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1023
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

reactos/base/applications/screensavers/matrix/rsrc.rc

@@ -3,10 +3,6 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-IDB_BITMAP1      BITMAP  DISCARDABLE  "matrix.bmp"
-IDC_BLANKCURSOR  CURSOR  DISCARDABLE  "cursor1.cur"
-IDI_ICON1        ICON    DISCARDABLE  "icon1.ico"
-
 #include "lang/bg-BG.rc"
 #include "lang/en-US.rc"
 #include "lang/de-DE.rc"

reactos/base/applications/screensavers/matrix/screensave.c

@@ -21,13 +21,13 @@
 //#pragma comment(linker, "/OPT:NOWIN98")
 
 //
-//  Added: Multimonitor support!!
+//	Added: Multimonitor support!!
 //
 HMONITOR (WINAPI * pfnEnumDisplayMonitors)(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
 BOOL     (WINAPI * pfnGetMonitorInfo)(HMONITOR, LPMONITORINFO);
 
 //
-//  Callback function for EnumDisplayMonitors API. Use this function
+//	Callback function for EnumDisplayMonitors API. Use this function
 //  to kickstart a screen-saver window for each monitor in the system
 //
 BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, RECT *rcMonitor, LPARAM Param)
@@ -100,9 +100,9 @@ BOOL ScreenSaver(HWND hwndParent)
 //  -p <hwnd>		(preview)
 //  -c <hwnd>		(configure)
 //
-VOID ParseCommandLine(LPSTR szCmdLine, UCHAR *chOption, HWND *hwndParent)
+BOOL ParseCommandLine(LPSTR szCmdLine, int *chOption, HWND *hwndParent)
 {
-	UCHAR ch = *szCmdLine++;
+	int ch = *szCmdLine++;
 
 	if(ch == '-' || ch == '/')
 		ch = *szCmdLine++;
@@ -126,6 +126,8 @@ VOID ParseCommandLine(LPSTR szCmdLine, UCHAR *chOption, HWND *hwndParent)
 	}
 	else
 		*hwndParent = NULL;
+
+	return TRUE;
 }
 
 //
@@ -133,8 +135,8 @@ VOID ParseCommandLine(LPSTR szCmdLine, UCHAR *chOption, HWND *hwndParent)
 //
 int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int iCmdShow)
 {
-	HWND   hwndParent;
-	UCHAR  chOption;
+	HWND	hwndParent;
+	int		chOption;
 
 	// Make sure that only 1 instance runs at a time - 
 	// Win98 seems to want us to restart every 5 seconds!!
@@ -149,12 +151,12 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, int iCmdS
 	
 	switch(chOption)
 	{
-	case 's':   return ScreenSaver(NULL);           // screen save
-	case 'p':   return ScreenSaver(hwndParent);     // preview in small window
-	case 'a':   return ChangePassword(hwndParent);  // ask for password
-	case 'c':   return Configure(hwndParent);       // configuration dialog
-	default:    return Configure(hwndParent);       // configuration dialog
+	case 's':	return ScreenSaver(NULL);			// screen save
+	case 'p':	return ScreenSaver(hwndParent);		// preview in small window
+	case 'a':	return ChangePassword(hwndParent);	// ask for password
+	case 'c':	return Configure(hwndParent);		// configuration dialog
+	default:	return Configure(hwndParent);		// configuration dialog
 	}
 
-	return 0;
+	return 0;	
 }

reactos/base/applications/screensavers/matrix/settings.c

@@ -3,7 +3,6 @@
 //
 //	Load/Save settings from registry
 //
-#include <stdlib.h>
 #include <windows.h>
 #include <tchar.h>
 #include "globals.h"
@@ -15,7 +14,7 @@ int		g_nNumMessages		 = 0;
 int		g_nMessageSpeed		 = 5;
 TCHAR	g_szFontName[512]	 = _T("Arial");
 
-int		g_nMatrixSpeed		 = 10;
+int		g_nMatrixSpeed		 = 150;
 int		g_nDensity			 = 32;
 int		g_nFontSize			 = 12;
 BOOL	g_fRandomizeMessages = FALSE;

reactos/base/applications/screensavers/scrnsave/scrnsave.c

@@ -37,7 +37,6 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	switch (msg)
 	{
 		case WM_DESTROY:
-		  ShowCursor(TRUE);
 			PostQuitMessage(0);
 			break;
 
@@ -105,19 +104,13 @@ void InitSaver(HWND hwndParent)
 	else
 	{
 		HWND hwnd;
-    hwnd = CreateWindowEx(WS_EX_TOPMOST,
-                          APPNAME, 
-                          APPNAME,
-                          WS_VISIBLE | WS_POPUP,
-                          0, 0,
-                          GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
-                          HWND_DESKTOP, 0,
-                          hInstance, NULL);
-     
-    SetWindowPos(hwnd, 
-                 0, 0, 0, 0, 0, 
-                 SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW);
-                                              
+		hwnd = CreateWindow(APPNAME, APPNAME,
+		                    WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST,
+		                    0, 0,
+		                    GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+		                    HWND_DESKTOP, 0,
+		                    hInstance, NULL);
+		ShowWindow(hwnd, SW_SHOWMAXIMIZED);
 		ShowCursor(FALSE);
 		fullscreen = TRUE;
 	}

reactos/base/applications/screensavers/starfield/screensaver.c

@@ -192,7 +192,6 @@ LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		{
 			KillTimer (hwnd, APP_TIMER);
 			free(stars);
-			ShowCursor(TRUE);
 			PostQuitMessage (0);
 			return 0;
 		}
@@ -267,19 +266,13 @@ void InitSaver(HWND hwndParent)
 	else
 	{
 		HWND hwnd;
-		hwnd = CreateWindowEx(WS_EX_TOPMOST,
-                          APPNAME, 
-                          APPNAME,
-                          WS_VISIBLE | WS_POPUP,
-                          0, 0,
-                          GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
-                          HWND_DESKTOP, 0,
-                          hInstance, NULL);
-     
-    SetWindowPos(hwnd, 
-                 0, 0, 0, 0, 0, 
-                 SWP_NOZORDER|SWP_NOACTIVATE|SWP_NOSIZE|SWP_SHOWWINDOW);
-                 
+		hwnd = CreateWindow(APPNAME, APPNAME,
+		                    WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST,
+		                    0, 0,
+		                    GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
+		                    HWND_DESKTOP, 0,
+		                    hInstance, NULL);
+		ShowWindow(hwnd, SW_SHOWMAXIMIZED);
 		ShowCursor(FALSE);
 		fullscreen = TRUE;
 	}

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

@@ -1,16 +0,0 @@
-/* Translation by Vytis "CMan" Gird<72>ijauskas (cman@cman.us) */
-
-LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_USAGE, "Naudojimas: shutdown [-?] [-l | -s | -r] [-f]\n\n\
-  Be parametr<74> arba -?\tParodyti <20><> prane<6E>im<69>\n\
-  -l\t\t\tAtsijungti\n\
-  -s\t\t\tI<74>jungti kompiuter<65>\n\
-  -r\t\t\tPerkrauti kompiuter<65>\n\
-  -f\t\t\tPriverstinai u<>verti visas paleistas programas\n\
-    \t\t\tJeigu nenurodyti jokie kiti parametrai, taip pat\n\
-    \t\t\tbus <20>vykdytas atsijungimas"
-}

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

@@ -17,6 +17,6 @@ IDS_USAGE, "
   -s\t\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>\n\
   -r\t\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>'<27><><EFBFBD><EFBFBD><EFBFBD>\n\
   -f\t\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><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>\n\
-    \t\t\t<><74><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n\
-    \t\t\t<><74><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
+    \t\t\t<><74><EFBFBD><EFBFBD> <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>\n\
+    \t\t\t<><74><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
 }