commit d549f6909edff44ed671d80bd066aeb4cd5f3fa3
author Alexandre Julliard <julliard@winehq.org> Fri Dec 22 02:04:15 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 22 02:04:15 2000 +0000
tree aa6e506c4bd9b8c80c1a5f401a75d3eeb9dd7908
parent 44b65a501dda933d643ac2e8b9edfccde065bd58

Use a separate FIFO pair for server requests that don't need to pass a
file descriptor.
Associate file descriptors with handles on the server side so that we
don't need to pass the fd every time the client wants to use it.

files/file.c

diff --git a/files/file.c b/files/file.c
index 3d957aa..3d5e0e4 100644
--- a/files/file.c
+++ b/files/file.c
@@ -185,7 +185,7 @@
 {
     struct alloc_file_handle_request *req = get_req_buffer();
     req->access  = access;
-    server_call_fd( REQ_ALLOC_FILE_HANDLE, fd, NULL );
+    server_call_fd( REQ_ALLOC_FILE_HANDLE, fd );
     return req->handle;
 }
 
@@ -197,12 +197,21 @@
  */
 int FILE_GetUnixHandle( HANDLE handle, DWORD access )
 {
-    int unix_handle = -1;
-    struct get_handle_fd_request *req = get_req_buffer();
-    req->handle = handle;
-    req->access = access;
-    server_call_fd( REQ_GET_HANDLE_FD, -1, &unix_handle );
-    return unix_handle;
+    int ret, fd = -1;
+    SERVER_START_REQ
+    {
+        struct get_handle_fd_request *req = wine_server_alloc_req( sizeof(*req), 0 );
+        req->handle = handle;
+        req->access = access;
+        if (!(ret = server_call( REQ_GET_HANDLE_FD ))) fd = req->fd;
+    }
+    SERVER_END_REQ;
+    if (!ret)
+    {
+        if (fd == -1) return wine_server_recv_fd( handle, 1 );
+        fd = dup(fd);
+    }
+    return fd;
 }