[Wine-patches] [eter-2.1 1/6] Revert "server : add entry_point in struct get_thread_info_reply".
Dmitry Timoshkov
dtimoshkov на etersoft.ru
Пн Июн 26 12:23:17 MSK 2017
This reverts commit d00b4abda04ab2a0ca5b13ad429e6fead4d135b1.
---
include/wine/server_protocol.h | 5 ++---
server/request.h | 15 +++++++--------
server/trace.c | 2 --
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index baa23ba6df..ad4f4254fe 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -47,7 +47,7 @@ struct reply_header
struct request_max_size
{
- int pad[18];
+ int pad[16];
};
#define FIRST_USER_HANDLE 0x0020
@@ -828,14 +828,13 @@ struct get_thread_info_reply
process_id_t pid;
thread_id_t tid;
client_ptr_t teb;
- client_ptr_t entry_point;
affinity_t affinity;
timeout_t creation_time;
timeout_t exit_time;
int exit_code;
int priority;
int last;
- char __pad_68[4];
+ char __pad_60[4];
};
diff --git a/server/request.h b/server/request.h
index 43c23a4779..ec8702bfd4 100644
--- a/server/request.h
+++ b/server/request.h
@@ -743,14 +743,13 @@ C_ASSERT( sizeof(struct get_thread_info_request) == 24 );
C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, pid) == 8 );
C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, tid) == 12 );
C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, teb) == 16 );
-C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, entry_point) == 24 );
-C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 32 );
-C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, creation_time) == 40 );
-C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_time) == 48 );
-C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 56 );
-C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 60 );
-C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 64 );
-C_ASSERT( sizeof(struct get_thread_info_reply) == 72 );
+C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 24 );
+C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, creation_time) == 32 );
+C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_time) == 40 );
+C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 48 );
+C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 52 );
+C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 56 );
+C_ASSERT( sizeof(struct get_thread_info_reply) == 64 );
C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, mask) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_thread_info_request, priority) == 20 );
diff --git a/server/trace.c b/server/trace.c
index 53acb8e620..6f6bc8b94a 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1220,7 +1220,6 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req
fprintf( stderr, " pid=%04x", req->pid );
fprintf( stderr, ", tid=%04x", req->tid );
dump_uint64( ", teb=", &req->teb );
- dump_uint64( ", entry_point=", &req->entry_point );
dump_uint64( ", affinity=", &req->affinity );
dump_timeout( ", creation_time=", &req->creation_time );
dump_timeout( ", exit_time=", &req->exit_time );
@@ -4855,7 +4854,6 @@ static const struct
{ "IO_TIMEOUT", STATUS_IO_TIMEOUT },
{ "KEY_DELETED", STATUS_KEY_DELETED },
{ "MAPPED_FILE_SIZE_ZERO", STATUS_MAPPED_FILE_SIZE_ZERO },
- { "MORE_PROCESSING_REQUIRED", STATUS_MORE_PROCESSING_REQUIRED },
{ "MUTANT_NOT_OWNED", STATUS_MUTANT_NOT_OWNED },
{ "NAME_TOO_LONG", STATUS_NAME_TOO_LONG },
{ "NETWORK_BUSY", STATUS_NETWORK_BUSY },
--
2.13.1
Подробная информация о списке рассылки Wine-patches