From 53929f19066af05c92373dcd662c1d007b2f7692 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 3 Apr 2009 18:02:21 +0200
Subject: [PATCH] server: Make all dump function take a prefix string to
 simplify the tracing code.

---
 server/trace.c      | 2778 +++++++++++++++++++------------------------
 tools/make_requests |   23 +-
 2 files changed, 1202 insertions(+), 1599 deletions(-)

diff --git a/server/trace.c b/server/trace.c
index 612d7233725..88ea5e51470 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -65,163 +65,134 @@ static void dump_uints( const int *ptr, int len )
     fputc( '}', stderr );
 }
 
-static void dump_timeout( const timeout_t *time )
+static void dump_timeout( const char *prefix, const timeout_t *time )
 {
-    fputs( get_timeout_str(*time), stderr );
+    fprintf( stderr, "%s%s", prefix, get_timeout_str(*time) );
 }
 
-static void dump_uint64( const unsigned __int64 *val )
+static void dump_uint64( const char *prefix, const unsigned __int64 *val )
 {
     if ((unsigned int)*val != *val)
-        fprintf( stderr, "%x%08x", (unsigned int)(*val >> 32), (unsigned int)*val );
+        fprintf( stderr, "%s%x%08x", prefix, (unsigned int)(*val >> 32), (unsigned int)*val );
     else
-        fprintf( stderr, "%08x", (unsigned int)*val );
+        fprintf( stderr, "%s%08x", prefix, (unsigned int)*val );
 }
 
-static void dump_rectangle( const rectangle_t *rect )
+static void dump_rectangle( const char *prefix, const rectangle_t *rect )
 {
-    fprintf( stderr, "{%d,%d;%d,%d}",
+    fprintf( stderr, "%s{%d,%d;%d,%d}", prefix,
              rect->left, rect->top, rect->right, rect->bottom );
 }
 
-static void dump_char_info( const char_info_t *info )
+static void dump_char_info( const char *prefix, const char_info_t *info )
 {
-    fprintf( stderr, "{'" );
+    fprintf( stderr, "%s{'", prefix );
     dump_strW( &info->ch, 1, stderr, "\'\'" );
     fprintf( stderr, "',%04x}", info->attr );
 }
 
-static void dump_ioctl_code( const ioctl_code_t *code )
+static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code )
 {
     switch(*code)
     {
-#define CASE(c) case c: fputs( #c, stderr ); break
+#define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break
         CASE(FSCTL_DISMOUNT_VOLUME);
         CASE(FSCTL_PIPE_DISCONNECT);
         CASE(FSCTL_PIPE_LISTEN);
         CASE(FSCTL_PIPE_WAIT);
-        default: fprintf( stderr, "%08x", *code ); break;
+        default: fprintf( stderr, "%s%08x", prefix, *code ); break;
 #undef CASE
     }
 }
 
-static void dump_cpu_type( const cpu_type_t *code )
+static void dump_cpu_type( const char *prefix, const cpu_type_t *code )
 {
     switch (*code)
     {
-#define CASE(c) case CPU_##c: fputs( #c, stderr ); break
+#define CASE(c) case CPU_##c: fprintf( stderr, "%s%s", prefix, #c ); break
         CASE(x86);
         CASE(x86_64);
         CASE(ALPHA);
         CASE(POWERPC);
         CASE(SPARC);
-        default: fprintf( stderr, "%u", *code ); break;
+        default: fprintf( stderr, "%s%u", prefix, *code ); break;
 #undef CASE
     }
 }
 
-static void dump_apc_call( const apc_call_t *call )
+static void dump_apc_call( const char *prefix, const apc_call_t *call )
 {
-    fputc( '{', stderr );
+    fprintf( stderr, "%s{", prefix );
     switch(call->type)
     {
     case APC_NONE:
         fprintf( stderr, "APC_NONE" );
         break;
     case APC_USER:
-        fprintf( stderr, "APC_USER,func=" );
-        dump_uint64( &call->user.func );
-        fprintf( stderr, ",args={" );
-        dump_uint64( &call->user.args[0] );
-        fputc( ',', stderr );
-        dump_uint64( &call->user.args[1] );
-        fputc( ',', stderr );
-        dump_uint64( &call->user.args[2] );
+        dump_uint64( "APC_USER,func=", &call->user.func );
+        dump_uint64( ",args={", &call->user.args[0] );
+        dump_uint64( ",", &call->user.args[1] );
+        dump_uint64( ",", &call->user.args[2] );
         fputc( '}', stderr );
         break;
     case APC_TIMER:
-        fprintf( stderr, "APC_TIMER,time=" );
-        dump_timeout( &call->timer.time );
-        fprintf( stderr, ",arg=" );
-        dump_uint64( &call->timer.arg );
+        dump_timeout( "APC_TIMER,time=", &call->timer.time );
+        dump_uint64( ",arg=", &call->timer.arg );
         break;
     case APC_ASYNC_IO:
-        fprintf( stderr, "APC_ASYNC_IO,func=" );
-        dump_uint64( &call->async_io.func );
-        fprintf( stderr, ",user=" );
-        dump_uint64( &call->async_io.user );
-        fprintf( stderr, ",sb=" );
-        dump_uint64( &call->async_io.sb );
+        dump_uint64( "APC_ASYNC_IO,func=", &call->async_io.func );
+        dump_uint64( ",user=", &call->async_io.user );
+        dump_uint64( ",sb=", &call->async_io.sb );
         fprintf( stderr, ",status=%s", get_status_name(call->async_io.status) );
         break;
     case APC_VIRTUAL_ALLOC:
-        fprintf( stderr, "APC_VIRTUAL_ALLOC,addr==" );
-        dump_uint64( &call->virtual_alloc.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &call->virtual_alloc.size );
+        dump_uint64( "APC_VIRTUAL_ALLOC,addr==", &call->virtual_alloc.addr );
+        dump_uint64( ",size=", &call->virtual_alloc.size );
         fprintf( stderr, ",zero_bits=%u,op_type=%x,prot=%x",
                  call->virtual_alloc.zero_bits, call->virtual_alloc.op_type,
                  call->virtual_alloc.prot );
         break;
     case APC_VIRTUAL_FREE:
-        fprintf( stderr, "APC_VIRTUAL_FREE,addr=" );
-        dump_uint64( &call->virtual_free.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &call->virtual_free.size );
+        dump_uint64( "APC_VIRTUAL_FREE,addr=", &call->virtual_free.addr );
+        dump_uint64( ",size=", &call->virtual_free.size );
         fprintf( stderr, ",op_type=%x", call->virtual_free.op_type );
         break;
     case APC_VIRTUAL_QUERY:
-        fprintf( stderr, "APC_VIRTUAL_QUERY,addr=" );
-        dump_uint64( &call->virtual_query.addr );
+        dump_uint64( "APC_VIRTUAL_QUERY,addr=", &call->virtual_query.addr );
         break;
     case APC_VIRTUAL_PROTECT:
-        fprintf( stderr, "APC_VIRTUAL_PROTECT,addr=" );
-        dump_uint64( &call->virtual_protect.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &call->virtual_protect.size );
+        dump_uint64( "APC_VIRTUAL_PROTECT,addr=", &call->virtual_protect.addr );
+        dump_uint64( ",size=", &call->virtual_protect.size );
         fprintf( stderr, ",prot=%x", call->virtual_protect.prot );
         break;
     case APC_VIRTUAL_FLUSH:
-        fprintf( stderr, "APC_VIRTUAL_FLUSH,addr=" );
-        dump_uint64( &call->virtual_flush.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &call->virtual_flush.size );
+        dump_uint64( "APC_VIRTUAL_FLUSH,addr=", &call->virtual_flush.addr );
+        dump_uint64( ",size=", &call->virtual_flush.size );
         break;
     case APC_VIRTUAL_LOCK:
-        fprintf( stderr, "APC_VIRTUAL_LOCK,addr=" );
-        dump_uint64( &call->virtual_lock.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &call->virtual_lock.size );
+        dump_uint64( "APC_VIRTUAL_LOCK,addr=", &call->virtual_lock.addr );
+        dump_uint64( ",size=", &call->virtual_lock.size );
         break;
     case APC_VIRTUAL_UNLOCK:
-        fprintf( stderr, "APC_VIRTUAL_UNLOCK,addr=" );
-        dump_uint64( &call->virtual_unlock.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &call->virtual_unlock.size );
+        dump_uint64( "APC_VIRTUAL_UNLOCK,addr=", &call->virtual_unlock.addr );
+        dump_uint64( ",size=", &call->virtual_unlock.size );
         break;
     case APC_MAP_VIEW:
-        fprintf( stderr, "APC_MAP_VIEW,handle=%04x,addr=", call->map_view.handle );
-        dump_uint64( &call->map_view.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &call->map_view.size );
-        fprintf( stderr, ",offset=" );
-        dump_uint64( &call->map_view.offset );
+        fprintf( stderr, "APC_MAP_VIEW,handle=%04x", call->map_view.handle );
+        dump_uint64( ",addr=", &call->map_view.addr );
+        dump_uint64( ",size=", &call->map_view.size );
+        dump_uint64( ",offset=", &call->map_view.offset );
         fprintf( stderr, ",zero_bits=%u,alloc_type=%x,prot=%x",
                  call->map_view.zero_bits, call->map_view.alloc_type, call->map_view.prot );
         break;
     case APC_UNMAP_VIEW:
-        fprintf( stderr, "APC_UNMAP_VIEW,addr=" );
-        dump_uint64( &call->unmap_view.addr );
+        dump_uint64( "APC_UNMAP_VIEW,addr=", &call->unmap_view.addr );
         break;
     case APC_CREATE_THREAD:
-        fprintf( stderr, "APC_CREATE_THREAD,func=" );
-        dump_uint64( &call->create_thread.func );
-        fprintf( stderr, ",arg=" );
-        dump_uint64( &call->create_thread.arg );
-        fprintf( stderr, ",reserve=" );
-        dump_uint64( &call->create_thread.reserve );
-        fprintf( stderr, ",commit=" );
-        dump_uint64( &call->create_thread.commit );
+        dump_uint64( "APC_CREATE_THREAD,func=", &call->create_thread.func );
+        dump_uint64( ",arg=", &call->create_thread.arg );
+        dump_uint64( ",reserve=", &call->create_thread.reserve );
+        dump_uint64( ",commit=", &call->create_thread.commit );
         fprintf( stderr, ",suspend=%u", call->create_thread.suspend );
         break;
     default:
@@ -231,79 +202,70 @@ static void dump_apc_call( const apc_call_t *call )
     fputc( '}', stderr );
 }
 
-static void dump_apc_result( const apc_result_t *result )
+static void dump_apc_result( const char *prefix, const apc_result_t *result )
 {
-    fputc( '{', stderr );
+    fprintf( stderr, "%s{", prefix );
     switch(result->type)
     {
     case APC_NONE:
         break;
     case APC_ASYNC_IO:
-        fprintf( stderr, "APC_ASYNC_IO,status=%s,total=%u,apc=",
+        fprintf( stderr, "APC_ASYNC_IO,status=%s,total=%u",
                  get_status_name( result->async_io.status ), result->async_io.total );
-        dump_uint64( &result->async_io.apc );
+        dump_uint64( ",apc=", &result->async_io.apc );
         break;
     case APC_VIRTUAL_ALLOC:
-        fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s,addr=",
+        fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s",
                  get_status_name( result->virtual_alloc.status ));
-        dump_uint64( &result->virtual_alloc.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &result->virtual_alloc.size );
+        dump_uint64( ",addr=", &result->virtual_alloc.addr );
+        dump_uint64( ",size=", &result->virtual_alloc.size );
         break;
     case APC_VIRTUAL_FREE:
-        fprintf( stderr, "APC_VIRTUAL_FREE,status=%s,addr=",
+        fprintf( stderr, "APC_VIRTUAL_FREE,status=%s",
                  get_status_name( result->virtual_free.status ));
-        dump_uint64( &result->virtual_free.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &result->virtual_free.size );
+        dump_uint64( ",addr=", &result->virtual_free.addr );
+        dump_uint64( ",size=", &result->virtual_free.size );
         break;
     case APC_VIRTUAL_QUERY:
-        fprintf( stderr, "APC_VIRTUAL_QUERY,status=%s,base=",
+        fprintf( stderr, "APC_VIRTUAL_QUERY,status=%s",
                  get_status_name( result->virtual_query.status ));
-        dump_uint64( &result->virtual_query.base );
-        fprintf( stderr, ",alloc_base=" );
-        dump_uint64( &result->virtual_query.alloc_base );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &result->virtual_query.size );
+        dump_uint64( ",base=", &result->virtual_query.base );
+        dump_uint64( ",alloc_base=", &result->virtual_query.alloc_base );
+        dump_uint64( ",size=", &result->virtual_query.size );
         fprintf( stderr, ",state=%x,prot=%x,alloc_prot=%x,alloc_type=%x",
                  result->virtual_query.state, result->virtual_query.prot,
                  result->virtual_query.alloc_prot, result->virtual_query.alloc_type );
         break;
     case APC_VIRTUAL_PROTECT:
-        fprintf( stderr, "APC_VIRTUAL_PROTECT,status=%s,addr=",
+        fprintf( stderr, "APC_VIRTUAL_PROTECT,status=%s",
                  get_status_name( result->virtual_protect.status ));
-        dump_uint64( &result->virtual_protect.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &result->virtual_protect.size );
+        dump_uint64( ",addr=", &result->virtual_protect.addr );
+        dump_uint64( ",size=", &result->virtual_protect.size );
         fprintf( stderr, ",prot=%x", result->virtual_protect.prot );
         break;
     case APC_VIRTUAL_FLUSH:
-        fprintf( stderr, "APC_VIRTUAL_FLUSH,status=%s,addr=",
+        fprintf( stderr, "APC_VIRTUAL_FLUSH,status=%s",
                  get_status_name( result->virtual_flush.status ));
-        dump_uint64( &result->virtual_flush.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &result->virtual_flush.size );
+        dump_uint64( ",addr=", &result->virtual_flush.addr );
+        dump_uint64( ",size=", &result->virtual_flush.size );
         break;
     case APC_VIRTUAL_LOCK:
-        fprintf( stderr, "APC_VIRTUAL_LOCK,status=%s,addr=",
+        fprintf( stderr, "APC_VIRTUAL_LOCK,status=%s",
                  get_status_name( result->virtual_lock.status ));
-        dump_uint64( &result->virtual_lock.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &result->virtual_lock.size );
+        dump_uint64( ",addr=", &result->virtual_lock.addr );
+        dump_uint64( ",size=", &result->virtual_lock.size );
         break;
     case APC_VIRTUAL_UNLOCK:
-        fprintf( stderr, "APC_VIRTUAL_UNLOCK,status=%s,addr=",
+        fprintf( stderr, "APC_VIRTUAL_UNLOCK,status=%s",
                  get_status_name( result->virtual_unlock.status ));
-        dump_uint64( &result->virtual_unlock.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &result->virtual_unlock.size );
+        dump_uint64( ",addr=", &result->virtual_unlock.addr );
+        dump_uint64( ",size=", &result->virtual_unlock.size );
         break;
     case APC_MAP_VIEW:
-        fprintf( stderr, "APC_MAP_VIEW,status=%s,addr=",
+        fprintf( stderr, "APC_MAP_VIEW,status=%s",
                  get_status_name( result->map_view.status ));
-        dump_uint64( &result->map_view.addr );
-        fprintf( stderr, ",size=" );
-        dump_uint64( &result->map_view.size );
+        dump_uint64( ",addr=", &result->map_view.addr );
+        dump_uint64( ",size=", &result->map_view.size );
         break;
     case APC_UNMAP_VIEW:
         fprintf( stderr, "APC_UNMAP_VIEW,status=%s",
@@ -321,22 +283,19 @@ static void dump_apc_result( const apc_result_t *result )
     fputc( '}', stderr );
 }
 
-static void dump_async_data( const async_data_t *data )
+static void dump_async_data( const char *prefix, const async_data_t *data )
 {
-    fprintf( stderr, "{handle=%04x,event=%04x,callback=", data->handle, data->event );
-    dump_uint64( &data->callback );
-    fprintf( stderr, ",iosb=" );
-    dump_uint64( &data->iosb );
-    fprintf( stderr, ",arg=" );
-    dump_uint64( &data->arg );
-    fprintf( stderr, ",cvalue=" );
-    dump_uint64( &data->cvalue );
+    fprintf( stderr, "%s{handle=%04x,event=%04x", prefix, data->handle, data->event );
+    dump_uint64( ",callback=", &data->callback );
+    dump_uint64( ",iosb=", &data->iosb );
+    dump_uint64( ",arg=", &data->arg );
+    dump_uint64( ",cvalue=", &data->cvalue );
     fputc( '}', stderr );
 }
 
-static void dump_luid( const luid_t *luid )
+static void dump_luid( const char *prefix, const luid_t *luid )
 {
-    fprintf( stderr, "%d.%u", luid->high_part, luid->low_part );
+    fprintf( stderr, "%s%d.%u", prefix, luid->high_part, luid->low_part );
 }
 
 static void dump_context( const CONTEXT *context, data_size_t size )
@@ -366,12 +325,12 @@ static void dump_context( const CONTEXT *context, data_size_t size )
 #endif
 }
 
-static void dump_varargs_ints( data_size_t size )
+static void dump_varargs_ints( const char *prefix, data_size_t size )
 {
     const int *data = cur_data;
     data_size_t len = size / sizeof(*data);
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
         fprintf( stderr, "%d", *data++ );
@@ -381,39 +340,39 @@ static void dump_varargs_ints( data_size_t size )
     remove_data( size );
 }
 
-static void dump_varargs_uints64( data_size_t size )
+static void dump_varargs_uints64( const char *prefix, data_size_t size )
 {
     const unsigned __int64 *data = cur_data;
     data_size_t len = size / sizeof(*data);
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
-        dump_uint64( data++ );
+        dump_uint64( "", data++ );
         if (--len) fputc( ',', stderr );
     }
     fputc( '}', stderr );
     remove_data( size );
 }
 
-static void dump_varargs_apc_result( data_size_t size )
+static void dump_varargs_apc_result( const char *prefix, data_size_t size )
 {
     const apc_result_t *result = cur_data;
 
     if (size >= sizeof(*result))
     {
-        dump_apc_result( result );
+        dump_apc_result( prefix, result );
         size = sizeof(*result);
     }
     remove_data( size );
 }
 
-static void dump_varargs_handles( data_size_t size )
+static void dump_varargs_handles( const char *prefix, data_size_t size )
 {
     const obj_handle_t *data = cur_data;
     data_size_t len = size / sizeof(*data);
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
         fprintf( stderr, "%04x", *data++ );
@@ -423,12 +382,12 @@ static void dump_varargs_handles( data_size_t size )
     remove_data( size );
 }
 
-static void dump_varargs_user_handles( data_size_t size )
+static void dump_varargs_user_handles( const char *prefix, data_size_t size )
 {
     const user_handle_t *data = cur_data;
     data_size_t len = size / sizeof(*data);
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
         fprintf( stderr, "%08x", *data++ );
@@ -438,12 +397,12 @@ static void dump_varargs_user_handles( data_size_t size )
     remove_data( size );
 }
 
-static void dump_varargs_bytes( data_size_t size )
+static void dump_varargs_bytes( const char *prefix, data_size_t size )
 {
     const unsigned char *data = cur_data;
     data_size_t len = size;
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
         fprintf( stderr, "%02x", *data++ );
@@ -453,39 +412,40 @@ static void dump_varargs_bytes( data_size_t size )
     remove_data( size );
 }
 
-static void dump_varargs_string( data_size_t size )
+static void dump_varargs_string( const char *prefix, data_size_t size )
 {
-    fprintf( stderr, "\"%.*s\"", (int)size, (const char *)cur_data );
+    fprintf( stderr, "%s\"%.*s\"", prefix, (int)size, (const char *)cur_data );
     remove_data( size );
 }
 
-static void dump_varargs_unicode_str( data_size_t size )
+static void dump_varargs_unicode_str( const char *prefix, data_size_t size )
 {
-    fprintf( stderr, "L\"" );
+    fprintf( stderr, "%sL\"", prefix );
     dump_strW( cur_data, size / sizeof(WCHAR), stderr, "\"\"" );
     fputc( '\"', stderr );
     remove_data( size );
 }
 
-static void dump_varargs_context( data_size_t size )
+static void dump_varargs_context( const char *prefix, data_size_t size )
 {
     if (!size)
     {
-        fprintf( stderr, "{}" );
+        fprintf( stderr, "%s{}", prefix );
         return;
     }
+    fprintf( stderr, "%s", prefix );
     dump_context( cur_data, size );
     remove_data( min( size, sizeof(CONTEXT) ));
 }
 
-static void dump_varargs_debug_event( data_size_t size )
+static void dump_varargs_debug_event( const char *prefix, data_size_t size )
 {
     debug_event_t event;
     unsigned int i;
 
     if (!size)
     {
-        fprintf( stderr, "{}" );
+        fprintf( stderr, "%s{}", prefix );
         return;
     }
     size = min( size, sizeof(event) );
@@ -495,75 +455,71 @@ static void dump_varargs_debug_event( data_size_t size )
     switch(event.code)
     {
     case EXCEPTION_DEBUG_EVENT:
-        fprintf( stderr, "{exception,first=%d,exc_code=%08x,flags=%08x,record=",
+        fprintf( stderr, "%s{exception,first=%d,exc_code=%08x,flags=%08x", prefix,
                  event.exception.first, event.exception.exc_code, event.exception.flags );
-        dump_uint64( &event.exception.record );
-        fprintf( stderr, ",address=" );
-        dump_uint64( &event.exception.address );
+        dump_uint64( ",record=", &event.exception.record );
+        dump_uint64( ",address=", &event.exception.address );
         fprintf( stderr, ",params={" );
         event.exception.nb_params = min( event.exception.nb_params, EXCEPTION_MAXIMUM_PARAMETERS );
         for (i = 0; i < event.exception.nb_params; i++)
         {
-            dump_uint64( &event.exception.params[i] );
+            dump_uint64( "", &event.exception.params[i] );
             if (i < event.exception.nb_params) fputc( ',', stderr );
         }
         fprintf( stderr, "}}" );
         break;
     case CREATE_THREAD_DEBUG_EVENT:
-        fprintf( stderr, "{create_thread,thread=%04x,teb=", event.create_thread.handle );
-        dump_uint64( &event.create_thread.teb );
-        fprintf( stderr, ",start=" );
-        dump_uint64( &event.create_thread.start );
+        fprintf( stderr, "%s{create_thread,thread=%04x", prefix, event.create_thread.handle );
+        dump_uint64( ",teb=", &event.create_thread.teb );
+        dump_uint64( ",start=", &event.create_thread.start );
         fputc( '}', stderr );
         break;
     case CREATE_PROCESS_DEBUG_EVENT:
-        fprintf( stderr, "{create_process,file=%04x,process=%04x,thread=%04x,base=",
+        fprintf( stderr, "%s{create_process,file=%04x,process=%04x,thread=%04x", prefix,
                  event.create_process.file, event.create_process.process,
                  event.create_process.thread );
-        dump_uint64( &event.create_process.base );
-        fprintf( stderr, ",offset=%d,size=%d,teb=",
+        dump_uint64( ",base=", &event.create_process.base );
+        fprintf( stderr, ",offset=%d,size=%d",
                  event.create_process.dbg_offset, event.create_process.dbg_size );
-        dump_uint64( &event.create_process.teb );
-        fprintf( stderr, ",start=" );
-        dump_uint64( &event.create_process.start );
-        fprintf( stderr, ",name=" );
-        dump_uint64( &event.create_process.name );
+        dump_uint64( ",teb=", &event.create_process.teb );
+        dump_uint64( ",start=", &event.create_process.start );
+        dump_uint64( ",name=", &event.create_process.name );
         fprintf( stderr, ",unicode=%d}", event.create_process.unicode );
         break;
     case EXIT_THREAD_DEBUG_EVENT:
-        fprintf( stderr, "{exit_thread,code=%d}", event.exit.exit_code );
+        fprintf( stderr, "%s{exit_thread,code=%d}", prefix, event.exit.exit_code );
         break;
     case EXIT_PROCESS_DEBUG_EVENT:
-        fprintf( stderr, "{exit_process,code=%d}", event.exit.exit_code );
+        fprintf( stderr, "%s{exit_process,code=%d}", prefix, event.exit.exit_code );
         break;
     case LOAD_DLL_DEBUG_EVENT:
-        fprintf( stderr, "{load_dll,file=%04x,base", event.load_dll.handle );
-        dump_uint64( &event.load_dll.base );
-        fprintf( stderr, ",offset=%d,size=%d,name=",
+        fprintf( stderr, "%s{load_dll,file=%04x", prefix, event.load_dll.handle );
+        dump_uint64( ",base=", &event.load_dll.base );
+        fprintf( stderr, ",offset=%d,size=%d",
                  event.load_dll.dbg_offset, event.load_dll.dbg_size );
-        dump_uint64( &event.load_dll.name );
+        dump_uint64( ",name=", &event.load_dll.name );
         fprintf( stderr, ",unicode=%d}", event.load_dll.unicode );
         break;
     case UNLOAD_DLL_DEBUG_EVENT:
-        fputs( "{unload_dll,base=", stderr );
-        dump_uint64( &event.unload_dll.base );
+        fprintf( stderr, "%s{unload_dll", prefix );
+        dump_uint64( ",base=", &event.unload_dll.base );
         fputc( '}', stderr );
         break;
     case OUTPUT_DEBUG_STRING_EVENT:
-        fprintf( stderr, "{output_string,string=" );
-        dump_uint64( &event.output_string.string );
+        fprintf( stderr, "%s{output_string", prefix );
+        dump_uint64( ",string=", &event.output_string.string );
         fprintf( stderr, ",unicode=%d,len=%u}",
                  event.output_string.unicode, event.output_string.length );
         break;
     case RIP_EVENT:
-        fprintf( stderr, "{rip,err=%d,type=%d}",
+        fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix,
                  event.rip_info.error, event.rip_info.type );
         break;
     case 0:  /* zero is the code returned on timeouts */
-        fprintf( stderr, "{}" );
+        fprintf( stderr, "%s{}", prefix );
         break;
     default:
-        fprintf( stderr, "{code=??? (%d)}", event.code );
+        fprintf( stderr, "%s{code=??? (%d)}", prefix, event.code );
         break;
     }
     remove_data( size );
@@ -580,21 +536,21 @@ static void dump_inline_unicode_string( const UNICODE_STRING *str, const void *d
     dump_strW( (const WCHAR *)data + offset/sizeof(WCHAR), length/sizeof(WCHAR), stderr, "\"\"" );
 }
 
-static void dump_varargs_startup_info( data_size_t size )
+static void dump_varargs_startup_info( const char *prefix, data_size_t size )
 {
     const RTL_USER_PROCESS_PARAMETERS *ptr = cur_data;
     RTL_USER_PROCESS_PARAMETERS params;
 
     if (size < sizeof(params.Size))
     {
-        fprintf( stderr, "{}" );
+        fprintf( stderr, "%s{}", prefix );
         return;
     }
     if (size > ptr->Size) size = ptr->Size;
     memset( &params, 0, sizeof(params) );
     memcpy( &params, ptr, min( size, sizeof(params) ));
 
-    fprintf( stderr, "{AllocationSize=%x,", params.AllocationSize );
+    fprintf( stderr, "%s{AllocationSize=%x,", prefix, params.AllocationSize );
     fprintf( stderr, "Size=%x,", params.Size );
     fprintf( stderr, "Flags=%x,", params.Flags );
     fprintf( stderr, "DebugFlags=%x,", params.DebugFlags );
@@ -633,12 +589,12 @@ static void dump_varargs_startup_info( data_size_t size )
     remove_data( size );
 }
 
-static void dump_varargs_input_records( data_size_t size )
+static void dump_varargs_input_records( const char *prefix, data_size_t size )
 {
     const INPUT_RECORD *rec = cur_data;
     data_size_t len = size / sizeof(*rec);
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
         fprintf( stderr, "{%04x,...}", rec->EventType );
@@ -649,37 +605,37 @@ static void dump_varargs_input_records( data_size_t size )
     remove_data( size );
 }
 
-static void dump_varargs_rectangles( data_size_t size )
+static void dump_varargs_rectangles( const char *prefix, data_size_t size )
 {
     const rectangle_t *rect = cur_data;
     data_size_t len = size / sizeof(*rect);
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
-        dump_rectangle( rect++ );
+        dump_rectangle( "", rect++ );
         if (--len) fputc( ',', stderr );
     }
     fputc( '}', stderr );
     remove_data( size );
 }
 
-static void dump_varargs_message_data( data_size_t size )
+static void dump_varargs_message_data( const char *prefix, data_size_t size )
 {
     /* FIXME: dump the structured data */
-    dump_varargs_bytes( size );
+    dump_varargs_bytes( prefix, size );
 }
 
-static void dump_varargs_properties( data_size_t size )
+static void dump_varargs_properties( const char *prefix, data_size_t size )
 {
     const property_data_t *prop = cur_data;
     data_size_t len = size / sizeof(*prop);
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
-        fprintf( stderr, "{atom=%04x,str=%d,data=", prop->atom, prop->string );
-        dump_uint64( &prop->data );
+        fprintf( stderr, "{atom=%04x,str=%d", prop->atom, prop->string );
+        dump_uint64( ",data=", &prop->data );
         fputc( '}', stderr );
         prop++;
         if (--len) fputc( ',', stderr );
@@ -688,12 +644,12 @@ static void dump_varargs_properties( data_size_t size )
     remove_data( size );
 }
 
-static void dump_varargs_LUID_AND_ATTRIBUTES( data_size_t size )
+static void dump_varargs_LUID_AND_ATTRIBUTES( const char *prefix, data_size_t size )
 {
     const LUID_AND_ATTRIBUTES *lat = cur_data;
     data_size_t len = size / sizeof(*lat);
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     while (len > 0)
     {
         fprintf( stderr, "{luid=%08x%08x,attr=%x}",
@@ -705,7 +661,7 @@ static void dump_varargs_LUID_AND_ATTRIBUTES( data_size_t size )
     remove_data( size );
 }
 
-static void dump_inline_sid( const SID *sid, data_size_t size )
+static void dump_inline_sid( const char *prefix, const SID *sid, data_size_t size )
 {
     DWORD i;
 
@@ -717,7 +673,7 @@ static void dump_inline_sid( const SID *sid, data_size_t size )
         return;
     }
 
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     fprintf( stderr, "S-%u-%u", sid->Revision, MAKELONG(
         MAKEWORD( sid->IdentifierAuthority.Value[5],
                   sid->IdentifierAuthority.Value[4] ),
@@ -728,19 +684,19 @@ static void dump_inline_sid( const SID *sid, data_size_t size )
     fputc( '}', stderr );
 }
 
-static void dump_varargs_SID( data_size_t size )
+static void dump_varargs_SID( const char *prefix, data_size_t size )
 {
     const SID *sid = cur_data;
-    dump_inline_sid( sid, size );
+    dump_inline_sid( prefix, sid, size );
     remove_data( size );
 }
 
-static void dump_inline_acl( const ACL *acl, data_size_t size )
+static void dump_inline_acl( const char *prefix, const ACL *acl, data_size_t size )
 {
     const ACE_HEADER *ace;
     ULONG i;
-    fputc( '{', stderr );
 
+    fprintf( stderr,"%s{", prefix );
     if (size)
     {
         if (size < sizeof(ACL))
@@ -792,9 +748,9 @@ static void dump_inline_acl( const ACL *acl, data_size_t size )
                 fprintf( stderr, "unknown<%d>", ace->AceType );
                 break;
             }
-            fprintf( stderr, ",AceFlags=%x,Sid=", ace->AceFlags );
+            fprintf( stderr, ",AceFlags=%x", ace->AceFlags );
             if (sid)
-                dump_inline_sid( sid, sid_size );
+                dump_inline_sid( ",Sid=", sid, sid_size );
             ace = (const ACE_HEADER *)((const char *)ace + ace->AceSize);
             fputc( '}', stderr );
         }
@@ -802,54 +758,51 @@ static void dump_inline_acl( const ACL *acl, data_size_t size )
     fputc( '}', stderr );
 }
 
-static void dump_inline_security_descriptor( const struct security_descriptor *sd, data_size_t size )
+static void dump_inline_security_descriptor( const char *prefix, const struct security_descriptor *sd, data_size_t size )
 {
-    fputc( '{', stderr );
+    fprintf( stderr,"%s{", prefix );
     if (size >= sizeof(struct security_descriptor))
     {
         size_t offset = sizeof(struct security_descriptor);
         fprintf( stderr, "control=%08x", sd->control );
-        fprintf( stderr, ",owner=" );
         if ((sd->owner_len > FIELD_OFFSET(SID, SubAuthority[255])) || (offset + sd->owner_len > size))
             return;
         if (sd->owner_len)
-            dump_inline_sid( (const SID *)((const char *)sd + offset), sd->owner_len );
+            dump_inline_sid( ",owner=", (const SID *)((const char *)sd + offset), sd->owner_len );
         else
-            fprintf( stderr, "<not present>" );
+            fprintf( stderr, ",owner=<not present>" );
         offset += sd->owner_len;
-        fprintf( stderr, ",group=" );
         if ((sd->group_len > FIELD_OFFSET(SID, SubAuthority[255])) || (offset + sd->group_len > size))
             return;
         if (sd->group_len)
-            dump_inline_sid( (const SID *)((const char *)sd + offset), sd->group_len );
+            dump_inline_sid( ",group=", (const SID *)((const char *)sd + offset), sd->group_len );
         else
-            fprintf( stderr, "<not present>" );
+            fprintf( stderr, ",group=<not present>" );
         offset += sd->group_len;
-        fprintf( stderr, ",sacl=" );
         if ((sd->sacl_len >= MAX_ACL_LEN) || (offset + sd->sacl_len > size))
             return;
-        dump_inline_acl( (const ACL *)((const char *)sd + offset), sd->sacl_len );
+        dump_inline_acl( ",sacl=", (const ACL *)((const char *)sd + offset), sd->sacl_len );
         offset += sd->sacl_len;
-        fprintf( stderr, ",dacl=" );
         if ((sd->dacl_len >= MAX_ACL_LEN) || (offset + sd->dacl_len > size))
             return;
-        dump_inline_acl( (const ACL *)((const char *)sd + offset), sd->dacl_len );
+        dump_inline_acl( ",dacl=", (const ACL *)((const char *)sd + offset), sd->dacl_len );
         offset += sd->dacl_len;
     }
     fputc( '}', stderr );
 }
 
-static void dump_varargs_security_descriptor( data_size_t size )
+static void dump_varargs_security_descriptor( const char *prefix, data_size_t size )
 {
     const struct security_descriptor *sd = cur_data;
-    dump_inline_security_descriptor( sd, size );
+    dump_inline_security_descriptor( prefix, sd, size );
     remove_data( size );
 }
 
-static void dump_varargs_token_groups( data_size_t size )
+static void dump_varargs_token_groups( const char *prefix, data_size_t size )
 {
     const struct token_groups *tg = cur_data;
-    fputc( '{', stderr );
+
+    fprintf( stderr,"%s{", prefix );
     if (size >= sizeof(struct token_groups))
     {
         size_t offset = sizeof(*tg);
@@ -869,8 +822,7 @@ static void dump_varargs_token_groups( data_size_t size )
                     fputc( ',', stderr );
                 fputc( '{', stderr );
                 fprintf( stderr, "attributes=%08x", attr[i] );
-                fprintf( stderr, ",sid=" );
-                dump_inline_sid( sid, size - offset );
+                dump_inline_sid( ",sid=", sid, size - offset );
                 if ((offset + FIELD_OFFSET(SID, SubAuthority[0]) > size) ||
                     (offset + FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]) > size))
                     break;
@@ -883,18 +835,19 @@ static void dump_varargs_token_groups( data_size_t size )
     fputc( '}', stderr );
 }
 
-static void dump_varargs_object_attributes( data_size_t size )
+static void dump_varargs_object_attributes( const char *prefix, data_size_t size )
 {
     const struct object_attributes *objattr = cur_data;
-    fputc( '{', stderr );
+
+    fprintf( stderr,"%s{", prefix );
     if (size >= sizeof(struct object_attributes))
     {
         const WCHAR *str;
-        fprintf( stderr, "rootdir=%04x,sd=", objattr->rootdir );
+        fprintf( stderr, "rootdir=%04x", objattr->rootdir );
         if (objattr->sd_len > size - sizeof(*objattr) ||
             objattr->name_len > size - sizeof(*objattr) - objattr->sd_len)
             return;
-        dump_inline_security_descriptor( (const struct security_descriptor *)(objattr + 1), objattr->sd_len );
+        dump_inline_security_descriptor( ",sd=", (const struct security_descriptor *)(objattr + 1), objattr->sd_len );
         str = (const WCHAR *)objattr + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR);
         fprintf( stderr, ",name=L\"" );
         dump_strW( str, objattr->name_len / sizeof(WCHAR), stderr, "\"\"" );
@@ -912,31 +865,28 @@ typedef void (*dump_func)( const void *req );
 
 static void dump_new_process_request( const struct new_process_request *req )
 {
-    fprintf( stderr, " inherit_all=%d,", req->inherit_all );
-    fprintf( stderr, " create_flags=%08x,", req->create_flags );
-    fprintf( stderr, " socket_fd=%d,", req->socket_fd );
-    fprintf( stderr, " exe_file=%04x,", req->exe_file );
-    fprintf( stderr, " hstdin=%04x,", req->hstdin );
-    fprintf( stderr, " hstdout=%04x,", req->hstdout );
-    fprintf( stderr, " hstderr=%04x,", req->hstderr );
-    fprintf( stderr, " process_access=%08x,", req->process_access );
-    fprintf( stderr, " process_attr=%08x,", req->process_attr );
-    fprintf( stderr, " thread_access=%08x,", req->thread_access );
-    fprintf( stderr, " thread_attr=%08x,", req->thread_attr );
-    fprintf( stderr, " info=" );
-    dump_varargs_startup_info( cur_size );
-    fputc( ',', stderr );
-    fprintf( stderr, " env=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " inherit_all=%d", req->inherit_all );
+    fprintf( stderr, ", create_flags=%08x", req->create_flags );
+    fprintf( stderr, ", socket_fd=%d", req->socket_fd );
+    fprintf( stderr, ", exe_file=%04x", req->exe_file );
+    fprintf( stderr, ", hstdin=%04x", req->hstdin );
+    fprintf( stderr, ", hstdout=%04x", req->hstdout );
+    fprintf( stderr, ", hstderr=%04x", req->hstderr );
+    fprintf( stderr, ", process_access=%08x", req->process_access );
+    fprintf( stderr, ", process_attr=%08x", req->process_attr );
+    fprintf( stderr, ", thread_access=%08x", req->thread_access );
+    fprintf( stderr, ", thread_attr=%08x", req->thread_attr );
+    dump_varargs_startup_info( ", info=", cur_size );
+    dump_varargs_unicode_str( ", env=", cur_size );
 }
 
 static void dump_new_process_reply( const struct new_process_reply *req )
 {
-    fprintf( stderr, " info=%04x,", req->info );
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " phandle=%04x,", req->phandle );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " thandle=%04x", req->thandle );
+    fprintf( stderr, " info=%04x", req->info );
+    fprintf( stderr, ", pid=%04x", req->pid );
+    fprintf( stderr, ", phandle=%04x", req->phandle );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    fprintf( stderr, ", thandle=%04x", req->thandle );
 }
 
 static void dump_get_new_process_info_request( const struct get_new_process_info_request *req )
@@ -946,22 +896,22 @@ static void dump_get_new_process_info_request( const struct get_new_process_info
 
 static void dump_get_new_process_info_reply( const struct get_new_process_info_reply *req )
 {
-    fprintf( stderr, " success=%d,", req->success );
-    fprintf( stderr, " exit_code=%d", req->exit_code );
+    fprintf( stderr, " success=%d", req->success );
+    fprintf( stderr, ", exit_code=%d", req->exit_code );
 }
 
 static void dump_new_thread_request( const struct new_thread_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " suspend=%d,", req->suspend );
-    fprintf( stderr, " request_fd=%d", req->request_fd );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", suspend=%d", req->suspend );
+    fprintf( stderr, ", request_fd=%d", req->request_fd );
 }
 
 static void dump_new_thread_reply( const struct new_thread_reply *req )
 {
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, " tid=%04x", req->tid );
+    fprintf( stderr, ", handle=%04x", req->handle );
 }
 
 static void dump_get_startup_info_request( const struct get_startup_info_request *req )
@@ -970,63 +920,48 @@ static void dump_get_startup_info_request( const struct get_startup_info_request
 
 static void dump_get_startup_info_reply( const struct get_startup_info_reply *req )
 {
-    fprintf( stderr, " exe_file=%04x,", req->exe_file );
-    fprintf( stderr, " hstdin=%04x,", req->hstdin );
-    fprintf( stderr, " hstdout=%04x,", req->hstdout );
-    fprintf( stderr, " hstderr=%04x,", req->hstderr );
-    fprintf( stderr, " info=" );
-    dump_varargs_startup_info( cur_size );
-    fputc( ',', stderr );
-    fprintf( stderr, " env=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " exe_file=%04x", req->exe_file );
+    fprintf( stderr, ", hstdin=%04x", req->hstdin );
+    fprintf( stderr, ", hstdout=%04x", req->hstdout );
+    fprintf( stderr, ", hstderr=%04x", req->hstderr );
+    dump_varargs_startup_info( ", info=", cur_size );
+    dump_varargs_unicode_str( ", env=", cur_size );
 }
 
 static void dump_init_process_done_request( const struct init_process_done_request *req )
 {
-    fprintf( stderr, " gui=%d,", req->gui );
-    fprintf( stderr, " module=" );
-    dump_uint64( &req->module );
-    fprintf( stderr, "," );
-    fprintf( stderr, " ldt_copy=" );
-    dump_uint64( &req->ldt_copy );
-    fprintf( stderr, "," );
-    fprintf( stderr, " entry=" );
-    dump_uint64( &req->entry );
+    fprintf( stderr, " gui=%d", req->gui );
+    dump_uint64( ", module=", &req->module );
+    dump_uint64( ", ldt_copy=", &req->ldt_copy );
+    dump_uint64( ", entry=", &req->entry );
 }
 
 static void dump_init_thread_request( const struct init_thread_request *req )
 {
-    fprintf( stderr, " unix_pid=%d,", req->unix_pid );
-    fprintf( stderr, " unix_tid=%d,", req->unix_tid );
-    fprintf( stderr, " debug_level=%d,", req->debug_level );
-    fprintf( stderr, " teb=" );
-    dump_uint64( &req->teb );
-    fprintf( stderr, "," );
-    fprintf( stderr, " entry=" );
-    dump_uint64( &req->entry );
-    fprintf( stderr, "," );
-    fprintf( stderr, " reply_fd=%d,", req->reply_fd );
-    fprintf( stderr, " wait_fd=%d,", req->wait_fd );
-    fprintf( stderr, " cpu=" );
-    dump_cpu_type( &req->cpu );
+    fprintf( stderr, " unix_pid=%d", req->unix_pid );
+    fprintf( stderr, ", unix_tid=%d", req->unix_tid );
+    fprintf( stderr, ", debug_level=%d", req->debug_level );
+    dump_uint64( ", teb=", &req->teb );
+    dump_uint64( ", entry=", &req->entry );
+    fprintf( stderr, ", reply_fd=%d", req->reply_fd );
+    fprintf( stderr, ", wait_fd=%d", req->wait_fd );
+    dump_cpu_type( ", cpu=", &req->cpu );
 }
 
 static void dump_init_thread_reply( const struct init_thread_reply *req )
 {
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " server_start=" );
-    dump_timeout( &req->server_start );
-    fprintf( stderr, "," );
-    fprintf( stderr, " info_size=%u,", req->info_size );
-    fprintf( stderr, " version=%d,", req->version );
-    fprintf( stderr, " all_cpus=%08x", req->all_cpus );
+    fprintf( stderr, " pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    dump_timeout( ", server_start=", &req->server_start );
+    fprintf( stderr, ", info_size=%u", req->info_size );
+    fprintf( stderr, ", version=%d", req->version );
+    fprintf( stderr, ", all_cpus=%08x", req->all_cpus );
 }
 
 static void dump_terminate_process_request( const struct terminate_process_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " exit_code=%d", req->exit_code );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", exit_code=%d", req->exit_code );
 }
 
 static void dump_terminate_process_reply( const struct terminate_process_reply *req )
@@ -1036,14 +971,14 @@ static void dump_terminate_process_reply( const struct terminate_process_reply *
 
 static void dump_terminate_thread_request( const struct terminate_thread_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " exit_code=%d", req->exit_code );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", exit_code=%d", req->exit_code );
 }
 
 static void dump_terminate_thread_reply( const struct terminate_thread_reply *req )
 {
-    fprintf( stderr, " self=%d,", req->self );
-    fprintf( stderr, " last=%d", req->last );
+    fprintf( stderr, " self=%d", req->self );
+    fprintf( stderr, ", last=%d", req->last );
 }
 
 static void dump_get_process_info_request( const struct get_process_info_request *req )
@@ -1053,87 +988,64 @@ static void dump_get_process_info_request( const struct get_process_info_request
 
 static void dump_get_process_info_reply( const struct get_process_info_reply *req )
 {
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " ppid=%04x,", req->ppid );
-    fprintf( stderr, " affinity=" );
-    dump_uint64( &req->affinity );
-    fprintf( stderr, "," );
-    fprintf( stderr, " peb=" );
-    dump_uint64( &req->peb );
-    fprintf( stderr, "," );
-    fprintf( stderr, " start_time=" );
-    dump_timeout( &req->start_time );
-    fprintf( stderr, "," );
-    fprintf( stderr, " end_time=" );
-    dump_timeout( &req->end_time );
-    fprintf( stderr, "," );
-    fprintf( stderr, " exit_code=%d,", req->exit_code );
-    fprintf( stderr, " priority=%d", req->priority );
+    fprintf( stderr, " pid=%04x", req->pid );
+    fprintf( stderr, ", ppid=%04x", req->ppid );
+    dump_uint64( ", affinity=", &req->affinity );
+    dump_uint64( ", peb=", &req->peb );
+    dump_timeout( ", start_time=", &req->start_time );
+    dump_timeout( ", end_time=", &req->end_time );
+    fprintf( stderr, ", exit_code=%d", req->exit_code );
+    fprintf( stderr, ", priority=%d", req->priority );
 }
 
 static void dump_set_process_info_request( const struct set_process_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " mask=%d,", req->mask );
-    fprintf( stderr, " priority=%d,", req->priority );
-    fprintf( stderr, " affinity=" );
-    dump_uint64( &req->affinity );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", mask=%d", req->mask );
+    fprintf( stderr, ", priority=%d", req->priority );
+    dump_uint64( ", affinity=", &req->affinity );
 }
 
 static void dump_get_thread_info_request( const struct get_thread_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " tid_in=%04x", req->tid_in );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", tid_in=%04x", req->tid_in );
 }
 
 static void dump_get_thread_info_reply( const struct get_thread_info_reply *req )
 {
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " teb=" );
-    dump_uint64( &req->teb );
-    fprintf( stderr, "," );
-    fprintf( stderr, " affinity=" );
-    dump_uint64( &req->affinity );
-    fprintf( stderr, "," );
-    fprintf( stderr, " creation_time=" );
-    dump_timeout( &req->creation_time );
-    fprintf( stderr, "," );
-    fprintf( stderr, " exit_time=" );
-    dump_timeout( &req->exit_time );
-    fprintf( stderr, "," );
-    fprintf( stderr, " exit_code=%d,", req->exit_code );
-    fprintf( stderr, " priority=%d,", req->priority );
-    fprintf( stderr, " last=%d", req->last );
+    fprintf( stderr, " pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    dump_uint64( ", teb=", &req->teb );
+    dump_uint64( ", affinity=", &req->affinity );
+    dump_timeout( ", creation_time=", &req->creation_time );
+    dump_timeout( ", exit_time=", &req->exit_time );
+    fprintf( stderr, ", exit_code=%d", req->exit_code );
+    fprintf( stderr, ", priority=%d", req->priority );
+    fprintf( stderr, ", last=%d", req->last );
 }
 
 static void dump_set_thread_info_request( const struct set_thread_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " mask=%d,", req->mask );
-    fprintf( stderr, " priority=%d,", req->priority );
-    fprintf( stderr, " affinity=" );
-    dump_uint64( &req->affinity );
-    fprintf( stderr, "," );
-    fprintf( stderr, " token=%04x", req->token );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", mask=%d", req->mask );
+    fprintf( stderr, ", priority=%d", req->priority );
+    dump_uint64( ", affinity=", &req->affinity );
+    fprintf( stderr, ", token=%04x", req->token );
 }
 
 static void dump_get_dll_info_request( const struct get_dll_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " base_address=" );
-    dump_uint64( &req->base_address );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", base_address=", &req->base_address );
 }
 
 static void dump_get_dll_info_reply( const struct get_dll_info_reply *req )
 {
-    fprintf( stderr, " entry_point=" );
-    dump_uint64( &req->entry_point );
-    fprintf( stderr, "," );
-    fprintf( stderr, " size=%u,", req->size );
-    fprintf( stderr, " filename_len=%u,", req->filename_len );
-    fprintf( stderr, " filename=" );
-    dump_varargs_unicode_str( cur_size );
+    dump_uint64( " entry_point=", &req->entry_point );
+    fprintf( stderr, ", size=%u", req->size );
+    fprintf( stderr, ", filename_len=%u", req->filename_len );
+    dump_varargs_unicode_str( ", filename=", cur_size );
 }
 
 static void dump_suspend_thread_request( const struct suspend_thread_request *req )
@@ -1158,37 +1070,30 @@ static void dump_resume_thread_reply( const struct resume_thread_reply *req )
 
 static void dump_load_dll_request( const struct load_dll_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " base=" );
-    dump_uint64( &req->base );
-    fprintf( stderr, "," );
-    fprintf( stderr, " name=" );
-    dump_uint64( &req->name );
-    fprintf( stderr, "," );
-    fprintf( stderr, " size=%u,", req->size );
-    fprintf( stderr, " dbg_offset=%d,", req->dbg_offset );
-    fprintf( stderr, " dbg_size=%d,", req->dbg_size );
-    fprintf( stderr, " filename=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", base=", &req->base );
+    dump_uint64( ", name=", &req->name );
+    fprintf( stderr, ", size=%u", req->size );
+    fprintf( stderr, ", dbg_offset=%d", req->dbg_offset );
+    fprintf( stderr, ", dbg_size=%d", req->dbg_size );
+    dump_varargs_unicode_str( ", filename=", cur_size );
 }
 
 static void dump_unload_dll_request( const struct unload_dll_request *req )
 {
-    fprintf( stderr, " base=" );
-    dump_uint64( &req->base );
+    dump_uint64( " base=", &req->base );
 }
 
 static void dump_queue_apc_request( const struct queue_apc_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " call=" );
-    dump_apc_call( &req->call );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_apc_call( ", call=", &req->call );
 }
 
 static void dump_queue_apc_reply( const struct queue_apc_reply *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " self=%d", req->self );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", self=%d", req->self );
 }
 
 static void dump_get_apc_result_request( const struct get_apc_result_request *req )
@@ -1198,8 +1103,7 @@ static void dump_get_apc_result_request( const struct get_apc_result_request *re
 
 static void dump_get_apc_result_reply( const struct get_apc_result_reply *req )
 {
-    fprintf( stderr, " result=" );
-    dump_apc_result( &req->result );
+    dump_apc_result( " result=", &req->result );
 }
 
 static void dump_close_handle_request( const struct close_handle_request *req )
@@ -1209,9 +1113,9 @@ static void dump_close_handle_request( const struct close_handle_request *req )
 
 static void dump_set_handle_info_request( const struct set_handle_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " flags=%d,", req->flags );
-    fprintf( stderr, " mask=%d", req->mask );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", flags=%d", req->flags );
+    fprintf( stderr, ", mask=%d", req->mask );
 }
 
 static void dump_set_handle_info_reply( const struct set_handle_info_reply *req )
@@ -1221,26 +1125,26 @@ static void dump_set_handle_info_reply( const struct set_handle_info_reply *req
 
 static void dump_dup_handle_request( const struct dup_handle_request *req )
 {
-    fprintf( stderr, " src_process=%04x,", req->src_process );
-    fprintf( stderr, " src_handle=%04x,", req->src_handle );
-    fprintf( stderr, " dst_process=%04x,", req->dst_process );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " options=%08x", req->options );
+    fprintf( stderr, " src_process=%04x", req->src_process );
+    fprintf( stderr, ", src_handle=%04x", req->src_handle );
+    fprintf( stderr, ", dst_process=%04x", req->dst_process );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", options=%08x", req->options );
 }
 
 static void dump_dup_handle_reply( const struct dup_handle_reply *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " self=%d,", req->self );
-    fprintf( stderr, " closed=%d", req->closed );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", self=%d", req->self );
+    fprintf( stderr, ", closed=%d", req->closed );
 }
 
 static void dump_open_process_request( const struct open_process_request *req )
 {
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x", req->attributes );
+    fprintf( stderr, " pid=%04x", req->pid );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
 }
 
 static void dump_open_process_reply( const struct open_process_reply *req )
@@ -1250,9 +1154,9 @@ static void dump_open_process_reply( const struct open_process_reply *req )
 
 static void dump_open_thread_request( const struct open_thread_request *req )
 {
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x", req->attributes );
+    fprintf( stderr, " tid=%04x", req->tid );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
 }
 
 static void dump_open_thread_reply( const struct open_thread_reply *req )
@@ -1262,41 +1166,29 @@ static void dump_open_thread_reply( const struct open_thread_reply *req )
 
 static void dump_select_request( const struct select_request *req )
 {
-    fprintf( stderr, " flags=%d,", req->flags );
-    fprintf( stderr, " cookie=" );
-    dump_uint64( &req->cookie );
-    fprintf( stderr, "," );
-    fprintf( stderr, " signal=%04x,", req->signal );
-    fprintf( stderr, " prev_apc=%04x,", req->prev_apc );
-    fprintf( stderr, " timeout=" );
-    dump_timeout( &req->timeout );
-    fprintf( stderr, "," );
-    fprintf( stderr, " result=" );
-    dump_varargs_apc_result( cur_size );
-    fputc( ',', stderr );
-    fprintf( stderr, " handles=" );
-    dump_varargs_handles( cur_size );
+    fprintf( stderr, " flags=%d", req->flags );
+    dump_uint64( ", cookie=", &req->cookie );
+    fprintf( stderr, ", signal=%04x", req->signal );
+    fprintf( stderr, ", prev_apc=%04x", req->prev_apc );
+    dump_timeout( ", timeout=", &req->timeout );
+    dump_varargs_apc_result( ", result=", cur_size );
+    dump_varargs_handles( ", handles=", cur_size );
 }
 
 static void dump_select_reply( const struct select_reply *req )
 {
-    fprintf( stderr, " timeout=" );
-    dump_timeout( &req->timeout );
-    fprintf( stderr, "," );
-    fprintf( stderr, " call=" );
-    dump_apc_call( &req->call );
-    fprintf( stderr, "," );
-    fprintf( stderr, " apc_handle=%04x", req->apc_handle );
+    dump_timeout( " timeout=", &req->timeout );
+    dump_apc_call( ", call=", &req->call );
+    fprintf( stderr, ", apc_handle=%04x", req->apc_handle );
 }
 
 static void dump_create_event_request( const struct create_event_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " manual_reset=%d,", req->manual_reset );
-    fprintf( stderr, " initial_state=%d,", req->initial_state );
-    fprintf( stderr, " objattr=" );
-    dump_varargs_object_attributes( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", manual_reset=%d", req->manual_reset );
+    fprintf( stderr, ", initial_state=%d", req->initial_state );
+    dump_varargs_object_attributes( ", objattr=", cur_size );
 }
 
 static void dump_create_event_reply( const struct create_event_reply *req )
@@ -1306,17 +1198,16 @@ static void dump_create_event_reply( const struct create_event_reply *req )
 
 static void dump_event_op_request( const struct event_op_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " op=%d", req->op );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", op=%d", req->op );
 }
 
 static void dump_open_event_request( const struct open_event_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_event_reply( const struct open_event_reply *req )
@@ -1326,11 +1217,10 @@ static void dump_open_event_reply( const struct open_event_reply *req )
 
 static void dump_create_mutex_request( const struct create_mutex_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " owned=%d,", req->owned );
-    fprintf( stderr, " objattr=" );
-    dump_varargs_object_attributes( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", owned=%d", req->owned );
+    dump_varargs_object_attributes( ", objattr=", cur_size );
 }
 
 static void dump_create_mutex_reply( const struct create_mutex_reply *req )
@@ -1350,11 +1240,10 @@ static void dump_release_mutex_reply( const struct release_mutex_reply *req )
 
 static void dump_open_mutex_request( const struct open_mutex_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_mutex_reply( const struct open_mutex_reply *req )
@@ -1364,12 +1253,11 @@ static void dump_open_mutex_reply( const struct open_mutex_reply *req )
 
 static void dump_create_semaphore_request( const struct create_semaphore_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " initial=%08x,", req->initial );
-    fprintf( stderr, " max=%08x,", req->max );
-    fprintf( stderr, " objattr=" );
-    dump_varargs_object_attributes( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", initial=%08x", req->initial );
+    fprintf( stderr, ", max=%08x", req->max );
+    dump_varargs_object_attributes( ", objattr=", cur_size );
 }
 
 static void dump_create_semaphore_reply( const struct create_semaphore_reply *req )
@@ -1379,8 +1267,8 @@ static void dump_create_semaphore_reply( const struct create_semaphore_reply *re
 
 static void dump_release_semaphore_request( const struct release_semaphore_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " count=%08x", req->count );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", count=%08x", req->count );
 }
 
 static void dump_release_semaphore_reply( const struct release_semaphore_reply *req )
@@ -1390,11 +1278,10 @@ static void dump_release_semaphore_reply( const struct release_semaphore_reply *
 
 static void dump_open_semaphore_request( const struct open_semaphore_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_semaphore_reply( const struct open_semaphore_reply *req )
@@ -1404,17 +1291,14 @@ static void dump_open_semaphore_reply( const struct open_semaphore_reply *req )
 
 static void dump_create_file_request( const struct create_file_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " sharing=%08x,", req->sharing );
-    fprintf( stderr, " create=%d,", req->create );
-    fprintf( stderr, " options=%08x,", req->options );
-    fprintf( stderr, " attrs=%08x,", req->attrs );
-    fprintf( stderr, " objattr=" );
-    dump_varargs_object_attributes( cur_size );
-    fputc( ',', stderr );
-    fprintf( stderr, " filename=" );
-    dump_varargs_string( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", sharing=%08x", req->sharing );
+    fprintf( stderr, ", create=%d", req->create );
+    fprintf( stderr, ", options=%08x", req->options );
+    fprintf( stderr, ", attrs=%08x", req->attrs );
+    dump_varargs_object_attributes( ", objattr=", cur_size );
+    dump_varargs_string( ", filename=", cur_size );
 }
 
 static void dump_create_file_reply( const struct create_file_reply *req )
@@ -1424,13 +1308,12 @@ static void dump_create_file_reply( const struct create_file_reply *req )
 
 static void dump_open_file_object_request( const struct open_file_object_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " sharing=%08x,", req->sharing );
-    fprintf( stderr, " options=%08x,", req->options );
-    fprintf( stderr, " filename=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    fprintf( stderr, ", sharing=%08x", req->sharing );
+    fprintf( stderr, ", options=%08x", req->options );
+    dump_varargs_unicode_str( ", filename=", cur_size );
 }
 
 static void dump_open_file_object_reply( const struct open_file_object_reply *req )
@@ -1440,9 +1323,9 @@ static void dump_open_file_object_reply( const struct open_file_object_reply *re
 
 static void dump_alloc_file_handle_request( const struct alloc_file_handle_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " fd=%d", req->fd );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", fd=%d", req->fd );
 }
 
 static void dump_alloc_file_handle_reply( const struct alloc_file_handle_reply *req )
@@ -1457,10 +1340,10 @@ static void dump_get_handle_fd_request( const struct get_handle_fd_request *req
 
 static void dump_get_handle_fd_reply( const struct get_handle_fd_reply *req )
 {
-    fprintf( stderr, " type=%d,", req->type );
-    fprintf( stderr, " removable=%d,", req->removable );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " options=%08x", req->options );
+    fprintf( stderr, " type=%d", req->type );
+    fprintf( stderr, ", removable=%d", req->removable );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", options=%08x", req->options );
 }
 
 static void dump_flush_file_request( const struct flush_file_request *req )
@@ -1475,41 +1358,34 @@ static void dump_flush_file_reply( const struct flush_file_reply *req )
 
 static void dump_lock_file_request( const struct lock_file_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " offset=" );
-    dump_uint64( &req->offset );
-    fprintf( stderr, "," );
-    fprintf( stderr, " count=" );
-    dump_uint64( &req->count );
-    fprintf( stderr, "," );
-    fprintf( stderr, " shared=%d,", req->shared );
-    fprintf( stderr, " wait=%d", req->wait );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", offset=", &req->offset );
+    dump_uint64( ", count=", &req->count );
+    fprintf( stderr, ", shared=%d", req->shared );
+    fprintf( stderr, ", wait=%d", req->wait );
 }
 
 static void dump_lock_file_reply( const struct lock_file_reply *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " overlapped=%d", req->overlapped );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", overlapped=%d", req->overlapped );
 }
 
 static void dump_unlock_file_request( const struct unlock_file_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " offset=" );
-    dump_uint64( &req->offset );
-    fprintf( stderr, "," );
-    fprintf( stderr, " count=" );
-    dump_uint64( &req->count );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", offset=", &req->offset );
+    dump_uint64( ", count=", &req->count );
 }
 
 static void dump_create_socket_request( const struct create_socket_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " family=%d,", req->family );
-    fprintf( stderr, " type=%d,", req->type );
-    fprintf( stderr, " protocol=%d,", req->protocol );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", family=%d", req->family );
+    fprintf( stderr, ", type=%d", req->type );
+    fprintf( stderr, ", protocol=%d", req->protocol );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static void dump_create_socket_reply( const struct create_socket_reply *req )
@@ -1519,9 +1395,9 @@ static void dump_create_socket_reply( const struct create_socket_reply *req )
 
 static void dump_accept_socket_request( const struct accept_socket_request *req )
 {
-    fprintf( stderr, " lhandle=%04x,", req->lhandle );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x", req->attributes );
+    fprintf( stderr, " lhandle=%04x", req->lhandle );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
 }
 
 static void dump_accept_socket_reply( const struct accept_socket_reply *req )
@@ -1531,54 +1407,53 @@ static void dump_accept_socket_reply( const struct accept_socket_reply *req )
 
 static void dump_set_socket_event_request( const struct set_socket_event_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " mask=%08x,", req->mask );
-    fprintf( stderr, " event=%04x,", req->event );
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " msg=%08x", req->msg );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", mask=%08x", req->mask );
+    fprintf( stderr, ", event=%04x", req->event );
+    fprintf( stderr, ", window=%08x", req->window );
+    fprintf( stderr, ", msg=%08x", req->msg );
 }
 
 static void dump_get_socket_event_request( const struct get_socket_event_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " service=%d,", req->service );
-    fprintf( stderr, " c_event=%04x", req->c_event );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", service=%d", req->service );
+    fprintf( stderr, ", c_event=%04x", req->c_event );
 }
 
 static void dump_get_socket_event_reply( const struct get_socket_event_reply *req )
 {
-    fprintf( stderr, " mask=%08x,", req->mask );
-    fprintf( stderr, " pmask=%08x,", req->pmask );
-    fprintf( stderr, " state=%08x,", req->state );
-    fprintf( stderr, " errors=" );
-    dump_varargs_ints( cur_size );
+    fprintf( stderr, " mask=%08x", req->mask );
+    fprintf( stderr, ", pmask=%08x", req->pmask );
+    fprintf( stderr, ", state=%08x", req->state );
+    dump_varargs_ints( ", errors=", cur_size );
 }
 
 static void dump_enable_socket_event_request( const struct enable_socket_event_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " mask=%08x,", req->mask );
-    fprintf( stderr, " sstate=%08x,", req->sstate );
-    fprintf( stderr, " cstate=%08x", req->cstate );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", mask=%08x", req->mask );
+    fprintf( stderr, ", sstate=%08x", req->sstate );
+    fprintf( stderr, ", cstate=%08x", req->cstate );
 }
 
 static void dump_set_socket_deferred_request( const struct set_socket_deferred_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " deferred=%04x", req->deferred );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", deferred=%04x", req->deferred );
 }
 
 static void dump_alloc_console_request( const struct alloc_console_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " pid=%04x", req->pid );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", pid=%04x", req->pid );
 }
 
 static void dump_alloc_console_reply( const struct alloc_console_reply *req )
 {
-    fprintf( stderr, " handle_in=%04x,", req->handle_in );
-    fprintf( stderr, " event=%04x", req->event );
+    fprintf( stderr, " handle_in=%04x", req->handle_in );
+    fprintf( stderr, ", event=%04x", req->event );
 }
 
 static void dump_free_console_request( const struct free_console_request *req )
@@ -1592,16 +1467,15 @@ static void dump_get_console_renderer_events_request( const struct get_console_r
 
 static void dump_get_console_renderer_events_reply( const struct get_console_renderer_events_reply *req )
 {
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    dump_varargs_bytes( " data=", cur_size );
 }
 
 static void dump_open_console_request( const struct open_console_request *req )
 {
-    fprintf( stderr, " from=%04x,", req->from );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " share=%d", req->share );
+    fprintf( stderr, " from=%04x", req->from );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", share=%d", req->share );
 }
 
 static void dump_open_console_reply( const struct open_console_reply *req )
@@ -1630,23 +1504,22 @@ static void dump_get_console_mode_reply( const struct get_console_mode_reply *re
 
 static void dump_set_console_mode_request( const struct set_console_mode_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " mode=%d", req->mode );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", mode=%d", req->mode );
 }
 
 static void dump_set_console_input_info_request( const struct set_console_input_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " mask=%d,", req->mask );
-    fprintf( stderr, " active_sb=%04x,", req->active_sb );
-    fprintf( stderr, " history_mode=%d,", req->history_mode );
-    fprintf( stderr, " history_size=%d,", req->history_size );
-    fprintf( stderr, " edition_mode=%d,", req->edition_mode );
-    fprintf( stderr, " input_cp=%d,", req->input_cp );
-    fprintf( stderr, " output_cp=%d,", req->output_cp );
-    fprintf( stderr, " win=%08x,", req->win );
-    fprintf( stderr, " title=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", mask=%d", req->mask );
+    fprintf( stderr, ", active_sb=%04x", req->active_sb );
+    fprintf( stderr, ", history_mode=%d", req->history_mode );
+    fprintf( stderr, ", history_size=%d", req->history_size );
+    fprintf( stderr, ", edition_mode=%d", req->edition_mode );
+    fprintf( stderr, ", input_cp=%d", req->input_cp );
+    fprintf( stderr, ", output_cp=%d", req->output_cp );
+    fprintf( stderr, ", win=%08x", req->win );
+    dump_varargs_unicode_str( ", title=", cur_size );
 }
 
 static void dump_get_console_input_info_request( const struct get_console_input_info_request *req )
@@ -1656,43 +1529,40 @@ static void dump_get_console_input_info_request( const struct get_console_input_
 
 static void dump_get_console_input_info_reply( const struct get_console_input_info_reply *req )
 {
-    fprintf( stderr, " history_mode=%d,", req->history_mode );
-    fprintf( stderr, " history_size=%d,", req->history_size );
-    fprintf( stderr, " history_index=%d,", req->history_index );
-    fprintf( stderr, " edition_mode=%d,", req->edition_mode );
-    fprintf( stderr, " input_cp=%d,", req->input_cp );
-    fprintf( stderr, " output_cp=%d,", req->output_cp );
-    fprintf( stderr, " win=%08x,", req->win );
-    fprintf( stderr, " title=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " history_mode=%d", req->history_mode );
+    fprintf( stderr, ", history_size=%d", req->history_size );
+    fprintf( stderr, ", history_index=%d", req->history_index );
+    fprintf( stderr, ", edition_mode=%d", req->edition_mode );
+    fprintf( stderr, ", input_cp=%d", req->input_cp );
+    fprintf( stderr, ", output_cp=%d", req->output_cp );
+    fprintf( stderr, ", win=%08x", req->win );
+    dump_varargs_unicode_str( ", title=", cur_size );
 }
 
 static void dump_append_console_input_history_request( const struct append_console_input_history_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " line=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_varargs_unicode_str( ", line=", cur_size );
 }
 
 static void dump_get_console_input_history_request( const struct get_console_input_history_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " index=%d", req->index );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", index=%d", req->index );
 }
 
 static void dump_get_console_input_history_reply( const struct get_console_input_history_reply *req )
 {
-    fprintf( stderr, " total=%d,", req->total );
-    fprintf( stderr, " line=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " total=%d", req->total );
+    dump_varargs_unicode_str( ", line=", cur_size );
 }
 
 static void dump_create_console_output_request( const struct create_console_output_request *req )
 {
-    fprintf( stderr, " handle_in=%04x,", req->handle_in );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " share=%08x", req->share );
+    fprintf( stderr, " handle_in=%04x", req->handle_in );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", share=%08x", req->share );
 }
 
 static void dump_create_console_output_reply( const struct create_console_output_reply *req )
@@ -1702,21 +1572,21 @@ static void dump_create_console_output_reply( const struct create_console_output
 
 static void dump_set_console_output_info_request( const struct set_console_output_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " mask=%d,", req->mask );
-    fprintf( stderr, " cursor_size=%d,", req->cursor_size );
-    fprintf( stderr, " cursor_visible=%d,", req->cursor_visible );
-    fprintf( stderr, " cursor_x=%d,", req->cursor_x );
-    fprintf( stderr, " cursor_y=%d,", req->cursor_y );
-    fprintf( stderr, " width=%d,", req->width );
-    fprintf( stderr, " height=%d,", req->height );
-    fprintf( stderr, " attr=%d,", req->attr );
-    fprintf( stderr, " win_left=%d,", req->win_left );
-    fprintf( stderr, " win_top=%d,", req->win_top );
-    fprintf( stderr, " win_right=%d,", req->win_right );
-    fprintf( stderr, " win_bottom=%d,", req->win_bottom );
-    fprintf( stderr, " max_width=%d,", req->max_width );
-    fprintf( stderr, " max_height=%d", req->max_height );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", mask=%d", req->mask );
+    fprintf( stderr, ", cursor_size=%d", req->cursor_size );
+    fprintf( stderr, ", cursor_visible=%d", req->cursor_visible );
+    fprintf( stderr, ", cursor_x=%d", req->cursor_x );
+    fprintf( stderr, ", cursor_y=%d", req->cursor_y );
+    fprintf( stderr, ", width=%d", req->width );
+    fprintf( stderr, ", height=%d", req->height );
+    fprintf( stderr, ", attr=%d", req->attr );
+    fprintf( stderr, ", win_left=%d", req->win_left );
+    fprintf( stderr, ", win_top=%d", req->win_top );
+    fprintf( stderr, ", win_right=%d", req->win_right );
+    fprintf( stderr, ", win_bottom=%d", req->win_bottom );
+    fprintf( stderr, ", max_width=%d", req->max_width );
+    fprintf( stderr, ", max_height=%d", req->max_height );
 }
 
 static void dump_get_console_output_info_request( const struct get_console_output_info_request *req )
@@ -1726,26 +1596,25 @@ static void dump_get_console_output_info_request( const struct get_console_outpu
 
 static void dump_get_console_output_info_reply( const struct get_console_output_info_reply *req )
 {
-    fprintf( stderr, " cursor_size=%d,", req->cursor_size );
-    fprintf( stderr, " cursor_visible=%d,", req->cursor_visible );
-    fprintf( stderr, " cursor_x=%d,", req->cursor_x );
-    fprintf( stderr, " cursor_y=%d,", req->cursor_y );
-    fprintf( stderr, " width=%d,", req->width );
-    fprintf( stderr, " height=%d,", req->height );
-    fprintf( stderr, " attr=%d,", req->attr );
-    fprintf( stderr, " win_left=%d,", req->win_left );
-    fprintf( stderr, " win_top=%d,", req->win_top );
-    fprintf( stderr, " win_right=%d,", req->win_right );
-    fprintf( stderr, " win_bottom=%d,", req->win_bottom );
-    fprintf( stderr, " max_width=%d,", req->max_width );
-    fprintf( stderr, " max_height=%d", req->max_height );
+    fprintf( stderr, " cursor_size=%d", req->cursor_size );
+    fprintf( stderr, ", cursor_visible=%d", req->cursor_visible );
+    fprintf( stderr, ", cursor_x=%d", req->cursor_x );
+    fprintf( stderr, ", cursor_y=%d", req->cursor_y );
+    fprintf( stderr, ", width=%d", req->width );
+    fprintf( stderr, ", height=%d", req->height );
+    fprintf( stderr, ", attr=%d", req->attr );
+    fprintf( stderr, ", win_left=%d", req->win_left );
+    fprintf( stderr, ", win_top=%d", req->win_top );
+    fprintf( stderr, ", win_right=%d", req->win_right );
+    fprintf( stderr, ", win_bottom=%d", req->win_bottom );
+    fprintf( stderr, ", max_width=%d", req->max_width );
+    fprintf( stderr, ", max_height=%d", req->max_height );
 }
 
 static void dump_write_console_input_request( const struct write_console_input_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " rec=" );
-    dump_varargs_input_records( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_varargs_input_records( ", rec=", cur_size );
 }
 
 static void dump_write_console_input_reply( const struct write_console_input_reply *req )
@@ -1755,45 +1624,42 @@ static void dump_write_console_input_reply( const struct write_console_input_rep
 
 static void dump_read_console_input_request( const struct read_console_input_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " flush=%d", req->flush );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", flush=%d", req->flush );
 }
 
 static void dump_read_console_input_reply( const struct read_console_input_reply *req )
 {
-    fprintf( stderr, " read=%d,", req->read );
-    fprintf( stderr, " rec=" );
-    dump_varargs_input_records( cur_size );
+    fprintf( stderr, " read=%d", req->read );
+    dump_varargs_input_records( ", rec=", cur_size );
 }
 
 static void dump_write_console_output_request( const struct write_console_output_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " x=%d,", req->x );
-    fprintf( stderr, " y=%d,", req->y );
-    fprintf( stderr, " mode=%d,", req->mode );
-    fprintf( stderr, " wrap=%d,", req->wrap );
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", x=%d", req->x );
+    fprintf( stderr, ", y=%d", req->y );
+    fprintf( stderr, ", mode=%d", req->mode );
+    fprintf( stderr, ", wrap=%d", req->wrap );
+    dump_varargs_bytes( ", data=", cur_size );
 }
 
 static void dump_write_console_output_reply( const struct write_console_output_reply *req )
 {
-    fprintf( stderr, " written=%d,", req->written );
-    fprintf( stderr, " width=%d,", req->width );
-    fprintf( stderr, " height=%d", req->height );
+    fprintf( stderr, " written=%d", req->written );
+    fprintf( stderr, ", width=%d", req->width );
+    fprintf( stderr, ", height=%d", req->height );
 }
 
 static void dump_fill_console_output_request( const struct fill_console_output_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " x=%d,", req->x );
-    fprintf( stderr, " y=%d,", req->y );
-    fprintf( stderr, " mode=%d,", req->mode );
-    fprintf( stderr, " count=%d,", req->count );
-    fprintf( stderr, " wrap=%d,", req->wrap );
-    fprintf( stderr, " data=" );
-    dump_char_info( &req->data );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", x=%d", req->x );
+    fprintf( stderr, ", y=%d", req->y );
+    fprintf( stderr, ", mode=%d", req->mode );
+    fprintf( stderr, ", count=%d", req->count );
+    fprintf( stderr, ", wrap=%d", req->wrap );
+    dump_char_info( ", data=", &req->data );
 }
 
 static void dump_fill_console_output_reply( const struct fill_console_output_reply *req )
@@ -1803,45 +1669,43 @@ static void dump_fill_console_output_reply( const struct fill_console_output_rep
 
 static void dump_read_console_output_request( const struct read_console_output_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " x=%d,", req->x );
-    fprintf( stderr, " y=%d,", req->y );
-    fprintf( stderr, " mode=%d,", req->mode );
-    fprintf( stderr, " wrap=%d", req->wrap );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", x=%d", req->x );
+    fprintf( stderr, ", y=%d", req->y );
+    fprintf( stderr, ", mode=%d", req->mode );
+    fprintf( stderr, ", wrap=%d", req->wrap );
 }
 
 static void dump_read_console_output_reply( const struct read_console_output_reply *req )
 {
-    fprintf( stderr, " width=%d,", req->width );
-    fprintf( stderr, " height=%d,", req->height );
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " width=%d", req->width );
+    fprintf( stderr, ", height=%d", req->height );
+    dump_varargs_bytes( ", data=", cur_size );
 }
 
 static void dump_move_console_output_request( const struct move_console_output_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " x_src=%d,", req->x_src );
-    fprintf( stderr, " y_src=%d,", req->y_src );
-    fprintf( stderr, " x_dst=%d,", req->x_dst );
-    fprintf( stderr, " y_dst=%d,", req->y_dst );
-    fprintf( stderr, " w=%d,", req->w );
-    fprintf( stderr, " h=%d", req->h );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", x_src=%d", req->x_src );
+    fprintf( stderr, ", y_src=%d", req->y_src );
+    fprintf( stderr, ", x_dst=%d", req->x_dst );
+    fprintf( stderr, ", y_dst=%d", req->y_dst );
+    fprintf( stderr, ", w=%d", req->w );
+    fprintf( stderr, ", h=%d", req->h );
 }
 
 static void dump_send_console_signal_request( const struct send_console_signal_request *req )
 {
-    fprintf( stderr, " signal=%d,", req->signal );
-    fprintf( stderr, " group_id=%04x", req->group_id );
+    fprintf( stderr, " signal=%d", req->signal );
+    fprintf( stderr, ", group_id=%04x", req->group_id );
 }
 
 static void dump_read_directory_changes_request( const struct read_directory_changes_request *req )
 {
-    fprintf( stderr, " filter=%08x,", req->filter );
-    fprintf( stderr, " subtree=%d,", req->subtree );
-    fprintf( stderr, " want_data=%d,", req->want_data );
-    fprintf( stderr, " async=" );
-    dump_async_data( &req->async );
+    fprintf( stderr, " filter=%08x", req->filter );
+    fprintf( stderr, ", subtree=%d", req->subtree );
+    fprintf( stderr, ", want_data=%d", req->want_data );
+    dump_async_data( ", async=", &req->async );
 }
 
 static void dump_read_change_request( const struct read_change_request *req )
@@ -1851,22 +1715,18 @@ static void dump_read_change_request( const struct read_change_request *req )
 
 static void dump_read_change_reply( const struct read_change_reply *req )
 {
-    fprintf( stderr, " action=%d,", req->action );
-    fprintf( stderr, " name=" );
-    dump_varargs_string( cur_size );
+    fprintf( stderr, " action=%d", req->action );
+    dump_varargs_string( ", name=", cur_size );
 }
 
 static void dump_create_mapping_request( const struct create_mapping_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " protect=%08x,", req->protect );
-    fprintf( stderr, " size=" );
-    dump_uint64( &req->size );
-    fprintf( stderr, "," );
-    fprintf( stderr, " file_handle=%04x,", req->file_handle );
-    fprintf( stderr, " objattr=" );
-    dump_varargs_object_attributes( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", protect=%08x", req->protect );
+    dump_uint64( ", size=", &req->size );
+    fprintf( stderr, ", file_handle=%04x", req->file_handle );
+    dump_varargs_object_attributes( ", objattr=", cur_size );
 }
 
 static void dump_create_mapping_reply( const struct create_mapping_reply *req )
@@ -1876,11 +1736,10 @@ static void dump_create_mapping_reply( const struct create_mapping_reply *req )
 
 static void dump_open_mapping_request( const struct open_mapping_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_mapping_reply( const struct open_mapping_reply *req )
@@ -1890,53 +1749,43 @@ static void dump_open_mapping_reply( const struct open_mapping_reply *req )
 
 static void dump_get_mapping_info_request( const struct get_mapping_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", access=%08x", req->access );
 }
 
 static void dump_get_mapping_info_reply( const struct get_mapping_info_reply *req )
 {
-    fprintf( stderr, " size=" );
-    dump_uint64( &req->size );
-    fprintf( stderr, "," );
-    fprintf( stderr, " protect=%d,", req->protect );
-    fprintf( stderr, " header_size=%d,", req->header_size );
-    fprintf( stderr, " base=" );
-    dump_uint64( &req->base );
-    fprintf( stderr, "," );
-    fprintf( stderr, " mapping=%04x,", req->mapping );
-    fprintf( stderr, " shared_file=%04x", req->shared_file );
+    dump_uint64( " size=", &req->size );
+    fprintf( stderr, ", protect=%d", req->protect );
+    fprintf( stderr, ", header_size=%d", req->header_size );
+    dump_uint64( ", base=", &req->base );
+    fprintf( stderr, ", mapping=%04x", req->mapping );
+    fprintf( stderr, ", shared_file=%04x", req->shared_file );
 }
 
 static void dump_get_mapping_committed_range_request( const struct get_mapping_committed_range_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " offset=" );
-    dump_uint64( &req->offset );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", offset=", &req->offset );
 }
 
 static void dump_get_mapping_committed_range_reply( const struct get_mapping_committed_range_reply *req )
 {
-    fprintf( stderr, " size=" );
-    dump_uint64( &req->size );
-    fprintf( stderr, "," );
-    fprintf( stderr, " committed=%d", req->committed );
+    dump_uint64( " size=", &req->size );
+    fprintf( stderr, ", committed=%d", req->committed );
 }
 
 static void dump_add_mapping_committed_range_request( const struct add_mapping_committed_range_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " offset=" );
-    dump_uint64( &req->offset );
-    fprintf( stderr, "," );
-    fprintf( stderr, " size=" );
-    dump_uint64( &req->size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", offset=", &req->offset );
+    dump_uint64( ", size=", &req->size );
 }
 
 static void dump_create_snapshot_request( const struct create_snapshot_request *req )
 {
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " attributes=%08x", req->attributes );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static void dump_create_snapshot_reply( const struct create_snapshot_reply *req )
@@ -1946,35 +1795,34 @@ static void dump_create_snapshot_reply( const struct create_snapshot_reply *req
 
 static void dump_next_process_request( const struct next_process_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " reset=%d", req->reset );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", reset=%d", req->reset );
 }
 
 static void dump_next_process_reply( const struct next_process_reply *req )
 {
-    fprintf( stderr, " count=%d,", req->count );
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " ppid=%04x,", req->ppid );
-    fprintf( stderr, " threads=%d,", req->threads );
-    fprintf( stderr, " priority=%d,", req->priority );
-    fprintf( stderr, " handles=%d,", req->handles );
-    fprintf( stderr, " filename=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " count=%d", req->count );
+    fprintf( stderr, ", pid=%04x", req->pid );
+    fprintf( stderr, ", ppid=%04x", req->ppid );
+    fprintf( stderr, ", threads=%d", req->threads );
+    fprintf( stderr, ", priority=%d", req->priority );
+    fprintf( stderr, ", handles=%d", req->handles );
+    dump_varargs_unicode_str( ", filename=", cur_size );
 }
 
 static void dump_next_thread_request( const struct next_thread_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " reset=%d", req->reset );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", reset=%d", req->reset );
 }
 
 static void dump_next_thread_reply( const struct next_thread_reply *req )
 {
-    fprintf( stderr, " count=%d,", req->count );
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " base_pri=%d,", req->base_pri );
-    fprintf( stderr, " delta_pri=%d", req->delta_pri );
+    fprintf( stderr, " count=%d", req->count );
+    fprintf( stderr, ", pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    fprintf( stderr, ", base_pri=%d", req->base_pri );
+    fprintf( stderr, ", delta_pri=%d", req->delta_pri );
 }
 
 static void dump_wait_debug_event_request( const struct wait_debug_event_request *req )
@@ -1984,30 +1832,22 @@ static void dump_wait_debug_event_request( const struct wait_debug_event_request
 
 static void dump_wait_debug_event_reply( const struct wait_debug_event_reply *req )
 {
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " wait=%04x,", req->wait );
-    fprintf( stderr, " event=" );
-    dump_varargs_debug_event( cur_size );
+    fprintf( stderr, " pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    fprintf( stderr, ", wait=%04x", req->wait );
+    dump_varargs_debug_event( ", event=", cur_size );
 }
 
 static void dump_queue_exception_event_request( const struct queue_exception_event_request *req )
 {
-    fprintf( stderr, " first=%d,", req->first );
-    fprintf( stderr, " code=%08x,", req->code );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " record=" );
-    dump_uint64( &req->record );
-    fprintf( stderr, "," );
-    fprintf( stderr, " address=" );
-    dump_uint64( &req->address );
-    fprintf( stderr, "," );
-    fprintf( stderr, " len=%u,", req->len );
-    fprintf( stderr, " params=" );
-    dump_varargs_uints64( min(cur_size,req->len) );
-    fputc( ',', stderr );
-    fprintf( stderr, " context=" );
-    dump_varargs_context( cur_size );
+    fprintf( stderr, " first=%d", req->first );
+    fprintf( stderr, ", code=%08x", req->code );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    dump_uint64( ", record=", &req->record );
+    dump_uint64( ", address=", &req->address );
+    fprintf( stderr, ", len=%u", req->len );
+    dump_varargs_uints64( ", params=", min(cur_size,req->len) );
+    dump_varargs_context( ", context=", cur_size );
 }
 
 static void dump_queue_exception_event_reply( const struct queue_exception_event_reply *req )
@@ -2022,30 +1862,27 @@ static void dump_get_exception_status_request( const struct get_exception_status
 
 static void dump_get_exception_status_reply( const struct get_exception_status_reply *req )
 {
-    fprintf( stderr, " context=" );
-    dump_varargs_context( cur_size );
+    dump_varargs_context( " context=", cur_size );
 }
 
 static void dump_output_debug_string_request( const struct output_debug_string_request *req )
 {
-    fprintf( stderr, " length=%u,", req->length );
-    fprintf( stderr, " string=" );
-    dump_uint64( &req->string );
-    fprintf( stderr, "," );
-    fprintf( stderr, " unicode=%d", req->unicode );
+    fprintf( stderr, " length=%u", req->length );
+    dump_uint64( ", string=", &req->string );
+    fprintf( stderr, ", unicode=%d", req->unicode );
 }
 
 static void dump_continue_debug_event_request( const struct continue_debug_event_request *req )
 {
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " status=%d", req->status );
+    fprintf( stderr, " pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    fprintf( stderr, ", status=%d", req->status );
 }
 
 static void dump_debug_process_request( const struct debug_process_request *req )
 {
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " attach=%d", req->attach );
+    fprintf( stderr, " pid=%04x", req->pid );
+    fprintf( stderr, ", attach=%d", req->attach );
 }
 
 static void dump_debug_break_request( const struct debug_break_request *req )
@@ -2065,54 +1902,45 @@ static void dump_set_debugger_kill_on_exit_request( const struct set_debugger_ki
 
 static void dump_read_process_memory_request( const struct read_process_memory_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " addr=" );
-    dump_uint64( &req->addr );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", addr=", &req->addr );
 }
 
 static void dump_read_process_memory_reply( const struct read_process_memory_reply *req )
 {
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    dump_varargs_bytes( " data=", cur_size );
 }
 
 static void dump_write_process_memory_request( const struct write_process_memory_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " addr=" );
-    dump_uint64( &req->addr );
-    fprintf( stderr, "," );
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", addr=", &req->addr );
+    dump_varargs_bytes( ", data=", cur_size );
 }
 
 static void dump_create_key_request( const struct create_key_request *req )
 {
-    fprintf( stderr, " parent=%04x,", req->parent );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " options=%08x,", req->options );
-    fprintf( stderr, " namelen=%u,", req->namelen );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( min(cur_size,req->namelen) );
-    fputc( ',', stderr );
-    fprintf( stderr, " class=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " parent=%04x", req->parent );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", options=%08x", req->options );
+    fprintf( stderr, ", namelen=%u", req->namelen );
+    dump_varargs_unicode_str( ", name=", min(cur_size,req->namelen) );
+    dump_varargs_unicode_str( ", class=", cur_size );
 }
 
 static void dump_create_key_reply( const struct create_key_reply *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " created=%d", req->created );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    fprintf( stderr, ", created=%d", req->created );
 }
 
 static void dump_open_key_request( const struct open_key_request *req )
 {
-    fprintf( stderr, " parent=%04x,", req->parent );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " parent=%04x", req->parent );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_key_reply( const struct open_key_reply *req )
@@ -2132,90 +1960,75 @@ static void dump_flush_key_request( const struct flush_key_request *req )
 
 static void dump_enum_key_request( const struct enum_key_request *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " index=%d,", req->index );
-    fprintf( stderr, " info_class=%d", req->info_class );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    fprintf( stderr, ", index=%d", req->index );
+    fprintf( stderr, ", info_class=%d", req->info_class );
 }
 
 static void dump_enum_key_reply( const struct enum_key_reply *req )
 {
-    fprintf( stderr, " subkeys=%d,", req->subkeys );
-    fprintf( stderr, " max_subkey=%d,", req->max_subkey );
-    fprintf( stderr, " max_class=%d,", req->max_class );
-    fprintf( stderr, " values=%d,", req->values );
-    fprintf( stderr, " max_value=%d,", req->max_value );
-    fprintf( stderr, " max_data=%d,", req->max_data );
-    fprintf( stderr, " modif=" );
-    dump_timeout( &req->modif );
-    fprintf( stderr, "," );
-    fprintf( stderr, " total=%u,", req->total );
-    fprintf( stderr, " namelen=%u,", req->namelen );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( min(cur_size,req->namelen) );
-    fputc( ',', stderr );
-    fprintf( stderr, " class=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " subkeys=%d", req->subkeys );
+    fprintf( stderr, ", max_subkey=%d", req->max_subkey );
+    fprintf( stderr, ", max_class=%d", req->max_class );
+    fprintf( stderr, ", values=%d", req->values );
+    fprintf( stderr, ", max_value=%d", req->max_value );
+    fprintf( stderr, ", max_data=%d", req->max_data );
+    dump_timeout( ", modif=", &req->modif );
+    fprintf( stderr, ", total=%u", req->total );
+    fprintf( stderr, ", namelen=%u", req->namelen );
+    dump_varargs_unicode_str( ", name=", min(cur_size,req->namelen) );
+    dump_varargs_unicode_str( ", class=", cur_size );
 }
 
 static void dump_set_key_value_request( const struct set_key_value_request *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " type=%d,", req->type );
-    fprintf( stderr, " namelen=%u,", req->namelen );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( min(cur_size,req->namelen) );
-    fputc( ',', stderr );
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    fprintf( stderr, ", type=%d", req->type );
+    fprintf( stderr, ", namelen=%u", req->namelen );
+    dump_varargs_unicode_str( ", name=", min(cur_size,req->namelen) );
+    dump_varargs_bytes( ", data=", cur_size );
 }
 
 static void dump_get_key_value_request( const struct get_key_value_request *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_get_key_value_reply( const struct get_key_value_reply *req )
 {
-    fprintf( stderr, " type=%d,", req->type );
-    fprintf( stderr, " total=%u,", req->total );
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " type=%d", req->type );
+    fprintf( stderr, ", total=%u", req->total );
+    dump_varargs_bytes( ", data=", cur_size );
 }
 
 static void dump_enum_key_value_request( const struct enum_key_value_request *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " index=%d,", req->index );
-    fprintf( stderr, " info_class=%d", req->info_class );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    fprintf( stderr, ", index=%d", req->index );
+    fprintf( stderr, ", info_class=%d", req->info_class );
 }
 
 static void dump_enum_key_value_reply( const struct enum_key_value_reply *req )
 {
-    fprintf( stderr, " type=%d,", req->type );
-    fprintf( stderr, " total=%u,", req->total );
-    fprintf( stderr, " namelen=%u,", req->namelen );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( min(cur_size,req->namelen) );
-    fputc( ',', stderr );
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " type=%d", req->type );
+    fprintf( stderr, ", total=%u", req->total );
+    fprintf( stderr, ", namelen=%u", req->namelen );
+    dump_varargs_unicode_str( ", name=", min(cur_size,req->namelen) );
+    dump_varargs_bytes( ", data=", cur_size );
 }
 
 static void dump_delete_key_value_request( const struct delete_key_value_request *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_load_registry_request( const struct load_registry_request *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " file=%04x,", req->file );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    fprintf( stderr, ", file=%04x", req->file );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_unload_registry_request( const struct unload_registry_request *req )
@@ -2225,26 +2038,25 @@ static void dump_unload_registry_request( const struct unload_registry_request *
 
 static void dump_save_registry_request( const struct save_registry_request *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " file=%04x", req->file );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    fprintf( stderr, ", file=%04x", req->file );
 }
 
 static void dump_set_registry_notification_request( const struct set_registry_notification_request *req )
 {
-    fprintf( stderr, " hkey=%04x,", req->hkey );
-    fprintf( stderr, " event=%04x,", req->event );
-    fprintf( stderr, " subtree=%d,", req->subtree );
-    fprintf( stderr, " filter=%08x", req->filter );
+    fprintf( stderr, " hkey=%04x", req->hkey );
+    fprintf( stderr, ", event=%04x", req->event );
+    fprintf( stderr, ", subtree=%d", req->subtree );
+    fprintf( stderr, ", filter=%08x", req->filter );
 }
 
 static void dump_create_timer_request( const struct create_timer_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " manual=%d,", req->manual );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    fprintf( stderr, ", manual=%d", req->manual );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_create_timer_reply( const struct create_timer_reply *req )
@@ -2254,11 +2066,10 @@ static void dump_create_timer_reply( const struct create_timer_reply *req )
 
 static void dump_open_timer_request( const struct open_timer_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_timer_reply( const struct open_timer_reply *req )
@@ -2268,17 +2079,11 @@ static void dump_open_timer_reply( const struct open_timer_reply *req )
 
 static void dump_set_timer_request( const struct set_timer_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " expire=" );
-    dump_timeout( &req->expire );
-    fprintf( stderr, "," );
-    fprintf( stderr, " callback=" );
-    dump_uint64( &req->callback );
-    fprintf( stderr, "," );
-    fprintf( stderr, " arg=" );
-    dump_uint64( &req->arg );
-    fprintf( stderr, "," );
-    fprintf( stderr, " period=%d", req->period );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_timeout( ", expire=", &req->expire );
+    dump_uint64( ", callback=", &req->callback );
+    dump_uint64( ", arg=", &req->arg );
+    fprintf( stderr, ", period=%d", req->period );
 }
 
 static void dump_set_timer_reply( const struct set_timer_reply *req )
@@ -2303,33 +2108,29 @@ static void dump_get_timer_info_request( const struct get_timer_info_request *re
 
 static void dump_get_timer_info_reply( const struct get_timer_info_reply *req )
 {
-    fprintf( stderr, " when=" );
-    dump_timeout( &req->when );
-    fprintf( stderr, "," );
-    fprintf( stderr, " signaled=%d", req->signaled );
+    dump_timeout( " when=", &req->when );
+    fprintf( stderr, ", signaled=%d", req->signaled );
 }
 
 static void dump_get_thread_context_request( const struct get_thread_context_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " suspend=%d", req->suspend );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    fprintf( stderr, ", suspend=%d", req->suspend );
 }
 
 static void dump_get_thread_context_reply( const struct get_thread_context_reply *req )
 {
-    fprintf( stderr, " self=%d,", req->self );
-    fprintf( stderr, " context=" );
-    dump_varargs_context( cur_size );
+    fprintf( stderr, " self=%d", req->self );
+    dump_varargs_context( ", context=", cur_size );
 }
 
 static void dump_set_thread_context_request( const struct set_thread_context_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " suspend=%d,", req->suspend );
-    fprintf( stderr, " context=" );
-    dump_varargs_context( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    fprintf( stderr, ", suspend=%d", req->suspend );
+    dump_varargs_context( ", context=", cur_size );
 }
 
 static void dump_set_thread_context_reply( const struct set_thread_context_reply *req )
@@ -2339,22 +2140,21 @@ static void dump_set_thread_context_reply( const struct set_thread_context_reply
 
 static void dump_get_selector_entry_request( const struct get_selector_entry_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " entry=%d", req->entry );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", entry=%d", req->entry );
 }
 
 static void dump_get_selector_entry_reply( const struct get_selector_entry_reply *req )
 {
-    fprintf( stderr, " base=%08x,", req->base );
-    fprintf( stderr, " limit=%08x,", req->limit );
-    fprintf( stderr, " flags=%02x", req->flags );
+    fprintf( stderr, " base=%08x", req->base );
+    fprintf( stderr, ", limit=%08x", req->limit );
+    fprintf( stderr, ", flags=%02x", req->flags );
 }
 
 static void dump_add_atom_request( const struct add_atom_request *req )
 {
-    fprintf( stderr, " table=%04x,", req->table );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " table=%04x", req->table );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_add_atom_reply( const struct add_atom_reply *req )
@@ -2364,15 +2164,14 @@ static void dump_add_atom_reply( const struct add_atom_reply *req )
 
 static void dump_delete_atom_request( const struct delete_atom_request *req )
 {
-    fprintf( stderr, " table=%04x,", req->table );
-    fprintf( stderr, " atom=%04x", req->atom );
+    fprintf( stderr, " table=%04x", req->table );
+    fprintf( stderr, ", atom=%04x", req->atom );
 }
 
 static void dump_find_atom_request( const struct find_atom_request *req )
 {
-    fprintf( stderr, " table=%04x,", req->table );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " table=%04x", req->table );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_find_atom_reply( const struct find_atom_reply *req )
@@ -2382,30 +2181,29 @@ static void dump_find_atom_reply( const struct find_atom_reply *req )
 
 static void dump_get_atom_information_request( const struct get_atom_information_request *req )
 {
-    fprintf( stderr, " table=%04x,", req->table );
-    fprintf( stderr, " atom=%04x", req->atom );
+    fprintf( stderr, " table=%04x", req->table );
+    fprintf( stderr, ", atom=%04x", req->atom );
 }
 
 static void dump_get_atom_information_reply( const struct get_atom_information_reply *req )
 {
-    fprintf( stderr, " count=%d,", req->count );
-    fprintf( stderr, " pinned=%d,", req->pinned );
-    fprintf( stderr, " total=%u,", req->total );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " count=%d", req->count );
+    fprintf( stderr, ", pinned=%d", req->pinned );
+    fprintf( stderr, ", total=%u", req->total );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_set_atom_information_request( const struct set_atom_information_request *req )
 {
-    fprintf( stderr, " table=%04x,", req->table );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " pinned=%d", req->pinned );
+    fprintf( stderr, " table=%04x", req->table );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    fprintf( stderr, ", pinned=%d", req->pinned );
 }
 
 static void dump_empty_atom_table_request( const struct empty_atom_table_request *req )
 {
-    fprintf( stderr, " table=%04x,", req->table );
-    fprintf( stderr, " if_pinned=%d", req->if_pinned );
+    fprintf( stderr, " table=%04x", req->table );
+    fprintf( stderr, ", if_pinned=%d", req->if_pinned );
 }
 
 static void dump_init_atom_table_request( const struct init_atom_table_request *req )
@@ -2434,15 +2232,15 @@ static void dump_set_queue_fd_request( const struct set_queue_fd_request *req )
 
 static void dump_set_queue_mask_request( const struct set_queue_mask_request *req )
 {
-    fprintf( stderr, " wake_mask=%08x,", req->wake_mask );
-    fprintf( stderr, " changed_mask=%08x,", req->changed_mask );
-    fprintf( stderr, " skip_wait=%d", req->skip_wait );
+    fprintf( stderr, " wake_mask=%08x", req->wake_mask );
+    fprintf( stderr, ", changed_mask=%08x", req->changed_mask );
+    fprintf( stderr, ", skip_wait=%d", req->skip_wait );
 }
 
 static void dump_set_queue_mask_reply( const struct set_queue_mask_reply *req )
 {
-    fprintf( stderr, " wake_bits=%08x,", req->wake_bits );
-    fprintf( stderr, " changed_bits=%08x", req->changed_bits );
+    fprintf( stderr, " wake_bits=%08x", req->wake_bits );
+    fprintf( stderr, ", changed_bits=%08x", req->changed_bits );
 }
 
 static void dump_get_queue_status_request( const struct get_queue_status_request *req )
@@ -2452,8 +2250,8 @@ static void dump_get_queue_status_request( const struct get_queue_status_request
 
 static void dump_get_queue_status_reply( const struct get_queue_status_reply *req )
 {
-    fprintf( stderr, " wake_bits=%08x,", req->wake_bits );
-    fprintf( stderr, " changed_bits=%08x", req->changed_bits );
+    fprintf( stderr, " wake_bits=%08x", req->wake_bits );
+    fprintf( stderr, ", changed_bits=%08x", req->changed_bits );
 }
 
 static void dump_get_process_idle_event_request( const struct get_process_idle_event_request *req )
@@ -2468,22 +2266,15 @@ static void dump_get_process_idle_event_reply( const struct get_process_idle_eve
 
 static void dump_send_message_request( const struct send_message_request *req )
 {
-    fprintf( stderr, " id=%04x,", req->id );
-    fprintf( stderr, " type=%d,", req->type );
-    fprintf( stderr, " flags=%d,", req->flags );
-    fprintf( stderr, " win=%08x,", req->win );
-    fprintf( stderr, " msg=%08x,", req->msg );
-    fprintf( stderr, " wparam=" );
-    dump_uint64( &req->wparam );
-    fprintf( stderr, "," );
-    fprintf( stderr, " lparam=" );
-    dump_uint64( &req->lparam );
-    fprintf( stderr, "," );
-    fprintf( stderr, " timeout=" );
-    dump_timeout( &req->timeout );
-    fprintf( stderr, "," );
-    fprintf( stderr, " data=" );
-    dump_varargs_message_data( cur_size );
+    fprintf( stderr, " id=%04x", req->id );
+    fprintf( stderr, ", type=%d", req->type );
+    fprintf( stderr, ", flags=%d", req->flags );
+    fprintf( stderr, ", win=%08x", req->win );
+    fprintf( stderr, ", msg=%08x", req->msg );
+    dump_uint64( ", wparam=", &req->wparam );
+    dump_uint64( ", lparam=", &req->lparam );
+    dump_timeout( ", timeout=", &req->timeout );
+    dump_varargs_message_data( ", data=", cur_size );
 }
 
 static void dump_post_quit_message_request( const struct post_quit_message_request *req )
@@ -2493,67 +2284,53 @@ static void dump_post_quit_message_request( const struct post_quit_message_reque
 
 static void dump_send_hardware_message_request( const struct send_hardware_message_request *req )
 {
-    fprintf( stderr, " id=%04x,", req->id );
-    fprintf( stderr, " win=%08x,", req->win );
-    fprintf( stderr, " msg=%08x,", req->msg );
-    fprintf( stderr, " wparam=" );
-    dump_uint64( &req->wparam );
-    fprintf( stderr, "," );
-    fprintf( stderr, " lparam=" );
-    dump_uint64( &req->lparam );
-    fprintf( stderr, "," );
-    fprintf( stderr, " info=" );
-    dump_uint64( &req->info );
-    fprintf( stderr, "," );
-    fprintf( stderr, " x=%d,", req->x );
-    fprintf( stderr, " y=%d,", req->y );
-    fprintf( stderr, " time=%08x", req->time );
+    fprintf( stderr, " id=%04x", req->id );
+    fprintf( stderr, ", win=%08x", req->win );
+    fprintf( stderr, ", msg=%08x", req->msg );
+    dump_uint64( ", wparam=", &req->wparam );
+    dump_uint64( ", lparam=", &req->lparam );
+    dump_uint64( ", info=", &req->info );
+    fprintf( stderr, ", x=%d", req->x );
+    fprintf( stderr, ", y=%d", req->y );
+    fprintf( stderr, ", time=%08x", req->time );
 }
 
 static void dump_get_message_request( const struct get_message_request *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " get_win=%08x,", req->get_win );
-    fprintf( stderr, " get_first=%08x,", req->get_first );
-    fprintf( stderr, " get_last=%08x,", req->get_last );
-    fprintf( stderr, " hw_id=%08x,", req->hw_id );
-    fprintf( stderr, " wake_mask=%08x,", req->wake_mask );
-    fprintf( stderr, " changed_mask=%08x", req->changed_mask );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", get_win=%08x", req->get_win );
+    fprintf( stderr, ", get_first=%08x", req->get_first );
+    fprintf( stderr, ", get_last=%08x", req->get_last );
+    fprintf( stderr, ", hw_id=%08x", req->hw_id );
+    fprintf( stderr, ", wake_mask=%08x", req->wake_mask );
+    fprintf( stderr, ", changed_mask=%08x", req->changed_mask );
 }
 
 static void dump_get_message_reply( const struct get_message_reply *req )
 {
-    fprintf( stderr, " win=%08x,", req->win );
-    fprintf( stderr, " msg=%08x,", req->msg );
-    fprintf( stderr, " wparam=" );
-    dump_uint64( &req->wparam );
-    fprintf( stderr, "," );
-    fprintf( stderr, " lparam=" );
-    dump_uint64( &req->lparam );
-    fprintf( stderr, "," );
-    fprintf( stderr, " type=%d,", req->type );
-    fprintf( stderr, " time=%08x,", req->time );
-    fprintf( stderr, " active_hooks=%08x,", req->active_hooks );
-    fprintf( stderr, " total=%u,", req->total );
-    fprintf( stderr, " data=" );
-    dump_varargs_message_data( cur_size );
+    fprintf( stderr, " win=%08x", req->win );
+    fprintf( stderr, ", msg=%08x", req->msg );
+    dump_uint64( ", wparam=", &req->wparam );
+    dump_uint64( ", lparam=", &req->lparam );
+    fprintf( stderr, ", type=%d", req->type );
+    fprintf( stderr, ", time=%08x", req->time );
+    fprintf( stderr, ", active_hooks=%08x", req->active_hooks );
+    fprintf( stderr, ", total=%u", req->total );
+    dump_varargs_message_data( ", data=", cur_size );
 }
 
 static void dump_reply_message_request( const struct reply_message_request *req )
 {
-    fprintf( stderr, " remove=%d,", req->remove );
-    fprintf( stderr, " result=" );
-    dump_uint64( &req->result );
-    fprintf( stderr, "," );
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " remove=%d", req->remove );
+    dump_uint64( ", result=", &req->result );
+    dump_varargs_bytes( ", data=", cur_size );
 }
 
 static void dump_accept_hardware_message_request( const struct accept_hardware_message_request *req )
 {
-    fprintf( stderr, " hw_id=%08x,", req->hw_id );
-    fprintf( stderr, " remove=%d,", req->remove );
-    fprintf( stderr, " new_win=%08x", req->new_win );
+    fprintf( stderr, " hw_id=%08x", req->hw_id );
+    fprintf( stderr, ", remove=%d", req->remove );
+    fprintf( stderr, ", new_win=%08x", req->new_win );
 }
 
 static void dump_get_message_reply_request( const struct get_message_reply_request *req )
@@ -2563,38 +2340,29 @@ static void dump_get_message_reply_request( const struct get_message_reply_reque
 
 static void dump_get_message_reply_reply( const struct get_message_reply_reply *req )
 {
-    fprintf( stderr, " result=" );
-    dump_uint64( &req->result );
-    fprintf( stderr, "," );
-    fprintf( stderr, " data=" );
-    dump_varargs_bytes( cur_size );
+    dump_uint64( " result=", &req->result );
+    dump_varargs_bytes( ", data=", cur_size );
 }
 
 static void dump_set_win_timer_request( const struct set_win_timer_request *req )
 {
-    fprintf( stderr, " win=%08x,", req->win );
-    fprintf( stderr, " msg=%08x,", req->msg );
-    fprintf( stderr, " rate=%08x,", req->rate );
-    fprintf( stderr, " id=" );
-    dump_uint64( &req->id );
-    fprintf( stderr, "," );
-    fprintf( stderr, " lparam=" );
-    dump_uint64( &req->lparam );
+    fprintf( stderr, " win=%08x", req->win );
+    fprintf( stderr, ", msg=%08x", req->msg );
+    fprintf( stderr, ", rate=%08x", req->rate );
+    dump_uint64( ", id=", &req->id );
+    dump_uint64( ", lparam=", &req->lparam );
 }
 
 static void dump_set_win_timer_reply( const struct set_win_timer_reply *req )
 {
-    fprintf( stderr, " id=" );
-    dump_uint64( &req->id );
+    dump_uint64( " id=", &req->id );
 }
 
 static void dump_kill_win_timer_request( const struct kill_win_timer_request *req )
 {
-    fprintf( stderr, " win=%08x,", req->win );
-    fprintf( stderr, " id=" );
-    dump_uint64( &req->id );
-    fprintf( stderr, "," );
-    fprintf( stderr, " msg=%08x", req->msg );
+    fprintf( stderr, " win=%08x", req->win );
+    dump_uint64( ", id=", &req->id );
+    fprintf( stderr, ", msg=%08x", req->msg );
 }
 
 static void dump_is_window_hung_request( const struct is_window_hung_request *req )
@@ -2614,33 +2382,31 @@ static void dump_get_serial_info_request( const struct get_serial_info_request *
 
 static void dump_get_serial_info_reply( const struct get_serial_info_reply *req )
 {
-    fprintf( stderr, " readinterval=%08x,", req->readinterval );
-    fprintf( stderr, " readconst=%08x,", req->readconst );
-    fprintf( stderr, " readmult=%08x,", req->readmult );
-    fprintf( stderr, " writeconst=%08x,", req->writeconst );
-    fprintf( stderr, " writemult=%08x,", req->writemult );
-    fprintf( stderr, " eventmask=%08x", req->eventmask );
+    fprintf( stderr, " readinterval=%08x", req->readinterval );
+    fprintf( stderr, ", readconst=%08x", req->readconst );
+    fprintf( stderr, ", readmult=%08x", req->readmult );
+    fprintf( stderr, ", writeconst=%08x", req->writeconst );
+    fprintf( stderr, ", writemult=%08x", req->writemult );
+    fprintf( stderr, ", eventmask=%08x", req->eventmask );
 }
 
 static void dump_set_serial_info_request( const struct set_serial_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " flags=%d,", req->flags );
-    fprintf( stderr, " readinterval=%08x,", req->readinterval );
-    fprintf( stderr, " readconst=%08x,", req->readconst );
-    fprintf( stderr, " readmult=%08x,", req->readmult );
-    fprintf( stderr, " writeconst=%08x,", req->writeconst );
-    fprintf( stderr, " writemult=%08x,", req->writemult );
-    fprintf( stderr, " eventmask=%08x", req->eventmask );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", flags=%d", req->flags );
+    fprintf( stderr, ", readinterval=%08x", req->readinterval );
+    fprintf( stderr, ", readconst=%08x", req->readconst );
+    fprintf( stderr, ", readmult=%08x", req->readmult );
+    fprintf( stderr, ", writeconst=%08x", req->writeconst );
+    fprintf( stderr, ", writemult=%08x", req->writemult );
+    fprintf( stderr, ", eventmask=%08x", req->eventmask );
 }
 
 static void dump_register_async_request( const struct register_async_request *req )
 {
-    fprintf( stderr, " type=%d,", req->type );
-    fprintf( stderr, " async=" );
-    dump_async_data( &req->async );
-    fprintf( stderr, "," );
-    fprintf( stderr, " count=%d", req->count );
+    fprintf( stderr, " type=%d", req->type );
+    dump_async_data( ", async=", &req->async );
+    fprintf( stderr, ", count=%d", req->count );
 }
 
 static void dump_cancel_async_request( const struct cancel_async_request *req )
@@ -2650,53 +2416,42 @@ static void dump_cancel_async_request( const struct cancel_async_request *req )
 
 static void dump_ioctl_request( const struct ioctl_request *req )
 {
-    fprintf( stderr, " code=" );
-    dump_ioctl_code( &req->code );
-    fprintf( stderr, "," );
-    fprintf( stderr, " async=" );
-    dump_async_data( &req->async );
-    fprintf( stderr, "," );
-    fprintf( stderr, " blocking=%d,", req->blocking );
-    fprintf( stderr, " in_data=" );
-    dump_varargs_bytes( cur_size );
+    dump_ioctl_code( " code=", &req->code );
+    dump_async_data( ", async=", &req->async );
+    fprintf( stderr, ", blocking=%d", req->blocking );
+    dump_varargs_bytes( ", in_data=", cur_size );
 }
 
 static void dump_ioctl_reply( const struct ioctl_reply *req )
 {
-    fprintf( stderr, " wait=%04x,", req->wait );
-    fprintf( stderr, " options=%08x,", req->options );
-    fprintf( stderr, " out_data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " wait=%04x", req->wait );
+    fprintf( stderr, ", options=%08x", req->options );
+    dump_varargs_bytes( ", out_data=", cur_size );
 }
 
 static void dump_get_ioctl_result_request( const struct get_ioctl_result_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " user_arg=" );
-    dump_uint64( &req->user_arg );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", user_arg=", &req->user_arg );
 }
 
 static void dump_get_ioctl_result_reply( const struct get_ioctl_result_reply *req )
 {
-    fprintf( stderr, " out_data=" );
-    dump_varargs_bytes( cur_size );
+    dump_varargs_bytes( " out_data=", cur_size );
 }
 
 static void dump_create_named_pipe_request( const struct create_named_pipe_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " options=%08x,", req->options );
-    fprintf( stderr, " maxinstances=%08x,", req->maxinstances );
-    fprintf( stderr, " outsize=%08x,", req->outsize );
-    fprintf( stderr, " insize=%08x,", req->insize );
-    fprintf( stderr, " timeout=" );
-    dump_timeout( &req->timeout );
-    fprintf( stderr, "," );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    fprintf( stderr, ", options=%08x", req->options );
+    fprintf( stderr, ", maxinstances=%08x", req->maxinstances );
+    fprintf( stderr, ", outsize=%08x", req->outsize );
+    fprintf( stderr, ", insize=%08x", req->insize );
+    dump_timeout( ", timeout=", &req->timeout );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_create_named_pipe_reply( const struct create_named_pipe_reply *req )
@@ -2711,33 +2466,29 @@ static void dump_get_named_pipe_info_request( const struct get_named_pipe_info_r
 
 static void dump_get_named_pipe_info_reply( const struct get_named_pipe_info_reply *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " maxinstances=%08x,", req->maxinstances );
-    fprintf( stderr, " instances=%08x,", req->instances );
-    fprintf( stderr, " outsize=%08x,", req->outsize );
-    fprintf( stderr, " insize=%08x", req->insize );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", maxinstances=%08x", req->maxinstances );
+    fprintf( stderr, ", instances=%08x", req->instances );
+    fprintf( stderr, ", outsize=%08x", req->outsize );
+    fprintf( stderr, ", insize=%08x", req->insize );
 }
 
 static void dump_create_window_request( const struct create_window_request *req )
 {
-    fprintf( stderr, " parent=%08x,", req->parent );
-    fprintf( stderr, " owner=%08x,", req->owner );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " instance=" );
-    dump_uint64( &req->instance );
-    fprintf( stderr, "," );
-    fprintf( stderr, " class=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " parent=%08x", req->parent );
+    fprintf( stderr, ", owner=%08x", req->owner );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    dump_uint64( ", instance=", &req->instance );
+    dump_varargs_unicode_str( ", class=", cur_size );
 }
 
 static void dump_create_window_reply( const struct create_window_reply *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " parent=%08x,", req->parent );
-    fprintf( stderr, " owner=%08x,", req->owner );
-    fprintf( stderr, " extra=%d,", req->extra );
-    fprintf( stderr, " class_ptr=" );
-    dump_uint64( &req->class_ptr );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", parent=%08x", req->parent );
+    fprintf( stderr, ", owner=%08x", req->owner );
+    fprintf( stderr, ", extra=%d", req->extra );
+    dump_uint64( ", class_ptr=", &req->class_ptr );
 }
 
 static void dump_destroy_window_request( const struct destroy_window_request *req )
@@ -2752,20 +2503,20 @@ static void dump_get_desktop_window_request( const struct get_desktop_window_req
 
 static void dump_get_desktop_window_reply( const struct get_desktop_window_reply *req )
 {
-    fprintf( stderr, " top_window=%08x,", req->top_window );
-    fprintf( stderr, " msg_window=%08x", req->msg_window );
+    fprintf( stderr, " top_window=%08x", req->top_window );
+    fprintf( stderr, ", msg_window=%08x", req->msg_window );
 }
 
 static void dump_set_window_owner_request( const struct set_window_owner_request *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " owner=%08x", req->owner );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", owner=%08x", req->owner );
 }
 
 static void dump_set_window_owner_reply( const struct set_window_owner_reply *req )
 {
-    fprintf( stderr, " full_owner=%08x,", req->full_owner );
-    fprintf( stderr, " prev_owner=%08x", req->prev_owner );
+    fprintf( stderr, " full_owner=%08x", req->full_owner );
+    fprintf( stderr, ", prev_owner=%08x", req->prev_owner );
 }
 
 static void dump_get_window_info_request( const struct get_window_info_request *req )
@@ -2775,60 +2526,49 @@ static void dump_get_window_info_request( const struct get_window_info_request *
 
 static void dump_get_window_info_reply( const struct get_window_info_reply *req )
 {
-    fprintf( stderr, " full_handle=%08x,", req->full_handle );
-    fprintf( stderr, " last_active=%08x,", req->last_active );
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " is_unicode=%d", req->is_unicode );
+    fprintf( stderr, " full_handle=%08x", req->full_handle );
+    fprintf( stderr, ", last_active=%08x", req->last_active );
+    fprintf( stderr, ", pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    fprintf( stderr, ", is_unicode=%d", req->is_unicode );
 }
 
 static void dump_set_window_info_request( const struct set_window_info_request *req )
 {
-    fprintf( stderr, " flags=%04x,", req->flags );
-    fprintf( stderr, " is_unicode=%d,", req->is_unicode );
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " style=%08x,", req->style );
-    fprintf( stderr, " ex_style=%08x,", req->ex_style );
-    fprintf( stderr, " id=%08x,", req->id );
-    fprintf( stderr, " instance=" );
-    dump_uint64( &req->instance );
-    fprintf( stderr, "," );
-    fprintf( stderr, " user_data=" );
-    dump_uint64( &req->user_data );
-    fprintf( stderr, "," );
-    fprintf( stderr, " extra_offset=%d,", req->extra_offset );
-    fprintf( stderr, " extra_size=%u,", req->extra_size );
-    fprintf( stderr, " extra_value=" );
-    dump_uint64( &req->extra_value );
+    fprintf( stderr, " flags=%04x", req->flags );
+    fprintf( stderr, ", is_unicode=%d", req->is_unicode );
+    fprintf( stderr, ", handle=%08x", req->handle );
+    fprintf( stderr, ", style=%08x", req->style );
+    fprintf( stderr, ", ex_style=%08x", req->ex_style );
+    fprintf( stderr, ", id=%08x", req->id );
+    dump_uint64( ", instance=", &req->instance );
+    dump_uint64( ", user_data=", &req->user_data );
+    fprintf( stderr, ", extra_offset=%d", req->extra_offset );
+    fprintf( stderr, ", extra_size=%u", req->extra_size );
+    dump_uint64( ", extra_value=", &req->extra_value );
 }
 
 static void dump_set_window_info_reply( const struct set_window_info_reply *req )
 {
-    fprintf( stderr, " old_style=%08x,", req->old_style );
-    fprintf( stderr, " old_ex_style=%08x,", req->old_ex_style );
-    fprintf( stderr, " old_instance=" );
-    dump_uint64( &req->old_instance );
-    fprintf( stderr, "," );
-    fprintf( stderr, " old_user_data=" );
-    dump_uint64( &req->old_user_data );
-    fprintf( stderr, "," );
-    fprintf( stderr, " old_extra_value=" );
-    dump_uint64( &req->old_extra_value );
-    fprintf( stderr, "," );
-    fprintf( stderr, " old_id=%08x", req->old_id );
+    fprintf( stderr, " old_style=%08x", req->old_style );
+    fprintf( stderr, ", old_ex_style=%08x", req->old_ex_style );
+    dump_uint64( ", old_instance=", &req->old_instance );
+    dump_uint64( ", old_user_data=", &req->old_user_data );
+    dump_uint64( ", old_extra_value=", &req->old_extra_value );
+    fprintf( stderr, ", old_id=%08x", req->old_id );
 }
 
 static void dump_set_parent_request( const struct set_parent_request *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " parent=%08x", req->parent );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", parent=%08x", req->parent );
 }
 
 static void dump_set_parent_reply( const struct set_parent_reply *req )
 {
-    fprintf( stderr, " old_parent=%08x,", req->old_parent );
-    fprintf( stderr, " full_parent=%08x", req->full_parent );
+    fprintf( stderr, " old_parent=%08x", req->old_parent );
+    fprintf( stderr, ", full_parent=%08x", req->full_parent );
 }
 
 static void dump_get_window_parents_request( const struct get_window_parents_request *req )
@@ -2838,40 +2578,36 @@ static void dump_get_window_parents_request( const struct get_window_parents_req
 
 static void dump_get_window_parents_reply( const struct get_window_parents_reply *req )
 {
-    fprintf( stderr, " count=%d,", req->count );
-    fprintf( stderr, " parents=" );
-    dump_varargs_user_handles( cur_size );
+    fprintf( stderr, " count=%d", req->count );
+    dump_varargs_user_handles( ", parents=", cur_size );
 }
 
 static void dump_get_window_children_request( const struct get_window_children_request *req )
 {
-    fprintf( stderr, " desktop=%04x,", req->desktop );
-    fprintf( stderr, " parent=%08x,", req->parent );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " class=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " desktop=%04x", req->desktop );
+    fprintf( stderr, ", parent=%08x", req->parent );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    dump_varargs_unicode_str( ", class=", cur_size );
 }
 
 static void dump_get_window_children_reply( const struct get_window_children_reply *req )
 {
-    fprintf( stderr, " count=%d,", req->count );
-    fprintf( stderr, " children=" );
-    dump_varargs_user_handles( cur_size );
+    fprintf( stderr, " count=%d", req->count );
+    dump_varargs_user_handles( ", children=", cur_size );
 }
 
 static void dump_get_window_children_from_point_request( const struct get_window_children_from_point_request *req )
 {
-    fprintf( stderr, " parent=%08x,", req->parent );
-    fprintf( stderr, " x=%d,", req->x );
-    fprintf( stderr, " y=%d", req->y );
+    fprintf( stderr, " parent=%08x", req->parent );
+    fprintf( stderr, ", x=%d", req->x );
+    fprintf( stderr, ", y=%d", req->y );
 }
 
 static void dump_get_window_children_from_point_reply( const struct get_window_children_from_point_reply *req )
 {
-    fprintf( stderr, " count=%d,", req->count );
-    fprintf( stderr, " children=" );
-    dump_varargs_user_handles( cur_size );
+    fprintf( stderr, " count=%d", req->count );
+    dump_varargs_user_handles( ", children=", cur_size );
 }
 
 static void dump_get_window_tree_request( const struct get_window_tree_request *req )
@@ -2881,35 +2617,30 @@ static void dump_get_window_tree_request( const struct get_window_tree_request *
 
 static void dump_get_window_tree_reply( const struct get_window_tree_reply *req )
 {
-    fprintf( stderr, " parent=%08x,", req->parent );
-    fprintf( stderr, " owner=%08x,", req->owner );
-    fprintf( stderr, " next_sibling=%08x,", req->next_sibling );
-    fprintf( stderr, " prev_sibling=%08x,", req->prev_sibling );
-    fprintf( stderr, " first_sibling=%08x,", req->first_sibling );
-    fprintf( stderr, " last_sibling=%08x,", req->last_sibling );
-    fprintf( stderr, " first_child=%08x,", req->first_child );
-    fprintf( stderr, " last_child=%08x", req->last_child );
+    fprintf( stderr, " parent=%08x", req->parent );
+    fprintf( stderr, ", owner=%08x", req->owner );
+    fprintf( stderr, ", next_sibling=%08x", req->next_sibling );
+    fprintf( stderr, ", prev_sibling=%08x", req->prev_sibling );
+    fprintf( stderr, ", first_sibling=%08x", req->first_sibling );
+    fprintf( stderr, ", last_sibling=%08x", req->last_sibling );
+    fprintf( stderr, ", first_child=%08x", req->first_child );
+    fprintf( stderr, ", last_child=%08x", req->last_child );
 }
 
 static void dump_set_window_pos_request( const struct set_window_pos_request *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " previous=%08x,", req->previous );
-    fprintf( stderr, " window=" );
-    dump_rectangle( &req->window );
-    fprintf( stderr, "," );
-    fprintf( stderr, " client=" );
-    dump_rectangle( &req->client );
-    fprintf( stderr, "," );
-    fprintf( stderr, " valid=" );
-    dump_varargs_rectangles( cur_size );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", handle=%08x", req->handle );
+    fprintf( stderr, ", previous=%08x", req->previous );
+    dump_rectangle( ", window=", &req->window );
+    dump_rectangle( ", client=", &req->client );
+    dump_varargs_rectangles( ", valid=", cur_size );
 }
 
 static void dump_set_window_pos_reply( const struct set_window_pos_reply *req )
 {
-    fprintf( stderr, " new_style=%08x,", req->new_style );
-    fprintf( stderr, " new_ex_style=%08x", req->new_ex_style );
+    fprintf( stderr, " new_style=%08x", req->new_style );
+    fprintf( stderr, ", new_ex_style=%08x", req->new_ex_style );
 }
 
 static void dump_get_window_rectangles_request( const struct get_window_rectangles_request *req )
@@ -2919,14 +2650,9 @@ static void dump_get_window_rectangles_request( const struct get_window_rectangl
 
 static void dump_get_window_rectangles_reply( const struct get_window_rectangles_reply *req )
 {
-    fprintf( stderr, " window=" );
-    dump_rectangle( &req->window );
-    fprintf( stderr, "," );
-    fprintf( stderr, " visible=" );
-    dump_rectangle( &req->visible );
-    fprintf( stderr, "," );
-    fprintf( stderr, " client=" );
-    dump_rectangle( &req->client );
+    dump_rectangle( " window=", &req->window );
+    dump_rectangle( ", visible=", &req->visible );
+    dump_rectangle( ", client=", &req->client );
 }
 
 static void dump_get_window_text_request( const struct get_window_text_request *req )
@@ -2936,47 +2662,40 @@ static void dump_get_window_text_request( const struct get_window_text_request *
 
 static void dump_get_window_text_reply( const struct get_window_text_reply *req )
 {
-    fprintf( stderr, " text=" );
-    dump_varargs_unicode_str( cur_size );
+    dump_varargs_unicode_str( " text=", cur_size );
 }
 
 static void dump_set_window_text_request( const struct set_window_text_request *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " text=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " handle=%08x", req->handle );
+    dump_varargs_unicode_str( ", text=", cur_size );
 }
 
 static void dump_get_windows_offset_request( const struct get_windows_offset_request *req )
 {
-    fprintf( stderr, " from=%08x,", req->from );
-    fprintf( stderr, " to=%08x", req->to );
+    fprintf( stderr, " from=%08x", req->from );
+    fprintf( stderr, ", to=%08x", req->to );
 }
 
 static void dump_get_windows_offset_reply( const struct get_windows_offset_reply *req )
 {
-    fprintf( stderr, " x=%d,", req->x );
-    fprintf( stderr, " y=%d", req->y );
+    fprintf( stderr, " x=%d", req->x );
+    fprintf( stderr, ", y=%d", req->y );
 }
 
 static void dump_get_visible_region_request( const struct get_visible_region_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " window=%08x", req->window );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static void dump_get_visible_region_reply( const struct get_visible_region_reply *req )
 {
-    fprintf( stderr, " top_win=%08x,", req->top_win );
-    fprintf( stderr, " top_rect=" );
-    dump_rectangle( &req->top_rect );
-    fprintf( stderr, "," );
-    fprintf( stderr, " win_rect=" );
-    dump_rectangle( &req->win_rect );
-    fprintf( stderr, "," );
-    fprintf( stderr, " total_size=%u,", req->total_size );
-    fprintf( stderr, " region=" );
-    dump_varargs_rectangles( cur_size );
+    fprintf( stderr, " top_win=%08x", req->top_win );
+    dump_rectangle( ", top_rect=", &req->top_rect );
+    dump_rectangle( ", win_rect=", &req->win_rect );
+    fprintf( stderr, ", total_size=%u", req->total_size );
+    dump_varargs_rectangles( ", region=", cur_size );
 }
 
 static void dump_get_window_region_request( const struct get_window_region_request *req )
@@ -2986,87 +2705,75 @@ static void dump_get_window_region_request( const struct get_window_region_reque
 
 static void dump_get_window_region_reply( const struct get_window_region_reply *req )
 {
-    fprintf( stderr, " total_size=%u,", req->total_size );
-    fprintf( stderr, " region=" );
-    dump_varargs_rectangles( cur_size );
+    fprintf( stderr, " total_size=%u", req->total_size );
+    dump_varargs_rectangles( ", region=", cur_size );
 }
 
 static void dump_set_window_region_request( const struct set_window_region_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " redraw=%d,", req->redraw );
-    fprintf( stderr, " region=" );
-    dump_varargs_rectangles( cur_size );
+    fprintf( stderr, " window=%08x", req->window );
+    fprintf( stderr, ", redraw=%d", req->redraw );
+    dump_varargs_rectangles( ", region=", cur_size );
 }
 
 static void dump_get_update_region_request( const struct get_update_region_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " from_child=%08x,", req->from_child );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " window=%08x", req->window );
+    fprintf( stderr, ", from_child=%08x", req->from_child );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static void dump_get_update_region_reply( const struct get_update_region_reply *req )
 {
-    fprintf( stderr, " child=%08x,", req->child );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " total_size=%u,", req->total_size );
-    fprintf( stderr, " region=" );
-    dump_varargs_rectangles( cur_size );
+    fprintf( stderr, " child=%08x", req->child );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    fprintf( stderr, ", total_size=%u", req->total_size );
+    dump_varargs_rectangles( ", region=", cur_size );
 }
 
 static void dump_update_window_zorder_request( const struct update_window_zorder_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " rect=" );
-    dump_rectangle( &req->rect );
+    fprintf( stderr, " window=%08x", req->window );
+    dump_rectangle( ", rect=", &req->rect );
 }
 
 static void dump_redraw_window_request( const struct redraw_window_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " region=" );
-    dump_varargs_rectangles( cur_size );
+    fprintf( stderr, " window=%08x", req->window );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    dump_varargs_rectangles( ", region=", cur_size );
 }
 
 static void dump_set_window_property_request( const struct set_window_property_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " data=" );
-    dump_uint64( &req->data );
-    fprintf( stderr, "," );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " window=%08x", req->window );
+    dump_uint64( ", data=", &req->data );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_remove_window_property_request( const struct remove_window_property_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " window=%08x", req->window );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_remove_window_property_reply( const struct remove_window_property_reply *req )
 {
-    fprintf( stderr, " data=" );
-    dump_uint64( &req->data );
+    dump_uint64( " data=", &req->data );
 }
 
 static void dump_get_window_property_request( const struct get_window_property_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " window=%08x", req->window );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_get_window_property_reply( const struct get_window_property_reply *req )
 {
-    fprintf( stderr, " data=" );
-    dump_uint64( &req->data );
+    dump_uint64( " data=", &req->data );
 }
 
 static void dump_get_window_properties_request( const struct get_window_properties_request *req )
@@ -3076,18 +2783,16 @@ static void dump_get_window_properties_request( const struct get_window_properti
 
 static void dump_get_window_properties_reply( const struct get_window_properties_reply *req )
 {
-    fprintf( stderr, " total=%d,", req->total );
-    fprintf( stderr, " props=" );
-    dump_varargs_properties( cur_size );
+    fprintf( stderr, " total=%d", req->total );
+    dump_varargs_properties( ", props=", cur_size );
 }
 
 static void dump_create_winstation_request( const struct create_winstation_request *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_create_winstation_reply( const struct create_winstation_reply *req )
@@ -3097,10 +2802,9 @@ static void dump_create_winstation_reply( const struct create_winstation_reply *
 
 static void dump_open_winstation_request( const struct open_winstation_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_winstation_reply( const struct open_winstation_reply *req )
@@ -3134,18 +2838,16 @@ static void dump_enum_winstation_request( const struct enum_winstation_request *
 
 static void dump_enum_winstation_reply( const struct enum_winstation_reply *req )
 {
-    fprintf( stderr, " next=%08x,", req->next );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " next=%08x", req->next );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_create_desktop_request( const struct create_desktop_request *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_create_desktop_reply( const struct create_desktop_reply *req )
@@ -3155,12 +2857,11 @@ static void dump_create_desktop_reply( const struct create_desktop_reply *req )
 
 static void dump_open_desktop_request( const struct open_desktop_request *req )
 {
-    fprintf( stderr, " winsta=%04x,", req->winsta );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " winsta=%04x", req->winsta );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_desktop_reply( const struct open_desktop_reply *req )
@@ -3190,37 +2891,35 @@ static void dump_set_thread_desktop_request( const struct set_thread_desktop_req
 
 static void dump_enum_desktop_request( const struct enum_desktop_request *req )
 {
-    fprintf( stderr, " winstation=%04x,", req->winstation );
-    fprintf( stderr, " index=%08x", req->index );
+    fprintf( stderr, " winstation=%04x", req->winstation );
+    fprintf( stderr, ", index=%08x", req->index );
 }
 
 static void dump_enum_desktop_reply( const struct enum_desktop_reply *req )
 {
-    fprintf( stderr, " next=%08x,", req->next );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " next=%08x", req->next );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_set_user_object_info_request( const struct set_user_object_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " obj_flags=%08x", req->obj_flags );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    fprintf( stderr, ", obj_flags=%08x", req->obj_flags );
 }
 
 static void dump_set_user_object_info_reply( const struct set_user_object_info_reply *req )
 {
-    fprintf( stderr, " is_desktop=%d,", req->is_desktop );
-    fprintf( stderr, " old_obj_flags=%08x,", req->old_obj_flags );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " is_desktop=%d", req->is_desktop );
+    fprintf( stderr, ", old_obj_flags=%08x", req->old_obj_flags );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_attach_thread_input_request( const struct attach_thread_input_request *req )
 {
-    fprintf( stderr, " tid_from=%04x,", req->tid_from );
-    fprintf( stderr, " tid_to=%04x,", req->tid_to );
-    fprintf( stderr, " attach=%d", req->attach );
+    fprintf( stderr, " tid_from=%04x", req->tid_from );
+    fprintf( stderr, ", tid_to=%04x", req->tid_to );
+    fprintf( stderr, ", attach=%d", req->attach );
 }
 
 static void dump_get_thread_input_request( const struct get_thread_input_request *req )
@@ -3230,15 +2929,14 @@ static void dump_get_thread_input_request( const struct get_thread_input_request
 
 static void dump_get_thread_input_reply( const struct get_thread_input_reply *req )
 {
-    fprintf( stderr, " focus=%08x,", req->focus );
-    fprintf( stderr, " capture=%08x,", req->capture );
-    fprintf( stderr, " active=%08x,", req->active );
-    fprintf( stderr, " foreground=%08x,", req->foreground );
-    fprintf( stderr, " menu_owner=%08x,", req->menu_owner );
-    fprintf( stderr, " move_size=%08x,", req->move_size );
-    fprintf( stderr, " caret=%08x,", req->caret );
-    fprintf( stderr, " rect=" );
-    dump_rectangle( &req->rect );
+    fprintf( stderr, " focus=%08x", req->focus );
+    fprintf( stderr, ", capture=%08x", req->capture );
+    fprintf( stderr, ", active=%08x", req->active );
+    fprintf( stderr, ", foreground=%08x", req->foreground );
+    fprintf( stderr, ", menu_owner=%08x", req->menu_owner );
+    fprintf( stderr, ", move_size=%08x", req->move_size );
+    fprintf( stderr, ", caret=%08x", req->caret );
+    dump_rectangle( ", rect=", &req->rect );
 }
 
 static void dump_get_last_input_time_request( const struct get_last_input_time_request *req )
@@ -3252,22 +2950,20 @@ static void dump_get_last_input_time_reply( const struct get_last_input_time_rep
 
 static void dump_get_key_state_request( const struct get_key_state_request *req )
 {
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " key=%d", req->key );
+    fprintf( stderr, " tid=%04x", req->tid );
+    fprintf( stderr, ", key=%d", req->key );
 }
 
 static void dump_get_key_state_reply( const struct get_key_state_reply *req )
 {
-    fprintf( stderr, " state=%02x,", req->state );
-    fprintf( stderr, " keystate=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " state=%02x", req->state );
+    dump_varargs_bytes( ", keystate=", cur_size );
 }
 
 static void dump_set_key_state_request( const struct set_key_state_request *req )
 {
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " keystate=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " tid=%04x", req->tid );
+    dump_varargs_bytes( ", keystate=", cur_size );
 }
 
 static void dump_set_foreground_window_request( const struct set_foreground_window_request *req )
@@ -3277,9 +2973,9 @@ static void dump_set_foreground_window_request( const struct set_foreground_wind
 
 static void dump_set_foreground_window_reply( const struct set_foreground_window_reply *req )
 {
-    fprintf( stderr, " previous=%08x,", req->previous );
-    fprintf( stderr, " send_msg_old=%d,", req->send_msg_old );
-    fprintf( stderr, " send_msg_new=%d", req->send_msg_new );
+    fprintf( stderr, " previous=%08x", req->previous );
+    fprintf( stderr, ", send_msg_old=%d", req->send_msg_old );
+    fprintf( stderr, ", send_msg_new=%d", req->send_msg_new );
 }
 
 static void dump_set_focus_window_request( const struct set_focus_window_request *req )
@@ -3304,82 +3000,73 @@ static void dump_set_active_window_reply( const struct set_active_window_reply *
 
 static void dump_set_capture_window_request( const struct set_capture_window_request *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static void dump_set_capture_window_reply( const struct set_capture_window_reply *req )
 {
-    fprintf( stderr, " previous=%08x,", req->previous );
-    fprintf( stderr, " full_handle=%08x", req->full_handle );
+    fprintf( stderr, " previous=%08x", req->previous );
+    fprintf( stderr, ", full_handle=%08x", req->full_handle );
 }
 
 static void dump_set_caret_window_request( const struct set_caret_window_request *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " width=%d,", req->width );
-    fprintf( stderr, " height=%d", req->height );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", width=%d", req->width );
+    fprintf( stderr, ", height=%d", req->height );
 }
 
 static void dump_set_caret_window_reply( const struct set_caret_window_reply *req )
 {
-    fprintf( stderr, " previous=%08x,", req->previous );
-    fprintf( stderr, " old_rect=" );
-    dump_rectangle( &req->old_rect );
-    fprintf( stderr, "," );
-    fprintf( stderr, " old_hide=%d,", req->old_hide );
-    fprintf( stderr, " old_state=%d", req->old_state );
+    fprintf( stderr, " previous=%08x", req->previous );
+    dump_rectangle( ", old_rect=", &req->old_rect );
+    fprintf( stderr, ", old_hide=%d", req->old_hide );
+    fprintf( stderr, ", old_state=%d", req->old_state );
 }
 
 static void dump_set_caret_info_request( const struct set_caret_info_request *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " x=%d,", req->x );
-    fprintf( stderr, " y=%d,", req->y );
-    fprintf( stderr, " hide=%d,", req->hide );
-    fprintf( stderr, " state=%d", req->state );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", handle=%08x", req->handle );
+    fprintf( stderr, ", x=%d", req->x );
+    fprintf( stderr, ", y=%d", req->y );
+    fprintf( stderr, ", hide=%d", req->hide );
+    fprintf( stderr, ", state=%d", req->state );
 }
 
 static void dump_set_caret_info_reply( const struct set_caret_info_reply *req )
 {
-    fprintf( stderr, " full_handle=%08x,", req->full_handle );
-    fprintf( stderr, " old_rect=" );
-    dump_rectangle( &req->old_rect );
-    fprintf( stderr, "," );
-    fprintf( stderr, " old_hide=%d,", req->old_hide );
-    fprintf( stderr, " old_state=%d", req->old_state );
+    fprintf( stderr, " full_handle=%08x", req->full_handle );
+    dump_rectangle( ", old_rect=", &req->old_rect );
+    fprintf( stderr, ", old_hide=%d", req->old_hide );
+    fprintf( stderr, ", old_state=%d", req->old_state );
 }
 
 static void dump_set_hook_request( const struct set_hook_request *req )
 {
-    fprintf( stderr, " id=%d,", req->id );
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " event_min=%d,", req->event_min );
-    fprintf( stderr, " event_max=%d,", req->event_max );
-    fprintf( stderr, " proc=" );
-    dump_uint64( &req->proc );
-    fprintf( stderr, "," );
-    fprintf( stderr, " flags=%d,", req->flags );
-    fprintf( stderr, " unicode=%d,", req->unicode );
-    fprintf( stderr, " module=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " id=%d", req->id );
+    fprintf( stderr, ", pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    fprintf( stderr, ", event_min=%d", req->event_min );
+    fprintf( stderr, ", event_max=%d", req->event_max );
+    dump_uint64( ", proc=", &req->proc );
+    fprintf( stderr, ", flags=%d", req->flags );
+    fprintf( stderr, ", unicode=%d", req->unicode );
+    dump_varargs_unicode_str( ", module=", cur_size );
 }
 
 static void dump_set_hook_reply( const struct set_hook_reply *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " active_hooks=%08x", req->active_hooks );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", active_hooks=%08x", req->active_hooks );
 }
 
 static void dump_remove_hook_request( const struct remove_hook_request *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " proc=" );
-    dump_uint64( &req->proc );
-    fprintf( stderr, "," );
-    fprintf( stderr, " id=%d", req->id );
+    fprintf( stderr, " handle=%08x", req->handle );
+    dump_uint64( ", proc=", &req->proc );
+    fprintf( stderr, ", id=%d", req->id );
 }
 
 static void dump_remove_hook_reply( const struct remove_hook_reply *req )
@@ -3389,25 +3076,22 @@ static void dump_remove_hook_reply( const struct remove_hook_reply *req )
 
 static void dump_start_hook_chain_request( const struct start_hook_chain_request *req )
 {
-    fprintf( stderr, " id=%d,", req->id );
-    fprintf( stderr, " event=%d,", req->event );
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " object_id=%d,", req->object_id );
-    fprintf( stderr, " child_id=%d", req->child_id );
+    fprintf( stderr, " id=%d", req->id );
+    fprintf( stderr, ", event=%d", req->event );
+    fprintf( stderr, ", window=%08x", req->window );
+    fprintf( stderr, ", object_id=%d", req->object_id );
+    fprintf( stderr, ", child_id=%d", req->child_id );
 }
 
 static void dump_start_hook_chain_reply( const struct start_hook_chain_reply *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " unicode=%d,", req->unicode );
-    fprintf( stderr, " proc=" );
-    dump_uint64( &req->proc );
-    fprintf( stderr, "," );
-    fprintf( stderr, " active_hooks=%08x,", req->active_hooks );
-    fprintf( stderr, " module=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    fprintf( stderr, ", unicode=%d", req->unicode );
+    dump_uint64( ", proc=", &req->proc );
+    fprintf( stderr, ", active_hooks=%08x", req->active_hooks );
+    dump_varargs_unicode_str( ", module=", cur_size );
 }
 
 static void dump_finish_hook_chain_request( const struct finish_hook_chain_request *req )
@@ -3417,43 +3101,35 @@ static void dump_finish_hook_chain_request( const struct finish_hook_chain_reque
 
 static void dump_get_hook_info_request( const struct get_hook_info_request *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " get_next=%d,", req->get_next );
-    fprintf( stderr, " event=%d,", req->event );
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " object_id=%d,", req->object_id );
-    fprintf( stderr, " child_id=%d", req->child_id );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", get_next=%d", req->get_next );
+    fprintf( stderr, ", event=%d", req->event );
+    fprintf( stderr, ", window=%08x", req->window );
+    fprintf( stderr, ", object_id=%d", req->object_id );
+    fprintf( stderr, ", child_id=%d", req->child_id );
 }
 
 static void dump_get_hook_info_reply( const struct get_hook_info_reply *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " id=%d,", req->id );
-    fprintf( stderr, " pid=%04x,", req->pid );
-    fprintf( stderr, " tid=%04x,", req->tid );
-    fprintf( stderr, " proc=" );
-    dump_uint64( &req->proc );
-    fprintf( stderr, "," );
-    fprintf( stderr, " unicode=%d,", req->unicode );
-    fprintf( stderr, " module=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", id=%d", req->id );
+    fprintf( stderr, ", pid=%04x", req->pid );
+    fprintf( stderr, ", tid=%04x", req->tid );
+    dump_uint64( ", proc=", &req->proc );
+    fprintf( stderr, ", unicode=%d", req->unicode );
+    dump_varargs_unicode_str( ", module=", cur_size );
 }
 
 static void dump_create_class_request( const struct create_class_request *req )
 {
-    fprintf( stderr, " local=%d,", req->local );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " style=%08x,", req->style );
-    fprintf( stderr, " instance=" );
-    dump_uint64( &req->instance );
-    fprintf( stderr, "," );
-    fprintf( stderr, " extra=%d,", req->extra );
-    fprintf( stderr, " win_extra=%d,", req->win_extra );
-    fprintf( stderr, " client_ptr=" );
-    dump_uint64( &req->client_ptr );
-    fprintf( stderr, "," );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " local=%d", req->local );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    fprintf( stderr, ", style=%08x", req->style );
+    dump_uint64( ", instance=", &req->instance );
+    fprintf( stderr, ", extra=%d", req->extra );
+    fprintf( stderr, ", win_extra=%d", req->win_extra );
+    dump_uint64( ", client_ptr=", &req->client_ptr );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_create_class_reply( const struct create_class_reply *req )
@@ -3463,73 +3139,63 @@ static void dump_create_class_reply( const struct create_class_reply *req )
 
 static void dump_destroy_class_request( const struct destroy_class_request *req )
 {
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " instance=" );
-    dump_uint64( &req->instance );
-    fprintf( stderr, "," );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " atom=%04x", req->atom );
+    dump_uint64( ", instance=", &req->instance );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_destroy_class_reply( const struct destroy_class_reply *req )
 {
-    fprintf( stderr, " client_ptr=" );
-    dump_uint64( &req->client_ptr );
+    dump_uint64( " client_ptr=", &req->client_ptr );
 }
 
 static void dump_set_class_info_request( const struct set_class_info_request *req )
 {
-    fprintf( stderr, " window=%08x,", req->window );
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " atom=%04x,", req->atom );
-    fprintf( stderr, " style=%08x,", req->style );
-    fprintf( stderr, " win_extra=%d,", req->win_extra );
-    fprintf( stderr, " instance=" );
-    dump_uint64( &req->instance );
-    fprintf( stderr, "," );
-    fprintf( stderr, " extra_offset=%d,", req->extra_offset );
-    fprintf( stderr, " extra_size=%u,", req->extra_size );
-    fprintf( stderr, " extra_value=" );
-    dump_uint64( &req->extra_value );
+    fprintf( stderr, " window=%08x", req->window );
+    fprintf( stderr, ", flags=%08x", req->flags );
+    fprintf( stderr, ", atom=%04x", req->atom );
+    fprintf( stderr, ", style=%08x", req->style );
+    fprintf( stderr, ", win_extra=%d", req->win_extra );
+    dump_uint64( ", instance=", &req->instance );
+    fprintf( stderr, ", extra_offset=%d", req->extra_offset );
+    fprintf( stderr, ", extra_size=%u", req->extra_size );
+    dump_uint64( ", extra_value=", &req->extra_value );
 }
 
 static void dump_set_class_info_reply( const struct set_class_info_reply *req )
 {
-    fprintf( stderr, " old_atom=%04x,", req->old_atom );
-    fprintf( stderr, " old_style=%08x,", req->old_style );
-    fprintf( stderr, " old_extra=%d,", req->old_extra );
-    fprintf( stderr, " old_win_extra=%d,", req->old_win_extra );
-    fprintf( stderr, " old_instance=" );
-    dump_uint64( &req->old_instance );
-    fprintf( stderr, "," );
-    fprintf( stderr, " old_extra_value=" );
-    dump_uint64( &req->old_extra_value );
+    fprintf( stderr, " old_atom=%04x", req->old_atom );
+    fprintf( stderr, ", old_style=%08x", req->old_style );
+    fprintf( stderr, ", old_extra=%d", req->old_extra );
+    fprintf( stderr, ", old_win_extra=%d", req->old_win_extra );
+    dump_uint64( ", old_instance=", &req->old_instance );
+    dump_uint64( ", old_extra_value=", &req->old_extra_value );
 }
 
 static void dump_set_clipboard_info_request( const struct set_clipboard_info_request *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " clipboard=%08x,", req->clipboard );
-    fprintf( stderr, " owner=%08x,", req->owner );
-    fprintf( stderr, " viewer=%08x,", req->viewer );
-    fprintf( stderr, " seqno=%08x", req->seqno );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", clipboard=%08x", req->clipboard );
+    fprintf( stderr, ", owner=%08x", req->owner );
+    fprintf( stderr, ", viewer=%08x", req->viewer );
+    fprintf( stderr, ", seqno=%08x", req->seqno );
 }
 
 static void dump_set_clipboard_info_reply( const struct set_clipboard_info_reply *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " old_clipboard=%08x,", req->old_clipboard );
-    fprintf( stderr, " old_owner=%08x,", req->old_owner );
-    fprintf( stderr, " old_viewer=%08x,", req->old_viewer );
-    fprintf( stderr, " seqno=%08x", req->seqno );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", old_clipboard=%08x", req->old_clipboard );
+    fprintf( stderr, ", old_owner=%08x", req->old_owner );
+    fprintf( stderr, ", old_viewer=%08x", req->old_viewer );
+    fprintf( stderr, ", seqno=%08x", req->seqno );
 }
 
 static void dump_open_token_request( const struct open_token_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static void dump_open_token_reply( const struct open_token_reply *req )
@@ -3539,35 +3205,33 @@ static void dump_open_token_reply( const struct open_token_reply *req )
 
 static void dump_set_global_windows_request( const struct set_global_windows_request *req )
 {
-    fprintf( stderr, " flags=%08x,", req->flags );
-    fprintf( stderr, " shell_window=%08x,", req->shell_window );
-    fprintf( stderr, " shell_listview=%08x,", req->shell_listview );
-    fprintf( stderr, " progman_window=%08x,", req->progman_window );
-    fprintf( stderr, " taskman_window=%08x", req->taskman_window );
+    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, ", shell_window=%08x", req->shell_window );
+    fprintf( stderr, ", shell_listview=%08x", req->shell_listview );
+    fprintf( stderr, ", progman_window=%08x", req->progman_window );
+    fprintf( stderr, ", taskman_window=%08x", req->taskman_window );
 }
 
 static void dump_set_global_windows_reply( const struct set_global_windows_reply *req )
 {
-    fprintf( stderr, " old_shell_window=%08x,", req->old_shell_window );
-    fprintf( stderr, " old_shell_listview=%08x,", req->old_shell_listview );
-    fprintf( stderr, " old_progman_window=%08x,", req->old_progman_window );
-    fprintf( stderr, " old_taskman_window=%08x", req->old_taskman_window );
+    fprintf( stderr, " old_shell_window=%08x", req->old_shell_window );
+    fprintf( stderr, ", old_shell_listview=%08x", req->old_shell_listview );
+    fprintf( stderr, ", old_progman_window=%08x", req->old_progman_window );
+    fprintf( stderr, ", old_taskman_window=%08x", req->old_taskman_window );
 }
 
 static void dump_adjust_token_privileges_request( const struct adjust_token_privileges_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " disable_all=%d,", req->disable_all );
-    fprintf( stderr, " get_modified_state=%d,", req->get_modified_state );
-    fprintf( stderr, " privileges=" );
-    dump_varargs_LUID_AND_ATTRIBUTES( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", disable_all=%d", req->disable_all );
+    fprintf( stderr, ", get_modified_state=%d", req->get_modified_state );
+    dump_varargs_LUID_AND_ATTRIBUTES( ", privileges=", cur_size );
 }
 
 static void dump_adjust_token_privileges_reply( const struct adjust_token_privileges_reply *req )
 {
-    fprintf( stderr, " len=%08x,", req->len );
-    fprintf( stderr, " privileges=" );
-    dump_varargs_LUID_AND_ATTRIBUTES( cur_size );
+    fprintf( stderr, " len=%08x", req->len );
+    dump_varargs_LUID_AND_ATTRIBUTES( ", privileges=", cur_size );
 }
 
 static void dump_get_token_privileges_request( const struct get_token_privileges_request *req )
@@ -3577,33 +3241,30 @@ static void dump_get_token_privileges_request( const struct get_token_privileges
 
 static void dump_get_token_privileges_reply( const struct get_token_privileges_reply *req )
 {
-    fprintf( stderr, " len=%08x,", req->len );
-    fprintf( stderr, " privileges=" );
-    dump_varargs_LUID_AND_ATTRIBUTES( cur_size );
+    fprintf( stderr, " len=%08x", req->len );
+    dump_varargs_LUID_AND_ATTRIBUTES( ", privileges=", cur_size );
 }
 
 static void dump_check_token_privileges_request( const struct check_token_privileges_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " all_required=%d,", req->all_required );
-    fprintf( stderr, " privileges=" );
-    dump_varargs_LUID_AND_ATTRIBUTES( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", all_required=%d", req->all_required );
+    dump_varargs_LUID_AND_ATTRIBUTES( ", privileges=", cur_size );
 }
 
 static void dump_check_token_privileges_reply( const struct check_token_privileges_reply *req )
 {
-    fprintf( stderr, " has_privileges=%d,", req->has_privileges );
-    fprintf( stderr, " privileges=" );
-    dump_varargs_LUID_AND_ATTRIBUTES( cur_size );
+    fprintf( stderr, " has_privileges=%d", req->has_privileges );
+    dump_varargs_LUID_AND_ATTRIBUTES( ", privileges=", cur_size );
 }
 
 static void dump_duplicate_token_request( const struct duplicate_token_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " primary=%d,", req->primary );
-    fprintf( stderr, " impersonation_level=%d", req->impersonation_level );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", primary=%d", req->primary );
+    fprintf( stderr, ", impersonation_level=%d", req->impersonation_level );
 }
 
 static void dump_duplicate_token_reply( const struct duplicate_token_reply *req )
@@ -3613,23 +3274,21 @@ static void dump_duplicate_token_reply( const struct duplicate_token_reply *req
 
 static void dump_access_check_request( const struct access_check_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " desired_access=%08x,", req->desired_access );
-    fprintf( stderr, " mapping_read=%08x,", req->mapping_read );
-    fprintf( stderr, " mapping_write=%08x,", req->mapping_write );
-    fprintf( stderr, " mapping_execute=%08x,", req->mapping_execute );
-    fprintf( stderr, " mapping_all=%08x,", req->mapping_all );
-    fprintf( stderr, " sd=" );
-    dump_varargs_security_descriptor( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", desired_access=%08x", req->desired_access );
+    fprintf( stderr, ", mapping_read=%08x", req->mapping_read );
+    fprintf( stderr, ", mapping_write=%08x", req->mapping_write );
+    fprintf( stderr, ", mapping_execute=%08x", req->mapping_execute );
+    fprintf( stderr, ", mapping_all=%08x", req->mapping_all );
+    dump_varargs_security_descriptor( ", sd=", cur_size );
 }
 
 static void dump_access_check_reply( const struct access_check_reply *req )
 {
-    fprintf( stderr, " access_granted=%08x,", req->access_granted );
-    fprintf( stderr, " access_status=%08x,", req->access_status );
-    fprintf( stderr, " privileges_len=%08x,", req->privileges_len );
-    fprintf( stderr, " privileges=" );
-    dump_varargs_LUID_AND_ATTRIBUTES( cur_size );
+    fprintf( stderr, " access_granted=%08x", req->access_granted );
+    fprintf( stderr, ", access_status=%08x", req->access_status );
+    fprintf( stderr, ", privileges_len=%08x", req->privileges_len );
+    dump_varargs_LUID_AND_ATTRIBUTES( ", privileges=", cur_size );
 }
 
 static void dump_get_token_user_request( const struct get_token_user_request *req )
@@ -3639,9 +3298,8 @@ static void dump_get_token_user_request( const struct get_token_user_request *re
 
 static void dump_get_token_user_reply( const struct get_token_user_reply *req )
 {
-    fprintf( stderr, " user_len=%u,", req->user_len );
-    fprintf( stderr, " user=" );
-    dump_varargs_SID( cur_size );
+    fprintf( stderr, " user_len=%u", req->user_len );
+    dump_varargs_SID( ", user=", cur_size );
 }
 
 static void dump_get_token_groups_request( const struct get_token_groups_request *req )
@@ -3651,43 +3309,37 @@ static void dump_get_token_groups_request( const struct get_token_groups_request
 
 static void dump_get_token_groups_reply( const struct get_token_groups_reply *req )
 {
-    fprintf( stderr, " user_len=%u,", req->user_len );
-    fprintf( stderr, " user=" );
-    dump_varargs_token_groups( cur_size );
+    fprintf( stderr, " user_len=%u", req->user_len );
+    dump_varargs_token_groups( ", user=", cur_size );
 }
 
 static void dump_set_security_object_request( const struct set_security_object_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " security_info=%08x,", req->security_info );
-    fprintf( stderr, " sd=" );
-    dump_varargs_security_descriptor( cur_size );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", security_info=%08x", req->security_info );
+    dump_varargs_security_descriptor( ", sd=", cur_size );
 }
 
 static void dump_get_security_object_request( const struct get_security_object_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " security_info=%08x", req->security_info );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", security_info=%08x", req->security_info );
 }
 
 static void dump_get_security_object_reply( const struct get_security_object_reply *req )
 {
-    fprintf( stderr, " sd_len=%08x,", req->sd_len );
-    fprintf( stderr, " sd=" );
-    dump_varargs_security_descriptor( cur_size );
+    fprintf( stderr, " sd_len=%08x", req->sd_len );
+    dump_varargs_security_descriptor( ", sd=", cur_size );
 }
 
 static void dump_create_mailslot_request( const struct create_mailslot_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " read_timeout=" );
-    dump_timeout( &req->read_timeout );
-    fprintf( stderr, "," );
-    fprintf( stderr, " max_msgsize=%08x,", req->max_msgsize );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_timeout( ", read_timeout=", &req->read_timeout );
+    fprintf( stderr, ", max_msgsize=%08x", req->max_msgsize );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_create_mailslot_reply( const struct create_mailslot_reply *req )
@@ -3697,28 +3349,23 @@ static void dump_create_mailslot_reply( const struct create_mailslot_reply *req
 
 static void dump_set_mailslot_info_request( const struct set_mailslot_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " read_timeout=" );
-    dump_timeout( &req->read_timeout );
-    fprintf( stderr, "," );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_timeout( ", read_timeout=", &req->read_timeout );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static void dump_set_mailslot_info_reply( const struct set_mailslot_info_reply *req )
 {
-    fprintf( stderr, " read_timeout=" );
-    dump_timeout( &req->read_timeout );
-    fprintf( stderr, "," );
-    fprintf( stderr, " max_msgsize=%08x", req->max_msgsize );
+    dump_timeout( " read_timeout=", &req->read_timeout );
+    fprintf( stderr, ", max_msgsize=%08x", req->max_msgsize );
 }
 
 static void dump_create_directory_request( const struct create_directory_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " directory_name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_unicode_str( ", directory_name=", cur_size );
 }
 
 static void dump_create_directory_reply( const struct create_directory_reply *req )
@@ -3728,11 +3375,10 @@ static void dump_create_directory_reply( const struct create_directory_reply *re
 
 static void dump_open_directory_request( const struct open_directory_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " directory_name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_unicode_str( ", directory_name=", cur_size );
 }
 
 static void dump_open_directory_reply( const struct open_directory_reply *req )
@@ -3742,31 +3388,25 @@ static void dump_open_directory_reply( const struct open_directory_reply *req )
 
 static void dump_get_directory_entry_request( const struct get_directory_entry_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " index=%08x", req->index );
+    fprintf( stderr, " handle=%04x", req->handle );
+    fprintf( stderr, ", index=%08x", req->index );
 }
 
 static void dump_get_directory_entry_reply( const struct get_directory_entry_reply *req )
 {
-    fprintf( stderr, " name_len=%u,", req->name_len );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( min(cur_size,req->name_len) );
-    fputc( ',', stderr );
-    fprintf( stderr, " type=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " name_len=%u", req->name_len );
+    dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) );
+    dump_varargs_unicode_str( ", type=", cur_size );
 }
 
 static void dump_create_symlink_request( const struct create_symlink_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " name_len=%u,", req->name_len );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( min(cur_size,req->name_len) );
-    fputc( ',', stderr );
-    fprintf( stderr, " target_name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    fprintf( stderr, ", name_len=%u", req->name_len );
+    dump_varargs_unicode_str( ", name=", min(cur_size,req->name_len) );
+    dump_varargs_unicode_str( ", target_name=", cur_size );
 }
 
 static void dump_create_symlink_reply( const struct create_symlink_reply *req )
@@ -3776,11 +3416,10 @@ static void dump_create_symlink_reply( const struct create_symlink_reply *req )
 
 static void dump_open_symlink_request( const struct open_symlink_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_open_symlink_reply( const struct open_symlink_reply *req )
@@ -3795,8 +3434,7 @@ static void dump_query_symlink_request( const struct query_symlink_request *req
 
 static void dump_query_symlink_reply( const struct query_symlink_reply *req )
 {
-    fprintf( stderr, " target_name=" );
-    dump_varargs_unicode_str( cur_size );
+    dump_varargs_unicode_str( " target_name=", cur_size );
 }
 
 static void dump_get_object_info_request( const struct get_object_info_request *req )
@@ -3806,8 +3444,8 @@ static void dump_get_object_info_request( const struct get_object_info_request *
 
 static void dump_get_object_info_reply( const struct get_object_info_reply *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " ref_count=%08x", req->ref_count );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", ref_count=%08x", req->ref_count );
 }
 
 static void dump_unlink_object_request( const struct unlink_object_request *req )
@@ -3831,14 +3469,13 @@ static void dump_allocate_locally_unique_id_request( const struct allocate_local
 
 static void dump_allocate_locally_unique_id_reply( const struct allocate_locally_unique_id_reply *req )
 {
-    fprintf( stderr, " luid=" );
-    dump_luid( &req->luid );
+    dump_luid( " luid=", &req->luid );
 }
 
 static void dump_create_device_manager_request( const struct create_device_manager_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x", req->attributes );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
 }
 
 static void dump_create_device_manager_reply( const struct create_device_manager_reply *req )
@@ -3848,15 +3485,12 @@ static void dump_create_device_manager_reply( const struct create_device_manager
 
 static void dump_create_device_request( const struct create_device_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " user_ptr=" );
-    dump_uint64( &req->user_ptr );
-    fprintf( stderr, "," );
-    fprintf( stderr, " manager=%04x,", req->manager );
-    fprintf( stderr, " name=" );
-    dump_varargs_unicode_str( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_uint64( ", user_ptr=", &req->user_ptr );
+    fprintf( stderr, ", manager=%04x", req->manager );
+    dump_varargs_unicode_str( ", name=", cur_size );
 }
 
 static void dump_create_device_reply( const struct create_device_reply *req )
@@ -3871,26 +3505,20 @@ static void dump_delete_device_request( const struct delete_device_request *req
 
 static void dump_get_next_device_request_request( const struct get_next_device_request_request *req )
 {
-    fprintf( stderr, " manager=%04x,", req->manager );
-    fprintf( stderr, " prev=%04x,", req->prev );
-    fprintf( stderr, " status=%08x,", req->status );
-    fprintf( stderr, " prev_data=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " manager=%04x", req->manager );
+    fprintf( stderr, ", prev=%04x", req->prev );
+    fprintf( stderr, ", status=%08x", req->status );
+    dump_varargs_bytes( ", prev_data=", cur_size );
 }
 
 static void dump_get_next_device_request_reply( const struct get_next_device_request_reply *req )
 {
-    fprintf( stderr, " next=%04x,", req->next );
-    fprintf( stderr, " code=" );
-    dump_ioctl_code( &req->code );
-    fprintf( stderr, "," );
-    fprintf( stderr, " user_ptr=" );
-    dump_uint64( &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=" );
-    dump_varargs_bytes( cur_size );
+    fprintf( stderr, " next=%04x", req->next );
+    dump_ioctl_code( ", code=", &req->code );
+    dump_uint64( ", user_ptr=", &req->user_ptr );
+    fprintf( stderr, ", in_size=%u", req->in_size );
+    fprintf( stderr, ", out_size=%u", req->out_size );
+    dump_varargs_bytes( ", next_data=", cur_size );
 }
 
 static void dump_make_process_system_request( const struct make_process_system_request *req )
@@ -3909,26 +3537,21 @@ static void dump_get_token_statistics_request( const struct get_token_statistics
 
 static void dump_get_token_statistics_reply( const struct get_token_statistics_reply *req )
 {
-    fprintf( stderr, " token_id=" );
-    dump_luid( &req->token_id );
-    fprintf( stderr, "," );
-    fprintf( stderr, " modified_id=" );
-    dump_luid( &req->modified_id );
-    fprintf( stderr, "," );
-    fprintf( stderr, " primary=%d,", req->primary );
-    fprintf( stderr, " impersonation_level=%d,", req->impersonation_level );
-    fprintf( stderr, " group_count=%d,", req->group_count );
-    fprintf( stderr, " privilege_count=%d", req->privilege_count );
+    dump_luid( " token_id=", &req->token_id );
+    dump_luid( ", modified_id=", &req->modified_id );
+    fprintf( stderr, ", primary=%d", req->primary );
+    fprintf( stderr, ", impersonation_level=%d", req->impersonation_level );
+    fprintf( stderr, ", group_count=%d", req->group_count );
+    fprintf( stderr, ", privilege_count=%d", req->privilege_count );
 }
 
 static void dump_create_completion_request( const struct create_completion_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " concurrent=%08x,", req->concurrent );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " filename=" );
-    dump_varargs_string( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", concurrent=%08x", req->concurrent );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_string( ", filename=", cur_size );
 }
 
 static void dump_create_completion_reply( const struct create_completion_reply *req )
@@ -3938,11 +3561,10 @@ static void dump_create_completion_reply( const struct create_completion_reply *
 
 static void dump_open_completion_request( const struct open_completion_request *req )
 {
-    fprintf( stderr, " access=%08x,", req->access );
-    fprintf( stderr, " attributes=%08x,", req->attributes );
-    fprintf( stderr, " rootdir=%04x,", req->rootdir );
-    fprintf( stderr, " filename=" );
-    dump_varargs_string( cur_size );
+    fprintf( stderr, " access=%08x", req->access );
+    fprintf( stderr, ", attributes=%08x", req->attributes );
+    fprintf( stderr, ", rootdir=%04x", req->rootdir );
+    dump_varargs_string( ", filename=", cur_size );
 }
 
 static void dump_open_completion_reply( const struct open_completion_reply *req )
@@ -3952,15 +3574,11 @@ static void dump_open_completion_reply( const struct open_completion_reply *req
 
 static void dump_add_completion_request( const struct add_completion_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " ckey=" );
-    dump_uint64( &req->ckey );
-    fprintf( stderr, "," );
-    fprintf( stderr, " cvalue=" );
-    dump_uint64( &req->cvalue );
-    fprintf( stderr, "," );
-    fprintf( stderr, " information=%08x,", req->information );
-    fprintf( stderr, " status=%08x", req->status );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", ckey=", &req->ckey );
+    dump_uint64( ", cvalue=", &req->cvalue );
+    fprintf( stderr, ", information=%08x", req->information );
+    fprintf( stderr, ", status=%08x", req->status );
 }
 
 static void dump_remove_completion_request( const struct remove_completion_request *req )
@@ -3970,14 +3588,10 @@ static void dump_remove_completion_request( const struct remove_completion_reque
 
 static void dump_remove_completion_reply( const struct remove_completion_reply *req )
 {
-    fprintf( stderr, " ckey=" );
-    dump_uint64( &req->ckey );
-    fprintf( stderr, "," );
-    fprintf( stderr, " cvalue=" );
-    dump_uint64( &req->cvalue );
-    fprintf( stderr, "," );
-    fprintf( stderr, " information=%08x,", req->information );
-    fprintf( stderr, " status=%08x", req->status );
+    dump_uint64( " ckey=", &req->ckey );
+    dump_uint64( ", cvalue=", &req->cvalue );
+    fprintf( stderr, ", information=%08x", req->information );
+    fprintf( stderr, ", status=%08x", req->status );
 }
 
 static void dump_query_completion_request( const struct query_completion_request *req )
@@ -3992,21 +3606,17 @@ static void dump_query_completion_reply( const struct query_completion_reply *re
 
 static void dump_set_completion_info_request( const struct set_completion_info_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " ckey=" );
-    dump_uint64( &req->ckey );
-    fprintf( stderr, "," );
-    fprintf( stderr, " chandle=%04x", req->chandle );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", ckey=", &req->ckey );
+    fprintf( stderr, ", chandle=%04x", req->chandle );
 }
 
 static void dump_add_fd_completion_request( const struct add_fd_completion_request *req )
 {
-    fprintf( stderr, " handle=%04x,", req->handle );
-    fprintf( stderr, " cvalue=" );
-    dump_uint64( &req->cvalue );
-    fprintf( stderr, "," );
-    fprintf( stderr, " status=%08x,", req->status );
-    fprintf( stderr, " information=%08x", req->information );
+    fprintf( stderr, " handle=%04x", req->handle );
+    dump_uint64( ", cvalue=", &req->cvalue );
+    fprintf( stderr, ", status=%08x", req->status );
+    fprintf( stderr, ", information=%08x", req->information );
 }
 
 static void dump_get_window_layered_info_request( const struct get_window_layered_info_request *req )
@@ -4016,17 +3626,17 @@ static void dump_get_window_layered_info_request( const struct get_window_layere
 
 static void dump_get_window_layered_info_reply( const struct get_window_layered_info_reply *req )
 {
-    fprintf( stderr, " color_key=%08x,", req->color_key );
-    fprintf( stderr, " alpha=%08x,", req->alpha );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " color_key=%08x", req->color_key );
+    fprintf( stderr, ", alpha=%08x", req->alpha );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static void dump_set_window_layered_info_request( const struct set_window_layered_info_request *req )
 {
-    fprintf( stderr, " handle=%08x,", req->handle );
-    fprintf( stderr, " color_key=%08x,", req->color_key );
-    fprintf( stderr, " alpha=%08x,", req->alpha );
-    fprintf( stderr, " flags=%08x", req->flags );
+    fprintf( stderr, " handle=%08x", req->handle );
+    fprintf( stderr, ", color_key=%08x", req->color_key );
+    fprintf( stderr, ", alpha=%08x", req->alpha );
+    fprintf( stderr, ", flags=%08x", req->flags );
 }
 
 static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
diff --git a/tools/make_requests b/tools/make_requests
index 95c56473a63..b53af11787f 100755
--- a/tools/make_requests
+++ b/tools/make_requests
@@ -69,6 +69,7 @@ sub DO_DUMP_FUNC($$@)
 {
     my $name = shift;
     my $req = shift;
+    my $prefix = " ";
     push @trace_lines, "static void dump_${name}_$req( const struct ${name}_$req *req )\n{\n";
     while ($#_ >= 0)
     {
@@ -81,31 +82,23 @@ sub DO_DUMP_FUNC($$@)
             if ($fmt =~ /^&(.*)/)
             {
                 my $func = $1;
-                push @trace_lines, "    fprintf( stderr, \" $var=\" );\n";
-                push @trace_lines, "    $func( &req->$var );\n";
-                push @trace_lines, "    fprintf( stderr, \",\" );\n" if ($#_ > 0);
+                push @trace_lines, "    $func( \"$prefix$var=\", &req->$var );\n";
             }
             elsif ($fmt =~ /^(%.*)\s+\((.*)\)/)
             {
                 my ($format, $cast) = ($1, $2);
-                push @trace_lines, "    fprintf( stderr, \" $var=$format";
-                push @trace_lines, "," if ($#_ > 0);
-                push @trace_lines, "\", ($cast)req->$var );\n";
+                push @trace_lines, "    fprintf( stderr, \"$prefix$var=$format\", ($cast)req->$var );\n";
             }
             else
             {
-                push @trace_lines, "    fprintf( stderr, \" $var=$fmt";
-                push @trace_lines, "," if ($#_ > 0);
-                push @trace_lines, "\", req->$var );\n";
+                push @trace_lines, "    fprintf( stderr, \"$prefix$var=$fmt\", req->$var );\n";
             }
 	}
 	else  # must be some varargs format
 	{
-            my $func = $type;
-            push @trace_lines, "    fprintf( stderr, \" $var=\" );\n";
-            push @trace_lines, "    $func;\n";
-            push @trace_lines, "    fputc( ',', stderr );\n" if ($#_ > 0);
+            push @trace_lines, "    " . sprintf($type, "$prefix$var=") . ";\n";
         }
+        $prefix = ", ";
     }
     push @trace_lines, "}\n\n";
 }
@@ -215,13 +208,13 @@ sub PARSE_REQUESTS()
             if (/^\s*VARARG\((\w+),(\w+),(\w+)\)/)
             {
                 $var = $1;
-                $type = "dump_varargs_" . $2 . "( min(cur_size,req->" . $3 . ") )";
+                $type = "dump_varargs_" . $2 . "( \"%s\", min(cur_size,req->" . $3 . ") )";
                 s!(VARARG\(.*\)\s*;)!/* $1 */!;
             }
             elsif (/^\s*VARARG\((\w+),(\w+)\)/)
             {
                 $var = $1;
-                $type = "dump_varargs_" . $2 . "( cur_size )";
+                $type = "dump_varargs_" . $2 . "( \"%s\", cur_size )";
                 s!(VARARG\(.*\)\s*;)!/* $1 */!;
             }
             elsif (/^\s*(\w+\**(\s+\w+\**)*)\s+(\w+);/)