Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 07:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

replace a bunch of #if's with GDIDBG_... macros

Browse source 
svn path=/trunk/; revision=32552
This commit is contained in:
Timo Kreuzer 2008-03-03 23:35:12 +00:00
parent 70e882a880
commit 7f8158f09e
1 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

80
reactos/subsystems/win32/win32k/objects/gdiobj.c
View file

@ -304,6 +304,33 @@ CaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture)
return nFrameCount; return nFrameCount;
} }
#define GDIDBG_TRACECALLER() \
DPRINT1("-> called from:\n"); \
KeRosDumpStackFrames(NULL, 20);
#define GDIDBG_TRACEALLOCATOR(index)
// DPRINT1("-> allocated from:\n");
// KeRosDumpStackFrames(GDIHandleAllocator[index], GDI_STACK_LEVELS);
#define GDIDBG_TRACELOCKER(index)
// DPRINT1("-> locked from:\n");
// KeRosDumpStackFrames(GDIHandleLocker[index], GDI_STACK_LEVELS);
#define GDIDBG_CAPTUREALLOCATOR(index) \
CaptureStackBackTace((PVOID*)GDIHandleAllocator[index], GDI_STACK_LEVELS);
#define GDIDBG_CAPTURELOCKER(index) \
CaptureStackBackTace((PVOID*)GDIHandleLocker[index], GDI_STACK_LEVELS);
#define GDIDBG_DUMPHANDLETABLE() \
IntDumpHandleTable(GdiHandleTable)
#else
#define GDIDBG_TRACECALLER()
#define GDIDBG_TRACEALLOCATOR(index)
#define GDIDBG_TRACELOCKER(index)
#define GDIDBG_CAPTUREALLOCATOR(index)
#define GDIDBG_CAPTURELOCKER(index)
#define GDIDBG_DUMPHANDLETABLE()
#endif /* GDI_DEBUG */ #endif /* GDI_DEBUG */
@ -501,9 +528,7 @@ LockHandle:
/* unlock the entry */ /* unlock the entry */
(void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, CurrentProcessId); (void)_InterlockedExchangePointer((PVOID*)&Entry->ProcessId, CurrentProcessId);
#ifdef GDI_DEBUG GDIDBG_CAPTUREALLOCATOR(Index);
CaptureStackBackTace((PVOID*)GDIHandleAllocator[Index], GDI_STACK_LEVELS);
#endif /* GDI_DEBUG */
if(W32Process != NULL) if(W32Process != NULL)
{ {
@ -540,9 +565,7 @@ LockHandle:
ExFreePool(newObject); ExFreePool(newObject);
} }
DPRINT1("Failed to insert gdi object into the handle table, no handles left!\n"); DPRINT1("Failed to insert gdi object into the handle table, no handles left!\n");
#ifdef GDI_DEBUG GDIDBG_DUMPHANDLETABLE();
IntDumpHandleTable(GdiHandleTable);
#endif /* GDI_DEBUG */
} }
else else
{ {
@ -578,10 +601,7 @@ GDIOBJ_FreeObj(HGDIOBJ hObj, DWORD ExpectedType)
if(GDI_HANDLE_IS_STOCKOBJ(hObj)) if(GDI_HANDLE_IS_STOCKOBJ(hObj))
{ {
DPRINT1("GDIOBJ_FreeObj() failed, can't delete stock object handle: 0x%x !!!\n", hObj); DPRINT1("GDIOBJ_FreeObj() failed, can't delete stock object handle: 0x%x !!!\n", hObj);
#ifdef GDI_DEBUG GDIDBG_TRACECALLER();
DPRINT1("-> called from:\n");
KeRosDumpStackFrames(NULL, 20);
#endif
return FALSE; return FALSE;
} }
@ -601,11 +621,8 @@ GDIOBJ_FreeObj(HGDIOBJ hObj, DWORD ExpectedType)
{ {
DPRINT1("Attempted to free object 0x%x of wrong type (Handle: 0x%x, expected: 0x%x)\n", DPRINT1("Attempted to free object 0x%x of wrong type (Handle: 0x%x, expected: 0x%x)\n",
hObj, HandleType, ExpectedType); hObj, HandleType, ExpectedType);
#ifdef GDI_DEBUG GDIDBG_TRACECALLER();
DPRINT1("-> called from:\n"); return FALSE;
KeRosDumpStackFrames(NULL, 20);
#endif
return FALSE;
} }
Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, hObj); Entry = GDI_HANDLE_GET_ENTRY(GdiHandleTable, hObj);
@ -669,10 +686,7 @@ LockHandle:
* The object is currently locked, so freeing is forbidden! * The object is currently locked, so freeing is forbidden!
*/ */
DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock); DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock);
#ifdef GDI_DEBUG GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj));
// DPRINT1("Locked from:\n");
// KeRosDumpStackFrames(GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS);
#endif
ASSERT(FALSE); ASSERT(FALSE);
} }
} }
@ -709,12 +723,8 @@ LockHandle:
{ {
DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1); DPRINT1("Attempted to free foreign handle: 0x%x Owner: 0x%x from Caller: 0x%x\n", hObj, (ULONG_PTR)PrevProcId & ~0x1, (ULONG_PTR)ProcessId & ~0x1);
} }
#ifdef GDI_DEBUG GDIDBG_TRACECALLER();
DPRINT1("-> called from:\n"); GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
KeRosDumpStackFrames(NULL, 20);
// DPRINT1("Allocated from:\n");
// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS);
#endif
} }
} }
@ -860,11 +870,8 @@ GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ExpectedType)
{ {
DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n", DPRINT1("Attempted to lock object 0x%x of wrong type (Handle: 0x%x, requested: 0x%x)\n",
hObj, HandleType, ExpectedType); hObj, HandleType, ExpectedType);
#ifdef GDI_DEBUG GDIDBG_TRACECALLER();
KeRosDumpStackFrames(NULL, 20); GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
// DPRINT1("Allocated from:\n");
// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS);
#endif
return NULL; return NULL;
} }
@ -874,12 +881,9 @@ GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ExpectedType)
/* Check for invalid owner. */ /* Check for invalid owner. */
if (ProcessId != HandleProcessId && HandleProcessId != NULL) if (ProcessId != HandleProcessId && HandleProcessId != NULL)
{ {
DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId); DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId);
#ifdef GDI_DEBUG GDIDBG_TRACECALLER();
KeRosDumpStackFrames(NULL, 20); GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
// DPRINT1("Handle allocator:\n");
// KeRosDumpStackFrames(GDIHandleAllocator[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS);
#endif
return NULL; return NULL;
} }
@ -921,9 +925,7 @@ GDIOBJ_LockObj (HGDIOBJ hObj, DWORD ExpectedType)
{ {
Object->Tid = Thread; Object->Tid = Thread;
Object->cExclusiveLock = 1; Object->cExclusiveLock = 1;
#ifdef GDI_DEBUG GDIDBG_CAPTURELOCKER(GDI_HANDLE_GET_INDEX(hObj))
CaptureStackBackTace((PVOID*)GDIHandleLocker[GDI_HANDLE_GET_INDEX(hObj)], GDI_STACK_LEVELS);
#endif
} }
else else
{ {