[PATCH 1/5] win32u: Don't call CopyImage with user lock in NtUserRegisterClassExWOW.

[Jacek Caban]

From: Jacek Caban <jacek at codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53082
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
---
 dlls/win32u/class.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c
index 1a6c92edc3a..320a1509a53 100644
--- a/dlls/win32u/class.c
+++ b/dlls/win32u/class.c
@@ -358,6 +358,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
 {
     const BOOL is_builtin = fnid, ansi = flags;
     HINSTANCE instance;
+    HICON sm_icon = 0;
     CLASS *class;
     ATOM atom;
     BOOL ret;
@@ -427,6 +428,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
     }
 
     /* Other non-null values must be set by caller */
+    if (wc->hIcon && !wc->hIconSm)
+        sm_icon = CopyImage( wc->hIcon, IMAGE_ICON,
+                             get_system_metrics( SM_CXSMICON ),
+                             get_system_metrics( SM_CYSMICON ),
+                             LR_COPYFROMRESOURCE );
 
     user_lock();
     if (class->local) list_add_head( &class_list, &class->entry );
@@ -440,15 +446,11 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam
 
     class->hIcon         = wc->hIcon;
     class->hIconSm       = wc->hIconSm;
+    class->hIconSmIntern = sm_icon;
     class->hCursor       = wc->hCursor;
     class->hbrBackground = wc->hbrBackground;
     class->winproc       = alloc_winproc( wc->lpfnWndProc, ansi );
     if (client_menu_name) class->menu_name = *client_menu_name;
-    if (wc->hIcon && !wc->hIconSm)
-        class->hIconSmIntern = CopyImage( wc->hIcon, IMAGE_ICON,
-                                          get_system_metrics( SM_CXSMICON ),
-                                          get_system_metrics( SM_CYSMICON ),
-                                          LR_COPYFROMRESOURCE );
     release_class_ptr( class );
     return atom;
 }
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/204