system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 09:34:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winmm: Destroy timer after calling callback.

Browse source 
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-09-30 14:37:57 +02:00 committed by Alexandre Julliard
parent b07504224e
commit daec24a9d6
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/winmm/time.c
View file

@ -107,7 +107,7 @@ static CONDITION_VARIABLE TIME_cv;
*/
static int TIME_MMSysTimeCallback(void)
{
WINE_TIMERENTRY *timer, copy;
WINE_TIMERENTRY *timer;
int i, delta_time;
/* since timeSetEvent() and timeKillEvent() can be called
@ -139,15 +139,7 @@ static int TIME_MMSysTimeCallback(void)
if (delta_time > 0) break;
if (timer->wFlags & TIME_PERIODIC)
{
timer->dwTriggerTime += timer->wDelay;
}
else
{
copy = *timer;
timer->wTimerID = 0;
timer = &copy;
}
switch(timer->wFlags & (TIME_CALLBACK_EVENT_SET|TIME_CALLBACK_EVENT_PULSE))
{
@ -171,9 +163,12 @@ static int TIME_MMSysTimeCallback(void)
EnterCriticalSection(&WINMM_cs);
if (flags & TIME_KILL_SYNCHRONOUS) LeaveCriticalSection(&TIME_cbcrst);
if (id != timer->wTimerID) timer = NULL;
}
break;
}
if (timer && !(timer->wFlags & TIME_PERIODIC))
timer->wTimerID = 0;
}
return delta_time;
}