ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

advapi32: Attempt to open WOW64 key before the lowest level key, too. 

Without this, we'll fail to open the correct key for e.g.
<Machine\Software\Classes> with KEY_WOW64_32KEY, which should resolve to
<Machine\Software\Wow6432Node\Classes>.
This commit is contained in:
Andrew Eikum 2013-10-04 09:44:21 -05:00 committed by Alexandre Julliard
parent 13479aa7b8
commit 8cb7f877d7
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/advapi32/registry.c
View File

@ -140,10 +140,9 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES
if (i == len && !force_wow32) return status; if (i == len && !force_wow32) return status;
attrs = attr->Attributes; attrs = attr->Attributes;
attr->Attributes &= ~OBJ_OPENLINK;
attr->ObjectName = &str; attr->ObjectName = &str;
while (i < len) for (;;)
{ {
str.Buffer = buffer + pos; str.Buffer = buffer + pos;
str.Length = (i - pos) * sizeof(WCHAR); str.Length = (i - pos) * sizeof(WCHAR);
@ -157,20 +156,25 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES
force_wow32 = FALSE; force_wow32 = FALSE;
} }
} }
status = NtCreateKey( &subkey, access, attr, 0, class, if (i == len)
options & ~REG_OPTION_CREATE_LINK, dispos ); {
attr->Attributes = attrs;
status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos );
}
else
{
attr->Attributes = attrs & ~OBJ_OPENLINK;
status = NtCreateKey( &subkey, access, attr, 0, class,
options & ~REG_OPTION_CREATE_LINK, dispos );
}
if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (attr->RootDirectory != root) NtClose( attr->RootDirectory );
if (status) return status; if (status) return status;
if (i == len) break;
attr->RootDirectory = subkey; attr->RootDirectory = subkey;
while (i < len && buffer[i] == '\\') i++; while (i < len && buffer[i] == '\\') i++;
pos = i; pos = i;
while (i < len && buffer[i] != '\\') i++; while (i < len && buffer[i] != '\\') i++;
} }
str.Buffer = buffer + pos;
str.Length = (i - pos) * sizeof(WCHAR);
attr->Attributes = attrs;
status = NtCreateKey( (PHANDLE)retkey, access, attr, 0, class, options, dispos );
if (attr->RootDirectory != root) NtClose( attr->RootDirectory );
} }
return status; return status;
} }
@ -190,10 +194,9 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a
if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID; if (len && buffer[0] == '\\') return STATUS_OBJECT_PATH_INVALID;
while (i < len && buffer[i] != '\\') i++; while (i < len && buffer[i] != '\\') i++;
attrs = attr->Attributes; attrs = attr->Attributes;
attr->Attributes &= ~OBJ_OPENLINK;
attr->ObjectName = &str; attr->ObjectName = &str;
while (i < len) for (;;)
{ {
str.Buffer = buffer + pos; str.Buffer = buffer + pos;
str.Length = (i - pos) * sizeof(WCHAR); str.Length = (i - pos) * sizeof(WCHAR);
@ -207,21 +210,25 @@ static NTSTATUS open_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES *a
force_wow32 = FALSE; force_wow32 = FALSE;
} }
} }
status = NtOpenKey( &subkey, access, attr ); if (i == len)
{
attr->Attributes = attrs;
status = NtOpenKey( (PHANDLE)retkey, access, attr );
}
else
{
attr->Attributes = attrs & ~OBJ_OPENLINK;
status = NtOpenKey( &subkey, access, attr );
}
if (attr->RootDirectory != root) NtClose( attr->RootDirectory ); if (attr->RootDirectory != root) NtClose( attr->RootDirectory );
if (status) return status; if (status) return status;
if (i == len) break;
attr->RootDirectory = subkey; attr->RootDirectory = subkey;
while (i < len && buffer[i] == '\\') i++; while (i < len && buffer[i] == '\\') i++;
pos = i; pos = i;
while (i < len && buffer[i] != '\\') i++; while (i < len && buffer[i] != '\\') i++;
} }
str.Buffer = buffer + pos;
str.Length = (i - pos) * sizeof(WCHAR);
attr->Attributes = attrs;
status = NtOpenKey( (PHANDLE)retkey, access, attr );
if (attr->RootDirectory != root) NtClose( attr->RootDirectory );
return status; return status;
} }
/* create one of the HKEY_* special root keys */ /* create one of the HKEY_* special root keys */