SIZEOF replaced with more secure analog - _countof

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

3 files changed, 21 insertions, 21 deletions

diff --git a/plugins/HistoryLinkListPlus/src/linklist.h b/plugins/HistoryLinkListPlus/src/linklist.h
index 867e5a8e7d..aa5d140cfe 100644
--- a/plugins/HistoryLinkListPlus/src/linklist.h
+++ b/plugins/HistoryLinkListPlus/src/linklist.h
@@ -129,7 +129,7 @@ typedef struct {
 #define LINKLIST_SHOW_TYPE		"ShowMessageType"

 

 

-#define _mstrlen(x) (SIZEOF(x) - 1)

+#define _mstrlen(x) (_countof(x) - 1)

 #define MAKE_TXT_COL(BGCol) ((DWORD)~BGCol & 0x00FFFFFF)

 

 #define DM_LINKSPLITTER			WM_USER+99

diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
index 28e5520a86..5a3ef9fd49 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp
@@ -76,9 +76,9 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 

 		SetClassLongPtr(hDlg, GCLP_HICON, (LONG_PTR)LoadIcon(hInst, MAKEINTRESOURCE(IDI_LINKLISTICON))); 

 		WindowList_Add(hWindowList, hDlg, DlgParam->hContact);

-		mir_sntprintf(title, SIZEOF(title), _T("%s [%s]"), TranslateT("Linklist plugin"), (LPCTSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)DlgParam->hContact, GCDNF_TCHAR));

+		mir_sntprintf(title, _countof(title), _T("%s [%s]"), TranslateT("Linklist plugin"), (LPCTSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)DlgParam->hContact, GCDNF_TCHAR));

 		SetWindowText(hDlg, title);

-		GetFilterText(listMenu, filter, SIZEOF(filter));

+		GetFilterText(listMenu, filter, _countof(filter));

 		SetDlgItemText(hDlg, IDC_STATUS, filter);

 			

 		mir_subclassWindow(GetDlgItem(hDlg, IDC_SPLITTER), SplitterProc);

@@ -207,7 +207,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			}

 			break;

 		case IDM_CLEARSEARCH: // clear search results

-			GetFilterText(listMenu, filter, SIZEOF(filter));

+			GetFilterText(listMenu, filter, _countof(filter));

 			SetDlgItemText(hDlg, IDC_STATUS, filter);

 			SetDlgItemText(hDlg, IDC_MAIN, _T(""));

 			WriteLinkList(hDlg, GetFlags(listMenu), DlgParam->listStart, NULL, 0);

@@ -221,7 +221,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			SendMessage(hDlg, WM_CLOSE, 0, 0);

 			break;

 		case IDM_DIR_IN: // view only incoming messages

-			GetFilterText(listMenu, filter, SIZEOF(filter));

+			GetFilterText(listMenu, filter, _countof(filter));

 			SetDlgItemText(hDlg, IDC_STATUS, filter);

 			if ((GetMenuState(listMenu, IDM_SEARCH, MF_BYCOMMAND) & MF_DISABLED))

 				break; // not possible if search dialog is open

@@ -234,11 +234,11 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				CheckMenuItem(listMenu, IDM_DIR_OUT, MF_UNCHECKED);

 				WriteLinkList(hDlg, GetFlags(listMenu), DlgParam->listStart, NULL, 0);

 			}		

-			GetFilterText(GetMenu(hDlg), filter, SIZEOF(filter));

+			GetFilterText(GetMenu(hDlg), filter, _countof(filter));

 			SetDlgItemText(hDlg, IDC_STATUS, filter);

 			break;

 		case IDM_DIR_OUT: // view only outgoing messages

-			GetFilterText(listMenu, filter, SIZEOF(filter));

+			GetFilterText(listMenu, filter, _countof(filter));

 			SetDlgItemText(hDlg, IDC_STATUS, filter);

 			if ((GetMenuState(listMenu, IDM_SEARCH, MF_BYCOMMAND) & MF_DISABLED))

 				break; // not possible if search dialog is open

@@ -251,11 +251,11 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				CheckMenuItem(listMenu, IDM_DIR_IN, MF_UNCHECKED);

 				WriteLinkList(hDlg, GetFlags(listMenu), DlgParam->listStart, NULL, 0);

 			}

-			GetFilterText(listMenu, filter, SIZEOF(filter));

+			GetFilterText(listMenu, filter, _countof(filter));

 			SetDlgItemText(hDlg, IDC_STATUS, filter);

 			break;

 		case IDM_TYPE_WEB: // view only e-mail addresses

-			GetFilterText(listMenu, filter, SIZEOF(filter));

+			GetFilterText(listMenu, filter, _countof(filter));

 			SetDlgItemText(hDlg, IDC_STATUS, filter);

 			// not possible if search dialog is open

 			if ((GetMenuState(listMenu, IDM_SEARCH, MF_BYCOMMAND) & MF_DISABLED))

@@ -269,7 +269,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				CheckMenuItem(listMenu, IDM_TYPE_MAIL, MF_UNCHECKED);

 				WriteLinkList(hDlg, GetFlags(listMenu), DlgParam->listStart, NULL, 0);

 			}

-			GetFilterText(listMenu, filter, SIZEOF(filter));

+			GetFilterText(listMenu, filter, _countof(filter));

 			SetDlgItemText(hDlg, IDC_STATUS, filter);

 			break;

 		case IDM_TYPE_MAIL: // view only URLs

@@ -284,7 +284,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 				CheckMenuItem(listMenu, IDM_TYPE_WEB, MF_UNCHECKED);

 				WriteLinkList(hDlg, GetFlags(listMenu), DlgParam->listStart, NULL, 0);

 			}

-			GetFilterText(listMenu, filter, SIZEOF(filter));

+			GetFilterText(listMenu, filter, _countof(filter));

 			SetDlgItemText(hDlg, IDC_STATUS, filter);

 			break;

 		}

@@ -413,7 +413,7 @@ INT_PTR CALLBACK SearchDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPara
 				WriteLinkList(hListDlg, flags, DlgParam->listStart, buffer, 0);

 				mir_free(buffer);

 			}		

-			mir_sntprintf(filter, SIZEOF(filter), _T("%s: %s"), TXT_FILTER, TXT_SEARCHFILTER);

+			mir_sntprintf(filter, _countof(filter), _T("%s: %s"), TXT_FILTER, TXT_SEARCHFILTER);

 			SetDlgItemText(hWndMain, IDC_STATUS, filter);

 			} break;

 		}

diff --git a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
index 8948ececc7..d7fefdaacb 100644
--- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
+++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp
@@ -115,14 +115,14 @@ int ExtractURI(DBEVENTINFO *dbei, MEVENT hEvent, LISTELEMENT *listStart)
 		_tcsncpy_s(wordsearch, wordlen, msg + wordStart, (wordlen - 1));

 		CharLower(wordsearch);

 

-		for (j = 0; j < SIZEOF(hyperlinkPrefixes); j ++) {

+		for (j = 0; j < _countof(hyperlinkPrefixes); j ++) {

 			if (!_tcsncmp(wordsearch, hyperlinkPrefixes[j], mir_tstrlen(hyperlinkPrefixes[j]))) {

 				isLink = 1;

 				break;

 			}

 		}

 		if (!isLink) {

-			for (j = 0; j < SIZEOF(hyperlinkSubstrings); j ++) {

+			for (j = 0; j < _countof(hyperlinkSubstrings); j ++) {

 				if (_tcsstr(wordsearch + 1,hyperlinkSubstrings[j])) {

 					isLink = 1;

 					break;

@@ -142,14 +142,14 @@ int ExtractURI(DBEVENTINFO *dbei, MEVENT hEvent, LISTELEMENT *listStart)
 				_tcsncpy_s(link, _T("http://"), _mstrlen(_T("http://")));

 				// Link longer than defined max -> cut link to max

 				if (wordlen > (LINK_MAX - _mstrlen(_T("http://"))))

-					_tcsncpy_s((link + _mstrlen(_T("http://"))), (SIZEOF(link) - _mstrlen(_T("http://"))), word, LINK_MAX - _mstrlen(_T("http://")));

+					_tcsncpy_s((link + _mstrlen(_T("http://"))), (_countof(link) - _mstrlen(_T("http://"))), word, LINK_MAX - _mstrlen(_T("http://")));

 				else

-					_tcsncpy_s((link + _mstrlen(_T("http://"))), (SIZEOF(link) - _mstrlen(_T("http://"))), word, wordlen);

+					_tcsncpy_s((link + _mstrlen(_T("http://"))), (_countof(link) - _mstrlen(_T("http://"))), word, wordlen);

 			} else {

 				_tcsncpy_s(link, word, ((wordlen > LINK_MAX) ? LINK_MAX : wordlen));

 			}

 

-			TimeZone_ToStringT(dbei->timestamp, _T("d-t"), dbdate, SIZEOF(dbdate));

+			TimeZone_ToStringT(dbei->timestamp, _T("d-t"), dbdate, _countof(dbdate));

 			date_ptr = _tcstok_s(dbdate, _T("-"), &tok_ctx);

 			time_ptr = _tcstok_s(NULL, _T("-"), &tok_ctx);

 			_tcsncpy_s(date, date_ptr, _TRUNCATE);

@@ -164,7 +164,7 @@ int ExtractURI(DBEVENTINFO *dbei, MEVENT hEvent, LISTELEMENT *listStart)
 			if (type == LINK_MAIL && _tcsstr(link, _T("mailto:")) == NULL) {

 				_tcsncpy_s(templink, link, _TRUNCATE);

 				_tcsncpy_s(link, _T("mailto:"), _TRUNCATE);

-				_tcsncpy_s((link + _mstrlen(_T("mailto:"))), (SIZEOF(link) - _mstrlen(_T("mailto:"))), templink, _TRUNCATE);

+				_tcsncpy_s((link + _mstrlen(_T("mailto:"))), (_countof(link) - _mstrlen(_T("mailto:"))), templink, _TRUNCATE);

 			}

 

 			// Add new Element to list:

@@ -310,7 +310,7 @@ void WriteLinkList(HWND hDlg, BYTE params, LISTELEMENT *listStart, LPCTSTR searc
 				_tcscpy_s(cf.szFaceName, _T("Arial"));

 				SendDlgItemMessage( hDlg, IDC_MAIN, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &cf);

 				

-				mir_sntprintf(searchText, SIZEOF(searchText), _T("%s '%s': %d\n\n"), TranslateT("Matches for searchtext"), searchString, listCount);

+				mir_sntprintf(searchText, _countof(searchText), _T("%s '%s': %d\n\n"), TranslateT("Matches for searchtext"), searchString, listCount);

 				SendDlgItemMessage(hDlg, IDC_MAIN, EM_REPLACESEL, FALSE, (LPARAM)searchText);

 				linePos += 2;

 			}

@@ -459,7 +459,7 @@ void WriteLinkList(HWND hDlg, BYTE params, LISTELEMENT *listStart, LPCTSTR searc
 					type = _T("[UNK ]");

 				}

 

-				mir_sntprintf(textLine, SIZEOF(textLine), _T("%s%s%s%s%s%s%s\n"),

+				mir_sntprintf(textLine, _countof(textLine), _T("%s%s%s%s%s%s%s\n"),

 					options.showDirection ? (actualElement->direction==DIRECTION_IN?_T("[in ]"):_T("[out]")) : _T(""),

 					options.showDirection? _T(" ") : _T(""),

 					options.showType ? type : _T(""),

@@ -1254,7 +1254,7 @@ BOOL SaveEditAsStream( HWND hDlg )
 	mir_sntprintf(temp, _T("%s (*.rtf)%c*.rtf%c%s (*.*)%c*.*%c%c"), TranslateT("RTF file"), 0, 0, TranslateT("All files"), 0, 0, 0);

 	ofn.lpstrFilter = temp;

 	ofn.lpstrFile = szFilename;

-	ofn.nMaxFile = SIZEOF(szFilename);

+	ofn.nMaxFile = _countof(szFilename);

 	ofn.lpstrTitle = TranslateT("Save RTF File");

 	ofn.Flags = OFN_OVERWRITEPROMPT;

 	// Get a filename or quit