lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-07-06 16:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

RtlpGetRegistryHandle(): Don't remove a leading backslash if an absolute registry path is used.

Browse Source 
svn path=/trunk/; revision=3055
This commit is contained in:
Eric Kohl
2002-06-12 23:24:19 +00:00
parent debb46b5c3
commit c16bc4c28d
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
reactos/lib/ntdll/rtl/registry.c
View File

@@ -1,4 +1,4 @@
/* $Id: registry.c,v 1.13 2002/06/06 14:03:58 ekohl Exp $
/* $Id: registry.c,v 1.14 2002/06/12 23:21:45 ekohl Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -291,21 +291,28 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
}
else
{
if (ValueInfo->Type == REG_SZ)
if (ValueInfo->Type == REG_SZ ||
ValueInfo->Type == REG_EXPAND_SZ ||
ValueInfo->Type == REG_MULTI_SZ)
#if 0
(ValueInfo->Type == REG_EXPAND_SZ && (QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)))
(ValueInfo->Type == REG_MULTI_SZ && (QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)))
#endif
{
PUNICODE_STRING ValueString;
ValueString = (PUNICODE_STRING)QueryEntry->EntryContext;
if (ValueString->Buffer == 0)
if (ValueString->Buffer == NULL)
{
RtlInitUnicodeString(ValueString,
NULL);
ValueString->MaximumLength = 256 * sizeof(WCHAR);
ValueString->MaximumLength = ValueInfo->DataLength + sizeof(WCHAR);
ValueString->Buffer = RtlAllocateHeap(RtlGetProcessHeap(),
0,
ValueString->MaximumLength);
if (!ValueString->Buffer)
break;
if (ValueString->Buffer == NULL)
{
Status = STATUS_INSUFFICIENT_RESOURCES;
break;
}
ValueString->Buffer[0] = 0;
}
ValueString->Length = min(ValueInfo->DataLength,
@@ -881,7 +888,7 @@ RtlpGetRegistryHandle(ULONG RelativeTo,
DPRINT("KeyName %wZ\n", &KeyName);
if (Path[0] == L'\\')
if (Path[0] == L'\\' && RelativeTo != RTL_REGISTRY_ABSOLUTE)
{
Path++;
}

10
reactos/ntoskrnl/cm/rtlfunc.c
View File

@@ -305,7 +305,7 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE)
{
DPRINT1("FIXME: Delete value: %S\n", QueryEntry->Name);
DPRINT("FIXME: Delete value: %S\n", QueryEntry->Name);
}
@@ -317,6 +317,8 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
if (QueryEntry->Name != NULL)
{
DPRINT("Callback\n");
RtlInitUnicodeString(&KeyName,
QueryEntry->Name);
@@ -375,7 +377,7 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE)
{
DPRINT1("FIXME: Delete value: %S\n", QueryEntry->Name);
DPRINT("FIXME: Delete value: %S\n", QueryEntry->Name);
}
@@ -608,13 +610,15 @@ RtlpGetRegistryHandle(ULONG RelativeTo,
break;
}
if (Path[0] == L'\\')
if (Path[0] == L'\\' && RelativeTo != RTL_REGISTRY_ABSOLUTE)
{
Path++;
}
RtlAppendUnicodeToString(&KeyName,
Path);
DPRINT("KeyName '%wZ'\n", &KeyName);
InitializeObjectAttributes(&ObjectAttributes,
&KeyName,
OBJ_CASE_INSENSITIVE,