[PATCH v4 4/5] ntdll: Return chassis info from NtQuerySystemInformation on Linux

Alex Henrie alexhenrie24 at gmail.com
Wed Jun 13 22:41:18 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 3c95992818..a0177b4062 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -123,6 +123,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 */
@@ -2480,12 +2491,15 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                         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);
@@ -2498,6 +2512,10 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                         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);
 
                         len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer);
 
@@ -2514,6 +2532,10 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                         len += max(board_vendor_size + board_product_size + board_version_size +
                                    board_serial_size + 1, 2);
 
+                        len += sizeof(struct smbios_chassis);
+                        len += max(chassis_vendor_size + chassis_version_size + chassis_serial_size +
+                                   chassis_asset_tag_size + 1, 2);
+
                         if (Length < len)
                         {
                             ret = STATUS_INFO_LENGTH_MISMATCH;
@@ -2601,6 +2623,33 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                             copy_smbios_string(&buffer, board_version, board_version_size);
                             copy_smbios_string(&buffer, board_serial, board_serial_size);
                             memset(buffer, 0, 1);
+                            buffer++;
+                        }
+                        else
+                        {
+                            memset(buffer, 0, 2);
+                            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);
                         }
                         else
                         {
@@ -2618,6 +2667,10 @@ NTSTATUS WINAPI NtQuerySystemInformation(
                         free(board_product);
                         free(board_version);
                         free(board_serial);
+                        free(chassis_vendor);
+                        free(chassis_version);
+                        free(chassis_serial);
+                        free(chassis_asset_tag);
                     }
                     goto finish;
 #endif
-- 
2.17.1




More information about the wine-patches mailing list