[ros-diffs] [sginsberg] 69075: - Fix the ASSERT in VdmSwapContext now that we are always setting up the trap frame correctly on debug build. - Fix the ASSERT in KeConnectInterrupt for debug single-processor bu...

Author: sginsberg
Date: Sun Sep  6 22:29:10 2015
New Revision: 69075

URL: http://svn.reactos.org/svn/reactos?rev=69075&view=rev
Log:
- Fix the ASSERT in VdmSwapContext now that we are always setting up the trap frame
correctly on debug build.
- Fix the ASSERT in KeConnectInterrupt for debug single-processor builds (but keep the old
one for multiprocessor build to make it less confusing if it is hit).

Modified:
    trunk/reactos/ntoskrnl/ke/i386/irqobj.c
    trunk/reactos/ntoskrnl/vdm/vdmexec.c

Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/irqobj.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c	[iso-8859-1] Sun Sep  6 22:29:10 2015
@@ -447,8 +447,16 @@
             /* The vector is shared and the interrupts are compatible */
             Interrupt->Connected = Connected = TRUE;
 
-            /* FIXME */
-            // ASSERT(Irql <= SYNCH_LEVEL);
+            /*
+             * Verify the IRQL for chained connect,
+             */
+#if defined(CONFIG_SMP)
+            ASSERT(Irql <= SYNCH_LEVEL);
+#elif (NTDDI_VERSION >= NTDDI_WS03)
+            ASSERT(Irql <= (IPI_LEVEL - 2));
+#else
+            ASSERT(Irql <= (IPI_LEVEL - 1));
+#endif
 
             /* Check if this is the first chain */
             if (Dispatch.Type != ChainConnect)

Modified: trunk/reactos/ntoskrnl/vdm/vdmexec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmexec.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/vdm/vdmexec.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/vdm/vdmexec.c	[iso-8859-1] Sun Sep  6 22:29:10 2015
@@ -50,7 +50,7 @@
 
     /* Make sure that we're at APC_LEVEL and that this is a valid frame */
     ASSERT(KeGetCurrentIrql() == APC_LEVEL);
-    //ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00);
+    ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00);
 
     /* Check if this is a V86 frame */
     if (TrapFrame->EFlags & EFLAGS_V86_MASK)