Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-01 18:43:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] proper fix for CID 1321923, 1321924

Browse source 
svn path=/trunk/; revision=68924
This commit is contained in:
Christoph von Wittich 2015-09-03 07:01:29 +00:00
parent 831d7c9721
commit 818c6c4afc
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
reactos/base/shell/explorer/traywnd.cpp
View file

@ -190,7 +190,7 @@ DefSize:
HDC hDC = NULL;
HDC hDCScreen = NULL;
SIZE Size, SmallIcon;
HBITMAP hbmpOld;
HBITMAP hbmpOld, hbmp = NULL;
HBITMAP hBitmap = NULL;
HICON hIconStart;
BOOL Ret;
@ -243,10 +243,10 @@ DefSize:
Size.cy = max(Size.cy, SmallIcon.cy);
/* Create the bitmap */
hBitmap = CreateCompatibleBitmap(hDCScreen,
hbmp = CreateCompatibleBitmap(hDCScreen,
Size.cx,
Size.cy);
if (hBitmap == NULL)
if (hbmp == NULL)
goto Cleanup;
/* Caluclate the button rect */
@ -256,13 +256,13 @@ DefSize:
rcButton.bottom = Size.cy;
/* Draw the button */
hbmpOld = (HBITMAP) SelectObject(hDC, hBitmap);
hbmpOld = (HBITMAP) SelectObject(hDC, hbmp);
Flags = DC_TEXT | DC_INBUTTON;
if (hIconStart != NULL)
Flags |= DC_ICON;
DrawCaptionTemp(NULL,
Ret = DrawCaptionTemp(NULL,
hDC,
&rcButton,
m_Font,
@ -275,12 +275,19 @@ DefSize:
if (!Ret)
goto Cleanup;
/* We successfully created the bitmap! */
hBitmap = hbmp;
hbmp = NULL;
Cleanup:
if (hDCScreen != NULL)
{
::ReleaseDC(NULL, hDCScreen);
}
if (hbmp != NULL)
DeleteObject(hbmp);
if (hDC != NULL)
DeleteDC(hDC);