Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-21 20:50:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[win32k]

Browse source 
- The timer is created usingUserCreateObject. It may be a good idea to save the handle in the timer object so that it can be deleted later.
- Dereference the object before attempting to delete it.

svn path=/trunk/; revision=47393
This commit is contained in:
Michael Martin 2010-05-29 06:51:03 +00:00
parent 61325bb279
commit a8a65751a3
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
reactos/subsystems/win32/win32k/ntuser/timer.c
View file

@ -50,13 +50,21 @@ CreateTimer(VOID)
if (!FirstpTmr)
{
FirstpTmr = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER));
if (FirstpTmr) InitializeListHead(&FirstpTmr->ptmrList);
if (FirstpTmr)
{
FirstpTmr->head.h = Handle;
InitializeListHead(&FirstpTmr->ptmrList);
}
Ret = FirstpTmr;
}
else
{
Ret = UserCreateObject(gHandleTable, NULL, &Handle, otTimer, sizeof(TIMER));
if (Ret) InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList);
if (Ret)
{
Ret->head.h = Handle;
InsertTailList(&FirstpTmr->ptmrList, &Ret->ptmrList);
}
}
return Ret;
}
@ -66,14 +74,17 @@ BOOL
FASTCALL
RemoveTimer(PTIMER pTmr)
{
BOOL Ret = FALSE;
if (pTmr)
{
/* Set the flag, it will be removed when ready */
RemoveEntryList(&pTmr->ptmrList);
UserDeleteObject( UserHMGetHandle(pTmr), otTimer);
return TRUE;
UserDereferenceObject(pTmr);
Ret = UserDeleteObject( UserHMGetHandle(pTmr), otTimer);
}
return FALSE;
if (!Ret) DPRINT1("Warning unable to delete timer\n");
return Ret;
}
PTIMER
@ -528,9 +539,7 @@ DestroyTimersForWindow(PTHREADINFO pti, PWINDOW_OBJECT Window)
{
if ((pTmr) && (pTmr->pti == pti) && (pTmr->pWnd == Window))
{
RemoveEntryList(&pTmr->ptmrList);
UserDeleteObject( UserHMGetHandle(pTmr), otTimer);
TimersRemoved = TRUE;
TimersRemoved = RemoveTimer(pTmr);
}
pLE = pTmr->ptmrList.Flink;
pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);
@ -557,9 +566,7 @@ DestroyTimersForThread(PTHREADINFO pti)
{
if ((pTmr) && (pTmr->pti == pti))
{
RemoveEntryList(&pTmr->ptmrList);
UserDeleteObject( UserHMGetHandle(pTmr), otTimer);
TimersRemoved = TRUE;
TimersRemoved = RemoveTimer(pTmr);
}
pLE = pTmr->ptmrList.Flink;
pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);