From 1016fc25ffc6a4d39741120de178ff72ecc2ba2e Mon Sep 17 00:00:00 2001 From: Stefan Ginsberg Date: Thu, 8 Mar 2012 09:18:28 +0000 Subject: [PATCH] - Fix DBG macro AGAIN which got broken during the switch to cmake. Checked build: DBG = 1, free build: DBG = 0. Noobs. svn path=/trunk/; revision=56090 --- reactos/CMakeLists.txt | 2 ++ reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp | 2 +- reactos/drivers/wdm/audio/legacy/stream/driver.c | 4 ++-- reactos/hal/halx86/include/halp.h | 4 ++-- reactos/ntoskrnl/include/internal/spinlock.h | 4 ++-- reactos/ntoskrnl/ke/amd64/kiinit.c | 2 +- reactos/subsystems/win32/csrss/win32csr/harderror.c | 2 +- reactos/subsystems/win32/win32k/include/win32.h | 4 ++-- reactos/subsystems/win32/win32k/include/win32kdebug.h | 2 +- reactos/subsystems/win32/win32k/main/dllmain.c | 6 +++--- reactos/subsystems/win32/win32k/objects/gdidbg.c | 2 +- reactos/subsystems/win32/win32k/objects/gdiobj.c | 2 +- 12 files changed, 19 insertions(+), 17 deletions(-) diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt index 4dbc8825a46..e182d589d24 100644 --- a/reactos/CMakeLists.txt +++ b/reactos/CMakeLists.txt @@ -105,6 +105,8 @@ else() if(DBG) add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) + else + add_definitions(-DDBG=0) endif() if(KDBG) diff --git a/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp b/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp index d3f8b8a29db..a94a3623433 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp @@ -1312,7 +1312,7 @@ ProcessResources ULONG countDMA = ResourceList->NumberOfDmas(); ULONG lengthIO = ResourceList->FindTranslatedPort(0)->u.Port.Length; -#ifdef DBG +#if DBG DPRINT("Starting MPU401 Port 0x%lx", ResourceList->FindTranslatedPort(0)->u.Port.Start.LowPart); #endif diff --git a/reactos/drivers/wdm/audio/legacy/stream/driver.c b/reactos/drivers/wdm/audio/legacy/stream/driver.c index 244cb0b3430..4bb5821b54f 100644 --- a/reactos/drivers/wdm/audio/legacy/stream/driver.c +++ b/reactos/drivers/wdm/audio/legacy/stream/driver.c @@ -226,7 +226,7 @@ StreamClassDebugAssert( IN PCHAR AssertText, IN ULONG AssertValue) { -#ifdef DBG +#if DBG DbgBreakPoint(); #endif } @@ -241,7 +241,7 @@ StreamClassDebugPrint( IN PCCHAR DebugMessage, ...) { -#ifdef DBG +#if DBG va_list ap; if (DebugPrintLevel <=STREAMDEBUG_LEVEL) diff --git a/reactos/hal/halx86/include/halp.h b/reactos/hal/halx86/include/halp.h index eb63d479933..4c2e72ae885 100644 --- a/reactos/hal/halx86/include/halp.h +++ b/reactos/hal/halx86/include/halp.h @@ -22,13 +22,13 @@ #endif #ifdef CONFIG_SMP -#ifdef DBG +#if DBG #define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0) #else #define HAL_BUILD_TYPE 0 #endif #else -#ifdef DBG +#if DBG #define HAL_BUILD_TYPE ((DBG ? PRCB_BUILD_DEBUG : 0) | PRCB_BUILD_UNIPROCESSOR) #else #define HAL_BUILD_TYPE 0 | PRCB_BUILD_UNIPROCESSOR diff --git a/reactos/ntoskrnl/include/internal/spinlock.h b/reactos/ntoskrnl/include/internal/spinlock.h index 6b38fb9c158..26cfa2db275 100644 --- a/reactos/ntoskrnl/include/internal/spinlock.h +++ b/reactos/ntoskrnl/include/internal/spinlock.h @@ -51,7 +51,7 @@ FORCEINLINE VOID KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) { -#ifdef DBG +#if DBG /* Make sure that we don't own the lock already */ if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) { @@ -63,7 +63,7 @@ KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) /* Try to acquire the lock */ while (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) { -#if defined(_M_IX86) && defined(DBG) +#if defined(_M_IX86) && DBG /* On x86 debug builds, we use a much slower but useful routine */ Kii386SpinOnSpinLock(SpinLock, 5); #else diff --git a/reactos/ntoskrnl/ke/amd64/kiinit.c b/reactos/ntoskrnl/ke/amd64/kiinit.c index 76cb3711f61..2aef8a27b80 100644 --- a/reactos/ntoskrnl/ke/amd64/kiinit.c +++ b/reactos/ntoskrnl/ke/amd64/kiinit.c @@ -114,7 +114,7 @@ KiInitializePcr(IN PKIPCR Pcr, #ifndef CONFIG_SMP Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR; #endif -#ifdef DBG +#if DBG Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG; #endif diff --git a/reactos/subsystems/win32/csrss/win32csr/harderror.c b/reactos/subsystems/win32/csrss/win32csr/harderror.c index 1b7aee87130..b0279c4340e 100644 --- a/reactos/subsystems/win32/csrss/win32csr/harderror.c +++ b/reactos/subsystems/win32/csrss/win32csr/harderror.c @@ -506,7 +506,7 @@ Win32CsrHardError( IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message) { -#ifdef DBG +#if DBG PCSR_PROCESS ProcessData = ThreadData->Process; #endif ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; diff --git a/reactos/subsystems/win32/win32k/include/win32.h b/reactos/subsystems/win32/win32k/include/win32.h index 480c267a861..cb89c0a61a4 100644 --- a/reactos/subsystems/win32/win32k/include/win32.h +++ b/reactos/subsystems/win32/win32k/include/win32.h @@ -194,12 +194,12 @@ typedef struct _PROCESSINFO struct _GDI_POOL *pPoolBrushAttr; struct _GDI_POOL *pPoolRgnAttr; -#ifdef DBG +#if DBG BYTE DbgChannelLevel[DbgChCount]; #endif } PROCESSINFO; -#ifdef DBG +#if DBG void NTAPI UserDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments); ULONG_PTR NTAPI UserDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult); #endif diff --git a/reactos/subsystems/win32/win32k/include/win32kdebug.h b/reactos/subsystems/win32/win32k/include/win32kdebug.h index 9175150fbbb..83de71a8314 100644 --- a/reactos/subsystems/win32/win32k/include/win32kdebug.h +++ b/reactos/subsystems/win32/win32k/include/win32kdebug.h @@ -27,7 +27,7 @@ */ -#ifdef DBG +#if DBG typedef struct { diff --git a/reactos/subsystems/win32/win32k/main/dllmain.c b/reactos/subsystems/win32/win32k/main/dllmain.c index 73b57f480e7..53b031e20c7 100644 --- a/reactos/subsystems/win32/win32k/main/dllmain.c +++ b/reactos/subsystems/win32/win32k/main/dllmain.c @@ -30,7 +30,7 @@ extern ULONG_PTR Win32kSSDT[]; extern UCHAR Win32kSSPT[]; extern ULONG Win32kNumberOfSysCalls; -#ifdef DBG +#if DBG void NTAPI DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments) @@ -85,7 +85,7 @@ Win32kProcessCallback(struct _EPROCESS *Process, PsSetProcessWin32Process(Process, ppiCurrent); -#ifdef DBG +#if DBG DbgInitDebugChannels(); #endif @@ -566,7 +566,7 @@ DriverEntry( PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData); /* Register service hook callbacks */ -#ifdef DBG +#if DBG KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0); KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0); #endif diff --git a/reactos/subsystems/win32/win32k/objects/gdidbg.c b/reactos/subsystems/win32/win32k/objects/gdidbg.c index b79e79e68d2..5172a5eabb5 100644 --- a/reactos/subsystems/win32/win32k/objects/gdidbg.c +++ b/reactos/subsystems/win32/win32k/objects/gdidbg.c @@ -8,7 +8,7 @@ /** INCLUDES ******************************************************************/ -#ifdef DBG +#if DBG #include #define NDEBUG #include diff --git a/reactos/subsystems/win32/win32k/objects/gdiobj.c b/reactos/subsystems/win32/win32k/objects/gdiobj.c index 4d76f36fc19..79f87ac1547 100644 --- a/reactos/subsystems/win32/win32k/objects/gdiobj.c +++ b/reactos/subsystems/win32/win32k/objects/gdiobj.c @@ -1309,7 +1309,7 @@ GDI_CleanupForProcess(struct _EPROCESS *Process) } } -#ifdef DBG +#if DBG //#ifdef GDI_DEBUG DbgGdiHTIntegrityCheck(); //#endif