dsound: Use the ARRAY_SIZE() macro.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dsound: Use the ARRAY_SIZE() macro.
c4fdcf3e · Michael Stefaniuc · Alexandre Julliard · f26168e4 · c4fdcf3e · c4fdcf3e
Commit c4fdcf3e authored Aug 08, 2018 by Michael Stefaniuc Committed by Alexandre Julliard Aug 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

dsound.c dlls/dsound/dsound.c +2 -2

propset.c dlls/dsound/propset.c +2 -2

No files found.
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -85,7 +85,7 @@ static void _dump_DSCAPS(DWORD xmask) {
    };
    unsigned int     i;

-    for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++)
+    for (i = 0; i < ARRAY_SIZE(flags); i++)
        if ((flags[i].mask & xmask) == flags[i].mask)
            TRACE("%s ",flags[i].name);
 }
@@ -113,7 +113,7 @@ static void _dump_DSBCAPS(DWORD xmask) {
    };
    unsigned int     i;

-    for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++)
+    for (i = 0; i < ARRAY_SIZE(flags); i++)
        if ((flags[i].mask & xmask) == flags[i].mask)
            TRACE("%s ",flags[i].name);
 }

--- a/dlls/dsound/propset.c
+++ b/dlls/dsound/propset.c
@@ -361,8 +361,8 @@ static void DSPROPERTY_descWto1(const DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W
                                DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *data1)
 {
    data1->DeviceId = dataW->DeviceId;
-    lstrcpynW(data1->ModuleW, dataW->Module, sizeof(data1->ModuleW)/sizeof(*data1->ModuleW));
-    lstrcpynW(data1->DescriptionW, dataW->Description, sizeof(data1->DescriptionW)/sizeof(*data1->DescriptionW));
+    lstrcpynW(data1->ModuleW, dataW->Module, ARRAY_SIZE(data1->ModuleW));
+    lstrcpynW(data1->DescriptionW, dataW->Description, ARRAY_SIZE(data1->DescriptionW));
    WideCharToMultiByte(CP_ACP, 0, data1->DescriptionW, -1, data1->DescriptionA, sizeof(data1->DescriptionA)-1, NULL, NULL);
    WideCharToMultiByte(CP_ACP, 0, data1->ModuleW, -1, data1->ModuleA, sizeof(data1->ModuleA)-1, NULL, NULL);
    data1->DescriptionA[sizeof(data1->DescriptionA)-1] = 0;