mir_sntprintf / mir_snprintf: obsoleted second parameter removed wherever possible

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

12 files changed, 63 insertions, 63 deletions

diff --git a/protocols/MRA/src/MraAdvancedSearch.cpp b/protocols/MRA/src/MraAdvancedSearch.cpp
index a8056de463..f793de682b 100644
--- a/protocols/MRA/src/MraAdvancedSearch.cpp
+++ b/protocols/MRA/src/MraAdvancedSearch.cpp
@@ -77,7 +77,7 @@ void InitComboBoxNumders(HWND hWndCombo, DWORD dwStart, DWORD dwEnd)
 

 	for (DWORD i = dwStart; i <= dwEnd; i++) {

 		TCHAR szBuff[MAX_PATH];

-		mir_sntprintf(szBuff, _countof(szBuff), _T("%lu"), i);

+		mir_sntprintf(szBuff, _T("%lu"), i);

 		DWORD dwItem = SendMessage(hWndCombo, CB_ADDSTRING, 0, (LPARAM)szBuff);

 		SendMessage(hWndCombo, CB_SETITEMDATA, dwItem, i);

 	}

diff --git a/protocols/MRA/src/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp
index 05ccb0ba1e..76339802f0 100644
--- a/protocols/MRA/src/MraAvatars.cpp
+++ b/protocols/MRA/src/MraAvatars.cpp
@@ -48,7 +48,7 @@ DWORD MraAvatarsHttpTransaction(HANDLE hConnection, DWORD dwRequestType, LPCSTR
 

 DWORD CMraProto::MraAvatarsQueueInitialize(HANDLE *phAvatarsQueueHandle)

 {

-	mir_snprintf(szAvtSectName, _countof(szAvtSectName), "%s Avatars", m_szModuleName);

+	mir_snprintf(szAvtSectName, "%s Avatars", m_szModuleName);

 

 	if (phAvatarsQueueHandle == NULL)

 		return ERROR_INVALID_HANDLE;

@@ -230,7 +230,7 @@ void CMraProto::MraAvatarsThreadProc(LPVOID lpParameter)
 							break;

 

 						default:

-							mir_sntprintf(szErrorText, _countof(szErrorText), TranslateT("Avatars: server return HTTP code: %lu"), dwResultCode);

+							mir_sntprintf(szErrorText, TranslateT("Avatars: server return HTTP code: %lu"), dwResultCode);

 							ShowFormattedErrorMessage(szErrorText, NO_ERROR);

 							break;

 						}

@@ -288,7 +288,7 @@ void CMraProto::MraAvatarsThreadProc(LPVOID lpParameter)
 								}

 								else {

 									dwErrorCode = GetLastError();

-									mir_sntprintf(szErrorText, _countof(szErrorText), TranslateT("Avatars: can't open file %s, error"), wszFileName);

+									mir_sntprintf(szErrorText, TranslateT("Avatars: can't open file %s, error"), wszFileName);

 									ShowFormattedErrorMessage(szErrorText, dwErrorCode);

 								}

 							}

@@ -375,7 +375,7 @@ DWORD MraAvatarsHttpTransaction(HANDLE hConnection, DWORD dwRequestType, LPCSTR
 	}

 

 	char szBuff[4096];

-	mir_snprintf(szBuff, _countof(szBuff), "http://%s/%s/%s/%s", lpszHost, lpszDomain, lpszUser, lpszReqObj);

+	mir_snprintf(szBuff, "http://%s/%s/%s/%s", lpszHost, lpszDomain, lpszUser, lpszReqObj);

 	CMStringA szSelfVersionString = MraGetSelfVersionString();

 

 	NETLIBHTTPHEADER nlbhHeaders[8] = { 0 };

@@ -473,7 +473,7 @@ DWORD CMraProto::MraAvatarsGetFileName(HANDLE hQueue, MCONTACT hContact, DWORD d
 		return ERROR_NOT_SUPPORTED;

 

 	TCHAR tszBase[MAX_PATH];

-	mir_sntprintf(tszBase, _countof(tszBase), _T("%s\\%s\\"), VARST(_T("%miranda_avatarcache%")), m_tszUserName);

+	mir_sntprintf(tszBase, _T("%s\\%s\\"), VARST(_T("%miranda_avatarcache%")), m_tszUserName);

 	res = tszBase;

 

 	// some path in buff and free space for file name is avaible

diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp
index cc7c1621cc..9ddef0f711 100644
--- a/protocols/MRA/src/MraFilesQueue.cpp
+++ b/protocols/MRA/src/MraFilesQueue.cpp
@@ -857,7 +857,7 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter)
 						}

 						else {// err allocating file disk space

 							dwRetErrorCode = GetLastError();

-							mir_sntprintf(szErrorText, _countof(szErrorText), TranslateT("Receive files: can't allocate disk space for file, size %lu bytes, error"), dat->pmfqfFiles[i].dwSize);

+							mir_sntprintf(szErrorText, TranslateT("Receive files: can't allocate disk space for file, size %lu bytes, error"), dat->pmfqfFiles[i].dwSize);

 							ShowFormattedErrorMessage(szErrorText, dwRetErrorCode);

 						}

 						CloseHandle(hFile);

@@ -870,7 +870,7 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter)
 					}

 					else {// err on open file

 						dwRetErrorCode = GetLastError();

-						mir_sntprintf(szErrorText, _countof(szErrorText), TranslateT("Receive files: can't open file %s, error"), wszFileName);

+						mir_sntprintf(szErrorText, TranslateT("Receive files: can't open file %s, error"), wszFileName);

 						ShowFormattedErrorMessage(szErrorText, dwRetErrorCode);

 						bFailed = TRUE;

 						break;

@@ -878,7 +878,7 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter)
 				}

 				else {// err on send request for file

 					dwRetErrorCode = GetLastError();

-					mir_sntprintf(szErrorText, _countof(szErrorText), TranslateT("Receive files: request for file %s not sent, error"), dat->pmfqfFiles[i].lpwszName);

+					mir_sntprintf(szErrorText, TranslateT("Receive files: request for file %s not sent, error"), dat->pmfqfFiles[i].lpwszName);

 					ShowFormattedErrorMessage(szErrorText, NO_ERROR);

 					bFailed = TRUE;

 					break;

@@ -1101,14 +1101,14 @@ void CMraProto::MraFilesQueueSendThreadProc(LPVOID lpParameter)
 						}

 						else { // err on open file

 							dwRetErrorCode = GetLastError();

-							mir_sntprintf(szErrorText, _countof(szErrorText), TranslateT("Send files: can't open file %s, error"), dat->pmfqfFiles[j].lpwszName);

+							mir_sntprintf(szErrorText, TranslateT("Send files: can't open file %s, error"), dat->pmfqfFiles[j].lpwszName);

 							ShowFormattedErrorMessage(szErrorText, dwRetErrorCode);

 							bFailed = TRUE;

 							break;

 						}

 					}

 					else {

-						mir_sntprintf(szErrorText, _countof(szErrorText), TranslateT("Send files: requested file: %S - not found in send files list."), (((LPSTR)btBuff) + sizeof(MRA_FT_GET_FILE)));

+						mir_sntprintf(szErrorText, TranslateT("Send files: requested file: %S - not found in send files list."), (((LPSTR)btBuff) + sizeof(MRA_FT_GET_FILE)));

 						ShowFormattedErrorMessage(szErrorText, NO_ERROR);

 						bFailed = TRUE;

 						break;

diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index c92a183c2a..8e71438ceb 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -108,7 +108,7 @@ void InitXStatusIcons()
 	hXStatusAdvancedStatusIcons[0] = NULL;

 	for (DWORD i = 1; i < MRA_XSTATUS_COUNT+1; i++) {

 		char szIconName[MAX_PATH];

-		mir_snprintf(szIconName, _countof(szIconName), "mra_xstatus%ld", i);

+		mir_snprintf(szIconName, "mra_xstatus%ld", i);

 		sid.pszName = szIconName;

 

 		int iCurIndex = i+IDI_XSTATUS1-1;

@@ -124,7 +124,7 @@ void DestroyXStatusIcons()
 	char szBuff[MAX_PATH];

 

 	for (DWORD i = 1; i < MRA_XSTATUS_COUNT+1; i++) {

-		mir_snprintf(szBuff, _countof(szBuff), "mra_xstatus%ld", i);

+		mir_snprintf(szBuff, "mra_xstatus%ld", i);

 		IcoLib_RemoveIcon(szBuff);

 	}

 

diff --git a/protocols/MRA/src/MraPlaces.h b/protocols/MRA/src/MraPlaces.h
index 4adccbb8a9..d2b0d4d417 100644
--- a/protocols/MRA/src/MraPlaces.h
+++ b/protocols/MRA/src/MraPlaces.h
@@ -41,7 +41,7 @@ typedef struct
 	{

 		if (mrapPlaces[i].dwCityID == 0 && mrapPlaces[i].dwPlaceID == 0)

 		{

-			mir_sntprintf(szBuff, _countof(szBuff), L"	{%ld, 	TEXT(\"%s\")}, ", mrapPlaces[i].dwCountryID, mrapPlaces[i].lpszData);

+			mir_sntprintf(szBuff, L"	{%ld, 	TEXT(\"%s\")}, ", mrapPlaces[i].dwCountryID, mrapPlaces[i].lpszData);

 			DebugPrintCRLFW(szBuff);

 		}

 	}

@@ -53,7 +53,7 @@ typedef struct
 	{

 		if (mrapPlaces[i].dwCityID && mrapPlaces[i].dwPlaceID == 0)

 		{

-			mir_sntprintf(szBuff, _countof(szBuff), L"	{%ld, 	%ld, 	TEXT(\"%s\")}, ", mrapPlaces[i].dwCountryID, mrapPlaces[i].dwCityID, mrapPlaces[i].lpszData);

+			mir_sntprintf(szBuff, L"	{%ld, 	%ld, 	TEXT(\"%s\")}, ", mrapPlaces[i].dwCountryID, mrapPlaces[i].dwCityID, mrapPlaces[i].lpszData);

 			DebugPrintCRLFW(szBuff);

 		}

 	}

diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp
index 3fb69e53aa..1665a6543c 100644
--- a/protocols/MRA/src/MraPopUp.cpp
+++ b/protocols/MRA/src/MraPopUp.cpp
@@ -47,20 +47,20 @@ INT_PTR CALLBACK MraPopupDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam, LPAR
 				bEnabled = GetBit(ppro->getDword("PopupsEventFilter", MRA_DEFAULT_POPUPS_EVENT_FILTER), dwType);

 				CheckDlgButton(hWndDlg, IDC_CHK_ENABLE, bEnabled ? BST_CHECKED : BST_UNCHECKED);

 

-				mir_snprintf(szBuff, _countof(szBuff), "PopupType%SUseWinColors", lpcwszPopupsTypes[dwType]);

+				mir_snprintf(szBuff, "PopupType%SUseWinColors", lpcwszPopupsTypes[dwType]);

 				bUseWinColors = ppro->getByte(szBuff, MRA_DEFAULT_POPUP_USE_WIN_COLORS);

 				CheckDlgButton(hWndDlg, IDC_CHK_USE_WIN_COLORS, bUseWinColors ? BST_CHECKED : BST_UNCHECKED);

 				EnableWindow(GetDlgItem(hWndDlg, IDC_CHK_USE_WIN_COLORS), bEnabled);

 

-				mir_snprintf(szBuff, _countof(szBuff), "PopupType%SColorBack", lpcwszPopupsTypes[dwType]);

+				mir_snprintf(szBuff, "PopupType%SColorBack", lpcwszPopupsTypes[dwType]);

 				SendDlgItemMessage(hWndDlg, IDC_POPUP_BACKCOLOR, CPM_SETCOLOUR, 0, ppro->getDword(szBuff, MRA_DEFAULT_POPUP_COLOR_BACK));

 				EnableWindow(GetDlgItem(hWndDlg, IDC_POPUP_BACKCOLOR), (bEnabled && bUseWinColors == FALSE));

 

-				mir_snprintf(szBuff, _countof(szBuff), "PopupType%SColorText", lpcwszPopupsTypes[dwType]);

+				mir_snprintf(szBuff, "PopupType%SColorText", lpcwszPopupsTypes[dwType]);

 				SendDlgItemMessage(hWndDlg, IDC_POPUP_TEXTCOLOR, CPM_SETCOLOUR, 0, ppro->getDword(szBuff, MRA_DEFAULT_POPUP_COLOR_TEXT));

 				EnableWindow(GetDlgItem(hWndDlg, IDC_POPUP_TEXTCOLOR), (bEnabled && bUseWinColors == FALSE));

 

-				mir_snprintf(szBuff, _countof(szBuff), "PopupType%STimeout", lpcwszPopupsTypes[dwType]);

+				mir_snprintf(szBuff, "PopupType%STimeout", lpcwszPopupsTypes[dwType]);

 				SetDlgItemInt(hWndDlg, IDC_POPUP_TIMEOUT, ppro->getDword(szBuff, MRA_DEFAULT_POPUP_TIMEOUT), FALSE);

 				EnableWindow(GetDlgItem(hWndDlg, IDC_POPUP_TIMEOUT), bEnabled);

 			}

@@ -105,16 +105,16 @@ INT_PTR CALLBACK MraPopupDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam, LPAR
 

 				ppro->setDword("PopupsEventFilter", dwPopupsEventFilter);

 

-				mir_snprintf(szBuff, _countof(szBuff), "PopupType%SUseWinColors", lpcwszPopupsTypes[dwType]);

+				mir_snprintf(szBuff, "PopupType%SUseWinColors", lpcwszPopupsTypes[dwType]);

 				ppro->setByte(szBuff, IsDlgButtonChecked(hWndDlg, IDC_CHK_USE_WIN_COLORS));

 

-				mir_snprintf(szBuff, _countof(szBuff), "PopupType%SColorBack", lpcwszPopupsTypes[dwType]);

+				mir_snprintf(szBuff, "PopupType%SColorBack", lpcwszPopupsTypes[dwType]);

 				ppro->setDword(szBuff, SendDlgItemMessage(hWndDlg, IDC_POPUP_BACKCOLOR, CPM_GETCOLOUR, 0, 0));

 

-				mir_snprintf(szBuff, _countof(szBuff), "PopupType%SColorText", lpcwszPopupsTypes[dwType]);

+				mir_snprintf(szBuff, "PopupType%SColorText", lpcwszPopupsTypes[dwType]);

 				ppro->setDword(szBuff, SendDlgItemMessage(hWndDlg, IDC_POPUP_TEXTCOLOR, CPM_GETCOLOUR, 0, 0));

 

-				mir_snprintf(szBuff, _countof(szBuff), "PopupType%STimeout", lpcwszPopupsTypes[dwType]);

+				mir_snprintf(szBuff, "PopupType%STimeout", lpcwszPopupsTypes[dwType]);

 				ppro->setDword(szBuff, GetDlgItemInt(hWndDlg, IDC_POPUP_TIMEOUT, NULL, FALSE));

 			}

 			return TRUE;

@@ -262,21 +262,21 @@ void CMraProto::MraPopupShowW(MCONTACT hContact, DWORD dwType, DWORD dwFlags, LP
 		ppd.PluginData = dat;

 

 		char szBuff[MAX_PATH];

-		mir_snprintf(szBuff, _countof(szBuff), "PopupType%SUseWinColors", lpcwszPopupsTypes[dwType]);

+		mir_snprintf(szBuff, "PopupType%SUseWinColors", lpcwszPopupsTypes[dwType]);

 		BOOL bUseWinColors = getByte(szBuff, MRA_DEFAULT_POPUP_USE_WIN_COLORS);

 		if (bUseWinColors) {

 			ppd.colorBack = GetSysColor(COLOR_BTNFACE);

 			ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);

 		}

 		else {

-			mir_snprintf(szBuff, _countof(szBuff), "PopupType%SColorBack", lpcwszPopupsTypes[dwType]);

+			mir_snprintf(szBuff, "PopupType%SColorBack", lpcwszPopupsTypes[dwType]);

 			ppd.colorBack = getDword(szBuff, MRA_DEFAULT_POPUP_COLOR_BACK);

 

-			mir_snprintf(szBuff, _countof(szBuff), "PopupType%SColorText", lpcwszPopupsTypes[dwType]);

+			mir_snprintf(szBuff, "PopupType%SColorText", lpcwszPopupsTypes[dwType]);

 			ppd.colorText = getDword(szBuff, MRA_DEFAULT_POPUP_COLOR_TEXT);

 		}

 

-		mir_snprintf(szBuff, _countof(szBuff), "PopupType%STimeout", lpcwszPopupsTypes[dwType]);

+		mir_snprintf(szBuff, "PopupType%STimeout", lpcwszPopupsTypes[dwType]);

 		ppd.iSeconds = getDword(szBuff, MRA_DEFAULT_POPUP_TIMEOUT);

 

 		if (dat->iPopupType == MRA_POPUP_TYPE_EMAIL_STATUS && dat->ppro->hWndEMailPopupStatus)

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 012b3d0247..2ac6cdec77 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -36,7 +36,7 @@ CMraProto::CMraProto(const char* _module, const TCHAR* _displayName) :
 		m_heNudgeReceived = CreateProtoEvent(PE_NUDGE);

 

 	TCHAR name[MAX_PATH];

-	mir_sntprintf(name, _countof(name), TranslateT("%s connection"), m_tszUserName);

+	mir_sntprintf(name, TranslateT("%s connection"), m_tszUserName);

 

 	NETLIBUSER nlu = { sizeof(nlu) };

 	nlu.flags = NUF_INCOMING | NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR;

@@ -46,7 +46,7 @@ CMraProto::CMraProto(const char* _module, const TCHAR* _displayName) :
 

 	InitMenus();

 

-	mir_snprintf(szNewMailSound, _countof(szNewMailSound), "%s_new_email", m_szModuleName);

+	mir_snprintf(szNewMailSound, "%s_new_email", m_szModuleName);

 	SkinAddNewSoundEx(szNewMailSound, m_szModuleName, MRA_SOUND_NEW_EMAIL);

 

 	HookProtoEvent(ME_CLIST_PREBUILDSTATUSMENU, &CMraProto::MraRebuildStatusMenu);

@@ -525,11 +525,11 @@ HANDLE CMraProto::GetAwayMsg(MCONTACT hContact)
 		SYSTEMTIME tt = { 0 };

 		dwTime = getDword(hContact, DBSETTING_BLOGSTATUSTIME, 0);

 		if (dwTime && MakeLocalSystemTimeFromTime32(dwTime, &tt))

-			mir_sntprintf(szTime, _countof(szTime), _T("%04ld.%02ld.%02ld %02ld:%02ld: "), tt.wYear, tt.wMonth, tt.wDay, tt.wHour, tt.wMinute);

+			mir_sntprintf(szTime, _T("%04ld.%02ld.%02ld %02ld:%02ld: "), tt.wYear, tt.wMonth, tt.wDay, tt.wHour, tt.wMinute);

 		else

 			szTime[0] = 0;

 

-		mir_sntprintf(szStatusDesc, _countof(szStatusDesc), _T("%s%s"), szTime, szBlogStatus.c_str());

+		mir_sntprintf(szStatusDesc, _T("%s%s"), szTime, szBlogStatus.c_str());

 		iRet = GetTickCount();

 		ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)iRet, (LPARAM)szStatusDesc);

 	}

diff --git a/protocols/MRA/src/MraSelectEMail.cpp b/protocols/MRA/src/MraSelectEMail.cpp
index f43beb4a9d..8925910c2a 100644
--- a/protocols/MRA/src/MraSelectEMail.cpp
+++ b/protocols/MRA/src/MraSelectEMail.cpp
@@ -22,7 +22,7 @@ void AddContactEMailToListParam(MCONTACT hContact, BOOL bMRAOnly, LPSTR lpszModu
 

 	for (int i = 0; true; i++) {

 		char szBuff[MAX_PATH];

-		mir_snprintf(szBuff, _countof(szBuff), "%s%lu", lpszValueName, i);

+		mir_snprintf(szBuff, "%s%lu", lpszValueName, i);

 		if (DB_GetStringA(hContact, lpszModule, szBuff, szEmail)) {

 			if (bMRAOnly == FALSE || IsEMailMR(szEmail)) {

 				WCHAR wszBuff[MAX_EMAIL_LEN];

diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index ef7ded50ad..2031f3ad84 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -423,7 +423,7 @@ DWORD CMraProto::GetContactBasicInfoW(MCONTACT hContact, DWORD *pdwID, DWORD *pd
 

 		for (int i = 0; i < 3; i++) {

 			char szValue[50];

-			mir_snprintf(szValue, _countof(szValue), "MyPhone%d", i);

+			mir_snprintf(szValue, "MyPhone%d", i);

 			if (DB_GetStringA(hContact, "UserInfo", szValue, szPhone)) {

 				if (szPhones->GetLength())

 					szPhones->AppendChar(',');

@@ -474,7 +474,7 @@ DWORD CMraProto::SetContactBasicInfoW(MCONTACT hContact, DWORD dwSetInfoFlags, D
 				break;

 

 			char szValue[MAX_PATH];

-			mir_snprintf(szValue, _countof(szValue), "MyPhone%d", i++);

+			mir_snprintf(szValue, "MyPhone%d", i++);

 			DB_SetStringExA(hContact, "UserInfo", szValue, "+" + szPhone);

 		}

 	}

@@ -644,14 +644,14 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &
 		MCONTACT hContact = NULL;

 

 		TCHAR szMailBoxStatus[MAX_SECONDLINE];

-		mir_sntprintf(szMailBoxStatus, _countof(szMailBoxStatus), TranslateT("Unread mail is available: %lu/%lu messages"), m_dwEmailMessagesUnread, dwEmailMessagesTotal);

+		mir_sntprintf(szMailBoxStatus, TranslateT("Unread mail is available: %lu/%lu messages"), m_dwEmailMessagesUnread, dwEmailMessagesTotal);

 

 		if (!pszFrom.IsEmpty() || !pszSubject.IsEmpty()) {

 			CMStringA szFrom, szSubject;

 			if (GetEMailFromString(szFrom, szEmail))

 				hContact = MraHContactFromEmail(szEmail, FALSE, TRUE, NULL);

 

-			mir_sntprintf(szStatusText, _countof(szStatusText), TranslateT("From: %S\r\nSubject: %S\r\n%s"), pszFrom.c_str(), szSubject.c_str(), szMailBoxStatus);

+			mir_sntprintf(szStatusText, TranslateT("From: %S\r\nSubject: %S\r\n%s"), pszFrom.c_str(), szSubject.c_str(), szMailBoxStatus);

 		}

 		else _tcsncpy_s(szStatusText, szMailBoxStatus, _TRUNCATE);

 

@@ -692,7 +692,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA &
 			hWndEMailPopupStatus = NULL;

 		}

 		else {

-			mir_sntprintf(szStatusText, _countof(szStatusText), TranslateT("No unread mail is available\r\nTotal messages: %lu"), dwEmailMessagesTotal);

+			mir_sntprintf(szStatusText, TranslateT("No unread mail is available\r\nTotal messages: %lu"), dwEmailMessagesTotal);

 			MraPopupShowFromAgentW(MRA_POPUP_TYPE_EMAIL_STATUS, (MRA_POPUP_ALLOW_ENTER), szStatusText);

 		}

 	}

@@ -802,7 +802,7 @@ DWORD GetContactEMailCountParam(MCONTACT hContact, BOOL bMRAOnly, LPSTR lpszModu
 

 	for (int i = 0; TRUE; i++) {

 		char szBuff[100];

-		mir_snprintf(szBuff, _countof(szBuff), "%s%lu", lpszValueName, i);

+		mir_snprintf(szBuff, "%s%lu", lpszValueName, i);

 		if (DB_GetStringA(hContact, lpszModule, szBuff, szEmail)) {

 			if (bMRAOnly == FALSE || IsEMailMR(szEmail))

 				dwRet++;

@@ -840,7 +840,7 @@ bool GetContactFirstEMailParam(MCONTACT hContact, BOOL bMRAOnly, LPSTR lpszModul
 

 	for (int i = 0; true; i++) {

 		char szBuff[100];

-		mir_snprintf(szBuff, _countof(szBuff), "%s%lu", lpszValueName, i);

+		mir_snprintf(szBuff, "%s%lu", lpszValueName, i);

 		if (DB_GetStringA(hContact, lpszModule, szBuff, szEmail)) {

 			if (bMRAOnly == FALSE || IsEMailMR(szEmail)) {

 				res = szEmail;

@@ -877,7 +877,7 @@ void CMraProto::ShowFormattedErrorMessage(LPWSTR lpwszErrText, DWORD dwErrorCode
 	else {

 		dwErrDescriptionSize = (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErrorCode, 0, szErrDescription, (_countof(szErrDescription) - sizeof(WCHAR)), NULL) - 2);

 		szErrDescription[dwErrDescriptionSize] = 0;

-		mir_sntprintf(szErrorText, _countof(szErrorText), _T("%s %lu: %s"), TranslateTS(lpwszErrText), dwErrorCode, szErrDescription);

+		mir_sntprintf(szErrorText, _T("%s %lu: %s"), TranslateTS(lpwszErrText), dwErrorCode, szErrDescription);

 	}

 	MraPopupShowFromAgentW(MRA_POPUP_TYPE_ERROR, 0, szErrorText);

 }

@@ -996,13 +996,13 @@ INT_PTR CALLBACK SetXStatusDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP
 			SendMessage(hWndDlg, WM_SETICON, ICON_BIG, (LPARAM)dat->hDlgIcon);

 			SetWindowText(hWndDlg, TranslateTS(lpcszXStatusNameDef[dat->dwXStatus]));

 

-			mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldName", dat->dwXStatus);

+			mir_snprintf(szValueName, "XStatus%ldName", dat->dwXStatus);

 			if (dat->ppro->mraGetStringW(NULL, szValueName, szBuff))

 				SetDlgItemText(hWndDlg, IDC_XTITLE, szBuff.c_str()); // custom xstatus name

 			else // default xstatus name

 				SetDlgItemText(hWndDlg, IDC_XTITLE, TranslateTS(lpcszXStatusNameDef[dat->dwXStatus]));

 

-			mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldMsg", dat->dwXStatus);

+			mir_snprintf(szValueName, "XStatus%ldMsg", dat->dwXStatus);

 			if (dat->ppro->mraGetStringW(NULL, szValueName, szBuff))

 				SetDlgItemText(hWndDlg, IDC_XMSG, szBuff.c_str()); // custom xstatus description

 			else // default xstatus description

@@ -1017,7 +1017,7 @@ INT_PTR CALLBACK SetXStatusDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP
 	case WM_TIMER:

 		if (dat->dwCountdown != -1) {

 			TCHAR szBuff[MAX_PATH];

-			mir_sntprintf(szBuff, _countof(szBuff), TranslateT("Closing in %ld"), dat->dwCountdown--);

+			mir_sntprintf(szBuff, TranslateT("Closing in %ld"), dat->dwCountdown--);

 			SetDlgItemText(hWndDlg, IDOK, szBuff);

 			break;

 		}

@@ -1047,7 +1047,7 @@ INT_PTR CALLBACK SetXStatusDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP
 			DWORD dwBuffSize = GetDlgItemText(hWndDlg, IDC_XMSG, szBuff, (STATUS_DESC_MAX + 1));

 

 			char szValueName[MAX_PATH];

-			mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldMsg", dat->dwXStatus);

+			mir_snprintf(szValueName, "XStatus%ldMsg", dat->dwXStatus);

 			dat->ppro->mraSetStringExW(NULL, szValueName, szBuff);

 			dat->ppro->mraSetStringExW(NULL, DBSETTING_XSTATUSMSG, szBuff);

 

@@ -1056,7 +1056,7 @@ INT_PTR CALLBACK SetXStatusDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LP
 				mir_tstrncpy(szBuff, TranslateTS(lpcszXStatusNameDef[dat->dwXStatus]), STATUS_TITLE_MAX + 1);

 				dwBuffSize = (DWORD)mir_wstrlen(szBuff);

 			}

-			mir_snprintf(szValueName, _countof(szValueName), "XStatus%dName", dat->dwXStatus);

+			mir_snprintf(szValueName, "XStatus%dName", dat->dwXStatus);

 			dat->ppro->mraSetStringExW(NULL, szValueName, szBuff);

 			dat->ppro->mraSetStringExW(NULL, DBSETTING_XSTATUSNAME, szBuff);

 

@@ -1173,7 +1173,7 @@ INT_PTR CALLBACK SendReplyBlogStatusDlgProc(HWND hWndDlg, UINT message, WPARAM w
 				size_t dwMessageSize = GetWindowTextLength(GetDlgItem(hWndDlg, IDC_MSG_TO_SEND));

 

 				EnableWindow(GetDlgItem(hWndDlg, IDOK), (int)dwMessageSize);

-				mir_sntprintf(tszBuff, _countof(tszBuff), _T("%d/%d"), dwMessageSize, MICBLOG_STATUS_MAX);

+				mir_sntprintf(tszBuff, _T("%d/%d"), dwMessageSize, MICBLOG_STATUS_MAX);

 				SetDlgItemText(hWndDlg, IDC_STATIC_CHARS_COUNTER, tszBuff);

 			}

 			break;

diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index b251560c18..59d26b620e 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -282,7 +282,7 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM)
 	HGENMENU hRoot;

 	{

 		TCHAR szItem[MAX_PATH + 64];

-		mir_sntprintf(szItem, _countof(szItem), _T("%s Custom Status"), m_tszUserName);

+		mir_sntprintf(szItem, _T("%s Custom Status"), m_tszUserName);

 

 		CMenuItem mi;

 		mi.root = pcli->pfnGetProtocolMenu(m_szModuleName);

@@ -303,10 +303,10 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM)
 	if (getByte(NULL, "xStatusShowAll", MRA_DEFAULT_SHOW_ALL_XSTATUSES))

 		dwCount = MRA_XSTATUS_COUNT;

 	for (DWORD i = 0; i < dwCount; i ++) {

-		mir_snprintf(szServiceFunction, _countof(szServiceFunction), "/menuXStatus%ld", i);

+		mir_snprintf(szServiceFunction, "/menuXStatus%ld", i);

 		mi.position ++;

 		if (i) {

-			mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldName", i);

+			mir_snprintf(szValueName, "XStatus%ldName", i);

 			if (mraGetStringW(NULL, szValueName, szStatusTitle))

 				mi.name.t = (TCHAR*)szStatusTitle.c_str();

 			else

@@ -400,7 +400,7 @@ void CMraProto::InitMenus()
 	// xstatus menu

 	for (DWORD i = 0; i < MRA_XSTATUS_COUNT; i++) {

 		char szServiceName[100];

-		mir_snprintf(szServiceName, _countof(szServiceName), "/menuXStatus%d", i);

+		mir_snprintf(szServiceName, "/menuXStatus%d", i);

 		CreateProtoServiceParam(szServiceName, &CMraProto::MraXStatusMenu, i);

 	}

 }

diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index 0975551c5e..23f02d6ed6 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -349,11 +349,11 @@ bool CMraProto::CmdHelloAck(BinBuffer &buf)
 	DWORD dwXStatusMir = m_iXStatus, dwXStatus;

 	DWORD dwStatus = GetMraStatusFromMiradaStatus(m_iDesiredStatus, dwXStatusMir, &dwXStatus);

 	if (IsXStatusValid(dwXStatusMir)) {// xstatuses

-		mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldName", dwXStatusMir);

+		mir_snprintf(szValueName, "XStatus%ldName", dwXStatusMir);

 		if (!mraGetStringW(NULL, szValueName, wszStatusTitle))

 			wszStatusTitle = TranslateTS(lpcszXStatusNameDef[dwXStatusMir]);

 

-		mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldMsg", dwXStatusMir);

+		mir_snprintf(szValueName, "XStatus%ldMsg", dwXStatusMir);

 		mraGetStringW(NULL, szValueName, wszStatusDesc);

 	}

 	else wszStatusTitle = pcli->pfnGetStatusModeDescription(m_iDesiredStatus, 0);

@@ -646,7 +646,7 @@ bool CMraProto::CmdFileTransferAck(BinBuffer &buf)
 		break;

 	default:// ## unknown error

 		TCHAR szBuff[1024];

-		mir_sntprintf(szBuff, _countof(szBuff), TranslateT("MRIM_CS_FILE_TRANSFER_ACK: unknown error, code: %lu"), dwAckType);

+		mir_sntprintf(szBuff, TranslateT("MRIM_CS_FILE_TRANSFER_ACK: unknown error, code: %lu"), dwAckType);

 		ShowFormattedErrorMessage(szBuff, NO_ERROR);

 		break;

 	}

@@ -743,7 +743,7 @@ bool CMraProto::CmdContactAck(int cmd, int seq, BinBuffer &buf)
 			break;

 		default:// ## unknown error

 			TCHAR szBuff[1024];

-			mir_sntprintf(szBuff, _countof(szBuff), TranslateT("MRIM_CS_*_CONTACT_ACK: unknown server error, code: %lu"), dwTemp);

+			mir_sntprintf(szBuff, TranslateT("MRIM_CS_*_CONTACT_ACK: unknown server error, code: %lu"), dwTemp);

 			MraPopupShowFromAgentW(MRA_POPUP_TYPE_DEBUG, 0, szBuff);

 			break;

 		}

@@ -1037,7 +1037,7 @@ bool CMraProto::CmdGame(BinBuffer &buf)
 		break;

 	default:

 		TCHAR szBuff[1024];

-		mir_sntprintf(szBuff, _countof(szBuff), TranslateT("MRIM_CS_GAME: unknown internal game message code: %lu"), dwGameMsg);

+		mir_sntprintf(szBuff, TranslateT("MRIM_CS_GAME: unknown internal game message code: %lu"), dwGameMsg);

 		MraPopupShowFromAgentW(MRA_POPUP_TYPE_DEBUG, 0, szBuff);

 		break;

 	}

@@ -1205,7 +1205,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf)
 					}

 					else if (fieldType == 'u') {

 						char szBuff[50];

-						mir_snprintf(szBuff, _countof(szBuff), "%lu, ", dwTemp);//;

+						mir_snprintf(szBuff, "%lu, ", dwTemp);//;

 						debugLogA("%s ", szBuff);

 					}

 					else _CrtDbgBreak();

@@ -1345,7 +1345,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf)
 			ShowFormattedErrorMessage(L"MRIM_CS_CONTACT_LIST2: internal server error", NO_ERROR);

 		else {

 			TCHAR szBuff[1024];

-			mir_sntprintf(szBuff, _countof(szBuff), TranslateT("MRIM_CS_CONTACT_LIST2: unknown server error, code: %lu"), dwTemp);

+			mir_sntprintf(szBuff, TranslateT("MRIM_CS_CONTACT_LIST2: unknown server error, code: %lu"), dwTemp);

 			MraPopupShowFromAgentW(MRA_POPUP_TYPE_DEBUG, 0, szBuff);

 		}

 	}

diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index 0440cfa9eb..4b74f823a0 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -353,13 +353,13 @@ DWORD CMraProto::MraSetXStatusInternal(DWORD dwXStatus)
 

 		// obsolete (TODO: remove in next version)

 		char szValueName[MAX_PATH];

-		mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldName", dwXStatus);

+		mir_snprintf(szValueName, "XStatus%ldName", dwXStatus);

 		if (!mraGetStringW(NULL, szValueName, szBuff))

 			szBuff = lpcszXStatusNameDef[dwXStatus];

 		mraSetStringExW(NULL, DBSETTING_XSTATUSNAME, szBuff);

 

 		// obsolete (TODO: remove in next version)

-		mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldMsg", dwXStatus);

+		mir_snprintf(szValueName, "XStatus%ldMsg", dwXStatus);

 		if (mraGetStringW(NULL, szValueName, szBuff))

 			mraSetStringExW(NULL, DBSETTING_XSTATUSMSG, szBuff);

 		else

@@ -401,7 +401,7 @@ INT_PTR CMraProto::MraSetXStatusEx(WPARAM, LPARAM lParam)
 

 				// set custom status name

 				if (pData->flags & CSSF_MASK_NAME) {

-					mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldName", dwXStatus);

+					mir_snprintf(szValueName, "XStatus%ldName", dwXStatus);

 					if (pData->flags & CSSF_UNICODE) {

 						mraSetStringExW(NULL, szValueName, pData->pwszName);

 						mraSetStringExW(NULL, DBSETTING_XSTATUSNAME, pData->pwszName);

@@ -414,7 +414,7 @@ INT_PTR CMraProto::MraSetXStatusEx(WPARAM, LPARAM lParam)
 

 				// set custom status message

 				if (pData->flags & CSSF_MASK_MESSAGE) {

-					mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldMsg", dwXStatus);

+					mir_snprintf(szValueName, "XStatus%ldMsg", dwXStatus);

 					if (pData->flags & CSSF_UNICODE) {

 						mraSetStringExW(NULL, szValueName, pData->pwszMessage);

 						mraSetStringExW(NULL, DBSETTING_XSTATUSMSG, pData->pwszMessage);

@@ -528,7 +528,7 @@ DWORD CMraProto::MraSendNewStatus(DWORD dwStatusMir, DWORD dwXStatusMir, const C
 	if (IsXStatusValid(dwXStatusMir)) {

 		char szValueName[MAX_PATH];

 		if (pwszStatusTitle.IsEmpty()) {

-			mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldName", dwXStatusMir);

+			mir_snprintf(szValueName, "XStatus%ldName", dwXStatusMir);

 			// custom xstatus name

 			if (!mraGetStringW(NULL, szValueName, wszStatusTitle))

 				wszStatusTitle = TranslateTS(lpcszXStatusNameDef[dwXStatusMir]);

@@ -536,7 +536,7 @@ DWORD CMraProto::MraSendNewStatus(DWORD dwStatusMir, DWORD dwXStatusMir, const C
 		else wszStatusTitle = pwszStatusTitle;

 

 		if (pwszStatusDesc.IsEmpty()) {

-			mir_snprintf(szValueName, _countof(szValueName), "XStatus%ldMsg", dwXStatusMir);

+			mir_snprintf(szValueName, "XStatus%ldMsg", dwXStatusMir);

 			// custom xstatus description

 			mraGetStringW(NULL, szValueName, wszStatusDesc);

 		}