server: Rename the wait_input_idle request to better reflect what it does.
Also get rid of the unused timeout field.
This commit is contained in:
parent
40723f795b
commit
ce40ef18df
|
@ -3181,10 +3181,9 @@ DWORD WINAPI WaitForInputIdle( HANDLE hProcess, DWORD dwTimeOut )
|
||||||
DWORD start_time, elapsed, ret;
|
DWORD start_time, elapsed, ret;
|
||||||
HANDLE idle_event = (HANDLE)-1;
|
HANDLE idle_event = (HANDLE)-1;
|
||||||
|
|
||||||
SERVER_START_REQ( wait_input_idle )
|
SERVER_START_REQ( get_process_idle_event )
|
||||||
{
|
{
|
||||||
req->handle = hProcess;
|
req->handle = hProcess;
|
||||||
req->timeout = dwTimeOut;
|
|
||||||
if (!(ret = wine_server_call_err( req ))) idle_event = reply->event;
|
if (!(ret = wine_server_call_err( req ))) idle_event = reply->event;
|
||||||
}
|
}
|
||||||
SERVER_END_REQ;
|
SERVER_END_REQ;
|
||||||
|
|
|
@ -2176,13 +2176,12 @@ struct get_queue_status_reply
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
struct wait_input_idle_request
|
struct get_process_idle_event_request
|
||||||
{
|
{
|
||||||
struct request_header __header;
|
struct request_header __header;
|
||||||
obj_handle_t handle;
|
obj_handle_t handle;
|
||||||
int timeout;
|
|
||||||
};
|
};
|
||||||
struct wait_input_idle_reply
|
struct get_process_idle_event_reply
|
||||||
{
|
{
|
||||||
struct reply_header __header;
|
struct reply_header __header;
|
||||||
obj_handle_t event;
|
obj_handle_t event;
|
||||||
|
@ -3853,7 +3852,7 @@ enum request
|
||||||
REQ_get_msg_queue,
|
REQ_get_msg_queue,
|
||||||
REQ_set_queue_mask,
|
REQ_set_queue_mask,
|
||||||
REQ_get_queue_status,
|
REQ_get_queue_status,
|
||||||
REQ_wait_input_idle,
|
REQ_get_process_idle_event,
|
||||||
REQ_send_message,
|
REQ_send_message,
|
||||||
REQ_post_quit_message,
|
REQ_post_quit_message,
|
||||||
REQ_get_message,
|
REQ_get_message,
|
||||||
|
@ -4073,7 +4072,7 @@ union generic_request
|
||||||
struct get_msg_queue_request get_msg_queue_request;
|
struct get_msg_queue_request get_msg_queue_request;
|
||||||
struct set_queue_mask_request set_queue_mask_request;
|
struct set_queue_mask_request set_queue_mask_request;
|
||||||
struct get_queue_status_request get_queue_status_request;
|
struct get_queue_status_request get_queue_status_request;
|
||||||
struct wait_input_idle_request wait_input_idle_request;
|
struct get_process_idle_event_request get_process_idle_event_request;
|
||||||
struct send_message_request send_message_request;
|
struct send_message_request send_message_request;
|
||||||
struct post_quit_message_request post_quit_message_request;
|
struct post_quit_message_request post_quit_message_request;
|
||||||
struct get_message_request get_message_request;
|
struct get_message_request get_message_request;
|
||||||
|
@ -4291,7 +4290,7 @@ union generic_reply
|
||||||
struct get_msg_queue_reply get_msg_queue_reply;
|
struct get_msg_queue_reply get_msg_queue_reply;
|
||||||
struct set_queue_mask_reply set_queue_mask_reply;
|
struct set_queue_mask_reply set_queue_mask_reply;
|
||||||
struct get_queue_status_reply get_queue_status_reply;
|
struct get_queue_status_reply get_queue_status_reply;
|
||||||
struct wait_input_idle_reply wait_input_idle_reply;
|
struct get_process_idle_event_reply get_process_idle_event_reply;
|
||||||
struct send_message_reply send_message_reply;
|
struct send_message_reply send_message_reply;
|
||||||
struct post_quit_message_reply post_quit_message_reply;
|
struct post_quit_message_reply post_quit_message_reply;
|
||||||
struct get_message_reply get_message_reply;
|
struct get_message_reply get_message_reply;
|
||||||
|
@ -4386,6 +4385,6 @@ union generic_reply
|
||||||
struct query_symlink_reply query_symlink_reply;
|
struct query_symlink_reply query_symlink_reply;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define SERVER_PROTOCOL_VERSION 240
|
#define SERVER_PROTOCOL_VERSION 241
|
||||||
|
|
||||||
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
|
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */
|
||||||
|
|
|
@ -1040,9 +1040,8 @@ DECL_HANDLER(get_dll_info)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* wait for a process to start waiting on input */
|
/* retrieve the process idle event */
|
||||||
/* FIXME: only returns event for now, wait is done in the client */
|
DECL_HANDLER(get_process_idle_event)
|
||||||
DECL_HANDLER(wait_input_idle)
|
|
||||||
{
|
{
|
||||||
struct process *process;
|
struct process *process;
|
||||||
|
|
||||||
|
|
|
@ -1554,10 +1554,9 @@ enum char_info_mode
|
||||||
@END
|
@END
|
||||||
|
|
||||||
|
|
||||||
/* Wait for a process to start waiting on input */
|
/* Retrieve the process idle event */
|
||||||
@REQ(wait_input_idle)
|
@REQ(get_process_idle_event)
|
||||||
obj_handle_t handle; /* process handle */
|
obj_handle_t handle; /* process handle */
|
||||||
int timeout; /* timeout */
|
|
||||||
@REPLY
|
@REPLY
|
||||||
obj_handle_t event; /* handle to idle event */
|
obj_handle_t event; /* handle to idle event */
|
||||||
@END
|
@END
|
||||||
|
|
|
@ -230,7 +230,7 @@ DECL_HANDLER(init_atom_table);
|
||||||
DECL_HANDLER(get_msg_queue);
|
DECL_HANDLER(get_msg_queue);
|
||||||
DECL_HANDLER(set_queue_mask);
|
DECL_HANDLER(set_queue_mask);
|
||||||
DECL_HANDLER(get_queue_status);
|
DECL_HANDLER(get_queue_status);
|
||||||
DECL_HANDLER(wait_input_idle);
|
DECL_HANDLER(get_process_idle_event);
|
||||||
DECL_HANDLER(send_message);
|
DECL_HANDLER(send_message);
|
||||||
DECL_HANDLER(post_quit_message);
|
DECL_HANDLER(post_quit_message);
|
||||||
DECL_HANDLER(get_message);
|
DECL_HANDLER(get_message);
|
||||||
|
@ -449,7 +449,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] =
|
||||||
(req_handler)req_get_msg_queue,
|
(req_handler)req_get_msg_queue,
|
||||||
(req_handler)req_set_queue_mask,
|
(req_handler)req_set_queue_mask,
|
||||||
(req_handler)req_get_queue_status,
|
(req_handler)req_get_queue_status,
|
||||||
(req_handler)req_wait_input_idle,
|
(req_handler)req_get_process_idle_event,
|
||||||
(req_handler)req_send_message,
|
(req_handler)req_send_message,
|
||||||
(req_handler)req_post_quit_message,
|
(req_handler)req_post_quit_message,
|
||||||
(req_handler)req_get_message,
|
(req_handler)req_get_message,
|
||||||
|
|
|
@ -2067,13 +2067,12 @@ static void dump_get_queue_status_reply( const struct get_queue_status_reply *re
|
||||||
fprintf( stderr, " changed_bits=%08x", req->changed_bits );
|
fprintf( stderr, " changed_bits=%08x", req->changed_bits );
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dump_wait_input_idle_request( const struct wait_input_idle_request *req )
|
static void dump_get_process_idle_event_request( const struct get_process_idle_event_request *req )
|
||||||
{
|
{
|
||||||
fprintf( stderr, " handle=%p,", req->handle );
|
fprintf( stderr, " handle=%p", req->handle );
|
||||||
fprintf( stderr, " timeout=%d", req->timeout );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void dump_wait_input_idle_reply( const struct wait_input_idle_reply *req )
|
static void dump_get_process_idle_event_reply( const struct get_process_idle_event_reply *req )
|
||||||
{
|
{
|
||||||
fprintf( stderr, " event=%p", req->event );
|
fprintf( stderr, " event=%p", req->event );
|
||||||
}
|
}
|
||||||
|
@ -3389,7 +3388,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = {
|
||||||
(dump_func)dump_get_msg_queue_request,
|
(dump_func)dump_get_msg_queue_request,
|
||||||
(dump_func)dump_set_queue_mask_request,
|
(dump_func)dump_set_queue_mask_request,
|
||||||
(dump_func)dump_get_queue_status_request,
|
(dump_func)dump_get_queue_status_request,
|
||||||
(dump_func)dump_wait_input_idle_request,
|
(dump_func)dump_get_process_idle_event_request,
|
||||||
(dump_func)dump_send_message_request,
|
(dump_func)dump_send_message_request,
|
||||||
(dump_func)dump_post_quit_message_request,
|
(dump_func)dump_post_quit_message_request,
|
||||||
(dump_func)dump_get_message_request,
|
(dump_func)dump_get_message_request,
|
||||||
|
@ -3605,7 +3604,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = {
|
||||||
(dump_func)dump_get_msg_queue_reply,
|
(dump_func)dump_get_msg_queue_reply,
|
||||||
(dump_func)dump_set_queue_mask_reply,
|
(dump_func)dump_set_queue_mask_reply,
|
||||||
(dump_func)dump_get_queue_status_reply,
|
(dump_func)dump_get_queue_status_reply,
|
||||||
(dump_func)dump_wait_input_idle_reply,
|
(dump_func)dump_get_process_idle_event_reply,
|
||||||
(dump_func)0,
|
(dump_func)0,
|
||||||
(dump_func)0,
|
(dump_func)0,
|
||||||
(dump_func)dump_get_message_reply,
|
(dump_func)dump_get_message_reply,
|
||||||
|
@ -3821,7 +3820,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = {
|
||||||
"get_msg_queue",
|
"get_msg_queue",
|
||||||
"set_queue_mask",
|
"set_queue_mask",
|
||||||
"get_queue_status",
|
"get_queue_status",
|
||||||
"wait_input_idle",
|
"get_process_idle_event",
|
||||||
"send_message",
|
"send_message",
|
||||||
"post_quit_message",
|
"post_quit_message",
|
||||||
"get_message",
|
"get_message",
|
||||||
|
|
Loading…
Reference in New Issue