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/mailslot.c

diff --git a/server/mailslot.c b/server/mailslot.c
index 3ff6b5c..57a15b5 100644
--- a/server/mailslot.c
+++ b/server/mailslot.c
@@ -249,7 +249,6 @@
                                   void *iosb, int type, int count )
 {
     struct mailslot *mailslot = get_fd_user( fd );
-    int *timeout = NULL;
 
     assert(mailslot->obj.ops == &mailslot_ops);
 
@@ -266,9 +265,14 @@
         return;
     }
 
-    if (mailslot->read_timeout != -1) timeout = &mailslot->read_timeout;
-
-    fd_queue_async_timeout( fd, apc, user, iosb, type, count, timeout );
+    if (mailslot->read_timeout != -1)
+    {
+        struct timeval when;
+        gettimeofday( &when, NULL );
+        add_timeout( &when, mailslot->read_timeout );
+        fd_queue_async_timeout( fd, apc, user, iosb, type, count, &when );
+    }
+    else fd_queue_async_timeout( fd, apc, user, iosb, type, count, NULL );
 }
 
 static void mailslot_device_dump( struct object *obj, int verbose )