SIZEOF replaced with more secure analog - _countof

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

1 files changed, 12 insertions, 12 deletions

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 9046c7ce7c..8af158731f 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -166,7 +166,7 @@ static LRESULT CALLBACK ContainerWndProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 			CSkin::DrawItem(dcMem, &rcWindow, item);

 

 			TCHAR szWindowText[512];

-			GetWindowText(hwndDlg, szWindowText, SIZEOF(szWindowText));

+			GetWindowText(hwndDlg, szWindowText, _countof(szWindowText));

 			szWindowText[511] = 0;

 			hOldFont = (HFONT)SelectObject(dcMem, PluginConfig.hFontCaption);

 			GetTextMetrics(dcMem, &tm);

@@ -609,7 +609,7 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam,
 			}

 			else {

 				char szCName[CONTAINER_NAMELEN + 20];

-				mir_snprintf(szCName, SIZEOF(szCName), "%s%d", CONTAINER_PREFIX, pContainer->iContainerIndex);

+				mir_snprintf(szCName, _countof(szCName), "%s%d", CONTAINER_PREFIX, pContainer->iContainerIndex);

 				if (Utils_RestoreWindowPosition(hwndDlg, NULL, SRMSGMOD_T, szCName)) {

 					if (Utils_RestoreWindowPositionNoMove(hwndDlg, NULL, SRMSGMOD_T, szCName))

 						if (Utils_RestoreWindowPosition(hwndDlg, NULL, SRMSGMOD_T, "split"))

@@ -1029,8 +1029,8 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam,
 			if (lParam) {               // lParam != 0 means sent by a chat window

 				TCHAR szText[512];

 				dat = (TWindowData*)GetWindowLongPtr((HWND)wParam, GWLP_USERDATA);

-				GetWindowText((HWND)wParam, szText, SIZEOF(szText));

-				szText[SIZEOF(szText) - 1] = 0;

+				GetWindowText((HWND)wParam, szText, _countof(szText));

+				szText[_countof(szText) - 1] = 0;

 				SetWindowText(hwndDlg, szText);

 				if (dat)

 					SendMessage(hwndDlg, DM_SETICON, (WPARAM)dat, (LPARAM)(dat->hTabIcon != dat->hTabStatusIcon ? dat->hTabIcon : dat->hTabStatusIcon));

@@ -1344,14 +1344,14 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam,
 				pContainer->settings = &PluginConfig.globalContainerSettings;

 

 				pContainer->szRelThemeFile[0] = pContainer->szAbsThemeFile[0] = 0;

-				mir_snprintf(szCname, SIZEOF(szCname), "%s_theme", CONTAINER_PREFIX);

+				mir_snprintf(szCname, _countof(szCname), "%s_theme", CONTAINER_PREFIX);

 				if (!db_get_ts(pContainer->hContactFrom, SRMSGMOD_T, szCname, &dbv))

 					szThemeName = dbv.ptszVal;

 			}

 			else {

 				Utils::ReadPrivateContainerSettings(pContainer);

 				if (szThemeName == NULL) {

-					mir_snprintf(szCname, SIZEOF(szCname), "%s%d_theme", CONTAINER_PREFIX, pContainer->iContainerIndex);

+					mir_snprintf(szCname, _countof(szCname), "%s%d_theme", CONTAINER_PREFIX, pContainer->iContainerIndex);

 					if (!db_get_ts(NULL, SRMSGMOD_T, szCname, &dbv))

 						szThemeName = dbv.ptszVal;

 				}

@@ -1725,13 +1725,13 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam,
 					}

 					else {

 						char szCName[40];

-						mir_snprintf(szCName, SIZEOF(szCName), "%s%dx", CONTAINER_PREFIX, pContainer->iContainerIndex);

+						mir_snprintf(szCName, _countof(szCName), "%s%dx", CONTAINER_PREFIX, pContainer->iContainerIndex);

 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.left);

-						mir_snprintf(szCName, SIZEOF(szCName), "%s%dy", CONTAINER_PREFIX, pContainer->iContainerIndex);

+						mir_snprintf(szCName, _countof(szCName), "%s%dy", CONTAINER_PREFIX, pContainer->iContainerIndex);

 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.top);

-						mir_snprintf(szCName, SIZEOF(szCName), "%s%dwidth", CONTAINER_PREFIX, pContainer->iContainerIndex);

+						mir_snprintf(szCName, _countof(szCName), "%s%dwidth", CONTAINER_PREFIX, pContainer->iContainerIndex);

 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.right - wp.rcNormalPosition.left);

-						mir_snprintf(szCName, SIZEOF(szCName), "%s%dheight", CONTAINER_PREFIX, pContainer->iContainerIndex);

+						mir_snprintf(szCName, _countof(szCName), "%s%dheight", CONTAINER_PREFIX, pContainer->iContainerIndex);

 						db_set_dw(0, SRMSGMOD_T, szCName, wp.rcNormalPosition.bottom - wp.rcNormalPosition.top);

 

 						db_set_b(0, SRMSGMOD_T, "splitmax", (BYTE)((wp.showCmd == SW_SHOWMAXIMIZED) ? 1 : 0));

@@ -1750,7 +1750,7 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam,
 						SendMessage((HWND)item.lParam, DM_QUERYHCONTACT, 0, (LPARAM)&hContact);

 

 						char szCName[40];

-						mir_snprintf(szCName, SIZEOF(szCName), "%s_theme", CONTAINER_PREFIX);

+						mir_snprintf(szCName, _countof(szCName), "%s_theme", CONTAINER_PREFIX);

 						if (mir_tstrlen(pContainer->szRelThemeFile) > 1) {

 							if (pContainer->fPrivateThemeChanged == TRUE) {

 								PathToRelativeT(pContainer->szRelThemeFile, pContainer->szAbsThemeFile, M.getDataPath());

@@ -1913,7 +1913,7 @@ int TSAPI CutContactName(const TCHAR *oldname, TCHAR *newname, unsigned int size
 		_tcsncpy_s(newname, size, oldname, _TRUNCATE);

 	else {

 		TCHAR fmt[30];

-		mir_sntprintf(fmt, SIZEOF(fmt), _T("%%%d.%ds..."), cutMax, cutMax);

+		mir_sntprintf(fmt, _countof(fmt), _T("%%%d.%ds..."), cutMax, cutMax);

 		mir_sntprintf(newname, size, fmt, oldname);

 	}

 	return 0;