[PATCH 1/2] ntdll: Use unique handle numbers in generated SMBIOS tables.

[Brendan Shanks]

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
 dlls/ntdll/unix/system.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 3756bd7cee0..de33d52ed2e 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -1257,6 +1257,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
         size_t chassis_vendor_len, chassis_version_len, chassis_serial_len, chassis_asset_tag_len;
         char *buffer = (char*)sfti->TableBuffer;
         BYTE string_count;
+        BYTE handle_count = 0;
         struct smbios_prologue *prologue;
         struct smbios_bios *bios;
         struct smbios_system *system;
@@ -1321,7 +1322,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
         bios = (struct smbios_bios*)buffer;
         bios->hdr.type = 0;
         bios->hdr.length = sizeof(struct smbios_bios);
-        bios->hdr.handle = 0;
+        bios->hdr.handle = handle_count++;
         bios->vendor = bios_vendor_len ? ++string_count : 0;
         bios->version = bios_version_len ? ++string_count : 0;
         bios->start = 0;
@@ -1346,7 +1347,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
         system = (struct smbios_system*)buffer;
         system->hdr.type = 1;
         system->hdr.length = sizeof(struct smbios_system);
-        system->hdr.handle = 0;
+        system->hdr.handle = handle_count++;
         system->vendor = system_vendor_len ? ++string_count : 0;
         system->product = system_product_len ? ++string_count : 0;
         system->version = system_version_len ? ++string_count : 0;
@@ -1370,7 +1371,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
         board = (struct smbios_board*)buffer;
         board->hdr.type = 2;
         board->hdr.length = sizeof(struct smbios_board);
-        board->hdr.handle = 0;
+        board->hdr.handle = handle_count++;
         board->vendor = board_vendor_len ? ++string_count : 0;
         board->product = board_product_len ? ++string_count : 0;
         board->version = board_version_len ? ++string_count : 0;
@@ -1388,7 +1389,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
         chassis = (struct smbios_chassis*)buffer;
         chassis->hdr.type = 3;
         chassis->hdr.length = sizeof(struct smbios_chassis);
-        chassis->hdr.handle = 0;
+        chassis->hdr.handle = handle_count++;
         chassis->vendor = chassis_vendor_len ? ++string_count : 0;
         chassis->type = atoi(chassis_type);
         chassis->version = chassis_version_len ? ++string_count : 0;
-- 
2.26.2

[PATCH 2/2] ntdll: End generated SMBIOS tables with the end-of-table structure.

[Brendan Shanks]

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
---
 dlls/ntdll/unix/system.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index de33d52ed2e..4e0841175eb 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -1263,6 +1263,7 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
         struct smbios_system *system;
         struct smbios_board *board;
         struct smbios_chassis *chassis;
+        struct smbios_header *end_of_table;
 
 #define S(s) s, sizeof(s)
         bios_vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor));
@@ -1301,6 +1302,9 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
         *required_len += sizeof(struct smbios_chassis);
         *required_len += max(L(chassis_vendor_len) + L(chassis_version_len) + L(chassis_serial_len) +
                              L(chassis_asset_tag_len) + 1, 2);
+
+        *required_len += sizeof(struct smbios_header);
+        *required_len += 2;
 #undef L
 
         sfti->TableBufferLength = *required_len;
@@ -1408,6 +1412,14 @@ static NTSTATUS get_firmware_info( SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULON
         if (!string_count) *buffer++ = 0;
         *buffer++ = 0;
 
+        end_of_table = (struct smbios_header*)buffer;
+        end_of_table->type = 127;
+        end_of_table->length = sizeof(struct smbios_header);
+        end_of_table->handle = handle_count++;
+        buffer += sizeof(struct smbios_header);
+        *buffer++ = 0;
+        *buffer++ = 0;
+
         return STATUS_SUCCESS;
     }
     default:
-- 
2.26.2