- In Win32 DBG is defined to 0 for a non-debug build and to 1 for a debug build....

- Fix this by defining DBG on non-debug build too and deprecate all usage of #ifdef DBG.

svn path=/trunk/; revision=41436

diff --git a/reactos/ReactOS-arm.rbuild b/reactos/ReactOS-arm.rbuild
index ae22843..7172dd3 100644 (file)
--- a/reactos/ReactOS-arm.rbuild
+++ b/reactos/ReactOS-arm.rbuild
@@ -19,6 +19,10 @@
                <define name="_SEH_ENABLE_TRACE" />
                <property name="DBG_OR_KDBG" value="true" />
        </if>
                <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" />
        <if property="KDBG" value="1">
                <define name="KDBG">1</define>
                <property name="DBG_OR_KDBG" value="true" />

diff --git a/reactos/ReactOS-generic.rbuild b/reactos/ReactOS-generic.rbuild
index bc848d6..46584a2 100644 (file)
--- a/reactos/ReactOS-generic.rbuild
+++ b/reactos/ReactOS-generic.rbuild
@@ -11,6 +11,10 @@
                <define name="_SEH_ENABLE_TRACE" />
                <property name="DBG_OR_KDBG" value="true" />
        </if>
                <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" />
        <if property="KDBG" value="1">
                <define name="KDBG">1</define>
                <property name="DBG_OR_KDBG" value="true" />

diff --git a/reactos/base/services/dhcp/include/debug.h b/reactos/base/services/dhcp/include/debug.h
index 5ee3e5e..369b8ee 100644 (file)
--- a/reactos/base/services/dhcp/include/debug.h
+++ b/reactos/base/services/dhcp/include/debug.h
@@ -18,7 +18,7 @@
 #define DEBUG_ADAPTER  0x00000100
 #define DEBUG_ULTRA    0xFFFFFFFF
 
 #define DEBUG_ADAPTER  0x00000100
 #define DEBUG_ULTRA    0xFFFFFFFF
 

-#ifdef DBG
+#if DBG

 
 extern unsigned long debug_trace_level;
 
 
 extern unsigned long debug_trace_level;
 

diff --git a/reactos/base/setup/usetup/bootsup.c b/reactos/base/setup/usetup/bootsup.c
index 2b1c227..71cb7e3 100644 (file)
--- a/reactos/base/setup/usetup/bootsup.c
+++ b/reactos/base/setup/usetup/bootsup.c
@@ -43,7 +43,7 @@ CreateCommonFreeLoaderSections(PINICACHE IniCache)
   IniSection = IniCacheAppendSection(IniCache,
                                     L"FREELOADER");
 
   IniSection = IniCacheAppendSection(IniCache,
                                     L"FREELOADER");
 

-#ifdef DBG
+#if DBG

   if (IsUnattendedSetup)
   {
     /* DefaultOS=ReactOS */
   if (IsUnattendedSetup)
   {
     /* DefaultOS=ReactOS */


@@ -64,7 +64,7 @@ CreateCommonFreeLoaderSections(PINICACHE IniCache)
                    L"ReactOS");
   }
 
                    L"ReactOS");
   }
 

-#ifdef DBG
+#if DBG

   if (IsUnattendedSetup)
 #endif
   {
   if (IsUnattendedSetup)
 #endif
   {


@@ -75,7 +75,7 @@ CreateCommonFreeLoaderSections(PINICACHE IniCache)
                    L"TimeOut",
                    L"0");
   }
                    L"TimeOut",
                    L"0");
   }

-#ifdef DBG
+#if DBG

   else
   {
     /* Timeout=0 or 10 */
   else
   {
     /* Timeout=0 or 10 */


@@ -380,7 +380,7 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
                    L"ReactOS_Debug",
                    L"\"ReactOS (Debug)\"");
 
                    L"ReactOS_Debug",
                    L"\"ReactOS (Debug)\"");
 

-#ifdef DBG
+#if DBG

   /* ReactOS_KdSerial="ReactOS (RosDbg)" */
   IniCacheInsertKey(IniSection,
                    NULL,
   /* ReactOS_KdSerial="ReactOS (RosDbg)" */
   IniCacheInsertKey(IniSection,
                    NULL,


@@ -453,7 +453,7 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
                    L"Options",
                    L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
 
                    L"Options",
                    L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
 

-#ifdef DBG
+#if DBG

 
   /* Create "ReactOS_KdSerial" section */
   IniSection = IniCacheAppendSection(IniCache,
 
   /* Create "ReactOS_KdSerial" section */
   IniSection = IniCacheAppendSection(IniCache,

diff --git a/reactos/base/system/services/services.c b/reactos/base/system/services/services.c
index ab9b3b9..44ee8f3 100644 (file)
--- a/reactos/base/system/services/services.c
+++ b/reactos/base/system/services/services.c
@@ -34,7 +34,7 @@ BOOL ScmShutdown = FALSE;
 VOID
 PrintString(LPCSTR fmt, ...)
 {
 VOID
 PrintString(LPCSTR fmt, ...)
 {

-#ifdef DBG
+#if DBG

     CHAR buffer[512];
     va_list ap;
 
     CHAR buffer[512];
     va_list ap;
 

diff --git a/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c b/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
index 4bf1d31..9081f0d 100644 (file)
--- a/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
+++ b/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c
@@ -163,7 +163,7 @@ BOOLEAN DiskGetExtendedDriveParameters(ULONG DriveNumber, PVOID Buffer, USHORT B
 
        memcpy(Buffer, Ptr, BufferSize);
 
 
        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]);
     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]);

diff --git a/reactos/boot/freeldr/freeldr/comm/rs232.c b/reactos/boot/freeldr/freeldr/comm/rs232.c
index 88aebbb..343182a 100644 (file)
--- a/reactos/boot/freeldr/freeldr/comm/rs232.c
+++ b/reactos/boot/freeldr/freeldr/comm/rs232.c
@@ -23,7 +23,7 @@
 
 /* MACROS *******************************************************************/
 
 
 /* MACROS *******************************************************************/
 

-#ifdef DBG
+#if DBG

 
 #define DEFAULT_BAUD_RATE    19200
 
 
 #define DEFAULT_BAUD_RATE    19200
 


@@ -275,11 +275,11 @@ VOID Rs232PortPutByte(UCHAR ByteToSend)
        WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend);
 }
 
        WRITE_PORT_UCHAR (SER_THR(Rs232PortBase), ByteToSend);
 }
 

-#endif /* defined DBG */
+#endif /* DBG */

 
 BOOLEAN Rs232PortInUse(ULONG Base)
 {
 
 BOOLEAN Rs232PortInUse(ULONG Base)
 {

-#ifdef DBG
+#if DBG

     return PortInitialized && Rs232PortBase == (PUCHAR)(ULONG_PTR)Base ? TRUE : FALSE;
 #else
     return FALSE;
     return PortInitialized && Rs232PortBase == (PUCHAR)(ULONG_PTR)Base ? TRUE : FALSE;
 #else
     return FALSE;

diff --git a/reactos/boot/freeldr/freeldr/debug.c b/reactos/boot/freeldr/freeldr/debug.c
index 7fcd3d9..a4b5990 100644 (file)
--- a/reactos/boot/freeldr/freeldr/debug.c
+++ b/reactos/boot/freeldr/freeldr/debug.c
@@ -21,7 +21,7 @@
 
 #include <debug.h>
 
 
 #include <debug.h>
 

-#ifdef DBG
+#if DBG

 
 //#define DEBUG_ALL
 //#define DEBUG_INIFILE
 
 //#define DEBUG_ALL
 //#define DEBUG_INIFILE


@@ -297,7 +297,7 @@ ULONG DbgPrint(PCCH Format, ...)
     return 0;
 }
 
     return 0;
 }
 

-#endif // defined DBG
+#endif // DBG

 
 ULONG
 MsgBoxPrint(const char *Format, ...)
 
 ULONG
 MsgBoxPrint(const char *Format, ...)

diff --git a/reactos/boot/freeldr/freeldr/fs/ntfs.c b/reactos/boot/freeldr/freeldr/fs/ntfs.c
index 9929b36..ecd4f67 100644 (file)
--- a/reactos/boot/freeldr/freeldr/fs/ntfs.c
+++ b/reactos/boot/freeldr/freeldr/fs/ntfs.c
@@ -427,7 +427,7 @@ static BOOLEAN NtfsReadMftRecord(ULONG MFTIndex, PNTFS_MFT_RECORD Buffer)
     return NtfsFixupRecord((PNTFS_RECORD)Buffer);
 }
 
     return NtfsFixupRecord((PNTFS_RECORD)Buffer);
 }
 

-#ifdef DBG
+#if DBG

 VOID NtfsPrintFile(PNTFS_INDEX_ENTRY IndexEntry)
 {
     PWCHAR FileName;
 VOID NtfsPrintFile(PNTFS_INDEX_ENTRY IndexEntry)
 {
     PWCHAR FileName;


@@ -455,7 +455,7 @@ static BOOLEAN NtfsCompareFileName(PCHAR FileName, PNTFS_INDEX_ENTRY IndexEntry)
     EntryFileName = IndexEntry->FileName.FileName;
     EntryFileNameLength = IndexEntry->FileName.FileNameLength;
 
     EntryFileName = IndexEntry->FileName.FileName;
     EntryFileNameLength = IndexEntry->FileName.FileNameLength;
 

-#ifdef DBG
+#if DBG

     NtfsPrintFile(IndexEntry);
 #endif
 
     NtfsPrintFile(IndexEntry);
 #endif
 

diff --git a/reactos/boot/freeldr/freeldr/include/debug.h b/reactos/boot/freeldr/freeldr/include/debug.h
index e6065fb..b12ee4e 100644 (file)
--- a/reactos/boot/freeldr/freeldr/include/debug.h
+++ b/reactos/boot/freeldr/freeldr/include/debug.h
@@ -39,7 +39,7 @@
 extern char* g_file;
 extern int g_line;
 
 extern char* g_file;
 extern int g_line;
 

-#ifdef DBG
+#if DBG

 
     VOID       DbgPrintMask(ULONG Mask, char *format, ...);
        VOID    DebugInit(VOID);
 
     VOID       DbgPrintMask(ULONG Mask, char *format, ...);
        VOID    DebugInit(VOID);


@@ -85,6 +85,6 @@ void  MEMORY_WRITE_BREAKPOINT4(unsigned long addr);
        #define BugCheck(_x_)
        #define DbgDumpBuffer(_x_, _y_, _z_)
 
        #define BugCheck(_x_)
        #define DbgDumpBuffer(_x_, _y_, _z_)
 

-#endif // defined DBG
+#endif // DBG

 
 #endif // defined __DEBUG_H
 
 #endif // defined __DEBUG_H

diff --git a/reactos/boot/freeldr/freeldr/include/mm.h b/reactos/boot/freeldr/freeldr/include/mm.h
index 9e8b8df..6f270b4 100644 (file)
--- a/reactos/boot/freeldr/freeldr/include/mm.h
+++ b/reactos/boot/freeldr/freeldr/include/mm.h
@@ -87,7 +87,7 @@ extern        ULONG           TotalPagesInLookupTable;
 extern ULONG           FreePagesInLookupTable;
 extern ULONG           LastFreePageHint;
 
 extern ULONG           FreePagesInLookupTable;
 extern ULONG           LastFreePageHint;
 

-#ifdef DBG
+#if DBG

 PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type);
 #endif
 
 PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type);
 #endif
 

diff --git a/reactos/boot/freeldr/freeldr/mm/meminit.c b/reactos/boot/freeldr/freeldr/mm/meminit.c
index 7921970..a89c192 100644 (file)
--- a/reactos/boot/freeldr/freeldr/mm/meminit.c
+++ b/reactos/boot/freeldr/freeldr/mm/meminit.c
@@ -21,7 +21,7 @@
 #include <freeldr.h>
 #include <debug.h>
 
 #include <freeldr.h>
 #include <debug.h>
 

-#ifdef DBG
+#if DBG

 typedef struct
 {
     MEMORY_TYPE Type;
 typedef struct
 {
     MEMORY_TYPE Type;


@@ -54,13 +54,13 @@ extern ULONG_PTR    MmHeapStart;
 
 BOOLEAN MmInitializeMemoryManager(VOID)
 {
 
 BOOLEAN MmInitializeMemoryManager(VOID)
 {

-#ifdef DBG
+#if DBG

        MEMORY_DESCRIPTOR* MemoryDescriptor = NULL;
 #endif
 
        DPRINTM(DPRINT_MEMORY, "Initializing Memory Manager.\n");
 
        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)
        // 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 @@ VOID MmInitializeHeap(PVOID PageLookupTable)
        DPRINTM(DPRINT_MEMORY, "Heap initialized, base 0x%08x, pages %d\n", (HeapStart << MM_PAGE_SHIFT), PagesNeeded);
 }
 
        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;
 PCSTR MmGetSystemMemoryMapTypeString(MEMORY_TYPE Type)
 {
        ULONG           Index;

diff --git a/reactos/boot/freeldr/freeldr/mm/mm.c b/reactos/boot/freeldr/freeldr/mm/mm.c
index 2f08b9c..5612b2f 100644 (file)
--- a/reactos/boot/freeldr/freeldr/mm/mm.c
+++ b/reactos/boot/freeldr/freeldr/mm/mm.c
@@ -20,7 +20,7 @@
 #include <freeldr.h>
 #include <debug.h>
 
 #include <freeldr.h>
 #include <debug.h>
 

-#ifdef DBG
+#if DBG

 VOID           DumpMemoryAllocMap(VOID);
 VOID           MemAllocTest(VOID);
 #endif // DBG
 VOID           DumpMemoryAllocMap(VOID);
 VOID           MemAllocTest(VOID);
 #endif // DBG


@@ -69,7 +69,7 @@ PVOID MmAllocateMemoryWithType(ULONG MemorySize, TYPE_OF_MEMORY MemoryType)
        FreePagesInLookupTable -= PagesNeeded;
        MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE);
 
        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
        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 @@ PVOID MmAllocateMemoryAtAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_
        FreePagesInLookupTable -= PagesNeeded;
        MemPointer = (PVOID)((ULONG_PTR)StartPageNumber * MM_PAGE_SIZE);
 
        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
        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 @@ PVOID MmAllocateHighestMemoryBelowAddress(ULONG MemorySize, PVOID DesiredAddress
        FreePagesInLookupTable -= PagesNeeded;
        MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE);
 
        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
        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 @@ VOID MmFreeMemory(PVOID MemoryPointer)
 {
 }
 
 {
 }
 

-#ifdef DBG
+#if DBG

 
 VOID DumpMemoryAllocMap(VOID)
 {
 
 VOID DumpMemoryAllocMap(VOID)
 {

diff --git a/reactos/boot/freeldr/freeldr/reactos/setupldr.c b/reactos/boot/freeldr/freeldr/reactos/setupldr.c
index f2df19b..5f6cd33 100644 (file)
--- a/reactos/boot/freeldr/freeldr/reactos/setupldr.c
+++ b/reactos/boot/freeldr/freeldr/reactos/setupldr.c
@@ -143,7 +143,7 @@ VOID LoadReactOSSetup(VOID)
   if (!*SourcePath)
     SourcePath = "\\";
 
   if (!*SourcePath)
     SourcePath = "\\";
 

-#ifdef DBG
+#if DBG

   /* Get load options */
   if (InfFindFirstLine (InfHandle,
                        "SetupData",
   /* Get load options */
   if (InfFindFirstLine (InfHandle,
                        "SetupData",

diff --git a/reactos/boot/freeldr/freeldr/rtl/libsupp.c b/reactos/boot/freeldr/freeldr/rtl/libsupp.c
index 587a867..fafba51 100644 (file)
--- a/reactos/boot/freeldr/freeldr/rtl/libsupp.c
+++ b/reactos/boot/freeldr/freeldr/rtl/libsupp.c
@@ -20,7 +20,7 @@
 
 #include <freeldr.h>
 
 
 #include <freeldr.h>
 

-#ifdef DBG
+#if DBG

 VOID FASTCALL
 CHECK_PAGED_CODE_RTL(char *file, int line)
 {
 VOID FASTCALL
 CHECK_PAGED_CODE_RTL(char *file, int line)
 {

diff --git a/reactos/boot/freeldr/freeldr/windows/wlmemory.c b/reactos/boot/freeldr/freeldr/windows/wlmemory.c
index 78e9589..c365034 100644 (file)
--- a/reactos/boot/freeldr/freeldr/windows/wlmemory.c
+++ b/reactos/boot/freeldr/freeldr/windows/wlmemory.c
@@ -614,7 +614,7 @@ WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
        DPRINTM(DPRINT_WINDOWS, "Memory Descriptor List prepared, printing PDE\n");
        List_PaToVa(&LoaderBlock->MemoryDescriptorListHead);
 
        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;
        {
                ULONG *PDE_Addr=(ULONG *)PDE;//0xC0300000;
                int j;

diff --git a/reactos/dll/ntdll/include/ntdllp.h b/reactos/dll/ntdll/include/ntdllp.h
index 903c15e..eb7661b 100644 (file)
--- a/reactos/dll/ntdll/include/ntdllp.h
+++ b/reactos/dll/ntdll/include/ntdllp.h
@@ -28,7 +28,7 @@ typedef BOOL
                          ULONG ul_reason_for_call,
                          LPVOID lpReserved);
 
                          ULONG ul_reason_for_call,
                          LPVOID lpReserved);
 

-#if defined(KDBG) || defined(DBG)
+#if defined(KDBG) || DBG

 VOID
 LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule);
 #endif
 VOID
 LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule);
 #endif

diff --git a/reactos/dll/ntdll/ldr/startup.c b/reactos/dll/ntdll/ldr/startup.c
index 6ee4906..e3c6236 100644 (file)
--- a/reactos/dll/ntdll/ldr/startup.c
+++ b/reactos/dll/ntdll/ldr/startup.c
@@ -427,7 +427,7 @@ LdrpInit2(PCONTEXT Context,
     InsertTailList(&Peb->Ldr->InInitializationOrderModuleList,
                    &NtModule->InInitializationOrderModuleList);
 
     InsertTailList(&Peb->Ldr->InInitializationOrderModuleList,
                    &NtModule->InInitializationOrderModuleList);
 

-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)

 
     LdrpLoadUserModuleSymbols(NtModule);
 
 
     LdrpLoadUserModuleSymbols(NtModule);
 


@@ -475,7 +475,7 @@ LdrpInit2(PCONTEXT Context,
 
     LdrpInitLoader();
 
 
     LdrpInitLoader();
 

-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)

 
     LdrpLoadUserModuleSymbols(ExeModule);
 
 
     LdrpLoadUserModuleSymbols(ExeModule);
 

diff --git a/reactos/dll/ntdll/ldr/utils.c b/reactos/dll/ntdll/ldr/utils.c
index b104a92..83c5bbb 100644 (file)
--- a/reactos/dll/ntdll/ldr/utils.c
+++ b/reactos/dll/ntdll/ldr/utils.c
@@ -69,7 +69,7 @@ static VOID LdrpDetachProcess(BOOLEAN UnloadAll);
 
 /* FUNCTIONS *****************************************************************/
 
 
 /* FUNCTIONS *****************************************************************/
 

-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)

 
 VOID
 LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule)
 
 VOID
 LdrpLoadUserModuleSymbols(PLDR_DATA_TABLE_ENTRY LdrModule)


@@ -2274,7 +2274,7 @@ LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
             DPRINT1("LdrFixupImports failed for %wZ, status=%x\n", &(*Module)->BaseDllName, Status);
             return Status;
           }
             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);
         LdrpLoadUserModuleSymbols(*Module);
 #endif /* DBG || KDBG */
         RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);

diff --git a/reactos/dll/ntdll/rtl/libsupp.c b/reactos/dll/ntdll/rtl/libsupp.c
index 8bae8c6..bd1f798 100644 (file)
--- a/reactos/dll/ntdll/rtl/libsupp.c
+++ b/reactos/dll/ntdll/rtl/libsupp.c
@@ -162,7 +162,7 @@ RtlpFreeMemory(PVOID Mem,
 }
 
 
 }
 
 

-#ifdef DBG
+#if DBG

 VOID FASTCALL
 CHECK_PAGED_CODE_RTL(char *file, int line)
 {
 VOID FASTCALL
 CHECK_PAGED_CODE_RTL(char *file, int line)
 {

diff --git a/reactos/dll/win32/iprtprio/iprtprio.c b/reactos/dll/win32/iprtprio/iprtprio.c
index ac45147..c3624e3 100644 (file)
--- a/reactos/dll/win32/iprtprio/iprtprio.c
+++ b/reactos/dll/win32/iprtprio/iprtprio.c
@@ -26,7 +26,7 @@
 #define EXPORT CALLBACK
 #endif
 
 #define EXPORT CALLBACK
 #endif
 

-#ifdef DBG
+#if DBG

 /* See debug.h for debug/trace constants */
 DWORD DebugTraceLevel = MAX_TRACE;
 #endif /* DBG */
 /* See debug.h for debug/trace constants */
 DWORD DebugTraceLevel = MAX_TRACE;
 #endif /* DBG */

diff --git a/reactos/dll/win32/msafd/include/debug.h b/reactos/dll/win32/msafd/include/debug.h
index a4eb8fe..2be8a15 100644 (file)
--- a/reactos/dll/win32/msafd/include/debug.h
+++ b/reactos/dll/win32/msafd/include/debug.h
@@ -22,7 +22,7 @@
 #undef ASSERT
 #endif
 
 #undef ASSERT
 #endif
 

-#ifdef DBG
+#if DBG

 
 extern DWORD DebugTraceLevel;
 
 
 extern DWORD DebugTraceLevel;
 

diff --git a/reactos/dll/win32/msafd/misc/dllmain.c b/reactos/dll/win32/msafd/misc/dllmain.c
index 4b65f78..c72059f 100644 (file)
--- a/reactos/dll/win32/msafd/misc/dllmain.c
+++ b/reactos/dll/win32/msafd/misc/dllmain.c
@@ -14,7 +14,7 @@
 
 #include <debug.h>
 
 
 #include <debug.h>
 

-#ifdef DBG
+#if DBG

 //DWORD DebugTraceLevel = DEBUG_ULTRA;
 DWORD DebugTraceLevel = 0;
 #endif /* DBG */
 //DWORD DebugTraceLevel = DEBUG_ULTRA;
 DWORD DebugTraceLevel = 0;
 #endif /* DBG */

diff --git a/reactos/dll/win32/snmpapi/debug.h b/reactos/dll/win32/snmpapi/debug.h
index 5f57ca5..87cc8f3 100644 (file)
--- a/reactos/dll/win32/snmpapi/debug.h
+++ b/reactos/dll/win32/snmpapi/debug.h
@@ -19,7 +19,7 @@
 
 ULONG DbgPrint(PCH Format,...);
 
 
 ULONG DbgPrint(PCH Format,...);
 

-#ifdef DBG
+#if DBG

 
 extern DWORD DebugTraceLevel;
 
 
 extern DWORD DebugTraceLevel;
 

diff --git a/reactos/dll/win32/snmpapi/snmpapi.c b/reactos/dll/win32/snmpapi/snmpapi.c
index 2afb21d..80e6476 100644 (file)
--- a/reactos/dll/win32/snmpapi/snmpapi.c
+++ b/reactos/dll/win32/snmpapi/snmpapi.c
@@ -26,7 +26,7 @@
 #endif
 
 
 #endif
 
 

-#ifdef DBG
+#if DBG

 
 /* See debug.h for debug/trace constants */
 DWORD DebugTraceLevel = MAX_TRACE;
 
 /* See debug.h for debug/trace constants */
 DWORD DebugTraceLevel = MAX_TRACE;

diff --git a/reactos/dll/win32/ws2_32/include/debug.h b/reactos/dll/win32/ws2_32/include/debug.h
index 6ed0a12..369aa28 100644 (file)
--- a/reactos/dll/win32/ws2_32/include/debug.h
+++ b/reactos/dll/win32/ws2_32/include/debug.h
@@ -22,7 +22,7 @@
 #undef ASSERT
 #endif
 
 #undef ASSERT
 #endif
 

-#ifdef DBG
+#if DBG

 
 extern DWORD DebugTraceLevel;
 
 
 extern DWORD DebugTraceLevel;
 

diff --git a/reactos/dll/win32/ws2_32/misc/catalog.c b/reactos/dll/win32/ws2_32/misc/catalog.c
index 3bda990..0dc13c4 100644 (file)
--- a/reactos/dll/win32/ws2_32/misc/catalog.c
+++ b/reactos/dll/win32/ws2_32/misc/catalog.c
@@ -32,7 +32,7 @@ DereferenceProviderByPointer(PCATALOG_ENTRY Provider)
 {
     WS_DbgPrint(MAX_TRACE, ("Provider (0x%X).\n", Provider));
 
 {
     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",
     if (Provider->ReferenceCount <= 0)
     {
         WS_DbgPrint(MIN_TRACE, ("Provider at 0x%X has invalid reference count (%ld).\n",

diff --git a/reactos/dll/win32/ws2_32/misc/dllmain.c b/reactos/dll/win32/ws2_32/misc/dllmain.c
index 7b29d87..1a3213f 100644 (file)
--- a/reactos/dll/win32/ws2_32/misc/dllmain.c
+++ b/reactos/dll/win32/ws2_32/misc/dllmain.c
@@ -14,7 +14,7 @@
 #include <handle.h>
 #include <upcall.h>
 
 #include <handle.h>
 #include <upcall.h>
 

-#ifdef DBG
+#if DBG

 
 /* See debug.h for debug/trace constants */
 //DWORD DebugTraceLevel = MIN_TRACE;
 
 /* See debug.h for debug/trace constants */
 //DWORD DebugTraceLevel = MIN_TRACE;


@@ -657,7 +657,7 @@ WSAAccept(IN     SOCKET s,
 
     if ( addr )
     {
 
     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,
         LPSOCKADDR_IN sa = (LPSOCKADDR_IN)addr;
         WS_DbgPrint(MAX_TRACE,("Returned address: %d %s:%d (len %d)\n",
                                sa->sin_family,

diff --git a/reactos/dll/win32/ws2help/debug.h b/reactos/dll/win32/ws2help/debug.h
index 95adc05..b25f7cc 100644 (file)
--- a/reactos/dll/win32/ws2help/debug.h
+++ b/reactos/dll/win32/ws2help/debug.h
@@ -21,7 +21,7 @@
 #undef ASSERT
 #endif
 
 #undef ASSERT
 #endif
 

-#ifdef DBG
+#if DBG

 
 extern DWORD DebugTraceLevel;
 
 
 extern DWORD DebugTraceLevel;
 

diff --git a/reactos/dll/win32/ws2help/ws2help.c b/reactos/dll/win32/ws2help/ws2help.c
index b52b2bd..d2fd024 100644 (file)
--- a/reactos/dll/win32/ws2help/ws2help.c
+++ b/reactos/dll/win32/ws2help/ws2help.c
@@ -10,7 +10,7 @@
 #include "ws2help.h"
 
 #include <debug.h>
 #include "ws2help.h"
 
 #include <debug.h>

-#ifdef DBG
+#if DBG

 
 /* See debug.h for debug/trace constants */
 DWORD DebugTraceLevel = MAX_TRACE;
 
 /* See debug.h for debug/trace constants */
 DWORD DebugTraceLevel = MAX_TRACE;

diff --git a/reactos/dll/win32/wshirda/debug.h b/reactos/dll/win32/wshirda/debug.h
index 1c51b67..c8702f3 100644 (file)
--- a/reactos/dll/win32/wshirda/debug.h
+++ b/reactos/dll/win32/wshirda/debug.h
@@ -17,7 +17,7 @@
 
 #define DEBUG_ULTRA    0xFFFFFFFF
 
 
 #define DEBUG_ULTRA    0xFFFFFFFF
 

-#ifdef DBG
+#if DBG

 
 extern DWORD DebugTraceLevel;
 
 
 extern DWORD DebugTraceLevel;
 

diff --git a/reactos/dll/win32/wshirda/wshirda.c b/reactos/dll/win32/wshirda/wshirda.c
index c8144a0..1ee4824 100644 (file)
--- a/reactos/dll/win32/wshirda/wshirda.c
+++ b/reactos/dll/win32/wshirda/wshirda.c
@@ -11,7 +11,7 @@
 
 #include <debug.h>
 
 
 #include <debug.h>
 

-#ifdef DBG
+#if DBG

 
 /* See debug.h for debug/trace constants */
 DWORD DebugTraceLevel = MAX_TRACE;
 
 /* See debug.h for debug/trace constants */
 DWORD DebugTraceLevel = MAX_TRACE;

diff --git a/reactos/drivers/filesystems/fastfat/finfo.c b/reactos/drivers/filesystems/fastfat/finfo.c
index 1b6e2c2..75873f7 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/finfo.c
+++ b/reactos/drivers/filesystems/fastfat/finfo.c
@@ -267,7 +267,7 @@ VfatSetDispositionInformation(PFILE_OBJECT FileObject,
                              PDEVICE_OBJECT DeviceObject,
                              PFILE_DISPOSITION_INFORMATION DispositionInfo)
 {
                              PDEVICE_OBJECT DeviceObject,
                              PFILE_DISPOSITION_INFORMATION DispositionInfo)
 {

-#ifdef DBG
+#if DBG

    PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension;
 #endif
 
    PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension;
 #endif
 

diff --git a/reactos/drivers/input/i8042prt/registry.c b/reactos/drivers/input/i8042prt/registry.c
index 24c7442..38b0f05 100644 (file)
--- a/reactos/drivers/input/i8042prt/registry.c
+++ b/reactos/drivers/input/i8042prt/registry.c
@@ -42,7 +42,7 @@ ReadRegistryEntries(
        /* Default value for CrashOnCtrlScroll depends if we're
         * running a debug build or a normal build.
         */
        /* 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;
        DefaultCrashOnCtrlScroll = 1;
 #else
        DefaultCrashOnCtrlScroll = 0;

diff --git a/reactos/drivers/network/afd/afd/lock.c b/reactos/drivers/network/afd/afd/lock.c
index d8ada70..7be8cea 100644 (file)
--- a/reactos/drivers/network/afd/afd/lock.c
+++ b/reactos/drivers/network/afd/afd/lock.c
@@ -264,7 +264,7 @@ UINT SocketAcquireStateLock( PAFD_FCB FCB ) {
 }
 
 VOID SocketStateUnlock( PAFD_FCB FCB ) {
 }
 
 VOID SocketStateUnlock( PAFD_FCB FCB ) {

-#ifdef DBG
+#if DBG

     PVOID CurrentThread = KeGetCurrentThread();
 #endif
     ASSERT(FCB->LockCount > 0);
     PVOID CurrentThread = KeGetCurrentThread();
 #endif
     ASSERT(FCB->LockCount > 0);

diff --git a/reactos/drivers/network/afd/afd/main.c b/reactos/drivers/network/afd/afd/main.c
index 754f3bb..65ca7ec 100644 (file)
--- a/reactos/drivers/network/afd/afd/main.c
+++ b/reactos/drivers/network/afd/afd/main.c
@@ -17,7 +17,7 @@
 #include "tdiconn.h"
 #include "debug.h"
 
 #include "tdiconn.h"
 #include "debug.h"
 

-#ifdef DBG
+#if DBG

 
 /* See debug.h for debug/trace constants */
 //DWORD DebugTraceLevel = DEBUG_ULTRA;
 
 /* See debug.h for debug/trace constants */
 //DWORD DebugTraceLevel = DEBUG_ULTRA;


@@ -349,7 +349,7 @@ AfdDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
     PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
     NTSTATUS Status = STATUS_SUCCESS;
 {
     PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp);
     NTSTATUS Status = STATUS_SUCCESS;

-#ifdef DBG
+#if DBG

     PFILE_OBJECT FileObject = IrpSp->FileObject;
 #endif
 
     PFILE_OBJECT FileObject = IrpSp->FileObject;
 #endif
 

diff --git a/reactos/drivers/network/afd/afd/tdi.c b/reactos/drivers/network/afd/afd/tdi.c
index 4d023e7..139a60b 100644 (file)
--- a/reactos/drivers/network/afd/afd/tdi.c
+++ b/reactos/drivers/network/afd/afd/tdi.c
@@ -13,7 +13,7 @@
 #include "tdiconn.h"
 #include "tdi_proto.h"
 
 #include "tdiconn.h"
 #include "tdi_proto.h"
 

-#ifdef DBG
+#if DBG

 #if 0
 static VOID DisplayBuffer(
     PVOID Buffer,
 #if 0
 static VOID DisplayBuffer(
     PVOID Buffer,

diff --git a/reactos/drivers/network/afd/include/debug.h b/reactos/drivers/network/afd/include/debug.h
index 0d3e4a9..da024f1 100644 (file)
--- a/reactos/drivers/network/afd/include/debug.h
+++ b/reactos/drivers/network/afd/include/debug.h
@@ -19,7 +19,7 @@
 #define DEBUG_IRP      0x00000200
 #define DEBUG_ULTRA    0xFFFFFFFF
 
 #define DEBUG_IRP      0x00000200
 #define DEBUG_ULTRA    0xFFFFFFFF
 

-#ifdef DBG
+#if DBG

 
 extern DWORD DebugTraceLevel;
 
 
 extern DWORD DebugTraceLevel;
 

diff --git a/reactos/drivers/network/dd/ne2000/include/debug.h b/reactos/drivers/network/dd/ne2000/include/debug.h
index dbf5e87..309a8a8 100644 (file)
--- a/reactos/drivers/network/dd/ne2000/include/debug.h
+++ b/reactos/drivers/network/dd/ne2000/include/debug.h
@@ -18,7 +18,7 @@
 #define DEBUG_MEMORY   0x00000100
 #define DEBUG_ULTRA    0xFFFFFFFF
 
 #define DEBUG_MEMORY   0x00000100
 #define DEBUG_ULTRA    0xFFFFFFFF
 

-#ifdef DBG
+#if DBG

 
 extern ULONG DebugTraceLevel;
 
 
 extern ULONG DebugTraceLevel;
 

diff --git a/reactos/drivers/network/dd/ne2000/ne2000/8390.c b/reactos/drivers/network/dd/ne2000/ne2000/8390.c
index 4ed2059..0461305 100644 (file)
--- a/reactos/drivers/network/dd/ne2000/ne2000/8390.c
+++ b/reactos/drivers/network/dd/ne2000/ne2000/8390.c
@@ -479,7 +479,7 @@ NDIS_STATUS NICStop(
         NdisStallExecution(500);
     }
 
         NdisStallExecution(500);
     }
 

-#ifdef DBG
+#if DBG

     if (i == 4)
         NDIS_DbgPrint(MIN_TRACE, ("NIC was not reset after 2ms.\n"));
 #endif
     if (i == 4)
         NDIS_DbgPrint(MIN_TRACE, ("NIC was not reset after 2ms.\n"));
 #endif


@@ -686,7 +686,7 @@ VOID NICReadDataAlign(
         NdisStallExecution(4);
     }
 
         NdisStallExecution(4);
     }
 

-#ifdef DBG
+#if DBG

     if (Count == 0xFFFF)
         NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
 #endif
     if (Count == 0xFFFF)
         NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
 #endif


@@ -741,7 +741,7 @@ VOID NICWriteDataAlign(
         NdisStallExecution(4);
     }
 
         NdisStallExecution(4);
     }
 

-#ifdef DBG
+#if DBG

     if (Count == 0xFFFF)
         NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
 #endif
     if (Count == 0xFFFF)
         NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
 #endif


@@ -778,7 +778,7 @@ VOID NICWriteDataAlign(
         NdisStallExecution(4);
     }
 
         NdisStallExecution(4);
     }
 

-#ifdef DBG
+#if DBG

     if (Count == 0xFFFF)
         NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
 #endif
     if (Count == 0xFFFF)
         NDIS_DbgPrint(MIN_TRACE, ("Remote DMA did not complete.\n"));
 #endif


@@ -1184,7 +1184,7 @@ static VOID HandleReceive(
             NdisStallExecution(500);
         }
 
             NdisStallExecution(500);
         }
 

-#ifdef DBG
+#if DBG

         if (i == 4)
             NDIS_DbgPrint(MIN_TRACE, ("NIC was not reset after 2ms.\n"));
 #endif
         if (i == 4)
             NDIS_DbgPrint(MIN_TRACE, ("NIC was not reset after 2ms.\n"));
 #endif

diff --git a/reactos/drivers/network/dd/ne2000/ne2000/main.c b/reactos/drivers/network/dd/ne2000/ne2000/main.c
index da808c0..800274e 100644 (file)
--- a/reactos/drivers/network/dd/ne2000/ne2000/main.c
+++ b/reactos/drivers/network/dd/ne2000/ne2000/main.c
@@ -19,7 +19,7 @@ DriverEntry(
     PUNICODE_STRING RegistryPath);
 
 
     PUNICODE_STRING RegistryPath);
 
 

-#ifdef DBG
+#if DBG

 
 /* See debug.h for debug/trace constants */
 ULONG DebugTraceLevel = 0;
 
 /* See debug.h for debug/trace constants */
 ULONG DebugTraceLevel = 0;

diff --git a/reactos/drivers/network/lan/include/debug.h b/reactos/drivers/network/lan/include/debug.h
index 4b296b8..af28e58 100644 (file)
--- a/reactos/drivers/network/lan/include/debug.h
+++ b/reactos/drivers/network/lan/include/debug.h
@@ -33,7 +33,7 @@
 #define DEBUG_CPOINT   0x00800000
 #define DEBUG_ULTRA    0xFFFFFFFF
 
 #define DEBUG_CPOINT   0x00800000
 #define DEBUG_ULTRA    0xFFFFFFFF
 

-#ifdef DBG
+#if DBG

 
 extern DWORD DebugTraceLevel;
 
 
 extern DWORD DebugTraceLevel;
 

diff --git a/reactos/drivers/network/ndis/include/debug.h b/reactos/drivers/network/ndis/include/debug.h
index e1f699d..7a4c40e 100644 (file)
--- a/reactos/drivers/network/ndis/include/debug.h
+++ b/reactos/drivers/network/ndis/include/debug.h
@@ -19,7 +19,7 @@
 #define DEBUG_PACKET   0x00000800
 #define DEBUG_ULTRA    0xFFFFFFFF
 
 #define DEBUG_PACKET   0x00000800
 #define DEBUG_ULTRA    0xFFFFFFFF
 

-#ifdef DBG
+#if DBG

 
 extern ULONG DebugTraceLevel;
 
 
 extern ULONG DebugTraceLevel;
 

diff --git a/reactos/drivers/network/ndis/include/miniport.h b/reactos/drivers/network/ndis/include/miniport.h
index ff79aad..6461b6b 100644 (file)
--- a/reactos/drivers/network/ndis/include/miniport.h
+++ b/reactos/drivers/network/ndis/include/miniport.h
@@ -108,7 +108,7 @@ extern LIST_ENTRY AdapterListHead;
 extern KSPIN_LOCK AdapterListLock;
 
 
 extern KSPIN_LOCK AdapterListLock;
 
 

-#ifdef DBG
+#if DBG

 VOID
 MiniDisplayPacket(
     PNDIS_PACKET Packet);
 VOID
 MiniDisplayPacket(
     PNDIS_PACKET Packet);

diff --git a/reactos/drivers/network/ndis/ndis/main.c b/reactos/drivers/network/ndis/ndis/main.c
index 4a538c2..a226c69 100644 (file)
--- a/reactos/drivers/network/ndis/ndis/main.c
+++ b/reactos/drivers/network/ndis/ndis/main.c
@@ -14,7 +14,7 @@
 #include "ndissys.h"
 
 
 #include "ndissys.h"
 
 

-#ifdef DBG
+#if DBG

 
 /* See debug.h for debug/trace constants */
 ULONG DebugTraceLevel = MIN_TRACE;
 
 /* See debug.h for debug/trace constants */
 ULONG DebugTraceLevel = MIN_TRACE;

diff --git a/reactos/drivers/network/ndis/ndis/miniport.c b/reactos/drivers/network/ndis/ndis/miniport.c
index c74542e..553f9f5 100644 (file)
--- a/reactos/drivers/network/ndis/ndis/miniport.c
+++ b/reactos/drivers/network/ndis/ndis/miniport.c
@@ -62,7 +62,7 @@ VOID
 MiniDisplayPacket(
     PNDIS_PACKET Packet)
 {
 MiniDisplayPacket(
     PNDIS_PACKET Packet)
 {

-#ifdef DBG
+#if DBG

     ULONG i, Length;
     UCHAR Buffer[64];
     if ((DebugTraceLevel & DEBUG_PACKET) > 0) {
     ULONG i, Length;
     UCHAR Buffer[64];
     if ((DebugTraceLevel & DEBUG_PACKET) > 0) {


@@ -92,7 +92,7 @@ MiniDisplayPacket2(
     PVOID  LookaheadBuffer,
     UINT   LookaheadBufferSize)
 {
     PVOID  LookaheadBuffer,
     UINT   LookaheadBufferSize)
 {

-#ifdef DBG
+#if DBG

     if ((DebugTraceLevel & DEBUG_PACKET) > 0) {
         ULONG i, Length;
         PUCHAR p;
     if ((DebugTraceLevel & DEBUG_PACKET) > 0) {
         ULONG i, Length;
         PUCHAR p;


@@ -520,7 +520,7 @@ MiniAdapterHasAddress(
 
   NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n"));
 
 
   NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n"));
 

-#ifdef DBG
+#if DBG

   if(!Adapter)
     {
       NDIS_DbgPrint(MID_TRACE, ("Adapter object was null\n"));
   if(!Adapter)
     {
       NDIS_DbgPrint(MID_TRACE, ("Adapter object was null\n"));


@@ -1586,7 +1586,7 @@ DoQueries(
       return NdisStatus;
     }
 
       return NdisStatus;
     }
 

-#ifdef DBG
+#if DBG

     {
       /* 802.3 only */
 
     {
       /* 802.3 only */
 

diff --git a/reactos/drivers/network/ndis/ndis/protocol.c b/reactos/drivers/network/ndis/ndis/protocol.c
index 9b57393..3c3b9c6 100644 (file)
--- a/reactos/drivers/network/ndis/ndis/protocol.c
+++ b/reactos/drivers/network/ndis/ndis/protocol.c
@@ -247,7 +247,7 @@ ProIndicatePacket(
 
   NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 
 
   NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 

-#ifdef DBG
+#if DBG

   MiniDisplayPacket(Packet);
 #endif
 
   MiniDisplayPacket(Packet);
 #endif
 

diff --git a/reactos/drivers/network/tcpip/datalink/lan.c b/reactos/drivers/network/tcpip/datalink/lan.c
index d53398f..b550d20 100644 (file)
--- a/reactos/drivers/network/tcpip/datalink/lan.c
+++ b/reactos/drivers/network/tcpip/datalink/lan.c
@@ -649,7 +649,7 @@ VOID LANTransmit(
                 EHeader->EType = ETYPE_IPv6;
                 break;
             default:
                 EHeader->EType = ETYPE_IPv6;
                 break;
             default:

-#ifdef DBG
+#if DBG

                 /* Should not happen */
                 TI_DbgPrint(MIN_TRACE, ("Unknown LAN protocol.\n"));
 
                 /* Should not happen */
                 TI_DbgPrint(MIN_TRACE, ("Unknown LAN protocol.\n"));
 

diff --git a/reactos/drivers/network/tcpip/include/address.h b/reactos/drivers/network/tcpip/include/address.h
index 7762cd1..65abace 100644 (file)
--- a/reactos/drivers/network/tcpip/include/address.h
+++ b/reactos/drivers/network/tcpip/include/address.h
@@ -20,7 +20,7 @@
     (IPAddress)->Address.IPv4Address = (RawAddress);  \
 }
 
     (IPAddress)->Address.IPv4Address = (RawAddress);  \
 }
 

-#ifdef DBG
+#if DBG

 
 PCHAR A2S(
     PIP_ADDRESS Address);
 
 PCHAR A2S(
     PIP_ADDRESS Address);

diff --git a/reactos/drivers/network/tcpip/include/debug.h b/reactos/drivers/network/tcpip/include/debug.h
index 9b86649..3bf4fb3 100644 (file)
--- a/reactos/drivers/network/tcpip/include/debug.h
+++ b/reactos/drivers/network/tcpip/include/debug.h
@@ -33,7 +33,7 @@
 #define DEBUG_INFO     0x02000000
 #define DEBUG_ULTRA    0x7FFFFFFF
 
 #define DEBUG_INFO     0x02000000
 #define DEBUG_ULTRA    0x7FFFFFFF
 

-#ifdef DBG
+#if DBG

 
 #define REMOVE_PARENS(...) __VA_ARGS__
 #define TI_DbgPrint(_t_, _x_) \
 
 #define REMOVE_PARENS(...) __VA_ARGS__
 #define TI_DbgPrint(_t_, _x_) \

diff --git a/reactos/drivers/network/tcpip/include/memtrack.h b/reactos/drivers/network/tcpip/include/memtrack.h
index 8157338..b23ca07 100644 (file)
--- a/reactos/drivers/network/tcpip/include/memtrack.h
+++ b/reactos/drivers/network/tcpip/include/memtrack.h
@@ -15,7 +15,7 @@
 #define AllocatePacketWithBuffer(x,y,z) AllocatePacketWithBufferX(x,y,z,__FILE__,__LINE__)
 #define FreeNdisPacket(x) FreeNdisPacketX(x,__FILE__,__LINE__)
 
 #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__)
 #define MTMARK() TrackDumpFL(__FILE__, __LINE__)
 #define exAllocatePool(x,y) ExAllocatePoolX(x,y,__FILE__,__LINE__)
 #define exAllocatePoolWithTag(x,y,z) ExAllocatePoolX(x,y,__FILE__,__LINE__)

diff --git a/reactos/drivers/network/tcpip/include/routines.h b/reactos/drivers/network/tcpip/include/routines.h
index 1ee30fa..31d7075 100644 (file)
--- a/reactos/drivers/network/tcpip/include/routines.h
+++ b/reactos/drivers/network/tcpip/include/routines.h
@@ -58,7 +58,7 @@ void GetDataPtr( PNDIS_PACKET Packet,
                 PCHAR *DataOut,
                 PUINT Size );
 
                 PCHAR *DataOut,
                 PUINT Size );
 

-#ifdef DBG
+#if DBG

 VOID DisplayIPPacket(
     PIP_PACKET IPPacket);
 #define DISPLAY_IP_PACKET(x) DisplayIPPacket(x)
 VOID DisplayIPPacket(
     PIP_PACKET IPPacket);
 #define DISPLAY_IP_PACKET(x) DisplayIPPacket(x)

diff --git a/reactos/drivers/network/tcpip/include/titypes.h b/reactos/drivers/network/tcpip/include/titypes.h
index 0e43723..babc10a 100644 (file)
--- a/reactos/drivers/network/tcpip/include/titypes.h
+++ b/reactos/drivers/network/tcpip/include/titypes.h
@@ -8,7 +8,7 @@
 #define __TITYPES_H
 
 
 #define __TITYPES_H
 
 

-#ifdef DBG
+#if DBG

 
 #define DEFINE_TAG ULONG Tag;
 #define INIT_TAG(_Object, _Tag) \
 
 #define DEFINE_TAG ULONG Tag;
 #define INIT_TAG(_Object, _Tag) \

diff --git a/reactos/drivers/network/tcpip/tcpip/dispatch.c b/reactos/drivers/network/tcpip/tcpip/dispatch.c
index 25597ac..ba33f68 100644 (file)
--- a/reactos/drivers/network/tcpip/tcpip/dispatch.c
+++ b/reactos/drivers/network/tcpip/tcpip/dispatch.c
@@ -164,7 +164,7 @@ VOID NTAPI DispCancelRequest(
     Irp->IoStatus.Status = STATUS_CANCELLED;
     Irp->IoStatus.Information = 0;
 
     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
     if (!Irp->Cancel)
         TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be TRUE.\n"));
 #endif


@@ -243,7 +243,7 @@ VOID NTAPI DispCancelListenRequest(
 
     TI_DbgPrint(DEBUG_IRP, ("IRP at (0x%X).\n", Irp));
 
 
     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
     if (!Irp->Cancel)
         TI_DbgPrint(MIN_TRACE, ("Irp->Cancel is FALSE, should be TRUE.\n"));
 #endif

diff --git a/reactos/drivers/network/tcpip/tcpip/main.c b/reactos/drivers/network/tcpip/tcpip/main.c
index a8b98bc..4ec072e 100644 (file)
--- a/reactos/drivers/network/tcpip/tcpip/main.c
+++ b/reactos/drivers/network/tcpip/tcpip/main.c
@@ -622,7 +622,7 @@ VOID NTAPI TiUnload(
  *     DriverObject = Pointer to driver object created by the system
  */
 {
  *     DriverObject = Pointer to driver object created by the system
  */
 {

-#ifdef DBG
+#if DBG

   KIRQL OldIrql;
 
   TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql);
   KIRQL OldIrql;
 
   TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql);

diff --git a/reactos/drivers/storage/class/cdrom/cdrom.c b/reactos/drivers/storage/class/cdrom/cdrom.c
index df9179b..e5a5149 100644 (file)
--- a/reactos/drivers/storage/class/cdrom/cdrom.c
+++ b/reactos/drivers/storage/class/cdrom/cdrom.c
@@ -126,7 +126,7 @@ typedef struct _CDROM_DATA {
 
     UCHAR MediaChangeCountDown;
 
 
     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
     //
     // 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 @@ typedef struct _CDROM_DATA {
 #define CDROM_SRB_LIST_SIZE          4
 
 
 #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
 
 //
 // Used to detect the loss of the autorun irp.  The driver prints out a message


@@ -984,7 +984,7 @@ Return Value:
 
     deviceExtension->MediaChangeNoMedia = TRUE;
     cddata->MediaChangeIrp = NULL;
 
     deviceExtension->MediaChangeNoMedia = TRUE;
     cddata->MediaChangeIrp = NULL;

-#ifdef DBG
+#if DBG

     cddata->MediaChangeIrpTimeInUse = 0;
     cddata->MediaChangeIrpLost = FALSE;
 #endif
     cddata->MediaChangeIrpTimeInUse = 0;
     cddata->MediaChangeIrpLost = FALSE;
 #endif


@@ -5746,7 +5746,7 @@ Return Value:
 
             cddata->MediaChangeCountDown--;
 
 
             cddata->MediaChangeCountDown--;
 

-#ifdef DBG
+#if DBG

             cddata->MediaChangeIrpTimeInUse = 0;
             cddata->MediaChangeIrpLost = FALSE;
 #endif
             cddata->MediaChangeIrpTimeInUse = 0;
             cddata->MediaChangeIrpLost = FALSE;
 #endif


@@ -5833,7 +5833,7 @@ Return Value:
             }
         } else {
 
             }
         } else {
 

-#ifdef DBG
+#if DBG

             if(cddata->MediaChangeIrpLost == FALSE) {
                 if(cddata->MediaChangeIrpTimeInUse++ >
                    MEDIA_CHANGE_TIMEOUT_TIME) {
             if(cddata->MediaChangeIrpLost == FALSE) {
                 if(cddata->MediaChangeIrpTimeInUse++ >
                    MEDIA_CHANGE_TIMEOUT_TIME) {

diff --git a/reactos/drivers/storage/ide/uniata/id_ata.cpp b/reactos/drivers/storage/ide/uniata/id_ata.cpp
index f869d47..b3f8eb1 100644 (file)
--- a/reactos/drivers/storage/ide/uniata/id_ata.cpp
+++ b/reactos/drivers/storage/ide/uniata/id_ata.cpp
@@ -3077,7 +3077,7 @@ AtapiCallBack__(
         goto ReturnCallback;
     }
 
         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]));
     }
     if (!IS_RDP((srb->Cdb[0]))) {
         KdPrint2((PRINT_PREFIX "AtapiCallBack: Invalid CDB marked as RDP - %#x\n", srb->Cdb[0]));
     }

diff --git a/reactos/drivers/usb/nt4compat/usbdriver/ehci.c b/reactos/drivers/usb/nt4compat/usbdriver/ehci.c
index b1ca150..08642ef 100644 (file)
--- a/reactos/drivers/usb/nt4compat/usbdriver/ehci.c
+++ b/reactos/drivers/usb/nt4compat/usbdriver/ehci.c
@@ -6060,7 +6060,7 @@ ehci_isr(PKINTERRUPT interrupt, PVOID context)
 
     PEHCI_DEV ehci;
     ULONG status;
 
     PEHCI_DEV ehci;
     ULONG status;

-#ifdef DBG
+#if DBG

     ULONG urb_count;
 #endif
     PLIST_ENTRY pthis, pnext;
     ULONG urb_count;
 #endif
     PLIST_ENTRY pthis, pnext;


@@ -6116,7 +6116,7 @@ ehci_isr(PKINTERRUPT interrupt, PVOID context)
     door_bell_rings = ((status & STS_IAA) != 0);
 
     // scan to remove those due
     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
     urb_count = dbg_count_list(&ehci->urb_list);
     ehci_dbg_print(DBGLVL_MAXIMUM, ("ehci_isr(): urb# in process is %d\n", urb_count));
 #endif

diff --git a/reactos/include/ddk/mcd.h b/reactos/include/ddk/mcd.h
index f3b2455..449065b 100644 (file)
--- a/reactos/include/ddk/mcd.h
+++ b/reactos/include/ddk/mcd.h
@@ -41,7 +41,7 @@ extern "C" {
 #undef DebugPrint
 #endif
 
 #undef DebugPrint
 #endif
 

-#ifdef DBG
+#if DBG

 #define DebugPrint(x) ChangerClassDebugPrint x
 #else
 #define DebugPrint(x)
 #define DebugPrint(x) ChangerClassDebugPrint x
 #else
 #define DebugPrint(x)

diff --git a/reactos/include/ddk/srb.h b/reactos/include/ddk/srb.h
index b03faa7..468cbb2 100644 (file)
--- a/reactos/include/ddk/srb.h
+++ b/reactos/include/ddk/srb.h
@@ -33,7 +33,7 @@ extern "C" {
   #define SCSIPORTAPI DECLSPEC_IMPORT
 #endif
 
   #define SCSIPORTAPI DECLSPEC_IMPORT
 #endif
 

-#ifdef DBG
+#if DBG

 #define DebugPrint(x) ScsiDebugPrint x
 #else
 #define DebugPrint(x)
 #define DebugPrint(x) ScsiDebugPrint x
 #else
 #define DebugPrint(x)


@@ -56,7 +56,7 @@ typedef PHYSICAL_ADDRESS SCSI_PHYSICAL_ADDRESS, *PSCSI_PHYSICAL_ADDRESS;
 
 #define MAXIMUM_CDB_SIZE                  12
 
 
 #define MAXIMUM_CDB_SIZE                  12
 

-#ifdef DBG
+#if DBG

 #define SCSI_PORT_SIGNATURE               0x54524f50
 #endif
 
 #define SCSI_PORT_SIGNATURE               0x54524f50
 #endif
 

diff --git a/reactos/include/ddk/storport.h b/reactos/include/ddk/storport.h
index 359eead..d4112fa 100644 (file)
--- a/reactos/include/ddk/storport.h
+++ b/reactos/include/ddk/storport.h
@@ -404,7 +404,7 @@ StorPortSynchronizeAccess(
   IN PSTOR_SYNCHRONIZED_ACCESS  SynchronizedAccessRoutine,
   IN PVOID  Context);
 
   IN PSTOR_SYNCHRONIZED_ACCESS  SynchronizedAccessRoutine,
   IN PVOID  Context);
 

-#ifdef DBG
+#if DBG

 #define DebugPrint(x) StorPortDebugPrint x
 #else
 #define DebugPrint(x)
 #define DebugPrint(x) StorPortDebugPrint x
 #else
 #define DebugPrint(x)

diff --git a/reactos/include/ddk/video.h b/reactos/include/ddk/video.h
index 966c3b2..dc5fbb0 100644 (file)
--- a/reactos/include/ddk/video.h
+++ b/reactos/include/ddk/video.h
@@ -86,7 +86,7 @@ typedef HW_DMA_RETURN
 #undef PAGED_CODE
 #endif
 
 #undef PAGED_CODE
 #endif
 

-#ifdef DBG
+#if DBG

 
 #define PAGED_CODE() \
   if (VideoPortGetCurrentIrql() > 1 /* APC_LEVEL */) \
 
 #define PAGED_CODE() \
   if (VideoPortGetCurrentIrql() > 1 /* APC_LEVEL */) \


@@ -1540,7 +1540,7 @@ VideoPortZeroMemory(
   IN PVOID  Destination,
   IN ULONG  Length);
 
   IN PVOID  Destination,
   IN ULONG  Length);
 

-#ifdef DBG
+#if DBG

 #define VideoDebugPrint(x) VideoPortDebugPrint x
 #else
 #define VideoDebugPrint(x)
 #define VideoDebugPrint(x) VideoPortDebugPrint x
 #else
 #define VideoDebugPrint(x)

diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h
index afd2fb1..65d9dbb 100644 (file)
--- a/reactos/include/ddk/winddk.h
+++ b/reactos/include/ddk/winddk.h
@@ -4256,7 +4256,7 @@ typedef struct _IO_REMOVE_LOCK_DBG_BLOCK {
 
 typedef struct _IO_REMOVE_LOCK {
   IO_REMOVE_LOCK_COMMON_BLOCK  Common;
 
 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;
   IO_REMOVE_LOCK_DBG_BLOCK  Dbg;
 #endif
 } IO_REMOVE_LOCK, *PIO_REMOVE_LOCK;


@@ -5753,7 +5753,7 @@ KeAcquireSpinLockRaiseToDpc(
 #define ROUND_TO_PAGES(Size) \
   ((ULONG_PTR) (((ULONG_PTR) Size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)))
 
 #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)) ? \
 
 #define ASSERT(exp) \
   (VOID)((!(exp)) ? \


@@ -6273,7 +6273,7 @@ ExUuidCreate(
 #define ExReleaseResourceForThread ExReleaseResourceForThreadLite
 
 
 #define ExReleaseResourceForThread ExReleaseResourceForThreadLite
 
 

-#ifdef DBG
+#if DBG

 
 #define PAGED_CODE() { \
   if (KeGetCurrentIrql() > APC_LEVEL) { \
 
 #define PAGED_CODE() { \
   if (KeGetCurrentIrql() > APC_LEVEL) { \


@@ -10267,7 +10267,7 @@ DbgSetDebugFilterState(
   IN ULONG  Level,
   IN BOOLEAN  State);
 
   IN ULONG  Level,
   IN BOOLEAN  State);
 

-#ifdef DBG
+#if DBG

 
 #define KdPrint(_x_) DbgPrint _x_
 #define KdPrintEx(_x_) DbgPrintEx _x_
 
 #define KdPrint(_x_) DbgPrint _x_
 #define KdPrintEx(_x_) DbgPrintEx _x_

diff --git a/reactos/include/reactos/debug.h b/reactos/include/reactos/debug.h
index 6c03d05..413a036 100644 (file)
--- a/reactos/include/reactos/debug.h
+++ b/reactos/include/reactos/debug.h
@@ -78,7 +78,7 @@ RtlAssert(
 
 /* Print stuff only on Debug Builds*/
 #define DPFLTR_DEFAULT_ID -1
 
 /* 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
 
     /* These are always printed */
     #define DPRINT1 DbgPrint("(%s:%d) ",__FILE__,__LINE__), DbgPrint

diff --git a/reactos/lib/drivers/ip/network/ip.c b/reactos/lib/drivers/ip/network/ip.c
index fafbf44..c9719dd 100644 (file)
--- a/reactos/lib/drivers/ip/network/ip.c
+++ b/reactos/lib/drivers/ip/network/ip.c
@@ -179,7 +179,7 @@ PIP_INTERFACE IPCreateInterface(
 
     TI_DbgPrint(DEBUG_IP, ("Called. BindInfo (0x%X).\n", BindInfo));
 
 
     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",
     if (BindInfo->Address) {
         PUCHAR A = BindInfo->Address;
         TI_DbgPrint(DEBUG_IP, ("Interface address (%02X %02X %02X %02X %02X %02X).\n",

diff --git a/reactos/lib/drivers/ip/network/memtrack.c b/reactos/lib/drivers/ip/network/memtrack.c
index 3a8f141..1df319a 100644 (file)
--- a/reactos/lib/drivers/ip/network/memtrack.c
+++ b/reactos/lib/drivers/ip/network/memtrack.c
@@ -2,7 +2,7 @@
 #include "precomp.h"
 
 
 #include "precomp.h"
 
 

-#ifdef DBG
+#if DBG

 #define TRACK_TAG TAG('T','r','C','K')
 
 static LIST_ENTRY AllocatedObjectsList;
 #define TRACK_TAG TAG('T','r','C','K')
 
 static LIST_ENTRY AllocatedObjectsList;

diff --git a/reactos/lib/drivers/ip/network/routines.c b/reactos/lib/drivers/ip/network/routines.c
index 3de4981..10de185 100644 (file)
--- a/reactos/lib/drivers/ip/network/routines.c
+++ b/reactos/lib/drivers/ip/network/routines.c
@@ -26,7 +26,7 @@ UINT Random(
     return RandomNumber;
 }
 
     return RandomNumber;
 }
 

-#ifdef DBG
+#if DBG

 static VOID DisplayIPHeader(
     PCHAR Header,
     UINT Length)
 static VOID DisplayIPHeader(
     PCHAR Header,
     UINT Length)


@@ -131,7 +131,7 @@ VOID DisplayTCPPacket(
 VOID DisplayIPPacket(
     PIP_PACKET IPPacket)
 {
 VOID DisplayIPPacket(
     PIP_PACKET IPPacket)
 {

-#ifdef DBG
+#if DBG

     PCHAR p;
     UINT Length;
     PNDIS_BUFFER Buffer;
     PCHAR p;
     UINT Length;
     PNDIS_BUFFER Buffer;

diff --git a/reactos/lib/drivers/oskittcp/include/memtrack.h b/reactos/lib/drivers/oskittcp/include/memtrack.h
index db076cb..802ed74 100644 (file)
--- a/reactos/lib/drivers/oskittcp/include/memtrack.h
+++ b/reactos/lib/drivers/oskittcp/include/memtrack.h
@@ -8,7 +8,7 @@
 #define FBSD_MALLOC FOURCC('d','s','b','f')
 #define EXALLOC_TAG FOURCC('E','x','A','l')
 
 #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); \
 #define MTMARK() TrackDumpFL(__FILE__, __LINE__)
 #define NdisAllocateBuffer(x,y,z,a,b) { \
     NdisAllocateBuffer(x,y,z,a,b); \

diff --git a/reactos/lib/drivers/oskittcp/include/oskitdebug.h b/reactos/lib/drivers/oskittcp/include/oskitdebug.h
index c7824b3..40ccd46 100644 (file)
--- a/reactos/lib/drivers/oskittcp/include/oskitdebug.h
+++ b/reactos/lib/drivers/oskittcp/include/oskitdebug.h
@@ -35,7 +35,7 @@
 
 #include <oskittypes.h>
 
 
 #include <oskittypes.h>
 

-#ifdef DBG
+#if DBG

 
 extern OSK_UINT OskitDebugTraceLevel;
 
 
 extern OSK_UINT OskitDebugTraceLevel;
 

diff --git a/reactos/lib/rtl/handle.c b/reactos/lib/rtl/handle.c
index 175c7f4..a508736 100644 (file)
--- a/reactos/lib/rtl/handle.c
+++ b/reactos/lib/rtl/handle.c
@@ -125,7 +125,7 @@ BOOLEAN NTAPI
 RtlFreeHandle(PRTL_HANDLE_TABLE HandleTable,
              PRTL_HANDLE_TABLE_ENTRY Handle)
 {
 RtlFreeHandle(PRTL_HANDLE_TABLE HandleTable,
              PRTL_HANDLE_TABLE_ENTRY Handle)
 {

-#ifdef DBG
+#if DBG

    /* check if handle is valid */
    if (!RtlIsValidHandle(HandleTable, Handle))
    {
    /* check if handle is valid */
    if (!RtlIsValidHandle(HandleTable, Handle))
    {

diff --git a/reactos/lib/rtl/rtlp.h b/reactos/lib/rtl/rtlp.h
index 7b9fb8e..495e1d4 100644 (file)
--- a/reactos/lib/rtl/rtlp.h
+++ b/reactos/lib/rtl/rtlp.h
@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 /* PAGED_CODE equivalent for user-mode RTL */
 /* 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
 extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line);
 #define PAGED_CODE_RTL() CHECK_PAGED_CODE_RTL(__FILE__, __LINE__)
 #else

diff --git a/reactos/ntoskrnl/cc/view.c b/reactos/ntoskrnl/cc/view.c
index ad502c7..a9abfc5 100644 (file)
--- a/reactos/ntoskrnl/cc/view.c
+++ b/reactos/ntoskrnl/cc/view.c
@@ -79,7 +79,7 @@ void* _alloca(size_t size);
 #error Unknown compiler for alloca intrinsic stack allocation "function"
 #endif
 
 #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;
 static void CcRosCacheSegmentIncRefCount_ ( PCACHE_SEGMENT cs, const char* file, int line )
 {
        ++cs->ReferenceCount;


@@ -117,7 +117,7 @@ CcRosTraceCacheMap (
        PBCB Bcb,
        BOOLEAN Trace )
 {
        PBCB Bcb,
        BOOLEAN Trace )
 {

-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)

        KIRQL oldirql;
        PLIST_ENTRY current_entry;
        PCACHE_SEGMENT current;
        KIRQL oldirql;
        PLIST_ENTRY current_entry;
        PCACHE_SEGMENT current;


@@ -596,7 +596,7 @@ CcRosCreateCacheSegment(PBCB Bcb,
   current->PageOut = FALSE;
   current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize);
   current->Bcb = Bcb;
   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 );
   if ( Bcb->Trace )
   {
     DPRINT1("CacheMap 0x%p: new Cache Segment: 0x%p\n", Bcb, current );


@@ -628,7 +628,7 @@ CcRosCreateCacheSegment(PBCB Bcb,
      {
        CcRosCacheSegmentIncRefCount(current);
        KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
      {
        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",
        if ( Bcb->Trace )
        {
                DPRINT1("CacheMap 0x%p: deleting newly created Cache Segment 0x%p ( found existing one 0x%p )\n",


@@ -881,7 +881,7 @@ CcRosInternalFreeCacheSegment(PCACHE_SEGMENT CacheSeg)
   KIRQL oldIrql;
 #endif
   DPRINT("Freeing cache segment 0x%p\n", CacheSeg);
   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 );
        if ( CacheSeg->Bcb->Trace )
        {
                DPRINT1("CacheMap 0x%p: deleting Cache Segment: 0x%p\n", CacheSeg->Bcb, CacheSeg );


@@ -1081,7 +1081,7 @@ CcRosDeleteFileCache(PFILE_OBJECT FileObject, PBCB Bcb)
         }
          InsertHeadList(&FreeList, &current->BcbSegmentListEntry);
       }
         }
          InsertHeadList(&FreeList, &current->BcbSegmentListEntry);
       }

-#if defined(DBG) || defined(KDBG)
+#if DBG || defined(KDBG)

       Bcb->Trace = FALSE;
 #endif
       KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);
       Bcb->Trace = FALSE;
 #endif
       KeReleaseSpinLock(&Bcb->BcbLock, oldIrql);

diff --git a/reactos/ntoskrnl/ex/i386/interlck_asm.S b/reactos/ntoskrnl/ex/i386/interlck_asm.S
index e6a8f3a..fcc70c6 100644 (file)
--- a/reactos/ntoskrnl/ex/i386/interlck_asm.S
+++ b/reactos/ntoskrnl/ex/i386/interlck_asm.S
@@ -461,7 +461,7 @@ _ExInterlockedDecrementLong@8:
 \r
 /*ULONG\r
  *NTAPI\r
 \r
 /*ULONG\r
  *NTAPI\r

- *ExInterlockedExchangeUlong(IN PULONG Taget,\r
+ *ExInterlockedExchangeUlong(IN PULONG Target,\r

  *                           IN ULONG Value,\r
  *                           IN PKSPIN_LOCK Lock)\r
  */\r
  *                           IN ULONG Value,\r
  *                           IN PKSPIN_LOCK Lock)\r
  */\r


@@ -529,7 +529,7 @@ _Exi386InterlockedDecrementLong@4:
 \r
 /*ULONG\r
  *NTAPI\r
 \r
 /*ULONG\r
  *NTAPI\r

- *Exi386InterlockedExchangeUlong(IN PULONG Taget,\r
+ *Exi386InterlockedExchangeUlong(IN PULONG Target,\r

  *                               IN ULONG Value,\r
  *                               IN PKSPIN_LOCK Lock)\r
  */\r
  *                               IN ULONG Value,\r
  *                               IN PKSPIN_LOCK Lock)\r
  */\r

diff --git a/reactos/ntoskrnl/ex/pushlock.c b/reactos/ntoskrnl/ex/pushlock.c
index 7846762..7a5f540 100644 (file)
--- a/reactos/ntoskrnl/ex/pushlock.c
+++ b/reactos/ntoskrnl/ex/pushlock.c
@@ -182,7 +182,7 @@ ExfWakePushLock(PEX_PUSH_LOCK PushLock,
         /* Sanity check */
         ASSERT(!WaitBlock->Signaled);
 
         /* Sanity check */
         ASSERT(!WaitBlock->Signaled);
 

-#ifdef DBG
+#if DBG

         /* We are about to get signaled */
         WaitBlock->Signaled = TRUE;
 #endif
         /* We are about to get signaled */
         WaitBlock->Signaled = TRUE;
 #endif

diff --git a/reactos/ntoskrnl/ex/resource.c b/reactos/ntoskrnl/ex/resource.c
index 6299f0d..1eeef9c 100644 (file)
--- a/reactos/ntoskrnl/ex/resource.c
+++ b/reactos/ntoskrnl/ex/resource.c
@@ -18,7 +18,7 @@
 #define IsOwnedExclusive(r)     (r->Flag & ResourceOwnedExclusive)
 #define IsBoostAllowed(r)       (!(r->Flag & ResourceHasDisabledPriorityBoost))
 
 #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
 
 FORCEINLINE
 VOID

diff --git a/reactos/ntoskrnl/include/config.h b/reactos/ntoskrnl/include/config.h
index 4d32bb1..656080f 100644 (file)
--- a/reactos/ntoskrnl/include/config.h
+++ b/reactos/ntoskrnl/include/config.h
@@ -16,7 +16,7 @@
 /********** mm/ppool.c **********/
 
 /* Disable Debugging Features */
 /********** mm/ppool.c **********/
 
 /* Disable Debugging Features */

-#ifndef DBG
+#if !DBG

     /* Enable strict checking of the nonpaged pool on every allocation */
     #undef ENABLE_VALIDATE_POOL
 
     /* Enable strict checking of the nonpaged pool on every allocation */
     #undef ENABLE_VALIDATE_POOL
 

diff --git a/reactos/ntoskrnl/include/internal/cc.h b/reactos/ntoskrnl/include/internal/cc.h
index 9993fc8..f04e197 100644 (file)
--- a/reactos/ntoskrnl/include/internal/cc.h
+++ b/reactos/ntoskrnl/include/internal/cc.h
@@ -116,7 +116,7 @@ typedef struct _BCB
     PVOID LazyWriteContext;
     KSPIN_LOCK BcbLock;
     ULONG RefCount;
     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;
        BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments */
 #endif
 } BCB, *PBCB;

diff --git a/reactos/ntoskrnl/include/internal/i386/asmmacro.S b/reactos/ntoskrnl/include/internal/i386/asmmacro.S
index 3d9ebf6..fcc78c8 100644 (file)
--- a/reactos/ntoskrnl/include/internal/i386/asmmacro.S
+++ b/reactos/ntoskrnl/include/internal/i386/asmmacro.S
@@ -997,7 +997,7 @@ PendingUserApc:
 // @remark
 //
 .macro TRAP_EPILOG SystemCall, RestorePreviousMode, RestoreSegments, RestoreVolatiles, RestoreAllRegs
 // @remark
 //
 .macro TRAP_EPILOG SystemCall, RestorePreviousMode, RestoreSegments, RestoreVolatiles, RestoreAllRegs

-#ifdef DBG
+#if DBG

     /* Assert the flags */
     pushfd
     pop edx
     /* Assert the flags */
     pushfd
     pop edx


@@ -1011,7 +1011,7 @@ PendingUserApc:
     /* Assert the trap frame */
 #endif
 5:
     /* Assert the trap frame */
 #endif
 5:

-#ifdef DBG
+#if DBG

     sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00
     jnz 0f
 
     sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00
     jnz 0f
 


@@ -1033,7 +1033,7 @@ PendingUserApc:
     /* Get exception list */
     mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST]
 
     /* Get exception list */
     mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST]
 

-#ifdef DBG
+#if DBG

     /* Assert the saved exception list */
     or edx, edx
     jnz 1f
     /* Assert the saved exception list */
     or edx, edx
     jnz 1f


@@ -1048,7 +1048,7 @@ PendingUserApc:
     /* Get previous mode */
     mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE]
 
     /* Get previous mode */
     mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE]
 

-#ifdef DBG
+#if DBG

     /* Assert the saved previous mode */
     cmp ecx, -1
     jnz 1f
     /* Assert the saved previous mode */
     cmp ecx, -1
     jnz 1f


@@ -1061,7 +1061,7 @@ PendingUserApc:
     mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl
 .else
 
     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
     /* Assert the saved previous mode */
     mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE]
     cmp ecx, -1


@@ -1304,7 +1304,7 @@ FastExit:
 .endif
 .endm
 
 .endif
 .endm
 

-#ifdef DBG
+#if DBG

 
 .macro VERIFY_INT Label
     /* Get the current time and mask it to 192 ticks */
 
 .macro VERIFY_INT Label
     /* Get the current time and mask it to 192 ticks */

diff --git a/reactos/ntoskrnl/include/internal/kd.h b/reactos/ntoskrnl/include/internal/kd.h
index 3d791ef..bc88f5e 100644 (file)
--- a/reactos/ntoskrnl/include/internal/kd.h
+++ b/reactos/ntoskrnl/include/internal/kd.h
@@ -66,7 +66,7 @@ KdPortPutByteEx(
 /* SYMBOL ROUTINES **********************************************************/
 #ifdef __NTOSKRNL__
 
 /* SYMBOL ROUTINES **********************************************************/
 #ifdef __NTOSKRNL__
 

-#if defined(KDBG) || defined(DBG)
+#if defined(KDBG) || DBG

 
 VOID
 KdbSymLoadUserModuleSymbols(IN PLDR_DATA_TABLE_ENTRY LdrModule);
 
 VOID
 KdbSymLoadUserModuleSymbols(IN PLDR_DATA_TABLE_ENTRY LdrModule);


@@ -128,7 +128,7 @@ typedef struct _KDB_MODULE_INFO
 # define KDB_CREATE_THREAD_HOOK(CONTEXT)       do { } while (0)
 #endif
 
 # 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)
 # define KeRosPrintAddress(ADDRESS)         KdbSymPrintAddress(ADDRESS)
 #else
 # define KeRosPrintAddress(ADDRESS)         KiRosPrintAddress(ADDRESS)

diff --git a/reactos/ntoskrnl/include/internal/ke_x.h b/reactos/ntoskrnl/include/internal/ke_x.h
index 2564593..a1ab17a 100644 (file)
--- a/reactos/ntoskrnl/include/internal/ke_x.h
+++ b/reactos/ntoskrnl/include/internal/ke_x.h
@@ -445,7 +445,7 @@ KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock)
             /* Value changed... wait until it's locked */
             while (*(volatile KSPIN_LOCK *)SpinLock == 1)
             {
             /* 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);
 
                 /* On debug builds, we use a much slower but useful routine */
                 //Kii386SpinOnSpinLock(SpinLock, 5);
 


@@ -459,7 +459,7 @@ KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock)
         }
         else
         {
         }
         else
         {

-#ifdef DBG
+#if DBG

             /* On debug builds, we OR in the KTHREAD */
             *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1;
 #endif
             /* On debug builds, we OR in the KTHREAD */
             *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1;
 #endif


@@ -476,7 +476,7 @@ FORCEINLINE
 VOID
 KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock)
 {
 VOID
 KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock)
 {

-#ifdef DBG
+#if DBG

     /* Make sure that the threads match */
     if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock)
     {
     /* Make sure that the threads match */
     if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock)
     {

diff --git a/reactos/ntoskrnl/kd/kdmain.c b/reactos/ntoskrnl/kd/kdmain.c
index c59a9a1..1b48765 100644 (file)
--- a/reactos/ntoskrnl/kd/kdmain.c
+++ b/reactos/ntoskrnl/kd/kdmain.c
@@ -49,7 +49,7 @@ KdpServiceDispatcher(ULONG Service,
             Result = KdpPrintString(Buffer1, Buffer1Length);
             break;
 
             Result = KdpPrintString(Buffer1, Buffer1Length);
             break;
 

-#ifdef DBG
+#if DBG

         case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */
         {
             switch ((ULONG)Buffer1)
         case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */
         {
             switch ((ULONG)Buffer1)

diff --git a/reactos/ntoskrnl/kdbg/kdb_symbols.c b/reactos/ntoskrnl/kdbg/kdb_symbols.c
index c606d52..17879bf 100644 (file)
--- a/reactos/ntoskrnl/kdbg/kdb_symbols.c
+++ b/reactos/ntoskrnl/kdbg/kdb_symbols.c
@@ -694,7 +694,7 @@ KdbInitialize(PKD_DISPATCH_TABLE DispatchTable,
 
     LoadSymbols = FALSE;
 
 
     LoadSymbols = FALSE;
 

-#ifdef DBG
+#if DBG

     /* Load symbols only if we have 96Mb of RAM or more */
     if (MmNumberOfPhysicalPages >= 0x6000)
         LoadSymbols = TRUE;
     /* Load symbols only if we have 96Mb of RAM or more */
     if (MmNumberOfPhysicalPages >= 0x6000)
         LoadSymbols = TRUE;

diff --git a/reactos/ntoskrnl/ke/arm/kiinit.c b/reactos/ntoskrnl/ke/arm/kiinit.c
index aa54282..4856039 100644 (file)
--- a/reactos/ntoskrnl/ke/arm/kiinit.c
+++ b/reactos/ntoskrnl/ke/arm/kiinit.c
@@ -65,7 +65,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess,
 #ifndef CONFIG_SMP
     Prcb->BuildType |= PRCB_BUILD_UNIPROCESSOR;
 #endif
 #ifndef CONFIG_SMP
     Prcb->BuildType |= PRCB_BUILD_UNIPROCESSOR;
 #endif

-#ifdef DBG
+#if DBG

     Prcb->BuildType |= PRCB_BUILD_DEBUG;
 #endif
     Prcb->CurrentThread = InitThread;
     Prcb->BuildType |= PRCB_BUILD_DEBUG;
 #endif
     Prcb->CurrentThread = InitThread;

diff --git a/reactos/ntoskrnl/ke/i386/ctxswitch.S b/reactos/ntoskrnl/ke/i386/ctxswitch.S
index 7d3447e..2edfb2b 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/ctxswitch.S
+++ b/reactos/ntoskrnl/ke/i386/ctxswitch.S
@@ -140,7 +140,7 @@ _KiFlushNPXState@4:
     cmp dword ptr [esp+20], 0
     je Return
 
     cmp dword ptr [esp+20], 0
     je Return
 

-#ifdef DBG
+#if DBG

     /* Assert Fxsr support */
     test byte ptr _KeI386FxsrPresent, 1
     jnz AssertOk
     /* Assert Fxsr support */
     test byte ptr _KeI386FxsrPresent, 1
     jnz AssertOk


@@ -167,7 +167,7 @@ Cr0OK:
     cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED
     jnz DontSave
 
     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
     /* We are the NPX Thread with an unloaded NPX State... this isn't normal! */
     int 3
 #endif


@@ -365,7 +365,7 @@ NotBusy:
 
 AfterTrace:
 #ifdef CONFIG_SMP
 
 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]
     /* Assert that we're on the right CPU */
     mov cl, [esi+KTHREAD_NEXT_PROCESSOR]
     cmp cl, [ebx+KPCR_PROCESSOR_NUMBER]


@@ -419,7 +419,7 @@ StackOk:
     lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx
 
     /* Assert change went ok */
     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
     test [ebp+KPROCESS_ACTIVE_PROCESSORS], ecx
     jz WrongActiveCpu
     test [eax+KPROCESS_ACTIVE_PROCESSORS], ecx


@@ -548,7 +548,7 @@ LoadLdt:
 
 NewCr0:
 
 
 NewCr0:
 

-#ifdef DBG
+#if DBG

     /* Assert NPX State */
     test byte ptr [esi+KTHREAD_NPX_STATE], ~(NPX_STATE_NOT_LOADED)
     jnz InvalidNpx
     /* Assert NPX State */
     test byte ptr [esi+KTHREAD_NPX_STATE], ~(NPX_STATE_NOT_LOADED)
     jnz InvalidNpx


@@ -589,7 +589,7 @@ BugCheckDpc:
     push ATTEMPTED_SWITCH_FROM_DPC
     call _KeBugCheckEx@20
 
     push ATTEMPTED_SWITCH_FROM_DPC
     call _KeBugCheckEx@20
 

-#ifdef DBG
+#if DBG

 InvalidNpx:
     int 3
 WrongActiveCpu:
 InvalidNpx:
     int 3
 WrongActiveCpu:


@@ -836,7 +836,7 @@ _KiSwapProcess@8:
     lock xor [eax+KPROCESS_ACTIVE_PROCESSORS], ecx
 
     /* Sanity check */
     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
     test dword ptr [edx+KPROCESS_ACTIVE_PROCESSORS], 0
     jz WrongCpu1
     test dword ptr [eax+KPROCESS_ACTIVE_PROCESSORS], 0


@@ -871,7 +871,7 @@ NewLdt:
     /* FIXME: TODO */
     int 3
 
     /* FIXME: TODO */
     int 3
 

-#ifdef DBG
+#if DBG

 WrongCpu1:
     int 3
 WrongCpu2:
 WrongCpu1:
     int 3
 WrongCpu2:

diff --git a/reactos/ntoskrnl/ke/i386/kiinit.c b/reactos/ntoskrnl/ke/i386/kiinit.c
index 39a0541..11d1762 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/kiinit.c
+++ b/reactos/ntoskrnl/ke/i386/kiinit.c
@@ -351,7 +351,7 @@ KiInitializePcr(IN ULONG ProcessorNumber,
 #ifndef CONFIG_SMP
     Pcr->PrcbData.BuildType |= PRCB_BUILD_UNIPROCESSOR;
 #endif
 #ifndef CONFIG_SMP
     Pcr->PrcbData.BuildType |= PRCB_BUILD_UNIPROCESSOR;
 #endif

-#ifdef DBG
+#if DBG

     Pcr->PrcbData.BuildType |= PRCB_BUILD_DEBUG;
 #endif
 
     Pcr->PrcbData.BuildType |= PRCB_BUILD_DEBUG;
 #endif
 

diff --git a/reactos/ntoskrnl/ke/i386/systimer.S b/reactos/ntoskrnl/ke/i386/systimer.S
index f196971..b43ee36 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/systimer.S
+++ b/reactos/ntoskrnl/ke/i386/systimer.S
@@ -98,7 +98,7 @@ _KeUpdateRunTime@8:
 
     /* At dispatch, increase DPC time */
     inc dword ptr [eax+KPCR_PRCB_DPC_TIME]
 
     /* 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]
 
     /* Update the DPC time */
     inc dword ptr [eax+KPCR_PRCB_DEBUG_DPC_TIME]
 

diff --git a/reactos/ntoskrnl/ke/i386/trap.s b/reactos/ntoskrnl/ke/i386/trap.s
index 81e1149..594a8f4 100644 (file)
--- a/reactos/ntoskrnl/ke/i386/trap.s
+++ b/reactos/ntoskrnl/ke/i386/trap.s
@@ -200,7 +200,7 @@ NotWin32K:
     /* Increase total syscall count */
     inc dword ptr PCR[KPCR_SYSTEM_CALLS]
 
     /* 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
     /* Increase per-syscall count */
     mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT]
     jecxz NoCountTable


@@ -239,7 +239,7 @@ CopyParams:
     call ebx
 
 AfterSysCall:
     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
     /* 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 @@ BadStack:
     push 0
     jmp _KiTrap6
 
     push 0
     jmp _KiTrap6
 

-#ifdef DBG
+#if DBG

 InvalidIrql:
     /* Save current IRQL */
     push PCR[KPCR_IRQL]
 InvalidIrql:
     /* Save current IRQL */
     push PCR[KPCR_IRQL]

diff --git a/reactos/ntoskrnl/ke/spinlock.c b/reactos/ntoskrnl/ke/spinlock.c
index b1b26fa..bd13d50 100644 (file)
--- a/reactos/ntoskrnl/ke/spinlock.c
+++ b/reactos/ntoskrnl/ke/spinlock.c
@@ -189,7 +189,7 @@ KeTryToAcquireSpinLockAtDpcLevel(IN OUT PKSPIN_LOCK SpinLock)
         return FALSE;
     }
 
         return FALSE;
     }
 

-#ifdef DBG
+#if DBG

     /* On debug builds, we OR in the KTHREAD */
     *SpinLock = (ULONG_PTR)KeGetCurrentThread() | 1;
 #endif
     /* On debug builds, we OR in the KTHREAD */
     *SpinLock = (ULONG_PTR)KeGetCurrentThread() | 1;
 #endif

diff --git a/reactos/ntoskrnl/mm/rmap.c b/reactos/ntoskrnl/mm/rmap.c
index 7faa31c..e4f096e 100644 (file)
--- a/reactos/ntoskrnl/mm/rmap.c
+++ b/reactos/ntoskrnl/mm/rmap.c
@@ -24,7 +24,7 @@ typedef struct _MM_RMAP_ENTRY
    struct _MM_RMAP_ENTRY* Next;
    PEPROCESS Process;
    PVOID Address;
    struct _MM_RMAP_ENTRY* Next;
    PEPROCESS Process;
    PVOID Address;

-#ifdef DBG
+#if DBG

    PVOID Caller;
 #endif
 }
    PVOID Caller;
 #endif
 }


@@ -396,7 +396,7 @@ MmInsertRmap(PFN_TYPE Page, PEPROCESS Process,
    }
    new_entry->Address = Address;
    new_entry->Process = (PEPROCESS)Process;
    }
    new_entry->Address = Address;
    new_entry->Process = (PEPROCESS)Process;

-#ifdef DBG
+#if DBG

 #ifdef __GNUC__
    new_entry->Caller = __builtin_return_address(0);
 #else
 #ifdef __GNUC__
    new_entry->Caller = __builtin_return_address(0);
 #else


@@ -416,7 +416,7 @@ MmInsertRmap(PFN_TYPE Page, PEPROCESS Process,
    ExAcquireFastMutex(&RmapListLock);
    current_entry = MmGetRmapListHeadPage(Page);
    new_entry->Next = current_entry;
    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)
    while (current_entry)
    {
       if (current_entry->Address == new_entry->Address && current_entry->Process == new_entry->Process)

diff --git a/reactos/ntoskrnl/mm/rpoolmgr.h b/reactos/ntoskrnl/mm/rpoolmgr.h
index 2935ab8..8ca1099 100644 (file)
--- a/reactos/ntoskrnl/mm/rpoolmgr.h
+++ b/reactos/ntoskrnl/mm/rpoolmgr.h
@@ -249,7 +249,7 @@ RPoolRemoveFree ( PR_POOL pool, PR_FREE Item )
                ASSERT ( pool->FirstFree == Item );
                pool->FirstFree = Item->NextFree;
        }
                ASSERT ( pool->FirstFree == Item );
                pool->FirstFree = Item->NextFree;
        }

-#ifdef DBG
+#if DBG

        Item->NextFree = Item->PrevFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF;
 #endif//DBG
 }
        Item->NextFree = Item->PrevFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF;
 #endif//DBG
 }


@@ -290,7 +290,7 @@ RFreeInit ( void* memory )
 #endif//R_FREEMAGIC
        block->Status = 0;
        RFreeFillStack ( block );
 #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;
        block->PrevFree = block->NextFree = (PR_FREE)(ULONG_PTR)0xDEADBEEF;
 #endif//DBG
        return block;


@@ -655,7 +655,7 @@ RiUsedInit ( PR_USED Block, rulong Tag )
        //ASSERT_SIZE ( Block->Size );
 
        // now add the block to the used block list
        //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
 
        Block->NextUsed = (PR_USED)(ULONG_PTR)0xDEADBEEF;
 #endif//R_USED_LIST
 


@@ -673,7 +673,7 @@ RiUsedInitRedZone ( PR_USED Block, rulong UserSize )
        Block->UserSize = UserSize;
        memset ( Addr - R_RZ, R_RZ_LOVALUE, R_RZ );
        memset ( Addr + Block->UserSize, R_RZ_HIVALUE, R_RZ );
        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
 }
        memset ( Addr, 0xCD, UserSize );
 #endif//DBG
 }

diff --git a/reactos/ntoskrnl/ps/debug.c b/reactos/ntoskrnl/ps/debug.c
index 48077e7..baaf45c 100644 (file)
--- a/reactos/ntoskrnl/ps/debug.c
+++ b/reactos/ntoskrnl/ps/debug.c
@@ -15,7 +15,7 @@
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
 
 /* PRIVATE FUNCTIONS *********************************************************/
 

-#ifdef DBG
+#if DBG

 VOID
 NTAPI
 PspDumpThreads(BOOLEAN IncludeSystem)
 VOID
 NTAPI
 PspDumpThreads(BOOLEAN IncludeSystem)

diff --git a/reactos/ntoskrnl/rtl/libsupp.c b/reactos/ntoskrnl/rtl/libsupp.c
index c9286b5..850d667 100644 (file)
--- a/reactos/ntoskrnl/rtl/libsupp.c
+++ b/reactos/ntoskrnl/rtl/libsupp.c
@@ -159,7 +159,7 @@ RtlLeaveHeapLock(
     return STATUS_SUCCESS;
 }
 
     return STATUS_SUCCESS;
 }
 

-#ifdef DBG
+#if DBG

 VOID FASTCALL
 CHECK_PAGED_CODE_RTL(char *file, int line)
 {
 VOID FASTCALL
 CHECK_PAGED_CODE_RTL(char *file, int line)
 {

diff --git a/reactos/tools/cabman/cabinet.cxx b/reactos/tools/cabman/cabinet.cxx
index 355d663..a45f340 100755 (executable)
--- a/reactos/tools/cabman/cabinet.cxx
+++ b/reactos/tools/cabman/cabinet.cxx
@@ -64,7 +64,7 @@ static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG by
 #ifndef CAB_READ_ONLY
 
 #if 0
 #ifndef CAB_READ_ONLY
 
 #if 0

-#ifdef DBG
+#if DBG

 
 void DumpBuffer(void* Buffer, ULONG Size)
 {
 
 void DumpBuffer(void* Buffer, ULONG Size)
 {

diff --git a/reactos/tools/cabman/cabinet.h b/reactos/tools/cabman/cabinet.h
index 69b7dcc..4183084 100755 (executable)
--- a/reactos/tools/cabman/cabinet.h
+++ b/reactos/tools/cabman/cabinet.h
@@ -48,8 +48,6 @@
 
 /* Debugging */
 
 
 /* Debugging */
 

-#define DBG
-

 #define NORMAL_MASK    0x000000FF
 #define SPECIAL_MASK   0xFFFFFF00
 #define MIN_TRACE      0x00000001
 #define NORMAL_MASK    0x000000FF
 #define SPECIAL_MASK   0xFFFFFF00
 #define MIN_TRACE      0x00000001


@@ -58,7 +56,7 @@
 
 #define DEBUG_MEMORY   0x00000100
 
 
 #define DEBUG_MEMORY   0x00000100
 

-#ifdef DBG
+#if DBG

 
 extern ULONG DebugTraceLevel;
 
 
 extern ULONG DebugTraceLevel;
 

diff --git a/reactos/tools/cabman/main.cxx b/reactos/tools/cabman/main.cxx
index 1475904..88f0f15 100755 (executable)
--- a/reactos/tools/cabman/main.cxx
+++ b/reactos/tools/cabman/main.cxx
@@ -17,7 +17,7 @@
 #include "cabman.h"
 
 
 #include "cabman.h"
 
 

-#ifdef DBG
+#if DBG

 
 ULONG DebugTraceLevel = MIN_TRACE;
 //ULONG DebugTraceLevel = MID_TRACE;
 
 ULONG DebugTraceLevel = MIN_TRACE;
 //ULONG DebugTraceLevel = MID_TRACE;

diff --git a/reactos/tools/hpp/hpp.c b/reactos/tools/hpp/hpp.c
index 30a678d..ef75198 100644 (file)
--- a/reactos/tools/hpp/hpp.c
+++ b/reactos/tools/hpp/hpp.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

-#ifdef DBG
+#if DBG

 #define trace printf
 #else
 #define trace if (0) printf
 #define trace printf
 #else
 #define trace if (0) printf