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

[WIN32K]

Browse source 
- Remove the cursor from the process cache when its handle is deleted, not after.
 - Do not return an invalid handle in NtUserSetCursor.
CORE-7575

svn path=/trunk/; revision=64912
This commit is contained in:
Jérôme Gardou 2014-10-23 09:32:39 +00:00
parent 797a6346f2
commit 54592b1afb
1 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

62
reactos/win32ss/user/ntuser/cursoricon_new.c
View file

@ -63,9 +63,9 @@ PCURICON_OBJECT FASTCALL UserGetCurIconObject(HCURSOR hCurIcon)
return NULL; return NULL;
} }
if(UserObjectInDestroy(hCurIcon)) if (UserObjectInDestroy(hCurIcon))
{ {
ERR("Requesting destroyed cursor.\n"); WARN("Requesting invalid/destroyed cursor.\n");
EngSetLastError(ERROR_INVALID_CURSOR_HANDLE); EngSetLastError(ERROR_INVALID_CURSOR_HANDLE);
return NULL; return NULL;
} }
@ -155,6 +155,36 @@ IntDestroyCurIconObject(
{ {
PCURICON_OBJECT CurIcon = Object; PCURICON_OBJECT CurIcon = Object;
/* Try finding it in its process cache */
if (CurIcon->CURSORF_flags & CURSORF_LRSHARED)
{
PPROCESSINFO ppi;
ppi = CurIcon->head.ppi;
if (ppi->pCursorCache == CurIcon)
{
ppi->pCursorCache = CurIcon->pcurNext;
UserDereferenceObject(CurIcon);
}
else
{
PCURICON_OBJECT CacheCurIcon = ppi->pCursorCache;
while (CacheCurIcon)
{
if (CacheCurIcon->pcurNext == CurIcon)
{
CacheCurIcon->pcurNext = CurIcon->pcurNext;
break;
}
CacheCurIcon = CacheCurIcon->pcurNext;
}
/* We must have found it! */
ASSERT(CacheCurIcon != NULL);
UserDereferenceObject(CurIcon);
}
}
/* We just mark the handle as being destroyed. /* We just mark the handle as being destroyed.
* Deleting all the stuff will be deferred to the actual struct free. */ * Deleting all the stuff will be deferred to the actual struct free. */
return UserDeleteObject(CurIcon->head.h, TYPE_CURSOR); return UserDeleteObject(CurIcon->head.h, TYPE_CURSOR);
@ -204,32 +234,12 @@ FreeCurIconObject(
if (CurIcon->CURSORF_flags & CURSORF_LRSHARED) if (CurIcon->CURSORF_flags & CURSORF_LRSHARED)
{ {
PPROCESSINFO ppi;
if (!IS_INTRESOURCE(CurIcon->strName.Buffer)) if (!IS_INTRESOURCE(CurIcon->strName.Buffer))
ExFreePoolWithTag(CurIcon->strName.Buffer, TAG_STRING); ExFreePoolWithTag(CurIcon->strName.Buffer, TAG_STRING);
if (CurIcon->atomModName) if (CurIcon->atomModName)
RtlDeleteAtomFromAtomTable(gAtomTable, CurIcon->atomModName); RtlDeleteAtomFromAtomTable(gAtomTable, CurIcon->atomModName);
CurIcon->strName.Buffer = NULL; CurIcon->strName.Buffer = NULL;
CurIcon->atomModName = 0; CurIcon->atomModName = 0;
/* Try finding it in its process cache */
ppi = CurIcon->head.ppi;
if (ppi->pCursorCache == CurIcon)
ppi->pCursorCache = CurIcon->pcurNext;
else
{
PCURICON_OBJECT CacheCurIcon= ppi->pCursorCache;
while (CacheCurIcon)
{
if (CacheCurIcon->pcurNext == CurIcon)
{
CacheCurIcon->pcurNext = CurIcon->pcurNext;
break;
}
CacheCurIcon = CacheCurIcon->pcurNext;
}
}
} }
/* Finally free the thing */ /* Finally free the thing */
@ -635,7 +645,7 @@ NtUserDestroyCursor(
{ {
BOOL ret; BOOL ret;
TRACE("Enter NtUserDestroyCursorIcon\n"); TRACE("Enter NtUserDestroyCursorIcon (%p, %u)\n", hCurIcon, bForce);
UserEnterExclusive(); UserEnterExclusive();
if (!bForce) if (!bForce)
@ -842,7 +852,7 @@ NtUserSetCursor(
PCURICON_OBJECT pcurOld, pcurNew; PCURICON_OBJECT pcurOld, pcurNew;
HCURSOR hOldCursor = NULL; HCURSOR hOldCursor = NULL;
TRACE("Enter NtUserSetCursor\n"); TRACE("Enter NtUserSetCursor: %p\n", hCursor);
UserEnterExclusive(); UserEnterExclusive();
if (hCursor) if (hCursor)
@ -863,6 +873,10 @@ NtUserSetCursor(
pcurOld = UserSetCursor(pcurNew, FALSE); pcurOld = UserSetCursor(pcurNew, FALSE);
if (pcurOld) if (pcurOld)
{ {
hOldCursor = pcurOld->head.h;
/* See if it was destroyed in the meantime */
if (UserObjectInDestroy(hOldCursor))
hOldCursor = NULL;
pcurOld->CURSORF_flags &= ~CURSORF_CURRENT; pcurOld->CURSORF_flags &= ~CURSORF_CURRENT;
UserDereferenceObject(pcurOld); UserDereferenceObject(pcurOld);
} }