winmm/tests: Avoid and ARRAY_SIZE-like 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>

winmm/tests: Avoid and ARRAY_SIZE-like macro.
b400d432 · Michael Stefaniuc · Alexandre Julliard · fc0b157c · b400d432 · b400d432
Commit b400d432 authored Jun 13, 2018 by Michael Stefaniuc Committed by Alexandre Julliard Jun 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

capture.c dlls/winmm/tests/capture.c +1 -1

wave.c dlls/winmm/tests/wave.c +1 -1

winmm_test.h dlls/winmm/tests/winmm_test.h +0 -1

No files found.
--- a/dlls/winmm/tests/capture.c
+++ b/dlls/winmm/tests/capture.c
@@ -398,7 +398,7 @@ static void wave_in_test_device(UINT_PTR device)

    HeapFree(GetProcessHeap(), 0, nameA);

-    for (f=0;f<NB_WIN_FORMATS;f++) {
+    for (f = 0; f < ARRAY_SIZE(win_formats); f++) {
        format.wFormatTag=WAVE_FORMAT_PCM;
        format.nChannels=win_formats[f][3];
        format.wBitsPerSample=win_formats[f][2];

--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -1041,7 +1041,7 @@ static void wave_out_test_device(UINT_PTR device)
                                CALLBACK_EVENT,&capsA,TRUE,FALSE,FALSE);
    }

-    for (f=0;f<NB_WIN_FORMATS;f++) {
+    for (f = 0; f < ARRAY_SIZE(win_formats); f++) {
        format.wFormatTag=WAVE_FORMAT_PCM;
        format.nChannels=win_formats[f][3];
        format.wBitsPerSample=win_formats[f][2];

--- a/dlls/winmm/tests/winmm_test.h
+++ b/dlls/winmm/tests/winmm_test.h
@@ -68,7 +68,6 @@ static const unsigned int win_formats[][4] = {
    {WAVE_FORMAT_96M16, 96000, 16, 1},
    {WAVE_FORMAT_96S16, 96000, 16, 2}
 };
-#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats))

 extern const char* dev_name(int);
 extern const char* wave_open_flags(DWORD);