new mir_sntprintf templates without SIZEOF

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

21 files changed, 60 insertions, 60 deletions

diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp
index 284499ef98..3537b61689 100644
--- a/src/core/stdchat/src/tools.cpp
+++ b/src/core/stdchat/src/tools.cpp
@@ -144,7 +144,7 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO
 	else if (iIndex == 0) {

 		TCHAR szTemp[50];

 		if (pszWordText)

-			mir_sntprintf(szTemp, SIZEOF(szTemp), TranslateT("&Message %s"), pszWordText);

+			mir_sntprintf(szTemp, TranslateT("&Message %s"), pszWordText);

 		else

 			mir_tstrncpy(szTemp, TranslateT("&Message"), SIZEOF(szTemp) - 1);

 

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index e8e9071dd4..a710d2be23 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -1315,17 +1315,17 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 			TCHAR szTemp[100];

 			switch(si->iType) {

 			case GCW_CHATROOM:

-				mir_sntprintf(szTemp, SIZEOF(szTemp),

+				mir_sntprintf(szTemp,

 					(si->nUsersInNicklist == 1) ? TranslateT("%s: chat room (%u user)") : TranslateT("%s: chat room (%u users)"),

 					si->ptszName, si->nUsersInNicklist);

 				break;

 			case GCW_PRIVMESS:

-				mir_sntprintf(szTemp, SIZEOF(szTemp),

+				mir_sntprintf(szTemp,

 					(si->nUsersInNicklist == 1) ? TranslateT("%s: message session") : TranslateT("%s: message session (%u users)"),

 					si->ptszName, si->nUsersInNicklist);

 				break;

 			case GCW_SERVER:

-				mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%s: Server"), si->ptszName);

+				mir_sntprintf(szTemp, _T("%s: Server"), si->ptszName);

 				break;

 			}

 			SetWindowText(hwndDlg, szTemp);

@@ -2436,7 +2436,7 @@ LABEL_SHOWWINDOW:
 					ValidateFilename(szName);

 

 					mir_sntprintf(szFolder, SIZEOF(szFolder), _T("%s\\%s"), g_Settings.pszLogDir, szName);

-					mir_sntprintf(szName, SIZEOF(szName), _T("%s.log"), si->ptszID);

+					mir_sntprintf(szName, _T("%s.log"), si->ptszID);

 					ValidateFilename(szName);

 

 					mir_sntprintf(szFile, SIZEOF(szFile), _T("%s\\%s"), szFolder, szName);

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index a04e8ee3ca..5b04d948dc 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -96,12 +96,12 @@ static void AddToFileList(TCHAR ***pppFiles, int *totalCount, const TCHAR* szFil
 	if (GetFileAttributes(szFilename) & FILE_ATTRIBUTE_DIRECTORY) {

 		WIN32_FIND_DATA fd;

 		TCHAR szPath[MAX_PATH];

-		mir_sntprintf(szPath, SIZEOF(szPath), _T("%s\\*"), szFilename);

+		mir_sntprintf(szPath, _T("%s\\*"), szFilename);

 		HANDLE hFind = FindFirstFile(szPath, &fd);

 		if (hFind != INVALID_HANDLE_VALUE) {

 			do {

 				if (!mir_tstrcmp(fd.cFileName, _T(".")) || !mir_tstrcmp(fd.cFileName, _T(".."))) continue;

-				mir_sntprintf(szPath, SIZEOF(szPath), _T("%s\\%s"), szFilename, fd.cFileName);

+				mir_sntprintf(szPath, _T("%s\\%s"), szFilename, fd.cFileName);

 				AddToFileList(pppFiles, totalCount, szPath);

 			}

 			while (FindNextFile(hFind, &fd));

@@ -122,7 +122,7 @@ static void UpdateReadChars(HWND hwndDlg, HWND hwndStatus)
 		TCHAR buf[32];

 		int len = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_MESSAGE));

 

-		mir_sntprintf(buf, SIZEOF(buf), _T("%d"), len);

+		mir_sntprintf(buf, _T("%d"), len);

 		SendMessage(hwndStatus, SB_SETTEXT, 1, (LPARAM)buf);

 	}

 }

@@ -955,7 +955,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					break;

 

 				case CNFT_DWORD:

-					mir_sntprintf(buf, SIZEOF(buf), _T("%u"), ci.dVal);

+					mir_sntprintf(buf, _T("%u"), ci.dVal);

 					break;

 				}

 			}

@@ -1061,7 +1061,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 							mir_free(ci.pszVal);

 							break;

 						case CNFT_DWORD:

-							mir_sntprintf(buf, SIZEOF(buf), _T("%u"), ci.dVal);

+							mir_sntprintf(buf, _T("%u"), ci.dVal);

 							break;

 						}

 					}

diff --git a/src/mir_core/src/ui_utils.cpp b/src/mir_core/src/ui_utils.cpp
index d4c69d53c0..fc87ed95fb 100644
--- a/src/mir_core/src/ui_utils.cpp
+++ b/src/mir_core/src/ui_utils.cpp
@@ -2369,7 +2369,7 @@ void CCtrlBase::SetTextA(const char *text)
 void CCtrlBase::SetInt(int value)

 {

 	TCHAR buf[32] = { 0 };

-	mir_sntprintf(buf, SIZEOF(buf), _T("%d"), value);

+	mir_sntprintf(buf, _T("%d"), value);

 	SetWindowText(m_hwnd, buf);

 }

 

diff --git a/src/modules/chat/chat_rtf.cpp b/src/modules/chat/chat_rtf.cpp
index 8373a833d5..255a051ef9 100644
--- a/src/modules/chat/chat_rtf.cpp
+++ b/src/modules/chat/chat_rtf.cpp
@@ -116,7 +116,7 @@ int DoRtfToTags(CMString &pszText, int iNumColors, COLORREF *pColors)
 			else if (!_tcsncmp(p, _T("\\highlight"), 10)) { //background color
 				TCHAR szTemp[20];
 				int iCol = _ttoi(p + 10);
-				mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%d"), iCol);
+				mir_sntprintf(szTemp, _T("%d"), iCol);
 			}
 			else if (!_tcsncmp(p, _T("\\line"), 5)) { // soft line break;
 				res.AppendChar('\n');
@@ -196,8 +196,8 @@ int DoRtfToTags(CMString &pszText, int iNumColors, COLORREF *pColors)
 		}
 	}
 
-	if (bInsideUl)

-		res.Append(_T("[/u]"));

+	if (bInsideUl)
+		res.Append(_T("[/u]"));
 
 	pszText = res;
 	return TRUE;
diff --git a/src/modules/chat/chat_svc.cpp b/src/modules/chat/chat_svc.cpp
index 168a786d62..31b0fc9080 100644
--- a/src/modules/chat/chat_svc.cpp
+++ b/src/modules/chat/chat_svc.cpp
@@ -233,7 +233,7 @@ static INT_PTR Service_NewChat(WPARAM, LPARAM lParam)
 
 		TCHAR szTemp[256];
 		if (si->iType == GCW_SERVER)
-			mir_sntprintf(szTemp, SIZEOF(szTemp), _T("Server: %s"), si->ptszName);
+			mir_sntprintf(szTemp, _T("Server: %s"), si->ptszName);
 		else
 			_tcsncpy_s(szTemp, si->ptszName, _TRUNCATE);
 		si->hContact = ci.AddRoom(gcw->pszModule, gcw->ptszID, szTemp, si->iType);
diff --git a/src/modules/chat/log.cpp b/src/modules/chat/log.cpp
index 59c37ff1c1..4ad98b44eb 100644
--- a/src/modules/chat/log.cpp
+++ b/src/modules/chat/log.cpp
@@ -232,7 +232,7 @@ static void AddEventToBuffer(char *&buffer, size_t &bufferEnd, size_t &bufferAll
 		else mir_tstrncpy(szTemp2, streamData->lin->ptszNick, 511);

 

 		if (streamData->lin->ptszUserInfo)

-			mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%s (%s)"), szTemp2, streamData->lin->ptszUserInfo);

+			mir_sntprintf(szTemp, _T("%s (%s)"), szTemp2, streamData->lin->ptszUserInfo);

 		else

 			_tcsncpy_s(szTemp, szTemp2, _TRUNCATE);

 		pszNick = szTemp;

diff --git a/src/modules/chat/tools.cpp b/src/modules/chat/tools.cpp
index fd4044515f..b91686d538 100644
--- a/src/modules/chat/tools.cpp
+++ b/src/modules/chat/tools.cpp
@@ -487,7 +487,7 @@ BOOL LogToFile(SESSION_INFO *si, GCEVENT *gce)
 		else mir_tstrncpy(szTemp2, gce->ptszNick, 511);

 

 		if (gce->ptszUserInfo)

-			mir_sntprintf(szTemp, SIZEOF(szTemp), _T("%s (%s)"), szTemp2, gce->ptszUserInfo);

+			mir_sntprintf(szTemp, _T("%s (%s)"), szTemp2, gce->ptszUserInfo);

 		else

 			_tcsncpy_s(szTemp, szTemp2, _TRUNCATE);

 		pszNick = szTemp;

@@ -497,52 +497,52 @@ BOOL LogToFile(SESSION_INFO *si, GCEVENT *gce)
 	case GC_EVENT_MESSAGE:

 	case GC_EVENT_MESSAGE | GC_EVENT_HIGHLIGHT:

 		p = '*';

-		mir_sntprintf(szBuffer, SIZEOF(szBuffer), _T("%s: %s"), gce->ptszNick, ci.RemoveFormatting(gce->ptszText));

+		mir_sntprintf(szBuffer, _T("%s: %s"), gce->ptszNick, ci.RemoveFormatting(gce->ptszText));

 		break;

 	case GC_EVENT_ACTION:

 	case GC_EVENT_ACTION | GC_EVENT_HIGHLIGHT:

 		p = '*';

-		mir_sntprintf(szBuffer, SIZEOF(szBuffer), _T("%s %s"), gce->ptszNick, ci.RemoveFormatting(gce->ptszText));

+		mir_sntprintf(szBuffer, _T("%s %s"), gce->ptszNick, ci.RemoveFormatting(gce->ptszText));

 		break;

 	case GC_EVENT_JOIN:

 		p = '>';

-		mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has joined"), pszNick);

+		mir_sntprintf(szBuffer, TranslateT("%s has joined"), pszNick);

 		break;

 	case GC_EVENT_PART:

 		p = '<';

 		if (!gce->ptszText)

-			mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has left"), pszNick);

+			mir_sntprintf(szBuffer, TranslateT("%s has left"), pszNick);

 		else

-			mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has left (%s)"), pszNick, ci.RemoveFormatting(gce->ptszText));

+			mir_sntprintf(szBuffer, TranslateT("%s has left (%s)"), pszNick, ci.RemoveFormatting(gce->ptszText));

 		break;

 	case GC_EVENT_QUIT:

 		p = '<';

 		if (!gce->ptszText)

-			mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has disconnected"), pszNick);

+			mir_sntprintf(szBuffer, TranslateT("%s has disconnected"), pszNick);

 		else

-			mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s has disconnected (%s)"), pszNick, ci.RemoveFormatting(gce->ptszText));

+			mir_sntprintf(szBuffer, TranslateT("%s has disconnected (%s)"), pszNick, ci.RemoveFormatting(gce->ptszText));

 		break;

 	case GC_EVENT_NICK:

 		p = '^';

-		mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s is now known as %s"), gce->ptszNick, gce->ptszText);

+		mir_sntprintf(szBuffer, TranslateT("%s is now known as %s"), gce->ptszNick, gce->ptszText);

 		break;

 	case GC_EVENT_KICK:

 		p = '~';

 		if (!gce->ptszText)

-			mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s kicked %s"), gce->ptszStatus, gce->ptszNick);

+			mir_sntprintf(szBuffer, TranslateT("%s kicked %s"), gce->ptszStatus, gce->ptszNick);

 		else

-			mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s kicked %s (%s)"), gce->ptszStatus, gce->ptszNick, ci.RemoveFormatting(gce->ptszText));

+			mir_sntprintf(szBuffer, TranslateT("%s kicked %s (%s)"), gce->ptszStatus, gce->ptszNick, ci.RemoveFormatting(gce->ptszText));

 		break;

 	case GC_EVENT_NOTICE:

 		p = 'o';

-		mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("Notice from %s: %s"), gce->ptszNick, ci.RemoveFormatting(gce->ptszText));

+		mir_sntprintf(szBuffer, TranslateT("Notice from %s: %s"), gce->ptszNick, ci.RemoveFormatting(gce->ptszText));

 		break;

 	case GC_EVENT_TOPIC:

 		p = '#';

 		if (!gce->ptszNick)

-			mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("The topic is '%s'"), ci.RemoveFormatting(gce->ptszText));

+			mir_sntprintf(szBuffer, TranslateT("The topic is '%s'"), ci.RemoveFormatting(gce->ptszText));

 		else

-			mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("The topic is '%s' (set by %s)"), ci.RemoveFormatting(gce->ptszText), gce->ptszNick);

+			mir_sntprintf(szBuffer, TranslateT("The topic is '%s' (set by %s)"), ci.RemoveFormatting(gce->ptszText), gce->ptszNick);

 		break;

 	case GC_EVENT_INFORMATION:

 		p = '!';

@@ -550,11 +550,11 @@ BOOL LogToFile(SESSION_INFO *si, GCEVENT *gce)
 		break;

 	case GC_EVENT_ADDSTATUS:

 		p = '+';

-		mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s enables '%s' status for %s"), gce->ptszText, gce->ptszStatus, gce->ptszNick);

+		mir_sntprintf(szBuffer, TranslateT("%s enables '%s' status for %s"), gce->ptszText, gce->ptszStatus, gce->ptszNick);

 		break;

 	case GC_EVENT_REMOVESTATUS:

 		p = '-';

-		mir_sntprintf(szBuffer, SIZEOF(szBuffer), TranslateT("%s disables '%s' status for %s"), gce->ptszText, gce->ptszStatus, gce->ptszNick);

+		mir_sntprintf(szBuffer, TranslateT("%s disables '%s' status for %s"), gce->ptszText, gce->ptszStatus, gce->ptszNick);

 		break;

 	}

 

diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp
index 74207f06e8..f82cfa27a7 100644
--- a/src/modules/clist/clcutils.cpp
+++ b/src/modules/clist/clcutils.cpp
@@ -59,7 +59,7 @@ TCHAR* fnGetGroupCountsText(struct ClcData *dat, ClcContact *contact)
 		return _T("");

 

 	static TCHAR szName[32];

-	mir_sntprintf(szName, SIZEOF(szName), _T("(%u/%u)"), onlineCount, totalCount);

+	mir_sntprintf(szName, _T("(%u/%u)"), onlineCount, totalCount);

 	return szName;

 }

 

diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp
index b81968aee8..a2ab028c3a 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/modules/clist/clistmenus.cpp
@@ -555,7 +555,7 @@ INT_PTR StatusMenuExecService(WPARAM wParam, LPARAM)
 		if (bIsLocked) {

 			pimi->mi.flags |= CMIF_CHECKED;

 			if (cli.bDisplayLocked) {

-				mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s (locked)"), acc->tszAccountName);

+				mir_sntprintf(buf, TranslateT("%s (locked)"), acc->tszAccountName);

 				ptszName = buf;

 			}

 			else ptszName = acc->tszAccountName;

@@ -974,7 +974,7 @@ void RebuildMenuOrder(void)
 				TCHAR buf[256], hotkeyName[100];

 				WORD hotKey = GetHotkeyValue(statusHotkeys[j]);

 				HotkeyToName(hotkeyName, SIZEOF(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey));

-				mir_sntprintf(buf, SIZEOF(buf), _T("%s\t%s"),

+				mir_sntprintf(buf, _T("%s\t%s"),

 					cli.pfnGetStatusModeDescription(statusModeList[j], 0), hotkeyName);

 				tmi.ptszName = buf;

 				tmi.hotKey = MAKELONG(HIBYTE(hotKey), LOBYTE(hotKey));

@@ -1004,7 +1004,7 @@ static int sttRebuildHotkeys(WPARAM, LPARAM)
 		TCHAR buf[256], hotkeyName[100];

 		WORD hotKey = GetHotkeyValue(statusHotkeys[j]);

 		HotkeyToName(hotkeyName, SIZEOF(hotkeyName), HIBYTE(hotKey), LOBYTE(hotKey));

-		mir_sntprintf(buf, SIZEOF(buf), _T("%s\t%s"), cli.pfnGetStatusModeDescription(statusModeList[j], 0), hotkeyName);

+		mir_sntprintf(buf, _T("%s\t%s"), cli.pfnGetStatusModeDescription(statusModeList[j], 0), hotkeyName);

 		tmi.ptszName = buf;

 		tmi.hotKey = MAKELONG(HIBYTE(hotKey), LOBYTE(hotKey));

 		MO_ModifyMenuItem(hStatusMainMenuHandles[j], &tmi);

diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp
index c0106c2678..0fdb7f7174 100644
--- a/src/modules/database/database.cpp
+++ b/src/modules/database/database.cpp
@@ -202,14 +202,14 @@ static void moveProfileDirProfiles(TCHAR *profiledir, BOOL isRootDir = TRUE)
 			mir_sntprintf(path2, SIZEOF(path2), _T("%s\\%s\\%s"), profiledir, profile, ffd.cFileName);

 			if (_taccess(path2, 0) == 0) {

 				TCHAR buf[512];

-				mir_sntprintf(buf, SIZEOF(buf),

+				mir_sntprintf(buf,

 					TranslateT("Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s\nBecause profile with this name already exists. Please resolve the issue manually."),

 					path, path2);

 				MessageBox(NULL, buf, _T("Miranda NG"), MB_ICONERROR | MB_OK);

 			}

 			else if (MoveFile(path, path2) == 0) {

 				TCHAR buf[512];

-				mir_sntprintf(buf, SIZEOF(buf),

+				mir_sntprintf(buf,

 					TranslateT("Miranda is trying to upgrade your profile structure.\nIt cannot move profile %s to the new location %s automatically\nMost likely this is due to insufficient privileges. Please move profile manually."),

 					path, path2);

 				MessageBox(NULL, buf, _T("Miranda NG"), MB_ICONERROR | MB_OK);

@@ -494,7 +494,7 @@ int LoadDatabaseModule(void)
 	if (arDbPlugins.getCount() == 0) {

 		TCHAR buf[256];

 		TCHAR *p = _tcsrchr(szProfile, '\\');

-		mir_sntprintf(buf, SIZEOF(buf), TranslateT("Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll"), p ? ++p : szProfile);

+		mir_sntprintf(buf, TranslateT("Miranda is unable to open '%s' because you do not have any profile plugins installed.\nYou need to install dbx_mmap.dll"), p ? ++p : szProfile);

 		MessageBox(0, buf, TranslateT("No profile support installed!"), MB_OK | MB_ICONERROR);

 	}

 

@@ -514,13 +514,13 @@ int LoadDatabaseModule(void)
 				// file isn't locked, just no driver could open it.

 				TCHAR buf[256];

 				TCHAR *p = _tcsrchr(szProfile, '\\');

-				mir_sntprintf(buf, SIZEOF(buf), TranslateT("Miranda was unable to open '%s', it's in an unknown format.\nThis profile might also be damaged, please run DbChecker which should be installed."), p ? ++p : szProfile);

+				mir_sntprintf(buf, TranslateT("Miranda was unable to open '%s', it's in an unknown format.\nThis profile might also be damaged, please run DbChecker which should be installed."), p ? ++p : szProfile);

 				MessageBox(0, buf, TranslateT("Miranda can't understand that profile"), MB_OK | MB_ICONERROR);

 			}

 			else if (!FindMirandaForProfile(szProfile)) {

 				TCHAR buf[256];

 				TCHAR *p = _tcsrchr(szProfile, '\\');

-				mir_sntprintf(buf, SIZEOF(buf), TranslateT("Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance"), p ? ++p : szProfile);

+				mir_sntprintf(buf, TranslateT("Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance"), p ? ++p : szProfile);

 				retry = MessageBox(0, buf, TranslateT("Miranda can't open that profile"), MB_RETRYCANCEL | MB_ICONERROR) == IDRETRY;

 			}

 		}

diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp
index be17cf1416..d972d8cfd2 100644
--- a/src/modules/database/dbini.cpp
+++ b/src/modules/database/dbini.cpp
@@ -396,7 +396,7 @@ LBL_NewLine:
 			break;

 		default:

 			TCHAR buf[250];

-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("Invalid setting type for '%s'. The first character of every value must be b, w, d, l, s, e, u, g, h or n."), _A2T(szName));

+			mir_sntprintf(buf, TranslateT("Invalid setting type for '%s'. The first character of every value must be b, w, d, l, s, e, u, g, h or n."), _A2T(szName));

 			MessageBox(NULL, buf, TranslateT("Install database settings"), MB_ICONWARNING | MB_OK);

 			break;

 		}

diff --git a/src/modules/database/profilemanager.cpp b/src/modules/database/profilemanager.cpp
index 742f181d7a..0dc3c75304 100644
--- a/src/modules/database/profilemanager.cpp
+++ b/src/modules/database/profilemanager.cpp
@@ -55,7 +55,7 @@ static int findProfiles(TCHAR *szProfileDir, ENUMPROFILECALLBACK callback, LPARA
 		// find all subfolders except "." and ".."
 		if ((ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && mir_tstrcmp(ffd.cFileName, _T(".")) && mir_tstrcmp(ffd.cFileName, _T(".."))) {
 			TCHAR buf[MAX_PATH], profile[MAX_PATH];
-			mir_sntprintf(buf, SIZEOF(buf), _T("%s\\%s\\%s.dat"), szProfileDir, ffd.cFileName, ffd.cFileName);
+			mir_sntprintf(buf, _T("%s\\%s\\%s.dat"), szProfileDir, ffd.cFileName, ffd.cFileName);
 			if (_taccess(buf, 0) == 0) {
 				mir_sntprintf(profile, SIZEOF(profile), _T("%s.dat"), ffd.cFileName);
 				if (!callback(buf, profile, lParam))
@@ -93,7 +93,7 @@ class CCreateProfileDlg : public CDlgBase
 		if (file) file++;
 		if (_taccess(profile, 0) == 0) {
 			// file already exists!
-			mir_sntprintf(buf, SIZEOF(buf),
+			mir_sntprintf(buf,
 				TranslateT("The profile '%s' already exists. Do you want to move it to the Recycle Bin?\n\nWARNING: The profile will be deleted if Recycle Bin is disabled.\nWARNING: A profile may contain confidential information and should be properly deleted."),
 				file);
 			if (MessageBox(m_hwnd, buf, TranslateT("The profile already exists"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON2) != IDYES)
@@ -104,9 +104,9 @@ class CCreateProfileDlg : public CDlgBase
 			sf.wFunc = FO_DELETE;
 			sf.pFrom = buf;
 			sf.fFlags = FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT | FOF_ALLOWUNDO;
-			mir_sntprintf(buf, SIZEOF(buf), _T("%s\0"), profile);
+			mir_sntprintf(buf, _T("%s\0"), profile);
 			if (SHFileOperation(&sf) != 0) {
-				mir_sntprintf(buf, SIZEOF(buf), TranslateT("Couldn't move '%s' to the Recycle Bin. Please select another profile name."), file);
+				mir_sntprintf(buf, TranslateT("Couldn't move '%s' to the Recycle Bin. Please select another profile name."), file);
 				MessageBox(m_hwnd, buf, TranslateT("Problem moving profile"), MB_ICONINFORMATION | MB_OK);
 				return 0;
 			}
@@ -115,7 +115,7 @@ class CCreateProfileDlg : public CDlgBase
 		// ask the database to create the profile
 		CreatePathToFileT(profile);
 		if ((err = link->makeDatabase(profile)) != ERROR_SUCCESS) {
-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("Unable to create the profile '%s', the error was %x"), file, err);
+			mir_sntprintf(buf, TranslateT("Unable to create the profile '%s', the error was %x"), file, err);
 			MessageBox(m_hwnd, buf, TranslateT("Problem creating profile"), MB_ICONERROR | MB_OK);
 			return 0;
 		}
diff --git a/src/modules/findadd/searchresults.cpp b/src/modules/findadd/searchresults.cpp
index f1b149740c..9b8db18ff0 100644
--- a/src/modules/findadd/searchresults.cpp
+++ b/src/modules/findadd/searchresults.cpp
@@ -182,7 +182,7 @@ static void BeginSearchFailed(void * arg)
 	TCHAR buf[128];

 	if (arg != NULL) {

 		const TCHAR* protoName = (TCHAR*)arg;

-		mir_sntprintf(buf, SIZEOF(buf),

+		mir_sntprintf(buf,

 			TranslateT("Could not start a search on '%s', there was a problem - is %s connected?"),

 			protoName, protoName);

 		mir_free((char*)arg);

diff --git a/src/modules/metacontacts/meta_addto.cpp b/src/modules/metacontacts/meta_addto.cpp
index 4369b3265c..575ecbcb55 100644
--- a/src/modules/metacontacts/meta_addto.cpp
+++ b/src/modules/metacontacts/meta_addto.cpp
@@ -154,7 +154,7 @@ static INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wPa
 

 			// ... and set it to the Window title.

 			TCHAR buf[256];

-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("Adding %s..."), ptszCDN);

+			mir_sntprintf(buf, TranslateT("Adding %s..."), ptszCDN);

 			SetWindowText(hwndDlg, buf);

 		}

 		ShowWindow(hwndDlg, SW_SHOWNORMAL);

diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp
index 0c668e50d2..61e3f3775f 100644
--- a/src/modules/options/options.cpp
+++ b/src/modules/options/options.cpp
@@ -299,9 +299,9 @@ static LRESULT CALLBACK OptionsFilterSubclassProc(HWND hWnd, UINT message, WPARA
 

 	TCHAR buf[255];

 	if (bSearchState == 1 && FilterLoadProgress < 100 && FilterLoadProgress > 0)

-		mir_sntprintf(buf, SIZEOF(buf), TranslateT("Loading... %d%%"), FilterLoadProgress);

+		mir_sntprintf(buf, TranslateT("Loading... %d%%"), FilterLoadProgress);

 	else

-		mir_sntprintf(buf, SIZEOF(buf), TranslateT("Search"));

+		mir_sntprintf(buf, TranslateT("Search"));

 

 	bool bDrawnByTheme = false;

 

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index 16f17dfed1..6eccaa8059 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -467,7 +467,7 @@ int isPluginOnWhiteList(const TCHAR* pluginname)
 	int rc = db_get_b(NULL, PLUGINDISABLELIST, _strlwr(_T2A(pluginname)), 0);

 	if (rc != 0 && askAboutIgnoredPlugins) {

 		TCHAR buf[256];

-		mir_sntprintf(buf, SIZEOF(buf), TranslateT("'%s' is disabled, re-enable?"), pluginname);

+		mir_sntprintf(buf, TranslateT("'%s' is disabled, re-enable?"), pluginname);

 		if (MessageBox(NULL, buf, TranslateT("Re-enable Miranda plugin?"), MB_YESNO | MB_ICONQUESTION) == IDYES) {

 			SetPluginOnWhiteList(pluginname, 1);

 			rc = 0;

diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp
index 1775aad6ac..9200d04bd1 100644
--- a/src/modules/plugins/pluginopts.cpp
+++ b/src/modules/plugins/pluginopts.cpp
@@ -61,7 +61,7 @@ static LIST<PluginListItemData> arPluginList(10, sttSortPlugins);
 static BOOL dialogListPlugins(WIN32_FIND_DATA *fd, TCHAR *path, WPARAM, LPARAM lParam)

 {

 	TCHAR buf[MAX_PATH];

-	mir_sntprintf(buf, SIZEOF(buf), _T("%s\\Plugins\\%s"), path, fd->cFileName);

+	mir_sntprintf(buf, _T("%s\\Plugins\\%s"), path, fd->cFileName);

 	HINSTANCE hInst = GetModuleHandle(buf);

 

 	BASIC_PLUGIN_INFO pi;

@@ -136,12 +136,12 @@ static BOOL dialogListPlugins(WIN32_FIND_DATA *fd, TCHAR *path, WPARAM, LPARAM l
 			void *pVerInfo = mir_alloc(verInfoSize);

 			GetFileVersionInfo(buf, 0, verInfoSize, pVerInfo);

 			VerQueryValue(pVerInfo, _T("\\"), (LPVOID*)&fi, &blockSize);

-			mir_sntprintf(buf, SIZEOF(buf), _T("%d.%d.%d.%d"), HIWORD(fi->dwProductVersionMS),

+			mir_sntprintf(buf, _T("%d.%d.%d.%d"), HIWORD(fi->dwProductVersionMS),

 				LOWORD(fi->dwProductVersionMS), HIWORD(fi->dwProductVersionLS), LOWORD(fi->dwProductVersionLS));

 			mir_free(pVerInfo);

 		}

 		else

-			mir_sntprintf(buf, SIZEOF(buf), _T("%d.%d.%d.%d"), HIBYTE(HIWORD(pi.pluginInfo->version)),

+			mir_sntprintf(buf, _T("%d.%d.%d.%d"), HIBYTE(HIWORD(pi.pluginInfo->version)),

 				LOBYTE(HIWORD(pi.pluginInfo->version)), HIBYTE(LOWORD(pi.pluginInfo->version)),

 				LOBYTE(LOWORD(pi.pluginInfo->version)));

 

diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp
index c276a62ca1..35b59d11bb 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/modules/protocols/protoopts.cpp
@@ -785,7 +785,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 						DWORD dwStatus = CallProtoServiceInt(NULL, pa->szModuleName, PS_GETSTATUS, 0, 0);

 						if (dwStatus >= ID_STATUS_ONLINE) {

 							TCHAR buf[200];

-							mir_sntprintf(buf, SIZEOF(buf), TranslateT("Account %s is being disabled"), pa->tszAccountName);

+							mir_sntprintf(buf, TranslateT("Account %s is being disabled"), pa->tszAccountName);

 							if (IDNO == ::MessageBox(hwndDlg,

 								TranslateT("Account is online. Disable account?"),

 								buf, MB_ICONWARNING | MB_DEFBUTTON2 | MB_YESNO)) {

@@ -845,7 +845,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 			if (idx != -1) {

 				pa = (PROTOACCOUNT*)ListBox_GetItemData(hwndList, idx);

 				TCHAR buf[200];

-				mir_sntprintf(buf, SIZEOF(buf), TranslateT("Account %s is being deleted"), pa->tszAccountName);

+				mir_sntprintf(buf, TranslateT("Account %s is being deleted"), pa->tszAccountName);

 				if (pa->bOldProto) {

 					MessageBox(hwndDlg, TranslateT("You need to disable plugin to delete this account"), buf, MB_ICONERROR | MB_OK);

 					break;

diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp
index 1d38355389..1b95f807ed 100644
--- a/src/modules/skin/sounds.cpp
+++ b/src/modules/skin/sounds.cpp
@@ -385,7 +385,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 						SendMessage(hwndDlg, DM_HIDEPANE, 0, 0);

 					else {

 						TCHAR buf[256];

-						mir_sntprintf(buf, SIZEOF(buf), _T("%s: %s"), arSounds[tvi.lParam].getSection(), arSounds[tvi.lParam].getDescr());

+						mir_sntprintf(buf, _T("%s: %s"), arSounds[tvi.lParam].getSection(), arSounds[tvi.lParam].getDescr());

 						SetDlgItemText(hwndDlg, IDC_NAMEVAL, buf);

 						if (arSounds[tvi.lParam].ptszTempFile)

 							SetDlgItemText(hwndDlg, IDC_LOCATION, arSounds[tvi.lParam].ptszTempFile);

diff --git a/src/modules/utils/enterstring.cpp b/src/modules/utils/enterstring.cpp
index 84adf3a1e4..c7fd4b4001 100644
--- a/src/modules/utils/enterstring.cpp
+++ b/src/modules/utils/enterstring.cpp
@@ -143,7 +143,7 @@ static INT_PTR CALLBACK sttEnterStringDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		if (params->timeout > 0) {

 			SetTimer(hwndDlg, 1001, 1000, NULL);

 			TCHAR buf[128];

-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("OK (%d)"), params->timeout);

+			mir_sntprintf(buf, TranslateT("OK (%d)"), params->timeout);

 			SetDlgItemText(hwndDlg, IDOK, buf);

 		}

 

@@ -162,7 +162,7 @@ static INT_PTR CALLBACK sttEnterStringDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 

 		case 1001:

 			TCHAR buf[128];

-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("OK (%d)"), --params->timeout);

+			mir_sntprintf(buf, TranslateT("OK (%d)"), --params->timeout);

 			SetDlgItemText(hwndDlg, IDOK, buf);

 

 			if (params->timeout < 0) {