[PATCH] dmusic: Use the ARRAY_SIZE() macro
Michael Stefaniuc
mstefani at winehq.org
Tue Oct 23 12:42:34 CDT 2018
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
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 58dcd9d952..033983f6c8 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 ad172ab7c2..9eb53640ca 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 */
--
2.14.5
More information about the wine-devel
mailing list