ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MSGSM32.ACM]

Browse Source 
* Sync with Wine 1.7.17.
CORE-8080

svn path=/trunk/; revision=62917
This commit is contained in:
Amine Khaldi
2014-04-23 14:34:13 +00:00
parent 57c7d8140b
commit d321a31575
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/msgsm32.acm/msgsm32.c
+19 -19
View File
@@ -63,13 +63,13 @@ FUNCPTR(gsm_decode);
if((p##f = wine_dlsym(libgsm_handle, #f, NULL, 0)) == NULL) { \
wine_dlclose(libgsm_handle, NULL, 0); \
libgsm_handle = NULL; \
return 0; \
return FALSE; \
}
/***********************************************************************
* GSM_drvLoad
*/
static LRESULT GSM_drvLoad(void)
static BOOL GSM_drvLoad(void)
{
char error[128];
@@ -81,12 +81,12 @@ static LRESULT GSM_drvLoad(void)
LOAD_FUNCPTR(gsm_option);
LOAD_FUNCPTR(gsm_encode);
LOAD_FUNCPTR(gsm_decode);
return 1;
return TRUE;
}
else
{
ERR("Couldn't load " SONAME_LIBGSM ": %s\n", error);
return 0;
return FALSE;
}
}
@@ -139,10 +139,10 @@ static LRESULT GSM_DriverDetails(PACMDRIVERDETAILSW add)
}
/* Validate a WAVEFORMATEX structure */
static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx)
static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx)
{
if (wfx->nChannels != 1)
return 0;
return FALSE;
switch (wfx->wFormatTag)
{
@@ -150,54 +150,54 @@ static DWORD GSM_FormatValidate(const WAVEFORMATEX *wfx)
if (wfx->wBitsPerSample != 16)
{
WARN("PCM wBitsPerSample %u\n", wfx->wBitsPerSample);
return 0;
return FALSE;
}
if (wfx->nBlockAlign != 2)
{
WARN("PCM nBlockAlign %u\n", wfx->nBlockAlign);
return 0;
return FALSE;
}
if (wfx->nAvgBytesPerSec != wfx->nBlockAlign * wfx->nSamplesPerSec)
{
WARN("PCM nAvgBytesPerSec %u/%u\n",
wfx->nAvgBytesPerSec,
wfx->nBlockAlign * wfx->nSamplesPerSec);
return 0;
return FALSE;
}
return 1;
return TRUE;
case WAVE_FORMAT_GSM610:
if (wfx->cbSize < sizeof(WORD))
{
WARN("GSM cbSize %u\n", wfx->cbSize);
return 0;
return FALSE;
}
if (wfx->wBitsPerSample != 0)
{
WARN("GSM wBitsPerSample %u\n", wfx->wBitsPerSample);
return 0;
return FALSE;
}
if (wfx->nBlockAlign != 65)
{
WARN("GSM nBlockAlign %u\n", wfx->nBlockAlign);
return 0;
return FALSE;
}
if (((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock != 320)
{
WARN("GSM wSamplesPerBlock %u\n",
((const GSM610WAVEFORMAT*)wfx)->wSamplesPerBlock);
return 0;
return FALSE;
}
if (wfx->nAvgBytesPerSec != wfx->nSamplesPerSec * 65 / 320)
{
WARN("GSM nAvgBytesPerSec %d / %d\n",
wfx->nAvgBytesPerSec, wfx->nSamplesPerSec * 65 / 320);
return 0;
return FALSE;
}
return 1;
return TRUE;
default:
return 0;
return FALSE;
}
return 0;
return FALSE;
}
static const DWORD gsm_rates[] = { 8000, 11025, 22050, 44100, 48000, 96000 };
@@ -512,7 +512,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
return ACMERR_NOTPOSSIBLE;
}
/* The packing algorythm writes 32 bytes, then 33 bytes,
/* The packing algorithm writes 32 bytes, then 33 bytes,
* and it seems to pad to align to 65 bytes always
* adding extra data where necessary
*/
reactos/media/doc/README.WINE
+1 -1
View File
@@ -116,7 +116,7 @@ reactos/dll/win32/mscoree # Synced to Wine-1.5.4
reactos/dll/win32/msctf # Synced to Wine-1.7.17
reactos/dll/win32/msftedit # Synced to Wine-1.7.1
reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1
reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1
reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.17
reactos/dll/win32/mshtml # Synced to Wine-1.7.1
reactos/dll/win32/mshtml.tlb # Synced to Wine-1.7.1
reactos/dll/win32/msi # Synced to Wine-1.7.1