From 003f02b733fec1d970959c9877e7d5cbb049d64e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 11 Oct 2001 20:50:10 +0000 Subject: [PATCH] Removed the cleanup_window_queue request. --- include/queue.h | 1 - include/wine/server_protocol.h | 12 +----------- server/protocol.def | 6 ------ server/queue.c | 7 ------- server/request.h | 2 -- server/trace.c | 8 -------- windows/queue.c | 16 ---------------- 7 files changed, 1 insertion(+), 51 deletions(-) diff --git a/include/queue.h b/include/queue.h index 2c94c731397..baf84ffc547 100644 --- a/include/queue.h +++ b/include/queue.h @@ -72,6 +72,5 @@ extern void QUEUE_Unlock( MESSAGEQUEUE *queue ); extern BOOL QUEUE_IsExitingQueue( HQUEUE16 hQueue ); extern void QUEUE_SetExitingQueue( HQUEUE16 hQueue ); extern void QUEUE_DeleteMsgQueue(void); -extern void QUEUE_CleanupWindow( HWND hwnd ); #endif /* __WINE_QUEUE_H */ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index c68f53c0030..1101a4774dd 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1420,14 +1420,6 @@ struct get_message_reply_request -struct cleanup_window_queue_request -{ - struct request_header __header; - user_handle_t win; -}; - - - struct set_win_timer_request { struct request_header __header; @@ -1763,7 +1755,6 @@ enum request REQ_get_message, REQ_reply_message, REQ_get_message_reply, - REQ_cleanup_window_queue, REQ_set_win_timer, REQ_kill_win_timer, REQ_create_serial, @@ -1900,7 +1891,6 @@ union generic_request struct get_message_request get_message; struct reply_message_request reply_message; struct get_message_reply_request get_message_reply; - struct cleanup_window_queue_request cleanup_window_queue; struct set_win_timer_request set_win_timer; struct kill_win_timer_request kill_win_timer; struct create_serial_request create_serial; @@ -1922,6 +1912,6 @@ union generic_request struct get_window_tree_request get_window_tree; }; -#define SERVER_PROTOCOL_VERSION 56 +#define SERVER_PROTOCOL_VERSION 57 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index c5122ba2e00..d19e694b924 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1272,12 +1272,6 @@ enum message_type @END -/* Cleanup a queue when a window is deleted */ -@REQ(cleanup_window_queue) - user_handle_t win; /* window handle */ -@END - - /* Set a window timer */ @REQ(set_win_timer) user_handle_t win; /* window handle */ diff --git a/server/queue.c b/server/queue.c index 4e0332b6aa6..4cf92e0b52a 100644 --- a/server/queue.c +++ b/server/queue.c @@ -985,13 +985,6 @@ DECL_HANDLER(get_message_reply) } -/* cleanup a queue when a window is deleted */ -DECL_HANDLER(cleanup_window_queue) -{ - queue_cleanup_window( current, get_user_full_handle(req->win) ); -} - - /* set a window timer */ DECL_HANDLER(set_win_timer) { diff --git a/server/request.h b/server/request.h index c4530b539f8..1269e174ef9 100644 --- a/server/request.h +++ b/server/request.h @@ -175,7 +175,6 @@ DECL_HANDLER(send_message); DECL_HANDLER(get_message); DECL_HANDLER(reply_message); DECL_HANDLER(get_message_reply); -DECL_HANDLER(cleanup_window_queue); DECL_HANDLER(set_win_timer); DECL_HANDLER(kill_win_timer); DECL_HANDLER(create_serial); @@ -311,7 +310,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_get_message, (req_handler)req_reply_message, (req_handler)req_get_message_reply, - (req_handler)req_cleanup_window_queue, (req_handler)req_set_win_timer, (req_handler)req_kill_win_timer, (req_handler)req_create_serial, diff --git a/server/trace.c b/server/trace.c index 90d572dad9d..58861edf939 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1531,11 +1531,6 @@ static void dump_get_message_reply_reply( const struct get_message_reply_request cur_pos += dump_varargs_bytes( req ); } -static void dump_cleanup_window_queue_request( const struct cleanup_window_queue_request *req ) -{ - fprintf( stderr, " win=%08x", req->win ); -} - static void dump_set_win_timer_request( const struct set_win_timer_request *req ) { fprintf( stderr, " win=%08x,", req->win ); @@ -1859,7 +1854,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_message_request, (dump_func)dump_reply_message_request, (dump_func)dump_get_message_reply_request, - (dump_func)dump_cleanup_window_queue_request, (dump_func)dump_set_win_timer_request, (dump_func)dump_kill_win_timer_request, (dump_func)dump_create_serial_request, @@ -1994,7 +1988,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_get_message_reply_reply, (dump_func)0, (dump_func)0, - (dump_func)0, (dump_func)dump_create_serial_reply, (dump_func)dump_get_serial_info_reply, (dump_func)0, @@ -2125,7 +2118,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "get_message", "reply_message", "get_message_reply", - "cleanup_window_queue", "set_win_timer", "kill_win_timer", "create_serial", diff --git a/windows/queue.c b/windows/queue.c index b9585209cb5..0e788c2cc5f 100644 --- a/windows/queue.c +++ b/windows/queue.c @@ -439,22 +439,6 @@ void QUEUE_DeleteMsgQueue(void) } -/*********************************************************************** - * QUEUE_CleanupWindow - * - * Cleanup the queue to account for a window being deleted. - */ -void QUEUE_CleanupWindow( HWND hwnd ) -{ - SERVER_START_REQ( cleanup_window_queue ) - { - req->win = hwnd; - SERVER_CALL(); - } - SERVER_END_REQ; -} - - /*********************************************************************** * GetWindowTask (USER.224) */