Michael Stefaniuc : view: Use the ARRAY_SIZE() macro.
Alexandre Julliard
julliard at winehq.org
Mon Jul 9 16:00:37 CDT 2018
Module: wine
Branch: master
Commit: e9e96bc39afd3acaf9ca6bb0f5f68ad017de138f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e96bc39afd3acaf9ca6bb0f5f68ad017de138f
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Mon Jul 9 20:59:14 2018 +0200
view: Use the ARRAY_SIZE() macro.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/view/view.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/programs/view/view.c b/programs/view/view.c
index 0adade7..3191529 100644
--- a/programs/view/view.c
+++ b/programs/view/view.c
@@ -214,12 +214,12 @@ static void UpdateWindowCaption(void)
WCHAR szView[MAX_PATH];
static const WCHAR hyphenW[] = { ' ','-',' ',0 };
- LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR));
+ LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView));
if (szFileTitle[0] != '\0')
{
lstrcpyW(szCaption, szFileTitle);
- LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR));
+ LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView));
lstrcatW(szCaption, hyphenW);
lstrcatW(szCaption, szView);
}
@@ -260,10 +260,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM
case IDM_OPEN:
{
WCHAR filename[MAX_PATH];
- if (FileOpen(hwnd, filename, sizeof(filename)/sizeof(WCHAR)))
+ if (FileOpen(hwnd, filename, ARRAY_SIZE(filename)))
{
szFileTitle[0] = 0;
- GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR));
+ GetFileTitleW(filename, szFileTitle, ARRAY_SIZE(szFileTitle));
DoOpenFile(filename);
UpdateWindowCaption();
}
@@ -323,7 +323,7 @@ static BOOL InitApplication(HINSTANCE hInstance)
WNDCLASSEXW wc;
/* Load the application description strings */
- LoadStringW(hInstance, IDS_DESCRIPTION, szTitle, sizeof(szTitle)/sizeof(WCHAR));
+ LoadStringW(hInstance, IDS_DESCRIPTION, szTitle, ARRAY_SIZE(szTitle));
/* Fill in window class structure with parameters that describe the
main window */
@@ -390,7 +390,7 @@ static void HandleCommandLine(LPWSTR cmdline)
cmdline[lstrlenW(cmdline) - 1] = 0;
}
szFileTitle[0] = 0;
- GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR));
+ GetFileTitleW(cmdline, szFileTitle, ARRAY_SIZE(szFileTitle));
DoOpenFile(cmdline);
UpdateWindowCaption();
}
More information about the wine-cvs
mailing list