[ros-diffs] [fireball] 33646: Stefan Ginsberg <[e-mail]> - Remove KiRosPrintAddress export from ntoskrnl_i386.def, and CcRos* apis too. - Make win32k use KeRosDumpStackFrames instead of KiRosPrintAddress.

Author: fireball
Date: Thu May 22 14:31:49 2008
New Revision: 33646

URL: http://svn.reactos.org/svn/reactos?rev=33646&view=rev
Log:
Stefan Ginsberg <stefan__100__(a)hotmail.com>
- Remove KiRosPrintAddress export from ntoskrnl_i386.def, and CcRos* apis too.
- Make win32k use KeRosDumpStackFrames instead of KiRosPrintAddress.

Modified:
    trunk/reactos/ntoskrnl/ntoskrnl_i386.def
    trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c
    trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c

Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.def…
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Thu May 22 14:31:49 2008
@@ -3,9 +3,6 @@
 ; ReactOS Operating System
 ;
 EXPORTS
-CcRosInitializeFileCache@16
-CcRosReleaseFileCache@4
-CcRosTraceCacheMap@8
 CcCanIWrite@16
 CcCopyRead@24
 CcCopyWrite@20

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Thu May 22
14:31:49 2008
@@ -1,6 +1,6 @@
 #ifdef GDI_DEBUG
 
-BOOLEAN STDCALL KiRosPrintAddress(PVOID Address);
+NTSYSAPI VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG);
 NTSYSAPI ULONG NTAPI RtlWalkFrameChain(OUT PVOID *Callers, IN ULONG Count, IN ULONG
Flags);
 
 static int leak_reported = 0;
@@ -79,14 +79,13 @@
     DbgPrint("Worst GDI Handle leak offenders (out of %i unique locations):\n",
n);
     for (i = 0; i < n && h[i].count > 1; i++)
     {
-        int j;
+        /* Print out the allocation count */
         DbgPrint(" %i allocs: ", h[i].count);
-        for (j = 0; j < GDI_STACK_LEVELS; j++)
-        {
-            ULONG Addr = GDIHandleAllocator[h[i].idx][j];
-            if (!KiRosPrintAddress((PVOID)Addr))
-                DbgPrint("<%X>", Addr);
-        }
+
+        /* Dump the frames */
+        KeRosDumpStackFrames(GDIHandleAllocator[h[i].idx], GDI_STACK_LEVELS);
+
+        /* Print new line for better readability */
         DbgPrint("\n");
     }
     if (i < n && h[i].count == 1)

Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Thu May 22
14:31:49 2008
@@ -9,14 +9,8 @@
 /** INCLUDES ******************************************************************/
 
 #include <w32k.h>
-
 #define NDEBUG
 #include <debug.h>
-
-/* FIXME include right header for KeRosDumpStackFrames */
-VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG);
-
-//#define GDI_DEBUG
 
 #define GDI_ENTRY_TO_INDEX(ht, e)                                              \
   (((ULONG_PTR)(e) - (ULONG_PTR)&((ht)->Entries[0])) / sizeof(GDI_TABLE_ENTRY))
@@ -83,7 +77,7 @@
 static LARGE_INTEGER ShortDelay;
 
 /** DEBUGGING *****************************************************************/
-
+//#define GDI_DEBUG
 #include "gdidbg.c"
 
 /** INTERNAL FUNCTIONS ********************************************************/