Michael Stefaniuc : msadp32.acm: Avoid ARRAY_SIZE-like macros.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 947600a33dd5cfb00c756b3fdcfb428da8c6befa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=947600a33dd5cfb00c756b3fd...

Author: Michael Stefaniuc 
Date:   Wed Jul 11 22:06:09 2018 +0200

msadp32.acm: Avoid ARRAY_SIZE-like macros.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Andrew Eikum 
Signed-off-by: Alexandre Julliard

---

dlls/msadp32.acm/msadp32.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c
index 24e0c6a..50ade3d 100644
--- a/dlls/msadp32.acm/msadp32.c
+++ b/dlls/msadp32.acm/msadp32.c
@@ -83,9 +83,6 @@ static const Format ADPCM_Formats[] =
     {1,  4, 22050}, {2,	4, 22050},  {1,  4, 44100}, {2,	 4, 44100},
 };

-#define	NUM_PCM_FORMATS		(sizeof(PCM_Formats) / sizeof(PCM_Formats[0]))
-#define	NUM_ADPCM_FORMATS	(sizeof(ADPCM_Formats) / sizeof(ADPCM_Formats[0]))
-
 static int MS_Delta[] =
 {
     230, 230, 230, 230, 307, 409, 512, 614,
@@ -109,11 +106,11 @@ static	DWORD	ADPCM_GetFormatIndex(const WAVEFORMATEX* wfx)
     switch (wfx->wFormatTag)
     {
     case WAVE_FORMAT_PCM:
-	hi = NUM_PCM_FORMATS;
+	hi = ARRAY_SIZE(PCM_Formats);
    fmts = PCM_Formats;
    break;
     case WAVE_FORMAT_ADPCM:
-	hi = NUM_ADPCM_FORMATS;
+	hi = ARRAY_SIZE(ADPCM_Formats);
    fmts = ADPCM_Formats;
    break;
     default:
@@ -441,13 +438,13 @@ static	LRESULT	ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
     case 0:
    aftd->dwFormatTag = WAVE_FORMAT_PCM;
    aftd->cbFormatSize = sizeof(PCMWAVEFORMAT);
-	aftd->cStandardFormats = NUM_PCM_FORMATS;
+	aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats);
         lstrcpyW(aftd->szFormatTag, szPcm);
         break;
     case 1:
    aftd->dwFormatTag = WAVE_FORMAT_ADPCM;
    aftd->cbFormatSize = sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET);
-	aftd->cStandardFormats = NUM_ADPCM_FORMATS;
+	aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats);
         lstrcpyW(aftd->szFormatTag, szMsAdPcm);
    break;
     }
@@ -470,7 +467,7 @@ static	LRESULT	ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
    switch (afd->dwFormatTag)
         {
    case WAVE_FORMAT_PCM:
-	    if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE;
+	    if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE;
        afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels;
        afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate;
        afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits;
@@ -483,7 +480,7 @@ static	LRESULT	ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
    	afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign;
        break;
    case WAVE_FORMAT_ADPCM:
-	    if (afd->dwFormatIndex >= NUM_ADPCM_FORMATS) return ACMERR_NOTPOSSIBLE;
+	    if (afd->dwFormatIndex >= ARRAY_SIZE(ADPCM_Formats)) return ACMERR_NOTPOSSIBLE;
             if (afd->cbwfx < sizeof(ADPCMWAVEFORMAT) + (7 - 1) * sizeof(ADPCMCOEFSET))
                 return ACMERR_NOTPOSSIBLE;
        afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels;