From 36472b00443e23acf28b0dd26ddc2c2e6216d909 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Tue, 9 Dec 2014 00:59:27 +0000 Subject: code cleanup over mir_sntprintf + small bug fix git-svn-id: http://svn.miranda-ng.org/main/trunk@11295 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdchat/src/tools.cpp | 2 +- src/core/stdchat/src/window.cpp | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'src/core/stdchat') diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 61f4679a40..38301b960b 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -135,7 +135,7 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO if (pszWordText && pszWordText[0]) { TCHAR szMenuText[4096]; - mir_sntprintf(szMenuText, 4096, TranslateT("Look up '%s':"), pszWordText); + mir_sntprintf(szMenuText, SIZEOF(szMenuText), TranslateT("Look up '%s':"), pszWordText); ModifyMenu(*hMenu, 4, MF_STRING | MF_BYPOSITION, 4, szMenuText); } else ModifyMenu(*hMenu, 4, MF_STRING | MF_GRAYED | MF_BYPOSITION, 4, TranslateT("No word to look up")); diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index 75be4f1bbc..4a73524523 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -2295,11 +2295,12 @@ LABEL_SHOWWINDOW: if (GetKeyState(VK_SHIFT) & 0x8000) { LRESULT lResult = (LRESULT)SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), EM_GETSEL, 0, 0); int start = LOWORD(lResult); - TCHAR* pszName = (TCHAR*)alloca(sizeof(TCHAR)*(mir_tstrlen(ui->pszUID) + 3)); + size_t dwNameLenMax = (mir_tstrlen(ui->pszUID) + 3); + TCHAR* pszName = (TCHAR*)alloca(sizeof(TCHAR) * dwNameLenMax); if (start == 0) - mir_sntprintf(pszName, mir_tstrlen(ui->pszUID) + 3, _T("%s: "), ui->pszUID); + mir_sntprintf(pszName, dwNameLenMax, _T("%s: "), ui->pszUID); else - mir_sntprintf(pszName, mir_tstrlen(ui->pszUID) + 2, _T("%s "), ui->pszUID); + mir_sntprintf(pszName, dwNameLenMax, _T("%s "), ui->pszUID); SendMessage(GetDlgItem(hwndDlg, IDC_MESSAGE), EM_REPLACESEL, FALSE, (LPARAM)pszName); PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0); @@ -2390,11 +2391,11 @@ LABEL_SHOWWINDOW: _tcsncpy_s(szName, (pInfo->ptszModDispName ? pInfo->ptszModDispName : _A2T(si->pszModule)), _TRUNCATE); ValidateFilename(szName); - mir_sntprintf(szFolder, MAX_PATH, _T("%s\\%s"), g_Settings.pszLogDir, szName); - mir_sntprintf(szName, MAX_PATH, _T("%s.log"), si->ptszID); + mir_sntprintf(szFolder, SIZEOF(szFolder), _T("%s\\%s"), g_Settings.pszLogDir, szName); + mir_sntprintf(szName, SIZEOF(szName), _T("%s.log"), si->ptszID); ValidateFilename(szName); - mir_sntprintf(szFile, MAX_PATH, _T("%s\\%s"), szFolder, szName); + mir_sntprintf(szFile, SIZEOF(szFile), _T("%s\\%s"), szFolder, szName); ShellExecute(hwndDlg, _T("open"), szFile, NULL, NULL, SW_SHOW); } } -- cgit v1.2.3