[rharabien] 53023: [NTOSKRNL] - Fix *TRACE macros definition. See r53008 for more info.

Author: rharabien
Date: Mon Aug  1 22:59:44 2011
New Revision: 53023

URL: http://svn.reactos.org/svn/reactos?rev=53023&view=rev
Log:
[NTOSKRNL]
- Fix *TRACE macros definition. See r53008 for more info.

Modified:
    trunk/reactos/ntoskrnl/include/internal/cm.h
    trunk/reactos/ntoskrnl/include/internal/dbgk.h
    trunk/reactos/ntoskrnl/include/internal/fsrtl.h
    trunk/reactos/ntoskrnl/include/internal/hdl.h
    trunk/reactos/ntoskrnl/include/internal/io.h
    trunk/reactos/ntoskrnl/include/internal/lpc.h
    trunk/reactos/ntoskrnl/include/internal/po.h
    trunk/reactos/ntoskrnl/include/internal/ps.h
    trunk/reactos/ntoskrnl/include/internal/vdm.h

Modified: trunk/reactos/ntoskrnl/include/internal/cm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/c...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -33,7 +33,7 @@
     if (x & CmpTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define CMTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define CMTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif

//

Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/d...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -43,7 +43,7 @@
     }
 #endif
 #else
-#define DBGKTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define DBGKTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif

VOID

Modified: trunk/reactos/ntoskrnl/include/internal/fsrtl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/f...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -36,7 +36,7 @@
     if (x & FsRtlpTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define FSTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define FSTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif

//

Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/h...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -30,7 +30,7 @@
     if (x & HdlpTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define HDLTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define HDLTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif

//

Modified: trunk/reactos/ntoskrnl/include/internal/io.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/i...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -10,7 +10,7 @@
 //
 // Define this if you want debugging support
 //
-#define _IO_DEBUG_                                      0x00
+#define _IO_DEBUG_                                      0x01

//
 // These define the Debug Masks Supported
@@ -43,7 +43,7 @@
     }
 #endif
 #else
-#define IOTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define IOTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif

//

Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/l...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -46,7 +46,7 @@
     }
 #endif
 #else
-#define LPCTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define LPCTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif

//

Modified: trunk/reactos/ntoskrnl/include/internal/po.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/p...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -30,7 +30,7 @@
     if (x & PopTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define POTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define POTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif

typedef struct _PO_HIBER_PERF

Modified: trunk/reactos/ntoskrnl/include/internal/ps.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/p...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -54,7 +54,7 @@
             __LINE__,                                       \
             OBJECT_TO_OBJECT_HEADER(x)->PointerCount)
 #else
-#define PSTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define PSTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #define PSREFTRACE(x)
 #endif

Modified: trunk/reactos/ntoskrnl/include/internal/vdm.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/v...
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/vdm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/vdm.h [iso-8859-1] Mon Aug  1 22:59:44 2011
@@ -27,7 +27,7 @@
     if (x & VdmpTraceLevel) DbgPrint(__VA_ARGS__)
 #endif
 #else
-#define VMTRACE(x, ...) DPRINT(__VA_ARGS__)
+#define VMTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__)
 #endif

//