change a few #ifdefs to allow loading of SYM files for user modules in DBG builds

svn path=/trunk/; revision=12129
This commit is contained in:
Royce Mitchell III 2004-12-15 03:00:33 +00:00
parent 8236f00175
commit 13277fb296
2 changed files with 10 additions and 10 deletions

View file

@ -1,4 +1,4 @@
/* $Id: startup.c,v 1.59 2004/11/21 21:09:42 weiden Exp $ /* $Id: startup.c,v 1.60 2004/12/15 03:00:33 royce Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -375,11 +375,11 @@ __true_LdrInitializeThunk (ULONG Unknown1,
InsertTailList(&Peb->Ldr->InInitializationOrderModuleList, InsertTailList(&Peb->Ldr->InInitializationOrderModuleList,
&NtModule->InInitializationOrderModuleList); &NtModule->InInitializationOrderModuleList);
#ifdef KDBG #if defined(DBG) || defined(KDBG)
LdrpLoadUserModuleSymbols(NtModule); LdrpLoadUserModuleSymbols(NtModule);
#endif /* DBG */ #endif /* DBG || KDBG */
/* add entry for executable (becomes first list entry) */ /* add entry for executable (becomes first list entry) */
ExeModule = (PLDR_MODULE)RtlAllocateHeap (Peb->ProcessHeap, ExeModule = (PLDR_MODULE)RtlAllocateHeap (Peb->ProcessHeap,
@ -423,11 +423,11 @@ __true_LdrInitializeThunk (ULONG Unknown1,
LdrpInitLoader(); LdrpInitLoader();
#ifdef KDBG #if defined(DBG) || defined(KDBG)
LdrpLoadUserModuleSymbols(ExeModule); LdrpLoadUserModuleSymbols(ExeModule);
#endif /* DBG */ #endif /* DBG || KDBG */
EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL); EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL);
ExeModule->EntryPoint = (ULONG)EntryPoint; ExeModule->EntryPoint = (ULONG)EntryPoint;

View file

@ -1,4 +1,4 @@
/* $Id: utils.c,v 1.101 2004/11/19 01:30:35 weiden Exp $ /* $Id: utils.c,v 1.102 2004/12/15 03:00:33 royce Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -68,7 +68,7 @@ static VOID LdrpDetachProcess(BOOL UnloadAll);
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
#ifdef KDBG #if defined(DBG) || defined(KDBG)
VOID VOID
LdrpLoadUserModuleSymbols(PLDR_MODULE LdrModule) LdrpLoadUserModuleSymbols(PLDR_MODULE LdrModule)
@ -82,7 +82,7 @@ LdrpLoadUserModuleSymbols(PLDR_MODULE LdrModule)
NULL); NULL);
} }
#endif /* DBG */ #endif /* DBG || KDBG */
static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL Locked) static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL Locked)
{ {
@ -2085,9 +2085,9 @@ LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
DPRINT1("LdrFixupImports failed for %wZ, status=%x\n", &(*Module)->BaseDllName, Status); DPRINT1("LdrFixupImports failed for %wZ, status=%x\n", &(*Module)->BaseDllName, Status);
return Status; return Status;
} }
#ifdef KDBG #if defined(DBG) || defined(KDBG)
LdrpLoadUserModuleSymbols(*Module); LdrpLoadUserModuleSymbols(*Module);
#endif #endif /* DBG || KDBG */
RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);
InsertTailList(&NtCurrentPeb()->Ldr->InInitializationOrderModuleList, InsertTailList(&NtCurrentPeb()->Ldr->InInitializationOrderModuleList,
&(*Module)->InInitializationOrderModuleList); &(*Module)->InInitializationOrderModuleList);