ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

some leftover from last sync : GDIDBG macros expect handles, not index

Browse Source 
svn path=/branches/reactos-yarotows/; revision=47119
This commit is contained in:
Jérôme Gardou
2010-05-07 23:33:11 +00:00
parent 147736390c
commit a7eaab78db
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
subsystems/win32/win32k/objects/dclife.c
+2
View File
@@ -796,6 +796,7 @@ IntGdiDeleteDC(HDC hDC, BOOL Force)
if (DCToDelete == NULL)
{
SetLastWin32Error(ERROR_INVALID_HANDLE);
DPRINT1("Could not lock DC to delete\n");
return FALSE;
}
@@ -842,6 +843,7 @@ NtGdiDeleteObjectApp(HANDLE DCHandle)
if (!GDIOBJ_OwnedByCurrentProcess(DCHandle))
{
DPRINT1("Not a DC from current process!\n");
SetLastWin32Error(ERROR_INVALID_HANDLE);
return FALSE;
}
subsystems/win32/win32k/objects/gdiobj.c
+5 -5
View File
@@ -646,7 +646,7 @@ LockHandle:
*/
DPRINT1("Object->cExclusiveLock = %d\n", Object->cExclusiveLock);
GDIDBG_TRACECALLER();
GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj));
GDIDBG_TRACELOCKER(hObj);
(void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId);
/* do not assert here for it will call again from dxg.sys it being call twice */
@@ -688,7 +688,7 @@ LockHandle:
}
DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId);
GDIDBG_TRACECALLER();
GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
GDIDBG_TRACEALLOCATOR(hObj);
}
}
@@ -989,7 +989,7 @@ GDIOBJ_LockObj(HGDIOBJ hObj, DWORD ExpectedType)
{
DPRINT1("Tried to lock object (0x%p) of wrong owner! ProcessId = %p, HandleProcessId = %p\n", hObj, ProcessId, HandleProcessId);
GDIDBG_TRACECALLER();
GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
GDIDBG_TRACEALLOCATOR(hObj);
return NULL;
}
@@ -1039,8 +1039,8 @@ GDIOBJ_LockObj(HGDIOBJ hObj, DWORD ExpectedType)
{
GDIDBG_TRACELOOP(hObj, Object->Tid, Thread);
GDIDBG_TRACECALLER();
GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj));
GDIDBG_TRACEALLOCATOR(GDI_HANDLE_GET_INDEX(hObj));
GDIDBG_TRACELOCKER(hObj);
GDIDBG_TRACEALLOCATOR(hObj);
/* Unlock the handle table entry. */
(void)InterlockedExchangePointer((PVOID*)&Entry->ProcessId, PrevProcId);