[PATCH v2] kernel32/tests: Load GetSystemFirmwareTable() dynamically.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
Fixes test failure on Windows XP.

This should have been caught by the testbot:
https://testbot.winehq.org/JobDetails.pl?Key=39816
but no e-mail from Marvin was sent.

dlls/kernel32/tests/version.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c
index 3bc04fd..49f908b 100644
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -26,6 +26,7 @@
 #include "winternl.h"

static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *);
+static UINT (WINAPI * pGetSystemFirmwareTable)(DWORD, DWORD, void *, DWORD);
 static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *);
 static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *);

@@ -44,6 +45,7 @@ static void init_function_pointers(void)
     hmod = GetModuleHandleA("kernel32.dll");

GET_PROC(GetProductInfo);
+    GET_PROC(GetSystemFirmwareTable);

hmod = GetModuleHandleA("ntdll.dll");

@@ -712,6 +714,12 @@ static void test_GetSystemFirmwareTable(void)
     SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len);
     UCHAR *smbios_table;

+    if (!pGetSystemFirmwareTable)
+    {
+        win_skip("GetSystemFirmwareTable not available\n");
+        return;
+    }
+
     ok(!!sfti, "Failed to allocate memory\n");
     sfti->ProviderSignature = RSMB;
     sfti->Action = SystemFirmwareTable_Get;
@@ -729,7 +737,7 @@ static void test_GetSystemFirmwareTable(void)

expected_len -= min_sfti_len;
     smbios_table = HeapAlloc(GetProcessHeap(), 0, expected_len);
-    len = GetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len);
+    len = pGetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len);
     ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len);
     ok(len == 0 || !memcmp(smbios_table, sfti->TableBuffer, 6),
        "Expected prologue %02x %02x %02x %02x %02x %02x, got %02x %02x %02x %02x %02x %02x\n",

[Huw Davies]

On Fri, Jul 13, 2018 at 10:14:29AM +0200, Zebediah Figura wrote:
> Signed-off-by: Zebediah Figura
>
> Fixes test failure on Windows XP.
>
> This should have been caught by the testbot:
> https://testbot.winehq.org/JobDetails.pl?Key=39816
> but no e-mail from Marvin was sent.

Thanks.  I've sent a v3 that avoids a memory leak.

Huw.

[Zebediah Figura]

On 13/07/18 10:48, Huw Davies wrote:
> On Fri, Jul 13, 2018 at 10:14:29AM +0200, Zebediah Figura wrote:
> > Signed-off-by: Zebediah Figura
> >
> > Fixes test failure on Windows XP.
> >
> > This should have been caught by the testbot:
> > https://testbot.winehq.org/JobDetails.pl?Key=39816
> > but no e-mail from Marvin was sent.
>
> Thanks.  I've sent a v3 that avoids a memory leak.
>
> Huw.

Whoops, thanks for catching that.