kernelbase: Fix GetSystemFirmwareTable regression.

Regression caused by 71aba33f. Signed-off-by: John Chadwick <john@jchw.io> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernelbase: Fix GetSystemFirmwareTable regression.
9021cca6 · John Chadwick · Alexandre Julliard · 2acbe4f0 · 9021cca6 · 9021cca6
Commit 9021cca6 authored Nov 20, 2019 by John Chadwick Committed by Alexandre Julliard Nov 20, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 8 deletions

version.c dlls/kernel32/tests/version.c +0 -1

memory.c dlls/kernelbase/memory.c +4 -7

No files found.
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -738,7 +738,6 @@ static void test_GetSystemFirmwareTable(void)
    expected_len -= min_sfti_len;
    len = pGetSystemFirmwareTable(RSMB, 0, NULL, 0);
-todo_wine
    ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len);
    smbios_table = HeapAlloc(GetProcessHeap(), 0, expected_len);

--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -1161,13 +1161,10 @@ UINT WINAPI GetSystemFirmwareTable( DWORD provider, DWORD id, void *buffer, DWOR
    info->Action = SystemFirmwareTable_Get;
    info->TableID = id;
-    if (set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation,
+    set_ntstatus( NtQuerySystemInformation( SystemFirmwareTableInformation,
-                                                info, buffer_size, &buffer_size )))
+                                            info, buffer_size, &buffer_size ));
-    {
+    buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer );
-        buffer_size -= offsetof( SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer );
+    if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size );
-        if (buffer_size <= size) memcpy( buffer, info->TableBuffer, buffer_size );
-    }
-    else buffer_size = 0;
    HeapFree( GetProcessHeap(), 0, info );
    return buffer_size;