SIZEOF replaced with more secure analog - _countof

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

5 files changed, 88 insertions, 88 deletions

diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp
index af4783d659..0a541b7662 100644
--- a/plugins/NewXstatusNotify/src/indsnd.cpp
+++ b/plugins/NewXstatusNotify/src/indsnd.cpp
@@ -32,7 +32,7 @@ void PreviewSound(HWND hList)
 

 	int hlpStatus = lvi.lParam;

 

-	ListView_GetItemText(hList, lvi.iItem, 1, buff, SIZEOF(buff));

+	ListView_GetItemText(hList, lvi.iItem, 1, buff, _countof(buff));

 	if (!mir_tstrcmp(buff, TranslateT(DEFAULT_SOUND))) {

 		if (hlpStatus < ID_STATUS_MIN)

 			SkinPlaySound(StatusListEx[hlpStatus].lpzSkinSoundName);

@@ -72,9 +72,9 @@ TCHAR *SelectSound(HWND hwndDlg, TCHAR *buff, size_t bufflen)
 	ofn.hInstance = hInst;

 	TCHAR filter[MAX_PATH];

 	if (GetModuleHandle(_T("bass_interface.dll")))

-		mir_sntprintf(filter, SIZEOF(filter), _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%s (*.*)%c*%c"), TranslateT("Sound files"), 0, 0, TranslateT("All files"), 0, 0);

+		mir_sntprintf(filter, _countof(filter), _T("%s (*.wav, *.mp3, *.ogg)%c*.wav;*.mp3;*.ogg%c%s (*.*)%c*%c"), TranslateT("Sound files"), 0, 0, TranslateT("All files"), 0, 0);

 	else

-		mir_sntprintf(filter, SIZEOF(filter), _T("%s (*.wav)%c*.wav%c%s (*.*)%c*%c"), TranslateT("Wave files"), 0, 0, TranslateT("All files"), 0, 0);

+		mir_sntprintf(filter, _countof(filter), _T("%s (*.wav)%c*.wav%c%s (*.*)%c*%c"), TranslateT("Wave files"), 0, 0, TranslateT("All files"), 0, 0);

 	ofn.lpstrFilter = filter;

 	ofn.lpstrFile = buff;

 	ofn.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_EXPLORER | OFN_NOCHANGEDIR;

@@ -171,11 +171,11 @@ INT_PTR CALLBACK DlgProcSoundUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 					lvi.iItem = ListView_InsertItem(hList, &lvi);

 

 					if (!db_get_ts(hContact, MODULE, StatusList[i].lpzSkinSoundName, &dbv)) {

-						_tcsncpy(buff, dbv.ptszVal, SIZEOF(buff)-1);

+						_tcsncpy(buff, dbv.ptszVal, _countof(buff)-1);

 						db_free(&dbv);

 					}

 					else

-						_tcsncpy(buff, TranslateT(DEFAULT_SOUND), SIZEOF(buff)-1);

+						_tcsncpy(buff, TranslateT(DEFAULT_SOUND), _countof(buff)-1);

 

 					ListView_SetItemText(hList, lvi.iItem, 1, buff);

 				}

@@ -237,7 +237,7 @@ INT_PTR CALLBACK DlgProcSoundUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			//Cycle through the list reading the text associated to each status.

 			for (lvi.iItem = ListView_GetItemCount(hList) - 1; lvi.iItem >= 0; lvi.iItem--) {

 				ListView_GetItem(hList, &lvi);

-				ListView_GetItemText(hList, lvi.iItem, 1, buff, SIZEOF(buff));

+				ListView_GetItemText(hList, lvi.iItem, 1, buff, _countof(buff));

 

 				if (!mir_tstrcmp(buff, TranslateT(DEFAULT_SOUND))) {

 					if (lvi.lParam < ID_STATUS_MIN)

@@ -349,7 +349,7 @@ void SetGroupsIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *g
 		if (hChildItem)

 			SetGroupsIcons(hwndList, hChildItem, hItem, childCount);

 

-		for (int i = 0; i < SIZEOF(iconOn); i++) {

+		for (int i = 0; i < _countof(iconOn); i++) {

 			if (iconOn[i] && GetExtraImage(hwndList, hItem, i) == EXTRA_IMAGE_DOT)

 				iconOn[i] = 0;

 		}

@@ -364,7 +364,7 @@ void SetGroupsIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *g
 		hItem = (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 

 	while (hItem) {

-		for (int i = 0; i < SIZEOF(iconOn); i++) {

+		for (int i = 0; i < _countof(iconOn); i++) {

 			int image = GetExtraImage(hwndList, hItem, i);

 			if (iconOn[i] && image == EXTRA_IMAGE_DOT)

 				iconOn[i] = 0;

@@ -377,7 +377,7 @@ void SetGroupsIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *g
 	}

 

 	//set icons

-	for (int i = 0; i < SIZEOF(iconOn); i++) {

+	for (int i = 0; i < _countof(iconOn); i++) {

 		SetExtraImage(hwndList, hParentItem, i, childCount[i] ? (iconOn[i] ? i : EXTRA_IMAGE_DOT) : EMPTY_EXTRA_ICON);

 		if (groupChildCount)

 			groupChildCount[i] += childCount[i];

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index d8de67a965..69b6dc751e 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -88,7 +88,7 @@ BYTE GetGender(MCONTACT hContact)
 HANDLE GetIconHandle(char *szIcon)

 {

 	char szSettingName[64];

-	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", MODULE, szIcon);

+	mir_snprintf(szSettingName, _countof(szSettingName), "%s_%s", MODULE, szIcon);

 	return IcoLib_GetIconHandle(szSettingName);

 }

 

@@ -328,7 +328,7 @@ void PlayChangeSound(MCONTACT hContact, const char *name)
 		DBVARIANT dbv;

 		TCHAR stzSoundFile[MAX_PATH] = { 0 };

 		if (!db_get_ts(hContact, MODULE, name, &dbv)) {

-			_tcsncpy(stzSoundFile, dbv.ptszVal, SIZEOF(stzSoundFile)-1);

+			_tcsncpy(stzSoundFile, dbv.ptszVal, _countof(stzSoundFile)-1);

 			db_free(&dbv);

 		}

 

@@ -416,8 +416,8 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 	// check if that proto from which we received statuschange notification, isn't in autodisable list

 	if (opt.AutoDisable) {

 		char statusIDs[12], statusIDp[12];

-		mir_snprintf(statusIDs, SIZEOF(statusIDs), "s%d", myStatus);

-		mir_snprintf(statusIDp, SIZEOF(statusIDp), "p%d", myStatus);

+		mir_snprintf(statusIDs, _countof(statusIDs), "s%d", myStatus);

+		mir_snprintf(statusIDp, _countof(statusIDp), "p%d", myStatus);

 		bEnableSound = db_get_b(0, MODULE, statusIDs, 1) ? FALSE : TRUE;

 		bEnablePopup = db_get_b(0, MODULE, statusIDp, 1) ? FALSE : TRUE;

 	}

@@ -443,7 +443,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 	if (opt.BlinkIcon && !opt.TempDisabled) {

 		HICON hIcon = opt.BlinkIcon_Status ? Skin_LoadProtoIcon(szProto, newStatus) : Skin_LoadIcon(SKINICON_OTHER_USERONLINE);

 		TCHAR str[256];

-		mir_sntprintf(str, SIZEOF(str), TranslateT("%s is now %s"), pcli->pfnGetContactDisplayName(hContact, 0), StatusList[Index(newStatus)].lpzStandardText);

+		mir_sntprintf(str, _countof(str), TranslateT("%s is now %s"), pcli->pfnGetContactDisplayName(hContact, 0), StatusList[Index(newStatus)].lpzStandardText);

 		BlinkIcon(hContact, hIcon, str);

 	}

 

@@ -457,9 +457,9 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus)
 	if (opt.LogToFile) {

 		TCHAR stzDate[MAX_STATUSTEXT], stzTime[MAX_STATUSTEXT], stzText[MAX_TEXT_LEN];

 

-		GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("HH':'mm"), stzTime, SIZEOF(stzTime));

-		GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("dd/MM/yyyy"), stzDate, SIZEOF(stzDate));

-		mir_sntprintf(stzText, SIZEOF(stzText), TranslateT("%s, %s. %s changed status to %s (was %s)\r\n"),

+		GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("HH':'mm"), stzTime, _countof(stzTime));

+		GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("dd/MM/yyyy"), stzDate, _countof(stzDate));

+		mir_sntprintf(stzText, _countof(stzText), TranslateT("%s, %s. %s changed status to %s (was %s)\r\n"),

 			stzDate, stzTime, pcli->pfnGetContactDisplayName(hContact, 0), StatusList[Index(newStatus)].lpzStandardText,

 			StatusList[Index(oldStatus)].lpzStandardText);

 		LogToFile(stzText);

@@ -553,7 +553,7 @@ int ProcessExtraStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		}

 		else if (strstr(cws->szSetting, "text")) {

 			char dbSetting[128];

-			mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s%s", szSetting, "Msg");

+			mir_snprintf(dbSetting, _countof(dbSetting), "%s%s", szSetting, "Msg");

 			smi.compare = CompareStatusMsg(&smi, cws, dbSetting);

 			if (smi.compare == COMPARE_SAME) {

 				replaceStrT(smi.newstatusmsg, 0);

@@ -651,11 +651,11 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		goto skip_notify;

 

 	char dbSetting[64];

-	mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_enabled", szProto);

+	mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", szProto);

 	// this proto is not set for status message notifications

 	if (db_get_b(NULL, MODULE, dbSetting, 1) == 0)

 		goto skip_notify;

-	mir_snprintf(dbSetting, SIZEOF(dbSetting), "%d", IDC_CHK_STATUS_MESSAGE);

+	mir_snprintf(dbSetting, _countof(dbSetting), "%d", IDC_CHK_STATUS_MESSAGE);

 	// status message change notifications are disabled

 	if (db_get_b(NULL, MODULE, dbSetting, 1) == 0)

 		goto skip_notify;

@@ -666,8 +666,8 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 	// check if our status isn't on autodisable list

 	if (opt.AutoDisable) {

 		char statusIDs[12], statusIDp[12];

-		mir_snprintf(statusIDs, SIZEOF(statusIDs), "s%d", myStatus);

-		mir_snprintf(statusIDp, SIZEOF(statusIDp), "p%d", myStatus);

+		mir_snprintf(statusIDs, _countof(statusIDs), "s%d", myStatus);

+		mir_snprintf(statusIDp, _countof(statusIDp), "p%d", myStatus);

 		bEnableSound = db_get_b(0, MODULE, statusIDs, 1) ? FALSE : bEnableSound;

 		bEnablePopup = db_get_b(0, MODULE, statusIDp, 1) ? FALSE : bEnablePopup;

 	}

@@ -695,7 +695,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		TCHAR *str;

 		if (smi.compare == COMPARE_DEL) {

 			char protoname[MAX_PATH];

-			mir_snprintf(protoname, SIZEOF(protoname), "%s_TPopupSMsgRemoved", szProto);

+			mir_snprintf(protoname, _countof(protoname), "%s_TPopupSMsgRemoved", szProto);

 			DBVARIANT dbVar = { 0 };

 			if (db_get_ts(NULL, MODULE, protoname, &dbVar)) {

 				str = GetStr(&smi, DEFAULT_POPUP_SMSGREMOVED);

@@ -707,7 +707,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		}

 		else {

 			char protoname[MAX_PATH];

-			mir_snprintf(protoname, SIZEOF(protoname), "%s_TPopupSMsgChanged", szProto);

+			mir_snprintf(protoname, _countof(protoname), "%s_TPopupSMsgChanged", szProto);

 			DBVARIANT dbVar = { 0 };

 			if (db_get_ts(NULL, MODULE, protoname, &dbVar)) {

 				str = GetStr(&smi, DEFAULT_POPUP_SMSGCHANGED);

@@ -733,7 +733,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 	if (opt.BlinkIcon && opt.BlinkIcon_ForMsgs && !opt.TempDisabled) {

 		HICON hIcon = opt.BlinkIcon_Status ? Skin_LoadProtoIcon(szProto, db_get_w(hContact, szProto, "Status", ID_STATUS_ONLINE)) : Skin_LoadIcon(SKINICON_OTHER_USERONLINE);

 		TCHAR str[256];

-		mir_sntprintf(str, SIZEOF(str), TranslateT("%s changed status message to %s"), pcli->pfnGetContactDisplayName(hContact, 0), smi.newstatusmsg);

+		mir_sntprintf(str, _countof(str), TranslateT("%s changed status message to %s"), pcli->pfnGetContactDisplayName(hContact, 0), smi.newstatusmsg);

 		BlinkIcon(hContact, hIcon, str);

 	}

 

@@ -751,8 +751,8 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 	if (opt.SMsgLogToFile && db_get_b(hContact, MODULE, "EnableSMsgLogging", 1)) {

 		TCHAR stzDate[MAX_STATUSTEXT], stzTime[MAX_STATUSTEXT], stzText[MAX_TEXT_LEN];

 

-		GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("HH':'mm"), stzTime, SIZEOF(stzTime));

-		GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("dd/MM/yyyy"), stzDate, SIZEOF(stzDate));

+		GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("HH':'mm"), stzTime, _countof(stzTime));

+		GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("dd/MM/yyyy"), stzDate, _countof(stzDate));

 

 		TCHAR *str;

 		if (smi.compare == COMPARE_DEL)

@@ -760,7 +760,7 @@ int ProcessStatusMessage(DBCONTACTWRITESETTING *cws, MCONTACT hContact)
 		else

 			str = GetStr(&smi, templates.LogSMsgChanged);

 

-		mir_sntprintf(stzText, SIZEOF(stzText), _T("%s, %s. %s %s\r\n"), stzDate, stzTime, pcli->pfnGetContactDisplayName(hContact, 0), str);

+		mir_sntprintf(stzText, _countof(stzText), _T("%s, %s. %s %s\r\n"), stzDate, stzTime, pcli->pfnGetContactDisplayName(hContact, 0), str);

 

 		LogToFile(stzText);

 		mir_free(str);

@@ -1098,7 +1098,7 @@ static IconItem iconList[] =
 

 void InitIcolib()

 {

-	Icon_Register(hInst, LPGEN("New Status Notify"), iconList, SIZEOF(iconList), MODULE);

+	Icon_Register(hInst, LPGEN("New Status Notify"), iconList, _countof(iconList), MODULE);

 }

 

 void InitSound()

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index 2fc03679d2..f1a078ec3d 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -31,20 +31,20 @@ INT_PTR CALLBACK DlgProcAutoDisableOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 void LoadTemplates()

 {

-	DBGetStringDefault(0, MODULE, "TPopupXChanged", templates.PopupXstatusChanged, SIZEOF(templates.PopupXstatusChanged), DEFAULT_POPUP_CHANGED);

-	DBGetStringDefault(0, MODULE, "TPopupXRemoved", templates.PopupXstatusRemoved, SIZEOF(templates.PopupXstatusRemoved), DEFAULT_POPUP_REMOVED);

-	DBGetStringDefault(0, MODULE, "TPopupXMsgChanged", templates.PopupXMsgChanged, SIZEOF(templates.PopupXMsgChanged), DEFAULT_POPUP_MSGCHANGED);

-	DBGetStringDefault(0, MODULE, "TPopupXMsgRemoved", templates.PopupXMsgRemoved, SIZEOF(templates.PopupXMsgRemoved), DEFAULT_POPUP_MSGREMOVED);

+	DBGetStringDefault(0, MODULE, "TPopupXChanged", templates.PopupXstatusChanged, _countof(templates.PopupXstatusChanged), DEFAULT_POPUP_CHANGED);

+	DBGetStringDefault(0, MODULE, "TPopupXRemoved", templates.PopupXstatusRemoved, _countof(templates.PopupXstatusRemoved), DEFAULT_POPUP_REMOVED);

+	DBGetStringDefault(0, MODULE, "TPopupXMsgChanged", templates.PopupXMsgChanged, _countof(templates.PopupXMsgChanged), DEFAULT_POPUP_MSGCHANGED);

+	DBGetStringDefault(0, MODULE, "TPopupXMsgRemoved", templates.PopupXMsgRemoved, _countof(templates.PopupXMsgRemoved), DEFAULT_POPUP_MSGREMOVED);

 

-	DBGetStringDefault(0, MODULE, "TLogXChanged", templates.LogXstatusChanged, SIZEOF(templates.LogXstatusChanged), DEFAULT_LOG_CHANGED);

-	DBGetStringDefault(0, MODULE, "TLogXRemoved", templates.LogXstatusRemoved, SIZEOF(templates.LogXstatusRemoved), DEFAULT_LOG_REMOVED);

-	DBGetStringDefault(0, MODULE, "TLogXMsgChanged", templates.LogXMsgChanged, SIZEOF(templates.LogXMsgChanged), DEFAULT_LOG_MSGCHANGED);

-	DBGetStringDefault(0, MODULE, "TLogXMsgRemoved", templates.LogXMsgRemoved, SIZEOF(templates.LogXMsgRemoved), DEFAULT_LOG_MSGREMOVED);

-	DBGetStringDefault(0, MODULE, "TLogXOpening", templates.LogXstatusOpening, SIZEOF(templates.LogXstatusOpening), DEFAULT_LOG_OPENING);

+	DBGetStringDefault(0, MODULE, "TLogXChanged", templates.LogXstatusChanged, _countof(templates.LogXstatusChanged), DEFAULT_LOG_CHANGED);

+	DBGetStringDefault(0, MODULE, "TLogXRemoved", templates.LogXstatusRemoved, _countof(templates.LogXstatusRemoved), DEFAULT_LOG_REMOVED);

+	DBGetStringDefault(0, MODULE, "TLogXMsgChanged", templates.LogXMsgChanged, _countof(templates.LogXMsgChanged), DEFAULT_LOG_MSGCHANGED);

+	DBGetStringDefault(0, MODULE, "TLogXMsgRemoved", templates.LogXMsgRemoved, _countof(templates.LogXMsgRemoved), DEFAULT_LOG_MSGREMOVED);

+	DBGetStringDefault(0, MODULE, "TLogXOpening", templates.LogXstatusOpening, _countof(templates.LogXstatusOpening), DEFAULT_LOG_OPENING);

 

-	DBGetStringDefault(0, MODULE, "TLogSMsgChanged", templates.LogSMsgChanged, SIZEOF(templates.LogSMsgChanged), DEFAULT_LOG_SMSGCHANGED);

-	DBGetStringDefault(0, MODULE, "TLogSMsgRemoved", templates.LogSMsgRemoved, SIZEOF(templates.LogSMsgRemoved), DEFAULT_LOG_SMSGREMOVED);

-	DBGetStringDefault(0, MODULE, "TLogSMsgOpening", templates.LogSMsgOpening, SIZEOF(templates.LogSMsgOpening), DEFAULT_LOG_SMSGOPENING);

+	DBGetStringDefault(0, MODULE, "TLogSMsgChanged", templates.LogSMsgChanged, _countof(templates.LogSMsgChanged), DEFAULT_LOG_SMSGCHANGED);

+	DBGetStringDefault(0, MODULE, "TLogSMsgRemoved", templates.LogSMsgRemoved, _countof(templates.LogSMsgRemoved), DEFAULT_LOG_SMSGREMOVED);

+	DBGetStringDefault(0, MODULE, "TLogSMsgOpening", templates.LogSMsgOpening, _countof(templates.LogSMsgOpening), DEFAULT_LOG_SMSGOPENING);

 

 	templates.PopupXFlags = db_get_b(0, MODULE, "TPopupXFlags", NOTIFY_NEW_XSTATUS | NOTIFY_NEW_MESSAGE);

 	templates.PopupSMsgFlags = db_get_b(0, MODULE, "TPopupSMsgFlags", NOTIFY_NEW_MESSAGE);

@@ -218,7 +218,7 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

 			//Statuses notified

 			char status[8];

-			mir_snprintf(status, SIZEOF(status), "%d", i);

+			mir_snprintf(status, _countof(status), "%d", i);

 			CheckDlgButton(hwndDlg, i, db_get_b(0, MODULE, status, 1) ? BST_CHECKED : BST_UNCHECKED);

 		}

 		CheckDlgButton(hwndDlg, IDC_CHK_FROMOFFLINE, opt.FromOffline ? BST_CHECKED : BST_UNCHECKED);

@@ -249,14 +249,14 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			TCHAR buff[MAX_PATH];

 			OPENFILENAME ofn = { 0 };

 

-			GetDlgItemText(hwndDlg, IDC_LOGFILE, buff, SIZEOF(buff));

+			GetDlgItemText(hwndDlg, IDC_LOGFILE, buff, _countof(buff));

 

 			ofn.lStructSize = sizeof(OPENFILENAME);

 			ofn.lpstrFile = buff;

 			ofn.nMaxFile = MAX_PATH;

 			ofn.hwndOwner = hwndDlg;

 			TCHAR filter[MAX_PATH];

-			mir_sntprintf(filter, SIZEOF(filter), _T("%s (*.*)%c*.*%c%s (*.log)%c*.log%c%s (*.txt)%c*.txt%c"), TranslateT("All Files"), 0, 0, TranslateT("Log"), 0, 0, TranslateT("Text"), 0, 0);

+			mir_sntprintf(filter, _countof(filter), _T("%s (*.*)%c*.*%c%s (*.log)%c*.log%c%s (*.txt)%c*.txt%c"), TranslateT("All Files"), 0, 0, TranslateT("Log"), 0, 0, TranslateT("Text"), 0, 0);

 			ofn.lpstrFilter = filter;

 			ofn.nFilterIndex = 2;

 			ofn.lpstrInitialDir = buff;

@@ -284,12 +284,12 @@ INT_PTR CALLBACK DlgProcGeneralOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			opt.HiddenContactsToo = IsDlgButtonChecked(hwndDlg, IDC_HIDDENCONTACTSTOO);

 			opt.UseIndSnd = IsDlgButtonChecked(hwndDlg, IDC_USEINDIVSOUNDS);

 

-			GetDlgItemText(hwndDlg, IDC_LOGFILE, opt.LogFilePath, SIZEOF(opt.LogFilePath));

+			GetDlgItemText(hwndDlg, IDC_LOGFILE, opt.LogFilePath, _countof(opt.LogFilePath));

 

 			//Notified statuses

 			for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) {

 				char status[8];

-				mir_snprintf(status, SIZEOF(status), "%d", i);

+				mir_snprintf(status, _countof(status), "%d", i);

 				db_set_b(NULL, MODULE, status, (BYTE)IsDlgButtonChecked(hwndDlg, i));

 			}

 			opt.FromOffline = IsDlgButtonChecked(hwndDlg, IDC_CHK_FROMOFFLINE);

@@ -336,7 +336,7 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		SetDlgItemInt(hwndDlg, IDC_CONNECTIONTIMEOUT_VALUE, opt.PopupConnectionTimeout, TRUE);

 

 		//Mouse actions

-		for (int i = 0; i < SIZEOF(PopupActions); i++) {

+		for (int i = 0; i < _countof(PopupActions); i++) {

 			SendDlgItemMessage(hwndDlg, IDC_STATUS_LC, CB_SETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_STATUS_LC, CB_ADDSTRING, 0, (LPARAM)TranslateTS(PopupActions[i].Text)), PopupActions[i].Action);

 			SendDlgItemMessage(hwndDlg, IDC_STATUS_RC, CB_SETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_STATUS_RC, CB_ADDSTRING, 0, (LPARAM)TranslateTS(PopupActions[i].Text)), PopupActions[i].Action);

 		}

@@ -381,13 +381,13 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			{

 				TCHAR str[MAX_SECONDLINE] = { 0 };

 				for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX; i++) {

-					_tcsncpy(str, _T(""), SIZEOF(str));

+					_tcsncpy(str, _T(""), _countof(str));

 

 					if (opt.ShowStatus) {

 						if (opt.UseAlternativeText == 1)

-							_tcsncpy(str, StatusList[Index(i)].lpzUStatusText, SIZEOF(str));

+							_tcsncpy(str, StatusList[Index(i)].lpzUStatusText, _countof(str));

 						else

-							_tcsncpy(str, StatusList[Index(i)].lpzStandardText, SIZEOF(str));

+							_tcsncpy(str, StatusList[Index(i)].lpzStandardText, _countof(str));

 

 						if (opt.ShowPreviousStatus) {

 							TCHAR buff[MAX_STATUSTEXT];

@@ -405,9 +405,9 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 					ShowChangePopup(NULL, Skin_LoadProtoIcon(NULL, i), i, str);

 				}

-				_tcsncpy(str, TranslateT("This is extra status"), SIZEOF(str));

+				_tcsncpy(str, TranslateT("This is extra status"), _countof(str));

 				ShowChangePopup(NULL, Skin_LoadProtoIcon(NULL, ID_STATUS_ONLINE), ID_STATUS_EXTRASTATUS, str);

-				_tcsncpy(str, TranslateT("This is status message"), SIZEOF(str));

+				_tcsncpy(str, TranslateT("This is status message"), _countof(str));

 				ShowChangePopup(NULL, Skin_LoadProtoIcon(NULL, ID_STATUS_ONLINE), ID_STATUS_STATUSMSG, str);

 

 				return FALSE;

@@ -630,10 +630,10 @@ INT_PTR CALLBACK DlgProcXPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				(IsDlgButtonChecked(hwndDlg, IDC_CHK_MSGREMOVE) ? NOTIFY_REMOVE_MESSAGE : 0);

 

 			// Templates

-			GetDlgItemText(hwndDlg, IDC_ED_TCHANGE, templates.PopupXstatusChanged, SIZEOF(templates.PopupXstatusChanged));

-			GetDlgItemText(hwndDlg, IDC_ED_TREMOVE, templates.PopupXstatusRemoved, SIZEOF(templates.PopupXstatusRemoved));

-			GetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, templates.PopupXMsgChanged, SIZEOF(templates.PopupXMsgChanged));

-			GetDlgItemText(hwndDlg, IDC_ED_TREMOVEMSG, templates.PopupXMsgRemoved, SIZEOF(templates.PopupXMsgRemoved));

+			GetDlgItemText(hwndDlg, IDC_ED_TCHANGE, templates.PopupXstatusChanged, _countof(templates.PopupXstatusChanged));

+			GetDlgItemText(hwndDlg, IDC_ED_TREMOVE, templates.PopupXstatusRemoved, _countof(templates.PopupXstatusRemoved));

+			GetDlgItemText(hwndDlg, IDC_ED_TCHANGEMSG, templates.PopupXMsgChanged, _countof(templates.PopupXMsgChanged));

+			GetDlgItemText(hwndDlg, IDC_ED_TREMOVEMSG, templates.PopupXMsgRemoved, _countof(templates.PopupXMsgRemoved));

 

 			// Save options to db

 			SaveOptions();

@@ -729,19 +729,19 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 				DBVARIANT dbVar = { 0 };

 				char protoname[MAX_PATH] = { 0 };

-				mir_snprintf(protoname, SIZEOF(protoname), "%s_TPopupSMsgChanged", protos[i]->szModuleName);

+				mir_snprintf(protoname, _countof(protoname), "%s_TPopupSMsgChanged", protos[i]->szModuleName);

 				if (db_get_ts(NULL, MODULE, protoname, &dbVar))

-					_tcsncpy(prototemplate->ProtoTemplateMsg, DEFAULT_POPUP_SMSGCHANGED, SIZEOF(prototemplate->ProtoTemplateMsg));

+					_tcsncpy(prototemplate->ProtoTemplateMsg, DEFAULT_POPUP_SMSGCHANGED, _countof(prototemplate->ProtoTemplateMsg));

 				else {

-					_tcsncpy(prototemplate->ProtoTemplateMsg, dbVar.ptszVal, SIZEOF(prototemplate->ProtoTemplateMsg));

+					_tcsncpy(prototemplate->ProtoTemplateMsg, dbVar.ptszVal, _countof(prototemplate->ProtoTemplateMsg));

 					db_free(&dbVar);

 				}

 

-				mir_snprintf(protoname, SIZEOF(protoname), "%s_TPopupSMsgRemoved", protos[i]->szModuleName);

+				mir_snprintf(protoname, _countof(protoname), "%s_TPopupSMsgRemoved", protos[i]->szModuleName);

 				if (db_get_ts(NULL, MODULE, protoname, &dbVar))

-					_tcsncpy(prototemplate->ProtoTemplateRemoved, DEFAULT_POPUP_SMSGREMOVED, SIZEOF(prototemplate->ProtoTemplateRemoved));

+					_tcsncpy(prototemplate->ProtoTemplateRemoved, DEFAULT_POPUP_SMSGREMOVED, _countof(prototemplate->ProtoTemplateRemoved));

 				else {

-					_tcsncpy(prototemplate->ProtoTemplateRemoved, dbVar.ptszVal, SIZEOF(prototemplate->ProtoTemplateRemoved));

+					_tcsncpy(prototemplate->ProtoTemplateRemoved, dbVar.ptszVal, _countof(prototemplate->ProtoTemplateRemoved));

 					db_free(&dbVar);

 				}

 

@@ -749,7 +749,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				ProtoTemplates.insert(prototemplate, ProtoTemplates.getCount());

 

 				char dbSetting[128];

-				mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_enabled", protos[i]->szModuleName);

+				mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", protos[i]->szModuleName);

 				ListView_SetCheckState(hList, lvItem.iItem, db_get_b(NULL, MODULE, dbSetting, TRUE));

 				lvItem.iItem++;

 			}

@@ -862,7 +862,7 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				ListView_GetItem(hList, &lvItem);

 

 				char dbSetting[128];

-				mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_enabled", (char *)lvItem.lParam);

+				mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", (char *)lvItem.lParam);

 				db_set_b(NULL, MODULE, dbSetting, (BYTE)ListView_GetCheckState(hList, lvItem.iItem));

 			}

 		}

@@ -999,11 +999,11 @@ INT_PTR CALLBACK DlgProcXLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				(IsDlgButtonChecked(hwndDlg, IDC_CHK_XSTATUSOPENING) ? NOTIFY_OPENING_ML : 0);

 

 			// Templates

-			GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSCHANGED, templates.LogXstatusChanged, SIZEOF(templates.LogXstatusChanged));

-			GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSREMOVED, templates.LogXstatusRemoved, SIZEOF(templates.LogXstatusRemoved));

-			GetDlgItemText(hwndDlg, IDC_ED_TMSGCHANGED, templates.LogXMsgChanged, SIZEOF(templates.LogXMsgChanged));

-			GetDlgItemText(hwndDlg, IDC_ED_TMSGREMOVED, templates.LogXMsgRemoved, SIZEOF(templates.LogXMsgRemoved));

-			GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSOPENING, templates.LogXstatusOpening, SIZEOF(templates.LogXstatusOpening));

+			GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSCHANGED, templates.LogXstatusChanged, _countof(templates.LogXstatusChanged));

+			GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSREMOVED, templates.LogXstatusRemoved, _countof(templates.LogXstatusRemoved));

+			GetDlgItemText(hwndDlg, IDC_ED_TMSGCHANGED, templates.LogXMsgChanged, _countof(templates.LogXMsgChanged));

+			GetDlgItemText(hwndDlg, IDC_ED_TMSGREMOVED, templates.LogXMsgRemoved, _countof(templates.LogXMsgRemoved));

+			GetDlgItemText(hwndDlg, IDC_ED_TXSTATUSOPENING, templates.LogXstatusOpening, _countof(templates.LogXstatusOpening));

 

 			SaveOptions();

 			SaveTemplates();

@@ -1170,9 +1170,9 @@ INT_PTR CALLBACK DlgProcLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				(IsDlgButtonChecked(hwndDlg, IDC_LOG_SMSGOPENING) ? NOTIFY_OPENING_ML : 0);

 

 			// Templates

-			GetDlgItemText(hwndDlg, IDC_LOG_TSMSGCHANGED, templates.LogSMsgChanged, SIZEOF(templates.LogSMsgChanged));

-			GetDlgItemText(hwndDlg, IDC_LOG_TSMSGREMOVED, templates.LogSMsgRemoved, SIZEOF(templates.LogSMsgRemoved));

-			GetDlgItemText(hwndDlg, IDC_LOG_TSMSGOPENING, templates.LogSMsgOpening, SIZEOF(templates.LogSMsgOpening));

+			GetDlgItemText(hwndDlg, IDC_LOG_TSMSGCHANGED, templates.LogSMsgChanged, _countof(templates.LogSMsgChanged));

+			GetDlgItemText(hwndDlg, IDC_LOG_TSMSGREMOVED, templates.LogSMsgRemoved, _countof(templates.LogSMsgRemoved));

+			GetDlgItemText(hwndDlg, IDC_LOG_TSMSGOPENING, templates.LogSMsgOpening, _countof(templates.LogSMsgOpening));

 

 			SaveOptions();

 			SaveTemplates();

diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index 8410aea172..fd1127dae2 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -36,7 +36,7 @@ void ShowChangePopup(MCONTACT hContact, HICON hIcon, WORD newStatus, const TCHAR
 	}

 	_tcsncpy_s(ppd.lptzContactName, buf, _TRUNCATE);

 

-	_tcsncpy(ppd.lptzText, stzText, SIZEOF(ppd.lptzText));

+	_tcsncpy(ppd.lptzText, stzText, _countof(ppd.lptzText));

 

 	switch (opt.Colors) {

 	case POPUP_COLOR_OWN:

@@ -85,9 +85,9 @@ static int AwayMsgHook(WPARAM, LPARAM lParam, LPARAM pObj)
 

 	TCHAR stzText[1024];

 	if (pstzLast)

-		mir_sntprintf(stzText, SIZEOF(stzText), _T("%s\n%s"), pstzLast, tszStatus);

+		mir_sntprintf(stzText, _countof(stzText), _T("%s\n%s"), pstzLast, tszStatus);

 	else

-		_tcsncpy(stzText, tszStatus, SIZEOF(stzText));

+		_tcsncpy(stzText, tszStatus, _countof(stzText));

 	SendMessage(pdp->hWnd, WM_SETREDRAW, FALSE, 0);

 	PUChangeTextT(pdp->hWnd, stzText);

 	SendMessage(pdp->hWnd, WM_SETREDRAW, TRUE, 0);

diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index e89551ab6c..dcc0640267 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -226,7 +226,7 @@ void BlinkXStatusIcon(XSTATUSCHANGE *xsc)
 	HICON hIcon = NULL;

 	TCHAR str[256] = { 0 };

 	TCHAR stzType[32];

-	mir_sntprintf(str, SIZEOF(str), TranslateT("%s changed %s"), pcli->pfnGetContactDisplayName(xsc->hContact, 0), GetStatusTypeAsString(xsc->type, stzType));

+	mir_sntprintf(str, _countof(str), TranslateT("%s changed %s"), pcli->pfnGetContactDisplayName(xsc->hContact, 0), GetStatusTypeAsString(xsc->type, stzType));

 

 	if (opt.BlinkIcon_Status) {

 		DBVARIANT dbv;

@@ -289,7 +289,7 @@ void LogChangeToDB(XSTATUSCHANGE *xsc)
 

 	TCHAR stzLastLog[2 * MAX_TEXT_LEN];

 	CMString stzLogText(ReplaceVars(xsc, Template));

-	DBGetStringDefault(xsc->hContact, MODULE, DB_LASTLOG, stzLastLog, SIZEOF(stzLastLog), _T(""));

+	DBGetStringDefault(xsc->hContact, MODULE, DB_LASTLOG, stzLastLog, _countof(stzLastLog), _T(""));

 

 	if (opt.XLogToDB) {

 		db_set_ws(xsc->hContact, MODULE, DB_LASTLOG, stzLogText);

@@ -322,8 +322,8 @@ void LogChangeToFile(XSTATUSCHANGE *xsc)
 

 	TCHAR stzDate[32], stzTime[32], stzText[MAX_TEXT_LEN];

 

-	GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("HH':'mm"), stzTime, SIZEOF(stzTime));

-	GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("dd/MM/yyyy"), stzDate, SIZEOF(stzDate));

+	GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("HH':'mm"), stzTime, _countof(stzTime));

+	GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("dd/MM/yyyy"), stzDate, _countof(stzDate));

 

 	TCHAR *Template = _T("");

 	switch (xsc->action) {

@@ -337,7 +337,7 @@ void LogChangeToFile(XSTATUSCHANGE *xsc)
 		Template = templates.LogXMsgRemoved; break;

 	}

 

-	mir_sntprintf(stzText, SIZEOF(stzText), _T("%s, %s. %s %s\r\n"), stzDate, stzTime, 

+	mir_sntprintf(stzText, _countof(stzText), _T("%s, %s. %s %s\r\n"), stzDate, stzTime, 

 		pcli->pfnGetContactDisplayName(xsc->hContact, 0), ReplaceVars(xsc, Template).GetString());

 

 	LogToFile(stzText);

@@ -369,8 +369,8 @@ void ExtraStatusChanged(XSTATUSCHANGE *xsc)
 	if (opt.AutoDisable) {

 		char statusIDs[12], statusIDp[12];

 		WORD myStatus = (WORD)CallProtoService(xsc->szProto, PS_GETSTATUS, 0, 0);

-		mir_snprintf(statusIDs, SIZEOF(statusIDs), "s%d", myStatus);

-		mir_snprintf(statusIDp, SIZEOF(statusIDp), "p%d", myStatus);

+		mir_snprintf(statusIDs, _countof(statusIDs), "s%d", myStatus);

+		mir_snprintf(statusIDp, _countof(statusIDp), "p%d", myStatus);

 		bEnableSound = db_get_b(0, MODULE, statusIDs, 1) ? FALSE : bEnableSound;

 		bEnablePopup = db_get_b(0, MODULE, statusIDp, 1) ? FALSE : bEnablePopup;

 	}

@@ -480,22 +480,22 @@ void AddXStatusEventThread(void *arg)
 

 	TCHAR stzTitle[MAX_TITLE_LEN], stzText[MAX_TEXT_LEN];

 	if (ProtoServiceExists(szProto, JS_PARSE_XMPP_URI)) {

-		GetJabberAdvStatusText(hContact, szProto, "mood", "title", stzTitle, SIZEOF(stzTitle));

+		GetJabberAdvStatusText(hContact, szProto, "mood", "title", stzTitle, _countof(stzTitle));

 		if (stzTitle[0]) {

-			GetJabberAdvStatusText(hContact, szProto, "mood", "text", stzText, SIZEOF(stzText));

+			GetJabberAdvStatusText(hContact, szProto, "mood", "text", stzText, _countof(stzText));

 			LogXstatusChange(hContact, szProto, TYPE_JABBER_MOOD, stzTitle, stzText);

 		}

 

-		GetJabberAdvStatusText(hContact, szProto, "activity", "title", stzTitle, SIZEOF(stzTitle));

+		GetJabberAdvStatusText(hContact, szProto, "activity", "title", stzTitle, _countof(stzTitle));

 		if (stzTitle[0]) {

-			GetJabberAdvStatusText(hContact, szProto, "activity", "text", stzText, SIZEOF(stzText));

+			GetJabberAdvStatusText(hContact, szProto, "activity", "text", stzText, _countof(stzText));

 			LogXstatusChange(hContact, szProto, TYPE_JABBER_ACTIVITY, stzTitle, stzText);

 		}

 	}

 	else {

-		GetIcqXStatus(hContact, szProto, "XStatusName", stzTitle, SIZEOF(stzTitle));

+		GetIcqXStatus(hContact, szProto, "XStatusName", stzTitle, _countof(stzTitle));

 		if (stzTitle[0]) {

-			GetIcqXStatus(hContact, szProto, "XStatusMsg", stzText, SIZEOF(stzText));

+			GetIcqXStatus(hContact, szProto, "XStatusMsg", stzText, _countof(stzText));

 			LogXstatusChange(hContact, szProto, TYPE_ICQ_XSTATUS, stzTitle, stzText);

 		}

 	}