Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 18:54:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K]

Browse source 
- Properly free classes small icon handles
 - Do not use LR_SHARED when copying them from the large icon. There's no reason for them to outlive the class.
Should fix remaining failures in user32:class that I introduced.

svn path=/trunk/; revision=64939
This commit is contained in:
Jérôme Gardou 2014-10-23 19:41:52 +00:00
parent 25c228cd3f
commit 3ef4731492
2 changed files with 65 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
reactos/win32ss/user/ntuser/class.c
View file

@ -9,7 +9,6 @@
#include <win32k.h>
DBG_DEFAULT_CHANNEL(UserClass);
BOOL FASTCALL IntClassDestroyIcon(HANDLE hCurIcon);
static NTSTATUS IntDeregisterClassAtom(IN RTL_ATOM Atom);
REGISTER_SYSCLASS DefaultServerClasses[] =
@ -251,7 +250,13 @@ IntDestroyClass(IN OUT PCLS Class)
if (Class->spcur)
UserDereferenceObject(Class->spcur);
if (Class->spicnSm)
{
UserDereferenceObject(Class->spicnSm);
/* Destroy the icon if we own it */
if ((Class->CSF_flags & CSF_CACHEDSMICON)
&& !(UserObjectInDestroy(UserHMGetHandle(Class->spicnSm))))
IntDestroyCurIconObject(Class->spicnSm);
}
#else
if (Class->hIconSmIntern)
IntClassDestroyIcon(Class->hIconSmIntern);
@ -1969,6 +1974,7 @@ UserSetClassLongPtr(IN PCLS Class,
{
/* We will change the small icon */
UserDereferenceObject(Class->spicnSm);
IntDestroyCurIconObject(Class->spicnSm);
Class->spicnSm = NULL;
Class->CSF_flags &= ~CSF_CACHEDSMICON;
}
@ -1985,7 +1991,7 @@ UserSetClassLongPtr(IN PCLS Class,
IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ),
LR_COPYFROMRESOURCE | LR_SHARED);
LR_COPYFROMRESOURCE);
}
if (!SmallIconHandle)
{
@ -1995,7 +2001,7 @@ UserSetClassLongPtr(IN PCLS Class,
IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ),
LR_SHARED);
0);
}
if (SmallIconHandle)
{
@ -2062,6 +2068,7 @@ UserSetClassLongPtr(IN PCLS Class,
#ifdef NEW_CURSORICON
{
PCURICON_OBJECT NewSmallIcon = NULL;
BOOLEAN NewIconFromCache = FALSE;
if (NewLong)
{
@ -2072,10 +2079,54 @@ UserSetClassLongPtr(IN PCLS Class,
return 0;
}
}
else
{
/* Create the new small icon from the large one */
HICON SmallIconHandle = NULL;
if((Class->spicn->CURSORF_flags & (CURSORF_LRSHARED | CURSORF_FROMRESOURCE))
== (CURSORF_LRSHARED | CURSORF_FROMRESOURCE))
{
SmallIconHandle = co_IntCopyImage(
UserHMGetHandle(Class->spicn),
IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ),
LR_COPYFROMRESOURCE);
}
if (!SmallIconHandle)
{
/* Retry without copying from resource */
SmallIconHandle = co_IntCopyImage(
UserHMGetHandle(Class->spicn),
IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ),
0);
}
if (SmallIconHandle)
{
/* So use it */
NewSmallIcon = UserGetCurIconObject(SmallIconHandle);
NewIconFromCache = TRUE;
}
else
{
ERR("Failed getting a small icon for the class.\n");
}
}
if (Class->spicnSm)
{
Ret = (ULONG_PTR)UserHMGetHandle(Class->spicnSm);
if (Class->CSF_flags & CSF_CACHEDSMICON)
{
/* We must destroy the icon if we own it */
IntDestroyCurIconObject(Class->spicnSm);
Ret = 0;
}
else
{
Ret = (ULONG_PTR)UserHMGetHandle(Class->spicnSm);
}
UserDereferenceObject(Class->spicnSm);
}
else
@ -2083,7 +2134,10 @@ UserSetClassLongPtr(IN PCLS Class,
Ret = 0;
}
Class->CSF_flags &= ~CSF_CACHEDSMICON;
if (NewIconFromCache)
Class->CSF_flags |= CSF_CACHEDSMICON;
else
Class->CSF_flags &= ~CSF_CACHEDSMICON;
Class->spicnSm = NewSmallIcon;
/* Update the clones */
@ -2094,7 +2148,10 @@ UserSetClassLongPtr(IN PCLS Class,
UserDereferenceObject(Class->spicnSm);
if (NewSmallIcon)
UserReferenceObject(NewSmallIcon);
Class->CSF_flags &= ~CSF_CACHEDSMICON;
if (NewIconFromCache)
Class->CSF_flags |= CSF_CACHEDSMICON;
else
Class->CSF_flags &= ~CSF_CACHEDSMICON;
Class->spicnSm = NewSmallIcon;
Class = Class->pclsNext;
}

4
reactos/win32ss/user/ntuser/window.c
View file

@ -1686,7 +1686,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ),
LR_COPYFROMRESOURCE | LR_SHARED);
LR_COPYFROMRESOURCE);
}
if (!IconSmHandle)
{
@ -1696,7 +1696,7 @@ PWND FASTCALL IntCreateWindow(CREATESTRUCTW* Cs,
IMAGE_ICON,
UserGetSystemMetrics( SM_CXSMICON ),
UserGetSystemMetrics( SM_CYSMICON ),
LR_SHARED);
0);
}
if (IconSmHandle)