diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index f8196860924..c7566ead0db 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -693,6 +693,8 @@ struct get_process_info_reply timeout_t end_time; int exit_code; int priority; + cpu_type_t cpu; + char __pad_60[4]; }; @@ -5310,6 +5312,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 386 +#define SERVER_PROTOCOL_VERSION 387 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 8a4fb15a711..2b8d8f6cc64 100644 --- a/server/process.c +++ b/server/process.c @@ -1068,6 +1068,7 @@ DECL_HANDLER(get_process_info) reply->peb = process->peb; reply->start_time = process->start_time; reply->end_time = process->end_time; + reply->cpu = process->cpu; release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 8ae653bea3a..e871736f75f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -660,6 +660,7 @@ typedef union timeout_t end_time; /* process end time */ int exit_code; /* process exit code */ int priority; /* priority class */ + cpu_type_t cpu; /* CPU that this process is running on */ @END diff --git a/server/request.h b/server/request.h index f85756c8f89..4fc3bd6a3c2 100644 --- a/server/request.h +++ b/server/request.h @@ -694,7 +694,8 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, start_time) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, end_time) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, exit_code) == 48 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 52 ); -C_ASSERT( sizeof(struct get_process_info_reply) == 56 ); +C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, cpu) == 56 ); +C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, mask) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_process_info_request, priority) == 20 ); diff --git a/server/trace.c b/server/trace.c index 6781ef7f39e..d24f653251b 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1152,6 +1152,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re dump_timeout( ", end_time=", &req->end_time ); fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); + dump_cpu_type( ", cpu=", &req->cpu ); } static void dump_set_process_info_request( const struct set_process_info_request *req )