[ros-diffs] [ion] 13798: Make ASSERTs bugcheck properly. Thanks Steven

Make ASSERTs bugcheck properly. Thanks Steven
Modified:
branches/alex_devel_branch/reactos/ntoskrnl/include/internal/debug.h
Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c
  _____  

Modified:
branches/alex_devel_branch/reactos/ntoskrnl/include/internal/debug.h
--- branches/alex_devel_branch/reactos/ntoskrnl/include/internal/debug.h
2005-03-02 21:24:02 UTC (rev 13797)
+++ branches/alex_devel_branch/reactos/ntoskrnl/include/internal/debug.h
2005-03-02 21:54:28 UTC (rev 13798)
@@ -38,11 +38,11 @@

 /* Assert only on "checked" version */
 #ifndef NASSERT
 #ifdef CONFIG_SMP
-#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d
for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber),
KeBugCheck(0); }
-#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d
for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber),
KeBugCheck(0); }
+#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d
for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber),
DbgBreakPoint(); }
+#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d
for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber),
DbgBreakPoint(); }
 #else
-#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at
%s:%d\n", __FILE__,__LINE__); KeBugCheck(0); }
-#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at
%s:%d\n", __FILE__,__LINE__); KeBugCheck(0); }
+#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at
%s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); }
+#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at
%s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); }
 #endif
 
 #define assertmsg(_c_, _m_) \
  _____  

Modified: branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c
--- branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c
2005-03-02 21:24:02 UTC (rev 13797)
+++ branches/alex_devel_branch/reactos/ntoskrnl/ps/kill.c
2005-03-02 21:54:28 UTC (rev 13798)
@@ -219,12 +219,6 @@

    }
 
    oldIrql = KeAcquireDispatcherDatabaseLock();
-
-#ifdef _ENABLE_THRDEVTPAIR
-   ExpSwapThreadEventPair(CurrentThread, NULL); /* Release the
associated eventpair object, if there was one */
-#endif /* _ENABLE_THRDEVTPAIR */
-
-   ASSERT(CurrentThread->Tcb.WaitBlockList == NULL);
    
    PsDispatchThreadNoLock(THREAD_STATE_TERMINATED_1);
    DPRINT1("Unexpected return, CurrentThread %x PsGetCurrentThread()
%x\n", CurrentThread, PsGetCurrentThread());