commit 40723f795ba390b70594f278106af637c9afb8d4
author Alexandre Julliard <julliard@winehq.org> Wed Jul 26 11:47:42 2006 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Jul 26 11:47:42 2006 +0200
tree 996bcd05e2c33890ad3300c8c606b54277e91edb
parent a624977f21a1a1668326882f84a47d3a7f5cb58d

server: Make the create_async function take an absolute timeout.

server/named_pipe.c

diff --git a/server/named_pipe.c b/server/named_pipe.c
index 5c4da77..202cf68 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -868,18 +868,18 @@
     }
     else
     {
-        int timeout;
-        if (req->timeout == NMPWAIT_USE_DEFAULT_WAIT)
-            timeout = pipe->timeout;
-        else
-            timeout = req->timeout;
-
         if (req->timeout == NMPWAIT_WAIT_FOREVER)
             create_async( current, NULL, &pipe->waiters,
                           req->func, req->event, NULL );
         else
-            create_async( current, &timeout, &pipe->waiters,
-                          req->func, req->event, NULL );
+        {
+            struct timeval when;
+
+            gettimeofday( &when, NULL );
+            if (req->timeout == NMPWAIT_USE_DEFAULT_WAIT) add_timeout( &when, pipe->timeout );
+            else add_timeout( &when, req->timeout );
+            create_async( current, &when, &pipe->waiters, req->func, req->event, NULL );
+        }
     }
 
     release_object( pipe );