system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

win32u: Don't call CopyImage with user lock in set_class_long.

Browse source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
This commit is contained in:
Jacek Caban 2022-06-07 21:27:58 +02:00 committed by Alexandre Julliard
parent 40cda88021
commit db8f643756
1 changed files with 48 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
dlls/win32u/class.c
View file

@ -647,6 +647,7 @@ static BOOL set_server_info( HWND hwnd, INT offset, LONG_PTR newval, UINT size )
static ULONG_PTR set_class_long( HWND hwnd, INT offset, LONG_PTR newval, UINT size, BOOL ansi )
{
ULONG_PTR retval = 0;
HICON small_icon = 0;
CLASS *class;
if (!(class = get_class_ptr( hwnd, TRUE ))) return 0;
@ -696,31 +697,62 @@ static ULONG_PTR set_class_long( HWND hwnd, INT offset, LONG_PTR newval, UINT si
break;
case GCLP_HICON:
retval = (ULONG_PTR)class->hIcon;
if (class->hIconSmIntern)
{
NtUserDestroyCursor( class->hIconSmIntern, 0 );
class->hIconSmIntern = NULL;
}
if (retval == newval) break;
if (newval && !class->hIconSm)
class->hIconSmIntern = CopyImage( (HICON)newval, IMAGE_ICON,
get_system_metrics( SM_CXSMICON ),
get_system_metrics( SM_CYSMICON ),
LR_COPYFROMRESOURCE );
{
release_class_ptr( class );
small_icon = CopyImage( (HICON)newval, IMAGE_ICON,
get_system_metrics( SM_CXSMICON ),
get_system_metrics( SM_CYSMICON ),
LR_COPYFROMRESOURCE );
if (!(class = get_class_ptr( hwnd, TRUE )))
{
NtUserDestroyCursor( small_icon, 0 );
return 0;
}
if (retval != HandleToUlong( class->hIcon ) || class->hIconSm)
{
/* someone beat us, restart */
release_class_ptr( class );
NtUserDestroyCursor( small_icon, 0 );
return set_class_long( hwnd, offset, newval, size, ansi );
}
}
if (class->hIconSmIntern) NtUserDestroyCursor( class->hIconSmIntern, 0 );
class->hIcon = (HICON)newval;
class->hIconSmIntern = small_icon;
break;
case GCLP_HICONSM:
retval = (ULONG_PTR)class->hIconSm;
if (retval == newval) break;
if (retval && !newval && class->hIcon)
class->hIconSmIntern = CopyImage( class->hIcon, IMAGE_ICON,
get_system_metrics( SM_CXSMICON ),
get_system_metrics( SM_CYSMICON ),
LR_COPYFROMRESOURCE );
else if (newval && class->hIconSmIntern)
{
NtUserDestroyCursor( class->hIconSmIntern, 0 );
class->hIconSmIntern = NULL;
HICON icon = class->hIcon;
release_class_ptr( class );
small_icon = CopyImage( icon, IMAGE_ICON,
get_system_metrics( SM_CXSMICON ),
get_system_metrics( SM_CYSMICON ),
LR_COPYFROMRESOURCE );
if (!(class = get_class_ptr( hwnd, TRUE )))
{
NtUserDestroyCursor( small_icon, 0 );
return 0;
}
if (class->hIcon != icon || !class->hIconSm)
{
/* someone beat us, restart */
release_class_ptr( class );
NtUserDestroyCursor( small_icon, 0 );
return set_class_long( hwnd, offset, newval, size, ansi );
}
}
if (class->hIconSmIntern) NtUserDestroyCursor( class->hIconSmIntern, 0 );
class->hIconSm = (HICON)newval;
class->hIconSmIntern = small_icon;
break;
case GCL_STYLE:
if (!set_server_info( hwnd, offset, newval, size )) break;