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/ListeningTo/src/listeningto.cpp | 22 +++++++++++----------- plugins/ListeningTo/src/options.cpp | 16 ++++++++-------- plugins/ListeningTo/src/players/foobar.cpp | 2 +- plugins/ListeningTo/src/players/generic.cpp | 2 +- plugins/ListeningTo/src/players/player.cpp | 2 +- plugins/ListeningTo/src/players/winamp.cpp | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) (limited to 'plugins/ListeningTo/src') diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index b28d5d8670..22f811d67e 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -140,7 +140,7 @@ extern "C" int __declspec(dllexport) Load(void) InitOptions(); // icons - Icon_Register(hInst, LPGEN("ListeningTo"), iconList, SIZEOF(iconList)); + Icon_Register(hInst, LPGEN("ListeningTo"), iconList, _countof(iconList)); // Extra icon support hExtraIcon = ExtraIcon_Register(MODULE_NAME "_icon", LPGEN("Listening to music"), "listening_to_icon"); @@ -217,10 +217,10 @@ void RegisterProtocol(char *proto, TCHAR *account) size_t id = proto_items.size(); proto_items.resize(id+1); - strncpy(proto_items[id].proto, proto, SIZEOF(proto_items[id].proto)); - proto_items[id].proto[SIZEOF(proto_items[id].proto)-1] = 0; + strncpy(proto_items[id].proto, proto, _countof(proto_items[id].proto)); + proto_items[id].proto[_countof(proto_items[id].proto)-1] = 0; - mir_tstrncpy(proto_items[id].account, account, SIZEOF(proto_items[id].account)); + mir_tstrncpy(proto_items[id].account, account, _countof(proto_items[id].account)); proto_items[id].hMenu = NULL; proto_items[id].old_xstatus = 0; @@ -240,7 +240,7 @@ int AccListChanged(WPARAM wParam, LPARAM lParam) { if (wParam == PRAC_UPGRADED || wParam == PRAC_CHANGED) { - mir_tstrncpy(info->account, proto->tszAccountName, SIZEOF(info->account)); + mir_tstrncpy(info->account, proto->tszAccountName, _countof(info->account)); TCHAR text[512]; mir_sntprintf(text, TranslateT("Send to %s"), info->account); @@ -571,9 +571,9 @@ void SetListeningInfo(char *proto, LISTENINGTOINFO *lti = NULL) }; Buffer name; - ReplaceTemplate(&name, NULL, opts.xstatus_name, fr, SIZEOF(fr)); + ReplaceTemplate(&name, NULL, opts.xstatus_name, fr, _countof(fr)); Buffer msg; - ReplaceTemplate(&msg, NULL, opts.xstatus_message, fr, SIZEOF(fr)); + ReplaceTemplate(&msg, NULL, opts.xstatus_message, fr, _countof(fr)); ics.flags = CSSF_TCHAR | CSSF_MASK_STATUS | CSSF_MASK_NAME | CSSF_MASK_MESSAGE; ics.ptszName = name.str; @@ -663,9 +663,9 @@ void SetListeningInfo(char *proto, LISTENINGTOINFO *lti = NULL) }; Buffer name; - ReplaceTemplate(&name, NULL, opts.xstatus_name, fr, SIZEOF(fr)); + ReplaceTemplate(&name, NULL, opts.xstatus_name, fr, _countof(fr)); Buffer msg; - ReplaceTemplate(&msg, NULL, opts.xstatus_message, fr, SIZEOF(fr)); + ReplaceTemplate(&msg, NULL, opts.xstatus_message, fr, _countof(fr)); status = XSTATUS_MUSIC; ics.flags = CSSF_TCHAR | CSSF_MASK_STATUS | CSSF_MASK_NAME | CSSF_MASK_MESSAGE; @@ -781,7 +781,7 @@ TCHAR *GetParsedFormat(LISTENINGTOINFO *lti) }; Buffer ret; - ReplaceTemplate(&ret, NULL, opts.templ, fr, SIZEOF(fr)); + ReplaceTemplate(&ret, NULL, opts.templ, fr, _countof(fr)); return ret.detach(); } @@ -986,7 +986,7 @@ TCHAR* VariablesParseInfo(ARGUMENTSINFO *ai) }; Buffer ret; - ReplaceTemplate(&ret, NULL, opts.templ, fr, SIZEOF(fr)); + ReplaceTemplate(&ret, NULL, opts.templ, fr, _countof(fr)); return ret.detach(); } diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp index 2c6f5c0d75..81e1257b20 100644 --- a/plugins/ListeningTo/src/options.cpp +++ b/plugins/ListeningTo/src/options.cpp @@ -122,9 +122,9 @@ void DeInitOptions() void LoadOptions() { - LoadOpts(optionsControls, SIZEOF(optionsControls), MODULE_NAME); - LoadOpts(formatControls, SIZEOF(formatControls), MODULE_NAME); - LoadOpts(playersControls, SIZEOF(playersControls), MODULE_NAME); + LoadOpts(optionsControls, _countof(optionsControls), MODULE_NAME); + LoadOpts(formatControls, _countof(formatControls), MODULE_NAME); + LoadOpts(playersControls, _countof(playersControls), MODULE_NAME); } @@ -182,7 +182,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP { BOOL ret; if (msg != WM_INITDIALOG) - ret = SaveOptsDlgProc(optionsControls, SIZEOF(optionsControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); + ret = SaveOptsDlgProc(optionsControls, _countof(optionsControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: @@ -204,7 +204,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP } } - ret = SaveOptsDlgProc(optionsControls, SIZEOF(optionsControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); + ret = SaveOptsDlgProc(optionsControls, _countof(optionsControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); OptionsEnableDisableCtrls(hwndDlg); break; @@ -252,7 +252,7 @@ static void PlayersEnableDisableCtrls(HWND hwndDlg) EnableWindow(GetDlgItem(hwndDlg, IDC_PLAYERS_L), enabled); BOOL needPoll = FALSE; - for (int i = 0; i < SIZEOF(playerDlgs); i += 2) { + for (int i = 0; i < _countof(playerDlgs); i += 2) { EnableWindow(GetDlgItem(hwndDlg, playerDlgs[i+1]), enabled); if (players[playerDlgs[i]]->needPoll && IsDlgButtonChecked(hwndDlg, playerDlgs[i+1])) needPoll = TRUE; @@ -269,7 +269,7 @@ static void PlayersEnableDisableCtrls(HWND hwndDlg) static INT_PTR CALLBACK PlayersDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { - BOOL ret = SaveOptsDlgProc(playersControls, SIZEOF(playersControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); + BOOL ret = SaveOptsDlgProc(playersControls, _countof(playersControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: @@ -297,6 +297,6 @@ static INT_PTR CALLBACK PlayersDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP static INT_PTR CALLBACK FormatDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { - return SaveOptsDlgProc(formatControls, SIZEOF(formatControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); + return SaveOptsDlgProc(formatControls, _countof(formatControls), MODULE_NAME, hwndDlg, msg, wParam, lParam); } diff --git a/plugins/ListeningTo/src/players/foobar.cpp b/plugins/ListeningTo/src/players/foobar.cpp index d4c59934bd..bcb42dbf3f 100644 --- a/plugins/ListeningTo/src/players/foobar.cpp +++ b/plugins/ListeningTo/src/players/foobar.cpp @@ -30,5 +30,5 @@ Foobar::Foobar() { name = _T("foobar2000"); window_classes = wcs; - num_window_classes = SIZEOF(wcs); + num_window_classes = _countof(wcs); } diff --git a/plugins/ListeningTo/src/players/generic.cpp b/plugins/ListeningTo/src/players/generic.cpp index d5da94ec7d..72ee921605 100644 --- a/plugins/ListeningTo/src/players/generic.cpp +++ b/plugins/ListeningTo/src/players/generic.cpp @@ -36,7 +36,7 @@ int m_log(const TCHAR *function, const TCHAR *fmt, ...) GetCurrentThreadId(), GetTickCount(), function); va_start(va, fmt); - mir_vsntprintf(&text[len], SIZEOF(text) - len, fmt, va); + mir_vsntprintf(&text[len], _countof(text) - len, fmt, va); va_end(va); BOOL writeBOM = (GetFileAttributes(_T("c:\\miranda_listeningto.log.txt")) == INVALID_FILE_ATTRIBUTES); diff --git a/plugins/ListeningTo/src/players/player.cpp b/plugins/ListeningTo/src/players/player.cpp index 36b63a8523..aea9eed1ba 100644 --- a/plugins/ListeningTo/src/players/player.cpp +++ b/plugins/ListeningTo/src/players/player.cpp @@ -155,7 +155,7 @@ void CodeInjectionPlayer::InjectCode() // Get the dll path char dll_path[1024] = {0}; - if (!GetModuleFileNameA(hInst, dll_path, SIZEOF(dll_path))) + if (!GetModuleFileNameA(hInst, dll_path, _countof(dll_path))) return; char *p = strrchr(dll_path, '\\'); diff --git a/plugins/ListeningTo/src/players/winamp.cpp b/plugins/ListeningTo/src/players/winamp.cpp index 20feea2b65..6ce85ab775 100644 --- a/plugins/ListeningTo/src/players/winamp.cpp +++ b/plugins/ListeningTo/src/players/winamp.cpp @@ -27,7 +27,7 @@ Winamp::Winamp() { name = _T("Winamp"); window_classes = wcs; - num_window_classes = SIZEOF(wcs); + num_window_classes = _countof(wcs); message_window_class = MIRANDA_WINDOWCLASS _T(".Winamp"); dll_name = "gen_mlt"; } -- cgit v1.2.3