[PATCH 4/5] win32u: Introduce new next_user_handle_ptr helper.

[Rémi Bernon]

From: Rémi Bernon

And use it instead of next_thread_window_ptr.
---
 dlls/win32u/ntuser_private.h |  1 +
 dlls/win32u/window.c         | 49 ++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h
index 5c337c722a7..79c2a85c276 100644
--- a/dlls/win32u/ntuser_private.h
+++ b/dlls/win32u/ntuser_private.h
@@ -54,6 +54,7 @@ struct user_object

HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type ) DECLSPEC_HIDDEN;
 void *get_user_handle_ptr( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN;
+void *next_user_handle_ptr( HANDLE *handle, unsigned int type ) DECLSPEC_HIDDEN;
 void release_user_handle_ptr( void *ptr ) DECLSPEC_HIDDEN;
 void *free_user_handle( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN;

diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 4db9d99884c..ea65bff6cb4 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -101,6 +101,26 @@ void *get_user_handle_ptr( HANDLE handle, unsigned int type )
     return ptr;
 }

+/***********************************************************************
+ *           next_user_handle_ptr
+ */
+void *next_user_handle_ptr( HANDLE *handle, unsigned int type )
+{
+    struct user_object *ptr;
+    WORD index = *handle ? USER_HANDLE_TO_INDEX( *handle ) + 1 : 0;
+
+    user_lock();
+    while (index < NB_USER_HANDLES)
+    {
+        if (!(ptr = user_handles[index++])) continue;
+        if (ptr->type != type) continue;
+        *handle = ptr->handle;
+        return ptr;
+    }
+    user_unlock();
+    return NULL;
+}
+
 /***********************************************************************
  *           set_user_handle_ptr
  */
@@ -142,27 +162,6 @@ void *free_user_handle( HANDLE handle, unsigned int type )
     return ptr;
 }

-/***********************************************************************
- *           next_thread_window
- */
-static WND *next_thread_window_ptr( HWND *hwnd )
-{
-    struct user_object *ptr;
-    WND *win;
-    WORD index = *hwnd ? USER_HANDLE_TO_INDEX( *hwnd ) + 1 : 0;
-
-    while (index < NB_USER_HANDLES)
-    {
-        if (!(ptr = user_handles[index++])) continue;
-        if (ptr->type != NTUSER_OBJ_WINDOW) continue;
-        win = (WND *)ptr;
-        if (win->tid != GetCurrentThreadId()) continue;
-        *hwnd = ptr->handle;
-        return win;
-    }
-    return NULL;
-}
-
 /*******************************************************************
  *           get_hwnd_message_parent
  *
@@ -4846,13 +4845,15 @@ BOOL WINAPI NtUserDestroyWindow( HWND hwnd )
 void destroy_thread_windows(void)
 {
     WND *win, *free_list = NULL;
-    HWND hwnd = 0;
+    HANDLE handle = 0;

user_lock();
-    while ((win = next_thread_window_ptr( &hwnd )))
+    while ((win = next_user_handle_ptr( &handle, NTUSER_OBJ_WINDOW )))
     {
+        release_user_handle_ptr( win );
+        if (win->tid != GetCurrentThreadId()) continue;
         free_dce( win->dce, win->obj.handle );
-        set_user_handle_ptr( hwnd, NULL );
+        set_user_handle_ptr( handle, NULL );
         win->obj.handle = free_list;
         free_list = win;
     }