commit 039aa42373ef302c1ad3957bf0bc4050b4c7e63e
author Alexandre Julliard <julliard@winehq.org> Fri Jun 11 18:31:22 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jun 11 18:31:22 1999 +0000
tree a0210e5d60ae72aab169fc35cfb3751a4e01749d
parent 7990b7c011cae9c87e6ede4068eaa79619ae188a

Return console handles in alloc_console request.
Fixed read_console_input parameters to conform to the reply structure
declaration.

server/trace.c

diff --git a/server/trace.c b/server/trace.c
index 66b4002..e45dbc3 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -521,7 +521,15 @@
 
 static int dump_alloc_console_request( struct alloc_console_request *req, int len )
 {
-    fprintf( stderr, " dummy=%d", req->dummy );
+    fprintf( stderr, " access=%08x,", req->access );
+    fprintf( stderr, " inherit=%d", req->inherit );
+    return (int)sizeof(*req);
+}
+
+static int dump_alloc_console_reply( struct alloc_console_reply *req, int len )
+{
+    fprintf( stderr, " handle_in=%d,", req->handle_in );
+    fprintf( stderr, " handle_out=%d", req->handle_out );
     return (int)sizeof(*req);
 }
 
@@ -591,8 +599,9 @@
 {
     fprintf( stderr, " cursor_size=%d,", req->cursor_size );
     fprintf( stderr, " cursor_visible=%d,", req->cursor_visible );
-    fprintf( stderr, " pid=%d", req->pid );
-    return (int)sizeof(*req);
+    fprintf( stderr, " pid=%d,", req->pid );
+    fprintf( stderr, " title=" );
+    return dump_chars( req+1, len - (int)sizeof(*req) ) + sizeof(*req);
 }
 
 static int dump_write_console_input_request( struct write_console_input_request *req, int len )
@@ -870,7 +879,7 @@
     (dump_func)0,
     (dump_func)0,
     (dump_func)dump_create_pipe_reply,
-    (dump_func)0,
+    (dump_func)dump_alloc_console_reply,
     (dump_func)0,
     (dump_func)dump_open_console_reply,
     (dump_func)0,
@@ -988,14 +997,14 @@
 void trace_reply( struct thread *thread, int type, int pass_fd,
                   struct iovec *vec, int veclen )
 {
-    static char buffer[MAX_MSG_LENGTH];
+    static unsigned char buffer[MAX_MSG_LENGTH];
 
     if (!thread) return;
     fprintf( stderr, "%08x: %s() = %d",
              (unsigned int)thread, req_names[thread->last_req], type );
     if (veclen)
     {
-        char *p = buffer;
+        unsigned char *p = buffer;
         int len;
         for (; veclen; veclen--, vec++)
         {