msacm32: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Thu Oct 12 14:35:06 CDT 2006
---
dlls/msacm32/Makefile.in | 1 -
dlls/msacm32/driver.c | 22 +++++++++---------
dlls/msacm32/filter.c | 12 +++++-----
dlls/msacm32/format.c | 18 +++++++-------
dlls/msacm32/internal.c | 14 ++++++-----
dlls/msacm32/msacm32_main.c | 4 ++-
dlls/msacm32/msacm_main.c | 48 +++++++++++++++++++-------------------
dlls/msacm32/pcmconverter.c | 54 ++++++++++++++++++++++---------------------
dlls/msacm32/stream.c | 20 ++++++++--------
9 files changed, 96 insertions(+), 97 deletions(-)
diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in
index 2e5727f..efe36a7 100644
--- a/dlls/msacm32/Makefile.in
+++ b/dlls/msacm32/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = msacm32.dll
IMPORTLIB = libmsacm32.$(IMPLIBEXT)
IMPORTS = winmm user32 advapi32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
driver.c \
diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c
index 37dc929..f995808 100644
--- a/dlls/msacm32/driver.c
+++ b/dlls/msacm32/driver.c
@@ -54,7 +54,7 @@ MMRESULT WINAPI acmDriverAddA(PHACMDRIVE
WCHAR * driverW = NULL;
LPARAM lParamW = lParam;
- TRACE("(%p, %p, %08lx, %08lx, %08lx)\n",
+ TRACE("(%p, %p, %08lx, %08x, %08x)\n",
phadid, hinstModule, lParam, dwPriority, fdwAdd);
if (!phadid) {
@@ -103,7 +103,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVE
{
PWINE_ACMLOCALDRIVER pLocalDrv = NULL;
- TRACE("(%p, %p, %08lx, %08lx, %08lx)\n",
+ TRACE("(%p, %p, %08lx, %08x, %08x)\n",
phadid, hinstModule, lParam, dwPriority, fdwAdd);
if (!phadid) {
@@ -187,7 +187,7 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVE
PWINE_ACMDRIVERID padid;
PWINE_ACMDRIVER* tpad;
- TRACE("(%p, %08lx)\n", had, fdwClose);
+ TRACE("(%p, %08x)\n", had, fdwClose);
if (fdwClose) {
WARN("invalid flag\n");
@@ -229,7 +229,7 @@ MMRESULT WINAPI acmDriverDetailsA(HACMDR
MMRESULT mmr;
ACMDRIVERDETAILSW addw;
- TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails);
+ TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails);
if (!padd) {
WARN("invalid parameter\n");
@@ -280,7 +280,7 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDR
HACMDRIVER acmDrvr;
MMRESULT mmr;
- TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails);
+ TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails);
if (!padd) {
WARN("invalid parameter\n");
@@ -319,7 +319,7 @@ MMRESULT WINAPI acmDriverEnum(ACMDRIVERE
PWINE_ACMDRIVERID padid;
DWORD fdwSupport;
- TRACE("(%p, %08lx, %08lx)\n", fnCallback, dwInstance, fdwEnum);
+ TRACE("(%p, %08x, %08x)\n", fnCallback, dwInstance, fdwEnum);
if (!fnCallback) {
WARN("invalid parameter\n");
@@ -354,7 +354,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao,
{
PWINE_ACMOBJ pao;
- TRACE("(%p, %p, %08lx)\n", hao, phadid, fdwDriverID);
+ TRACE("(%p, %p, %08x)\n", hao, phadid, fdwDriverID);
if (fdwDriverID) {
WARN("invalid flag\n");
@@ -490,7 +490,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVE
PWINE_ACMDRIVER pad = NULL;
MMRESULT ret;
- TRACE("(%p, %p, %08lu)\n", phad, hadid, fdwOpen);
+ TRACE("(%p, %p, %08u)\n", phad, hadid, fdwOpen);
if (!phad) {
WARN("invalid parameter\n");
@@ -598,7 +598,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVE
MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority)
{
- TRACE("(%p, %08lx, %08lx)\n", hadid, dwPriority, fdwPriority);
+ TRACE("(%p, %08x, %08x)\n", hadid, dwPriority, fdwPriority);
/* Check for unknown flags */
if (fdwPriority &
@@ -672,7 +672,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDR
return MMSYSERR_NOTSUPPORTED;
}
if (dwPriority != 1 && dwPriority != (DWORD)-1) {
- FIXME("unexpected priority %ld, using sign only\n", dwPriority);
+ FIXME("unexpected priority %d, using sign only\n", dwPriority);
if ((signed)dwPriority < 0) dwPriority = (DWORD)-1;
if (dwPriority > 0) dwPriority = 1;
}
@@ -739,7 +739,7 @@ MMRESULT WINAPI acmDriverRemove(HACMDRIV
PWINE_ACMDRIVERID padid;
PWINE_ACMNOTIFYWND panwnd;
- TRACE("(%p, %08lx)\n", hadid, fdwRemove);
+ TRACE("(%p, %08x)\n", hadid, fdwRemove);
padid = MSACM_GetDriverID(hadid);
panwnd = MSACM_GetNotifyWnd(hadid);
diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c
index b060a0b..89ffc35 100644
--- a/dlls/msacm32/filter.c
+++ b/dlls/msacm32/filter.c
@@ -91,7 +91,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDR
MMRESULT mmr;
ACMFILTERTAGDETAILSA aftd;
- TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
+ TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails);
memset(&aftd, 0, sizeof(aftd));
aftd.cbStruct = sizeof(aftd);
@@ -127,7 +127,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDR
mmr = MSACM_Message(had, ACMDM_FILTER_DETAILS, (LPARAM)pafd, fdwDetails);
break;
default:
- WARN("Unknown fdwDetails %08lx\n", fdwDetails);
+ WARN("Unknown fdwDetails %08x\n", fdwDetails);
mmr = MMSYSERR_INVALFLAG;
break;
}
@@ -228,7 +228,7 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVE
PWINE_ACMDRIVERID padid;
BOOL ret;
- TRACE("(%p, %p, %p, %ld, %ld)\n",
+ TRACE("(%p, %p, %p, %d, %d)\n",
had, pafd, fnCallback, dwInstance, fdwEnum);
if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM;
@@ -294,7 +294,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HAC
PWINE_ACMDRIVERID padid;
MMRESULT mmr;
- TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails);
+ TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails);
if (fdwDetails & ~(ACM_FILTERTAGDETAILSF_FILTERTAG|ACM_FILTERTAGDETAILSF_INDEX|
ACM_FILTERTAGDETAILSF_LARGESTSIZE))
@@ -355,7 +355,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HAC
break;
default:
- WARN("Unsupported fdwDetails=%08lx\n", fdwDetails);
+ WARN("Unsupported fdwDetails=%08x\n", fdwDetails);
mmr = MMSYSERR_ERROR;
}
@@ -427,7 +427,7 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDR
PWINE_ACMDRIVERID padid;
unsigned int i;
- TRACE("(%p, %p, %p, %ld, %ld)\n",
+ TRACE("(%p, %p, %p, %d, %d)\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 caa670d..22629d6 100644
--- a/dlls/msacm32/format.c
+++ b/dlls/msacm32/format.c
@@ -207,7 +207,7 @@ static INT_PTR CALLBACK FormatChooseDlgP
MSACM_FillFormat(hWnd);
if ((afc->fdwStyle & ~(ACMFORMATCHOOSE_STYLEF_CONTEXTHELP|
ACMFORMATCHOOSE_STYLEF_SHOWHELP)) != 0)
- FIXME("Unsupported style %08lx\n", ((PACMFORMATCHOOSEA)lParam)->fdwStyle);
+ FIXME("Unsupported style %08x\n", ((PACMFORMATCHOOSEA)lParam)->fdwStyle);
if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP))
ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE);
return TRUE;
@@ -320,7 +320,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDR
static const WCHAR fmt2[] = {';',' ','%','d',' ','b','i','t','s',0};
ACMFORMATTAGDETAILSA aftd;
- TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails);
+ TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails);
memset(&aftd, 0, sizeof(aftd));
aftd.cbStruct = sizeof(aftd);
@@ -355,7 +355,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDR
mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails);
break;
default:
- WARN("Unknown fdwDetails %08lx\n", fdwDetails);
+ WARN("Unknown fdwDetails %08x\n", fdwDetails);
mmr = MMSYSERR_INVALFLAG;
break;
}
@@ -491,7 +491,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVE
WAVEFORMATEX wfxRef;
BOOL ret;
- TRACE("(%p, %p, %p, %ld, %ld)\n",
+ TRACE("(%p, %p, %p, %d, %d)\n",
had, pafd, fnCallback, dwInstance, fdwEnum);
if (!pafd)
@@ -515,7 +515,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVE
if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_SUGGEST|
ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT))
- FIXME("Unsupported fdwEnum values %08lx\n", fdwEnum);
+ FIXME("Unsupported fdwEnum values %08x\n", fdwEnum);
if (had) {
HACMDRIVERID hadid;
@@ -548,7 +548,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRI
ACMDRVFORMATSUGGEST adfg;
MMRESULT mmr;
- TRACE("(%p, %p, %p, %ld, %ld)\n",
+ TRACE("(%p, %p, %p, %d, %d)\n",
had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest);
if (fdwSuggest & ~(ACM_FORMATSUGGESTF_NCHANNELS|ACM_FORMATSUGGESTF_NSAMPLESPERSEC|
@@ -624,7 +624,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HAC
PWINE_ACMDRIVERID padid;
MMRESULT mmr = ACMERR_NOTPOSSIBLE;
- TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails);
+ TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails);
if (fdwDetails & ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_INDEX|
ACM_FORMATTAGDETAILSF_LARGESTSIZE))
@@ -691,7 +691,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HAC
break;
default:
- WARN("Unsupported fdwDetails=%08lx\n", fdwDetails);
+ WARN("Unsupported fdwDetails=%08x\n", fdwDetails);
mmr = MMSYSERR_ERROR;
}
@@ -773,7 +773,7 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDR
unsigned int i;
BOOL bPcmDone = FALSE;
- TRACE("(%p, %p, %p, %ld, %ld)\n",
+ TRACE("(%p, %p, %p, %d, %d)\n",
had, paftd, fnCallback, dwInstance, fdwEnum);
if (!paftd)
diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c
index 0d05989..aa36053 100644
--- a/dlls/msacm32/internal.c
+++ b/dlls/msacm32/internal.c
@@ -75,12 +75,12 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFr
if (0 == strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(WCHAR))) {
lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey);
if (lRet != ERROR_SUCCESS) {
- WARN("unable to open registry key - 0x%08lx\n", lRet);
+ WARN("unable to open registry key - 0x%08x\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%08lx\n", debugstr_w(pszRegEntry), lRet);
+ WARN("unable to query requested subkey %s - 0x%08x\n", debugstr_w(pszRegEntry), lRet);
} else {
MSACM_RegisterDriver(pszRegEntry, buf, 0);
}
@@ -395,7 +395,7 @@ PWINE_ACMNOTIFYWND MSACM_RegisterNotific
{
PWINE_ACMNOTIFYWND panwnd;
- TRACE("(%p,0x%08lx)\n", hNotifyWnd, dwNotifyMsg);
+ TRACE("(%p,0x%08x)\n", hNotifyWnd, dwNotifyMsg);
panwnd = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMNOTIFYWND));
panwnd->obj.dwType = WINE_ACMOBJ_NOTIFYWND;
@@ -665,13 +665,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%08lx) - priority changes won't persist past application end.\n",
+ ERR("unable to remove current key %s (0x%08x) - 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%08lx) - priority changes won't persist past application end.\n",
+ ERR("unable to create key %s (0x%08x) - priority changes won't persist past application end.\n",
debugstr_w(basePriorityKey), lError);
return;
}
@@ -691,7 +691,7 @@ void MSACM_WriteCurrentPriorities(void)
lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (strlenW(szBuffer) + 1) * sizeof(WCHAR));
if (lError != ERROR_SUCCESS) {
- ERR("unable to write value for %s under key %s (0x%08lx)\n",
+ ERR("unable to write value for %s under key %s (0x%08x)\n",
debugstr_w(padid->pszDriverAlias), debugstr_w(basePriorityKey), lError);
}
}
@@ -705,7 +705,7 @@ void MSACM_WriteCurrentPriorities(void)
lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (strlenW(szBuffer) + 1) * sizeof(WCHAR));
if (lError != ERROR_SUCCESS) {
- ERR("unable to write value for %s under key %s (0x%08lx)\n",
+ ERR("unable to write value for %s under key %s (0x%08x)\n",
debugstr_w(converterAlias), debugstr_w(basePriorityKey), lError);
}
RegCloseKey(hPriorityKey);
diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c
index 3666f28..cc08b85 100644
--- a/dlls/msacm32/msacm32_main.c
+++ b/dlls/msacm32/msacm32_main.c
@@ -45,7 +45,7 @@ HINSTANCE MSACM_hInstance32 = 0;
*/
BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
- TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, lpvReserved);
+ TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, lpvReserved);
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
@@ -87,7 +87,7 @@ DWORD WINAPI acmGetVersion(void)
case VER_PLATFORM_WIN32_NT:
return 0x04000565; /* 4.0.1381 */
default:
- FIXME("%lx not supported\n", version.dwPlatformId);
+ FIXME("%x not supported\n", version.dwPlatformId);
case VER_PLATFORM_WIN32_WINDOWS:
return 0x04030000; /* 4.3.0 */
}
diff --git a/dlls/msacm32/msacm_main.c b/dlls/msacm32/msacm_main.c
index ff6827f..55c7a63 100644
--- a/dlls/msacm32/msacm_main.c
+++ b/dlls/msacm32/msacm_main.c
@@ -73,7 +73,7 @@ MMRESULT16 WINAPI acmMetrics16(
MMRESULT16 WINAPI acmDriverEnum16(
ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{
- FIXME("(%p, %ld, %ld): stub\n",
+ FIXME("(%p, %d, %d): stub\n",
fnCallback, dwInstance, fdwEnum
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -87,7 +87,7 @@ MMRESULT16 WINAPI acmDriverEnum16(
MMRESULT16 WINAPI acmDriverDetails16(
HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails)
{
- FIXME("(0x%04x, %p, %ld): stub\n", hadid, padd, fdwDetails);
+ FIXME("(0x%04x, %p, %d): stub\n", hadid, padd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -99,7 +99,7 @@ MMRESULT16 WINAPI acmDriverAdd16(
LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule,
LPARAM lParam, DWORD dwPriority, DWORD fdwAdd)
{
- FIXME("(%p, 0x%04x, %ld, %ld, %ld): stub\n",
+ FIXME("(%p, 0x%04x, %ld, %d, %d): stub\n",
phadid, hinstModule, lParam, dwPriority, fdwAdd
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -112,7 +112,7 @@ MMRESULT16 WINAPI acmDriverAdd16(
MMRESULT16 WINAPI acmDriverRemove16(
HACMDRIVERID16 hadid, DWORD fdwRemove)
{
- FIXME("(0x%04x, %ld): stub\n", hadid, fdwRemove);
+ FIXME("(0x%04x, %d): stub\n", hadid, fdwRemove);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -123,7 +123,7 @@ MMRESULT16 WINAPI acmDriverRemove16(
MMRESULT16 WINAPI acmDriverOpen16(
LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen)
{
- FIXME("(%p, 0x%04x, %ld): stub\n", phad, hadid, fdwOpen);
+ FIXME("(%p, 0x%04x, %d): stub\n", phad, hadid, fdwOpen);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -134,7 +134,7 @@ MMRESULT16 WINAPI acmDriverOpen16(
MMRESULT16 WINAPI acmDriverClose16(
HACMDRIVER16 had, DWORD fdwClose)
{
- FIXME("(0x%04x, %ld): stub\n", had, fdwClose);
+ FIXME("(0x%04x, %d): stub\n", had, fdwClose);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -158,7 +158,7 @@ LRESULT WINAPI acmDriverMessage16(
MMRESULT16 WINAPI acmDriverID16(
HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID)
{
- FIXME("(0x%04x, %p, %ld): stub\n", hao, phadid, fdwDriverID);
+ FIXME("(0x%04x, %p, %d): stub\n", hao, phadid, fdwDriverID);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -169,7 +169,7 @@ MMRESULT16 WINAPI acmDriverID16(
MMRESULT16 WINAPI acmDriverPriority16(
HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority)
{
- FIXME("(0x%04x, %ld, %ld): stub\n",
+ FIXME("(0x%04x, %d, %d): stub\n",
hadid, dwPriority, fdwPriority
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -182,7 +182,7 @@ MMRESULT16 WINAPI acmDriverPriority16(
MMRESULT16 WINAPI acmFormatTagDetails16(
HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails)
{
- FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails);
+ FIXME("(0x%04x, %p, %d): stub\n", had, paftd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -194,7 +194,7 @@ MMRESULT16 WINAPI acmFormatTagEnum16(
HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd,
ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{
- FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
+ FIXME("(0x%04x, %p, %p, %d, %d): stub\n",
had, paftd, fnCallback, dwInstance, fdwEnum
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -218,7 +218,7 @@ MMRESULT16 WINAPI acmFormatChoose16(
MMRESULT16 WINAPI acmFormatDetails16(
HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails)
{
- FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails);
+ FIXME("(0x%04x, %p, %d): stub\n", had, pafd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -230,7 +230,7 @@ MMRESULT16 WINAPI acmFormatEnum16(
HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd,
ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{
- FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
+ FIXME("(0x%04x, %p, %p, %d, %d): stub\n",
had, pafd, fnCallback, dwInstance, fdwEnum
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -244,7 +244,7 @@ MMRESULT16 WINAPI acmFormatSuggest16(
HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc,
LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest)
{
- FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
+ FIXME("(0x%04x, %p, %p, %d, %d): stub\n",
had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -257,7 +257,7 @@ MMRESULT16 WINAPI acmFormatSuggest16(
MMRESULT16 WINAPI acmFilterTagDetails16(
HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails)
{
- FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails);
+ FIXME("(0x%04x, %p, %d): stub\n", had, paftd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -269,7 +269,7 @@ MMRESULT16 WINAPI acmFilterTagEnum16(
HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd,
ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{
- FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
+ FIXME("(0x%04x, %p, %p, %d, %d): stub\n",
had, paftd, fnCallback, dwInstance, fdwEnum
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -293,7 +293,7 @@ MMRESULT16 WINAPI acmFilterChoose16(
MMRESULT16 WINAPI acmFilterDetails16(
HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails)
{
- FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails);
+ FIXME("(0x%04x, %p, %d): stub\n", had, pafd, fdwDetails);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -305,7 +305,7 @@ MMRESULT16 WINAPI acmFilterEnum16(
HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd,
ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum)
{
- FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n",
+ FIXME("(0x%04x, %p, %p, %d, %d): stub\n",
had, pafd, fnCallback, dwInstance, fdwEnum
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -321,7 +321,7 @@ MMRESULT16 WINAPI acmStreamOpen16(
LPWAVEFILTER pwfltr, DWORD dwCallback,
DWORD dwInstance, DWORD fdwOpen)
{
- FIXME("(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n",
+ FIXME("(%p, 0x%04x, %p, %p, %p, %d, %d, %d): stub\n",
phas, had, pwfxSrc, pwfxDst, pwfltr,
dwCallback, dwInstance, fdwOpen
);
@@ -335,7 +335,7 @@ MMRESULT16 WINAPI acmStreamOpen16(
MMRESULT16 WINAPI acmStreamClose16(
HACMSTREAM16 has, DWORD fdwClose)
{
- FIXME("(0x%04x, %ld): stub\n", has, fdwClose);
+ FIXME("(0x%04x, %d): stub\n", has, fdwClose);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -347,7 +347,7 @@ MMRESULT16 WINAPI acmStreamSize16(
HACMSTREAM16 has, DWORD cbInput,
LPDWORD pdwOutputBytes, DWORD fdwSize)
{
- FIXME("(0x%04x, %ld, %p, %ld): stub\n",
+ FIXME("(0x%04x, %d, %p, %d): stub\n",
has, cbInput, pdwOutputBytes, fdwSize
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -360,7 +360,7 @@ MMRESULT16 WINAPI acmStreamSize16(
MMRESULT16 WINAPI acmStreamConvert16(
HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert)
{
- FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwConvert);
+ FIXME("(0x%04x, %p, %d): stub\n", has, pash, fdwConvert);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -371,7 +371,7 @@ MMRESULT16 WINAPI acmStreamConvert16(
MMRESULT16 WINAPI acmStreamReset16(
HACMSTREAM16 has, DWORD fdwReset)
{
- FIXME("(0x%04x, %ld): stub\n", has, fdwReset);
+ FIXME("(0x%04x, %d): stub\n", has, fdwReset);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -382,7 +382,7 @@ MMRESULT16 WINAPI acmStreamReset16(
MMRESULT16 WINAPI acmStreamPrepareHeader16(
HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare)
{
- FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwPrepare);
+ FIXME("(0x%04x, %p, %d): stub\n", has, pash, fdwPrepare);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return MMSYSERR_ERROR;
}
@@ -393,7 +393,7 @@ MMRESULT16 WINAPI acmStreamPrepareHeader
MMRESULT16 WINAPI acmStreamUnprepareHeader16(
HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare)
{
- FIXME("(0x%04x, %p, %ld): stub\n",
+ FIXME("(0x%04x, %p, %d): stub\n",
has, pash, fdwUnprepare
);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c
index 1a6a065..d75639a 100644
--- a/dlls/msacm32/pcmconverter.c
+++ b/dlls/msacm32/pcmconverter.c
@@ -66,7 +66,7 @@ static DWORD PCM_drvOpen(LPCSTR str, PAC
*/
static DWORD PCM_drvClose(DWORD dwDevID)
{
- TRACE("(%ld)\n", dwDevID);
+ TRACE("(%d)\n", dwDevID);
return 1;
}
@@ -393,7 +393,7 @@ static void cvtSS88C(DWORD srcRate, cons
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
*dst++ = *src;
@@ -413,7 +413,7 @@ static void cvtSM88C(DWORD srcRate, cons
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
*dst++ = M8(src[0], src[1]);
@@ -432,7 +432,7 @@ static void cvtMS88C(DWORD srcRate, cons
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
*dst++ = *src;
@@ -452,7 +452,7 @@ static void cvtMM88C(DWORD srcRate, cons
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
*dst++ = *src;
@@ -471,7 +471,7 @@ static void cvtSS816C(DWORD srcRate, con
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
W16(dst, C816(src[0])); dst += 2;
@@ -491,7 +491,7 @@ static void cvtSM816C(DWORD srcRate, con
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
W16(dst, M16(C816(src[0]), C816(src[1]))); dst += 2;
@@ -510,7 +510,7 @@ static void cvtMS816C(DWORD srcRate, con
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
W16(dst, C816(*src)); dst += 2;
@@ -530,7 +530,7 @@ static void cvtMM816C(DWORD srcRate, con
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
W16(dst, C816(*src)); dst += 2;
@@ -549,7 +549,7 @@ static void cvtSS168C(DWORD srcRate, con
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
*dst++ = C168(R16(src));
@@ -569,7 +569,7 @@ static void cvtSM168C(DWORD srcRate, con
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
*dst++ = C168(M16(R16(src), R16(src + 2)));
@@ -588,7 +588,7 @@ static void cvtMS168C(DWORD srcRate, con
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
*dst++ = C168(R16(src));
@@ -608,7 +608,7 @@ static void cvtMM168C(DWORD srcRate, con
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
*dst++ = C168(R16(src));
@@ -627,7 +627,7 @@ static void cvtSS1616C(DWORD srcRate, co
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
W16(dst, R16(src)); dst += 2;
@@ -647,7 +647,7 @@ static void cvtSM1616C(DWORD srcRate, co
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
W16(dst, M16(R16(src), R16(src + 2))); dst += 2;
@@ -666,7 +666,7 @@ static void cvtMS1616C(DWORD srcRate, co
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while((*ndst)--) {
W16(dst, R16(src)); dst += 2;
@@ -686,7 +686,7 @@ static void cvtMM1616C(DWORD srcRate, co
DWORD dstRate, unsigned char* dst, LPDWORD ndst)
{
DWORD error = dstRate / 2;
- TRACE("(%ld, %p, %p, %ld, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
+ TRACE("(%d, %p, %p, %d, %p, %p)\n", srcRate, src, nsrc, dstRate, dst, ndst);
while ((*ndst)--) {
W16(dst, R16(src)); dst += 2;
@@ -746,7 +746,7 @@ static LRESULT PCM_DriverDetails(PACMDRI
*/
static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery)
{
- TRACE("(%p, %08lx)\n", aftd, dwQuery);
+ TRACE("(%p, %08x)\n", aftd, dwQuery);
switch (dwQuery) {
case ACM_FORMATTAGDETAILSF_INDEX:
@@ -769,7 +769,7 @@ static LRESULT PCM_FormatTagDetails(PACM
}
break;
default:
- WARN("Unsupported query %08lx\n", dwQuery);
+ WARN("Unsupported query %08x\n", dwQuery);
return MMSYSERR_NOTSUPPORTED;
}
@@ -789,7 +789,7 @@ static LRESULT PCM_FormatTagDetails(PACM
*/
static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery)
{
- TRACE("(%p, %08lx)\n", afd, dwQuery);
+ TRACE("(%p, %08x)\n", afd, dwQuery);
switch (dwQuery) {
case ACM_FORMATDETAILSF_FORMAT:
@@ -813,7 +813,7 @@ static LRESULT PCM_FormatDetails(PACMFOR
afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign;
break;
default:
- WARN("Unsupported query %08lx\n", dwQuery);
+ WARN("Unsupported query %08x\n", dwQuery);
return MMSYSERR_NOTSUPPORTED;
}
@@ -956,7 +956,7 @@ static LRESULT PCM_StreamSize(PACMDRVSTR
adsi->pwfxSrc->nAvgBytesPerSec) & dstMask;
break;
default:
- WARN("Unsupported query %08lx\n", adss->fdwSize);
+ WARN("Unsupported query %08x\n", adss->fdwSize);
return MMSYSERR_NOTSUPPORTED;
}
return MMSYSERR_NOERROR;
@@ -974,12 +974,12 @@ static LRESULT PCM_StreamConvert(PACMDRV
TRACE("(%p, %p)\n", adsi, adsh);
- 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",
+ 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",
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=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+ TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, 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);
@@ -987,7 +987,7 @@ static LRESULT PCM_StreamConvert(PACMDRV
~(ACM_STREAMCONVERTF_BLOCKALIGN|
ACM_STREAMCONVERTF_END|
ACM_STREAMCONVERTF_START)) {
- FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert);
+ FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert);
}
/* ACM_STREAMCONVERTF_BLOCKALIGN
* currently all conversions are block aligned, so do nothing for this flag
diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c
index ab6a59b..b05948d 100644
--- a/dlls/msacm32/stream.c
+++ b/dlls/msacm32/stream.c
@@ -58,7 +58,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREA
PWINE_ACMSTREAM was;
MMRESULT ret;
- TRACE("(%p, %ld)\n", has, fdwClose);
+ TRACE("(%p, %d)\n", has, fdwClose);
if ((was = ACM_GetStream(has)) == NULL) {
WARN("invalid handle\n");
@@ -84,7 +84,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTR
MMRESULT ret = MMSYSERR_NOERROR;
PACMDRVSTREAMHEADER padsh;
- TRACE("(%p, %p, %ld)\n", has, pash, fdwConvert);
+ TRACE("(%p, %p, %d)\n", has, pash, fdwConvert);
if ((was = ACM_GetStream(has)) == NULL) {
WARN("invalid handle\n");
@@ -152,7 +152,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREA
int wfxDstSize;
WAVEFORMATEX wfxSrc, wfxDst;
- TRACE("(%p, %p, %p, %p, %p, %ld, %ld, %ld)\n",
+ TRACE("(%p, %p, %p, %p, %p, %d, %d, %d)\n",
phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen);
/* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than
@@ -171,11 +171,11 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREA
pwfxDst = &wfxDst;
}
- TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+ TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, 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=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
+ TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n",
pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec,
pwfxDst->nBlockAlign, pwfxDst->wBitsPerSample, pwfxDst->cbSize);
@@ -296,7 +296,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(H
MMRESULT ret = MMSYSERR_NOERROR;
PACMDRVSTREAMHEADER padsh;
- TRACE("(%p, %p, %ld)\n", has, pash, fdwPrepare);
+ TRACE("(%p, %p, %d)\n", has, pash, fdwPrepare);
if ((was = ACM_GetStream(has)) == NULL) {
WARN("invalid handle\n");
@@ -360,7 +360,7 @@ MMRESULT WINAPI acmStreamReset(HACMSTREA
PWINE_ACMSTREAM was;
MMRESULT ret = MMSYSERR_NOERROR;
- TRACE("(%p, %ld)\n", has, fdwReset);
+ TRACE("(%p, %d)\n", has, fdwReset);
if (fdwReset) {
WARN("invalid flag\n");
@@ -385,7 +385,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM
ACMDRVSTREAMSIZE adss;
MMRESULT ret;
- TRACE("(%p, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize);
+ TRACE("(%p, %d, %p, %d)\n", has, cbInput, pdwOutputBytes, fdwSize);
if ((was = ACM_GetStream(has)) == NULL) {
WARN("invalid handle\n");
@@ -426,7 +426,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM
break;
}
}
- TRACE("=> (%d) [%lu]\n", ret, *pdwOutputBytes);
+ TRACE("=> (%d) [%u]\n", ret, *pdwOutputBytes);
return ret;
}
@@ -440,7 +440,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader
MMRESULT ret = MMSYSERR_NOERROR;
PACMDRVSTREAMHEADER padsh;
- TRACE("(%p, %p, %ld)\n", has, pash, fdwUnprepare);
+ TRACE("(%p, %p, %d)\n", has, pash, fdwUnprepare);
if ((was = ACM_GetStream(has)) == NULL) {
WARN("invalid handle\n");
--
1.4.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061012/aea0f5c0/attachment-0001.pgp
More information about the wine-patches
mailing list