Commit e0330145 authored by Alexandre Julliard's avatar Alexandre Julliard

server: Remove the no longer needed exe_file parameter in the

init_process_done request.
parent 9669ff8d
...@@ -264,7 +264,6 @@ struct init_process_done_request ...@@ -264,7 +264,6 @@ struct init_process_done_request
size_t module_size; size_t module_size;
void* entry; void* entry;
void* name; void* name;
obj_handle_t exe_file;
int gui; int gui;
/* VARARG(filename,unicode_str); */ /* VARARG(filename,unicode_str); */
}; };
...@@ -4364,6 +4363,6 @@ union generic_reply ...@@ -4364,6 +4363,6 @@ union generic_reply
struct query_symlink_reply query_symlink_reply; struct query_symlink_reply query_symlink_reply;
}; };
#define SERVER_PROTOCOL_VERSION 225 #define SERVER_PROTOCOL_VERSION 226
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */
...@@ -351,9 +351,6 @@ size_t init_process( struct thread *thread ) ...@@ -351,9 +351,6 @@ size_t init_process( struct thread *thread )
if (!info) return 0; if (!info) return 0;
/* retrieve the main exe file */
if (info->exe_file) process->exe.file = (struct file *)grab_object( info->exe_file );
/* thread will be actually suspended in init_done */ /* thread will be actually suspended in init_done */
if (info->create_flags & CREATE_SUSPENDED) thread->suspend++; if (info->create_flags & CREATE_SUSPENDED) thread->suspend++;
...@@ -994,8 +991,6 @@ DECL_HANDLER(init_process_done) ...@@ -994,8 +991,6 @@ DECL_HANDLER(init_process_done)
return; return;
} }
if (process->exe.file) release_object( process->exe.file );
/* check if main exe has been registered as a dll already */ /* check if main exe has been registered as a dll already */
if ((dll = find_process_dll( process, req->module ))) if ((dll = find_process_dll( process, req->module )))
{ {
...@@ -1006,13 +1001,9 @@ DECL_HANDLER(init_process_done) ...@@ -1006,13 +1001,9 @@ DECL_HANDLER(init_process_done)
} }
else else
{ {
struct file *file = NULL;
if (req->exe_file) file = get_file_obj( process, req->exe_file, FILE_READ_DATA );
process->exe.base = req->module; process->exe.base = req->module;
process->exe.size = req->module_size; process->exe.size = req->module_size;
process->exe.name = req->name; process->exe.name = req->name;
process->exe.file = file;
if ((process->exe.namelen = get_req_data_size())) if ((process->exe.namelen = get_req_data_size()))
process->exe.filename = memdup( get_req_data(), process->exe.namelen ); process->exe.filename = memdup( get_req_data(), process->exe.namelen );
} }
......
...@@ -258,7 +258,6 @@ struct security_descriptor ...@@ -258,7 +258,6 @@ struct security_descriptor
size_t module_size; /* main module size */ size_t module_size; /* main module size */
void* entry; /* process entry point */ void* entry; /* process entry point */
void* name; /* ptr to ptr to name (in process addr space) */ void* name; /* ptr to ptr to name (in process addr space) */
obj_handle_t exe_file; /* file handle for main exe */
int gui; /* is it a GUI process? */ int gui; /* is it a GUI process? */
VARARG(filename,unicode_str); /* file name of main exe */ VARARG(filename,unicode_str); /* file name of main exe */
@END @END
......
...@@ -641,7 +641,6 @@ static void dump_init_process_done_request( const struct init_process_done_reque ...@@ -641,7 +641,6 @@ static void dump_init_process_done_request( const struct init_process_done_reque
fprintf( stderr, " module_size=%lu,", (unsigned long)req->module_size ); fprintf( stderr, " module_size=%lu,", (unsigned long)req->module_size );
fprintf( stderr, " entry=%p,", req->entry ); fprintf( stderr, " entry=%p,", req->entry );
fprintf( stderr, " name=%p,", req->name ); fprintf( stderr, " name=%p,", req->name );
fprintf( stderr, " exe_file=%p,", req->exe_file );
fprintf( stderr, " gui=%d,", req->gui ); fprintf( stderr, " gui=%d,", req->gui );
fprintf( stderr, " filename=" ); fprintf( stderr, " filename=" );
dump_varargs_unicode_str( cur_size ); dump_varargs_unicode_str( cur_size );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment