ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Get rid of the unused file parameter in exec_process. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-11-11 20:02:36 +01:00
parent 55a5818106
commit 8c4a1cc792
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/kernel32/process.c
View File

@ -1430,8 +1430,7 @@ static NTSTATUS alloc_object_attributes( const SECURITY_ATTRIBUTES *attr, struct
* *
* Replace the existing process by exec'ing a new one. * Replace the existing process by exec'ing a new one.
*/ */
static BOOL replace_process( HANDLE handle, const RTL_USER_PROCESS_PARAMETERS *params, static BOOL replace_process( const RTL_USER_PROCESS_PARAMETERS *params, const pe_image_info_t *pe_info )
const pe_image_info_t *pe_info )
{ {
NTSTATUS status; NTSTATUS status;
int socketfd[2]; int socketfd[2];
@ -1454,7 +1453,6 @@ static BOOL replace_process( HANDLE handle, const RTL_USER_PROCESS_PARAMETERS *p
SERVER_START_REQ( exec_process ) SERVER_START_REQ( exec_process )
{ {
req->socket_fd = socketfd[1]; req->socket_fd = socketfd[1];
req->exe_file = wine_server_obj_handle( handle );
req->cpu = pe_info->cpu; req->cpu = pe_info->cpu;
status = wine_server_call( req ); status = wine_server_call( req );
} }
@ -2124,11 +2122,11 @@ static void exec_process( LPCWSTR name )
debugstr_w(name), is_64bit_arch(pe_info.cpu) ? 64 : 32, debugstr_w(name), is_64bit_arch(pe_info.cpu) ? 64 : 32,
wine_dbgstr_longlong(pe_info.base), wine_dbgstr_longlong(pe_info.base + pe_info.map_size), wine_dbgstr_longlong(pe_info.base), wine_dbgstr_longlong(pe_info.base + pe_info.map_size),
cpu_names[pe_info.cpu] ); cpu_names[pe_info.cpu] );
replace_process( hFile, params, &pe_info ); replace_process( params, &pe_info );
break; break;
case BINARY_UNIX_LIB: case BINARY_UNIX_LIB:
TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) ); TRACE( "%s is a Unix library, starting as Winelib app\n", debugstr_w(name) );
replace_process( hFile, params, &pe_info ); replace_process( params, &pe_info );
break; break;
case BINARY_UNKNOWN: case BINARY_UNKNOWN:
/* check for .com or .pif extension */ /* check for .com or .pif extension */
@ -2138,7 +2136,7 @@ static void exec_process( LPCWSTR name )
case BINARY_WIN16: case BINARY_WIN16:
TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) );
if (!(new_params = get_vdm_params( params, &pe_info ))) break; if (!(new_params = get_vdm_params( params, &pe_info ))) break;
replace_process( 0, new_params, &pe_info ); replace_process( new_params, &pe_info );
RtlDestroyProcessParameters( new_params ); RtlDestroyProcessParameters( new_params );
break; break;
default: default:

4
include/wine/server_protocol.h
View File

@ -795,8 +795,8 @@ struct exec_process_request
{ {
struct request_header __header; struct request_header __header;
int socket_fd; int socket_fd;
obj_handle_t exe_file;
client_cpu_t cpu; client_cpu_t cpu;
char __pad_20[4];
}; };
struct exec_process_reply struct exec_process_reply
{ {
@ -6691,6 +6691,6 @@ union generic_reply
struct resume_process_reply resume_process_reply; struct resume_process_reply resume_process_reply;
}; };
#define SERVER_PROTOCOL_VERSION 588 #define SERVER_PROTOCOL_VERSION 589
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

1
server/protocol.def
View File

@ -803,7 +803,6 @@ struct rawinput_device
/* Execute a process, replacing the current one */ /* Execute a process, replacing the current one */
@REQ(exec_process) @REQ(exec_process)
int socket_fd; /* file descriptor for process socket */ int socket_fd; /* file descriptor for process socket */
obj_handle_t exe_file; /* file handle for main exe */
client_cpu_t cpu; /* CPU that the new process will use */ client_cpu_t cpu; /* CPU that the new process will use */
@END @END

3
server/request.h
View File

@ -757,8 +757,7 @@ C_ASSERT( FIELD_OFFSET(struct new_process_reply, pid) == 12 );
C_ASSERT( FIELD_OFFSET(struct new_process_reply, handle) == 16 ); C_ASSERT( FIELD_OFFSET(struct new_process_reply, handle) == 16 );
C_ASSERT( sizeof(struct new_process_reply) == 24 ); C_ASSERT( sizeof(struct new_process_reply) == 24 );
C_ASSERT( FIELD_OFFSET(struct exec_process_request, socket_fd) == 12 ); C_ASSERT( FIELD_OFFSET(struct exec_process_request, socket_fd) == 12 );
C_ASSERT( FIELD_OFFSET(struct exec_process_request, exe_file) == 16 ); C_ASSERT( FIELD_OFFSET(struct exec_process_request, cpu) == 16 );
C_ASSERT( FIELD_OFFSET(struct exec_process_request, cpu) == 20 );
C_ASSERT( sizeof(struct exec_process_request) == 24 ); C_ASSERT( sizeof(struct exec_process_request) == 24 );
C_ASSERT( FIELD_OFFSET(struct get_new_process_info_request, info) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_new_process_info_request, info) == 12 );
C_ASSERT( sizeof(struct get_new_process_info_request) == 16 ); C_ASSERT( sizeof(struct get_new_process_info_request) == 16 );

1
server/trace.c
View File

@ -1265,7 +1265,6 @@ static void dump_new_process_reply( const struct new_process_reply *req )
static void dump_exec_process_request( const struct exec_process_request *req ) static void dump_exec_process_request( const struct exec_process_request *req )
{ {
fprintf( stderr, " socket_fd=%d", req->socket_fd ); fprintf( stderr, " socket_fd=%d", req->socket_fd );
fprintf( stderr, ", exe_file=%04x", req->exe_file );
dump_client_cpu( ", cpu=", &req->cpu ); dump_client_cpu( ", cpu=", &req->cpu );
} }