commit 1ab243bac186fcebcbe8b73f2f5d87f7a33e3e86
author Alexandre Julliard <julliard@winehq.org> Tue Dec 19 02:12:45 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Dec 19 02:12:45 2000 +0000
tree 31f188c284b788546bb3d498a165c0486f98cc30
parent d88dbb4a108b9bd9204ba2edf9d9faf7a5af6091

Merged the get_read_fd and get_write_fd requests.

server/trace.c

diff --git a/server/trace.c b/server/trace.c
index 6b6f3ab..bad07e8 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -256,7 +256,6 @@
     fprintf( stderr, " hstdout=%d,", req->hstdout );
     fprintf( stderr, " hstderr=%d,", req->hstderr );
     fprintf( stderr, " cmd_show=%d,", req->cmd_show );
-    fprintf( stderr, " alloc_fd=%d,", req->alloc_fd );
     fprintf( stderr, " filename=" );
     cur_pos += dump_varargs_string( req );
 }
@@ -657,14 +656,15 @@
     fprintf( stderr, " handle=%d", req->handle );
 }
 
-static void dump_get_read_fd_request( const struct get_read_fd_request *req )
+static void dump_get_handle_fd_request( const struct get_handle_fd_request *req )
 {
-    fprintf( stderr, " handle=%d", req->handle );
+    fprintf( stderr, " handle=%d,", req->handle );
+    fprintf( stderr, " access=%08x", req->access );
 }
 
-static void dump_get_write_fd_request( const struct get_write_fd_request *req )
+static void dump_get_handle_fd_reply( const struct get_handle_fd_request *req )
 {
-    fprintf( stderr, " handle=%d", req->handle );
+    fprintf( stderr, " fd=%d", req->fd );
 }
 
 static void dump_set_file_pointer_request( const struct set_file_pointer_request *req )
@@ -1487,8 +1487,7 @@
     (dump_func)dump_open_semaphore_request,
     (dump_func)dump_create_file_request,
     (dump_func)dump_alloc_file_handle_request,
-    (dump_func)dump_get_read_fd_request,
-    (dump_func)dump_get_write_fd_request,
+    (dump_func)dump_get_handle_fd_request,
     (dump_func)dump_set_file_pointer_request,
     (dump_func)dump_truncate_file_request,
     (dump_func)dump_set_file_time_request,
@@ -1600,8 +1599,7 @@
     (dump_func)dump_open_semaphore_reply,
     (dump_func)dump_create_file_reply,
     (dump_func)dump_alloc_file_handle_reply,
-    (dump_func)0,
-    (dump_func)0,
+    (dump_func)dump_get_handle_fd_reply,
     (dump_func)dump_set_file_pointer_reply,
     (dump_func)0,
     (dump_func)0,
@@ -1713,8 +1711,7 @@
     "open_semaphore",
     "create_file",
     "alloc_file_handle",
-    "get_read_fd",
-    "get_write_fd",
+    "get_handle_fd",
     "set_file_pointer",
     "truncate_file",
     "set_file_time",