[PATCH] msvfw32: Use the ARRAY_SIZE() macro

Michael Stefaniuc mstefani at winehq.org
Wed Aug 8 04:30:08 CDT 2018


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 dlls/msvfw32/mciwnd.c       | 3 +--
 dlls/msvfw32/msvideo_main.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c
index fc499732ef..50899e1fbd 100644
--- a/dlls/msvfw32/mciwnd.c
+++ b/dlls/msvfw32/mciwnd.c
@@ -1006,8 +1006,7 @@ end_of_mci_open:
                 cmdW = (LPWSTR)lParam;
 
             mwi->lasterror = mciSendStringW(cmdW, mwi->return_string,
-                                            sizeof(mwi->return_string)/sizeof(mwi->return_string[0]),
-                                            0);
+                                            ARRAY_SIZE(mwi->return_string), 0);
             if (mwi->lasterror)
                 MCIWND_notify_error(mwi);
 
diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c
index 5dc99a42da..ea81e8e4a9 100644
--- a/dlls/msvfw32/msvideo_main.c
+++ b/dlls/msvfw32/msvideo_main.c
@@ -310,8 +310,7 @@ static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned i
     lpicinfo->dwVersionICM = ICVERSION;
     lpicinfo->szName[0] = 0;
     lpicinfo->szDescription[0] = 0;
-    MultiByteToWideChar(CP_ACP, 0, driver, -1, lpicinfo->szDriver,
-			sizeof(lpicinfo->szDriver)/sizeof(WCHAR));
+    MultiByteToWideChar(CP_ACP, 0, driver, -1, lpicinfo->szDriver, ARRAY_SIZE(lpicinfo->szDriver));
 
     return TRUE;
 }
-- 
2.14.4




More information about the wine-devel mailing list