Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-08 03:07:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K:NTUSER] Allocate & free timers under global user lock

Browse source
This commit is contained in:
Jérôme Gardou 2021-07-30 15:40:33 +02:00 committed by Jérôme Gardou
parent 515d83a883
commit 6ec0420dc6
2 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
win32ss/user/ntuser/simplecall.c
View file

@ -761,7 +761,14 @@ NtUserCallHwndParam(
switch (Routine) switch (Routine)
{ {
case HWNDPARAM_ROUTINE_KILLSYSTEMTIMER: 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: case HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID:
{ {

39
win32ss/user/ntuser/timer.c
View file

@ -635,19 +635,18 @@ NtUserSetTimer
) )
{ {
PWND Window = NULL; PWND Window = NULL;
DECLARE_RETURN(UINT_PTR); UINT_PTR ret;
TRACE("Enter NtUserSetTimer\n"); TRACE("Enter NtUserSetTimer\n");
UserEnterExclusive(); UserEnterExclusive();
if (hWnd) Window = UserGetWindowObject(hWnd); if (hWnd) Window = UserGetWindowObject(hWnd);
ret = IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND);
UserLeave(); UserLeave();
TRACE("Leave NtUserSetTimer, ret=%u\n", ret);
RETURN(IntSetTimer(Window, nIDEvent, uElapse, lpTimerFunc, TMRF_TIFROMWND)); return ret;
CLEANUP:
TRACE("Leave NtUserSetTimer, ret=%u\n", _ret_);
END_CLEANUP;
} }
@ -660,18 +659,18 @@ NtUserKillTimer
) )
{ {
PWND Window = NULL; PWND Window = NULL;
DECLARE_RETURN(BOOL); BOOL ret;
TRACE("Enter NtUserKillTimer\n"); TRACE("Enter NtUserKillTimer\n");
UserEnterExclusive(); UserEnterExclusive();
if (hWnd) Window = UserGetWindowObject(hWnd); if (hWnd) Window = UserGetWindowObject(hWnd);
ret = IntKillTimer(Window, uIDEvent, FALSE);
UserLeave(); UserLeave();
RETURN(IntKillTimer(Window, uIDEvent, FALSE)); TRACE("Leave NtUserKillTimer, ret=%i\n", ret);
return ret;
CLEANUP:
TRACE("Leave NtUserKillTimer, ret=%i\n", _ret_);
END_CLEANUP;
} }
@ -684,15 +683,17 @@ NtUserSetSystemTimer(
TIMERPROC lpTimerFunc 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: UserLeave();
TRACE("Leave NtUserSetSystemTimer, ret=%u\n", _ret_);
END_CLEANUP; TRACE("Leave NtUserSetSystemTimer, ret=%u\n", ret);
return ret;
} }
BOOL BOOL