Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win32SS]

Browse source 
- Patch by Katayama Hirofumi MZ : Improves NC_IconForWindow function. See CORE-12129.

svn path=/trunk/; revision=73334
This commit is contained in:
James Tabor 2016-11-22 04:46:58 +00:00
parent 20637bd50c
commit b45fe0d55c
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/win32ss/user/ntuser/nonclient.c
View file

@ -613,11 +613,6 @@ PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND pWnd )
PCURICON_OBJECT pIcon = NULL;
HICON hIcon;
//FIXME: Some callers use this function as if it returns a boolean saying "this window has an icon".
//FIXME: Hence we must return a pointer with no reference count.
//FIXME: This is bad and we should feel bad.
//FIXME: Stop whining over wine code.
hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE);
if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp, TRUE);
@ -636,11 +631,9 @@ PCURICON_OBJECT FASTCALL NC_IconForWindow( PWND pWnd )
}
if (hIcon)
{
pIcon = UserGetCurIconObject(hIcon);
if (pIcon)
{
UserDereferenceObject(pIcon);
}
pIcon = (PCURICON_OBJECT)UserGetObjectNoErr(gHandleTable,
hIcon,
TYPE_CURSOR);
}
return pIcon;
}