code cleanup over mir_sntprintf + small bug fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@11295 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

19 files changed, 62 insertions, 66 deletions

diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index f692288afe..2f1517a33e 100644
--- a/plugins/TabSRMM/src/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -45,7 +45,7 @@ static void OnAddLog(SESSION_INFO *si, int isOk)
 static void OnGetLogName(SESSION_INFO *si, LPCTSTR ptszParsedName)

 {

 	if (!PathIsAbsoluteT(ptszParsedName))

-		mir_sntprintf(si->pszLogFileName, MAX_PATH, _T("%s%s"), M.getChatLogPath(), ptszParsedName);

+		mir_sntprintf(si->pszLogFileName, SIZEOF(si->pszLogFileName), _T("%s%s"), M.getChatLogPath(), ptszParsedName);

 	else

 		_tcsncpy_s(si->pszLogFileName, ptszParsedName, _TRUNCATE);

 }

diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp
index a34b7d0896..d7af61c6bf 100644
--- a/plugins/TabSRMM/src/chat/services.cpp
+++ b/plugins/TabSRMM/src/chat/services.cpp
@@ -37,7 +37,7 @@ HWND CreateNewRoom(TContainerData *pContainer, SESSION_INFO *si, BOOL bActivateT
 	if (hContact != 0 && M.GetByte("limittabs", 0) && !_tcsncmp(pContainer->szName, _T("default"), 6)) {

 		if ((pContainer = FindMatchingContainer(_T("default"), hContact)) == NULL) {

 			TCHAR szName[CONTAINER_NAMELEN + 1];

-			mir_sntprintf(szName, CONTAINER_NAMELEN, _T("default"));

+			mir_sntprintf(szName, SIZEOF(szName), _T("default"));

 			if ((pContainer = CreateContainer(szName, CNT_CREATEFLAG_CLONED, hContact)) == NULL)

 				return 0;

 		}

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index 2803d8f87e..275036ead9 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -113,7 +113,7 @@ int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoNa
 		pd.lchIcon = LoadIconEx(IDI_CHANMGR, "window", 0, 0);

 

 	PROTOACCOUNT *pa = ProtoGetAccount(pszProtoName);

-	mir_sntprintf(pd.lptzContactName, MAX_CONTACTNAME - 1, _T("%s - %s"),

+	mir_sntprintf(pd.lptzContactName, SIZEOF(pd.lptzContactName), _T("%s - %s"),

 					  (pa == NULL) ? _A2T(pszProtoName) : pa->tszAccountName,

 					  pcli->pfnGetContactDisplayName(hContact, 0));

 

@@ -538,7 +538,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/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 1d30b7af89..8a60369600 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -2078,11 +2078,11 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					else if (diff > 59) {
 						DWORD hours = diff / 60;
 						DWORD minutes = diff % 60;
-						mir_sntprintf(mi->tszIdleMsg, 60, TranslateT(", %d %s, %d %s idle"), hours, hours > 1 ?
+						mir_sntprintf(mi->tszIdleMsg, SIZEOF(mi->tszIdleMsg), TranslateT(", %d %s, %d %s idle"), hours, hours > 1 ?
 							TranslateT("hours") : TranslateT("hour"),
 							minutes, minutes > 1 ? TranslateT("minutes") : TranslateT("minute"));
 					}
-					else mir_sntprintf(mi->tszIdleMsg, 60, TranslateT(", %d %s idle"), diff, diff > 1 ? TranslateT("minutes") : TranslateT("minute"));
+					else mir_sntprintf(mi->tszIdleMsg, SIZEOF(mi->tszIdleMsg), TranslateT(", %d %s idle"), diff, diff > 1 ? TranslateT("minutes") : TranslateT("minute"));
 				}
 				mir_sntprintf(szFinalStatusBarText, SIZEOF(szFinalStatusBarText), TranslateT("%s on %s%s"), dat->szMyNickname, mi->ptszModDispName, mi->tszIdleMsg);
 			}
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index d3d6953c78..4a890d2ac6 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -482,15 +482,15 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 static TCHAR* ShortenPreview(DBEVENTINFO* dbe)

 {

 	bool	fAddEllipsis = false;

-	int iPreviewLimit = nen_options.iLimitPreview;

+	size_t iPreviewLimit = nen_options.iLimitPreview;

 	if (iPreviewLimit > 500 || iPreviewLimit == 0)

 		iPreviewLimit = 500;

 

 	TCHAR* buf = DbGetEventTextT(dbe, CP_ACP);

 	if (mir_tstrlen(buf) > iPreviewLimit) {

 		fAddEllipsis = true;

-		int iIndex = iPreviewLimit;

-		int iWordThreshold = 20;

+		size_t iIndex = iPreviewLimit;

+		size_t iWordThreshold = 20;

 		while(iIndex && buf[iIndex] != ' ' && iWordThreshold--)

 			buf[iIndex--] = 0;

 

@@ -578,7 +578,7 @@ static int PopupUpdateT(MCONTACT hContact, HANDLE hEvent)
 

 	TCHAR timestamp[MAX_DATASIZE];

 	_tcsftime(timestamp, MAX_DATASIZE, _T("%Y.%m.%d %H:%M"), _localtime32((__time32_t *)&dbe.timestamp));

-	mir_sntprintf(pdata->eventData[pdata->nrMerged].tszText, MAX_SECONDLINE, _T("\n\n%s\n"), timestamp);

+	mir_sntprintf(pdata->eventData[pdata->nrMerged].tszText, SIZEOF(pdata->eventData[pdata->nrMerged].tszText), _T("\n\n%s\n"), timestamp);

 

 	TCHAR *szPreview = GetPreviewT(dbe.eventType, &dbe);

 	if (szPreview) {

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 61c2429ce2..492ab6b0ec 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -45,12 +45,12 @@ void TSAPI DM_SaveLogAsRTF(const TWindowData *dat)
 	else if (dat) {
 		TCHAR szFilter[MAX_PATH], szFilename[MAX_PATH];
 		mir_sntprintf(szFilter, SIZEOF(szFilter), _T("%s%c*.rtf%c%c"), TranslateT("Rich Edit file"), 0, 0, 0);
-		mir_sntprintf(szFilename, MAX_PATH, _T("%s.rtf"), dat->cache->getNick());
+		mir_sntprintf(szFilename, SIZEOF(szFilename), _T("%s.rtf"), dat->cache->getNick());
 
 		Utils::sanitizeFilename(szFilename);
 
 		TCHAR szInitialDir[MAX_PATH + 2];
-		mir_sntprintf(szInitialDir, MAX_PATH, _T("%s%s\\"), M.getDataPath(), _T("\\Saved message logs"));
+		mir_sntprintf(szInitialDir, SIZEOF(szInitialDir), _T("%s%s\\"), M.getDataPath(), _T("\\Saved message logs"));
 		CreateDirectoryTreeT(szInitialDir);
 
 		OPENFILENAME ofn = { 0 };
@@ -1011,7 +1011,7 @@ void TSAPI DM_LoadLocale(TWindowData *dat)
 		if (!PluginConfig.m_dontUseDefaultKbd) {
 			TCHAR	szBuf[20];
 			GetLocaleInfo(LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, szBuf, 20);
-			mir_sntprintf(szKLName, KL_NAMELENGTH, _T("0000%s"), szBuf);
+			mir_sntprintf(szKLName, SIZEOF(szKLName), _T("0000%s"), szBuf);
 			db_set_ts(dat->hContact, SRMSGMOD_T, "locale", szKLName);
 		}
 		else {
@@ -1769,7 +1769,7 @@ void TSAPI DM_UpdateTitle(TWindowData *dat, WPARAM wParam, LPARAM lParam)
 
 				if (mir_tstrlen(newcontactname) != 0 && dat->szStatus != NULL) {
 					if (PluginConfig.m_StatusOnTabs)
-						mir_sntprintf(newtitle, 127, _T("%s (%s)"), newcontactname, dat->szStatus);
+						mir_sntprintf(newtitle, SIZEOF(newtitle), _T("%s (%s)"), newcontactname, dat->szStatus);
 					else
 						_tcsncpy_s(newtitle, newcontactname, _TRUNCATE);
 				} else
diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp
index 0922b715de..c6797a5670 100644
--- a/plugins/TabSRMM/src/infopanel.cpp
+++ b/plugins/TabSRMM/src/infopanel.cpp
@@ -689,7 +689,7 @@ void CInfoPanel::Chat_RenderIPSecondLine(const HDC hdc, RECT& rcItem)
 

 	SIZE szTitle;

 	TCHAR	szPrefix[100];

-	mir_sntprintf(szPrefix, 100, TranslateT("Topic is: %s"), _T(""));

+	mir_sntprintf(szPrefix, SIZEOF(szPrefix), TranslateT("Topic is: %s"), _T(""));

 	::GetTextExtentPoint32(hdc, szPrefix, (int)mir_tstrlen(szPrefix), &szTitle);

 	mapRealRect(rcItem, m_rcUIN, szTitle);

 	if (m_hoverFlags & HOVER_UIN)

@@ -910,11 +910,11 @@ void CInfoPanel::showTip(UINT ctrlId, const LPARAM lParam)
 			return;

 

 		TCHAR temp[1024];

-		mir_sntprintf(temp, 1024, RTF_DEFAULT_HEADER, 0, 0, 0, 30 * 15);

+		mir_sntprintf(temp, SIZEOF(temp), RTF_DEFAULT_HEADER, 0, 0, 0, 30 * 15);

 

 		tstring *str = new tstring(temp);

 

-		mir_sntprintf(temp, 1024, TranslateT("\\tab \\ul\\b Status message:\\ul0\\b0 \\par %s"),

+		mir_sntprintf(temp, SIZEOF(temp), TranslateT("\\tab \\ul\\b Status message:\\ul0\\b0 \\par %s"),

 			m_dat->cache->getStatusMsg() ? m_dat->cache->getStatusMsg() : TranslateT("No status message"));

 		str->append(temp);

 

@@ -928,7 +928,7 @@ void CInfoPanel::showTip(UINT ctrlId, const LPARAM lParam)
 

 			if (tszXStatusName) {

 				str->append(TranslateT("\\par\\par\\tab \\ul\\b Extended status information:\\ul0\\b0 \\par "));

-				mir_sntprintf(temp, 1024, _T("%s%s%s"), tszXStatusName, m_dat->cache->getXStatusMsg() ? _T(" / ") : _T(""),

+				mir_sntprintf(temp, SIZEOF(temp), _T("%s%s%s"), tszXStatusName, m_dat->cache->getXStatusMsg() ? _T(" / ") : _T(""),

 								m_dat->cache->getXStatusMsg() ? m_dat->cache->getXStatusMsg() : _T(""));

 				str->append(temp);

 				if (dbv.ptszVal)

@@ -937,12 +937,12 @@ void CInfoPanel::showTip(UINT ctrlId, const LPARAM lParam)
 		}

 

 		if (m_dat->cache->getListeningInfo()) {

-			mir_sntprintf(temp, 1024, TranslateT("\\par\\par\\tab \\ul\\b Listening to:\\ul0\\b0 \\par %s"), m_dat->cache->getListeningInfo());

+			mir_sntprintf(temp, SIZEOF(temp), TranslateT("\\par\\par\\tab \\ul\\b Listening to:\\ul0\\b0 \\par %s"), m_dat->cache->getListeningInfo());

 			str->append(temp);

 		}

 

 		if (0 == db_get_ts(m_dat->cache->getActiveContact(), m_dat->cache->getActiveProto(), "MirVer", &dbv)) {

-			mir_sntprintf(temp, 1024, TranslateT("\\par\\par\\ul\\b Client:\\ul0\\b0  %s"), dbv.ptszVal);

+			mir_sntprintf(temp, SIZEOF(temp), TranslateT("\\par\\par\\ul\\b Client:\\ul0\\b0  %s"), dbv.ptszVal);

 			::db_free(&dbv);

 			str->append(temp);

 		}

@@ -1107,11 +1107,11 @@ INT_PTR CALLBACK CInfoPanel::ConfigDlgProc(HWND hwnd, UINT msg, WPARAM wParam, L
 	case WM_INITDIALOG:

 		{

 			TCHAR	tszTitle[100];

-			mir_sntprintf(tszTitle, 100, TranslateT("Set panel visibility for this %s"),

+			mir_sntprintf(tszTitle, SIZEOF(tszTitle), TranslateT("Set panel visibility for this %s"),

 				m_isChat ? TranslateT("chat room") : TranslateT("contact"));

 			::SetDlgItemText(hwnd, IDC_STATIC_VISIBILTY, tszTitle);

 

-			mir_sntprintf(tszTitle, 100, m_isChat ? TranslateT("Do not synchronize the panel height with IM windows") :

+			mir_sntprintf(tszTitle, SIZEOF(tszTitle), m_isChat ? TranslateT("Do not synchronize the panel height with IM windows") :

 				TranslateT("Do not synchronize the panel height with group chat windows"));

 

 			::SetDlgItemText(hwnd, IDC_NOSYNC, tszTitle);

@@ -1562,7 +1562,7 @@ INT_PTR CALLBACK CTip::WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
 			HANDLE hTheme = 0;

 

 			TCHAR szTitle[128];

-			mir_sntprintf(szTitle, 128, m_szTitle ? _T("%s (%s)") : _T("%s%s"), c->getNick(), m_szTitle ? m_szTitle : _T(""));

+			mir_sntprintf(szTitle, SIZEOF(szTitle), m_szTitle ? _T("%s (%s)") : _T("%s%s"), c->getNick(), m_szTitle ? m_szTitle : _T(""));

 

 			if (m_panel) {

 				HDC hdcMem = ::CreateCompatibleDC(hdc);

diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 8cdd44efa3..e0e46dd76d 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -147,13 +147,9 @@ const TCHAR* CMimAPI::getUserDir()
 
 void CMimAPI::InitPaths()
 {
-	m_szProfilePath[0] = 0;
-	m_szSkinsPath[0] = 0;
-	m_szSavedAvatarsPath[0] = 0;
-
 	const TCHAR *szUserdataDir = getUserDir();
 
-	mir_sntprintf(m_szProfilePath, MAX_PATH, _T("%stabSRMM"), szUserdataDir);
+	mir_sntprintf(m_szProfilePath, SIZEOF(m_szProfilePath), _T("%stabSRMM"), szUserdataDir);
 	if (ServiceExists(MS_FOLDERS_REGISTER_PATH)) {
 		_tcsncpy_s(m_szChatLogsPath, _T("%miranda_logpath%"), _TRUNCATE);
 		_tcsncpy_s(m_szSkinsPath, _T("%miranda_path%\\Skins\\TabSRMM"), _TRUNCATE);
@@ -168,7 +164,7 @@ void CMimAPI::InitPaths()
 
 	Utils::ensureTralingBackslash(m_szSkinsPath);
 
-	mir_sntprintf(m_szSavedAvatarsPath, MAX_PATH, _T("%s\\Saved Contact Pictures"), m_szProfilePath);
+	mir_sntprintf(m_szSavedAvatarsPath, SIZEOF(m_szSavedAvatarsPath), _T("%s\\Saved Contact Pictures"), m_szProfilePath);
 }
 
 bool CMimAPI::getAeroState()
diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp
index ebbccf651c..bfd1cdb387 100644
--- a/plugins/TabSRMM/src/modplus.cpp
+++ b/plugins/TabSRMM/src/modplus.cpp
@@ -128,7 +128,7 @@ static int CustomButtonPressed(WPARAM wParam, LPARAM lParam)
 

 		bufSize = textlenght + 12;

 		pszFormatedText = (TCHAR*)_alloca(bufSize*sizeof(TCHAR));

-		mir_sntprintf(pszFormatedText, bufSize*sizeof(TCHAR), _T("[img]%s[/img]"), pszText);

+		mir_sntprintf(pszFormatedText, bufSize, _T("[img]%s[/img]"), pszText);

 

 		bbd.ptszTooltip = 0;

 		bbd.hIcon = 0;

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index fe567a05fc..a41827ce05 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -154,11 +154,11 @@ static void SaveAvatarToFile(TWindowData *dat, HBITMAP hbm, int isOwnPic)
 

 	TCHAR szBaseName[MAX_PATH];

 	if (isOwnPic)

-		mir_sntprintf(szBaseName, MAX_PATH, _T("My Avatar_%s"), szTimestamp);

+		mir_sntprintf(szBaseName, SIZEOF(szBaseName), _T("My Avatar_%s"), szTimestamp);

 	else

-		mir_sntprintf(szBaseName, MAX_PATH, _T("%s_%s"), dat->cache->getNick(), szTimestamp);

+		mir_sntprintf(szBaseName, SIZEOF(szBaseName), _T("%s_%s"), dat->cache->getNick(), szTimestamp);

 

-	mir_sntprintf(szFinalFilename, MAX_PATH, _T("%s.png"), szBaseName);

+	mir_sntprintf(szFinalFilename, SIZEOF(szFinalFilename), _T("%s.png"), szBaseName);

 

 	// do not allow / or \ or % in the filename

 	Utils::sanitizeFilename(szFinalFilename);

@@ -1341,7 +1341,7 @@ void TSAPI GetLocaleID(TWindowData *dat, const TCHAR *szKLName)
 		TCHAR	szKey[20];

 		DWORD	dwLID = _tcstoul(szKLName, &stopped, 16);

 

-		mir_sntprintf(szKey, 20, _T("%04.04x"), LOWORD(dwLID));

+		mir_sntprintf(szKey, SIZEOF(szKey), _T("%04.04x"), LOWORD(dwLID));

 		if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_CLASSES_ROOT, _T("MIME\\Database\\Rfc1766"), 0, KEY_READ, &hKey)) {

 			DWORD dwLength = 255;

 			if (ERROR_SUCCESS == RegQueryValueEx(hKey, szKey, 0, 0, (unsigned char *)szLI, &dwLength)) {

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index dba48a37d0..6a1071ae89 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -103,7 +103,7 @@ static int TSAPI ScanSkinDir(const TCHAR* tszFolder, HWND hwndCombobox)
 {

 	bool fValid = false;

 	TCHAR tszMask[MAX_PATH];

-	mir_sntprintf(tszMask, MAX_PATH, _T("%s*.*"), tszFolder);

+	mir_sntprintf(tszMask, SIZEOF(tszMask), _T("%s*.*"), tszFolder);

 

 	WIN32_FIND_DATA fd = { 0 };

 	HANDLE h = FindFirstFile(tszMask, &fd);

@@ -123,7 +123,7 @@ static int TSAPI ScanSkinDir(const TCHAR* tszFolder, HWND hwndCombobox)
 		LRESULT lr;

 		TCHAR	szBuf[255];

 

-		mir_sntprintf(tszFinalName, MAX_PATH, _T("%s%s"), tszFolder, fd.cFileName);

+		mir_sntprintf(tszFinalName, SIZEOF(tszFinalName), _T("%s%s"), tszFolder, fd.cFileName);

 

 		GetPrivateProfileString(_T("Global"), _T("Name"), _T("None"), szBuf, 500, tszFinalName);

 		if (!_tcscmp(szBuf, _T("None"))) {

@@ -159,7 +159,7 @@ static int TSAPI RescanSkins(HWND hwndCombobox)
 	_tcsncpy_s(tszSkinRoot, M.getSkinPath(), _TRUNCATE);

 

 	SetDlgItemText(GetParent(hwndCombobox), IDC_SKINROOTFOLDER, tszSkinRoot);

-	mir_sntprintf(tszFindMask, MAX_PATH, _T("%s*.*"), tszSkinRoot);

+	mir_sntprintf(tszFindMask, SIZEOF(tszFindMask), _T("%s*.*"), tszSkinRoot);

 

 	SendMessage(hwndCombobox, CB_RESETCONTENT, 0, 0);

 	SendMessage(hwndCombobox, CB_INSERTSTRING, -1, (LPARAM)TranslateT("<no skin>"));

@@ -169,7 +169,7 @@ static int TSAPI RescanSkins(HWND hwndCombobox)
 	while (h != INVALID_HANDLE_VALUE) {

 		if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY && fd.cFileName[0] != '.') {

 			TCHAR	tszSubDir[MAX_PATH];

-			mir_sntprintf(tszSubDir, MAX_PATH, _T("%s%s\\"), tszSkinRoot, fd.cFileName);

+			mir_sntprintf(tszSubDir, SIZEOF(tszSubDir), _T("%s%s\\"), tszSkinRoot, fd.cFileName);

 			ScanSkinDir(tszSubDir, hwndCombobox);

 		}

 		if (FindNextFile(h, &fd) == 0)

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index ec1145b851..962f95da2f 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -560,7 +560,7 @@ HWND TSAPI CreateNewTabForContact(TContainerData *pContainer, MCONTACT hContact,
 	if (hContact != 0 && M.GetByte("limittabs", 0) && !_tcsncmp(pContainer->szName, _T("default"), 6)) {
 		if ((pContainer = FindMatchingContainer(_T("default"), hContact)) == NULL) {
 			TCHAR szName[CONTAINER_NAMELEN + 1];
-			mir_sntprintf(szName, CONTAINER_NAMELEN, _T("default"));
+			mir_sntprintf(szName, SIZEOF(szName), _T("default"));
 			if ((pContainer = CreateContainer(szName, CNT_CREATEFLAG_CLONED, hContact)) == NULL)
 				return 0;
 		}
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index a9931f78a9..4d15647c1c 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -130,12 +130,12 @@ CSendLaterJob::~CSendLaterJob()
 				_tcsncpy_s(ppd.lptzContactName, (tszName ? tszName : TranslateT("'(Unknown Contact)'")), _TRUNCATE);

 				TCHAR *msgPreview = Utils::GetPreviewWithEllipsis(reinterpret_cast<TCHAR *>(&pBuf[mir_strlen((char *)pBuf) + 1]), 100);

 				if (fSuccess) {

-					mir_sntprintf(ppd.lptzText, MAX_SECONDLINE, TranslateT("A send later job completed successfully.\nThe original message: %s"),

+					mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), TranslateT("A send later job completed successfully.\nThe original message: %s"),

 								  msgPreview);

 					mir_free(msgPreview);

 				}

 				else if (fFailed) {

-					mir_sntprintf(ppd.lptzText, MAX_SECONDLINE, TranslateT("A send later job failed to complete.\nThe original message: %s"),

+					mir_sntprintf(ppd.lptzText, SIZEOF(ppd.lptzText), TranslateT("A send later job failed to complete.\nThe original message: %s"),

 						msgPreview);

 					mir_free(msgPreview);

 				}

@@ -544,7 +544,7 @@ void CSendLater::qMgrFillList(bool fClear)
 

 			lvItem.mask = LVIF_TEXT|LVIF_PARAM;

 			TCHAR tszBuf[255];

-			mir_sntprintf(tszBuf, 255, _T("%s [%s]"), tszNick, c->getRealAccount());

+			mir_sntprintf(tszBuf, SIZEOF(tszBuf), _T("%s [%s]"), tszNick, c->getRealAccount());

 			lvItem.pszText = tszBuf;

 			lvItem.cchTextMax = SIZEOF(tszBuf);

 			lvItem.iItem = uIndex++;

@@ -596,7 +596,7 @@ void CSendLater::qMgrFillList(bool fClear)
 				bCode = p->bCode;

 

 			TCHAR tszStatus[20];

-			mir_sntprintf(tszStatus, 20, _T("X/%s[%c] (%d)"), tszStatusText, bCode, p->iSendCount);

+			mir_sntprintf(tszStatus, SIZEOF(tszStatus), _T("X/%s[%c] (%d)"), tszStatusText, bCode, p->iSendCount);

 			tszStatus[0] = p->szId[0];

 			lvItem.pszText = tszStatus;

 			lvItem.iSubItem = 3;

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index fc8801cf85..3c2078f9c2 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -322,7 +322,7 @@ int SendQueue::sendQueued(TWindowData *dat, const int iEntry)
 
 		if (iSendLength >= iMinLength) {
 			TCHAR	tszError[256];
-			mir_sntprintf(tszError, 256, TranslateT("The message cannot be sent delayed or to multiple contacts, because it exceeds the maximum allowed message length of %d bytes"), iMinLength);
+			mir_sntprintf(tszError, SIZEOF(tszError), TranslateT("The message cannot be sent delayed or to multiple contacts, because it exceeds the maximum allowed message length of %d bytes"), iMinLength);
 			::SendMessage(dat->hwnd, DM_ACTIVATETOOLTIP, IDC_MESSAGE, LPARAM(tszError));
 			sendQueue->clearJob(iEntry);
 			return 0;
@@ -388,7 +388,7 @@ send_unsplitted:
 
 			size_t iSendLength = getSendLength(iEntry, dat->sendMode);
 			if (iSendLength >= dat->nMax) {
-				mir_sntprintf(tszError, 256, TranslateT("The message cannot be sent delayed or to multiple contacts, because it exceeds the maximum allowed message length of %d bytes"), dat->nMax);
+				mir_sntprintf(tszError, SIZEOF(tszError), TranslateT("The message cannot be sent delayed or to multiple contacts, because it exceeds the maximum allowed message length of %d bytes"), dat->nMax);
 				SendMessage(dat->hwnd, DM_ACTIVATETOOLTIP, IDC_MESSAGE, LPARAM(tszError));
 				clearJob(iEntry);
 				return 0;
diff --git a/plugins/TabSRMM/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp
index 88d9a61997..b594845180 100644
--- a/plugins/TabSRMM/src/taskbar.cpp
+++ b/plugins/TabSRMM/src/taskbar.cpp
@@ -696,7 +696,7 @@ void CThumbBase::renderBase()
 		wchar_t	tszTemp[30];

 

 		m_rcIcon.top += m_sz.cy;

-		mir_sntprintf(tszTemp, 30, TranslateT("%d Unread"), m_dat->dwUnread);

+		mir_sntprintf(tszTemp, SIZEOF(tszTemp), TranslateT("%d Unread"), m_dat->dwUnread);

 		CSkin::RenderText(m_hdc, m_dat->hTheme, tszTemp, &m_rcIcon, m_dtFlags | DT_CENTER | DT_WORD_ELLIPSIS, 10, 0, true);

 	}

 	m_rcIcon= m_rcTop;

@@ -875,7 +875,7 @@ void CThumbMUC::renderContent()
 

 		if (mi) {

 			if (m_dat->dwUnread) {

-				mir_sntprintf(szTemp, 30, TranslateT("%d Unread"), m_dat->dwUnread);

+				mir_sntprintf(szTemp, SIZEOF(szTemp), TranslateT("%d Unread"), m_dat->dwUnread);

 				CSkin::RenderText(m_hdc, m_dat->hTheme, szTemp, &m_rcIcon, m_dtFlags | DT_SINGLELINE | DT_RIGHT, 10, 0, true);

 				m_rcIcon.top += m_sz.cy;

 			}

diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index e7cde034cd..502404f187 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -1209,7 +1209,7 @@ void CSkin::LoadIcon(const TCHAR *szSection, const TCHAR *name, HICON &hIcon)
 		TCHAR szDrive[MAX_PATH], szDir[MAX_PATH], szImagePath[MAX_PATH];

 

 		_tsplitpath(m_tszFileName, szDrive, szDir, NULL, NULL);

-		mir_sntprintf(szImagePath, MAX_PATH, _T("%s\\%s\\%s"), szDrive, szDir, buffer);

+		mir_sntprintf(szImagePath, SIZEOF(szImagePath), _T("%s\\%s\\%s"), szDrive, szDir, buffer);

 		hIcon = (HICON)LoadImage(0, szImagePath, IMAGE_ICON, 16, 16, LR_LOADFROMFILE);

 	}

 	else hIcon = NULL;

@@ -1238,12 +1238,12 @@ void CSkin::ReadItem(const int id, const TCHAR *szItem)
 	this_item->ALPHA = min(this_item->ALPHA, 100);

 

 	clr = RGB(GetBValue(defaults->COLOR), GetGValue(defaults->COLOR), GetRValue(defaults->COLOR));

-	mir_sntprintf(def_color, 15, _T("%6.6x"), clr);

+	mir_sntprintf(def_color, SIZEOF(def_color), _T("%6.6x"), clr);

 	GetPrivateProfileString(szItem, _T("Color1"), def_color, buffer, 400, m_tszFileName);

 	this_item->COLOR = HexStringToLong(buffer);

 

 	clr = RGB(GetBValue(defaults->COLOR2), GetGValue(defaults->COLOR2), GetRValue(defaults->COLOR2));

-	mir_sntprintf(def_color, 15, _T("%6.6x"), clr);

+	mir_sntprintf(def_color, SIZEOF(def_color), _T("%6.6x"), clr);

 	GetPrivateProfileString(szItem, _T("Color2"), def_color, buffer, 400, m_tszFileName);

 	this_item->COLOR2 = HexStringToLong(buffer);

 

@@ -1313,7 +1313,7 @@ void CSkin::ReadImageItem(const TCHAR *itemname)
 

 	// handle the assignments of image items to skin items

 	for (int n = 0;; n++) {

-		mir_sntprintf(szItemNr, 30, _T("Item%d"), n);

+		mir_sntprintf(szItemNr, SIZEOF(szItemNr), _T("Item%d"), n);

 		GetPrivateProfileString(itemname, szItemNr, _T("None"), buffer, 500, m_tszFileName);

 		if (!_tcscmp(buffer, _T("None")))

 			break;

@@ -1478,7 +1478,7 @@ void CSkin::Load(void)
 	GetPrivateProfileString(_T("Theme"), _T("File"), _T("None"), buffer, MAX_PATH, m_tszFileName);

 

 	_tsplitpath(m_tszFileName, szDrive, szPath, NULL, NULL);

-	mir_sntprintf(szFinalName, MAX_PATH, _T("%s\\%s\\%s"), szDrive, szPath, buffer);

+	mir_sntprintf(szFinalName, SIZEOF(szFinalName), _T("%s\\%s\\%s"), szDrive, szPath, buffer);

 	if (PathFileExists(szFinalName)) {

 		ReadThemeFromINI(szFinalName, 0, FALSE, m_fLoadOnStartup ? 0 : M.GetByte("skin_loadmode", 0));

 		CacheLogFonts();

@@ -1676,9 +1676,9 @@ void CSkin::setupAeroSkins()
 

 	// load unknown avatar..

 	if (0 == PluginConfig.g_hbmUnknown) {

-		mir_sntprintf(tszFilename, MAX_PATH, _T("%scustom_unknown.png"), tszBasePath);

+		mir_sntprintf(tszFilename, SIZEOF(tszFilename), _T("%scustom_unknown.png"), tszBasePath);

 		if (!PathFileExists(tszFilename))

-			mir_sntprintf(tszFilename, MAX_PATH, _T("%sunknown.png"), tszBasePath);

+			mir_sntprintf(tszFilename, SIZEOF(tszFilename), _T("%sunknown.png"), tszBasePath);

 		PluginConfig.g_hbmUnknown = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_TCHAR);

 		if (PluginConfig.g_hbmUnknown == 0) {

 			HDC dc = GetDC(0);

@@ -1687,9 +1687,9 @@ void CSkin::setupAeroSkins()
 		}

 	}

 

-	mir_sntprintf(tszFilename, MAX_PATH, _T("%scustom_tabskin_aero.png"), tszBasePath);

+	mir_sntprintf(tszFilename, SIZEOF(tszFilename), _T("%scustom_tabskin_aero.png"), tszBasePath);

 	if (!PathFileExists(tszFilename))

-		mir_sntprintf(tszFilename, MAX_PATH, _T("%stabskin_aero.png"), tszBasePath);

+		mir_sntprintf(tszFilename, SIZEOF(tszFilename), _T("%stabskin_aero.png"), tszBasePath);

 

 	BOOL isOpaque = false;

 	if (CMimAPI::m_pfnDwmGetColorizationColor && M.isAero())

@@ -1774,9 +1774,9 @@ void CSkin::setupAeroSkins()
 	m_tabBottom->setMetrics(bm.bmWidth, bm.bmHeight);

 

 

-	mir_sntprintf(tszFilename, MAX_PATH, _T("%scustom_tabskin_aero_glow.png"), tszBasePath);

+	mir_sntprintf(tszFilename, SIZEOF(tszFilename), _T("%scustom_tabskin_aero_glow.png"), tszBasePath);

 	if (!PathFileExists(tszFilename))

-		mir_sntprintf(tszFilename, MAX_PATH, _T("%stabskin_aero_glow.png"), tszBasePath);

+		mir_sntprintf(tszFilename, SIZEOF(tszFilename), _T("%stabskin_aero_glow.png"), tszBasePath);

 

 	fib = (FIBITMAP *)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_TCHAR | IMGL_RETURNDIB);

 

@@ -1807,9 +1807,9 @@ void CSkin::setupAeroSkins()
 	m_tabGlowBottom->setMetrics(bm.bmWidth, bm.bmHeight);

 

 	// background item for the button switch bar

-	mir_sntprintf(tszFilename, MAX_PATH, _T("%scustom_tabskin_aero_button.png"), tszBasePath);

+	mir_sntprintf(tszFilename, SIZEOF(tszFilename), _T("%scustom_tabskin_aero_button.png"), tszBasePath);

 	if (!PathFileExists(tszFilename))

-		mir_sntprintf(tszFilename, MAX_PATH, _T("%stabskin_aero_button.png"), tszBasePath);

+		mir_sntprintf(tszFilename, SIZEOF(tszFilename), _T("%stabskin_aero_button.png"), tszBasePath);

 

 	hbm = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)tszFilename, IMGL_TCHAR);

 

diff --git a/plugins/TabSRMM/src/themes.h b/plugins/TabSRMM/src/themes.h
index 434ec1d87e..1dbe7b9dfe 100644
--- a/plugins/TabSRMM/src/themes.h
+++ b/plugins/TabSRMM/src/themes.h
@@ -94,7 +94,7 @@ public:
 	CImageItem(const TCHAR *szName)

 	{

 		memset(this, 0, sizeof(CImageItem));

-		mir_sntprintf(m_szName, 40, szName);

+		mir_sntprintf(m_szName, SIZEOF(m_szName), szName);

 		m_szName[39] = 0;

 	}

 

diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 5a75484758..31eb776712 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -91,7 +91,7 @@ static void TrayAnimThread(LPVOID vParam)
 void TSAPI CreateTrayMenus(int mode)

 {

 	if (mode) {

-		mir_sntprintf(g_eventName, 100, _T("tsr_evt_%d"), GetCurrentThreadId());

+		mir_sntprintf(g_eventName, SIZEOF(g_eventName), _T("tsr_evt_%d"), GetCurrentThreadId());

 		g_hEvent = CreateEvent(NULL, FALSE, FALSE, g_eventName);

 		isAnimThreadRunning = TRUE;

 		hTrayAnimThread = mir_forkthread(TrayAnimThread, NULL);

diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index 1258284c44..cf5863ec1c 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -135,13 +135,13 @@ search_again:
 

 						TCHAR szTemp[5];

 						message.insert(beginmark, _T("cxxx "));

-						mir_sntprintf(szTemp, 4, _T("%02d"), MSGDLGFONTCOUNT + 13 + ii);

+						mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%02d"), MSGDLGFONTCOUNT + 13 + ii);

 						message[beginmark + 3] = szTemp[0];

 						message[beginmark + 4] = szTemp[1];

 						clr_found = true;

 						if (was_added) {

 							TCHAR wszTemp[100];

-							mir_sntprintf(wszTemp, 100, _T("##col##%06u:%04u"), endmark - closing, ii);

+							mir_sntprintf(wszTemp, SIZEOF(wszTemp), _T("##col##%06u:%04u"), endmark - closing, ii);

 							wszTemp[99] = 0;

 							message.insert(beginmark, wszTemp);

 						}

@@ -941,7 +941,7 @@ bool Utils::extractResource(const HMODULE h, const UINT uID, const TCHAR *tszNam
 			DWORD	dwSize = SizeofResource(g_hInst, hRes), written = 0;

 

 			TCHAR	szFilename[MAX_PATH];

-			mir_sntprintf(szFilename, MAX_PATH, _T("%s%s"), tszPath, tszFilename);

+			mir_sntprintf(szFilename, SIZEOF(szFilename), _T("%s%s"), tszPath, tszFilename);

 			if (!fForceOverwrite)

 				if (PathFileExists(szFilename))

 					return true;

@@ -1331,7 +1331,7 @@ INT_PTR CALLBACK CWarning::dlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			::SendDlgItemMessage(hwnd, IDC_WARNTEXT, EM_AUTOURLDETECT, TRUE, 0);

 			::SendDlgItemMessage(hwnd, IDC_WARNTEXT, EM_SETEVENTMASK, 0, ENM_LINK);

 

-			mir_sntprintf(temp, 1024, RTF_DEFAULT_HEADER, 0, 0, 0, 30*15);

+			mir_sntprintf(temp, SIZEOF(temp), RTF_DEFAULT_HEADER, 0, 0, 0, 30*15);

 			tstring *str = new tstring(temp);

 

 			str->append(m_szText);