[ros-diffs] [tkreuzer] 52513: [NTOSKRNL] - Fix KdComponentTableSize - Make assembly instruction in KiCallUserMode MASM compatible - silence some KD internal debug prints The MSVC bootcd boots to desktop, but c...

Author: tkreuzer
Date: Sun Jul  3 09:56:59 2011
New Revision: 52513

URL: http://svn.reactos.org/svn/reactos?rev=52513&view=rev
Log:
[NTOSKRNL]
- Fix KdComponentTableSize
- Make assembly instruction in KiCallUserMode MASM compatible
- silence some KD internal debug prints
The MSVC bootcd boots to desktop, but crashes with BAD_POOL_HEADER before 2nd stage setup
starts.

Modified:
    trunk/reactos/ntoskrnl/kd64/kddata.c
    trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S
    trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c

Modified: trunk/reactos/ntoskrnl/kd64/kddata.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sun Jul  3 09:56:59 2011
@@ -356,7 +356,7 @@
     &Kd_ENDOFTABLE_Mask,
 };
 
-ULONG KdComponentTableSize = sizeof(KdComponentTable);
+ULONG KdComponentTableSize = sizeof(KdComponentTable) / sizeof(KdComponentTable[0]);
 
 //
 // Debugger Data

Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Sun Jul  3 09:56:59 2011
@@ -13,7 +13,7 @@
 #include <internal/i386/asmmacro.S>
 
 EXTERN _MmGrowKernelStack@4:PROC
-EXTERN _KeUserCallbackDispatcher:PROC
+EXTERN _KeUserCallbackDispatcher:DWORD
 EXTERN @KiServiceExit@8:PROC
 EXTERN _KeGetCurrentIrql@0:PROC
 EXTERN _KeBugCheckEx@20:PROC
@@ -190,7 +190,7 @@
 
     /* Get user-mode dispatcher address and set it as EIP */
 SetEip:
-    mov eax, _KeUserCallbackDispatcher
+    mov eax, dword ptr [_KeUserCallbackDispatcher]
     mov [esp+KTRAP_FRAME_EIP], eax
 
     /* Set the exception list */

Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] Sun Jul  3 09:56:59 2011
@@ -17,6 +17,8 @@
 
 #ifndef _WINKD_
 #define KdpDprintf DPRINT
+#elif defined(NDEBUG)
+#define KdpDprintf(...)
 #endif
 
 /* GLOBALS ********************************************************************/