SIZEOF replaced with more secure analog - _countof

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

7 files changed, 97 insertions, 97 deletions

diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp
index 7938502f89..6ce6b6cc19 100644
--- a/plugins/IEView/src/HistoryHTMLBuilder.cpp
+++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp
@@ -83,8 +83,8 @@ char *HistoryHTMLBuilder::timestampToString(time_t check)
 {

 	static char szResult[512];

 	char str[80];

-	TimeZone_ToString(check, "d t", str, SIZEOF(str));

-	mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

+	TimeZone_ToString(check, "d t", str, _countof(str));

+	mir_strncat(szResult, str, _countof(szResult) - mir_strlen(szResult));

 	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp
index 7ac74ea989..740fd36264 100644
--- a/plugins/IEView/src/MUCCHTMLBuilder.cpp
+++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp
@@ -105,8 +105,8 @@ char *MUCCHTMLBuilder::timestampToString(DWORD dwData, time_t check)
 	else

 		szFormat = (char *)"";

 

-	TimeZone_ToString(check, szFormat, str, SIZEOF(str));

-	mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

+	TimeZone_ToString(check, szFormat, str, _countof(str));

+	mir_strncat(szResult, str, _countof(szResult) - mir_strlen(szResult));

 	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp
index 16c7e3e020..cb4d82d711 100644
--- a/plugins/IEView/src/Options.cpp
+++ b/plugins/IEView/src/Options.cpp
@@ -78,11 +78,11 @@ static void SaveSRMMProtoSettings(HWND hwndDlg, ProtocolSettings *proto)
 		i |= IsDlgButtonChecked(hwndDlg, IDC_LOG_RELATIVE_DATE) ? Options::LOG_RELATIVE_DATE : 0;

 		i |= IsDlgButtonChecked(hwndDlg, IDC_LOG_GROUP_MESSAGES) ? Options::LOG_GROUP_MESSAGES : 0;

 		proto->setSRMMFlagsTemp(i);

-		GetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path, _countof(path));

 		proto->setSRMMBackgroundFilenameTemp(path);

-		GetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path, _countof(path));

 		proto->setSRMMCssFilenameTemp(path);

-		GetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path, _countof(path));

 		proto->setSRMMTemplateFilenameTemp(path);

 	}

 }

@@ -108,11 +108,11 @@ static void SaveChatProtoSettings(HWND hwndDlg, ProtocolSettings *proto)
 		i |= IsDlgButtonChecked(hwndDlg, IDC_LOG_RELATIVE_DATE) ? Options::LOG_RELATIVE_DATE : 0;

 		i |= IsDlgButtonChecked(hwndDlg, IDC_LOG_GROUP_MESSAGES) ? Options::LOG_GROUP_MESSAGES : 0;

 		proto->setChatFlagsTemp(i);

-		GetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path, _countof(path));

 		proto->setChatBackgroundFilenameTemp(path);

-		GetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path, _countof(path));

 		proto->setChatCssFilenameTemp(path);

-		GetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path, _countof(path));

 		proto->setChatTemplateFilenameTemp(path);

 	}

 }

@@ -138,11 +138,11 @@ static void SaveHistoryProtoSettings(HWND hwndDlg, ProtocolSettings *proto)
 		i |= IsDlgButtonChecked(hwndDlg, IDC_LOG_RELATIVE_DATE) ? Options::LOG_RELATIVE_DATE : 0;

 		i |= IsDlgButtonChecked(hwndDlg, IDC_LOG_GROUP_MESSAGES) ? Options::LOG_GROUP_MESSAGES : 0;

 		proto->setHistoryFlagsTemp(i);

-		GetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path, _countof(path));

 		proto->setHistoryBackgroundFilenameTemp(path);

-		GetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path, _countof(path));

 		proto->setHistoryCssFilenameTemp(path);

-		GetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path, SIZEOF(path));

+		GetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path, _countof(path));

 		proto->setHistoryTemplateFilenameTemp(path);

 	}

 }

@@ -447,7 +447,7 @@ int IEViewOptInit(WPARAM wParam, LPARAM)
 

 	odp.ptszGroup = LPGENT("Skins");

 	odp.ptszTitle = LPGENT("IEView");

-	for (size_t i = 1; i < SIZEOF(tabPages); i++) {

+	for (size_t i = 1; i < _countof(tabPages); i++) {

 		odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);

 		odp.pfnDlgProc = tabPages[i].dlgProc;

 		odp.ptszTab = tabPages[i].tabName;

@@ -510,7 +510,7 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 		EnableWindow(GetDlgItem(hwndDlg, IDC_EMBED_SIZE), IsDlgButtonChecked(hwndDlg, IDC_ENABLE_EMBED));

 		{

 			TCHAR* size[] = { _T("320 x 205"), _T("480 x 385"), _T("560 x 349"), _T("640 x 390") };

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

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

 				int item = SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_ADDSTRING, 0, (LPARAM)TranslateTS(size[i]));

 				SendDlgItemMessage(hwndDlg, IDC_EMBED_SIZE, CB_SETITEMDATA, item, 0);

 			}

@@ -605,30 +605,30 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 				MarkChanges(2, hwndDlg);

 				break;

 			case IDC_BROWSE_TEMPLATES:

-				mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s (*.*)%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

-				if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

+				mir_snprintf(filter, _countof(filter), "%s (*.ivt)%c*.ivt%c%s (*.*)%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "ivt", path, _countof(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 					UpdateTemplateIcons(hwndDlg, path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_BACKGROUND_IMAGE:

-				mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.jpeg,*.gif,*.png,*.bmp)%c*.jpg;*.jpeg;*.gif;*.png;*.bmp%c%s (*.*)%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

-				if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

+				mir_snprintf(filter, _countof(filter), "%s (*.jpg,*.jpeg,*.gif,*.png,*.bmp)%c*.jpg;*.jpeg;*.gif;*.png;*.bmp%c%s (*.*)%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "jpg", path, _countof(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS:

-				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.css%c%s (*.*)%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

-				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

+				mir_snprintf(filter, _countof(filter), "%s (*.css)%c*.css%c%s (*.*)%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, _countof(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS_RTL:

-				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.css%c%s (*.*)%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

-				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

+				mir_snprintf(filter, _countof(filter), "%s (*.css)%c*.css%c%s (*.*)%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, _countof(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 					MarkChanges(2, hwndDlg);

 				}

@@ -737,30 +737,30 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 			MarkChanges(4, hwndDlg);

 			break;

 		case IDC_BROWSE_TEMPLATES:

-			mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

-			if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

+			mir_snprintf(filter, _countof(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+			if (BrowseFile(hwndDlg, filter, "ivt", path, _countof(path))) {

 				SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 				UpdateTemplateIcons(hwndDlg, path);

 				MarkChanges(4, hwndDlg);

 			}

 			break;

 		case IDC_BROWSE_BACKGROUND_IMAGE:

-			mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

-			if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

+			mir_snprintf(filter, _countof(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+			if (BrowseFile(hwndDlg, filter, "jpg", path, _countof(path))) {

 				SetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path);

 				MarkChanges(4, hwndDlg);

 			}

 			break;

 		case IDC_BROWSE_EXTERNALCSS:

-			mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

-			if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

+			mir_snprintf(filter, _countof(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+			if (BrowseFile(hwndDlg, filter, "css", path, _countof(path))) {

 				SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 				MarkChanges(4, hwndDlg);

 			}

 			break;

 		case IDC_BROWSE_EXTERNALCSS_RTL:

-			mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

-			if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

+			mir_snprintf(filter, _countof(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+			if (BrowseFile(hwndDlg, filter, "css", path, _countof(path))) {

 				SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 				MarkChanges(4, hwndDlg);

 			}

@@ -870,30 +870,30 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA
 			MarkChanges(8, hwndDlg);

 			break;

 		case IDC_BROWSE_TEMPLATES:

-			mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

-			if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

+			mir_snprintf(filter, _countof(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+			if (BrowseFile(hwndDlg, filter, "ivt", path, _countof(path))) {

 				SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 				UpdateTemplateIcons(hwndDlg, path);

 				MarkChanges(8, hwndDlg);

 			}

 			break;

 		case IDC_BROWSE_BACKGROUND_IMAGE:

-			mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

-			if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

+			mir_snprintf(filter, _countof(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+			if (BrowseFile(hwndDlg, filter, "jpg", path, _countof(path))) {

 				SetDlgItemTextA(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME, path);

 				MarkChanges(8, hwndDlg);

 			}

 			break;

 		case IDC_BROWSE_EXTERNALCSS:

-			mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

-			if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

+			mir_snprintf(filter, _countof(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+			if (BrowseFile(hwndDlg, filter, "css", path, _countof(path))) {

 				SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 				MarkChanges(8, hwndDlg);

 			}

 			break;

 		case IDC_BROWSE_EXTERNALCSS_RTL:

-			mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

-			if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

+			mir_snprintf(filter, _countof(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+			if (BrowseFile(hwndDlg, filter, "css", path, _countof(path))) {

 				SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 				MarkChanges(8, hwndDlg);

 			}

@@ -1495,13 +1495,13 @@ void Options::init()
 		else continue;

 

 		/* SRMM settings */

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_ENABLE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_ENABLE);

 		proto->setSRMMEnable(i == 0 ? true : 0 != db_get_b(NULL, ieviewModuleName, dbsName, FALSE));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_MODE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_MODE);

 		proto->setSRMMMode(db_get_b(NULL, ieviewModuleName, dbsName, FALSE));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_FLAGS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_FLAGS);

 		proto->setSRMMFlags(db_get_dw(NULL, ieviewModuleName, dbsName, 16128));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_BACKGROUND);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_BACKGROUND);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			if (strncmp(tmpPath, "http://", 7))

@@ -1510,7 +1510,7 @@ void Options::init()
 			proto->setSRMMBackgroundFilename(tmpPath);

 			db_free(&dbv);

 		}

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_CSS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_CSS);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			if (strncmp(tmpPath, "http://", 7))

@@ -1519,7 +1519,7 @@ void Options::init()
 			proto->setSRMMCssFilename(tmpPath);

 			db_free(&dbv);

 		}

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_TEMPLATE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_TEMPLATE);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			PathToAbsolute(dbv.pszVal, tmpPath);

@@ -1528,13 +1528,13 @@ void Options::init()
 		}

 

 		/* Group chat settings */

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_ENABLE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_ENABLE);

 		proto->setChatEnable(i == 0 ? true : 0 != db_get_b(NULL, ieviewModuleName, dbsName, FALSE));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_MODE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_MODE);

 		proto->setChatMode(db_get_b(NULL, ieviewModuleName, dbsName, FALSE));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_FLAGS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_FLAGS);

 		proto->setChatFlags(db_get_dw(NULL, ieviewModuleName, dbsName, 16128));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_BACKGROUND);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_BACKGROUND);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			if (strncmp(tmpPath, "http://", 7))

@@ -1543,7 +1543,7 @@ void Options::init()
 			proto->setChatBackgroundFilename(tmpPath);

 			db_free(&dbv);

 		}

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_CSS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_CSS);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			if (strncmp(tmpPath, "http://", 7))

@@ -1552,7 +1552,7 @@ void Options::init()
 			proto->setChatCssFilename(tmpPath);

 			db_free(&dbv);

 		}

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_TEMPLATE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_TEMPLATE);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			PathToAbsolute(dbv.pszVal, tmpPath);

@@ -1561,13 +1561,13 @@ void Options::init()
 		}

 

 		/* History settings */

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_ENABLE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_ENABLE);

 		proto->setHistoryEnable(i == 0 ? true : 0 != db_get_b(NULL, ieviewModuleName, dbsName, FALSE));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_MODE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_MODE);

 		proto->setHistoryMode(db_get_b(NULL, ieviewModuleName, dbsName, FALSE));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_FLAGS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_FLAGS);

 		proto->setHistoryFlags(db_get_dw(NULL, ieviewModuleName, dbsName, 16128));

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_BACKGROUND);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_BACKGROUND);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			if (strncmp(tmpPath, "http://", 7))

@@ -1576,7 +1576,7 @@ void Options::init()
 			proto->setHistoryBackgroundFilename(tmpPath);

 			db_free(&dbv);

 		}

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_CSS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_CSS);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			if (strncmp(tmpPath, "http://", 7))

@@ -1585,7 +1585,7 @@ void Options::init()
 			proto->setHistoryCssFilename(tmpPath);

 			db_free(&dbv);

 		}

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_TEMPLATE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_TEMPLATE);

 		if (!db_get(NULL, ieviewModuleName, dbsName, &dbv)) {

 			mir_strcpy(tmpPath, dbv.pszVal);

 			PathToAbsolute(dbv.pszVal, tmpPath);

@@ -1681,67 +1681,67 @@ void Options::saveProtocolSettings()
 		char tmpPath[MAX_PATH];

 		proto->copyFromTemp();

 		/* SRMM settings */

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_ENABLE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_ENABLE);

 		db_set_b(NULL, ieviewModuleName, dbsName, proto->isSRMMEnable());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_MODE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_MODE);

 		db_set_b(NULL, ieviewModuleName, dbsName, proto->getSRMMMode());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_FLAGS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_FLAGS);

 		db_set_dw(NULL, ieviewModuleName, dbsName, proto->getSRMMFlags());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_BACKGROUND);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_BACKGROUND);

 		mir_strcpy(tmpPath, proto->getSRMMBackgroundFilename());

 		PathToRelative(proto->getSRMMBackgroundFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

 

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_CSS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_CSS);

 		mir_strcpy(tmpPath, proto->getSRMMCssFilename());

 		PathToRelative(proto->getSRMMCssFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

 

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_TEMPLATE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_SRMM_TEMPLATE);

 		mir_strcpy(tmpPath, proto->getSRMMTemplateFilename());

 		PathToRelative(proto->getSRMMTemplateFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

 

 		/* Group Chat settings */

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_ENABLE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_ENABLE);

 		db_set_b(NULL, ieviewModuleName, dbsName, proto->isChatEnable());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_MODE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_MODE);

 		db_set_b(NULL, ieviewModuleName, dbsName, proto->getChatMode());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_FLAGS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_FLAGS);

 		db_set_dw(NULL, ieviewModuleName, dbsName, proto->getChatFlags());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_BACKGROUND);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_BACKGROUND);

 		mir_strcpy(tmpPath, proto->getChatBackgroundFilename());

 		PathToRelative(proto->getChatBackgroundFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

 

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_CSS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_CSS);

 		mir_strcpy(tmpPath, proto->getChatCssFilename());

 		PathToRelative(proto->getChatCssFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

 

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_TEMPLATE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_CHAT_TEMPLATE);

 		mir_strcpy(tmpPath, proto->getChatTemplateFilename());

 		PathToRelative(proto->getChatTemplateFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

 

 		/* History settings */

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_ENABLE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_ENABLE);

 		db_set_b(NULL, ieviewModuleName, dbsName, proto->isHistoryEnable());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_MODE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_MODE);

 		db_set_b(NULL, ieviewModuleName, dbsName, proto->getHistoryMode());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_FLAGS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_FLAGS);

 		db_set_dw(NULL, ieviewModuleName, dbsName, proto->getHistoryFlags());

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_BACKGROUND);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_BACKGROUND);

 		mir_strcpy(tmpPath, proto->getHistoryBackgroundFilename());

 		PathToRelative(proto->getHistoryBackgroundFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

 

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_CSS);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_CSS);

 		mir_strcpy(tmpPath, proto->getHistoryCssFilename());

 		PathToRelative(proto->getHistoryCssFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

 

-		mir_snprintf(dbsName, SIZEOF(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_TEMPLATE);

+		mir_snprintf(dbsName, _countof(dbsName), "%s.%s", proto->getProtocolName(), DBS_HISTORY_TEMPLATE);

 		mir_strcpy(tmpPath, proto->getHistoryTemplateFilename());

 		PathToRelative(proto->getHistoryTemplateFilename(), tmpPath);

 		db_set_s(NULL, ieviewModuleName, dbsName, tmpPath);

diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp
index 7143720889..4faadcca27 100644
--- a/plugins/IEView/src/ScriverHTMLBuilder.cpp
+++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp
@@ -136,13 +136,13 @@ char* ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod
 		today = mktime(&tm_today);

 

 		if (dwFlags & SMF_LOG_USERELATIVEDATE && check >= today) {

-			strncpy(szResult, Translate("Today"), SIZEOF(szResult)-1);

+			strncpy(szResult, Translate("Today"), _countof(szResult)-1);

 			if (mode == 0) {

 				mir_strcat(szResult, ",");

 			}

 		}

 		else if (dwFlags & SMF_LOG_USERELATIVEDATE && check > (today - 86400)) {

-			strncpy(szResult, Translate("Yesterday"), SIZEOF(szResult)-1);

+			strncpy(szResult, Translate("Yesterday"), _countof(szResult)-1);

 			if (mode == 0) {

 				mir_strcat(szResult, ",");

 			}

@@ -161,8 +161,8 @@ char* ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mod
 		mir_strcat(format, (dwFlags & SMF_LOG_SHOWSECONDS) ? "s" : "t");

 	}

 	if (format[0] != '\0') {

-		TimeZone_ToString(check, format, str, SIZEOF(str));

-		mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

+		TimeZone_ToString(check, format, str, _countof(str));

+		mir_strncat(szResult, str, _countof(szResult) - mir_strlen(szResult));

 	}

 	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
index 5f02f33da0..fc739de97e 100644
--- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
+++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
@@ -189,8 +189,8 @@ char* TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isG
 			szResult[0] = '\0';

 		}

 	}

-	TimeZone_ToString(check, szFormat, str, SIZEOF(str));

-	mir_strncat(szResult, str, SIZEOF(szResult) - mir_strlen(szResult));

+	TimeZone_ToString(check, szFormat, str, _countof(str));

+	mir_strncat(szResult, str, _countof(szResult) - mir_strlen(szResult));

 	mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500);

 	return szResult;

 }

diff --git a/plugins/IEView/src/Template.cpp b/plugins/IEView/src/Template.cpp
index e9a6271fde..afbbeceab5 100644
--- a/plugins/IEView/src/Template.cpp
+++ b/plugins/IEView/src/Template.cpp
@@ -359,7 +359,7 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename,
 		if (sscanf(store, "%s", tmp2) == EOF) continue;

 		//template start

 		bool bFound = false;

-		for (unsigned i = 0; i < SIZEOF(templateNames); i++) {

+		for (unsigned i = 0; i < _countof(templateNames); i++) {

 			if (!strncmp(store, templateNames[i].tokenString, templateNames[i].tokenLen)) {

 				bFound = true;

 				break;

@@ -386,7 +386,7 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename,
 		"MessageOutGroupStart", "MessageOutGroupInner",

 		"hMessageOutGroupStart", "hMessageOutGroupInner" };

 	tmap->grouping = true;

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

+	for (i = 0; i < _countof(groupTemplates); i++) {

 		if (tmap->getTemplate(groupTemplates[i]) == NULL) {

 			tmap->grouping = false;

 			break;

@@ -394,7 +394,7 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename,
 	}

 	static const char *rtlTemplates[] = { "MessageInRTL", "MessageOutRTL" }; //"HTMLStartRTL",

 	tmap->rtl = true;

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

+	for (i = 0; i < _countof(rtlTemplates); i++) {

 		if (tmap->getTemplate(rtlTemplates[i]) == NULL) {

 			tmap->rtl = false;

 			break;

diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index d7f5ecc85c..8f42cf907a 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -57,7 +57,7 @@ char* TemplateHTMLBuilder::getAvatar(MCONTACT hContact, const char *szProto)
 			if (ace->cbSize == sizeof(avatarCacheEntry))

 				result = ace->szFilename;

 			else // compatibility: in M0.9 it will always be char*

-				MultiByteToWideChar(CP_ACP, 0, (char*)ace->szFilename, -1, tmpPath, SIZEOF(tmpPath));

+				MultiByteToWideChar(CP_ACP, 0, (char*)ace->szFilename, -1, tmpPath, _countof(tmpPath));

 		}

 	}

 	if (!db_get_ts(hContact, "ContactPhoto", "File", &dbv)) {

@@ -122,7 +122,7 @@ char *TemplateHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mo
 	TCHAR str[300];

 

 	if (mode) // time

-		TimeZone_ToStringT(check, (dwFlags & Options::LOG_SHOW_SECONDS) ? _T("s") : _T("t"), str, SIZEOF(str));

+		TimeZone_ToStringT(check, (dwFlags & Options::LOG_SHOW_SECONDS) ? _T("s") : _T("t"), str, _countof(str));

 	else { // date

 		struct tm tm_now, tm_today;

 		time_t now = time(NULL);

@@ -132,11 +132,11 @@ char *TemplateHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mo
 		tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

 		today = mktime(&tm_today);

 		if (dwFlags & Options::LOG_RELATIVE_DATE && check >= today)

-			_tcsncpy(str, TranslateT("Today"), SIZEOF(str));

+			_tcsncpy(str, TranslateT("Today"), _countof(str));

 		else if (dwFlags & Options::LOG_RELATIVE_DATE && check > (today - 86400))

-			_tcsncpy(str, TranslateT("Yesterday"), SIZEOF(str));

+			_tcsncpy(str, TranslateT("Yesterday"), _countof(str));

 		else

-			TimeZone_ToStringT(check, (dwFlags & Options::LOG_LONG_DATE) ? _T("D") : _T("d"), str, SIZEOF(str));

+			TimeZone_ToStringT(check, (dwFlags & Options::LOG_LONG_DATE) ? _T("D") : _T("d"), str, _countof(str));

 	}

 

 	mir_strncpy(szResult, T2Utf(str), 500);

@@ -169,7 +169,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 		return;

 

 	mir_strcpy(tempBase, "file://");

-	mir_strncat(tempBase, tmpm->getFilename(), SIZEOF(tempBase) - mir_strlen(tempBase));

+	mir_strncat(tempBase, tmpm->getFilename(), _countof(tempBase) - mir_strlen(tempBase));

 	char *pathrun = tempBase + mir_strlen(tempBase);

 	while ((*pathrun != '\\' && *pathrun != '/') && (pathrun > tempBase))

 		pathrun--;

@@ -186,7 +186,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 		szNameOut = mir_strdup("&nbsp;");

 		szNameIn = mir_strdup("&nbsp;");

 	}

-	mir_snprintf(tempStr, SIZEOF(tempStr), "%snoavatar.png", tempBase);

+	mir_snprintf(tempStr, _countof(tempStr), "%snoavatar.png", tempBase);

 	TCHAR szNoAvatarPath[MAX_PATH];

 	_tcsncpy_s(szNoAvatarPath, _A2T(protoSettings->getSRMMTemplateFilename()), _TRUNCATE);

 	TCHAR *szNoAvatarPathTmp = _tcsrchr(szNoAvatarPath, '\\');

@@ -194,9 +194,9 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 		*szNoAvatarPathTmp = 0;

 	mir_tstrcat(szNoAvatarPath, _T("\\noavatar.png"));

 	if (_taccess(szNoAvatarPath, 0) == -1)

-		mir_snprintf(tempStr, SIZEOF(tempStr), "%snoavatar.jpg", tempBase);

+		mir_snprintf(tempStr, _countof(tempStr), "%snoavatar.jpg", tempBase);

 	else

-		mir_snprintf(tempStr, SIZEOF(tempStr), "%snoavatar.png", tempBase);

+		mir_snprintf(tempStr, _countof(tempStr), "%snoavatar.png", tempBase);

 	char *szNoAvatar = mir_utf8encode(tempStr);

 

 	char *szAvatarIn = getAvatar(event->hContact, szRealProto);

@@ -368,9 +368,9 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
 		*szNoAvatarPathTmp = 0;

 	mir_tstrcat(szNoAvatarPath, _T("\\noavatar.png"));

 	if (_taccess(szNoAvatarPath, 0) == -1)

-		mir_snprintf(tempStr, SIZEOF(tempStr), "%snoavatar.jpg", tempBase);

+		mir_snprintf(tempStr, _countof(tempStr), "%snoavatar.jpg", tempBase);

 	else

-		mir_snprintf(tempStr, SIZEOF(tempStr), "%snoavatar.png", tempBase);

+		mir_snprintf(tempStr, _countof(tempStr), "%snoavatar.png", tempBase);

 	char *szNoAvatar = mir_utf8encode(tempStr);

 

 	char *szAvatarIn = NULL;

@@ -426,12 +426,12 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
 			if (isSent) {

 				szAvatar = szAvatarOut;

 				szUIN = szUINOut;

-				mir_snprintf(szCID, SIZEOF(szCID), "%d", 0);

+				mir_snprintf(szCID, _countof(szCID), "%d", 0);

 			}

 			else {

 				szAvatar = szAvatarIn;

 				szUIN = szUINIn;

-				mir_snprintf(szCID, SIZEOF(szCID), "%d", (int)event->hContact);

+				mir_snprintf(szCID, _countof(szCID), "%d", (int)event->hContact);

 			}

 			tmpltName[0] = groupTemplate;

 			tmpltName[1] = NULL;