[PATCH v2 9/9] server: Remove now unnecessary active_hooks from replies.

[Rémi Bernon]

From: Rémi Bernon

---
 server/hook.c       |  4 ----
 server/protocol.def |  4 ----
 server/queue.c      | 17 -----------------
 3 files changed, 25 deletions(-)

diff --git a/server/hook.c b/server/hook.c
index 3047f52492d..c2d2823cd61 100644
--- a/server/hook.c
+++ b/server/hook.c
@@ -486,7 +486,6 @@ DECL_HANDLER(set_hook)
                           req->flags, req->proc, req->unicode, module, module_size )))
     {
         reply->handle = hook->handle;
-        reply->active_hooks = get_active_hooks();
     }
     else free( module );

@@ -525,7 +524,6 @@ DECL_HANDLER(remove_hook)
     }

remove_hook( hook );
-    reply->active_hooks = get_active_hooks();
 }

@@ -542,8 +540,6 @@ DECL_HANDLER(start_hook_chain)
         return;
     }

-    reply->active_hooks = get_active_hooks();
-
     if (!table || !(hook = get_first_valid_hook( table, req->id - WH_MINHOOK, req->event,
                                                  req->window, req->object_id, req->child_id )))
     {
diff --git a/server/protocol.def b/server/protocol.def
index 5777f0c9482..0cd476ed2f5 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2225,7 +2225,6 @@ enum message_type
     int             x;         /* message x position */
     int             y;         /* message y position */
     unsigned int    time;      /* message time */
-    unsigned int    active_hooks; /* active hooks bitmap */
     data_size_t     total;     /* total size of extra data */
     VARARG(data,message_data); /* message data for sent messages */
 @END
@@ -3029,7 +3028,6 @@ enum caret_state
     VARARG(module,unicode_str);    /* module name */
 @REPLY
     user_handle_t  handle;         /* handle to the hook */
-    unsigned int   active_hooks;   /* active hooks bitmap */
 @END

@@ -3039,7 +3037,6 @@ enum caret_state
     client_ptr_t   proc;           /* hook procedure if handle is 0 */
     int            id;             /* id of the hook if handle is 0 */
 @REPLY
-    unsigned int   active_hooks;   /* active hooks bitmap */
 @END

@@ -3056,7 +3053,6 @@ enum caret_state
     thread_id_t    tid;            /* thread id for low-level keyboard/mouse hooks */
     int            unicode;        /* is it a unicode hook? */
     client_ptr_t   proc;           /* hook procedure */
-    unsigned int   active_hooks;   /* active hooks bitmap */
     VARARG(module,unicode_str);    /* module name */
 @END

diff --git a/server/queue.c b/server/queue.c
index 6a40b8c0b95..af76172d2e8 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -639,21 +639,6 @@ void set_queue_hooks( struct thread *thread, struct hook_table *hooks )
     queue->hooks = hooks;
 }

-/* get the thread message queue active hooks bitmap */
-unsigned int get_active_hooks(void)
-{
-    unsigned int ret = 1u << 31;  /* set high bit to indicate that the bitmap is valid */
-    struct msg_queue *queue;
-    int bit;
-
-    if (!(queue = current->queue)) return ret;
-
-    for (bit = 0; bit < ARRAY_SIZE(queue->shared->hooks_count); bit++)
-        if (queue->shared->hooks_count[bit]) ret |= 1 << bit;
-
-    return ret;
-}
-
 /* update the thread message queue hooks counters */
 void add_queue_hook_count( struct thread *thread, unsigned int index, int count )
 {
@@ -3129,8 +3114,6 @@ DECL_HANDLER(get_message)
     user_handle_t get_win = get_user_full_handle( req->get_win );
     unsigned int filter = req->flags >> 16;

-    reply->active_hooks = get_active_hooks();
-
     if (get_win && get_win != 1 && get_win != -1 && !get_user_object( get_win, USER_WINDOW ))
     {
         set_win32_error( ERROR_INVALID_WINDOW_HANDLE );