Re: [PATCH 11/24] dlls/msgsm32.acm: enable compilation with long types

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Tue, Feb 15, 2022 at 07:29:35AM +0100, Eric Pouech wrote:
> Signed-off-by: Eric Pouech
>
> dlls/msgsm32.acm/Makefile.in |    1 -
>  dlls/msgsm32.acm/msgsm32.c   |   18 +++++++++---------
>  2 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/dlls/msgsm32.acm/Makefile.in b/dlls/msgsm32.acm/Makefile.in
> index a72f7880fce..41bd1703abf 100644
> --- a/dlls/msgsm32.acm/Makefile.in
> +++ b/dlls/msgsm32.acm/Makefile.in
> @@ -1,4 +1,3 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES
>  MODULE    = msgsm32.acm
>  IMPORTS   = $(GSM_PE_LIBS) winmm user32
>  EXTRAINCL = $(GSM_PE_CFLAGS)
> diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c
> index 83624139a0a..002604f0450 100644
> --- a/dlls/msgsm32.acm/msgsm32.c
> +++ b/dlls/msgsm32.acm/msgsm32.c
> @@ -90,7 +90,7 @@ static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx)
>          }
>          if (wfx->nAvgBytesPerSec != wfx->nBlockAlign * wfx->nSamplesPerSec)
>          {
> -
>        WARN("PCM nAvgBytesPerSec %u/%u\n",
> -
>        WARN("PCM nAvgBytesPerSec %lu/%lu\n",
>             wfx->nAvgBytesPerSec,
>             wfx->nBlockAlign * wfx->nSamplesPerSec);
>        return FALSE;
>
> @@ -120,7 +120,7 @@ static BOOL GSM_FormatValidate(const WAVEFORMATEX *wfx)
>          }
>          if (wfx->nAvgBytesPerSec != wfx->nSamplesPerSec * 65 / 320)
>          {
> -
>        WARN("GSM nAvgBytesPerSec %d / %d\n",
> -
>        WARN("GSM nAvgBytesPerSec %ld / %ld\n",
>             wfx->nAvgBytesPerSec, wfx->nSamplesPerSec * 65 / 320);
>        return FALSE;
>    }
>
> @@ -163,7 +163,7 @@ static	LRESULT	GSM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
>    }
>    break;
>      default:
> - WARN("Unsupported query %08x\n", dwQuery);
> - WARN("Unsupported query %08lx\n", dwQuery);
> return MMSYSERR_NOTSUPPORTED;
> }
>
> @@ -220,12 +220,12 @@ static	LRESULT	GSM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
>              ((GSM610WAVEFORMAT*)afd->pwfx)->wSamplesPerBlock = 320;
>        break;
>    default:
> -
>        WARN("Unsupported tag %08x\n", afd->dwFormatTag);
> -
>        WARN("Unsupported tag %08lx\n", afd->dwFormatTag);
>  return MMSYSERR_INVALPARAM;
> }
>  break;
>    default:
> - WARN("Unsupported query %08x\n", dwQuery);
> - WARN("Unsupported query %08lx\n", dwQuery);
> return MMSYSERR_NOTSUPPORTED;
> }
> afd->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC;
>
> @@ -375,7 +375,7 @@ static	LRESULT GSM_StreamSize(const ACMDRVSTREAMINSTANCE *adsi, PACMDRVSTREAMSIZ
>    }
>    return MMSYSERR_NOERROR;
>      default:
> - WARN("Unsupported query %08x\n", adss->fdwSize);
> - WARN("Unsupported query %08lx\n", adss->fdwSize);
> return MMSYSERR_NOTSUPPORTED;
> }
>
> }
> @@ -398,7 +398,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
>      ACM_STREAMCONVERTF_END|
>      ACM_STREAMCONVERTF_START))
>      {
> - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert);
> -
>
> FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert);
> }
>
> /* Reset the index to 0, just to be sure */
>
> @@ -493,7 +493,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
>  adsh->cbSrcLengthUsed = nsrc;
>  adsh->cbDstLengthUsed = ndst;
> - TRACE("%d(%d) -> %d(%d)\n", nsrc, adsh->cbSrcLength, ndst, adsh->cbDstLength);
> - TRACE("%ld(%ld) -> %ld(%ld)\n", nsrc, adsh->cbSrcLength, ndst, adsh->cbDstLength);
> return MMSYSERR_NOERROR;
>
> }
>
> @@ -503,7 +503,7 @@ static LRESULT GSM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
>  LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
>    				 LPARAM dwParam1, LPARAM dwParam2)
>  {
> - TRACE("(%08lx %p %04x %08lx %08lx);\n",
> -
>
> TRACE("(%08Ix %p %04x %08Ix %08Ix);\n",
>       dwDevID, hDriv, wMsg, dwParam1, dwParam2);
>
> switch (wMsg)