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

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


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

diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 560cb747bf..e79059b224 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -98,6 +98,16 @@ struct smbios_system {
     BYTE serial;
 };
 
+struct smbios_board {
+    BYTE type;
+    BYTE length;
+    WORD handle;
+    BYTE vendor;
+    BYTE product;
+    BYTE version;
+    BYTE serial;
+};
+
 #include "poppack.h"
 
 /* Firmware table providers */
@@ -1933,11 +1943,14 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             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 *board_vendor, *board_product, *board_version, *board_serial;
+            size_t board_vendor_size, board_product_size, board_version_size, board_serial_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;
 
             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);
@@ -1946,6 +1959,10 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             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);
+            board_vendor = get_smbios_string("/sys/class/dmi/id/board_vendor", &board_vendor_size);
+            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);
 
             *required_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer);
 
@@ -1955,9 +1972,14 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             *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);
 
+            *required_len += sizeof(struct smbios_board);
+            *required_len += max(board_vendor_size + board_product_size + board_version_size +
+                                 board_serial_size + 1, 2);
+
             if (available_len < *required_len)
             {
                 return STATUS_BUFFER_TOO_SMALL;
@@ -2018,6 +2040,32 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
                 copy_smbios_string(&buffer, system_version, system_version_size);
                 copy_smbios_string(&buffer, system_serial, system_serial_size);
                 memset(buffer, 0, 1);
+                buffer++;
+            }
+            else
+            {
+                memset(buffer, 0, 2);
+                buffer += 2;
+            }
+
+            string_count = 0;
+            board = (struct smbios_board*)buffer;
+            board->type = 2;
+            board->length = sizeof(struct smbios_board);
+            board->handle = 0;
+            board->vendor = board_vendor ? ++string_count : 0;
+            board->product = board_product ? ++string_count : 0;
+            board->version = board_version ? ++string_count : 0;
+            board->serial = board_serial ? ++string_count : 0;
+            buffer += sizeof(struct smbios_board);
+
+            if (string_count)
+            {
+                copy_smbios_string(&buffer, board_vendor, board_vendor_size);
+                copy_smbios_string(&buffer, board_product, board_product_size);
+                copy_smbios_string(&buffer, board_version, board_version_size);
+                copy_smbios_string(&buffer, board_serial, board_serial_size);
+                memset(buffer, 0, 1);
             }
             else
             {
@@ -2031,6 +2079,10 @@ static inline NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti
             free(system_product);
             free(system_version);
             free(system_serial);
+            free(board_vendor);
+            free(board_product);
+            free(board_version);
+            free(board_serial);
 
             return STATUS_SUCCESS;
         }
-- 
2.17.1




More information about the wine-devel mailing list