Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

added #ifdef around headers to support test build. Modified debug messages.

Browse source 
svn path=/trunk/; revision=3750
This commit is contained in:
Robert Dickenson 2002-11-13 05:18:03 +00:00
parent 3a8df0d499
commit 84831891ce
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/ntoskrnl/cm/registry.c
View file

@ -1,4 +1,4 @@
/* $Id: registry.c,v 1.76 2002/09/08 10:23:17 chorns Exp $ /* $Id: registry.c,v 1.77 2002/11/13 05:18:03 robd Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -11,6 +11,9 @@
* Created 22/05/98 * Created 22/05/98
*/ */
#ifdef WIN32_REGDBG
#include "cm_win32.h"
#else
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <roscfg.h> #include <roscfg.h>
#include <limits.h> #include <limits.h>
@ -22,6 +25,7 @@
#include <internal/debug.h> #include <internal/debug.h>
#include "cm.h" #include "cm.h"
#endif
/* ------------------------------------------------- File Statics */ /* ------------------------------------------------- File Statics */
@ -500,14 +504,14 @@ CmInit2(PCHAR CommandLine)
} }
p1 = p2; p1 = p2;
} }
#ifndef WIN32_REGDBG
RtlWriteRegistryValue(RTL_REGISTRY_SERVICES, RtlWriteRegistryValue(RTL_REGISTRY_SERVICES,
L"\\Pice", L"\\Pice",
L"Start", L"Start",
REG_DWORD, REG_DWORD,
&PiceStart, &PiceStart,
sizeof(ULONG)); sizeof(ULONG));
#endif
} }
@ -619,7 +623,7 @@ CmiConnectHive(PWSTR FileName,
HANDLE KeyHandle; HANDLE KeyHandle;
NTSTATUS Status; NTSTATUS Status;
DPRINT("Called. FileName %S\n", FullName); DPRINT("CmiConnectHive(%S, %S, %s, %p, %d) - Called.\n", FileName, FullName, KeyName, Parent, CreateNew);
Status = CmiCreateRegistryHive(FileName, &RegistryHive, CreateNew); Status = CmiCreateRegistryHive(FileName, &RegistryHive, CreateNew);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
@ -695,24 +699,23 @@ CmiInitializeHive(PWSTR FileName,
//Status = CmiConnectHive(FileName, FullName, KeyName, Parent, FALSE); //Status = CmiConnectHive(FileName, FullName, KeyName, Parent, FALSE);
Status = CmiConnectHive(FileName, FullName, KeyName, Parent, CreateNew); Status = CmiConnectHive(FileName, FullName, KeyName, Parent, CreateNew);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status)) {
{ #ifdef WIN32_REGDBG
DPRINT("Status %.08x\n", Status);
#if 0
WCHAR AltFileName[MAX_PATH]; WCHAR AltFileName[MAX_PATH];
CPRINT("WARNING! Registry file %S not found\n", FileName); CPRINT("WARNING! Registry file %S not found\n", FileName);
//DPRINT("Status %.08x\n", Status);
wcscpy(AltFileName, FileName); wcscpy(AltFileName, FileName);
wcscat(AltFileName, L".alt"); wcscat(AltFileName, L".alt");
DPRINT("Attempting to connect the alternative hive %S\n", AltFileName);
/* Try to connect the alternative hive */ /* Try to connect the alternative hive */
Status = CmiConnectHive(AltFileName, FullName, KeyName, Parent, TRUE); Status = CmiConnectHive(AltFileName, FullName, KeyName, Parent, TRUE);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status)) {
{
CPRINT("WARNING! Alternative registry file %S not found\n", AltFileName); CPRINT("WARNING! Alternative registry file %S not found\n", AltFileName);
DPRINT("Status %.08x\n", Status); //DPRINT("Status %.08x\n", Status);
} }
#endif #endif
} }