[ros-diffs] [ion] 25942: - Merge from KD-branch: - Remove double implementation of DebugPrint with a single correct implementation which calls DebugService, and moved DebugPrint to rtl since it can now be shared properly.

Author: ion
Date: Fri Mar  2 09:11:27 2007
New Revision: 25942

URL: http://svn.reactos.org/svn/reactos?rev=25942&view=rev
Log:
- Merge from KD-branch:
  - Remove double implementation of DebugPrint with a single correct implementation which
calls DebugService, and moved DebugPrint to rtl since it can now be shared properly.

Modified:
    trunk/reactos/dll/ntdll/dbg/dbgui.c
    trunk/reactos/lib/rtl/debug.c
    trunk/reactos/ntoskrnl/rtl/misc.c

Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=…
==============================================================================
--- trunk/reactos/dll/ntdll/dbg/dbgui.c (original)
+++ trunk/reactos/dll/ntdll/dbg/dbgui.c Fri Mar  2 09:11:27 2007
@@ -13,28 +13,6 @@
 #include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
-
-NTSTATUS
-NTAPI
-DebugService(IN ULONG Service,
-             IN PVOID Buffer,
-             IN ULONG Length,
-             IN PVOID Argument1,
-             IN PVOID Argument2);
-
-NTSTATUS
-NTAPI
-DebugPrint(IN PANSI_STRING DebugString,
-           IN ULONG ComponentId,
-           IN ULONG Level)
-{
-    /* Call the INT2D Service */
-    return DebugService(BREAKPOINT_PRINT,
-                        DebugString->Buffer,
-                        DebugString->Length,
-                        UlongToPtr(ComponentId),
-                        UlongToPtr(Level));
-}
 
 /*
  * @implemented

Modified: trunk/reactos/lib/rtl/debug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=25942&…
==============================================================================
--- trunk/reactos/lib/rtl/debug.c (original)
+++ trunk/reactos/lib/rtl/debug.c Fri Mar  2 09:11:27 2007
@@ -16,7 +16,6 @@
 
 /* PRIVATE FUNCTIONS ********************************************************/
 
-#if 0
 NTSTATUS
 NTAPI
 DebugPrint(IN PANSI_STRING DebugString,
@@ -28,15 +27,8 @@
                         DebugString->Buffer,
                         DebugString->Length,
                         UlongToPtr(ComponentId),
-                        UlongToPtr(Level)); 
-}
-#else
-NTSTATUS
-NTAPI
-DebugPrint(IN PANSI_STRING DebugString,
-           IN ULONG ComponentId,
-           IN ULONG Level);
-#endif
+                        UlongToPtr(Level));
+}
 
 NTSTATUS
 NTAPI

Modified: trunk/reactos/ntoskrnl/rtl/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/misc.c?rev=25…
==============================================================================
--- trunk/reactos/ntoskrnl/rtl/misc.c (original)
+++ trunk/reactos/ntoskrnl/rtl/misc.c Fri Mar  2 09:11:27 2007
@@ -22,17 +22,6 @@
 extern ULONG NtOSCSDVersion;
 
 /* FUNCTIONS *****************************************************************/
-
-NTSTATUS
-NTAPI
-DebugPrint(IN PANSI_STRING DebugString,
-           IN ULONG ComponentId,
-           IN ULONG Level)
-{
-    /* Temporary hack */
-    KdpPrintString(DebugString->Buffer, DebugString->Length);
-    return STATUS_SUCCESS;
-}
 
 /*
 * @implemented