ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

server: Move the ldt_copy pointer to the init_first_thread request. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-02-02 10:26:20 +01:00
parent 44699c324f
commit d514c64a8c
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/ntdll/unix/server.c
View File

@ -1535,6 +1535,9 @@ size_t server_init_process(void)
req->unix_tid = get_unix_tid();
req->teb = wine_server_client_ptr( NtCurrentTeb() );
req->peb = wine_server_client_ptr( NtCurrentTeb()->Peb );
#ifdef __i386__
req->ldt_copy = wine_server_client_ptr( &__wine_ldt_copy );
#endif
req->reply_fd = reply_pipe;
req->wait_fd = ntdll_get_thread_data()->wait_fd[1];
req->debug_level = (TRACE_ON(server) != 0);
@ -1611,9 +1614,6 @@ void server_init_process_done(void)
SERVER_START_REQ( init_process_done )
{
req->module = wine_server_client_ptr( peb->ImageBaseAddress );
#ifdef __i386__
req->ldt_copy = wine_server_client_ptr( &__wine_ldt_copy );
#endif
req->entry = wine_server_client_ptr( entry );
req->gui = (nt->OptionalHeader.Subsystem != IMAGE_SUBSYSTEM_WINDOWS_CUI);
status = wine_server_call( req );

6
include/wine/server_protocol.h
View File

@ -881,7 +881,6 @@ struct init_process_done_request
struct request_header __header;
int gui;
mod_handle_t module;
client_ptr_t ldt_copy;
client_ptr_t entry;
};
struct init_process_done_reply
@ -901,10 +900,11 @@ struct init_first_thread_request
int debug_level;
client_ptr_t teb;
client_ptr_t peb;
client_ptr_t ldt_copy;
int reply_fd;
int wait_fd;
client_cpu_t cpu;
char __pad_52[4];
char __pad_60[4];
};
struct init_first_thread_reply
{
@ -6229,7 +6229,7 @@ union generic_reply
/* ### protocol_version begin ### */
#define SERVER_PROTOCOL_VERSION 663
#define SERVER_PROTOCOL_VERSION 664
/* ### protocol_version end ### */

1
server/process.c
View File

@ -1369,7 +1369,6 @@ DECL_HANDLER(init_process_done)
list_remove( &dll->entry );
list_add_head( &process->dlls, &dll->entry );
process->ldt_copy = req->ldt_copy;
process->start_time = current_time;
current->entry_point = req->entry;

2
server/protocol.def
View File

@ -863,7 +863,6 @@ typedef struct
@REQ(init_process_done)
int gui; /* is it a GUI process? */
mod_handle_t module; /* main module base address */
client_ptr_t ldt_copy; /* address of LDT copy (in thread address space) */
client_ptr_t entry; /* process entry point */
@REPLY
int suspend; /* is process suspended? */
@ -877,6 +876,7 @@ typedef struct
int debug_level; /* new debug level */
client_ptr_t teb; /* TEB of new thread (in process address space) */
client_ptr_t peb; /* PEB of new process (in process address space) */
client_ptr_t ldt_copy; /* address of LDT copy (in process address space) */
int reply_fd; /* fd for reply pipe */
int wait_fd; /* fd for blocking calls pipe */
client_cpu_t cpu; /* CPU that this thread is running on */

14
server/request.h
View File

@ -745,9 +745,8 @@ C_ASSERT( FIELD_OFFSET(struct get_startup_info_reply, info_size) == 8 );
C_ASSERT( sizeof(struct get_startup_info_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct init_process_done_request, gui) == 12 );
C_ASSERT( FIELD_OFFSET(struct init_process_done_request, module) == 16 );
C_ASSERT( FIELD_OFFSET(struct init_process_done_request, ldt_copy) == 24 );
C_ASSERT( FIELD_OFFSET(struct init_process_done_request, entry) == 32 );
C_ASSERT( sizeof(struct init_process_done_request) == 40 );
C_ASSERT( FIELD_OFFSET(struct init_process_done_request, entry) == 24 );
C_ASSERT( sizeof(struct init_process_done_request) == 32 );
C_ASSERT( FIELD_OFFSET(struct init_process_done_reply, suspend) == 8 );
C_ASSERT( sizeof(struct init_process_done_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, unix_pid) == 12 );
@ -755,10 +754,11 @@ C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, unix_tid) == 16 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, debug_level) == 20 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, teb) == 24 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, peb) == 32 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, reply_fd) == 40 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, wait_fd) == 44 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, cpu) == 48 );
C_ASSERT( sizeof(struct init_first_thread_request) == 56 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, ldt_copy) == 40 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, reply_fd) == 48 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, wait_fd) == 52 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_request, cpu) == 56 );
C_ASSERT( sizeof(struct init_first_thread_request) == 64 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, pid) == 8 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, tid) == 12 );
C_ASSERT( FIELD_OFFSET(struct init_first_thread_reply, server_start) == 16 );

1
server/thread.c
View File

@ -1434,6 +1434,7 @@ DECL_HANDLER(init_first_thread)
current->unix_tid = req->unix_tid;
current->teb = req->teb;
process->peb = req->peb;
process->ldt_copy = req->ldt_copy;
process->cpu = req->cpu;
if (!process->parent_id)

2
server/trace.c
View File

@ -1383,7 +1383,6 @@ static void dump_init_process_done_request( const struct init_process_done_reque
{
fprintf( stderr, " gui=%d", req->gui );
dump_uint64( ", module=", &req->module );
dump_uint64( ", ldt_copy=", &req->ldt_copy );
dump_uint64( ", entry=", &req->entry );
}
@ -1399,6 +1398,7 @@ static void dump_init_first_thread_request( const struct init_first_thread_reque
fprintf( stderr, ", debug_level=%d", req->debug_level );
dump_uint64( ", teb=", &req->teb );
dump_uint64( ", peb=", &req->peb );
dump_uint64( ", ldt_copy=", &req->ldt_copy );
fprintf( stderr, ", reply_fd=%d", req->reply_fd );
fprintf( stderr, ", wait_fd=%d", req->wait_fd );
dump_client_cpu( ", cpu=", &req->cpu );