[ros-diffs] [sginsberg] 43532: - 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.

Author: sginsberg
Date: Sat Oct 17 17:03:54 2009
New Revision: 43532

URL: http://svn.reactos.org/svn/reactos?rev=43532&view=rev
Log:
- 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.

Modified:
    trunk/reactos/dll/ntdll/include/ntdllp.h
    trunk/reactos/dll/ntdll/ldr/startup.c
    trunk/reactos/dll/ntdll/ldr/utils.c
    trunk/reactos/ntoskrnl/cc/view.c
    trunk/reactos/ntoskrnl/include/internal/cc.h

Modified: trunk/reactos/dll/ntdll/include/ntdllp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h…
==============================================================================
--- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Oct 17 17:03:54 2009
@@ -28,10 +28,6 @@
                          ULONG ul_reason_for_call,
                          LPVOID lpReserved);
 
-#if defined(KDBG) || DBG
-VOID
-LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule);
-#endif
 extern HANDLE WindowsApiPort;
 
 /* EOF */

Modified: trunk/reactos/dll/ntdll/ldr/startup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Oct 17 17:03:54 2009
@@ -428,12 +428,6 @@
     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,
@@ -477,12 +471,6 @@
                    &ExeModule->InLoadOrderLinks);
 
     LdrpInitLoader();
-
-#if DBG || defined(KDBG)
-
-    LdrpLoadUserModuleSymbols(ExeModule);
-
-#endif /* DBG || KDBG */
 
     EntryPoint = LdrPEStartup((PVOID)ImageBase, NULL, NULL, NULL);
     ExeModule->EntryPoint = EntryPoint;

Modified: trunk/reactos/dll/ntdll/ldr/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat Oct 17 17:03:54 2009
@@ -62,22 +62,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 @@
             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);

Modified: trunk/reactos/ntoskrnl/cc/view.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=435…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Oct 17 17:03:54 2009
@@ -70,7 +70,7 @@
 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 @@
 	PBCB Bcb,
 	BOOLEAN Trace )
 {
-#if DBG || defined(KDBG)
+#if DBG
 	KIRQL oldirql;
 	PLIST_ENTRY current_entry;
 	PCACHE_SEGMENT current;
@@ -587,7 +587,7 @@
   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 @@
      {
 	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 @@
   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 @@
 	 }
          InsertHeadList(&FreeList, &current->BcbSegmentListEntry);
       }
-#if DBG || defined(KDBG)
+#if DBG
       Bcb->Trace = FALSE;
 #endif
       KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);

Modified: trunk/reactos/ntoskrnl/include/internal/cc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sat Oct 17 17:03:54 2009
@@ -116,7 +116,7 @@
     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;