[PATCH v2 0/1] MR7458: kernelbase/tests: Skip test if EnumSystemFirmwareTables is not available.

[Bernhard Übelacker]

Tests show test kernelbase:memory is failing for many Windows 7 machines. https://test.winehq.org/data/patterns-tb-win.html#kernelbase:memory

This patch adds skipping the test if function `EnumSystemFirmwareTables` is not found.

--
  v2: kernelbase/tests: Skip test if EnumSystemFirmwareTables is not available.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7458

[PATCH v2 1/1] kernelbase/tests: Skip test if EnumSystemFirmwareTables is not available.

[Bernhard Übelacker]

From: Bernhard Übelacker <bernhardu(a)mailbox.org>

---
 dlls/kernelbase/tests/memory.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/kernelbase/tests/memory.c b/dlls/kernelbase/tests/memory.c
index b7841d57fee..5fffdfdb5ed 100644
--- a/dlls/kernelbase/tests/memory.c
+++ b/dlls/kernelbase/tests/memory.c
@@ -34,6 +34,12 @@ static void test_enum_system_firmware_tables(void)
     UINT res;
     DWORD err;
 
+    if (!pEnumSystemFirmwareTables)
+    {
+        win_skip("Function EnumSystemFirmwareTables not available, skipping.\n");
+        return;
+    }
+
     /* Applications may use e.g. 'ACPI', which we currently don't support.
      * We should at the very least return valid error codes for it.
      * Test with a definitely-invalid provider so it also fails on real Windows. */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7458

[Bernhard Übelacker]

On Sun Mar  2 19:39:29 2025 +0000, Bernhard Übelacker wrote:
> changed this line in [version 2 of the diff](/wine/wine/-/merge_requests/7458/diffs?diff_id=161407&start_sha=51fb28a47056c004683b39b5c6a73e941139555b#5c08263dac74c57367eb2f449e5eccb92596a4fd_39_39)
> Thanks for spotting, I pushed with your suggested change.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7458#note_96366

[Bernhard Übelacker]

v2:
- replace `skip` by `win_skip`, a missing `EnumSystemFirmwareTables` should be an error in Wine.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7458#note_96367

[PATCH v2 0/1] MR7458: kernelbase/tests: Skip test if EnumSystemFirmwareTables is not available. - approved

[Jinoh Kang (＠iamahuman)]

This merge request was approved by Jinoh Kang.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7458