From 4c814798c7bc7f6a0f92c21b027b26290622aa2f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Jun 2015 19:35:42 +0000 Subject: SIZEOF replaced with more secure analog - _countof git-svn-id: http://svn.miranda-ng.org/main/trunk@14270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Alarms/src/icons.cpp | 2 +- plugins/Alarms/src/options.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Alarms/src') diff --git a/plugins/Alarms/src/icons.cpp b/plugins/Alarms/src/icons.cpp index 8d2bdd51c3..3848213ad1 100644 --- a/plugins/Alarms/src/icons.cpp +++ b/plugins/Alarms/src/icons.cpp @@ -26,7 +26,7 @@ int ReloadIcons(WPARAM, LPARAM) void InitIcons() { - Icon_Register(hInst, "Alarms", iconList, SIZEOF(iconList)); + Icon_Register(hInst, "Alarms", iconList, _countof(iconList)); if ( !ServiceExists(MS_CLIST_FRAMES_ADDFRAME)) hIconMenuShowHide = IcoLib_GetIcon("alarms_menu_showhide"); diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 853c54b285..f5bcd72416 100644 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -532,10 +532,10 @@ static INT_PTR CALLBACK DlgProcAddEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LP case IDOK: { TCHAR buff[MAX_PATH]; - GetDlgItemText(hwndDlg, IDC_TITLE, buff, SIZEOF(buff)); + GetDlgItemText(hwndDlg, IDC_TITLE, buff, _countof(buff)); replaceStrT(add_edit_alarm->szTitle, buff); - GetDlgItemText(hwndDlg, IDC_DESC, buff, SIZEOF(buff)); + GetDlgItemText(hwndDlg, IDC_DESC, buff, _countof(buff)); replaceStrT(add_edit_alarm->szDesc, buff); if (add_edit_alarm->szTitle == 0 || add_edit_alarm->szTitle[0] == '\0') { @@ -562,9 +562,9 @@ static INT_PTR CALLBACK DlgProcAddEdit(HWND hwndDlg, UINT msg, WPARAM wParam, LP add_edit_alarm->flags |= IsDlgButtonChecked(hwndDlg, IDC_CHK_NOREMINDER) ? ALF_NOREMINDER: 0; if (add_edit_alarm->action & AAF_COMMAND) { - GetDlgItemText(hwndDlg, IDC_ED_COMMAND, buff, SIZEOF(buff)); + GetDlgItemText(hwndDlg, IDC_ED_COMMAND, buff, _countof(buff)); replaceStrT(add_edit_alarm->szCommand, buff); - GetDlgItemText(hwndDlg, IDC_ED_PARAMS, buff, SIZEOF(buff)); + GetDlgItemText(hwndDlg, IDC_ED_PARAMS, buff, _countof(buff)); replaceStrT(add_edit_alarm->szCommandParams, buff); } -- cgit v1.2.3