Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/mciavi32/Makefile.in | 1 dlls/mciavi32/info.c | 50 +++++++++--------- dlls/mciavi32/mciavi.c | 60 +++++++++++----------- dlls/mciavi32/mmoutput.c | 124 +++++++++++++++++++++++---------------------- dlls/mciavi32/wnd.c | 10 ++-- 5 files changed, 122 insertions(+), 123 deletions(-)
diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in index 6a165050f2b..e7fe6ba5760 100644 --- a/dlls/mciavi32/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32
diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index d6039129549..286753f6487 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -39,9 +39,9 @@ static DWORD MCIAVI_ConvertFrameToTimeFormat(WINE_MCIAVI* wma, DWORD val, LPDWOR ret = val; break; default: - WARN("Bad time format %u!\n", wma->dwMciTimeFormat); + WARN("Bad time format %lu!\n", wma->dwMciTimeFormat); } - TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wma->dwMciTimeFormat, ret); + TRACE("val=%lu=0x%08lx [tf=%lu] => ret=%lu\n", val, val, wma->dwMciTimeFormat, ret); *lpRet = 0; return ret; } @@ -61,9 +61,9 @@ DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) ret = val; break; default: - WARN("Bad time format %u!\n", wma->dwMciTimeFormat); + WARN("Bad time format %lu!\n", wma->dwMciTimeFormat); } - TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wma->dwMciTimeFormat, ret); + TRACE("val=%lu=0x%08lx [tf=%lu] => ret=%lu\n", val, val, wma->dwMciTimeFormat, ret); return ret; }
@@ -75,7 +75,7 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); DWORD ret = MCIERR_UNSUPPORTED_FUNCTION;
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -173,7 +173,7 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l break; /* w2k does not know MAX_WINDOWS or MAX/MINIMUM_RATE */ default: - FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); + FIXME("Unknown capability (%08lx) !\n", lpParms->dwItem); break; } } @@ -196,7 +196,7 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; if (dwFlags & MCI_TEST) return 0;
- TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); + TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize);
EnterCriticalSection(&wma->cs);
@@ -207,7 +207,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 (%u)\n", dwFlags); + WARN("Don't know this info command (%lu)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_COMMAND; } if (!ret) { @@ -242,7 +242,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) wma->dwMciTimeFormat = MCI_FORMAT_FRAMES; break; default: - WARN("Bad time format %u!\n", lpParms->dwTimeFormat); + WARN("Bad time format %lu!\n", lpParms->dwTimeFormat); LeaveCriticalSection(&wma->cs); return MCIERR_BAD_TIME_FORMAT; } @@ -284,7 +284,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) break; default: szAudio = " audio unknown"; - WARN("Unknown audio channel %u\n", lpParms->dwAudio); + WARN("Unknown audio channel %lu\n", lpParms->dwAudio); break; } } @@ -319,7 +319,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) break; default: szAudio = " audio unknown"; - WARN("Unknown audio channel %u\n", lpParms->dwAudio); + WARN("Unknown audio channel %lu\n", lpParms->dwAudio); break; } } @@ -342,12 +342,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): %d\n", str, lpParms->dwFileFormat); + default: FIXME("Setting unknown file format (%s): %ld\n", str, lpParms->dwFileFormat); } }
if (dwFlags & MCI_DGV_SET_SPEED) { - FIXME("Setting speed to %d\n", lpParms->dwSpeed); + FIXME("Setting speed to %ld\n", lpParms->dwSpeed); }
LeaveCriticalSection(&wma->cs); @@ -373,7 +373,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar switch (lpParms->dwItem) { case MCI_STATUS_CURRENT_TRACK: lpParms->dwReturn = 1; - TRACE("MCI_STATUS_CURRENT_TRACK => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_CURRENT_TRACK => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_LENGTH: if (!wma->hFile) { @@ -383,7 +383,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ lpParms->dwReturn = MCIAVI_ConvertFrameToTimeFormat(wma, wma->mah.dwTotalFrames, &ret); - TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_LENGTH => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: lpParms->dwReturn = MAKEMCIRESOURCE(wma->dwStatus, wma->dwStatus); @@ -397,7 +397,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar break; case MCI_STATUS_NUMBER_OF_TRACKS: lpParms->dwReturn = 1; - TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_POSITION: if (!wma->hFile) { @@ -409,7 +409,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar lpParms->dwReturn = MCIAVI_ConvertFrameToTimeFormat(wma, (dwFlags & MCI_STATUS_START) ? 0 : wma->dwCurrVideoFrame, &ret); - TRACE("MCI_STATUS_POSITION %s => %lu\n", + TRACE("MCI_STATUS_POSITION %s => %Iu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break; case MCI_STATUS_READY: @@ -458,11 +458,11 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar #endif case MCI_DGV_STATUS_BITSPERPEL: lpParms->dwReturn = wma->inbih->biBitCount; - TRACE("MCI_DGV_STATUS_BITSPERPEL => %lu\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_BITSPERPEL => %Iu\n", lpParms->dwReturn); break; case MCI_DGV_STATUS_HPAL: lpParms->dwReturn = 0; - TRACE("MCI_DGV_STATUS_HPAL => %lx\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_HPAL => %Ix\n", lpParms->dwReturn); break; case MCI_DGV_STATUS_HWND: lpParms->dwReturn = (DWORD_PTR)wma->hWndPaint; @@ -488,12 +488,12 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar break; case MCI_DGV_STATUS_SPEED: lpParms->dwReturn = 1000; - TRACE("MCI_DGV_STATUS_SPEED = %lu\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_SPEED = %Iu\n", lpParms->dwReturn); break; case MCI_DGV_STATUS_FRAME_RATE: /* FIXME: 1000 is a settable speed multiplier */ lpParms->dwReturn = MulDiv(1000000,1000,wma->mah.dwMicroSecPerFrame); - TRACE("MCI_DGV_STATUS_FRAME_RATE = %lu\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_FRAME_RATE = %Iu\n", lpParms->dwReturn); break; case MCI_DGV_STATUS_FORWARD: lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); @@ -511,7 +511,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar break; case MCI_DGV_STATUS_AUDIO_STREAM: lpParms->dwReturn = wma->audio_stream_n; - TRACE("MCI_DGV_STATUS_AUDIO_STREAM => %lu\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_AUDIO_STREAM => %Iu\n", lpParms->dwReturn); break; #if 0 case MCI_DGV_STATUS_KEY_COLOR: @@ -536,15 +536,15 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar case MCI_DGV_STATUS_VOLUME: #endif default: - FIXME("Unknown command %08X !\n", lpParms->dwItem); - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + FIXME("Unknown command %08lX !\n", lpParms->dwItem); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); LeaveCriticalSection(&wma->cs); return MCIERR_UNSUPPORTED_FUNCTION; } }
if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + TRACE("MCI_NOTIFY_SUCCESSFUL %08IX !\n", lpParms->dwCallback); mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); } diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 7a1657f79eb..64a1a0fbd7d 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -103,7 +103,7 @@ static DWORD MCIAVI_drvClose(DWORD dwDevID) { WINE_MCIAVI *wma;
- TRACE("%04x\n", dwDevID); + TRACE("%04lx\n", dwDevID);
/* finish all outstanding things */ MCIAVI_mciClose(dwDevID, MCI_WAIT, NULL); @@ -137,7 +137,7 @@ static DWORD MCIAVI_drvConfigure(DWORD dwDevID) { WINE_MCIAVI *wma;
- TRACE("%04x\n", dwDevID); + TRACE("%04lx\n", dwDevID);
MCIAVI_mciStop(dwDevID, MCI_WAIT, NULL);
@@ -214,7 +214,7 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, WINE_MCIAVI *wma; LRESULT dwRet = 0;
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpOpenParms);
if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -306,7 +306,7 @@ DWORD MCIAVI_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) WINE_MCIAVI *wma; DWORD dwRet = 0;
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -477,7 +477,7 @@ mci_play_done: wma->dwStatus = MCI_MODE_STOP;
if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + TRACE("MCI_NOTIFY_SUCCESSFUL %08IX !\n", lpParms->dwCallback); mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wma->wDevID, MCI_NOTIFY_SUCCESSFUL); } @@ -503,9 +503,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 %u, flags %08x)\n", data->wma->wDevID, data->flags); + TRACE("In thread before async play command (id %u, flags %08lx)\n", data->wma->wDevID, data->flags); ret = MCIAVI_player(data->wma, data->flags, &data->params); - TRACE("In thread after async play command (id %u, flags %08x)\n", data->wma->wDevID, data->flags); + TRACE("In thread after async play command (id %u, flags %08lx)\n", data->wma->wDevID, data->flags);
HeapFree(GetProcessHeap(), 0, data); return ret; @@ -545,7 +545,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms DWORD dwRet; DWORD dwFromFrame, dwToFrame;
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -555,7 +555,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (dwFlags & MCI_TEST) return 0;
if (dwFlags & (MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLBY2)) - FIXME("Unsupported flag %08x\n", dwFlags); + FIXME("Unsupported flag %08lx\n", dwFlags);
EnterCriticalSection(&wma->cs);
@@ -582,7 +582,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=%u to frame=%u\n", dwFromFrame, dwToFrame); + TRACE("Playing from frame=%lu to frame=%lu\n", dwFromFrame, dwToFrame);
wma->dwCurrVideoFrame = dwFromFrame; wma->dwToVideoFrame = dwToFrame; @@ -637,7 +637,7 @@ static DWORD MCIAVI_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa WINE_MCIAVI *wma; DWORD dwRet = 0;
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -645,7 +645,7 @@ static DWORD MCIAVI_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa
EnterCriticalSection(&wma->cs);
- TRACE("current status %04x\n", wma->dwStatus); + TRACE("current status %04lx\n", wma->dwStatus);
switch (wma->dwStatus) { case MCI_MODE_PLAY: @@ -690,7 +690,7 @@ static DWORD MCIAVI_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP { WINE_MCIAVI *wma;
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -717,7 +717,7 @@ static DWORD MCIAVI_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lp { WINE_MCIAVI *wma;
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -745,7 +745,7 @@ static DWORD MCIAVI_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms WINE_MCIAVI *wma; DWORD position;
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -772,7 +772,7 @@ static DWORD MCIAVI_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms EnterCriticalSection(&wma->cs);
wma->dwCurrVideoFrame = position; - TRACE("Seeking to frame=%u\n", wma->dwCurrVideoFrame); + TRACE("Seeking to frame=%lu\n", wma->dwCurrVideoFrame);
if (dwFlags & MCI_NOTIFY) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), @@ -789,7 +789,7 @@ static DWORD MCIAVI_mciLoad(UINT wDevID, DWORD dwFlags, LPMCI_DGV_LOAD_PARMSW lp { WINE_MCIAVI *wma;
- FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -806,7 +806,7 @@ static DWORD MCIAVI_mciRealize(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS l { WINE_MCIAVI *wma;
- FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -824,7 +824,7 @@ static DWORD MCIAVI_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS { WINE_MCIAVI *wma;
- TRACE("%04x, %08x, %p\n", wDevID, dwFlags, lpParms); + TRACE("%04x, %08lx, %p\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -851,7 +851,7 @@ static DWORD MCIAVI_mciStep(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STEP_PARMS lpP DWORD position; int delta = 1;
- TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lx, %p)\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -869,7 +869,7 @@ static DWORD MCIAVI_mciStep(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STEP_PARMS lpP EnterCriticalSection(&wma->cs);
wma->dwCurrVideoFrame = position; - TRACE("Stepping to frame=%u\n", wma->dwCurrVideoFrame); + TRACE("Stepping to frame=%lu\n", wma->dwCurrVideoFrame);
if (dwFlags & MCI_NOTIFY) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), @@ -886,7 +886,7 @@ static DWORD MCIAVI_mciCue(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CUE_PARMS lpPar { WINE_MCIAVI *wma;
- FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -905,7 +905,7 @@ static DWORD MCIAVI_mciBreak(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpPar { WINE_MCIAVI *wma;
- TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lx, %p)\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -931,7 +931,7 @@ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
- FIXME("(%04x, %08x, %p) Item %04x: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETAUDIO_ITEM ? lpParms->dwItem : 0); + FIXME("(%04x, %08lx, %p) Item %04lx: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETAUDIO_ITEM ? lpParms->dwItem : 0);
wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -946,7 +946,7 @@ static DWORD MCIAVI_mciSignal(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SIGNAL_PARMS { WINE_MCIAVI *wma;
- FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -965,7 +965,7 @@ static DWORD MCIAVI_mciSetVideo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETVIDEO_P
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
- FIXME("(%04x, %08x, %p) Item %04x: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETVIDEO_ITEM ? lpParms->dwItem : 0); + FIXME("(%04x, %08lx, %p) Item %04lx: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETVIDEO_ITEM ? lpParms->dwItem : 0);
wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -980,7 +980,7 @@ static DWORD MCIAVI_mciConfigure(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS { WINE_MCIAVI *wma;
- FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK;
@@ -1001,7 +1001,7 @@ static DWORD MCIAVI_mciConfigure(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + TRACE("(%08IX, %p, %08X, %08IX, %08IX)\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2);
switch (wMsg) { @@ -1063,11 +1063,11 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SAVE: case MCI_UNDO: case MCI_UNFREEZE: - TRACE("Unsupported function [0x%x] flags=%08x\n", wMsg, (DWORD)dwParam1); + TRACE("Unsupported function [0x%x] flags=%08lx\n", wMsg, (DWORD)dwParam1); return MCIERR_UNSUPPORTED_FUNCTION; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [0x%x] %08x\n", wMsg, (DWORD)dwParam1); + WARN("Unsupported command [0x%x] %08lx\n", wMsg, (DWORD)dwParam1); break; case MCI_OPEN: case MCI_CLOSE: diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index ee0481c59c7..ec2751e6d9a 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -39,17 +39,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=%d\n", wma->ash_audio.dwFlags); + TRACE("ash.dwFlags=%ld\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=%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.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.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);
@@ -62,7 +62,7 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK return FALSE; } if (mmckInfo.cksize < sizeof(WAVEFORMAT)) { - WARN("Size of strf chunk (%d) < audio format struct\n", mmckInfo.cksize); + WARN("Size of strf chunk (%ld) < audio format struct\n", mmckInfo.cksize); return FALSE; } wma->lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); @@ -75,8 +75,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=%d\n", wma->lpWaveFormat->nSamplesPerSec); - TRACE("waveFormat.nAvgBytesPerSec=%d\n", wma->lpWaveFormat->nAvgBytesPerSec); + TRACE("waveFormat.nSamplesPerSec=%ld\n", wma->lpWaveFormat->nSamplesPerSec); + TRACE("waveFormat.nAvgBytesPerSec=%ld\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)) @@ -97,17 +97,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=%d\n", wma->ash_video.dwFlags); + TRACE("ash.dwFlags=%ld\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=%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.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.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);
@@ -128,17 +128,17 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK
mmioRead(wma->hFile, (LPSTR)wma->inbih, mmckInfo.cksize);
- 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.biSize=%ld\n", wma->inbih->biSize); + TRACE("bih.biWidth=%ld\n", wma->inbih->biWidth); + TRACE("bih.biHeight=%ld\n", wma->inbih->biHeight); TRACE("bih.biPlanes=%d\n", wma->inbih->biPlanes); TRACE("bih.biBitCount=%d\n", wma->inbih->biBitCount); - 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); + 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);
SetRect(&wma->source, 0, 0, wma->inbih->biWidth, wma->inbih->biHeight); wma->dest = wma->source; @@ -175,7 +175,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 #%d)\n", (LPSTR)&mmck->ckid, stream_n); + TRACE("ckid %4.4s (stream #%ld)\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. @@ -197,11 +197,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 #%d\n", stream_n); + TRACE("data belongs to another video stream #%ld\n", stream_n); return FALSE; }
- TRACE("Adding video frame[%d]: %d bytes\n", + TRACE("Adding video frame[%ld]: %ld bytes\n", alb->numVideoFrames, mmck->cksize);
if (alb->numVideoFrames < wma->dwPlayableVideoFrames) { @@ -217,11 +217,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 #%d\n", stream_n); + TRACE("data belongs to another audio stream #%ld\n", stream_n); return FALSE; }
- TRACE("Adding audio frame[%d]: %d bytes\n", + TRACE("Adding audio frame[%ld]: %ld bytes\n", alb->numAudioBlocks, mmck->cksize); if (wma->lpWaveFormat) { if (alb->numAudioBlocks >= alb->numAudioAllocated) { @@ -286,16 +286,16 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma)
mmioRead(wma->hFile, (LPSTR)&wma->mah, sizeof(wma->mah));
- 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); + 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);
mmioAscend(wma->hFile, &mmckInfo, 0);
@@ -320,7 +320,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma)
mmioRead(wma->hFile, (LPSTR)&strh, sizeof(strh));
- TRACE("Stream #%d fccType %4.4s\n", stream_n, (LPSTR)&strh.fccType); + TRACE("Stream #%ld fccType %4.4s\n", stream_n, (LPSTR)&strh.fccType);
if (strh.fccType == streamtypeVIDEO) { @@ -399,18 +399,18 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioAscend(wma->hFile, &mmckInfo, 0); } if (alb.numVideoFrames != wma->dwPlayableVideoFrames) { - WARN("AVI header says %d frames, we found %d video frames, reducing playable frames\n", + WARN("AVI header says %ld frames, we found %ld video frames, reducing playable frames\n", wma->dwPlayableVideoFrames, alb.numVideoFrames); wma->dwPlayableVideoFrames = alb.numVideoFrames; } wma->dwPlayableAudioBlocks = alb.numAudioBlocks;
if (alb.inVideoSize > wma->ash_video.dwSuggestedBufferSize) { - WARN("inVideoSize=%d suggestedSize=%d\n", alb.inVideoSize, wma->ash_video.dwSuggestedBufferSize); + WARN("inVideoSize=%ld suggestedSize=%ld\n", alb.inVideoSize, wma->ash_video.dwSuggestedBufferSize); wma->ash_video.dwSuggestedBufferSize = alb.inVideoSize; } if (alb.inAudioSize > wma->ash_audio.dwSuggestedBufferSize) { - WARN("inAudioSize=%d suggestedSize=%d\n", alb.inAudioSize, wma->ash_audio.dwSuggestedBufferSize); + WARN("inAudioSize=%ld suggestedSize=%ld\n", alb.inAudioSize, wma->ash_audio.dwSuggestedBufferSize); wma->ash_audio.dwSuggestedBufferSize = alb.inAudioSize; }
@@ -463,17 +463,17 @@ BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) return FALSE; }
- 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.biSize=%ld\n", wma->outbih->biSize); + TRACE("bih.biWidth=%ld\n", wma->outbih->biWidth); + TRACE("bih.biHeight=%ld\n", wma->outbih->biHeight); TRACE("bih.biPlanes=%d\n", wma->outbih->biPlanes); TRACE("bih.biBitCount=%d\n", wma->outbih->biBitCount); - 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); + 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);
wma->outdata = HeapAlloc(GetProcessHeap(), 0, wma->outbih->biSizeImage); if (!wma->outdata) { @@ -512,7 +512,7 @@ static void CALLBACK MCIAVI_waveCallback(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwIn break; case WOM_DONE: InterlockedIncrement(&wma->dwEventCount); - TRACE("Returning waveHdr=%lx\n", dwParam1); + TRACE("Returning waveHdr=%Ix\n", dwParam1); SetEvent(wma->hEvent); break; default: @@ -531,7 +531,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 %d\n", dwRet); + TRACE("Can't open low level audio device %ld\n", dwRet); dwRet = MCIERR_DEVICE_OPEN; wma->hWave = 0; goto cleanUp; @@ -576,7 +576,7 @@ void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) { if (!wma->lpAudioIndex) return; - TRACE("%d (ec=%u)\n", wma->lpAudioIndex[wma->dwCurrAudioBlock].dwOffset, wma->dwEventCount); + TRACE("%ld (ec=%lu)\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 && @@ -609,7 +609,7 @@ double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) if (!hDC || !wma->inbih) return 0;
- TRACE("Painting frame %u (cached %u)\n", wma->dwCurrVideoFrame, wma->dwCachedFrame); + TRACE("Painting frame %lu (cached %lu)\n", wma->dwCurrVideoFrame, wma->dwCachedFrame);
if (wma->dwCurrVideoFrame != wma->dwCachedFrame) { diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index d48dbb1357a..643478f018d 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi);
static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam); + TRACE("hwnd=%p msg=%x wparam=%Ix lparam=%Ix\n", hWnd, uMsg, wParam, lParam);
switch (uMsg) { case WM_CREATE: @@ -137,7 +137,7 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd;
- TRACE("(%04x, %08X, %p, style %x, parent %p, dimensions %dx%d, hwnd %p)\n", wma->wDevID, + TRACE("(%04x, %08lX, %p, style %lx, parent %p, dimensions %ldx%ld, hwnd %p)\n", wma->wDevID, dwFlags, lpParms, dwStyle, hParent, rc.right - rc.left, rc.bottom - rc.top, wma->hWnd); return wma->hWnd != 0; } @@ -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, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -206,7 +206,7 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); RECT rc;
- TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lx, %p)\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -273,7 +273,7 @@ DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpPar { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID);
- TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms);
if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;