[PATCH v4 2/5] ntdll: Return system info from NtQuerySystemInformation on Linux

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 dlls/ntdll/nt.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 72ae381813..162c7467c8 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -103,6 +103,16 @@ struct smbios_bios {
     UINT64 characteristics;
 };
 
+struct smbios_system {
+    BYTE type;
+    BYTE length;
+    WORD handle;
+    BYTE vendor;
+    BYTE product;
+    BYTE version;
+    BYTE serial;
+};
+
 #include "poppack.h"
 
 /* Firmware table providers */
@@ -2456,14 +2466,21 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                     {
                         char *bios_vendor, *bios_version, *bios_date;
                         size_t bios_vendor_size, bios_version_size, bios_date_size;
+                        char *system_vendor, *system_product, *system_version, *system_serial;
+                        size_t system_vendor_size, system_product_size, system_version_size, system_serial_size;
                         char *buffer = (char*)sfti->TableBuffer;
                         BYTE string_count;
                         struct smbios_prologue *prologue;
                         struct smbios_bios *bios;
+                        struct smbios_system *system;
 
                         bios_vendor = get_smbios_string("/sys/class/dmi/id/bios_vendor", &bios_vendor_size);
                         bios_version = get_smbios_string("/sys/class/dmi/id/bios_version", &bios_version_size);
                         bios_date = get_smbios_string("/sys/class/dmi/id/bios_date", &bios_date_size);
+                        system_vendor = get_smbios_string("/sys/class/dmi/id/sys_vendor", &system_vendor_size);
+                        system_product = get_smbios_string("/sys/class/dmi/id/product", &system_product_size);
+                        system_version = get_smbios_string("/sys/class/dmi/id/product_version", &system_version_size);
+                        system_serial = get_smbios_string("/sys/class/dmi/id/product_serial", &system_serial_size);
 
                         len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer);
 
@@ -2472,6 +2489,10 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                         len += sizeof(struct smbios_bios);
                         len += max(bios_vendor_size + bios_version_size + bios_date_size + 1, 2);
 
+                        len += sizeof(struct smbios_system);
+                        len += max(system_vendor_size + system_product_size + system_version_size +
+                                   system_serial_size + 1, 2);
+
                         if (Length < len)
                         {
                             ret = STATUS_INFO_LENGTH_MISMATCH;
@@ -2507,6 +2528,32 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                             copy_smbios_string(&buffer, bios_version, bios_version_size);
                             copy_smbios_string(&buffer, bios_date, bios_date_size);
                             memset(buffer, 0, 1);
+                            buffer++;
+                        }
+                        else
+                        {
+                            memset(buffer, 0, 2);
+                            buffer += 2;
+                        }
+
+                        string_count = 0;
+                        system = (struct smbios_system*)buffer;
+                        system->type = 1;
+                        system->length = sizeof(struct smbios_system);
+                        system->handle = 0;
+                        system->vendor = system_vendor ? ++string_count : 0;
+                        system->product = system_product ? ++string_count : 0;
+                        system->version = system_version ? ++string_count : 0;
+                        system->serial = system_serial ? ++string_count : 0;
+                        buffer += sizeof(struct smbios_system);
+
+                        if (string_count)
+                        {
+                            copy_smbios_string(&buffer, system_vendor, system_vendor_size);
+                            copy_smbios_string(&buffer, system_product, system_product_size);
+                            copy_smbios_string(&buffer, system_version, system_version_size);
+                            copy_smbios_string(&buffer, system_serial, system_serial_size);
+                            memset(buffer, 0, 1);
                         }
                         else
                         {
@@ -2516,6 +2563,10 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                         free(bios_vendor);
                         free(bios_version);
                         free(bios_date);
+                        free(system_vendor);
+                        free(system_product);
+                        free(system_version);
+                        free(system_serial);
                     }
                     goto finish;
 #endif
-- 
2.17.1