[ros-diffs] [amunger] 28263: Merge 28257 from trunk.

[amunger at svn.reactos.org]

Author: amunger
Date: Thu Aug  9 16:10:43 2007
New Revision: 28263

URL: http://svn.reactos.org/svn/reactos?rev=28263&view=rev
Log:
Merge 28257 from trunk.

Added:
    branches/ros-branch-0_3_3/reactos/ntoskrnl/kd/wrappers/kdbg.c
      - copied unchanged from r28257, trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c
Modified:
    branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c
    branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild

Modified: branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c?rev=28263&r1=28262&r2=28263&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c (original)
+++ branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c Thu Aug  9 16:10:43 2007
@@ -671,21 +671,22 @@
 }
 
 VOID
-STDCALL
+NTAPI
 KdbDebugPrint(PCH Message, ULONG Length)
 {
+    /* Nothing here */
 }
 
 
 /*! \brief Initializes the KDB symbols implementation.
  *
- * \param NtoskrnlModuleObject  LDR_DATA_TABLE_ENTRY of ntoskrnl.exe
- * \param LdrHalModuleObject    LDR_DATA_TABLE_ENTRY of hal.sys
+ * \param DispatchTable         Pointer to the KD dispatch table
+ * \param BootPhase             Phase of initialization
  */
 VOID
-STDCALL
-KdpKdbgInit(PKD_DISPATCH_TABLE DispatchTable,
-            ULONG BootPhase)
+NTAPI
+KdbInitialize(PKD_DISPATCH_TABLE DispatchTable,
+              ULONG BootPhase)
 {
     PCHAR p1, p2;
     int Found;

Modified: branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild?rev=28263&r1=28262&r2=28263&view=diff
==============================================================================
--- branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild (original)
+++ branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild Thu Aug  9 16:10:43 2007
@@ -263,6 +263,7 @@
             <directory name="wrappers">
                 <file>bochs.c</file>
                 <file>gdbstub.c</file>
+		<file>kdbg.c</file>
             </directory>
             <file>kdinit.c</file>
             <file>kdio.c</file>