Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix some resource leaks

Browse source 
svn path=/trunk/; revision=36341
This commit is contained in:
Christoph von Wittich 2008-09-20 09:05:24 +00:00
parent 29dc95eb08
commit 1e89fe22e0
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/base/applications/kbswitch/kbswitch.c
View file

@ -34,7 +34,7 @@ CreateTrayIcon(LPTSTR szLCID)
HBITMAP hBitmap, hBmpNew, hBmpOld; HBITMAP hBitmap, hBmpNew, hBmpOld;
RECT rect; RECT rect;
DWORD bkColor, bkText; DWORD bkColor, bkText;
HFONT hFont = NULL; HFONT hFontOld, hFont = NULL;
ICONINFO IconInfo; ICONINFO IconInfo;
HICON hIcon = NULL; HICON hIcon = NULL;
@ -72,11 +72,12 @@ CreateTrayIcon(LPTSTR szLCID)
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma")); DEFAULT_QUALITY, FF_DONTCARE, _T("Tahoma"));
SelectObject(hdc, hFont); hFontOld = SelectObject(hdc, hFont);
DrawText(hdc, _tcsupr(szBuf), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER); DrawText(hdc, _tcsupr(szBuf), 2, &rect, DT_SINGLELINE|DT_CENTER|DT_VCENTER);
SelectObject(hdc, hBmpNew); SelectObject(hdc, hBmpNew);
PatBlt(hdc, 0, 0, 16, 16, BLACKNESS); PatBlt(hdc, 0, 0, 16, 16, BLACKNESS);
SelectObject(hdc, hBmpOld); SelectObject(hdc, hBmpOld);
SelectObject(hdc, hFontOld);
IconInfo.hbmColor = hBitmap; IconInfo.hbmColor = hBitmap;
IconInfo.hbmMask = hBmpNew; IconInfo.hbmMask = hBmpNew;
@ -248,6 +249,7 @@ GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName)
{ {
_tcscpy(szName, szPath); _tcscpy(szName, szPath);
RegCloseKey(hKey); RegCloseKey(hKey);
FreeLibrary(hLib);
return TRUE; return TRUE;
} }
FreeLibrary(hLib); FreeLibrary(hLib);
@ -285,7 +287,6 @@ ActivateLayout(HWND hwnd, ULONG uLayoutNum)
_ultot(uLayoutNum, szLayoutNum, 10); _ultot(uLayoutNum, szLayoutNum, 10);
GetLayoutID(szLayoutNum, szLCID); GetLayoutID(szLayoutNum, szLCID);
CreateTrayIcon(szLCID);
// Switch to the new keyboard layout // Switch to the new keyboard layout
GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR)); GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR));