Removed the cleanup_window_queue request.

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 */

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 */

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 */

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)
 {

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,

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",

windows/queue.c

@@ -440,22 +440,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)
  */
 HTASK16 WINAPI GetWindowTask16( HWND16 hwnd )