* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
-#include <wine/port.h>
+#define WIN32_NO_STATUS
-#include <assert.h>
+#include <config.h>
+//#include <wine/port.h>
+
+//#include <assert.h>
#include <stdarg.h>
-#include <string.h>
+//#include <string.h>
#ifdef HAVE_GSM_GSM_H
#include <gsm/gsm.h>
#include <gsm.h>
#endif
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "mmsystem.h"
-#include "mmreg.h"
-#include "msacm.h"
-#include "msacmdrv.h"
-#include "wine/library.h"
-#include "wine/debug.h"
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <winnls.h>
+//#include "mmsystem.h"
+//#include "mmreg.h"
+//#include "msacm.h"
+#include <msacmdrv.h>
+//#include "wine/library.h"
+#include <wine/debug.h>
WINE_DEFAULT_DEBUG_CHANNEL(gsm);
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];
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;
}
}
}
/* 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)
{
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 };
aftd->dwFormatTagIndex = 1;
break;
}
- /* fall thru */
+ /* fall through */
case ACM_FORMATTAGDETAILSF_FORMATTAG:
switch (aftd->dwFormatTag)
{
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
*/
case ACMDM_STREAM_CONVERT:
return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2);
#else
- case ACMDM_STREAM_OPEN: ERR("libgsm support not compiled in!\n");
+ case ACMDM_STREAM_OPEN: WARN("libgsm support not compiled in!\n");
case ACMDM_STREAM_CLOSE:
case ACMDM_STREAM_SIZE:
case ACMDM_STREAM_CONVERT: