[ros-diffs] [hbelusca] 58138: [NTOSKRNL-CMLIB] Continue to use the new debugging macros introduced in r58132.

Author: hbelusca
Date: Mon Jan  7 22:11:06 2013
New Revision: 58138

URL: http://svn.reactos.org/svn/reactos?rev=58138&view=rev
Log:
[NTOSKRNL-CMLIB]
Continue to use the new debugging macros introduced in r58132.

Modified:
    trunk/reactos/lib/cmlib/hivecell.c
    trunk/reactos/ntoskrnl/cache/cachesub.c
    trunk/reactos/ntoskrnl/cache/copysup.c
    trunk/reactos/ntoskrnl/cache/fssup.c
    trunk/reactos/ntoskrnl/cache/logsup.c
    trunk/reactos/ntoskrnl/include/internal/i386/ke.h
    trunk/reactos/ntoskrnl/io/iomgr/irp.c
    trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
    trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c
    trunk/reactos/ntoskrnl/kd64/arm/kdarm.c
    trunk/reactos/ntoskrnl/ke/dpc.c
    trunk/reactos/ntoskrnl/ke/i386/context.c
    trunk/reactos/ntoskrnl/ke/i386/traphdlr.c
    trunk/reactos/ntoskrnl/mm/arm/stubs.c
    trunk/reactos/ntoskrnl/po/povolume.c

Modified: trunk/reactos/lib/cmlib/hivecell.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=5…
==============================================================================
--- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -548,8 +548,7 @@
     }
 
     /* FIXME: TODO */
-    DPRINT1("ERROR: Too many references\n");
-    ASSERT(FALSE); // while (TRUE);
+    ASSERTMSG(FALSE, "ERROR: Too many references\n");
     return FALSE;
 }
 

Modified: trunk/reactos/ntoskrnl/cache/cachesub.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -131,8 +131,7 @@
                       IN BOOLEAN CcInternalCaller)
 {
     LARGE_INTEGER Result = {{0}};
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return Result;
 }
 

Modified: trunk/reactos/ntoskrnl/cache/copysup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/copysup.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/cache/copysup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cache/copysup.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -121,8 +121,7 @@
                OUT PVOID Buffer,
                OUT PIO_STATUS_BLOCK IoStatus)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 BOOLEAN
@@ -208,8 +207,7 @@
                 IN ULONG Length,
                 IN PVOID Buffer)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 BOOLEAN
@@ -219,8 +217,7 @@
             IN BOOLEAN Wait,
             IN UCHAR Retrying)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return FALSE;
 }
 
@@ -233,8 +230,7 @@
              IN ULONG BytesToWrite,
              IN BOOLEAN Retrying)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 /* EOF */

Modified: trunk/reactos/ntoskrnl/cache/fssup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -392,14 +392,13 @@
     CcpFlushCache(Map, NULL, 0, NULL, TRUE);
     return TRUE;
 }
-
+
 VOID
 NTAPI
 CcSetDirtyPageThreshold(IN PFILE_OBJECT FileObject,
                         IN ULONG DirtyPageThreshold)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 /*

Modified: trunk/reactos/ntoskrnl/cache/logsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/logsup.c?re…
==============================================================================
--- trunk/reactos/ntoskrnl/cache/logsup.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cache/logsup.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -23,8 +23,7 @@
                                IN BOOLEAN DisableReadAhead,
                                IN BOOLEAN DisableWriteBehind)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 VOID
@@ -47,17 +46,15 @@
                 IN PVOID Context2)
 {
     LARGE_INTEGER Result = {{0}};
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return Result;
 }
-
+
 BOOLEAN
 NTAPI
 CcIsThereDirtyData(IN PVPB Vpb)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return FALSE;
 }
 
@@ -67,8 +64,7 @@
                       OUT OPTIONAL PLARGE_INTEGER OldestLsn)
 {
     LARGE_INTEGER Result = {{0}};
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return Result;
 }
 

Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Jan  7 22:11:06
2013
@@ -137,8 +137,7 @@
                    IN ULONG Flags)                  \
     {                                               \
         /* Not yet handled */                       \
-        UNIMPLEMENTED;                              \
-        ASSERT(FALSE); /* while (TRUE); */          \
+        UNIMPLEMENTED_DBGBREAK();                   \
         return FALSE;                               \
     }
 

Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -265,8 +265,7 @@
             (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 @@
                              PriorityBoost);
 #else
             /* Not implemented yet. */
-            DPRINT1("Not supported!\n");
-            ASSERT(FALSE); // while (TRUE);
+            UNIMPLEMENTED_DBGBREAK("Not supported!\n");
 #endif
         }
 

Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.…
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -3784,7 +3784,7 @@
 
 #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

Modified: trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/amd64/kdx64.…
==============================================================================
--- trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd64/amd64/kdx64.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -139,8 +139,7 @@
                   IN ULONG Length,
                   OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -154,8 +153,7 @@
                    IN ULONG Length,
                    OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -357,8 +355,7 @@
 NTAPI
 KdpSysCheckLowMemory(IN ULONG Flags)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -366,7 +363,8 @@
 NTAPI
 KdpAllowDisable(VOID)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_ACCESS_DENIED;
 }
+
+/* EOF */

Modified: trunk/reactos/ntoskrnl/kd64/arm/kdarm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/arm/kdarm.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/kd64/arm/kdarm.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd64/arm/kdarm.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -22,8 +22,7 @@
 KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State,
                   IN PCONTEXT Context)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 VOID
@@ -31,8 +30,7 @@
 KdpSetContextState(IN PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange,
                    IN PCONTEXT Context)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
 }
 
 NTSTATUS
@@ -40,8 +38,7 @@
 KdpSysReadMsr(IN ULONG Msr,
               OUT PLARGE_INTEGER MsrValue)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -50,8 +47,7 @@
 KdpSysWriteMsr(IN ULONG Msr,
                IN PLARGE_INTEGER MsrValue)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -65,8 +61,7 @@
                   IN ULONG Length,
                   OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -80,8 +75,7 @@
                    IN ULONG Length,
                    OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -93,8 +87,7 @@
                        IN ULONG Length,
                        OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -106,8 +99,7 @@
                         IN ULONG Length,
                         OUT PULONG ActualLength)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -121,8 +113,7 @@
                   IN ULONG DataSize,
                   OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -136,8 +127,7 @@
                    IN ULONG DataSize,
                    OUT PULONG ActualDataSize)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -145,8 +135,7 @@
 NTAPI
 KdpSysCheckLowMemory(IN ULONG Flags)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_UNSUCCESSFUL;
 }
 
@@ -154,7 +143,6 @@
 NTAPI
 KdpAllowDisable(VOID)
 {
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_ACCESS_DENIED;
 }

Modified: trunk/reactos/ntoskrnl/ke/dpc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=5813…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -779,9 +779,7 @@
             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

Modified: trunk/reactos/ntoskrnl/ke/i386/context.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/context.c…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/context.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/context.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -35,8 +35,7 @@
     if (NewProcess->LdtDescriptor.LimitLow != OldProcess->LdtDescriptor.LimitLow)
     {
         /* Not handled yet */
-        UNIMPLEMENTED;
-        ASSERT(FALSE); // while (TRUE);
+        UNIMPLEMENTED_DBGBREAK();
         return;
     }
     

Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -662,9 +662,7 @@
         if (!VdmDispatchBop(TrapFrame))
         {
             /* Should only happen in VDM mode */
-            UNIMPLEMENTED;
-            ASSERT(FALSE);
-            while (TRUE);
+            UNIMPLEMENTED_FATAL();
         }
         
         /* Bring IRQL back */
@@ -735,9 +733,7 @@
         if (SaveArea->Cr0NpxState & CR0_EM)
         {
             /* Not implemented */
-            UNIMPLEMENTED;
-            ASSERT(FALSE);
-            while (TRUE);
+            UNIMPLEMENTED_FATAL();
         }
     
         /* Save CR0 and check NPX state */
@@ -922,9 +918,7 @@
         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 @@
         ((PVOID)TrapFrame->Eip < (PVOID)KiTrap0DHandler))
     {
         /* Not implemented */
-        UNIMPLEMENTED;
-        ASSERT(FALSE);
-        while (TRUE);
+        UNIMPLEMENTED_FATAL();
     }
 
     /*
@@ -1136,9 +1128,7 @@
         else
         {
             /* Otherwise, this is another kind of IRET fault */
-            UNIMPLEMENTED;
-            ASSERT(FALSE);
-            while (TRUE);
+            UNIMPLEMENTED_FATAL();
         }
     }
      
@@ -1195,9 +1185,7 @@
             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 @@
         (TrapFrame->Eip == (ULONG_PTR)ReadBatch))
     {
         /* Not yet implemented */
-        UNIMPLEMENTED;
-        ASSERT(FALSE);
-        while (TRUE);
+        UNIMPLEMENTED_FATAL();
     }
 #endif
     /* Check for VDM trap */
@@ -1445,16 +1431,14 @@
 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 @@
     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 @@
 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 */

Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -374,8 +374,7 @@
     //
     // FIXME-USER: Need to delete address space
     //
-    UNIMPLEMENTED;
-    ASSERT(FALSE); // while (TRUE);
+    UNIMPLEMENTED_DBGBREAK();
     return STATUS_NOT_IMPLEMENTED;
 }
 

Modified: trunk/reactos/ntoskrnl/po/povolume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/povolume.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] Mon Jan  7 22:11:06 2013
@@ -299,10 +299,7 @@
     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 */