Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:45:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improved default value handling in RtlQueryRegistryValues().

Browse source 
svn path=/trunk/; revision=2898
This commit is contained in:
Eric Kohl 2002-04-29 23:20:44 +00:00
parent 488ec274f1
commit b5d501b385
2 changed files with 92 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

49
reactos/lib/ntdll/rtl/registry.c
View file

@ -1,4 +1,4 @@
/* $Id: registry.c,v 1.10 2002/02/10 13:55:45 ekohl Exp $ /* $Id: registry.c,v 1.11 2002/04/29 23:19:53 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -240,8 +240,51 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
&ResultSize); &ResultSize);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo); if (QueryEntry->Flags & RTL_QUERY_REGISTRY_REQUIRED)
break; {
RtlFreeHeap(RtlGetProcessHeap(), 0, ValueInfo);
Status = STATUS_OBJECT_NAME_NOT_FOUND;
break;
}
if (QueryEntry->DefaultType == REG_SZ)
{
PUNICODE_STRING ValueString;
PUNICODE_STRING SourceString;
SourceString = (PUNICODE_STRING)QueryEntry->DefaultData;
ValueString = (PUNICODE_STRING)QueryEntry->EntryContext;
if (ValueString->Buffer == 0)
{
ValueString->Length = SourceString->Length;
ValueString->MaximumLength = SourceString->MaximumLength;
ValueString->Buffer = RtlAllocateHeap(RtlGetProcessHeap(),
0,
ValueString->MaximumLength);
if (!ValueString->Buffer)
break;
ValueString->Buffer[0] = 0;
memcpy(ValueString->Buffer,
SourceString->Buffer,
SourceString->MaximumLength);
}
else
{
ValueString->Length = min(SourceString->Length,
ValueString->MaximumLength - sizeof(WCHAR));
memcpy(ValueString->Buffer,
SourceString->Buffer,
ValueString->Length);
((PWSTR)ValueString->Buffer)[ValueString->Length / sizeof(WCHAR)] = 0;
}
}
else
{
memcpy(QueryEntry->EntryContext,
QueryEntry->DefaultData,
QueryEntry->DefaultLength);
}
Status = STATUS_SUCCESS;
} }
else else
{ {

49
reactos/ntoskrnl/cm/rtlfunc.c
View file

@ -225,9 +225,50 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
&ResultSize); &ResultSize);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
DPRINT("ZwQueryValueKey() failed with status %x\n", Status); if (QueryEntry->Flags & RTL_QUERY_REGISTRY_REQUIRED)
ExFreePool(ValueInfo); {
break; ExFreePool(ValueInfo);
Status = STATUS_OBJECT_NAME_NOT_FOUND;
goto ByeBye;
}
if (QueryEntry->DefaultType == REG_SZ)
{
PUNICODE_STRING ValueString;
PUNICODE_STRING SourceString;
SourceString = (PUNICODE_STRING)QueryEntry->DefaultData;
ValueString = (PUNICODE_STRING)QueryEntry->EntryContext;
if (ValueString->Buffer == 0)
{
ValueString->Length = SourceString->Length;
ValueString->MaximumLength = SourceString->MaximumLength;
ValueString->Buffer = ExAllocatePool(PagedPool,
ValueString->MaximumLength);
if (!ValueString->Buffer)
break;
ValueString->Buffer[0] = 0;
memcpy(ValueString->Buffer,
SourceString->Buffer,
SourceString->MaximumLength);
}
else
{
ValueString->Length = RtlMin(SourceString->Length,
ValueString->MaximumLength - sizeof(WCHAR));
memcpy(ValueString->Buffer,
SourceString->Buffer,
ValueString->Length);
((PWSTR)ValueString->Buffer)[ValueString->Length / sizeof(WCHAR)] = 0;
}
}
else
{
memcpy(QueryEntry->EntryContext,
QueryEntry->DefaultData,
QueryEntry->DefaultLength);
}
Status = STATUS_SUCCESS;
} }
else else
{ {
@ -451,6 +492,8 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
QueryEntry++; QueryEntry++;
} }
ByeBye:
if (CurrentKeyHandle != BaseKeyHandle) if (CurrentKeyHandle != BaseKeyHandle)
NtClose(CurrentKeyHandle); NtClose(CurrentKeyHandle);