diff --git a/rosapps/sysutils/systeminfo/lang/de-DE.rc b/rosapps/sysutils/systeminfo/lang/de-DE.rc index 3c1071a18fe..28d9e8eeb0e 100644 --- a/rosapps/sysutils/systeminfo/lang/de-DE.rc +++ b/rosapps/sysutils/systeminfo/lang/de-DE.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE -{ +BEGIN IDS_USAGE, "SYSTEMINFO [/S System [/U Benutzername [/P [Passwort]]]] [/FO Format] [/NH]\n\n\ Beschreibung:\n\ @@ -58,5 +58,9 @@ IDS_VIRT_MEM_INUSE, "Auslagerungsdatei: In Verwendung: %ld MB (%ld KB)\n" IDS_HOST_NAME, "Domäne: %s\n" IDS_PAGEFILE_LOC, "Auslagerungsdateipfad(e) %s" IDS_TIME_ZONE, "Zeitzone: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END diff --git a/rosapps/sysutils/systeminfo/lang/en-US.rc b/rosapps/sysutils/systeminfo/lang/en-US.rc index 15b76fd5b68..a6e28ecaca0 100644 --- a/rosapps/sysutils/systeminfo/lang/en-US.rc +++ b/rosapps/sysutils/systeminfo/lang/en-US.rc @@ -1,7 +1,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE DISCARDABLE -{ +BEGIN IDS_USAGE, "SYSTEMINFO [/S system [/U username [/P [password]]]] [/FO format] [/NH]\n\n\ Description:\n\ @@ -54,7 +54,11 @@ IDS_VIRT_MEM_MAX, "Virtual Memory: Max Size: %ld MB (%ld KB)\n" IDS_VIRT_MEM_AVAIL, "Virtual Memory: Available: %ld MB (%ld KB)\n" IDS_VIRT_MEM_INUSE, "Virtual Memory: In Use: %ld MB (%ld KB)\n" IDS_HOST_NAME, "Host Name: %s\n" -IDS_PAGEFILE_LOC, "Page File Location(s) %s" +IDS_PAGEFILE_LOC, "Page File Location(s) %s\n" IDS_TIME_ZONE, "Time zone: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END diff --git a/rosapps/sysutils/systeminfo/lang/fr-FR.rc b/rosapps/sysutils/systeminfo/lang/fr-FR.rc index 938e4049fcd..2b193ad5595 100644 --- a/rosapps/sysutils/systeminfo/lang/fr-FR.rc +++ b/rosapps/sysutils/systeminfo/lang/fr-FR.rc @@ -1,9 +1,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE -{ +BEGIN -IDS_USAGE, "SYSTEMINFO [/S système [/U utilisateur [/P [motdepasse]]]] [/FO format] [/NH]\n\n\ +IDS_USAGE "SYSTEMINFO [/S système [/U utilisateur [/P [motdepasse]]]] [/FO format] [/NH]\n\n\ Description:\n\ Cet outil en ligne de commande permet à un administrateur d'effectuer une requête sur les informations\n\ basiques de la configuration du système.\n\n\ @@ -56,5 +56,9 @@ IDS_VIRT_MEM_INUSE, "M IDS_HOST_NAME, "Nom d'hôte: %s\n" IDS_PAGEFILE_LOC, "Emplacement(s) des fichiers d'échange %s" IDS_TIME_ZONE, "Fuseau horaire: %s\n" +IDS_DOMINE, "Domain: %s\n" +IDS_BIOS_DATE, "BIOS Date: %s\n" +IDS_BIOS_VERSION, "BIOS Version: %s\n" +IDS_NETWORK_CARDS, "Network Card(s) %u Installed.\n" -} +END diff --git a/rosapps/sysutils/systeminfo/resource.h b/rosapps/sysutils/systeminfo/resource.h index 86cc28a51de..a8499d52eec 100644 --- a/rosapps/sysutils/systeminfo/resource.h +++ b/rosapps/sysutils/systeminfo/resource.h @@ -27,3 +27,7 @@ #define IDS_HOST_NAME 124 #define IDS_PAGEFILE_LOC 125 #define IDS_TIME_ZONE 126 +#define IDS_DOMINE 127 +#define IDS_BIOS_DATE 128 +#define IDS_BIOS_VERSION 129 +#define IDS_NETWORK_CARDS 130 diff --git a/rosapps/sysutils/systeminfo/systeminfo.c b/rosapps/sysutils/systeminfo/systeminfo.c index 0395067819f..e7d8680fa9b 100644 --- a/rosapps/sysutils/systeminfo/systeminfo.c +++ b/rosapps/sysutils/systeminfo/systeminfo.c @@ -220,6 +220,18 @@ AllSysInfo(VOID) } //getting BIOS Version + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosVersion"), + Buf)) + if(GetOemStrings(IDS_BIOS_VERSION,Msg)) fprintf(stderr,Msg,Buf); + + //gettings BIOS date + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("HARDWARE\\DESCRIPTION\\System"), + TEXT("SystemBiosDate"), + Buf)) + if(GetOemStrings(IDS_BIOS_DATE,Msg)) fprintf(stderr,Msg,Buf); //getting ReactOS Directory if(!GetWindowsDirectory(Buf,BUFFER_SIZE)) printf("Error getting: GetWindowsDirectory"); @@ -327,11 +339,19 @@ AllSysInfo(VOID) } //getting Domain + if (GetRegistryValue(HKEY_LOCAL_MACHINE, + TEXT("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon"), + TEXT("CachePrimaryDomain"), + Buf)) + if(GetOemStrings(IDS_DOMINE,Msg)) fprintf(stderr,Msg,Buf); //getting Logon Server //getting NetWork Card(s) + if(GetOemStrings(IDS_NETWORK_CARDS,Msg)) + { + } } /* Main program */