new mir_sntprintf templates without SIZEOF

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

18 files changed, 57 insertions, 57 deletions

diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 37160b7ad7..723b45a43a 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -154,7 +154,7 @@ int CJabberProto::AdHoc_OnJAHMCommandListResult(HWND hwndDlg, HXML iqNode, Jabbe
 			code = xmlGetAttrValue(errorNode, _T("code"));

 			description = xmlGetText(errorNode);

 		}

-		mir_sntprintf(buff, SIZEOF(buff), TranslateT("Error %s %s"), (code) ? code : _T(""), (description) ? description : _T(""));

+		mir_sntprintf(buff, TranslateT("Error %s %s"), (code) ? code : _T(""), (description) ? description : _T(""));

 		JabberFormSetInstruction(hwndDlg, buff);

 	}

 	else if (!mir_tstrcmp(type, _T("result"))) {

@@ -282,7 +282,7 @@ int CJabberProto::AdHoc_OnJAHMProcessResult(HWND hwndDlg, HXML workNode, JabberA
 			code = xmlGetAttrValue(errorNode, _T("code"));

 			description = xmlGetText(errorNode);

 		}

-		mir_sntprintf(buff, SIZEOF(buff), TranslateT("Error %s %s"), code ? code : _T(""), description ? description : _T(""));

+		mir_sntprintf(buff, TranslateT("Error %s %s"), code ? code : _T(""), description ? description : _T(""));

 		JabberFormSetInstruction(hwndDlg,buff);

 	}

 	JabberAdHoc_RefreshFrameScroll(hwndDlg, dat);

diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp
index ffbc79d77f..914a528824 100644
--- a/protocols/JabberG/src/jabber_byte.cpp
+++ b/protocols/JabberG/src/jabber_byte.cpp
@@ -363,7 +363,7 @@ int CJabberProto::ByteSendParse(HANDLE hConn, JABBER_BYTE_TRANSFER *jbt, char* b
 

 			TCHAR *szInitiatorJid = JabberPrepareJid(jbt->srcJID);

 			TCHAR *szTargetJid = JabberPrepareJid(jbt->dstJID);

-			mir_sntprintf(text, SIZEOF(text), _T("%s%s%s"), jbt->sid, szInitiatorJid, szTargetJid);

+			mir_sntprintf(text, _T("%s%s%s"), jbt->sid, szInitiatorJid, szTargetJid);

 			mir_free(szInitiatorJid);

 			mir_free(szTargetJid);

 

@@ -512,7 +512,7 @@ int CJabberProto::ByteSendProxyParse(HANDLE hConn, JABBER_BYTE_TRANSFER *jbt, ch
 

 			TCHAR *szInitiatorJid = JabberPrepareJid(jbt->srcJID);

 			TCHAR *szTargetJid = JabberPrepareJid(jbt->dstJID);

-			mir_sntprintf(text, SIZEOF(text), _T("%s%s%s"), jbt->sid, szInitiatorJid, szTargetJid);

+			mir_sntprintf(text, _T("%s%s%s"), jbt->sid, szInitiatorJid, szTargetJid);

 			mir_free(szInitiatorJid);

 			mir_free(szTargetJid);

 

@@ -707,7 +707,7 @@ int CJabberProto::ByteReceiveParse(HANDLE hConn, JABBER_BYTE_TRANSFER *jbt, char
 			{

 				ptrT szInitiatorJid(JabberPrepareJid(jbt->srcJID));

 				ptrT szTargetJid(JabberPrepareJid(jbt->dstJID));

-				mir_sntprintf(text, SIZEOF(text), _T("%s%s%s"), jbt->sid, szInitiatorJid, szTargetJid);

+				mir_sntprintf(text, _T("%s%s%s"), jbt->sid, szInitiatorJid, szTargetJid);

 			}

 

 			T2Utf szAuthString(text);

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 4ac3010bea..6ecdb6548b 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -763,7 +763,7 @@ public:
 		CLCINFOITEM cii = { 0 };

 		cii.cbSize = sizeof(cii);

 		cii.flags = CLCIIF_CHECKBOX;

-		mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s (not on roster)"), jidData->jid);

+		mir_sntprintf(buf, TranslateT("%s (not on roster)"), jidData->jid);

 		cii.pszText = buf;

 		jidData->hItem = SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

 		SendDlgItemMessage(m_hwnd, IDC_CLIST, CLM_SETCHECKMARK, jidData->hItem, 1);

@@ -858,7 +858,7 @@ static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 		SendDlgItemMessage(hwndDlg, IDC_ICO_STATUS, STM_SETICON, (WPARAM)LoadSkinnedProtoIcon(dat->ppro->m_szModuleName, dat->him->m_iStatus), 0);

 

 		TCHAR buf[256];

-		mir_sntprintf(buf, SIZEOF(buf), TranslateT("%s from\n%s"), dat->him->m_tszResourceName, dat->item->jid);

+		mir_sntprintf(buf, TranslateT("%s from\n%s"), dat->him->m_tszResourceName, dat->item->jid);

 		SetDlgItemText(hwndDlg, IDC_HEADERBAR, buf);

 

 		SetDlgItemText(hwndDlg, IDC_TXT_NICK, dat->him->m_tszResourceName);

@@ -1017,7 +1017,7 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 			// do not use snprintf to avoid possible problems with % symbol

 			if (TCHAR *p = _tcsstr(szMessage, _T("%s"))) {

 				*p = 0;

-				mir_sntprintf(buf, SIZEOF(buf), _T("%s%s%s"), szMessage, him->m_tszResourceName, p + 2);

+				mir_sntprintf(buf, _T("%s%s%s"), szMessage, him->m_tszResourceName, p + 2);

 			}

 			else mir_tstrncpy(buf, szMessage, SIZEOF(buf));

 			UnEscapeChatTags(buf);

@@ -1272,7 +1272,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g
 		if (ppro->EnterString(szBuffer, szTitle, ESF_COMBO, "gcNick_")) {

 			if (ppro->ListGetItemPtr(LIST_CHATROOM, gch->pDest->ptszID) != NULL) {

 				TCHAR text[1024];

-				mir_sntprintf(text, SIZEOF(text), _T("%s/%s"), gch->pDest->ptszID, szBuffer);

+				mir_sntprintf(text, _T("%s/%s"), gch->pDest->ptszID, szBuffer);

 				ppro->SendPresenceTo(ppro->m_iStatus == ID_STATUS_INVISIBLE ? ID_STATUS_ONLINE : ppro->m_iStatus, text, NULL);

 			}

 		}

diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 81b37b400e..14aadd27d8 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -246,7 +246,7 @@ void CJabberProto::GroupchatJoinRoom(const TCHAR *server, const TCHAR *room, con
 	}

 

 	TCHAR text[JABBER_MAX_JID_LEN + 1];

-	mir_sntprintf(text, SIZEOF(text), _T("%s@%s/%s"), room, server, nick);

+	mir_sntprintf(text, _T("%s@%s/%s"), room, server, nick);

 

 	JABBER_LIST_ITEM *item = ListAdd(LIST_CHATROOM, text);

 	item->bAutoJoin = autojoin;

@@ -1011,7 +1011,7 @@ void CJabberProto::GroupchatProcessPresence(HXML node)
 			if (++item->iChatState == 1 && newNick != NULL && newNick[0] != 0) {

 				replaceStrT(item->nick, newNick);

 				TCHAR text[1024] = { 0 };

-				mir_sntprintf(text, SIZEOF(text), _T("%s/%s"), item->jid, newNick);

+				mir_sntprintf(text, _T("%s/%s"), item->jid, newNick);

 				SendPresenceTo(m_iStatus, text, NULL);

 			}

 			else {

@@ -1164,7 +1164,7 @@ public:
 		CSuper::OnInitDialog();

 

 		TCHAR buf[256];

-		mir_sntprintf(buf, SIZEOF(buf), TranslateT("Group chat invitation to\n%s"), m_info->roomJid);

+		mir_sntprintf(buf, TranslateT("Group chat invitation to\n%s"), m_info->roomJid);

 		SetDlgItemText(m_hwnd, IDC_HEADERBAR, buf);

 

 		SetDlgItemText(m_hwnd, IDC_FROM, m_info->from);

diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index 252da69c2f..d239ae052c 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -311,7 +311,7 @@ BOOL GetOSDisplayString(LPTSTR pszOS, int BUFSIZE)
 		}

 

 		TCHAR buf[80];

-		mir_sntprintf(buf, SIZEOF(buf), TEXT(" (build %d)"), osvi.dwBuildNumber);

+		mir_sntprintf(buf, TEXT(" (build %d)"), osvi.dwBuildNumber);

 		StringCchCat(pszOS, BUFSIZE, buf);

 		return TRUE;

 	}

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index eaa7edc593..38712cd0c1 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -239,7 +239,7 @@ void CJabberProto::OnIqResultGetAuth(HXML iqNode, CJabberIqInfo*)
 		m_ThreadInfo->send("</stream:stream>");

 

 		TCHAR text[128];

-		mir_sntprintf(text, SIZEOF(text), TranslateT("Authentication failed for %s."), m_ThreadInfo->conn.username);

+		mir_sntprintf(text, TranslateT("Authentication failed for %s."), m_ThreadInfo->conn.username);

 		MsgPopup(NULL, text, TranslateT("Jabber Authentication"));

 		JLoginFailed(LOGINERR_WRONGPASSWORD);

 		m_ThreadInfo = NULL;	// To disallow auto reconnect

@@ -266,7 +266,7 @@ void CJabberProto::OnIqResultSetAuth(HXML iqNode, CJabberIqInfo*)
 		TCHAR text[128];

 

 		m_ThreadInfo->send("</stream:stream>");

-		mir_sntprintf(text, SIZEOF(text), TranslateT("Authentication failed for %s."), m_ThreadInfo->conn.username);

+		mir_sntprintf(text, TranslateT("Authentication failed for %s."), m_ThreadInfo->conn.username);

 		MsgPopup(NULL, text, TranslateT("Jabber Authentication"));

 		JLoginFailed(LOGINERR_WRONGPASSWORD);

 		m_ThreadInfo = NULL;	// To disallow auto reconnect

@@ -815,9 +815,9 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*)
 						hasHomeStreet = true;

 						if (hContact != NULL) {

 							if ((o=xmlGetChild(n, "EXTADR")) != NULL && xmlGetText(o) != NULL)

-								mir_sntprintf(text, SIZEOF(text), _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

+								mir_sntprintf(text, _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

 							else if ((o=xmlGetChild(n, "EXTADD")) != NULL && xmlGetText(o) != NULL)

-								mir_sntprintf(text, SIZEOF(text), _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

+								mir_sntprintf(text, _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

 							else

 								_tcsncpy_s(text, xmlGetText(m), _TRUNCATE);

 							text[SIZEOF(text)-1] = '\0';

@@ -858,9 +858,9 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*)
 						hasWorkStreet = true;

 						if (hContact != NULL) {

 							if ((o=xmlGetChild(n, "EXTADR")) != NULL && xmlGetText(o) != NULL)

-								mir_sntprintf(text, SIZEOF(text), _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

+								mir_sntprintf(text, _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

 							else if ((o=xmlGetChild(n, "EXTADD")) != NULL && xmlGetText(o) != NULL)

-								mir_sntprintf(text, SIZEOF(text), _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

+								mir_sntprintf(text, _T("%s\r\n%s"), xmlGetText(m), xmlGetText(o));

 							else

 								_tcsncpy_s(text, xmlGetText(m), _TRUNCATE);

 							text[SIZEOF(text)-1] = '\0';

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 79335a9182..b5c762af08 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -748,11 +748,11 @@ void CJabberProto::MenuInit()
 

 		mir_snprintf(srvFce, SIZEOF(srvFce), "%s/menuSetPriority/%d", m_szModuleName, steps[i]);

 		if (steps[i] > 0) {

-			mir_sntprintf(szName, SIZEOF(szName), TranslateT("Increase priority by %d"), steps[i]);

+			mir_sntprintf(szName, TranslateT("Increase priority by %d"), steps[i]);

 			mi.icolibItem = GetIconHandle(IDI_ARROW_UP);

 		}

 		else {

-			mir_sntprintf(szName, SIZEOF(szName), TranslateT("Decrease priority by %d"), -steps[i]);

+			mir_sntprintf(szName, TranslateT("Decrease priority by %d"), -steps[i]);

 			mi.icolibItem = GetIconHandle(IDI_ARROW_DOWN);

 		}

 

@@ -796,7 +796,7 @@ void CJabberProto::UpdatePriorityMenu(short priority)
 		return;

 

 	TCHAR szName[128];

-	mir_sntprintf(szName, SIZEOF(szName), TranslateT("Resource priority [%d]"), (int)priority);

+	mir_sntprintf(szName, TranslateT("Resource priority [%d]"), (int)priority);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIF_TCHAR | CMIM_NAME | CMIF_KEEPUNTRANSLATED;

@@ -1036,7 +1036,7 @@ int CJabberProto::OnProcessSrmmIconClick(WPARAM hContact, LPARAM lParam)
 	HMENU hMenu = CreatePopupMenu();

 	TCHAR buf[256];

 

-	mir_sntprintf(buf, SIZEOF(buf), TranslateT("Last active (%s)"),

+	mir_sntprintf(buf, TranslateT("Last active (%s)"),

 		LI->m_pLastSeenResource ? LI->m_pLastSeenResource->m_tszResourceName : TranslateT("No activity yet, use server's choice"));

 	AppendMenu(hMenu, MF_STRING, MENUITEM_LASTSEEN, buf);

 

@@ -1121,7 +1121,7 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleDirectPresence(WPARAM hContact, LPARAM
 		if (item == NULL)

 			return 0;

 

-		mir_sntprintf(text, SIZEOF(text), _T("%s/%s"), item->jid, item->nick);

+		mir_sntprintf(text, _T("%s/%s"), item->jid, item->nick);

 		jid = text;

 	}

 	else jid = tszJid;

diff --git a/protocols/JabberG/src/jabber_message_handlers.cpp b/protocols/JabberG/src/jabber_message_handlers.cpp
index aabdec3b57..77e900c76e 100644
--- a/protocols/JabberG/src/jabber_message_handlers.cpp
+++ b/protocols/JabberG/src/jabber_message_handlers.cpp
@@ -44,9 +44,9 @@ BOOL CJabberProto::OnMessageError(HXML node, ThreadData*, CJabberMessageInfo* pI
 			TCHAR buf[512];

 			HXML bodyNode = xmlGetChild(node, "body");

 			if (bodyNode)

-				mir_sntprintf(buf, SIZEOF(buf), _T("%s:\n%s\n%s"), pInfo->GetFrom(), xmlGetText(bodyNode), szErrText);

+				mir_sntprintf(buf, _T("%s:\n%s\n%s"), pInfo->GetFrom(), xmlGetText(bodyNode), szErrText);

 			else

-				mir_sntprintf(buf, SIZEOF(buf), _T("%s:\n%s"), pInfo->GetFrom(), szErrText);

+				mir_sntprintf(buf, _T("%s:\n%s"), pInfo->GetFrom(), szErrText);

 

 			 MsgPopup(NULL, buf, TranslateT("Jabber Error"));

 		}

diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index e493e54c0d..a6800722c8 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -377,7 +377,7 @@ public:
 		SelectObject(hdc, m_hfntNormal);

 		if (pNote->GetFrom()) {

 			TCHAR buf[256];

-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("From: %s"), pNote->GetFrom());

+			mir_sntprintf(buf, TranslateT("From: %s"), pNote->GetFrom());

 			rc.top += DrawText(hdc, buf, -1, &rc, DT_NOPREFIX | DT_SINGLELINE | DT_END_ELLIPSIS);

 		}

 		rc.top += DrawText(hdc, pNote->GetText(), -1, &rc, DT_NOPREFIX | DT_WORDBREAK | DT_EXPANDTABS | DT_END_ELLIPSIS);

@@ -412,7 +412,7 @@ public:
 		SelectObject(hdc, m_hfntNormal);

 		if (pNote->GetFrom()) {

 			TCHAR buf[256];

-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("From: %s"), pNote->GetFrom());

+			mir_sntprintf(buf, TranslateT("From: %s"), pNote->GetFrom());

 			rcTmp = rc;

 			DrawText(hdc, buf, -1, &rcTmp, DT_NOPREFIX | DT_SINGLELINE | DT_END_ELLIPSIS | DT_CALCRECT);

 			lps->itemHeight += rcTmp.bottom;

@@ -729,7 +729,7 @@ void CJabberProto::ProcessOutgoingNote(CNoteItem *pNote, bool ok)
 	}

 

 	TCHAR buf[1024];

-	mir_sntprintf(buf, SIZEOF(buf), _T("Incoming note: %s\n\n%s\nTags: %s"),

+	mir_sntprintf(buf, _T("Incoming note: %s\n\n%s\nTags: %s"),

 		pNote->GetTitle(), pNote->GetText(), pNote->GetTagsStr());

 

 	JabberCapsBits jcb = GetResourceCapabilites(pNote->GetFrom(), TRUE);

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index bdf8e06dc0..df53cb80f4 100644
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -243,7 +243,7 @@ protected:
 	void OnInitDialog()

 	{

 		TCHAR text[256];

-		mir_sntprintf(text, SIZEOF(text), STR_FORMAT, TranslateT("Register"), m_regInfo->username, m_regInfo->server, m_regInfo->port);

+		mir_sntprintf(text, STR_FORMAT, TranslateT("Register"), m_regInfo->username, m_regInfo->server, m_regInfo->port);

 		SetDlgItemText(m_hwnd, IDC_REG_STATUS, text);

 	}

 

diff --git a/protocols/JabberG/src/jabber_password.cpp b/protocols/JabberG/src/jabber_password.cpp
index 494b685230..e36ed79c55 100644
--- a/protocols/JabberG/src/jabber_password.cpp
+++ b/protocols/JabberG/src/jabber_password.cpp
@@ -50,7 +50,7 @@ static INT_PTR CALLBACK JabberChangePasswordDlgProc(HWND hwndDlg, UINT msg, WPAR
 		TranslateDialogDefault(hwndDlg);

 		if (ppro->m_bJabberOnline && ppro->m_ThreadInfo != NULL) {

 			TCHAR text[1024];

-			mir_sntprintf(text, SIZEOF(text), TranslateT("Set New Password for %s@%S"), ppro->m_ThreadInfo->conn.username, ppro->m_ThreadInfo->conn.server);

+			mir_sntprintf(text, TranslateT("Set New Password for %s@%S"), ppro->m_ThreadInfo->conn.username, ppro->m_ThreadInfo->conn.server);

 			SetWindowText(hwndDlg, text);

 		}

 		return TRUE;

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 2169b02f1d..2b7309779f 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -58,9 +58,9 @@ void CJabberProto::OnIqResultPrivacyListModify(HXML, CJabberIqInfo *pInfo)
 	if (!pParam->m_dwCount) {

 		TCHAR szText[ 512 ];

 		if (!pParam->m_bAllOk)

-			mir_sntprintf(szText, SIZEOF(szText), TranslateT("Error occurred while applying changes"));

+			mir_sntprintf(szText, TranslateT("Error occurred while applying changes"));

 		else

-			mir_sntprintf(szText, SIZEOF(szText), TranslateT("Privacy lists successfully saved"));

+			mir_sntprintf(szText, TranslateT("Privacy lists successfully saved"));

 		if (m_pDlgPrivacyLists)

 			m_pDlgPrivacyLists->SetStatusText(szText);

 		// FIXME: enable apply button

@@ -226,14 +226,14 @@ void CJabberProto::OnIqResultPrivacyListDefault(HXML iqNode, CJabberIqInfo *pInf
 			CPrivacyList *pList = (CPrivacyList *)pInfo->GetUserData();

 			if (pList) {

 				m_privacyListManager.SetDefaultListName(pList->GetListName());

-				mir_sntprintf(szText, SIZEOF(szText), TranslateT("Privacy list %s set as default"), pList->GetListName());

+				mir_sntprintf(szText, TranslateT("Privacy list %s set as default"), pList->GetListName());

 			}

 			else {

 				m_privacyListManager.SetDefaultListName(NULL);

-				mir_sntprintf(szText, SIZEOF(szText), TranslateT("Default privacy list successfully declined"));

+				mir_sntprintf(szText, TranslateT("Default privacy list successfully declined"));

 			}

 		}

-		else mir_sntprintf(szText, SIZEOF(szText), TranslateT("Error occurred while setting default list"));

+		else mir_sntprintf(szText, TranslateT("Error occurred while setting default list"));

 	}

 

 	if (m_pDlgPrivacyLists) {

diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index 06cd7a8fa2..af1ebda659 100644
--- a/protocols/JabberG/src/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
@@ -192,7 +192,7 @@ void CJabberProto::OnIqResultGetSearchFields(HXML iqNode, CJabberIqInfo*)
 			code = xmlGetAttrValue(errorNode, _T("code"));
 			description = xmlGetText(errorNode);
 		}
-		mir_sntprintf(buff, SIZEOF(buff), TranslateT("Error %s %s\r\nPlease select other server"), code ? code : _T(""), description ? description : _T(""));
+		mir_sntprintf(buff, TranslateT("Error %s %s\r\nPlease select other server"), code ? code : _T(""), description ? description : _T(""));
 		SetDlgItemText(searchHandleDlg, IDC_INSTRUCTIONS, buff);
 	}
 	else SetDlgItemText(searchHandleDlg, IDC_INSTRUCTIONS, TranslateT("Error: unknown reply received\r\nPlease select other server"));
@@ -271,7 +271,7 @@ void CJabberProto::SearchReturnResults(HANDLE  id, void * pvUsersInfo, U_TCHAR_M
 
 		if (nick) {
 			if (mir_tstrcmpi(nick, Results.psr.id.t))
-				mir_sntprintf(buff, SIZEOF(buff), _T("%s (%s)"), nick, Results.psr.id.t);
+				mir_sntprintf(buff, _T("%s (%s)"), nick, Results.psr.id.t);
 			else
 				_tcsncpy_s(buff, nick, _TRUNCATE);
 
@@ -389,7 +389,7 @@ void CJabberProto::OnIqResultAdvancedSearch(HXML iqNode, CJabberIqInfo*)
 			description = xmlGetText(errorNode);
 		}
 
-		mir_sntprintf(buff, SIZEOF(buff), TranslateT("Error %s %s\r\nTry to specify more detailed"), code ? code : _T(""), description ? description : _T(""));
+		mir_sntprintf(buff, TranslateT("Error %s %s\r\nTry to specify more detailed"), code ? code : _T(""), description ? description : _T(""));
 		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, (HANDLE)id, 0);
 		if (searchHandleDlg)
 			SetDlgItemText(searchHandleDlg, IDC_INSTRUCTIONS, buff);
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index c7a1354fa1..cd3e8d0d18 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -77,7 +77,7 @@ static INT_PTR CALLBACK JabberPasswordDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

 			TCHAR text[512];

-			mir_sntprintf(text, SIZEOF(text), TranslateT("Enter password for %s"), param->ptszJid);

+			mir_sntprintf(text, TranslateT("Enter password for %s"), param->ptszJid);

 			SetDlgItemText(hwndDlg, IDC_JID, text);

 

 			int bSavePassword = param->pro->getByte("SaveSessionPassword", 0);

@@ -651,7 +651,7 @@ void CJabberProto::PerformAuthentication(ThreadData *info)
 		}

 

 		TCHAR text[1024];

-		mir_sntprintf(text, SIZEOF(text), TranslateT("Authentication failed for %s@%S."), info->conn.username, info->conn.server);

+		mir_sntprintf(text, TranslateT("Authentication failed for %s@%S."), info->conn.username, info->conn.server);

 		MsgPopup(NULL, text, TranslateT("Jabber Authentication"));

 		JLoginFailed(LOGINERR_WRONGPASSWORD);

 		info->send("</stream:stream>");

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index d3958b3436..7ac15547a1 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -174,7 +174,7 @@ static HTREEITEM sttFillInfoLine(HWND hwndTree, HTREEITEM htiRoot, HICON hIcon,
 
 	TCHAR buf[256];
 	if (title)
-		mir_sntprintf(buf, SIZEOF(buf), _T("%s: %s"), title, value);
+		mir_sntprintf(buf, _T("%s: %s"), title, value);
 	else
 		mir_tstrncpy(buf, value, SIZEOF(buf));
 
@@ -227,7 +227,7 @@ static void sttFillResourceInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM hti
 	HICON hIcon = NULL;
 	if ( ServiceExists(MS_FP_GETCLIENTICONT)) {
 		if (r->m_tszSoftware != NULL) {
-			mir_sntprintf(buf, SIZEOF(buf), _T("%s %s"), r->m_tszSoftware, r->m_tszSoftwareVersion);
+			mir_sntprintf(buf, _T("%s %s"), r->m_tszSoftware, r->m_tszSoftwareVersion);
 			hIcon = Finger_GetClientIcon(buf, 0);
 		}
 	}
@@ -269,7 +269,7 @@ static void sttFillResourceInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM hti
 	sttFillInfoLine(hwndTree, htiResource, NULL, TranslateT("Idle since"), buf, sttInfoLineId(resource, INFOLINE_IDLE));
 
 	// caps
-	mir_sntprintf(buf, SIZEOF(buf), _T("%s/%s"), item->jid, r->m_tszResourceName);
+	mir_sntprintf(buf, _T("%s/%s"), item->jid, r->m_tszResourceName);
 	JabberCapsBits jcb = ppro->GetResourceCapabilites(buf, TRUE);
 
 	if (!(jcb & JABBER_RESOURCE_CAPS_ERROR)) {
@@ -320,7 +320,7 @@ static void sttFillAdvStatusInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM ht
 	if (szAdvStatusIcon && szAdvStatusTitle && *szAdvStatusTitle) {
 		TCHAR szText[2048];
 		if (szAdvStatusText && *szAdvStatusText)
-			mir_sntprintf(szText, SIZEOF(szText), _T("%s (%s)"), TranslateTS(szAdvStatusTitle), szAdvStatusText);
+			mir_sntprintf(szText, _T("%s (%s)"), TranslateTS(szAdvStatusTitle), szAdvStatusText);
 		else
 			_tcsncpy_s(szText, TranslateTS(szAdvStatusTitle), _TRUNCATE);
 		sttFillInfoLine(hwndTree, htiRoot, Skin_GetIcon(szAdvStatusIcon), szTitle, szText, dwInfoLine);
@@ -498,7 +498,7 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 	case WM_CONTEXTMENU:
 		if (GetWindowLongPtr((HWND)wParam, GWL_ID) == IDC_TV_INFO) {
 			HWND hwndTree = GetDlgItem(hwndDlg, IDC_TV_INFO);
-			POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };

+			POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) };
 			HTREEITEM hItem = 0;
 
 			if ((pt.x == -1) && (pt.y == -1)) {
@@ -678,19 +678,19 @@ static INT_PTR CALLBACK JabberUserPhotoDlgProc(HWND hwndDlg, UINT msg, WPARAM wP
 
 			switch (ProtoGetAvatarFileFormat(item->photoFileName)) {
 			case PA_FORMAT_BMP:
-				mir_sntprintf(szFilter, SIZEOF(szFilter), _T("BMP %s (*.bmp)%c*.BMP"), TranslateT("format"), 0);
+				mir_sntprintf(szFilter, _T("BMP %s (*.bmp)%c*.BMP"), TranslateT("format"), 0);
 				break;
 
 			case PA_FORMAT_GIF:
-				mir_sntprintf(szFilter, SIZEOF(szFilter), _T("GIF %s (*.gif)%c*.GIF"), TranslateT("format"), 0);
+				mir_sntprintf(szFilter, _T("GIF %s (*.gif)%c*.GIF"), TranslateT("format"), 0);
 				break;
 
 			case PA_FORMAT_JPEG:
-				mir_sntprintf(szFilter, SIZEOF(szFilter), _T("JPEG %s (*.jpg;*.jpeg)%c*.JPG;*.JPEG"), TranslateT("format"), 0);
+				mir_sntprintf(szFilter, _T("JPEG %s (*.jpg;*.jpeg)%c*.JPG;*.JPEG"), TranslateT("format"), 0);
 				break;
 
 			default:
-				mir_sntprintf(szFilter, SIZEOF(szFilter), _T("%s (*.*)%c*.*"), TranslateT("Unknown format"), 0);
+				mir_sntprintf(szFilter, _T("%s (*.*)%c*.*"), TranslateT("Unknown format"), 0);
 			}
 
 			TCHAR szFileName[MAX_PATH]; szFileName[0] = '\0';
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 662240451c..ded31eb3ef 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -528,7 +528,7 @@ void CJabberProto::SendPresence(int status, bool bSendToAll)
 			JABBER_LIST_ITEM *item = ListGetItemPtrFromIndex(i);

 			if (item != NULL) {

 				TCHAR text[1024];

-				mir_sntprintf(text, SIZEOF(text), _T("%s/%s"), item->jid, item->nick);

+				mir_sntprintf(text, _T("%s/%s"), item->jid, item->nick);

 				SendPresenceTo(status == ID_STATUS_INVISIBLE ? ID_STATUS_ONLINE : status, text, NULL);

 			}

 		}

@@ -551,7 +551,7 @@ int __stdcall JabberGetPacketID(HXML n)
 TCHAR* __stdcall JabberId2string(int id)

 {

 	TCHAR text[100];

-	mir_sntprintf(text, SIZEOF(text), _T(JABBER_IQID) _T("%d"), id);

+	mir_sntprintf(text, _T(JABBER_IQID) _T("%d"), id);

 	return mir_tstrdup(text);

 }

 

diff --git a/protocols/JabberG/src/jabber_xml.cpp b/protocols/JabberG/src/jabber_xml.cpp
index 616ee41f0f..0d75e02496 100644
--- a/protocols/JabberG/src/jabber_xml.cpp
+++ b/protocols/JabberG/src/jabber_xml.cpp
@@ -154,7 +154,7 @@ void __fastcall xmlAddAttr(HXML hXml, LPCTSTR pszName, unsigned __int64 value)
 void __fastcall xmlAddAttrID(HXML hXml, int id)

 {

 	TCHAR text[100];

-	mir_sntprintf(text, SIZEOF(text), _T(JABBER_IQID) _T("%d"), id);

+	mir_sntprintf(text, _T(JABBER_IQID) _T("%d"), id);

 	xmlAddAttr(hXml, _T("id"), text);

 }

 

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 473f0b5292..a6351238ba 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -68,7 +68,7 @@ void CJabberDlgPepBase::OnInitDialog()
 	SetTimer(m_hwnd, 1, 1000, NULL);

 

 	TCHAR buf[128];

-	mir_sntprintf(buf, SIZEOF(buf), TranslateT("OK (%d)"), m_time);

+	mir_sntprintf(buf, TranslateT("OK (%d)"), m_time);

 	m_btnOk.SetText(buf);

 }

 

@@ -89,7 +89,7 @@ INT_PTR CJabberDlgPepBase::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 	case WM_TIMER:

 		if (wParam == 1) {

 			TCHAR buf[128];

-			mir_sntprintf(buf, SIZEOF(buf), TranslateT("OK (%d)"), --m_time);

+			mir_sntprintf(buf, TranslateT("OK (%d)"), --m_time);

 			m_btnOk.SetText(buf);

 

 			if (m_time < 0) {

@@ -341,7 +341,7 @@ BOOL CJabberDlgPepSimple::OnWmDrawItem(UINT, WPARAM, LPARAM lParam)
 		if (mode->m_subitem) {

 			for (int i = lpdis->itemData; i >= 0; --i)

 				if (!m_modes[i].m_subitem) {

-					mir_sntprintf(text, SIZEOF(text), _T("%s [%s]"), m_modes[i].m_title, mode->m_title);

+					mir_sntprintf(text, _T("%s [%s]"), m_modes[i].m_title, mode->m_title);

 					break;

 				}

 		}

@@ -352,7 +352,7 @@ BOOL CJabberDlgPepSimple::OnWmDrawItem(UINT, WPARAM, LPARAM lParam)
 	}

 	else {

 		TCHAR text[128];

-		mir_sntprintf(text, SIZEOF(text), _T("...%s"), mode->m_title);

+		mir_sntprintf(text, _T("...%s"), mode->m_title);

 		DrawIconEx(lpdis->hDC, lpdis->rcItem.left + 23, (lpdis->rcItem.top + lpdis->rcItem.bottom - 16) / 2, mode->m_hIcon, 16, 16, 0, NULL, DI_NORMAL);

 		TextOut(lpdis->hDC, lpdis->rcItem.left + 44, (lpdis->rcItem.top + lpdis->rcItem.bottom - tm.tmHeight) / 2, text, (int)mir_tstrlen(text));

 	}