Alexandre Julliard : server: Don' t allow a waitable timer to be set to expire in the past.

Alexandre Julliard julliard at wine.codeweavers.com
Tue May 22 06:59:53 CDT 2007


Module: wine
Branch: master
Commit: 1b15d45dd76eeaeb7779373b15ba2db2333ce3ce
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1b15d45dd76eeaeb7779373b15ba2db2333ce3ce

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue May 22 11:59:45 2007 +0200

server: Don't allow a waitable timer to be set to expire in the past.

---

 server/timer.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/timer.c b/server/timer.c
index 088a063..ffa4b03 100644
--- a/server/timer.c
+++ b/server/timer.c
@@ -164,7 +164,8 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period
         period = 0;  /* period doesn't make any sense for a manual timer */
         timer->signaled = 0;
     }
-
+    if (expire > 0 && expire < current_time) expire = current_time;
+    timer->when     = expire;
     timer->period   = period;
     timer->callback = callback;
     timer->arg      = arg;




More information about the wine-cvs mailing list