[PATCH] winhlp32: Avoid an ARRAY_SIZE-like macro

Michael Stefaniuc mstefani at winehq.org
Fri Aug 10 05:27:56 CDT 2018


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 programs/winhlp32/winhelp.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c
index 8ee3d0410e..7ce5d4a0a8 100644
--- a/programs/winhlp32/winhelp.c
+++ b/programs/winhlp32/winhelp.c
@@ -66,19 +66,18 @@ static void WINHELP_InitFonts(HWND hWnd)
         {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}},
         {-10, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}},
         { -8, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}};
-#define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist))
 
-    static HFONT fonts[FONTS_LEN];
+    static HFONT fonts[ARRAY_SIZE(logfontlist)];
     static BOOL init = FALSE;
 
-    win->fonts_len = FONTS_LEN;
+    win->fonts_len = ARRAY_SIZE(logfontlist);
     win->fonts = fonts;
 
     if (!init)
     {
         UINT i;
 
-        for (i = 0; i < FONTS_LEN; i++)
+        for (i = 0; i < ARRAY_SIZE(logfontlist); i++)
 	{
             fonts[i] = CreateFontIndirectW(&logfontlist[i]);
 	}
-- 
2.14.4




More information about the wine-devel mailing list