From 9629690528cbfb08f5eb19275a1669249e147c09 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 3 Jul 2011 09:56:59 +0000
Subject: [PATCH] [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.

svn path=/trunk/; revision=52513
---
 reactos/ntoskrnl/kd64/kddata.c          | 2 +-
 reactos/ntoskrnl/ke/i386/usercall_asm.S | 4 ++--
 reactos/ntoskrnl/mm/ARM3/mmdbg.c        | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/reactos/ntoskrnl/kd64/kddata.c b/reactos/ntoskrnl/kd64/kddata.c
index 3d2be608f59..901ffb21a7c 100644
--- a/reactos/ntoskrnl/kd64/kddata.c
+++ b/reactos/ntoskrnl/kd64/kddata.c
@@ -356,7 +356,7 @@ PULONG KdComponentTable[104] =
     &Kd_ENDOFTABLE_Mask,
 };
 
-ULONG KdComponentTableSize = sizeof(KdComponentTable);
+ULONG KdComponentTableSize = sizeof(KdComponentTable) / sizeof(KdComponentTable[0]);
 
 //
 // Debugger Data
diff --git a/reactos/ntoskrnl/ke/i386/usercall_asm.S b/reactos/ntoskrnl/ke/i386/usercall_asm.S
index a5ab6c914e3..341cefd9bee 100644
--- a/reactos/ntoskrnl/ke/i386/usercall_asm.S
+++ b/reactos/ntoskrnl/ke/i386/usercall_asm.S
@@ -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 @@ DontBias:
 
     /* 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 */
diff --git a/reactos/ntoskrnl/mm/ARM3/mmdbg.c b/reactos/ntoskrnl/mm/ARM3/mmdbg.c
index ae476a78ab2..8d80e174f4d 100644
--- a/reactos/ntoskrnl/mm/ARM3/mmdbg.c
+++ b/reactos/ntoskrnl/mm/ARM3/mmdbg.c
@@ -17,6 +17,8 @@
 
 #ifndef _WINKD_
 #define KdpDprintf DPRINT
+#elif defined(NDEBUG)
+#define KdpDprintf(...)
 #endif
 
 /* GLOBALS ********************************************************************/