Commit in reactos on MAIN
ntoskrnl/rtl/error.c+18-61.11 -> 1.12
subsys/win32k/w32k.h+11.1 -> 1.2
subsys/win32k/ntuser/msgqueue.c+2-21.95 -> 1.96
+21-8
3 modified files
ASSERT() was a no-op in win32k, even for debug builds

reactos/ntoskrnl/rtl
error.c 1.11 -> 1.12
diff -u -r1.11 -r1.12
--- error.c	28 Feb 2004 15:12:49 -0000	1.11
+++ error.c	15 May 2004 16:17:59 -0000	1.12
@@ -1,4 +1,4 @@
-/* $Id: error.c,v 1.11 2004/02/28 15:12:49 navaraf Exp $
+/* $Id: error.c,v 1.12 2004/05/15 16:17:59 gvg Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -840,11 +840,23 @@
 	  ULONG LineNumber,
 	  PCHAR Message)
 {
-   DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n",
-	    (PCHAR)FailedAssertion,
-	    (PCHAR)FileName,
-	    LineNumber,
-	    Message);
+   if (NULL == Message)
+      {
+         DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n",
+                  (PCHAR)FailedAssertion,
+                  (PCHAR)FileName,
+                  LineNumber,
+                  Message);
+      }
+   else
+      {
+         DbgPrint("Assertion \'%s\' failed at %s line %d\n",
+                  (PCHAR)FailedAssertion,
+                  (PCHAR)FileName,
+                  LineNumber);
+      }
+
+   DbgBreakPoint();
 }
 
 

reactos/subsys/win32k
w32k.h 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- w32k.h	10 May 2004 17:07:18 -0000	1.1
+++ w32k.h	15 May 2004 16:17:59 -0000	1.2
@@ -5,6 +5,7 @@
 #define __WIN32K__
 #define NTOS_MODE_KERNEL
 
+#include <roscfg.h>
 #include <roskrnl.h>
 
 #include <ddk/winddi.h>

reactos/subsys/win32k/ntuser
msgqueue.c 1.95 -> 1.96
diff -u -r1.95 -r1.96
--- msgqueue.c	14 May 2004 23:57:32 -0000	1.95
+++ msgqueue.c	15 May 2004 16:17:59 -0000	1.96
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: msgqueue.c,v 1.95 2004/05/14 23:57:32 weiden Exp $
+/* $Id: msgqueue.c,v 1.96 2004/05/15 16:17:59 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -145,7 +145,7 @@
     while (mmov != SystemMessageQueueHead )
     {
       ULONG prev = mmov ? mmov - 1 : SYSTEM_MESSAGE_QUEUE_SIZE - 1;
-      ASSERT(mmov >= 0);
+      ASSERT((LONG) mmov >= 0);
       ASSERT(mmov < SYSTEM_MESSAGE_QUEUE_SIZE);
       SystemMessageQueue[mmov] = SystemMessageQueue[prev];
       mmov = prev;
CVSspam 0.2.8