SIZEOF replaced with more secure analog - _countof

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

6 files changed, 70 insertions, 70 deletions

diff --git a/plugins/Non-IM Contact/src/contactinfo.cpp b/plugins/Non-IM Contact/src/contactinfo.cpp
index 961ec57d88..66d278aa69 100644
--- a/plugins/Non-IM Contact/src/contactinfo.cpp
+++ b/plugins/Non-IM Contact/src/contactinfo.cpp
@@ -10,9 +10,9 @@ INT_PTR CALLBACK DlgProcContactInfo(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 			char name[2048];

 			SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)hContact);

 

-			if (!db_get_static(hContact, MODNAME, "Name", name, SIZEOF(name))) break;

+			if (!db_get_static(hContact, MODNAME, "Name", name, _countof(name))) break;

 			SetDlgItemTextA(hwnd, IDC_DISPLAY_NAME, name);

-			if (!db_get_static(hContact, MODNAME, "ToolTip", name, SIZEOF(name))) break;

+			if (!db_get_static(hContact, MODNAME, "ToolTip", name, _countof(name))) break;

 			SetDlgItemTextA(hwnd, IDC_TOOLTIP, name);

 		}

 		return TRUE;

@@ -29,7 +29,7 @@ INT_PTR CALLBACK DlgProcContactInfo(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 				MCONTACT hContact = (MCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 				if (GetWindowTextLength(GetDlgItem(hwnd, IDC_DISPLAY_NAME))) {

 					char text[512];

-					GetDlgItemTextA(hwnd, IDC_DISPLAY_NAME, text, SIZEOF(text));

+					GetDlgItemTextA(hwnd, IDC_DISPLAY_NAME, text, _countof(text));

 					db_set_s(hContact, MODNAME, "Name", text);

 					WriteSetting(hContact, MODNAME, "Name", MODNAME, "Nick");

 				}

@@ -40,7 +40,7 @@ INT_PTR CALLBACK DlgProcContactInfo(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 

 				if (GetWindowTextLength(GetDlgItem(hwnd, IDC_TOOLTIP))) {

 					char text[2048];

-					GetDlgItemTextA(hwnd, IDC_TOOLTIP, text, SIZEOF(text));

+					GetDlgItemTextA(hwnd, IDC_TOOLTIP, text, _countof(text));

 					db_set_s(hContact, MODNAME, "ToolTip", text);

 					WriteSetting(hContact, MODNAME, "ToolTip", "UserInfo", "MyNotes");

 				}

@@ -157,7 +157,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 				if (!db_get_w(NULL, MODNAME, "Timer", 1))

 					SetDlgItemText(hwnd, IDC_TIMER_INTERVAL_MSG, TranslateT("Non-IM Contact protocol timer is Disabled"));

 				else {

-					mir_sntprintf(string, SIZEOF(string), TranslateT("Timer intervals... Non-IM Contact Protocol timer is %d seconds"), db_get_w(NULL, MODNAME, "Timer", 1));

+					mir_sntprintf(string, _countof(string), TranslateT("Timer intervals... Non-IM Contact Protocol timer is %d seconds"), db_get_w(NULL, MODNAME, "Timer", 1));

 					SetDlgItemText(hwnd, IDC_TIMER_INTERVAL_MSG, string);

 				}

 			}

@@ -200,7 +200,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 

 		case IDC_OPEN_FOLDER:

 			if (BrowseForFolder(hwnd, szFileName)) {

-				mir_snprintf(szFileName, SIZEOF(szFileName), "%s ,/e", szFileName);

+				mir_snprintf(szFileName, _countof(szFileName), "%s ,/e", szFileName);

 				SetDlgItemTextA(hwnd, IDC_LINK, "explorer.exe");

 				SetDlgItemTextA(hwnd, IDC_PARAMS, szFileName);

 			}

@@ -217,7 +217,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 

 				if (GetWindowTextLength(GetDlgItem(hwnd, IDC_LINK))) {

 					char text[512];

-					GetDlgItemTextA(hwnd, IDC_LINK, text, SIZEOF(text));

+					GetDlgItemTextA(hwnd, IDC_LINK, text, _countof(text));

 					db_set_s(hContact, MODNAME, "ProgramString", text);

 					WriteSetting(hContact, MODNAME, "ProgramString", MODNAME, "Program");

 				}

@@ -225,7 +225,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 

 				if (GetWindowTextLength(GetDlgItem(hwnd, IDC_PARAMS))) {

 					char text[512];

-					GetDlgItemTextA(hwnd, IDC_PARAMS, text, SIZEOF(text));

+					GetDlgItemTextA(hwnd, IDC_PARAMS, text, _countof(text));

 					db_set_s(hContact, MODNAME, "ProgramParamsString", text);

 					WriteSetting(hContact, MODNAME, "ProgramParamsString", MODNAME, "ProgramParams");

 				}

@@ -233,7 +233,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 

 				if (GetWindowTextLength(GetDlgItem(hwnd, IDC_GROUP))) {

 					TCHAR text[512];

-					GetDlgItemText(hwnd, IDC_GROUP, text, SIZEOF(text));

+					GetDlgItemText(hwnd, IDC_GROUP, text, _countof(text));

 					Clist_CreateGroup(NULL, text);

 					db_set_ts(hContact, "CList", "Group", text);

 				}

@@ -252,7 +252,7 @@ INT_PTR CALLBACK DlgProcOtherStuff(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 				if (IsDlgButtonChecked(hwnd, CHK_USE_TIMER)) {

 					if (GetWindowTextLength(GetDlgItem(hwnd, IDC_TIMER))) {

 						TCHAR text[512];

-						GetDlgItemText(hwnd, IDC_TIMER, text, SIZEOF(text));

+						GetDlgItemText(hwnd, IDC_TIMER, text, _countof(text));

 						db_set_w(hContact, MODNAME, "Timer", (WORD)_ttoi(text));

 					}

 					else db_set_w(hContact, MODNAME, "Timer", 15);

@@ -311,7 +311,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				int i = 0, j = 0, k = 0;

 				char *string = oldString[k];

 				MCONTACT hContact1 = (MCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA), hContact2;

-				if (db_get_static(hContact1, MODNAME, "Name", dbVar1, SIZEOF(dbVar1))) {

+				if (db_get_static(hContact1, MODNAME, "Name", dbVar1, _countof(dbVar1))) {

 					char *replace = (char*)malloc(GetWindowTextLength(GetDlgItem(hwnd, IDC_STRING_REPLACE)) + 1);

 					GetDlgItemTextA(hwnd, IDC_STRING_REPLACE, replace, GetWindowTextLength(GetDlgItem(hwnd, IDC_STRING_REPLACE)) + 1);

 					// get the list of replace strings

@@ -347,7 +347,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 

 					db_set_s(hContact2, MODNAME, "Name", dbVar2);

 					// copy the ProgramString

-					if (db_get_static(hContact1, MODNAME, "ProgramString", dbVar1, SIZEOF(dbVar1))) {

+					if (db_get_static(hContact1, MODNAME, "ProgramString", dbVar1, _countof(dbVar1))) {

 						mir_strcpy(dbVar2, "");

 						for (i = 0; i <= k; i++)

 							copyReplaceString(dbVar1, dbVar2, oldString[i], newString[i]);

@@ -355,7 +355,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 						db_set_s(hContact2, MODNAME, "ProgramString", dbVar2);

 					}

 					// copy the ProgramParamString

-					if (db_get_static(hContact1, MODNAME, "ProgramParamString", dbVar1, SIZEOF(dbVar1))) {

+					if (db_get_static(hContact1, MODNAME, "ProgramParamString", dbVar1, _countof(dbVar1))) {

 						mir_strcpy(dbVar2, "");

 						for (i = 0; i <= k; i++)

 							copyReplaceString(dbVar1, dbVar2, oldString[i], newString[i]);

@@ -363,7 +363,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 						db_set_s(hContact2, MODNAME, "ProgramParamString", dbVar2);

 					}

 					// copy the group

-					if (db_get_static(hContact1, "CList", "Group", dbVar1, SIZEOF(dbVar1))) {

+					if (db_get_static(hContact1, "CList", "Group", dbVar1, _countof(dbVar1))) {

 						mir_strcpy(dbVar2, "");

 						for (i = 0; i <= k; i++)

 							copyReplaceString(dbVar1, dbVar2, oldString[i], newString[i]);

@@ -371,7 +371,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 						db_set_s(hContact2, "CList", "Group", dbVar2);

 					}

 					// copy the ToolTip

-					if (db_get_static(hContact1, MODNAME, "ToolTip", dbVar1, SIZEOF(dbVar1))) {

+					if (db_get_static(hContact1, MODNAME, "ToolTip", dbVar1, _countof(dbVar1))) {

 						mir_strcpy(dbVar2, "");

 						for (i = 0; i <= k; i++)

 							copyReplaceString(dbVar1, dbVar2, oldString[i], newString[i]);

@@ -390,7 +390,7 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			else {

 				char dbVar1[2000];

 				MCONTACT hContact1 = (MCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA);

-				if (db_get_static(hContact1, MODNAME, "Name", dbVar1, SIZEOF(dbVar1))) {

+				if (db_get_static(hContact1, MODNAME, "Name", dbVar1, _countof(dbVar1))) {

 					MCONTACT hContact2 = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

 					if (!hContact2) {

 						msg("contact did not get created", "");

@@ -400,19 +400,19 @@ INT_PTR CALLBACK DlgProcCopy(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					CallService(MS_IGNORE_IGNORE, (WPARAM)hContact2, IGNOREEVENT_USERONLINE);

 					db_set_s(hContact2, MODNAME, "Nick", Translate("New Non-IM Contact"));

 					db_set_s(hContact2, MODNAME, "Name", dbVar1);

-					if (db_get_static(hContact1, MODNAME, "ProgramString", dbVar1, SIZEOF(dbVar1)))

+					if (db_get_static(hContact1, MODNAME, "ProgramString", dbVar1, _countof(dbVar1)))

 						db_set_s(hContact2, MODNAME, "ProgramString", dbVar1);

 

 					// copy the ProgramParamString

-					if (db_get_static(hContact1, MODNAME, "ProgramParamString", dbVar1, SIZEOF(dbVar1)))

+					if (db_get_static(hContact1, MODNAME, "ProgramParamString", dbVar1, _countof(dbVar1)))

 						db_set_s(hContact2, MODNAME, "ProgramParamString", dbVar1);

 

 					// copy the group

-					if (db_get_static(hContact1, "CList", "Group", dbVar1, SIZEOF(dbVar1)))

+					if (db_get_static(hContact1, "CList", "Group", dbVar1, _countof(dbVar1)))

 						db_set_s(hContact2, "CList", "Group", dbVar1);

 

 					// copy the ToolTip

-					if (db_get_static(hContact1, MODNAME, "ToolTip", dbVar1, SIZEOF(dbVar1)))

+					if (db_get_static(hContact1, MODNAME, "ToolTip", dbVar1, _countof(dbVar1)))

 						db_set_s(hContact2, MODNAME, "ToolTip", dbVar1);

 

 					// timer

@@ -453,15 +453,15 @@ void ExportContact(MCONTACT hContact)
 		//	else 

 		FILE *file = fopen(szFileName, "a");

 		if (file) {

-			if (db_get_static(hContact, MODNAME, "Name", DBVar, SIZEOF(DBVar))) {

+			if (db_get_static(hContact, MODNAME, "Name", DBVar, _countof(DBVar))) {

 				fprintf(file, "\r\n[Non-IM Contact]\r\nName=%s\r\n", DBVar);

-				if (db_get_static(hContact, MODNAME, "ProgramString", DBVar, SIZEOF(DBVar)))

+				if (db_get_static(hContact, MODNAME, "ProgramString", DBVar, _countof(DBVar)))

 					fprintf(file, "ProgramString=%s\r\n", DBVar);

-				if (db_get_static(hContact, MODNAME, "ProgramParamString", DBVar, SIZEOF(DBVar)))

+				if (db_get_static(hContact, MODNAME, "ProgramParamString", DBVar, _countof(DBVar)))

 					fprintf(file, "ProgramParamString=%s\r\n", DBVar);

-				if (db_get_static(hContact, MODNAME, "ToolTip", DBVar, SIZEOF(DBVar)))

+				if (db_get_static(hContact, MODNAME, "ToolTip", DBVar, _countof(DBVar)))

 					fprintf(file, "ToolTip=%s</tooltip>\r\n", DBVar);

-				if (db_get_static(hContact, "CList", "Group", DBVar, SIZEOF(DBVar)))

+				if (db_get_static(hContact, "CList", "Group", DBVar, _countof(DBVar)))

 					fprintf(file, "Group=%s\r\n", DBVar);

 				if (tmp = db_get_w(hContact, MODNAME, "Icon", 40072))

 					fprintf(file, "Icon=%d\r\n", tmp);

diff --git a/plugins/Non-IM Contact/src/dialog.cpp b/plugins/Non-IM Contact/src/dialog.cpp
index 1565321cb4..a948737802 100644
--- a/plugins/Non-IM Contact/src/dialog.cpp
+++ b/plugins/Non-IM Contact/src/dialog.cpp
@@ -61,7 +61,7 @@ INT_PTR CALLBACK DlgProcNimcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 				TCHAR tmp[5];

 				db_set_b(NULL, MODNAME, "AwayAsStatus", (BYTE)IsDlgButtonChecked(hwnd, IDC_AWAYISNOTONLINE));

 				if (BST_UNCHECKED == IsDlgButtonChecked(hwnd, IDC_DISABLETIMER) && GetWindowTextLength(GetDlgItem(hwnd, IDC_TIMER_INT))) {

-					GetDlgItemText(hwnd, IDC_TIMER_INT, tmp, SIZEOF(tmp));

+					GetDlgItemText(hwnd, IDC_TIMER_INT, tmp, _countof(tmp));

 					db_set_w(NULL, MODNAME, "Timer", (WORD)_ttoi(tmp));

 				}

 				else db_set_w(NULL, MODNAME, "Timer", 0);

@@ -136,7 +136,7 @@ INT_PTR CALLBACK TestWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 				char tmp[MAX_STRING_LENGTH];

 				int i = 0, j;

 				if (GetWindowTextLength(GetDlgItem(hwnd, IDC_STRING))) {

-					GetDlgItemTextA(hwnd, IDC_STRING, tmp, SIZEOF(tmp));

+					GetDlgItemTextA(hwnd, IDC_STRING, tmp, _countof(tmp));

 					if (tmp[mir_strlen(tmp) - 1] == '(') {

 						for (i = 0; i < VARS; i++) {

 							if (!mir_strcmp(braceList[i].var, &tmp[mir_strlen(tmp) - mir_strlen(braceList[i].var)])) {

@@ -179,7 +179,7 @@ INT_PTR CALLBACK TestWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
 			char str2replace[MAX_STRING_LENGTH];

 			int error;

 			if (GetWindowTextLength(GetDlgItem(hwnd, IDC_STRING))) {

-				GetDlgItemTextA(hwnd, IDC_STRING, str2replace, SIZEOF(str2replace));

+				GetDlgItemTextA(hwnd, IDC_STRING, str2replace, _countof(str2replace));

 				switch (stringReplacer(str2replace, replacedString, NULL)) {

 				case ERROR_NO_LINE_AFTER_VAR_F:

 					replacedString.Format("ERROR: no %s", "%line or %wholeline or %lastline after %fn");

@@ -288,10 +288,10 @@ void DoPropertySheet(MCONTACT hContact, HINSTANCE hInst)
 	psh.dwFlags = PSH_USEICONID | PSH_PROPSHEETPAGE | PSH_USECALLBACK;

 	psh.hInstance = hInst;

 	psh.pszIcon = MAKEINTRESOURCEA(IDI_MAIN);

-	db_get_static(hContact, MODNAME, "Nick", nick, SIZEOF(nick));

-	mir_snprintf(title, SIZEOF(title), Translate("Edit Non-IM Contact \"%s\""), nick);

+	db_get_static(hContact, MODNAME, "Nick", nick, _countof(nick));

+	mir_snprintf(title, _countof(title), Translate("Edit Non-IM Contact \"%s\""), nick);

 	psh.pszCaption = title;

-	psh.nPages = SIZEOF(psp);

+	psh.nPages = _countof(psp);

 	psh.ppsp = (LPCPROPSHEETPAGEA)&psp;

 	psh.pfnCallback = PropSheetProc;

 

@@ -307,7 +307,7 @@ INT_PTR addContact(WPARAM wParam, LPARAM lParam)
 	CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_USERONLINE);

 	db_set_ts(hContact, MODNAME, "Nick", TranslateT("New Non-IM Contact"));

 	DoPropertySheet(hContact, hInst);

-	if (!db_get_static(hContact, MODNAME, "Name", tmp, SIZEOF(tmp)))

+	if (!db_get_static(hContact, MODNAME, "Name", tmp, _countof(tmp)))

 		CallService(MS_DB_CONTACT_DELETE, hContact, 0);

 	replaceAllStrings(hContact);

 	return 0;

@@ -324,7 +324,7 @@ INT_PTR editContact(WPARAM wParam, LPARAM lParam)
 		db_set_s(hContact, MODNAME, "Nick", Translate("New Non-IM Contact"));

 	}

 	DoPropertySheet(hContact, hInst);

-	if (!db_get_static(hContact, MODNAME, "Name", tmp, SIZEOF(tmp)))

+	if (!db_get_static(hContact, MODNAME, "Name", tmp, _countof(tmp)))

 		CallService(MS_DB_CONTACT_DELETE, hContact, 0);

 	replaceAllStrings(hContact);

 	return 0;

diff --git a/plugins/Non-IM Contact/src/files.cpp b/plugins/Non-IM Contact/src/files.cpp
index 677f2d2455..5d5ba5945c 100644
--- a/plugins/Non-IM Contact/src/files.cpp
+++ b/plugins/Non-IM Contact/src/files.cpp
@@ -17,15 +17,15 @@ INT_PTR exportContacts(WPARAM wParam, LPARAM lParam)
 	for (MCONTACT hContact = db_find_first(MODNAME); hContact; hContact = db_find_next(hContact, MODNAME)) {

 		int tmp;

 		char DBVar[1024];

-		if (db_get_static(hContact, MODNAME, "Name", DBVar, SIZEOF(DBVar))) {

+		if (db_get_static(hContact, MODNAME, "Name", DBVar, _countof(DBVar))) {

 			fprintf(file, "\r\n[Non-IM Contact]\r\nName=%s\r\n", DBVar);

-			if (db_get_static(hContact, MODNAME, "ProgramString", DBVar, SIZEOF(DBVar)))

+			if (db_get_static(hContact, MODNAME, "ProgramString", DBVar, _countof(DBVar)))

 				fprintf(file, "ProgramString=%s\r\n", DBVar);

-			if (db_get_static(hContact, MODNAME, "ProgramParamString", DBVar, SIZEOF(DBVar)))

+			if (db_get_static(hContact, MODNAME, "ProgramParamString", DBVar, _countof(DBVar)))

 				fprintf(file, "ProgramParamString=%s\r\n", DBVar);

-			if (db_get_static(hContact, MODNAME, "ToolTip", DBVar, SIZEOF(DBVar)))

+			if (db_get_static(hContact, MODNAME, "ToolTip", DBVar, _countof(DBVar)))

 				fprintf(file, "ToolTip=%s</tooltip>\r\n", DBVar);

-			if (db_get_static(hContact, "CList", "Group", DBVar, SIZEOF(DBVar)))

+			if (db_get_static(hContact, "CList", "Group", DBVar, _countof(DBVar)))

 				fprintf(file, "Group=%s\r\n", DBVar);

 			if (tmp = db_get_w(hContact, MODNAME, "Icon", 40072))

 				fprintf(file, "Icon=%d\r\n", tmp);

@@ -76,7 +76,7 @@ void reloadFiles(HWND fileList)
 	SendMessage(fileList, CB_RESETCONTENT, 0, 0);

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

 		mir_snprintf(fn, "fn%d", i);

-		if (db_get_static(NULL, MODNAME, fn, file, SIZEOF(file))) {

+		if (db_get_static(NULL, MODNAME, fn, file, _countof(file))) {

 			index = SendMessageA(fileList, CB_ADDSTRING, 0, (LPARAM)file);

 			SendMessage(fileList, CB_SETITEMDATA, index, (LPARAM)i);

 			SendMessage(fileList, CB_SETCURSEL, index, 0);

@@ -105,13 +105,13 @@ void readFile(HWND hwnd)
 	char temp[MAX_STRING_LENGTH], szFileName[512], temp1[MAX_STRING_LENGTH], fn[8];

 	int fileNumber = SendDlgItemMessage(hwnd, IDC_FILE_LIST, CB_GETCURSEL, 0, 0);

 	mir_snprintf(fn, "fn%d", fileNumber);

-	if (!db_get_static(NULL, MODNAME, fn, szFileName, SIZEOF(szFileName))) {

+	if (!db_get_static(NULL, MODNAME, fn, szFileName, _countof(szFileName))) {

 		msg(Translate("File couldn't be opened"), fn);

 		return;

 	}

 

 	if (!strncmp("http://", szFileName, mir_strlen("http://")) || !strncmp("https://", szFileName, mir_strlen("https://")))

-		mir_snprintf(szFileName, SIZEOF(szFileName), "%s\\plugins\\fn%d.html", getMimDir(temp), fileNumber);

+		mir_snprintf(szFileName, _countof(szFileName), "%s\\plugins\\fn%d.html", getMimDir(temp), fileNumber);

 

 	FILE *filen = fopen(szFileName, "r");

 	if (!filen) {

@@ -127,7 +127,7 @@ void readFile(HWND hwnd)
 		else if (temp[mir_strlen(temp) - 1] == '\n')

 			temp[mir_strlen(temp) - 1] = '\0';

 		else temp[mir_strlen(temp)] = '\0';

-		mir_snprintf(temp1, SIZEOF(temp1), Translate("line(%-3d) = | %s"), lineNumber, temp);

+		mir_snprintf(temp1, _countof(temp1), Translate("line(%-3d) = | %s"), lineNumber, temp);

 		SendDlgItemMessageA(hwnd, IDC_FILE_CONTENTS, LB_ADDSTRING, 0, (LPARAM)temp1);

 		lineNumber++;

 		fileLength++;

@@ -149,7 +149,7 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			int i = SendDlgItemMessage(hwnd, IDC_FILE_LIST, CB_GETCURSEL, 0, 0);

 			mir_snprintf(fn, "fn%d", i);

 			SendDlgItemMessage(hwnd, IDC_FILE_CONTENTS, LB_RESETCONTENT, 0, 0);

-			if (db_get_static(NULL, MODNAME, fn, string, SIZEOF(string))) {

+			if (db_get_static(NULL, MODNAME, fn, string, _countof(string))) {

 				if ((!strncmp("http://", string, mir_strlen("http://"))) || (!strncmp("https://", string, mir_strlen("https://")))) {

 					SetDlgItemTextA(hwnd, IDC_URL, string);

 					mir_snprintf(fn, "fn%d_timer", i);

@@ -172,22 +172,22 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			if (GetWindowTextLength(GetDlgItem(hwnd, IDC_URL))) {

 				char text[512], url[512], fn[10] = "fn0", szFileName[MAX_PATH], temp[512];

 				int i, timer;

-				GetDlgItemTextA(hwnd, IDC_URL, text, SIZEOF(text));

+				GetDlgItemTextA(hwnd, IDC_URL, text, _countof(text));

 				mir_strcpy(url, text);

 				if (!InternetDownloadFile(text)) {

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

 						mir_snprintf(fn, "fn%d", i);

-						if (!db_get_static(NULL, MODNAME, fn, text, SIZEOF(text)))

+						if (!db_get_static(NULL, MODNAME, fn, text, _countof(text)))

 							break;

 					}

-					mir_snprintf(szFileName, SIZEOF(szFileName), "%s\\plugins\\%s.html", getMimDir(temp), fn);

+					mir_snprintf(szFileName, _countof(szFileName), "%s\\plugins\\%s.html", getMimDir(temp), fn);

 					if (savehtml(szFileName)) {

 						mir_snprintf(fn, "fn%d", i);

 						db_set_s(NULL, MODNAME, fn, url);

 						if (!GetWindowTextLength(GetDlgItem(hwnd, IDC_WWW_TIMER)))

 							timer = 60;

 						else {

-							GetDlgItemTextA(hwnd, IDC_WWW_TIMER, text, SIZEOF(text));

+							GetDlgItemTextA(hwnd, IDC_WWW_TIMER, text, _countof(text));

 							timer = atoi(text);

 						}

 						mir_snprintf(fn, "fn%d_timer", i);

@@ -207,7 +207,7 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			char file[MAX_PATH], fn[6];

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

 				mir_snprintf(fn, "fn%d", i);

-				if (!db_get_static(NULL, MODNAME, fn, file, SIZEOF(file)))

+				if (!db_get_static(NULL, MODNAME, fn, file, _countof(file)))

 					break;

 			}

 			if (Openfile(file, 1)) {

@@ -239,7 +239,7 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				}

 				else {

 					mir_snprintf(fn, "fn%d", i);

-					while (db_get_static(NULL, MODNAME, fn, tmp, SIZEOF(tmp))) {

+					while (db_get_static(NULL, MODNAME, fn, tmp, _countof(tmp))) {

 						mir_snprintf(fn1, "fn%d", i - 1);

 						db_set_s(NULL, MODNAME, fn1, tmp);

 						mir_snprintf(fn, "fn%d", ++i);

@@ -258,7 +258,7 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				char fn[20], tmp[MAX_PATH];

 				SetDlgItemTextA(hwnd, IDC_FN, _itoa(index, fn, 10));

 				mir_snprintf(fn, "fn%d", index);

-				if (db_get_static(NULL, MODNAME, fn, tmp, SIZEOF(tmp))) {

+				if (db_get_static(NULL, MODNAME, fn, tmp, _countof(tmp))) {

 					if (!strncmp("http://", tmp, mir_strlen("http://")) || !strncmp("https://", tmp, mir_strlen("https://"))) {

 						SetDlgItemTextA(hwnd, IDC_URL, tmp);

 						mir_snprintf(fn, "fn%d_timer", index);

@@ -290,12 +290,12 @@ INT_PTR CALLBACK DlgProcFiles(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				mir_snprintf(fn, "fn%d", i);

 				if (GetWindowTextLength(GetDlgItem(hwnd, IDC_WWW_TIMER))) {

 					TCHAR text[5];

-					GetDlgItemText(hwnd, IDC_WWW_TIMER, text, SIZEOF(text));

+					GetDlgItemText(hwnd, IDC_WWW_TIMER, text, _countof(text));

 					timer = _ttoi(text);

 				}

 				else timer = 60;

 

-				if (db_get_static(NULL, MODNAME, fn, string, SIZEOF(string)))

+				if (db_get_static(NULL, MODNAME, fn, string, _countof(string)))

 					if (!strncmp("http://", string, mir_strlen("http://")) || !strncmp("https://", string, mir_strlen("https://"))) {

 						mir_snprintf(fn, "fn%d_timer", i);

 						db_set_w(NULL, MODNAME, fn, (WORD)timer);

diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp
index 7b556e486e..5b41419efd 100644
--- a/plugins/Non-IM Contact/src/main.cpp
+++ b/plugins/Non-IM Contact/src/main.cpp
@@ -32,8 +32,8 @@ INT_PTR doubleClick(WPARAM wParam, LPARAM lParam)
 	if (proto && !mir_strcmp(proto, MODNAME)) {

 		if (GetKeyState(VK_CONTROL) & 0x8000) // ctrl is pressed

 			editContact(wParam, 0);		// for later when i add a second double click setting

-		else if (db_get_static(wParam, MODNAME, "Program", program, SIZEOF(program)) && mir_strcmp(program, "")) {

-			if (!db_get_static(wParam, MODNAME, "ProgramParams", params, SIZEOF(params)))

+		else if (db_get_static(wParam, MODNAME, "Program", program, _countof(program)) && mir_strcmp(program, "")) {

+			if (!db_get_static(wParam, MODNAME, "ProgramParams", params, _countof(params)))

 				mir_strcpy(params, "");

 			if (strstr(program, "http://") || strstr(program, "https://"))

 				CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)program);

@@ -118,7 +118,7 @@ extern "C" __declspec(dllexport) int Load()
 	mir_getLP(&pluginInfoEx);

 	mir_getCLI();

 

-	Icon_Register(hInst, LPGEN("Non-IM Contact"), icoList, SIZEOF(icoList));

+	Icon_Register(hInst, LPGEN("Non-IM Contact"), icoList, _countof(icoList));

 

 	HookEvent(ME_CLIST_DOUBLECLICKED, (MIRANDAHOOK)doubleClick);

 	HookEvent(ME_OPT_INITIALISE, NimcOptInit);

diff --git a/plugins/Non-IM Contact/src/namereplacing.cpp b/plugins/Non-IM Contact/src/namereplacing.cpp
index 456fc8d86e..4837219d2c 100644
--- a/plugins/Non-IM Contact/src/namereplacing.cpp
+++ b/plugins/Non-IM Contact/src/namereplacing.cpp
@@ -3,7 +3,7 @@
 int readFileIntoArray(int fileNumber, char *FileContents[])

 {

 	char dbSetting[20], temp[MAX_STRING_LENGTH];

-	mir_snprintf(dbSetting, SIZEOF(dbSetting), "fn%d", fileNumber);

+	mir_snprintf(dbSetting, _countof(dbSetting), "fn%d", fileNumber);

 

 	char *szVar = db_get_sa(NULL, MODNAME, dbSetting);

 	if (szVar == NULL)

@@ -11,9 +11,9 @@ int readFileIntoArray(int fileNumber, char *FileContents[])
 

 	char tszFileName[MAX_PATH];

 	if (!strncmp("http://", szVar, 7) || !strncmp("https://", szVar, 7))

-		mir_snprintf(tszFileName, SIZEOF(tszFileName), "%s\\plugins\\fn%d.html", getMimDir(temp), fileNumber);

+		mir_snprintf(tszFileName, _countof(tszFileName), "%s\\plugins\\fn%d.html", getMimDir(temp), fileNumber);

 	else

-		mir_strncpy(tszFileName, szVar, SIZEOF(tszFileName));

+		mir_strncpy(tszFileName, szVar, _countof(tszFileName));

 	mir_free(szVar);

 

 	FILE* file = fopen(tszFileName, "r");

@@ -405,9 +405,9 @@ int lastChecked(CMStringA &szNewStr, const char *str)
 			return 0;

 

 		if (!strncmp("http://", szVar, 7) || !strncmp("https://", szVar, 8))

-			mir_snprintf(tszFileName, SIZEOF(tszFileName), "%s\\plugins\\fn%d.html", getMimDir(temp), file);

+			mir_snprintf(tszFileName, _countof(tszFileName), "%s\\plugins\\fn%d.html", getMimDir(temp), file);

 		else

-			mir_strncpy(tszFileName, szVar, SIZEOF(tszFileName));

+			mir_strncpy(tszFileName, szVar, _countof(tszFileName));

 		mir_free(szVar);

 

 		HANDLE hFile = CreateFileA(tszFileName, 0, FILE_SHARE_READ, 0, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

@@ -417,7 +417,7 @@ int lastChecked(CMStringA &szNewStr, const char *str)
 		if (GetLastWriteTime(hFile, tszFileName)) {

 			CloseHandle(hFile);

 			szNewStr.Append(tszFileName);

-			mir_snprintf(tszFileName, SIZEOF(tszFileName), "%s%d))", szPattern, file);

+			mir_snprintf(tszFileName, _countof(tszFileName), "%s%d))", szPattern, file);

 			return (int)mir_strlen(tszFileName);

 		}

 		CloseHandle(hFile);

@@ -540,8 +540,8 @@ int stringReplacer(const char *oldString, CMStringA &szNewString, MCONTACT hCont
 				return ERROR_NO_FILE;

 			}

 			else {

-				mir_snprintf(tempString, SIZEOF(tempString), "fn%d", tempInt);

-				if (db_get_static(NULL, MODNAME, tempString, tempString, SIZEOF(tempString)))

+				mir_snprintf(tempString, _countof(tempString), "fn%d", tempInt);

+				if (db_get_static(NULL, MODNAME, tempString, tempString, _countof(tempString)))

 					szNewString.Append(tempString);

 				else return ERROR_NO_FILE;

 				positionInOldString += (int)mir_strlen(_itoa(tempInt, tempString, 10)) + 1;

@@ -578,7 +578,7 @@ void WriteSetting(MCONTACT hContact, char* module1, char* setting1, char* module
 	CMStringA newString;

 	char text[MAX_STRING_LENGTH];

 	int error = 0, status = GetLCStatus(0, 0);

-	if (db_get_static(hContact, module1, setting1, text, SIZEOF(text))) {

+	if (db_get_static(hContact, module1, setting1, text, _countof(text))) {

 		switch (stringReplacer(text, newString, hContact)) {

 		case ERROR_NO_LINE_AFTER_VAR_F:

 			newString.Format(Translate("%s - ERROR: no line specified or line not found (in %s)"), text, setting1);

@@ -622,11 +622,11 @@ void replaceAllStrings(MCONTACT hContact)
 	WriteSetting(hContact, MODNAME, "ProgramParamsString", MODNAME, "ProgramParams");

 	/* tooltips*/

 	WriteSetting(hContact, MODNAME, "ToolTip", "UserInfo", "MyNotes");

-	if (db_get_static(hContact, MODNAME, "Program", tmp1, SIZEOF(tmp1)) && db_get_static(hContact, MODNAME, "ProgramParams", tmp2, SIZEOF(tmp2))) {

-		mir_snprintf(tmp3, SIZEOF(tmp3), "%s %s", tmp1, tmp2);

+	if (db_get_static(hContact, MODNAME, "Program", tmp1, _countof(tmp1)) && db_get_static(hContact, MODNAME, "ProgramParams", tmp2, _countof(tmp2))) {

+		mir_snprintf(tmp3, _countof(tmp3), "%s %s", tmp1, tmp2);

 		db_set_s(hContact, "UserInfo", "FirstName", tmp3);

 	}

-	else if (db_get_static(hContact, MODNAME, "Program", tmp1, SIZEOF(tmp1))) {

+	else if (db_get_static(hContact, MODNAME, "Program", tmp1, _countof(tmp1))) {

 		db_set_s(hContact, "UserInfo", "FirstName", tmp1);

 	}

 	else db_set_s(hContact, "UserInfo", "FirstName", "");

diff --git a/plugins/Non-IM Contact/src/timer.cpp b/plugins/Non-IM Contact/src/timer.cpp
index cbd5ba7f29..5f19b802f0 100644
--- a/plugins/Non-IM Contact/src/timer.cpp
+++ b/plugins/Non-IM Contact/src/timer.cpp
@@ -24,7 +24,7 @@ void timerFunc(void *di)
 	/* update the web pages*/

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

 		mir_snprintf(fn, "fn%d", i);

-		if (!db_get_static(NULL, MODNAME, fn, text, SIZEOF(text)))

+		if (!db_get_static(NULL, MODNAME, fn, text, _countof(text)))

 			break;

 

 		if (!strncmp("http://", text, mir_strlen("http://")) || !strncmp("https://", text, mir_strlen("https://"))) {

@@ -32,7 +32,7 @@ void timerFunc(void *di)
 			int timer = db_get_w(NULL, MODNAME, fn, 60);

 			if (timer && !(timerCount % timer)) {

 				if (!InternetDownloadFile(text)) {

-					mir_snprintf(szFileName, SIZEOF(szFileName), "%s\\plugins\\fn%d.html", getMimDir(temp), i);

+					mir_snprintf(szFileName, _countof(szFileName), "%s\\plugins\\fn%d.html", getMimDir(temp), i);

 					savehtml(szFileName);

 				}

 			}

@@ -43,7 +43,7 @@ void timerFunc(void *di)
 	for (MCONTACT hContact = db_find_first(MODNAME); hContact; hContact = db_find_next(hContact, MODNAME)) {

 		int timer = db_get_w(hContact, MODNAME, "Timer", 15);

 		if (timer && !(timerCount % timer))

-			if (db_get_static(hContact, MODNAME, "Name", text, SIZEOF(text)))

+			if (db_get_static(hContact, MODNAME, "Name", text, _countof(text)))

 				replaceAllStrings(hContact);

 	}

 }