mirror of
https://github.com/reactos/reactos.git
synced 2025-05-28 21:48:19 +00:00
- 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
This commit is contained in:
parent
a7caca2e37
commit
1016fc25ff
12 changed files with 19 additions and 17 deletions
|
@ -105,6 +105,8 @@ else()
|
||||||
|
|
||||||
if(DBG)
|
if(DBG)
|
||||||
add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE)
|
add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE)
|
||||||
|
else
|
||||||
|
add_definitions(-DDBG=0)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(KDBG)
|
if(KDBG)
|
||||||
|
|
|
@ -1312,7 +1312,7 @@ ProcessResources
|
||||||
ULONG countDMA = ResourceList->NumberOfDmas();
|
ULONG countDMA = ResourceList->NumberOfDmas();
|
||||||
ULONG lengthIO = ResourceList->FindTranslatedPort(0)->u.Port.Length;
|
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);
|
DPRINT("Starting MPU401 Port 0x%lx", ResourceList->FindTranslatedPort(0)->u.Port.Start.LowPart);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -226,7 +226,7 @@ StreamClassDebugAssert(
|
||||||
IN PCHAR AssertText,
|
IN PCHAR AssertText,
|
||||||
IN ULONG AssertValue)
|
IN ULONG AssertValue)
|
||||||
{
|
{
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
DbgBreakPoint();
|
DbgBreakPoint();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -241,7 +241,7 @@ StreamClassDebugPrint(
|
||||||
IN PCCHAR DebugMessage,
|
IN PCCHAR DebugMessage,
|
||||||
...)
|
...)
|
||||||
{
|
{
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
||||||
if (DebugPrintLevel <=STREAMDEBUG_LEVEL)
|
if (DebugPrintLevel <=STREAMDEBUG_LEVEL)
|
||||||
|
|
|
@ -22,13 +22,13 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
#define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0)
|
#define HAL_BUILD_TYPE (DBG ? PRCB_BUILD_DEBUG : 0)
|
||||||
#else
|
#else
|
||||||
#define HAL_BUILD_TYPE 0
|
#define HAL_BUILD_TYPE 0
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
#define HAL_BUILD_TYPE ((DBG ? PRCB_BUILD_DEBUG : 0) | PRCB_BUILD_UNIPROCESSOR)
|
#define HAL_BUILD_TYPE ((DBG ? PRCB_BUILD_DEBUG : 0) | PRCB_BUILD_UNIPROCESSOR)
|
||||||
#else
|
#else
|
||||||
#define HAL_BUILD_TYPE 0 | PRCB_BUILD_UNIPROCESSOR
|
#define HAL_BUILD_TYPE 0 | PRCB_BUILD_UNIPROCESSOR
|
||||||
|
|
|
@ -51,7 +51,7 @@ FORCEINLINE
|
||||||
VOID
|
VOID
|
||||||
KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock)
|
KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock)
|
||||||
{
|
{
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
/* Make sure that we don't own the lock already */
|
/* Make sure that we don't own the lock already */
|
||||||
if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock)
|
if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock)
|
||||||
{
|
{
|
||||||
|
@ -63,7 +63,7 @@ KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock)
|
||||||
/* Try to acquire the lock */
|
/* Try to acquire the lock */
|
||||||
while (InterlockedBitTestAndSet((PLONG)SpinLock, 0))
|
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 */
|
/* On x86 debug builds, we use a much slower but useful routine */
|
||||||
Kii386SpinOnSpinLock(SpinLock, 5);
|
Kii386SpinOnSpinLock(SpinLock, 5);
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -114,7 +114,7 @@ KiInitializePcr(IN PKIPCR Pcr,
|
||||||
#ifndef CONFIG_SMP
|
#ifndef CONFIG_SMP
|
||||||
Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR;
|
Pcr->Prcb.BuildType |= PRCB_BUILD_UNIPROCESSOR;
|
||||||
#endif
|
#endif
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG;
|
Pcr->Prcb.BuildType |= PRCB_BUILD_DEBUG;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -506,7 +506,7 @@ Win32CsrHardError(
|
||||||
IN PCSR_THREAD ThreadData,
|
IN PCSR_THREAD ThreadData,
|
||||||
IN PHARDERROR_MSG Message)
|
IN PHARDERROR_MSG Message)
|
||||||
{
|
{
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
PCSR_PROCESS ProcessData = ThreadData->Process;
|
PCSR_PROCESS ProcessData = ThreadData->Process;
|
||||||
#endif
|
#endif
|
||||||
ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS];
|
ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS];
|
||||||
|
|
|
@ -194,12 +194,12 @@ typedef struct _PROCESSINFO
|
||||||
struct _GDI_POOL *pPoolBrushAttr;
|
struct _GDI_POOL *pPoolBrushAttr;
|
||||||
struct _GDI_POOL *pPoolRgnAttr;
|
struct _GDI_POOL *pPoolRgnAttr;
|
||||||
|
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
BYTE DbgChannelLevel[DbgChCount];
|
BYTE DbgChannelLevel[DbgChCount];
|
||||||
#endif
|
#endif
|
||||||
} PROCESSINFO;
|
} PROCESSINFO;
|
||||||
|
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
void NTAPI UserDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments);
|
void NTAPI UserDbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments);
|
||||||
ULONG_PTR NTAPI UserDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult);
|
ULONG_PTR NTAPI UserDbgPostServiceHook(ULONG ulSyscallId, ULONG_PTR ulResult);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
|
|
@ -30,7 +30,7 @@ extern ULONG_PTR Win32kSSDT[];
|
||||||
extern UCHAR Win32kSSPT[];
|
extern UCHAR Win32kSSPT[];
|
||||||
extern ULONG Win32kNumberOfSysCalls;
|
extern ULONG Win32kNumberOfSysCalls;
|
||||||
|
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
void
|
void
|
||||||
NTAPI
|
NTAPI
|
||||||
DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments)
|
DbgPreServiceHook(ULONG ulSyscallId, PULONG_PTR pulArguments)
|
||||||
|
@ -85,7 +85,7 @@ Win32kProcessCallback(struct _EPROCESS *Process,
|
||||||
|
|
||||||
PsSetProcessWin32Process(Process, ppiCurrent);
|
PsSetProcessWin32Process(Process, ppiCurrent);
|
||||||
|
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
DbgInitDebugChannels();
|
DbgInitDebugChannels();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -566,7 +566,7 @@ DriverEntry(
|
||||||
PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData);
|
PsEstablishWin32Callouts((PWIN32_CALLOUTS_FPNS)&CalloutData);
|
||||||
|
|
||||||
/* Register service hook callbacks */
|
/* Register service hook callbacks */
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0);
|
KdSystemDebugControl('CsoR', DbgPreServiceHook, ID_Win32PreServiceHook, 0, 0, 0, 0);
|
||||||
KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0);
|
KdSystemDebugControl('CsoR', DbgPostServiceHook, ID_Win32PostServiceHook, 0, 0, 0, 0);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
/** INCLUDES ******************************************************************/
|
/** INCLUDES ******************************************************************/
|
||||||
|
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
#include <win32k.h>
|
#include <win32k.h>
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
|
@ -1309,7 +1309,7 @@ GDI_CleanupForProcess(struct _EPROCESS *Process)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DBG
|
#if DBG
|
||||||
//#ifdef GDI_DEBUG
|
//#ifdef GDI_DEBUG
|
||||||
DbgGdiHTIntegrityCheck();
|
DbgGdiHTIntegrityCheck();
|
||||||
//#endif
|
//#endif
|
||||||
|
|
Loading…
Reference in a new issue