From b762bd7b177c285b4981bf8461678df981d62e45 Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Tue, 24 Jul 2018 00:01:24 +0200 Subject: [PATCH] clock: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc Signed-off-by: Alexandre Julliard --- programs/clock/main.c | 4 ++-- programs/clock/winclock.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/clock/main.c b/programs/clock/main.c index 04bfe644246..3ad636be431 100644 --- a/programs/clock/main.c +++ b/programs/clock/main.c @@ -72,7 +72,7 @@ static VOID CLOCK_UpdateWindowCaption(VOID) /* Set frame caption */ if (Globals.bDate) { chars = GetDateFormatW(LOCALE_USER_DEFAULT, DATE_LONGDATE, NULL, NULL, - szCaption, sizeof(szCaption)/sizeof(WCHAR)); + szCaption, ARRAY_SIZE(szCaption)); if (chars) { --chars; szCaption[chars++] = ' '; @@ -255,7 +255,7 @@ static int CLOCK_MenuCommand (WPARAM wParam) } /* show "about" box */ case IDM_ABOUT: { - LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, sizeof(szApp)/sizeof(WCHAR)); + LoadStringW(Globals.hInstance, IDS_CLOCK, szApp, ARRAY_SIZE(szApp)); lstrcpyW(szAppRelease,szApp); ShellAboutW(Globals.hMainWnd, szApp, szAppRelease, 0); break; diff --git a/programs/clock/winclock.c b/programs/clock/winclock.c index 0b2def11ab6..53c3821d95e 100644 --- a/programs/clock/winclock.c +++ b/programs/clock/winclock.c @@ -187,7 +187,7 @@ HFONT SizeFont(HDC dc, int x, int y, BOOL bSeconds, const LOGFONTW* font) int chars; chars = GetTimeFormatW(LOCALE_USER_DEFAULT, bSeconds ? 0 : TIME_NOSECONDS, NULL, - NULL, szTime, sizeof(szTime)/sizeof(WCHAR)); + NULL, szTime, ARRAY_SIZE(szTime)); if (!chars) return 0; @@ -219,7 +219,7 @@ void DigitalClock(HDC dc, int x, int y, BOOL bSeconds, HFONT font) int chars; chars = GetTimeFormatW(LOCALE_USER_DEFAULT, bSeconds ? 0 : TIME_NOSECONDS, NULL, - NULL, szTime, sizeof(szTime)/sizeof(WCHAR)); + NULL, szTime, ARRAY_SIZE(szTime)); if (!chars) return; --chars;