Pass the environment for a child process through the server instead of

include/wine/server_protocol.h

@@ -177,6 +177,7 @@ struct new_process_request
     obj_handle_t hstdout;
     obj_handle_t hstderr;
     /* VARARG(info,startup_info); */
+    /* VARARG(env,unicode_str); */
 };
 struct new_process_reply
 {
@@ -261,6 +262,7 @@ struct get_startup_info_reply
 {
     struct reply_header __header;
     /* VARARG(info,startup_info); */
+    /* VARARG(env,unicode_str); */
 };
 
 
@@ -3626,6 +3628,6 @@ union generic_reply
     struct set_global_windows_reply set_global_windows_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 145
+#define SERVER_PROTOCOL_VERSION 146
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

server/protocol.def

@@ -191,6 +191,7 @@ typedef struct
     obj_handle_t hstdout;      /* handle for stdout */
     obj_handle_t hstderr;      /* handle for stderr */
     VARARG(info,startup_info); /* startup information */
+    VARARG(env,unicode_str);   /* environment for new process */
 @REPLY
     obj_handle_t info;         /* new process info handle */
 @END
@@ -246,6 +247,7 @@ typedef struct
 @REQ(get_startup_info)
 @REPLY
     VARARG(info,startup_info); /* startup information */
+    VARARG(env,unicode_str);   /* environment */
 @END
 
 

server/trace.c

@@ -423,6 +423,9 @@ static void dump_new_process_request( const struct new_process_request *req )
     fprintf( stderr, " hstderr=%p,", req->hstderr );
     fprintf( stderr, " info=" );
     dump_varargs_startup_info( cur_size );
+    fputc( ',', stderr );
+    fprintf( stderr, " env=" );
+    dump_varargs_unicode_str( cur_size );
 }
 
 static void dump_new_process_reply( const struct new_process_reply *req )
@@ -489,6 +492,9 @@ static void dump_get_startup_info_reply( const struct get_startup_info_reply *re
 {
     fprintf( stderr, " info=" );
     dump_varargs_startup_info( cur_size );
+    fputc( ',', stderr );
+    fprintf( stderr, " env=" );
+    dump_varargs_unicode_str( cur_size );
 }
 
 static void dump_init_process_done_request( const struct init_process_done_request *req )