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

Alex Henrie alexhenrie24 at gmail.com
Fri Jun 15 01:59:14 CDT 2018


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

diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index e79059b224..7380b236b1 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -108,6 +108,17 @@ struct smbios_board {
     BYTE serial;
 };
 
+struct smbios_chassis {
+    BYTE type;
+    BYTE length;
+    WORD handle;
+    BYTE vendor;
+    BYTE shape;
+    BYTE version;
+    BYTE serial;
+    BYTE asset_tag;
+};
+
 #include "poppack.h"
 
 /* Firmware table providers */
@@ -1945,12 +1956,15 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             size_t system_vendor_size, system_product_size, system_version_size, system_serial_size;
             char *board_vendor, *board_product, *board_version, *board_serial;
             size_t board_vendor_size, board_product_size, board_version_size, board_serial_size;
+            char *chassis_vendor, *chassis_version, *chassis_serial, *chassis_asset_tag;
+            size_t chassis_vendor_size, chassis_version_size, chassis_serial_size, chassis_asset_tag_size;
             char *buffer = (char*)sfti->TableBuffer;
             BYTE string_count;
             struct smbios_prologue *prologue;
             struct smbios_bios *bios;
             struct smbios_system *system;
             struct smbios_board *board;
+            struct smbios_chassis *chassis;
 
             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);
@@ -1963,6 +1977,10 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             board_product = get_smbios_string("/sys/class/dmi/id/board_name", &board_product_size);
             board_version = get_smbios_string("/sys/class/dmi/id/board_version", &board_version_size);
             board_serial = get_smbios_string("/sys/class/dmi/id/board_serial", &board_serial_size);
+            chassis_vendor = get_smbios_string("/sys/class/dmi/id/chassis_vendor", &chassis_vendor_size);
+            chassis_version = get_smbios_string("/sys/class/dmi/id/chassis_version", &chassis_version_size);
+            chassis_serial = get_smbios_string("/sys/class/dmi/id/chassis_serial", &chassis_serial_size);
+            chassis_asset_tag = get_smbios_string("/sys/class/dmi/id/chassis_tag", &chassis_asset_tag_size);
 
             *required_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer);
 
@@ -1980,6 +1998,10 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             *required_len += max(board_vendor_size + board_product_size + board_version_size +
                                  board_serial_size + 1, 2);
 
+            *required_len += sizeof(struct smbios_chassis);
+            *required_len += max(chassis_vendor_size + chassis_version_size + chassis_serial_size +
+                                 chassis_asset_tag_size + 1, 2);
+
             if (available_len < *required_len)
             {
                 return STATUS_BUFFER_TOO_SMALL;
@@ -2048,6 +2070,33 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
                 buffer += 2;
             }
 
+            string_count = 0;
+            chassis = (struct smbios_chassis*)buffer;
+            chassis->type = 3;
+            chassis->length = sizeof(struct smbios_chassis);
+            chassis->handle = 0;
+            chassis->vendor = chassis_vendor ? ++string_count : 0;
+            chassis->shape = 0x2; /* unknown */
+            chassis->version = chassis_version ? ++string_count : 0;
+            chassis->serial = chassis_serial ? ++string_count : 0;
+            chassis->asset_tag = chassis_asset_tag ? ++string_count : 0;
+            buffer += sizeof(struct smbios_chassis);
+
+            if (string_count)
+            {
+                copy_smbios_string(&buffer, chassis_vendor, chassis_vendor_size);
+                copy_smbios_string(&buffer, chassis_version, chassis_version_size);
+                copy_smbios_string(&buffer, chassis_serial, chassis_serial_size);
+                copy_smbios_string(&buffer, chassis_asset_tag, chassis_asset_tag_size);
+                memset(buffer, 0, 1);
+                buffer++;
+            }
+            else
+            {
+                memset(buffer, 0, 2);
+                buffer += 2;
+            }
+
             string_count = 0;
             board = (struct smbios_board*)buffer;
             board->type = 2;
@@ -2083,6 +2132,10 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             free(board_product);
             free(board_version);
             free(board_serial);
+            free(chassis_vendor);
+            free(chassis_version);
+            free(chassis_serial);
+            free(chassis_asset_tag);
 
             return STATUS_SUCCESS;
         }
-- 
2.17.1




More information about the wine-devel mailing list