[Wine-patches] Update some files with tools/make_requests.

[Alexander Morozov]

Патч исправляет вот такую проблему:
[amorozov на atlant ~]$ wineserver -k
[amorozov на atlant ~]$ ww winecfg
wine client error:0: version mismatch 10386/10385.
Your wine binary was not upgraded correctly,
or you have an older one somewhere in your PATH.
Or maybe the wrong wineserver is still running?
----------- следующая часть -----------
From 9cdcbf45e92170245872f913b6f9e292092e2435 Mon Sep 17 00:00:00 2001
From: Alexander Morozov <amorozov на etersoft.ru>
Date: Mon, 27 Apr 2009 12:56:03 +0400
Subject: [PATCH] Update some files with tools/make_requests.

---
 include/wine/server_protocol.h |    2 +-
 server/trace.c                 |   27 ++++++++++-----------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 76b595a..d2dbed8 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -5317,6 +5317,6 @@ union generic_reply
     struct get_device_reply get_device_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 10385
+#define SERVER_PROTOCOL_VERSION 10386
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
diff --git a/server/trace.c b/server/trace.c
index 3538135..cd2cd2d 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -3661,16 +3661,12 @@ static void dump_get_next_device_request_request( const struct get_next_device_r
 
 static void dump_get_next_device_request_reply( const struct get_next_device_request_reply *req )
 {
-    fprintf( stderr, " next=%04x,", req->next );
+    fprintf( stderr, " next=%04x", req->next );
     dump_ioctl_code( ", code=", &req->code );
-    fprintf( stderr, "," );
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " user_ptr=" );
+    fprintf( stderr, ", pid=%04x", req->pid );
     dump_uint64( ", user_ptr=", &req->user_ptr );
-    fprintf( stderr, "," );
-    fprintf( stderr, " in_size=%u,", req->in_size );
-    fprintf( stderr, " out_size=%u,", req->out_size );
-    fprintf( stderr, " next_data=" );
+    fprintf( stderr, ", in_size=%u", req->in_size );
+    fprintf( stderr, ", out_size=%u", req->out_size );
     dump_varargs_bytes( ", next_data=", cur_size );
 }
 
@@ -3799,23 +3795,20 @@ static void dump_get_device_name_request( const struct get_device_name_request *
 
 static void dump_get_device_name_reply( const struct get_device_name_reply *req )
 {
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    dump_varargs_unicode_str( " name=", cur_size );
 }
 
 static void dump_get_device_request( const struct get_device_request *req )
 {
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " manager=%04x,", req->manager );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    fprintf( stderr, ", manager=%04x", req->manager );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_get_device_reply( const struct get_device_reply *req )
 {
-    fprintf( stderr, " user_ptr=" );
-    dump_uint64( &req->user_ptr );
+    dump_uint64( " user_ptr=", &req->user_ptr );
 }
 
 static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
-- 
1.6.1.3.GIT