- 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.

svn path=/trunk/; revision=25942

diff --git a/reactos/dll/ntdll/dbg/dbgui.c b/reactos/dll/ntdll/dbg/dbgui.c
index e3e3a1a..376b09d 100644 (file)
--- a/reactos/dll/ntdll/dbg/dbgui.c
+++ b/reactos/dll/ntdll/dbg/dbgui.c
@@ -14,28 +14,6 @@
 
 /* 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
  */

diff --git a/reactos/lib/rtl/debug.c b/reactos/lib/rtl/debug.c
index 16d091b..d2352a3 100644 (file)
--- a/reactos/lib/rtl/debug.c
+++ b/reactos/lib/rtl/debug.c
@@ -16,7 +16,6 @@
 
 /* PRIVATE FUNCTIONS ********************************************************/
 
-#if 0
 NTSTATUS
 NTAPI
 DebugPrint(IN PANSI_STRING DebugString,
@@ -28,15 +27,8 @@ DebugPrint(IN PANSI_STRING DebugString,
                         DebugString->Buffer,
                         DebugString->Length,
                         UlongToPtr(ComponentId),
-                        UlongToPtr(Level)); 
+                        UlongToPtr(Level));
 }
-#else
-NTSTATUS
-NTAPI
-DebugPrint(IN PANSI_STRING DebugString,
-           IN ULONG ComponentId,
-           IN ULONG Level);
-#endif
 
 NTSTATUS
 NTAPI

diff --git a/reactos/ntoskrnl/rtl/misc.c b/reactos/ntoskrnl/rtl/misc.c
index 9e2a565..8075b48 100644 (file)
--- a/reactos/ntoskrnl/rtl/misc.c
+++ b/reactos/ntoskrnl/rtl/misc.c
@@ -23,17 +23,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
 */