system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 08:36:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dmusic: Use the ARRAY_SIZE() macro.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-10-23 19:42:34 +02:00 committed by Alexandre Julliard
parent eb2e0d9fbe
commit 0eb58d6cfc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/dmusic/dmusic.c
View file

@ -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;

6
dlls/dmusic/dmusic_main.c
View file

@ -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 */