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

[KBSWITCH] Follow-up of 0991ced

Browse source 
- Used FW_NORMAL.
- Added NULL checks.
CORE-10667
This commit is contained in:
Katayama Hirofumi MZ 2022-08-25 14:19:50 +09:00
parent c7ba53e3fb
commit 261416ddb9
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
base/applications/kbswitch/kbswitch.c
View file

@ -169,13 +169,31 @@ CreateTrayIcon(LPTSTR szLCID)
hdc = CreateCompatibleDC(NULL);
hbmColor = CreateCompatibleBitmap(hdc, CX_ICON, CY_ICON);
hbmMono = CreateBitmap(CX_ICON, CY_ICON, 1, 1, NULL);
if (!hdc || !hbmColor || !hbmMono)
{
if (hdc)
DeleteDC(hdc);
if (hbmColor)
DeleteObject(hbmColor);
if (hbmMono)
DeleteObject(hbmMono);
return NULL;
}
/* Create a font */
ZeroMemory(&lf, sizeof(lf));
lf.lfHeight = -11;
lf.lfCharSet = ANSI_CHARSET;
lf.lfWeight = FW_NORMAL;
StringCchCopy(lf.lfFaceName, ARRAYSIZE(lf.lfFaceName), _T("Tahoma"));
hFont = CreateFontIndirect(&lf);
if (!hFont)
{
DeleteDC(hdc);
DeleteObject(hbmColor);
DeleteObject(hbmMono);
return NULL;
}
SetRect(&rect, 0, 0, CX_ICON, CY_ICON);