Michael Stefaniuc : dmusic: Use the ARRAY_SIZE() macro.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0eb58d6cfcccaa2222a7ccfb52ae859a8e576f32
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=0eb58d6cfcccaa2222a7ccfb5...

Author: Michael Stefaniuc 
Date:   Tue Oct 23 19:42:34 2018 +0200

dmusic: Use the ARRAY_SIZE() macro.

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

---

dlls/dmusic/dmusic.c      | 2 +-
 dlls/dmusic/dmusic_main.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c
index 58dcd9d..033983f 100644
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -301,7 +301,7 @@ static HRESULT WINAPI IDirectMusic8Impl_GetDefaultPort(LPDIRECTMUSIC8 iface, LPG
         return S_OK;
     }
     /* FIXME: Check return types to ensure we're interpreting data right */
-    MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, sizeof(buff) / sizeof(WCHAR));
+    MultiByteToWideChar(CP_ACP, 0, returnBuffer, -1, buff, ARRAY_SIZE(buff));
     CLSIDFromString(buff, &defaultPortGUID);
     *guid_port = defaultPortGUID;

diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c
index ad172ab..9eb5364 100644
--- a/dlls/dmusic/dmusic_main.c
+++ b/dlls/dmusic/dmusic_main.c
@@ -408,7 +408,7 @@ const char *debugstr_dmguid (const GUID *id) {

if (!id) return "(null)";

-	for (i = 0; i < sizeof(guids)/sizeof(guids[0]); i++) {
+	for (i = 0; i < ARRAY_SIZE(guids); i++) {
    	if (IsEqualGUID(id, guids[i].guid))
    		return guids[i].name;
    }
@@ -452,7 +452,7 @@ static const char *debugstr_DMUS_OBJ_FLAGS (DWORD flagmask) {
        FE(DMUS_OBJ_MEMORY),
        FE(DMUS_OBJ_STREAM)
    };
-    return debugstr_flags (flagmask, flags, sizeof(flags)/sizeof(flags[0]));
+    return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
 }

/* Dump whole DMUS_OBJECTDESC struct */
@@ -484,7 +484,7 @@ static const char* debugstr_DMUS_PORTPARAMS_FLAGS(DWORD flagmask)
         FE(DMUS_PORTPARAMS_EFFECTS),
         FE(DMUS_PORTPARAMS_SHARE)
     };
-    return debugstr_flags(flagmask, flags, sizeof(flags)/sizeof(flags[0]));
+    return debugstr_flags(flagmask, flags, ARRAY_SIZE(flags));
 }

/* Dump whole DMUS_PORTPARAMS struct */