[REG]

- Upgrade the files architecture to the classic one : lang-directory for language resource files, rsrc.rc and <app_name>.rc for main resource files.
- Convert remaining language resource files to UTF-8 without BOM.
- Add version information to the program - Patch by Lee Schroeder.

CORE-6821 #resolve #comment Committed in r57963. Thanks :)

svn path=/trunk/; revision=57963

reactos/base/applications/cmdutils/reg/CMakeLists.txt

@@ -4,7 +4,7 @@ set_rc_compiler()
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
-add_executable(reg reg.c rsrc.rc)
+add_executable(reg reg.c reg.rc)
 
 set_module_type(reg win32cui UNICODE)
 add_importlibs(reg advapi32 user32 msvcrt kernel32)

reactos/base/applications/cmdutils/reg/lang/ko-KR.rc

@@ -26,13 +26,13 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n"
-    STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n"
-    STRING_SUCCESS, "작업이 성공적으로 끝났습니다\n"
-    STRING_INVALID_KEY, "에러: 올바르지 않은 키 이름\n"
-    STRING_INVALID_CMDLINE, "에러:올바르지 않은 명령라인 매개변수\n"
-    STRING_NO_REMOTE, "에러: 원격 머신에  키를 더하는 것은 가능하지 않습니다\n"
-    STRING_CANNOT_FIND, "에러: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다\n"
+    STRING_USAGE, "명령어 형식:\n\nREG [ ADD | DELETE | QUERY ]\nREG 명령어 /?\n"
+    STRING_ADD_USAGE, "REG ADD 값 [/v 값 | /ve] [/t 형식] [/s 분리기호] [/d 데이타] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE 키 이름 [/v 값 | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY 키 이름 [/v 값| /ve] [/s]\n"
+    STRING_SUCCESS, "작업이 성공적으로 끝났습니다\n"
+    STRING_INVALID_KEY, "에러: 올바르지 않은 키 이름\n"
+    STRING_INVALID_CMDLINE, "에러:올바르지 않은 명령라인 매개변수\n"
+    STRING_NO_REMOTE, "에러: 원격 머신에  키를 더하는 것은 가능하지 않습니다\n"
+    STRING_CANNOT_FIND, "에러: 이 시스템에서 지정된 레지스트리 키나 값을 찾을수 없습니다\n"
 }

reactos/base/applications/cmdutils/reg/lang/pl-PL.rc

@@ -4,7 +4,7 @@
  *
  * Copyright 2008 Andrew Riedi
  * Copyright 2008 Mikolaj Zalewski
- * Copyright 2010 Łukasz Wojniłowicz
+ * Copyright 2010 Łukasz Wojniłowicz
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,13 +27,13 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
-    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
-    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n"
-    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n"
-    STRING_SUCCESS, "Operacja zakończona pomyślnie\n"
-    STRING_INVALID_KEY, "Błąd: Niewłaściwa nazwa klucza\n"
-    STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
-    STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
-    STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
+    STRING_USAGE, "Składnia tego polecenia:\n\nREG [ ADD | DELETE | QUERY ]\nREG polecenie /?\n"
+    STRING_ADD_USAGE, "REG ADD nazwa_klucza [/v nazwa_wartości | /ve] [/t typ] [/s separator] [/d dane] [/f]\n"
+    STRING_DELETE_USAGE, "REG DELETE nazwa_klucza [/v nazwa_wartości | /ve | /va] [/f]\n"
+    STRING_QUERY_USAGE, "REG QUERY nazwa_klucza [/v nazwa_wartości | /ve] [/s]\n"
+    STRING_SUCCESS, "Operacja zakończona pomyślnie\n"
+    STRING_INVALID_KEY, "Błąd: Niewłaściwa nazwa klucza\n"
+    STRING_INVALID_CMDLINE, "Błąd: Niewłaściwe parametry wiersza poleceń\n"
+    STRING_NO_REMOTE, "Błąd: Nie można dodać kluczy do zdalnej maszyny\n"
+    STRING_CANNOT_FIND, "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n"
 }

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

@@ -0,0 +1,13 @@
+#include <windows.h>
+#include <commctrl.h>
+#include "reg.h"
+
+/* Define language neutral resources */
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Registry Console Tool"
+#define REACTOS_STR_INTERNAL_NAME       "reg"
+#define REACTOS_STR_ORIGINAL_FILENAME   "reg.exe"
+#include <reactos/version.rc>
+
+#include "rsrc.rc"

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

@@ -1,59 +1,63 @@
-#ifdef LANGUAGE_EN_US
-    #include "En.rc"
-#endif
-#ifdef LANGUAGE_KO_KR
-    #include "Ko.rc"
-#endif
-#ifdef LANGUAGE_NL_NL
-    #include "Nl.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "Pl.rc"
-#endif
+#include <windows.h>
+#include "reg.h"
 
-/* UTF-8 */
+/* Include localised resources */
+// UTF-8
+#pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG
-    #include "Bg.rc"
+    #include "lang/bg-BG.rc"
 #endif
 #ifdef LANGUAGE_DA_DK
-    #include "Da.rc"
+    #include "lang/da-DK.rc"
 #endif
 #ifdef LANGUAGE_DE_DE
-    #include "De.rc"
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
 #endif
 #ifdef LANGUAGE_ES_ES
-    #include "Es.rc"
+    #include "lang/es-ES.rc"
 #endif
 #ifdef LANGUAGE_FR_FR
-    #include "Fr.rc"
+    #include "lang/fr-FR.rc"
 #endif
 #ifdef LANGUAGE_IT_IT
-    #include "It.rc"
+    #include "lang/it-IT.rc"
 #endif
 #ifdef LANGUAGE_JA_JP
-    #include "Ja.rc"
+    #include "lang/ja-JP.rc"
+#endif
+#ifdef LANGUAGE_KO_KR
+    #include "lang/ko-KR.rc"
 #endif
 #ifdef LANGUAGE_LT_LT
-    #include "Lt.rc"
+    #include "lang/lt-LT.rc"
+#endif
+#ifdef LANGUAGE_NL_NL
+    #include "lang/nl-NL.rc"
 #endif
 #ifdef LANGUAGE_NO_NO
-    #include "No.rc"
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
 #endif
 #ifdef LANGUAGE_PT_PT
-    #include "Pt.rc"
+    #include "lang/pt-PT.rc"
 #endif
 #ifdef LANGUAGE_RO_RO
-    #include "Ro.rc"
+    #include "lang/ro-RO.rc"
 #endif
 #ifdef LANGUAGE_RU_RU
-    #include "Ru.rc"
+    #include "lang/ru-RU.rc"
 #endif
 #ifdef LANGUAGE_SL_SI
-    #include "Si.rc"
+    #include "lang/sl-SI.rc"
 #endif
 #ifdef LANGUAGE_SV_SE
-    #include "Sv.rc"
+    #include "lang/sv-SE.rc"
 #endif
 #ifdef LANGUAGE_UK_UA
-    #include "Uk.rc"
+    #include "lang/uk-UA.rc"
 #endif