[PATCH v5 6/8] ntdll: Return system info from NtQuerySystemInformation on Linux

[Alex Henrie]

Signed-off-by: Alex Henrie 
---
 dlls/ntdll/nt.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 658970b051..560cb747bf 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -88,6 +88,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 */
@@ -1921,14 +1931,21 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
         {
             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);

*required_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer);

@@ -1937,6 +1954,10 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             *required_len += sizeof(struct smbios_bios);
             *required_len += max(bios_vendor_size + bios_version_size + bios_date_size + 1, 2);

+            *required_len += sizeof(struct smbios_system);
+            *required_len += max(system_vendor_size + system_product_size + system_version_size +
+                                 system_serial_size + 1, 2);
+
             if (available_len < *required_len)
             {
                 return STATUS_BUFFER_TOO_SMALL;
@@ -1971,6 +1992,32 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
                 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
             {
@@ -1980,6 +2027,10 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             free(bios_vendor);
             free(bios_version);
             free(bios_date);
+            free(system_vendor);
+            free(system_product);
+            free(system_version);
+            free(system_serial);

return STATUS_SUCCESS;
         }