[ROSAPPS]

Fix binpatch and systeminfo MSVC build.

svn path=/trunk/; revision=67550

diff --git a/rosapps/applications/sysutils/systeminfo/CMakeLists.txt b/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
index bc9a28e..4d6413e 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
+++ b/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_executable(systeminfo systeminfo.c systeminfo.rc rsrc.rc)
+add_executable(systeminfo systeminfo.c systeminfo.rc)
 set_module_type(systeminfo win32cui)
 add_importlibs(systeminfo user32 advapi32 netapi32 shlwapi iphlpapi ws2_32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET systeminfo DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc b/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
index 5569c6e..7861621 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
@@ -41,7 +41,7 @@ IDS_REG_ORG,                 "Registrierte Organisation"
 IDS_PRODUCT_ID,              "Produkt ID"
 IDS_INST_DATE,               "Installationsdatum"
 IDS_UP_TIME,                 "System Up Time"
-IDS_UP_TIME_FORMAT           "%u Days, %u Hours, %u Minutes, %u Seconds"
+IDS_UP_TIME_FORMAT,          "%u Days, %u Hours, %u Minutes, %u Seconds"
 IDS_SYS_MANUFACTURER,        "System Manufacturer"
 IDS_SYS_MODEL,               "System Model"
 IDS_SYS_TYPE,                "Systemtyp"

diff --git a/rosapps/applications/sysutils/systeminfo/lang/en-US.rc b/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
index 2b9bed9..d603471 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
@@ -39,7 +39,7 @@ IDS_REG_ORG,                 "Registered Organization"
 IDS_PRODUCT_ID,              "Product ID"
 IDS_INST_DATE,               "Install Date"
 IDS_UP_TIME,                 "System Up Time"
-IDS_UP_TIME_FORMAT           "%u Days, %u Hours, %u Minutes, %u Seconds"
+IDS_UP_TIME_FORMAT,          "%u Days, %u Hours, %u Minutes, %u Seconds"
 IDS_SYS_MANUFACTURER,        "System Manufacturer"
 IDS_SYS_MODEL,               "System Model"
 IDS_SYS_TYPE,                "System type"

diff --git a/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc b/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
index 1665c15..3421543 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
@@ -44,7 +44,7 @@ IDS_REG_ORG,                 "Organización"
 IDS_PRODUCT_ID,              "Identificador de Producto"
 IDS_INST_DATE,               "Fecha de Instalación"
 IDS_UP_TIME,                 "System Up Time"
-IDS_UP_TIME_FORMAT           "%u Days, %u Hours, %u Minutes, %u Seconds"
+IDS_UP_TIME_FORMAT,          "%u Days, %u Hours, %u Minutes, %u Seconds"
 IDS_SYS_MANUFACTURER,        "System Manufacturer"
 IDS_SYS_MODEL,               "System Model"
 IDS_SYS_TYPE,                "Tipo de sistema"

diff --git a/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc b/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
index cb4adb9..37c5b43 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
@@ -39,7 +39,7 @@ IDS_REG_ORG,                 "Organisation enregistrée"
 IDS_PRODUCT_ID,              "ID du produit"\r
 IDS_INST_DATE,               "Date d'installation"\r
 IDS_UP_TIME,                 "System Up Time"\r
-IDS_UP_TIME_FORMAT           "%u Days, %u Hours, %u Minutes, %u Seconds"\r
+IDS_UP_TIME_FORMAT,          "%u Days, %u Hours, %u Minutes, %u Seconds"\r
 IDS_SYS_MANUFACTURER,        "System Manufacturer"\r
 IDS_SYS_MODEL,               "System Model"\r
 IDS_SYS_TYPE,                "Type du système"\r

diff --git a/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc b/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
index 60932cd..400d1d2 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
@@ -39,7 +39,7 @@ IDS_REG_ORG,                 "Organizzazione Registrata"
 IDS_PRODUCT_ID,              "ID Prodotto"
 IDS_INST_DATE,               "Data Installazione"
 IDS_UP_TIME,                 "Tempo di Avvio Sistema"
-IDS_UP_TIME_FORMAT           "%u Giorno, %u Ore, %u Minuti, %u Secondi"
+IDS_UP_TIME_FORMAT,          "%u Giorno, %u Ore, %u Minuti, %u Secondi"
 IDS_SYS_MANUFACTURER,        "Produttore PC"
 IDS_SYS_MODEL,               "Modello Sistema"
 IDS_SYS_TYPE,                "Tipo Sistema"

diff --git a/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc b/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
index 81ae868..6d5370d 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
@@ -39,7 +39,7 @@ IDS_REG_ORG,                 "Registerert organisasjon"
 IDS_PRODUCT_ID,              "Produkt ID"
 IDS_INST_DATE,               "Installert dato"
 IDS_UP_TIME,                 "System Up Time"
-IDS_UP_TIME_FORMAT           "%u Days, %u Hours, %u Minutes, %u Seconds"
+IDS_UP_TIME_FORMAT,          "%u Days, %u Hours, %u Minutes, %u Seconds"
 IDS_SYS_MANUFACTURER,        "System Manufacturer"
 IDS_SYS_MODEL,               "System Model"
 IDS_SYS_TYPE,                "Systemtype"

diff --git a/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc b/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
index 76216f5..5377c21 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
@@ -46,7 +46,7 @@ IDS_REG_ORG,                 "Organizacja"
 IDS_PRODUCT_ID,              "ID produktu"
 IDS_INST_DATE,               "Data instalacji"
 IDS_UP_TIME,                 "Czas pracy systemu"
-IDS_UP_TIME_FORMAT           "%u dni, %u godzin, %u minut, %u sekund"
+IDS_UP_TIME_FORMAT,          "%u dni, %u godzin, %u minut, %u sekund"
 IDS_SYS_MANUFACTURER,        "Producent systemu"
 IDS_SYS_MODEL,               "Model systemu"
 IDS_SYS_TYPE,                "Rodzaj systemu"

diff --git a/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc b/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
index a2691fa..a68262b 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
@@ -47,7 +47,7 @@ IDS_REG_ORG,                 "Organizație înregistrată"
 IDS_PRODUCT_ID,              "ID produs"
 IDS_INST_DATE,               "Data de instalare"
 IDS_UP_TIME,                 "Timp de operare"
-IDS_UP_TIME_FORMAT           "%u zile, %u ore, %u minute, %u secunde"
+IDS_UP_TIME_FORMAT,          "%u zile, %u ore, %u minute, %u secunde"
 IDS_SYS_MANUFACTURER,        "Furnizorul sistemului"
 IDS_SYS_MODEL,               "Modelul sistemului"
 IDS_SYS_TYPE,                "Tipul sistemului"

diff --git a/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc b/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
index c5e8f7e..c9ad6cb 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
@@ -43,7 +43,7 @@ IDS_REG_ORG,                 "Registrovan  organiz cia"
 IDS_PRODUCT_ID,              "ID produktu"
 IDS_INST_DATE,               "D tum inçtal cie"
 IDS_UP_TIME,                 "System Up Time"
-IDS_UP_TIME_FORMAT           "%u Days, %u Hours, %u Minutes, %u Seconds"
+IDS_UP_TIME_FORMAT,          "%u Days, %u Hours, %u Minutes, %u Seconds"
 IDS_SYS_MANUFACTURER,        "System Manufacturer"
 IDS_SYS_MODEL,               "System Model"
 IDS_SYS_TYPE,                "Typ syst‚mu"

diff --git a/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc b/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
index d0c628f..cae4845 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
+++ b/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
@@ -47,7 +47,7 @@ IDS_REG_ORG,                "Зареєстрована організація"
 IDS_PRODUCT_ID,             "ID продукта"
 IDS_INST_DATE,              "Дата установки"
 IDS_UP_TIME,                "System Up Time"
-IDS_UP_TIME_FORMAT          "%u Days, %u Hours, %u Minutes, %u Seconds"
+IDS_UP_TIME_FORMAT,         "%u Days, %u Hours, %u Minutes, %u Seconds"
 IDS_SYS_MANUFACTURER,       "System Manufacturer"
 IDS_SYS_MODEL,              "System Model"
 IDS_SYS_TYPE,               "Тип системи"

diff --git a/rosapps/applications/sysutils/systeminfo/resource.h b/rosapps/applications/sysutils/systeminfo/resource.h
index 2a8f556..af347ab 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/resource.h
+++ b/rosapps/applications/sysutils/systeminfo/resource.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDS_USAGE                1000
 
 #define IDS_HOST_NAME            100

diff --git a/rosapps/applications/sysutils/systeminfo/rsrc.rc b/rosapps/applications/sysutils/systeminfo/rsrc.rc
index acd7873..5f9097a 100644 (file)
--- a/rosapps/applications/sysutils/systeminfo/rsrc.rc
+++ b/rosapps/applications/sysutils/systeminfo/rsrc.rc
@@ -1,16 +1,38 @@
 #include <windows.h>
 #include "resource.h"
 
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/de-DE.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/it-IT.rc"
-#include "lang/no-NO.rc"
-#include "lang/pl-PL.rc"
-#include "lang/ro-RO.rc"
-#include "lang/sk-SK.rc"
-#include "lang/uk-UA.rc"
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
+    #include "lang/es-ES.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_IT_IT
+    #include "lang/it-IT.rc"
+#endif
+#ifdef LANGUAGE_NO_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif

diff --git a/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt b/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt
index 07c3464..8d823e7 100644 (file)
--- a/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt
+++ b/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt
@@ -2,4 +2,7 @@
 add_executable(binpatch patch.c)
 set_module_type(binpatch win32cui)
 add_importlibs(binpatch ntdll msvcrt kernel32)
+if(MSVC)
+    target_link_libraries(binpatch oldnames)
+endif()
 add_cd_file(TARGET binpatch DESTINATION reactos/bin FOR all)