[NTOSKRNL-CMLIB]

Continue to use the new debugging macros introduced in r58132.

svn path=/trunk/; revision=58138

diff --git a/reactos/lib/cmlib/hivecell.c b/reactos/lib/cmlib/hivecell.c
index 3c82b45..c11fd9f 100644 (file)
--- a/reactos/lib/cmlib/hivecell.c
+++ b/reactos/lib/cmlib/hivecell.c
@@ -548,8 +548,7 @@ HvTrackCellRef(PHV_TRACK_CELL_REF CellRef,
     }
 
     /* FIXME: TODO */
-    DPRINT1("ERROR: Too many references\n");
-    ASSERT(FALSE); // while (TRUE);
+    ASSERTMSG(FALSE, "ERROR: Too many references\n");
     return FALSE;
 }
 

diff --git a/reactos/ntoskrnl/cache/cachesub.c b/reactos/ntoskrnl/cache/cachesub.c
index 0431a56..56d50ab 100644 (file)
--- a/reactos/ntoskrnl/cache/cachesub.c
+++ b/reactos/ntoskrnl/cache/cachesub.c
@@ -131,8 +131,7 @@ CcGetFlushedValidData(IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
                       IN BOOLEAN CcInternalCaller)
 {
     LARGE_INTEGER Result = {{0}};
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return Result;
 }
 

diff --git a/reactos/ntoskrnl/cache/copysup.c b/reactos/ntoskrnl/cache/copysup.c
index be2af04..8820779 100644 (file)
--- a/reactos/ntoskrnl/cache/copysup.c
+++ b/reactos/ntoskrnl/cache/copysup.c
@@ -121,8 +121,7 @@ CcFastCopyRead(IN PFILE_OBJECT FileObject,
                OUT PVOID Buffer,
                OUT PIO_STATUS_BLOCK IoStatus)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 BOOLEAN
@@ -208,8 +207,7 @@ CcFastCopyWrite(IN PFILE_OBJECT FileObject,
                 IN ULONG Length,
                 IN PVOID Buffer)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 BOOLEAN
@@ -219,8 +217,7 @@ CcCanIWrite(IN PFILE_OBJECT FileObject,
             IN BOOLEAN Wait,
             IN UCHAR Retrying)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return FALSE;
 }
 
@@ -233,8 +230,7 @@ CcDeferWrite(IN PFILE_OBJECT FileObject,
              IN ULONG BytesToWrite,
              IN BOOLEAN Retrying)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 /* EOF */

diff --git a/reactos/ntoskrnl/cache/fssup.c b/reactos/ntoskrnl/cache/fssup.c
index f816100..3eabe78 100644 (file)
--- a/reactos/ntoskrnl/cache/fssup.c
+++ b/reactos/ntoskrnl/cache/fssup.c
@@ -392,14 +392,13 @@ CcPurgeCacheSection(IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
     CcpFlushCache(Map, NULL, 0, NULL, TRUE);
     return TRUE;
 }
-\f
+
 VOID
 NTAPI
 CcSetDirtyPageThreshold(IN PFILE_OBJECT FileObject,
                         IN ULONG DirtyPageThreshold)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 /*

diff --git a/reactos/ntoskrnl/cache/logsup.c b/reactos/ntoskrnl/cache/logsup.c
index cb4f78a..33f7b90 100644 (file)
--- a/reactos/ntoskrnl/cache/logsup.c
+++ b/reactos/ntoskrnl/cache/logsup.c
@@ -23,8 +23,7 @@ CcSetAdditionalCacheAttributes(IN PFILE_OBJECT FileObject,
                                IN BOOLEAN DisableReadAhead,
                                IN BOOLEAN DisableWriteBehind)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 VOID
@@ -47,17 +46,15 @@ CcGetDirtyPages(IN PVOID LogHandle,
                 IN PVOID Context2)
 {
     LARGE_INTEGER Result = {{0}};
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return Result;
 }
-\f
+
 BOOLEAN
 NTAPI
 CcIsThereDirtyData(IN PVPB Vpb)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return FALSE;
 }
 
@@ -67,8 +64,7 @@ CcGetLsnForFileObject(IN PFILE_OBJECT FileObject,
                       OUT OPTIONAL PLARGE_INTEGER OldestLsn)
 {
     LARGE_INTEGER Result = {{0}};
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return Result;
 }
 

diff --git a/reactos/ntoskrnl/include/internal/i386/ke.h b/reactos/ntoskrnl/include/internal/i386/ke.h
index 7e81de3..3ae219a 100644 (file)
--- a/reactos/ntoskrnl/include/internal/i386/ke.h
+++ b/reactos/ntoskrnl/include/internal/i386/ke.h
@@ -137,8 +137,7 @@ typedef union _KTRAP_EXIT_SKIP_BITS
                    IN ULONG Flags)                  \
     {                                               \
         /* Not yet handled */                       \
-        UNIMPLEMENTED;                              \
-        ASSERT(FALSE); /* while (TRUE); */          \
+        UNIMPLEMENTED_DBGBREAK();                   \
         return FALSE;                               \
     }
 

diff --git a/reactos/ntoskrnl/io/iomgr/irp.c b/reactos/ntoskrnl/io/iomgr/irp.c
index f19b496..f3a4bda 100644 (file)
--- a/reactos/ntoskrnl/io/iomgr/irp.c
+++ b/reactos/ntoskrnl/io/iomgr/irp.c
@@ -265,8 +265,7 @@ IopCompleteRequest(IN PKAPC Apc,
             (Irp->IoStatus.Information == IO_REPARSE_TAG_MOUNT_POINT))
         {
             /* We should never get this yet */
-            DPRINT1("Reparse support not yet present!\n");
-            ASSERT(FALSE); // while (TRUE);
+            UNIMPLEMENTED_DBGBREAK("Reparse support not yet present!\n");
             return;
         }
     }
@@ -1373,8 +1372,7 @@ IofCompleteRequest(IN PIRP Irp,
                              PriorityBoost);
 #else
             /* Not implemented yet. */
-            DPRINT1("Not supported!\n");
-            ASSERT(FALSE); // while (TRUE);
+            UNIMPLEMENTED_DBGBREAK("Not supported!\n");
 #endif
         }
 

diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
index 54e5c41..3aca4ce 100644 (file)
--- a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
@@ -3784,7 +3784,7 @@ PiGetDeviceRegistryProperty(IN PDEVICE_OBJECT DeviceObject,
 
 #define PIP_RETURN_DATA(x, y)   {ReturnLength = x; Data = y; Status = STATUS_SUCCESS; break;}
 #define PIP_REGISTRY_DATA(x, y) {ValueName = x; ValueType = y; break;}
-#define PIP_UNIMPLEMENTED()     {UNIMPLEMENTED; ASSERT(FALSE); /* while (TRUE); */ break;}
+#define PIP_UNIMPLEMENTED()     {UNIMPLEMENTED_DBGBREAK(); break;}
 
 /*
  * @implemented

diff --git a/reactos/ntoskrnl/kd64/amd64/kdx64.c b/reactos/ntoskrnl/kd64/amd64/kdx64.c
index a496fd7..219013b 100644 (file)
--- a/reactos/ntoskrnl/kd64/amd64/kdx64.c
+++ b/reactos/ntoskrnl/kd64/amd64/kdx64.c
@@ -139,8 +139,7 @@ KdpSysReadBusData(IN ULONG BusDataType,
                   IN ULONG Length,
                   OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -154,8 +153,7 @@ KdpSysWriteBusData(IN ULONG BusDataType,
                    IN ULONG Length,
                    OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -357,8 +355,7 @@ NTSTATUS
 NTAPI
 KdpSysCheckLowMemory(IN ULONG Flags)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -366,7 +363,8 @@ NTSTATUS
 NTAPI
 KdpAllowDisable(VOID)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_ACCESS_DENIED;
 }
+
+/* EOF */

diff --git a/reactos/ntoskrnl/kd64/arm/kdarm.c b/reactos/ntoskrnl/kd64/arm/kdarm.c
index 35f9211..04907d3 100644 (file)
--- a/reactos/ntoskrnl/kd64/arm/kdarm.c
+++ b/reactos/ntoskrnl/kd64/arm/kdarm.c
@@ -22,8 +22,7 @@ NTAPI
 KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State,
                   IN PCONTEXT Context)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 VOID
@@ -31,8 +30,7 @@ NTAPI
 KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange,
                    IN PCONTEXT Context)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 NTSTATUS
@@ -40,8 +38,7 @@ NTAPI
 KdpSysReadMsr(IN ULONG Msr,
               OUT PLARGE_INTEGER MsrValue)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -50,8 +47,7 @@ NTAPI
 KdpSysWriteMsr(IN ULONG Msr,
                IN PLARGE_INTEGER MsrValue)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -65,8 +61,7 @@ KdpSysReadBusData(IN ULONG BusDataType,
                   IN ULONG Length,
                   OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -80,8 +75,7 @@ KdpSysWriteBusData(IN ULONG BusDataType,
                    IN ULONG Length,
                    OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -93,8 +87,7 @@ KdpSysReadControlSpace(IN ULONG Processor,
                        IN ULONG Length,
                        OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -106,8 +99,7 @@ KdpSysWriteControlSpace(IN ULONG Processor,
                         IN ULONG Length,
                         OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -121,8 +113,7 @@ KdpSysReadIoSpace(IN ULONG InterfaceType,
                   IN ULONG DataSize,
                   OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -136,8 +127,7 @@ KdpSysWriteIoSpace(IN ULONG InterfaceType,
                    IN ULONG DataSize,
                    OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -145,8 +135,7 @@ NTSTATUS
 NTAPI
 KdpSysCheckLowMemory(IN ULONG Flags)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -154,7 +143,6 @@ NTSTATUS
 NTAPI
 KdpAllowDisable(VOID)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_ACCESS_DENIED;
 }

diff --git a/reactos/ntoskrnl/ke/dpc.c b/reactos/ntoskrnl/ke/dpc.c
index 577fefb..4777237 100644 (file)
--- a/reactos/ntoskrnl/ke/dpc.c
+++ b/reactos/ntoskrnl/ke/dpc.c
@@ -779,9 +779,7 @@ KeInsertQueueDpc(IN PKDPC Dpc,
             if (!(Prcb->DpcThreadActive) && !(Prcb->DpcThreadRequested))
             {
                 /* FIXME: Setup Threaded DPC */
-                DPRINT1("Threaded DPC not supported\n");
-                ASSERT(FALSE);
-                while (TRUE);
+                UNIMPLEMENTED_FATAL("Threaded DPC not supported\n");
             }
         }
         else

diff --git a/reactos/ntoskrnl/ke/i386/context.c b/reactos/ntoskrnl/ke/i386/context.c
index cd36a14..e6b9130 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/context.c
+++ b/reactos/ntoskrnl/ke/i386/context.c
@@ -35,8 +35,7 @@ KiSwapProcess(IN PKPROCESS NewProcess,
     if (NewProcess->LdtDescriptor.LimitLow != OldProcess->LdtDescriptor.LimitLow)
     {
         /* Not handled yet */
-        UNIMPLEMENTED;
-        ASSERT(FALSE); // while (TRUE);
+        UNIMPLEMENTED_DBGBREAK();
         return;
     }
     

diff --git a/reactos/ntoskrnl/ke/i386/traphdlr.c b/reactos/ntoskrnl/ke/i386/traphdlr.c
index 2bd9a46..e54deab 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/traphdlr.c
+++ b/reactos/ntoskrnl/ke/i386/traphdlr.c
@@ -662,9 +662,7 @@ KiTrap06Handler(IN PKTRAP_FRAME TrapFrame)
         if (!VdmDispatchBop(TrapFrame))
         {
             /* Should only happen in VDM mode */
-            UNIMPLEMENTED;
-            ASSERT(FALSE);
-            while (TRUE);
+            UNIMPLEMENTED_FATAL();
         }
         
         /* Bring IRQL back */
@@ -735,9 +733,7 @@ KiTrap07Handler(IN PKTRAP_FRAME TrapFrame)
         if (SaveArea->Cr0NpxState & CR0_EM)
         {
             /* Not implemented */
-            UNIMPLEMENTED;
-            ASSERT(FALSE);
-            while (TRUE);
+            UNIMPLEMENTED_FATAL();
         }
     
         /* Save CR0 and check NPX state */
@@ -922,9 +918,7 @@ KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame)
         if (__builtin_expect(Ki386HandleOpcodeV86(TrapFrame) == 0xFF, 0))
         {
             /* Should only happen in VDM mode */
-            UNIMPLEMENTED;
-            ASSERT(FALSE);
-            while (TRUE);
+            UNIMPLEMENTED_FATAL();
         }
         
         /* Bring IRQL back */
@@ -1079,9 +1073,7 @@ KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame)
         ((PVOID)TrapFrame->Eip < (PVOID)KiTrap0DHandler))
     {
         /* Not implemented */
-        UNIMPLEMENTED;
-        ASSERT(FALSE);
-        while (TRUE);
+        UNIMPLEMENTED_FATAL();
     }
 
     /*
@@ -1136,9 +1128,7 @@ KiTrap0DHandler(IN PKTRAP_FRAME TrapFrame)
         else
         {
             /* Otherwise, this is another kind of IRET fault */
-            UNIMPLEMENTED;
-            ASSERT(FALSE);
-            while (TRUE);
+            UNIMPLEMENTED_FATAL();
         }
     }
      
@@ -1195,9 +1185,7 @@ KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame)
             FIELD_OFFSET(KTRAP_FRAME, EFlags))
         {
             /* The stack is somewhere in between frames, we need to fix it */
-            UNIMPLEMENTED;
-            ASSERT(FALSE);
-            while (TRUE);
+            UNIMPLEMENTED_FATAL();
         }
     }
 
@@ -1261,9 +1249,7 @@ KiTrap0EHandler(IN PKTRAP_FRAME TrapFrame)
         (TrapFrame->Eip == (ULONG_PTR)ReadBatch))
     {
         /* Not yet implemented */
-        UNIMPLEMENTED;
-        ASSERT(FALSE);
-        while (TRUE);
+        UNIMPLEMENTED_FATAL();
     }
 #endif
     /* Check for VDM trap */
@@ -1445,16 +1431,14 @@ VOID
 FASTCALL
 KiGetTickCountHandler(IN PKTRAP_FRAME TrapFrame)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 VOID
 FASTCALL
 KiCallbackReturnHandler(IN PKTRAP_FRAME TrapFrame)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 DECLSPEC_NORETURN
@@ -1624,9 +1608,7 @@ KiSystemCall(IN PKTRAP_FRAME TrapFrame,
     if (__builtin_expect((Arguments < (PVOID)MmUserProbeAddress) && !(KiUserTrap(TrapFrame)), 0))
     {
         /* Access violation */
-        UNIMPLEMENTED;
-        ASSERT(FALSE);
-        while (TRUE);
+        UNIMPLEMENTED_FATAL();
     }
     
     /* Call pre-service debug hook */
@@ -1690,9 +1672,7 @@ NTAPI
 Kei386EoiHelper(VOID)
 {
     /* We should never see this call happening */
-    DPRINT1("Mismatched NT/HAL version");
-    ASSERT(FALSE);
-    while (TRUE);
+    ERROR_FATAL("Mismatched NT/HAL version");
 }
 
 /* EOF */

diff --git a/reactos/ntoskrnl/mm/arm/stubs.c b/reactos/ntoskrnl/mm/arm/stubs.c
index 6aab43f..b494bc9 100644 (file)
--- a/reactos/ntoskrnl/mm/arm/stubs.c
+++ b/reactos/ntoskrnl/mm/arm/stubs.c
@@ -374,8 +374,7 @@ Mmi386ReleaseMmInfo(IN PEPROCESS Process)
     //
     // FIXME-USER: Need to delete address space
     //
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_NOT_IMPLEMENTED;
 }
 

diff --git a/reactos/ntoskrnl/po/povolume.c b/reactos/ntoskrnl/po/povolume.c
index 13da03a..3ef3918 100644 (file)
--- a/reactos/ntoskrnl/po/povolume.c
+++ b/reactos/ntoskrnl/po/povolume.c
@@ -299,10 +299,7 @@ PopFlushVolumes(IN BOOLEAN ShuttingDown)
     if (!(FlushPolicy & 2))
     {
         /* ReactOS only implements this routine for shutdown, which requires it */
-        UNIMPLEMENTED;
-        ASSERT(FALSE); // while (TRUE);
-        KeReleaseGuardedMutex(&PopVolumeLock);
-        return;
+        UNIMPLEMENTED_DBGBREAK();
     }
 
     /* Check if there were no volumes at all */