[ros-diffs] [reactos] 01/01: [MSG711.ACM] Sync with Wine Staging 4.0. CORE-15682

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d3499acfa69648164cf2…

commit 3d3499acfa69648164cf24e608ce7089b56ec88c
Author:     Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Tue Jan 29 13:06:10 2019 +0100
Commit:     Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Tue Jan 29 13:06:10 2019 +0100

    [MSG711.ACM] Sync with Wine Staging 4.0. CORE-15682
---
 dll/win32/msg711.acm/msg711.c | 30 +++++++++++++-----------------
 media/doc/README.WINE         |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/dll/win32/msg711.acm/msg711.c b/dll/win32/msg711.acm/msg711.c
index dc1661c7db..d20c89bfaf 100644
--- a/dll/win32/msg711.acm/msg711.c
+++ b/dll/win32/msg711.acm/msg711.c
@@ -87,10 +87,6 @@ static const Format ULaw_Formats[] =
     {1,  8, 22050}, {2,	8, 22050},  {1,  8, 44100}, {2,	 8, 44100},
 };
 
-#define	NUM_PCM_FORMATS		(sizeof(PCM_Formats) / sizeof(PCM_Formats[0]))
-#define	NUM_ALAW_FORMATS	(sizeof(ALaw_Formats) / sizeof(ALaw_Formats[0]))
-#define	NUM_ULAW_FORMATS	(sizeof(ULaw_Formats) / sizeof(ULaw_Formats[0]))
-
 /***********************************************************************
  *           G711_GetFormatIndex
  */
@@ -102,15 +98,15 @@ static	DWORD	G711_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_ALAW:
-	hi = NUM_ALAW_FORMATS;
+	hi = ARRAY_SIZE(ALaw_Formats);
 	fmts = ALaw_Formats;
 	break;
     case WAVE_FORMAT_MULAW:
-	hi = NUM_ULAW_FORMATS;
+	hi = ARRAY_SIZE(ULaw_Formats);
 	fmts = ULaw_Formats;
 	break;
     default:
@@ -662,13 +658,13 @@ static	LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add)
     add->cFilterTags = 0;
     add->hicon = NULL;
     MultiByteToWideChar( CP_ACP, 0, "Microsoft CCITT G.711", -1,
-                         add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR)
);
+                         add->szShortName, ARRAY_SIZE( add->szShortName ));
     MultiByteToWideChar( CP_ACP, 0, "Wine G711 converter", -1,
-                         add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) );
+                         add->szLongName, ARRAY_SIZE( add->szLongName ));
     MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1,
-                         add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR)
);
+                         add->szCopyright, ARRAY_SIZE( add->szCopyright ));
     MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1,
-                         add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR)
);
+                         add->szLicensing, ARRAY_SIZE( add->szLicensing ));
     add->szFeatures[0] = 0;
 
     return MMSYSERR_NOERROR;
@@ -716,19 +712,19 @@ static	LRESULT	G711_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_ALAW;
 	aftd->cbFormatSize = sizeof(WAVEFORMATEX);
-	aftd->cStandardFormats = NUM_ALAW_FORMATS;
+	aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats);
         lstrcpyW(aftd->szFormatTag, szALaw);
 	break;
     case 2:
 	aftd->dwFormatTag = WAVE_FORMAT_MULAW;
 	aftd->cbFormatSize = sizeof(WAVEFORMATEX);
-	aftd->cStandardFormats = NUM_ULAW_FORMATS;
+	aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats);
         lstrcpyW(aftd->szFormatTag, szULaw);
 	break;
     }
@@ -751,7 +747,7 @@ static	LRESULT	G711_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;
@@ -759,7 +755,7 @@ static	LRESULT	G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD
dwQuery)
 	    afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec *
afd->pwfx->nBlockAlign;
 	    break;
 	case WAVE_FORMAT_ALAW:
-	    if (afd->dwFormatIndex >= NUM_ALAW_FORMATS) return ACMERR_NOTPOSSIBLE;
+	    if (afd->dwFormatIndex >= ARRAY_SIZE(ALaw_Formats)) return
ACMERR_NOTPOSSIBLE;
 	    afd->pwfx->nChannels = ALaw_Formats[afd->dwFormatIndex].nChannels;
 	    afd->pwfx->nSamplesPerSec = ALaw_Formats[afd->dwFormatIndex].rate;
 	    afd->pwfx->wBitsPerSample = ALaw_Formats[afd->dwFormatIndex].nBits;
@@ -768,7 +764,7 @@ static	LRESULT	G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD
dwQuery)
             afd->pwfx->cbSize = 0;
 	    break;
 	case WAVE_FORMAT_MULAW:
-	    if (afd->dwFormatIndex >= NUM_ULAW_FORMATS) return ACMERR_NOTPOSSIBLE;
+	    if (afd->dwFormatIndex >= ARRAY_SIZE(ULaw_Formats)) return
ACMERR_NOTPOSSIBLE;
 	    afd->pwfx->nChannels = ULaw_Formats[afd->dwFormatIndex].nChannels;
 	    afd->pwfx->nSamplesPerSec = ULaw_Formats[afd->dwFormatIndex].rate;
 	    afd->pwfx->wBitsPerSample = ULaw_Formats[afd->dwFormatIndex].nBits;
diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index fb1db00c8b..23e50e9b4e 100644
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -108,7 +108,7 @@ reactos/dll/win32/mscms               # Synced to WineStaging-4.0
 reactos/dll/win32/mscoree             # Synced to Wine-1.5.4
 reactos/dll/win32/msctf               # Synced to WineStaging-4.0
 reactos/dll/win32/msftedit            # Synced to WineStaging-3.3
-reactos/dll/win32/msg711.acm          # Synced to WineStaging-3.3
+reactos/dll/win32/msg711.acm          # Synced to WineStaging-4.0
 reactos/dll/win32/msgsm32.acm         # Synced to WineStaging-3.3
 reactos/dll/win32/mshtml              # Synced to WineStaging-1.7.55
 reactos/dll/win32/mshtml.tlb          # Synced to WineStaging-1.7.55