Alexandre Julliard : server: Return the process CPU in the get_process_info request.
Alexandre Julliard
julliard at winehq.org
Tue Jul 7 08:08:19 CDT 2009
Module: wine
Branch: master
Commit: 6056e8a52b8a931bc54306044fb991028fa7f1cf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6056e8a52b8a931bc54306044fb991028fa7f1cf
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jul 7 11:37:47 2009 +0200
server: Return the process CPU in the get_process_info request.
---
include/wine/server_protocol.h | 4 +++-
server/process.c | 1 +
server/protocol.def | 1 +
server/request.h | 3 ++-
server/trace.c | 1 +
5 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index f819686..c7566ea 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 8a4fb15..2b8d8f6 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 8ae653b..e871736 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 f85756c..4fc3bd6 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 6781ef7..d24f653 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 )
More information about the wine-cvs
mailing list