Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-01 03:29:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSG711.ACM] Sync with Wine Staging 4.0. CORE-15682

Browse source
This commit is contained in:
Amine Khaldi 2019-01-29 13:06:10 +01:00
parent 53028dd240
commit 3d3499acfa
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dll/win32/msg711.acm/msg711.c
View file

@ -87,10 +87,6 @@ static const Format ULaw_Formats[] =
{1, 8, 22050}, {2, 8, 22050}, {1, 8, 44100}, {2, 8, 44100}, {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 * G711_GetFormatIndex
*/ */
@ -102,15 +98,15 @@ static DWORD G711_GetFormatIndex(const WAVEFORMATEX *wfx)
switch (wfx->wFormatTag) switch (wfx->wFormatTag)
{ {
case WAVE_FORMAT_PCM: case WAVE_FORMAT_PCM:
hi = NUM_PCM_FORMATS; hi = ARRAY_SIZE(PCM_Formats);
fmts = PCM_Formats; fmts = PCM_Formats;
break; break;
case WAVE_FORMAT_ALAW: case WAVE_FORMAT_ALAW:
hi = NUM_ALAW_FORMATS; hi = ARRAY_SIZE(ALaw_Formats);
fmts = ALaw_Formats; fmts = ALaw_Formats;
break; break;
case WAVE_FORMAT_MULAW: case WAVE_FORMAT_MULAW:
hi = NUM_ULAW_FORMATS; hi = ARRAY_SIZE(ULaw_Formats);
fmts = ULaw_Formats; fmts = ULaw_Formats;
break; break;
default: default:
@ -662,13 +658,13 @@ static LRESULT G711_DriverDetails(PACMDRIVERDETAILSW add)
add->cFilterTags = 0; add->cFilterTags = 0;
add->hicon = NULL; add->hicon = NULL;
MultiByteToWideChar( CP_ACP, 0, "Microsoft CCITT G.711", -1, 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, 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, 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, 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; add->szFeatures[0] = 0;
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
@ -716,19 +712,19 @@ static LRESULT G711_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
case 0: case 0:
aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->dwFormatTag = WAVE_FORMAT_PCM;
aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); aftd->cbFormatSize = sizeof(PCMWAVEFORMAT);
aftd->cStandardFormats = NUM_PCM_FORMATS; aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats);
lstrcpyW(aftd->szFormatTag, szPcm); lstrcpyW(aftd->szFormatTag, szPcm);
break; break;
case 1: case 1:
aftd->dwFormatTag = WAVE_FORMAT_ALAW; aftd->dwFormatTag = WAVE_FORMAT_ALAW;
aftd->cbFormatSize = sizeof(WAVEFORMATEX); aftd->cbFormatSize = sizeof(WAVEFORMATEX);
aftd->cStandardFormats = NUM_ALAW_FORMATS; aftd->cStandardFormats = ARRAY_SIZE(ALaw_Formats);
lstrcpyW(aftd->szFormatTag, szALaw); lstrcpyW(aftd->szFormatTag, szALaw);
break; break;
case 2: case 2:
aftd->dwFormatTag = WAVE_FORMAT_MULAW; aftd->dwFormatTag = WAVE_FORMAT_MULAW;
aftd->cbFormatSize = sizeof(WAVEFORMATEX); aftd->cbFormatSize = sizeof(WAVEFORMATEX);
aftd->cStandardFormats = NUM_ULAW_FORMATS; aftd->cStandardFormats = ARRAY_SIZE(ULaw_Formats);
lstrcpyW(aftd->szFormatTag, szULaw); lstrcpyW(aftd->szFormatTag, szULaw);
break; break;
} }
@ -751,7 +747,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
switch (afd->dwFormatTag) switch (afd->dwFormatTag)
{ {
case WAVE_FORMAT_PCM: 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->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels;
afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate;
afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; 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; afd->pwfx->nAvgBytesPerSec = afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign;
break; break;
case WAVE_FORMAT_ALAW: 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->nChannels = ALaw_Formats[afd->dwFormatIndex].nChannels;
afd->pwfx->nSamplesPerSec = ALaw_Formats[afd->dwFormatIndex].rate; afd->pwfx->nSamplesPerSec = ALaw_Formats[afd->dwFormatIndex].rate;
afd->pwfx->wBitsPerSample = ALaw_Formats[afd->dwFormatIndex].nBits; afd->pwfx->wBitsPerSample = ALaw_Formats[afd->dwFormatIndex].nBits;
@ -768,7 +764,7 @@ static LRESULT G711_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
afd->pwfx->cbSize = 0; afd->pwfx->cbSize = 0;
break; break;
case WAVE_FORMAT_MULAW: 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->nChannels = ULaw_Formats[afd->dwFormatIndex].nChannels;
afd->pwfx->nSamplesPerSec = ULaw_Formats[afd->dwFormatIndex].rate; afd->pwfx->nSamplesPerSec = ULaw_Formats[afd->dwFormatIndex].rate;
afd->pwfx->wBitsPerSample = ULaw_Formats[afd->dwFormatIndex].nBits; afd->pwfx->wBitsPerSample = ULaw_Formats[afd->dwFormatIndex].nBits;

2
media/doc/README.WINE
View file

@ -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/mscoree # Synced to Wine-1.5.4
reactos/dll/win32/msctf # Synced to WineStaging-4.0 reactos/dll/win32/msctf # Synced to WineStaging-4.0
reactos/dll/win32/msftedit # Synced to WineStaging-3.3 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/msgsm32.acm # Synced to WineStaging-3.3
reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55
reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55