Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:23:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dmitry Philippov:

Browse source 
- Implement RTL_QUERY_REGISTRY_DELETE (which simply deletes the key after querying)
 - Fix REG_MULTI_SZ to actually walk through the whole data, not stopping at the first encountered 0 character. This makes the "ntdll_winetest.exe reg" test behave exactly as on Windows XP

svn path=/trunk/; revision=23727
This commit is contained in:
Aleksey Bragin 2006-08-26 20:45:30 +00:00
parent 32a1a90cc7
commit f0549011c0
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/lib/rtl/registry.c
View file

@ -9,7 +9,6 @@
/* /*
* TODO: * TODO:
* - finish RtlQueryRegistryValues() * - finish RtlQueryRegistryValues()
* - support RTL_QUERY_REGISTRY_DELETE
*/ */
/* INCLUDES *****************************************************************/ /* INCLUDES *****************************************************************/
@ -784,7 +783,7 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE) if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE)
{ {
DPRINT1("FIXME: Delete value: %S\n", QueryEntry->Name); Status = ZwDeleteValueKey(CurrentKeyHandle, &KeyName);
} }
@ -828,8 +827,9 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
!(QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) !(QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND))
{ {
DPRINT("Expand REG_MULTI_SZ type\n"); DPRINT("Expand REG_MULTI_SZ type\n");
ULONG DataSize = 0;
StringPtr = (PWSTR)ValueInfo->Data; StringPtr = (PWSTR)ValueInfo->Data;
while (*StringPtr != 0) while (DataSize < (ValueInfo->DataLength-2))
{ {
StringLen = (wcslen(StringPtr) + 1) * sizeof(WCHAR); StringLen = (wcslen(StringPtr) + 1) * sizeof(WCHAR);
Status = QueryEntry->QueryRoutine(QueryEntry->Name, Status = QueryEntry->QueryRoutine(QueryEntry->Name,
@ -841,6 +841,7 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
if(!NT_SUCCESS(Status)) if(!NT_SUCCESS(Status))
break; break;
StringPtr = (PWSTR)((PUCHAR)StringPtr + StringLen); StringPtr = (PWSTR)((PUCHAR)StringPtr + StringLen);
DataSize += StringLen;
} }
} }
else if ((ValueInfo->Type == REG_EXPAND_SZ) && else if ((ValueInfo->Type == REG_EXPAND_SZ) &&
@ -889,8 +890,7 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE) if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE)
{ {
DPRINT1("FIXME: Delete value: %S\n", QueryEntry->Name); Status = ZwDeleteValueKey(CurrentKeyHandle, &KeyName);
} }
RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY);