Use upper-case ASSERT macros.

svn path=/trunk/; revision=11390
This commit is contained in:
Eric Kohl 2004-10-22 20:43:58 +00:00
parent 9e01875f9c
commit b1a58d7d7e
41 changed files with 233 additions and 253 deletions

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -60,12 +60,12 @@ IoAllocateController(PCONTROLLER_OBJECT ControllerObject,
PCONTROLLER_QUEUE_ENTRY entry; PCONTROLLER_QUEUE_ENTRY entry;
IO_ALLOCATION_ACTION Result; IO_ALLOCATION_ACTION Result;
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
entry = entry =
ExAllocatePoolWithTag(NonPagedPool, sizeof(CONTROLLER_QUEUE_ENTRY), ExAllocatePoolWithTag(NonPagedPool, sizeof(CONTROLLER_QUEUE_ENTRY),
TAG_CQE); TAG_CQE);
assert(entry!=NULL); ASSERT(entry!=NULL);
entry->DeviceObject = DeviceObject; entry->DeviceObject = DeviceObject;
entry->ExecutionRoutine = ExecutionRoutine; entry->ExecutionRoutine = ExecutionRoutine;
@ -99,7 +99,7 @@ IoCreateController(ULONG Size)
{ {
PCONTROLLER_OBJECT controller; PCONTROLLER_OBJECT controller;
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
controller = controller =
ExAllocatePoolWithTag(NonPagedPool, sizeof(CONTROLLER_OBJECT), ExAllocatePoolWithTag(NonPagedPool, sizeof(CONTROLLER_OBJECT),
@ -133,7 +133,7 @@ IoDeleteController(PCONTROLLER_OBJECT ControllerObject)
* ControllerObject = Controller object to be released * ControllerObject = Controller object to be released
*/ */
{ {
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
ExFreePool(ControllerObject->ControllerExtension); ExFreePool(ControllerObject->ControllerExtension);
ExFreePool(ControllerObject); ExFreePool(ControllerObject);

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -212,7 +212,7 @@ IoCreateStreamFileObject(PFILE_OBJECT FileObject,
DPRINT("IoCreateStreamFileObject(FileObject %x, DeviceObject %x)\n", DPRINT("IoCreateStreamFileObject(FileObject %x, DeviceObject %x)\n",
FileObject, DeviceObject); FileObject, DeviceObject);
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
Status = ObCreateObject(KernelMode, Status = ObCreateObject(KernelMode,
IoFileObjectType, IoFileObjectType,
@ -346,7 +346,7 @@ IoCreateFile(OUT PHANDLE FileHandle,
FileHandle,DesiredAccess,ObjectAttributes, FileHandle,DesiredAccess,ObjectAttributes,
ObjectAttributes->ObjectName->Buffer); ObjectAttributes->ObjectName->Buffer);
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
if (IoStatusBlock == NULL) if (IoStatusBlock == NULL)
return STATUS_ACCESS_VIOLATION; return STATUS_ACCESS_VIOLATION;
@ -491,7 +491,7 @@ IoCreateFile(OUT PHANDLE FileHandle,
ZwClose(*FileHandle); ZwClose(*FileHandle);
} }
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("Finished IoCreateFile() (*FileHandle) %x\n", (*FileHandle)); DPRINT("Finished IoCreateFile() (*FileHandle) %x\n", (*FileHandle));

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -15,8 +15,6 @@
#define NDEBUG #define NDEBUG
#include <internal/debug.h> #include <internal/debug.h>
#define ASSERT assert
/* GLOBALS ********************************************************************/ /* GLOBALS ********************************************************************/
#define TAG_DEVICE_EXTENSION TAG('D', 'E', 'X', 'T') #define TAG_DEVICE_EXTENSION TAG('D', 'E', 'X', 'T')
@ -538,7 +536,7 @@ IoCreateDevice(
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
NTSTATUS Status; NTSTATUS Status;
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
if (DeviceName != NULL) if (DeviceName != NULL)
{ {

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -41,8 +41,8 @@ NtQueryInformationFile(HANDLE FileHandle,
PVOID SystemBuffer; PVOID SystemBuffer;
KPROCESSOR_MODE PreviousMode; KPROCESSOR_MODE PreviousMode;
assert(IoStatusBlock != NULL); ASSERT(IoStatusBlock != NULL);
assert(FileInformation != NULL); ASSERT(FileInformation != NULL);
DPRINT("NtQueryInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " DPRINT("NtQueryInformationFile(Handle %x StatBlk %x FileInfo %x Length %d "
"Class %d)\n", FileHandle, IoStatusBlock, FileInformation, "Class %d)\n", FileHandle, IoStatusBlock, FileInformation,
@ -308,7 +308,7 @@ IoQueryFileInformation(IN PFILE_OBJECT FileObject,
PIO_STACK_LOCATION StackPtr; PIO_STACK_LOCATION StackPtr;
NTSTATUS Status; NTSTATUS Status;
assert(FileInformation != NULL) ASSERT(FileInformation != NULL);
Status = ObReferenceObjectByPointer(FileObject, Status = ObReferenceObjectByPointer(FileObject,
FILE_READ_ATTRIBUTES, FILE_READ_ATTRIBUTES,
@ -392,8 +392,8 @@ NtSetInformationFile(HANDLE FileHandle,
PVOID SystemBuffer; PVOID SystemBuffer;
KPROCESSOR_MODE PreviousMode; KPROCESSOR_MODE PreviousMode;
assert(IoStatusBlock != NULL) ASSERT(IoStatusBlock != NULL);
assert(FileInformation != NULL) ASSERT(FileInformation != NULL);
DPRINT("NtSetInformationFile(Handle %x StatBlk %x FileInfo %x Length %d " DPRINT("NtSetInformationFile(Handle %x StatBlk %x FileInfo %x Length %d "
"Class %d)\n", FileHandle, IoStatusBlock, FileInformation, "Class %d)\n", FileHandle, IoStatusBlock, FileInformation,

View file

@ -245,7 +245,7 @@ IopMountFileSystem(PDEVICE_OBJECT DeviceObject,
DPRINT("IopMountFileSystem(DeviceObject %x, DeviceToMount %x)\n", DPRINT("IopMountFileSystem(DeviceObject %x, DeviceToMount %x)\n",
DeviceObject,DeviceToMount); DeviceObject,DeviceToMount);
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
KeInitializeEvent(&Event, NotificationEvent, FALSE); KeInitializeEvent(&Event, NotificationEvent, FALSE);
Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE);
@ -293,7 +293,7 @@ IopLoadFileSystem(IN PDEVICE_OBJECT DeviceObject)
DPRINT("IopLoadFileSystem(DeviceObject %x)\n", DeviceObject); DPRINT("IopLoadFileSystem(DeviceObject %x)\n", DeviceObject);
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
KeInitializeEvent(&Event, NotificationEvent, FALSE); KeInitializeEvent(&Event, NotificationEvent, FALSE);
Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE);
@ -343,7 +343,7 @@ IoMountVolume(IN PDEVICE_OBJECT DeviceObject,
DEVICE_TYPE MatchingDeviceType; DEVICE_TYPE MatchingDeviceType;
PDEVICE_OBJECT DevObject; PDEVICE_OBJECT DevObject;
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("IoMountVolume(DeviceObject %x AllowRawMount %x)\n", DPRINT("IoMountVolume(DeviceObject %x AllowRawMount %x)\n",
DeviceObject, AllowRawMount); DeviceObject, AllowRawMount);
@ -589,7 +589,7 @@ IoRegisterFileSystem(IN PDEVICE_OBJECT DeviceObject)
Fs = ExAllocatePoolWithTag(NonPagedPool, Fs = ExAllocatePoolWithTag(NonPagedPool,
sizeof(FILE_SYSTEM_OBJECT), sizeof(FILE_SYSTEM_OBJECT),
TAG_FILE_SYSTEM); TAG_FILE_SYSTEM);
assert(Fs!=NULL); ASSERT(Fs!=NULL);
Fs->DeviceObject = DeviceObject; Fs->DeviceObject = DeviceObject;
KeEnterCriticalRegion(); KeEnterCriticalRegion();

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -162,7 +162,7 @@ IoInitializeIrp(PIRP Irp,
* StackSize = Number of stack locations in the IRP * StackSize = Number of stack locations in the IRP
*/ */
{ {
assert(Irp != NULL); ASSERT(Irp != NULL);
memset(Irp, 0, PacketSize); memset(Irp, 0, PacketSize);
Irp->Size = PacketSize; Irp->Size = PacketSize;
@ -189,12 +189,12 @@ IofCallDriver(PDEVICE_OBJECT DeviceObject,
DPRINT("IofCallDriver(DeviceObject %x, Irp %x)\n",DeviceObject,Irp); DPRINT("IofCallDriver(DeviceObject %x, Irp %x)\n",DeviceObject,Irp);
assert(Irp); ASSERT(Irp);
assert(DeviceObject); ASSERT(DeviceObject);
DriverObject = DeviceObject->DriverObject; DriverObject = DeviceObject->DriverObject;
assert(DriverObject); ASSERT(DriverObject);
IoSetNextIrpStackLocation(Irp); IoSetNextIrpStackLocation(Irp);
Param = IoGetCurrentIrpStackLocation(Irp); Param = IoGetCurrentIrpStackLocation(Irp);
@ -301,9 +301,9 @@ IofCompleteRequest(PIRP Irp,
DPRINT("IoCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n", DPRINT("IoCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n",
Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread()); Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread());
assert(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
assert(Irp->CancelRoutine == NULL); ASSERT(Irp->CancelRoutine == NULL);
assert(Irp->IoStatus.Status != STATUS_PENDING); ASSERT(Irp->IoStatus.Status != STATUS_PENDING);
if (IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED) if (IoGetCurrentIrpStackLocation(Irp)->Control & SL_PENDING_RETURNED)
{ {

View file

@ -34,7 +34,7 @@ NtCreateMailslotFile(OUT PHANDLE FileHandle,
FileHandle,DesiredAccess,ObjectAttributes, FileHandle,DesiredAccess,ObjectAttributes,
ObjectAttributes->ObjectName->Buffer); ObjectAttributes->ObjectName->Buffer);
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
if (TimeOut != NULL) if (TimeOut != NULL)
{ {

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -54,7 +54,7 @@ IoAllocateMdl(PVOID VirtualAddress,
{ {
if (SecondaryBuffer) if (SecondaryBuffer)
{ {
assert(Irp->MdlAddress); ASSERT(Irp->MdlAddress);
/* FIXME: add to end of list maybe?? */ /* FIXME: add to end of list maybe?? */
Mdl->Next = Irp->MdlAddress->Next; Mdl->Next = Irp->MdlAddress->Next;

View file

@ -39,7 +39,7 @@ NtCreateNamedPipeFile(PHANDLE FileHandle,
FileHandle,DesiredAccess,ObjectAttributes, FileHandle,DesiredAccess,ObjectAttributes,
ObjectAttributes->ObjectName->Buffer); ObjectAttributes->ObjectName->Buffer);
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
if (TimeOut != NULL) if (TimeOut != NULL)
{ {

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -33,17 +33,6 @@ PDRIVER_OBJECT IopRootDriverObject;
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
/*
* @unimplemented
*/
VOID
STDCALL
IoAdjustPagingPathCount(
IN PLONG Count,
IN BOOLEAN Increment)
{
}
/* /*
* @unimplemented * @unimplemented
*/ */
@ -491,11 +480,11 @@ IopFreeDeviceNode(PDEVICE_NODE DeviceNode)
KIRQL OldIrql; KIRQL OldIrql;
/* All children must be deleted before a parent is deleted */ /* All children must be deleted before a parent is deleted */
assert(!DeviceNode->Child); ASSERT(!DeviceNode->Child);
KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql); KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
assert(DeviceNode->Pdo); ASSERT(DeviceNode->Pdo);
ObDereferenceObject(DeviceNode->Pdo); ObDereferenceObject(DeviceNode->Pdo);

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -332,8 +332,8 @@ RawFsAllocateIrpContext(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
DPRINT("RawFsAllocateIrpContext(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); DPRINT("RawFsAllocateIrpContext(DeviceObject %x, Irp %x)\n", DeviceObject, Irp);
assert(DeviceObject); ASSERT(DeviceObject);
assert(Irp); ASSERT(Irp);
GlobalData = (PRAWFS_GLOBAL_DATA) DeviceObject->DeviceExtension; GlobalData = (PRAWFS_GLOBAL_DATA) DeviceObject->DeviceExtension;
IrpContext = ExAllocateFromNPagedLookasideList(&IrpContextLookasideList); IrpContext = ExAllocateFromNPagedLookasideList(&IrpContextLookasideList);
@ -344,7 +344,7 @@ RawFsAllocateIrpContext(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
IrpContext->DeviceObject = DeviceObject; IrpContext->DeviceObject = DeviceObject;
IrpContext->DeviceExt = DeviceObject->DeviceExtension; IrpContext->DeviceExt = DeviceObject->DeviceExtension;
IrpContext->Stack = IoGetCurrentIrpStackLocation(Irp); IrpContext->Stack = IoGetCurrentIrpStackLocation(Irp);
assert(IrpContext->Stack); ASSERT(IrpContext->Stack);
MajorFunction = IrpContext->MajorFunction = IrpContext->Stack->MajorFunction; MajorFunction = IrpContext->MajorFunction = IrpContext->Stack->MajorFunction;
IrpContext->MinorFunction = IrpContext->Stack->MinorFunction; IrpContext->MinorFunction = IrpContext->Stack->MinorFunction;
IrpContext->FileObject = IrpContext->Stack->FileObject; IrpContext->FileObject = IrpContext->Stack->FileObject;
@ -369,7 +369,7 @@ RawFsFreeIrpContext(IN PRAWFS_IRP_CONTEXT IrpContext)
{ {
DPRINT("RawFsFreeIrpContext(IrpContext %x)\n", IrpContext); DPRINT("RawFsFreeIrpContext(IrpContext %x)\n", IrpContext);
assert(IrpContext); ASSERT(IrpContext);
ExFreeToNPagedLookasideList(&IrpContextLookasideList, IrpContext); ExFreeToNPagedLookasideList(&IrpContextLookasideList, IrpContext);
} }
@ -392,8 +392,8 @@ RawFsQueueRequest(PRAWFS_IRP_CONTEXT IrpContext)
{ {
ULONG Count; ULONG Count;
assert(IrpContext != NULL); ASSERT(IrpContext != NULL);
assert(IrpContext->Irp != NULL); ASSERT(IrpContext->Irp != NULL);
Count = InterlockedIncrement(&RawFsQueueCount); Count = InterlockedIncrement(&RawFsQueueCount);
@ -475,7 +475,7 @@ RawFsCreate(IN PRAWFS_IRP_CONTEXT IrpContext)
DPRINT("RawFsCreate(IrpContext %x)\n", IrpContext); DPRINT("RawFsCreate(IrpContext %x)\n", IrpContext);
assert(IrpContext); ASSERT(IrpContext);
if (RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject)) if (RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject))
{ {
@ -537,7 +537,7 @@ RawFsMount(IN PRAWFS_IRP_CONTEXT IrpContext)
DPRINT("RawFsMount(IrpContext %x)\n", IrpContext); DPRINT("RawFsMount(IrpContext %x)\n", IrpContext);
assert(IrpContext); ASSERT(IrpContext);
if (!RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject)) if (!RawFsIsRawFileSystemDeviceObject(IrpContext->DeviceObject))
{ {
@ -675,7 +675,7 @@ RawFsFileSystemControl(IN PRAWFS_IRP_CONTEXT IrpContext)
DPRINT("RawFsFileSystemControl(IrpContext %x)\n", IrpContext); DPRINT("RawFsFileSystemControl(IrpContext %x)\n", IrpContext);
assert (IrpContext); ASSERT(IrpContext);
switch (IrpContext->MinorFunction) switch (IrpContext->MinorFunction)
{ {
@ -791,7 +791,7 @@ RawFsDispatchRequest(IN PRAWFS_IRP_CONTEXT IrpContext)
DPRINT("RawFsDispatchRequest(IrpContext %x), MajorFunction %x\n", DPRINT("RawFsDispatchRequest(IrpContext %x), MajorFunction %x\n",
IrpContext, IrpContext->MajorFunction); IrpContext, IrpContext->MajorFunction);
assert (IrpContext); ASSERT(IrpContext);
switch (IrpContext->MajorFunction) switch (IrpContext->MajorFunction)
{ {
@ -839,8 +839,8 @@ RawFsBuildRequest(IN PDEVICE_OBJECT DeviceObject,
DPRINT("RawFsBuildRequest(DeviceObject %x, Irp %x)\n", DeviceObject, Irp); DPRINT("RawFsBuildRequest(DeviceObject %x, Irp %x)\n", DeviceObject, Irp);
assert(DeviceObject); ASSERT(DeviceObject);
assert(Irp); ASSERT(Irp);
IrpContext = RawFsAllocateIrpContext(DeviceObject, Irp); IrpContext = RawFsAllocateIrpContext(DeviceObject, Irp);
if (IrpContext == NULL) if (IrpContext == NULL)

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -40,7 +40,7 @@ IoCreateSymbolicLink(PUNICODE_STRING SymbolicLinkName,
HANDLE Handle; HANDLE Handle;
NTSTATUS Status; NTSTATUS Status;
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("IoCreateSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n", DPRINT("IoCreateSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n",
SymbolicLinkName, SymbolicLinkName,
@ -91,7 +91,7 @@ IoCreateUnprotectedSymbolicLink(PUNICODE_STRING SymbolicLinkName,
HANDLE Handle; HANDLE Handle;
NTSTATUS Status; NTSTATUS Status;
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("IoCreateUnprotectedSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n", DPRINT("IoCreateUnprotectedSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n",
SymbolicLinkName, SymbolicLinkName,
@ -158,7 +158,7 @@ IoDeleteSymbolicLink(PUNICODE_STRING SymbolicLinkName)
HANDLE Handle; HANDLE Handle;
NTSTATUS Status; NTSTATUS Status;
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("IoDeleteSymbolicLink (SymbolicLinkName %S)\n", DPRINT("IoDeleteSymbolicLink (SymbolicLinkName %S)\n",
SymbolicLinkName->Buffer); SymbolicLinkName->Buffer);

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -100,8 +100,8 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle,
PVOID SystemBuffer; PVOID SystemBuffer;
KPROCESSOR_MODE PreviousMode; KPROCESSOR_MODE PreviousMode;
assert(IoStatusBlock != NULL); ASSERT(IoStatusBlock != NULL);
assert(FsInformation != NULL); ASSERT(FsInformation != NULL);
DPRINT("FsInformation %p\n", FsInformation); DPRINT("FsInformation %p\n", FsInformation);
@ -202,7 +202,7 @@ IoQueryVolumeInformation(IN PFILE_OBJECT FileObject,
PIRP Irp; PIRP Irp;
NTSTATUS Status; NTSTATUS Status;
assert(FsInformation != NULL); ASSERT(FsInformation != NULL);
DPRINT("FsInformation %p\n", FsInformation); DPRINT("FsInformation %p\n", FsInformation);
@ -285,8 +285,8 @@ NtSetVolumeInformationFile(IN HANDLE FileHandle,
PVOID SystemBuffer; PVOID SystemBuffer;
KPROCESSOR_MODE PreviousMode; KPROCESSOR_MODE PreviousMode;
assert(IoStatusBlock != NULL); ASSERT(IoStatusBlock != NULL);
assert(FsInformation != NULL); ASSERT(FsInformation != NULL);
PreviousMode = ExGetPreviousMode(); PreviousMode = ExGetPreviousMode();

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -185,8 +185,8 @@ xHalpReadSector (IN PDEVICE_OBJECT DeviceObject,
DPRINT("xHalpReadSector() called\n"); DPRINT("xHalpReadSector() called\n");
assert(DeviceObject); ASSERT(DeviceObject);
assert(Sector); ASSERT(Sector);
KeInitializeEvent(&Event, KeInitializeEvent(&Event,
NotificationEvent, NotificationEvent,
@ -1183,8 +1183,8 @@ xHalIoWritePartitionTable(IN PDEVICE_OBJECT DeviceObject,
NumberOfHeads, NumberOfHeads,
PartitionBuffer); PartitionBuffer);
assert(DeviceObject); ASSERT(DeviceObject);
assert(PartitionBuffer); ASSERT(PartitionBuffer);
DiskManager = NoDiskManager; DiskManager = NoDiskManager;

View file

@ -631,7 +631,7 @@ KiSwapApcEnvironment(
if (Thread->ApcStateIndex == AttachedApcEnvironment) if (Thread->ApcStateIndex == AttachedApcEnvironment)
{ {
/* NewProcess must be the same as in the original-environment */ /* 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 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)... */ /* we don't support targeting apc's at attached-environments (yet)... */
assert(IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])); ASSERT(IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode]));
assert(IsListEmpty(&Thread->ApcState.ApcListHead[UserMode])); ASSERT(IsListEmpty(&Thread->ApcState.ApcListHead[UserMode]));
assert(Thread->ApcState.KernelApcInProgress == FALSE); ASSERT(Thread->ApcState.KernelApcInProgress == FALSE);
assert(Thread->ApcState.KernelApcPending == FALSE); ASSERT(Thread->ApcState.KernelApcPending == FALSE);
assert(Thread->ApcState.UserApcPending == FALSE); ASSERT(Thread->ApcState.UserApcPending == FALSE);
/* restore backup of original environment */ /* restore backup of original environment */
Thread->ApcState = Thread->SavedApcState; Thread->ApcState = Thread->SavedApcState;

View file

@ -18,7 +18,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -82,7 +82,7 @@ KiDispatchInterrupt(VOID)
KIRQL oldlvl; KIRQL oldlvl;
PKPCR Pcr; PKPCR Pcr;
assert_irql(DISPATCH_LEVEL); ASSERT_IRQL(DISPATCH_LEVEL);
Pcr = KeGetCurrentKPCR(); Pcr = KeGetCurrentKPCR();
@ -96,13 +96,13 @@ KiDispatchInterrupt(VOID)
while (!IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)) 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); current_entry = RemoveHeadList(&Pcr->PrcbData.DpcData[0].DpcListHead);
Pcr->PrcbData.DpcData[0].DpcQueueDepth--; Pcr->PrcbData.DpcData[0].DpcQueueDepth--;
Pcr->PrcbData.DpcData[0].DpcCount++; 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))); (Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0 && !IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)));
current = CONTAINING_RECORD(current_entry,KDPC,DpcListEntry); current = CONTAINING_RECORD(current_entry,KDPC,DpcListEntry);
@ -176,7 +176,7 @@ KeRemoveQueueDpc (PKDPC Dpc)
Dpc->Lock=0; 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))); (Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0 && !IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)));
KiReleaseSpinLock(&Pcr->PrcbData.DpcData[0].DpcLock); KiReleaseSpinLock(&Pcr->PrcbData.DpcData[0].DpcLock);
@ -208,7 +208,7 @@ KeInsertQueueDpc (PKDPC Dpc,
DPRINT("KeInsertQueueDpc(dpc %x, SystemArgument1 %x, SystemArgument2 %x)\n", DPRINT("KeInsertQueueDpc(dpc %x, SystemArgument1 %x, SystemArgument2 %x)\n",
Dpc, SystemArgument1, SystemArgument2); Dpc, SystemArgument1, SystemArgument2);
assert(KeGetCurrentIrql()>=DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql()>=DISPATCH_LEVEL);
Dpc->Number=0; Dpc->Number=0;
Dpc->Importance=MediumImportance; Dpc->Importance=MediumImportance;
@ -222,7 +222,7 @@ KeInsertQueueDpc (PKDPC Dpc,
Pcr = KeGetCurrentKPCR(); Pcr = KeGetCurrentKPCR();
KeRaiseIrql(HIGH_LEVEL, &oldlvl); KeRaiseIrql(HIGH_LEVEL, &oldlvl);
KiAcquireSpinLock(&Pcr->PrcbData.DpcData[0].DpcLock); 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))); (Pcr->PrcbData.DpcData[0].DpcQueueDepth > 0 && !IsListEmpty(&Pcr->PrcbData.DpcData[0].DpcListHead)));
InsertHeadList(&Pcr->PrcbData.DpcData[0].DpcListHead,&Dpc->DpcListEntry); InsertHeadList(&Pcr->PrcbData.DpcData[0].DpcListHead,&Dpc->DpcListEntry);
DPRINT("Dpc->DpcListEntry.Flink %x\n", Dpc->DpcListEntry.Flink); DPRINT("Dpc->DpcListEntry.Flink %x\n", Dpc->DpcListEntry.Flink);

View file

@ -44,7 +44,7 @@ VOID STDCALL KeInitializeEvent (PKEVENT Event,
} }
else else
{ {
assert(FALSE); ASSERT(FALSE);
return; return;
} }

View file

@ -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) 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); 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) + KiIdt[sel].a = (((int)func)&0xffff) +
(KERNEL_CS << 16); (KERNEL_CS << 16);
KiIdt[sel].b = 0x8f00 + (dpl << 13) + (((int)func)&0xffff0000); KiIdt[sel].b = 0x8f00 + (dpl << 13) + (((int)func)&0xffff0000);

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/i386/irq.c * FILE: ntoskrnl/ke/i386/irq.c
@ -518,7 +518,7 @@ KiInterruptDispatch (ULONG irq, PKIRQ_TRAPFRAME Trapframe)
KiDeliverNormalApc(); KiDeliverNormalApc();
assert(KeGetCurrentThread() == CurrentThread); ASSERT(KeGetCurrentThread() == CurrentThread);
if (CurrentThread->TrapFrame == &KernelTrapFrame) if (CurrentThread->TrapFrame == &KernelTrapFrame)
{ {
KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe); KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe);

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -33,7 +33,7 @@ KiSystemCallHook(ULONG Nr, ...)
DbgPrint("%x, ", va_arg(ap, ULONG)); DbgPrint("%x, ", va_arg(ap, ULONG));
} }
DbgPrint(")\n"); DbgPrint(")\n");
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
va_end(ap); va_end(ap);
#endif #endif
} }

View file

@ -27,7 +27,7 @@ KeInsertByKeyDeviceQueue (
IN ULONG SortKey) IN ULONG SortKey)
{ {
DPRINT("KeInsertByKeyDeviceQueue()\n"); DPRINT("KeInsertByKeyDeviceQueue()\n");
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
DeviceQueueEntry->SortKey=SortKey; DeviceQueueEntry->SortKey=SortKey;
@ -64,9 +64,9 @@ KeRemoveByKeyDeviceQueue (
PLIST_ENTRY current; PLIST_ENTRY current;
PKDEVICE_QUEUE_ENTRY entry; PKDEVICE_QUEUE_ENTRY entry;
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
assert(DeviceQueue!=NULL); ASSERT(DeviceQueue!=NULL);
assert(DeviceQueue->Busy); ASSERT(DeviceQueue->Busy);
KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock); KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock);
@ -117,9 +117,9 @@ KeRemoveDeviceQueue (
DPRINT("KeRemoveDeviceQueue(DeviceQueue %x)\n",DeviceQueue); DPRINT("KeRemoveDeviceQueue(DeviceQueue %x)\n",DeviceQueue);
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
assert(DeviceQueue!=NULL); ASSERT(DeviceQueue!=NULL);
assert(DeviceQueue->Busy); ASSERT(DeviceQueue->Busy);
KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock); KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock);
@ -151,7 +151,7 @@ KeInitializeDeviceQueue (
* DeviceQueue = Device queue to initialize * DeviceQueue = Device queue to initialize
*/ */
{ {
assert(DeviceQueue!=NULL); ASSERT(DeviceQueue!=NULL);
InitializeListHead(&DeviceQueue->DeviceListHead); InitializeListHead(&DeviceQueue->DeviceListHead);
DeviceQueue->Busy=FALSE; DeviceQueue->Busy=FALSE;
KeInitializeSpinLock(&DeviceQueue->Lock); KeInitializeSpinLock(&DeviceQueue->Lock);
@ -175,7 +175,7 @@ KeInsertDeviceQueue (
* True otherwise * True otherwise
*/ */
{ {
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock); KeAcquireSpinLockAtDpcLevel(&DeviceQueue->Lock);
@ -206,7 +206,7 @@ KeRemoveEntryDeviceQueue(
KIRQL oldIrql; KIRQL oldIrql;
PKDEVICE_QUEUE_ENTRY entry; PKDEVICE_QUEUE_ENTRY entry;
assert(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
KeAcquireSpinLock(&DeviceQueue->Lock, &oldIrql); KeAcquireSpinLock(&DeviceQueue->Lock, &oldIrql);

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * FILE: ntoskrnl/ke/kthread.c
* PURPOSE: Microkernel thread support * PURPOSE: Microkernel thread support
@ -55,7 +55,7 @@ VOID
KeFreeStackPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, KeFreeStackPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty) PFN_TYPE Page, SWAPENTRY SwapEntry, BOOLEAN Dirty)
{ {
assert(SwapEntry == 0); ASSERT(SwapEntry == 0);
if (Page != 0) if (Page != 0)
{ {
MmReleasePageMemoryConsumer(MC_NPPOOL, Page); MmReleasePageMemoryConsumer(MC_NPPOOL, Page);
@ -328,7 +328,7 @@ crashes. I'm disabling it again, until we fix the APC implementation...
} }
VOID STDCALL VOID STDCALL
KeRescheduleThread() KeRescheduleThread(VOID)
{ {
PsDispatchThread(THREAD_STATE_READY); PsDispatchThread(THREAD_STATE_READY);
} }
@ -338,9 +338,7 @@ KeRescheduleThread()
*/ */
VOID VOID
STDCALL STDCALL
KeRevertToUserAffinityThread( KeRevertToUserAffinityThread(VOID)
VOID
)
{ {
PKTHREAD CurrentThread; PKTHREAD CurrentThread;
CurrentThread = KeGetCurrentThread(); CurrentThread = KeGetCurrentThread();
@ -359,8 +357,7 @@ CCHAR
STDCALL STDCALL
KeSetIdealProcessorThread ( KeSetIdealProcessorThread (
IN PKTHREAD Thread, IN PKTHREAD Thread,
IN CCHAR Processor IN CCHAR Processor)
)
{ {
CCHAR PreviousIdealProcessor; CCHAR PreviousIdealProcessor;
@ -379,9 +376,7 @@ KeSetIdealProcessorThread (
*/ */
VOID VOID
STDCALL STDCALL
KeSetSystemAffinityThread( KeSetSystemAffinityThread(IN KAFFINITY Affinity)
IN KAFFINITY Affinity
)
{ {
PKTHREAD CurrentThread; PKTHREAD CurrentThread;
CurrentThread = KeGetCurrentThread(); CurrentThread = KeGetCurrentThread();
@ -398,9 +393,7 @@ KeSetSystemAffinityThread(
*/ */
VOID VOID
STDCALL STDCALL
KeTerminateThread( KeTerminateThread(IN KPRIORITY Increment)
IN KPRIORITY Increment
)
{ {
/* The Increment Argument seems to be ignored by NT and always 0 when called */ /* The Increment Argument seems to be ignored by NT and always 0 when called */

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/main.c * FILE: ntoskrnl/ke/main.c
@ -289,25 +289,25 @@ ExpInitializeExecutive(VOID)
* Fail at runtime if someone has changed various structures without * Fail at runtime if someone has changed various structures without
* updating the offsets used for the assembler code. * updating the offsets used for the assembler code.
*/ */
assert(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK); ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK);
assert(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB); ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB);
assert(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK); ASSERT(FIELD_OFFSET(KTHREAD, KernelStack) == KTHREAD_KERNEL_STACK);
assert(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE); ASSERT(FIELD_OFFSET(KTHREAD, ServiceTable) == KTHREAD_SERVICE_TABLE);
assert(FIELD_OFFSET(KTHREAD, PreviousMode) == KTHREAD_PREVIOUS_MODE); ASSERT(FIELD_OFFSET(KTHREAD, PreviousMode) == KTHREAD_PREVIOUS_MODE);
assert(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME); ASSERT(FIELD_OFFSET(KTHREAD, TrapFrame) == KTHREAD_TRAP_FRAME);
assert(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK);
assert(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS);
assert(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) ==
KPROCESS_DIRECTORY_TABLE_BASE); KPROCESS_DIRECTORY_TABLE_BASE);
assert(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET); ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET);
assert(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0); ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0);
assert(FIELD_OFFSET(KTRAP_FRAME, Reserved9) == KTRAP_FRAME_RESERVED9); ASSERT(FIELD_OFFSET(KTRAP_FRAME, Reserved9) == KTRAP_FRAME_RESERVED9);
assert(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS);
assert(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP);
assert(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST);
assert(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF);
assert(FIELD_OFFSET(KPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); ASSERT(FIELD_OFFSET(KPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD);
LdrInit1(); LdrInit1();

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/mutex.c * FILE: ntoskrnl/ke/mutex.c
@ -76,7 +76,7 @@ KeReleaseMutex(IN PKMUTEX Mutex,
KEBUGCHECK(THREAD_NOT_MUTEX_OWNER); KEBUGCHECK(THREAD_NOT_MUTEX_OWNER);
} }
Mutex->Header.SignalState++; Mutex->Header.SignalState++;
assert(Mutex->Header.SignalState <= 1); ASSERT(Mutex->Header.SignalState <= 1);
if (Mutex->Header.SignalState == 1) if (Mutex->Header.SignalState == 1)
{ {
Mutex->OwnerThread = NULL; Mutex->OwnerThread = NULL;
@ -175,7 +175,7 @@ KeReleaseMutant(IN PKMUTANT Mutant,
KEBUGCHECK(THREAD_NOT_MUTEX_OWNER); KEBUGCHECK(THREAD_NOT_MUTEX_OWNER);
} }
Mutant->Header.SignalState++; Mutant->Header.SignalState++;
assert(Mutant->Header.SignalState <= 1); ASSERT(Mutant->Header.SignalState <= 1);
} }
else else
{ {

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -88,7 +88,7 @@ KeInitializeSpinLock (PKSPIN_LOCK SpinLock)
VOID FASTCALL VOID FASTCALL
KefAcquireSpinLockAtDpcLevel(PKSPIN_LOCK SpinLock) KefAcquireSpinLockAtDpcLevel(PKSPIN_LOCK SpinLock)
{ {
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
KiAcquireSpinLock(SpinLock); KiAcquireSpinLock(SpinLock);
} }
@ -132,7 +132,7 @@ KeAcquireInStackQueuedSpinLockAtDpcLevel(
VOID FASTCALL VOID FASTCALL
KefReleaseSpinLockFromDpcLevel(PKSPIN_LOCK SpinLock) KefReleaseSpinLockFromDpcLevel(PKSPIN_LOCK SpinLock)
{ {
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
KiReleaseSpinLock(SpinLock); KiReleaseSpinLock(SpinLock);
} }

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -301,7 +301,7 @@ KeSetTimerEx (PKTIMER Timer,
DPRINT("KeSetTimerEx(Timer %x), DueTime: \n",Timer); DPRINT("KeSetTimerEx(Timer %x), DueTime: \n",Timer);
assert(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL);
KeAcquireSpinLock(&TimerListLock, &oldlvl); KeAcquireSpinLock(&TimerListLock, &oldlvl);
@ -327,7 +327,7 @@ KeSetTimerEx (PKTIMER Timer,
Timer->Period = Period; Timer->Period = Period;
Timer->Header.SignalState = FALSE; Timer->Header.SignalState = FALSE;
AlreadyInList = (Timer->TimerListEntry.Flink == NULL) ? FALSE : TRUE; 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)); (Timer->TimerListEntry.Flink != NULL && Timer->TimerListEntry.Blink != NULL));
if (AlreadyInList) if (AlreadyInList)
{ {
@ -383,13 +383,13 @@ KeCancelTimer (PKTIMER Timer)
} }
if (Timer->Header.Absolute) if (Timer->Header.Absolute)
{ {
assert(&Timer->TimerListEntry != &AbsoluteTimerListHead); ASSERT(&Timer->TimerListEntry != &AbsoluteTimerListHead);
} }
else else
{ {
assert(&Timer->TimerListEntry != &RelativeTimerListHead); ASSERT(&Timer->TimerListEntry != &RelativeTimerListHead);
} }
assert(Timer->TimerListEntry.Flink != &Timer->TimerListEntry); ASSERT(Timer->TimerListEntry.Flink != &Timer->TimerListEntry);
RemoveEntryList(&Timer->TimerListEntry); RemoveEntryList(&Timer->TimerListEntry);
Timer->TimerListEntry.Flink = Timer->TimerListEntry.Blink = NULL; Timer->TimerListEntry.Flink = Timer->TimerListEntry.Blink = NULL;
KeReleaseSpinLock(&TimerListLock, oldlvl); KeReleaseSpinLock(&TimerListLock, oldlvl);
@ -450,7 +450,7 @@ KeInitializeTimerEx (PKTIMER Timer,
} }
else else
{ {
assert(FALSE); ASSERT(FALSE);
return; return;
} }
@ -526,7 +526,7 @@ HandleExpiredTimer(PKTIMER Timer)
DPRINT("Finished dpc routine\n"); DPRINT("Finished dpc routine\n");
} }
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
KeAcquireDispatcherDatabaseLockAtDpcLevel(); KeAcquireDispatcherDatabaseLockAtDpcLevel();
Timer->Header.SignalState = TRUE; Timer->Header.SignalState = TRUE;
@ -571,7 +571,7 @@ KeExpireTimers(PKDPC Dpc,
DPRINT("KeExpireTimers()\n"); DPRINT("KeExpireTimers()\n");
assert(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
InitializeListHead(&TimerList); InitializeListHead(&TimerList);
@ -581,13 +581,13 @@ KeExpireTimers(PKDPC Dpc,
KeQuerySystemTime(&SystemTime); KeQuerySystemTime(&SystemTime);
current_entry = RelativeTimerListHead.Flink; current_entry = RelativeTimerListHead.Flink;
assert(current_entry); ASSERT(current_entry);
while (current_entry != &RelativeTimerListHead) while (current_entry != &RelativeTimerListHead)
{ {
current = CONTAINING_RECORD(current_entry, KTIMER, TimerListEntry); current = CONTAINING_RECORD(current_entry, KTIMER, TimerListEntry);
assert(current); ASSERT(current);
assert(current_entry != &RelativeTimerListHead); ASSERT(current_entry != &RelativeTimerListHead);
assert(current_entry->Flink != current_entry); ASSERT(current_entry->Flink != current_entry);
if ((ULONGLONG)InterruptTime.QuadPart < current->DueTime.QuadPart) if ((ULONGLONG)InterruptTime.QuadPart < current->DueTime.QuadPart)
{ {
break; break;
@ -598,13 +598,13 @@ KeExpireTimers(PKDPC Dpc,
} }
current_entry = AbsoluteTimerListHead.Flink; current_entry = AbsoluteTimerListHead.Flink;
assert(current_entry); ASSERT(current_entry);
while (current_entry != &AbsoluteTimerListHead) while (current_entry != &AbsoluteTimerListHead)
{ {
current = CONTAINING_RECORD(current_entry, KTIMER, TimerListEntry); current = CONTAINING_RECORD(current_entry, KTIMER, TimerListEntry);
assert(current); ASSERT(current);
assert(current_entry != &AbsoluteTimerListHead); ASSERT(current_entry != &AbsoluteTimerListHead);
assert(current_entry->Flink != current_entry); ASSERT(current_entry->Flink != current_entry);
if ((ULONGLONG)SystemTime.QuadPart < current->DueTime.QuadPart) if ((ULONGLONG)SystemTime.QuadPart < current->DueTime.QuadPart)
{ {
break; break;
@ -637,7 +637,7 @@ KiUpdateSystemTime(KIRQL oldIrql,
{ {
LARGE_INTEGER Time; LARGE_INTEGER Time;
assert(KeGetCurrentIrql() == PROFILE_LEVEL); ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL);
KiRawTicks++; KiRawTicks++;

View file

@ -136,7 +136,7 @@ KiSideEffectsBeforeWake(DISPATCHER_HEADER * hdr,
Mutex = CONTAINING_RECORD(hdr, KMUTEX, Header); Mutex = CONTAINING_RECORD(hdr, KMUTEX, Header);
hdr->SignalState--; hdr->SignalState--;
assert(hdr->SignalState <= 1); ASSERT(hdr->SignalState <= 1);
if (hdr->SignalState == 0) if (hdr->SignalState == 0)
{ {
if (Thread == NULL) if (Thread == NULL)
@ -171,7 +171,7 @@ KiIsObjectSignalled(DISPATCHER_HEADER * hdr,
Mutex = CONTAINING_RECORD(hdr, KMUTEX, Header); Mutex = CONTAINING_RECORD(hdr, KMUTEX, Header);
assert(hdr->SignalState <= 1); ASSERT(hdr->SignalState <= 1);
if ((hdr->SignalState < 1 && Mutex->OwnerThread == Thread) || 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); WaiterHead = CONTAINING_RECORD(EnumEntry, KWAIT_BLOCK, WaitListEntry);
DPRINT("current_entry %x current %x\n", EnumEntry, WaiterHead); DPRINT("current_entry %x current %x\n", EnumEntry, WaiterHead);
EnumEntry = EnumEntry->Flink; EnumEntry = EnumEntry->Flink;
assert(WaiterHead->Thread != NULL); ASSERT(WaiterHead->Thread != NULL);
assert(WaiterHead->Thread->WaitBlockList != NULL); ASSERT(WaiterHead->Thread->WaitBlockList != NULL);
Abandoned = FALSE; Abandoned = FALSE;
@ -317,7 +317,7 @@ KeDispatcherObjectWakeOneOrAll(DISPATCHER_HEADER * hdr,
} }
//no WaitAny objects can possibly be signaled since we are here //no WaitAny objects can possibly be signaled since we are here
assert(!(Waiter->WaitType == WaitAny ASSERT(!(Waiter->WaitType == WaitAny
&& KiIsObjectSignalled(Waiter->Object, Waiter->Thread))); && KiIsObjectSignalled(Waiter->Object, Waiter->Thread)));
} }
@ -495,7 +495,7 @@ KeWaitForMultipleObjects(ULONG Count,
DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) " DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) "
"PsGetCurrentThread() %x\n", Count, Object, PsGetCurrentThread()); "PsGetCurrentThread() %x\n", Count, Object, PsGetCurrentThread());
assert(0 < Count && Count <= EX_MAXIMUM_WAIT_OBJECTS); ASSERT(0 < Count && Count <= EX_MAXIMUM_WAIT_OBJECTS);
CurrentThread = KeGetCurrentThread(); CurrentThread = KeGetCurrentThread();
WaitIrql = KeGetCurrentIrql(); WaitIrql = KeGetCurrentIrql();

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -943,7 +943,7 @@ LdrPEProcessModule(PVOID ModuleLoadBase,
ModuleTextSection = ExAllocatePool(NonPagedPool, ModuleTextSection = ExAllocatePool(NonPagedPool,
sizeof(MODULE_TEXT_SECTION)); sizeof(MODULE_TEXT_SECTION));
assert(ModuleTextSection); ASSERT(ModuleTextSection);
RtlZeroMemory(ModuleTextSection, sizeof(MODULE_TEXT_SECTION)); RtlZeroMemory(ModuleTextSection, sizeof(MODULE_TEXT_SECTION));
ModuleTextSection->Base = (ULONG)DriverBase; ModuleTextSection->Base = (ULONG)DriverBase;
ModuleTextSection->Length = DriverSize; ModuleTextSection->Length = DriverSize;

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -22,7 +22,7 @@ MmFreeContinuousPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
PFN_TYPE Page, SWAPENTRY SwapEntry, PFN_TYPE Page, SWAPENTRY SwapEntry,
BOOLEAN Dirty) BOOLEAN Dirty)
{ {
assert(SwapEntry == 0); ASSERT(SwapEntry == 0);
if (Page != 0) if (Page != 0)
{ {
MmReleasePageMemoryConsumer(MC_NPPOOL, Page); MmReleasePageMemoryConsumer(MC_NPPOOL, Page);

View file

@ -117,7 +117,7 @@ MmSetLRULastPage(PFN_TYPE Pfn)
{ {
KIRQL oldIrql; KIRQL oldIrql;
assert (Pfn < MmPageArraySize); ASSERT(Pfn < MmPageArraySize);
KeAcquireSpinLock(&PageListLock, &oldIrql); KeAcquireSpinLock(&PageListLock, &oldIrql);
if (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_USED && if (MmPageArray[Pfn].Flags.Type == MM_PHYSICAL_PAGE_USED &&
MmPageArray[Pfn].Flags.Consumer == MC_USER) MmPageArray[Pfn].Flags.Consumer == MC_USER)
@ -506,7 +506,7 @@ MmSetFlagsPage(PFN_TYPE Pfn, ULONG Flags)
{ {
KIRQL oldIrql; KIRQL oldIrql;
assert (Pfn < MmPageArraySize); ASSERT(Pfn < MmPageArraySize);
KeAcquireSpinLock(&PageListLock, &oldIrql); KeAcquireSpinLock(&PageListLock, &oldIrql);
MmPageArray[Pfn].AllFlags = Flags; MmPageArray[Pfn].AllFlags = Flags;
KeReleaseSpinLock(&PageListLock, oldIrql); KeReleaseSpinLock(&PageListLock, oldIrql);
@ -571,7 +571,7 @@ MmGetFlagsPage(PFN_TYPE Pfn)
KIRQL oldIrql; KIRQL oldIrql;
ULONG Flags; ULONG Flags;
assert (Pfn < MmPageArraySize); ASSERT(Pfn < MmPageArraySize);
KeAcquireSpinLock(&PageListLock, &oldIrql); KeAcquireSpinLock(&PageListLock, &oldIrql);
Flags = MmPageArray[Pfn].AllFlags; Flags = MmPageArray[Pfn].AllFlags;
KeReleaseSpinLock(&PageListLock, oldIrql); KeReleaseSpinLock(&PageListLock, oldIrql);
@ -585,7 +585,7 @@ MmSetSavedSwapEntryPage(PFN_TYPE Pfn, SWAPENTRY SavedSwapEntry)
{ {
KIRQL oldIrql; KIRQL oldIrql;
assert (Pfn < MmPageArraySize); ASSERT(Pfn < MmPageArraySize);
KeAcquireSpinLock(&PageListLock, &oldIrql); KeAcquireSpinLock(&PageListLock, &oldIrql);
MmPageArray[Pfn].SavedSwapEntry = SavedSwapEntry; MmPageArray[Pfn].SavedSwapEntry = SavedSwapEntry;
KeReleaseSpinLock(&PageListLock, oldIrql); KeReleaseSpinLock(&PageListLock, oldIrql);
@ -597,7 +597,7 @@ MmGetSavedSwapEntryPage(PFN_TYPE Pfn)
SWAPENTRY SavedSwapEntry; SWAPENTRY SavedSwapEntry;
KIRQL oldIrql; KIRQL oldIrql;
assert (Pfn < MmPageArraySize); ASSERT(Pfn < MmPageArraySize);
KeAcquireSpinLock(&PageListLock, &oldIrql); KeAcquireSpinLock(&PageListLock, &oldIrql);
SavedSwapEntry = MmPageArray[Pfn].SavedSwapEntry; SavedSwapEntry = MmPageArray[Pfn].SavedSwapEntry;
KeReleaseSpinLock(&PageListLock, oldIrql); KeReleaseSpinLock(&PageListLock, oldIrql);

View file

@ -74,9 +74,9 @@ MEMORY_AREA* MmOpenMemoryAreaByAddress(PMADDRESS_SPACE AddressSpace,
current = CONTAINING_RECORD(current_entry, current = CONTAINING_RECORD(current_entry,
MEMORY_AREA, MEMORY_AREA,
Entry); Entry);
assert(current_entry->Blink->Flink == current_entry); ASSERT(current_entry->Blink->Flink == current_entry);
assert(current_entry->Flink->Blink == current_entry); ASSERT(current_entry->Flink->Blink == current_entry);
assert(previous_entry->Flink == current_entry); ASSERT(previous_entry->Flink == current_entry);
if (current->BaseAddress <= Address && if (current->BaseAddress <= Address &&
(PVOID)((char*)current->BaseAddress + current->Length) > Address) (PVOID)((char*)current->BaseAddress + current->Length) > Address)
{ {
@ -612,7 +612,7 @@ NTSTATUS MmCreateMemoryArea(PEPROCESS Process,
if (BoundaryAddressMultiple.QuadPart != 0) if (BoundaryAddressMultiple.QuadPart != 0)
{ {
EndAddress = ((char*)(*BaseAddress)) + tmpLength-1; 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, if (MmOpenMemoryAreaByRegion(AddressSpace,

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -209,7 +209,7 @@ MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode)
NTSTATUS Status; NTSTATUS Status;
/* pretty sure you can't map partial mdl's to user space */ /* 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; BoundaryAddressMultiple.QuadPart = 0;
Base = NULL; Base = NULL;
@ -244,9 +244,9 @@ MmMapLockedPages(PMDL Mdl, KPROCESSOR_MODE AccessMode)
else /* if (AccessMode == KernelMode) */ else /* if (AccessMode == KernelMode) */
{ {
/* can't map mdl twice */ /* 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 */ /* 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; CurrentProcess = NULL;
@ -386,7 +386,7 @@ MmUnmapLockedPages(PVOID BaseAddress, PMDL Mdl)
if ((DWORD)BaseAddress >= KERNEL_BASE) if ((DWORD)BaseAddress >= KERNEL_BASE)
{ {
assert(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA); ASSERT(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA);
KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql); KeAcquireSpinLock(&MiMdlMappingRegionLock, &oldIrql);
/* Deallocate all the pages used. */ /* Deallocate all the pages used. */
@ -407,7 +407,7 @@ MmUnmapLockedPages(PVOID BaseAddress, PMDL Mdl)
{ {
MEMORY_AREA *Marea; MEMORY_AREA *Marea;
assert(Mdl->Process == PsGetCurrentProcess()); ASSERT(Mdl->Process == PsGetCurrentProcess());
Marea = MmOpenMemoryAreaByAddress( &Mdl->Process->AddressSpace, BaseAddress ); Marea = MmOpenMemoryAreaByAddress( &Mdl->Process->AddressSpace, BaseAddress );
if (Marea == NULL) if (Marea == NULL)
@ -505,14 +505,14 @@ VOID STDCALL MmProbeAndLockPages (PMDL Mdl,
DPRINT("MmProbeAndLockPages(Mdl %x)\n", 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))); MDL_IO_SPACE|MDL_SOURCE_IS_NONPAGED_POOL)));
MdlPages = (PPFN_TYPE)(Mdl + 1); MdlPages = (PPFN_TYPE)(Mdl + 1);
NrPages = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE; NrPages = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE;
/* mdl must have enough page entries */ /* 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 && 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 * mdl buffer must (at least) be in kernel space, thou this doesn't
* necesarely mean that the buffer in within _nonpaged_ kernel space... * 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; PageCount = PAGE_ROUND_UP(Mdl->ByteOffset + Mdl->ByteCount) / PAGE_SIZE;
MdlPages = (PPFN_TYPE)(Mdl + 1); MdlPages = (PPFN_TYPE)(Mdl + 1);
/* mdl must have enough page entries */ /* 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++) for (i=0; i < PageCount; i++)
{ {
@ -777,7 +777,7 @@ MmAllocatePagesForMdl ( IN PHYSICAL_ADDRESS LowAddress,
*/ */
/* SkipBytes must be a multiple of the page size */ /* SkipBytes must be a multiple of the page size */
assert((SkipBytes.QuadPart % PAGE_SIZE) == 0); ASSERT((SkipBytes.QuadPart % PAGE_SIZE) == 0);
UNIMPLEMENTED; UNIMPLEMENTED;
return(NULL); return(NULL);

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * COPYRIGHT: See COPYING in the top directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -103,7 +103,7 @@ NTSTATUS MmReleaseMemoryArea(PEPROCESS Process, PMEMORY_AREA Marea)
{ {
case MEMORY_AREA_SECTION_VIEW: case MEMORY_AREA_SECTION_VIEW:
Status = MmUnmapViewOfSection(Process, Marea->BaseAddress); Status = MmUnmapViewOfSection(Process, Marea->BaseAddress);
assert(Status == STATUS_SUCCESS); ASSERT(Status == STATUS_SUCCESS);
return(STATUS_SUCCESS); return(STATUS_SUCCESS);
case MEMORY_AREA_VIRTUAL_MEMORY: case MEMORY_AREA_VIRTUAL_MEMORY:

View file

@ -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 * COPYRIGHT: See COPYING in the top directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -152,7 +152,7 @@ MmInitVirtualMemory(ULONG LastKernelAddress,
BoundaryAddressMultiple); BoundaryAddressMultiple);
BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG)&_text_end__)); 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__)) - Length = PAGE_ROUND_UP(((ULONG)&_init_end__)) -
PAGE_ROUND_UP(((ULONG)&_text_end__)); PAGE_ROUND_UP(((ULONG)&_text_end__));
ParamLength = ParamLength - Length; ParamLength = ParamLength - Length;
@ -469,7 +469,7 @@ MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
PFN_TYPE Page, SWAPENTRY SwapEntry, PFN_TYPE Page, SWAPENTRY SwapEntry,
BOOLEAN Dirty) BOOLEAN Dirty)
{ {
assert(SwapEntry == 0); ASSERT(SwapEntry == 0);
if (Page != 0) if (Page != 0)
{ {
MmReleasePageMemoryConsumer(MC_NPPOOL, Page); MmReleasePageMemoryConsumer(MC_NPPOOL, Page);

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -92,7 +92,7 @@ MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
PFN_TYPE Page, SWAPENTRY SwapEntry, PFN_TYPE Page, SWAPENTRY SwapEntry,
BOOLEAN Dirty) BOOLEAN Dirty)
{ {
assert(SwapEntry == 0); ASSERT(SwapEntry == 0);
if (Page != 0) if (Page != 0)
{ {
MmReleasePageMemoryConsumer(MC_NPPOOL, Page); MmReleasePageMemoryConsumer(MC_NPPOOL, Page);

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -322,7 +322,7 @@ void avl_insert (PNODE * root, PNODE n, int (*compare)(PNODE, PNODE))
} }
else else
{ {
assert (x->balance == +1); ASSERT(x->balance == +1);
w = x->link[1]; w = x->link[1];
x->link[1] = w->link[0]; x->link[1] = w->link[0];
w->link[0] = x; w->link[0] = x;
@ -373,7 +373,7 @@ void avl_insert (PNODE * root, PNODE n, int (*compare)(PNODE, PNODE))
} }
else else
{ {
assert (x->balance == -1); ASSERT(x->balance == -1);
w = x->link[0]; w = x->link[0];
x->link[0] = w->link[1]; x->link[0] = w->link[1];
w->link[1] = x; w->link[1] = x;
@ -528,7 +528,7 @@ void avl_remove (PNODE *root, PNODE item, int (*compare)(PNODE, PNODE))
{ {
PNODE w; PNODE w;
assert (x->balance == -1); ASSERT(x->balance == -1);
w = x->link[0]; w = x->link[0];
x->link[0] = w->link[1]; x->link[0] = w->link[1];
w->link[1] = x; w->link[1] = x;
@ -600,7 +600,7 @@ void avl_remove (PNODE *root, PNODE item, int (*compare)(PNODE, PNODE))
if (x->balance == +1) if (x->balance == +1)
{ {
PNODE w; PNODE w;
assert (x->balance == +1); ASSERT(x->balance == +1);
w = x->link[1]; w = x->link[1];
x->link[1] = w->link[0]; x->link[1] = w->link[0];
w->link[0] = x; w->link[0] = x;

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * PROJECT: ReactOS kernel
* FILE: ntoskrnl/mm/section.c * FILE: ntoskrnl/mm/section.c
@ -458,7 +458,7 @@ MiReadPage(PMEMORY_AREA MemoryArea,
FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->FileOffset; FileOffset = SegOffset + MemoryArea->Data.SectionData.Segment->FileOffset;
IsImageSection = MemoryArea->Data.SectionData.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE; IsImageSection = MemoryArea->Data.SectionData.Section->AllocationAttributes & SEC_IMAGE ? TRUE : FALSE;
assert(Bcb); ASSERT(Bcb);
DPRINT("%S %x\n", FileObject->FileName.Buffer, FileOffset); DPRINT("%S %x\n", FileObject->FileName.Buffer, FileOffset);
@ -1766,7 +1766,7 @@ MmWritePageSectionView(PMADDRESS_SPACE AddressSpace,
*/ */
if (DirectMapped && !Private) if (DirectMapped && !Private)
{ {
assert(SwapEntry == 0); ASSERT(SwapEntry == 0);
CcRosMarkDirtyCacheSegment(Bcb, Offset + MemoryArea->Data.SectionData.ViewOffset); CcRosMarkDirtyCacheSegment(Bcb, Offset + MemoryArea->Data.SectionData.ViewOffset);
PageOp->Status = STATUS_SUCCESS; PageOp->Status = STATUS_SUCCESS;
MmspCompleteAndReleasePageOp(PageOp); MmspCompleteAndReleasePageOp(PageOp);
@ -3215,7 +3215,7 @@ MmFreeSectionPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
FileObject = MemoryArea->Data.SectionData.Section->FileObject; FileObject = MemoryArea->Data.SectionData.Section->FileObject;
Bcb = FileObject->SectionObjectPointer->SharedCacheMap; Bcb = FileObject->SectionObjectPointer->SharedCacheMap;
CcRosMarkDirtyCacheSegment(Bcb, Offset); 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", DPRINT("Opening memory area Process %x BaseAddress %x\n",
Process, BaseAddress); Process, BaseAddress);
assert(Process); ASSERT(Process);
AddressSpace = &Process->AddressSpace; AddressSpace = &Process->AddressSpace;
MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace, MemoryArea = MmOpenMemoryAreaByAddress(AddressSpace,
@ -3760,7 +3760,7 @@ MmMapViewOfSection(IN PVOID SectionObject,
ULONG ViewOffset; ULONG ViewOffset;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
assert(Process); ASSERT(Process);
Section = (PSECTION_OBJECT)SectionObject; Section = (PSECTION_OBJECT)SectionObject;
AddressSpace = &Process->AddressSpace; AddressSpace = &Process->AddressSpace;

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * 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 * PROJECT: ReactOS kernel
* FILE: ntoskrnl/mm/virtual.c * FILE: ntoskrnl/mm/virtual.c
@ -623,7 +623,7 @@ ProbeForRead (IN PVOID Address,
IN ULONG Length, IN ULONG Length,
IN ULONG Alignment) IN ULONG Alignment)
{ {
assert (Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8); ASSERT(Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8);
if (Length == 0) if (Length == 0)
return; return;
@ -652,7 +652,7 @@ ProbeForWrite (IN PVOID Address,
ULONG x; ULONG x;
ULONG i; ULONG i;
assert (Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8); ASSERT(Alignment ==1 || Alignment == 2 || Alignment == 4 || Alignment == 8);
if (Length == 0) if (Length == 0)
return; return;

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -113,7 +113,7 @@ NtpTimerApcKernelRoutine(PKAPC Apc,
VOID INIT_FUNCTION VOID INIT_FUNCTION
NtInitializeTimerImplementation(VOID) NtInitializeTimerImplementation(VOID)
{ {
assert(!ExTimerType) ASSERT(!ExTimerType)
ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE));
RtlCreateUnicodeString(&ExTimerType->TypeName, L"Timer"); RtlCreateUnicodeString(&ExTimerType->TypeName, L"Timer");

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -343,7 +343,7 @@ ObCreateObject (IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL,
PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL; PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL;
SECURITY_SUBJECT_CONTEXT SubjectContext; SECURITY_SUBJECT_CONTEXT SubjectContext;
assert_irql(APC_LEVEL); ASSERT_IRQL(APC_LEVEL);
DPRINT("ObCreateObject(Type %p ObjectAttributes %p, Object %p)\n", DPRINT("ObCreateObject(Type %p ObjectAttributes %p, Object %p)\n",
Type, ObjectAttributes, Object); Type, ObjectAttributes, Object);
@ -603,10 +603,10 @@ ObOpenObjectByPointer(IN POBJECT Object,
static NTSTATUS static NTSTATUS
ObpDeleteObject(POBJECT_HEADER Header) ObpDeleteObject(POBJECT_HEADER Header)
{ {
DPRINT("ObPerformRetentionChecks(Header %p)\n", Header); DPRINT("ObpDeleteObject(Header %p)\n", Header);
if (KeGetCurrentIrql() != PASSIVE_LEVEL) 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); KEBUGCHECK(0);
} }
@ -640,8 +640,8 @@ ObpDeleteObjectWorkRoutine (IN PVOID Parameter)
PRETENTION_CHECK_PARAMS Params = (PRETENTION_CHECK_PARAMS)Parameter; PRETENTION_CHECK_PARAMS Params = (PRETENTION_CHECK_PARAMS)Parameter;
/* ULONG Tag; */ /* See below */ /* ULONG Tag; */ /* See below */
assert(Params); ASSERT(Params);
assert(KeGetCurrentIrql() == PASSIVE_LEVEL); /* We need PAGED_CODE somewhere... */ ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); /* We need PAGED_CODE somewhere... */
/* Turn this on when we have ExFreePoolWithTag /* Turn this on when we have ExFreePoolWithTag
Tag = Params->ObjectHeader->ObjectType->Tag; */ Tag = Params->ObjectHeader->ObjectType->Tag; */
@ -706,7 +706,7 @@ ObpDeleteObjectDpcLevel(IN POBJECT_HEADER ObjectHeader,
return STATUS_PENDING; return STATUS_PENDING;
default: default:
DPRINT("ObpPerformRetentionChecksDpcLevel called at unsupported " DPRINT("ObpDeleteObjectDpcLevel called at unsupported "
"IRQL %u!\n", KeGetCurrentIrql()); "IRQL %u!\n", KeGetCurrentIrql());
KEBUGCHECK(0); KEBUGCHECK(0);
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
@ -737,7 +737,7 @@ ObfReferenceObject(IN PVOID Object)
{ {
POBJECT_HEADER Header; POBJECT_HEADER Header;
assert(Object); ASSERT(Object);
Header = BODY_TO_HEADER(Object); Header = BODY_TO_HEADER(Object);
@ -775,7 +775,7 @@ ObfDereferenceObject(IN PVOID Object)
BOOL Permanent; BOOL Permanent;
ULONG HandleCount; ULONG HandleCount;
assert(Object); ASSERT(Object);
/* Extract the object header. */ /* Extract the object header. */
Header = BODY_TO_HEADER(Object); Header = BODY_TO_HEADER(Object);
@ -787,7 +787,7 @@ ObfDereferenceObject(IN PVOID Object)
last reference. last reference.
*/ */
NewRefCount = InterlockedDecrement(&Header->RefCount); NewRefCount = InterlockedDecrement(&Header->RefCount);
assert(NewRefCount >= 0); ASSERT(NewRefCount >= 0);
/* Check whether the object can now be deleted. */ /* Check whether the object can now be deleted. */
if (NewRefCount == 0 && if (NewRefCount == 0 &&
@ -819,10 +819,10 @@ ObGetObjectPointerCount(PVOID Object)
{ {
POBJECT_HEADER Header; POBJECT_HEADER Header;
assert(Object); ASSERT(Object);
Header = BODY_TO_HEADER(Object); Header = BODY_TO_HEADER(Object);
return(Header->RefCount); return Header->RefCount;
} }
@ -844,10 +844,10 @@ ObGetObjectHandleCount(PVOID Object)
{ {
POBJECT_HEADER Header; POBJECT_HEADER Header;
assert(Object); ASSERT(Object);
Header = BODY_TO_HEADER(Object); Header = BODY_TO_HEADER(Object);
return(Header->HandleCount); return Header->HandleCount;
} }

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -210,7 +210,7 @@ NtCreateSymbolicLinkObject(OUT PHANDLE SymbolicLinkHandle,
PSYMLINK_OBJECT SymbolicLink; PSYMLINK_OBJECT SymbolicLink;
NTSTATUS Status; NTSTATUS Status;
assert_irql(PASSIVE_LEVEL); ASSERT_IRQL(PASSIVE_LEVEL);
DPRINT("NtCreateSymbolicLinkObject(SymbolicLinkHandle %p, DesiredAccess %ul, ObjectAttributes %p, DeviceName %wZ)\n", DPRINT("NtCreateSymbolicLinkObject(SymbolicLinkHandle %p, DesiredAccess %ul, ObjectAttributes %p, DeviceName %wZ)\n",
SymbolicLinkHandle, SymbolicLinkHandle,