Re: [PATCH 01/24] dlls/msacm32: enable compilation with long types

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Tue, Feb 15, 2022 at 07:28:35AM +0100, Eric Pouech wrote:
> Signed-off-by: Eric Pouech
>
> dlls/msacm32/Makefile.in    |    1 -
>  dlls/msacm32/driver.c       |   26 +++++++++++++-------------
>  dlls/msacm32/filter.c       |   12 ++++++------
>  dlls/msacm32/format.c       |   26 +++++++++++++-------------
>  dlls/msacm32/internal.c     |   14 +++++++-------
>  dlls/msacm32/msacm32_main.c |    4 ++--
>  dlls/msacm32/pcmconverter.c |   24 ++++++++++++------------
>  dlls/msacm32/stream.c       |   24 ++++++++++++------------
>  8 files changed, 65 insertions(+), 66 deletions(-)
>
> diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in
> index a6da7428749..be2136d78f7 100644
> --- a/dlls/msacm32/Makefile.in
> +++ b/dlls/msacm32/Makefile.in
> @@ -1,4 +1,3 @@
> -EXTRADEFS = -DWINE_NO_LONG_TYPES
>  MODULE    = msacm32.dll
>  IMPORTLIB = msacm32
>  IMPORTS   = winmm user32 advapi32
> diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c
> index 036461800b1..c01872d636a 100644
> --- a/dlls/msacm32/driver.c
> +++ b/dlls/msacm32/driver.c
> @@ -49,7 +49,7 @@ MMRESULT WINAPI acmDriverAddA(PHACMDRIVERID phadid, HINSTANCE hinstModule,
>      WCHAR * driverW = NULL;
>      LPARAM lParamW = lParam;
> - TRACE("(%p, %p, %08lx, %08x, %08x)\n",
> -
>
> TRACE("(%p, %p, %08Ix, %08lx, %08lx)\n",
>       phadid, hinstModule, lParam, dwPriority, fdwAdd);
>
> if (!phadid) {
>
> @@ -98,7 +98,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule,
>  {
>      PWINE_ACMLOCALDRIVER pLocalDrv = NULL;
> - TRACE("(%p, %p, %08lx, %08x, %08x)\n",
> -
>
> TRACE("(%p, %p, %08Ix, %08lx, %08lx)\n",
>       phadid, hinstModule, lParam, dwPriority, fdwAdd);
>
> if (!phadid) {
>
> @@ -165,7 +165,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule,
>          }
>          break;
>      default:
> -
>    ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd);
> -
>    ERR("invalid flag value 0x%08lx for fdwAdd\n", fdwAdd);
>    return MMSYSERR_INVALFLAG;
> }
>
> @@ -182,7 +182,7 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose)
>      PWINE_ACMDRIVERID	padid;
>      PWINE_ACMDRIVER*	tpad;
> - TRACE("(%p, %08x)\n", had, fdwClose);
> -
>
> TRACE("(%p, %08lx)\n", had, fdwClose);
>
> if (fdwClose) {
>     WARN("invalid flag\n");
>
> @@ -225,7 +225,7 @@ MMRESULT WINAPI acmDriverDetailsA(HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, D
>      MMRESULT mmr;
>      ACMDRIVERDETAILSW	addw;
> - TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails);
> -
>
> TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails);
>
> if (!padd) {
>     WARN("invalid parameter\n");
>
> @@ -276,7 +276,7 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D
>      HACMDRIVER acmDrvr;
>      MMRESULT mmr;
> - TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails);
> -
>
> TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails);
>
> if (!padd) {
>     WARN("invalid parameter\n");
>
> @@ -318,7 +318,7 @@ MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance,
>      PWINE_ACMDRIVERID	padid;
>      DWORD		fdwSupport;
> - TRACE("(%p, %08lx, %08x)\n", fnCallback, dwInstance, fdwEnum);
> -
>
> TRACE("(%p, %08Ix, %08lx)\n", fnCallback, dwInstance, fdwEnum);
>
> if (!fnCallback) {
>     WARN("invalid parameter\n");
>
> @@ -353,7 +353,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID
>  {
>      PWINE_ACMOBJ pao;
> - TRACE("(%p, %p, %08x)\n", hao, phadid, fdwDriverID);
> -
>
> TRACE("(%p, %p, %08lx)\n", hao, phadid, fdwDriverID);
>
> if (fdwDriverID) {
>     WARN("invalid flag\n");
>
> @@ -391,7 +391,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID
>   */
>  LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2)
>  {
> - TRACE("(%p, %04x, %08lx, %08lx\n", had, uMsg, lParam1, lParam2);
> -
>
> TRACE("(%p, %04x, %08Ix, %08Ix\n", had, uMsg, lParam1, lParam2);
>
> if ((uMsg >= ACMDM_USER && uMsg < ACMDM_RESERVED_LOW) ||
> uMsg == ACMDM_DRIVER_ABOUT ||
>
> @@ -492,7 +492,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
>      PWINE_ACMDRIVER	pad = NULL;
>      MMRESULT		ret;
> - TRACE("(%p, %p, %08u)\n", phad, hadid, fdwOpen);
> -
>
> TRACE("(%p, %p, %08lu)\n", phad, hadid, fdwOpen);
>
> if (!phad) {
>     WARN("invalid parameter\n");
>
> @@ -605,7 +605,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe
>  MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority)
>  {
> - TRACE("(%p, %08x, %08x)\n", hadid, dwPriority, fdwPriority);
> -
>
> TRACE("(%p, %08lx, %08lx)\n", hadid, dwPriority, fdwPriority);
>
> /* Check for unknown flags */
> if (fdwPriority &
>
> @@ -679,7 +679,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd
>                      return MMSYSERR_NOTSUPPORTED;
>                  }
>                  if (dwPriority != 1 && dwPriority != (DWORD)-1) {
> -
>                FIXME("unexpected priority %d, using sign only\n", dwPriority);
> -
>                FIXME("unexpected priority %ld, using sign only\n", dwPriority);
>                if ((signed)dwPriority < 0) dwPriority = (DWORD)-1;
>                if (dwPriority > 0) dwPriority = 1;
>            }
>
> @@ -746,7 +746,7 @@ MMRESULT WINAPI acmDriverRemove(HACMDRIVERID hadid, DWORD fdwRemove)
>      PWINE_ACMDRIVERID padid;
>      PWINE_ACMNOTIFYWND panwnd;
> - TRACE("(%p, %08x)\n", hadid, fdwRemove);
> -
>
> TRACE("(%p, %08lx)\n", hadid, fdwRemove);
>
> padid = MSACM_GetDriverID(hadid);
> panwnd = MSACM_GetNotifyWnd(hadid);
>
> diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c
> index 8d5abced9d9..bacb9c0abcf 100644
> --- a/dlls/msacm32/filter.c
> +++ b/dlls/msacm32/filter.c
> @@ -91,7 +91,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
>      MMRESULT			mmr;
>      ACMFILTERTAGDETAILSA	aftd;
> - TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails);
> -
>
> TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
>
> memset(&aftd, 0, sizeof(aftd));
> aftd.cbStruct = sizeof(aftd);
>
> @@ -127,7 +127,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
>    mmr = MSACM_Message(had, ACMDM_FILTER_DETAILS, (LPARAM)pafd, fdwDetails);
>    break;
>      default:
> - WARN("Unknown fdwDetails %08x\n", fdwDetails);
> - WARN("Unknown fdwDetails %08lx\n", fdwDetails);
> mmr = MMSYSERR_INVALFLAG;
> break;
> }
>
> @@ -228,7 +228,7 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd,
>      PWINE_ACMDRIVERID		padid;
>      BOOL			ret;
> - TRACE("(%p, %p, %p, %ld, %d)\n",
> -
>
> TRACE("(%p, %p, %p, %Id, %ld)\n",
> had, pafd, fnCallback, dwInstance, fdwEnum);
>
> if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
>
> @@ -294,7 +294,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd
>      PWINE_ACMDRIVERID	padid;
>      MMRESULT		mmr;
> - TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails);
> -
>
> TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails);
>
> if (fdwDetails & ~(ACM_FILTERTAGDETAILSF_FILTERTAG|ACM_FILTERTAGDETAILSF_INDEX|
>       ACM_FILTERTAGDETAILSF_LARGESTSIZE))
>
> @@ -355,7 +355,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd
>    break;
>  default:
> - WARN("Unsupported fdwDetails=%08x\n", fdwDetails);
> - WARN("Unsupported fdwDetails=%08lx\n", fdwDetails);
> mmr = MMSYSERR_ERROR;
> }
>
> @@ -427,7 +427,7 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd,
>      PWINE_ACMDRIVERID		padid;
>      unsigned int			i;
> - TRACE("(%p, %p, %p, %ld, %d)\n",
> -
>
> TRACE("(%p, %p, %p, %Id, %ld)\n",
> had, paftd, fnCallback, dwInstance, fdwEnum);
>
> if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM;
>
> diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c
> index 536fa42e767..6aab538fffb 100644
> --- a/dlls/msacm32/format.c
> +++ b/dlls/msacm32/format.c
> @@ -217,7 +217,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
>  {
>      ACMFORMATCHOOSEW *afc = (ACMFORMATCHOOSEW *)GetPropW(hWnd, L"acmprop");
> - TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam);
> -
>
> TRACE("hwnd=%p msg=%i 0x%08Ix 0x%08Ix\n", hWnd, msg, wParam, lParam);
>
> switch (msg) {
> case WM_INITDIALOG:
>
> @@ -230,7 +230,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
>                                 ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT|
>                                 ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE|
>                                 ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0)
> -
>        FIXME("Unsupported style %08x\n", afc->fdwStyle);
> -
>        FIXME("Unsupported style %08lx\n", afc->fdwStyle);
> if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP))
>      ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE);
>  return TRUE;
>
> @@ -249,7 +249,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
>    	MSACM_FillFormat(hWnd, afc);
>    	break;
>        default:
> -
> TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08lx\n",
> -
> TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08Ix\n",
>  HIWORD(wParam), lParam);
> break;
>   }
>
> @@ -261,7 +261,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
>        break;
>
> default:
> -
>    TRACE("Dropped dlgCmd: ctl=%d ntf=0x%04x 0x%08lx\n",
> -
>    TRACE("Dropped dlgCmd: ctl=%d ntf=0x%04x 0x%08Ix\n",
> LOWORD(wParam), HIWORD(wParam), lParam);
>  break;
> }
>
> @@ -281,7 +281,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg,
>    break;
>  #endif
>      default:
> - TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08lx 0x%08lx\n",
> - TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08Ix 0x%08Ix\n",
>     hWnd,  msg, wParam, lParam );
> break;
> }
>
> @@ -430,7 +430,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD
>      MMRESULT			mmr;
>      ACMFORMATTAGDETAILSW	aftd = {0};
> - TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails);
> -
>
> TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
>
> if (!pafd)
>     return MMSYSERR_INVALPARAM;
>
> @@ -486,7 +486,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD
>    mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails);
>    break;
>      default:
> - WARN("Unknown fdwDetails %08x\n", fdwDetails);
> - WARN("Unknown fdwDetails %08lx\n", fdwDetails);
> mmr = MMSYSERR_INVALFLAG;
> break;
> }
>
> @@ -673,7 +673,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
>      DWORD			cbwfxMax;
>      MMRESULT			mmr;
> - TRACE("(%p, %p, %p, %ld, %d)\n",
> -
>
> TRACE("(%p, %p, %p, %Id, %ld)\n",
> had, pafd, fnCallback, dwInstance, fdwEnum);
>
> if (!pafd)
>
> @@ -705,7 +705,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd,
>    return MMSYSERR_INVALPARAM;
>  if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT))
> - FIXME("Unsupported fdwEnum values %08x\n", fdwEnum);
> -
>
> FIXME("Unsupported fdwEnum values %08lx\n", fdwEnum);
>
> mmr = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax);
> if (mmr != MMSYSERR_NOERROR)
>
> @@ -745,7 +745,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc,
>      ACMDRVFORMATSUGGEST	adfg;
>      MMRESULT		mmr;
> - TRACE("(%p, %p, %p, %d, %d)\n",
> -
>
> TRACE("(%p, %p, %p, %ld, %ld)\n",
> had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest);
>
> if (!pwfxSrc || !pwfxDst)
>
> @@ -850,7 +850,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd
>      PWINE_ACMDRIVERID	padid;
>      MMRESULT		mmr = ACMERR_NOTPOSSIBLE;
> - TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails);
> -
>
> TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails);
>
> if (fdwDetails & ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_INDEX|
>       ACM_FORMATTAGDETAILSF_LARGESTSIZE))
>
> @@ -917,7 +917,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd
>    break;
>  default:
> - WARN("Unsupported fdwDetails=%08x\n", fdwDetails);
> - WARN("Unsupported fdwDetails=%08lx\n", fdwDetails);
> mmr = MMSYSERR_ERROR;
> }
>
> @@ -999,7 +999,7 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd,
>      unsigned int        i;
>      BOOL                bPcmDone = FALSE;
> - TRACE("(%p, %p, %p, %ld, %d)\n",
> -
>
> TRACE("(%p, %p, %p, %Id, %ld)\n",
>       had, paftd, fnCallback, dwInstance, fdwEnum);
>
> if (!paftd)
>
> diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c
> index e83f1f5c215..7c2d3b5bf9e 100644
> --- a/dlls/msacm32/internal.c
> +++ b/dlls/msacm32/internal.c
> @@ -74,12 +74,12 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry)
>      if (0 == wcsnicmp(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) {
>          lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey);
>          if (lRet != ERROR_SUCCESS) {
> -
>        WARN("unable to open registry key - 0x%08x\n", lRet);
> -
>        WARN("unable to open registry key - 0x%08lx\n", lRet);
>    } else {
>        bufLen = sizeof(buf);
>        lRet = RegQueryValueExW(hKey, pszRegEntry, NULL, NULL, (LPBYTE)buf, &bufLen);
>        if (lRet != ERROR_SUCCESS) {
> -
>            WARN("unable to query requested subkey %s - 0x%08x\n", debugstr_w(pszRegEntry), lRet);
> -
>            WARN("unable to query requested subkey %s - 0x%08lx\n", debugstr_w(pszRegEntry), lRet);
>        } else {
>            MSACM_RegisterDriver(pszRegEntry, buf, 0);
>        }
>
> @@ -403,7 +403,7 @@ PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNot
>  {
>      PWINE_ACMNOTIFYWND	panwnd;
> - TRACE("(%p,0x%08x)\n", hNotifyWnd, dwNotifyMsg);
> -
>
> TRACE("(%p,0x%08lx)\n", hNotifyWnd, dwNotifyMsg);
>
> panwnd = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMNOTIFYWND));
> panwnd->obj.dwType = WINE_ACMOBJ_NOTIFYWND;
>
> @@ -654,13 +654,13 @@ void MSACM_WriteCurrentPriorities(void)
>      /* Delete ACM priority key and create it anew */
>      lError = RegDeleteKeyW(HKEY_CURRENT_USER, basePriorityKey);
>      if (lError != ERROR_SUCCESS && lError != ERROR_FILE_NOT_FOUND) {
> -
>    ERR("unable to remove current key %s (0x%08x) - priority changes won't persist past application end.\n",
> -
>    ERR("unable to remove current key %s (0x%08lx) - priority changes won't persist past application end.\n",
>        debugstr_w(basePriorityKey), lError);
>    return;
> }
>    lError = RegCreateKeyW(HKEY_CURRENT_USER, basePriorityKey, &hPriorityKey);
>    if (lError != ERROR_SUCCESS) {
> -
>    ERR("unable to create key %s (0x%08x) - priority changes won't persist past application end.\n",
> -
>    ERR("unable to create key %s (0x%08lx) - priority changes won't persist past application end.\n",
>        debugstr_w(basePriorityKey), lError);
>    return;
> }
>
> @@ -680,7 +680,7 @@ void MSACM_WriteCurrentPriorities(void)
>      lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR));
>      if (lError != ERROR_SUCCESS) {
> -
>        ERR("unable to write value for %s under key %s (0x%08x)\n",
> -
>        ERR("unable to write value for %s under key %s (0x%08lx)\n",
>            debugstr_w(padid->pszDriverAlias), debugstr_w(basePriorityKey), lError);
>    }
> }
>
> @@ -694,7 +694,7 @@ void MSACM_WriteCurrentPriorities(void)
>  lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR));
>  if (lError != ERROR_SUCCESS) {
> -
>    ERR("unable to write value for Internal PCM Converter under key %s (0x%08x)\n",
> -
>    ERR("unable to write value for Internal PCM Converter under key %s (0x%08lx)\n",
>        debugstr_w(basePriorityKey), lError);
> }
>    RegCloseKey(hPriorityKey);
>
> diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c
> index efe58af309a..ad33c88d85a 100644
> --- a/dlls/msacm32/msacm32_main.c
> +++ b/dlls/msacm32/msacm32_main.c
> @@ -44,7 +44,7 @@ HINSTANCE	MSACM_hInstance32 = 0;
>   */
>  BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
>  {
> - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, lpvReserved);
> -
>
> TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, lpvReserved);
>
> switch (fdwReason) {
> case DLL_PROCESS_ATTACH:
>
> @@ -87,7 +87,7 @@ DWORD WINAPI acmGetVersion(void)
>      case VER_PLATFORM_WIN32s:
>    return 0x02010000; /* 2.1 */
>      default:
> -
>    FIXME("%x not supported\n", version.dwPlatformId);
> -
>    FIXME("%lx not supported\n", version.dwPlatformId);
>    /* fall through */
> case VER_PLATFORM_WIN32_WINDOWS:
>  return 0x04030000; /* 4.3.0 */
>
> diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c
> index d528a6d35fb..0b9724ba5e1 100644
> --- a/dlls/msacm32/pcmconverter.c
> +++ b/dlls/msacm32/pcmconverter.c
> @@ -65,7 +65,7 @@ static	DWORD	PCM_drvOpen(LPCSTR str, PACMDRVOPENDESCW adod)
>   */
>  static	DWORD	PCM_drvClose(DWORD dwDevID)
>  {
> - TRACE("(%d)\n", dwDevID);
> -
>
> TRACE("(%ld)\n", dwDevID);
>
> return 1;
>
> }
> @@ -1001,7 +1001,7 @@ static	LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add)
>   */
>  static	LRESULT	PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
>  {
> - TRACE("(%p, %08x)\n", aftd, dwQuery);
> -
>
> TRACE("(%p, %08lx)\n", aftd, dwQuery);
>
> switch (dwQuery) {
> case ACM_FORMATTAGDETAILSF_INDEX:
>
> @@ -1024,7 +1024,7 @@ static	LRESULT	PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
>          }
>    break;
>      default:
> - WARN("Unsupported query %08x\n", dwQuery);
> - WARN("Unsupported query %08lx\n", dwQuery);
> return MMSYSERR_NOTSUPPORTED;
> }
>
> @@ -1044,7 +1044,7 @@ static	LRESULT	PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
>   */
>  static	LRESULT	PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
>  {
> - TRACE("(%p, %08x)\n", afd, dwQuery);
> -
>
> TRACE("(%p, %08lx)\n", afd, dwQuery);
>
> switch (dwQuery) {
> case ACM_FORMATDETAILSF_FORMAT:
>
> @@ -1068,7 +1068,7 @@ static	LRESULT	PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
>        afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign;
>    break;
>      default:
> - WARN("Unsupported query %08x\n", dwQuery);
> - WARN("Unsupported query %08lx\n", dwQuery);
> return MMSYSERR_NOTSUPPORTED;
> }
>
> @@ -1260,7 +1260,7 @@ static	LRESULT PCM_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss
>    			       adsi->pwfxSrc->nAvgBytesPerSec) & dstMask;
>    break;
>      default:
> - WARN("Unsupported query %08x\n", adss->fdwSize);
> - WARN("Unsupported query %08lx\n", adss->fdwSize);
> return MMSYSERR_NOTSUPPORTED;
> }
> return MMSYSERR_NOERROR;
>
> @@ -1278,12 +1278,12 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
>  TRACE("(%p, %p)\n", adsi, adsh);
>
> - TRACE("nsrc=%d,adsh->cbSrcLength=%d\n", nsrc, adsh->cbSrcLength);
> - TRACE("ndst=%d,adsh->cbDstLength=%d\n", ndst, adsh->cbDstLength);
> - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
> - TRACE("nsrc=%ld,adsh->cbSrcLength=%ld\n", nsrc, adsh->cbSrcLength);
> - TRACE("ndst=%ld,adsh->cbDstLength=%ld\n", ndst, adsh->cbDstLength);
> - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
>       adsi->pwfxSrc->wFormatTag, adsi->pwfxSrc->nChannels, adsi->pwfxSrc->nSamplesPerSec, adsi->pwfxSrc->nAvgBytesPerSec,
>       adsi->pwfxSrc->nBlockAlign, adsi->pwfxSrc->wBitsPerSample, adsi->pwfxSrc->cbSize);
> - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
> - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
>       adsi->pwfxDst->wFormatTag, adsi->pwfxDst->nChannels, adsi->pwfxDst->nSamplesPerSec, adsi->pwfxDst->nAvgBytesPerSec,
>       adsi->pwfxDst->nBlockAlign, adsi->pwfxDst->wBitsPerSample, adsi->pwfxDst->cbSize);
>
> @@ -1291,7 +1291,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
>    ~(ACM_STREAMCONVERTF_BLOCKALIGN|
>      ACM_STREAMCONVERTF_END|
>      ACM_STREAMCONVERTF_START)) {
> - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert);
> - FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert);
> }
> /* ACM_STREAMCONVERTF_BLOCKALIGN
> - currently all conversions are block aligned, so do nothing for this flag
>
> @@ -1325,7 +1325,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER
>  LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
>    			       LPARAM dwParam1, LPARAM dwParam2)
>  {
> - TRACE("(%08lx %p %u %08lx %08lx);\n",
> -
>
> TRACE("(%08Ix %p %u %08Ix %08Ix);\n",
>       dwDevID, hDriv, wMsg, dwParam1, dwParam2);
>
> switch (wMsg) {
>
> diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c
> index e06503abfe4..1fcd2e39066 100644
> --- a/dlls/msacm32/stream.c
> +++ b/dlls/msacm32/stream.c
> @@ -67,7 +67,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose)
>      PWINE_ACMSTREAM	was;
>      MMRESULT		ret;
> - TRACE("(%p, %d)\n", has, fdwClose);
> -
>
> TRACE("(%p, %ld)\n", has, fdwClose);
>
> if ((was = ACM_GetStream(has)) == NULL) {
>     WARN("invalid handle\n");
>
> @@ -93,7 +93,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
>      MMRESULT		ret = MMSYSERR_NOERROR;
>      PACMDRVSTREAMHEADER	padsh;
> - TRACE("(%p, %p, %d)\n", has, pash, fdwConvert);
> -
>
> TRACE("(%p, %p, %ld)\n", has, pash, fdwConvert);
>
> if ((was = ACM_GetStream(has)) == NULL) {
>     WARN("invalid handle\n");
>
> @@ -138,7 +138,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash,
>  MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1,
>    			 LPARAM lParam2)
>  {
> - FIXME("(%p, %u, %ld, %ld): stub\n", has, uMsg, lParam1, lParam2);
> - FIXME("(%p, %u, %Id, %Id): stub\n", has, uMsg, lParam1, lParam2);
> SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
> return MMSYSERR_ERROR;
>
> }
> @@ -158,7 +158,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had,
>      int			wfxDstSize;
>      WAVEFORMATEX	wfxSrc, wfxDst;
> - TRACE("(%p, %p, %p, %p, %p, %ld, %ld, %d)\n",
> -
>
> TRACE("(%p, %p, %p, %p, %p, %Id, %Id, %ld)\n",
> phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen);
>
> /* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than
>
> @@ -177,11 +177,11 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had,
>          pwfxDst = &wfxDst;
>      }
> - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
> - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
> pwfxSrc->wFormatTag, pwfxSrc->nChannels, pwfxSrc->nSamplesPerSec, pwfxSrc->nAvgBytesPerSec,
> pwfxSrc->nBlockAlign, pwfxSrc->wBitsPerSample, pwfxSrc->cbSize);
> - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
> - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
> pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec,
> pwfxDst->nBlockAlign, pwfxDst->wBitsPerSample, pwfxDst->cbSize);
>
> @@ -303,7 +303,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
>      MMRESULT		ret = MMSYSERR_NOERROR;
>      PACMDRVSTREAMHEADER	padsh;
> - TRACE("(%p, %p, %d)\n", has, pash, fdwPrepare);
> -
>
> TRACE("(%p, %p, %ld)\n", has, pash, fdwPrepare);
>
> if ((was = ACM_GetStream(has)) == NULL) {
>     WARN("invalid handle\n");
>
> @@ -320,7 +320,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
>      if ((was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM ||
>           was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) &&
>          pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) {
> -
>    WARN("source smaller than block align (%d < %d)\n",
> -
>    WARN("source smaller than block align (%ld < %d)\n",
>         pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign);
>    return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM;
> }
>
> @@ -373,7 +373,7 @@ MMRESULT WINAPI acmStreamReset(HACMSTREAM has, DWORD fdwReset)
>      PWINE_ACMSTREAM	was;
>      MMRESULT		ret = MMSYSERR_NOERROR;
> - TRACE("(%p, %d)\n", has, fdwReset);
> -
>
> TRACE("(%p, %ld)\n", has, fdwReset);
>
> if (fdwReset) {
>     WARN("invalid flag\n");
>
> @@ -398,7 +398,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput,
>      ACMDRVSTREAMSIZE	adss;
>      MMRESULT		ret;
> - TRACE("(%p, %d, %p, %d)\n", has, cbInput, pdwOutputBytes, fdwSize);
> -
>
> TRACE("(%p, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize);
>
> if ((was = ACM_GetStream(has)) == NULL) {
>     WARN("invalid handle\n");
>
> @@ -439,7 +439,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput,
>        break;
>    }
>      }
> - TRACE("=> (%d) [%u]\n", ret, *pdwOutputBytes);
> - TRACE("=> (%d) [%lu]\n", ret, *pdwOutputBytes);
> return ret;
>
> }
>
> @@ -453,7 +453,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash,
>      MMRESULT		ret = MMSYSERR_NOERROR;
>      PACMDRVSTREAMHEADER	padsh;
> - TRACE("(%p, %p, %d)\n", has, pash, fdwUnprepare);
> -
>
> TRACE("(%p, %p, %ld)\n", has, pash, fdwUnprepare);
>
> if ((was = ACM_GetStream(has)) == NULL) {
>     WARN("invalid handle\n");