From 414fe80aebe3850fd016da5cb883f4bfeab1c543 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Fri, 13 Jul 2018 19:01:30 +0200 Subject: [PATCH] start: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc Signed-off-by: Alexandre Julliard --- programs/explorer/startmenu.c | 2 +- programs/start/start.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index 0d79aca9a4d..f5f50bb3e72 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -475,7 +475,7 @@ void do_startmenu(HWND hwnd) if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl))) add_shell_item(&root_menu, pidl); - LoadStringW(NULL, IDS_RUN, run_label, sizeof(run_label)/sizeof(run_label[0])); + LoadStringW(NULL, IDS_RUN, run_label, ARRAY_SIZE(run_label)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_STRING|MIIM_ID; diff --git a/programs/start/start.c b/programs/start/start.c index 4010befa04c..32372ecc341 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -100,8 +100,7 @@ static void fatal_string_error(int which, DWORD error_code, const WCHAR *filenam { WCHAR msg[2048]; - if (!LoadStringW(GetModuleHandleW(NULL), which, - msg, sizeof(msg)/sizeof(WCHAR))) + if (!LoadStringW(GetModuleHandleW(NULL), which, msg, ARRAY_SIZE(msg))) WINE_ERR("LoadString failed, error %d\n", GetLastError()); fatal_error(msg, error_code, filename); @@ -111,8 +110,7 @@ static void fatal_string(int which) { WCHAR msg[2048]; - if (!LoadStringW(GetModuleHandleW(NULL), which, - msg, sizeof(msg)/sizeof(WCHAR))) + if (!LoadStringW(GetModuleHandleW(NULL), which, msg, ARRAY_SIZE(msg))) WINE_ERR("LoadString failed, error %d\n", GetLastError()); output(msg);