Alex Henrie : kernel32: Connect GetSystemFirmwareTable to NtQuerySystemInformation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 93711aee1fdfdce79b82907b9187e95630ed3055
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=93711aee1fdfdce79b82907b9...

Author: Alex Henrie <alexhenrie24(a)gmail.com>
Date:   Thu Jul 12 00:57:52 2018 +0200

kernel32: Connect GetSystemFirmwareTable to NtQuerySystemInformation.

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com>
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/kernel32/cpu.c           | 31 +++++++++++++++++++++++++++++++
 dlls/kernel32/process.c       | 10 ----------
 dlls/kernel32/tests/version.c |  2 +-
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
index ec1fd0f..1e99951 100644
--- a/dlls/kernel32/cpu.c
+++ b/dlls/kernel32/cpu.c
@@ -336,3 +336,34 @@ DWORD64 WINAPI GetEnabledXStateFeatures(void)
     FIXME("\n");
     return 0;
 }
+
+/***********************************************************************
+ *           GetSystemFirmwareTable (KERNEL32.@)
+ */
+UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, void *buffer, DWORD size)
+{
+    ULONG buffer_size = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer) + size;
+    SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti = HeapAlloc(GetProcessHeap(), 0, buffer_size);
+    NTSTATUS status;
+
+    TRACE("(0x%08x, 0x%08x, %p, %d)\n", provider, id, buffer, size);
+
+    if (!sfti)
+    {
+        SetLastError(ERROR_OUTOFMEMORY);
+        return 0;
+    }
+
+    sfti->ProviderSignature = provider;
+    sfti->Action = SystemFirmwareTable_Get;
+    sfti->TableID = id;
+
+    status = NtQuerySystemInformation(SystemFirmwareTableInformation, sfti, buffer_size, &buffer_size);
+    buffer_size -= FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer);
+    if (buffer_size <= size)
+        memcpy(buffer, sfti->TableBuffer, buffer_size);
+
+    if (status) SetLastError(RtlNtStatusToDosError(status));
+    HeapFree(GetProcessHeap(), 0, sfti);
+    return buffer_size;
+}
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 7787a32..4e6ba11 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -4128,16 +4128,6 @@ HRESULT WINAPI UnregisterApplicationRestart(void)
     return S_OK;
 }
 
-/***********************************************************************
- *           GetSystemFirmwareTable       (KERNEL32.@)
- */
-UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, PVOID buffer, DWORD size)
-{
-    FIXME("(%d %d %p %d):stub\n", provider, id, buffer, size);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return 0;
-}
-
 struct proc_thread_attr
 {
     DWORD_PTR attr;
diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c
index ac43d1a..3bc04fd 100644
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -719,7 +719,7 @@ static void test_GetSystemFirmwareTable(void)
     pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &expected_len);
     if (expected_len == 0) /* xp, 2003 */
     {
-        skip("SystemFirmwareTableInformation is not available\n");
+        win_skip("SystemFirmwareTableInformation is not available\n");
         HeapFree(GetProcessHeap(), 0, sfti);
         return;
     }