From 3d64cefb8851fcf43b9c6109abdddaf71e340a71 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 14 Jul 2012 14:57:37 +0000 Subject: - various leaks - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@965 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/contactcache.cpp | 2 +- plugins/TabSRMM/src/containeroptions.cpp | 2 +- plugins/TabSRMM/src/globals.cpp | 2 +- plugins/TabSRMM/src/hotkeyhandler.cpp | 2 +- plugins/TabSRMM/src/mim.cpp | 2 +- plugins/TabSRMM/src/msgdialog.cpp | 2 +- plugins/TabSRMM/src/msgoptions.cpp | 8 ++++---- plugins/TabSRMM/src/msgs.cpp | 2 +- plugins/TabSRMM/src/sendlater.cpp | 4 ++-- plugins/TabSRMM/src/sidebar.cpp | 2 +- plugins/TabSRMM/src/tabctrl.cpp | 4 +--- plugins/TabSRMM/src/themeio.cpp | 8 ++++---- plugins/TabSRMM/src/themes.cpp | 6 +++--- 13 files changed, 22 insertions(+), 24 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index 116303b85b..36cf125e56 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -573,7 +573,7 @@ TCHAR* CContactCache::getNormalizedStatusMsg(const TCHAR *src, bool fStripAll) tstring dest; - for(i = 0; i < _tcslen(src); i++) { + for (i = 0; i < _tcslen(src); i++) { if (src[i] == 0x0d || src[i] == '\t') continue; if (i && src[i] == (TCHAR)0x0a) { diff --git a/plugins/TabSRMM/src/containeroptions.cpp b/plugins/TabSRMM/src/containeroptions.cpp index 305c0bdb8b..312435c3ab 100644 --- a/plugins/TabSRMM/src/containeroptions.cpp +++ b/plugins/TabSRMM/src/containeroptions.cpp @@ -200,7 +200,7 @@ INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM wParam, SendDlgItemMessage(hwndDlg, IDC_OWNAVATARMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Don't show them")); - for(i = 0; i < nr_layouts; i++) + for (i = 0; i < nr_layouts; i++) SendDlgItemMessage(hwndDlg, IDC_SBARLAYOUT, CB_INSERTSTRING, -1, (LPARAM)TranslateTS(sblayouts[i].szName)); /* bits 24 - 31 of dwFlagsEx hold the side bar layout id */ diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 009ae7eef6..223c4ff32f 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -618,7 +618,7 @@ int CGlobals::PreshutdownSendRecv(WPARAM wParam, LPARAM lParam) hContact = (HANDLE) CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM) hContact, 0); } - for(i = 0; i < SERVICE_LAST; i++) { + for (i = 0; i < SERVICE_LAST; i++) { if (PluginConfig.hSvc[i]) DestroyServiceFunction(PluginConfig.hSvc[i]); } diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index 2394ee5cf9..9574df156b 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -165,7 +165,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_CREATE: int i; - for(i = 0; i < safe_sizeof(_hotkeydescs); i++) { + for (i = 0; i < safe_sizeof(_hotkeydescs); i++) { _hotkeydescs[i].cbSize = sizeof(HOTKEYDESC); Hotkey_Register(&_hotkeydescs[i]); } diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index bab0647150..ce63a4cd91 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -202,7 +202,7 @@ const TCHAR* CMimAPI::StriStr(const TCHAR *szString, const TCHAR *szSearchFor) for (; *szString; ++szString) { if (_totupper(*szString) == _totupper(*szSearchFor)) { const TCHAR *h, *n; - for(h = szString, n = szSearchFor; *h && *n; ++h, ++n) { + for (h = szString, n = szSearchFor; *h && *n; ++h, ++n) { if (_totupper(*h) != _totupper(*n)) break; } diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index b76eba793d..4a29fe72c3 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1485,7 +1485,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP { UINT _ctrls[] = {IDC_RETRY, IDC_CANCELSEND, IDC_MSGSENDLATER}; - for(i = 0; i < 3; i++) { + for (i = 0; i < 3; i++) { SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASPUSHBTN, TRUE, 0); SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASFLATBTN, FALSE, 0); SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASTHEMEDBTN, TRUE, 0); diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 35f146beff..6995ad506e 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -204,7 +204,7 @@ static int TSAPI RescanSkins(HWND hwndCombobox) SendMessage(hwndCombobox, CB_SETCURSEL, 0, 0); if (0 == M->GetTString(0, SRMSGMOD_T, "ContainerSkin", &dbv)) { LRESULT lr = SendMessage(hwndCombobox, CB_GETCOUNT, 0, 0); - for(int i = 1; i < lr; i++) { + for (int i = 1; i < lr; i++) { TCHAR* idata = (TCHAR *)SendMessage(hwndCombobox, CB_GETITEMDATA, i, 0); if (idata && idata != (TCHAR *)CB_ERR) { @@ -227,7 +227,7 @@ static void TSAPI FreeComboData(HWND hwndCombobox) { LRESULT lr = SendMessage(hwndCombobox, CB_GETCOUNT, 0, 0); - for(int i = 1; i < lr; i++) { + for (int i = 1; i < lr; i++) { void *idata = (void *)SendMessage(hwndCombobox, CB_GETITEMDATA, i, 0); if (idata && idata != (void *)CB_ERR) @@ -689,7 +689,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LRESULT r = SendDlgItemMessage(hwndDlg, IDC_MSGLOGDIDSPLAY, CB_GETCURSEL, 0, 0); Utils::showDlgControl(hwndDlg, IDC_EXPLAINMSGLOGSETTINGS, r == 0 ? SW_HIDE : SW_SHOW); Utils::showDlgControl(hwndDlg, IDC_LOGOPTIONS, r == 0 ? SW_SHOW : SW_HIDE); - for(i = 0; i < safe_sizeof(__ctrls); i++) + for (i = 0; i < safe_sizeof(__ctrls); i++) Utils::enableDlgControl(hwndDlg, __ctrls[i], r == 0 ? TRUE : FALSE); return 0; } @@ -1182,7 +1182,7 @@ static INT_PTR CALLBACK DlgProcContainerSettings(HWND hwndDlg, UINT msg, WPARAM SendDlgItemMessage(hwndDlg, IDC_FLASHINTERVALSPIN, UDM_SETACCEL, 0, (int)M->GetDword("flashinterval", 1000)); CheckDlgButton(hwndDlg, IDC_USEAERO, M->GetByte("useAero", 1)); CheckDlgButton(hwndDlg, IDC_USEAEROPEEK, M->GetByte("useAeroPeek", 1)); - for(int i = 0; i < CSkin::AERO_EFFECT_LAST; i++) + for (int i = 0; i < CSkin::AERO_EFFECT_LAST; i++) SendDlgItemMessage(hwndDlg, IDC_AEROEFFECT, CB_INSERTSTRING, -1, (LPARAM)TranslateTS(CSkin::m_aeroEffects[i].tszName)); SendDlgItemMessage(hwndDlg, IDC_AEROEFFECT, CB_SETCURSEL, (WPARAM)CSkin::m_aeroEffect, 0); diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index 5b7a995893..4593a3ea43 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -550,7 +550,7 @@ static void TSAPI InitAPI() ZeroMemory(PluginConfig.hSvc, sizeof(HANDLE) * CGlobals::SERVICE_LAST); - for(i = 0; i < safe_sizeof(SERVICES); i++) + for (i = 0; i < safe_sizeof(SERVICES); i++) *(SERVICES[i].h) = CreateServiceFunction(SERVICES[i].szName, SERVICES[i].pfnService); *(SERVICES[CGlobals::H_MS_MSG_SENDMESSAGEW].h) = CreateServiceFunction(MS_MSG_SENDMESSAGE "W", SendMessageCommand_W); diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index 2d6a02a07c..77a6731c45 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -756,7 +756,7 @@ void CSendLater::qMgrSaveColumns() LVCOLUMN col = {0}; col.mask = LVCF_WIDTH; - for(i = 0; i < QMGR_LIST_NRCOLUMNS; i++) { + for (i = 0; i < QMGR_LIST_NRCOLUMNS; i++) { ::SendMessage(m_hwndList, LVM_GETCOLUMN, i, reinterpret_cast(&col)); nWidths[i] = max(col.cx, 10); } @@ -899,7 +899,7 @@ INT_PTR CALLBACK CSendLater::DlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM MB_ICONQUESTION | MB_OKCANCEL) == IDCANCEL) break; } - for(LRESULT i = 0; i < items; i++) { + for (LRESULT i = 0; i < items; i++) { item.iItem = i; ::SendMessage(m_hwndList, LVM_GETITEM, 0, reinterpret_cast(&item)); if (item.state & LVIS_SELECTED) { diff --git a/plugins/TabSRMM/src/sidebar.cpp b/plugins/TabSRMM/src/sidebar.cpp index 6988b6c1d3..11ad473251 100644 --- a/plugins/TabSRMM/src/sidebar.cpp +++ b/plugins/TabSRMM/src/sidebar.cpp @@ -526,7 +526,7 @@ void CSideBar::populateAll() m_iTopButtons = 0; - for(int i = 0; i < iItems; i++) { + for (int i = 0; i < iItems; i++) { TabCtrl_GetItem(hwndTab, i, &item); if (item.lParam && ::IsWindow((HWND)item.lParam)) { TWindowData *dat = (TWindowData *)::GetWindowLongPtr((HWND)item.lParam, GWLP_USERDATA); diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp index 10ac3c39e4..94032a8cc6 100644 --- a/plugins/TabSRMM/src/tabctrl.cpp +++ b/plugins/TabSRMM/src/tabctrl.cpp @@ -1453,8 +1453,6 @@ void TSAPI ReloadTabConfig() void TSAPI FreeTabConfig() { - int i; - if (PluginConfig.tabConfig.m_hPenItemShadow) DeleteObject(PluginConfig.tabConfig.m_hPenItemShadow); @@ -1467,7 +1465,7 @@ void TSAPI FreeTabConfig() if (PluginConfig.tabConfig.m_hMenuFont) DeleteObject(PluginConfig.tabConfig.m_hMenuFont); - for(i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { if (PluginConfig.tabConfig.m_brushes[i]) { DeleteObject(PluginConfig.tabConfig.m_brushes[i]); PluginConfig.tabConfig.m_brushes[i] = 0; diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp index 031d6d88be..05bf677717 100644 --- a/plugins/TabSRMM/src/themeio.cpp +++ b/plugins/TabSRMM/src/themeio.cpp @@ -218,12 +218,12 @@ void TSAPI WriteThemeToINI(const TCHAR *szIniFilenameT, struct TWindowData *dat) } def = SRMSGDEFSET_BKGCOLOUR; - for(i = 0; i < safe_sizeof(_extSettings); i++) { + for (i = 0; i < safe_sizeof(_extSettings); i++) { WritePrivateProfileStringA(_extSettings[i].szIniSection, _extSettings[i].szIniName, _itoa(M->GetDword(_extSettings[i].szDbModule, _extSettings[i].szDbSetting, _extSettings[i].dwDef), szBuf, 10), szIniFilename); } - for(i = 0; i < safe_sizeof(_extSettings_v5); i++) { + for (i = 0; i < safe_sizeof(_extSettings_v5); i++) { WritePrivateProfileStringA(_extSettings_v5[i].szIniSection, _extSettings_v5[i].szIniName, _itoa(M->GetDword(_extSettings_v5[i].szDbModule, _extSettings_v5[i].szDbSetting, _extSettings_v5[i].dwDef), szBuf, 10), szIniFilename); } @@ -324,13 +324,13 @@ void TSAPI ReadThemeFromINI(const TCHAR *szIniFilenameT, TContainerData *dat, in if (dwFlags & THEME_READ_FONTS) { COLORREF defclr; - for(i = 0; i < safe_sizeof(_extSettings); i++) { + for (i = 0; i < safe_sizeof(_extSettings); i++) { M->WriteDword(_extSettings[i].szDbModule, _extSettings[i].szDbSetting, GetPrivateProfileIntA(_extSettings[i].szIniSection, _extSettings[i].szIniName, _extSettings[i].dwDef, szIniFilename)); } if (version >= 5) { - for(i = 0; i < safe_sizeof(_extSettings_v5); i++) { + for (i = 0; i < safe_sizeof(_extSettings_v5); i++) { M->WriteDword(_extSettings_v5[i].szDbModule, _extSettings_v5[i].szDbSetting, GetPrivateProfileIntA(_extSettings_v5[i].szIniSection, _extSettings_v5[i].szIniName, _extSettings_v5[i].dwDef, szIniFilename)); } diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index 5bf22158dc..8426bf8c45 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -1204,7 +1204,7 @@ void CSkin::Unload() m_SkinDarkShadowPen = 0; if (m_SkinItems) { - for(i = 0; i < ID_EXTBK_LAST; i++) { + for (i = 0; i < ID_EXTBK_LAST; i++) { m_SkinItems[i].IGNORED = 1; m_SkinItems[i].imageItem = 0; } @@ -1237,7 +1237,7 @@ void CSkin::Unload() m_closeIcon = m_maxIcon = m_minIcon = 0; - for(i = 0; i < m_nrSkinIcons; i++) { + for (i = 0; i < m_nrSkinIcons; i++) { if (m_skinIcons[i].phIcon ) ::DestroyIcon(*(m_skinIcons[i].phIcon)); } @@ -2809,7 +2809,7 @@ void CSkin::extractSkinsAndLogo(bool fForceOverwrite) const m_fAeroSkinsValid = true; try { - for(int i = 0; i < safe_sizeof(my_default_skin); i++) + for (int i = 0; i < safe_sizeof(my_default_skin); i++) Utils::extractResource(g_hInst, my_default_skin[i].ulID, _T("SKIN_GLYPH"), tszBasePath, my_default_skin[i].tszName, fForceOverwrite); } catch(CRTException& ex) { -- cgit v1.2.3