From 690ae7ba3d64637473f900cfb9221569f9c0b30c Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Thu, 12 Oct 2006 21:34:57 +0200 Subject: [PATCH] mciavi32: Win64 printf format warning fixes. --- dlls/mciavi32/Makefile.in | 1 - dlls/mciavi32/info.c | 30 +++++----- dlls/mciavi32/mciavi.c | 78 ++++++++++++------------ dlls/mciavi32/mmoutput.c | 122 +++++++++++++++++++------------------- dlls/mciavi32/wnd.c | 6 +- 5 files changed, 118 insertions(+), 119 deletions(-) diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in index 6373b06f8b3..facb1eec671 100644 --- a/dlls/mciavi32/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -4,7 +4,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32 kernel32 -EXTRADEFS = -DWINE_NO_LONG_AS_INT C_SRCS = \ info.c \ diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 33f467ac53c..202a6a03c1e 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -40,9 +40,9 @@ DWORD MCIAVI_ConvertFrameToTimeFormat(WINE_MCIAVI* wma, DWORD val, LPDWORD lpRe ret = val; break; default: - WARN("Bad time format %lu!\n", wma->dwMciTimeFormat); + WARN("Bad time format %u!\n", wma->dwMciTimeFormat); } - TRACE("val=%lu=0x%08lx [tf=%lu] => ret=%lu\n", val, val, wma->dwMciTimeFormat, ret); + TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wma->dwMciTimeFormat, ret); *lpRet = 0; return ret; } @@ -62,9 +62,9 @@ DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) ret = val; break; default: - WARN("Bad time format %lu!\n", wma->dwMciTimeFormat); + WARN("Bad time format %u!\n", wma->dwMciTimeFormat); } - TRACE("val=%lu=0x%08lx [tf=%lu] => ret=%lu\n", val, val, wma->dwMciTimeFormat, ret); + TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wma->dwMciTimeFormat, ret); return ret; } @@ -76,7 +76,7 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); DWORD ret; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -131,7 +131,7 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l ret = MCI_RESOURCE_RETURNED; break; default: - FIXME("Unknown capability (%08lx) !\n", lpParms->dwItem); + FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); ret = MCIERR_UNRECOGNIZED_COMMAND; break; } @@ -158,7 +158,7 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; - TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); + TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); EnterCriticalSection(&wma->cs); @@ -167,7 +167,7 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) else if (dwFlags & MCI_INFO_FILE) str = wma->lpFileName; else { - WARN("Don't know this info command (%lu)\n", dwFlags); + WARN("Don't know this info command (%u)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_COMMAND; } if (str) { @@ -207,7 +207,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) wma->dwMciTimeFormat = MCI_FORMAT_FRAMES; break; default: - WARN("Bad time format %lu!\n", lpParms->dwTimeFormat); + WARN("Bad time format %u!\n", lpParms->dwTimeFormat); LeaveCriticalSection(&wma->cs); return MCIERR_BAD_TIME_FORMAT; } @@ -249,7 +249,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) wma->dwSet |= 2; break; default: - WARN("Unknown audio chanel %lu\n", lpParms->dwAudio); + WARN("Unknown audio chanel %u\n", lpParms->dwAudio); break; } } @@ -283,7 +283,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) wma->dwSet &= ~2; break; default: - WARN("Unknown audio chanel %lu\n", lpParms->dwAudio); + WARN("Unknown audio chanel %u\n", lpParms->dwAudio); break; } } @@ -306,12 +306,12 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) case MCI_DGV_FF_MPEG: FIXME("Setting file format (%s) to 'MPEG'\n", str); break; case MCI_DGV_FF_RDIB: FIXME("Setting file format (%s) to 'RLE DIB'\n", str); break; case MCI_DGV_FF_RJPEG: FIXME("Setting file format (%s) to 'RJPEG'\n", str); break; - default: FIXME("Setting unknown file format (%s): %ld\n", str, lpParms->dwFileFormat); + default: FIXME("Setting unknown file format (%s): %d\n", str, lpParms->dwFileFormat); } } if (dwFlags & MCI_DGV_SET_SPEED) { - FIXME("Setting speed to %ld\n", lpParms->dwSpeed); + FIXME("Setting speed to %d\n", lpParms->dwSpeed); } LeaveCriticalSection(&wma->cs); @@ -452,8 +452,8 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar case MCI_STATUS_MEDIA_PRESENT: #endif default: - FIXME("Unknowm command %08lX !\n", lpParms->dwItem); - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + FIXME("Unknowm command %08X !\n", lpParms->dwItem); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); LeaveCriticalSection(&wma->cs); return MCIERR_UNRECOGNIZED_COMMAND; } diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 5adacd15c91..9785dbefb29 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -102,7 +102,7 @@ static DWORD MCIAVI_drvClose(DWORD dwDevID) { WINE_MCIAVI *wma; - TRACE("%04lx\n", dwDevID); + TRACE("%04x\n", dwDevID); /* finish all outstanding things */ MCIAVI_mciClose(dwDevID, MCI_WAIT, NULL); @@ -136,7 +136,7 @@ static DWORD MCIAVI_drvConfigure(DWORD dwDevID) { WINE_MCIAVI *wma; - TRACE("%04lx\n", dwDevID); + TRACE("%04x\n", dwDevID); MCIAVI_mciStop(dwDevID, MCI_WAIT, NULL); @@ -213,7 +213,7 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, WINE_MCIAVI *wma; LRESULT dwRet = 0; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpOpenParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -299,7 +299,7 @@ DWORD MCIAVI_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) WINE_MCIAVI *wma; DWORD dwRet = 0; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -347,9 +347,9 @@ static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) struct MCIAVI_play_data *data = (struct MCIAVI_play_data *)arg; DWORD ret; - TRACE("In thread before async play command (id %08x, flags %08lx)\n", data->wDevID, data->flags); + TRACE("In thread before async play command (id %08x, flags %08x)\n", data->wDevID, data->flags); ret = MCIAVI_mciPlay(data->wDevID, data->flags | MCI_WAIT, &data->params); - TRACE("In thread after async play command (id %08x, flags %08lx)\n", data->wDevID, data->flags); + TRACE("In thread after async play command (id %08x, flags %08x)\n", data->wDevID, data->flags); HeapFree(GetProcessHeap(), 0, data); return ret; @@ -396,7 +396,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms unsigned i, nHdr = 0; DWORD dwFromFrame, dwToFrame; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -438,7 +438,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (dwToFrame >= wma->dwPlayableVideoFrames) dwToFrame = wma->dwPlayableVideoFrames - 1; - TRACE("Playing from frame=%lu to frame=%lu\n", dwFromFrame, dwToFrame); + TRACE("Playing from frame=%u to frame=%u\n", dwFromFrame, dwToFrame); wma->dwCurrVideoFrame = dwFromFrame; wma->dwToVideoFrame = dwToFrame; @@ -463,7 +463,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms SetEvent(wma->ack_event); if (dwFlags & (MCI_DGV_PLAY_REPEAT|MCI_DGV_PLAY_REVERSE|MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLSCREEN)) - FIXME("Unsupported flag %08lx\n", dwFlags); + FIXME("Unsupported flag %08x\n", dwFlags); /* time is in microseconds, we should convert it to milliseconds */ frameTime = (wma->mah.dwMicroSecPerFrame + 500) / 1000; @@ -579,7 +579,7 @@ static DWORD MCIAVI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECORD_PARMS { WINE_MCIAVI *wma; - FIXME("(%04x, %08lX, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08X, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -602,14 +602,14 @@ static DWORD MCIAVI_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa WINE_MCIAVI *wma; DWORD dwRet = 0; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; EnterCriticalSection(&wma->cs); - TRACE("current status %04lx\n", wma->dwStatus); + TRACE("current status %04x\n", wma->dwStatus); switch (wma->dwStatus) { case MCI_MODE_PLAY: @@ -654,7 +654,7 @@ static DWORD MCIAVI_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP { WINE_MCIAVI *wma; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -680,7 +680,7 @@ static DWORD MCIAVI_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lp { WINE_MCIAVI *wma; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -706,7 +706,7 @@ static DWORD MCIAVI_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms { WINE_MCIAVI *wma; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -731,7 +731,7 @@ static DWORD MCIAVI_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms return MCIERR_MISSING_PARAMETER; } - TRACE("Seeking to frame=%lu bytes\n", wma->dwCurrVideoFrame); + TRACE("Seeking to frame=%u bytes\n", wma->dwCurrVideoFrame); if (dwFlags & MCI_NOTIFY) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), @@ -748,7 +748,7 @@ static DWORD MCIAVI_mciLoad(UINT wDevID, DWORD dwFlags, LPMCI_DGV_LOAD_PARMSW lp { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -767,7 +767,7 @@ static DWORD MCIAVI_mciSave(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SAVE_PARMSW lp { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -786,7 +786,7 @@ static DWORD MCIAVI_mciFreeze(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS l { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -805,7 +805,7 @@ static DWORD MCIAVI_mciRealize(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS l { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -824,7 +824,7 @@ static DWORD MCIAVI_mciUnFreeze(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -843,7 +843,7 @@ static DWORD MCIAVI_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS { WINE_MCIAVI *wma; - TRACE("%04x, %08lx, %p\n", wDevID, dwFlags, lpParms); + TRACE("%04x, %08x, %p\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -867,7 +867,7 @@ static DWORD MCIAVI_mciStep(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STEP_PARMS lpP { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -886,7 +886,7 @@ static DWORD MCIAVI_mciCopy(UINT wDevID, DWORD dwFlags, LPMCI_DGV_COPY_PARMS lpP { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -905,7 +905,7 @@ static DWORD MCIAVI_mciCut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CUT_PARMS lpPar { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -924,7 +924,7 @@ static DWORD MCIAVI_mciDelete(UINT wDevID, DWORD dwFlags, LPMCI_DGV_DELETE_PARMS { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -943,7 +943,7 @@ static DWORD MCIAVI_mciPaste(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PASTE_PARMS l { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -962,7 +962,7 @@ static DWORD MCIAVI_mciCue(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CUE_PARMS lpPar { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -981,7 +981,7 @@ static DWORD MCIAVI_mciCapture(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CAPTURE_PAR { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1000,7 +1000,7 @@ static DWORD MCIAVI_mciMonitor(UINT wDevID, DWORD dwFlags, LPMCI_DGV_MONITOR_PAR { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1019,7 +1019,7 @@ static DWORD MCIAVI_mciReserve(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RESERVE_PAR { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1038,7 +1038,7 @@ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1057,7 +1057,7 @@ static DWORD MCIAVI_mciSignal(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SIGNAL_PARMS { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1076,7 +1076,7 @@ static DWORD MCIAVI_mciSetVideo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETVIDEO_P { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1095,7 +1095,7 @@ static DWORD MCIAVI_mciQuality(UINT wDevID, DWORD dwFlags, LPMCI_DGV_QUALITY_PAR { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1114,7 +1114,7 @@ static DWORD MCIAVI_mciList(UINT wDevID, DWORD dwFlags, LPMCI_DGV_LIST_PARMSW lp { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1133,7 +1133,7 @@ static DWORD MCIAVI_mciUndo(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1152,7 +1152,7 @@ static DWORD MCIAVI_mciConfigure(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); @@ -1171,7 +1171,7 @@ static DWORD MCIAVI_mciRestore(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RESTORE_PAR { WINE_MCIAVI *wma; - FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); MCIAVI_mciStop(wDevID, MCI_WAIT, NULL); diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index 3dd9d588636..eab8fd51c96 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -41,17 +41,17 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK HIBYTE(HIWORD(wma->ash_audio.fccHandler))); else TRACE("ash.fccHandler=0, no handler specified\n"); - TRACE("ash.dwFlags=%ld\n", wma->ash_audio.dwFlags); + TRACE("ash.dwFlags=%d\n", wma->ash_audio.dwFlags); TRACE("ash.wPriority=%d\n", wma->ash_audio.wPriority); TRACE("ash.wLanguage=%d\n", wma->ash_audio.wLanguage); - TRACE("ash.dwInitialFrames=%ld\n", wma->ash_audio.dwInitialFrames); - TRACE("ash.dwScale=%ld\n", wma->ash_audio.dwScale); - TRACE("ash.dwRate=%ld\n", wma->ash_audio.dwRate); - TRACE("ash.dwStart=%ld\n", wma->ash_audio.dwStart); - TRACE("ash.dwLength=%ld\n", wma->ash_audio.dwLength); - TRACE("ash.dwSuggestedBufferSize=%ld\n", wma->ash_audio.dwSuggestedBufferSize); - TRACE("ash.dwQuality=%ld\n", wma->ash_audio.dwQuality); - TRACE("ash.dwSampleSize=%ld\n", wma->ash_audio.dwSampleSize); + TRACE("ash.dwInitialFrames=%d\n", wma->ash_audio.dwInitialFrames); + TRACE("ash.dwScale=%d\n", wma->ash_audio.dwScale); + TRACE("ash.dwRate=%d\n", wma->ash_audio.dwRate); + TRACE("ash.dwStart=%d\n", wma->ash_audio.dwStart); + TRACE("ash.dwLength=%d\n", wma->ash_audio.dwLength); + TRACE("ash.dwSuggestedBufferSize=%d\n", wma->ash_audio.dwSuggestedBufferSize); + TRACE("ash.dwQuality=%d\n", wma->ash_audio.dwQuality); + TRACE("ash.dwSampleSize=%d\n", wma->ash_audio.dwSampleSize); TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", wma->ash_audio.rcFrame.top, wma->ash_audio.rcFrame.left, wma->ash_audio.rcFrame.bottom, wma->ash_audio.rcFrame.right); @@ -64,7 +64,7 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK return FALSE; } if (mmckInfo.cksize < sizeof(WAVEFORMAT)) { - WARN("Size of strf chunk (%ld) < audio format struct\n", mmckInfo.cksize); + WARN("Size of strf chunk (%d) < audio format struct\n", mmckInfo.cksize); return FALSE; } wma->lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); @@ -77,8 +77,8 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK TRACE("waveFormat.wFormatTag=%d\n", wma->lpWaveFormat->wFormatTag); TRACE("waveFormat.nChannels=%d\n", wma->lpWaveFormat->nChannels); - TRACE("waveFormat.nSamplesPerSec=%ld\n", wma->lpWaveFormat->nSamplesPerSec); - TRACE("waveFormat.nAvgBytesPerSec=%ld\n", wma->lpWaveFormat->nAvgBytesPerSec); + TRACE("waveFormat.nSamplesPerSec=%d\n", wma->lpWaveFormat->nSamplesPerSec); + TRACE("waveFormat.nAvgBytesPerSec=%d\n", wma->lpWaveFormat->nAvgBytesPerSec); TRACE("waveFormat.nBlockAlign=%d\n", wma->lpWaveFormat->nBlockAlign); TRACE("waveFormat.wBitsPerSample=%d\n", wma->lpWaveFormat->wBitsPerSample); if (mmckInfo.cksize >= sizeof(WAVEFORMATEX)) @@ -101,17 +101,17 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK HIBYTE(LOWORD(wma->ash_video.fccHandler)), LOBYTE(HIWORD(wma->ash_video.fccHandler)), HIBYTE(HIWORD(wma->ash_video.fccHandler))); - TRACE("ash.dwFlags=%ld\n", wma->ash_video.dwFlags); + TRACE("ash.dwFlags=%d\n", wma->ash_video.dwFlags); TRACE("ash.wPriority=%d\n", wma->ash_video.wPriority); TRACE("ash.wLanguage=%d\n", wma->ash_video.wLanguage); - TRACE("ash.dwInitialFrames=%ld\n", wma->ash_video.dwInitialFrames); - TRACE("ash.dwScale=%ld\n", wma->ash_video.dwScale); - TRACE("ash.dwRate=%ld\n", wma->ash_video.dwRate); - TRACE("ash.dwStart=%ld\n", wma->ash_video.dwStart); - TRACE("ash.dwLength=%ld\n", wma->ash_video.dwLength); - TRACE("ash.dwSuggestedBufferSize=%ld\n", wma->ash_video.dwSuggestedBufferSize); - TRACE("ash.dwQuality=%ld\n", wma->ash_video.dwQuality); - TRACE("ash.dwSampleSize=%ld\n", wma->ash_video.dwSampleSize); + TRACE("ash.dwInitialFrames=%d\n", wma->ash_video.dwInitialFrames); + TRACE("ash.dwScale=%d\n", wma->ash_video.dwScale); + TRACE("ash.dwRate=%d\n", wma->ash_video.dwRate); + TRACE("ash.dwStart=%d\n", wma->ash_video.dwStart); + TRACE("ash.dwLength=%d\n", wma->ash_video.dwLength); + TRACE("ash.dwSuggestedBufferSize=%d\n", wma->ash_video.dwSuggestedBufferSize); + TRACE("ash.dwQuality=%d\n", wma->ash_video.dwQuality); + TRACE("ash.dwSampleSize=%d\n", wma->ash_video.dwSampleSize); TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", wma->ash_video.rcFrame.top, wma->ash_video.rcFrame.left, wma->ash_video.rcFrame.bottom, wma->ash_video.rcFrame.right); @@ -132,17 +132,17 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK mmioRead(wma->hFile, (LPSTR)wma->inbih, mmckInfo.cksize); - TRACE("bih.biSize=%ld\n", wma->inbih->biSize); - TRACE("bih.biWidth=%ld\n", wma->inbih->biWidth); - TRACE("bih.biHeight=%ld\n", wma->inbih->biHeight); + TRACE("bih.biSize=%d\n", wma->inbih->biSize); + TRACE("bih.biWidth=%d\n", wma->inbih->biWidth); + TRACE("bih.biHeight=%d\n", wma->inbih->biHeight); TRACE("bih.biPlanes=%d\n", wma->inbih->biPlanes); TRACE("bih.biBitCount=%d\n", wma->inbih->biBitCount); - TRACE("bih.biCompression=%lx\n", wma->inbih->biCompression); - TRACE("bih.biSizeImage=%ld\n", wma->inbih->biSizeImage); - TRACE("bih.biXPelsPerMeter=%ld\n", wma->inbih->biXPelsPerMeter); - TRACE("bih.biYPelsPerMeter=%ld\n", wma->inbih->biYPelsPerMeter); - TRACE("bih.biClrUsed=%ld\n", wma->inbih->biClrUsed); - TRACE("bih.biClrImportant=%ld\n", wma->inbih->biClrImportant); + TRACE("bih.biCompression=%x\n", wma->inbih->biCompression); + TRACE("bih.biSizeImage=%d\n", wma->inbih->biSizeImage); + TRACE("bih.biXPelsPerMeter=%d\n", wma->inbih->biXPelsPerMeter); + TRACE("bih.biYPelsPerMeter=%d\n", wma->inbih->biYPelsPerMeter); + TRACE("bih.biClrUsed=%d\n", wma->inbih->biClrUsed); + TRACE("bih.biClrImportant=%d\n", wma->inbih->biClrImportant); wma->source.left = 0; wma->source.top = 0; @@ -183,7 +183,7 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, stream_n <<= 4; stream_n |= (p[1] <= '9') ? (p[1] - '0') : (tolower(p[1]) - 'a' + 10); - TRACE("ckid %4.4s (stream #%ld)\n", (LPSTR)&mmck->ckid, stream_n); + TRACE("ckid %4.4s (stream #%d)\n", (LPSTR)&mmck->ckid, stream_n); /* Some (rare?) AVI files have video streams name XXYY where XX = stream number and YY = TWOCC * of the last 2 characters of the biCompression member of the BITMAPINFOHEADER structure. @@ -202,11 +202,11 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, case cktypePALchange: if (stream_n != wma->video_stream_n) { - TRACE("data belongs to another video stream #%ld\n", stream_n); + TRACE("data belongs to another video stream #%d\n", stream_n); return FALSE; } - TRACE("Adding video frame[%ld]: %ld bytes\n", + TRACE("Adding video frame[%d]: %d bytes\n", alb->numVideoFrames, mmck->cksize); if (alb->numVideoFrames < wma->dwPlayableVideoFrames) { @@ -222,11 +222,11 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, case cktypeWAVEbytes: if (stream_n != wma->audio_stream_n) { - TRACE("data belongs to another audio stream #%ld\n", stream_n); + TRACE("data belongs to another audio stream #%d\n", stream_n); return FALSE; } - TRACE("Adding audio frame[%ld]: %ld bytes\n", + TRACE("Adding audio frame[%d]: %d bytes\n", alb->numAudioBlocks, mmck->cksize); if (wma->lpWaveFormat) { if (alb->numAudioBlocks >= alb->numAudioAllocated) { @@ -288,16 +288,16 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioRead(wma->hFile, (LPSTR)&wma->mah, sizeof(wma->mah)); - TRACE("mah.dwMicroSecPerFrame=%ld\n", wma->mah.dwMicroSecPerFrame); - TRACE("mah.dwMaxBytesPerSec=%ld\n", wma->mah.dwMaxBytesPerSec); - TRACE("mah.dwPaddingGranularity=%ld\n", wma->mah.dwPaddingGranularity); - TRACE("mah.dwFlags=%ld\n", wma->mah.dwFlags); - TRACE("mah.dwTotalFrames=%ld\n", wma->mah.dwTotalFrames); - TRACE("mah.dwInitialFrames=%ld\n", wma->mah.dwInitialFrames); - TRACE("mah.dwStreams=%ld\n", wma->mah.dwStreams); - TRACE("mah.dwSuggestedBufferSize=%ld\n", wma->mah.dwSuggestedBufferSize); - TRACE("mah.dwWidth=%ld\n", wma->mah.dwWidth); - TRACE("mah.dwHeight=%ld\n", wma->mah.dwHeight); + TRACE("mah.dwMicroSecPerFrame=%d\n", wma->mah.dwMicroSecPerFrame); + TRACE("mah.dwMaxBytesPerSec=%d\n", wma->mah.dwMaxBytesPerSec); + TRACE("mah.dwPaddingGranularity=%d\n", wma->mah.dwPaddingGranularity); + TRACE("mah.dwFlags=%d\n", wma->mah.dwFlags); + TRACE("mah.dwTotalFrames=%d\n", wma->mah.dwTotalFrames); + TRACE("mah.dwInitialFrames=%d\n", wma->mah.dwInitialFrames); + TRACE("mah.dwStreams=%d\n", wma->mah.dwStreams); + TRACE("mah.dwSuggestedBufferSize=%d\n", wma->mah.dwSuggestedBufferSize); + TRACE("mah.dwWidth=%d\n", wma->mah.dwWidth); + TRACE("mah.dwHeight=%d\n", wma->mah.dwHeight); mmioAscend(wma->hFile, &mmckInfo, 0); @@ -320,7 +320,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) continue; } - TRACE("Stream #%ld fccType %4.4s\n", stream_n, (LPSTR)&mmckStream.fccType); + TRACE("Stream #%d fccType %4.4s\n", stream_n, (LPSTR)&mmckStream.fccType); if (mmckStream.fccType == streamtypeVIDEO) { @@ -393,18 +393,18 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioAscend(wma->hFile, &mmckInfo, 0); } if (alb.numVideoFrames != wma->dwPlayableVideoFrames) { - WARN("Found %ld video frames (/%ld), reducing playable frames\n", + WARN("Found %d video frames (/%d), reducing playable frames\n", alb.numVideoFrames, wma->dwPlayableVideoFrames); wma->dwPlayableVideoFrames = alb.numVideoFrames; } wma->dwPlayableAudioBlocks = alb.numAudioBlocks; if (alb.inVideoSize > wma->ash_video.dwSuggestedBufferSize) { - WARN("inVideoSize=%ld suggestedSize=%ld\n", alb.inVideoSize, wma->ash_video.dwSuggestedBufferSize); + WARN("inVideoSize=%d suggestedSize=%d\n", alb.inVideoSize, wma->ash_video.dwSuggestedBufferSize); wma->ash_video.dwSuggestedBufferSize = alb.inVideoSize; } if (alb.inAudioSize > wma->ash_audio.dwSuggestedBufferSize) { - WARN("inAudioSize=%ld suggestedSize=%ld\n", alb.inAudioSize, wma->ash_audio.dwSuggestedBufferSize); + WARN("inAudioSize=%d suggestedSize=%d\n", alb.inAudioSize, wma->ash_audio.dwSuggestedBufferSize); wma->ash_audio.dwSuggestedBufferSize = alb.inAudioSize; } @@ -457,17 +457,17 @@ BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) return FALSE; } - TRACE("bih.biSize=%ld\n", wma->outbih->biSize); - TRACE("bih.biWidth=%ld\n", wma->outbih->biWidth); - TRACE("bih.biHeight=%ld\n", wma->outbih->biHeight); + TRACE("bih.biSize=%d\n", wma->outbih->biSize); + TRACE("bih.biWidth=%d\n", wma->outbih->biWidth); + TRACE("bih.biHeight=%d\n", wma->outbih->biHeight); TRACE("bih.biPlanes=%d\n", wma->outbih->biPlanes); TRACE("bih.biBitCount=%d\n", wma->outbih->biBitCount); - TRACE("bih.biCompression=%lx\n", wma->outbih->biCompression); - TRACE("bih.biSizeImage=%ld\n", wma->outbih->biSizeImage); - TRACE("bih.biXPelsPerMeter=%ld\n", wma->outbih->biXPelsPerMeter); - TRACE("bih.biYPelsPerMeter=%ld\n", wma->outbih->biYPelsPerMeter); - TRACE("bih.biClrUsed=%ld\n", wma->outbih->biClrUsed); - TRACE("bih.biClrImportant=%ld\n", wma->outbih->biClrImportant); + TRACE("bih.biCompression=%x\n", wma->outbih->biCompression); + TRACE("bih.biSizeImage=%d\n", wma->outbih->biSizeImage); + TRACE("bih.biXPelsPerMeter=%d\n", wma->outbih->biXPelsPerMeter); + TRACE("bih.biYPelsPerMeter=%d\n", wma->outbih->biYPelsPerMeter); + TRACE("bih.biClrUsed=%d\n", wma->outbih->biClrUsed); + TRACE("bih.biClrImportant=%d\n", wma->outbih->biClrImportant); wma->outdata = HeapAlloc(GetProcessHeap(), 0, wma->outbih->biSizeImage); if (!wma->outdata) { @@ -525,7 +525,7 @@ DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) dwRet = waveOutOpen((HWAVEOUT *)&wma->hWave, WAVE_MAPPER, wma->lpWaveFormat, (DWORD_PTR)MCIAVI_waveCallback, wma->wDevID, CALLBACK_FUNCTION); if (dwRet != 0) { - TRACE("Can't open low level audio device %ld\n", dwRet); + TRACE("Can't open low level audio device %d\n", dwRet); dwRet = MCIERR_DEVICE_OPEN; wma->hWave = 0; goto cleanUp; @@ -570,7 +570,7 @@ void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) { if (!wma->lpAudioIndex) return; - TRACE("%ld (ec=%lu)\n", wma->lpAudioIndex[wma->dwCurrAudioBlock].dwOffset, wma->dwEventCount); + TRACE("%d (ec=%u)\n", wma->lpAudioIndex[wma->dwCurrAudioBlock].dwOffset, wma->dwEventCount); /* push as many blocks as possible => audio gets priority */ while (wma->dwStatus != MCI_MODE_STOP && wma->dwStatus != MCI_MODE_NOT_READY && @@ -605,7 +605,7 @@ LRESULT MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) if (!hDC || !wma->inbih) return TRUE; - TRACE("Painting frame %lu (cached %lu)\n", wma->dwCurrVideoFrame, wma->dwCachedFrame); + TRACE("Painting frame %u (cached %u)\n", wma->dwCurrVideoFrame, wma->dwCachedFrame); if (wma->dwCurrVideoFrame != wma->dwCachedFrame) { diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index 478962e807e..84ea5a574e5 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -150,7 +150,7 @@ DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); RECT rc; - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -202,7 +202,7 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); - TRACE("(%04x, %08lx, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -268,7 +268,7 @@ DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpPar { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); - TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;