- ntdll: Remove deprecated LdrpLoadUserModuleSymbols that doesn't actually do anything since the hack in NtSystemDebugControl was removed almost 3 years ago.

- Cc: Remove weird check for DBG or KDBG -- debug code should always be wrapped under #if DBG.

svn path=/trunk/; revision=43532
This commit is contained in:
Stefan Ginsberg 2009-10-17 15:03:54 +00:00
parent 1943fae14f
commit 4bbe9c3785
5 changed files with 8 additions and 42 deletions

View file

@ -28,10 +28,6 @@ typedef BOOL
ULONG ul_reason_for_call,
LPVOID lpReserved);
#if defined(KDBG) || DBG
VOID
LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule);
#endif
extern HANDLE WindowsApiPort;
/* EOF */

View file

@ -428,12 +428,6 @@ LdrpInit2(PCONTEXT Context,
InsertTailList(&Peb->Ldr->InInitializationOrderModuleList,
&NtModule->InInitializationOrderModuleList);
#if DBG || defined(KDBG)
LdrpLoadUserModuleSymbols(NtModule);
#endif /* DBG || KDBG */
/* add entry for executable (becomes first list entry) */
ExeModule = (PLDR_DATA_TABLE_ENTRY)
RtlAllocateHeap(Peb->ProcessHeap,
@ -478,12 +472,6 @@ LdrpInit2(PCONTEXT Context,
LdrpInitLoader();
#if DBG || defined(KDBG)
LdrpLoadUserModuleSymbols(ExeModule);
#endif /* DBG || KDBG */
EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL);
ExeModule->EntryPoint = EntryPoint;

View file

@ -63,22 +63,6 @@ static VOID LdrpDetachProcess(BOOLEAN UnloadAll);
/* FUNCTIONS *****************************************************************/
#if DBG || defined(KDBG)
VOID
LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule)
{
NtSystemDebugControl(
SysDbgQueryVersion,
(PVOID)LdrModule,
0,
NULL,
0,
NULL);
}
#endif /* DBG || KDBG */
BOOLEAN
LdrMappedAsDataFile(PVOID *BaseAddress)
{
@ -2268,9 +2252,7 @@ LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
DPRINT1("LdrFixupImports failed for %wZ, status=%x\n", &(*Module)->BaseDllName, Status);
return Status;
}
#if DBG || defined(KDBG)
LdrpLoadUserModuleSymbols(*Module);
#endif /* DBG || KDBG */
RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);
InsertTailList(&NtCurrentPeb()->Ldr->InInitializationOrderModuleList,
&(*Module)->InInitializationOrderModuleList);

View file

@ -70,7 +70,7 @@ NPAGED_LOOKASIDE_LIST iBcbLookasideList;
static NPAGED_LOOKASIDE_LIST BcbLookasideList;
static NPAGED_LOOKASIDE_LIST CacheSegLookasideList;
#if DBG || defined(KDBG)
#if DBG
static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line )
{
++cs->ReferenceCount;
@ -108,7 +108,7 @@ CcRosTraceCacheMap (
PBCB Bcb,
BOOLEAN Trace )
{
#if DBG || defined(KDBG)
#if DBG
KIRQL oldirql;
PLIST_ENTRY current_entry;
PCACHE_SEGMENT current;
@ -587,7 +587,7 @@ CcRosCreateCacheSegment(PBCB Bcb,
current->PageOut = FALSE;
current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize);
current->Bcb = Bcb;
#if DBG || defined(KDBG)
#if DBG
if ( Bcb->Trace )
{
DPRINT1("CacheMap 0x%p: new Cache Segment: 0x%p\n", Bcb, current );
@ -619,7 +619,7 @@ CcRosCreateCacheSegment(PBCB Bcb,
{
CcRosCacheSegmentIncRefCount(current);
KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
#if DBG || defined(KDBG)
#if DBG
if ( Bcb->Trace )
{
DPRINT1("CacheMap 0x%p: deleting newly created Cache Segment 0x%p ( found existing one 0x%p )\n",
@ -865,7 +865,7 @@ CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg)
KIRQL oldIrql;
#endif
DPRINT("Freeing cache segment 0x%p\n", CacheSeg);
#if DBG || defined(KDBG)
#if DBG
if ( CacheSeg->Bcb->Trace )
{
DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb, CacheSeg );
@ -1065,7 +1065,7 @@ CcRosDeleteFileCache(PFILE_OBJECT FileObject, PBCB Bcb)
}
InsertHeadList(&FreeList, &current->BcbSegmentListEntry);
}
#if DBG || defined(KDBG)
#if DBG
Bcb->Trace = FALSE;
#endif
KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);

View file

@ -116,7 +116,7 @@ typedef struct _BCB
PVOID LazyWriteContext;
KSPIN_LOCK BcbLock;
ULONG RefCount;
#if DBG || defined(KDBG)
#if DBG
BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */
#endif
} BCB, *PBCB;