[PATCH] mmdevapi/tests: Remove an ARRAY_SIZE()-like macro

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc 
---
 dlls/mmdevapi/tests/render.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
index 9d3e8617b9..a4e94b15e0 100644
--- a/dlls/mmdevapi/tests/render.c
+++ b/dlls/mmdevapi/tests/render.c
@@ -51,7 +51,6 @@ static const unsigned int win_formats[][4] = {
     {48000,  8, 1},   {48000,  8, 2},   {48000, 16, 1},   {48000, 16, 2},
     {96000,  8, 1},   {96000,  8, 2},   {96000, 16, 1},   {96000, 16, 2}
 };
-#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats))

#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)

@@ -384,7 +383,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode)
     fmt.wFormatTag = WAVE_FORMAT_PCM;
     fmt.cbSize = 0;

-    for(i = 0; i < NB_WIN_FORMATS; i++) {
+    for(i = 0; i < ARRAY_SIZE(win_formats); i++) {
         hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER,
                 NULL, (void**)&ac);
         ok(hr == S_OK, "Activation failed with %08x\n", hr);

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Mon, Jun 04, 2018 at 01:07:44AM +0200, Michael Stefaniuc wrote:
> Signed-off-by: Michael Stefaniuc
>
> dlls/mmdevapi/tests/render.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c
> index 9d3e8617b9..a4e94b15e0 100644
> --- a/dlls/mmdevapi/tests/render.c
> +++ b/dlls/mmdevapi/tests/render.c
> @@ -51,7 +51,6 @@ static const unsigned int win_formats[][4] = {
>      {48000,  8, 1},   {48000,  8, 2},   {48000, 16, 1},   {48000, 16, 2},
>      {96000,  8, 1},   {96000,  8, 2},   {96000, 16, 1},   {96000, 16, 2}
>  };
> -#define NB_WIN_FORMATS (sizeof(win_formats)/sizeof(*win_formats))
>
> #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
>
> @@ -384,7 +383,7 @@ static void test_formats(AUDCLNT_SHAREMODE mode)
>      fmt.wFormatTag = WAVE_FORMAT_PCM;
>      fmt.cbSize = 0;
> - for(i = 0; i < NB_WIN_FORMATS; i++) {
> - for(i = 0; i < ARRAY_SIZE(win_formats); i++) {
>     hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER,
>             NULL, (void**)&ac);
>     ok(hr == S_OK, "Activation failed with %08x\n", hr);
>
> -- 
> 2.14.4