Get rid of the boot_done request.
This commit is contained in:
parent
9253e0e39c
commit
4391be583e
@ -47,7 +47,6 @@
|
|||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(process);
|
WINE_DEFAULT_DEBUG_CHANNEL(process);
|
||||||
WINE_DECLARE_DEBUG_CHANNEL(file);
|
WINE_DECLARE_DEBUG_CHANNEL(file);
|
||||||
WINE_DECLARE_DEBUG_CHANNEL(server);
|
|
||||||
WINE_DECLARE_DEBUG_CHANNEL(relay);
|
WINE_DECLARE_DEBUG_CHANNEL(relay);
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
@ -1004,14 +1003,6 @@ static BOOL process_init(void)
|
|||||||
/* convert old configuration to new format */
|
/* convert old configuration to new format */
|
||||||
convert_old_config();
|
convert_old_config();
|
||||||
|
|
||||||
/* global boot finished, the rest is process-local */
|
|
||||||
SERVER_START_REQ( boot_done )
|
|
||||||
{
|
|
||||||
req->debug_level = TRACE_ON(server);
|
|
||||||
wine_server_call( req );
|
|
||||||
}
|
|
||||||
SERVER_END_REQ;
|
|
||||||
|
|
||||||
set_registry_environment();
|
set_registry_environment();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -237,18 +237,6 @@ struct new_thread_reply
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
struct boot_done_request
|
|
||||||
{
|
|
||||||
struct request_header __header;
|
|
||||||
int debug_level;
|
|
||||||
};
|
|
||||||
struct boot_done_reply
|
|
||||||
{
|
|
||||||
struct reply_header __header;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
struct init_process_request
|
struct init_process_request
|
||||||
{
|
{
|
||||||
struct request_header __header;
|
struct request_header __header;
|
||||||
@ -3566,7 +3554,6 @@ enum request
|
|||||||
REQ_new_process,
|
REQ_new_process,
|
||||||
REQ_get_new_process_info,
|
REQ_get_new_process_info,
|
||||||
REQ_new_thread,
|
REQ_new_thread,
|
||||||
REQ_boot_done,
|
|
||||||
REQ_init_process,
|
REQ_init_process,
|
||||||
REQ_get_startup_info,
|
REQ_get_startup_info,
|
||||||
REQ_init_process_done,
|
REQ_init_process_done,
|
||||||
@ -3777,7 +3764,6 @@ union generic_request
|
|||||||
struct new_process_request new_process_request;
|
struct new_process_request new_process_request;
|
||||||
struct get_new_process_info_request get_new_process_info_request;
|
struct get_new_process_info_request get_new_process_info_request;
|
||||||
struct new_thread_request new_thread_request;
|
struct new_thread_request new_thread_request;
|
||||||
struct boot_done_request boot_done_request;
|
|
||||||
struct init_process_request init_process_request;
|
struct init_process_request init_process_request;
|
||||||
struct get_startup_info_request get_startup_info_request;
|
struct get_startup_info_request get_startup_info_request;
|
||||||
struct init_process_done_request init_process_done_request;
|
struct init_process_done_request init_process_done_request;
|
||||||
@ -3986,7 +3972,6 @@ union generic_reply
|
|||||||
struct new_process_reply new_process_reply;
|
struct new_process_reply new_process_reply;
|
||||||
struct get_new_process_info_reply get_new_process_info_reply;
|
struct get_new_process_info_reply get_new_process_info_reply;
|
||||||
struct new_thread_reply new_thread_reply;
|
struct new_thread_reply new_thread_reply;
|
||||||
struct boot_done_reply boot_done_reply;
|
|
||||||
struct init_process_reply init_process_reply;
|
struct init_process_reply init_process_reply;
|
||||||
struct get_startup_info_reply get_startup_info_reply;
|
struct get_startup_info_reply get_startup_info_reply;
|
||||||
struct init_process_done_reply init_process_done_reply;
|
struct init_process_done_reply init_process_done_reply;
|
||||||
@ -4189,6 +4174,6 @@ union generic_reply
|
|||||||
struct set_mailslot_info_reply set_mailslot_info_reply;
|
struct set_mailslot_info_reply set_mailslot_info_reply;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define SERVER_PROTOCOL_VERSION 184
|
#define SERVER_PROTOCOL_VERSION 185
|
||||||
|
|
||||||
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
|
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
|
||||||
|
@ -237,12 +237,6 @@ struct security_descriptor
|
|||||||
@END
|
@END
|
||||||
|
|
||||||
|
|
||||||
/* Signal that we are finished booting on the client side */
|
|
||||||
@REQ(boot_done)
|
|
||||||
int debug_level; /* new debug level */
|
|
||||||
@END
|
|
||||||
|
|
||||||
|
|
||||||
/* Initialize a process; called from the new process context */
|
/* Initialize a process; called from the new process context */
|
||||||
@REQ(init_process)
|
@REQ(init_process)
|
||||||
@REPLY
|
@REPLY
|
||||||
|
@ -106,7 +106,6 @@ inline static void set_reply_data_ptr( void *data, size_t size )
|
|||||||
DECL_HANDLER(new_process);
|
DECL_HANDLER(new_process);
|
||||||
DECL_HANDLER(get_new_process_info);
|
DECL_HANDLER(get_new_process_info);
|
||||||
DECL_HANDLER(new_thread);
|
DECL_HANDLER(new_thread);
|
||||||
DECL_HANDLER(boot_done);
|
|
||||||
DECL_HANDLER(init_process);
|
DECL_HANDLER(init_process);
|
||||||
DECL_HANDLER(get_startup_info);
|
DECL_HANDLER(get_startup_info);
|
||||||
DECL_HANDLER(init_process_done);
|
DECL_HANDLER(init_process_done);
|
||||||
@ -316,7 +315,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
|
|||||||
(req_handler)req_new_process,
|
(req_handler)req_new_process,
|
||||||
(req_handler)req_get_new_process_info,
|
(req_handler)req_get_new_process_info,
|
||||||
(req_handler)req_new_thread,
|
(req_handler)req_new_thread,
|
||||||
(req_handler)req_boot_done,
|
|
||||||
(req_handler)req_init_process,
|
(req_handler)req_init_process,
|
||||||
(req_handler)req_get_startup_info,
|
(req_handler)req_get_startup_info,
|
||||||
(req_handler)req_init_process_done,
|
(req_handler)req_init_process_done,
|
||||||
|
@ -109,7 +109,6 @@ static const struct fd_ops thread_fd_ops =
|
|||||||
};
|
};
|
||||||
|
|
||||||
static struct list thread_list = LIST_INIT(thread_list);
|
static struct list thread_list = LIST_INIT(thread_list);
|
||||||
static struct thread *booting_thread;
|
|
||||||
|
|
||||||
/* initialize the structure for a newly allocated thread */
|
/* initialize the structure for a newly allocated thread */
|
||||||
inline static void init_thread_structure( struct thread *thread )
|
inline static void init_thread_structure( struct thread *thread )
|
||||||
@ -169,12 +168,6 @@ struct thread *create_thread( int fd, struct process *process )
|
|||||||
thread->desktop = process->desktop;
|
thread->desktop = process->desktop;
|
||||||
if (!current) current = thread;
|
if (!current) current = thread;
|
||||||
|
|
||||||
if (!booting_thread) /* first thread ever */
|
|
||||||
{
|
|
||||||
booting_thread = thread;
|
|
||||||
lock_master_socket(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
list_add_head( &thread_list, &thread->entry );
|
list_add_head( &thread_list, &thread->entry );
|
||||||
|
|
||||||
if (!(thread->id = alloc_ptid( thread )))
|
if (!(thread->id = alloc_ptid( thread )))
|
||||||
@ -237,12 +230,6 @@ static void cleanup_thread( struct thread *thread )
|
|||||||
thread->reply_fd = NULL;
|
thread->reply_fd = NULL;
|
||||||
thread->wait_fd = NULL;
|
thread->wait_fd = NULL;
|
||||||
thread->desktop = 0;
|
thread->desktop = 0;
|
||||||
|
|
||||||
if (thread == booting_thread) /* killing booting thread */
|
|
||||||
{
|
|
||||||
booting_thread = NULL;
|
|
||||||
lock_master_socket(0);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* destroy a thread when its refcount is 0 */
|
/* destroy a thread when its refcount is 0 */
|
||||||
@ -817,16 +804,6 @@ struct token *thread_get_impersonation_token( struct thread *thread )
|
|||||||
return thread->process->token;
|
return thread->process->token;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* signal that we are finished booting on the client side */
|
|
||||||
DECL_HANDLER(boot_done)
|
|
||||||
{
|
|
||||||
if (current == booting_thread)
|
|
||||||
{
|
|
||||||
booting_thread = (struct thread *)~0UL; /* make sure it doesn't match other threads */
|
|
||||||
lock_master_socket(0); /* allow other clients now */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* create a new thread */
|
/* create a new thread */
|
||||||
DECL_HANDLER(new_thread)
|
DECL_HANDLER(new_thread)
|
||||||
{
|
{
|
||||||
|
@ -606,11 +606,6 @@ static void dump_new_thread_reply( const struct new_thread_reply *req )
|
|||||||
fprintf( stderr, " handle=%p", req->handle );
|
fprintf( stderr, " handle=%p", req->handle );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dump_boot_done_request( const struct boot_done_request *req )
|
|
||||||
{
|
|
||||||
fprintf( stderr, " debug_level=%d", req->debug_level );
|
|
||||||
}
|
|
||||||
|
|
||||||
static void dump_init_process_request( const struct init_process_request *req )
|
static void dump_init_process_request( const struct init_process_request *req )
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@ -3071,7 +3066,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
|
|||||||
(dump_func)dump_new_process_request,
|
(dump_func)dump_new_process_request,
|
||||||
(dump_func)dump_get_new_process_info_request,
|
(dump_func)dump_get_new_process_info_request,
|
||||||
(dump_func)dump_new_thread_request,
|
(dump_func)dump_new_thread_request,
|
||||||
(dump_func)dump_boot_done_request,
|
|
||||||
(dump_func)dump_init_process_request,
|
(dump_func)dump_init_process_request,
|
||||||
(dump_func)dump_get_startup_info_request,
|
(dump_func)dump_get_startup_info_request,
|
||||||
(dump_func)dump_init_process_done_request,
|
(dump_func)dump_init_process_done_request,
|
||||||
@ -3278,7 +3272,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
|
|||||||
(dump_func)dump_new_process_reply,
|
(dump_func)dump_new_process_reply,
|
||||||
(dump_func)dump_get_new_process_info_reply,
|
(dump_func)dump_get_new_process_info_reply,
|
||||||
(dump_func)dump_new_thread_reply,
|
(dump_func)dump_new_thread_reply,
|
||||||
(dump_func)0,
|
|
||||||
(dump_func)dump_init_process_reply,
|
(dump_func)dump_init_process_reply,
|
||||||
(dump_func)dump_get_startup_info_reply,
|
(dump_func)dump_get_startup_info_reply,
|
||||||
(dump_func)0,
|
(dump_func)0,
|
||||||
@ -3485,7 +3478,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
|
|||||||
"new_process",
|
"new_process",
|
||||||
"get_new_process_info",
|
"get_new_process_info",
|
||||||
"new_thread",
|
"new_thread",
|
||||||
"boot_done",
|
|
||||||
"init_process",
|
"init_process",
|
||||||
"get_startup_info",
|
"get_startup_info",
|
||||||
"init_process_done",
|
"init_process_done",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user