mirror of
https://github.com/reactos/reactos.git
synced 2025-05-07 10:46:58 +00:00
[WIN32K:NTUSER] Allocate & free timers under global user lock
This commit is contained in:
parent
515d83a883
commit
6ec0420dc6
2 changed files with 28 additions and 20 deletions
|
@ -761,7 +761,14 @@ NtUserCallHwndParam(
|
|||
switch (Routine)
|
||||
{
|
||||
case HWNDPARAM_ROUTINE_KILLSYSTEMTIMER:
|
||||
return IntKillTimer(UserGetWindowObject(hWnd), (UINT_PTR)Param, TRUE);
|
||||
{
|
||||
DWORD ret;
|
||||
|
||||
UserEnterExclusive();
|
||||
ret = IntKillTimer(UserGetWindowObject(hWnd), (UINT_PTR)Param, TRUE);
|
||||
UserLeave();
|
||||
return ret;
|
||||
}
|
||||
|
||||
case HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID:
|
||||
{
|
||||
|
|
|
@ -635,19 +635,18 @@ NtUserSetTimer
|
|||
)
|
||||
{
|
||||
PWND Window = NULL;
|
||||
DECLARE_RETURN(UINT_PTR);
|
||||
UINT_PTR ret;
|
||||
|
||||
TRACE("Enter NtUserSetTimer\n");
|
||||
UserEnterExclusive();
|
||||
if (hWnd) Window = UserGetWindowObject(hWnd);
|
||||
|
||||
ret = IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND);
|
||||
|
||||
UserLeave();
|
||||
TRACE("Leave NtUserSetTimer, ret=%u\n", ret);
|
||||
|
||||
RETURN(IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND));
|
||||
|
||||
CLEANUP:
|
||||
TRACE("Leave NtUserSetTimer, ret=%u\n", _ret_);
|
||||
|
||||
END_CLEANUP;
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
@ -660,18 +659,18 @@ NtUserKillTimer
|
|||
)
|
||||
{
|
||||
PWND Window = NULL;
|
||||
DECLARE_RETURN(BOOL);
|
||||
BOOL ret;
|
||||
|
||||
TRACE("Enter NtUserKillTimer\n");
|
||||
UserEnterExclusive();
|
||||
if (hWnd) Window = UserGetWindowObject(hWnd);
|
||||
|
||||
ret = IntKillTimer(Window, uIDEvent, FALSE);
|
||||
|
||||
UserLeave();
|
||||
|
||||
RETURN(IntKillTimer(Window, uIDEvent, FALSE));
|
||||
|
||||
CLEANUP:
|
||||
TRACE("Leave NtUserKillTimer, ret=%i\n", _ret_);
|
||||
END_CLEANUP;
|
||||
TRACE("Leave NtUserKillTimer, ret=%i\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
@ -684,15 +683,17 @@ NtUserSetSystemTimer(
|
|||
TIMERPROC lpTimerFunc
|
||||
)
|
||||
{
|
||||
DECLARE_RETURN(UINT_PTR);
|
||||
UINT_PTR ret;
|
||||
|
||||
TRACE("Enter NtUserSetSystemTimer\n");
|
||||
UserEnterExclusive();
|
||||
TRACE("Enter NtUserSetSystemTimer\n");
|
||||
|
||||
RETURN(IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM));
|
||||
ret = IntSetTimer(UserGetWindowObject(hWnd), nIDEvent, uElapse, NULL, TMRF_SYSTEM);
|
||||
|
||||
CLEANUP:
|
||||
TRACE("Leave NtUserSetSystemTimer, ret=%u\n", _ret_);
|
||||
END_CLEANUP;
|
||||
UserLeave();
|
||||
|
||||
TRACE("Leave NtUserSetSystemTimer, ret=%u\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
BOOL
|
||||
|
|
Loading…
Reference in a new issue