[PATCH v14 2/6] kernelbase: Always try to open the Wow6432Node in open_key().

[Sven Baars]

From: Sven Baars

---
 dlls/kernelbase/registry.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c
index 0f629ab2d36..531a0bbea1e 100644
--- a/dlls/kernelbase/registry.c
+++ b/dlls/kernelbase/registry.c
@@ -218,7 +218,6 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES
 static NTSTATUS open_key( HKEY *retkey, DWORD options, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr )
 {
     NTSTATUS status;
-    BOOL force_wow32 = is_win64 && (access & KEY_WOW64_32KEY);
     HANDLE subkey, root = attr->RootDirectory;
     WCHAR *buffer = attr->ObjectName->Buffer;
     DWORD i, len = attr->ObjectName->Length / sizeof(WCHAR);
@@ -226,7 +225,7 @@ static NTSTATUS open_key( HKEY *retkey, DWORD options, ACCESS_MASK access, OBJEC

*retkey = NULL;

-    if (!force_wow32)
+    if (!(is_win64 && (access & KEY_WOW64_32KEY)))
     {
         if (options & REG_OPTION_OPEN_LINK) attr->Attributes |= OBJ_OPENLINK;
         status = NtOpenKeyEx( (HANDLE *)retkey, access, attr, options );
@@ -266,16 +265,14 @@ static NTSTATUS open_key( HKEY *retkey, DWORD options, ACCESS_MASK access, OBJEC
         buffer += i;
         len -= i;

-        if (force_wow32)
+        str.Buffer = buffer;
+        str.Length = len * sizeof(WCHAR);
+        if (!is_wow6432node( &str ))
         {
-            str.Buffer = buffer;
-            str.Length = len * sizeof(WCHAR);
-            if (is_wow6432node( &str )) force_wow32 = FALSE;
-            else if ((subkey = open_wow6432node( attr->RootDirectory )))
+            if ((subkey = open_wow6432node( attr->RootDirectory )))
             {
                 NtClose( attr->RootDirectory );
                 attr->RootDirectory = subkey;
-                force_wow32 = FALSE;
             }
         }
     }