From 215e48d0bd0c54348d22290ccf2b7ec1fbffc264 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 18 Feb 2018 14:50:29 +0100 Subject: [PATCH] [KMTESTS:CC] Addendum to 3fe0e28: use ok_irql. CORE-14349 --- modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c index d7540f72e01..d0ba58c6ffa 100644 --- a/modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcCopyRead_drv.c @@ -172,7 +172,7 @@ TestIrpHandler( if (IoStack->MajorFunction == IRP_MJ_CREATE) { - ok(KeGetCurrentIrql() == PASSIVE_LEVEL, "Wrong IRQL: %d\n", KeGetCurrentIrql()); + ok_irql(PASSIVE_LEVEL); if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR)) { @@ -237,7 +237,7 @@ TestIrpHandler( if (!FlagOn(Irp->Flags, IRP_NOCACHE)) { - ok(KeGetCurrentIrql() == PASSIVE_LEVEL, "Wrong IRQL: %d\n", KeGetCurrentIrql()); + ok_irql(PASSIVE_LEVEL); ok(Offset.QuadPart % PAGE_SIZE != 0, "Offset is aligned: %I64i\n", Offset.QuadPart); ok(Length % PAGE_SIZE != 0, "Length is aligned: %I64i\n", Length); @@ -274,7 +274,7 @@ TestIrpHandler( { PMDL Mdl; - ok(KeGetCurrentIrql() == APC_LEVEL, "Wrong IRQL: %d\n", KeGetCurrentIrql()); + ok_irql(APC_LEVEL); ok((Offset.QuadPart % PAGE_SIZE == 0 || Offset.QuadPart == 0), "Offset is not aligned: %I64i\n", Offset.QuadPart); ok(Length % PAGE_SIZE == 0, "Length is not aligned: %I64i\n", Length); @@ -305,7 +305,7 @@ TestIrpHandler( } else if (IoStack->MajorFunction == IRP_MJ_CLEANUP) { - ok(KeGetCurrentIrql() == PASSIVE_LEVEL, "Wrong IRQL: %d\n", KeGetCurrentIrql()); + ok_irql(PASSIVE_LEVEL); KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); CcUninitializeCacheMap(IoStack->FileObject, NULL, &CacheUninitEvent); KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL);