Fixed some bogus infinite expiration time.

96c142b9 · Eric Pouech · Alexandre Julliard · a4dd6a6a · 96c142b9
Commit 96c142b9 authored Apr 25, 1999 by Eric Pouech Committed by Alexandre Julliard Apr 25, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

timer.c windows/timer.c +7 -2

No files found.
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -207,9 +207,14 @@ LONG TIMER_GetNextExpiration(void)
    while (pTimer && !pTimer->expires)  /* Skip already expired timers */
        pTimer = pTimer->next;

-    retValue = pTimer ? EXPIRE_TIME( pTimer, GetTickCount() ) : -1;
-    LeaveCriticalSection( &csTimer );
+    if (pTimer)
+    {
+        DWORD now = GetTickCount();
+        retValue = (pTimer->expires <= now) ? 0 : (pTimer->expires - now);
+    }
+    else retValue = -1;

+    LeaveCriticalSection( &csTimer );
    return retValue;
 }