[PATCH v3 0/2] MR4735: advapi32/tests: Don't run wow64 tests on 32-bit Windows

[Sven Baars (＠sbaars)]

This should fix some test failures in other components.

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54613

--
  v3: advapi32/tests: Skip WoW64 tests on 32-bit in test_reg_create_key.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4735

[PATCH v3 1/2] advapi32/tests: Introduce a new has_wow64 helper.

[Sven Baars]

From: Sven Baars <sbaars(a)codeweavers.com>

---
 dlls/advapi32/tests/registry.c | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 30a79368c94..151796fb0be 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -64,6 +64,17 @@ static DWORD (WINAPI *pEnumDynamicTimeZoneInformation)(const DWORD,
 static BOOL limited_user;
 static const BOOL is_64bit = sizeof(void *) > sizeof(int);
 
+static BOOL has_wow64(void)
+{
+    if (ptr_size != 64)
+    {
+        BOOL is_wow64;
+        if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)
+            return FALSE;
+    }
+    return TRUE;
+}
+
 static const char *dbgstr_SYSTEMTIME(const SYSTEMTIME *st)
 {
     return wine_dbg_sprintf("%02d-%02d-%04d %02d:%02d:%02d.%03d",
@@ -2575,14 +2586,10 @@ static void test_redirection(void)
     HKEY key, key32, key64, root, root32, root64;
     DWORD subkeys, subkeys32, subkeys64;
 
-    if (ptr_size != 64)
+    if (!has_wow64())
     {
-        BOOL is_wow64;
-        if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)
-        {
-            skip( "Not on Wow64, no redirection\n" );
-            return;
-        }
+        skip( "Not on Wow64, no redirection\n" );
+        return;
     }
 
     if (limited_user)
-- 
GitLab


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

[PATCH v3 2/2] advapi32/tests: Skip WoW64 tests on 32-bit in test_reg_create_key.

[Sven Baars]

From: Sven Baars <sbaars(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=54613
---
 dlls/advapi32/tests/registry.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
index 151796fb0be..a71dfe0639d 100644
--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -1338,9 +1338,9 @@ static void test_reg_create_key(void)
      * the registry access check is performed correctly. Redirection isn't
      * being tested, so the tests don't care about whether the process is
      * running under WOW64. */
-    if (!pIsWow64Process)
+    if (!has_wow64())
     {
-        win_skip("WOW64 flags are not recognized\n");
+        skip("WOW64 flags are not recognized\n");
         return;
     }
 
-- 
GitLab

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