[sginsberg] 41436: - In Win32 DBG is defined to 0 for a non-debug build and to 1 for a debug build. In ReactOS we do this slightly different: DBG is correctly defined to 1 for debug, but not defined at all on non-debug/release build. Because gcc is awesome we can then check for debug compilation with both #ifdef DBG and #if DBG (error free! yay gcc!), and so we have mixed usage all over the tree. - Fix this by defining DBG on non-debug build too and deprecate all usage of #ifdef DBG.
17 Jun
2009
17 Jun
'09
12:44 p.m.
Author: sginsberg
Date: Wed Jun 17 16:44:05 2009
New Revision: 41436
URL: http://svn.reactos.org/svn/reactos?rev=41436&view=rev
Log:
- In Win32 DBG is defined to 0 for a non-debug build and to 1 for a debug build. In
ReactOS we do this slightly different: DBG is correctly defined to 1 for debug, but not
defined at all on non-debug/release build. Because gcc is awesome we can then check for
debug compilation with both #ifdef DBG and #if DBG (error free! yay gcc!), and so we have
mixed usage all over the tree.
- Fix this by defining DBG on non-debug build too and deprecate all usage of #ifdef DBG.
Modified:
trunk/reactos/ReactOS-arm.rbuild
trunk/reactos/ReactOS-generic.rbuild
trunk/reactos/base/services/dhcp/include/debug.h
trunk/reactos/base/setup/usetup/bootsup.c
trunk/reactos/base/system/services/services.c
trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
trunk/reactos/boot/freeldr/freeldr/comm/rs232.c
trunk/reactos/boot/freeldr/freeldr/debug.c
trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c
trunk/reactos/boot/freeldr/freeldr/include/debug.h
trunk/reactos/boot/freeldr/freeldr/include/mm.h
trunk/reactos/boot/freeldr/freeldr/mm/meminit.c
trunk/reactos/boot/freeldr/freeldr/mm/mm.c
trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c
trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c
trunk/reactos/dll/ntdll/include/ntdllp.h
trunk/reactos/dll/ntdll/ldr/startup.c
trunk/reactos/dll/ntdll/ldr/utils.c
trunk/reactos/dll/ntdll/rtl/libsupp.c
trunk/reactos/dll/win32/iprtprio/iprtprio.c
trunk/reactos/dll/win32/msafd/include/debug.h
trunk/reactos/dll/win32/msafd/misc/dllmain.c
trunk/reactos/dll/win32/snmpapi/debug.h
trunk/reactos/dll/win32/snmpapi/snmpapi.c
trunk/reactos/dll/win32/ws2_32/include/debug.h
trunk/reactos/dll/win32/ws2_32/misc/catalog.c
trunk/reactos/dll/win32/ws2_32/misc/dllmain.c
trunk/reactos/dll/win32/ws2help/debug.h
trunk/reactos/dll/win32/ws2help/ws2help.c
trunk/reactos/dll/win32/wshirda/debug.h
trunk/reactos/dll/win32/wshirda/wshirda.c
trunk/reactos/drivers/filesystems/fastfat/finfo.c
trunk/reactos/drivers/input/i8042prt/registry.c
trunk/reactos/drivers/network/afd/afd/lock.c
trunk/reactos/drivers/network/afd/afd/main.c
trunk/reactos/drivers/network/afd/afd/tdi.c
trunk/reactos/drivers/network/afd/include/debug.h
trunk/reactos/drivers/network/dd/ne2000/include/debug.h
trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c
trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c
trunk/reactos/drivers/network/lan/include/debug.h
trunk/reactos/drivers/network/ndis/include/debug.h
trunk/reactos/drivers/network/ndis/include/miniport.h
trunk/reactos/drivers/network/ndis/ndis/main.c
trunk/reactos/drivers/network/ndis/ndis/miniport.c
trunk/reactos/drivers/network/ndis/ndis/protocol.c
trunk/reactos/drivers/network/tcpip/datalink/lan.c
trunk/reactos/drivers/network/tcpip/include/address.h
trunk/reactos/drivers/network/tcpip/include/debug.h
trunk/reactos/drivers/network/tcpip/include/memtrack.h
trunk/reactos/drivers/network/tcpip/include/routines.h
trunk/reactos/drivers/network/tcpip/include/titypes.h
trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c
trunk/reactos/drivers/network/tcpip/tcpip/main.c
trunk/reactos/drivers/storage/class/cdrom/cdrom.c
trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp
trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c
trunk/reactos/include/ddk/mcd.h
trunk/reactos/include/ddk/srb.h
trunk/reactos/include/ddk/storport.h
trunk/reactos/include/ddk/video.h
trunk/reactos/include/ddk/winddk.h
trunk/reactos/include/reactos/debug.h
trunk/reactos/lib/drivers/ip/network/ip.c
trunk/reactos/lib/drivers/ip/network/memtrack.c
trunk/reactos/lib/drivers/ip/network/routines.c
trunk/reactos/lib/drivers/oskittcp/include/memtrack.h
trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h
trunk/reactos/lib/rtl/handle.c
trunk/reactos/lib/rtl/rtlp.h
trunk/reactos/ntoskrnl/cc/view.c
trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S
trunk/reactos/ntoskrnl/ex/pushlock.c
trunk/reactos/ntoskrnl/ex/resource.c
trunk/reactos/ntoskrnl/include/config.h
trunk/reactos/ntoskrnl/include/internal/cc.h
trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S
trunk/reactos/ntoskrnl/include/internal/kd.h
trunk/reactos/ntoskrnl/include/internal/ke_x.h
trunk/reactos/ntoskrnl/kd/kdmain.c
trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c
trunk/reactos/ntoskrnl/ke/arm/kiinit.c
trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S
trunk/reactos/ntoskrnl/ke/i386/kiinit.c
trunk/reactos/ntoskrnl/ke/i386/systimer.S
trunk/reactos/ntoskrnl/ke/i386/trap.s
trunk/reactos/ntoskrnl/ke/spinlock.c
trunk/reactos/ntoskrnl/mm/rmap.c
trunk/reactos/ntoskrnl/mm/rpoolmgr.h
trunk/reactos/ntoskrnl/ps/debug.c
trunk/reactos/ntoskrnl/rtl/libsupp.c
trunk/reactos/tools/cabman/cabinet.cxx
trunk/reactos/tools/cabman/cabinet.h
trunk/reactos/tools/cabman/main.cxx
trunk/reactos/tools/hpp/hpp.c
Modified: trunk/reactos/ReactOS-arm.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=414…
==============================================================================
--- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -19,6 +19,10 @@
<define name="_SEH_ENABLE_TRACE" />
<property name="DBG_OR_KDBG" value="true" />
</if>
+ <if property="DBG" value="0">
+ <define name="DBG">0</define>
+ </if>
+
<if property="KDBG" value="1">
<define name="KDBG">1</define>
<property name="DBG_OR_KDBG" value="true" />
Modified: trunk/reactos/ReactOS-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev…
==============================================================================
--- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -11,6 +11,10 @@
<define name="_SEH_ENABLE_TRACE" />
<property name="DBG_OR_KDBG" value="true" />
</if>
+ <if property="DBG" value="0">
+ <define name="DBG">0</define>
+ </if>
+
<if property="KDBG" value="1">
<define name="KDBG">1</define>
<property name="DBG_OR_KDBG" value="true" />
Modified: trunk/reactos/base/services/dhcp/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include…
==============================================================================
--- trunk/reactos/base/services/dhcp/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/base/services/dhcp/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -18,7 +18,7 @@
#define DEBUG_ADAPTER 0x00000100
#define DEBUG_ULTRA 0xFFFFFFFF
-#ifdef DBG
+#if DBG
extern unsigned long debug_trace_level;
Modified: trunk/reactos/base/setup/usetup/bootsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.…
==============================================================================
--- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -43,7 +43,7 @@
IniSection = IniCacheAppendSection(IniCache,
L"FREELOADER");
-#ifdef DBG
+#if DBG
if (IsUnattendedSetup)
{
/* DefaultOS=ReactOS */
@@ -64,7 +64,7 @@
L"ReactOS");
}
-#ifdef DBG
+#if DBG
if (IsUnattendedSetup)
#endif
{
@@ -75,7 +75,7 @@
L"TimeOut",
L"0");
}
-#ifdef DBG
+#if DBG
else
{
/* Timeout=0 or 10 */
@@ -380,7 +380,7 @@
L"ReactOS_Debug",
L"\"ReactOS (Debug)\"");
-#ifdef DBG
+#if DBG
/* ReactOS_KdSerial="ReactOS (RosDbg)" */
IniCacheInsertKey(IniSection,
NULL,
@@ -453,7 +453,7 @@
L"Options",
L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
-#ifdef DBG
+#if DBG
/* Create "ReactOS_KdSerial" section */
IniSection = IniCacheAppendSection(IniCache,
Modified: trunk/reactos/base/system/services/services.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi…
==============================================================================
--- trunk/reactos/base/system/services/services.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/services/services.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -34,7 +34,7 @@
VOID
PrintString(LPCSTR fmt, ...)
{
-#ifdef DBG
+#if DBG
CHAR buffer[512];
va_list ap;
Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] Wed Jun 17
16:44:05 2009
@@ -163,7 +163,7 @@
memcpy(Buffer, Ptr, BufferSize);
-#ifdef DBG
+#if DBG
DPRINTM(DPRINT_DISK, "size of buffer: %x\n",
Ptr[0]);
DPRINTM(DPRINT_DISK, "information flags: %x\n",
Ptr[1]);
DPRINTM(DPRINT_DISK, "number of physical cylinders on drive: %u\n",
*(PULONG)&Ptr[2]);
Modified: trunk/reactos/boot/freeldr/freeldr/comm/rs232.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/comm/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/comm/rs232.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -23,7 +23,7 @@
/* MACROS *******************************************************************/
-#ifdef DBG
+#if DBG
#define DEFAULT_BAUD_RATE 19200
@@ -275,11 +275,11 @@
WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend);
}
-#endif /* defined DBG */
+#endif /* DBG */
BOOLEAN Rs232PortInUse(ULONG Base)
{
-#ifdef DBG
+#if DBG
return PortInitialized && Rs232PortBase == (PUCHAR)(ULONG_PTR)Base ? TRUE :
FALSE;
#else
return FALSE;
Modified: trunk/reactos/boot/freeldr/freeldr/debug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -21,7 +21,7 @@
#include <debug.h>
-#ifdef DBG
+#if DBG
//#define DEBUG_ALL
//#define DEBUG_INIFILE
@@ -297,7 +297,7 @@
return 0;
}
-#endif // defined DBG
+#endif // DBG
ULONG
MsgBoxPrint(const char *Format, ...)
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -427,7 +427,7 @@
return NtfsFixupRecord((PNTFS_RECORD)Buffer);
}
-#ifdef DBG
+#if DBG
VOID NtfsPrintFile(PNTFS_INDEX_ENTRY IndexEntry)
{
PWCHAR FileName;
@@ -455,7 +455,7 @@
EntryFileName = IndexEntry->FileName.FileName;
EntryFileNameLength = IndexEntry->FileName.FileNameLength;
-#ifdef DBG
+#if DBG
NtfsPrintFile(IndexEntry);
#endif
Modified: trunk/reactos/boot/freeldr/freeldr/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -39,7 +39,7 @@
extern char* g_file;
extern int g_line;
-#ifdef DBG
+#if DBG
VOID DbgPrintMask(ULONG Mask, char *format, ...);
VOID DebugInit(VOID);
@@ -85,6 +85,6 @@
#define BugCheck(_x_)
#define DbgDumpBuffer(_x_, _y_, _z_)
-#endif // defined DBG
+#endif // DBG
#endif // defined __DEBUG_H
Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -87,7 +87,7 @@
extern ULONG FreePagesInLookupTable;
extern ULONG LastFreePageHint;
-#ifdef DBG
+#if DBG
PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type);
#endif
Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -21,7 +21,7 @@
#include <freeldr.h>
#include <debug.h>
-#ifdef DBG
+#if DBG
typedef struct
{
MEMORY_TYPE Type;
@@ -54,13 +54,13 @@
BOOLEAN MmInitializeMemoryManager(VOID)
{
-#ifdef DBG
+#if DBG
MEMORY_DESCRIPTOR* MemoryDescriptor = NULL;
#endif
DPRINTM(DPRINT_MEMORY, "Initializing Memory Manager.\n");
-#ifdef DBG
+#if DBG
// Dump the system memory map
DPRINTM(DPRINT_MEMORY, "System Memory Map (Base Address, Length, Type):\n");
while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL)
@@ -128,7 +128,7 @@
DPRINTM(DPRINT_MEMORY, "Heap initialized, base 0x%08x, pages %d\n", (HeapStart
<< MM_PAGE_SHIFT), PagesNeeded);
}
-#ifdef DBG
+#if DBG
PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type)
{
ULONG Index;
Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -20,7 +20,7 @@
#include <freeldr.h>
#include <debug.h>
-#ifdef DBG
+#if DBG
VOID DumpMemoryAllocMap(VOID);
VOID MemAllocTest(VOID);
#endif // DBG
@@ -69,7 +69,7 @@
FreePagesInLookupTable -= PagesNeeded;
MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE);
-#ifdef DBG
+#if DBG
DPRINTM(DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page
%d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd);
DPRINTM(DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer);
#endif // DBG
@@ -169,7 +169,7 @@
FreePagesInLookupTable -= PagesNeeded;
MemPointer = (PVOID)((ULONG_PTR)StartPageNumber * MM_PAGE_SIZE);
-#ifdef DBG
+#if DBG
DPRINTM(DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page
%d.\n", MemorySize, PagesNeeded, StartPageNumber);
DPRINTM(DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer);
#endif // DBG
@@ -242,7 +242,7 @@
FreePagesInLookupTable -= PagesNeeded;
MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE);
-#ifdef DBG
+#if DBG
DPRINTM(DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page
%d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd);
DPRINTM(DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer);
#endif // DBG
@@ -259,7 +259,7 @@
{
}
-#ifdef DBG
+#if DBG
VOID DumpMemoryAllocMap(VOID)
{
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -143,7 +143,7 @@
if (!*SourcePath)
SourcePath = "\\";
-#ifdef DBG
+#if DBG
/* Get load options */
if (InfFindFirstLine (InfHandle,
"SetupData",
Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -20,7 +20,7 @@
#include <freeldr.h>
-#ifdef DBG
+#if DBG
VOID FASTCALL
CHECK_PAGED_CODE_RTL(char *file, int line)
{
Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -614,7 +614,7 @@
DPRINTM(DPRINT_WINDOWS, "Memory Descriptor List prepared, printing PDE\n");
List_PaToVa(&LoaderBlock->MemoryDescriptorListHead);
-#ifdef DBG
+#if DBG
{
ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000;
int j;
Modified: trunk/reactos/dll/ntdll/include/ntdllp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h…
==============================================================================
--- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -28,7 +28,7 @@
ULONG ul_reason_for_call,
LPVOID lpReserved);
-#if defined(KDBG) || defined(DBG)
+#if defined(KDBG) || DBG
VOID
LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule);
#endif
Modified: trunk/reactos/dll/ntdll/ldr/startup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -427,7 +427,7 @@
InsertTailList(&Peb->Ldr->InInitializationOrderModuleList,
&NtModule->InInitializationOrderModuleList);
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
LdrpLoadUserModuleSymbols(NtModule);
@@ -475,7 +475,7 @@
LdrpInitLoader();
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
LdrpLoadUserModuleSymbols(ExeModule);
Modified: trunk/reactos/dll/ntdll/ldr/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -69,7 +69,7 @@
/* FUNCTIONS *****************************************************************/
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
VOID
LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule)
@@ -2274,7 +2274,7 @@
DPRINT1("LdrFixupImports failed for %wZ, status=%x\n",
&(*Module)->BaseDllName, Status);
return Status;
}
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
LdrpLoadUserModuleSymbols(*Module);
#endif /* DBG || KDBG */
RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);
Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re…
==============================================================================
--- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -162,7 +162,7 @@
}
-#ifdef DBG
+#if DBG
VOID FASTCALL
CHECK_PAGED_CODE_RTL(char *file, int line)
{
Modified: trunk/reactos/dll/win32/iprtprio/iprtprio.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iprtprio/iprtpri…
==============================================================================
--- trunk/reactos/dll/win32/iprtprio/iprtprio.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/iprtprio/iprtprio.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -26,7 +26,7 @@
#define EXPORT CALLBACK
#endif
-#ifdef DBG
+#if DBG
/* See debug.h for debug/trace constants */
DWORD DebugTraceLevel = MAX_TRACE;
#endif /* DBG */
Modified: trunk/reactos/dll/win32/msafd/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/include/de…
==============================================================================
--- trunk/reactos/dll/win32/msafd/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msafd/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -22,7 +22,7 @@
#undef ASSERT
#endif
-#ifdef DBG
+#if DBG
extern DWORD DebugTraceLevel;
Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma…
==============================================================================
--- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -14,7 +14,7 @@
#include <debug.h>
-#ifdef DBG
+#if DBG
//DWORD DebugTraceLevel = DEBUG_ULTRA;
DWORD DebugTraceLevel = 0;
#endif /* DBG */
Modified: trunk/reactos/dll/win32/snmpapi/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/debug.h?…
==============================================================================
--- trunk/reactos/dll/win32/snmpapi/debug.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/snmpapi/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -19,7 +19,7 @@
ULONG DbgPrint(PCH Format,...);
-#ifdef DBG
+#if DBG
extern DWORD DebugTraceLevel;
Modified: trunk/reactos/dll/win32/snmpapi/snmpapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/snmpapi.…
==============================================================================
--- trunk/reactos/dll/win32/snmpapi/snmpapi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/snmpapi/snmpapi.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -26,7 +26,7 @@
#endif
-#ifdef DBG
+#if DBG
/* See debug.h for debug/trace constants */
DWORD DebugTraceLevel = MAX_TRACE;
Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/d…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -22,7 +22,7 @@
#undef ASSERT
#endif
-#ifdef DBG
+#if DBG
extern DWORD DebugTraceLevel;
Modified: trunk/reactos/dll/win32/ws2_32/misc/catalog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/cata…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/catalog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/catalog.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -32,7 +32,7 @@
{
WS_DbgPrint(MAX_TRACE, ("Provider (0x%X).\n", Provider));
-#ifdef DBG
+#if DBG
if (Provider->ReferenceCount <= 0)
{
WS_DbgPrint(MIN_TRACE, ("Provider at 0x%X has invalid reference count
(%ld).\n",
Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -14,7 +14,7 @@
#include <handle.h>
#include <upcall.h>
-#ifdef DBG
+#if DBG
/* See debug.h for debug/trace constants */
//DWORD DebugTraceLevel = MIN_TRACE;
@@ -657,7 +657,7 @@
if ( addr )
{
-#ifdef DBG
+#if DBG
LPSOCKADDR_IN sa = (LPSOCKADDR_IN)addr;
WS_DbgPrint(MAX_TRACE,("Returned address: %d %s:%d (len %d)\n",
sa->sin_family,
Modified: trunk/reactos/dll/win32/ws2help/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/debug.h?…
==============================================================================
--- trunk/reactos/dll/win32/ws2help/debug.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2help/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -21,7 +21,7 @@
#undef ASSERT
#endif
-#ifdef DBG
+#if DBG
extern DWORD DebugTraceLevel;
Modified: trunk/reactos/dll/win32/ws2help/ws2help.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.…
==============================================================================
--- trunk/reactos/dll/win32/ws2help/ws2help.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2help/ws2help.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -10,7 +10,7 @@
#include "ws2help.h"
#include <debug.h>
-#ifdef DBG
+#if DBG
/* See debug.h for debug/trace constants */
DWORD DebugTraceLevel = MAX_TRACE;
Modified: trunk/reactos/dll/win32/wshirda/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/debug.h?…
==============================================================================
--- trunk/reactos/dll/win32/wshirda/debug.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wshirda/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -17,7 +17,7 @@
#define DEBUG_ULTRA 0xFFFFFFFF
-#ifdef DBG
+#if DBG
extern DWORD DebugTraceLevel;
Modified: trunk/reactos/dll/win32/wshirda/wshirda.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/wshirda.…
==============================================================================
--- trunk/reactos/dll/win32/wshirda/wshirda.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wshirda/wshirda.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -11,7 +11,7 @@
#include <debug.h>
-#ifdef DBG
+#if DBG
/* See debug.h for debug/trace constants */
DWORD DebugTraceLevel = MAX_TRACE;
Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -267,7 +267,7 @@
PDEVICE_OBJECT DeviceObject,
PFILE_DISPOSITION_INFORMATION DispositionInfo)
{
-#ifdef DBG
+#if DBG
PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension;
#endif
Modified: trunk/reactos/drivers/input/i8042prt/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/reg…
==============================================================================
--- trunk/reactos/drivers/input/i8042prt/registry.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/i8042prt/registry.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -42,7 +42,7 @@
/* Default value for CrashOnCtrlScroll depends if we're
* running a debug build or a normal build.
*/
-#ifdef DBG
+#if DBG
DefaultCrashOnCtrlScroll = 1;
#else
DefaultCrashOnCtrlScroll = 0;
Modified: trunk/reactos/drivers/network/afd/afd/lock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -264,7 +264,7 @@
}
VOID SocketStateUnlock( PAFD_FCB FCB ) {
-#ifdef DBG
+#if DBG
PVOID CurrentThread = KeGetCurrentThread();
#endif
ASSERT(FCB->LockCount > 0);
Modified: trunk/reactos/drivers/network/afd/afd/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -17,7 +17,7 @@
#include "tdiconn.h"
#include "debug.h"
-#ifdef DBG
+#if DBG
/* See debug.h for debug/trace constants */
//DWORD DebugTraceLevel = DEBUG_ULTRA;
@@ -349,7 +349,7 @@
{
PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
NTSTATUS Status = STATUS_SUCCESS;
-#ifdef DBG
+#if DBG
PFILE_OBJECT FileObject = IrpSp->FileObject;
#endif
Modified: trunk/reactos/drivers/network/afd/afd/tdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -13,7 +13,7 @@
#include "tdiconn.h"
#include "tdi_proto.h"
-#ifdef DBG
+#if DBG
#if 0
static VOID DisplayBuffer(
PVOID Buffer,
Modified: trunk/reactos/drivers/network/afd/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ…
==============================================================================
--- trunk/reactos/drivers/network/afd/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -19,7 +19,7 @@
#define DEBUG_IRP 0x00000200
#define DEBUG_ULTRA 0xFFFFFFFF
-#ifdef DBG
+#if DBG
extern DWORD DebugTraceLevel;
Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/…
==============================================================================
--- trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] Wed Jun 17
16:44:05 2009
@@ -18,7 +18,7 @@
#define DEBUG_MEMORY 0x00000100
#define DEBUG_ULTRA 0xFFFFFFFF
-#ifdef DBG
+#if DBG
extern ULONG DebugTraceLevel;
Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/…
==============================================================================
--- trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/ne2000/ne2000/8390.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -479,7 +479,7 @@
NdisStallExecution(500);
}
-#ifdef DBG
+#if DBG
if (i == 4)
NDIS_DbgPrint(MIN_TRACE, ("NIC was not reset after 2ms.\n"));
#endif
@@ -686,7 +686,7 @@
NdisStallExecution(4);
}
-#ifdef DBG
+#if DBG
if (Count == 0xFFFF)
NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
#endif
@@ -741,7 +741,7 @@
NdisStallExecution(4);
}
-#ifdef DBG
+#if DBG
if (Count == 0xFFFF)
NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
#endif
@@ -778,7 +778,7 @@
NdisStallExecution(4);
}
-#ifdef DBG
+#if DBG
if (Count == 0xFFFF)
NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
#endif
@@ -1184,7 +1184,7 @@
NdisStallExecution(500);
}
-#ifdef DBG
+#if DBG
if (i == 4)
NDIS_DbgPrint(MIN_TRACE, ("NIC was not reset after 2ms.\n"));
#endif
Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/…
==============================================================================
--- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -19,7 +19,7 @@
PUNICODE_STRING RegistryPath);
-#ifdef DBG
+#if DBG
/* See debug.h for debug/trace constants */
ULONG DebugTraceLevel = 0;
Modified: trunk/reactos/drivers/network/lan/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/includ…
==============================================================================
--- trunk/reactos/drivers/network/lan/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/lan/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -33,7 +33,7 @@
#define DEBUG_CPOINT 0x00800000
#define DEBUG_ULTRA 0xFFFFFFFF
-#ifdef DBG
+#if DBG
extern DWORD DebugTraceLevel;
Modified: trunk/reactos/drivers/network/ndis/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu…
==============================================================================
--- trunk/reactos/drivers/network/ndis/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -19,7 +19,7 @@
#define DEBUG_PACKET 0x00000800
#define DEBUG_ULTRA 0xFFFFFFFF
-#ifdef DBG
+#if DBG
extern ULONG DebugTraceLevel;
Modified: trunk/reactos/drivers/network/ndis/include/miniport.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu…
==============================================================================
--- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -108,7 +108,7 @@
extern KSPIN_LOCK AdapterListLock;
-#ifdef DBG
+#if DBG
VOID
MiniDisplayPacket(
PNDIS_PACKET Packet);
Modified: trunk/reactos/drivers/network/ndis/ndis/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -14,7 +14,7 @@
#include "ndissys.h"
-#ifdef DBG
+#if DBG
/* See debug.h for debug/trace constants */
ULONG DebugTraceLevel = MIN_TRACE;
Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -62,7 +62,7 @@
MiniDisplayPacket(
PNDIS_PACKET Packet)
{
-#ifdef DBG
+#if DBG
ULONG i, Length;
UCHAR Buffer[64];
if ((DebugTraceLevel & DEBUG_PACKET) > 0) {
@@ -92,7 +92,7 @@
PVOID LookaheadBuffer,
UINT LookaheadBufferSize)
{
-#ifdef DBG
+#if DBG
if ((DebugTraceLevel & DEBUG_PACKET) > 0) {
ULONG i, Length;
PUCHAR p;
@@ -520,7 +520,7 @@
NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n"));
-#ifdef DBG
+#if DBG
if(!Adapter)
{
NDIS_DbgPrint(MID_TRACE, ("Adapter object was null\n"));
@@ -1586,7 +1586,7 @@
return NdisStatus;
}
-#ifdef DBG
+#if DBG
{
/* 802.3 only */
Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -247,7 +247,7 @@
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
-#ifdef DBG
+#if DBG
MiniDisplayPacket(Packet);
#endif
Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -649,7 +649,7 @@
EHeader->EType = ETYPE_IPv6;
break;
default:
-#ifdef DBG
+#if DBG
/* Should not happen */
TI_DbgPrint(MIN_TRACE, ("Unknown LAN protocol.\n"));
Modified: trunk/reactos/drivers/network/tcpip/include/address.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -20,7 +20,7 @@
(IPAddress)->Address.IPv4Address = (RawAddress); \
}
-#ifdef DBG
+#if DBG
PCHAR A2S(
PIP_ADDRESS Address);
Modified: trunk/reactos/drivers/network/tcpip/include/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/debug.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/debug.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -33,7 +33,7 @@
#define DEBUG_INFO 0x02000000
#define DEBUG_ULTRA 0x7FFFFFFF
-#ifdef DBG
+#if DBG
#define REMOVE_PARENS(...) __VA_ARGS__
#define TI_DbgPrint(_t_, _x_) \
Modified: trunk/reactos/drivers/network/tcpip/include/memtrack.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/memtrack.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/memtrack.h [iso-8859-1] Wed Jun 17
16:44:05 2009
@@ -15,7 +15,7 @@
#define AllocatePacketWithBuffer(x,y,z)
AllocatePacketWithBufferX(x,y,z,__FILE__,__LINE__)
#define FreeNdisPacket(x) FreeNdisPacketX(x,__FILE__,__LINE__)
-#ifdef DBG
+#if DBG
#define MTMARK() TrackDumpFL(__FILE__, __LINE__)
#define exAllocatePool(x,y) ExAllocatePoolX(x,y,__FILE__,__LINE__)
#define exAllocatePoolWithTag(x,y,z) ExAllocatePoolX(x,y,__FILE__,__LINE__)
Modified: trunk/reactos/drivers/network/tcpip/include/routines.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/routines.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/routines.h [iso-8859-1] Wed Jun 17
16:44:05 2009
@@ -58,7 +58,7 @@
PCHAR *DataOut,
PUINT Size );
-#ifdef DBG
+#if DBG
VOID DisplayIPPacket(
PIP_PACKET IPPacket);
#define DISPLAY_IP_PACKET(x) DisplayIPPacket(x)
Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -8,7 +8,7 @@
#define __TITYPES_H
-#ifdef DBG
+#if DBG
#define DEFINE_TAG ULONG Tag;
#define INIT_TAG(_Object, _Tag) \
Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -164,7 +164,7 @@
Irp->IoStatus.Status = STATUS_CANCELLED;
Irp->IoStatus.Information = 0;
-#ifdef DBG
+#if DBG
if (!Irp->Cancel)
TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be
TRUE.\n"));
#endif
@@ -243,7 +243,7 @@
TI_DbgPrint(DEBUG_IRP, ("IRP at (0x%X).\n", Irp));
-#ifdef DBG
+#if DBG
if (!Irp->Cancel)
TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be
TRUE.\n"));
#endif
Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -622,7 +622,7 @@
* DriverObject = Pointer to driver object created by the system
*/
{
-#ifdef DBG
+#if DBG
KIRQL OldIrql;
TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql);
Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro…
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -126,7 +126,7 @@
UCHAR MediaChangeCountDown;
-#ifdef DBG
+#if DBG
//
// Second timer to keep track of how long the media change IRP has been
// in use. If this value exceeds the timeout (#defined) then we should
@@ -176,7 +176,7 @@
#define CDROM_SRB_LIST_SIZE 4
-#ifdef DBG
+#if DBG
//
// Used to detect the loss of the autorun irp. The driver prints out a message
@@ -984,7 +984,7 @@
deviceExtension->MediaChangeNoMedia = TRUE;
cddata->MediaChangeIrp = NULL;
-#ifdef DBG
+#if DBG
cddata->MediaChangeIrpTimeInUse = 0;
cddata->MediaChangeIrpLost = FALSE;
#endif
@@ -5746,7 +5746,7 @@
cddata->MediaChangeCountDown--;
-#ifdef DBG
+#if DBG
cddata->MediaChangeIrpTimeInUse = 0;
cddata->MediaChangeIrpLost = FALSE;
#endif
@@ -5833,7 +5833,7 @@
}
} else {
-#ifdef DBG
+#if DBG
if(cddata->MediaChangeIrpLost == FALSE) {
if(cddata->MediaChangeIrpTimeInUse++ >
MEDIA_CHANGE_TIMEOUT_TIME) {
Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -3077,7 +3077,7 @@
goto ReturnCallback;
}
-#ifdef DBG
+#if DBG
if (!IS_RDP((srb->Cdb[0]))) {
KdPrint2((PRINT_PREFIX "AtapiCallBack: Invalid CDB marked as RDP -
%#x\n", srb->Cdb[0]));
}
Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd…
==============================================================================
--- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -6060,7 +6060,7 @@
PEHCI_DEV ehci;
ULONG status;
-#ifdef DBG
+#if DBG
ULONG urb_count;
#endif
PLIST_ENTRY pthis, pnext;
@@ -6116,7 +6116,7 @@
door_bell_rings = ((status & STS_IAA) != 0);
// scan to remove those due
-#ifdef DBG
+#if DBG
urb_count = dbg_count_list(&ehci->urb_list);
ehci_dbg_print(DBGLVL_MAXIMUM, ("ehci_isr(): urb# in process is %d\n",
urb_count));
#endif
Modified: trunk/reactos/include/ddk/mcd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mcd.h?rev=4143…
==============================================================================
--- trunk/reactos/include/ddk/mcd.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/mcd.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -41,7 +41,7 @@
#undef DebugPrint
#endif
-#ifdef DBG
+#if DBG
#define DebugPrint(x) ChangerClassDebugPrint x
#else
#define DebugPrint(x)
Modified: trunk/reactos/include/ddk/srb.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4143…
==============================================================================
--- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -33,7 +33,7 @@
#define SCSIPORTAPI DECLSPEC_IMPORT
#endif
-#ifdef DBG
+#if DBG
#define DebugPrint(x) ScsiDebugPrint x
#else
#define DebugPrint(x)
@@ -56,7 +56,7 @@
#define MAXIMUM_CDB_SIZE 12
-#ifdef DBG
+#if DBG
#define SCSI_PORT_SIGNATURE 0x54524f50
#endif
Modified: trunk/reactos/include/ddk/storport.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev…
==============================================================================
--- trunk/reactos/include/ddk/storport.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/storport.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -404,7 +404,7 @@
IN PSTOR_SYNCHRONIZED_ACCESS SynchronizedAccessRoutine,
IN PVOID Context);
-#ifdef DBG
+#if DBG
#define DebugPrint(x) StorPortDebugPrint x
#else
#define DebugPrint(x)
Modified: trunk/reactos/include/ddk/video.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=41…
==============================================================================
--- trunk/reactos/include/ddk/video.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/video.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -86,7 +86,7 @@
#undef PAGED_CODE
#endif
-#ifdef DBG
+#if DBG
#define PAGED_CODE() \
if (VideoPortGetCurrentIrql() > 1 /* APC_LEVEL */) \
@@ -1540,7 +1540,7 @@
IN PVOID Destination,
IN ULONG Length);
-#ifdef DBG
+#if DBG
#define VideoDebugPrint(x) VideoPortDebugPrint x
#else
#define VideoDebugPrint(x)
Modified: trunk/reactos/include/ddk/winddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4…
==============================================================================
--- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -4256,7 +4256,7 @@
typedef struct _IO_REMOVE_LOCK {
IO_REMOVE_LOCK_COMMON_BLOCK Common;
-#ifdef DBG
+#if DBG
IO_REMOVE_LOCK_DBG_BLOCK Dbg;
#endif
} IO_REMOVE_LOCK, *PIO_REMOVE_LOCK;
@@ -5753,7 +5753,7 @@
#define ROUND_TO_PAGES(Size) \
((ULONG_PTR) (((ULONG_PTR) Size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)))
-#ifdef DBG
+#if DBG
#define ASSERT(exp) \
(VOID)((!(exp)) ? \
@@ -6273,7 +6273,7 @@
#define ExReleaseResourceForThread ExReleaseResourceForThreadLite
-#ifdef DBG
+#if DBG
#define PAGED_CODE() { \
if (KeGetCurrentIrql() > APC_LEVEL) { \
@@ -10267,7 +10267,7 @@
IN ULONG Level,
IN BOOLEAN State);
-#ifdef DBG
+#if DBG
#define KdPrint(_x_) DbgPrint _x_
#define KdPrintEx(_x_) DbgPrintEx _x_
Modified: trunk/reactos/include/reactos/debug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re…
==============================================================================
--- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -78,7 +78,7 @@
/* Print stuff only on Debug Builds*/
#define DPFLTR_DEFAULT_ID -1
-#ifdef DBG
+#if DBG
/* These are always printed */
#define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint
Modified: trunk/reactos/lib/drivers/ip/network/ip.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.…
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -179,7 +179,7 @@
TI_DbgPrint(DEBUG_IP, ("Called. BindInfo (0x%X).\n", BindInfo));
-#ifdef DBG
+#if DBG
if (BindInfo->Address) {
PUCHAR A = BindInfo->Address;
TI_DbgPrint(DEBUG_IP, ("Interface address (%02X %02X %02X %02X %02X
%02X).\n",
Modified: trunk/reactos/lib/drivers/ip/network/memtrack.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/mem…
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -2,7 +2,7 @@
#include "precomp.h"
-#ifdef DBG
+#if DBG
#define TRACK_TAG TAG('T','r','C','K')
static LIST_ENTRY AllocatedObjectsList;
Modified: trunk/reactos/lib/drivers/ip/network/routines.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou…
==============================================================================
--- trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -26,7 +26,7 @@
return RandomNumber;
}
-#ifdef DBG
+#if DBG
static VOID DisplayIPHeader(
PCHAR Header,
UINT Length)
@@ -131,7 +131,7 @@
VOID DisplayIPPacket(
PIP_PACKET IPPacket)
{
-#ifdef DBG
+#if DBG
PCHAR p;
UINT Length;
PNDIS_BUFFER Buffer;
Modified: trunk/reactos/lib/drivers/oskittcp/include/memtrack.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/memtrack.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/include/memtrack.h [iso-8859-1] Wed Jun 17 16:44:05
2009
@@ -8,7 +8,7 @@
#define FBSD_MALLOC FOURCC('d','s','b','f')
#define EXALLOC_TAG FOURCC('E','x','A','l')
-#ifdef DBG
+#if DBG
#define MTMARK() TrackDumpFL(__FILE__, __LINE__)
#define NdisAllocateBuffer(x,y,z,a,b) { \
NdisAllocateBuffer(x,y,z,a,b); \
Modified: trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/include/oskitdebug.h [iso-8859-1] Wed Jun 17
16:44:05 2009
@@ -35,7 +35,7 @@
#include <oskittypes.h>
-#ifdef DBG
+#if DBG
extern OSK_UINT OskitDebugTraceLevel;
Modified: trunk/reactos/lib/rtl/handle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/handle.c?rev=41436…
==============================================================================
--- trunk/reactos/lib/rtl/handle.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/handle.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -125,7 +125,7 @@
RtlFreeHandle(PRTL_HANDLE_TABLE HandleTable,
PRTL_HANDLE_TABLE_ENTRY Handle)
{
-#ifdef DBG
+#if DBG
/* check if handle is valid */
if (!RtlIsValidHandle(HandleTable, Handle))
{
Modified: trunk/reactos/lib/rtl/rtlp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=41436&a…
==============================================================================
--- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -9,7 +9,7 @@
/* INCLUDES ******************************************************************/
/* PAGED_CODE equivalent for user-mode RTL */
-#ifdef DBG
+#if DBG
extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line);
#define PAGED_CODE_RTL() CHECK_PAGED_CODE_RTL(__FILE__, __LINE__)
#else
Modified: trunk/reactos/ntoskrnl/cc/view.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=414…
==============================================================================
--- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -79,7 +79,7 @@
#error Unknown compiler for alloca intrinsic stack allocation "function"
#endif
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line
)
{
++cs->ReferenceCount;
@@ -117,7 +117,7 @@
PBCB Bcb,
BOOLEAN Trace )
{
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
KIRQL oldirql;
PLIST_ENTRY current_entry;
PCACHE_SEGMENT current;
@@ -596,7 +596,7 @@
current->PageOut = FALSE;
current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize);
current->Bcb = Bcb;
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
if ( Bcb->Trace )
{
DPRINT1("CacheMap 0x%p: new Cache Segment: 0x%p\n", Bcb, current );
@@ -628,7 +628,7 @@
{
CcRosCacheSegmentIncRefCount(current);
KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
if ( Bcb->Trace )
{
DPRINT1("CacheMap 0x%p: deleting newly created Cache Segment 0x%p ( found existing
one 0x%p )\n",
@@ -881,7 +881,7 @@
KIRQL oldIrql;
#endif
DPRINT("Freeing cache segment 0x%p\n", CacheSeg);
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
if ( CacheSeg->Bcb->Trace )
{
DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb,
CacheSeg );
@@ -1081,7 +1081,7 @@
}
InsertHeadList(&FreeList, ¤t->BcbSegmentListEntry);
}
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
Bcb->Trace = FALSE;
#endif
KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -461,7 +461,7 @@
/*ULONG
*NTAPI
- *ExInterlockedExchangeUlong(IN PULONG Taget,
+ *ExInterlockedExchangeUlong(IN PULONG Target,
* IN ULONG Value,
* IN PKSPIN_LOCK Lock)
*/
@@ -529,7 +529,7 @@
/*ULONG
*NTAPI
- *Exi386InterlockedExchangeUlong(IN PULONG Taget,
+ *Exi386InterlockedExchangeUlong(IN PULONG Target,
* IN ULONG Value,
* IN PKSPIN_LOCK Lock)
*/
Modified: trunk/reactos/ntoskrnl/ex/pushlock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/pushlock.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/pushlock.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -182,7 +182,7 @@
/* Sanity check */
ASSERT(!WaitBlock->Signaled);
-#ifdef DBG
+#if DBG
/* We are about to get signaled */
WaitBlock->Signaled = TRUE;
#endif
Modified: trunk/reactos/ntoskrnl/ex/resource.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -18,7 +18,7 @@
#define IsOwnedExclusive(r) (r->Flag & ResourceOwnedExclusive)
#define IsBoostAllowed(r) (!(r->Flag & ResourceHasDisabledPriorityBoost))
-#if (!(defined(CONFIG_SMP)) && !(defined(DBG)))
+#if (!(defined(CONFIG_SMP)) && !(DBG))
FORCEINLINE
VOID
Modified: trunk/reactos/ntoskrnl/include/config.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/config.h?…
==============================================================================
--- trunk/reactos/ntoskrnl/include/config.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/config.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -16,7 +16,7 @@
/********** mm/ppool.c **********/
/* Disable Debugging Features */
-#ifndef DBG
+#if !DBG
/* Enable strict checking of the nonpaged pool on every allocation */
#undef ENABLE_VALIDATE_POOL
Modified: trunk/reactos/ntoskrnl/include/internal/cc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -116,7 +116,7 @@
PVOID LazyWriteContext;
KSPIN_LOCK BcbLock;
ULONG RefCount;
-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)
BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */
#endif
} BCB, *PBCB;
Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Wed Jun 17
16:44:05 2009
@@ -997,7 +997,7 @@
// @remark
//
.macro TRAP_EPILOG SystemCall, RestorePreviousMode, RestoreSegments, RestoreVolatiles,
RestoreAllRegs
-#ifdef DBG
+#if DBG
/* Assert the flags */
pushfd
pop edx
@@ -1011,7 +1011,7 @@
/* Assert the trap frame */
#endif
5:
-#ifdef DBG
+#if DBG
sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00
jnz 0f
@@ -1033,7 +1033,7 @@
/* Get exception list */
mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST]
-#ifdef DBG
+#if DBG
/* Assert the saved exception list */
or edx, edx
jnz 1f
@@ -1048,7 +1048,7 @@
/* Get previous mode */
mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE]
-#ifdef DBG
+#if DBG
/* Assert the saved previous mode */
cmp ecx, -1
jnz 1f
@@ -1061,7 +1061,7 @@
mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl
.else
-#ifdef DBG
+#if DBG
/* Assert the saved previous mode */
mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE]
cmp ecx, -1
@@ -1304,7 +1304,7 @@
.endif
.endm
-#ifdef DBG
+#if DBG
.macro VERIFY_INT Label
/* Get the current time and mask it to 192 ticks */
Modified: trunk/reactos/ntoskrnl/include/internal/kd.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -66,7 +66,7 @@
/* SYMBOL ROUTINES **********************************************************/
#ifdef __NTOSKRNL__
-#if defined(KDBG) || defined(DBG)
+#if defined(KDBG) || DBG
VOID
KdbSymLoadUserModuleSymbols(IN PLDR_DATA_TABLE_ENTRY LdrModule);
@@ -128,7 +128,7 @@
# define KDB_CREATE_THREAD_HOOK(CONTEXT) do { } while (0)
#endif
-#if defined(KDBG) || defined(DBG)
+#if defined(KDBG) || DBG
# define KeRosPrintAddress(ADDRESS) KdbSymPrintAddress(ADDRESS)
#else
# define KeRosPrintAddress(ADDRESS) KiRosPrintAddress(ADDRESS)
Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -445,7 +445,7 @@
/* Value changed... wait until it's locked */
while (*(volatile KSPIN_LOCK *)SpinLock == 1)
{
-#ifdef DBG
+#if DBG
/* On debug builds, we use a much slower but useful routine */
//Kii386SpinOnSpinLock(SpinLock, 5);
@@ -459,7 +459,7 @@
}
else
{
-#ifdef DBG
+#if DBG
/* On debug builds, we OR in the KTHREAD */
*SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1;
#endif
@@ -476,7 +476,7 @@
VOID
KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock)
{
-#ifdef DBG
+#if DBG
/* Make sure that the threads match */
if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock)
{
Modified: trunk/reactos/ntoskrnl/kd/kdmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4…
==============================================================================
--- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -49,7 +49,7 @@
Result = KdpPrintString(Buffer1, Buffer1Length);
break;
-#ifdef DBG
+#if DBG
case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */
{
switch ((ULONG)Buffer1)
Modified: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_symbols.…
==============================================================================
--- trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -694,7 +694,7 @@
LoadSymbols = FALSE;
-#ifdef DBG
+#if DBG
/* Load symbols only if we have 96Mb of RAM or more */
if (MmNumberOfPhysicalPages >= 0x6000)
LoadSymbols = TRUE;
Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -65,7 +65,7 @@
#ifndef CONFIG_SMP
Prcb->BuildType |= PRCB_BUILD_UNIPROCESSOR;
#endif
-#ifdef DBG
+#if DBG
Prcb->BuildType |= PRCB_BUILD_DEBUG;
#endif
Prcb->CurrentThread = InitThread;
Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -140,7 +140,7 @@
cmp dword ptr [esp+20], 0
je Return
-#ifdef DBG
+#if DBG
/* Assert Fxsr support */
test byte ptr _KeI386FxsrPresent, 1
jnz AssertOk
@@ -167,7 +167,7 @@
cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED
jnz DontSave
-#ifdef DBG
+#if DBG
/* We are the NPX Thread with an unloaded NPX State... this isn't normal! */
int 3
#endif
@@ -365,7 +365,7 @@
AfterTrace:
#ifdef CONFIG_SMP
-#ifdef DBG
+#if DBG
/* Assert that we're on the right CPU */
mov cl, [esi+KTHREAD_NEXT_PROCESSOR]
cmp cl, [ebx+KPCR_PROCESSOR_NUMBER]
@@ -419,7 +419,7 @@
lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx
/* Assert change went ok */
-#ifdef DBG
+#if DBG
test [ebp+KPROCESS_ACTIVE_PROCESSORS], ecx
jz WrongActiveCpu
test [eax+KPROCESS_ACTIVE_PROCESSORS], ecx
@@ -548,7 +548,7 @@
NewCr0:
-#ifdef DBG
+#if DBG
/* Assert NPX State */
test byte ptr [esi+KTHREAD_NPX_STATE], ~(NPX_STATE_NOT_LOADED)
jnz InvalidNpx
@@ -589,7 +589,7 @@
push ATTEMPTED_SWITCH_FROM_DPC
call _KeBugCheckEx@20
-#ifdef DBG
+#if DBG
InvalidNpx:
int 3
WrongActiveCpu:
@@ -836,7 +836,7 @@
lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx
/* Sanity check */
-#ifdef DBG
+#if DBG
test dword ptr [edx+KPROCESS_ACTIVE_PROCESSORS], 0
jz WrongCpu1
test dword ptr [eax+KPROCESS_ACTIVE_PROCESSORS], 0
@@ -871,7 +871,7 @@
/* FIXME: TODO */
int 3
-#ifdef DBG
+#if DBG
WrongCpu1:
int 3
WrongCpu2:
Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -351,7 +351,7 @@
#ifndef CONFIG_SMP
Pcr->PrcbData.BuildType |= PRCB_BUILD_UNIPROCESSOR;
#endif
-#ifdef DBG
+#if DBG
Pcr->PrcbData.BuildType |= PRCB_BUILD_DEBUG;
#endif
Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -98,7 +98,7 @@
/* At dispatch, increase DPC time */
inc dword ptr [eax+KPCR_PRCB_DPC_TIME]
-#ifdef DBG
+#if DBG
/* Update the DPC time */
inc dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME]
Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -200,7 +200,7 @@
/* Increase total syscall count */
inc dword ptr PCR[KPCR_SYSTEM_CALLS]
-#ifdef DBG
+#if DBG
/* Increase per-syscall count */
mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT]
jecxz NoCountTable
@@ -239,7 +239,7 @@
call ebx
AfterSysCall:
-#ifdef DBG
+#if DBG
/* Make sure the user-mode call didn't return at elevated IRQL */
test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK
jz SkipCheck
@@ -377,7 +377,7 @@
push 0
jmp _KiTrap6
-#ifdef DBG
+#if DBG
InvalidIrql:
/* Save current IRQL */
push PCR[KPCR_IRQL]
Modified: trunk/reactos/ntoskrnl/ke/spinlock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -189,7 +189,7 @@
return FALSE;
}
-#ifdef DBG
+#if DBG
/* On debug builds, we OR in the KTHREAD */
*SpinLock = (ULONG_PTR)KeGetCurrentThread() | 1;
#endif
Modified: trunk/reactos/ntoskrnl/mm/rmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=414…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -24,7 +24,7 @@
struct _MM_RMAP_ENTRY* Next;
PEPROCESS Process;
PVOID Address;
-#ifdef DBG
+#if DBG
PVOID Caller;
#endif
}
@@ -396,7 +396,7 @@
}
new_entry->Address = Address;
new_entry->Process = (PEPROCESS)Process;
-#ifdef DBG
+#if DBG
#ifdef __GNUC__
new_entry->Caller = __builtin_return_address(0);
#else
@@ -416,7 +416,7 @@
ExAcquireFastMutex(&RmapListLock);
current_entry = MmGetRmapListHeadPage(Page);
new_entry->Next = current_entry;
-#ifdef DBG
+#if DBG
while (current_entry)
{
if (current_entry->Address == new_entry->Address &&
current_entry->Process == new_entry->Process)
Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rpoolmgr.h?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/rpoolmgr.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -249,7 +249,7 @@
ASSERT ( pool->FirstFree == Item );
pool->FirstFree = Item->NextFree;
}
-#ifdef DBG
+#if DBG
Item->NextFree = Item->PrevFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF;
#endif//DBG
}
@@ -290,7 +290,7 @@
#endif//R_FREEMAGIC
block->Status = 0;
RFreeFillStack ( block );
-#ifdef DBG
+#if DBG
block->PrevFree = block->NextFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF;
#endif//DBG
return block;
@@ -655,7 +655,7 @@
//ASSERT_SIZE ( Block->Size );
// now add the block to the used block list
-#ifdef DBG
+#if DBG
Block->NextUsed = (PR_USED)(ULONG_PTR)0xDEADBEEF;
#endif//R_USED_LIST
@@ -673,7 +673,7 @@
Block->UserSize = UserSize;
memset ( Addr - R_RZ, R_RZ_LOVALUE, R_RZ );
memset ( Addr + Block->UserSize, R_RZ_HIVALUE, R_RZ );
-#ifdef DBG
+#if DBG
memset ( Addr, 0xCD, UserSize );
#endif//DBG
}
Modified: trunk/reactos/ntoskrnl/ps/debug.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=41…
==============================================================================
--- trunk/reactos/ntoskrnl/ps/debug.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ps/debug.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -15,7 +15,7 @@
/* PRIVATE FUNCTIONS *********************************************************/
-#ifdef DBG
+#if DBG
VOID
NTAPI
PspDumpThreads(BOOLEAN IncludeSystem)
Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -159,7 +159,7 @@
return STATUS_SUCCESS;
}
-#ifdef DBG
+#if DBG
VOID FASTCALL
CHECK_PAGED_CODE_RTL(char *file, int line)
{
Modified: trunk/reactos/tools/cabman/cabinet.cxx
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r…
==============================================================================
--- trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] (original)
+++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -64,7 +64,7 @@
#ifndef CAB_READ_ONLY
#if 0
-#ifdef DBG
+#if DBG
void DumpBuffer(void* Buffer, ULONG Size)
{
Modified: trunk/reactos/tools/cabman/cabinet.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev…
==============================================================================
--- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original)
+++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -48,8 +48,6 @@
/* Debugging */
-#define DBG
-
#define NORMAL_MASK 0x000000FF
#define SPECIAL_MASK 0xFFFFFF00
#define MIN_TRACE 0x00000001
@@ -58,7 +56,7 @@
#define DEBUG_MEMORY 0x00000100
-#ifdef DBG
+#if DBG
extern ULONG DebugTraceLevel;
Modified: trunk/reactos/tools/cabman/main.cxx
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=…
==============================================================================
--- trunk/reactos/tools/cabman/main.cxx [iso-8859-1] (original)
+++ trunk/reactos/tools/cabman/main.cxx [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -17,7 +17,7 @@
#include "cabman.h"
-#ifdef DBG
+#if DBG
ULONG DebugTraceLevel = MIN_TRACE;
//ULONG DebugTraceLevel = MID_TRACE;
Modified: trunk/reactos/tools/hpp/hpp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=41436&…
==============================================================================
--- trunk/reactos/tools/hpp/hpp.c [iso-8859-1] (original)
+++ trunk/reactos/tools/hpp/hpp.c [iso-8859-1] Wed Jun 17 16:44:05 2009
@@ -12,7 +12,7 @@
#include <string.h>
#include <ctype.h>
-#ifdef DBG
+#if DBG
#define trace printf
#else
#define trace if (0) printf
5630
days inactive
5630
days old
0 comments
1 participants
participants (1)
-
sginsberg＠svn.reactos.org