From 2a438cfb4808aa4e667536dda6e889c59425a382 Mon Sep 17 00:00:00 2001
From: Royce Mitchell III <royce3@ev1.net>
Date: Mon, 21 Jul 2003 21:53:53 +0000
Subject: [PATCH] created KEBUGCHECK, KEBUGCHECKEX, KEBUGCHECKWITHTS macros to
 report file/line of bugcheck. replace all direct calls of KeBugCheck,
 KeBugCheckEx and KeBugCheckWithTs with corresponding macros. I rebuilt from a
 make clean and it looks good.

svn path=/trunk/; revision=5213
---
 reactos/drivers/dd/ide/ide.c           |   4 +-
 reactos/drivers/fs/cdfs/fcb.c          |   6 +-
 reactos/drivers/fs/ntfs/attrib.c       |   6 +-
 reactos/drivers/fs/ntfs/fcb.c          |   6 +-
 reactos/drivers/fs/vfat/fcb.c          |   4 +-
 reactos/drivers/fs/vfat/fsctl.c        |   6 +-
 reactos/drivers/fs/vfat/rw.c           |   4 +-
 reactos/hal/halx86/adapter.c           |   4 +-
 reactos/hal/halx86/irql.c              |   6 +-
 reactos/hal/halx86/mp.c                |  30 +++----
 reactos/hal/halx86/mpsirql.c           |   8 +-
 reactos/include/ddk/kefuncs.h          |   9 +-
 reactos/ntoskrnl/cc/copy.c             |   6 +-
 reactos/ntoskrnl/cc/misc.c             |   4 +-
 reactos/ntoskrnl/cc/view.c             |  18 ++--
 reactos/ntoskrnl/cm/regfile.c          |   4 +-
 reactos/ntoskrnl/cm/registry.c         |   6 +-
 reactos/ntoskrnl/dbg/kdb.c             |   4 +-
 reactos/ntoskrnl/dbg/profile.c         |   4 +-
 reactos/ntoskrnl/ex/resource.c         |   8 +-
 reactos/ntoskrnl/ex/win32k.c           |   4 +-
 reactos/ntoskrnl/include/internal/ke.h |   1 +
 reactos/ntoskrnl/io/device.c           |   4 +-
 reactos/ntoskrnl/io/pnpmgr.c           |   8 +-
 reactos/ntoskrnl/io/pnproot.c          |   8 +-
 reactos/ntoskrnl/io/rawfs.c            |   8 +-
 reactos/ntoskrnl/kd/kdebug.c           |   4 +-
 reactos/ntoskrnl/ke/apc.c              |   4 +-
 reactos/ntoskrnl/ke/catch.c            |   6 +-
 reactos/ntoskrnl/ke/i386/gdt.c         |   2 +-
 reactos/ntoskrnl/ke/kthread.c          |   6 +-
 reactos/ntoskrnl/ke/main.c             |  24 +++---
 reactos/ntoskrnl/ke/mutex.c            |   6 +-
 reactos/ntoskrnl/ke/process.c          |   6 +-
 reactos/ntoskrnl/ke/spinlock.c         |   8 +-
 reactos/ntoskrnl/ke/timer.c            |   4 +-
 reactos/ntoskrnl/ke/wait.c             |   6 +-
 reactos/ntoskrnl/ldr/loader.c          |   6 +-
 reactos/ntoskrnl/lpc/reply.c           |   4 +-
 reactos/ntoskrnl/mm/anonmem.c          |  18 ++--
 reactos/ntoskrnl/mm/balance.c          |  12 +--
 reactos/ntoskrnl/mm/freelist.c         |  58 ++++++-------
 reactos/ntoskrnl/mm/i386/page.c        |  48 +++++------
 reactos/ntoskrnl/mm/iospace.c          |   4 +-
 reactos/ntoskrnl/mm/kmap.c             |   6 +-
 reactos/ntoskrnl/mm/marea.c            |   2 +-
 reactos/ntoskrnl/mm/mdl.c              |  10 +--
 reactos/ntoskrnl/mm/mm.c               |   4 +-
 reactos/ntoskrnl/mm/mminit.c           |   4 +-
 reactos/ntoskrnl/mm/mpw.c              |   4 +-
 reactos/ntoskrnl/mm/npool.c            |  26 +++---
 reactos/ntoskrnl/mm/pagefile.c         |  24 +++---
 reactos/ntoskrnl/mm/pageop.c           |   4 +-
 reactos/ntoskrnl/mm/pager.c            |   4 +-
 reactos/ntoskrnl/mm/pool.c             |   4 +-
 reactos/ntoskrnl/mm/rmap.c             |  26 +++---
 reactos/ntoskrnl/mm/section.c          | 112 ++++++++++++-------------
 reactos/ntoskrnl/mm/slab.c             |   6 +-
 reactos/ntoskrnl/nt/profile.c          |   2 +-
 reactos/ntoskrnl/ob/object.c           |  10 +--
 reactos/ntoskrnl/ps/create.c           |   4 +-
 reactos/ntoskrnl/ps/kill.c             |   6 +-
 reactos/ntoskrnl/ps/process.c          |  16 ++--
 reactos/ntoskrnl/ps/thread.c           |  12 +--
 reactos/ntoskrnl/ps/w32call.c          |   4 +-
 reactos/ntoskrnl/rtl/nls.c             |  10 +--
 reactos/subsys/win32k/ntuser/timer.c   |   4 +-
 reactos/subsys/win32k/ntuser/window.c  |   4 +-
 68 files changed, 361 insertions(+), 353 deletions(-)

diff --git a/reactos/drivers/dd/ide/ide.c b/reactos/drivers/dd/ide/ide.c
index e70b689a151..6fbe1fad4fc 100644
--- a/reactos/drivers/dd/ide/ide.c
+++ b/reactos/drivers/dd/ide/ide.c
@@ -1,4 +1,4 @@
-/* $Id: ide.c,v 1.57 2002/12/09 19:57:56 hbirr Exp $
+/* $Id: ide.c,v 1.58 2003/07/21 21:53:46 royce Exp $
  *
  *  IDE.C - IDE Disk driver 
  *     written by Rex Jolliff
@@ -1578,7 +1578,7 @@ STDCALL IDEStartIo(IN PDEVICE_OBJECT DeviceObject,
     default:
       Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
       Irp->IoStatus.Information = 0;
-      KeBugCheck((ULONG)Irp);
+      KEBUGCHECK((ULONG)Irp);
       IoCompleteRequest(Irp, IO_NO_INCREMENT);
       IoStartNextPacket(DeviceObject, FALSE);
       break;
diff --git a/reactos/drivers/fs/cdfs/fcb.c b/reactos/drivers/fs/cdfs/fcb.c
index b790a04b755..47a08d38e15 100644
--- a/reactos/drivers/fs/cdfs/fcb.c
+++ b/reactos/drivers/fs/cdfs/fcb.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fcb.c,v 1.13 2003/06/07 11:34:35 chorns Exp $
+/* $Id: fcb.c,v 1.14 2003/07/21 21:53:47 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -248,7 +248,7 @@ CdfsFCBInitializeCache(PVCB Vcb,
   if (!NT_SUCCESS(Status))
     {
       DbgPrint("CcRosInitializeFileCache failed\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   ObDereferenceObject(FileObject);
@@ -427,7 +427,7 @@ CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb,
       if (!NT_SUCCESS(Status))
 	{
 	  DbgPrint("CcRosInitializeFileCache failed\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       Fcb->Flags |= FCB_CACHE_INITIALIZED;
     }
diff --git a/reactos/drivers/fs/ntfs/attrib.c b/reactos/drivers/fs/ntfs/attrib.c
index 4b6ff5099a3..43836158c9b 100644
--- a/reactos/drivers/fs/ntfs/attrib.c
+++ b/reactos/drivers/fs/ntfs/attrib.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: attrib.c,v 1.3 2003/07/17 13:31:39 chorns Exp $
+/* $Id: attrib.c,v 1.4 2003/07/21 21:53:47 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -215,7 +215,7 @@ NtfsDumpAttribute(PATTRIBUTE Attribute)
 
 	      default:
 		DbgPrint("RunLength size of %hu not implemented!\n", RunHeader & 0x0F);
-		KeBugCheck(0);
+		KEBUGCHECK(0);
 	    }
 
 	  switch (RunHeader >> 4)
@@ -243,7 +243,7 @@ NtfsDumpAttribute(PATTRIBUTE Attribute)
 
 	      default:
 		DbgPrint("RunStart size of %hu not implemented!\n", RunHeader >> 4);
-		KeBugCheck(0);
+		KEBUGCHECK(0);
 	    }
 
 	  DbgPrint("    AllocatedSize %I64d  DataSize %I64d\n", NresAttr->AllocatedSize, NresAttr->DataSize);
diff --git a/reactos/drivers/fs/ntfs/fcb.c b/reactos/drivers/fs/ntfs/fcb.c
index 778230698fd..4fd1cfc815f 100644
--- a/reactos/drivers/fs/ntfs/fcb.c
+++ b/reactos/drivers/fs/ntfs/fcb.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fcb.c,v 1.7 2003/07/17 13:31:39 chorns Exp $
+/* $Id: fcb.c,v 1.8 2003/07/21 21:53:47 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -247,7 +247,7 @@ NtfsFCBInitializeCache(PVCB Vcb,
   if (!NT_SUCCESS(Status))
     {
       DbgPrint("CcRosInitializeFileCache failed\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   ObDereferenceObject(FileObject);
@@ -419,7 +419,7 @@ NtfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb,
       if (!NT_SUCCESS(Status))
 	{
 	  DbgPrint("CcRosInitializeFileCache failed\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       Fcb->Flags |= FCB_CACHE_INITIALIZED;
     }
diff --git a/reactos/drivers/fs/vfat/fcb.c b/reactos/drivers/fs/vfat/fcb.c
index f594d6ea049..741abbce78b 100644
--- a/reactos/drivers/fs/vfat/fcb.c
+++ b/reactos/drivers/fs/vfat/fcb.c
@@ -1,4 +1,4 @@
-/* $Id: fcb.c,v 1.29 2003/06/07 11:34:36 chorns Exp $
+/* $Id: fcb.c,v 1.30 2003/07/21 21:53:47 royce Exp $
  *
  *
  * FILE:             fcb.c
@@ -298,7 +298,7 @@ vfatFCBInitializeCacheFromVolume (PVCB  vcb, PVFATFCB  fcb)
   if (!NT_SUCCESS (status))
   {
     DbgPrint ("CcRosInitializeFileCache failed\n");
-    KeBugCheck (0);
+    KEBUGCHECK (0);
   }
 
   fcb->Flags |= FCB_CACHE_INITIALIZED;
diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/fs/vfat/fsctl.c
index 93c633da609..58062b4a18d 100644
--- a/reactos/drivers/fs/vfat/fsctl.c
+++ b/reactos/drivers/fs/vfat/fsctl.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: fsctl.c,v 1.17 2003/06/24 21:34:41 ekohl Exp $
+/* $Id: fsctl.c,v 1.18 2003/07/21 21:53:47 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -185,13 +185,13 @@ VfatMountDevice(PDEVICE_EXTENSION DeviceExt,
       (DeviceExt->FatInfo.BytesPerCluster % PAGE_SIZE) != 0)
    {
       DbgPrint("(%s:%d) Invalid cluster size\n", __FILE__, __LINE__);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
    }
    else if (DeviceExt->FatInfo.BytesPerCluster < PAGE_SIZE &&
       (PAGE_SIZE % DeviceExt->FatInfo.BytesPerCluster) != 0)
    {
       DbgPrint("(%s:%d) Invalid cluster size2\n", __FILE__, __LINE__);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
    }
 
    return(STATUS_SUCCESS);
diff --git a/reactos/drivers/fs/vfat/rw.c b/reactos/drivers/fs/vfat/rw.c
index c3de3e1054d..096bea25f32 100644
--- a/reactos/drivers/fs/vfat/rw.c
+++ b/reactos/drivers/fs/vfat/rw.c
@@ -1,5 +1,5 @@
 
-/* $Id: rw.c,v 1.56 2003/05/11 09:51:26 hbirr Exp $
+/* $Id: rw.c,v 1.57 2003/07/21 21:53:47 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -82,7 +82,7 @@ OffsetToCluster(PDEVICE_EXTENSION DeviceExt,
   if (FirstCluster == 0)
   {
     DbgPrint("OffsetToCluster is called with FirstCluster = 0!\n");
-    KeBugCheck(0);
+    KEBUGCHECK(0);
   }
 
   if (FirstCluster == 1)
diff --git a/reactos/hal/halx86/adapter.c b/reactos/hal/halx86/adapter.c
index 0435ee80836..8ae6b34bd31 100644
--- a/reactos/hal/halx86/adapter.c
+++ b/reactos/hal/halx86/adapter.c
@@ -1,4 +1,4 @@
-/* $Id: adapter.c,v 1.4 2002/10/01 19:27:18 chorns Exp $
+/* $Id: adapter.c,v 1.5 2003/07/21 21:53:50 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -89,7 +89,7 @@ IoFreeAdapterChannel (PADAPTER_OBJECT	AdapterObject)
   if( AdapterObject->Inuse == FALSE )
     {
       DbgPrint( "Attempting to IoFreeAdapterChannel on a channel not in use\n" );
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   AdapterObject->Inuse = FALSE;
   if( AdapterObject->Buffer )
diff --git a/reactos/hal/halx86/irql.c b/reactos/hal/halx86/irql.c
index 5984122412a..72bcaaeca5d 100644
--- a/reactos/hal/halx86/irql.c
+++ b/reactos/hal/halx86/irql.c
@@ -1,4 +1,4 @@
-/* $Id: irql.c,v 1.9 2003/01/03 00:28:07 guido Exp $
+/* $Id: irql.c,v 1.10 2003/07/21 21:53:50 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -209,7 +209,7 @@ KfLowerIrql (KIRQL	NewIrql)
     {
       DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n",
 		__FILE__, __LINE__, NewIrql, CurrentIrql);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
       for(;;);
     }
   
@@ -268,7 +268,7 @@ KfRaiseIrql (KIRQL	NewIrql)
     {
       DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n",
 		__FILE__,__LINE__,CurrentIrql,NewIrql);
-      KeBugCheck (0);
+      KEBUGCHECK (0);
       for(;;);
     }
   
diff --git a/reactos/hal/halx86/mp.c b/reactos/hal/halx86/mp.c
index ab7caf6171f..3ca4d6ce3db 100644
--- a/reactos/hal/halx86/mp.c
+++ b/reactos/hal/halx86/mp.c
@@ -1,4 +1,4 @@
-/* $Id: mp.c,v 1.7 2003/04/06 10:45:15 chorns Exp $
+/* $Id: mp.c,v 1.8 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -277,7 +277,7 @@ IOAPICSetupIds(VOID)
     tmp = IOAPICRead(apic, 0);
     if (GET_IOAPIC_ID(tmp) != IOAPICMap[apic].ApicId) {
       DPRINT1("Could not set I/O APIC ID!\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   }
 }
@@ -550,7 +550,7 @@ static VOID AddPinToIrq(
 		entry = irq_2_pin + entry->next;
 		if (++first_free_entry >= PIN_MAP_SIZE) {
       DPRINT1("Ohh no!");
-			KeBugCheck(0);
+			KEBUGCHECK(0);
      }
 	}
 	entry->apic = apic;
@@ -595,7 +595,7 @@ static ULONG AssignIrqVector(
 	  current_vector = FIRST_DEVICE_VECTOR + vector_offset;
   } else if (current_vector == FIRST_SYSTEM_VECTOR) {
      DPRINT1("Ran out of interrupt sources!");
-     KeBugCheck(0);
+     KEBUGCHECK(0);
   }
 
   vector = current_vector;
@@ -1559,7 +1559,7 @@ HaliInitBSP(
 		DPRINT("APIC found\n");
 	} else {
 		DPRINT1("No APIC found\n");
-		KeBugCheck(0);
+		KEBUGCHECK(0);
 	}
 
   CPUMap[BootCPU].MaxLVT = APICGetMaxLVT();
@@ -1970,7 +1970,7 @@ static VOID HaliMPIOApicInfo(PMP_CONFIGURATION_IOAPIC m)
     DPRINT("Max # of I/O APICs (%d) exceeded (found %d).\n",
       MAX_IOAPIC, IOAPICCount);
     DPRINT1("Recompile with bigger MAX_IOAPIC!.\n");
-    KeBugCheck(0);
+    KEBUGCHECK(0);
   }
   IOAPICMap[IOAPICCount].ApicId = m->ApicId;
   IOAPICMap[IOAPICCount].ApicVersion = m->ApicVersion;
@@ -1987,7 +1987,7 @@ static VOID HaliMPIntSrcInfo(PMP_CONFIGURATION_INTSRC m)
     m->SrcBusIrq, m->DstApicId, m->DstApicInt);
   if (IRQCount > MAX_IRQ_SOURCE) {
     DPRINT1("Max # of irq sources exceeded!!\n");
-    KeBugCheck(0);
+    KEBUGCHECK(0);
   }
 
   IRQMap[IRQCount] = *m;
@@ -2010,11 +2010,11 @@ static VOID HaliMPIntLocalInfo(PMP_CONFIGURATION_INTLOCAL m)
    */
   if ((m->IrqType == INT_EXTINT) && (m->DstApicLInt != 0)) {
     DPRINT1("Invalid MP table!\n");
-    KeBugCheck(0);
+    KEBUGCHECK(0);
   }
   if ((m->IrqType == INT_NMI) && (m->DstApicLInt != 1)) {
     DPRINT1("Invalid MP table!\n");
-    KeBugCheck(0);
+    KEBUGCHECK(0);
   }
 }
 
@@ -2036,14 +2036,14 @@ HaliReadMPConfigTable(
        
        DbgPrint("Bad MP configuration block signature: %c%c%c%c\n", 
 		pc[0], pc[1], pc[2], pc[3]);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
        return;
      }
 
    if (MPChecksum((PUCHAR)Table, Table->Length))
      {
        DbgPrint("Bad MP configuration block checksum\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
        return;
      }
 
@@ -2051,7 +2051,7 @@ HaliReadMPConfigTable(
      {
        DbgPrint("Bad MP configuration table version (%d)\n",
 		Table->Specification);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
        return;
      }
 
@@ -2060,7 +2060,7 @@ HaliReadMPConfigTable(
      {
        DbgPrint("APIC base address is at 0x%X. " \
 		"I cannot handle non-standard adresses\n", APICBase);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    Entry = (PUCHAR)((PVOID)Table + sizeof(MP_CONFIGURATION_TABLE));
@@ -2107,7 +2107,7 @@ HaliReadMPConfigTable(
 	 }
        default:
 	 DbgPrint("Unknown entry in MPC table\n");
-	 KeBugCheck(0);
+	 KEBUGCHECK(0);
        }
    }
 }
@@ -2378,7 +2378,7 @@ HalpInitMPS(
         EBDA <<= 4;
         if (!HaliScanForMPConfigTable((ULONG)EBDA, 0x1000)) {
           DbgPrint("No multiprocessor compliant system found.\n");
-          KeBugCheck(0);
+          KEBUGCHECK(0);
         }
       }
     }
diff --git a/reactos/hal/halx86/mpsirql.c b/reactos/hal/halx86/mpsirql.c
index b1c078017de..0031046057e 100644
--- a/reactos/hal/halx86/mpsirql.c
+++ b/reactos/hal/halx86/mpsirql.c
@@ -47,7 +47,7 @@ KIRQL STDCALL KeGetCurrentIrql (VOID)
   if (KeGetCurrentKPCR ()->Irql > HIGH_LEVEL)
     {
       DPRINT1 ("CurrentIrql %x\n", KeGetCurrentKPCR ()->Irql);
-      KeBugCheck (0);
+      KEBUGCHECK (0);
       for(;;);
     }
 
@@ -63,7 +63,7 @@ static VOID KeSetCurrentIrql (KIRQL NewIrql)
   if (NewIrql > HIGH_LEVEL)
     {
       DPRINT1 ("NewIrql %x\n", NewIrql);
-      KeBugCheck (0);
+      KEBUGCHECK (0);
       for(;;);
     }
 
@@ -174,7 +174,7 @@ KfLowerIrql (KIRQL	NewIrql)
   if (NewIrql > KeGetCurrentIrql ())
     {
       DPRINT1 ("NewIrql %x CurrentIrql %x\n", NewIrql, KeGetCurrentIrql ());
-      KeBugCheck (0);
+      KEBUGCHECK (0);
       for(;;);
     }
   
@@ -230,7 +230,7 @@ KfRaiseIrql (KIRQL	NewIrql)
   if (NewIrql < KeGetCurrentIrql ())
     {
       DPRINT1 ("CurrentIrql %x NewIrql %x\n", KeGetCurrentIrql (), NewIrql);
-      KeBugCheck (0);
+      KEBUGCHECK (0);
       for(;;);
     }
   
diff --git a/reactos/include/ddk/kefuncs.h b/reactos/include/ddk/kefuncs.h
index 4d8e5052a03..4cfb87d474a 100644
--- a/reactos/include/ddk/kefuncs.h
+++ b/reactos/include/ddk/kefuncs.h
@@ -53,9 +53,12 @@ KeReleaseSpinLockFromDpcLevel(
  * ARGUMENTS:
  *           BugCheckCode = Specifies the reason for the bug check
  * RETURNS: Doesn't
+ *
+ * NOTES - please use the macro KEBUGCHECK with the same argument so the end-user
+ * knows what file/line number where the bug check occured
  */
 VOID STDCALL KeBugCheck (ULONG	BugCheckCode);
-
+#define KEBUGCHECK(a) DPRINT1("KeBugCheck at %s:%i\n",__FILE__,__LINE__), KeBugCheck(a)
 
 /*
  * FUNCTION: Brings the system down in a controlled manner when an 
@@ -64,12 +67,16 @@ VOID STDCALL KeBugCheck (ULONG	BugCheckCode);
  *           BugCheckCode = Specifies the reason for the bug check
  *           BugCheckParameter[1-4] = Additional information about bug
  * RETURNS: Doesn't
+ *
+ * NOTES - please use the macro KEBUGCHECKEX with the same arguments so the end-user
+ * knows what file/line number where the bug check occured
  */
 VOID STDCALL KeBugCheckEx (ULONG	BugCheckCode,
 			   ULONG	BugCheckParameter1,
 			   ULONG	BugCheckParameter2,
 			   ULONG	BugCheckParameter3,
 			   ULONG	BugCheckParameter4);
+#define KEBUGCHECKEX(a,b,c,d,e) DPRINT1("KeBugCheckEx at %s:%i\n",__FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e)
 
 BOOLEAN STDCALL KeCancelTimer (PKTIMER	Timer);
 
diff --git a/reactos/ntoskrnl/cc/copy.c b/reactos/ntoskrnl/cc/copy.c
index 5dc82f35333..fe4a7a352e3 100644
--- a/reactos/ntoskrnl/cc/copy.c
+++ b/reactos/ntoskrnl/cc/copy.c
@@ -1,4 +1,4 @@
-/* $Id: copy.c,v 1.18 2003/07/10 06:27:13 royce Exp $
+/* $Id: copy.c,v 1.19 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -39,13 +39,13 @@ CcInitCacheZeroPage(VOID)
    if (!NT_SUCCESS(Status))
    {
        DbgPrint("Can't allocate CcZeroPage.\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
    }
    Status = MiZeroPage(CcZeroPage);
    if (!NT_SUCCESS(Status))
    {
        DbgPrint("Can't zero out CcZeroPage.\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
    }
 }
 
diff --git a/reactos/ntoskrnl/cc/misc.c b/reactos/ntoskrnl/cc/misc.c
index b4671400a0c..53e3e68ac40 100644
--- a/reactos/ntoskrnl/cc/misc.c
+++ b/reactos/ntoskrnl/cc/misc.c
@@ -128,7 +128,7 @@ CcSetFileSizes (IN PFILE_OBJECT FileObject,
 	   else
 	   {
 	      DPRINT1("Anyone has referenced a cache segment behind the new size.\n");
-	      KeBugCheck(0);
+	      KEBUGCHECK(0);
 	   }
 	}
      }
@@ -147,7 +147,7 @@ CcSetFileSizes (IN PFILE_OBJECT FileObject,
         if (!NT_SUCCESS(Status))
         {
            DPRINT1("CcRosInternalFreeCacheSegment failed, status = %x\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
         }
      }
   }
diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
index 9aedb843c60..ca9ebd3da9c 100644
--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: view.c,v 1.67 2003/07/15 19:30:33 hbirr Exp $
+/* $Id: view.c,v 1.68 2003/07/21 21:53:51 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/cc/view.c
@@ -398,7 +398,7 @@ CcRosMarkDirtyCacheSegment(PBCB Bcb, ULONG FileOffset)
   CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset);
   if (CacheSeg == NULL)
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (!CacheSeg->Dirty)
     {
@@ -569,7 +569,7 @@ CcRosCreateCacheSegment(PBCB Bcb,
   if (StartingOffset == 0xffffffff)
   {
      DPRINT1("Out of CacheSeg mapping space\n");
-     KeBugCheck(0);
+     KEBUGCHECK(0);
   }
 
   current->BaseAddress = CiCacheSegMappingRegionBase + StartingOffset * PAGE_SIZE;
@@ -595,7 +595,7 @@ CcRosCreateCacheSegment(PBCB Bcb,
   MmUnlockAddressSpace(MmGetKernelAddressSpace());
   if (!NT_SUCCESS(Status))
   {
-     KeBugCheck(0);
+     KEBUGCHECK(0);
   }
 #endif
   for (i = 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++)
@@ -605,7 +605,7 @@ CcRosCreateCacheSegment(PBCB Bcb,
      Status = MmRequestPageMemoryConsumer(MC_CACHE, TRUE, &Page);
      if (!NT_SUCCESS(Status))
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
       
      Status = MmCreateVirtualMapping(NULL,
@@ -615,7 +615,7 @@ CcRosCreateCacheSegment(PBCB Bcb,
 				     TRUE);
      if (!NT_SUCCESS(Status))
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
   }
   return(STATUS_SUCCESS);
@@ -736,7 +736,7 @@ CcRosRequestCacheSegment(PBCB Bcb,
     {
       CPRINT("Bad fileoffset %x should be multiple of %x",
         FileOffset, Bcb->CacheSegmentSize);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   return(CcRosGetCacheSegment(Bcb,
@@ -1216,7 +1216,7 @@ CmLazyCloseThreadMain(PVOID Ignored)
       if (!NT_SUCCESS(Status))
       {
 	  DbgPrint("LazyCloseThread: Wait failed\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	  break;
       }
       if (LazyCloseThreadShouldTerminate)
@@ -1274,7 +1274,7 @@ CcInitView(VOID)
   MmUnlockAddressSpace(MmGetKernelAddressSpace());
   if (!NT_SUCCESS(Status))
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   Buffer = ExAllocatePool(NonPagedPool, CI_CACHESEG_MAPPING_REGION_SIZE / (PAGE_SIZE * 8));
diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c
index e73294c9e61..f4c73319ca5 100644
--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@@ -527,7 +527,7 @@ CmiCheckAndFixHive(PREGISTRY_HIVE RegistryHive)
 	{
 	  /* There is no way to fix the hive without log file - BSOD! */
 	  DPRINT("Hive header inconsistent and no log file available!\n");
-	  KeBugCheck(CONFIG_LIST_FAILED);
+	  KEBUGCHECK(CONFIG_LIST_FAILED);
 	}
 
       Status = STATUS_SUCCESS;
@@ -570,7 +570,7 @@ CmiCheckAndFixHive(PREGISTRY_HIVE RegistryHive)
 	      HiveHeader->UpdateCounter1 != HiveHeader->UpdateCounter2)
 	    {
 	      DPRINT("Hive file and log file are inconsistent!\n");
-	      KeBugCheck(CONFIG_LIST_FAILED);
+	      KEBUGCHECK(CONFIG_LIST_FAILED);
 	    }
 
 	  /* Log file damaged but hive is okay */
diff --git a/reactos/ntoskrnl/cm/registry.c b/reactos/ntoskrnl/cm/registry.c
index 259d941aa25..7f452d19c5b 100644
--- a/reactos/ntoskrnl/cm/registry.c
+++ b/reactos/ntoskrnl/cm/registry.c
@@ -1,4 +1,4 @@
-/* $Id: registry.c,v 1.106 2003/06/16 14:00:51 ekohl Exp $
+/* $Id: registry.c,v 1.107 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -367,7 +367,7 @@ CmInit2(PCHAR CommandLine)
   Status = CmiCreateCurrentControlSetLink();
   if (!NT_SUCCESS(Status))
     {
-      KeBugCheck(CONFIG_INITIALIZATION_FAILED);
+      KEBUGCHECK(CONFIG_INITIALIZATION_FAILED);
     }
 
   /* Set PICE 'Start' value to 1, if PICE debugging is enabled */
@@ -400,7 +400,7 @@ CmInit2(PCHAR CommandLine)
 				 sizeof(ULONG));
   if (!NT_SUCCESS(Status))
     {
-      KeBugCheck(CONFIG_INITIALIZATION_FAILED);
+      KEBUGCHECK(CONFIG_INITIALIZATION_FAILED);
     }
 }
 
diff --git a/reactos/ntoskrnl/dbg/kdb.c b/reactos/ntoskrnl/dbg/kdb.c
index 0de6c2a28af..e2da3edfcba 100644
--- a/reactos/ntoskrnl/dbg/kdb.c
+++ b/reactos/ntoskrnl/dbg/kdb.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: kdb.c,v 1.10 2002/09/08 10:23:18 chorns Exp $
+/* $Id: kdb.c,v 1.11 2003/07/21 21:53:51 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/dbg/kdb.c
@@ -580,7 +580,7 @@ DbgRegsCommand(ULONG Argc, PCH Argv[], PKTRAP_FRAME Tf)
 ULONG
 DbgBugCheckCommand(ULONG Argc, PCH Argv[], PKTRAP_FRAME Tf)
 {
-  KeBugCheck(1);
+  KEBUGCHECK(1);
   return(1);
 }
 
diff --git a/reactos/ntoskrnl/dbg/profile.c b/reactos/ntoskrnl/dbg/profile.c
index 21fbc383c38..c0c5674d222 100755
--- a/reactos/ntoskrnl/dbg/profile.c
+++ b/reactos/ntoskrnl/dbg/profile.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: profile.c,v 1.3 2003/05/06 08:45:10 ekohl Exp $
+/* $Id: profile.c,v 1.4 2003/07/21 21:53:51 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/dbg/profile.c
@@ -309,7 +309,7 @@ KdbProfilerAnalyzeSamples()
   if (!ExInitializeHashTable(&Hashtable, 17, KdbProfilerKeyCompare, TRUE))
     {
       DPRINT1("ExInitializeHashTable() failed.");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   InitializeListHead(&SamplesListHead);
diff --git a/reactos/ntoskrnl/ex/resource.c b/reactos/ntoskrnl/ex/resource.c
index 74496ad203a..bab33e96298 100644
--- a/reactos/ntoskrnl/ex/resource.c
+++ b/reactos/ntoskrnl/ex/resource.c
@@ -1,4 +1,4 @@
-/* $Id: resource.c,v 1.24 2003/07/15 16:26:18 silverblade Exp $
+/* $Id: resource.c,v 1.25 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -258,7 +258,7 @@ static BOOLEAN EiAddSharedOwner(PERESOURCE Resource)
 				TAG_OWNER_TABLE);
 	if (Resource->OwnerTable == NULL)
 	  {
-	     KeBugCheck(0);
+	     KEBUGCHECK(0);
 	     return(FALSE);
 	  }
 	memset(Resource->OwnerTable,0,sizeof(OWNER_ENTRY)*3);
@@ -310,7 +310,7 @@ static BOOLEAN EiAddSharedOwner(PERESOURCE Resource)
 				TAG_OWNER_TABLE);
 	if (freeEntry == NULL)
 	  {
-	     KeBugCheck(0);
+	     KEBUGCHECK(0);
 	     return(FALSE);
 	  }
 	memcpy(freeEntry,Resource->OwnerTable,
@@ -439,7 +439,7 @@ ExConvertExclusiveToSharedLite (
    if (!(Resource->Flag & ResourceOwnedExclusive))
      {
 	/* Might not be what the caller expects, better bug check */
-	KeBugCheck(0);
+	KEBUGCHECK(0);
 	KeReleaseSpinLock(&Resource->SpinLock, oldIrql);
 	return;
      }
diff --git a/reactos/ntoskrnl/ex/win32k.c b/reactos/ntoskrnl/ex/win32k.c
index d8461e74edd..f8bbc2874d2 100644
--- a/reactos/ntoskrnl/ex/win32k.c
+++ b/reactos/ntoskrnl/ex/win32k.c
@@ -263,7 +263,7 @@ ExpWin32kInit(VOID)
   if (ExWindowStationObjectType == NULL)
   {
     CPRINT("Could not create window station object type\n");
-    KeBugCheck(0);
+    KEBUGCHECK(0);
   }
 
   ExWindowStationObjectType->Tag = TAG('W', 'I', 'N', 'S');
@@ -291,7 +291,7 @@ ExpWin32kInit(VOID)
   if (ExDesktopObjectType == NULL)
   {
     CPRINT("Could not create desktop object type\n");
-    KeBugCheck(0);
+    KEBUGCHECK(0);
   }
 
   ExDesktopObjectType->Tag = TAG('D', 'E', 'S', 'K');
diff --git a/reactos/ntoskrnl/include/internal/ke.h b/reactos/ntoskrnl/include/internal/ke.h
index 21a20d960c9..0077cf1e2e2 100644
--- a/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@ -105,6 +105,7 @@ KeBugCheckWithTf(ULONG BugCheckCode,
 		 ULONG BugCheckParameter3,
 		 ULONG BugCheckParameter4,
 		 PKTRAP_FRAME Tf);
+#define KEBUGCHECKWITHTF(a,b,c,d,e,f) DPRINT1("KeBugCheckWithTf at %s:%i\n",__FILE__,__LINE__), KeBugCheckWithTf(a,b,c,d,e,f)
 VOID
 KiDumpTrapFrame(PKTRAP_FRAME Tf, ULONG ExceptionNr, ULONG cr2);
 
diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c
index 92bfc47ef48..d93414ae048 100644
--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.56 2003/07/11 01:23:14 royce Exp $
+/* $Id: device.c,v 1.57 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -394,7 +394,7 @@ IopInitializeDevice(PDEVICE_NODE DeviceNode,
         {
           /* FIXME: What do we do? Unload the driver or just disable the device? */
           DbgPrint("An FDO was not attached\n");
-          KeBugCheck(0);
+          KEBUGCHECK(0);
         }
 
       /* FIXME: Put some resources in the IRP for the device */
diff --git a/reactos/ntoskrnl/io/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr.c
index 6efd1df3193..f1d499732bb 100644
--- a/reactos/ntoskrnl/io/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr.c
@@ -1,4 +1,4 @@
-/* $Id: pnpmgr.c,v 1.12 2003/07/11 01:23:14 royce Exp $
+/* $Id: pnpmgr.c,v 1.13 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -1237,7 +1237,7 @@ VOID PnpInit(VOID)
   if (!NT_SUCCESS(Status))
   {
     CPRINT("IoCreateDriverObject() failed\n");
-    KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+    KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
   }
 
   Status = IoCreateDevice(
@@ -1251,7 +1251,7 @@ VOID PnpInit(VOID)
   if (!NT_SUCCESS(Status))
   {
     CPRINT("IoCreateDevice() failed\n");
-    KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+    KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
   }
 
   Status = IopCreateDeviceNode(
@@ -1261,7 +1261,7 @@ VOID PnpInit(VOID)
   if (!NT_SUCCESS(Status))
   {
     CPRINT("Insufficient resources\n");
-    KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+    KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
   }
 
   IopRootDeviceNode->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE;
diff --git a/reactos/ntoskrnl/io/pnproot.c b/reactos/ntoskrnl/io/pnproot.c
index dac4b8979be..270855be2d9 100644
--- a/reactos/ntoskrnl/io/pnproot.c
+++ b/reactos/ntoskrnl/io/pnproot.c
@@ -1,4 +1,4 @@
-/* $Id: pnproot.c,v 1.13 2003/07/11 01:23:14 royce Exp $
+/* $Id: pnproot.c,v 1.14 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -907,7 +907,7 @@ PnpRootAddDevice(
     &PnpRootDeviceObject);
   if (!NT_SUCCESS(Status)) {
     CPRINT("IoCreateDevice() failed with status 0x%X\n", Status);
-    KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+    KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
   }
 
   DeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)PnpRootDeviceObject->DeviceExtension;
@@ -924,12 +924,12 @@ PnpRootAddDevice(
 
   if (!PnpRootDeviceObject) {
     CPRINT("PnpRootDeviceObject 0x%X\n", PnpRootDeviceObject);
-    KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+    KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
   }
 
   if (!PhysicalDeviceObject) {
     CPRINT("PhysicalDeviceObject 0x%X\n", PhysicalDeviceObject);
-    KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+    KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
   }
 
   InitializeListHead(&DeviceExtension->DeviceListHead);
diff --git a/reactos/ntoskrnl/io/rawfs.c b/reactos/ntoskrnl/io/rawfs.c
index ca2071d58e8..5ad7731f30a 100755
--- a/reactos/ntoskrnl/io/rawfs.c
+++ b/reactos/ntoskrnl/io/rawfs.c
@@ -1,4 +1,4 @@
-/* $Id: rawfs.c,v 1.5 2003/07/11 01:23:14 royce Exp $
+/* $Id: rawfs.c,v 1.6 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -887,7 +887,7 @@ RawFsDriverEntry(IN PDRIVER_OBJECT DriverObject,
   if (!NT_SUCCESS(Status))
     {
       CPRINT("IoCreateDevice() failed with status 0x%.08x\n", Status);
-      KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+      KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
       return(Status);
     }
   DeviceData = DiskDeviceObject->DeviceExtension;
@@ -907,7 +907,7 @@ RawFsDriverEntry(IN PDRIVER_OBJECT DriverObject,
   if (!NT_SUCCESS(Status))
     {
       CPRINT("IoCreateDevice() failed with status 0x%.08x\n", Status);
-      KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+      KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
       return(Status);
     }
   DeviceData = CdromDeviceObject->DeviceExtension;
@@ -927,7 +927,7 @@ RawFsDriverEntry(IN PDRIVER_OBJECT DriverObject,
   if (!NT_SUCCESS(Status))
     {
       CPRINT("IoCreateDevice() failed with status 0x%.08x\n", Status);
-      KeBugCheck(PHASE1_INITIALIZATION_FAILED);
+      KEBUGCHECK(PHASE1_INITIALIZATION_FAILED);
       return(Status);
     }
   DeviceData = TapeDeviceObject->DeviceExtension;
diff --git a/reactos/ntoskrnl/kd/kdebug.c b/reactos/ntoskrnl/kd/kdebug.c
index eac554aad81..857c6254683 100644
--- a/reactos/ntoskrnl/kd/kdebug.c
+++ b/reactos/ntoskrnl/kd/kdebug.c
@@ -1,4 +1,4 @@
-/* $Id: kdebug.c,v 1.44 2003/07/11 01:23:14 royce Exp $
+/* $Id: kdebug.c,v 1.45 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -389,7 +389,7 @@ KdSystemDebugControl(ULONG Code)
   /* B - Bug check the system. */
   else if (Code == 1)
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   /* 
    * C -  Dump statistics about the distribution of tagged blocks in 
diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c
index f9cd90efe25..d041485c2fa 100644
--- a/reactos/ntoskrnl/ke/apc.c
+++ b/reactos/ntoskrnl/ke/apc.c
@@ -96,7 +96,7 @@ KiDeliverNormalApc(VOID)
        if (Apc->NormalRoutine == NULL)
 	 {
 	   DbgPrint("Exiting kernel with kernel APCs pending.\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        Apc->Inserted = FALSE;
        Thread->Tcb.ApcState.KernelApcInProgress++;
@@ -322,7 +322,7 @@ KeInsertQueueApc (PKAPC	Apc,
    if (Apc->Inserted)
      {
 	DbgPrint("KeInsertQueueApc(): multiple APC insertations\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    TargetThread = Apc->Thread;
diff --git a/reactos/ntoskrnl/ke/catch.c b/reactos/ntoskrnl/ke/catch.c
index b4e0c49045c..03a369e2843 100644
--- a/reactos/ntoskrnl/ke/catch.c
+++ b/reactos/ntoskrnl/ke/catch.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: catch.c,v 1.33 2003/07/11 01:23:15 royce Exp $
+/* $Id: catch.c,v 1.34 2003/07/21 21:53:51 royce Exp $
  *
  * PROJECT:              ReactOS kernel
  * FILE:                 ntoskrnl/ke/catch.c
@@ -132,7 +132,7 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
 
 	  /* If that fails then bugcheck */
 	  DPRINT1("Could not terminate thread\n");
-	  KeBugCheck(KMODE_EXCEPTION_NOT_HANDLED);
+	  KEBUGCHECK(KMODE_EXCEPTION_NOT_HANDLED);
 	}
       else
 	{
@@ -147,7 +147,7 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
 	  if (Value != ExceptionContinueExecution ||
 	      0 != (ExceptionRecord->ExceptionFlags & EXCEPTION_NONCONTINUABLE))
 	    {
-              KeBugCheckWithTf(KMODE_EXCEPTION_NOT_HANDLED, 0, 0, 0, 0, Tf);	      
+              KEBUGCHECKWITHTF(KMODE_EXCEPTION_NOT_HANDLED, 0, 0, 0, 0, Tf);	      
 	    }
 	}
     }
diff --git a/reactos/ntoskrnl/ke/i386/gdt.c b/reactos/ntoskrnl/ke/i386/gdt.c
index f0a052cba9e..97775878d4b 100644
--- a/reactos/ntoskrnl/ke/i386/gdt.c
+++ b/reactos/ntoskrnl/ke/i386/gdt.c
@@ -95,7 +95,7 @@ KiInitializeGdt(PKPCR Pcr)
   if (Gdt == NULL)
     {
       DbgPrint("No GDT (%d)\n", Pcr->ProcessorNumber);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   /*
diff --git a/reactos/ntoskrnl/ke/kthread.c b/reactos/ntoskrnl/ke/kthread.c
index a16e2150cc5..56154434590 100644
--- a/reactos/ntoskrnl/ke/kthread.c
+++ b/reactos/ntoskrnl/ke/kthread.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: kthread.c,v 1.41 2003/07/11 01:23:15 royce Exp $
+/* $Id: kthread.c,v 1.42 2003/07/21 21:53:51 royce Exp $
  *
  * FILE:            ntoskrnl/ke/kthread.c
  * PURPOSE:         Microkernel thread support
@@ -113,7 +113,7 @@ KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First)
       if (!NT_SUCCESS(Status))
 	{
 	  DPRINT1("Failed to create thread stack\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       for (i = 0; i < (MM_STACK_SIZE / PAGE_SIZE); i++)
 	{
@@ -121,7 +121,7 @@ KeInitializeThread(PKPROCESS Process, PKTHREAD Thread, BOOLEAN First)
 	  Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page);
 	  if (!NT_SUCCESS(Status))
 	    {
-	      KeBugCheck(0);
+	      KEBUGCHECK(0);
 	    }
 	  Status = MmCreateVirtualMapping(NULL,
 					  KernelStack + (i * PAGE_SIZE),
diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index 0560ba8e619..cc9ff8fc1e2 100644
--- a/reactos/ntoskrnl/ke/main.c
+++ b/reactos/ntoskrnl/ke/main.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: main.c,v 1.165 2003/07/06 10:25:15 hbirr Exp $
+/* $Id: main.c,v 1.166 2003/07/21 21:53:51 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/main.c
@@ -203,7 +203,7 @@ InitSystemSharedUserPage (PCSZ ParameterLine)
 	CPRINT("NtOpenSymbolicLinkObject() failed (Status %x)\n",
 	         Status);
 
-	KeBugCheck (0x0);
+	KEBUGCHECK (0x0);
      }
 
    Status = NtQuerySymbolicLinkObject (Handle,
@@ -217,7 +217,7 @@ InitSystemSharedUserPage (PCSZ ParameterLine)
 	CPRINT("NtQuerySymbolicObject() failed (Status %x)\n",
 		 Status);
 
-	KeBugCheck (0x0);
+	KEBUGCHECK (0x0);
      }
    DPRINT("Length: %lu ArcDeviceName: %wZ\n", Length, &ArcDeviceName);
 
@@ -282,7 +282,7 @@ InitSystemSharedUserPage (PCSZ ParameterLine)
    if (BootDriveFound == FALSE)
      {
 	DbgPrint("No system drive found!\n");
-	KeBugCheck (0x0);
+	KEBUGCHECK (0x0);
      }
 }
 
@@ -462,12 +462,12 @@ ExpInitializeExecutive(VOID)
   KeLowerIrql(PASSIVE_LEVEL);
 
   if (!SeInit1())
-    KeBugCheck(SECURITY_INITIALIZATION_FAILED);
+    KEBUGCHECK(SECURITY_INITIALIZATION_FAILED);
 
   ObInit();
 
   if (!SeInit2())
-    KeBugCheck(SECURITY1_INITIALIZATION_FAILED);
+    KEBUGCHECK(SECURITY1_INITIALIZATION_FAILED);
 
   PiInitProcessManager();
 
@@ -657,7 +657,7 @@ ExpInitializeExecutive(VOID)
   if (BootDriverCount == 0)
     {
       DbgPrint("No boot drivers available.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   /* Create ARC names for boot devices */
@@ -667,7 +667,7 @@ ExpInitializeExecutive(VOID)
   CPRINT("CommandLine: %s\n", (PUCHAR)KeLoaderBlock.CommandLine);
   Status = IoCreateSystemRootLink((PUCHAR)KeLoaderBlock.CommandLine);
   if (!NT_SUCCESS(Status))
-    KeBugCheck(INACCESSIBLE_BOOT_DEVICE);
+    KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE);
 
 #ifdef DBGPRINT_FILE_LOG
   /* On the assumption that we can now access disks start up the debug
@@ -721,7 +721,7 @@ ExpInitializeExecutive(VOID)
 				 &ThreadHandle);
   if (!NT_SUCCESS(Status))
     {
-      KeBugCheckEx(SESSION4_INITIALIZATION_FAILED, Status, 0, 0, 0);
+      KEBUGCHECKEX(SESSION4_INITIALIZATION_FAILED, Status, 0, 0, 0);
     }
 
   /*
@@ -733,7 +733,7 @@ ExpInitializeExecutive(VOID)
 				 &Timeout);
   if (Status != STATUS_TIMEOUT)
     {
-      KeBugCheckEx(SESSION5_INITIALIZATION_FAILED, Status, 0, 0, 0);
+      KEBUGCHECKEX(SESSION5_INITIALIZATION_FAILED, Status, 0, 0, 0);
     }
 
   NtClose(ThreadHandle);
@@ -752,14 +752,14 @@ KiSystemStartup(BOOLEAN BootProcessor)
     {
       /* Never returns */
       ExpInitializeExecutive();
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   /* Do application processor initialization */
   KeApplicationProcessorInit();
   PsApplicationProcessorInit();
   KeLowerIrql(PASSIVE_LEVEL);
   PsIdleThreadMain(NULL);
-  KeBugCheck(0);
+  KEBUGCHECK(0);
   for(;;);
 }
 
diff --git a/reactos/ntoskrnl/ke/mutex.c b/reactos/ntoskrnl/ke/mutex.c
index 478beefddf5..034a1c41182 100644
--- a/reactos/ntoskrnl/ke/mutex.c
+++ b/reactos/ntoskrnl/ke/mutex.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mutex.c,v 1.13 2003/07/10 17:44:06 royce Exp $
+/* $Id: mutex.c,v 1.14 2003/07/21 21:53:51 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/mutex.c
@@ -75,7 +75,7 @@ KeReleaseMutex(IN PKMUTEX Mutex,
   if (Mutex->OwnerThread != KeGetCurrentThread())
     {
       DbgPrint("THREAD_NOT_MUTEX_OWNER: Mutex %p\n", Mutex);
-      KeBugCheck(0); /* THREAD_NOT_MUTEX_OWNER */
+      KEBUGCHECK(0); /* THREAD_NOT_MUTEX_OWNER */
     }
   Mutex->Header.SignalState++;
   assert(Mutex->Header.SignalState <= 1);
@@ -161,7 +161,7 @@ KeReleaseMutant(IN PKMUTANT Mutant,
 	  DbgPrint("THREAD_NOT_MUTEX_OWNER: Mutant->OwnerThread %p CurrentThread %p\n",
 		   Mutant->OwnerThread,
 		   KeGetCurrentThread());
-	  KeBugCheck(0); /* THREAD_NOT_MUTEX_OWNER */
+	  KEBUGCHECK(0); /* THREAD_NOT_MUTEX_OWNER */
 	}
       Mutant->Header.SignalState++;
       assert(Mutant->Header.SignalState <= 1);
diff --git a/reactos/ntoskrnl/ke/process.c b/reactos/ntoskrnl/ke/process.c
index a5da5e3e218..a95230ff08f 100644
--- a/reactos/ntoskrnl/ke/process.c
+++ b/reactos/ntoskrnl/ke/process.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: process.c,v 1.15 2003/07/10 17:44:06 royce Exp $
+/* $Id: process.c,v 1.16 2003/07/21 21:53:51 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/process.c
@@ -57,7 +57,7 @@ KeAttachProcess (PEPROCESS Process)
    if (CurrentThread->OldProcess != NULL)
      {
 	DbgPrint("Invalid attach (thread is already attached)\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    KeRaiseIrql(DISPATCH_LEVEL, &oldlvl);
@@ -104,7 +104,7 @@ KeDetachProcess (VOID)
    if (CurrentThread->OldProcess == NULL)
      {
 	DbgPrint("Invalid detach (thread was not attached)\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    KeRaiseIrql(DISPATCH_LEVEL, &oldlvl);
diff --git a/reactos/ntoskrnl/ke/spinlock.c b/reactos/ntoskrnl/ke/spinlock.c
index 1a20b8ff429..56819476fac 100644
--- a/reactos/ntoskrnl/ke/spinlock.c
+++ b/reactos/ntoskrnl/ke/spinlock.c
@@ -1,4 +1,4 @@
-/* $Id: spinlock.c,v 1.17 2003/07/10 17:44:06 royce Exp $
+/* $Id: spinlock.c,v 1.18 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -92,14 +92,14 @@ KeAcquireSpinLockAtDpcLevel (PKSPIN_LOCK	SpinLock)
    if (*SpinLock >= 2)
      {
 	DbgPrint("Lock %x has bad value %x\n", SpinLock, *SpinLock);
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    while ((i = InterlockedExchange((LONG *)SpinLock, 1)) == 1)
      {
 #ifndef MP
        DbgPrint("Spinning on spinlock %x current value %x\n", SpinLock, i);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
 #else /* not MP */
        /* Avoid reading the value again too fast */
 #endif /* MP */
@@ -123,7 +123,7 @@ KeReleaseSpinLockFromDpcLevel (PKSPIN_LOCK	SpinLock)
    if (*SpinLock != 1)
      {
 	DbgPrint("Releasing unacquired spinlock %x\n", SpinLock);
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    (void)InterlockedExchange((LONG *)SpinLock, 0);
 }
diff --git a/reactos/ntoskrnl/ke/timer.c b/reactos/ntoskrnl/ke/timer.c
index 3cb20c6d1b2..ceee87eac40 100644
--- a/reactos/ntoskrnl/ke/timer.c
+++ b/reactos/ntoskrnl/ke/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.60 2003/07/11 01:23:15 royce Exp $
+/* $Id: timer.c,v 1.61 2003/07/21 21:53:51 royce Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -451,7 +451,7 @@ KeExpireTimers(PKDPC Dpc,
    if (KeGetCurrentIrql() > DISPATCH_LEVEL)
    {
        DPRINT1("-----------------------------\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
    }
 
 
diff --git a/reactos/ntoskrnl/ke/wait.c b/reactos/ntoskrnl/ke/wait.c
index f2f0f19e55e..51394a3224c 100644
--- a/reactos/ntoskrnl/ke/wait.c
+++ b/reactos/ntoskrnl/ke/wait.c
@@ -137,7 +137,7 @@ KiSideEffectsBeforeWake(DISPATCHER_HEADER * hdr,
             if (Thread == NULL)
             {
                DPRINT("Thread == NULL!\n");
-               KeBugCheck(0);
+               KEBUGCHECK(0);
             }
             Abandoned = Mutex->Abandoned;
             if (Thread != NULL)
@@ -150,7 +150,7 @@ KiSideEffectsBeforeWake(DISPATCHER_HEADER * hdr,
 
       default:
          DbgPrint("(%s:%d) Dispatcher object %x has unknown type\n", __FILE__, __LINE__, hdr);
-         KeBugCheck(0);
+         KEBUGCHECK(0);
    }
 
    return Abandoned;
@@ -373,7 +373,7 @@ BOOLEAN KeDispatcherObjectWake(DISPATCHER_HEADER* hdr)
        return(KeDispatcherObjectWakeOne(hdr));
      }
    DbgPrint("Dispatcher object %x has unknown type %d\n", hdr, hdr->Type);
-   KeBugCheck(0);
+   KEBUGCHECK(0);
    return(FALSE);
 }
 
diff --git a/reactos/ntoskrnl/ldr/loader.c b/reactos/ntoskrnl/ldr/loader.c
index e230162b48a..cfc9786f5a5 100644
--- a/reactos/ntoskrnl/ldr/loader.c
+++ b/reactos/ntoskrnl/ldr/loader.c
@@ -1,4 +1,4 @@
-/* $Id: loader.c,v 1.132 2003/07/20 05:15:34 royce Exp $
+/* $Id: loader.c,v 1.133 2003/07/21 21:53:52 royce Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -1559,7 +1559,7 @@ LdrPEGetExportAddress(PMODULE_OBJECT ModuleObject,
       DbgPrint("Export not found for %d:%s\n",
 	     Hint,
 	     Name != NULL ? Name : "(Ordinal)");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   return(ExportAddress);
@@ -1621,7 +1621,7 @@ LdrSafePEGetExportAddress(PVOID ImportModuleBase,
       ps("Export not found for %d:%s\n",
 	 Hint,
 	 Name != NULL ? Name : "(Ordinal)");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   return ExportAddress;
 }
diff --git a/reactos/ntoskrnl/lpc/reply.c b/reactos/ntoskrnl/lpc/reply.c
index bcde0258c5e..9a70aa2b124 100644
--- a/reactos/ntoskrnl/lpc/reply.c
+++ b/reactos/ntoskrnl/lpc/reply.c
@@ -1,4 +1,4 @@
-/* $Id: reply.c,v 1.17 2003/07/11 01:23:15 royce Exp $
+/* $Id: reply.c,v 1.18 2003/07/21 21:53:52 royce Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -49,7 +49,7 @@ EiReplyOrRequestPort (IN	PEPORT		Port,
    
    if (Port == NULL)
      {
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    MessageReply = ExAllocatePoolWithTag(NonPagedPool, sizeof(QUEUEDMESSAGE),
diff --git a/reactos/ntoskrnl/mm/anonmem.c b/reactos/ntoskrnl/mm/anonmem.c
index 7512e20e961..2098ccf257b 100644
--- a/reactos/ntoskrnl/mm/anonmem.c
+++ b/reactos/ntoskrnl/mm/anonmem.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: anonmem.c,v 1.18 2003/07/12 01:52:10 dwelch Exp $
+/* $Id: anonmem.c,v 1.19 2003/07/21 21:53:52 royce Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/anonmem.c
@@ -157,7 +157,7 @@ MmPageOutVirtualMemory(PMADDRESS_SPACE AddressSpace,
 
    if (PhysicalAddress.QuadPart == 0)
      {
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    /*
@@ -291,7 +291,7 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace,
    if (PageOp == NULL)
      {
        DPRINT1("MmGetPageOp failed");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    /*
@@ -312,12 +312,12 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace,
        if (Status != STATUS_SUCCESS)
 	 {
 	   DPRINT1("Failed to wait for page op\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        if (PageOp->Status == STATUS_PENDING)
 	 {
 	   DPRINT1("Woke for page op before completion\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        /*
 	* If this wasn't a pagein then we need to restart the handling
@@ -363,7 +363,7 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace,
    if (!NT_SUCCESS(Status))
    {
       DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
    }
 
    /*
@@ -380,7 +380,7 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace,
        Status = MmReadFromSwapPage(SwapEntry, Mdl);
        if (!NT_SUCCESS(Status))
 	 {
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        MmSetSavedSwapEntryPage(Page, SwapEntry);
      }
@@ -407,7 +407,7 @@ MmNotPresentFaultVirtualMemory(PMADDRESS_SPACE AddressSpace,
    if (!NT_SUCCESS(Status))
      {
        DPRINT1("MmCreateVirtualMapping failed, not out of memory\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
        return(Status);
      }
 
@@ -727,7 +727,7 @@ MmFreeVirtualMemory(PEPROCESS Process,
 	      if (Status != STATUS_SUCCESS)
 		{
 		  DPRINT1("Failed to wait for page op\n");
-		  KeBugCheck(0);
+		  KEBUGCHECK(0);
 		}
 	      MmLockAddressSpace(&Process->AddressSpace);
 	      MmReleasePageOp(PageOp);
diff --git a/reactos/ntoskrnl/mm/balance.c b/reactos/ntoskrnl/mm/balance.c
index d9cab82022b..a35086c609e 100644
--- a/reactos/ntoskrnl/mm/balance.c
+++ b/reactos/ntoskrnl/mm/balance.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: balance.c,v 1.19 2003/07/13 14:36:32 dwelch Exp $
+/* $Id: balance.c,v 1.20 2003/07/21 21:53:52 royce Exp $
  *
  * PROJECT:     ReactOS kernel 
  * FILE:        ntoskrnl/mm/balance.c
@@ -108,7 +108,7 @@ MmReleasePageMemoryConsumer(ULONG Consumer, PHYSICAL_ADDRESS Page)
   if (Page.QuadPart == 0LL)
     {
       DPRINT1("Tried to release page zero.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   KeAcquireSpinLock(&AllocationListLock, &oldIrql);
@@ -176,7 +176,7 @@ MmRebalanceMemoryConsumers(VOID)
 	  Status = MiMemoryConsumers[i].Trim(Target, 0, &NrFreedPages);
 	  if (!NT_SUCCESS(Status))
 	    {
-	      KeBugCheck(0);
+	      KEBUGCHECK(0);
 	    }
 	  Target = Target - NrFreedPages;
 	}
@@ -235,7 +235,7 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait,
 	  KeReleaseSpinLock(&AllocationListLock, oldIrql);
 	  if (Page.QuadPart == 0LL)
 	    {
-	      KeBugCheck(0);
+	      KEBUGCHECK(0);
 	    }
 	  *AllocatedPage = Page;
 	  InterlockedDecrement((LONG *)&MiPagesRequired);
@@ -255,7 +255,7 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait,
       Page = Request.Page;
       if (Page.QuadPart == 0LL)
 	{
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       MmTransferOwnershipPage(Page, Consumer);
       *AllocatedPage = Page;
@@ -270,7 +270,7 @@ MmRequestPageMemoryConsumer(ULONG Consumer, BOOLEAN CanWait,
   Page = MmAllocPage(Consumer, 0);
   if (Page.QuadPart == 0LL)
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   *AllocatedPage = Page;
 
diff --git a/reactos/ntoskrnl/mm/freelist.c b/reactos/ntoskrnl/mm/freelist.c
index 85371c74864..861d5778ccc 100644
--- a/reactos/ntoskrnl/mm/freelist.c
+++ b/reactos/ntoskrnl/mm/freelist.c
@@ -73,7 +73,7 @@ MmTransferOwnershipPage(PHYSICAL_ADDRESS PhysicalAddress, ULONG NewConsumer)
   if (MmPageArray[Start].MapCount != 0)
     {
       DbgPrint("Transfering mapped page.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   RemoveEntryList(&MmPageArray[Start].ListEntry);
   InsertTailList(&UsedPageListHeads[NewConsumer], 
@@ -380,7 +380,7 @@ MmInitializePageList(PVOID FirstPhysKernelAddress,
 	   if (!NT_SUCCESS(Status))
 	     {
 	       DbgPrint("Unable to create virtual mapping\n");
-	       KeBugCheck(0);
+	       KEBUGCHECK(0);
 	     }
 	 }
        memset((PVOID)MmPageArray + (i * PAGE_SIZE), 0, PAGE_SIZE);
@@ -556,7 +556,7 @@ MmMarkPageMapped(PHYSICAL_ADDRESS PhysicalAddress)
       if (MmPageArray[Start].Flags.Type == MM_PHYSICAL_PAGE_FREE)
 	{
 	  DbgPrint("Mapping non-used page\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       MmPageArray[Start].MapCount++;
       KeReleaseSpinLock(&PageListLock, oldIrql);
@@ -575,12 +575,12 @@ MmMarkPageUnmapped(PHYSICAL_ADDRESS PhysicalAddress)
       if (MmPageArray[Start].Flags.Type == MM_PHYSICAL_PAGE_FREE)
 	{
 	  DbgPrint("Unmapping non-used page\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       if (MmPageArray[Start].MapCount == 0)
 	{
 	  DbgPrint("Unmapping not mapped page\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       MmPageArray[Start].MapCount--;
       KeReleaseSpinLock(&PageListLock, oldIrql);
@@ -638,7 +638,7 @@ MmReferencePage(PHYSICAL_ADDRESS PhysicalAddress)
 
    if (PhysicalAddress.u.LowPart == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    KeAcquireSpinLock(&PageListLock, &oldIrql);
@@ -646,7 +646,7 @@ MmReferencePage(PHYSICAL_ADDRESS PhysicalAddress)
    if (MmPageArray[Start].Flags.Type != MM_PHYSICAL_PAGE_USED)
      {
 	DbgPrint("Referencing non-used page\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    MmPageArray[Start].ReferenceCount++;
@@ -664,7 +664,7 @@ MmGetReferenceCountPage(PHYSICAL_ADDRESS PhysicalAddress)
 
    if (PhysicalAddress.u.LowPart == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    KeAcquireSpinLock(&PageListLock, &oldIrql);
@@ -672,7 +672,7 @@ MmGetReferenceCountPage(PHYSICAL_ADDRESS PhysicalAddress)
    if (MmPageArray[Start].Flags.Type != MM_PHYSICAL_PAGE_USED)
      {
 	DbgPrint("Getting reference count for free page\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    RCount = MmPageArray[Start].ReferenceCount;
@@ -690,7 +690,7 @@ MmIsUsablePage(PHYSICAL_ADDRESS PhysicalAddress)
 
    if (PhysicalAddress.u.LowPart == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
 
    if (MmPageArray[Start].Flags.Type != MM_PHYSICAL_PAGE_USED &&
@@ -712,7 +712,7 @@ MmDereferencePage(PHYSICAL_ADDRESS PhysicalAddress)
 
    if (PhysicalAddress.u.LowPart == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    KeAcquireSpinLock(&PageListLock, &oldIrql);
@@ -721,7 +721,7 @@ MmDereferencePage(PHYSICAL_ADDRESS PhysicalAddress)
    if (MmPageArray[Start].Flags.Type != MM_PHYSICAL_PAGE_USED)
      {
 	DbgPrint("Dereferencing free page\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
   
    MmPageArray[Start].ReferenceCount--;
@@ -733,29 +733,29 @@ MmDereferencePage(PHYSICAL_ADDRESS PhysicalAddress)
        if (MmPageArray[Start].RmapListHead != NULL)
 	 {
 	   DbgPrint("Freeing page with rmap entries.\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        if (MmPageArray[Start].MapCount != 0)
 	 {
 	   DbgPrint("Freeing mapped page (0x%I64x count %d)\n",
 		    PhysicalAddress, MmPageArray[Start].MapCount);
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        if (MmPageArray[Start].LockCount > 0)
 	 {
 	   DbgPrint("Freeing locked page\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        if (MmPageArray[Start].SavedSwapEntry != 0)
 	 {
 	   DbgPrint("Freeing page with swap entry.\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        if (MmPageArray[Start].Flags.Type != MM_PHYSICAL_PAGE_USED)
 	 {
 	   DbgPrint("Freeing page with flags %x\n",
 		    MmPageArray[Start].Flags.Type);
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        MmPageArray[Start].Flags.Type = MM_PHYSICAL_PAGE_FREE;
        InsertTailList(&FreeUnzeroedPageListHead, 
@@ -780,7 +780,7 @@ MmGetLockCountPage(PHYSICAL_ADDRESS PhysicalAddress)
    
    if (PhysicalAddress.u.LowPart == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    KeAcquireSpinLock(&PageListLock, &oldIrql);
@@ -788,7 +788,7 @@ MmGetLockCountPage(PHYSICAL_ADDRESS PhysicalAddress)
    if (MmPageArray[Start].Flags.Type != MM_PHYSICAL_PAGE_USED)
      {
 	DbgPrint("Getting lock count for free page\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    LockCount = MmPageArray[Start].LockCount;
@@ -807,7 +807,7 @@ MmLockPage(PHYSICAL_ADDRESS PhysicalAddress)
    
    if (PhysicalAddress.u.LowPart == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    KeAcquireSpinLock(&PageListLock, &oldIrql);
@@ -815,7 +815,7 @@ MmLockPage(PHYSICAL_ADDRESS PhysicalAddress)
    if (MmPageArray[Start].Flags.Type != MM_PHYSICAL_PAGE_USED)
      {
 	DbgPrint("Locking free page\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    MmPageArray[Start].LockCount++;
@@ -832,7 +832,7 @@ MmUnlockPage(PHYSICAL_ADDRESS PhysicalAddress)
    
    if (PhysicalAddress.u.LowPart == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    KeAcquireSpinLock(&PageListLock, &oldIrql);
@@ -840,7 +840,7 @@ MmUnlockPage(PHYSICAL_ADDRESS PhysicalAddress)
    if (MmPageArray[Start].Flags.Type != MM_PHYSICAL_PAGE_USED)
      {
 	DbgPrint("Unlocking free page\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    MmPageArray[Start].LockCount--;
@@ -884,12 +884,12 @@ MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry)
   if (PageDescriptor->Flags.Type != MM_PHYSICAL_PAGE_FREE)
     {
       DbgPrint("Got non-free page from freelist\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (PageDescriptor->MapCount != 0)
     {
       DbgPrint("Got mapped page from freelist\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED;
   PageDescriptor->Flags.Consumer = Consumer;
@@ -914,7 +914,7 @@ MmAllocPage(ULONG Consumer, SWAPENTRY SavedSwapEntry)
   if (PageDescriptor->MapCount != 0)
     {
       DbgPrint("Returning mapped page.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   return(PageOffset);
 }
@@ -941,7 +941,7 @@ MmZeroPageThreadMain(PVOID Ignored)
       if (!NT_SUCCESS(Status))
 	{
 	  DbgPrint("ZeroPageThread: Wait failed\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	  return(STATUS_UNSUCCESSFUL);
 	}
 
@@ -972,7 +972,7 @@ MmZeroPageThreadMain(PVOID Ignored)
             if (!NT_SUCCESS(Status))
             {
                DbgPrint("Unable to create virtual mapping\n");
-	       KeBugCheck(0);
+	       KEBUGCHECK(0);
             }
 	 }
          memset(Address, 0, PAGE_SIZE);
@@ -981,7 +981,7 @@ MmZeroPageThreadMain(PVOID Ignored)
 	 if (PageDescriptor->MapCount != 0)
 	   {
 	     DbgPrint("Mapped page on freelist.\n");
-	     KeBugCheck(0);
+	     KEBUGCHECK(0);
 	   }
  	 PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_FREE;
 	 InsertHeadList(&FreeZeroedPageListHead, ListEntry);
diff --git a/reactos/ntoskrnl/mm/i386/page.c b/reactos/ntoskrnl/mm/i386/page.c
index 01f8634e79f..c676dac4fb5 100644
--- a/reactos/ntoskrnl/mm/i386/page.c
+++ b/reactos/ntoskrnl/mm/i386/page.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: page.c,v 1.55 2003/07/13 14:36:32 dwelch Exp $
+/* $Id: page.c,v 1.56 2003/07/21 21:53:53 royce Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/i386/page.c
@@ -95,7 +95,7 @@ ProtectToPTE(ULONG flProtect)
   else
     {
       DPRINT1("Unknown main protection type.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (!(flProtect & PAGE_SYSTEM))
     {
@@ -173,7 +173,7 @@ VOID MmDeletePageTable(PEPROCESS Process, PVOID Address)
    *(ADDR_TO_PDE(Address)) = 0;
    if (Address >= (PVOID)KERNEL_BASE)
      {
-         KeBugCheck(0);
+         KEBUGCHECK(0);
 //       MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0;
      }
    FLUSH_TLB;
@@ -202,7 +202,7 @@ VOID MmFreePageTable(PEPROCESS Process, PVOID Address)
       {
          DbgPrint("Page table entry not clear at %x/%x (is %x)\n",
 		  ((ULONG)Address / 4*1024*1024), i, PageTable[i]);
-	 KeBugCheck(0);
+	 KEBUGCHECK(0);
       }
    }
    npage = *(ADDR_TO_PDE(Address));
@@ -212,7 +212,7 @@ VOID MmFreePageTable(PEPROCESS Process, PVOID Address)
    if (Address >= (PVOID)KERNEL_BASE)
    {
 //    MmGlobalKernelPageDirectory[ADDR_TO_PDE_OFFSET(Address)] = 0;
-      KeBugCheck(0);
+      KEBUGCHECK(0);
    }
    else
    {
@@ -255,7 +255,7 @@ NTSTATUS MmGetPageEntry2(PVOID PAddress, PULONG* Pte, BOOLEAN MayWait)
 	    Status = MmRequestPageMemoryConsumer(MC_NPPOOL, MayWait, &npage);
 	    if (!NT_SUCCESS(Status))
 	    {
-	       KeBugCheck(0);
+	       KEBUGCHECK(0);
 	    }
 	    oldIrql = KeRaiseIrqlToSynchLevel();
 	    /* An other thread can set this pde entry, we must check again */
@@ -405,7 +405,7 @@ MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOL* WasDirty, PHYSIC
      }
    if ((*Pde) == 0)
      {
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    /*
@@ -417,7 +417,7 @@ MmDisableVirtualMapping(PEPROCESS Process, PVOID Address, BOOL* WasDirty, PHYSIC
    WasValid = (PAGE_MASK(Pte) != 0);
    if (!WasValid)
      {
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    /*
@@ -783,7 +783,7 @@ PULONG MmGetPageEntry(PVOID PAddress)
 	    Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &npage);
             if (!NT_SUCCESS(Status))
 	    {
-	       KeBugCheck(0);
+	       KEBUGCHECK(0);
 	    }
 	    MiZeroPage(npage);
 	    oldIrql = KeRaiseIrqlToSynchLevel();
@@ -806,7 +806,7 @@ PULONG MmGetPageEntry(PVOID PAddress)
 	 Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &npage);
          if (!NT_SUCCESS(Status))
 	 {
-	    KeBugCheck(0);
+	    KEBUGCHECK(0);
 	 }
 	 MiZeroPage(npage);
 	 *Pde = npage.u.LowPart | PA_PRESENT | PA_READWRITE | PA_USER;
@@ -846,7 +846,7 @@ MmIsAccessedAndResetAccessPage(PEPROCESS Process, PVOID Address)
        if (((ULONG)Address & ~0xFFF) < KERNEL_BASE)
          {
            DPRINT1("MmIsAccessedAndResetAccessPage is called for user space without a process.\n");
-           KeBugCheck(0);
+           KEBUGCHECK(0);
 	 }
        CurrentProcess = NULL;
      }
@@ -884,7 +884,7 @@ VOID MmSetCleanPage(PEPROCESS Process, PVOID Address)
        if (((ULONG)Address & ~0xFFF) < KERNEL_BASE)
          {
            DPRINT1("MmSetCleanPage is called for user space without a process.\n");
-           KeBugCheck(0);
+           KEBUGCHECK(0);
 	 }
        CurrentProcess = NULL;
      }
@@ -915,7 +915,7 @@ VOID MmSetDirtyPage(PEPROCESS Process, PVOID Address)
        if (((ULONG)Address & ~0xFFF) < KERNEL_BASE)
          {
            DPRINT1("MmSetDirtyPage is called for user space without a process.\n");
-           KeBugCheck(0);
+           KEBUGCHECK(0);
 	 }
        CurrentProcess = NULL;
      }
@@ -981,12 +981,12 @@ MmCreateVirtualMappingForKernel(PVOID Address,
    if (Process == NULL && Address < (PVOID)KERNEL_BASE)
      {
        DPRINT1("No process\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    if (Process != NULL && Address >= (PVOID)KERNEL_BASE)
      {
        DPRINT1("Setting kernel address with process context\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    Attributes = ProtectToPTE(flProtect);
    
@@ -1006,7 +1006,7 @@ MmCreateVirtualMappingForKernel(PVOID Address,
      }
    if (PAGE_MASK((*Pte)) != 0 && !((*Pte) & PA_PRESENT))
      {
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    if (PAGE_MASK((*Pte)) != 0)
      {
@@ -1053,16 +1053,16 @@ MmCreatePageFileMapping(PEPROCESS Process,
   if (Process == NULL && Address < (PVOID)KERNEL_BASE)
     {
       DPRINT1("No process\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
      }
   if (Process != NULL && Address >= (PVOID)KERNEL_BASE)
     {
       DPRINT1("Setting kernel address with process context\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (SwapEntry & (1 << 31))
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   if (Process != NULL && Process != CurrentProcess)
@@ -1126,12 +1126,12 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process,
    if (Process == NULL && Address < (PVOID)KERNEL_BASE)
      {
        DPRINT1("No process\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    if (Process != NULL && Address >= (PVOID)KERNEL_BASE)
      {
        DPRINT1("Setting kernel address with process context\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    MmMarkPageMapped(PhysicalAddress);
    
@@ -1141,7 +1141,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process,
        DPRINT1("Setting physical address but not allowing access at address "
 	       "0x%.8X with attributes %x/%x.\n", 
 	       Address, Attributes, flProtect);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    
    if (Process != NULL && Process != CurrentProcess)
@@ -1160,7 +1160,7 @@ MmCreateVirtualMappingUnsafe(PEPROCESS Process,
      }
    if (PAGE_MASK((*Pte)) != 0 && !((*Pte) & PA_PRESENT))
      {
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    if (PAGE_MASK((*Pte)) != 0)
      {
@@ -1196,7 +1196,7 @@ MmCreateVirtualMapping(PEPROCESS Process,
   if (!MmIsUsablePage(PhysicalAddress))
     {
       DPRINT1("Page at address %x not usable\n", PhysicalAddress);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   
   return(MmCreateVirtualMappingUnsafe(Process,
diff --git a/reactos/ntoskrnl/mm/iospace.c b/reactos/ntoskrnl/mm/iospace.c
index fe3a04a9e7d..96bcdd7f0d6 100644
--- a/reactos/ntoskrnl/mm/iospace.c
+++ b/reactos/ntoskrnl/mm/iospace.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: iospace.c,v 1.20 2003/07/10 21:05:03 royce Exp $
+/* $Id: iospace.c,v 1.21 2003/07/21 21:53:52 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/iospace.c
@@ -109,7 +109,7 @@ MmMapIoSpace (IN PHYSICAL_ADDRESS PhysicalAddress,
 	if (!NT_SUCCESS(Status))
 	  {
 	     DbgPrint("Unable to create virtual mapping\n");
-	     KeBugCheck(0);
+	     KEBUGCHECK(0);
 	  }
 	MmMarkPageMapped((PHYSICAL_ADDRESS) (PhysicalAddress.QuadPart + 
 	                                     (i * PAGE_SIZE)));
diff --git a/reactos/ntoskrnl/mm/kmap.c b/reactos/ntoskrnl/mm/kmap.c
index 51d2f485792..ed22a4ac7a2 100644
--- a/reactos/ntoskrnl/mm/kmap.c
+++ b/reactos/ntoskrnl/mm/kmap.c
@@ -1,4 +1,4 @@
-/* $Id: kmap.c,v 1.25 2003/07/05 18:10:50 hbirr Exp $
+/* $Id: kmap.c,v 1.26 2003/07/21 21:53:52 royce Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -119,7 +119,7 @@ ExAllocatePageWithPhysPage(PHYSICAL_ADDRESS PhysPage)
       if (!NT_SUCCESS(Status))
       {
           DbgPrint("Unable to create virtual mapping\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
       }
       return Addr;
    }
@@ -170,7 +170,7 @@ MiAllocNonPagedPoolRegion(ULONG nr_pages)
    if (Base == 0xFFFFFFFF)
    {
       DbgPrint("CRITICAL: Out of non-paged pool space\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
    }
    if (AllocMapHint == Base)
    {
diff --git a/reactos/ntoskrnl/mm/marea.c b/reactos/ntoskrnl/mm/marea.c
index 27be0448fa2..ad24424ee13 100644
--- a/reactos/ntoskrnl/mm/marea.c
+++ b/reactos/ntoskrnl/mm/marea.c
@@ -377,7 +377,7 @@ MmFreeMemoryArea(PMADDRESS_SPACE AddressSpace,
 					  BaseAddress);
    if (MemoryArea == NULL)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
 	return(STATUS_UNSUCCESSFUL);
      }
    if (AddressSpace->Process != NULL && 
diff --git a/reactos/ntoskrnl/mm/mdl.c b/reactos/ntoskrnl/mm/mdl.c
index 78367d4c700..c87a3e9f48e 100644
--- a/reactos/ntoskrnl/mm/mdl.c
+++ b/reactos/ntoskrnl/mm/mdl.c
@@ -1,4 +1,4 @@
-/* $Id: mdl.c,v 1.52 2003/07/10 21:05:03 royce Exp $
+/* $Id: mdl.c,v 1.53 2003/07/21 21:53:52 royce Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -56,7 +56,7 @@ MmInitializeMdlImplementation(VOID)
   if (!NT_SUCCESS(Status))
     {
       MmUnlockAddressSpace(MmGetKernelAddressSpace());
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   MmUnlockAddressSpace(MmGetKernelAddressSpace());
 
@@ -153,7 +153,7 @@ MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode)
    if (AccessMode == UserMode)
      {
        DPRINT1("MDL mapping to user-mode not yet handled.\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    /* Calculate the number of pages required. */
@@ -167,7 +167,7 @@ MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode)
    if (StartingOffset == 0xffffffff)
    {
       DPRINT1("Out of MDL mapping space\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
    }
 
    Base = MiMdlMappingRegionBase + StartingOffset * PAGE_SIZE;
@@ -192,7 +192,7 @@ MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode)
        if (!NT_SUCCESS(Status))
 	 {
 	   DbgPrint("Unable to create virtual mapping\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
      }
 
diff --git a/reactos/ntoskrnl/mm/mm.c b/reactos/ntoskrnl/mm/mm.c
index acf6dc44e05..99b5d36d228 100644
--- a/reactos/ntoskrnl/mm/mm.c
+++ b/reactos/ntoskrnl/mm/mm.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mm.c,v 1.64 2003/07/11 01:23:15 royce Exp $
+/* $Id: mm.c,v 1.65 2003/07/21 21:53:52 royce Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -82,7 +82,7 @@ NTSTATUS MmReleaseMemoryArea(PEPROCESS Process, PMEMORY_AREA Marea)
 	return(STATUS_SUCCESS);
 
      default:
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    
    return(STATUS_SUCCESS);
diff --git a/reactos/ntoskrnl/mm/mminit.c b/reactos/ntoskrnl/mm/mminit.c
index 6ba8e7acae1..0b5b1874399 100644
--- a/reactos/ntoskrnl/mm/mminit.c
+++ b/reactos/ntoskrnl/mm/mminit.c
@@ -1,4 +1,4 @@
-/* $Id: mminit.c,v 1.53 2003/07/13 14:36:32 dwelch Exp $
+/* $Id: mminit.c,v 1.54 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -237,7 +237,7 @@ VOID MmInitVirtualMemory(ULONG LastKernelAddress,
    if (!NT_SUCCESS(Status))
      {
 	DbgPrint("Unable to create virtual mapping\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    RtlZeroMemory(BaseAddress, Length);
 
diff --git a/reactos/ntoskrnl/mm/mpw.c b/reactos/ntoskrnl/mm/mpw.c
index 3814d64445c..c43ba2e19b9 100644
--- a/reactos/ntoskrnl/mm/mpw.c
+++ b/reactos/ntoskrnl/mm/mpw.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: mpw.c,v 1.15 2003/07/17 16:57:39 silverblade Exp $
+/* $Id: mpw.c,v 1.16 2003/07/21 21:53:53 royce Exp $
  *
  * PROJECT:      ReactOS kernel
  * FILE:         ntoskrnl/mm/mpw.c
@@ -94,7 +94,7 @@ MmMpwThreadMain(PVOID Ignored)
       if (!NT_SUCCESS(Status))
 	{
 	  DbgPrint("MpwThread: Wait failed\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	  return(STATUS_UNSUCCESSFUL);
 	}
       if (MpwThreadShouldTerminate)
diff --git a/reactos/ntoskrnl/mm/npool.c b/reactos/ntoskrnl/mm/npool.c
index 3a56bbafbbc..2d3e7a4219c 100644
--- a/reactos/ntoskrnl/mm/npool.c
+++ b/reactos/ntoskrnl/mm/npool.c
@@ -1,4 +1,4 @@
-/* $Id: npool.c,v 1.70 2003/07/11 01:23:15 royce Exp $
+/* $Id: npool.c,v 1.71 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -926,7 +926,7 @@ static void validate_free_list(void)
 	  {
 	     DbgPrint("Bad block magic (probable pool corruption) at %x\n",
 		      current);
-	     KeBugCheck(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
+	     KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
 	  }
 	
 	if (base_addr < MiNonPagedPoolStart ||
@@ -936,13 +936,13 @@ static void validate_free_list(void)
 	     DbgPrint("Size %d\n",current->Size);
 	     DbgPrint("Limits are %x %x\n",MiNonPagedPoolStart,
 		      MiNonPagedPoolStart+MiCurrentNonPagedPoolLength);
-	     KeBugCheck(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
+	     KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
 	  }
 	blocks_seen++;
 	if (blocks_seen > MiNrFreeBlocks)
 	  {
 	     DbgPrint("Too many blocks on free list\n");
-	     KeBugCheck(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
+	     KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
 	  }
 	if (current->ListEntry.Flink != &MiFreeBlockListHead &&
 	    current->ListEntry.Flink->Blink != &current->ListEntry)
@@ -951,7 +951,7 @@ static void validate_free_list(void)
 		      "current->next->previous %x)\n",
 		      __FILE__,__LINE__,current, current->ListEntry.Flink,
 		      current->ListEntry.Flink->Blink);
-	     KeBugCheck(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
+	     KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
 	  }
 
 	current_entry = current_entry->Flink;
@@ -979,7 +979,7 @@ static void validate_used_list(void)
 	  {
 	     DbgPrint("Bad block magic (probable pool corruption) at %x\n",
 		      current);
-	     KeBugCheck(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
+	     KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
 	  }
 	if (base_addr < MiNonPagedPoolStart ||
 	    (base_addr+current->Size) >
@@ -1028,7 +1028,7 @@ static void check_duplicates(BLOCK_HDR* blk)
 	 {
 	   DbgPrint("Bad block magic (probable pool corruption) at %x\n",
 		    current);
-	   KeBugCheck(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
+	   KEBUGCHECK(/*KBUG_POOL_FREE_LIST_CORRUPT*/0);
 	 }
        
        if ( (int)current > base && (int)current < last ) 
@@ -1390,7 +1390,7 @@ static void* grow_kernel_pool(unsigned int size, ULONG Tag, PVOID Caller)
    if (MiCurrentNonPagedPoolLength + nr_pages * PAGE_SIZE > MiNonPagedPoolLength)
      {
        DbgPrint("CRITICAL: Out of non-paged pool space\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    MiCurrentNonPagedPoolLength += nr_pages * PAGE_SIZE;
    KeReleaseSpinLock(&MmNpoolLock, oldIrql);
@@ -1405,7 +1405,7 @@ static void* grow_kernel_pool(unsigned int size, ULONG Tag, PVOID Caller)
        Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Page);
        if (!NT_SUCCESS(Status))
 	 {
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	   return(NULL);
 	 }
        Status = MmCreateVirtualMapping(NULL,
@@ -1416,7 +1416,7 @@ static void* grow_kernel_pool(unsigned int size, ULONG Tag, PVOID Caller)
 	if (!NT_SUCCESS(Status))
 	  {
 	     DbgPrint("Unable to create virtual mapping\n");
-	     KeBugCheck(0);
+	     KEBUGCHECK(0);
 	  }
      }
 
@@ -1510,7 +1510,7 @@ VOID STDCALL ExFreeNonPagedPool (PVOID block)
 	   DbgPrint("ExFreePool of non-allocated address %x (magic %x)\n", 
 		    block, blk->Magic);
 	 }
-	KeBugCheck(0);
+	KEBUGCHECK(0);
 	return;
      }
    
@@ -1640,7 +1640,7 @@ ExAllocateWholePageBlock(ULONG UserSize)
       Page = MmAllocPage(MC_NPPOOL, 0);
       if (Page.QuadPart == 0LL)
 	{
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       MmCreateVirtualMapping(NULL, 
 			     Address + (i * PAGE_SIZE),
@@ -1662,7 +1662,7 @@ ExFreeWholePageBlock(PVOID Addr)
       Addr >= (MiNonPagedPoolStart + MiCurrentNonPagedPoolLength))
     {
       DbgPrint("Block %x found outside pool area\n", Addr);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   NrPages = *(PULONG)((ULONG)Addr - sizeof(ULONG));
   MiFreeNonPagedPoolRegion((PVOID)PAGE_ROUND_DOWN((ULONG)Addr), NrPages, TRUE);
diff --git a/reactos/ntoskrnl/mm/pagefile.c b/reactos/ntoskrnl/mm/pagefile.c
index 2dcc0c16045..70d5af8c294 100644
--- a/reactos/ntoskrnl/mm/pagefile.c
+++ b/reactos/ntoskrnl/mm/pagefile.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: pagefile.c,v 1.32 2003/07/11 01:23:15 royce Exp $
+/* $Id: pagefile.c,v 1.33 2003/07/21 21:53:53 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/pagefile.c
@@ -133,7 +133,7 @@ NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PMDL Mdl)
    
    if (SwapEntry == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
 	return(STATUS_UNSUCCESSFUL);
      }
    
@@ -143,13 +143,13 @@ NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PMDL Mdl)
    if (i >= MAX_PAGING_FILES)
      {
        DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    if (PagingFileList[i]->FileObject == NULL ||
        PagingFileList[i]->FileObject->DeviceObject == NULL)
      {
        DPRINT1("Bad paging file 0x%.8X\n", SwapEntry);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    
    file_offset.QuadPart = offset * PAGE_SIZE;
@@ -173,7 +173,7 @@ NTSTATUS MmWriteToSwapPage(SWAPENTRY SwapEntry, PMDL Mdl)
    if (j >= RetrievalPointers->NumberOfPairs)
      {
        CHECKPOINT1;
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    KeInitializeEvent(&Event, NotificationEvent, FALSE);
@@ -203,7 +203,7 @@ NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PMDL Mdl)
    
    if (SwapEntry == 0)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
 	return(STATUS_UNSUCCESSFUL);
      }
    
@@ -213,13 +213,13 @@ NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PMDL Mdl)
    if (i >= MAX_PAGING_FILES)
      {
        DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    if (PagingFileList[i]->FileObject == NULL ||
        PagingFileList[i]->FileObject->DeviceObject == NULL)
      {
        DPRINT1("Bad paging file 0x%.8X\n", SwapEntry);
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    
    file_offset.QuadPart = offset * PAGE_SIZE;
@@ -243,7 +243,7 @@ NTSTATUS MmReadFromSwapPage(SWAPENTRY SwapEntry, PMDL Mdl)
    if (j >= RetrievalPointers->NumberOfPairs)
      {
        CHECKPOINT1;
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    KeInitializeEvent(&Event, NotificationEvent, FALSE);
    Status = IoPageRead(PagingFileList[i]->FileObject,
@@ -364,7 +364,7 @@ MmFreeSwapPage(SWAPENTRY Entry)
    KeAcquireSpinLock(&PagingFileListLock, &oldIrql);
    if (PagingFileList[i] == NULL)
      {
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock);
    
@@ -410,7 +410,7 @@ MmAllocSwapPage(VOID)
 	     off = MiAllocPageFromPagingFile(PagingFileList[i]);
 	     if (off == 0xFFFFFFFF)
 	       {
-		  KeBugCheck(0);
+		  KEBUGCHECK(0);
 		  KeReleaseSpinLock(&PagingFileListLock, oldIrql);
 		  return(STATUS_UNSUCCESSFUL);
 	       }
@@ -424,7 +424,7 @@ MmAllocSwapPage(VOID)
      }
    
    KeReleaseSpinLock(&PagingFileListLock, oldIrql); 
-   KeBugCheck(0);
+   KEBUGCHECK(0);
    return(0);
 }
 
diff --git a/reactos/ntoskrnl/mm/pageop.c b/reactos/ntoskrnl/mm/pageop.c
index 4c7e2304add..19cca9f0f92 100644
--- a/reactos/ntoskrnl/mm/pageop.c
+++ b/reactos/ntoskrnl/mm/pageop.c
@@ -1,4 +1,4 @@
-/* $Id: pageop.c,v 1.16 2003/04/26 23:13:32 hyperion Exp $
+/* $Id: pageop.c,v 1.17 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -67,7 +67,7 @@ MmReleasePageOp(PMM_PAGEOP PageOp)
       PrevPageOp = PrevPageOp->Next;
     }
   KeReleaseSpinLock(&MmPageOpHashTableLock, oldIrql);
-  KeBugCheck(0);
+  KEBUGCHECK(0);
 }
 
 PMM_PAGEOP
diff --git a/reactos/ntoskrnl/mm/pager.c b/reactos/ntoskrnl/mm/pager.c
index 87f0e05a37b..69a4328facb 100644
--- a/reactos/ntoskrnl/mm/pager.c
+++ b/reactos/ntoskrnl/mm/pager.c
@@ -1,4 +1,4 @@
-/* $Id: pager.c,v 1.14 2003/07/17 16:57:39 silverblade Exp $
+/* $Id: pager.c,v 1.15 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -69,7 +69,7 @@ MmPagerThreadMain(PVOID Ignored)
        if (!NT_SUCCESS(Status))
 	 {
 	   DbgPrint("PagerThread: Wait failed\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        if (PagerThreadShouldTerminate)
 	 {
diff --git a/reactos/ntoskrnl/mm/pool.c b/reactos/ntoskrnl/mm/pool.c
index 86bf23b5296..fbc05cbfcf7 100644
--- a/reactos/ntoskrnl/mm/pool.c
+++ b/reactos/ntoskrnl/mm/pool.c
@@ -1,4 +1,4 @@
-/* $Id: pool.c,v 1.18 2003/07/11 01:23:15 royce Exp $
+/* $Id: pool.c,v 1.19 2003/07/21 21:53:53 royce Exp $
  * 
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -62,7 +62,7 @@ EiAllocatePool(POOL_TYPE PoolType,
    if ((PoolType==NonPagedPoolMustSucceed || 
 	PoolType==NonPagedPoolCacheAlignedMustS) && Block==NULL)     
      {
-	KeBugCheck(MUST_SUCCEED_POOL_EMPTY);
+	KEBUGCHECK(MUST_SUCCEED_POOL_EMPTY);
      }
    return(Block);
 }
diff --git a/reactos/ntoskrnl/mm/rmap.c b/reactos/ntoskrnl/mm/rmap.c
index 662dc2ab3ae..ecf5025dfa5 100644
--- a/reactos/ntoskrnl/mm/rmap.c
+++ b/reactos/ntoskrnl/mm/rmap.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: rmap.c,v 1.22 2003/07/19 08:02:51 hbirr Exp $
+/* $Id: rmap.c,v 1.23 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -95,7 +95,7 @@ MmWritePagePhysicalAddress(PHYSICAL_ADDRESS PhysicalAddress)
   Address = entry->Address;
   if ((((ULONG)Address) & 0xFFF) != 0)
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (Address < (PVOID)KERNEL_BASE)
     {
@@ -144,7 +144,7 @@ MmWritePagePhysicalAddress(PHYSICAL_ADDRESS PhysicalAddress)
       if (PageOp == NULL)
 	{
 	  DPRINT1("MmGetPageOp failed\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
 
 
@@ -205,7 +205,7 @@ MmWritePagePhysicalAddress(PHYSICAL_ADDRESS PhysicalAddress)
     }
   else
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }  
   if (Address < (PVOID)KERNEL_BASE)
     {
@@ -238,7 +238,7 @@ MmPageOutPhysicalAddress(PHYSICAL_ADDRESS PhysicalAddress)
   Address = entry->Address;
   if ((((ULONG)Address) & 0xFFF) != 0)
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   if (Address < (PVOID)KERNEL_BASE)
@@ -282,7 +282,7 @@ MmPageOutPhysicalAddress(PHYSICAL_ADDRESS PhysicalAddress)
       if (PageOp == NULL)
 	{
 	  DPRINT1("MmGetPageOp failed\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
 
       if (PageOp->Thread != PsGetCurrentThread())
@@ -341,7 +341,7 @@ MmPageOutPhysicalAddress(PHYSICAL_ADDRESS PhysicalAddress)
     }
   else
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (Address < (PVOID)KERNEL_BASE)
     {
@@ -360,7 +360,7 @@ MmSetCleanAllRmaps(PHYSICAL_ADDRESS PhysicalAddress)
   if (current_entry == NULL)
     {
       DPRINT1("MmIsDirtyRmap: No rmaps.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   while (current_entry != NULL)
     {      
@@ -380,7 +380,7 @@ MmSetDirtyAllRmaps(PHYSICAL_ADDRESS PhysicalAddress)
   if (current_entry == NULL)
     {
       DPRINT1("MmIsDirtyRmap: No rmaps.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   while (current_entry != NULL)
     {      
@@ -427,7 +427,7 @@ MmInsertRmap(PHYSICAL_ADDRESS PhysicalAddress, PEPROCESS Process,
   new_entry = ExAllocateFromNPagedLookasideList(&RmapLookasideList);
   if (new_entry == NULL)
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   new_entry->Address = Address;
   new_entry->Process = Process;
@@ -439,7 +439,7 @@ MmInsertRmap(PHYSICAL_ADDRESS PhysicalAddress, PEPROCESS Process,
 	      "address 0x%.8X\n", Process->UniqueProcessId, Address, 
 	      MmGetPhysicalAddressForProcess(Process, Address), 
 	      PhysicalAddress)
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   ExAcquireFastMutex(&RmapListLock);
@@ -462,7 +462,7 @@ MmDeleteAllRmaps(PHYSICAL_ADDRESS PhysicalAddress, PVOID Context,
   if (current_entry == NULL)
     {
       DPRINT1("MmDeleteAllRmaps: No rmaps.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   MmSetRmapListHeadPage(PhysicalAddress, NULL);
   while (current_entry != NULL)
@@ -508,5 +508,5 @@ MmDeleteRmap(PHYSICAL_ADDRESS PhysicalAddress, PEPROCESS Process,
       previous_entry = current_entry;
       current_entry = current_entry->Next;
     }
-  KeBugCheck(0);
+  KEBUGCHECK(0);
 }
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index c03f5111ccc..456eefe1ff3 100644
--- a/reactos/ntoskrnl/mm/section.c
+++ b/reactos/ntoskrnl/mm/section.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: section.c,v 1.123 2003/07/14 20:14:11 hbirr Exp $
+/* $Id: section.c,v 1.124 2003/07/21 21:53:53 royce Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/section.c
@@ -111,7 +111,7 @@ MmFreeSectionSegments(PFILE_OBJECT FileObject)
 	    {
 	      DPRINT1("Image segment %d still referenced (was %d)\n", i,
 		      SectionSegments[i].ReferenceCount);
-	      KeBugCheck(0);
+	      KEBUGCHECK(0);
 	    }
 	  MmFreePageTablesSectionSegment(&SectionSegments[i]);
 	}
@@ -128,7 +128,7 @@ MmFreeSectionSegments(PFILE_OBJECT FileObject)
       if (Segment->ReferenceCount != 0)
 	{
 	  DPRINT1("Data segment still referenced\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       MmFreePageTablesSectionSegment(Segment);
       ExFreePool(Segment);
@@ -173,7 +173,7 @@ MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
 				   TAG_SECTION_PAGE_TABLE);
 	   if (Table == NULL)
 	     {
-               KeBugCheck(0);
+               KEBUGCHECK(0);
 	     }
 	   memset(Table, 0, sizeof(SECTION_PAGE_TABLE));
 	   DPRINT("Table %x\n", Table);
@@ -224,16 +224,16 @@ MmSharePageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
   if (Entry == 0)
     {
       DPRINT1("Entry == 0 for MmSharePageEntrySectionSegment\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (SHARE_COUNT_FROM_SSE(Entry) == MAX_SHARE_COUNT)
     {
       DPRINT1("Maximum share count reached\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (IS_SWAP_FROM_SSE(Entry))
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) + 1);
   MmSetPageEntrySectionSegment(Segment, Offset, Entry);
@@ -251,16 +251,16 @@ MmUnsharePageEntrySectionSegment(PSECTION_OBJECT Section,
   if (Entry == 0)
     {
       DPRINT1("Entry == 0 for MmSharePageEntrySectionSegment\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (SHARE_COUNT_FROM_SSE(Entry) == 0)
     {
       DPRINT1("Zero share count for unshare\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (IS_SWAP_FROM_SSE(Entry))
     {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   Entry = MAKE_SSE(PAGE_FROM_SSE(Entry), SHARE_COUNT_FROM_SSE(Entry) - 1);
   /*
@@ -295,7 +295,7 @@ MmUnsharePageEntrySectionSegment(PSECTION_OBJECT Section,
 	      if (!NT_SUCCESS(Status))
 		{
 		  DPRINT1("CcRosUnmapCacheSegment failed, status = %x\n", Status);
-		  KeBugCheck(0);
+		  KEBUGCHECK(0);
 		}
 	    }
 	}
@@ -598,7 +598,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
    if (PageOp == NULL)
      {
        DPRINT1("MmGetPageOp failed\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    /*
@@ -622,12 +622,12 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (Status != STATUS_SUCCESS)
 	 {
 	   DPRINT1("Failed to wait for page op, status = %x\n", Status);
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        if (PageOp->Status == STATUS_PENDING)
 	 {
 	   DPRINT1("Woke for page op before completion\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        MmLockAddressSpace(AddressSpace);
        /*
@@ -691,7 +691,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
 	   if (!NT_SUCCESS(Status))
 	     {
 	       DbgPrint("Unable to create virtual mapping\n");
-	       KeBugCheck(0);
+	       KEBUGCHECK(0);
 	     }
 	   MmInsertRmap(Page, MemoryArea->Process, (PVOID)PAddress);
 	 }
@@ -721,7 +721,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (Segment->Flags & MM_PAGEFILE_SEGMENT)
          {
 	   DPRINT1("Found a swaped out private page in a pagefile section.\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
 
        MmUnlockSectionSegment(Segment);
@@ -731,7 +731,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page);
        if (!NT_SUCCESS(Status))
 	 {
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
 
        Mdl = MmCreateMdl(NULL, NULL, PAGE_SIZE);
@@ -740,7 +740,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (!NT_SUCCESS(Status))
 	 {
 	   DPRINT1("MmReadFromSwapPage failed, status = %x\n", Status);
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        MmLockAddressSpace(AddressSpace);
        Status = MmCreateVirtualMapping(AddressSpace->Process,		      
@@ -761,7 +761,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (!NT_SUCCESS(Status))
 	 {
 	   DPRINT("MmCreateVirtualMapping failed, not out of memory\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	   return(Status);
 	 }
 
@@ -817,7 +817,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (!NT_SUCCESS(Status))
 	 {
 	   DPRINT("MmCreateVirtualMapping failed, not out of memory\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	   return(Status);
 	 }
        /* 
@@ -854,7 +854,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
 	 }
        if (!NT_SUCCESS(Status))
          {
-           KeBugCheck(0);
+           KEBUGCHECK(0);
          }
        Status = MmCreateVirtualMapping(AddressSpace->Process,
 				       Address,
@@ -875,7 +875,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (!NT_SUCCESS(Status))
 	 {
 	   DPRINT("MmCreateVirtualMapping failed, not out of memory\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	   return(Status);
 	 }
        MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress);
@@ -951,7 +951,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (Entry != Entry1)
 	 {
 	   DbgPrint("Someone changed ppte entry while we slept\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        
        /*
@@ -980,7 +980,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (!NT_SUCCESS(Status))
          {
            DbgPrint("Unable to create virtual mapping\n");
-           KeBugCheck(0);
+           KEBUGCHECK(0);
          }
        MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress);
 
@@ -1011,7 +1011,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page);
        if (!NT_SUCCESS(Status))
 	 {
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
 
        Mdl = MmCreateMdl(NULL, NULL, PAGE_SIZE);
@@ -1019,7 +1019,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        Status = MmReadFromSwapPage(SwapEntry, Mdl);
        if (!NT_SUCCESS(Status))
 	 {
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
 
        /*
@@ -1036,7 +1036,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (Entry != Entry1)
 	 {
 	   DbgPrint("Someone changed ppte entry while we slept\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        
        /*
@@ -1069,7 +1069,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (!NT_SUCCESS(Status))
          {
            DbgPrint("Unable to create virtual mapping\n");
-           KeBugCheck(0);
+           KEBUGCHECK(0);
          }
        MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress);
        if (Locked)
@@ -1112,7 +1112,7 @@ MmNotPresentFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (!NT_SUCCESS(Status))
          {
            DbgPrint("Unable to create virtual mapping\n");
-           KeBugCheck(0);
+           KEBUGCHECK(0);
          }
        MmInsertRmap(Page, AddressSpace->Process, (PVOID)PAddress);
        if (Locked)
@@ -1199,7 +1199,7 @@ MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace,
    if (PageOp == NULL)
      {
        DPRINT1("MmGetPageOp failed\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 
    /*
@@ -1220,12 +1220,12 @@ MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace,
        if (Status == STATUS_TIMEOUT)
 	 {
 	   DPRINT1("Failed to wait for page op, status = %x\n", Status);
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        if (PageOp->Status == STATUS_PENDING)
 	 {
 	   DPRINT1("Woke for page op before completion\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        /*
 	* Restart the operation
@@ -1248,7 +1248,7 @@ MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace,
    Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &NewPage);
    if (!NT_SUCCESS(Status))
    {
-     KeBugCheck(0);
+     KEBUGCHECK(0);
    }
 
    /*
@@ -1287,14 +1287,14 @@ MmAccessFaultSectionView(PMADDRESS_SPACE AddressSpace,
    if (!NT_SUCCESS(Status))
      {
        DPRINT("MmCreateVirtualMapping failed, not out of memory\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
        return(Status);
      }
    MmInsertRmap(NewPage, AddressSpace->Process, (PVOID)PAddress);
    if (!NT_SUCCESS(Status))
      {
        DbgPrint("Unable to create virtual mapping\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
    if (Locked)
      {
@@ -1405,7 +1405,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
       DPRINT1("Trying to page out from physical memory section address 0x%X "
 	      "process %d\n", Address, 
 	      AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   /*
@@ -1416,7 +1416,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
     {
       DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n",
 	  AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0, Address);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   PhysicalAddress = 
     MmGetPhysicalAddressForProcess(AddressSpace->Process, Address);
@@ -1450,7 +1450,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
 	  DPRINT1("SwapEntry != 0 was 0x%.8X at address 0x%.8X, "
 		  "paddress 0x%.8X\n", SwapEntry, Address, 
 		  PhysicalAddress);
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
 
       /*
@@ -1459,7 +1459,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
       if (Context.Private)
 	{
 	  DPRINT1("Had private copy of read-only page.\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       
       /*
@@ -1470,7 +1470,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
       if (Context.WasDirty)
 	{
 	  DPRINT1("Had a dirty page of a read-only page.\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
 
       PageOp->Status = STATUS_SUCCESS;
@@ -1491,7 +1491,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
       if(!MiIsPageFromCache(MemoryArea, Context.Offset))
         {
 	  DPRINT1("Direct mapped non private page is not associated with the cache.\n")
-          KeBugCheck(0);
+          KEBUGCHECK(0);
         }
     }
   else
@@ -1510,7 +1510,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
       if (!(Context.Segment->Flags & MM_PAGEFILE_SEGMENT))
         {
 	  CHECKPOINT1;
-          KeBugCheck(0);
+          KEBUGCHECK(0);
 	}
     }
 
@@ -1536,7 +1536,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
 		      "process %d address 0x%.8X\n",
 		      AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0,
 		      Address);	      
-	      KeBugCheck(0);
+	      KEBUGCHECK(0);
 	    }
 	  else
 	    {
@@ -1545,7 +1545,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
 					       SwapEntry);
 	      if (!NT_SUCCESS(Status))
 		{
-		  KeBugCheck(0);
+		  KEBUGCHECK(0);
 		}
 	    }
 	}
@@ -1555,7 +1555,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
           if (!NT_SUCCESS(Status))
             {
               DPRINT1("CCRosUnmapCacheSegment failed, status = %x\n", Status);
-              KeBugCheck(0);
+              KEBUGCHECK(0);
 	    }
 	}
       else
@@ -1580,7 +1580,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
       if (!NT_SUCCESS(Status))
         {
           DPRINT1("CcRosUnmapCacheSegment failed, status = %x\n", Status);
-          KeBugCheck(0);
+          KEBUGCHECK(0);
 	}
       PageOp->Status = STATUS_SUCCESS;
       KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE);
@@ -1699,7 +1699,7 @@ MmPageOutSectionView(PMADDRESS_SPACE AddressSpace,
 				       SwapEntry);
       if (!NT_SUCCESS(Status))
 	{
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
     }
   else
@@ -1773,7 +1773,7 @@ MmWritePageSectionView(PMADDRESS_SPACE AddressSpace,
       DPRINT1("Trying to write back page from physical memory mapped at %X "
 	      "process %d\n", Address, 
 	      AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   /*
@@ -1784,7 +1784,7 @@ MmWritePageSectionView(PMADDRESS_SPACE AddressSpace,
     {
       DPRINT1("Trying to page out not-present page at (%d,0x%.8X).\n",
 	  AddressSpace->Process ? AddressSpace->Process->UniqueProcessId : 0, Address);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   PhysicalAddress = 
     MmGetPhysicalAddressForProcess(AddressSpace->Process, Address);
@@ -2109,7 +2109,7 @@ MmCreatePhysicalMemorySection(VOID)
   if (!NT_SUCCESS(Status))
     {
       DbgPrint("Failed to create PhysicalMemory section\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   Status = ObReferenceObjectByHandle(PhysSectionH,
 				     SECTION_ALL_ACCESS,
@@ -2120,7 +2120,7 @@ MmCreatePhysicalMemorySection(VOID)
   if (!NT_SUCCESS(Status))
     {
       DbgPrint("Failed to reference PhysicalMemory section\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   PhysSection->AllocationAttributes |= SEC_PHYSICALMEMORY;
   ObDereferenceObject((PVOID)PhysSection);
@@ -3182,7 +3182,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
      if (Status != STATUS_SUCCESS)
        {
          DPRINT1("Failed to wait for page op, status = %x\n", Status);
-	 KeBugCheck(0);
+	 KEBUGCHECK(0);
        }
 
      MmLockAddressSpace(&MArea->Process->AddressSpace);
@@ -3217,7 +3217,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
       if (Segment->Flags & MM_PAGEFILE_SEGMENT)
         {
 	  DPRINT1("Found a swap entry for a page in a pagefile section.\n");
-	  KeBugCheck(0);
+	  KEBUGCHECK(0);
 	}
       MmFreeSwapPage(SwapEntry);
     }
@@ -3232,7 +3232,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
           if (Segment->Flags & MM_PAGEFILE_SEGMENT)
             {
 	      DPRINT1("Found a private page in a pagefile section.\n");
-	      KeBugCheck(0);
+	      KEBUGCHECK(0);
 	    }
 	  /*
 	   * Just dereference private pages
@@ -3532,7 +3532,7 @@ MmAllocateSection (IN ULONG Length)
        if (!NT_SUCCESS(Status))
 	 {
 	   DbgPrint("Unable to allocate page\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
        Status = MmCreateVirtualMapping (NULL,
 					(Result + (i * PAGE_SIZE)),
@@ -3542,7 +3542,7 @@ MmAllocateSection (IN ULONG Length)
        if (!NT_SUCCESS(Status))
 	 {
 	   DbgPrint("Unable to create virtual mapping\n");
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
      }
    return ((PVOID)Result);
diff --git a/reactos/ntoskrnl/mm/slab.c b/reactos/ntoskrnl/mm/slab.c
index c4c8e6f417f..934c8e33152 100644
--- a/reactos/ntoskrnl/mm/slab.c
+++ b/reactos/ntoskrnl/mm/slab.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: slab.c,v 1.8 2002/10/01 19:27:24 chorns Exp $
+/* $Id: slab.c,v 1.9 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -182,7 +182,7 @@ ExAllocateSlabCache(PSLAB_CACHE Slab, BOOLEAN MayWait)
   if (Page->FirstFreeBuffer == NULL)
     {
       DPRINT1("First free page had no free buffers.\n");
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   /*
@@ -284,7 +284,7 @@ ExFreeSlabCache(PSLAB_CACHE Slab, PVOID Object)
 	}
     }
   DPRINT1("Tried to free object not in cache.\n");
-  KeBugCheck(0);
+  KEBUGCHECK(0);
 }
 
 VOID
diff --git a/reactos/ntoskrnl/nt/profile.c b/reactos/ntoskrnl/nt/profile.c
index d7b4a756b42..7263ef3e730 100644
--- a/reactos/ntoskrnl/nt/profile.c
+++ b/reactos/ntoskrnl/nt/profile.c
@@ -328,7 +328,7 @@ VOID KiRemoveProfile(PKPROFILE Profile)
 
 	  current_entry = current_entry->Flink;
 	}
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
 
   KeReleaseSpinLock(&ProfileListLock, oldIrql);
diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c
index b8be14e4ce5..950c61269f6 100644
--- a/reactos/ntoskrnl/ob/object.c
+++ b/reactos/ntoskrnl/ob/object.c
@@ -1,4 +1,4 @@
-/* $Id: object.c,v 1.64 2003/07/10 21:34:29 royce Exp $
+/* $Id: object.c,v 1.65 2003/07/21 21:53:53 royce Exp $
  * 
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -597,13 +597,13 @@ ObpPerformRetentionChecks(POBJECT_HEADER Header)
     {
       CPRINT("Object %x/%x has invalid reference count (%d)\n",
 	     Header, HEADER_TO_BODY(Header), Header->RefCount);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   if (Header->HandleCount < 0)
     {
       CPRINT("Object %x/%x has invalid handle count (%d)\n",
 	     Header, HEADER_TO_BODY(Header), Header->HandleCount);
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   
   if (Header->RefCount == 0 &&
@@ -612,7 +612,7 @@ ObpPerformRetentionChecks(POBJECT_HEADER Header)
     {
       if (Header->CloseInProcess)
       {
-	 KeBugCheck(0);
+	 KEBUGCHECK(0);
 	 return STATUS_UNSUCCESSFUL;
       }
       Header->CloseInProcess = TRUE;
@@ -660,7 +660,7 @@ ObfReferenceObject(IN PVOID Object)
 
   if (Header->CloseInProcess)
   {
-      KeBugCheck(0);
+      KEBUGCHECK(0);
   }
   InterlockedIncrement(&Header->RefCount);
 
diff --git a/reactos/ntoskrnl/ps/create.c b/reactos/ntoskrnl/ps/create.c
index ad411378fa5..7ad1706b577 100644
--- a/reactos/ntoskrnl/ps/create.c
+++ b/reactos/ntoskrnl/ps/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.63 2003/07/11 01:23:15 royce Exp $
+/* $Id: create.c,v 1.64 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -455,7 +455,7 @@ PsCreateTeb(HANDLE ProcessHandle,
 	if (!NT_SUCCESS(Status))
 	  {
 	     CPRINT("NtQueryVirtualMemory (Status %x)\n", Status);
-	     KeBugCheck(0);
+	     KEBUGCHECK(0);
 	  }
 	/* FIXME: Race between this and the above check */
 	if (Info.State == MEM_FREE)
diff --git a/reactos/ntoskrnl/ps/kill.c b/reactos/ntoskrnl/ps/kill.c
index 3e35725019a..08ee4332458 100644
--- a/reactos/ntoskrnl/ps/kill.c
+++ b/reactos/ntoskrnl/ps/kill.c
@@ -1,4 +1,4 @@
-/* $Id: kill.c,v 1.61 2003/07/11 01:23:15 royce Exp $
+/* $Id: kill.c,v 1.62 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -123,7 +123,7 @@ PsReapThreads(VOID)
 		  if (!NT_SUCCESS(Status))
 		  {
 		     DPRINT1("ObCreateHandle failed, status = %x\n", Status);
-		     KeBugCheck(0);
+		     KEBUGCHECK(0);
 		  }
 		  Offset = FIELD_OFFSET(TEB, DeallocationStack);
 		  Length = 0;
@@ -189,7 +189,7 @@ PsTerminateCurrentThread(NTSTATUS ExitStatus)
    KeAcquireSpinLock(&PiThreadListLock, &oldIrql);   
    PsDispatchThreadNoLock(THREAD_STATE_TERMINATED_1);
 DPRINT1("Unexpected return, CurrentThread %x PsGetCurrentThread() %x\n", CurrentThread, PsGetCurrentThread());
-   KeBugCheck(0);
+   KEBUGCHECK(0);
 }
 
 VOID STDCALL
diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index dfd93d4baf1..ee3ff5af3c6 100644
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.109 2003/07/11 01:23:15 royce Exp $
+/* $Id: process.c,v 1.110 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -92,7 +92,7 @@ PsGetNextProcess(PEPROCESS OldProcess)
    if (!NT_SUCCESS(Status))
      {
 	CPRINT("PsGetNextProcess(): ObReferenceObjectByPointer failed\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    ObDereferenceObject(OldProcess);
    
@@ -561,7 +561,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle,
 				  DUPLICATE_SAME_ACCESS);
        if (!NT_SUCCESS(Status))
 	 {
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
      }
    else
@@ -581,7 +581,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle,
 				  DUPLICATE_SAME_ACCESS);
        if (!NT_SUCCESS(Status))
 	 {
-	   KeBugCheck(0);
+	   KEBUGCHECK(0);
 	 }
      }
    else
@@ -677,7 +677,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle,
      {
 	MmUnlockAddressSpace(&Process->AddressSpace);
 	DPRINT1("Failed to protect the highest 64KB of the process address space\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
 
    /* Protect the lowest 64KB of the process address space */
@@ -696,7 +696,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle,
      {
 	MmUnlockAddressSpace(&Process->AddressSpace);
 	DPRINT1("Failed to protect the lowest 64KB of the process address space\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
 #endif
 
@@ -715,7 +715,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle,
      {
 	MmUnlockAddressSpace(&Process->AddressSpace);
 	DPRINT1("Failed to protect the memory above the shared user page\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
 
    /* Create the shared data page */
@@ -733,7 +733,7 @@ NtCreateProcess(OUT PHANDLE ProcessHandle,
    if (!NT_SUCCESS(Status))
      {
 	DPRINT1("Failed to create shared data page\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
 
    /*
diff --git a/reactos/ntoskrnl/ps/thread.c b/reactos/ntoskrnl/ps/thread.c
index b55cc1b8bfd..c526c50726f 100644
--- a/reactos/ntoskrnl/ps/thread.c
+++ b/reactos/ntoskrnl/ps/thread.c
@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.114 2003/07/17 16:57:39 silverblade Exp $
+/* $Id: thread.c,v 1.115 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -84,7 +84,7 @@ PsInsertIntoThreadList(KPRIORITY Priority, PETHREAD Thread)
    if (Priority >= MAXIMUM_PRIORITY || Priority < 0)
      {
 	DPRINT1("Invalid thread priority\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    InsertTailList(&PriorityListHead[Priority], &Thread->Tcb.QueueListEntry);
    PiNrReadyThreads++;
@@ -248,7 +248,7 @@ VOID PsDispatchThreadNoLock (ULONG NewThreadStatus)
 	  }
      }
    CPRINT("CRITICAL: No threads are ready\n");
-   KeBugCheck(0);
+   KEBUGCHECK(0);
 }
 
 VOID STDCALL
@@ -470,7 +470,7 @@ PsInitThreadManagment(VOID)
    if (!NT_SUCCESS(Status))
      {
        DPRINT1("PS: Failed to create reaper thread.\n");
-       KeBugCheck(0);
+       KEBUGCHECK(0);
      }
 }
 
@@ -507,7 +507,7 @@ KeSetPriorityThread (PKTHREAD Thread, KPRIORITY Priority)
    
    if (Priority < 0 || Priority >= MAXIMUM_PRIORITY)
      {
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    
    OldPriority = Thread->Priority;
@@ -596,7 +596,7 @@ NtContinue(IN PCONTEXT	Context,
    if (TrapFrame == NULL)
      {
 	CPRINT("NtContinue called but TrapFrame was NULL\n");
-	KeBugCheck(0);
+	KEBUGCHECK(0);
      }
    KeContextToTrapFrame(Context, TrapFrame);
    return(STATUS_SUCCESS);
diff --git a/reactos/ntoskrnl/ps/w32call.c b/reactos/ntoskrnl/ps/w32call.c
index 8ed7e97dc6d..630e6d67f5c 100644
--- a/reactos/ntoskrnl/ps/w32call.c
+++ b/reactos/ntoskrnl/ps/w32call.c
@@ -1,4 +1,4 @@
-/* $Id: w32call.c,v 1.6 2003/05/17 15:29:50 ekohl Exp $
+/* $Id: w32call.c,v 1.7 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:              See COPYING in the top level directory
  * PROJECT:                ReactOS kernel
@@ -117,7 +117,7 @@ NtCallbackReturn (PVOID		Result,
   KeStackSwitchAndRet((PVOID)(OldStack + 1));
 
   /* Should never return. */
-  KeBugCheck(0);
+  KEBUGCHECK(0);
   return(STATUS_UNSUCCESSFUL);
 }
 
diff --git a/reactos/ntoskrnl/rtl/nls.c b/reactos/ntoskrnl/rtl/nls.c
index b927596ea8f..86accd9b104 100644
--- a/reactos/ntoskrnl/rtl/nls.c
+++ b/reactos/ntoskrnl/rtl/nls.c
@@ -1,4 +1,4 @@
-/* $Id: nls.c,v 1.17 2003/07/11 01:23:15 royce Exp $
+/* $Id: nls.c,v 1.18 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -98,7 +98,7 @@ RtlpCreateInitialNlsTables(VOID)
       NlsOemCodePageTable == NULL || NlsOemCodePageTableSize == 0 ||
       NlsUnicodeCasemapTable == NULL || NlsUnicodeCasemapTableSize == 0)
     {
-      KeBugCheckEx (0x32, STATUS_UNSUCCESSFUL, 1, 0, 0);
+      KEBUGCHECKEX (0x32, STATUS_UNSUCCESSFUL, 1, 0, 0);
     }
 
   RtlInitNlsTables (NlsAnsiCodePageTable,
@@ -139,7 +139,7 @@ RtlpCreateNlsSection(VOID)
   if (!NT_SUCCESS(Status))
     {
       DPRINT1("NtCreateSection() failed\n");
-      KeBugCheckEx(0x32, Status, 1, 1, 0);
+      KEBUGCHECKEX(0x32, Status, 1, 1, 0);
     }
 
   Status = ObReferenceObjectByHandle(SectionHandle,
@@ -152,7 +152,7 @@ RtlpCreateNlsSection(VOID)
   if (!NT_SUCCESS(Status))
     {
       DPRINT1("ObReferenceObjectByHandle() failed\n");
-      KeBugCheckEx(0x32, Status, 1, 2, 0);
+      KEBUGCHECKEX(0x32, Status, 1, 2, 0);
     }
 
   Status = MmMapViewInSystemSpace(NlsSectionObject,
@@ -162,7 +162,7 @@ RtlpCreateNlsSection(VOID)
   if (!NT_SUCCESS(Status))
     {
       DPRINT1("MmMapViewInSystemSpace() failed\n");
-      KeBugCheckEx(0x32, Status, 1, 3, 0);
+      KEBUGCHECKEX(0x32, Status, 1, 3, 0);
     }
 
   DPRINT("NlsSection: Base %p  Size %lx\n", 
diff --git a/reactos/subsys/win32k/ntuser/timer.c b/reactos/subsys/win32k/ntuser/timer.c
index e481fd301f8..66a9ca7136c 100644
--- a/reactos/subsys/win32k/ntuser/timer.c
+++ b/reactos/subsys/win32k/ntuser/timer.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: timer.c,v 1.5 2003/07/06 23:04:19 hyperion Exp $
+/* $Id: timer.c,v 1.6 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -331,7 +331,7 @@ TimerThreadMain(
       if (!NT_SUCCESS(Status))
       {
          DPRINT1("Error waiting in TimerThreadMain\n");
-         KeBugCheck(0);
+         KEBUGCHECK(0);
       }
 
       ExAcquireFastMutex(&Mutex);
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index 2d88f8cf409..29f29df3145 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.64 2003/07/17 07:49:15 gvg Exp $
+/* $Id: window.c,v 1.65 2003/07/21 21:53:53 royce Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -1241,7 +1241,7 @@ DestroyThreadWindows(struct _ETHREAD *Thread)
   if (Win32Thread->WindowListHead.Flink == LastHead)
     {
       /* Window at head of list was not removed, should never happen, infinite loop */
-      KeBugCheck(0);
+      KEBUGCHECK(0);
     }
   ExReleaseFastMutexUnsafe(&Win32Thread->WindowListLock);
 }