Alexandre Julliard : server: Remove the no longer used pid/tid fields in the init_thread request.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cc63b76833aa96e573800ff5b4dd6c7f01f324f7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=cc63b76833aa96e573800ff5b...

Author: Alexandre Julliard 
Date:   Mon Jun 28 11:41:06 2021 +0200

server: Remove the no longer used pid/tid fields in the init_thread request.

Signed-off-by: Alexandre Julliard

---

include/wine/server_protocol.h | 6 ++----
 server/protocol.def            | 2 --
 server/request.h               | 6 ++----
 server/thread.c                | 2 --
 server/trace.c                 | 4 +---
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 51ee6ee4aa3..1720eef506e 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -952,10 +952,8 @@ struct init_thread_request
 struct init_thread_reply
 {
     struct reply_header __header;
-    process_id_t pid;
-    thread_id_t  tid;
     int          suspend;
-    char __pad_20[4];
+    char __pad_12[4];
 };

@@ -6236,7 +6234,7 @@ union generic_reply

/* ### protocol_version begin ### */

-#define SERVER_PROTOCOL_VERSION 718
+#define SERVER_PROTOCOL_VERSION 719

/* ### protocol_version end ### */

diff --git a/server/protocol.def b/server/protocol.def
index 557311e2b3f..762be1fa7c0 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -924,8 +924,6 @@ typedef struct
     client_ptr_t teb;          /* TEB of new thread (in thread address space) */
     client_ptr_t entry;        /* entry point (in thread address space) */
 @REPLY
-    process_id_t pid;          /* process id of the new thread's process */
-    thread_id_t  tid;          /* thread id of the new thread */
     int          suspend;      /* is thread suspended? */
 @END

diff --git a/server/request.h b/server/request.h
index 0221cbd33ae..1c45ac34cc7 100644
--- a/server/request.h
+++ b/server/request.h
@@ -758,10 +758,8 @@ C_ASSERT( FIELD_OFFSET(struct init_thread_request, wait_fd) == 20 );
 C_ASSERT( FIELD_OFFSET(struct init_thread_request, teb) == 24 );
 C_ASSERT( FIELD_OFFSET(struct init_thread_request, entry) == 32 );
 C_ASSERT( sizeof(struct init_thread_request) == 40 );
-C_ASSERT( FIELD_OFFSET(struct init_thread_reply, pid) == 8 );
-C_ASSERT( FIELD_OFFSET(struct init_thread_reply, tid) == 12 );
-C_ASSERT( FIELD_OFFSET(struct init_thread_reply, suspend) == 16 );
-C_ASSERT( sizeof(struct init_thread_reply) == 24 );
+C_ASSERT( FIELD_OFFSET(struct init_thread_reply, suspend) == 8 );
+C_ASSERT( sizeof(struct init_thread_reply) == 16 );
 C_ASSERT( FIELD_OFFSET(struct terminate_process_request, handle) == 12 );
 C_ASSERT( FIELD_OFFSET(struct terminate_process_request, exit_code) == 16 );
 C_ASSERT( sizeof(struct terminate_process_request) == 24 );
diff --git a/server/thread.c b/server/thread.c
index 703b23d73d1..f9535a7b25b 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1457,8 +1457,6 @@ DECL_HANDLER(init_thread)
     generate_debug_event( current, DbgCreateThreadStateChange, &req->entry );
     set_thread_affinity( current, current->affinity );

-    reply->pid     = get_process_id( current->process );
-    reply->tid     = get_thread_id( current );
     reply->suspend = (current->suspend || current->process->suspend || current->context != NULL);
 }

diff --git a/server/trace.c b/server/trace.c
index bbdf17feb1a..55068d1179b 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1545,9 +1545,7 @@ static void dump_init_thread_request( const struct init_thread_request *req )

static void dump_init_thread_reply( const struct init_thread_reply *req )
 {
-    fprintf( stderr, " pid=%04x", req->pid );
-    fprintf( stderr, ", tid=%04x", req->tid );
-    fprintf( stderr, ", suspend=%d", req->suspend );
+    fprintf( stderr, " suspend=%d", req->suspend );
 }

static void dump_terminate_process_request( const struct terminate_process_request *req )