Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
8c4a1cc7
Commit
8c4a1cc7
authored
Nov 11, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: Get rid of the unused file parameter in exec_process.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
55a58181
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
12 deletions
+7
-12
process.c
dlls/kernel32/process.c
+4
-6
server_protocol.h
include/wine/server_protocol.h
+2
-2
protocol.def
server/protocol.def
+0
-1
request.h
server/request.h
+1
-2
trace.c
server/trace.c
+0
-1
No files found.
dlls/kernel32/process.c
View file @
8c4a1cc7
...
@@ -1430,8 +1430,7 @@ static NTSTATUS alloc_object_attributes( const SECURITY_ATTRIBUTES *attr, struct
...
@@ -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
...
@@ -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 )
...
@@ -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 )
...
@@ -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:
...
...
include/wine/server_protocol.h
View file @
8c4a1cc7
...
@@ -795,8 +795,8 @@ struct exec_process_request
...
@@ -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
...
@@ -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 58
8
#define SERVER_PROTOCOL_VERSION 58
9
#endif
/* __WINE_WINE_SERVER_PROTOCOL_H */
#endif
/* __WINE_WINE_SERVER_PROTOCOL_H */
server/protocol.def
View file @
8c4a1cc7
...
@@ -803,7 +803,6 @@ struct rawinput_device
...
@@ -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
...
...
server/request.h
View file @
8c4a1cc7
...
@@ -757,8 +757,7 @@ C_ASSERT( FIELD_OFFSET(struct new_process_reply, pid) == 12 );
...
@@ -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
);
...
...
server/trace.c
View file @
8c4a1cc7
...
@@ -1265,7 +1265,6 @@ static void dump_new_process_reply( const struct new_process_reply *req )
...
@@ -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
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment