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

- Don't leak bitmaps in the CopyIcon call.

Browse source 
- Pass the call on, don't call straight into win32k

svn path=/trunk/; revision=31291
This commit is contained in:
Ged Murphy 2007-12-17 16:31:10 +00:00
parent c5d666d363
commit 1e284d22a4
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reactos/dll/win32/user32/windows/icon.c
View file

@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32);
/* FUNCTIONS *****************************************************************/
HICON
ICON_CreateIconFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cxDesired, int cyDesired, int xHotspot, int yHotspot)
{
@ -147,16 +148,19 @@ ICON_CreateCursorFromData(HDC hDC, PVOID ImageData, ICONIMAGE* IconImage, int cx
*/
HICON
STDCALL
CopyIcon(
HICON hIcon)
CopyIcon(HICON hIcon)
{
ICONINFO IconInfo;
HICON hRetIcon = NULL;
ICONINFO IconInfo;
if(GetIconInfo((HANDLE)hIcon, &IconInfo))
{
return NtUserCreateCursorIconHandle(&IconInfo, FALSE);
}
return (HICON)0;
if(GetIconInfo(hIcon, &IconInfo))
{
hRetIcon = CreateIconIndirect(&IconInfo);
DeleteObject(IconInfo.hbmColor);
DeleteObject(IconInfo.hbmMask);
}
return hRetIcon;
}