From 8ae5761dd0cdeb3ecaebba2c19069631d40bbb93 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 31 Dec 2001 22:26:51 +0000
Subject: [PATCH] Fixed string type in named pipe requests.

---
 include/wine/server_protocol.h |  8 ++++----
 server/protocol.def            | 10 +++++-----
 server/trace.c                 | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index ccb317bd485..680285178dd 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -2211,7 +2211,7 @@ struct create_named_pipe_request
     unsigned int   outsize;
     unsigned int   insize;
     unsigned int   timeout;
-    /* VARARG(filename,string); */
+    /* VARARG(name,unicode_str); */
 };
 struct create_named_pipe_reply
 {
@@ -2225,7 +2225,7 @@ struct open_named_pipe_request
 {
     struct request_header __header;
     unsigned int   access;
-    /* VARARG(filename,string); */
+    /* VARARG(name,unicode_str); */
 };
 struct open_named_pipe_reply
 {
@@ -2255,7 +2255,7 @@ struct wait_named_pipe_request
     unsigned int   timeout;
     void*          overlapped;
     void*          func;
-    /* VARARG(filename,string); */
+    /* VARARG(name,unicode_str); */
 };
 struct wait_named_pipe_reply
 {
@@ -3038,6 +3038,6 @@ union generic_reply
     struct get_window_properties_reply get_window_properties_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 67
+#define SERVER_PROTOCOL_VERSION 68
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/protocol.def b/server/protocol.def
index 835b3ad31f3..76a3cf813db 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1552,18 +1552,18 @@ enum message_type
     unsigned int   outsize;
     unsigned int   insize;
     unsigned int   timeout;
-    VARARG(filename,string);    /* pipe name */
+    VARARG(name,unicode_str);    /* pipe name */
 @REPLY
-    handle_t       handle;     /* handle to the pipe */
+    handle_t       handle;       /* handle to the pipe */
 @END
 
 
 /* Open an existing named pipe */
 @REQ(open_named_pipe)
     unsigned int   access;
-    VARARG(filename,string);    /* pipe name */
+    VARARG(name,unicode_str);    /* pipe name */
 @REPLY
-    handle_t       handle;     /* handle to the pipe */
+    handle_t       handle;       /* handle to the pipe */
 @END
 
 
@@ -1580,7 +1580,7 @@ enum message_type
     unsigned int   timeout;
     void*          overlapped;
     void*          func;
-    VARARG(filename,string);    /* pipe name */
+    VARARG(name,unicode_str);    /* pipe name */
 @END
 
 
diff --git a/server/trace.c b/server/trace.c
index 0f12a0ee3cf..d162045501b 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1756,8 +1756,8 @@ static void dump_create_named_pipe_request( const struct create_named_pipe_reque
     fprintf( stderr, " outsize=%08x,", req->outsize );
     fprintf( stderr, " insize=%08x,", req->insize );
     fprintf( stderr, " timeout=%08x,", req->timeout );
-    fprintf( stderr, " filename=" );
-    dump_varargs_string( cur_size );
+    fprintf( stderr, " name=" );
+    dump_varargs_unicode_str( cur_size );
 }
 
 static void dump_create_named_pipe_reply( const struct create_named_pipe_reply *req )
@@ -1768,8 +1768,8 @@ static void dump_create_named_pipe_reply( const struct create_named_pipe_reply *
 static void dump_open_named_pipe_request( const struct open_named_pipe_request *req )
 {
     fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " filename=" );
-    dump_varargs_string( cur_size );
+    fprintf( stderr, " name=" );
+    dump_varargs_unicode_str( cur_size );
 }
 
 static void dump_open_named_pipe_reply( const struct open_named_pipe_reply *req )
@@ -1789,8 +1789,8 @@ static void dump_wait_named_pipe_request( const struct wait_named_pipe_request *
     fprintf( stderr, " timeout=%08x,", req->timeout );
     fprintf( stderr, " overlapped=%p,", req->overlapped );
     fprintf( stderr, " func=%p,", req->func );
-    fprintf( stderr, " filename=" );
-    dump_varargs_string( cur_size );
+    fprintf( stderr, " name=" );
+    dump_varargs_unicode_str( cur_size );
 }
 
 static void dump_disconnect_named_pipe_request( const struct disconnect_named_pipe_request *req )