[ros-diffs] [mjmartin] 47385: [win32k] - Remove use of TMRF_DELETEPENDING for deleting timers as this was a bad idea. Timers need to be deleted immediately as waiting for them to be deleted resulted in some processes running out of handles. Fixes richedit winetest for editor. - Add flag TMRF_TIFROMWND for timers created from user mode so the thread stored in the timer object is from the window and not caller. Fixes an issue where FireFox would not show any of its windows and looked dead. - When creating and deleting timers, If the window is non null and IDEvent is 0 then the IDEvent is changed to 1. - When modifying timer list use UserEnter and Leave instead of a Critical Region only.
mjmartin at svn.reactos.org
mjmartin at svn.reactos.org
Fri May 28 22:35:31 CEST 2010
Author: mjmartin
Date: Fri May 28 22:35:30 2010
New Revision: 47385
URL: http://svn.reactos.org/svn/reactos?rev=47385&view=rev
Log:
[win32k]
- Remove use of TMRF_DELETEPENDING for deleting timers as this was a bad idea.
Timers need to be deleted immediately as waiting for them to be deleted resulted in some processes running out of handles.
Fixes richedit winetest for editor.
- Add flag TMRF_TIFROMWND for timers created from user mode so the thread stored in the timer object is from the window and not caller.
Fixes an issue where FireFox would not show any of its windows and looked dead.
- When creating and deleting timers, If the window is non null and IDEvent is 0 then the IDEvent is changed to 1.
- When modifying timer list use UserEnter and Leave instead of a Critical Region only.
Modified:
trunk/reactos/subsystems/win32/win32k/include/timer.h
trunk/reactos/subsystems/win32/win32k/ntuser/timer.c
Modified: trunk/reactos/subsystems/win32/win32k/include/timer.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/timer.h?rev=47385&r1=47384&r2=47385&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/timer.h [iso-8859-1] Fri May 28 22:35:30 2010
@@ -23,7 +23,6 @@
#define TMRF_ONESHOT 0x0010
#define TMRF_WAITING 0x0020
#define TMRF_TIFROMWND 0x0040
-#define TMRF_DELETEPENDING 0x8000
extern PKTIMER MasterTimer;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/timer.c?rev=47385&r1=47384&r2=47385&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Fri May 28 22:35:30 2010
@@ -69,7 +69,8 @@
if (pTmr)
{
/* Set the flag, it will be removed when ready */
- pTmr->flags |= TMRF_DELETEPENDING;
+ RemoveEntryList(&pTmr->ptmrList);
+ UserDeleteObject( UserHMGetHandle(pTmr), otTimer);
return TRUE;
}
return FALSE;
@@ -215,21 +216,25 @@
Ret = IDEvent;
}
+ if ((Window) && (IDEvent == 0))
+ IDEvent = 1;
+
pTmr = FindTimer(Window, IDEvent, Type, FALSE);
- if ((!pTmr) || (pTmr->flags & TMRF_DELETEPENDING))
+ if (!pTmr)
{
pTmr = CreateTimer();
if (!pTmr) return 0;
- if (Window && (Type & TMRF_TIFROMWND))
- pTmr->pti = Window->pti->pEThread->Tcb.Win32Thread;
- else
- {
- if (Type & TMRF_RIT)
- pTmr->pti = ptiRawInput;
- else
- pTmr->pti = PsGetCurrentThreadWin32Thread();
+ if (Window && (Type & TMRF_TIFROMWND))
+ pTmr->pti = Window->pti->pEThread->Tcb.Win32Thread;
+ else
+ {
+ if (Type & TMRF_RIT)
+ pTmr->pti = ptiRawInput;
+ else
+ pTmr->pti = PsGetCurrentThreadWin32Thread();
}
+
pTmr->pWnd = Window;
pTmr->cmsCountdown = Elapse;
pTmr->cmsRate = Elapse;
@@ -237,9 +242,11 @@
pTmr->nID = IDEvent;
pTmr->flags = Type|TMRF_INIT; // Set timer to Init mode.
}
-
- pTmr->cmsCountdown = Elapse;
- pTmr->cmsRate = Elapse;
+ else
+ {
+ pTmr->cmsCountdown = Elapse;
+ pTmr->cmsRate = Elapse;
+ }
ASSERT(MasterTimer != NULL);
// Start the timer thread!
@@ -302,7 +309,7 @@
pti = PsGetCurrentThreadWin32Thread();
ThreadQueue = pti->MessageQueue;
- KeEnterCriticalRegion();
+ UserEnterExclusive();
do
{
@@ -325,7 +332,7 @@
pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);
} while (pTmr != FirstpTmr);
- KeLeaveCriticalRegion();
+ UserLeave();
return Hit;
}
@@ -389,25 +396,7 @@
}
}
}
- if (pTmr->flags & TMRF_DELETEPENDING)
- {
- DPRINT("Removing Timer %x from List\n", pTmr);
-
- /* FIXME: Fix this!!!! */
-/*
- if (!pTmr->pWnd)
- {
- DPRINT1("Clearing Bits for WindowLess Timer\n");
- IntLockWindowlessTimerBitmap();
- RtlSetBits(&WindowLessTimersBitMap, pTmr->nID, 1);
- IntUnlockWindowlessTimerBitmap();
- }
-*/
- RemoveEntryList(&pTmr->ptmrList);
- UserDeleteObject( UserHMGetHandle(pTmr), otTimer);
- }
- else
- pTmr->cmsCountdown = pTmr->cmsRate;
+ pTmr->cmsCountdown = pTmr->cmsRate;
}
else
pTmr->cmsCountdown -= Time - TimeLast;
@@ -533,21 +522,21 @@
if ((FirstpTmr == NULL) || (Window == NULL))
return FALSE;
- KeEnterCriticalRegion();
+ UserEnterExclusive();
do
{
if ((pTmr) && (pTmr->pti == pti) && (pTmr->pWnd == Window))
{
- pTmr->flags &= ~TMRF_READY;
- pTmr->flags |= TMRF_DELETEPENDING;
+ RemoveEntryList(&pTmr->ptmrList);
+ UserDeleteObject( UserHMGetHandle(pTmr), otTimer);
TimersRemoved = TRUE;
}
pLE = pTmr->ptmrList.Flink;
pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);
} while (pTmr != FirstpTmr);
- KeLeaveCriticalRegion();
+ UserLeave();
return TimersRemoved;
}
@@ -562,21 +551,21 @@
if (FirstpTmr == NULL)
return FALSE;
- KeEnterCriticalRegion();
+ UserEnterExclusive();
do
{
if ((pTmr) && (pTmr->pti == pti))
{
- pTmr->flags &= ~TMRF_READY;
- pTmr->flags |= TMRF_DELETEPENDING;
+ RemoveEntryList(&pTmr->ptmrList);
+ UserDeleteObject( UserHMGetHandle(pTmr), otTimer);
TimersRemoved = TRUE;
}
pLE = pTmr->ptmrList.Flink;
pTmr = CONTAINING_RECORD(pLE, TIMER, ptmrList);
} while (pTmr != FirstpTmr);
- KeLeaveCriticalRegion();
+ UserLeave();
return TimersRemoved;
}
@@ -588,8 +577,8 @@
DPRINT("IntKillTimer Window %x id %p systemtimer %s\n",
Window, IDEvent, SystemTimer ? "TRUE" : "FALSE");
- if (IDEvent == 0)
- return FALSE;
+ if ((Window) && (IDEvent == 0))
+ IDEvent = 1;
pTmr = FindTimer(Window, IDEvent, SystemTimer ? TMRF_SYSTEM : 0, TRUE);
return pTmr ? TRUE : FALSE;
@@ -692,7 +681,7 @@
DPRINT("Enter NtUserSetTimer\n");
UserEnterExclusive();
- RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, 0));
+ RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND));
CLEANUP:
DPRINT("Leave NtUserSetTimer, ret=%i\n", _ret_);
More information about the Ros-diffs
mailing list