Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 16:36:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K]

Browse source 
Don't calll GDIOBJ_vDereferenceObject from GDIOBJ_vUnlockObject, instead manually decrement the reference count. This allows us to ASSERT that the former function is never called with an exclusive lock held.

svn path=/trunk/; revision=56458
This commit is contained in:
Timo Kreuzer 2012-05-01 09:29:41 +00:00
parent bb3050e722
commit c99f588f86
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/win32ss/gdi/ntgdi/gdiobj.c
View file

@ -476,6 +476,9 @@ GDIOBJ_vDereferenceObject(POBJ pobj)
{
ULONG cRefs, ulIndex;
/* Must not be exclusively locked */
ASSERT(pobj->cExclusiveLock == 0);
/* Check if the object has a handle */
if (GDI_HANDLE_GET_INDEX(pobj->hHmgr))
{
@ -647,11 +650,13 @@ VOID
NTAPI
GDIOBJ_vUnlockObject(POBJ pobj)
{
ULONG cRefs, ulIndex;
ASSERT(pobj->cExclusiveLock > 0);
/* Decrease lock count */
pobj->cExclusiveLock--;
DBG_DECREASE_LOCK_COUNT(PsGetCurrentProcessWin32Process(), pobj->hHmgr);
DBG_LOGEVENT(&pobj->slhLog, EVENT_UNLOCK, 0);
/* Check if this was the last lock */
if (pobj->cExclusiveLock == 0)
@ -664,9 +669,13 @@ GDIOBJ_vUnlockObject(POBJ pobj)
KeLeaveCriticalRegion();
}
/* Dereference the object */
DBG_LOGEVENT(&pobj->slhLog, EVENT_UNLOCK, 0);
GDIOBJ_vDereferenceObject(pobj);
/* Calculate the index */
ulIndex = GDI_HANDLE_GET_INDEX(pobj->hHmgr);
/* Decrement reference count */
ASSERT((gpaulRefCount[ulIndex] & REF_MASK_COUNT) > 0);
cRefs = InterlockedDecrement((LONG*)&gpaulRefCount[ulIndex]);
ASSERT(cRefs & REF_MASK_VALID);
}
HGDIOBJ