SIZEOF replaced with more secure analog - _countof

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

10 files changed, 30 insertions, 30 deletions

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
index 370819a3f7..5c896b8c11 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
@@ -66,7 +66,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 			settings = ( AAMSGSETTING** )malloc(sizeof(AAMSGSETTING*));

 			count = 0;

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

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

 				if ( !( protoModeMsgFlags & Proto_Status2Flag( statusModeList[i] )))

 					continue;

 

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
index 04be013089..fddb288e73 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
@@ -183,7 +183,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 				lvItem.mask = LVIF_TEXT | LVIF_PARAM;

 				lvItem.iItem = 0;

 				lvItem.iSubItem = 0;

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

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

 					if ((flags & statusModePf2List[i]) || (statusModePf2List[i] == PF2_OFFLINE) || (bSettingSame)) {

 						lvItem.pszText = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);

 						lvItem.lParam = (LPARAM)statusModePf2List[i];

@@ -203,7 +203,7 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 				// clear box and add new status, loop status and check if compatible with proto

 				SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_RESETCONTENT, 0, 0);

 				SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_RESETCONTENT, 0, 0);

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

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

 					if ((flags & statusModePf2List[i]) || statusModePf2List[i] == PF2_OFFLINE || bSettingSame) {

 						TCHAR *statusMode = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);

 						int item = SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode);

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index 2e1af36c2a..2be09d66f3 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -212,7 +212,7 @@ static int AssignStatus(TConnectionSettings* cs, int status, int lastStatus, TCH
 	mir_cslock lck(GenStatusCS);
 
 	char dbSetting[128];
-	mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_enabled", cs->szName);
+	mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", cs->szName);
 	cs->lastStatus = lastStatus == 0 ? cs->status : lastStatus;
 	if (!db_get_b(NULL, MODULENAME, dbSetting, 1))
 		cs->status = ID_STATUS_DISABLED;
@@ -520,7 +520,7 @@ static int ProcessProtoAck(WPARAM, LPARAM lParam)
 		return 0;
 
 	char dbSetting[128];
-	mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_enabled", ack->szModule);
+	mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", ack->szModule);
 	if (!db_get_b(NULL, MODULENAME, dbSetting, 1))
 		return 0;
 
@@ -933,8 +933,8 @@ static int ProcessPopup(int reason, LPARAM lParam)
 			for (int i = 0; i < connectionSettings.getCount(); i++) {
 				if (mir_tstrlen(ps[i]->tszAccName) > 0 && mir_strlen(ps[i]->szName) > 0) {
 					if (db_get_b(NULL, MODULENAME, SETTING_PUSHOWEXTRA, TRUE)) {
-						mir_sntprintf(protoInfoLine, SIZEOF(protoInfoLine), TranslateT("%s\t(will be set to %s)\r\n"), ps[i]->tszAccName, pcli->pfnGetStatusModeDescription(ps[i]->status, GSMDF_TCHAR));
-						mir_tstrncat(protoInfo, protoInfoLine, SIZEOF(protoInfo) - mir_tstrlen(protoInfo) - 1);
+						mir_sntprintf(protoInfoLine, _countof(protoInfoLine), TranslateT("%s\t(will be set to %s)\r\n"), ps[i]->tszAccName, pcli->pfnGetStatusModeDescription(ps[i]->status, GSMDF_TCHAR));
+						mir_tstrncat(protoInfo, protoInfoLine, _countof(protoInfo) - mir_tstrlen(protoInfo) - 1);
 					}
 				}
 			}
@@ -1051,7 +1051,7 @@ INT_PTR EnableProtocolService(WPARAM wParam, LPARAM lParam)
 		return -1;
 
 	char dbSetting[128];
-	mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_enabled", szProto);
+	mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", szProto);
 	if (!db_get_b(NULL, MODULENAME, dbSetting, 1)) // 'hard' disabled
 		return -1;
 
@@ -1077,7 +1077,7 @@ INT_PTR IsProtocolEnabledService(WPARAM, LPARAM lParam)
 	char *szProto = (char *)lParam;
 
 	char dbSetting[128];
-	mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s_enabled", szProto);
+	mir_snprintf(dbSetting, _countof(dbSetting), "%s_enabled", szProto);
 	if (!db_get_b(NULL, MODULENAME, dbSetting, 1))
 		return FALSE;
 
diff --git a/plugins/StatusPlugins/KeepStatus/options.cpp b/plugins/StatusPlugins/KeepStatus/options.cpp
index 452ac6e691..5bfc7267cd 100644
--- a/plugins/StatusPlugins/KeepStatus/options.cpp
+++ b/plugins/StatusPlugins/KeepStatus/options.cpp
@@ -71,7 +71,7 @@ static INT_PTR CALLBACK DlgProcKSBasicOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 				ListView_InsertItem(hList, &lvItem);

 

 				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, MODULENAME, dbSetting, TRUE));

 				lvItem.iItem++;

 			}

@@ -152,7 +152,7 @@ static INT_PTR CALLBACK DlgProcKSBasicOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 				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, MODULENAME, dbSetting, (BYTE)ListView_GetCheckState(hList, lvItem.iItem));

 			}

 		}

diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp
index ca7d35b838..21ca2d2385 100644
--- a/plugins/StatusPlugins/StartupStatus/options.cpp
+++ b/plugins/StatusPlugins/StartupStatus/options.cpp
@@ -161,9 +161,9 @@ HRESULT CreateLink(TSettingsList& protoSettings)
 {

 	TCHAR savePath[MAX_PATH];

 	if (SHGetSpecialFolderPath(NULL, savePath, 0x10, FALSE))

-		_tcsncat_s(savePath, SHORTCUT_FILENAME, SIZEOF(savePath) - mir_tstrlen(savePath));

+		_tcsncat_s(savePath, SHORTCUT_FILENAME, _countof(savePath) - mir_tstrlen(savePath));

 	else

-		mir_sntprintf(savePath, SIZEOF(savePath), _T(".\\%s"), SHORTCUT_FILENAME);

+		mir_sntprintf(savePath, _countof(savePath), _T(".\\%s"), SHORTCUT_FILENAME);

 

 	// Get a pointer to the IShellLink interface.

 	IShellLink *psl;

@@ -175,7 +175,7 @@ HRESULT CreateLink(TSettingsList& protoSettings)
 		// Set the path to the shortcut target, and add the

 		// description.

 		TCHAR path[MAX_PATH];

-		GetModuleFileName(NULL, path, SIZEOF(path));

+		GetModuleFileName(NULL, path, _countof(path));

 		psl->SetPath(path);

 		psl->SetDescription(desc);

 		psl->SetArguments( _A2T(args));

@@ -220,7 +220,7 @@ INT_PTR CALLBACK CmdlOptionsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l
 				EmptyClipboard();

 

 				char cmdl[2048];

-				GetDlgItemTextA(hwndDlg,IDC_CMDL, cmdl, SIZEOF(cmdl));

+				GetDlgItemTextA(hwndDlg,IDC_CMDL, cmdl, _countof(cmdl));

 				HGLOBAL cmdlGlob = GlobalAlloc(GMEM_MOVEABLE, sizeof(cmdl));

 				if (cmdlGlob == NULL) {

 					CloseClipboard();

@@ -610,7 +610,7 @@ static INT_PTR CALLBACK StatusProfilesOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wP
 

 				int flags = (CallProtoService(ps->szName, PS_GETCAPS, PFLAGNUM_2, 0))&~(CallProtoService(ps->szName, PS_GETCAPS, PFLAGNUM_5, 0));

 				SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_RESETCONTENT, 0, 0);

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

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

 					if ( (flags&statusModePf2List[i]) || (statusModeList[i] == ID_STATUS_OFFLINE)) {

 						int item = SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_ADDSTRING, 0, (LPARAM)pcli->pfnGetStatusModeDescription(statusModeList[i], 0));

 						SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_SETITEMDATA, (WPARAM)item, (LPARAM)statusModeList[i]);

@@ -866,7 +866,7 @@ INT_PTR CALLBACK addProfileDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lP
 		case WM_COMMAND:

 			if (LOWORD(wParam) == IDC_OK) {

 				TCHAR profileName[128];

-				GetDlgItemText(hwndDlg, IDC_PROFILENAME, profileName, SIZEOF(profileName));

+				GetDlgItemText(hwndDlg, IDC_PROFILENAME, profileName, _countof(profileName));

 				SendMessage(hwndParent, UM_ADDPROFILE, 0, (LPARAM)profileName);

 				// done and exit

 				DestroyWindow(hwndDlg);

diff --git a/plugins/StatusPlugins/StartupStatus/profiles.cpp b/plugins/StatusPlugins/StartupStatus/profiles.cpp
index a3b6687216..d8a5b7df9a 100644
--- a/plugins/StatusPlugins/StartupStatus/profiles.cpp
+++ b/plugins/StatusPlugins/StartupStatus/profiles.cpp
@@ -107,7 +107,7 @@ static int CreateMainMenuItems(WPARAM, LPARAM)
 
 		mi.ptszName = profilename;
 		mi.position = 2000100000 + mcount;
-		mir_snprintf(servicename, SIZEOF(servicename), "%s%d", MS_SS_MENUSETPROFILEPREFIX, mcount);
+		mir_snprintf(servicename, _countof(servicename), "%s%d", MS_SS_MENUSETPROFILEPREFIX, mcount);
 		switch(mcount) {
 		case 0:
 			hProfileServices[mcount] = CreateServiceFunction(servicename, profileService0);
@@ -190,7 +190,7 @@ TCHAR *GetStatusMessage(int profile, char *szProto)
 
 	for ( int i=0; i < pceCount; i++ ) {
 		if ( (pce[i].profile == profile) && (!mir_strcmp(pce[i].szProto, szProto))) {
-			mir_snprintf(dbSetting, SIZEOF(dbSetting), "%d_%s_%s", profile, szProto, SETTING_PROFILE_STSMSG);
+			mir_snprintf(dbSetting, _countof(dbSetting), "%d_%s_%s", profile, szProto, SETTING_PROFILE_STSMSG);
 			if (!db_get_ts(NULL, MODULENAME, dbSetting, &dbv)) { // reload from db
 				pce[i].msg = ( TCHAR* )realloc(pce[i].msg, sizeof(TCHAR)*(mir_tstrlen(dbv.ptszVal)+1));
 				if (pce[i].msg != NULL) {
@@ -214,7 +214,7 @@ TCHAR *GetStatusMessage(int profile, char *szProto)
 	pce[pceCount].profile = profile;
 	pce[pceCount].szProto = _strdup(szProto);
 	pce[pceCount].msg = NULL;
-	mir_snprintf(dbSetting, SIZEOF(dbSetting), "%d_%s_%s", profile, szProto, SETTING_PROFILE_STSMSG);
+	mir_snprintf(dbSetting, _countof(dbSetting), "%d_%s_%s", profile, szProto, SETTING_PROFILE_STSMSG);
 	if (!db_get_ts(NULL, MODULENAME, dbSetting, &dbv)) {
 		pce[pceCount].msg = _tcsdup(dbv.ptszVal);
 		db_free(&dbv);
@@ -339,7 +339,7 @@ static int RegisterHotKeys()
 			return -1;
 
 		char atomname[255];
-		mir_snprintf(atomname, SIZEOF(atomname), "StatusProfile_%d", i);
+		mir_snprintf(atomname, _countof(atomname), "StatusProfile_%d", i);
 		hkInfo[hkiCount].id = GlobalAddAtomA(atomname);
 		if (hkInfo[hkiCount].id == 0)
 			continue;
diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
index 155cc1e17b..d1591e98c4 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.cpp
@@ -168,7 +168,7 @@ static void SetLastStatusMessages(TSettingsList &ps)
 			continue;

 

 		char dbSetting[128];

-		mir_snprintf(dbSetting, SIZEOF(dbSetting), "%s%s", PREFIX_LASTMSG, ps[i].szName);

+		mir_snprintf(dbSetting, _countof(dbSetting), "%s%s", PREFIX_LASTMSG, ps[i].szName);

 

 		DBVARIANT dbv;

 		if (ps[i].szMsg == NULL && !db_get_ts(NULL, MODULENAME, dbSetting, &dbv)) {

@@ -301,9 +301,9 @@ static int OnOkToExit(WPARAM, LPARAM)
 			continue;

 

 		char lastName[128], lastMsg[128];

-		mir_snprintf(lastName, SIZEOF(lastName), "%s%s", PREFIX_LAST, pa->szModuleName);

+		mir_snprintf(lastName, _countof(lastName), "%s%s", PREFIX_LAST, pa->szModuleName);

 		db_set_w(NULL, MODULENAME, lastName, (WORD)CallProtoService(pa->szModuleName, PS_GETSTATUS, 0, 0));

-		mir_snprintf(lastMsg, SIZEOF(lastMsg), "%s%s", PREFIX_LASTMSG, pa->szModuleName);

+		mir_snprintf(lastMsg, _countof(lastMsg), "%s%s", PREFIX_LASTMSG, pa->szModuleName);

 		db_unset(NULL, MODULENAME, lastMsg);

 

 		if (!(CallProtoService(pa->szModuleName, PS_GETCAPS, (WPARAM)PFLAGNUM_1, 0) & PF1_MODEMSGSEND & ~PF1_INDIVMODEMSG))

diff --git a/plugins/StatusPlugins/StartupStatus/toolbars.cpp b/plugins/StatusPlugins/StartupStatus/toolbars.cpp
index 6fc5b99823..e5029981d1 100644
--- a/plugins/StatusPlugins/StartupStatus/toolbars.cpp
+++ b/plugins/StatusPlugins/StartupStatus/toolbars.cpp
@@ -45,7 +45,7 @@ void RemoveTopToolbarButtons()
 int CreateTopToolbarButtons(WPARAM wParam, LPARAM lParam)

 {

 	if (iconList[0].hIcolib == NULL)

-		Icon_Register(hInst, "Toolbar/StartupStatus", iconList, SIZEOF(iconList));

+		Icon_Register(hInst, "Toolbar/StartupStatus", iconList, _countof(iconList));

 

 	int profileCount = CallService(MS_SS_GETPROFILECOUNT, 0, 0);

 

diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp
index fa128665f6..cbf299a072 100644
--- a/plugins/StatusPlugins/commonstatus.cpp
+++ b/plugins/StatusPlugins/commonstatus.cpp
@@ -177,9 +177,9 @@ static void SetStatusMsg(PROTOCOLSETTINGEX *ps, int newstatus)
 

 			TCHAR substituteStr[128];

 			if (!_tcsnicmp(tszMsg + j, _T("%time%"), 6))

-				GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, 0, 0, substituteStr, SIZEOF(substituteStr));

+				GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, 0, 0, substituteStr, _countof(substituteStr));

 			else if (!_tcsnicmp(tszMsg + j, _T("%date%"), 6))

-				GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, 0, 0, substituteStr, SIZEOF(substituteStr));

+				GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, 0, 0, substituteStr, _countof(substituteStr));

 			else

 				continue;

 

diff --git a/plugins/StatusPlugins/confirmdialog.cpp b/plugins/StatusPlugins/confirmdialog.cpp
index 03b9943ca2..5b5ecca46d 100644
--- a/plugins/StatusPlugins/confirmdialog.cpp
+++ b/plugins/StatusPlugins/confirmdialog.cpp
@@ -269,7 +269,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				// LAST STATUS

 				if (proto->status == ID_STATUS_LAST) {

 					TCHAR last[80];

-					mir_sntprintf(last, SIZEOF(last), _T("%s (%s)"), TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, 0));

+					mir_sntprintf(last, _countof(last), _T("%s (%s)"), TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, 0));

 					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_STARTUPLIST), lvItem.iItem, 1, last);

 					actualStatus = proto->lastStatus;

 				}

@@ -278,7 +278,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				else if (proto->status == ID_STATUS_CURRENT) {

 					int currentStatus = CallProtoService(proto->szName, PS_GETSTATUS, 0, 0);

 					TCHAR current[80];

-					mir_sntprintf(current, SIZEOF(current), _T("%s (%s)"), TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));

+					mir_sntprintf(current, _countof(current), _T("%s (%s)"), TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));

 					ListView_SetItemText(GetDlgItem(hwndDlg, IDC_STARTUPLIST), lvItem.iItem, 1, current);

 					actualStatus = currentStatus;

 				}

@@ -362,7 +362,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					actualStatus = currentStatus;

 				}

 

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

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

 					if (((flags & statusModePf2List[i]) || (statusModePf2List[i] == PF2_OFFLINE)) && (!((!(flags)& Proto_Status2Flag(statusModePf2List[i]))) || ((CallProtoService(proto->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0)&Proto_Status2Flag(statusModePf2List[i]))))) {

 						TCHAR *statusMode = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);

 						item = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode);