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

[0.4.5]

Browse source 
- Merge Giannis's imagelist leak fix from r74440/r74443.

svn path=/branches/ros-branch-0_4_5/; revision=74456
This commit is contained in:
Thomas Faber 2017-05-03 11:12:04 +00:00
parent adf25037a3
commit ec8e75d513
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/comctl32/imagelist.c
View file

@ -1444,6 +1444,9 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
HBRUSH hOldBrush;
POINT pt;
BOOL has_alpha;
#ifdef __REACTOS__
HDC hdcSaturated = NULL;
#endif
if (!pimldp || !(himl = pimldp->himl)) return FALSE;
if (!is_valid(himl)) return FALSE;
@ -1500,9 +1503,10 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
*/
if (fState & ILS_SATURATE)
{
hImageListDC = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y,
hdcSaturated = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y,
pt.x, pt.y, cx, cy, pimldp->rgbFg);
hImageListDC = hdcSaturated;
/* shitty way of getting subroutines to blit at the right place (top left corner),
as our modified imagelist only contains a single image for performance reasons */
pt.x = 0;
@ -1672,6 +1676,10 @@ end:
SetTextColor(hImageDC, oldImageFg);
SelectObject(hImageDC, hOldImageBmp);
cleanup:
#ifdef __REACTOS__
if (hdcSaturated)
DeleteDC(hdcSaturated);
#endif
DeleteObject(hBlendMaskBmp);
DeleteObject(hImageBmp);
DeleteDC(hImageDC);