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

added #ifdef around headers to support private test build and some temporary zeroing of arrays during debugging.

Browse source 
svn path=/trunk/; revision=3733
This commit is contained in:
Robert Dickenson 2002-11-10 14:02:44 +00:00
parent 2e1e2b7968
commit d7753423c7
1 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,9 @@
* UPDATE HISTORY: * UPDATE HISTORY:
*/ */
#ifdef WIN32_REGDBG
#include "cm_win32.h"
#else
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <roscfg.h> #include <roscfg.h>
#include <internal/ob.h> #include <internal/ob.h>
@ -18,6 +21,7 @@
#include <internal/debug.h> #include <internal/debug.h>
#include "cm.h" #include "cm.h"
#endif
NTSTATUS STDCALL NTSTATUS STDCALL
RtlCheckRegistryKey(IN ULONG RelativeTo, RtlCheckRegistryKey(IN ULONG RelativeTo,
@ -145,6 +149,10 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
PWSTR StringPtr; PWSTR StringPtr;
DPRINT("RtlQueryRegistryValues() called\n"); DPRINT("RtlQueryRegistryValues() called\n");
#ifdef WIN32_REGDBG
BaseKeyHandle = NULL;
CurrentKeyHandle = NULL;
#endif
Status = RtlpGetRegistryHandle(RelativeTo, Status = RtlpGetRegistryHandle(RelativeTo,
Path, Path,
@ -241,7 +249,9 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
Status = STATUS_NO_MEMORY; Status = STATUS_NO_MEMORY;
break; break;
} }
#ifdef WIN32_REGDBG
memset(ValueInfo, 0, BufferSize);
#endif
Status = ZwQueryValueKey(CurrentKeyHandle, Status = ZwQueryValueKey(CurrentKeyHandle,
&KeyName, &KeyName,
KeyValuePartialInformation, KeyValuePartialInformation,
@ -466,7 +476,11 @@ 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");
#ifdef WIN32_REGDBG
StringPtr = (PWSTR)(FullValueInfo + FullValueInfo->DataOffset);
#else
StringPtr = (PWSTR)((PVOID)FullValueInfo + FullValueInfo->DataOffset); StringPtr = (PWSTR)((PVOID)FullValueInfo + FullValueInfo->DataOffset);
#endif
while (*StringPtr != 0) while (*StringPtr != 0)
{ {
StringLen = (wcslen(StringPtr) + 1) * sizeof(WCHAR); StringLen = (wcslen(StringPtr) + 1) * sizeof(WCHAR);
@ -485,7 +499,11 @@ RtlQueryRegistryValues(IN ULONG RelativeTo,
{ {
Status = QueryEntry->QueryRoutine(FullValueInfo->Name, Status = QueryEntry->QueryRoutine(FullValueInfo->Name,
FullValueInfo->Type, FullValueInfo->Type,
#ifdef WIN32_REGDBG
FullValueInfo + FullValueInfo->DataOffset,
#else
(PVOID)FullValueInfo + FullValueInfo->DataOffset, (PVOID)FullValueInfo + FullValueInfo->DataOffset,
#endif
FullValueInfo->DataLength, FullValueInfo->DataLength,
Context, Context,
QueryEntry->EntryContext); QueryEntry->EntryContext);