[ros-diffs] [dreimer] 67550: [ROSAPPS] Fix binpatch and systeminfo MSVC build.

Author: dreimer
Date: Tue May  5 00:18:15 2015
New Revision: 67550

URL: http://svn.reactos.org/svn/reactos?rev=67550&view=rev
Log:
[ROSAPPS]
Fix binpatch and systeminfo MSVC build.

Modified:
    trunk/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
    trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
    trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
    trunk/rosapps/applications/sysutils/systeminfo/resource.h
    trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc
    trunk/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt

Modified: trunk/rosapps/applications/sysutils/systeminfo/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/CMakeLists.txt	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -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)

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -41,7 +41,7 @@
 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"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -39,7 +39,7 @@
 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"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -44,7 +44,7 @@
 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"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -39,7 +39,7 @@
 IDS_PRODUCT_ID,              "ID du produit"
 IDS_INST_DATE,               "Date d'installation"
 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,                "Type du système"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -39,7 +39,7 @@
 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"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -39,7 +39,7 @@
 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"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -46,7 +46,7 @@
 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"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/ro-RO.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -47,7 +47,7 @@
 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"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -43,7 +43,7 @@
 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"

Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -47,7 +47,7 @@
 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,               "Тип системи"

Modified: trunk/rosapps/applications/sysutils/systeminfo/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/resource.h	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/resource.h	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -1,3 +1,5 @@
+#pragma once
+
 #define IDS_USAGE                1000
 
 #define IDS_HOST_NAME            100

Modified: trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc	[iso-8859-1] Tue May  5
00:18:15 2015
@@ -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

Modified: trunk/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt	[iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/binpatch/CMakeLists.txt	[iso-8859-1] Tue May
 5 00:18:15 2015
@@ -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)