[PATCH 1/1] server: Destroy global hook table in desktop_close_handle().

[Paul Gofman]

From: Paul Gofman

---
 server/winstation.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/winstation.c b/server/winstation.c
index b3746090ccf..6c243f809c1 100644
--- a/server/winstation.c
+++ b/server/winstation.c
@@ -369,12 +369,19 @@ static int desktop_link_name( struct object *obj, struct object_name *name, stru

static int desktop_close_handle( struct object *obj, struct process *process, obj_handle_t handle )
 {
+    struct desktop *desktop = (struct desktop *)obj;
     struct thread *thread;

/* check if the handle is currently used by the process or one of its threads */
     if (process->desktop == handle) return 0;
     LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry )
         if (thread->desktop == handle) return 0;
+
+    if (desktop->obj.handle_count == 1 && desktop->global_hooks)
+    {
+        release_object( desktop->global_hooks );
+        desktop->global_hooks = NULL;
+    }
     return 1;
 }

@@ -397,7 +404,6 @@ static void desktop_destroy( struct object *obj )
     free_pointers( desktop );
     if (desktop->top_window) free_window_handle( desktop->top_window );
     if (desktop->msg_window) free_window_handle( desktop->msg_window );
-    if (desktop->global_hooks) release_object( desktop->global_hooks );
     if (desktop->close_timeout) remove_timeout_user( desktop->close_timeout );
     if (desktop->key_repeat.timeout) remove_timeout_user( desktop->key_repeat.timeout );
     release_object( desktop->winstation );