Mark as 0.3.0 Release

svn path=/branches/ros-branch-0_3_0/; revision=23748

reactos/CREDITS

@@ -31,7 +31,6 @@ Jason Filby <jasonfilby@yahoo.com>
 Jason Weiler
 Jean Michault
 Jim Noeth
-Johannes Anderwald <johannes.anderwald@student.tugraz.at> 
 Jonathan Wilson <jonwil@tpgi.com.au>
 Jurgen van Gael <jurgen.vangael@student.kuleuven.ac.be>
 KJK::Hyperion <noog@libero.it>

reactos/Makefile

@@ -97,12 +97,6 @@
 #        output files) or no (to not build non-symbol-stripped versions of
 #        executable output files). The variable defaults to no.
 #
-#    ROS_LEAN_AND_MEAN
-#        This variable controls if all binaries should be stripped out of useless
-#        data added by GCC/LD as well as of RSYM symbol data. Output binary size
-#        will go from 80 to 40MB, memory usage from 58 to 38MB and the install CD
-#        from 18 to 13MB. The variable defaults to no.
-#
 #    ROS_RBUILDFLAGS
 #        Pass parameters to rbuild.
 #            -v           Be verbose.
@@ -209,7 +203,6 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_REGTESTS=@echo $(QUOTE)[REGTESTS] $@$(QUOTE)
   ECHO_TEST    =@echo $(QUOTE)[TEST]     $@$(QUOTE)
   ECHO_GENDIB  =@echo $(QUOTE)[GENDIB]   $@$(QUOTE)
-  ECHO_STRIP   =@echo $(QUOTE)[STRIP]    $@$(QUOTE)
 else
   ECHO_CP      =
   ECHO_MKDIR   =
@@ -238,7 +231,6 @@ else
   ECHO_REGTESTS=
   ECHO_TEST    =
   ECHO_GENDIB  =
-  ECHO_STRIP   =
 endif
 
 
@@ -264,7 +256,6 @@ endif
 	ar = $(Q)$(PREFIX)-ar
 	objcopy = $(Q)$(PREFIX)-objcopy
 	dlltool = $(Q)$(PREFIX)-dlltool
-	strip = $(Q)$(PREFIX)-strip
 	windres = $(Q)$(PREFIX)-windres
 	rm = $(Q)rm -f
 	cp = $(Q)cp
@@ -284,7 +275,6 @@ else # mingw32-windows
 	ar = $(Q)ar
 	objcopy = $(Q)objcopy
 	dlltool = $(Q)dlltool
-	strip = $(Q)strip
 	windres = $(Q)windres
 	rm = $(Q)rm -f
 	cp = $(Q)cp
@@ -303,7 +293,6 @@ else # mingw32-windows
 	ar = $(Q)ar
 	objcopy = $(Q)objcopy
 	dlltool = $(Q)dlltool
-	strip = $(Q)strip
 	windres = $(Q)windres
 	rm = $(Q)del /f /q
 	cp = $(Q)copy /y
@@ -414,42 +403,42 @@ $(ERRCODES_H) $(ERRCODES_RC): $(WMC_TARGET) $(KERNEL32_MC)
 .PHONY: msvc6
 msvc6: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc
 
 .PHONY: msvc7
 msvc7: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc
 
 .PHONY: msvc71
 msvc71: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc
 
 .PHONY: msvc8
 msvc8: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc
 
 .PHONY: msvc6_clean
 msvc6_clean: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 msvc
 
 .PHONY: msvc7_clean
 msvc7_clean: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 msvc
 
 .PHONY: msvc71_clean
 msvc71_clean: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 msvc
 
 .PHONY: msvc8_clean
 msvc8_clean: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.00 msvc
 
 .PHONY: msvc_clean
 msvc_clean: $(RBUILD_TARGET)
@@ -459,56 +448,56 @@ msvc_clean: $(RBUILD_TARGET)
 .PHONY: msvc_clean_all
 msvc_clean_all: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.10 -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.10 msvc
 
 .PHONY: msvc7_install_debug
 msvc7_install_debug: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug msvc
 
 .PHONY: msvc7_install_release
 msvc7_install_release: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease msvc
 
 .PHONY: msvc7_install_speed
 msvc7_install_speed: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed msvc
 
 .PHONY: msvc71_install_debug
 msvc71_install_debug: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug msvc
 
 .PHONY: msvc71_install_release
 msvc71_install_release: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease msvc
 
 
 .PHONY: msvc71_install_speed
 msvc71_install_speed: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed msvc
 
 .PHONY: msvc8_install_debug
 msvc8_install_debug: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug msvc
 
 .PHONY: msvc8_install_release
 msvc8_install_release: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease msvc
 
 .PHONY: msvc8_install_speed
 msvc8_install_speed: $(RBUILD_TARGET)
 	$(ECHO_RBUILD)
-	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed -voversionconfiguration msvc
+	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed msvc
 
 .PHONY: makefile_auto_clean
 makefile_auto_clean:

reactos/base/applications/cacls/De.rc

@@ -1,79 +0,0 @@
-/*
- *  German language file by Daniel Reimer <EmuandCo> 2006-06-15
- */
-
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_HELP, "<22>ndert Datei-ACLs (Access Control List) oder zeigt sie an.\n\n\
-CACLS Dateiname [/T] [/E] [/C] [/G Benutzer:Zugriff] [/R Benutzer [...]]\n\
-                [/P Benutzer:Zugriff [...]] [/D Benutzer [...]]\n\
-  Dateiname            ACLs f<>r angegebene Datei anzeigen.\n\
-  /T                   ACLs der angegebenen Datei im aktuellen Verzeichnis\n\
-                       und allen Unterverzeichnissen <20>ndern.\n\
-  /E                   ACL bearbeiten anstatt sie zu ersetzen.\n\
-  /C                   <20>ndern der ACLs bei Zugriffsverletzung fortsetzen.\n\
-  /G Benutzer:Zugriff  Angegebene Zugriffsarten zulassen.\n\
-                       Zugriff kann sein: R Lesen\n\
-                                          W  Schreiben\n\
-                                          C  <20>ndern (Schreiben)\n\
-                                          F  Vollzugriff\n\
-  /R Benutzer          Zugriffsrechte des Benutzers aufheben (g<>ltig mit /E).\n\
-  /P Benutzer:Zugriff  Zugriffsrechte des Benutzers ersetzen.\n\
-                       Zugriff kann sein: N  Kein\n\
-                                          R  Lesen\n\
-                                          W  Schreiben\n\
-                                          C  <20>ndern (Schreiben)\n\
-                                          F  Vollzugriff\n\
-   /D Benutzer         Zugriff f<>r Benutzer verweigern.\n\
-Platzhalterzeichen (Wildcards) werden f<>r Dateiname unterst<73>tzt.\n\
-Mehrere Benutzer k<>nnen in einem Befehl angegeben werden.\n\n\
-Abk<EFBFBD>rzungen:\n\
-   CI - Containervererbung.\n\
-        Der ACE-Eintrag wird von Verzeichnissen geerbt.\n\
-   OI - Objektvererbung.\n\
-        Der ACE-Eintrag wird von Dateien geerbt.\n\
-   IO - Nur vererben.\n\
-        Der ACE-Eintrag bezieht sich nicht auf\n\
-        die aktuelle Datei/das aktuelle Verzeichnis.\n"
-
-IDS_ABBR_CI, "(CI)"
-IDS_ABBR_OI, "(OI)"
-IDS_ABBR_IO, "(IO)"
-IDS_ABBR_FULL, "F"
-IDS_ABBR_READ, "R"
-IDS_ABBR_WRITE, "W"
-IDS_ABBR_CHANGE, "C"
-IDS_ABBR_NONE, "N"
-IDS_ALLOW, ""
-IDS_DENY, "(DENY)"
-IDS_SPECIAL_ACCESS, "(special access:)"
-IDS_GENERIC_READ, "GENERIC_READ"
-IDS_GENERIC_WRITE, "GENERIC_WRITE"
-IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
-IDS_GENERIC_ALL, "GENERIC_ALL"
-IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
-IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
-IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
-IDS_FILE_READ_DATA, "FILE_READ_DATA"
-IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
-IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
-IDS_FILE_READ_EA, "FILE_READ_EA"
-IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
-IDS_FILE_EXECUTE, "FILE_EXECUTE"
-IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
-IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
-IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
-IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
-IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
-IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
-IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
-IDS_SYNCHRONIZE, "SYNCHRONIZE"
-IDS_WRITE_OWNER, "WRITE_OWNER"
-IDS_WRITE_DAC, "WRITE_DAC"
-IDS_READ_CONTROL, "READ_CONTROL"
-IDS_DELETE, "DELETE"
-IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}

reactos/base/applications/cacls/Ru.rc

@@ -1,75 +0,0 @@
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
-
-IDS_HELP, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (ACLs) <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\n\
-CACLS <20><><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD> [/T] [/E] [/C] [/G <20><><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD> [...]] [/R <20><><EFBFBD> [...]]\n\
-               [/P <20><><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD>[...]] [/D <20><><EFBFBD> [...]]\n\
-   <20><><EFBFBD>_<EFBFBD><5F><EFBFBD><EFBFBD><EFBFBD>     <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ACL.\n\
-   /T            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ACL <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                 <20> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-   /E            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ACL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-   /C            <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-   /G <20><><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD>  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-                 <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: R  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                                   W  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                                   C  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)\n\
-                                   F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-   /R <20><><EFBFBD>        <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                 (<28><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> /E).\n\
-   /P <20><><EFBFBD>:<3A><><EFBFBD><EFBFBD><EFBFBD>  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-                 <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>: N  <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                                   R  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                                   W  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-                                   C  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)\n\
-                                   F  <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\n\
-   /D <20><><EFBFBD>        <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-<EFBFBD> <20><><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> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>.\n\
-<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\n\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:\n\
-   CI - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-        ACE <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-   OI - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-        ACE <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-   IO - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.\n\
-        ACE <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD>.\n"
-
-IDS_ABBR_CI, "(CI)"
-IDS_ABBR_OI, "(OI)"
-IDS_ABBR_IO, "(IO)"
-IDS_ABBR_FULL, "F"
-IDS_ABBR_READ, "R"
-IDS_ABBR_WRITE, "W"
-IDS_ABBR_CHANGE, "C"
-IDS_ABBR_NONE, "N"
-IDS_ALLOW, ""
-IDS_DENY, "(DENY)"
-IDS_SPECIAL_ACCESS, "(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:)"
-IDS_GENERIC_READ, "GENERIC_READ"
-IDS_GENERIC_WRITE, "GENERIC_WRITE"
-IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE"
-IDS_GENERIC_ALL, "GENERIC_ALL"
-IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE"
-IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ"
-IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE"
-IDS_FILE_READ_DATA, "FILE_READ_DATA"
-IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA"
-IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA"
-IDS_FILE_READ_EA, "FILE_READ_EA"
-IDS_FILE_WRITE_EA, "FILE_WRITE_EA"
-IDS_FILE_EXECUTE, "FILE_EXECUTE"
-IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD"
-IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES"
-IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES"
-IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED"
-IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY"
-IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL"
-IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED"
-IDS_SYNCHRONIZE, "SYNCHRONIZE"
-IDS_WRITE_OWNER, "WRITE_OWNER"
-IDS_WRITE_DAC, "WRITE_DAC"
-IDS_READ_CONTROL, "READ_CONTROL"
-IDS_DELETE, "DELETE"
-IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL"
-}

reactos/base/applications/cacls/cacls.rbuild

@@ -1,4 +1,4 @@
-<module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe">
+<module name="cacls" type="win32cui" installbase="system32" installname="cacls.exe" usewrc="false">
 	<include base="cacls">.</include>
 	<define name="__USE_W32API" />
 	<define name="UNICODE" />

reactos/base/applications/cacls/cacls.rc

@@ -6,5 +6,8 @@
 #define REACTOS_STR_ORIGINAL_FILENAME	"cacls.exe\0"
 #include <reactos/version.rc>
 
-#include "rsrc.rc"
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+#include "En.rc"
+#include "Nl.rc"
 

reactos/base/applications/cacls/rsrc.rc

@@ -1,15 +0,0 @@
-
-
-#include <windows.h>
-#include "resource.h"
-
-/* define language neutral resources */
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-/* include localised resources */
-#include "En.rc"
-#include "Nl.rc"
-#include "Ru.rc"
-#include "De.rc"
-

reactos/base/applications/calc/De.rc

@@ -144,7 +144,7 @@ WHATS_THIS_MENU MENU DISCARDABLE
 }
 
 DLG_STATS DIALOG 12,0,125,78
-CAPTION "Statistik Box"
+CAPTION "Statistics Box"
 FONT 9, "Tahoma"
 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
 BEGIN

reactos/base/applications/calc/Hu.rc

@@ -23,7 +23,7 @@
 #include "resource.h"
 #include "winecalc.h"
 
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
 {

reactos/base/applications/calc/Ru.rc

@@ -22,7 +22,7 @@
 #include "resource.h"
 #include "winecalc.h"
 
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
 {

reactos/base/applications/control/Fi.rc

@@ -1,28 +0,0 @@
-// English language resource file (frik85, 2005-03-08)
-
-LANGUAGE LANG_FINNISH, SUBLANG_NEUTRAL
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_MAINMENU MENU DISCARDABLE 
-BEGIN
-    POPUP "&Tiedosto"
-    BEGIN
-        MENUITEM "&Sulje",                      IDM_CLOSE
-    END
-    POPUP "&N<>yt<79>"
-    BEGIN
-        MENUITEM "Suuret kuvakkeet",                 IDM_LARGEICONS
-        MENUITEM "Pienet kuvakkeet",                 IDM_SMALLICONS
-        MENUITEM "Luettelo",                        IDM_LIST
-        MENUITEM "Tiedot",                     IDM_DETAILS
-    END
-    POPUP "Ohje"
-    BEGIN
-        MENUITEM "Tietoja",                       IDM_ABOUT
-    END
-END
-

reactos/base/applications/control/control.rc

@@ -43,5 +43,4 @@ IDI_MAINICON            ICON    DISCARDABLE     "resources/config.ico"
 #include "Sv.rc"
 #include "Es.rc"
 #include "Hu.rc"
-#include "Fi.rc"
 

reactos/base/applications/games/solitaire/solitaire.cpp

@@ -188,7 +188,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
             return 0;
 
         case IDM_HELP_ABOUT:
-            MessageBox(hwnd, _T("Solitaire by J Brown\r\n\r\nCardLib version 1.0."), szAppName, MB_OK|MB_ICONINFORMATION);
+            MessageBox(hwnd, _T("Solitare by J Brown\r\n\r\nCardLib version 1.0."), szAppName, MB_OK|MB_ICONINFORMATION);
 
             return 0;
 

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

@@ -52,7 +52,7 @@ CAPTION "Gl
 {
     LTEXT           "Bitte geben Sie ihren Namen ein", IDIGNORE,  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 DIALOG DISCARDABLE  0, 0, 100, 100
@@ -66,18 +66,18 @@ CAPTION "Benutzerdefiniertes Spiel"
     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
+    DEFPUSHBUTTON   "Ok",     IDOK,      40,  30,  50,  15
     PUSHBUTTON      "Abbrechen", IDCANCEL,  40,  50,  50,  15
 }
 
 DLG_ABOUT DIALOG DISCARDABLE  0, 0, 145, 80
 STYLE  DS_MODALFRAME | DS_3DLOOK |
     WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "<EFBFBD>ber"
+CAPTION "About"
 {
     LTEXT                               "Winemine", IDNONE,  10,  10,  35,  10
     LTEXT         "Copyright 2000, Joshua Thielen", IDNONE,  35,  25, 100,  10
-    LTEXT                 "Unter der Wine Lizenz", IDNONE,  35,  35, 100,  10
+    LTEXT                 "unter der Wine Lizenz", IDNONE,  35,  35, 100,  10
     ICON                                "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/Fr.rc

@@ -1,90 +0,0 @@
-#include "resource.h"
-
-/*
- * Translation made by Jerome Signouret, 2006.
- * Initial file : http://svn.reactos.org/viewcvs/trunk/reactos/base/applications/games/winemine/En.rc
- * Revision : 85
- */
- 
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-STRINGTABLE {
-     IDS_APPNAME, "WineMine"
-
-}
-
-MENU_WINEMINE MENU DISCARDABLE
-{
-    POPUP "&Options" {
-        MENUITEM "&Nouveau",           IDM_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Mark Question", IDM_MARKQ
-        MENUITEM SEPARATOR
-        MENUITEM "&D<>butant",      IDM_BEGINNER
-        MENUITEM "&Amateur",      IDM_ADVANCED
-        MENUITEM "&Expert",        IDM_EXPERT
-        MENUITEM "&Sur mesure",        IDM_CUSTOM
-        MENUITEM SEPARATOR
-        MENUITEM "&Quitter",          IDM_EXIT
-    }
-    POPUP "&Info" {
-        MENUITEM "&Temps acc<63>l<EFBFBD>r<EFBFBD>",    IDM_TIMES
-        MENUITEM "&A propos",         IDM_ABOUT
-    }
-}
-
-DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "Temps acc<63>l<EFBFBD>r<EFBFBD>"
-{
-    GROUPBOX        "Temps acc<63>l<EFBFBD>r<EFBFBD>", IDIGNORE,  10,  10, 140,  45
-    LTEXT           "D<>butant",      IDIGNORE,  20,  20,  40,   8
-    LTEXT           "Amateur",      IDIGNORE,  20,  30,  40,   8
-    LTEXT           "Expert",        IDIGNORE,  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 DIALOG DISCARDABLE  0, 0, 160, 60
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "F<>licitations!"
-{
-    LTEXT           "Veuillez entrer votre nom :", IDIGNORE,  10,  10, 150,  10
-    EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
-    DEFPUSHBUTTON   "Ok",                         IDOK,  60,  40,  40,  15
-}
-
-DLG_CUSTOM DIALOG DISCARDABLE  0, 0, 100, 100
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "Sur mesure"
-{
-    LTEXT           "Lignes",   IDIGNORE,   5,   5,  30,  10
-    LTEXT           "Colonnes",   IDIGNORE,   5,  35,  30,  10
-    LTEXT           "Mines",  IDIGNORE,   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      "Annuler", IDCANCEL,  40,  50,  50,  15
-}
-
-DLG_ABOUT DIALOG DISCARDABLE  0, 0, 145, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "A propos"
-{
-    LTEXT                               "Winemine", IDIGNORE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDIGNORE,  35,  25, 100,  10
-    LTEXT                 "Sous licence Wine", IDIGNORE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDIGNORE,  10,  25,  20,  20
-    DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55,  15
-}
-

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

@@ -1,85 +0,0 @@
-//Polish translation Emil Kaczmarek 2006
-
-#include "resource.h"
-
-LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
-
-STRINGTABLE {
-     IDS_APPNAME, "Saper"
-
-}
-
-MENU_WINEMINE MENU DISCARDABLE
-{
-    POPUP "&Opcje" {
-        MENUITEM "&Nowa gra",           IDM_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "Poz&iom", IDM_MARKQ
-        MENUITEM SEPARATOR
-        MENUITEM "&Pocz<63>tkuj<75>cy",      IDM_BEGINNER
-        MENUITEM "&Zaawansowany",      IDM_ADVANCED
-        MENUITEM "&Ekspert",        IDM_EXPERT
-        MENUITEM "&W<>asny poziom",        IDM_CUSTOM
-        MENUITEM SEPARATOR
-        MENUITEM "Zam&knij",          IDM_EXIT
-    }
-    POPUP "&Informacje" {
-        MENUITEM "N&ajlepsze czasy",    IDM_TIMES
-        MENUITEM "O progra&mie",         IDM_ABOUT
-    }
-}
-
-DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "Najlepsze czasy"
-{
-    GROUPBOX        "Najlepsze czasy", IDIGNORE,  10,  10, 140,  45
-    LTEXT           "Pocz<63>tkuj<75>cy",      IDIGNORE,  20,  20,  40,   8
-    LTEXT           "zaawansowany",      IDIGNORE,  20,  30,  40,   8
-    LTEXT           "Ekspert",        IDIGNORE,  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 DIALOG DISCARDABLE  0, 0, 160, 60
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "Gratulacje!"
-{
-    LTEXT           "Wpisz swoje imi<6D>", IDIGNORE,  10,  10, 150,  10
-    EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
-    DEFPUSHBUTTON   "Ok",                         IDOK,  60,  40,  40,  15
-}
-
-DLG_CUSTOM DIALOG DISCARDABLE  0, 0, 100, 100
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "Ustawienia gry"
-{
-    LTEXT           "Ilo<6C><6F> rz<72>d<EFBFBD>w",   IDIGNORE,   5,   5,  30,  10
-    LTEXT           "Ilo<6C><6F> kolumn",   IDIGNORE,   5,  35,  30,  10
-    LTEXT           "Ilo<6C><6F> min",  IDIGNORE,   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      "Wycofaj", IDCANCEL,  40,  50,  50,  15
-}
-
-DLG_ABOUT DIALOG DISCARDABLE  0, 0, 145, 80
-STYLE  DS_MODALFRAME | DS_3DLOOK |
-    WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP
-CAPTION "About"
-{
-    LTEXT                               "Winemine", IDIGNORE,  10,  10,  35,  10
-    LTEXT         "Copyright 2000, Joshua Thielen", IDIGNORE,  35,  25, 100,  10
-    LTEXT                 "under the Wine license", IDIGNORE,  35,  35, 100,  10
-    ICON                                "WINEMINE", IDIGNORE,  10,  25,  20,  20
-    DEFPUSHBUTTON                             "Ok", IDOK,      50,  60,  55,  15
-}

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

@@ -23,11 +23,8 @@
 
 #include "De.rc"
 #include "En.rc"
-#include "Fr.rc"
-#include "Pl.rc"
 #include "Nl.rc"
 
-
 IDI_WINEMINE ICON MOVEABLE "rc/winemine.ico"
 
 IDB_FACES BITMAP MOVEABLE "rc/faces.bmp"

reactos/base/applications/getfirefox/De.rc

@@ -35,7 +35,7 @@ FONT 8, "MS Shell Dlg"
  LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER
  CHECKBOX "Entferne ""Get Firefox"" nach Fertigstellung aus dem Startmen<65>", IDC_REMOVE,
            10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Abbrechen", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
 }
 
 STRINGTABLE

reactos/base/applications/getfirefox/Sv.rc

@@ -1,46 +0,0 @@
-/*
- * PROJECT:     ReactOS utilities
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        apps/utils/getfirefox/Sv.rc
- * PURPOSE:     Swedish resources
- * COPYRIGHT:   Copyright 2004 Mike McCormack for CodeWeavers
- *              Copyright 2005 Ge van Geldorp (gvg@reactos.org)
- *              Copyright 2006 Andreas Bjerkeholt (harteex@gmail.com)
- */
-/*
- * Based on Wine dlls/shdocvw/En.rc
- *
- * 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
- */
-
-LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
-
-IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
-STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "H<>mtar Firefox"
-FONT 8, "MS Shell Dlg"
-{
- CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12
- LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER
- CHECKBOX "Ta bort ""H<>mta Firefox"" fr<66>n startmenyn n<>r nedladdningen <20>r klar", IDC_REMOVE,
-           10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "Avbryt", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
-}
-
-STRINGTABLE
-BEGIN
- IDS_START_MENU_NAME "H<>mta Firefox"
-END
-

reactos/base/applications/getfirefox/Uk.rc

@@ -1,38 +0,0 @@
-/*
- * getfirefox (Ukrainian resources)
- *
- * 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
- * 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
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-IDD_GETFIREFOX DIALOG LOADONCALL MOVEABLE DISCARDABLE  0, 0, 220, 76
-STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Firefox"
-FONT 8, "MS Shell Dlg"
-{
- CONTROL "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER|PBS_SMOOTH,10,10,200,12
- LTEXT "", IDC_STATUS, 10, 30, 200, 10, SS_CENTER
- CHECKBOX "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ""<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Firefox"" <20> <20><><EFBFBD><EFBFBD> ""<22><><EFBFBD><EFBFBD>"" <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_REMOVE,
-           10, 44, 200, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- PUSHBUTTON "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDCANCEL, 85, 58, 50, 15, WS_GROUP | WS_TABSTOP
-}
-
-STRINGTABLE
-BEGIN
- IDS_START_MENU_NAME "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Firefox"
-END

reactos/base/applications/getfirefox/getfirefox.rc

@@ -28,7 +28,4 @@
 #include "Hu.rc"
 #include "Nl.rc"
 #include "Ru.rc"
-#include "Sv.rc"
-#include "Uk.rc"
-
 

reactos/base/applications/ibrowser/De.rc

@@ -78,8 +78,8 @@ BEGIN
     POPUP "&Hilfe"
     BEGIN
         MENUITEM "IBrowser &FAQ...",            ID_IBROWSER_FAQ
-        MENUITEM "&<EFBFBD>ber IBrowser...",          ID_ABOUT_IBROWSER
-        MENUITEM "<EFBFBD>ber &OS...",                ID_ABOUT_WINDOWS
+        MENUITEM "&About IBrowser...",          ID_ABOUT_IBROWSER
+        MENUITEM "About &OS...",                ID_ABOUT_WINDOWS
     END
 END
 

reactos/base/applications/ibrowser/Nl.rc

@@ -1,161 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "ibrowser_intres.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <windows.h>
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// German (Germany) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-#ifdef _WIN32
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "ibrowser_intres.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include <windows.h>\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#ifndef _ROS_\r\n"
-    "LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL\r\n"
-    "STRINGTABLE DISCARDABLE \r\n"
-    "BEGIN\r\n"
-    "#ifdef UNICODE\r\n"
-    "IDS_IBROWSER_VERSION_STR ""ROS IBrowser%0s""\r\n"
-    "#else\r\n"
-    "IDS_IBROWSER_VERSION_STR ""ROS IBrowser Ansi%0s""\r\n"
-    "#endif\r\n"
-    "END\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // German (Germany) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Dutch resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDM_SDIFRAME MENU PRELOAD DISCARDABLE 
-BEGIN
-    POPUP "&Bestand"
-    BEGIN
-        MENUITEM "&Openen",                      ID_FILE_OPEN
-        MENUITEM "&Afsluiten",                   ID_FILE_EXIT
-    END
-    POPUP "&Beeld"
-    BEGIN
-        MENUITEM "&Werkbalk",                       ID_VIEW_TOOL_BAR
-        MENUITEM "&ZijBalk",                        ID_VIEW_SIDE_BAR, GRAYED
-        MENUITEM "&Statusbalk",                     ID_VIEW_STATUSBAR
-        MENUITEM SEPARATOR
-        MENUITEM "&Vernieuwen\tF5",                  ID_REFRESH
-        MENUITEM "V&olledig Scherm\tCtrl+Shift+S",  ID_VIEW_FULLSCREEN
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "IBrowser &FAQ...",            ID_IBROWSER_FAQ
-        MENUITEM "Info...",                     ID_ABOUT_IBROWSER
-        MENUITEM "Info over het &OS...",        ID_ABOUT_WINDOWS
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUT_IBROWSER DIALOG DISCARDABLE  0, 0, 199, 106
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Info"
-FONT 10, "MS Sans Serif"
-BEGIN
-    LTEXT           "ReactOS Web Browser",IDC_ROS_IBROWSER,91,13,104,11
-    LTEXT           "V 0.9",IDC_VERSION_TXT,91,27,104,8
-    LTEXT           "(c) 2005 Martin Fuchs",IDC_STATIC,91,42,104,8
-    LTEXT           "",IDC_WIN_VERSION,91,58,98,22
-    LTEXT           "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129,
-                    8
-    CONTROL         "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP,
-                    154,90,38,12
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_TITLE               "Reactos Internet Web Browser"
-    IDS_EMPTY               "(Leeg)"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_ABOUT_IBROWSER      "&Info..."
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#ifndef _ROS_
-LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-STRINGTABLE DISCARDABLE 
-BEGIN
-#ifdef UNICODE
-IDS_IBROWSER_VERSION_STR "ROS IBrowser%0s"
-#else
-IDS_IBROWSER_VERSION_STR "ROS IBrowser Ansi%0s"
-#endif
-END
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

reactos/base/applications/ibrowser/ibrowser_intres.rc

@@ -66,7 +66,6 @@ BEGIN
     "#include ""Sv.rc""\r\n"
     "#include ""Hu.rc""\r\n"
     "#include ""Ro.rc""\r\n"
-    "#include ""Nl.rc""\r\n"    
     "#include ""Ja.rc""\0"
 END
 
@@ -102,7 +101,6 @@ IDI_IBROWSER            ICON    DISCARDABLE     "res/ibrowser.ico"
 #include "Sv.rc"
 #include "Hu.rc"
 #include "Ro.rc"
-#include "Nl.rc"
 #include "Ja.rc"
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED

reactos/base/applications/imagesoft/En.rc

@@ -32,9 +32,9 @@ BEGIN
   END
   POPUP "&View"
   BEGIN
-    MENUITEM "&Tools",           ID_TOOLS, CHECKED
-    MENUITEM "&Colors",          ID_COLOR, CHECKED
-    MENUITEM "&History",         ID_HISTORY, CHECKED
+    MENUITEM "&Tools",           ID_TOOLS
+    MENUITEM "&Colors",          ID_COLOR
+    MENUITEM "&History",         ID_HISTORY
     MENUITEM "&Status Bar",      ID_STATUSBAR, CHECKED
   END
   POPUP "&Image"

reactos/base/applications/imagesoft/floatwindow.c

@@ -49,7 +49,7 @@ ShowHideWindow(PFLT_WND FltInfo)
 }
 
 
-VOID
+BOOL
 FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info)
 {
     HWND hTb;
@@ -67,39 +67,45 @@ FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info)
                          NULL,
                          hInstance,
                          NULL);
+    if (hTb != NULL)
+    {
+        SendMessage(hTb,
+                    TB_SETEXTENDEDSTYLE,
+                    0,
+                    TBSTYLE_EX_HIDECLIPPEDBUTTONS);
 
-    SendMessage(hTb,
-                TB_SETEXTENDEDSTYLE,
-                0,
-                TBSTYLE_EX_HIDECLIPPEDBUTTONS);
+        SendMessage(hTb,
+                    TB_BUTTONSTRUCTSIZE,
+                    sizeof(ToolsButtons[0]),
+                    0);
 
-    SendMessage(hTb,
-                TB_BUTTONSTRUCTSIZE,
-                sizeof(ToolsButtons[0]),
-                0);
+        SendMessage(hTb,
+                    TB_SETBITMAPSIZE,
+                    0,
+                    (LPARAM)MAKELONG(16, 16));
 
-    SendMessage(hTb,
-                TB_SETBITMAPSIZE,
-                0,
-                (LPARAM)MAKELONG(16, 16));
+        hImageList = InitImageList(NumButtons,
+                                   IDB_TOOLSRECTSEL);
 
-    hImageList = InitImageList(NumButtons,
-                               IDB_TOOLSRECTSEL);
+        ImageList_Destroy((HIMAGELIST)SendMessage(hTb,
+                                                  TB_SETIMAGELIST,
+                                                  0,
+                                                  (LPARAM)hImageList));
 
-    ImageList_Destroy((HIMAGELIST)SendMessage(hTb,
-                                              TB_SETIMAGELIST,
-                                              0,
-                                              (LPARAM)hImageList));
+        SendMessage(hTb,
+                    TB_ADDBUTTONS,
+                    NumButtons,
+                    (LPARAM)ToolsButtons);
 
-    SendMessage(hTb,
-                TB_ADDBUTTONS,
-                NumButtons,
-                (LPARAM)ToolsButtons);
+        SendMessage(hTb,
+                    TB_AUTOSIZE,
+                    0,
+                    0);
 
-    SendMessage(hTb,
-                TB_AUTOSIZE,
-                0,
-                0);
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
 
@@ -158,7 +164,7 @@ FloatWindowPaintHueSlider(HWND hHueSlider)
 }
 
 
-VOID
+BOOL
 FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info)
 {
     HWND hColorPicker;
@@ -183,6 +189,8 @@ FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info)
                                   NULL,
                                   hInstance,
                                   NULL);
+    if (hColorPicker == NULL)
+        return FALSE;
 
     hHueSlider = CreateWindowEx(0,
                                 WC_STATIC,
@@ -196,6 +204,8 @@ FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info)
                                 NULL,
                                 hInstance,
                                 NULL);
+    if (hHueSlider == NULL)
+        return FALSE;
 
     hMouseButton = CreateWindowEx(0,
                                   WC_COMBOBOX,
@@ -206,16 +216,16 @@ FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info)
                                   NULL,
                                   hInstance,
                                   NULL);
+    if (hMouseButton == NULL)
+        return FALSE;
+
     //MakeFlatCombo(hMouseButton);
 
     /* temp, just testing */
-    if (hMouseButton != NULL)
-    {
-        SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Primary"));
-        SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Secondary"));
-        SendMessage(hMouseButton, CB_SETCURSEL, 0, 0);
+    SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Primary"));
+    SendMessage(hMouseButton, CB_ADDSTRING, 0, (LPARAM)_T("Secondary"));
+    SendMessage(hMouseButton, CB_SETCURSEL, 0, 0);
 
-    }
 
     hMore = CreateWindowEx(WS_EX_STATICEDGE,
                            WC_BUTTON,
@@ -228,6 +238,8 @@ FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info)
                            NULL,
                            hInstance,
                            NULL);
+    if (hMore == NULL)
+        return FALSE;
 
     hMoreBitmap = (HBITMAP)LoadImage(hInstance,
                                      MAKEINTRESOURCE(IDB_COLORSMORE),
@@ -255,10 +267,12 @@ FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info)
         ReleaseDC(hColorPicker, hDc);
     }
 
+    return TRUE;
+
 }
 
 
-VOID
+BOOL
 FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info)
 {
     HWND hList;
@@ -275,6 +289,8 @@ FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info)
                            NULL,
                            hInstance,
                            NULL);
+    if (hList == NULL)
+        return FALSE;
 
     NumButtons = sizeof(HistoryButtons) / sizeof(HistoryButtons[0]);
     hButtons = CreateWindowEx(0,
@@ -286,34 +302,40 @@ FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info)
                               NULL,
                               hInstance,
                               NULL);
+    if (hButtons != NULL)
+    {
+        SendMessage(hButtons,
+                    TB_BUTTONSTRUCTSIZE,
+                    sizeof(ToolsButtons[0]),
+                    0);
 
-    SendMessage(hButtons,
-                TB_BUTTONSTRUCTSIZE,
-                sizeof(ToolsButtons[0]),
-                0);
+        SendMessage(hButtons,
+                    TB_SETBITMAPSIZE,
+                    0,
+                    (LPARAM)MAKELONG(10, 10));
 
-    SendMessage(hButtons,
-                TB_SETBITMAPSIZE,
-                0,
-                (LPARAM)MAKELONG(10, 10));
+        hImageList = InitImageList(NumButtons,
+                                   IDB_HISTBACK);
 
-    hImageList = InitImageList(NumButtons,
-                               IDB_HISTBACK);
+        ImageList_Destroy((HIMAGELIST)SendMessage(hButtons,
+                                                  TB_SETIMAGELIST,
+                                                  0,
+                                                  (LPARAM)hImageList));
 
-    ImageList_Destroy((HIMAGELIST)SendMessage(hButtons,
-                                              TB_SETIMAGELIST,
-                                              0,
-                                              (LPARAM)hImageList));
+        SendMessage(hButtons,
+                    TB_SETBUTTONSIZE,
+                    0,
+                    MAKELONG(18, 16));
 
-    SendMessage(hButtons,
-                TB_SETBUTTONSIZE,
-                0,
-                MAKELONG(18, 16));
+        SendMessage(hButtons,
+                    TB_ADDBUTTONS,
+                    NumButtons,
+                    (LPARAM)HistoryButtons);
 
-    SendMessage(hButtons,
-                TB_ADDBUTTONS,
-                NumButtons,
-                (LPARAM)HistoryButtons);
+        return TRUE;
+    }
+
+    return FALSE;
 }
 
 LRESULT CALLBACK

reactos/base/applications/imagesoft/imagesoft.rbuild

@@ -15,7 +15,7 @@
 		<library>comctl32</library>
 		<library>shell32</library>
 		<library>comdlg32</library>
-		<compilationunit name="about.c">
+		<compilationunit name="unit.c">
 			<file>about.c</file>
 			<file>floatwindow.c</file>
 			<file>imageprop.c</file>

reactos/base/applications/imagesoft/mainwnd.c

@@ -528,6 +528,7 @@ static VOID
 MainWndCreateFloatWindows(PMAIN_WND_INFO Info)
 {
     RECT rect;
+    HMENU hMenu;
     UINT Res;
     PFLT_WND WndArr[NUM_FLT_WND]; /* temp array for looping */
     INT i;
@@ -595,19 +596,45 @@ MainWndCreateFloatWindows(PMAIN_WND_INFO Info)
 
     }
 
+    hMenu = GetMenu(Info->hSelf);
+
     if (Info->fltTools->hSelf != NULL)
     {
-        FloatToolbarCreateToolsGui(Info);
+        if (FloatToolbarCreateToolsGui(Info))
+        {
+            //CheckMenuItem(hMenu,
+            //              ID_TOOLS,
+            //              MF_CHECKED);
+
+            /* temp disable windows until they are useful */
+            ShowHideWindow(Info->fltTools);
+        }
     }
 
     if (Info->fltColors->hSelf != NULL)
     {
-        FloatToolbarCreateColorsGui(Info);
+        if (FloatToolbarCreateColorsGui(Info))
+        {
+            //CheckMenuItem(hMenu,
+            //              ID_COLOR,
+            //              MF_CHECKED);
+
+            /* temp disable windows until they are useful */
+            ShowHideWindow(Info->fltColors);
+        }
     }
 
     if (Info->fltHistory->hSelf != NULL)
     {
-        FloatToolbarCreateHistoryGui(Info);
+        if (FloatToolbarCreateHistoryGui(Info))
+        {
+            //CheckMenuItem(hMenu,
+            //              ID_HISTORY,
+            //              MF_CHECKED);
+
+            /* temp disable windows until they are useful */
+            ShowHideWindow(Info->fltHistory);
+        }
     }
 
 }

reactos/base/applications/imagesoft/precomp.h

@@ -384,9 +384,9 @@ typedef struct _FLT_WND
     BOOL bOpaque;
 } FLT_WND, *PFLT_WND;
 
-VOID FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info);
-VOID FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info);
-VOID FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info);
+BOOL FloatToolbarCreateToolsGui(PMAIN_WND_INFO Info);
+BOOL FloatToolbarCreateColorsGui(PMAIN_WND_INFO Info);
+BOOL FloatToolbarCreateHistoryGui(PMAIN_WND_INFO Info);
 BOOL InitFloatWndClass(VOID);
 VOID UninitFloatWndImpl(VOID);
 BOOL ShowHideWindow(PFLT_WND FltInfo);

reactos/base/applications/msconfig/De.rc

@@ -5,7 +5,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "Systemkonfigurationsprogramm"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -16,7 +16,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "Alle &aktivieren",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -25,7 +25,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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
@@ -34,7 +34,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "Alle &aktivieren",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
@@ -43,7 +43,7 @@ END
 
 IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
  GROUPBOX "Systemstartauswahl", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
  CONTROL "&Normaler Systemstart - Alle Ger<65>tetreiber und Dienste laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 210, 10
@@ -56,7 +56,7 @@ END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
    PUSHBUTTON    "&Alle Bootpfade <20>berpr<70>fen", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 90, 12
@@ -77,7 +77,7 @@ END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12

reactos/base/applications/msconfig/En.rc

@@ -5,7 +5,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "System configuration program"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -16,7 +16,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "&Activate all",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -25,7 +25,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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
@@ -34,7 +34,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "&Activate all",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
@@ -43,7 +43,7 @@ END
 
 IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
  GROUPBOX "Startup Selection", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
  CONTROL "&Normal Startup - load all device drivers and services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
@@ -56,7 +56,7 @@ END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
    PUSHBUTTON    "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
@@ -77,7 +77,7 @@ END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
@@ -96,7 +96,7 @@ BEGIN
    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 "OK", IDC_OK, 20, 160, 50, 12
+   PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12
    PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12
 END
 

reactos/base/applications/msconfig/Fr.rc

@@ -5,7 +5,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "Utilitaire de configuration syst<73>me"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -16,7 +16,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "&Activer tout",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -25,7 +25,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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
@@ -34,7 +34,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "&Activer tout",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
@@ -43,7 +43,7 @@ END
 
 IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
  GROUPBOX "S<>lection du D<>marrage ", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
  CONTROL "D<>marrage &Normal - charge tous les drivers et services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 185, 10
@@ -56,7 +56,7 @@ END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
    PUSHBUTTON    "&Check All Boot Paths", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
@@ -77,7 +77,7 @@ END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
@@ -96,7 +96,7 @@ BEGIN
    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 "OK", IDC_OK, 20, 160, 50, 12
+   PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12
    PUSHBUTTON "Annuler", IDC_CANCEL, 100, 160, 50, 12
 END
 

reactos/base/applications/msconfig/Hu.rc

@@ -7,7 +7,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "Rendszerbe<62>ll<6C>t<EFBFBD>sok"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -18,7 +18,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "Mindet &bekapcsol",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -27,7 +27,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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
@@ -36,7 +36,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "Mindet &bekapcsol",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14

reactos/base/applications/msconfig/Nl.rc

@@ -25,7 +25,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_POPUP |
     WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU |
     WS_THICKFRAME
 CAPTION "Hulpprogramma voor systeemconfiguratie"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
     DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
@@ -36,7 +36,7 @@ END
 
 IDD_STARTUP_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
     PUSHBUTTON      "&Alles inschakelen",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
@@ -45,7 +45,7 @@ END
 
 IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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
@@ -54,7 +54,7 @@ END
 
 IDD_SERVICES_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
     PUSHBUTTON      "&Alles inschakelen",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
@@ -63,7 +63,7 @@ END
 
 IDD_GENERAL_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
  GROUPBOX "Type opstartprocedure", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
  CONTROL "&Normaal opstarten - alle apparatuurstuurprogramma's en services in het geheugen laden", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
@@ -76,7 +76,7 @@ END
 
 IDD_FREELDR_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
    CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200
    PUSHBUTTON    "&Alle opstartpaden controleren", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
@@ -97,7 +97,7 @@ END
 
 IDD_FREELDR_ADVANCED_PAGE DIALOG DISCARDABLE  0, 0, 175, 175
 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
    CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10
    EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12
@@ -116,7 +116,7 @@ BEGIN
    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 "OK", IDC_OK, 20, 160, 50, 12
+   PUSHBUTTON "Ok", IDC_OK, 20, 160, 50, 12
    PUSHBUTTON "Cancel", IDC_CANCEL, 100, 160, 50, 12
 END
 

reactos/base/applications/msconfig/No.rc

@@ -1,156 +0,0 @@
-LANGUAGE LANG_NORWEGIAN, 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 "System configuration program"
-FONT 8, "Tahoma"
-BEGIN
-    CONTROL "kategori1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195
-    DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "&Hjelp", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Avbryt", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    PUSHBUTTON "Bruk", 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, "Tahoma"
-BEGIN
-    CONTROL         "liste3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148
-    PUSHBUTTON      "&Aktivere alt",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14
-    PUSHBUTTON      "&Deaktivere alt",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14
-END
-
-IDD_TOOLS_PAGE DIALOG DISCARDABLE  0, 0, 362, 175
-STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN
-FONT 8, "Tahoma"
-BEGIN
-    CONTROL "Liste2",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 "&Kj<4B>r", 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, "Tahoma"
-BEGIN
-    CONTROL         "Liste1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148
-    PUSHBUTTON      "&Aktivere alt",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14
-    PUSHBUTTON      "&Deaktivere alt",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, "Tahoma"
-BEGIN
- GROUPBOX "Oppstarts utvalg", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT
- CONTROL "&Normal oppstart - laste inn alle enhetsdrivere og tjenester", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10
- CONTROL "&Diagnose oppstart - last bare inn grunnleggende enheter og tjenester", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10
- CONTROL "&Selektiv oppstart", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10
- CHECKBOX "L&ast inn SYSTEM.INI Filen", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10
- CHECKBOX "&Last inn System tjenester", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10
- CHECKBOX "Las&t inn oppstartselementet", 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, "Tahoma"
-BEGIN
-   CONTROL "", IDC_LIST_BOX, "Listeboks", 0x50010141, 10, 10, 340, 50, 0x00000200
-   PUSHBUTTON    "&Sjekk alle oppstartsbaner", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12
-   PUSHBUTTON    "&Sett som standard", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12
-   PUSHBUTTON    "Flytt &Opp", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12
-   PUSHBUTTON    "Flytt &Ned", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12
-   GROUPBOX "Oppstarts alternativer", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT
-   CHECKBOX "/&SIKKEROPPSTART", IDC_CBX_SAFE_BOOT, 15, 90, 50, 10
-   CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 55, 10
-   CHECKBOX "/&OPPSTARTLOGG", 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 "Av&anserte alternativer...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 
-   LTEXT "&Tidsavbrudd:", -1, 280, 91, 30, 10
-   EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
-   LTEXT "sek.", -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, "Tahoma"
-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&ROFIL", 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 "Ok", IDC_OK, 20, 160, 50, 12
-   PUSHBUTTON "Avbryt", IDC_CANCEL, 100, 160, 50, 12
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_MSCONFIG             "System konfigurasjon program"
-    IDS_TAB_GENERAL          "Generelt"
-    IDS_TAB_SYSTEM           "SYSTEM.INI"
-    IDS_TAB_FREELDR          "FREELDR.INI"   
-    IDS_TAB_SERVICES         "Tjenester" 
-    IDS_TAB_STARTUP          "Oppstart" 
-    IDS_TAB_TOOLS            "Verkt<6B>y"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_SERVICES_COLUMN_SERVICE "Tjeneste"
-    IDS_SERVICES_COLUMN_REQ     "Viktig"
-    IDS_SERVICES_COLUMN_VENDOR  "Produsent"
-    IDS_SERVICES_COLUMN_STATUS  "Status"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_TOOLS_COLUMN_NAME    "Navn"
-    IDS_TOOLS_COLUMN_DESCR   "Beskrivelse"
-
-    IDS_TOOLS_CMD_NAME       "ledertekst"
-    IDS_TOOLS_CMD_DESCR      ""
-    IDS_TOOLS_CMD_CMD        "cmd.exe"
-
-    IDS_TOOLS_INFO_NAME      "Versjon"
-    IDS_TOOLS_INFO_DESCR     "Vis versjon informasjon."
-    IDS_TOOLS_INFO_CMD       "winver.exe"
-
-    IDS_TOOLS_REGEDIT_NAME   "Register-Editor"
-    IDS_TOOLS_REGEDIT_DESCR  "<22>pne Register-Editor."
-    IDS_TOOLS_REGEDIT_CMD    "regedit.exe"
-
-    IDS_TOOLS_SYSDM_NAME     "System egenskaper"
-    IDS_TOOLS_SYSDM_DESCR    "Vis informasjon om denne datamaskinen."
-    IDS_TOOLS_SYSDM_CMD      "kontroll"
-    IDS_TOOLS_SYSDM_PARAM    "sysdm.cpl"
-
-    IDS_STARTUP_COLUMN_ELEMENT "Element"
-    IDS_STARTUP_COLUMN_CMD     "kommando"
-    IDS_STARTUP_COLUMN_PATH    "Plassering"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_SERVICES_STATUS_RUNNING "Kj<4B>rer"
-    IDS_SERVICES_STATUS_STOPPED "Stoppet"
-    IDS_SERVICES_YES "Ja"
-    IDS_SERVICES_UNKNOWN "Ukjent" 
-END
-

reactos/base/applications/msconfig/freeldrpage.c

@@ -15,9 +15,6 @@ HWND hFreeLdrDialog;
 INT_PTR CALLBACK
 FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    UNREFERENCED_PARAMETER(lParam)
-    UNREFERENCED_PARAMETER(wParam)
-
     switch (message) {
     case WM_INITDIALOG:
         hFreeLdrDialog = hDlg;

reactos/base/applications/msconfig/generalpage.c

@@ -15,9 +15,6 @@ HWND hGeneralDialog;
 INT_PTR CALLBACK
 GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    UNREFERENCED_PARAMETER(lParam)
-    UNREFERENCED_PARAMETER(wParam)
-
     switch (message) {
     case WM_INITDIALOG:
         hGeneralDialog = hDlg;

reactos/base/applications/msconfig/msconfig.c

@@ -21,12 +21,12 @@ BOOL OnCreate(HWND hWnd)
 	TCITEM  item;
 
 	hTabWnd = GetDlgItem(hWnd, IDC_TAB);
-    hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC) GeneralPageWndProc);
-    hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC) SystemPageWndProc);
-    hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC) FreeLdrPageWndProc);
-    hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, (DLGPROC) ServicesPageWndProc);
-    hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, (DLGPROC) StartupPageWndProc);
-    hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, (DLGPROC) ToolsPageWndProc);
+    hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc);
+    hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc);
+    hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc);
+    hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc);
+    hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc);
+    hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc);
 
     LoadString(hInst, IDS_MSCONFIG, szTemp, 256);
     SetWindowText(hWnd, szTemp);
@@ -192,17 +192,13 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 
     INITCOMMONCONTROLSEX InitControls;
 
-    UNREFERENCED_PARAMETER(hPrevInstance)
-    UNREFERENCED_PARAMETER(lpCmdLine)
-    UNREFERENCED_PARAMETER(nCmdShow)
-
     InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX);
     InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES;
     InitCommonControlsEx(&InitControls);
 
     hInst = hInstance;
  
-    DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc);
+    DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc);
   
     return 0;
 }

reactos/base/applications/msconfig/msconfig.rc

@@ -18,5 +18,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "Fr.rc"
 #include "Hu.rc"
 #include "Nl.rc"
-#include "No.rc"
 

reactos/base/applications/msconfig/srvpage.c

@@ -22,9 +22,6 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	TCHAR       szTemp[256];
 	DWORD dwStyle;
 
-    UNREFERENCED_PARAMETER(lParam)
-    UNREFERENCED_PARAMETER(wParam)
-
     switch (message) {
     case WM_INITDIALOG:
 

reactos/base/applications/msconfig/startuppage.c

@@ -22,9 +22,6 @@ StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     TCHAR       szTemp[256];
     DWORD dwStyle;
 
-    UNREFERENCED_PARAMETER(lParam)
-    UNREFERENCED_PARAMETER(wParam)
-
     switch (message) {
     case WM_INITDIALOG:
 

reactos/base/applications/msconfig/systempage.c

@@ -14,8 +14,6 @@ HWND hSystemDialog;
 INT_PTR CALLBACK
 SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    UNREFERENCED_PARAMETER(lParam)
-    UNREFERENCED_PARAMETER(wParam)
     switch (message) {
     case WM_INITDIALOG:
         hSystemDialog = hDlg;

reactos/base/applications/network/ping/ping.c

@@ -489,7 +489,7 @@ static BOOL Ping(VOID)
     Packet->Icmp.Type     = ICMPMSG_ECHOREQUEST;
     Packet->Icmp.Code     = 0;
     Packet->Icmp.Id	      = (USHORT)GetCurrentProcessId();
-    Packet->Icmp.SeqNum   = (USHORT)CurrentSeqNum;
+    Packet->Icmp.SeqNum   = htons((USHORT)CurrentSeqNum);
     Packet->Icmp.Checksum = 0;
 
     /* Timestamp is part of data area */

reactos/base/applications/notepad/dialog.c

@@ -670,7 +670,7 @@ VOID DIALOG_SelectFont(VOID)
     cf.lStructSize=sizeof(cf);
     cf.hwndOwner=Globals.hMainWnd;
     cf.lpLogFont=&lf;
-    cf.Flags=CF_SCREENFONTS | CF_INITTOLOGFONTSTRUCT;
+    cf.Flags=CF_SCREENFONTS;
 
     if( ChooseFont(&cf) )
     {

reactos/base/applications/notepad/res/Cs.rc

@@ -97,7 +97,7 @@ PUSHBUTTON    "&N
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Da.rc

@@ -95,7 +95,7 @@ PUSHBUTTON    "&Hj
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/De.rc

@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 MAIN_MENU MENU
 BEGIN
@@ -69,7 +69,7 @@ BEGIN
 		MENUITEM "&Suchen...",        CMD_HELP_SEARCH
 		MENUITEM "&Hilfe benutzen",   CMD_HELP_ON_HELP
 		MENUITEM SEPARATOR
-		MENUITEM "&<EFBFBD>ber"             CMD_ABOUT
+		MENUITEM "&About"             CMD_ABOUT
 		MENUITEM "Inf&o",       CMD_ABOUT_WINE
 	END
 END
@@ -101,28 +101,17 @@ PUSHBUTTON    "Abbrechen",     IDCANCEL,               180, 21, 40, 15, WS_TABST
 PUSHBUTTON    "&Hilfe",       0x153,                180, 39, 40, 15, WS_TABSTOP
 }
 
-/* Dialog 'Gehe zu...' */
-DIALOG_GOTO DIALOG 0,0,165,50
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-FONT 8, "MS Shell Dlg"
-CAPTION "Gehe zu Zeile"
-{
-EDITTEXT        ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP
-LTEXT           "Zeile Nummer:",0x155,5,12,45,12,WS_CHILD | WS_TABSTOP | ES_NUMBER
-DEFPUSHBUTTON   "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP
-PUSHBUTTON      "Abbrechen", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP
-}
 
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "<EFBFBD>ber ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+CAPTION "About ReactOS Notepad"
+FONT 8, "Tahoma"
 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,232,39
     CONTROL         "",
                     -1,"Static",0x50000000,8,48,272,11
-    DEFPUSHBUTTON   "Schlie<EFBFBD>en",IDOK,114,149,44,15,WS_GROUP
+    DEFPUSHBUTTON   "Close",IDOK,114,149,44,15,WS_GROUP
     ICON            IDI_NPICON,-1,12,9,20,30
     EDITTEXT        IDC_LICENSE,8,64,272,81,ES_MULTILINE |
                     ES_READONLY | WS_VSCROLL
@@ -130,7 +119,7 @@ END
 
 STRINGTABLE DISCARDABLE
 BEGIN
-  STRING_LICENSE, "Dieses Programm ist kostenlos; Sie k<>nnen es frei verteilen mit od. ohne <20>nderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation ver<65>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<73>tere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
+  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

reactos/base/applications/notepad/res/En.rc

@@ -129,7 +129,7 @@ PUSHBUTTON      "Cancel", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Es.rc

@@ -98,7 +98,7 @@ PUSHBUTTON    "&Ayuda",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Fi.rc

@@ -93,7 +93,7 @@ PUSHBUTTON    "&Apua",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Fr.rc

@@ -96,7 +96,7 @@ PUSHBUTTON    "&Aide",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Gr.rc

@@ -128,7 +128,7 @@ PUSHBUTTON      "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Hu.rc

@@ -95,7 +95,7 @@ PUSHBUTTON    "&S
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/It.rc

@@ -98,7 +98,7 @@ PUSHBUTTON    "&Aiuto",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Ja.rc

@@ -130,7 +130,7 @@ PUSHBUTTON      "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Nl.rc

@@ -94,7 +94,7 @@ PUSHBUTTON    "&Help",     0x153,               180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Pl.rc

@@ -97,7 +97,7 @@ PUSHBUTTON    "&Pomoc",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Pt.rc

@@ -98,7 +98,7 @@ PUSHBUTTON    "&Ajuda",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Ru.rc

@@ -93,7 +93,7 @@ PUSHBUTTON    "&
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Si.rc

@@ -93,7 +93,7 @@ PUSHBUTTON    "&Pomo
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Sk.rc

@@ -99,7 +99,7 @@ PUSHBUTTON    "&Help",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Sv.rc

@@ -95,7 +95,7 @@ PUSHBUTTON    "&Hj
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Th.rc

@@ -94,7 +94,7 @@ PUSHBUTTON    "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Uk.rc

@@ -1,7 +1,7 @@
 /*
  * Notepad (Ukrainian resources)
  *
- * Copyright 2005, 2006 Artem Reznikov
+ * Copyright 2005 Artem Reznikov
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,48 +22,48 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
 {
- POPUP "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
-  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              CMD_NEW
-  MENUITEM "&³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...\tCtrl+O",   CMD_OPEN
+ POPUP "&File" {
+  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",           CMD_NEW
+  MENUITEM "&³<><C2B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...\tCtrl+O",     CMD_OPEN
   MENUITEM "&<26>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCtrl+S",     CMD_SAVE
-  MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><>...",        CMD_SAVE_AS
+  MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><>...",       CMD_SAVE_AS
   MENUITEM SEPARATOR
-  MENUITEM "<22><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", CMD_PAGE_SETUP
-  MENUITEM "<22>&<26><><EFBFBD>",                  CMD_PRINT
+  MENUITEM "<22><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",    CMD_PAGE_SETUP
+  MENUITEM "<22>&<26><><EFBFBD>",            CMD_PRINT
   MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...", CMD_PRINTER_SETUP
   MENUITEM SEPARATOR
-  MENUITEM "<22>&<26><><EFBFBD><EFBFBD>",                 CMD_EXIT
+  MENUITEM "<22>&<26><><EFBFBD><EFBFBD>",             CMD_EXIT
  }
 POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
   MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCtrl+Z",     CMD_UNDO
   MENUITEM SEPARATOR
   MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCtrl+X",      CMD_CUT
   MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCtrl+C",     CMD_COPY
-  MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD>\tCtrl+V",      CMD_PASTE
-  MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tDel",         CMD_DELETE
+  MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD>\tCtrl+V",    CMD_PASTE
+  MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tDel",      CMD_DELETE
   MENUITEM SEPARATOR
-  MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD>...\tCtrl+F",     CMD_SEARCH
-  MENUITEM "<22><><EFBFBD>&<26><><EFBFBD> <20><><EFBFBD><EFBFBD>\tF3",       CMD_SEARCH_NEXT
-  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCtrl+H",      CMD_REPLACE
-  MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>&<26><>...\tCtrl+G",    CMD_GOTO
+  MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD>...\tCtrl+F",  CMD_SEARCH
+  MENUITEM "<22><><EFBFBD>&<26><><EFBFBD> <20><><EFBFBD><EFBFBD>\tF3",    CMD_SEARCH_NEXT
+  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tCtrl+H",   CMD_REPLACE
+  MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>&<26><>...\tCtrl+G",  CMD_GOTO
   MENUITEM SEPARATOR
-  MENUITEM "<22><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD> <20><><EFBFBD>\tCtrl+A",  CMD_SELECT_ALL
-  MENUITEM "&<26><><EFBFBD><EFBFBD> <20> <20><><EFBFBD>\tF5",        CMD_TIME_DATE
+  MENUITEM "<22><><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD> <20><><EFBFBD>\tCtrl+A",       CMD_SELECT_ALL
+  MENUITEM "&<26><><EFBFBD><EFBFBD> <20> <20><><EFBFBD>\tF5",    CMD_TIME_DATE
  }
 POPUP "<22><><EFBFBD>&<26><><EFBFBD>" {
-  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     CMD_WRAP
-  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>...",              CMD_FONT
+  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",  CMD_WRAP
+  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>...",          CMD_FONT
 }
 POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
-  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",           CMD_STATUSBAR
+  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",    CMD_STATUSBAR
 }
 POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" {
-  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>",                 CMD_HELP_CONTENTS
-  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>...",              CMD_HELP_SEARCH
-  MENUITEM "&Help on help",          CMD_HELP_ON_HELP
+  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>",         CMD_HELP_CONTENTS
+  MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD>...",        CMD_HELP_SEARCH
+  MENUITEM "&Help on help",     CMD_HELP_ON_HELP
   MENUITEM SEPARATOR
-		MENUITEM "&<EFBFBD><EFBFBD><EFBFBD>"      CMD_ABOUT
-  MENUITEM "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",          CMD_ABOUT_WINE
+		MENUITEM "&About"             CMD_ABOUT
+  MENUITEM "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",      CMD_ABOUT_WINE
  }
 }
 
@@ -74,7 +74,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 {
-LTEXT    "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:", 0x140,   10, 07, 40, 15
+LTEXT    "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",  0x140,   10, 07, 40, 15
 EDITTEXT                         0x141,       60, 05,110, 12, WS_BORDER | WS_TABSTOP
 LTEXT    "<22>&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",  0x142,   10, 24, 40, 15
 EDITTEXT                         0x143,       60, 22,110, 12, WS_BORDER | WS_TABSTOP
@@ -121,14 +121,14 @@ PUSHBUTTON      "
 
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
-CAPTION "<EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS"
+CAPTION "About ReactOS Notepad"
 FONT 8, "Tahoma"
 BEGIN
-    CONTROL         "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ReactOS 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 ",
+    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,232,39
     CONTROL         " ",
                     -1,"Static",0x50000000,8,48,272,11
-    DEFPUSHBUTTON   "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDOK,114,149,44,15,WS_GROUP
+    DEFPUSHBUTTON   "Close",IDOK,114,149,44,15,WS_GROUP
     ICON            IDI_NPICON,-1,12,9,20,30
     EDITTEXT        IDC_LICENSE,8,64,272,81,ES_MULTILINE |
                     ES_READONLY | WS_VSCROLL

reactos/base/applications/notepad/res/Wa.rc

@@ -93,7 +93,7 @@ PUSHBUTTON    "&Aide",       0x153,                180, 39, 40, 15, WS_TABSTOP
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/notepad/res/Zh.rc

@@ -93,7 +93,7 @@ PUSHBUTTON    "
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,284,170
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About ReactOS Notepad"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 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,232,39

reactos/base/applications/regedit/De.rc

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 /*
  * Menu
@@ -263,7 +263,7 @@ BEGIN
     IDS_BAD_VALUE           "Kann den Wert '%s' nicht lesen"
     IDS_UNSUPPORTED_TYPE    "Kann den Schl<68>ssel des Typen (%ld) nicht <20>ndern"
     IDS_TOO_BIG_VALUE       "Der Wert (%ld) ist zu gro<72>"
-    IDS_MULTI_SZ_EMPTY_STRING "Daten vom Typ REG_MULTI_SZ k<>nnen keine leere Zeichenkette enthalten.\nDie leere Zeichenkette wurde aus der Liste gel<65>scht."
+    IDS_MULTI_SZ_EMPTY_STRING "Daten vom Typ REG_MULTI_SZ k<>nnen keine leere Zeichenkette enthalten.\nDie leere Zeichenkette wurden von der Liste gel<65>scht."
     IDS_QUERY_DELETE_ONE    "Diesen Wert wirklich l<>schen?"
     IDS_QUERY_DELETE_MORE   "Diese Werte wirklich l<>schen?"
     IDS_QUERY_DELETE_CONFIRM "L<>schen best<73>tigen"
@@ -330,25 +330,25 @@ END
 IDD_DIALOG1 DIALOG DISCARDABLE  50, 50, 268, 98
 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
     WS_BORDER
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
 END
 
 IDD_ADDFAVORITES DIALOG DISCARDABLE  0, 0, 186, 46
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Zu Favoriten hinzuf<75>gen"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
     PUSHBUTTON      "A&bbrechen",IDCANCEL,129,24,50,14
-    LTEXT           "&Favorit:",IDC_STATIC,7,7,70,10
+    LTEXT           "&Favorite Name:",IDC_STATIC,7,7,70,10
     EDITTEXT        IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL
 END
 
 IDD_REMOVEFAVORITES DIALOG DISCARDABLE  0, 0, 164, 135
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Favoriten entfernen"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,107,114,50,14
     PUSHBUTTON      "A&bbrechen",IDCANCEL,7,114,50,14
@@ -359,16 +359,16 @@ END
 
 IDD_FIND DIALOG DISCARDABLE  0, 0, 254, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Suchen"
-FONT 8, "MS Shell Dlg"
+CAPTION "Find"
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "&Weitersuchen",IDOK,197,7,50,14
     PUSHBUTTON      "A&bbrechen",IDCANCEL,197,24,50,14
-    GROUPBOX        "Suche in",IDC_STATIC,7,25,63,51
+    GROUPBOX        "Look at",IDC_STATIC,7,25,63,51
     LTEXT           "Suche &nach:",IDC_STATIC,7,8,37,10
     EDITTEXT        IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL
     CONTROL         "&Schl<68>ssel",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,14,36,45,8
+                    WS_TABSTOP,14,36,35,8
     CONTROL         "&Werte",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,14,48,36,8
     CONTROL         "&Daten",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | 

reactos/base/applications/regedit/En.rc

@@ -364,7 +364,7 @@ END
 IDD_EXPORTRANGE DIALOG DISCARDABLE  50, 50, 370, 50
 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
     WS_BORDER
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
    GROUPBOX "Export Range",IDC_STATIC,2,0,366,48
    CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11
@@ -375,7 +375,7 @@ END
 IDD_ADDFAVORITES DIALOG DISCARDABLE  0, 0, 186, 46
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Add to Favorites"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
@@ -386,7 +386,7 @@ END
 IDD_REMOVEFAVORITES DIALOG DISCARDABLE  0, 0, 164, 135
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Remove Favorites"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,107,114,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,7,114,50,14
@@ -398,7 +398,7 @@ END
 IDD_FIND DIALOG DISCARDABLE  0, 0, 254, 82
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Find"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
     DEFPUSHBUTTON   "&Find Next",IDOK,197,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,197,24,50,14

reactos/base/applications/regedit/Uk.rc

@@ -1,454 +0,0 @@
-/*
- * Regedit (Ukrainian resources)
- *
- * 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
- * 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
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-/*
- * Menu
- */
-
-IDC_REGEDIT MENU DISCARDABLE
-BEGIN
-    POPUP "&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "<22>&<26><><EFBFBD><EFBFBD>",                            ID_REGISTRY_EXIT
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                     ID_HELP_ABOUT
-    END
-END
-
-IDR_REGEDIT_MENU MENU DISCARDABLE
-BEGIN
-    POPUP "&<26><><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",                        ID_REGISTRY_IMPORTREGISTRYFILE
-
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",                       ID_REGISTRY_EXPORTREGISTRYFILE
-
-        MENUITEM SEPARATOR
-		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><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><EFBFBD>...",
-                                                ID_REGISTRY_DISCONNECTNETWORKREGISTRY
-        , GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "<22>&<26><><EFBFBD>\tCtrl+P",                     ID_REGISTRY_PRINT, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "<22>&<26><><EFBFBD><EFBFBD>",                            ID_REGISTRY_EXIT
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                          ID_EDIT_MODIFY
-        MENUITEM SEPARATOR
-        POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-        BEGIN
-            MENUITEM "<22><>&<26><>",                         ID_EDIT_NEW_KEY
-            MENUITEM SEPARATOR
-            MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",             ID_EDIT_NEW_STRINGVALUE
-            MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",            ID_EDIT_NEW_BINARYVALUE
-            MENUITEM "&DWORD <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",               ID_EDIT_NEW_DWORDVALUE
-			MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",			ID_EDIT_NEW_MULTISTRINGVALUE
-			MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",	ID_EDIT_NEW_EXPANDABLESTRINGVALUE
-        END
-        MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",			ID_EDIT_PERMISSIONS
-        MENUITEM SEPARATOR
-        MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tDel",              ID_EDIT_DELETE
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              ID_EDIT_RENAME
-        MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",     ID_EDIT_COPYKEYNAME
-        MENUITEM SEPARATOR
-        MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD>\tCtrl+F",             ID_EDIT_FIND
-        MENUITEM "<22><><EFBFBD>&<26><><EFBFBD> <20><><EFBFBD><EFBFBD>\tF3",            ID_EDIT_FINDNEXT
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>",                ID_VIEW_STATUSBAR
-        MENUITEM SEPARATOR
-        MENUITEM "<22><><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  ID_VIEW_SPLIT
-        MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tF5",                ID_VIEW_REFRESH
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    BEGIN
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",            ID_FAVOURITES_ADDTOFAVOURITES
-        , GRAYED
-        MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",        ID_FAVOURITES_REMOVEFAVOURITE
-        , GRAYED
-    END
-    POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    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><EFBFBD>",       ID_HELP_ABOUT
-    END
-END
-
-IDR_POPUP_MENUS MENU DISCARDABLE
-BEGIN
-  POPUP ""
-  BEGIN
-	MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                    ID_EDIT_MODIFY
-	MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",       ID_EDIT_MODIFY_BIN
-	MENUITEM SEPARATOR
-	MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>\tDel",              ID_EDIT_DELETE
-	MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              ID_EDIT_RENAME
-  END
-  POPUP ""
-  BEGIN
-        POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-        BEGIN
-            MENUITEM "<22><>&<26><>",                       ID_EDIT_NEW_KEY
-            MENUITEM SEPARATOR
-            MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",           ID_EDIT_NEW_STRINGVALUE
-            MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",          ID_EDIT_NEW_BINARYVALUE
-            MENUITEM "&DWORD <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",             ID_EDIT_NEW_DWORDVALUE
-        END
-  END
-  POPUP ""
-  BEGIN
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",             ID_TREE_EXPANDBRANCH
-        POPUP "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-        BEGIN
-            MENUITEM "<22><>&<26><>",                       ID_EDIT_NEW_KEY
-            MENUITEM SEPARATOR
-            MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",           ID_EDIT_NEW_STRINGVALUE
-            MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",          ID_EDIT_NEW_BINARYVALUE
-            MENUITEM "&DWORD <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",             ID_EDIT_NEW_DWORDVALUE
-        END
-        MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD>",                         ID_EDIT_FIND
-        MENUITEM SEPARATOR
-        MENUITEM "<22>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                       ID_TREE_DELETE
-        MENUITEM "<22><><EFBFBD><EFBFBD><EFBFBD>&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                  ID_TREE_RENAME
-        MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                        ID_TREE_EXPORT
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>...",                     ID_TREE_PERMISSIONS, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",         ID_EDIT_COPYKEYNAME
-  END
-END
-
-
-/*
- * Dialog
- */
-
-IDD_EDIT_STRING DIALOG  32, 24, 252, 84
-STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | 
-    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,6,6,134,8
-    EDITTEXT        IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "&<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,6,35,161,8
-    EDITTEXT        IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,142,64,50,14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDCANCEL,196,64,50,14
-END
-
-IDD_EDIT_MULTI_STRING DIALOG  32, 24, 252, 174
-STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | 
-    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,6,6,134,8
-    EDITTEXT        IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "&<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,6,35,161,8
-    EDITTEXT        IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL
-    DEFPUSHBUTTON   "OK",IDOK,142,154,50,14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDCANCEL,196,154,50,14
-END
-
-IDD_EDIT_BIN_DATA DIALOG  32, 24, 252, 174
-STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | 
-    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><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>"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,6,6,134,8
-    EDITTEXT        IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "&<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,6,35,161,8
-    CONTROL         "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102
-    DEFPUSHBUTTON   "OK",IDOK,142,154,50,14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDCANCEL,196,154,50,14
-END
-
-
-IDD_EDIT_DWORD DIALOG  32, 24, 252, 104
-STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | 
-    WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> DWORD <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT           "&<26><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,6,6,134,8
-    EDITTEXT        IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
-    LTEXT           "&<26><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,6,35,161,8
-    EDITTEXT        IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL
-    GROUPBOX        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_STATIC,130,35,116,39
-    AUTORADIOBUTTON "&س<><D8B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP
-    AUTORADIOBUTTON "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_FORMAT_DEC,141,59,60,10
-    DEFPUSHBUTTON   "OK",IDOK,142,82,50,14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDCANCEL,196,82,50,14
-END
-
-/*
- * String Table
- */
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_LIST_COLUMN_NAME    "<22><>'<27>"
-    IDS_LIST_COLUMN_TYPE    "<22><><EFBFBD>"
-    IDS_LIST_COLUMN_DATA    "<22><><EFBFBD><EFBFBD>"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    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><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><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><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
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    ID_EDIT_MODIFY          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    ID_EDIT_NEW_KEY         "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    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><EFBFBD>"
-    ID_REGISTRY_EXPORTREGISTRYFILE
-                            "<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><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><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><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>"
-    ID_VIEW_SPLIT           "<22><><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> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    ID_VIEW_REFRESH         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    ID_EDIT_DELETE          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    ID_EDIT_RENAME          "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    ID_EDIT_COPYKEYNAME     "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    ID_EDIT_FIND            "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>"
-    ID_EDIT_FINDNEXT        "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_ERROR		    "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_WARNING		    "<22><><EFBFBD><EFBFBD><EFBFBD>"
-    IDS_BAD_KEY             "<22><> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> '%s'"
-    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>-<2D><> <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>"
-    IDS_QUERY_DELETE_ONE    "<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><EFBFBD>?"
-    IDS_QUERY_DELETE_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><EFBFBD>?"
-    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>"
-    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><>-<2D><> <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
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_BINARY_EMPTY	    "(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    IDS_DEFAULT_VALUE_NAME  "(<28><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)"
-    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><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><EFBFBD>"
-    IDS_FLT_REGFILES_FLT    "*.reg"
-    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    "*.*"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_ACCESS_FULLCONTROL        "Full Control"
-  IDS_ACCESS_READ               "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_ACCESS_QUERYVALUE         "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_ACCESS_SETVALUE           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_ACCESS_CREATESUBKEY       "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_ACCESS_ENUMERATESUBKEYS   "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_ACCESS_NOTIFY             "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_ACCESS_CREATELINK         "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>'<27><><EFBFBD><EFBFBD>"
-  IDS_ACCESS_DELETE             "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_ACCESS_WRITEDAC           "<22><><EFBFBD><EFBFBD><EFBFBD> DAC"
-  IDS_ACCESS_WRITEOWNER         "<22><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_ACCESS_READCONTROL        "Read Control"
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_INHERIT_THISKEYONLY        "ҳ<><D2B3><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_INHERIT_THISKEYANDSUBKEYS  "<22><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_INHERIT_SUBKEYSONLY        "ҳ<><D2B3><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-END
-
-STRINGTABLE DISCARDABLE
-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><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-END
-
-/*****************************************************************/
-
-
-/*
- * Dialog
- */
-
-IDD_EXPORTRANGE DIALOG DISCARDABLE  50, 50, 370, 50
-STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
-    WS_BORDER
-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><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
-
-IDD_ADDFAVORITES DIALOG DISCARDABLE  0, 0, 186, 46
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDCANCEL,129,24,50,14
-    LTEXT           "<22><>'&<26> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,7,7,70,10
-    EDITTEXT        IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL
-END
-
-IDD_REMOVEFAVORITES DIALOG DISCARDABLE  0, 0, 164, 135
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,107,114,50,14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDCANCEL,7,114,50,14
-    CONTROL         "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | 
-                    WS_BORDER | WS_TABSTOP,7,20,150,90
-    LTEXT           "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,7,7,99,12
-END
-
-IDD_FIND DIALOG DISCARDABLE  0, 0, 254, 82
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "<22><><EFBFBD>&<26><><EFBFBD> <20><><EFBFBD><EFBFBD>",IDOK,197,7,50,14
-    PUSHBUTTON      "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDCANCEL,197,24,50,14
-    GROUPBOX        "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>",IDC_STATIC,7,25,63,51
-    LTEXT           "&<26><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:",IDC_STATIC,7,8,37,10
-    EDITTEXT        IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL
-    CONTROL         "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,14,36,35,8
-    CONTROL         "&<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,14,48,36,8
-    CONTROL         "&<26><><EFBFBD><EFBFBD>",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,14,60,42,8
-    CONTROL         "&ҳ<><D2B3><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_MATCHSTRING,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13
-    CONTROL         "<22> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> &<26><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,83,48,90,12
-END
-
-IDD_FINDING DIALOGEX 0, 0, 145, 50
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | 
-    WS_CAPTION | WS_SYSMENU
-CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-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><EFBFBD>...",IDC_STATIC,33,12,83,8
-END
-
-/*
- * TEXTINCLUDE
- */
-
-1 TEXTINCLUDE DISCARDABLE
-BEGIN
-    "resource.h\0"
-END
-
-
-
-/*
- * String Table
- */
-
-/*
- *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><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/regedit/rsrc.rc

@@ -50,5 +50,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include "Si.rc"
 #include "Sv.rc"
 #include "Hu.rc"
-#include "Uk.rc"
-

reactos/base/applications/reporterror/Nl.rc

@@ -1,61 +0,0 @@
-/*
- * COPYRIGHT:   See COPYING in the top level directory
- * PROJECT:     ReactOS Error Reporting Assistant
- * FILE:        base/application/reporterror/Nl.rc
- * AUTHOR:      Maurus Cuelenaere
- */
-
-LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
-
-IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Foutafhandelingassistent"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  CONTROL "Het systeem herstelde zich van een fout.",-1,"Static",0x50020000,115,15,160,24
-  CONTROL "Wilt u de fout rapporteren aan het ReactOS-team?",-1,"Static",0x50020000,115,35,160,17
-END
-
-IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Foutafhandelingassistent"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  CONTROL "Gelieve te beschrijven wat u deed toen de fout optrad.\n\nKlik op 'Volgende' om het rapport te verzenden aan het ReactOS-team of klik op 'Annuleren' om geen informatie te verzenden.",-1,"Static",0x50020000,10,0,225,40
-  CONTROL "Uw e-mail adres (optioneel):",-1,"Static",0x50020000,10,40,120,20
-  CONTROL "",IDE_SUBMIT_REPORT_YOUR_EMAIL,"Edit",0x50010000,110,40,150,12,0x00000200
-  CONTROL "Het probleem (optioneel):",-1,"Static",0x50020000,10,55,147,20
-  CONTROL "",IDE_SUBMIT_REPORT_PROBLEM_DESCRIPTION,"Edit",0x50A11004,10,65,250,55,0x00000200
-END
-
-
-IDD_SUBMITTING_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Foutafhandelingassistent"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  CONTROL "{STATUS}",IDC_SUBMISSION_STATUS,"Static",0x50020000,25,58,225,8
-  CONTROL "",IDC_SUBMITTING_IN_PROGRESS,"msctls_progress32",0x50800000,25,80,225,8
-END
-
-IDD_SUBMITTED_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
-CAPTION "Foutafhandelingassistent"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-  CONTROL "Het rapport is succesvol verzonden naar het ReactOS-team.",-1,"Static",0x50020000,25,5,225,20
-END
-
-STRINGTABLE
-BEGIN
-  IDS_WIZARD_NAME "Rapporteer een fout aan het ReactOS-team"
-  IDS_FAILED_TO_CONTACT_SERVER "Het systeem kon de server niet bereiken.\nControleer of u verbonden bent met het internet."
-  IDS_FAILED_TO_DELIVER_ERROR_REPORT "Het systeem kon het rapport niet afleveren."
-END
-
-STRINGTABLE
-BEGIN
-  IDS_CONTACTING_SERVER "Bezig met verbinden met de server..."
-  IDS_FAILED_TO_INITIALIZE_WINSOCK "Kan winsock niet initialiseren (windows error code %d)"
-  IDS_FAILED_TO_LOCATE_SERVER "Kan geen verbinding maken met de server."
-END

reactos/base/applications/reporterror/de.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
@@ -6,7 +6,7 @@ CAPTION "Fehlerbericht Assistent"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
   LTEXT "Das System hat einen Fehler entdeckt.", -1, 115, 15, 160, 24
-  LTEXT "Wollen Sie den Fehlerbericht an die ReactOS Foundation senden?", -1, 115, 35, 160, 17
+  LTEXT "Wollen Sie den Fehlerbericht an das ReactOS Projekt schicken?", -1, 115, 35, 160, 17
 END
 
 IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -14,7 +14,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Fehlerbericht Assistent"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "Bitte beschreiben Sie was sie gerade getan haben als der Fehler auftrat.\n\nKlicken Sie auf 'Weiter' um den Fehlerbricht an die ReactOS Foundation zu senden oder 'Abbrechen' um keine Informationen zu senden.",-1,10,0,255,40
+  LTEXT "Bitte beschreiben Sie was sie gerade gemacht haben als der Fehler auftrat.\n\nKlicken Sie auf 'Weiter' um den Fehlerbricht and das ReactOS Projekt zu senden oder 'Abbrechen' um keine Informationen zu senden.",-1,10,0,255,40
   LTEXT "Ihre E-Mail Addresse (freiwillig):",-1,10,40,120,20
   EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 120,40,140,12
   LTEXT "Beschreibung des Problems/Fehlers (freiwillig):",-1,10,55,160,20
@@ -35,12 +35,12 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Fehlerbericht Assistent"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "Ihr Fehlerbericht wurde erfolgreich an die ReactOS Foundation geschickt.",-1,25,5,225,20
+  LTEXT "Ihr Fehlerbericht wurde erfolgreich an das ReactOS Projekt gesendet.",-1,25,5,225,20
 END
 
 STRINGTABLE
 BEGIN
-  IDS_WIZARD_NAME "Fehlerbericht an die ReactOS Foundation senden"
+  IDS_WIZARD_NAME "Fehlerbericht an das ReactOS Projekt senden"
   IDS_FAILED_TO_CONTACT_SERVER "Das System war nicht in der Lage den ReactOS Fehlerbericht Server zu kontaktieren.\nBitte vergewissern Sie sich das ihr System mit dem Internet verbunden ist."
   IDS_FAILED_TO_DELIVER_ERROR_REPORT "Das System konnte den Fehlerbericht nicht versenden."
 END

reactos/base/applications/reporterror/en.rc

@@ -6,7 +6,7 @@ CAPTION "Error reporting assistant"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
   LTEXT "The system recovered from an error.", -1, 115, 15, 160, 24
-  LTEXT "Would you like to report the error to the ReactOS foundation?", -1, 115, 35, 160, 17
+  LTEXT "Would you like to report the error to the ReactOS project?", -1, 115, 35, 160, 17
 END
 
 IDD_SUBMIT_REPORT DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@@ -14,7 +14,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Error reporting assistant"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReactOS foundation or 'Cancel' to not send any information.",-1,10,0,225,40
+  LTEXT "Please describe what you were trying to do when the error occurred.\n\nClick 'Next' to send the report to the ReactOS project or 'Cancel' to not send any information.",-1,10,0,225,40
   LTEXT "Your e-mail address (optional):",-1,10,40,120,20
   EDITTEXT IDE_SUBMIT_REPORT_YOUR_EMAIL, 110,40,150,12
   LTEXT "Description of problem (optional):",-1,10,55,120,20
@@ -35,12 +35,12 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
 CAPTION "Error reporting assistant"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-  LTEXT "Your error report was successfully sent to the ReactOS foundation.",-1,25,5,225,20
+  LTEXT "Your error report was successfully sent to the ReactOS project.",-1,25,5,225,20
 END
 
 STRINGTABLE
 BEGIN
-  IDS_WIZARD_NAME "Report error to the ReactOS foundation"
+  IDS_WIZARD_NAME "Report error to the ReactOS project"
   IDS_FAILED_TO_CONTACT_SERVER "The system was unable to contact the error reporting server.\nPlease make sure that your system is connected to the internet."
   IDS_FAILED_TO_DELIVER_ERROR_REPORT "The system was unable to deliver the error report."
 END

reactos/base/applications/reporterror/reporterror.rc

@@ -20,5 +20,4 @@ IDB_HEADER    BITMAP "resources/header.bmp"
 #include "Ja.rc"
 #include "sv.rc"
 #include "hu.rc"
-#include "Nl.rc"
 #include "ru.rc"

reactos/base/applications/screensavers/cylfrac/cylfrac.c

@@ -1,298 +0,0 @@
-/*
- *  Copyright 2003 J Brown
- *  Copyright 2006 Andrey Korotaev <unC0Rr@inbox.ru>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-#include <windows.h>
-#include <gl.h>
-#include <glu.h>
-#include <tchar.h>
-
-#define APPNAME _T("Cylfrac")
-#define wfactor 0.9
-#define rotfactor 1.5
-#define FPS 100
-#define timerdelay 1000/FPS
-
-POINT initpoint;
-HDC dc;
-HGLRC hrc;
-DWORD oldticks;
-MMRESULT TimerID;
-
-DWORD lvls = 7;
-int cylquality = 8;
-
-HINSTANCE hInstance;
-
-GLUquadricObj * cylinder;
-
-float angle = 0;
-float colorh = 0.0;
-float rval, gval, bval;
-
-BOOL fullscreen = FALSE;
-
-float _RGB(float H, float M1, float M2)
-{
-	if(H < 0.0) H += 360.0;
-		else if(H > 360.0) H -= 360.0;
-	if(H < 60) return M1 + (M2 - M1) * H / 60.0;
-	if((H >= 60 )&&(H < 180)) return M2;
-	if((H >= 180)&&(H < 240)) return M1 + (M2 - M1)*(240 - H) / 60.0;
-	return M1;
-}
-
-void HLStoRGB(float H, float L, float S,
-              float* R, float* G, float* B)
-{
-    float M1, M2;
-	if(S <= 0.5) M2 = S * (1 + L);
-		else M2 = S * (1 - L) + L;
-	M1 = 2 * S - M2;
-	if (L == 0.0)
-	{
-		*R = S;
-		*G = S;
-		*B = S;
-	} else {
-		*R = _RGB(H + 120.0, M1, M2);
-		*G = _RGB(H        , M1, M2);
-		*B = _RGB(H - 120.0, M1, M2);
-	}
-}
-
-void DrawCylinder(int n, float rota, float width)
-{
-	glPushMatrix();
-	glColor3f(rval/n, gval/n, bval/n);
-	glRotatef(rota, 0.0, 1.0, 0.0);
-	gluCylinder(cylinder, width, width * wfactor, n * 0.5, cylquality, 1);
-	glTranslatef(0.0, 0.0, -n * 0.5);
-	gluCylinder(cylinder, width * wfactor, width, n * 0.5, cylquality, 1);
-	if(n > 1)
-	{
-		float r = rota * rotfactor;
-		glRotatef(90.0, 1.0, 0.0, 0.0);
-		DrawCylinder(n - 1,  r, width * wfactor);
-		glTranslatef(0.0, n, 0.0);
-		DrawCylinder(n - 1, -r, width * wfactor);
-	}
-	glPopMatrix();
-}
-
-void DrawScene(HWND hwnd, HDC dc, int ticks)
-{
-	PAINTSTRUCT ps;
-	dc = BeginPaint(hwnd, &ps);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	glRotatef(ticks * 0.01, 0.0, 1.0, -0.5);
-	angle += ticks * 0.01;
-	colorh += ticks * 0.003;
-	if (colorh > 360.0) colorh -= 360.0;
-	HLStoRGB(colorh, 1.0, 0.7, &rval, &gval, &bval);
-	DrawCylinder(lvls, angle, 0.2);
-	SwapBuffers(dc);
-	EndPaint(hwnd, &ps);
-}
-
-void CALLBACK TimeProc(UINT uID, UINT uMsg, DWORD dwUser, DWORD dw1, DWORD dw2)
-{
-	InvalidateRect((HWND)dwUser, NULL, 0);
-}
-
-void MyPixelFormat(HDC dc)
-{
-	int npf;
-	PIXELFORMATDESCRIPTOR pfd;
-
-	ZeroMemory(&pfd, sizeof(pfd));
-	pfd.nSize = sizeof(pfd);
-	pfd.nVersion = 1;
-	pfd.dwFlags = PFD_DOUBLEBUFFER | PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW;
-
-	npf = ChoosePixelFormat(dc, &pfd);
-	if(npf != 0)
-		SetPixelFormat(dc, npf, &pfd);
-}
-
-void InitGL(HWND hwnd)
-{
-	GLfloat lightpos[4] = {2.0, 2.0, -2.0, 0.7};
-	GLfloat ca = 1.0;
-	dc = GetDC(hwnd);
-	MyPixelFormat(dc);
-	hrc = wglCreateContext(dc);
-	wglMakeCurrent(dc, hrc);
-	cylinder = gluNewQuadric();
-	glEnable(GL_DEPTH_TEST);
-	glEnable(GL_LIGHT0);
-	glLightfv(GL_LIGHT0,  GL_POSITION, (GLfloat *)&lightpos);
-	glLightfv(GL_LIGHT0,  GL_LINEAR_ATTENUATION, &ca);
-	glEnable(GL_LIGHTING);
-	glEnable(GL_COLOR_MATERIAL);
-}
-
-LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	switch(msg) {
-		case WM_CREATE:
-			GetCursorPos(&initpoint);
-			InitGL(hwnd);
-			oldticks = GetTickCount();
-			TimerID = timeSetEvent (timerdelay, 0, TimeProc, (DWORD)hwnd, TIME_PERIODIC);
-			break;
-		case WM_PAINT:
-		{
-			DWORD ticks = oldticks;
-			oldticks = GetTickCount();
-			DrawScene(hwnd, dc, oldticks - ticks);
-			POINT currpoint;
-			if(fullscreen)
-			{
-				GetCursorPos(&currpoint);
-				if(abs(currpoint.x - initpoint.x) + (abs(currpoint.y - initpoint.y)) > 10)
-					PostMessage(hwnd, WM_CLOSE, 0, 0);
-			}
-			break;
-		}
-		case WM_DESTROY:
-			timeKillEvent(TimerID);
-			gluDeleteQuadric(cylinder);
-			wglMakeCurrent(0, 0);
-			wglDeleteContext(hrc);
-			ReleaseDC(hwnd, dc);
-			DeleteDC(dc);
-			PostQuitMessage(0);
-			break;
-		case WM_NOTIFY:
-		case WM_SYSKEYDOWN:
-			PostMessage(hwnd, WM_CLOSE, 0, 0);
-			break;
-		case WM_SIZE:
-		{
-			int width = LOWORD(lParam);
-			int height = HIWORD(lParam);
-			glViewport(0, 0, width, height);
-			glMatrixMode(GL_MODELVIEW);
-			glLoadIdentity();
-			float fscale = 0.8/(float)lvls;
-			glScalef(fscale, fscale, fscale);
-			break;
-		}
-
-	}
-	return DefWindowProc(hwnd, msg, wParam, lParam);
-}
-
-void InitSaver(HWND hwndParent)
-{
-	WNDCLASS wc;
-	ZeroMemory(&wc, sizeof(wc));
-	wc.style            = CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc      = WndProc;
-	wc.lpszClassName    = APPNAME;
-  	RegisterClass(&wc);
-
-	if (hwndParent != 0)
-	{
-		RECT rect;
-		GetClientRect(hwndParent, &rect);
-		CreateWindow(APPNAME, APPNAME,
-		             WS_VISIBLE | WS_CHILD,
-		             0, 0,
-		             rect.right,
-		             rect.bottom,
-		             hwndParent, 0,
-		             hInstance, NULL);
-		fullscreen = FALSE;
-	} else {
-		HWND hwnd;
-		hwnd = CreateWindow(APPNAME, APPNAME,
-		                    WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST,
-		                    0, 0,
-		                    GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN),
-		                    HWND_DESKTOP, 0,
-		                    hInstance, NULL);
-		ShowWindow(hwnd, SW_SHOWMAXIMIZED);
-		ShowCursor(FALSE);
-		fullscreen = TRUE;
-	}
-}
-
-void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
-{
-	int ch = *szCmdLine++;
-
-	if(ch == '-' || ch == '/')
-		ch = *szCmdLine++;
-
-	if(ch >= 'A' && ch <= 'Z')
-		ch += 'a' - 'A';
-
-	*chOption = ch;
-	ch = *szCmdLine++;
-
-	if(ch == ':')
-		ch = *szCmdLine++;
-
-	while(ch == ' ' || ch == '\t')
-		ch = *szCmdLine++;
-
-	if(isdigit(ch))
-	{
-		unsigned int i = atoi(szCmdLine - 1);
-		*hwndParent = (HWND)i;
-	}
-	else
-		*hwndParent = 0;
-}
-
-int WINAPI WinMain (HINSTANCE hInst,
-                    HINSTANCE hPrev,
-                    LPSTR lpCmdLine,
-                    int iCmdShow)
-{
-	HWND	hwndParent;
-	int		chOption;
-
-	hInstance = hInst;
-
-	ParseCommandLine(lpCmdLine, &chOption, &hwndParent);
-
-	switch(chOption)
-	{
-		case 's': InitSaver(0);	break;
-		case 'p': InitSaver(hwndParent); break;
-		case 'c':
-			MessageBox(0,
-			           _T("Cylinders fractal by unC0Rr.\nSpecial for ReactOS.\n"),
-			           _T("About"),
-			           MB_OK | MB_ICONINFORMATION);
-			return 0;
-		default: InitSaver(0);
-	}
-
-	MSG Message;
-
-	while (GetMessage(&Message, 0, 0, 0))
-		DispatchMessage(&Message);
-
-	return Message.wParam;
-}
-
-

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

@@ -1,15 +0,0 @@
-<module name="cylfrac" type="win32scr" installbase="system32" installname="cylfrac.scr">
-	<define name="__USE_W32API" />
-	<define name="__REACTOS__" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
-	
-	<library>kernel32</library>
-	<library>user32</library> 
-	<library>gdi32</library> 
-	<library>opengl32</library> 
-	<library>glu32</library> 
-	<library>winmm</library>
-	
-	<file>cylfrac.c</file>
-</module>

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

@@ -69,7 +69,7 @@ BOOL CALLBACK ConfigDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		prevheight = GetSystemMetrics(SM_CYSCREEN) / GLYPH_HEIGHT + 1;
 
 		//Add any saved messages to the combo box
-		for(index = 0; index < g_nNumMessages; index++)
+		for(index = 0; index <= g_nNumMessages; index++)
 		{
 			if(lstrlen(g_szMessages[index]) > 0)
 				SendDlgItemMessage(hwnd, IDC_COMBO1, CB_ADDSTRING, 0, (LPARAM)g_szMessages[index]);

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

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true">
-	<include base="matrix">.</include>
+      <include base="matrix">.</include>
 	
 	<linkerflag>-lstdc++</linkerflag>
 	<define name="__USE_W32API" />
@@ -15,10 +15,12 @@
 	<library>user32</library> 
 	<library>gdi32</library> 
 	<library>winspool</library> 
-	<library>comctl32</library> 
+      <library>comctl32</library> 
 	<library>comdlg32</library> 
-	<library>advapi32</library>
+      <library>advapi32</library>
 	<library>shell32</library> 
+	<library>ole32</library> 
+	<library>oleaut32</library> 
 	<library>uuid</library> 
 	
 	<file>config.c</file>

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

@@ -29,7 +29,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 IDD_CONFIG DIALOG DISCARDABLE  0, 0, 340, 183
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Matrix ScreenSaver Configuration"
-FONT 8, "MS Shell Dlg"
+FONT 8, "MS Sans Serif"
 BEGIN
     GROUPBOX        "Decode &Speed",IDC_STATIC,7,7,128,36
     LTEXT           "Slower",IDC_STATIC,13,24,22,8

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

@@ -98,7 +98,6 @@ void LoadSettings()
 	{
 		/* built-in coded message for first run */
 		lstrcpyn(g_szMessages[0], _T("ReactOS"), MAXMSG_LENGTH);
-		++g_nNumMessages;
 	}
 
 	RegCloseKey(hkey);

reactos/base/applications/screensavers/screensavers.rbuild

@@ -4,7 +4,5 @@
 <directory name="matrix">
 	<xi:include href="matrix/matrix.rbuild" />
 </directory>
-<directory name="cylfrac">
-	<xi:include href="cylfrac/cylfrac.rbuild" />
-</directory>
+
 </group>

reactos/base/applications/screenshot/screenshot.c

@@ -347,8 +347,6 @@ int WINAPI WinMain(HINSTANCE hInstance,
     pScrSht = HeapAlloc(GetProcessHeap(),
                         0,
                         sizeof(SCREENSHOT));
-    if (pScrSht == NULL)
-        return -1;
 
     if (bFullScreen)
     {
@@ -360,13 +358,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
     }
 
     if (pScrSht->hSelf == NULL)
-    {
-        HeapFree(GetProcessHeap(),
-                 0,
-                 pScrSht);
-
         return -1;
-    }
 
     if (CaptureScreen(pScrSht))
     {

reactos/base/applications/servman/De.rc

@@ -31,7 +31,7 @@ END
 IDD_ABOUTBOX DIALOG DISCARDABLE  22,16,190,182
 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "<22>ber den Service Manager"
-FONT 8, "MS Shell Dlg"
+FONT 8, "Tahoma"
 BEGIN
     CONTROL         "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)",
                     IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,48,7,130,26
@@ -44,7 +44,7 @@ END
 
 IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "Allgemein"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"MS Sans Serif",0,0
 STYLE 0x10CF0000
 BEGIN
   CONTROL "Dienstname:",IDC_STATIC,"Static",0x50000000,4,11,53,11
@@ -86,7 +86,7 @@ BEGIN
   IDS_SERVICES_YES "Ja"
   IDS_SERVICES_UNKNOWN "Unbekannt"
   IDS_SERVICES_AUTO "Automatisch"
-  IDS_SERVICES_MAN "Manuell"
+  IDS_SERVICES_MAN "Manuel"
   IDS_SERVICES_DIS "Deaktiviert"
 END
 

reactos/base/applications/servman/En.rc

@@ -8,7 +8,7 @@ BEGIN
   END
   POPUP "Action"
   BEGIN
-    MENUITEM "Connect to...", ID_CONNECT, GRAYED
+    MENUITEM "Connect to...", ID_NET_CON, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Start",       ID_START, GRAYED
     MENUITEM "Stop",        ID_STOP, GRAYED
@@ -18,7 +18,7 @@ BEGIN
     MENUITEM SEPARATOR
     MENUITEM "Refresh",     ID_REFRESH
     MENUITEM SEPARATOR
-    MENUITEM "Edit...",     ID_EDIT, GRAYED
+    MENUITEM "Edit...", ID_EDIT, GRAYED
     MENUITEM "Create...",   ID_CREATE
     MENUITEM "Delete...",   ID_DELETE, GRAYED
     MENUITEM SEPARATOR
@@ -31,15 +31,13 @@ BEGIN
     MENUITEM "List",        ID_VIEW_LIST
     MENUITEM "Details",     ID_VIEW_DETAILS
     MENUITEM SEPARATOR
-    MENUITEM "Customize...",ID_VIEW_CUST, GRAYED
+    MENUITEM "Customize...",ID_VIEW_CUSTOMIZE, GRAYED
   END
   POPUP "Help"
   BEGIN
-    MENUITEM "Help",        ID_HELP
-    MENUITEM "About",       ID_ABOUT
+    MENUITEM "About...",    ID_ABOUT
   END
 END
-
 IDR_POPUP MENU
 BEGIN
   POPUP "popup"
@@ -52,7 +50,7 @@ BEGIN
     MENUITEM SEPARATOR
     MENUITEM "Refresh",     ID_REFRESH
     MENUITEM SEPARATOR
-    MENUITEM "Edit...",     ID_EDIT, GRAYED
+    MENUITEM "Edit...", ID_EDIT, GRAYED
     MENUITEM "Delete...",   ID_DELETE, GRAYED
     MENUITEM SEPARATOR
     MENUITEM "Properties...", ID_PROP, GRAYED
@@ -63,10 +61,10 @@ END
 
 IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "About Service Manager"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Service Manager v0.5.1\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
+  LTEXT "Service Manager v0.5\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
@@ -74,14 +72,14 @@ END
 
 IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "General"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",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
+  CONTROL "",IDC_START_TYPE,"ComboBox",0x50010003,70,107,176,40
   PUSHBUTTON "Start", IDC_START, 6, 155, 54, 15, WS_DISABLED
   PUSHBUTTON "Stop", IDC_STOP, 68, 155, 54, 15, WS_DISABLED
   PUSHBUTTON "Pause", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED
@@ -92,7 +90,7 @@ BEGIN
   LTEXT "Path to executable:", IDC_STATIC, 6, 73, 82, 9
   LTEXT "Startup type:", IDC_STATIC, 6, 108, 53, 11
   LTEXT "Service status:", IDC_STATIC, 4, 138, 53, 11
-  LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE
+  CONTROL "",IDC_SERV_STATUS,"Static",0x50000000,70,138,176,11
   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
@@ -100,11 +98,11 @@ END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
 CAPTION "Dependencies"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",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
+  CONTROL "",IDC_DEPEND_TREE1,"SysTreeView32",0x50010007,8,70,236,68,0x00000200
+  CONTROL "",IDC_DEPEND_TREE2,"SysTreeView32",0x50010007,8,151,234,67,0x00000200
   LTEXT "Some services depend on other services, system drivers and load order groups. If a system component is stopped or it is not running properly, dependant services can be affected.", IDC_STATIC,8, 7, 238, 26
   LTEXT "This service depends on the following components", IDC_STATIC, 8, 57, 236, 9
   LTEXT "", IDC_DEPEND_SERVICE, 8, 38, 236, 13
@@ -112,27 +110,27 @@ END
 
 IDD_DLG_CREATE DIALOGEX 6,6,225,209
 CAPTION "Create a service"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",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 "*Service Name :", IDC_STATIC, 12, 12, 54, 9
-  LTEXT "*Display Name :", IDC_STATIC, 12, 33, 54, 9
-  LTEXT "*Path to executable :", IDC_STATIC, 10, 51, 68, 9
-  LTEXT "Description :", IDC_STATIC, 12, 86, 44, 9
-  PUSHBUTTON "OK", IDOK, 126, 192, 44, 13
-  PUSHBUTTON "Cancel", IDCANCEL, 176, 192, 46, 13
-  LTEXT "Additional options (click help for details)", IDC_STATIC, 10, 151, 134, 9
-  PUSHBUTTON "Help", ID_CREATE_HELP, 6, 192, 44, 13
+  CONTROL "",IDC_CREATE_SERVNAME,"Edit",0x50010000,72,12,150,11,0x00000200
+  CONTROL "",IDC_CREATE_DISPNAME,"Edit",0x50010000,72,31,150,11,0x00000200
+  CONTROL "",IDC_CREATE_PATH,"Edit",0x50010000,8,62,214,13,0x00000200
+  CONTROL "",IDC_CREATE_DESC,"Edit",0x50010000,10,97,210,48,0x00000200
+  CONTROL "",IDC_CREATE_OPTIONS,"Edit",0x50010000,10,162,210,13,0x00000200
+  CONTROL "*Service Name :",IDC_STATIC,"Static",0x50000202,12,12,54,9
+  CONTROL "*Display Name :",IDC_STATIC,"Static",0x50000202,12,33,54,9
+  CONTROL "*Path to executable :",IDC_STATIC,"Static",0x50000000,10,51,68,9
+  CONTROL "Description :",IDC_STATIC,"Static",0x50000000,12,86,44,9
+  CONTROL "OK",IDOK,"Button",0x50010000,126,192,44,13
+  CONTROL "Cancel",IDCANCEL,"Button",0x50010000,176,192,46,13
+  CONTROL "Additional options (click help for details)",IDC_STATIC,"Static",0x50000000,10,151,134,9
+  CONTROL "Help",ID_CREATE_HELP,"Button",0x50010000,6,192,44,13
 END
 
 IDD_DLG_DELETE DIALOGEX 6,6,185,148
 CAPTION "Delete a service"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",0,0
 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME
 BEGIN
   ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22
@@ -146,7 +144,7 @@ END
 
 IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150
 CAPTION "Options"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"MS Sans Serif",0,0
 STYLE 0x10CF0000
 BEGIN
   LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150
@@ -155,17 +153,19 @@ END
 
 IDD_DLG_PROGRESS DIALOGEX 6,6,255,89
 CAPTION "Service Control"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"MS Sans Serif",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
+  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 "&Close", IDOK, 100, 70, 54, 13
 END
 
 
+IDB_BUTTONS BITMAP DISCARDABLE "res/toolbar.bmp"
+
 
 STRINGTABLE DISCARDABLE
 BEGIN
@@ -196,12 +196,11 @@ BEGIN
   IDS_TOOLTIP_PROP "Properties"
   IDS_TOOLTIP_REFRESH "Refresh"
   IDS_TOOLTIP_EXPORT "Export list"
-  IDS_TOOLTIP_CREATE "Create a new service"
-  IDS_TOOLTIP_DELETE "Deletes an existing service"
   IDS_TOOLTIP_START "Start service"
   IDS_TOOLTIP_STOP "Stop service"
   IDS_TOOLTIP_PAUSE "Pause service"
   IDS_TOOLTIP_RESTART "Restart service"
+  IDS_TOOLTIP_NEW "Create a new service"
   IDS_TOOLTIP_HELP "Help"
   IDS_TOOLTIP_EXIT "Exit"
 END
@@ -211,7 +210,7 @@ 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_CREATE_SUCCESS "Service Created Succesfully"
-  IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory"
+  IDS_CREATE_REQ "* = required fields"
   IDS_DELETE_STOP "You must manually stop the service before deleting!"
 END
 
@@ -219,62 +218,3 @@ 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
-  IDS_HINT_BLANK        " "
-  IDS_HINT_EXPORT       " Exports the current list to a file."
-  IDS_HINT_EXIT         " Exits the program."
-
-  IDS_HINT_CONNECT      " Manage a different computer."
-  IDS_HINT_START        " Start the selected service."
-  IDS_HINT_STOP         " Stop the selected service."
-  IDS_HINT_PAUSE        " Pause the selected service."
-  IDS_HINT_RESUME       " Resume the selected service."
-  IDS_HINT_RESTART      " Stop and start the selected service."
-  IDS_HINT_REFRESH      " Refresh the service list."
-  IDS_HINT_EDIT         " Edit the properties of the selected service."
-  IDS_HINT_CREATE       " Create a new service."
-  IDS_HINT_DELETE       " Delete the selected service."
-  IDS_HINT_PROP         " Open property sheet for the current selection."
-
-  IDS_HINT_LARGE        " Display items by using large icons."
-  IDS_HINT_SMALL        " Display items by using small icons."
-  IDS_HINT_LIST         " Display item in a list."
-  IDS_HINT_DETAILS      " Display information about each item in a window."
-  IDS_HINT_CUST         " Customizes the view."
-
-  IDS_HINT_HELP         " Display help window."
-  IDS_HINT_ABOUT        " About ReactOS Service Manager."
-
-  IDS_HINT_SYS_RESTORE  " Restores this window to normal size."
-  IDS_HINT_SYS_MOVE     " Moves this window."
-  IDS_HINT_SYS_SIZE     " Resizes this window."
-  IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon."
-  IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen."
-  IDS_HINT_SYS_CLOSE    " Closes this window."
-END

reactos/base/applications/servman/Ru.rc

@@ -63,7 +63,7 @@ END
 
 IDD_ABOUTBOX DIALOGEX 22,16,190,182
 CAPTION "<22> Service Manager"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
   LTEXT "Service Manager v0.5\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
@@ -74,7 +74,7 @@ END
 
 IDD_DLG_GENERAL DIALOGEX 6,6,253,225
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",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
@@ -100,7 +100,7 @@ END
 
 IDD_DLG_DEPEND DIALOGEX 6,6,253,225
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",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
@@ -112,7 +112,7 @@ END
 
 IDD_DLG_CREATE DIALOGEX 6,6,225,209
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",0,0
 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP
 BEGIN
   CONTROL "",IDC_CREATE_SERVNAME,"Edit",0x50010000,72,12,150,11,0x00000200
@@ -132,7 +132,7 @@ END
 
 IDD_DLG_DELETE DIALOGEX 6,6,185,148
 CAPTION "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"Tahoma",0,0
 STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME
 BEGIN
   ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22
@@ -146,7 +146,7 @@ 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
+FONT 8,"MS Sans Serif",0,0
 STYLE 0x10CF0000
 BEGIN
   LTEXT "", IDC_CREATE_HELP, 6, 5, 200, 150
@@ -155,7 +155,7 @@ END
 
 IDD_DLG_PROGRESS DIALOGEX 6,6,255,89
 CAPTION "Service Control"
-FONT 8, "MS Shell Dlg",0,0
+FONT 8,"MS Sans Serif",0,0
 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 EXSTYLE WS_EX_TOOLWINDOW
 BEGIN

reactos/base/applications/servman/about.c

@@ -3,12 +3,19 @@
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        base/system/servman/about.c
  * PURPOSE:     About dialog box message handler
- * COPYRIGHT:   Copyright 2005 - 2006 Ged Murphy <gedmurphy@gmail.com>
+ * COPYRIGHT:   Copyright 2005 Ged Murphy <gedmurphy@gmail.com>
  *
  */
 
-#include "precomp.h"
+//ShellAbout(hwnd, _T("test"), _T("test2"), MAKEINTRESOURCE(IDI_SM_ICON));
 
+#include "servman.h"
+
+extern HINSTANCE hInstance;
+
+#ifdef _MSC_VER
+#pragma warning(disable : 4100)
+#endif
 BOOL CALLBACK
 AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -20,28 +27,15 @@ AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     {
     case WM_INITDIALOG:
 
-        hIcon = LoadImage(hInstance,
-                          MAKEINTRESOURCE(IDI_SM_ICON),
-                          IMAGE_ICON,
-                          16,
-                          16,
-                          0);
+        hIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0);
+        SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
 
-        SendMessage(hDlg,
-                    WM_SETICON,
-                    ICON_SMALL,
-                    (LPARAM)hIcon);
+        hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT);
 
-        hLicenseEditWnd = GetDlgItem(hDlg,
-                                     IDC_LICENSE_EDIT);
+        LoadString(hInstance, IDS_LICENSE, strLicense,
+            sizeof(strLicense) / sizeof(TCHAR));
 
-        LoadString(hInstance,
-                   IDS_LICENSE,
-                   strLicense,
-                   sizeof(strLicense) / sizeof(TCHAR));
-
-        SetWindowText(hLicenseEditWnd,
-                      strLicense);
+        SetWindowText(hLicenseEditWnd, strLicense);
 
         return TRUE;
 
@@ -50,8 +44,7 @@ AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
         if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
         {
             DestroyIcon(hIcon);
-            EndDialog(hDlg,
-                      LOWORD(wParam));
+            EndDialog(hDlg, LOWORD(wParam));
             return TRUE;
         }
 

reactos/base/applications/servman/control.c

@@ -7,15 +7,17 @@
  *
  */
 
-#include "precomp.h"
+#include "servman.h"
 
-BOOL
-Control(PMAIN_WND_INFO Info,
-        DWORD Control)
+extern HWND hListView;
+
+
+BOOL Control(HWND hProgDlg, DWORD Control)
 {
     HWND hProgBar;
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
+    ENUM_SERVICE_STATUS_PROCESS *Service = NULL;
     SERVICE_STATUS_PROCESS ServiceStatus;
     SERVICE_STATUS Status;
     LVITEM item;
@@ -23,51 +25,38 @@ Control(PMAIN_WND_INFO Info,
     DWORD dwStartTickCount, dwOldCheckPoint;
 
     item.mask = LVIF_PARAM;
-    item.iItem = Info->SelectedItem;
-    SendMessage(Info->hListView,
-                LVM_GETITEM,
-                0,
-                (LPARAM)&item);
+    item.iItem = GetSelectedItem();
+    SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item);
+
+    /* copy pointer to selected service */
+    Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam;
 
     /* 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);
+    hProgBar = GetDlgItem(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);
+    hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
     if (hSCManager == NULL)
     {
-        GetError();
+        GetError(0);
         return FALSE;
     }
 
     /* open handle to the service */
-    hSc = OpenService(hSCManager,
-                      Info->CurrentService->lpServiceName,
+    hSc = OpenService(hSCManager, Service->lpServiceName,
                       SC_MANAGER_ALL_ACCESS);
     if (hSc == NULL)
     {
-        GetError();
+        GetError(0);
         return FALSE;
     }
 
     /* process requested action */
-    if (! ControlService(hSc,
-                         Control,
-                         &Status))
+    if (! ControlService(hSc, Control, &Status))
     {
-        GetError();
+        GetError(0);
         CloseServiceHandle(hSc);
         return FALSE;
     }
@@ -79,7 +68,7 @@ Control(PMAIN_WND_INFO Info,
                                sizeof(SERVICE_STATUS_PROCESS),
                                &BytesNeeded))
     {
-        GetError();
+        GetError(0);
         return FALSE;
     }
 
@@ -95,38 +84,33 @@ Control(PMAIN_WND_INFO Info,
 
         dwWaitTime = ServiceStatus.dwWaitHint / 10;
 
-        if (dwWaitTime < 500)
+        if( dwWaitTime < 500 )
             dwWaitTime = 500;
-        else if (dwWaitTime > 5000)
+        else if ( dwWaitTime > 5000 )
             dwWaitTime = 5000;
 
         /* increment the progress bar */
-        SendMessage(hProgBar,
-                    PBM_STEPIT,
-                    0,
-                    0);
+        SendMessage(hProgBar, PBM_STEPIT, 0, 0);
 
         /* wait before checking status */
         Sleep(dwWaitTime);
 
         /* check status again */
-        if (! QueryServiceStatusEx(hSc,
-                                   SC_STATUS_PROCESS_INFO,
-                                   (LPBYTE)&ServiceStatus,
-                                   sizeof(SERVICE_STATUS_PROCESS),
-                                   &BytesNeeded))
+        if (! QueryServiceStatusEx(
+                hSc,
+                SC_STATUS_PROCESS_INFO,
+                (LPBYTE)&ServiceStatus,
+                sizeof(SERVICE_STATUS_PROCESS),
+                &BytesNeeded))
         {
-            GetError();
+            GetError(0);
             return FALSE;
         }
 
         if (ServiceStatus.dwCheckPoint > dwOldCheckPoint)
         {
             /* The service is making progress. increment the progress bar */
-            SendMessage(hProgBar,
-                        PBM_STEPIT,
-                        0,
-                        0);
+            SendMessage(hProgBar, PBM_STEPIT, 0, 0);
             dwStartTickCount = GetTickCount();
             dwOldCheckPoint = ServiceStatus.dwCheckPoint;
         }
@@ -144,10 +128,7 @@ Control(PMAIN_WND_INFO Info,
 
     if (ServiceStatus.dwCurrentState == Control)
     {
-        SendMessage(hProgBar,
-                    PBM_DELTAPOS,
-                    PROGRESSRANGE,
-                    0);
+        SendMessage(hProgBar, PBM_DELTAPOS, PROGRESSRANGE, 0);
         Sleep(1000);
         return TRUE;
     }

reactos/base/applications/servman/create.c

@@ -7,46 +7,38 @@
  *
  */
 
-#include "precomp.h"
+#include "servman.h"
 
-typedef struct _CREATE_DATA
-{
-    HWND hSelf;
-    LPTSTR ServiceName;
-    LPTSTR DisplayName;
-    LPTSTR BinPath;
-    LPTSTR Description;
-    LPTSTR Options;
+extern HINSTANCE hInstance;
+BOOL bHelpOpen = FALSE;
 
-} CREATE_DATA, *PCREATE_DATA;
 
-static BOOL bHelpOpen = FALSE;
-
-static BOOL
-DoCreate(PCREATE_DATA Data)
+BOOL Create(LPTSTR ServiceName,
+            LPTSTR DisplayName,
+            LPTSTR BinPath,
+            LPTSTR Description,
+            LPTSTR Options)
 {
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
     TCHAR Buf[32];
 
     /* open handle to the SCM */
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ALL_ACCESS);
+    hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
     if (hSCManager == NULL)
     {
-        GetError();
+        GetError(0);
         return FALSE;
     }
 
     hSc = CreateService(hSCManager,
-                        Data->ServiceName,
-                        Data->DisplayName,
+                        ServiceName,
+                        DisplayName,
                         SERVICE_ALL_ACCESS,
                         SERVICE_WIN32_OWN_PROCESS,
                         SERVICE_DEMAND_START,
                         SERVICE_ERROR_NORMAL,
-                        Data->BinPath,
+                        BinPath,
                         NULL,
                         NULL,
                         NULL,
@@ -55,205 +47,26 @@ DoCreate(PCREATE_DATA Data)
 
     if (hSc == NULL)
     {
-        GetError();
-        CloseServiceHandle(hSCManager);
+        GetError(0);
         return FALSE;
     }
 
-    /* Set the service description in the registry
-     * CreateService does not do this for us */
-    SetDescription(Data->ServiceName,
-                   Data->Description);
+    SetDescription(ServiceName, Description);
 
-    /* report success to user */
-    LoadString(hInstance,
-               IDS_CREATE_SUCCESS,
-               Buf,
-               sizeof(Buf) / sizeof(TCHAR));
+    LoadString(hInstance, IDS_CREATE_SUCCESS, Buf,
+        sizeof(Buf) / sizeof(TCHAR));
 	DisplayString(Buf);
-
 	CloseServiceHandle(hSCManager);
     CloseServiceHandle(hSc);
-
     return TRUE;
 }
 
 
-static BOOL
-GetDataFromDialog(PCREATE_DATA Data)
-{
-    HWND hwnd;
-    TCHAR Buf[64];
-    INT iLen = 0;
-
-    /* get service name */
-    hwnd = GetDlgItem(Data->hSelf,
-                      IDC_CREATE_SERVNAME);
-    iLen = GetWindowTextLength(hwnd);
-    if (iLen != 0)
-    {
-        Data->ServiceName = HeapAlloc(ProcessHeap,
-                                      0,
-                                      (iLen+1) * sizeof(TCHAR));
-        if (Data->ServiceName != NULL)
-        {
-            GetWindowText(hwnd,
-                          Data->ServiceName,
-                          iLen+1);
-        }
-        else
-            return FALSE;
-    }
-    else
-    {
-        LoadString(hInstance,
-                   IDS_CREATE_REQ,
-                   Buf,
-                   sizeof(Buf));
-        DisplayString(Buf);
-        SetFocus(hwnd);
-        return FALSE;
-    }
-
-    /* get display name */
-    iLen = 0;
-    hwnd = GetDlgItem(Data->hSelf,
-                      IDC_CREATE_DISPNAME);
-    iLen = GetWindowTextLength(hwnd);
-    if (iLen != 0)
-    {
-        Data->DisplayName = 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 = 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 = 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 = HeapAlloc(ProcessHeap,
-                                  0,
-                                  (iLen+1) * sizeof(TCHAR));
-        if (Data->Options != NULL)
-        {
-            GetWindowText(hwnd,
-                          Data->Options,
-                          iLen+1);
-        }
-        else
-            return FALSE;
-    }
-
-    return TRUE;
-}
-
-static VOID
-FreeMemory(PCREATE_DATA Data)
-{
-    if (Data->ServiceName != NULL)
-        HeapFree(ProcessHeap,
-                 0,
-                 Data->ServiceName);
-    if (Data->DisplayName != NULL)
-        HeapFree(ProcessHeap,
-                 0,
-                 Data->DisplayName);
-    if (Data->BinPath != NULL)
-        HeapFree(ProcessHeap,
-                 0,
-                 Data->BinPath);
-    if (Data->Description != NULL)
-        HeapFree(ProcessHeap,
-                 0,
-                 Data->Description);
-    if (Data->Options != NULL)
-        HeapFree(ProcessHeap,
-                 0,
-                 Data->Options);
-
-    HeapFree(ProcessHeap,
-             0,
-             Data);
-}
-
-
+#ifdef _MSC_VER
+#pragma warning(disable : 4100)
+#endif
 BOOL CALLBACK
-CreateHelpDialogProc(HWND hDlg,
-                     UINT message,
-                     WPARAM wParam,
-                     LPARAM lParam)
+CreateHelpDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HWND hHelp;
     HICON hIcon = NULL;
@@ -261,45 +74,31 @@ CreateHelpDialogProc(HWND hDlg,
 
     switch (message)
     {
-        case WM_INITDIALOG:
+    case WM_INITDIALOG:
+        hIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0);
+        SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
+
+        hHelp = GetDlgItem(hDlg, IDC_CREATE_HELP);
+
+        LoadString(hInstance, IDS_HELP_OPTIONS, Buf,
+            sizeof(Buf) / sizeof(TCHAR));
+
+        SetWindowText(hHelp, Buf);
+
+        return TRUE;
+
+    case WM_COMMAND:
+        if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
         {
-            hIcon = LoadImage(hInstance,
-                              MAKEINTRESOURCE(IDI_SM_ICON),
-                              IMAGE_ICON,
-                              16,
-                              16,
-                              0);
-
-            SendMessage(hDlg,
-                        WM_SETICON,
-                        ICON_SMALL,
-                        (LPARAM)hIcon);
-
-            hHelp = GetDlgItem(hDlg,
-                               IDC_CREATE_HELP);
-
-            LoadString(hInstance,
-                       IDS_HELP_OPTIONS,
-                       Buf,
-                       sizeof(Buf) / sizeof(TCHAR));
-
-            SetWindowText(hHelp,
-                          Buf);
-
+            DestroyIcon(hIcon);
+            DestroyWindow(hDlg);
             return TRUE;
         }
+    break;
 
-        case WM_COMMAND:
-        {
-            if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL))
-            {
-                bHelpOpen = FALSE;
-                DestroyIcon(hIcon);
-                DestroyWindow(hDlg);
-                return TRUE;
-            }
-            break;
-        }
+    case WM_DESTROY:
+        bHelpOpen = FALSE;
+    break;
     }
 
     return FALSE;
@@ -307,94 +106,160 @@ CreateHelpDialogProc(HWND hDlg,
 
 
 BOOL CALLBACK
-CreateDialogProc(HWND hDlg,
-                 UINT message,
-                 WPARAM wParam,
-                 LPARAM lParam)
+CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HICON hIcon = NULL;
 
     switch (message)
     {
-        case WM_INITDIALOG:
-        {
-            hIcon = LoadImage(hInstance,
-                              MAKEINTRESOURCE(IDI_SM_ICON),
-                              IMAGE_ICON,
-                              16,
-                              16,
-                              0);
+    case WM_INITDIALOG:
+        hIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0);
+        SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
+        return TRUE;
 
-            SendMessage(hDlg,
-                        WM_SETICON,
-                        ICON_SMALL,
-                        (LPARAM)hIcon);
-            return TRUE;
-        }
-
-        case WM_COMMAND:
+    case WM_COMMAND:
+        switch (LOWORD(wParam))
         {
-            switch (LOWORD(wParam))
+            case IDOK:
             {
-                case IDOK:
+                LPTSTR ServiceName = NULL;
+                LPTSTR DisplayName = NULL;
+                LPTSTR BinPath = NULL;
+                LPTSTR Description = NULL;
+                LPTSTR Options = NULL;
+                HWND hwnd;
+                TCHAR Buf[32];
+                INT iLen = 0;
+
+                /* get service name */
+                hwnd = GetDlgItem(hDlg, IDC_CREATE_SERVNAME);
+                iLen = GetWindowTextLength(hwnd);
+                if (iLen != 0)
                 {
-                    PCREATE_DATA Data;
-
-                    Data = HeapAlloc(ProcessHeap,
-                                     HEAP_ZERO_MEMORY,
-                                     sizeof(CREATE_DATA));
-                    if (Data != NULL)
+                    ServiceName = HeapAlloc(GetProcessHeap(), 0, iLen+1);
+                    if (ServiceName != NULL)
                     {
-                        Data->hSelf = hDlg;
-
-                        if (GetDataFromDialog(Data))
-                        {
-                            DoCreate(Data);
-                        }
-                        else
-                        {
-                            /* Something went wrong, leave the dialog
-                             * open so they can try again */
-                            FreeMemory(Data);
-                            break;
-                        }
-
-                        FreeMemory(Data);
+                        GetWindowText(hwnd, ServiceName, iLen+1);
                     }
 
-                    DestroyIcon(hIcon);
-                    EndDialog(hDlg,
-                              LOWORD(wParam));
-                    return TRUE;
                 }
-
-                case IDCANCEL:
+                else
                 {
-                    DestroyIcon(hIcon);
-                    EndDialog(hDlg,
-                              LOWORD(wParam));
-                    return TRUE;
+                    LoadString(hInstance, IDS_CREATE_REQ, Buf,
+                        sizeof(Buf) / sizeof(TCHAR));
+                    DisplayString(Buf);
+                    SetFocus(hwnd);
+                    break;
                 }
 
-                case ID_CREATE_HELP:
+                /* get display name */
+                iLen = 0;
+                hwnd = GetDlgItem(hDlg, IDC_CREATE_DISPNAME);
+                iLen = GetWindowTextLength(hwnd);
+                if (iLen != 0)
                 {
-                    HWND hHelp;
+                    DisplayName = HeapAlloc(GetProcessHeap(), 0, iLen+1);
+                    if (DisplayName != NULL)
+                        GetWindowText(hwnd, DisplayName, iLen+1);
 
-                    if (! bHelpOpen)
-                    {
-                        hHelp = CreateDialog(hInstance,
-                                             MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS),
-                                             hDlg,
-                                             (DLGPROC)CreateHelpDialogProc);
-                        if(hHelp != NULL)
-                        {
-                            bHelpOpen = TRUE;
-                        }
-                    }
                 }
-                break;
+                else
+                {
+                    LoadString(hInstance, IDS_CREATE_REQ, Buf,
+                        sizeof(Buf) / sizeof(TCHAR));
+                    DisplayString(Buf);
+                    SetFocus(hwnd);
+                    break;
+                }
+
+                /* get binary path */
+                iLen = 0;
+                hwnd = GetDlgItem(hDlg, IDC_CREATE_PATH);
+                iLen = GetWindowTextLength(hwnd);
+                if (iLen != 0)
+                {
+                    BinPath = HeapAlloc(GetProcessHeap(), 0, iLen+1);
+                    if (BinPath != NULL)
+                        GetWindowText(hwnd, BinPath, iLen+1);
+
+                }
+                else
+                {
+                    LoadString(hInstance, IDS_CREATE_REQ, Buf,
+                        sizeof(Buf) / sizeof(TCHAR));
+                    DisplayString(Buf);
+                    SetFocus(hwnd);
+                    break;
+                }
+
+                /* get description */
+                iLen = 0;
+                hwnd = GetDlgItem(hDlg, IDC_CREATE_DESC);
+                iLen = GetWindowTextLength(hwnd);
+                if (iLen != 0)
+                {
+                    Description = HeapAlloc(GetProcessHeap(), 0, iLen+1);
+                    if (Description != NULL)
+                        GetWindowText(hwnd, Description, iLen+1);
+
+                }
+
+                /* get options */
+                iLen = 0;
+                hwnd = GetDlgItem(hDlg, IDC_CREATE_PATH);
+                iLen = GetWindowTextLength(hwnd);
+                if (iLen != 0)
+                {
+                    Options = HeapAlloc(GetProcessHeap(), 0, iLen+1);
+                    if (Options != NULL)
+                        GetWindowText(hwnd, Options, iLen+1);
+
+                }
+
+                Create(ServiceName, DisplayName, BinPath, Description, Options);
+
+                if (ServiceName != NULL)
+                    HeapFree(GetProcessHeap(), 0, ServiceName);
+                if (DisplayName != NULL)
+                    HeapFree(GetProcessHeap(), 0, DisplayName);
+                if (BinPath != NULL)
+                    HeapFree(GetProcessHeap(), 0, BinPath);
+                if (Description != NULL)
+                    HeapFree(GetProcessHeap(), 0, Description);
+                if (Options != NULL)
+                    HeapFree(GetProcessHeap(), 0, Options);
+
+
+                DestroyIcon(hIcon);
+                EndDialog(hDlg, LOWORD(wParam));
+                return TRUE;
             }
+
+            case IDCANCEL:
+                DestroyIcon(hIcon);
+                EndDialog(hDlg, LOWORD(wParam));
+                return TRUE;
+
+            case ID_CREATE_HELP:
+            {
+                HWND hHelp;
+
+                if (! bHelpOpen)
+                {
+                    hHelp = CreateDialog(hInstance,
+                                         MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS),
+                                         hDlg,
+                                         (DLGPROC)CreateHelpDialogProc);
+                    if(hHelp != NULL)
+                    {
+                        ShowWindow(hHelp, SW_SHOW);
+                        bHelpOpen = TRUE;
+                    }
+                }
+            }
+            break;
         }
+
     }
 
     return FALSE;

reactos/base/applications/servman/delete.c

@@ -7,42 +7,40 @@
  *
  */
 
-#include "precomp.h"
+#include "servman.h"
 
-static BOOL
-DoDeleteService(PMAIN_WND_INFO Info,
-                HWND hDlg)
+extern HINSTANCE hInstance;
+extern HWND hListView;
+
+BOOL DoDeleteService(HWND hDlg)
 {
     SC_HANDLE hSCManager;
     SC_HANDLE hSc;
+    ENUM_SERVICE_STATUS_PROCESS *Service = NULL;
 
     /* open handle to the SCM */
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ALL_ACCESS);
+    hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
     if (hSCManager == NULL)
     {
-        GetError();
+        GetError(0);
         return FALSE;
     }
 
-    /* get a handle to the service requested for deleting */
-    hSc = OpenService(hSCManager,
-                      Info->CurrentService->lpServiceName,
-                      DELETE);
+    /* copy pointer to selected service */
+    Service = GetSelectedService();
+
+    /* get a handle to the service requested for starting */
+    hSc = OpenService(hSCManager, Service->lpServiceName, DELETE);
     if (hSc == NULL)
     {
-        GetError();
-        CloseServiceHandle(hSCManager);
+        GetError(0);
         return FALSE;
     }
 
-    /* delete the service opened */
+    /* start the service opened */
     if (! DeleteService(hSc))
     {
-        GetError();
-        CloseServiceHandle(hSCManager);
-        CloseServiceHandle(hSc);
+        GetError(0);
         return FALSE;
     }
 
@@ -54,87 +52,57 @@ DoDeleteService(PMAIN_WND_INFO Info,
 }
 
 
+#ifdef _MSC_VER
+#pragma warning(disable : 4100)
+#endif
 BOOL CALLBACK
-DeleteDialogProc(HWND hDlg,
-                 UINT message,
-                 WPARAM wParam,
-                 LPARAM lParam)
+DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    PMAIN_WND_INFO Info = NULL;
+    ENUM_SERVICE_STATUS_PROCESS *Service = NULL;
     HICON hIcon = NULL;
     TCHAR Buf[1000];
     LVITEM item;
 
     switch (message)
     {
-        case WM_INITDIALOG:
+    case WM_INITDIALOG:
+
+        hIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0);
+        SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon);
+
+        /* get pointer to selected service */
+        Service = GetSelectedService();
+
+        SendDlgItemMessage(hDlg, IDC_DEL_NAME, WM_SETTEXT, 0, (LPARAM)Service->lpDisplayName);
+
+
+        item.mask = LVIF_TEXT;
+        item.iItem = GetSelectedItem();
+        item.iSubItem = 1;
+        item.pszText = Buf;
+        item.cchTextMax = sizeof(Buf);
+        SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item);
+
+        SendDlgItemMessage(hDlg, IDC_DEL_DESC, WM_SETTEXT, 0,
+                (LPARAM)Buf);
+
+        return TRUE;
+
+    case WM_COMMAND:
+        switch (LOWORD(wParam))
         {
-            Info = (PMAIN_WND_INFO)lParam;
+            case IDOK:
+                if (DoDeleteService(hDlg))
+                    (void)ListView_DeleteItem(hListView, GetSelectedItem());
 
-            hIcon = LoadImage(hInstance,
-                              MAKEINTRESOURCE(IDI_SM_ICON),
-                              IMAGE_ICON,
-                              16,
-                              16,
-                              0);
+                DestroyIcon(hIcon);
+                EndDialog(hDlg, LOWORD(wParam));
+                return TRUE;
 
-            SendMessage(hDlg,
-                        WM_SETICON,
-                        ICON_SMALL,
-                        (LPARAM)hIcon);
-
-            SendDlgItemMessage(hDlg,
-                               IDC_DEL_NAME,
-                               WM_SETTEXT,
-                               0,
-                               (LPARAM)Info->CurrentService->lpDisplayName);
-
-
-            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:
-        {
-            switch (LOWORD(wParam))
-            {
-                case IDOK:
-                {
-                    if (DoDeleteService(Info, hDlg))
-                        (void)ListView_DeleteItem(Info->hListView,
-                                                  Info->SelectedItem);
-
-                    DestroyIcon(hIcon);
-                    EndDialog(hDlg,
-                              LOWORD(wParam));
-                    return TRUE;
-                }
-
-                case IDCANCEL:
-                {
-                    DestroyIcon(hIcon);
-                    EndDialog(hDlg,
-                              LOWORD(wParam));
-                    return TRUE;
-                }
-            }
+            case IDCANCEL:
+                DestroyIcon(hIcon);
+                EndDialog(hDlg, LOWORD(wParam));
+                return TRUE;
         }
     }
 

reactos/base/applications/servman/export.c

@@ -7,13 +7,12 @@
  *
  */
 
-#include "precomp.h"
+#include "servman.h"
 
-static DWORD
-GetTextFromListView(PMAIN_WND_INFO Info,
-                    TCHAR Text[500],
-                    INT row,
-                    INT col)
+extern HWND hListView;
+
+
+DWORD GetTextFromListView(TCHAR Text[500], INT row, INT col)
 {
     LVITEM item;
     DWORD NumChars;
@@ -23,30 +22,19 @@ GetTextFromListView(PMAIN_WND_INFO Info,
     item.iSubItem = col;
     item.pszText = Text;
     item.cchTextMax = 500;
-    NumChars = (INT)SendMessage(Info->hListView,
-                                LVM_GETITEMTEXT,
-                                row,
-                                (LPARAM)&item);
+    NumChars = (INT)SendMessage(hListView, LVM_GETITEMTEXT, row, (LPARAM)&item);
 
     return NumChars;
 }
 
 
-static BOOL
-SaveServicesToFile(PMAIN_WND_INFO Info,
-                   LPCTSTR pszFileName)
+BOOL SaveServicesToFile(LPCTSTR pszFileName)
 {
 	HANDLE hFile;
 	BOOL bSuccess = FALSE;
 
-	hFile = CreateFile(pszFileName,
-                       GENERIC_WRITE,
-                       0,
-                       NULL,
-                       CREATE_ALWAYS,
-                       FILE_ATTRIBUTE_NORMAL,
-                       NULL);
-
+	hFile = CreateFile(pszFileName, GENERIC_WRITE, 0, NULL,
+                       CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 	if(hFile != INVALID_HANDLE_VALUE)
 	{
         TCHAR LVText[500];
@@ -56,47 +44,29 @@ SaveServicesToFile(PMAIN_WND_INFO Info,
 		INT NumListedServ = 0;
 		INT i, k;
 
-		NumListedServ = ListView_GetItemCount(Info->hListView);
+		NumListedServ = ListView_GetItemCount(hListView);
 
 		for (i=0; i < NumListedServ; i++)
 		{
 		    for (k=0; k<5; k++)
 		    {
-                dwTextLength = GetTextFromListView(Info,
-                                                   LVText,
-                                                   i,
-                                                   k);
+                dwTextLength = GetTextFromListView(LVText, i, k);
                 if (LVText != NULL)
                 {
-                    WriteFile(hFile,
-                              LVText,
-                              sizeof(TCHAR) * dwTextLength,
-                              &dwWritten,
-                              NULL);
-
-                    WriteFile(hFile,
-                              &tab,
-                              sizeof(TCHAR),
-                              &dwWritten,
-                              NULL);
+                    WriteFile(hFile, LVText, sizeof(TCHAR) * dwTextLength, &dwWritten, NULL);
+                    WriteFile(hFile, &tab, sizeof(TCHAR), &dwWritten, NULL);
                 }
 		    }
-		    WriteFile(hFile,
-                      &newl,
-                      sizeof(TCHAR),
-                      &dwWritten,
-                      NULL);
+		    WriteFile(hFile, &newl, sizeof(TCHAR), &dwWritten, NULL);
 		}
-
 		CloseHandle(hFile);
 		bSuccess = TRUE;
 	}
-
 	return bSuccess;
 }
 
 
-VOID ExportFile(PMAIN_WND_INFO Info)
+VOID ExportFile(HWND hwnd)
 {
 	OPENFILENAME ofn;
 	TCHAR szFileName[MAX_PATH] = _T("");
@@ -104,7 +74,7 @@ VOID ExportFile(PMAIN_WND_INFO Info)
 	ZeroMemory(&ofn, sizeof(ofn));
 
 	ofn.lStructSize = sizeof(OPENFILENAME);
-	ofn.hwndOwner = Info->hMainWnd;
+	ofn.hwndOwner = hwnd;
 	ofn.lpstrFilter = _T("Text (Tab Delimited)(*.txt)\0*.txt\0Text (Comma Delimited)(*.csv)\0*.csv\0");
 	ofn.lpstrFile = szFileName;
 	ofn.nMaxFile = MAX_PATH;
@@ -113,13 +83,10 @@ VOID ExportFile(PMAIN_WND_INFO Info)
 
 	if(GetSaveFileName(&ofn))
 	{
-		if (SaveServicesToFile(Info, szFileName))
+		if (SaveServicesToFile(szFileName))
             return;
 	}
 
 	if (CommDlgExtendedError() != CDERR_GENERALCODES)
         MessageBox(NULL, _T("Export to file failed"), NULL, 0);
 }
-
-
-

reactos/base/applications/servman/geterror.c

@@ -0,0 +1,41 @@
+/*
+ * PROJECT:     ReactOS Services
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/system/servman/geterror.c
+ * PURPOSE:     displays error messages
+ * COPYRIGHT:   Copyright 2005 Ged Murphy <gedmurphy@gmail.com>
+ *
+ */
+
+#include "servman.h"
+
+
+VOID GetError(DWORD err)
+{
+    LPVOID lpMsgBuf;
+
+    if (err == 0)
+        err = GetLastError();
+
+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                  FORMAT_MESSAGE_FROM_SYSTEM |
+                  FORMAT_MESSAGE_IGNORE_INSERTS,
+                  NULL,
+                  err,
+                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
+                  (LPTSTR) &lpMsgBuf,
+                   0,
+                   NULL );
+
+        MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR);
+
+        LocalFree(lpMsgBuf);
+}
+
+
+VOID DisplayString(PTCHAR Msg)
+{
+
+    MessageBox(NULL, Msg, _T("Note!"), MB_OK);
+
+}

reactos/base/applications/servman/misc.c

@@ -1,259 +0,0 @@
-/*
- * PROJECT:     ReactOS Services
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/system/servman/misc.c
- * PURPOSE:     miscallanous functions
- * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
- *
- */
-
-#include "precomp.h"
-
-static INT
-LengthOfStrResource(IN HINSTANCE hInst,
-                    IN UINT uID)
-{
-    HRSRC hrSrc;
-    HGLOBAL hRes;
-    LPWSTR lpName, lpStr;
-
-    if (hInst == NULL)
-    {
-        return -1;
-    }
-
-    /* There are always blocks of 16 strings */
-    lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1);
-
-    /* Find the string table block */
-    if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) &&
-        (hRes = LoadResource(hInst, hrSrc)) &&
-        (lpStr = LockResource(hRes)))
-    {
-        UINT x;
-
-        /* Find the string we're looking for */
-        uID &= 0xF; /* position in the block, same as % 16 */
-        for (x = 0; x < uID; x++)
-        {
-            lpStr += (*lpStr) + 1;
-        }
-
-        /* Found the string */
-        return (int)(*lpStr);
-    }
-    return -1;
-}
-
-INT
-AllocAndLoadString(OUT LPTSTR *lpTarget,
-                   IN HINSTANCE hInst,
-                   IN UINT uID)
-{
-    INT ln;
-
-    ln = LengthOfStrResource(hInst,
-                             uID);
-    if (ln++ > 0)
-    {
-        (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED,
-                                         ln * sizeof(TCHAR));
-        if ((*lpTarget) != NULL)
-        {
-            INT Ret;
-            if (!(Ret = LoadString(hInst, uID, *lpTarget, ln)))
-            {
-                LocalFree((HLOCAL)(*lpTarget));
-            }
-            return Ret;
-        }
-    }
-    return 0;
-}
-
-DWORD
-LoadAndFormatString(IN HINSTANCE hInstance,
-                    IN UINT uID,
-                    OUT LPTSTR *lpTarget,
-                    ...)
-{
-    DWORD Ret = 0;
-    LPTSTR lpFormat;
-    va_list lArgs;
-
-    if (AllocAndLoadString(&lpFormat,
-                           hInstance,
-                           uID) > 0)
-    {
-        va_start(lArgs, lpTarget);
-        /* let's use FormatMessage to format it because it has the ability to allocate
-           memory automatically */
-        Ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
-                            lpFormat,
-                            0,
-                            0,
-                            (LPTSTR)lpTarget,
-                            0,
-                            &lArgs);
-        va_end(lArgs);
-
-        LocalFree((HLOCAL)lpFormat);
-    }
-
-    return Ret;
-}
-
-BOOL
-StatusBarLoadAndFormatString(IN HWND hStatusBar,
-                             IN INT PartId,
-                             IN HINSTANCE hInstance,
-                             IN UINT uID,
-                             ...)
-{
-    BOOL Ret = FALSE;
-    LPTSTR lpFormat, lpStr;
-    va_list lArgs;
-
-    if (AllocAndLoadString(&lpFormat,
-                           hInstance,
-                           uID) > 0)
-    {
-        va_start(lArgs, uID);
-        /* let's use FormatMessage to format it because it has the ability to allocate
-           memory automatically */
-        Ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING,
-                            lpFormat,
-                            0,
-                            0,
-                            (LPTSTR)&lpStr,
-                            0,
-                            &lArgs);
-        va_end(lArgs);
-
-        if (lpStr != NULL)
-        {
-            Ret = (BOOL)SendMessage(hStatusBar,
-                                    SB_SETTEXT,
-                                    (WPARAM)PartId,
-                                    (LPARAM)lpStr);
-            LocalFree((HLOCAL)lpStr);
-        }
-
-        LocalFree((HLOCAL)lpFormat);
-    }
-
-    return Ret;
-}
-
-BOOL
-StatusBarLoadString(IN HWND hStatusBar,
-                    IN INT PartId,
-                    IN HINSTANCE hInstance,
-                    IN UINT uID)
-{
-    BOOL Ret = FALSE;
-    LPTSTR lpStr;
-
-    if (AllocAndLoadString(&lpStr,
-                           hInstance,
-                           uID) > 0)
-    {
-        Ret = (BOOL)SendMessage(hStatusBar,
-                                SB_SETTEXT,
-                                (WPARAM)PartId,
-                                (LPARAM)lpStr);
-        LocalFree((HLOCAL)lpStr);
-    }
-
-    return Ret;
-}
-
-
-INT
-GetTextFromEdit(OUT LPTSTR lpString,
-                IN HWND hDlg,
-                IN UINT Res)
-{
-    INT len = GetWindowTextLength(GetDlgItem(hDlg, Res));
-    if(len > 0)
-    {
-        GetDlgItemText(hDlg,
-                       Res,
-                       lpString,
-                       len + 1);
-    }
-    else
-        lpString = NULL;
-
-    return len;
-}
-
-
-VOID GetError(VOID)
-{
-    LPVOID lpMsgBuf;
-
-    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                  FORMAT_MESSAGE_FROM_SYSTEM |
-                  FORMAT_MESSAGE_IGNORE_INSERTS,
-                  NULL,
-                  GetLastError(),
-                  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                  (LPTSTR) &lpMsgBuf,
-                  0,
-                  NULL );
-
-    MessageBox(NULL, lpMsgBuf, _T("Error!"), MB_OK | MB_ICONERROR);
-
-    LocalFree(lpMsgBuf);
-}
-
-VOID DisplayString(PTCHAR Msg)
-{
-    MessageBox(NULL, Msg, _T("Note!"), MB_ICONEXCLAMATION|MB_OK);
-}
-
-
-
-HIMAGELIST
-InitImageList(UINT StartResource,
-              UINT EndResource,
-              UINT Width,
-              UINT Height)
-{
-    HBITMAP hBitmap;
-    HIMAGELIST hImageList;
-    INT i, Ret;
-
-    /* Create the toolbar icon image list */
-    hImageList = ImageList_Create(Width,
-                                  Height,
-                                  ILC_MASK | ILC_COLOR24,
-                                  EndResource - StartResource,
-                                  0);
-    if (hImageList == NULL)
-        return NULL;
-
-    /* Add all icons to the image list */
-    for (i = StartResource; i <= EndResource; i++)
-    {
-        hBitmap = LoadImage(hInstance,
-                            MAKEINTRESOURCE(i),
-                            IMAGE_BITMAP,
-                            Width,
-                            Height,
-                            LR_LOADTRANSPARENT);
-        if (hBitmap == NULL)
-            return NULL;
-
-        Ret = ImageList_AddMasked(hImageList,
-                                  hBitmap,
-                                  RGB(255, 0, 128));
-        if (Ret == -1)
-            return NULL;
-
-        DeleteObject(hBitmap);
-    }
-
-    return hImageList;
-}

reactos/base/applications/servman/precomp.h

@@ -1,146 +0,0 @@
-#ifndef __SERVMAN_PRECOMP_H
-#define __SERVMAN_PRECOMP_H
-
-//#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <windowsx.h> /* GET_X/Y_LPARAM */
-#include <stdio.h>
-#include <tchar.h>
-#include <commctrl.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
-
-
-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
-{
-    HWND  hMainWnd;
-    HWND  hListView;
-    HWND  hStatus;
-    HWND  hTool;
-    HWND  hProgDlg;
-    HMENU hShortcutMenu;
-    int   nCmdShow;
-
-    /* Stores the complete services array */
-    ENUM_SERVICE_STATUS_PROCESS *pServiceStatus;
-
-    /* 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;
-
-
-BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK CreateDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK DeleteDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam);
-
-
-/* servman.c */
-extern HINSTANCE hInstance;
-extern HANDLE ProcessHeap;
-
-/* mainwnd.c */
-typedef struct _MENU_HINT
-{
-    WORD CmdId;
-    UINT HintId;
-} MENU_HINT, *PMENU_HINT;
-
-BOOL InitMainWindowImpl(VOID);
-VOID UninitMainWindowImpl(VOID);
-HWND CreateMainWindow(LPCTSTR lpCaption, int nCmdShow);
-
-/* start */
-BOOL DoStart(PMAIN_WND_INFO Info);
-
-/* stop */
-BOOL DoStop(PMAIN_WND_INFO Info);
-
-/* control */
-BOOL Control(PMAIN_WND_INFO Info, DWORD Control);
-
-/* query.c */
-ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(PMAIN_WND_INFO Info);
-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);
-
-/* export.c */
-VOID ExportFile(PMAIN_WND_INFO Info);
-
-/* misc.c */
-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/servman/progress.c

@@ -7,7 +7,11 @@
  *
  */
 
-#include "precomp.h"
+#include "servman.h"
+
+extern HINSTANCE hInstance;
+//extern HWND hMainWnd;
+
 
 BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam)
 {

reactos/base/applications/servman/propsheet.c

@@ -7,38 +7,61 @@
  *
  */
 
-#include "precomp.h"
+#include "servman.h"
 
-static VOID
-SetButtonStates(PMAIN_WND_INFO Info)
+HWND hwndGenDlg;
+extern ENUM_SERVICE_STATUS_PROCESS *pServiceStatus;
+extern HINSTANCE hInstance;
+extern HWND hListView;
+extern HWND hMainWnd;
+
+
+typedef struct _PROP_DLG_INFO
+{
+    LPTSTR lpServiceName;
+    LPTSTR lpDisplayName;
+    LPTSTR lpDescription;
+    LPTSTR lpPathToExe;
+    TCHAR  szStartupType;
+    TCHAR  szServiceStatus[25];
+    LPTSTR lpStartParams;
+} PROP_DLG_INFO, *PPROP_DLG_INFO;
+
+
+
+VOID SetButtonStates()
 {
     HWND hButton;
+    ENUM_SERVICE_STATUS_PROCESS *Service = NULL;
     DWORD Flags, State;
 
-    Flags = Info->CurrentService->ServiceStatusProcess.dwControlsAccepted;
-    State = Info->CurrentService->ServiceStatusProcess.dwCurrentState;
+    /* get pointer to selected service */
+    Service = GetSelectedService();
+
+    Flags = Service->ServiceStatusProcess.dwControlsAccepted;
+    State = Service->ServiceStatusProcess.dwCurrentState;
 
     if (State == SERVICE_STOPPED)
     {
-        hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_START);
+        hButton = GetDlgItem(hwndGenDlg, IDC_START);
         EnableWindow (hButton, TRUE);
     }
 
     if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) )
     {
-        hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_STOP);
+        hButton = GetDlgItem(hwndGenDlg, IDC_STOP);
         EnableWindow (hButton, TRUE);
     }
 
     if ( (Flags & SERVICE_ACCEPT_PAUSE_CONTINUE) && (State == SERVICE_RUNNING) )
     {
-        hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_PAUSE);
+        hButton = GetDlgItem(hwndGenDlg, IDC_PAUSE);
         EnableWindow (hButton, TRUE);
     }
 
     if ( (Flags & SERVICE_ACCEPT_STOP) && (State == SERVICE_RUNNING) )
     {
-        hButton = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_PAUSE);
+        hButton = GetDlgItem(hwndGenDlg, IDC_PAUSE);
         EnableWindow (hButton, TRUE);
     }
 }
@@ -47,8 +70,7 @@ SetButtonStates(PMAIN_WND_INFO Info)
  * Fills the 'startup type' combo box with possible
  * values and sets it to value of the selected item
  */
-static VOID
-SetStartupType(PMAIN_WND_INFO Info)
+VOID SetStartupType(LPTSTR lpServiceName)
 {
     HWND hList;
     HKEY hKey;
@@ -59,18 +81,14 @@ SetStartupType(PMAIN_WND_INFO Info)
     TCHAR KeyBuf[300];
 
     /* open the registry key for the service */
-    _sntprintf(KeyBuf,
-               sizeof(KeyBuf) / sizeof(TCHAR),
-               Path,
-               Info->CurrentService->lpServiceName);
-
+    _sntprintf(KeyBuf, sizeof(KeyBuf) / sizeof(TCHAR), Path, lpServiceName);
     RegOpenKeyEx(HKEY_LOCAL_MACHINE,
                  KeyBuf,
                  0,
                  KEY_READ,
                  &hKey);
 
-    hList = GetDlgItem(Info->PropSheet->hwndGenDlg, IDC_START_TYPE);
+    hList = GetDlgItem(hwndGenDlg, IDC_START_TYPE);
 
     LoadString(hInstance, IDS_SERVICES_AUTO, buf, sizeof(buf) / sizeof(TCHAR));
     SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)buf);
@@ -105,113 +123,82 @@ SetStartupType(PMAIN_WND_INFO Info)
  * Populates the General Properties dialog with
  * the relevant service information
  */
-static VOID
-GetDlgInfo(PMAIN_WND_INFO Info)
+VOID GetDlgInfo()
 {
+    ENUM_SERVICE_STATUS_PROCESS *Service = NULL;
+    PROP_DLG_INFO DlgInfo;
+    
+
+    /* get pointer to selected service */
+    Service = GetSelectedService();
+
+
     /* set the service name */
-    Info->PropSheet->lpServiceName = Info->CurrentService->lpServiceName;
-    SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
-                       IDC_SERV_NAME,
-                       WM_SETTEXT,
-                       0,
-                       (LPARAM)Info->PropSheet->lpServiceName);
+    DlgInfo.lpServiceName = Service->lpServiceName;
+    SendDlgItemMessage(hwndGenDlg, IDC_SERV_NAME, WM_SETTEXT, 0, (
+        LPARAM)DlgInfo.lpServiceName);
+
 
     /* set the display name */
-    Info->PropSheet->lpDisplayName = Info->CurrentService->lpDisplayName;
-    SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
-                       IDC_DISP_NAME,
-                       WM_SETTEXT,
-                       0,
-                       (LPARAM)Info->PropSheet->lpDisplayName);
+    DlgInfo.lpDisplayName = Service->lpDisplayName;
+    SendDlgItemMessage(hwndGenDlg, IDC_DISP_NAME, WM_SETTEXT, 0,
+        (LPARAM)DlgInfo.lpDisplayName);
+
 
     /* set the description */
-    if (GetDescription(Info->CurrentService->lpServiceName, &Info->PropSheet->lpDescription))
-        SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
-                           IDC_DESCRIPTION,
-                           WM_SETTEXT,
-                           0,
-                           (LPARAM)Info->PropSheet->lpDescription);
+    if (GetDescription(Service->lpServiceName, &DlgInfo.lpDescription))
+        SendDlgItemMessage(hwndGenDlg, IDC_DESCRIPTION, WM_SETTEXT, 0,
+            (LPARAM)DlgInfo.lpDescription);
+
 
     /* set the executable path */
-    if (GetExecutablePath(Info, &Info->PropSheet->lpPathToExe))
-        SendDlgItemMessage(Info->PropSheet->hwndGenDlg,
-                           IDC_EXEPATH,
-                           WM_SETTEXT,
-                           0,
-                           (LPARAM)Info->PropSheet->lpPathToExe);
+    if (GetExecutablePath(&DlgInfo.lpPathToExe))
+        SendDlgItemMessage(hwndGenDlg, IDC_EXEPATH, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpPathToExe);
+
 
     /* set startup type */
-    SetStartupType(Info);
+    SetStartupType(Service->lpServiceName);
+
 
     /* set service status */
-    if (Info->CurrentService->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING)
+    if (Service->ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING)
     {
-        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);
+        LoadString(hInstance, IDS_SERVICES_STARTED, DlgInfo.szServiceStatus,
+            sizeof(DlgInfo.szServiceStatus) / sizeof(TCHAR));
+        SendDlgItemMessageW(hwndGenDlg, IDC_SERV_STATUS, WM_SETTEXT, 0, (LPARAM)DlgInfo.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);
+        LoadString(hInstance, IDS_SERVICES_STOPPED, DlgInfo.szServiceStatus,
+            sizeof(DlgInfo.szServiceStatus) / sizeof(TCHAR));
+        SendDlgItemMessageW(hwndGenDlg, IDC_SERV_STATUS, WM_SETTEXT, 0, (LPARAM)DlgInfo.szServiceStatus);
     }
 
 }
 
 
 
+#ifdef _MSC_VER
+#pragma warning(disable : 4100)
+#endif
+
 /*
  * General Property dialog callback.
  * Controls messages to the General dialog
  */
-static INT_PTR CALLBACK
+INT_PTR CALLBACK
 GeneralPageProc(HWND hwndDlg,
                 UINT uMsg,
 		        WPARAM wParam,
 		        LPARAM lParam)
 {
-    PMAIN_WND_INFO Info;
-
-    /* Get the window context */
-    Info = (PMAIN_WND_INFO)GetWindowLongPtr(hwndDlg,
-                                            GWLP_USERDATA);
-
-    if (Info == NULL && uMsg != WM_INITDIALOG)
-    {
-        return FALSE;
-    }
+    hwndGenDlg = hwndDlg;
 
     switch (uMsg)
     {
         case WM_INITDIALOG:
-        {
-            Info = (PMAIN_WND_INFO)(((LPPROPSHEETPAGE)lParam)->lParam);
-            if (Info != NULL)
-            {
-                Info->PropSheet->hwndGenDlg = hwndDlg;
-
-                SetWindowLongPtr(hwndDlg,
-                                 GWLP_USERDATA,
-                                 (LONG_PTR)Info);
-                GetDlgInfo(Info);
-                SetButtonStates(Info);
-            }
-        }
+            GetDlgInfo();
+            SetButtonStates();
         break;
 
         case WM_COMMAND:
@@ -223,19 +210,19 @@ GeneralPageProc(HWND hwndDlg,
                 break;
 
                 case IDC_START:
-                    SendMessage(Info->hMainWnd, WM_COMMAND, ID_START, 0);
+                    SendMessage(hMainWnd, WM_COMMAND, ID_START, 0);
                 break;
 
                 case IDC_STOP:
-                    SendMessage(Info->hMainWnd, WM_COMMAND, ID_STOP, 0);
+                    SendMessage(hMainWnd, WM_COMMAND, ID_STOP, 0);
                 break;
 
                 case IDC_PAUSE:
-                    SendMessage(Info->hMainWnd, WM_COMMAND, ID_PAUSE, 0);
+                    SendMessage(hMainWnd, WM_COMMAND, ID_PAUSE, 0);
                 break;
 
                 case IDC_RESUME:
-                    SendMessage(Info->hMainWnd, WM_COMMAND, ID_RESUME, 0);
+                    SendMessage(hMainWnd, WM_COMMAND, ID_RESUME, 0);
                 break;
 
                 case IDC_START_PARAM:
@@ -259,6 +246,9 @@ GeneralPageProc(HWND hwndDlg,
                         /* Enable the 'Apply' button */
                         PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
                     break;
+
+                    default:
+                    break;
                 }
             }
         break;
@@ -273,43 +263,28 @@ GeneralPageProc(HWND hwndDlg,
  * Dependancies Property dialog callback.
  * Controls messages to the Dependancies dialog
  */
-static INT_PTR CALLBACK
+INT_PTR CALLBACK
 DependanciesPageProc(HWND hwndDlg,
                      UINT uMsg,
 		             WPARAM wParam,
 		             LPARAM lParam)
 {
-    PMAIN_WND_INFO Info;
-
-    /* Get the window context */
-    Info = (PMAIN_WND_INFO)GetWindowLongPtr(hwndDlg,
-                                            GWLP_USERDATA);
-
-    if (Info == NULL && uMsg != WM_INITDIALOG)
-    {
-        return FALSE;
-    }
 
     switch (uMsg)
     {
         case WM_INITDIALOG:
-        {
-            Info = (PMAIN_WND_INFO)(((LPPROPSHEETPAGE)lParam)->lParam);
-            if (Info != NULL)
-            {
-                Info->PropSheet->hwndDepDlg = hwndDlg;
 
-                SetWindowLongPtr(hwndDlg,
-                                 GWLP_USERDATA,
-                                 (LONG_PTR)Info);
-            }
-        }
-        break;
+            break;
 
         case WM_COMMAND:
             switch(LOWORD(wParam))
             {
+                case IDC_START:
+                    break;
 
+                case IDC_STOP:
+
+                    break;
             }
             break;
 
@@ -321,10 +296,9 @@ DependanciesPageProc(HWND hwndDlg,
                 LPNMHDR lpnm = (LPNMHDR)lParam;
 
                 switch (lpnm->code)
-                {
-
-                }
 
+                default:
+                    break;
             }
             break;
     }
@@ -333,8 +307,7 @@ DependanciesPageProc(HWND hwndDlg,
 }
 
 
-static INT CALLBACK
-AddEditButton(HWND hwnd, UINT message, LPARAM lParam)
+INT CALLBACK AddEditButton(HWND hwnd, UINT message, LPARAM lParam)
 {
     HWND hEditButton;
 
@@ -366,10 +339,7 @@ AddEditButton(HWND hwnd, UINT message, LPARAM lParam)
 
 
 static VOID
-InitPropSheetPage(PROPSHEETPAGE *psp,
-                  PMAIN_WND_INFO Info,
-                  WORD idDlg,
-                  DLGPROC DlgProc)
+InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc)
 {
   ZeroMemory(psp, sizeof(PROPSHEETPAGE));
   psp->dwSize = sizeof(PROPSHEETPAGE);
@@ -377,33 +347,35 @@ InitPropSheetPage(PROPSHEETPAGE *psp,
   psp->hInstance = hInstance;
   psp->pszTemplate = MAKEINTRESOURCE(idDlg);
   psp->pfnDlgProc = DlgProc;
-  psp->lParam = (LPARAM)Info;
 }
 
 
 LONG APIENTRY
-OpenPropSheet(PMAIN_WND_INFO Info)
+OpenPropSheet(HWND hwnd)
 {
     PROPSHEETHEADER psh;
     PROPSHEETPAGE psp[2];
+    ENUM_SERVICE_STATUS_PROCESS *Service = NULL;
+
+    Service = GetSelectedService();
 
     ZeroMemory(&psh, sizeof(PROPSHEETHEADER));
     psh.dwSize = sizeof(PROPSHEETHEADER);
     psh.dwFlags =  PSH_PROPSHEETPAGE | PSH_PROPTITLE | PSH_USECALLBACK;
-    psh.hwndParent = Info->hMainWnd;
+    psh.hwndParent = hwnd;
     psh.hInstance = hInstance;
     psh.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON));
-    psh.pszCaption = Info->CurrentService->lpDisplayName;
+    psh.pszCaption = Service->lpDisplayName;
     psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE);
     psh.nStartPage = 0;
     psh.pfnCallback = AddEditButton;
     psh.ppsp = psp;
 
 
-    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], IDD_DLG_GENERAL, GeneralPageProc);
+    //InitPropSheetPage(&psp[1], IDD_DLG_GENERAL, LogonPageProc);
+    //InitPropSheetPage(&psp[2], IDD_DLG_GENERAL, RecoveryPageProc);
+    InitPropSheetPage(&psp[1], IDD_DLG_DEPEND, DependanciesPageProc);
 
     return (LONG)(PropertySheet(&psh) != -1);
 }

reactos/base/applications/servman/query.c

@@ -7,23 +7,38 @@
  *
  */
 
-#include "precomp.h"
+#include "servman.h"
+
+extern HINSTANCE hInstance;
+extern HWND hListView;
+extern HWND hStatus;
+
+/* Stores the complete services array */
+ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL;
+
+
+/* Free service array */
+VOID FreeMemory(VOID)
+{
+    HeapFree(GetProcessHeap(), 0, pServiceStatus);
+}
+
 
 
 ENUM_SERVICE_STATUS_PROCESS*
-GetSelectedService(PMAIN_WND_INFO Info)
+GetSelectedService(VOID)
 {
-    LVITEM lvItem;
+    ENUM_SERVICE_STATUS_PROCESS *pSelectedService = NULL;
+    LVITEM item;
 
-    lvItem.mask = LVIF_PARAM;
-    lvItem.iItem = Info->SelectedItem;
-    SendMessage(Info->hListView,
-                LVM_GETITEM,
-                0,
-                (LPARAM)&lvItem);
+    item.mask = LVIF_PARAM;
+    item.iItem = GetSelectedItem();
+    SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item);
 
-    /* return pointer to selected service */
-    return (ENUM_SERVICE_STATUS_PROCESS *)lvItem.lParam;
+    /* copy pointer to selected service */
+    pSelectedService = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam;
+
+    return pSelectedService;
 }
 
 
@@ -53,7 +68,7 @@ BOOL SetDescription(LPTSTR ServiceName, LPTSTR Description)
                      (LPBYTE)Description,
                      (DWORD)lstrlen(szBuf)+1)) != ERROR_SUCCESS)
    {
-       //GetError(val);
+       GetError(val);
        return FALSE;
    }
 
@@ -96,9 +111,7 @@ BOOL GetDescription(LPTSTR lpServiceName, LPTSTR *retDescription)
 
     if (ret != ERROR_FILE_NOT_FOUND)
     {
-        Description = HeapAlloc(ProcessHeap,
-                                HEAP_ZERO_MEMORY,
-                                dwValueSize);
+        Description = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize);
         if (Description == NULL)
         {
             RegCloseKey(hKey);
@@ -112,9 +125,7 @@ BOOL GetDescription(LPTSTR lpServiceName, LPTSTR *retDescription)
                            (LPBYTE)Description,
                            &dwValueSize))
         {
-            HeapFree(ProcessHeap,
-                     0,
-                     Description);
+            HeapFree(GetProcessHeap(), 0, Description);
             RegCloseKey(hKey);
             return FALSE;
         }
@@ -128,47 +139,40 @@ BOOL GetDescription(LPTSTR lpServiceName, LPTSTR *retDescription)
 
 
 /* get vendor of service binary */
-BOOL
-GetExecutablePath(PMAIN_WND_INFO Info,
-                  LPTSTR *ExePath)
+BOOL GetExecutablePath(LPTSTR *ExePath)
 {
     SC_HANDLE hSCManager = NULL;
     SC_HANDLE hSc = NULL;
     LPQUERY_SERVICE_CONFIG pServiceConfig = NULL;
+    ENUM_SERVICE_STATUS_PROCESS *Service = NULL;
     DWORD BytesNeeded = 0;
 
+    /* copy pointer to selected service */
+    Service = GetSelectedService();
+
     /* open handle to the SCM */
-    hSCManager = OpenSCManager(NULL,
-                               NULL,
-                               SC_MANAGER_ENUMERATE_SERVICE);
+    hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ENUMERATE_SERVICE);
     if (hSCManager == NULL)
     {
-        GetError();
+        GetError(0);
         return FALSE;
     }
 
     /* get a handle to the service requested for starting */
-    hSc = OpenService(hSCManager,
-                      Info->CurrentService->lpServiceName,
-                      SERVICE_QUERY_CONFIG);
+    hSc = OpenService(hSCManager, Service->lpServiceName, SERVICE_QUERY_CONFIG);
     if (hSc == NULL)
     {
-        GetError();
+        GetError(0);
         goto cleanup;
     }
 
 
-    if (!QueryServiceConfig(hSc,
-                            pServiceConfig,
-                            0,
-                            &BytesNeeded))
+    if (!QueryServiceConfig(hSc, pServiceConfig, 0, &BytesNeeded))
     {
         if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
         {
             pServiceConfig = (LPQUERY_SERVICE_CONFIG)
-                             HeapAlloc(ProcessHeap,
-                                       0,
-                                       BytesNeeded);
+                HeapAlloc(GetProcessHeap(), 0, BytesNeeded);
             if (pServiceConfig == NULL)
                 goto cleanup;
 
@@ -177,9 +181,7 @@ GetExecutablePath(PMAIN_WND_INFO Info,
                                     BytesNeeded,
                                     &BytesNeeded))
             {
-                HeapFree(ProcessHeap,
-                         0,
-                         pServiceConfig);
+                HeapFree(GetProcessHeap(), 0, pServiceConfig);
                 goto cleanup;
             }
         }
@@ -205,8 +207,7 @@ cleanup:
 }
 
 
-static VOID
-InitListViewImage(PMAIN_WND_INFO Info)
+VOID InitListViewImage(VOID)
 {
     HICON hSmIconItem, hLgIconItem;    /* icon for list-view items */
     HIMAGELIST hSmall, hLarge;  /* image list for other views */
@@ -214,65 +215,43 @@ InitListViewImage(PMAIN_WND_INFO Info)
 
     /* Create the icon image lists */
     hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON),
-                              GetSystemMetrics(SM_CYSMICON),
-                              ILC_MASK | ILC_COLOR32,
-                              1,
-                              1);
+    GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR32, 1, 1);
 
     hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON),
-                              GetSystemMetrics(SM_CYICON),
-                              ILC_MASK | ILC_COLOR32,
-                              1,
-                              1);
+    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);
+    hSmIconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON),
+                          IMAGE_ICON, 16, 16, 0);
+    ImageList_AddIcon(hSmall, hSmIconItem);
 
-    ImageList_AddIcon(hSmall,
-                      hSmIconItem);
-
-    hLgIconItem = LoadImage(hInstance,
-                            MAKEINTRESOURCE(IDI_SM_ICON),
-                            IMAGE_ICON,
-                            32,
-                            32,
-                            0);
-
-    ImageList_AddIcon(hLarge,
-                      hLgIconItem);
+    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);
+    (void)ListView_SetImageList(hListView, hSmall, LVSIL_SMALL);
+    (void)ListView_SetImageList(hListView, hLarge, LVSIL_NORMAL);
 
 }
 
 
 
 BOOL
-RefreshServiceList(PMAIN_WND_INFO Info)
+RefreshServiceList(VOID)
 {
-    LVITEM lvItem;
+    LVITEM item;
     TCHAR szNumServices[32];
     TCHAR szStatus[64];
     DWORD NumServices = 0;
     DWORD Index;
     LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s");
 
-    (void)ListView_DeleteAllItems(Info->hListView);
+    (void)ListView_DeleteAllItems(hListView);
 
-    InitListViewImage(Info);
+    InitListViewImage();
 
-    NumServices = GetServiceList(Info);
+    NumServices = GetServiceList();
 
     if (NumServices)
     {
@@ -288,10 +267,8 @@ RefreshServiceList(PMAIN_WND_INFO Info)
             DWORD dwValueSize;
 
              /* open the registry key for the service */
-            _sntprintf(buf,
-                       300,
-                       Path,
-                       Info->pServiceStatus[Index].lpServiceName);
+            _sntprintf(buf, 300, Path,
+                      pServiceStatus[Index].lpServiceName);
 
             RegOpenKeyEx(HKEY_LOCAL_MACHINE,
                          buf,
@@ -301,54 +278,49 @@ RefreshServiceList(PMAIN_WND_INFO Info)
 
 
             /* set the display name */
-            ZeroMemory(&lvItem, sizeof(LVITEM));
-            lvItem.mask = LVIF_TEXT | LVIF_PARAM;
-            lvItem.pszText = Info->pServiceStatus[Index].lpDisplayName;
+
+            ZeroMemory(&item, sizeof(LVITEM));
+            item.mask = LVIF_TEXT | LVIF_PARAM;
+            item.pszText = 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];
+            item.lParam = (LPARAM)&pServiceStatus[Index];
 
-            lvItem.iItem = ListView_GetItemCount(Info->hListView);
-            lvItem.iItem = ListView_InsertItem(Info->hListView, &lvItem);
+            item.iItem = ListView_GetItemCount(hListView);
+            item.iItem = ListView_InsertItem(hListView, &item);
 
 
 
             /* set the description */
-            if (GetDescription(Info->pServiceStatus[Index].lpServiceName, &Description))
-            {
-                lvItem.pszText = Description;
-                lvItem.iSubItem = 1;
-                SendMessage(Info->hListView,
-                            LVM_SETITEMTEXT,
-                            lvItem.iItem,
-                            (LPARAM)&lvItem);
 
-                HeapFree(ProcessHeap,
-                         0,
-                         Description);
+            if (GetDescription(pServiceStatus[Index].lpServiceName, &Description))
+            {
+                item.pszText = Description;
+                item.iSubItem = 1;
+                SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
+
+                HeapFree(GetProcessHeap(), 0, Description);
             }
 
 
             /* set the status */
-            if (Info->pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING)
+
+            if (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);
+                LoadString(hInstance, IDS_SERVICES_STARTED, szStatus,
+                    sizeof(szStatus) / sizeof(TCHAR));
+                item.pszText = szStatus;
+                item.iSubItem = 2;
+                SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
             }
 
 
 
             /* set the startup type */
+
             dwValueSize = sizeof(DWORD);
             if (RegQueryValueEx(hKey,
                                 _T("Start"),
@@ -363,47 +335,33 @@ RefreshServiceList(PMAIN_WND_INFO Info)
 
             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);
+                LoadString(hInstance, IDS_SERVICES_AUTO, szStatus,
+                    sizeof(szStatus) / sizeof(TCHAR));
+                item.pszText = szStatus;
+                item.iSubItem = 3;
+                SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
             }
             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);
+                LoadString(hInstance, IDS_SERVICES_MAN, szStatus,
+                    sizeof(szStatus) / sizeof(TCHAR));
+                item.pszText = szStatus;
+                item.iSubItem = 3;
+                SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
             }
             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);
+                LoadString(hInstance, IDS_SERVICES_DIS, szStatus,
+                    sizeof(szStatus) / sizeof(TCHAR));
+                item.pszText = szStatus;
+                item.iSubItem = 3;
+                SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
             }
 
 
 
             /* set Log On As */
+
             dwValueSize = 0;
             if (RegQueryValueEx(hKey,
                                 _T("ObjectName"),
@@ -416,9 +374,7 @@ RefreshServiceList(PMAIN_WND_INFO Info)
                 continue;
             }
 
-            LogOnAs = HeapAlloc(ProcessHeap,
-                                HEAP_ZERO_MEMORY,
-                                dwValueSize);
+            LogOnAs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize);
             if (LogOnAs == NULL)
             {
                 RegCloseKey(hKey);
@@ -431,52 +387,32 @@ RefreshServiceList(PMAIN_WND_INFO Info)
                                (LPBYTE)LogOnAs,
                                &dwValueSize))
             {
-                HeapFree(ProcessHeap,
-                         0,
-                         LogOnAs);
+                HeapFree(GetProcessHeap(), 0, LogOnAs);
                 RegCloseKey(hKey);
                 continue;
             }
 
-            lvItem.pszText = LogOnAs;
-            lvItem.iSubItem = 4;
-            SendMessage(Info->hListView,
-                        LVM_SETITEMTEXT,
-                        lvItem.iItem,
-                        (LPARAM)&lvItem);
+            item.pszText = LogOnAs;
+            item.iSubItem = 4;
+            SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
 
-            HeapFree(ProcessHeap,
-                     0,
-                     LogOnAs);
+            HeapFree(GetProcessHeap(), 0, LogOnAs);
 
             RegCloseKey(hKey);
 
         }
 
-        NumListedServ = ListView_GetItemCount(Info->hListView);
+        NumListedServ = ListView_GetItemCount(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);
+        LoadString(hInstance, IDS_NUM_SERVICES, szNumServices,
+            sizeof(szNumServices) / sizeof(TCHAR));
+        _sntprintf(buf, 300, szNumServices, NumListedServ);
+        SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)buf);
     }
 
     /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */
-    SendMessage (Info->hListView,
-                 WM_SETREDRAW,
-                 TRUE,
-                 0) ;
+    SendMessage (hListView, WM_SETREDRAW, TRUE, 0) ;
 
     return TRUE;
 }
@@ -485,7 +421,7 @@ RefreshServiceList(PMAIN_WND_INFO Info)
 
 
 DWORD
-GetServiceList(PMAIN_WND_INFO Info)
+GetServiceList(VOID)
 {
     SC_HANDLE ScHandle;
 
@@ -500,7 +436,7 @@ GetServiceList(PMAIN_WND_INFO Info)
                                  SC_ENUM_PROCESS_INFO,
                                  SERVICE_WIN32,
                                  SERVICE_STATE_ALL,
-                                 (LPBYTE)Info->pServiceStatus,
+                                 (LPBYTE)pServiceStatus,
                                  0, &BytesNeeded,
                                  &NumServices,
                                  &ResumeHandle,
@@ -510,11 +446,9 @@ GetServiceList(PMAIN_WND_INFO Info)
             if (GetLastError() == ERROR_MORE_DATA)
             {
                 /* reserve memory for service info array */
-                Info->pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *)
-                        HeapAlloc(ProcessHeap,
-                                  0,
-                                  BytesNeeded);
-                if (Info->pServiceStatus == NULL)
+                pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *)
+                        HeapAlloc(GetProcessHeap(), 0, BytesNeeded);
+                if (pServiceStatus == NULL)
 			        return FALSE;
 
                 /* fill array with service info */
@@ -522,16 +456,14 @@ GetServiceList(PMAIN_WND_INFO Info)
                                          SC_ENUM_PROCESS_INFO,
                                          SERVICE_WIN32,
                                          SERVICE_STATE_ALL,
-                                         (LPBYTE)Info->pServiceStatus,
+                                         (LPBYTE)pServiceStatus,
                                          BytesNeeded,
                                          &BytesNeeded,
                                          &NumServices,
                                          &ResumeHandle,
                                          0) == 0)
                 {
-                    HeapFree(ProcessHeap,
-                             0,
-                             Info->pServiceStatus);
+                    HeapFree(GetProcessHeap(), 0, pServiceStatus);
                     return FALSE;
                 }
             }