Michael Stefaniuc : appwiz.cpl: Use the available ARRAY_SIZE() macro.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 30276291fa220e165099dc485de445ca7c0e17c0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=30276291fa220e165099dc485...

Author: Michael Stefaniuc 
Date:   Thu Mar 29 17:14:13 2018 +0200

appwiz.cpl: Use the available ARRAY_SIZE() macro.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/appwiz.cpl/addons.c | 4 ++--
 dlls/appwiz.cpl/appwiz.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index 76f00a0..67bf037 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -171,7 +171,7 @@ static void set_status(DWORD id)
     HWND status = GetDlgItem(install_dialog, ID_DWL_STATUS);
     WCHAR buf[64];

-    LoadStringW(hInst, id, buf, sizeof(buf)/sizeof(WCHAR));
+    LoadStringW(hInst, id, buf, ARRAY_SIZE(buf));
     SendMessageW(status, WM_SETTEXT, 0, (LPARAM)buf);
 }

@@ -514,7 +514,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface,
     }else {
         WCHAR message[256];

-        if(LoadStringW(hInst, IDS_INVALID_SHA, message, sizeof(message)/sizeof(WCHAR)))
+        if(LoadStringW(hInst, IDS_INVALID_SHA, message, ARRAY_SIZE(message)))
             MessageBoxW(NULL, message, NULL, MB_ICONERROR);
     }

diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c
index dae9df9..af893b8 100644
--- a/dlls/appwiz.cpl/appwiz.c
+++ b/dlls/appwiz.cpl/appwiz.c
@@ -450,10 +450,10 @@ static void InstallProgram(HWND hWnd)
     WCHAR FilterBufferW[MAX_PATH];
     WCHAR FileNameBufferW[MAX_PATH];

-    LoadStringW(hInst, IDS_CPL_TITLE, titleW, sizeof(titleW)/sizeof(WCHAR));
-    LoadStringW(hInst, IDS_FILTER_INSTALLS, filter_installs, sizeof(filter_installs)/sizeof(WCHAR));
-    LoadStringW(hInst, IDS_FILTER_PROGRAMS, filter_programs, sizeof(filter_programs)/sizeof(WCHAR));
-    LoadStringW(hInst, IDS_FILTER_ALL, filter_all, sizeof(filter_all)/sizeof(WCHAR));
+    LoadStringW(hInst, IDS_CPL_TITLE, titleW, ARRAY_SIZE(titleW));
+    LoadStringW(hInst, IDS_FILTER_INSTALLS, filter_installs, ARRAY_SIZE(filter_installs));
+    LoadStringW(hInst, IDS_FILTER_PROGRAMS, filter_programs, ARRAY_SIZE(filter_programs));
+    LoadStringW(hInst, IDS_FILTER_ALL, filter_all, ARRAY_SIZE(filter_all));

snprintfW( FilterBufferW, MAX_PATH, filters, filter_installs, 0, 0,
                filter_programs, 0, 0, filter_all, 0, 0 );