From b1a58d7d7e3e452acef7cd6ac2d4e340d28e814d Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Fri, 22 Oct 2004 20:43:58 +0000
Subject: [PATCH] Use upper-case ASSERT macros.

svn path=/trunk/; revision=11390
---
 reactos/ntoskrnl/io/cntrller.c      | 12 +++----
 reactos/ntoskrnl/io/create.c        |  8 ++---
 reactos/ntoskrnl/io/device.c        |  6 ++--
 reactos/ntoskrnl/io/file.c          | 12 +++----
 reactos/ntoskrnl/io/fs.c            | 10 +++---
 reactos/ntoskrnl/io/irp.c           | 26 +++++++-------
 reactos/ntoskrnl/io/mailslot.c      |  2 +-
 reactos/ntoskrnl/io/mdl.c           |  4 +--
 reactos/ntoskrnl/io/npipe.c         |  2 +-
 reactos/ntoskrnl/io/pnpmgr.c        | 17 ++-------
 reactos/ntoskrnl/io/rawfs.c         | 26 +++++++-------
 reactos/ntoskrnl/io/symlink.c       |  8 ++---
 reactos/ntoskrnl/io/vpb.c           | 12 +++----
 reactos/ntoskrnl/io/xhaldrv.c       | 10 +++---
 reactos/ntoskrnl/ke/apc.c           | 12 +++----
 reactos/ntoskrnl/ke/dpc.c           | 14 ++++----
 reactos/ntoskrnl/ke/event.c         |  2 +-
 reactos/ntoskrnl/ke/i386/exp.c      |  2 +-
 reactos/ntoskrnl/ke/i386/irq.c      |  4 +--
 reactos/ntoskrnl/ke/i386/usercall.c |  4 +--
 reactos/ntoskrnl/ke/kqueue.c        | 28 +++++++--------
 reactos/ntoskrnl/ke/kthread.c       | 23 +++++-------
 reactos/ntoskrnl/ke/main.c          | 38 ++++++++++----------
 reactos/ntoskrnl/ke/mutex.c         |  6 ++--
 reactos/ntoskrnl/ke/spinlock.c      |  6 ++--
 reactos/ntoskrnl/ke/timer.c         | 56 ++++++++++++++---------------
 reactos/ntoskrnl/ke/wait.c          | 12 +++----
 reactos/ntoskrnl/ldr/loader.c       |  4 +--
 reactos/ntoskrnl/mm/cont.c          |  4 +--
 reactos/ntoskrnl/mm/freelist.c      | 10 +++---
 reactos/ntoskrnl/mm/marea.c         |  8 ++---
 reactos/ntoskrnl/mm/mdl.c           | 22 ++++++------
 reactos/ntoskrnl/mm/mm.c            |  4 +--
 reactos/ntoskrnl/mm/mminit.c        |  6 ++--
 reactos/ntoskrnl/mm/ncache.c        |  4 +--
 reactos/ntoskrnl/mm/npool.c         | 10 +++---
 reactos/ntoskrnl/mm/section.c       | 12 +++----
 reactos/ntoskrnl/mm/virtual.c       |  6 ++--
 reactos/ntoskrnl/nt/nttimer.c       |  4 +--
 reactos/ntoskrnl/ob/object.c        | 28 +++++++--------
 reactos/ntoskrnl/ob/symlink.c       |  4 +--
 41 files changed, 234 insertions(+), 254 deletions(-)

diff --git a/reactos/ntoskrnl/io/cntrller.c b/reactos/ntoskrnl/io/cntrller.c
index ade10786126..c1f06d2c5b0 100644
--- a/reactos/ntoskrnl/io/cntrller.c
+++ b/reactos/ntoskrnl/io/cntrller.c
@@ -1,4 +1,4 @@
-/* $Id: cntrller.c,v 1.11 2004/08/15 16:39:03 chorns Exp $
+/* $Id: cntrller.c,v 1.12 2004/10/22 20:25:52 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -60,12 +60,12 @@ IoAllocateController(PCONTROLLER_OBJECT ControllerObject,
    PCONTROLLER_QUEUE_ENTRY entry;
    IO_ALLOCATION_ACTION Result;
 
-   assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
+   ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
 
    entry = 
      ExAllocatePoolWithTag(NonPagedPool, sizeof(CONTROLLER_QUEUE_ENTRY),
 			   TAG_CQE);
-   assert(entry!=NULL);
+   ASSERT(entry!=NULL);
    
    entry->DeviceObject = DeviceObject;
    entry->ExecutionRoutine = ExecutionRoutine;
@@ -99,7 +99,7 @@ IoCreateController(ULONG Size)
 {
    PCONTROLLER_OBJECT controller;
    
-   assert_irql(PASSIVE_LEVEL);
+   ASSERT_IRQL(PASSIVE_LEVEL);
    
    controller = 
      ExAllocatePoolWithTag(NonPagedPool, sizeof(CONTROLLER_OBJECT),
@@ -133,7 +133,7 @@ IoDeleteController(PCONTROLLER_OBJECT ControllerObject)
  *        ControllerObject = Controller object to be released
  */
 {
-   assert_irql(PASSIVE_LEVEL);
+   ASSERT_IRQL(PASSIVE_LEVEL);
 
    ExFreePool(ControllerObject->ControllerExtension);
    ExFreePool(ControllerObject);
@@ -166,7 +166,7 @@ IoFreeController(PCONTROLLER_OBJECT ControllerObject)
 	  }
 	Result = Entry->ExecutionRoutine(Entry->DeviceObject,
 					 Entry->DeviceObject->CurrentIrp,
-					 NULL,					 
+					 NULL,
 					 Entry->Context);
 	ExFreePool(Entry);
      } while (Result == DeallocateObject);
diff --git a/reactos/ntoskrnl/io/create.c b/reactos/ntoskrnl/io/create.c
index ef1ef3ccd88..e091023f111 100644
--- a/reactos/ntoskrnl/io/create.c
+++ b/reactos/ntoskrnl/io/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.74 2004/08/15 16:39:03 chorns Exp $
+/* $Id: create.c,v 1.75 2004/10/22 20:25:52 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -212,7 +212,7 @@ IoCreateStreamFileObject(PFILE_OBJECT FileObject,
   DPRINT("IoCreateStreamFileObject(FileObject %x, DeviceObject %x)\n",
 	 FileObject, DeviceObject);
 
-  assert_irql(PASSIVE_LEVEL);
+  ASSERT_IRQL(PASSIVE_LEVEL);
 
   Status = ObCreateObject(KernelMode,
 			  IoFileObjectType,
@@ -346,7 +346,7 @@ IoCreateFile(OUT	PHANDLE			FileHandle,
 	  FileHandle,DesiredAccess,ObjectAttributes,
 	  ObjectAttributes->ObjectName->Buffer);
    
-   assert_irql(PASSIVE_LEVEL);
+   ASSERT_IRQL(PASSIVE_LEVEL);
 
   if (IoStatusBlock == NULL)
     return STATUS_ACCESS_VIOLATION;
@@ -491,7 +491,7 @@ IoCreateFile(OUT	PHANDLE			FileHandle,
 	ZwClose(*FileHandle);
      }
 
-   assert_irql(PASSIVE_LEVEL);
+   ASSERT_IRQL(PASSIVE_LEVEL);
 
    DPRINT("Finished IoCreateFile() (*FileHandle) %x\n", (*FileHandle));
 
diff --git a/reactos/ntoskrnl/io/device.c b/reactos/ntoskrnl/io/device.c
index 7b40e22a766..1c6a764caa1 100644
--- a/reactos/ntoskrnl/io/device.c
+++ b/reactos/ntoskrnl/io/device.c
@@ -1,4 +1,4 @@
-/* $Id: device.c,v 1.78 2004/10/22 11:00:41 ekohl Exp $
+/* $Id: device.c,v 1.79 2004/10/22 20:25:53 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -15,8 +15,6 @@
 #define NDEBUG
 #include <internal/debug.h>
 
-#define ASSERT assert
-
 /* GLOBALS ********************************************************************/
 
 #define TAG_DEVICE_EXTENSION   TAG('D', 'E', 'X', 'T')
@@ -538,7 +536,7 @@ IoCreateDevice(
    OBJECT_ATTRIBUTES ObjectAttributes;
    NTSTATUS Status;
    
-   assert_irql(PASSIVE_LEVEL);
+   ASSERT_IRQL(PASSIVE_LEVEL);
    
    if (DeviceName != NULL)
    {
diff --git a/reactos/ntoskrnl/io/file.c b/reactos/ntoskrnl/io/file.c
index 64b7621ff65..0ec82c039f2 100644
--- a/reactos/ntoskrnl/io/file.c
+++ b/reactos/ntoskrnl/io/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.34 2004/08/21 20:51:26 tamlin Exp $
+/* $Id: file.c,v 1.35 2004/10/22 20:25:53 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -41,8 +41,8 @@ NtQueryInformationFile(HANDLE FileHandle,
    PVOID SystemBuffer;
    KPROCESSOR_MODE PreviousMode;
    
-   assert(IoStatusBlock != NULL);
-   assert(FileInformation != NULL);
+   ASSERT(IoStatusBlock != NULL);
+   ASSERT(FileInformation != NULL);
    
    DPRINT("NtQueryInformationFile(Handle %x StatBlk %x FileInfo %x Length %d "
 	  "Class %d)\n", FileHandle, IoStatusBlock, FileInformation,
@@ -308,7 +308,7 @@ IoQueryFileInformation(IN PFILE_OBJECT FileObject,
    PIO_STACK_LOCATION StackPtr;
    NTSTATUS Status;
    
-   assert(FileInformation != NULL)
+   ASSERT(FileInformation != NULL);
    
    Status = ObReferenceObjectByPointer(FileObject,
 				       FILE_READ_ATTRIBUTES,
@@ -392,8 +392,8 @@ NtSetInformationFile(HANDLE FileHandle,
    PVOID SystemBuffer;
    KPROCESSOR_MODE PreviousMode;
    
-   assert(IoStatusBlock != NULL)
-   assert(FileInformation != NULL)
+   ASSERT(IoStatusBlock != NULL);
+   ASSERT(FileInformation != NULL);
    
    DPRINT("NtSetInformationFile(Handle %x StatBlk %x FileInfo %x Length %d "
 	  "Class %d)\n", FileHandle, IoStatusBlock, FileInformation,
diff --git a/reactos/ntoskrnl/io/fs.c b/reactos/ntoskrnl/io/fs.c
index 0d701c6d859..fb85cd40b79 100644
--- a/reactos/ntoskrnl/io/fs.c
+++ b/reactos/ntoskrnl/io/fs.c
@@ -245,7 +245,7 @@ IopMountFileSystem(PDEVICE_OBJECT DeviceObject,
   DPRINT("IopMountFileSystem(DeviceObject %x, DeviceToMount %x)\n",
 	 DeviceObject,DeviceToMount);
 
-  assert_irql(PASSIVE_LEVEL);
+  ASSERT_IRQL(PASSIVE_LEVEL);
 
   KeInitializeEvent(&Event, NotificationEvent, FALSE);
   Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE);
@@ -293,7 +293,7 @@ IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject)
 
   DPRINT("IopLoadFileSystem(DeviceObject %x)\n", DeviceObject);
 
-  assert_irql(PASSIVE_LEVEL);
+  ASSERT_IRQL(PASSIVE_LEVEL);
 
   KeInitializeEvent(&Event, NotificationEvent, FALSE);
   Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE);
@@ -343,7 +343,7 @@ IoMountVolume(IN PDEVICE_OBJECT DeviceObject,
   DEVICE_TYPE MatchingDeviceType;
   PDEVICE_OBJECT DevObject;
 
-  assert_irql(PASSIVE_LEVEL);
+  ASSERT_IRQL(PASSIVE_LEVEL);
 
   DPRINT("IoMountVolume(DeviceObject %x  AllowRawMount %x)\n",
 	 DeviceObject, AllowRawMount);
@@ -589,7 +589,7 @@ IoRegisterFileSystem(IN PDEVICE_OBJECT DeviceObject)
   Fs = ExAllocatePoolWithTag(NonPagedPool,
 			     sizeof(FILE_SYSTEM_OBJECT),
 			     TAG_FILE_SYSTEM);
-  assert(Fs!=NULL);
+  ASSERT(Fs!=NULL);
 
   Fs->DeviceObject = DeviceObject;
   KeEnterCriticalRegion();
@@ -633,7 +633,7 @@ IoUnregisterFileSystem(IN PDEVICE_OBJECT DeviceObject)
 	  RemoveEntryList(current_entry);
 	  ExFreePool(current);
 	  ExReleaseResourceLite(&FileSystemListLock);
-    KeLeaveCriticalRegion();
+	  KeLeaveCriticalRegion();
 	  IopNotifyFileSystemChange(DeviceObject, FALSE);
 	  return;
 	}
diff --git a/reactos/ntoskrnl/io/irp.c b/reactos/ntoskrnl/io/irp.c
index 505ea0300bb..22e7c359b4f 100644
--- a/reactos/ntoskrnl/io/irp.c
+++ b/reactos/ntoskrnl/io/irp.c
@@ -1,4 +1,4 @@
-/* $Id: irp.c,v 1.67 2004/08/21 20:51:26 tamlin Exp $
+/* $Id: irp.c,v 1.68 2004/10/22 20:25:53 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -162,7 +162,7 @@ IoInitializeIrp(PIRP Irp,
  *          StackSize = Number of stack locations in the IRP
  */
 {
-  assert(Irp != NULL);
+  ASSERT(Irp != NULL);
 
   memset(Irp, 0, PacketSize);
   Irp->Size = PacketSize;
@@ -186,21 +186,21 @@ IofCallDriver(PDEVICE_OBJECT DeviceObject,
 {
   PDRIVER_OBJECT DriverObject;
   PIO_STACK_LOCATION Param;
-  
+
   DPRINT("IofCallDriver(DeviceObject %x, Irp %x)\n",DeviceObject,Irp);
-  
-  assert(Irp);
-  assert(DeviceObject);
+
+  ASSERT(Irp);
+  ASSERT(DeviceObject);
 
   DriverObject = DeviceObject->DriverObject;
 
-  assert(DriverObject);
+  ASSERT(DriverObject);
 
   IoSetNextIrpStackLocation(Irp);
   Param = IoGetCurrentIrpStackLocation(Irp);
 
   DPRINT("IrpSp 0x%X\n", Param);
-  
+
   Param->DeviceObject = DeviceObject;
 
   DPRINT("MajorFunction %d\n", Param->MajorFunction);
@@ -301,9 +301,9 @@ IofCompleteRequest(PIRP Irp,
    DPRINT("IoCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n",
       Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread());
 
-   assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
-   assert(Irp->CancelRoutine == NULL);
-   assert(Irp->IoStatus.Status != STATUS_PENDING);
+   ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+   ASSERT(Irp->CancelRoutine == NULL);
+   ASSERT(Irp->IoStatus.Status != STATUS_PENDING);
 
    if (IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED)
    {
@@ -394,9 +394,9 @@ IofCompleteRequest(PIRP Irp,
 
          if (Irp->MdlAddress->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA)
          {
-            MmUnmapLockedPages(Irp->MdlAddress->MappedSystemVa, Irp->MdlAddress);            
+            MmUnmapLockedPages(Irp->MdlAddress->MappedSystemVa, Irp->MdlAddress);
          }
-         
+
          ExFreePool(Irp->MdlAddress);
       }
 
diff --git a/reactos/ntoskrnl/io/mailslot.c b/reactos/ntoskrnl/io/mailslot.c
index c08d30269f8..4a41f76b9e7 100644
--- a/reactos/ntoskrnl/io/mailslot.c
+++ b/reactos/ntoskrnl/io/mailslot.c
@@ -34,7 +34,7 @@ NtCreateMailslotFile(OUT PHANDLE FileHandle,
 	  FileHandle,DesiredAccess,ObjectAttributes,
 	  ObjectAttributes->ObjectName->Buffer);
    
-   assert_irql(PASSIVE_LEVEL);
+   ASSERT_IRQL(PASSIVE_LEVEL);
    
    if (TimeOut != NULL)
      {
diff --git a/reactos/ntoskrnl/io/mdl.c b/reactos/ntoskrnl/io/mdl.c
index 635addb6a9a..daf9f69b698 100644
--- a/reactos/ntoskrnl/io/mdl.c
+++ b/reactos/ntoskrnl/io/mdl.c
@@ -1,4 +1,4 @@
-/* $Id: mdl.c,v 1.18 2004/08/21 20:47:28 tamlin Exp $
+/* $Id: mdl.c,v 1.19 2004/10/22 20:25:54 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -54,7 +54,7 @@ IoAllocateMdl(PVOID VirtualAddress,
    {
       if (SecondaryBuffer)
       {
-         assert(Irp->MdlAddress);
+         ASSERT(Irp->MdlAddress);
          
          /* FIXME: add to end of list maybe?? */
          Mdl->Next = Irp->MdlAddress->Next;
diff --git a/reactos/ntoskrnl/io/npipe.c b/reactos/ntoskrnl/io/npipe.c
index dac444082fc..5a163454cde 100644
--- a/reactos/ntoskrnl/io/npipe.c
+++ b/reactos/ntoskrnl/io/npipe.c
@@ -39,7 +39,7 @@ NtCreateNamedPipeFile(PHANDLE FileHandle,
 	  FileHandle,DesiredAccess,ObjectAttributes,
 	  ObjectAttributes->ObjectName->Buffer);
    
-   assert_irql(PASSIVE_LEVEL);
+   ASSERT_IRQL(PASSIVE_LEVEL);
    
    if (TimeOut != NULL)
      {
diff --git a/reactos/ntoskrnl/io/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr.c
index c1fca7e8f8e..ba40a607a39 100644
--- a/reactos/ntoskrnl/io/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr.c
@@ -1,4 +1,4 @@
-/* $Id: pnpmgr.c,v 1.42 2004/10/22 18:34:11 ekohl Exp $
+/* $Id: pnpmgr.c,v 1.43 2004/10/22 20:25:54 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -33,17 +33,6 @@ PDRIVER_OBJECT IopRootDriverObject;
 
 /* FUNCTIONS *****************************************************************/
 
-/*
- * @unimplemented
- */
-VOID
-STDCALL
-IoAdjustPagingPathCount(
-  IN PLONG Count,
-  IN BOOLEAN Increment)
-{
-}
-
 /*
  * @unimplemented
  */
@@ -491,11 +480,11 @@ IopFreeDeviceNode(PDEVICE_NODE DeviceNode)
   KIRQL OldIrql;
 
   /* All children must be deleted before a parent is deleted */
-  assert(!DeviceNode->Child);
+  ASSERT(!DeviceNode->Child);
 
   KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
 
-  assert(DeviceNode->Pdo);
+  ASSERT(DeviceNode->Pdo);
 
   ObDereferenceObject(DeviceNode->Pdo);
 
diff --git a/reactos/ntoskrnl/io/rawfs.c b/reactos/ntoskrnl/io/rawfs.c
index d207c4ca275..c2735c2d89b 100755
--- a/reactos/ntoskrnl/io/rawfs.c
+++ b/reactos/ntoskrnl/io/rawfs.c
@@ -1,4 +1,4 @@
-/* $Id: rawfs.c,v 1.12 2004/08/15 16:39:03 chorns Exp $
+/* $Id: rawfs.c,v 1.13 2004/10/22 20:25:54 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -332,8 +332,8 @@ RawFsAllocateIrpContext(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
 
   DPRINT("RawFsAllocateIrpContext(DeviceObject %x, Irp %x)\n", DeviceObject, Irp);
 
-  assert(DeviceObject);
-  assert(Irp);
+  ASSERT(DeviceObject);
+  ASSERT(Irp);
 
   GlobalData = (PRAWFS_GLOBAL_DATA) DeviceObject->DeviceExtension;
   IrpContext = ExAllocateFromNPagedLookasideList(&IrpContextLookasideList);
@@ -344,7 +344,7 @@ RawFsAllocateIrpContext(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
       IrpContext->DeviceObject = DeviceObject;
       IrpContext->DeviceExt = DeviceObject->DeviceExtension;
       IrpContext->Stack = IoGetCurrentIrpStackLocation(Irp);
-      assert(IrpContext->Stack);
+      ASSERT(IrpContext->Stack);
       MajorFunction = IrpContext->MajorFunction = IrpContext->Stack->MajorFunction;
       IrpContext->MinorFunction = IrpContext->Stack->MinorFunction;
       IrpContext->FileObject = IrpContext->Stack->FileObject;
@@ -369,7 +369,7 @@ RawFsFreeIrpContext(IN PRAWFS_IRP_CONTEXT IrpContext)
 {
   DPRINT("RawFsFreeIrpContext(IrpContext %x)\n", IrpContext);
 
-  assert(IrpContext);
+  ASSERT(IrpContext);
 
   ExFreeToNPagedLookasideList(&IrpContextLookasideList, IrpContext);
 }
@@ -392,8 +392,8 @@ RawFsQueueRequest(PRAWFS_IRP_CONTEXT IrpContext)
 {
   ULONG Count;
 
-  assert(IrpContext != NULL);
-  assert(IrpContext->Irp != NULL);
+  ASSERT(IrpContext != NULL);
+  ASSERT(IrpContext->Irp != NULL);
 
   Count = InterlockedIncrement(&RawFsQueueCount);
 
@@ -475,7 +475,7 @@ RawFsCreate(IN PRAWFS_IRP_CONTEXT IrpContext)
 
   DPRINT("RawFsCreate(IrpContext %x)\n", IrpContext);
 
-  assert(IrpContext);
+  ASSERT(IrpContext);
   
   if (RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject))
     {
@@ -537,7 +537,7 @@ RawFsMount(IN PRAWFS_IRP_CONTEXT IrpContext)
 
   DPRINT("RawFsMount(IrpContext %x)\n", IrpContext);
 
-  assert(IrpContext);
+  ASSERT(IrpContext);
 
   if (!RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject))
     {
@@ -675,7 +675,7 @@ RawFsFileSystemControl(IN PRAWFS_IRP_CONTEXT IrpContext)
 
   DPRINT("RawFsFileSystemControl(IrpContext %x)\n", IrpContext);
   
-  assert (IrpContext);
+  ASSERT(IrpContext);
 
   switch (IrpContext->MinorFunction)
     {
@@ -791,7 +791,7 @@ RawFsDispatchRequest(IN PRAWFS_IRP_CONTEXT IrpContext)
   DPRINT("RawFsDispatchRequest(IrpContext %x), MajorFunction %x\n",
     IrpContext, IrpContext->MajorFunction);
 
-  assert (IrpContext);
+  ASSERT(IrpContext);
 
   switch (IrpContext->MajorFunction)
     {
@@ -839,8 +839,8 @@ RawFsBuildRequest(IN PDEVICE_OBJECT DeviceObject,
 
   DPRINT("RawFsBuildRequest(DeviceObject %x, Irp %x)\n", DeviceObject, Irp);
 
-  assert(DeviceObject);
-  assert(Irp);
+  ASSERT(DeviceObject);
+  ASSERT(Irp);
 
   IrpContext = RawFsAllocateIrpContext(DeviceObject, Irp);
   if (IrpContext == NULL)
diff --git a/reactos/ntoskrnl/io/symlink.c b/reactos/ntoskrnl/io/symlink.c
index 41c4e118268..59ee7853888 100644
--- a/reactos/ntoskrnl/io/symlink.c
+++ b/reactos/ntoskrnl/io/symlink.c
@@ -1,4 +1,4 @@
-/* $Id: symlink.c,v 1.34 2004/08/15 16:39:03 chorns Exp $
+/* $Id: symlink.c,v 1.35 2004/10/22 20:25:54 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -40,7 +40,7 @@ IoCreateSymbolicLink(PUNICODE_STRING SymbolicLinkName,
   HANDLE Handle;
   NTSTATUS Status;
 
-  assert_irql(PASSIVE_LEVEL);
+  ASSERT_IRQL(PASSIVE_LEVEL);
 
   DPRINT("IoCreateSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n",
 	 SymbolicLinkName,
@@ -91,7 +91,7 @@ IoCreateUnprotectedSymbolicLink(PUNICODE_STRING SymbolicLinkName,
   HANDLE Handle;
   NTSTATUS Status;
 
-  assert_irql(PASSIVE_LEVEL);
+  ASSERT_IRQL(PASSIVE_LEVEL);
 
   DPRINT("IoCreateUnprotectedSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n",
 	 SymbolicLinkName,
@@ -158,7 +158,7 @@ IoDeleteSymbolicLink(PUNICODE_STRING SymbolicLinkName)
   HANDLE Handle;
   NTSTATUS Status;
 
-  assert_irql(PASSIVE_LEVEL);
+  ASSERT_IRQL(PASSIVE_LEVEL);
 
   DPRINT("IoDeleteSymbolicLink (SymbolicLinkName %S)\n",
 	 SymbolicLinkName->Buffer);
diff --git a/reactos/ntoskrnl/io/vpb.c b/reactos/ntoskrnl/io/vpb.c
index 8851b8c6fe7..53fc31fae93 100644
--- a/reactos/ntoskrnl/io/vpb.c
+++ b/reactos/ntoskrnl/io/vpb.c
@@ -1,4 +1,4 @@
-/* $Id: vpb.c,v 1.25 2004/08/15 16:39:03 chorns Exp $
+/* $Id: vpb.c,v 1.26 2004/10/22 20:25:54 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -100,8 +100,8 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle,
    PVOID SystemBuffer;
    KPROCESSOR_MODE PreviousMode;
    
-   assert(IoStatusBlock != NULL);
-   assert(FsInformation != NULL);
+   ASSERT(IoStatusBlock != NULL);
+   ASSERT(FsInformation != NULL);
    
    DPRINT("FsInformation %p\n", FsInformation);
 
@@ -202,7 +202,7 @@ IoQueryVolumeInformation(IN PFILE_OBJECT FileObject,
    PIRP Irp;
    NTSTATUS Status;
    
-   assert(FsInformation != NULL);
+   ASSERT(FsInformation != NULL);
    
    DPRINT("FsInformation %p\n", FsInformation);
    
@@ -285,8 +285,8 @@ NtSetVolumeInformationFile(IN HANDLE FileHandle,
    PVOID SystemBuffer;
    KPROCESSOR_MODE PreviousMode;
 
-   assert(IoStatusBlock != NULL);
-   assert(FsInformation != NULL);
+   ASSERT(IoStatusBlock != NULL);
+   ASSERT(FsInformation != NULL);
 
    PreviousMode = ExGetPreviousMode();
 
diff --git a/reactos/ntoskrnl/io/xhaldrv.c b/reactos/ntoskrnl/io/xhaldrv.c
index 334c4d76f52..db3f727056d 100644
--- a/reactos/ntoskrnl/io/xhaldrv.c
+++ b/reactos/ntoskrnl/io/xhaldrv.c
@@ -1,4 +1,4 @@
-/* $Id: xhaldrv.c,v 1.48 2004/08/21 19:13:22 hbirr Exp $
+/* $Id: xhaldrv.c,v 1.49 2004/10/22 20:25:54 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -185,8 +185,8 @@ xHalpReadSector (IN PDEVICE_OBJECT DeviceObject,
 
   DPRINT("xHalpReadSector() called\n");
 
-  assert(DeviceObject);
-  assert(Sector);
+  ASSERT(DeviceObject);
+  ASSERT(Sector);
 
   KeInitializeEvent(&Event,
 		    NotificationEvent,
@@ -1183,8 +1183,8 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject,
 	  NumberOfHeads,
 	  PartitionBuffer);
 
-  assert(DeviceObject);
-  assert(PartitionBuffer);
+  ASSERT(DeviceObject);
+  ASSERT(PartitionBuffer);
 
   DiskManager = NoDiskManager;
 
diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c
index 284cad75ad4..84d7d0e8acf 100644
--- a/reactos/ntoskrnl/ke/apc.c
+++ b/reactos/ntoskrnl/ke/apc.c
@@ -631,7 +631,7 @@ KiSwapApcEnvironment(
   if (Thread->ApcStateIndex == AttachedApcEnvironment)
   {
     /* NewProcess must be the same as in the original-environment */
-    assert(NewProcess == Thread->ApcStatePointer[OriginalApcEnvironment]->Process);
+    ASSERT(NewProcess == Thread->ApcStatePointer[OriginalApcEnvironment]->Process);
 
     /*    
     FIXME: Deliver any pending apc's queued to the attached environment before 
@@ -643,11 +643,11 @@ KiSwapApcEnvironment(
     */
 
     /* we don't support targeting apc's at attached-environments (yet)... */
-    assert(IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode]));
-    assert(IsListEmpty(&Thread->ApcState.ApcListHead[UserMode]));
-    assert(Thread->ApcState.KernelApcInProgress == FALSE);
-    assert(Thread->ApcState.KernelApcPending == FALSE);
-    assert(Thread->ApcState.UserApcPending == FALSE);
+    ASSERT(IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode]));
+    ASSERT(IsListEmpty(&Thread->ApcState.ApcListHead[UserMode]));
+    ASSERT(Thread->ApcState.KernelApcInProgress == FALSE);
+    ASSERT(Thread->ApcState.KernelApcPending == FALSE);
+    ASSERT(Thread->ApcState.UserApcPending == FALSE);
     
     /* restore backup of original environment */
     Thread->ApcState = Thread->SavedApcState;
diff --git a/reactos/ntoskrnl/ke/dpc.c b/reactos/ntoskrnl/ke/dpc.c
index 9b6c2cb54fc..bb7027d6b40 100644
--- a/reactos/ntoskrnl/ke/dpc.c
+++ b/reactos/ntoskrnl/ke/dpc.c
@@ -18,7 +18,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: dpc.c,v 1.38 2004/10/17 15:39:29 hbirr Exp $
+/* $Id: dpc.c,v 1.39 2004/10/22 20:30:47 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -82,7 +82,7 @@ KiDispatchInterrupt(VOID)
    KIRQL oldlvl;
    PKPCR Pcr;
 
-   assert_irql(DISPATCH_LEVEL);
+   ASSERT_IRQL(DISPATCH_LEVEL);
 
    Pcr = KeGetCurrentKPCR();
 
@@ -96,13 +96,13 @@ KiDispatchInterrupt(VOID)
 
    while (!IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead))
    {
-      assert(Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0);
+      ASSERT(Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0);
 
       current_entry = RemoveHeadList(&Pcr->PrcbData.DpcData[0].DpcListHead);
       Pcr->PrcbData.DpcData[0].DpcQueueDepth--;
       Pcr->PrcbData.DpcData[0].DpcCount++;
 
-      assert((Pcr->PrcbData.DpcData[0].DpcQueueDepth == 0 && IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)) ||
+      ASSERT((Pcr->PrcbData.DpcData[0].DpcQueueDepth == 0 && IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)) ||
              (Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0 && !IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)));	     
 
       current = CONTAINING_RECORD(current_entry,KDPC,DpcListEntry);
@@ -176,7 +176,7 @@ KeRemoveQueueDpc (PKDPC	Dpc)
 	Dpc->Lock=0;
      }
 
-   assert((Pcr->PrcbData.DpcData[0].DpcQueueDepth == 0 && IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)) ||
+   ASSERT((Pcr->PrcbData.DpcData[0].DpcQueueDepth == 0 && IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)) ||
           (Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0 && !IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)));	     
 
    KiReleaseSpinLock(&Pcr->PrcbData.DpcData[0].DpcLock);
@@ -208,7 +208,7 @@ KeInsertQueueDpc (PKDPC	Dpc,
    DPRINT("KeInsertQueueDpc(dpc %x, SystemArgument1 %x, SystemArgument2 %x)\n",
 	  Dpc, SystemArgument1, SystemArgument2);
 
-   assert(KeGetCurrentIrql()>=DISPATCH_LEVEL);
+   ASSERT(KeGetCurrentIrql()>=DISPATCH_LEVEL);
 
    Dpc->Number=0;
    Dpc->Importance=MediumImportance;
@@ -222,7 +222,7 @@ KeInsertQueueDpc (PKDPC	Dpc,
    Pcr = KeGetCurrentKPCR();
    KeRaiseIrql(HIGH_LEVEL, &oldlvl);
    KiAcquireSpinLock(&Pcr->PrcbData.DpcData[0].DpcLock);
-   assert((Pcr->PrcbData.DpcData[0].DpcQueueDepth == 0 && IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)) ||
+   ASSERT((Pcr->PrcbData.DpcData[0].DpcQueueDepth == 0 && IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)) ||
           (Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0 && !IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)));	     
    InsertHeadList(&Pcr->PrcbData.DpcData[0].DpcListHead,&Dpc->DpcListEntry);
    DPRINT("Dpc->DpcListEntry.Flink %x\n", Dpc->DpcListEntry.Flink);
diff --git a/reactos/ntoskrnl/ke/event.c b/reactos/ntoskrnl/ke/event.c
index 986f0b5da87..c3d7eed0b95 100644
--- a/reactos/ntoskrnl/ke/event.c
+++ b/reactos/ntoskrnl/ke/event.c
@@ -44,7 +44,7 @@ VOID STDCALL KeInitializeEvent (PKEVENT		Event,
      }
    else
      {
-	assert(FALSE);
+	ASSERT(FALSE);
 	return;
      }
    
diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c
index 0e6250ebd42..d87c22411a0 100644
--- a/reactos/ntoskrnl/ke/i386/exp.c
+++ b/reactos/ntoskrnl/ke/i386/exp.c
@@ -685,7 +685,7 @@ static void set_interrupt_gate(unsigned int sel, unsigned int func)
 static void set_trap_gate(unsigned int sel, unsigned int func, unsigned int dpl)
 {
    DPRINT("set_trap_gate(sel %d, func %x, dpl %d)\n",sel, func, dpl);
-   assert(dpl <= 3);
+   ASSERT(dpl <= 3);
    KiIdt[sel].a = (((int)func)&0xffff) +
      (KERNEL_CS << 16);
    KiIdt[sel].b = 0x8f00 + (dpl << 13) + (((int)func)&0xffff0000);
diff --git a/reactos/ntoskrnl/ke/i386/irq.c b/reactos/ntoskrnl/ke/i386/irq.c
index ae9c1e4d30b..0a2a2cf9542 100644
--- a/reactos/ntoskrnl/ke/i386/irq.c
+++ b/reactos/ntoskrnl/ke/i386/irq.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: irq.c,v 1.47 2004/10/17 15:39:29 hbirr Exp $
+/* $Id: irq.c,v 1.48 2004/10/22 20:32:49 ekohl Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/i386/irq.c
@@ -518,7 +518,7 @@ KiInterruptDispatch (ULONG irq, PKIRQ_TRAPFRAME Trapframe)
 	   
            KiDeliverNormalApc();
            
-	   assert(KeGetCurrentThread() == CurrentThread);
+	   ASSERT(KeGetCurrentThread() == CurrentThread);
            if (CurrentThread->TrapFrame == &KernelTrapFrame)
 	     {
                KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe);
diff --git a/reactos/ntoskrnl/ke/i386/usercall.c b/reactos/ntoskrnl/ke/i386/usercall.c
index 84d3fd9c574..c0a548ad6d3 100644
--- a/reactos/ntoskrnl/ke/i386/usercall.c
+++ b/reactos/ntoskrnl/ke/i386/usercall.c
@@ -1,4 +1,4 @@
-/* $Id: usercall.c,v 1.29 2004/08/21 21:20:08 tamlin Exp $
+/* $Id: usercall.c,v 1.30 2004/10/22 20:32:49 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -33,7 +33,7 @@ KiSystemCallHook(ULONG Nr, ...)
 	DbgPrint("%x, ", va_arg(ap, ULONG));
      }
    DbgPrint(")\n");
-   assert_irql(PASSIVE_LEVEL);
+   ASSERT_IRQL(PASSIVE_LEVEL);
    va_end(ap);
 #endif
 }
diff --git a/reactos/ntoskrnl/ke/kqueue.c b/reactos/ntoskrnl/ke/kqueue.c
index 825b93e2e9a..70ffe09954f 100644
--- a/reactos/ntoskrnl/ke/kqueue.c
+++ b/reactos/ntoskrnl/ke/kqueue.c
@@ -27,8 +27,8 @@ KeInsertByKeyDeviceQueue (
   IN ULONG			SortKey)
 {
   DPRINT("KeInsertByKeyDeviceQueue()\n");
-  assert(KeGetCurrentIrql() == DISPATCH_LEVEL);   
-   
+  ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
+
   DeviceQueueEntry->SortKey=SortKey;
 
   KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock);
@@ -62,12 +62,12 @@ KeRemoveByKeyDeviceQueue (
 	)
 {
   PLIST_ENTRY current;
-  PKDEVICE_QUEUE_ENTRY entry;   
-   
-  assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
-  assert(DeviceQueue!=NULL);
-  assert(DeviceQueue->Busy);
-   
+  PKDEVICE_QUEUE_ENTRY entry;
+
+  ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
+  ASSERT(DeviceQueue!=NULL);
+  ASSERT(DeviceQueue->Busy);
+
   KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock);
    
   /* an attempt to remove an entry from an empty (and busy) queue sets the queue to idle */
@@ -117,9 +117,9 @@ KeRemoveDeviceQueue (
    
    DPRINT("KeRemoveDeviceQueue(DeviceQueue %x)\n",DeviceQueue);
    
-   assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
-   assert(DeviceQueue!=NULL);
-   assert(DeviceQueue->Busy);
+   ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
+   ASSERT(DeviceQueue!=NULL);
+   ASSERT(DeviceQueue->Busy);
    
    KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock);
    
@@ -151,7 +151,7 @@ KeInitializeDeviceQueue (
  *       DeviceQueue = Device queue to initialize
  */
 {
-   assert(DeviceQueue!=NULL);
+   ASSERT(DeviceQueue!=NULL);
    InitializeListHead(&DeviceQueue->DeviceListHead);
    DeviceQueue->Busy=FALSE;
    KeInitializeSpinLock(&DeviceQueue->Lock);
@@ -175,7 +175,7 @@ KeInsertDeviceQueue (
  *          True otherwise
  */
 {
-  assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
+  ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
    
   KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock);
    
@@ -206,7 +206,7 @@ KeRemoveEntryDeviceQueue(
   KIRQL oldIrql;
   PKDEVICE_QUEUE_ENTRY entry;
   
-  assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+  ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
   
   KeAcquireSpinLock(&DeviceQueue->Lock, &oldIrql);
   
diff --git a/reactos/ntoskrnl/ke/kthread.c b/reactos/ntoskrnl/ke/kthread.c
index c3c4f71e7be..b0735e0437a 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.54 2004/10/13 01:42:14 ion Exp $
+/* $Id: kthread.c,v 1.55 2004/10/22 20:30:47 ekohl Exp $
  *
  * FILE:            ntoskrnl/ke/kthread.c
  * PURPOSE:         Microkernel thread support
@@ -55,7 +55,7 @@ VOID
 KeFreeStackPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, 
 		PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
 {
-  assert(SwapEntry == 0);
+  ASSERT(SwapEntry == 0);
   if (Page != 0)
     {
       MmReleasePageMemoryConsumer(MC_NPPOOL, Page);
@@ -328,7 +328,7 @@ crashes. I'm disabling it again, until we fix the APC implementation...
 }
 
 VOID STDCALL
-KeRescheduleThread()
+KeRescheduleThread(VOID)
 {
   PsDispatchThread(THREAD_STATE_READY);
 }
@@ -338,9 +338,7 @@ KeRescheduleThread()
  */
 VOID
 STDCALL
-KeRevertToUserAffinityThread(
-    VOID
-)
+KeRevertToUserAffinityThread(VOID)
 {
 	PKTHREAD CurrentThread;
 	CurrentThread = KeGetCurrentThread();
@@ -359,8 +357,7 @@ CCHAR
 STDCALL
 KeSetIdealProcessorThread (
 	IN PKTHREAD Thread,
-	IN CCHAR Processor
-	)
+	IN CCHAR Processor)
 {
 	CCHAR PreviousIdealProcessor;
 
@@ -379,9 +376,7 @@ KeSetIdealProcessorThread (
  */
 VOID
 STDCALL
-KeSetSystemAffinityThread(
-    IN KAFFINITY Affinity
-)
+KeSetSystemAffinityThread(IN KAFFINITY Affinity)
 {
 	PKTHREAD CurrentThread;
 	CurrentThread = KeGetCurrentThread();
@@ -396,11 +391,9 @@ KeSetSystemAffinityThread(
 /*
  * @implemented
  */
-VOID 
+VOID
 STDCALL
-KeTerminateThread(
-	IN KPRIORITY   	 Increment  	 
-)
+KeTerminateThread(IN KPRIORITY Increment)
 {
 	/* The Increment Argument seems to be ignored by NT and always 0 when called */
 	
diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c
index 64a9e3d70e6..1957e341343 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.199 2004/10/13 22:27:03 ion Exp $
+/* $Id: main.c,v 1.200 2004/10/22 20:30:47 ekohl Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/main.c
@@ -289,25 +289,25 @@ ExpInitializeExecutive(VOID)
    * Fail at runtime if someone has changed various structures without
    * updating the offsets used for the assembler code.
    */
-  assert(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK);
-  assert(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB);
-  assert(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK);
-  assert(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE);
-  assert(FIELD_OFFSET(KTHREAD, PreviousMode) == KTHREAD_PREVIOUS_MODE);
-  assert(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME);
-  assert(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK);
-  assert(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS);
-  assert(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == 
+  ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK);
+  ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB);
+  ASSERT(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK);
+  ASSERT(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE);
+  ASSERT(FIELD_OFFSET(KTHREAD, PreviousMode) == KTHREAD_PREVIOUS_MODE);
+  ASSERT(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME);
+  ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK);
+  ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS);
+  ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == 
 	 KPROCESS_DIRECTORY_TABLE_BASE);
-  assert(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET);
-  assert(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0);
-  assert(FIELD_OFFSET(KTRAP_FRAME, Reserved9) == KTRAP_FRAME_RESERVED9);
-  assert(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS);
-  assert(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP);
-
-  assert(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST);
-  assert(FIELD_OFFSET(KPCR, Self) == KPCR_SELF);
-  assert(FIELD_OFFSET(KPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD);  
+  ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET);
+  ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0);
+  ASSERT(FIELD_OFFSET(KTRAP_FRAME, Reserved9) == KTRAP_FRAME_RESERVED9);
+  ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS);
+  ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP);
+
+  ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST);
+  ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF);
+  ASSERT(FIELD_OFFSET(KPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD);  
 
   LdrInit1();
 
diff --git a/reactos/ntoskrnl/ke/mutex.c b/reactos/ntoskrnl/ke/mutex.c
index 8190a6c9751..4ee6ecd25ab 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.17 2004/08/15 16:39:05 chorns Exp $
+/* $Id: mutex.c,v 1.18 2004/10/22 20:30:48 ekohl Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/ke/mutex.c
@@ -76,7 +76,7 @@ KeReleaseMutex(IN PKMUTEX Mutex,
       KEBUGCHECK(THREAD_NOT_MUTEX_OWNER);
     }
   Mutex->Header.SignalState++;
-  assert(Mutex->Header.SignalState <= 1);
+  ASSERT(Mutex->Header.SignalState <= 1);
   if (Mutex->Header.SignalState == 1)
     {
       Mutex->OwnerThread = NULL;
@@ -175,7 +175,7 @@ KeReleaseMutant(IN PKMUTANT Mutant,
 	  KEBUGCHECK(THREAD_NOT_MUTEX_OWNER);
 	}
       Mutant->Header.SignalState++;
-      assert(Mutant->Header.SignalState <= 1);
+      ASSERT(Mutant->Header.SignalState <= 1);
     }
   else
     {
diff --git a/reactos/ntoskrnl/ke/spinlock.c b/reactos/ntoskrnl/ke/spinlock.c
index 3d66253f4d0..a5a0338b2f3 100644
--- a/reactos/ntoskrnl/ke/spinlock.c
+++ b/reactos/ntoskrnl/ke/spinlock.c
@@ -1,4 +1,4 @@
-/* $Id: spinlock.c,v 1.23 2004/08/21 21:19:06 tamlin Exp $
+/* $Id: spinlock.c,v 1.24 2004/10/22 20:30:48 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -88,7 +88,7 @@ KeInitializeSpinLock (PKSPIN_LOCK	SpinLock)
 VOID FASTCALL
 KefAcquireSpinLockAtDpcLevel(PKSPIN_LOCK SpinLock)
 {
-  assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
+  ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
   KiAcquireSpinLock(SpinLock);
 }
 
@@ -132,7 +132,7 @@ KeAcquireInStackQueuedSpinLockAtDpcLevel(
 VOID FASTCALL
 KefReleaseSpinLockFromDpcLevel(PKSPIN_LOCK SpinLock)
 {
-  assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
+  ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
   KiReleaseSpinLock(SpinLock);  
 }
 
diff --git a/reactos/ntoskrnl/ke/timer.c b/reactos/ntoskrnl/ke/timer.c
index 43ab8c34393..773efc6637e 100644
--- a/reactos/ntoskrnl/ke/timer.c
+++ b/reactos/ntoskrnl/ke/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.81 2004/10/17 15:39:29 hbirr Exp $
+/* $Id: timer.c,v 1.82 2004/10/22 20:30:48 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -301,7 +301,7 @@ KeSetTimerEx (PKTIMER		Timer,
 
    DPRINT("KeSetTimerEx(Timer %x), DueTime: \n",Timer);
 
-   assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+   ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
 
    KeAcquireSpinLock(&TimerListLock, &oldlvl);
 
@@ -327,7 +327,7 @@ KeSetTimerEx (PKTIMER		Timer,
    Timer->Period = Period;
    Timer->Header.SignalState = FALSE;
    AlreadyInList = (Timer->TimerListEntry.Flink == NULL) ? FALSE : TRUE;
-   assert((Timer->TimerListEntry.Flink == NULL && Timer->TimerListEntry.Blink == NULL) ||
+   ASSERT((Timer->TimerListEntry.Flink == NULL && Timer->TimerListEntry.Blink == NULL) ||
           (Timer->TimerListEntry.Flink != NULL && Timer->TimerListEntry.Blink != NULL));
    if (AlreadyInList)
      {
@@ -383,13 +383,13 @@ KeCancelTimer (PKTIMER	Timer)
      }
    if (Timer->Header.Absolute)
      {
-       assert(&Timer->TimerListEntry != &AbsoluteTimerListHead);
+       ASSERT(&Timer->TimerListEntry != &AbsoluteTimerListHead);
      }
    else
      {
-       assert(&Timer->TimerListEntry != &RelativeTimerListHead);
+       ASSERT(&Timer->TimerListEntry != &RelativeTimerListHead);
      }
-   assert(Timer->TimerListEntry.Flink != &Timer->TimerListEntry);
+   ASSERT(Timer->TimerListEntry.Flink != &Timer->TimerListEntry);
    RemoveEntryList(&Timer->TimerListEntry);
    Timer->TimerListEntry.Flink = Timer->TimerListEntry.Blink = NULL;
    KeReleaseSpinLock(&TimerListLock, oldlvl);
@@ -450,7 +450,7 @@ KeInitializeTimerEx (PKTIMER		Timer,
      }
    else
      {
-	assert(FALSE);
+	ASSERT(FALSE);
 	return;
      }
 
@@ -526,7 +526,7 @@ HandleExpiredTimer(PKTIMER Timer)
 	DPRINT("Finished dpc routine\n");
      }
 
-   assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
+   ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
 
    KeAcquireDispatcherDatabaseLockAtDpcLevel();
    Timer->Header.SignalState = TRUE;
@@ -571,7 +571,7 @@ KeExpireTimers(PKDPC Dpc,
 
    DPRINT("KeExpireTimers()\n");
 
-   assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
+   ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
 
    InitializeListHead(&TimerList);
 
@@ -581,13 +581,13 @@ KeExpireTimers(PKDPC Dpc,
    KeQuerySystemTime(&SystemTime);
 
    current_entry = RelativeTimerListHead.Flink;
-   assert(current_entry);
+   ASSERT(current_entry);
    while (current_entry != &RelativeTimerListHead)
      {
        current = CONTAINING_RECORD(current_entry, KTIMER, TimerListEntry);
-       assert(current);
-       assert(current_entry != &RelativeTimerListHead);
-       assert(current_entry->Flink != current_entry);
+       ASSERT(current);
+       ASSERT(current_entry != &RelativeTimerListHead);
+       ASSERT(current_entry->Flink != current_entry);
        if ((ULONGLONG)InterruptTime.QuadPart < current->DueTime.QuadPart)
          {
 	   break;
@@ -598,13 +598,13 @@ KeExpireTimers(PKDPC Dpc,
      }
 
    current_entry = AbsoluteTimerListHead.Flink;
-   assert(current_entry);
+   ASSERT(current_entry);
    while (current_entry != &AbsoluteTimerListHead)
      {
        current = CONTAINING_RECORD(current_entry, KTIMER, TimerListEntry);
-       assert(current);
-       assert(current_entry != &AbsoluteTimerListHead);
-       assert(current_entry->Flink != current_entry);
+       ASSERT(current);
+       ASSERT(current_entry != &AbsoluteTimerListHead);
+       ASSERT(current_entry->Flink != current_entry);
        if ((ULONGLONG)SystemTime.QuadPart < current->DueTime.QuadPart)
          {
 	   break;
@@ -637,7 +637,7 @@ KiUpdateSystemTime(KIRQL oldIrql,
 {
    LARGE_INTEGER Time;
 
-   assert(KeGetCurrentIrql() == PROFILE_LEVEL);
+   ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL);
 
    KiRawTicks++;
    
@@ -766,13 +766,13 @@ KiUpdateProcessThreadTime(KIRQL oldIrql, PKIRQ_TRAPFRAME Tf)
 #ifdef MP
          InterlockedIncrement((PLONG)&ThreadsProcess->Pcb.KernelTime);
 #else
-         ThreadsProcess->Pcb.KernelTime++;  
+         ThreadsProcess->Pcb.KernelTime++;
 #endif
          CurrentThread->KernelTime++;
          Pcr->PrcbData.KernelTime++;
-      }  	
+      }
    }
-} 
+}
 
 /*
  * @unimplemented
@@ -793,11 +793,11 @@ KeSetTimeUpdateNotifyRoutine(
 VOID
 STDCALL
 KeUpdateRunTime(
-	IN PKTRAP_FRAME	TrapFrame
-)
+    IN PKTRAP_FRAME TrapFrame
+    )
 {
 	KIRQL OldIrql = PASSIVE_LEVEL;
-	
+
 	/* These are equivalent... we should just remove the Ki and stick it here... */
 	KiUpdateProcessThreadTime(OldIrql, (PKIRQ_TRAPFRAME)TrapFrame);
 }
@@ -808,12 +808,12 @@ KeUpdateRunTime(
 VOID 
 STDCALL
 KeUpdateSystemTime(
-	IN PKTRAP_FRAME TrapFrame,
-	IN ULONG        Increment
-)
+    IN PKTRAP_FRAME TrapFrame,
+    IN ULONG Increment
+    )
 {
 	KIRQL OldIrql = PASSIVE_LEVEL;
-	
+
 	/* These are equivalent... we should just remove the Ki and stick it here... */
 	KiUpdateSystemTime(OldIrql, (PKIRQ_TRAPFRAME)TrapFrame);
 }
diff --git a/reactos/ntoskrnl/ke/wait.c b/reactos/ntoskrnl/ke/wait.c
index 250527ee011..141a5193321 100644
--- a/reactos/ntoskrnl/ke/wait.c
+++ b/reactos/ntoskrnl/ke/wait.c
@@ -136,7 +136,7 @@ KiSideEffectsBeforeWake(DISPATCHER_HEADER * hdr,
 
          Mutex = CONTAINING_RECORD(hdr, KMUTEX, Header);
          hdr->SignalState--;
-         assert(hdr->SignalState <= 1);
+         ASSERT(hdr->SignalState <= 1);
          if (hdr->SignalState == 0)
          {
             if (Thread == NULL)
@@ -171,7 +171,7 @@ KiIsObjectSignalled(DISPATCHER_HEADER * hdr,
 
       Mutex = CONTAINING_RECORD(hdr, KMUTEX, Header);
 
-      assert(hdr->SignalState <= 1);
+      ASSERT(hdr->SignalState <= 1);
 
       if ((hdr->SignalState < 1 && Mutex->OwnerThread == Thread) || hdr->SignalState == 1)
       {
@@ -255,8 +255,8 @@ KeDispatcherObjectWakeOneOrAll(DISPATCHER_HEADER * hdr,
       WaiterHead = CONTAINING_RECORD(EnumEntry, KWAIT_BLOCK, WaitListEntry);
       DPRINT("current_entry %x current %x\n", EnumEntry, WaiterHead);
       EnumEntry = EnumEntry->Flink;
-      assert(WaiterHead->Thread != NULL);
-      assert(WaiterHead->Thread->WaitBlockList != NULL);
+      ASSERT(WaiterHead->Thread != NULL);
+      ASSERT(WaiterHead->Thread->WaitBlockList != NULL);
 
       Abandoned = FALSE;
 
@@ -317,7 +317,7 @@ KeDispatcherObjectWakeOneOrAll(DISPATCHER_HEADER * hdr,
                }
 
                //no WaitAny objects can possibly be signaled since we are here
-               assert(!(Waiter->WaitType == WaitAny
+               ASSERT(!(Waiter->WaitType == WaitAny
 					  && KiIsObjectSignalled(Waiter->Object, Waiter->Thread)));
             }
 
@@ -495,7 +495,7 @@ KeWaitForMultipleObjects(ULONG Count,
    DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) "
           "PsGetCurrentThread() %x\n", Count, Object, PsGetCurrentThread());
 
-   assert(0 < Count && Count <= EX_MAXIMUM_WAIT_OBJECTS);
+   ASSERT(0 < Count && Count <= EX_MAXIMUM_WAIT_OBJECTS);
 
    CurrentThread = KeGetCurrentThread();
    WaitIrql = KeGetCurrentIrql();
diff --git a/reactos/ntoskrnl/ldr/loader.c b/reactos/ntoskrnl/ldr/loader.c
index 2d0dd257799..dc764c3c7a9 100644
--- a/reactos/ntoskrnl/ldr/loader.c
+++ b/reactos/ntoskrnl/ldr/loader.c
@@ -1,4 +1,4 @@
-/* $Id: loader.c,v 1.148 2004/10/09 12:17:53 gvg Exp $
+/* $Id: loader.c,v 1.149 2004/10/22 20:33:53 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -943,7 +943,7 @@ LdrPEProcessModule(PVOID ModuleLoadBase,
 
   ModuleTextSection = ExAllocatePool(NonPagedPool, 
 				     sizeof(MODULE_TEXT_SECTION));
-  assert(ModuleTextSection);
+  ASSERT(ModuleTextSection);
   RtlZeroMemory(ModuleTextSection, sizeof(MODULE_TEXT_SECTION));
   ModuleTextSection->Base = (ULONG)DriverBase;
   ModuleTextSection->Length = DriverSize;
diff --git a/reactos/ntoskrnl/mm/cont.c b/reactos/ntoskrnl/mm/cont.c
index 5c6e2c7a6de..b1ec2fe57b9 100644
--- a/reactos/ntoskrnl/mm/cont.c
+++ b/reactos/ntoskrnl/mm/cont.c
@@ -1,4 +1,4 @@
-/* $Id: cont.c,v 1.34 2004/08/15 16:39:06 chorns Exp $
+/* $Id: cont.c,v 1.35 2004/10/22 20:38:22 ekohl Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -22,7 +22,7 @@ MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
                      PFN_TYPE Page, SWAPENTRY SwapEntry,
                      BOOLEAN Dirty)
 {
-   assert(SwapEntry == 0);
+   ASSERT(SwapEntry == 0);
    if (Page != 0)
    {
       MmReleasePageMemoryConsumer(MC_NPPOOL, Page);
diff --git a/reactos/ntoskrnl/mm/freelist.c b/reactos/ntoskrnl/mm/freelist.c
index 5fcc60063b2..d40d6d0b280 100644
--- a/reactos/ntoskrnl/mm/freelist.c
+++ b/reactos/ntoskrnl/mm/freelist.c
@@ -117,7 +117,7 @@ MmSetLRULastPage(PFN_TYPE Pfn)
 {
    KIRQL oldIrql;
 
-   assert (Pfn < MmPageArraySize);
+   ASSERT(Pfn < MmPageArraySize);
    KeAcquireSpinLock(&PageListLock, &oldIrql);
    if (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_USED &&
        MmPageArray[Pfn].Flags.Consumer == MC_USER)
@@ -506,7 +506,7 @@ MmSetFlagsPage(PFN_TYPE Pfn, ULONG Flags)
 {
    KIRQL oldIrql;
 
-   assert (Pfn < MmPageArraySize);
+   ASSERT(Pfn < MmPageArraySize);
    KeAcquireSpinLock(&PageListLock, &oldIrql);
    MmPageArray[Pfn].AllFlags = Flags;
    KeReleaseSpinLock(&PageListLock, oldIrql);
@@ -571,7 +571,7 @@ MmGetFlagsPage(PFN_TYPE Pfn)
    KIRQL oldIrql;
    ULONG Flags;
 
-   assert (Pfn < MmPageArraySize);
+   ASSERT(Pfn < MmPageArraySize);
    KeAcquireSpinLock(&PageListLock, &oldIrql);
    Flags = MmPageArray[Pfn].AllFlags;
    KeReleaseSpinLock(&PageListLock, oldIrql);
@@ -585,7 +585,7 @@ MmSetSavedSwapEntryPage(PFN_TYPE Pfn,  SWAPENTRY SavedSwapEntry)
 {
    KIRQL oldIrql;
 
-   assert (Pfn < MmPageArraySize);
+   ASSERT(Pfn < MmPageArraySize);
    KeAcquireSpinLock(&PageListLock, &oldIrql);
    MmPageArray[Pfn].SavedSwapEntry = SavedSwapEntry;
    KeReleaseSpinLock(&PageListLock, oldIrql);
@@ -597,7 +597,7 @@ MmGetSavedSwapEntryPage(PFN_TYPE Pfn)
    SWAPENTRY SavedSwapEntry;
    KIRQL oldIrql;
 
-   assert (Pfn < MmPageArraySize);
+   ASSERT(Pfn < MmPageArraySize);
    KeAcquireSpinLock(&PageListLock, &oldIrql);
    SavedSwapEntry = MmPageArray[Pfn].SavedSwapEntry;
    KeReleaseSpinLock(&PageListLock, oldIrql);
diff --git a/reactos/ntoskrnl/mm/marea.c b/reactos/ntoskrnl/mm/marea.c
index f8203296c8a..57f8c231650 100644
--- a/reactos/ntoskrnl/mm/marea.c
+++ b/reactos/ntoskrnl/mm/marea.c
@@ -74,9 +74,9 @@ MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace,
       current = CONTAINING_RECORD(current_entry,
                                   MEMORY_AREA,
                                   Entry);
-      assert(current_entry->Blink->Flink == current_entry);
-      assert(current_entry->Flink->Blink == current_entry);
-      assert(previous_entry->Flink == current_entry);
+      ASSERT(current_entry->Blink->Flink == current_entry);
+      ASSERT(current_entry->Flink->Blink == current_entry);
+      ASSERT(previous_entry->Flink == current_entry);
       if (current->BaseAddress <= Address &&
             (PVOID)((char*)current->BaseAddress + current->Length) > Address)
       {
@@ -612,7 +612,7 @@ NTSTATUS MmCreateMemoryArea(PEPROCESS Process,
       if (BoundaryAddressMultiple.QuadPart != 0)
       {
          EndAddress = ((char*)(*BaseAddress)) + tmpLength-1;
-         assert(((DWORD_PTR)*BaseAddress/BoundaryAddressMultiple.QuadPart) == ((DWORD_PTR)EndAddress/BoundaryAddressMultiple.QuadPart));
+         ASSERT(((DWORD_PTR)*BaseAddress/BoundaryAddressMultiple.QuadPart) == ((DWORD_PTR)EndAddress/BoundaryAddressMultiple.QuadPart));
       }
 
       if (MmOpenMemoryAreaByRegion(AddressSpace,
diff --git a/reactos/ntoskrnl/mm/mdl.c b/reactos/ntoskrnl/mm/mdl.c
index c7c82688c6e..6f7f69f27e3 100644
--- a/reactos/ntoskrnl/mm/mdl.c
+++ b/reactos/ntoskrnl/mm/mdl.c
@@ -1,4 +1,4 @@
-/* $Id: mdl.c,v 1.68 2004/08/15 16:39:07 chorns Exp $
+/* $Id: mdl.c,v 1.69 2004/10/22 20:38:22 ekohl Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -209,7 +209,7 @@ MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode)
       NTSTATUS Status;
 
       /* pretty sure you can't map partial mdl's to user space */
-      assert(!(Mdl->MdlFlags & MDL_PARTIAL));
+      ASSERT(!(Mdl->MdlFlags & MDL_PARTIAL));
 
       BoundaryAddressMultiple.QuadPart = 0;
       Base = NULL;
@@ -244,9 +244,9 @@ MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode)
    else /* if (AccessMode == KernelMode) */
    {
       /* can't map mdl twice */
-      assert(!(Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA|MDL_PARTIAL_HAS_BEEN_MAPPED)));
+      ASSERT(!(Mdl->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA|MDL_PARTIAL_HAS_BEEN_MAPPED)));
       /* can't map mdl buildt from non paged pool into kernel space */
-      assert(!(Mdl->MdlFlags & (MDL_SOURCE_IS_NONPAGED_POOL)));
+      ASSERT(!(Mdl->MdlFlags & (MDL_SOURCE_IS_NONPAGED_POOL)));
       
       CurrentProcess = NULL;
 
@@ -386,7 +386,7 @@ MmUnmapLockedPages(PVOID BaseAddress, PMDL Mdl)
 
    if ((DWORD)BaseAddress >= KERNEL_BASE)
    {
-      assert(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA);
+      ASSERT(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA);
       
       KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql);
       /* Deallocate all the pages used. */
@@ -407,7 +407,7 @@ MmUnmapLockedPages(PVOID BaseAddress, PMDL Mdl)
    {
       MEMORY_AREA *Marea;
       
-      assert(Mdl->Process == PsGetCurrentProcess());
+      ASSERT(Mdl->Process == PsGetCurrentProcess());
 
       Marea = MmOpenMemoryAreaByAddress( &Mdl->Process->AddressSpace, BaseAddress );
       if (Marea == NULL)
@@ -505,14 +505,14 @@ VOID STDCALL MmProbeAndLockPages (PMDL Mdl,
 
    DPRINT("MmProbeAndLockPages(Mdl %x)\n", Mdl);
 
-   assert(!(Mdl->MdlFlags & (MDL_PAGES_LOCKED|MDL_MAPPED_TO_SYSTEM_VA|MDL_PARTIAL|
+   ASSERT(!(Mdl->MdlFlags & (MDL_PAGES_LOCKED|MDL_MAPPED_TO_SYSTEM_VA|MDL_PARTIAL|
             MDL_IO_SPACE|MDL_SOURCE_IS_NONPAGED_POOL)));
 
    MdlPages = (PPFN_TYPE)(Mdl + 1);
    NrPages = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE;
    
    /* mdl must have enough page entries */
-   assert(NrPages <= (Mdl->Size - sizeof(MDL))/sizeof(PFN_TYPE));
+   ASSERT(NrPages <= (Mdl->Size - sizeof(MDL))/sizeof(PFN_TYPE));
 
 
    if (Mdl->StartVa >= (PVOID)KERNEL_BASE && 
@@ -678,13 +678,13 @@ MmBuildMdlForNonPagedPool (PMDL Mdl)
     * mdl buffer must (at least) be in kernel space, thou this doesn't 
     * necesarely mean that the buffer in within _nonpaged_ kernel space...
     */
-   assert((ULONG)Mdl->StartVa >= KERNEL_BASE);
+   ASSERT((ULONG)Mdl->StartVa >= KERNEL_BASE);
    
    PageCount = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE;
    MdlPages = (PPFN_TYPE)(Mdl + 1);
    
    /* mdl must have enough page entries */
-   assert(PageCount <= (Mdl->Size - sizeof(MDL))/sizeof(PFN_TYPE));
+   ASSERT(PageCount <= (Mdl->Size - sizeof(MDL))/sizeof(PFN_TYPE));
    
    for (i=0; i < PageCount; i++)
    {
@@ -777,7 +777,7 @@ MmAllocatePagesForMdl ( IN PHYSICAL_ADDRESS LowAddress,
 */
    
    /* SkipBytes must be a multiple of the page size */
-   assert((SkipBytes.QuadPart % PAGE_SIZE) == 0);
+   ASSERT((SkipBytes.QuadPart % PAGE_SIZE) == 0);
    
    UNIMPLEMENTED;
    return(NULL);
diff --git a/reactos/ntoskrnl/mm/mm.c b/reactos/ntoskrnl/mm/mm.c
index b27bc050cce..dc6bc448069 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.78 2004/08/21 19:04:47 tamlin Exp $
+/* $Id: mm.c,v 1.79 2004/10/22 20:38:22 ekohl Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -103,7 +103,7 @@ NTSTATUS MmReleaseMemoryArea(PEPROCESS Process, PMEMORY_AREA Marea)
    {
       case MEMORY_AREA_SECTION_VIEW:
          Status = MmUnmapViewOfSection(Process, Marea->BaseAddress);
-         assert(Status == STATUS_SUCCESS);
+         ASSERT(Status == STATUS_SUCCESS);
          return(STATUS_SUCCESS);
 
       case MEMORY_AREA_VIRTUAL_MEMORY:
diff --git a/reactos/ntoskrnl/mm/mminit.c b/reactos/ntoskrnl/mm/mminit.c
index 90e15fc0878..3d4610b7123 100644
--- a/reactos/ntoskrnl/mm/mminit.c
+++ b/reactos/ntoskrnl/mm/mminit.c
@@ -1,4 +1,4 @@
-/* $Id: mminit.c,v 1.70 2004/10/04 21:38:49 ion Exp $
+/* $Id: mminit.c,v 1.71 2004/10/22 20:38:22 ekohl Exp $
  *
  * COPYRIGHT:   See COPYING in the top directory
  * PROJECT:     ReactOS kernel 
@@ -152,7 +152,7 @@ MmInitVirtualMemory(ULONG LastKernelAddress,
                       BoundaryAddressMultiple);
 
    BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG)&_text_end__));
-   assert (BaseAddress == (PVOID)&_init_start__);
+   ASSERT(BaseAddress == (PVOID)&_init_start__);
    Length = PAGE_ROUND_UP(((ULONG)&_init_end__)) -
             PAGE_ROUND_UP(((ULONG)&_text_end__));
    ParamLength = ParamLength - Length;
@@ -469,7 +469,7 @@ MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
                      PFN_TYPE Page, SWAPENTRY SwapEntry,
                      BOOLEAN Dirty)
 {
-   assert(SwapEntry == 0);
+   ASSERT(SwapEntry == 0);
    if (Page != 0)
    {
       MmReleasePageMemoryConsumer(MC_NPPOOL, Page);
diff --git a/reactos/ntoskrnl/mm/ncache.c b/reactos/ntoskrnl/mm/ncache.c
index 030403e4d8e..57439281d5c 100644
--- a/reactos/ntoskrnl/mm/ncache.c
+++ b/reactos/ntoskrnl/mm/ncache.c
@@ -1,4 +1,4 @@
-/* $Id: ncache.c,v 1.30 2004/08/15 16:39:08 chorns Exp $
+/* $Id: ncache.c,v 1.31 2004/10/22 20:38:22 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -92,7 +92,7 @@ MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
                     PFN_TYPE Page, SWAPENTRY SwapEntry,
                     BOOLEAN Dirty)
 {
-   assert(SwapEntry == 0);
+   ASSERT(SwapEntry == 0);
    if (Page != 0)
    {
       MmReleasePageMemoryConsumer(MC_NPPOOL, Page);
diff --git a/reactos/ntoskrnl/mm/npool.c b/reactos/ntoskrnl/mm/npool.c
index 2bccf77fb4e..db181e4e6e9 100644
--- a/reactos/ntoskrnl/mm/npool.c
+++ b/reactos/ntoskrnl/mm/npool.c
@@ -1,4 +1,4 @@
-/* $Id: npool.c,v 1.91 2004/10/01 20:51:28 arty Exp $
+/* $Id: npool.c,v 1.92 2004/10/22 20:38:22 ekohl Exp $
  *
  * COPYRIGHT:    See COPYING in the top level directory
  * PROJECT:      ReactOS kernel
@@ -322,7 +322,7 @@ void avl_insert (PNODE * root, PNODE n, int (*compare)(PNODE, PNODE))
       }
       else
       {
-         assert (x->balance == +1);
+         ASSERT(x->balance == +1);
          w = x->link[1];
          x->link[1] = w->link[0];
          w->link[0] = x;
@@ -373,7 +373,7 @@ void avl_insert (PNODE * root, PNODE n, int (*compare)(PNODE, PNODE))
       }
       else
       {
-         assert (x->balance == -1);
+         ASSERT(x->balance == -1);
          w = x->link[0];
          x->link[0] = w->link[1];
          w->link[1] = x;
@@ -528,7 +528,7 @@ void avl_remove (PNODE *root, PNODE item, int (*compare)(PNODE, PNODE))
             {
                PNODE w;
 
-               assert (x->balance == -1);
+               ASSERT(x->balance == -1);
                w = x->link[0];
                x->link[0] = w->link[1];
                w->link[1] = x;
@@ -600,7 +600,7 @@ void avl_remove (PNODE *root, PNODE item, int (*compare)(PNODE, PNODE))
             if (x->balance == +1)
             {
                PNODE w;
-               assert (x->balance == +1);
+               ASSERT(x->balance == +1);
                w = x->link[1];
                x->link[1] = w->link[0];
                w->link[0] = x;
diff --git a/reactos/ntoskrnl/mm/section.c b/reactos/ntoskrnl/mm/section.c
index 25c46a4290a..13b21a5ae3e 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.165 2004/10/09 12:17:54 gvg Exp $
+/* $Id: section.c,v 1.166 2004/10/22 20:38:23 ekohl Exp $
  *
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/mm/section.c
@@ -458,7 +458,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
    FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->FileOffset;
    IsImageSection = MemoryArea->Data.SectionData.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE;
 
-   assert(Bcb);
+   ASSERT(Bcb);
 
    DPRINT("%S %x\n", FileObject->FileName.Buffer, FileOffset);
 
@@ -1766,7 +1766,7 @@ MmWritePageSectionView(PMADDRESS_SPACE AddressSpace,
     */
    if (DirectMapped && !Private)
    {
-      assert(SwapEntry == 0);
+      ASSERT(SwapEntry == 0);
       CcRosMarkDirtyCacheSegment(Bcb, Offset + MemoryArea->Data.SectionData.ViewOffset);
       PageOp->Status = STATUS_SUCCESS;
       MmspCompleteAndReleasePageOp(PageOp);
@@ -3215,7 +3215,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
          FileObject = MemoryArea->Data.SectionData.Section->FileObject;
          Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
          CcRosMarkDirtyCacheSegment(Bcb, Offset);
-         assert(SwapEntry == 0);
+         ASSERT(SwapEntry == 0);
       }
    }
 
@@ -3337,7 +3337,7 @@ MmUnmapViewOfSection(PEPROCESS Process,
    DPRINT("Opening memory area Process %x BaseAddress %x\n",
           Process, BaseAddress);
 
-   assert(Process);
+   ASSERT(Process);
 
    AddressSpace = &Process->AddressSpace;
    MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
@@ -3760,7 +3760,7 @@ MmMapViewOfSection(IN PVOID SectionObject,
    ULONG ViewOffset;
    NTSTATUS Status = STATUS_SUCCESS;
 
-   assert(Process);
+   ASSERT(Process);
 
    Section = (PSECTION_OBJECT)SectionObject;
    AddressSpace = &Process->AddressSpace;
diff --git a/reactos/ntoskrnl/mm/virtual.c b/reactos/ntoskrnl/mm/virtual.c
index 76407485906..8632876a494 100644
--- a/reactos/ntoskrnl/mm/virtual.c
+++ b/reactos/ntoskrnl/mm/virtual.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: virtual.c,v 1.80 2004/08/31 20:17:18 hbirr Exp $
+/* $Id: virtual.c,v 1.81 2004/10/22 20:38:23 ekohl Exp $
  *
  * PROJECT:     ReactOS kernel
  * FILE:        ntoskrnl/mm/virtual.c
@@ -623,7 +623,7 @@ ProbeForRead (IN PVOID Address,
               IN ULONG Length,
               IN ULONG Alignment)
 {
-   assert (Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8);
+   ASSERT(Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8);
 
    if (Length == 0)
       return;
@@ -652,7 +652,7 @@ ProbeForWrite (IN PVOID Address,
    ULONG x;
    ULONG i;
 
-   assert (Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8);
+   ASSERT(Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8);
 
    if (Length == 0)
       return;
diff --git a/reactos/ntoskrnl/nt/nttimer.c b/reactos/ntoskrnl/nt/nttimer.c
index 630aa0d6941..46b7c321738 100644
--- a/reactos/ntoskrnl/nt/nttimer.c
+++ b/reactos/ntoskrnl/nt/nttimer.c
@@ -1,4 +1,4 @@
-/* $Id: nttimer.c,v 1.24 2004/08/15 16:39:09 chorns Exp $
+/* $Id: nttimer.c,v 1.25 2004/10/22 20:41:10 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -113,7 +113,7 @@ NtpTimerApcKernelRoutine(PKAPC Apc,
 VOID INIT_FUNCTION
 NtInitializeTimerImplementation(VOID)
 {
-   assert(!ExTimerType)
+   ASSERT(!ExTimerType)
    ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE));
 
    RtlCreateUnicodeString(&ExTimerType->TypeName, L"Timer");
diff --git a/reactos/ntoskrnl/ob/object.c b/reactos/ntoskrnl/ob/object.c
index 10f8e25729e..38eacafca44 100644
--- a/reactos/ntoskrnl/ob/object.c
+++ b/reactos/ntoskrnl/ob/object.c
@@ -1,4 +1,4 @@
-/* $Id: object.c,v 1.83 2004/08/15 16:39:10 chorns Exp $
+/* $Id: object.c,v 1.84 2004/10/22 20:43:58 ekohl Exp $
  * 
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -343,7 +343,7 @@ ObCreateObject (IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL,
   PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL;
   SECURITY_SUBJECT_CONTEXT SubjectContext;
 
-  assert_irql(APC_LEVEL);
+  ASSERT_IRQL(APC_LEVEL);
 
   DPRINT("ObCreateObject(Type %p ObjectAttributes %p, Object %p)\n",
 	 Type, ObjectAttributes, Object);
@@ -603,10 +603,10 @@ ObOpenObjectByPointer(IN POBJECT Object,
 static NTSTATUS
 ObpDeleteObject(POBJECT_HEADER Header)
 {
-  DPRINT("ObPerformRetentionChecks(Header %p)\n", Header);
+  DPRINT("ObpDeleteObject(Header %p)\n", Header);
   if (KeGetCurrentIrql() != PASSIVE_LEVEL)
     {
-      DPRINT("ObpPerformRetentionChecks called at an unsupported IRQL.  Use ObpPerformRetentionChecksDpcLevel instead.\n");
+      DPRINT("ObpDeleteObject called at an unsupported IRQL.  Use ObpDeleteObjectDpcLevel instead.\n");
       KEBUGCHECK(0);
     }
 
@@ -640,8 +640,8 @@ ObpDeleteObjectWorkRoutine (IN PVOID Parameter)
   PRETENTION_CHECK_PARAMS Params = (PRETENTION_CHECK_PARAMS)Parameter;
   /* ULONG Tag; */ /* See below */
 
-  assert(Params);
-  assert(KeGetCurrentIrql() == PASSIVE_LEVEL); /* We need PAGED_CODE somewhere... */
+  ASSERT(Params);
+  ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); /* We need PAGED_CODE somewhere... */
 
   /* Turn this on when we have ExFreePoolWithTag
   Tag = Params->ObjectHeader->ObjectType->Tag; */
@@ -706,7 +706,7 @@ ObpDeleteObjectDpcLevel(IN POBJECT_HEADER ObjectHeader,
       return STATUS_PENDING;
       
     default:
-      DPRINT("ObpPerformRetentionChecksDpcLevel called at unsupported "
+      DPRINT("ObpDeleteObjectDpcLevel called at unsupported "
 	     "IRQL %u!\n", KeGetCurrentIrql());
       KEBUGCHECK(0);
       return STATUS_UNSUCCESSFUL;
@@ -737,7 +737,7 @@ ObfReferenceObject(IN PVOID Object)
 {
   POBJECT_HEADER Header;
 
-  assert(Object);
+  ASSERT(Object);
 
   Header = BODY_TO_HEADER(Object);
 
@@ -775,7 +775,7 @@ ObfDereferenceObject(IN PVOID Object)
   BOOL Permanent;
   ULONG HandleCount;
 
-  assert(Object);
+  ASSERT(Object);
 
   /* Extract the object header. */
   Header = BODY_TO_HEADER(Object);
@@ -787,7 +787,7 @@ ObfDereferenceObject(IN PVOID Object)
      last reference.
   */
   NewRefCount = InterlockedDecrement(&Header->RefCount);
-  assert(NewRefCount >= 0);
+  ASSERT(NewRefCount >= 0);
 
   /* Check whether the object can now be deleted. */
   if (NewRefCount == 0 &&
@@ -819,10 +819,10 @@ ObGetObjectPointerCount(PVOID Object)
 {
   POBJECT_HEADER Header;
 
-  assert(Object);
+  ASSERT(Object);
   Header = BODY_TO_HEADER(Object);
 
-  return(Header->RefCount);
+  return Header->RefCount;
 }
 
 
@@ -844,10 +844,10 @@ ObGetObjectHandleCount(PVOID Object)
 {
   POBJECT_HEADER Header;
 
-  assert(Object);
+  ASSERT(Object);
   Header = BODY_TO_HEADER(Object);
 
-  return(Header->HandleCount);
+  return Header->HandleCount;
 }
 
 
diff --git a/reactos/ntoskrnl/ob/symlink.c b/reactos/ntoskrnl/ob/symlink.c
index 4fa42328062..e72cbbaeb18 100644
--- a/reactos/ntoskrnl/ob/symlink.c
+++ b/reactos/ntoskrnl/ob/symlink.c
@@ -1,4 +1,4 @@
-/* $Id: symlink.c,v 1.9 2004/08/15 16:39:10 chorns Exp $
+/* $Id: symlink.c,v 1.10 2004/10/22 20:43:58 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -210,7 +210,7 @@ NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,
   PSYMLINK_OBJECT SymbolicLink;
   NTSTATUS Status;
 
-  assert_irql(PASSIVE_LEVEL);
+  ASSERT_IRQL(PASSIVE_LEVEL);
 
   DPRINT("NtCreateSymbolicLinkObject(SymbolicLinkHandle %p, DesiredAccess %ul, ObjectAttributes %p, DeviceName %wZ)\n",
 	 SymbolicLinkHandle,
-- 
2.17.1