Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/dmime/Makefile.in | 1 - dlls/dmime/audiopath.c | 10 +++--- dlls/dmime/dmobject.c | 20 ++++++------ dlls/dmime/graph.c | 8 ++--- dlls/dmime/lyricstrack.c | 32 +++++++++--------- dlls/dmime/markertrack.c | 14 ++++---- dlls/dmime/paramcontroltrack.c | 24 +++++++------- dlls/dmime/performance.c | 60 +++++++++++++++++----------------- dlls/dmime/segment.c | 58 ++++++++++++++++---------------- dlls/dmime/segmentstate.c | 8 ++--- dlls/dmime/segtriggertrack.c | 34 +++++++++---------- dlls/dmime/seqtrack.c | 24 +++++++------- dlls/dmime/sysextrack.c | 24 +++++++------- dlls/dmime/tempotrack.c | 26 +++++++-------- dlls/dmime/timesigtrack.c | 16 ++++----- dlls/dmime/wavetrack.c | 50 ++++++++++++++-------------- 16 files changed, 204 insertions(+), 205 deletions(-)
diff --git a/dlls/dmime/Makefile.in b/dlls/dmime/Makefile.in index 4098a2c9fdb..51d1492585f 100644 --- a/dlls/dmime/Makefile.in +++ b/dlls/dmime/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dmime.dll IMPORTS = dxguid uuid dsound ole32 user32 advapi32
diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 078d843d466..5018be9d453 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -94,7 +94,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_AddRef (IDirectMusicAudioPath *ifa struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p): ref=%ld\n", This, ref);
DMIME_LockModule(); return ref; @@ -105,7 +105,7 @@ static ULONG WINAPI IDirectMusicAudioPathImpl_Release (IDirectMusicAudioPath *if struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref);
if (ref == 0) { if (This->pPrimary) @@ -126,7 +126,7 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); HRESULT hr;
- FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), + FIXME("(%p, %ld, %ld, %ld, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); switch (dwStage) { @@ -238,14 +238,14 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_Activate(IDirectMusicAudioPath * static HRESULT WINAPI IDirectMusicAudioPathImpl_SetVolume (IDirectMusicAudioPath *iface, LONG lVolume, DWORD dwDuration) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %i, %d): stub\n", This, lVolume, dwDuration); + FIXME("(%p, %li, %ld): stub\n", This, lVolume, dwDuration); return S_OK; }
static HRESULT WINAPI IDirectMusicAudioPathImpl_ConvertPChannel (IDirectMusicAudioPath *iface, DWORD dwPChannelIn, DWORD* pdwPChannelOut) { struct IDirectMusicAudioPathImpl *This = impl_from_IDirectMusicAudioPath(iface); - FIXME("(%p, %d, %p): stub\n", This, dwPChannelIn, pdwPChannelOut); + FIXME("(%p, %ld, %p): stub\n", This, dwPChannelIn, pdwPChannelOut); return S_OK; }
diff --git a/dlls/dmime/dmobject.c b/dlls/dmime/dmobject.c index e6a1ce906a7..b526b23d031 100644 --- a/dlls/dmime/dmobject.c +++ b/dlls/dmime/dmobject.c @@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) return;
TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); - TRACE_(dmfile)(" - dwSize = %u\n", desc->dwSize); + TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ") - TRACE_(dmfile)(" - dwValidData = %#08x ( ", desc->dwValidData); + TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData); X(DMUS_OBJ_OBJECT); X(DMUS_OBJ_CLASS); X(DMUS_OBJ_NAME); @@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk) return "(null)"; if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST) type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type)); - return wine_dbg_sprintf("%s chunk, %ssize %u", debugstr_fourcc(chunk->id), type, chunk->size); + return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size); }
static HRESULT stream_read(IStream *stream, void *data, ULONG size) @@ -295,10 +295,10 @@ static HRESULT stream_read(IStream *stream, void *data, ULONG size)
hr = IStream_Read(stream, data, size, &read); if (FAILED(hr)) - TRACE_(dmfile)("IStream_Read failed: %08x\n", hr); + TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr); else if (!read && read < size) { /* All or nothing: Handle a partial read due to end of stream as an error */ - TRACE_(dmfile)("Short read: %u < %u\n", read, size); + TRACE_(dmfile)("Short read: %lu < %lu\n", read, size); return E_FAIL; }
@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD)))) return hr; if (size != elem_size) { - WARN_(dmfile)("%s: Array element size mismatch: got %u, expected %u\n", + WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n", debugstr_chunk(chunk), size, elem_size); return DMUS_E_UNSUPPORTED_STREAM; } @@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, ULONG size) { if (chunk->size != size) { - WARN_(dmfile)("Chunk %s (size %u, offset %s) doesn't contains the expected data size %u\n", + WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n", debugstr_fourcc(chunk->id), chunk->size, wine_dbgstr_longlong(chunk->offset.QuadPart), size); return E_FAIL; @@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, struct chunk_entry chunk = {.parent = riff}; HRESULT hr;
- TRACE("Looking for %#x in %p: %s\n", supported, stream, debugstr_chunk(riff)); + TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
desc->dwValidData = 0; desc->dwSize = sizeof(*desc); @@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, break; } } - TRACE("Found %#x\n", desc->dwValidData); + TRACE("Found %#lx\n", desc->dwValidData);
return hr; } @@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, WARN("Failed to read data of %s\n", debugstr_chunk(&chunk)); return hr; } - TRACE("REFERENCE guidClassID %s, dwValidData %#x\n", debugstr_dmguid(&reference.guidClassID), + TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID), reference.dwValidData);
if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData))) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 85eef9c091d..526163e5b54 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -73,7 +73,7 @@ static ULONG WINAPI DirectMusicGraph_AddRef(IDirectMusicGraph *iface) IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref);
DMIME_LockModule(); return ref; @@ -84,7 +84,7 @@ static ULONG WINAPI DirectMusicGraph_Release(IDirectMusicGraph *iface) IDirectMusicGraphImpl *This = impl_from_IDirectMusicGraph(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref);
if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -108,7 +108,7 @@ static HRESULT WINAPI DirectMusicGraph_InsertTool(IDirectMusicGraph *iface, IDir LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pNewTool = NULL;
- FIXME("(%p, %p, %p, %d, %i): use of pdwPChannels\n", This, pTool, pdwPChannels, cPChannels, lIndex); + FIXME("(%p, %p, %p, %ld, %li): use of pdwPChannels\n", This, pTool, pdwPChannels, cPChannels, lIndex);
if (!pTool) return E_POINTER; @@ -150,7 +150,7 @@ static HRESULT WINAPI DirectMusicGraph_GetTool(IDirectMusicGraph *iface, DWORD d struct list* pEntry = NULL; LPDMUS_PRIVATE_GRAPH_TOOL pIt = NULL;
- TRACE("(%p, %d, %p)\n", This, dwIndex, ppTool); + TRACE("(%p, %ld, %p)\n", This, dwIndex, ppTool);
LIST_FOR_EACH (pEntry, &This->Tools) { diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index b2ce3e0a4c1..769713a6ba1 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -70,7 +70,7 @@ static ULONG WINAPI lyrics_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI lyrics_track_Release(IDirectMusicTrack8 *iface) IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -102,7 +102,7 @@ static HRESULT WINAPI lyrics_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; }
@@ -118,7 +118,7 @@ static HRESULT WINAPI lyrics_track_Play(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; }
@@ -127,7 +127,7 @@ static HRESULT WINAPI lyrics_track_GetParam(IDirectMusicTrack8 *iface, REFGUID t { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; }
@@ -136,7 +136,7 @@ static HRESULT WINAPI lyrics_track_SetParam(IDirectMusicTrack8 *iface, REFGUID t { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; }
@@ -169,7 +169,7 @@ static HRESULT WINAPI lyrics_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME m MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
@@ -178,7 +178,7 @@ static HRESULT WINAPI lyrics_track_PlayEx(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -188,7 +188,7 @@ static HRESULT WINAPI lyrics_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -197,7 +197,7 @@ static HRESULT WINAPI lyrics_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI lyrics_track_Compose(IDirectMusicTrack8 *iface, IUnknown * { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; }
@@ -215,7 +215,7 @@ static HRESULT WINAPI lyrics_track_Join(IDirectMusicTrack8 *iface, IDirectMusicT MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicLyricsTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -267,10 +267,10 @@ static HRESULT parse_lyrics_track_events(IDirectMusicLyricsTrack *This, IStream }
TRACE("Found DMUS_IO_LYRICSTRACK_EVENTHEADER\n"); - TRACE(" - dwFlags 0x%08x\n", header.dwFlags); - TRACE(" - dwTimingFlags 0x%08x\n", header.dwTimingFlags); - TRACE(" - lTimeLogical %d\n", header.lTimeLogical); - TRACE(" - lTimePhysical %d\n", header.lTimePhysical); + TRACE(" - dwFlags %#lx\n", header.dwFlags); + TRACE(" - dwTimingFlags %#lx\n", header.dwTimingFlags); + TRACE(" - lTimeLogical %ld\n", header.lTimeLogical); + TRACE(" - lTimePhysical %ld\n", header.lTimePhysical);
if (FAILED(hr = stream_next_chunk(stream, &child))) return hr; diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index f41bed668a6..cfb788ccf50 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -64,7 +64,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -74,7 +74,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; }
@@ -113,7 +113,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; }
@@ -122,7 +122,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface);
- TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param);
if (!param) return E_POINTER; @@ -144,7 +144,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface);
- TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; }
@@ -183,7 +183,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSI MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 8fb3d40332f..c0aed374101 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI paramcontrol_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI paramcontrol_track_Release(IDirectMusicTrack8 *iface) IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -98,7 +98,7 @@ static HRESULT WINAPI paramcontrol_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; }
@@ -114,7 +114,7 @@ static HRESULT WINAPI paramcontrol_track_Play(IDirectMusicTrack8 *iface, void *p IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; }
@@ -123,7 +123,7 @@ static HRESULT WINAPI paramcontrol_track_GetParam(IDirectMusicTrack8 *iface, REF { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; }
@@ -132,7 +132,7 @@ static HRESULT WINAPI paramcontrol_track_SetParam(IDirectMusicTrack8 *iface, REF { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return DMUS_E_SET_UNSUPPORTED; }
@@ -166,7 +166,7 @@ static HRESULT WINAPI paramcontrol_track_Clone(IDirectMusicTrack8 *iface, MUSIC_ MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
@@ -175,7 +175,7 @@ static HRESULT WINAPI paramcontrol_track_PlayEx(IDirectMusicTrack8 *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -185,7 +185,7 @@ static HRESULT WINAPI paramcontrol_track_GetParamEx(IDirectMusicTrack8 *iface, R DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -194,7 +194,7 @@ static HRESULT WINAPI paramcontrol_track_SetParamEx(IDirectMusicTrack8 *iface, R REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -204,7 +204,7 @@ static HRESULT WINAPI paramcontrol_track_Compose(IDirectMusicTrack8 *iface, IUnk { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; }
@@ -213,7 +213,7 @@ static HRESULT WINAPI paramcontrol_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack **resulttrack) { IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 58d16de234d..f59be107c58 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -103,7 +103,7 @@ static DMUS_PMSGItem* ProceedMsg(IDirectMusicPerformance8Impl* This, DMUS_PMSGIt case DMUS_PMSGT_TEMPO: case DMUS_PMSGT_STOP: default: - FIXME("Unhandled PMsg Type: 0x%x\n", cur->pMsg.dwType); + FIXME("Unhandled PMsg Type: %#lx\n", cur->pMsg.dwType); break; } return cur; @@ -276,7 +276,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_AddRef(IDirectMusicPerformance8 IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p): AddRef from %d\n", This, ref - 1); + TRACE("(%p): ref=%ld\n", This, ref);
DMIME_LockModule();
@@ -288,7 +288,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p): ReleaseRef to %d\n", This, ref); + TRACE("(%p): ref=%ld\n", This, ref);
if (ref == 0) { wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); @@ -318,7 +318,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegment(IDirectMusicPerfo { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %p, %d, 0x%s, %p): stub\n", This, pSegment, dwFlags, + FIXME("(%p, %p, %ld, 0x%s, %p): stub\n", This, pSegment, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState); if (ppSegmentState) return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); @@ -331,7 +331,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Stop(IDirectMusicPerformance8 { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %p, %p, %d, %d): stub\n", This, pSegment, pSegmentState, mtTime, dwFlags); + FIXME("(%p, %p, %p, %ld, %ld): stub\n", This, pSegment, pSegmentState, mtTime, dwFlags); return S_OK; }
@@ -340,7 +340,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetSegmentState(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p,%p, %d): stub\n", This, ppSegmentState, mtTime); + FIXME("(%p,%p, %ld): stub\n", This, ppSegmentState, mtTime); return S_OK; }
@@ -349,7 +349,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetPrepareTime(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- TRACE("(%p, %d)\n", This, dwMilliSeconds); + TRACE("(%p, %ld)\n", This, dwMilliSeconds); This->dwPrepareTime = dwMilliSeconds; return S_OK; } @@ -372,7 +372,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetBumperLength(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- TRACE("(%p, %d)\n", This, dwMilliSeconds); + TRACE("(%p, %ld)\n", This, dwMilliSeconds); This->dwBumperLength = dwMilliSeconds; return S_OK; } @@ -447,7 +447,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_MusicToReferenceTime(IDirectM { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %d, %p): stub\n", This, mtTime, prtTime); + FIXME("(%p, %ld, %p): stub\n", This, mtTime, prtTime); return S_OK; }
@@ -496,9 +496,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AllocPMsg(IDirectMusicPerform { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); DMUS_PMSGItem* pItem = NULL; - - FIXME("(%p, %d, %p): stub\n", This, cb, ppPMSG); - + + FIXME("(%p, %ld, %p): stub\n", This, cb, ppPMSG); + if (sizeof(DMUS_PMSG) > cb) { return E_INVALIDARG; } @@ -698,7 +698,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMu { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + FIXME("(%p, %ld, %p, %ld): semi-stub\n", This, block_num, port, group);
if (!port) return E_POINTER; @@ -716,7 +716,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPe IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); struct pchannel_block *block;
- FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); + FIXME("(%p)->(%ld, %p, %ld, %ld) semi-stub\n", This, pchannel, port, group, channel);
if (!port) return E_POINTER; @@ -739,7 +739,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerf DWORD block_num = pchannel / 16; unsigned int index = pchannel % 16;
- TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); + TRACE("(%p)->(%ld, %p, %p, %p)\n", This, pchannel, port, group, channel);
entry = wine_rb_get(&This->pchannels, &block_num); if (!entry) @@ -765,7 +765,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_DownloadInstrument(IDirectMus { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %p, %d, %p, %p, %d, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); + FIXME("(%p, %p, %ld, %p, %p, %ld, %p, %p, %p): stub\n", This, pInst, dwPChannel, ppDownInst, pNoteRanges, dwNumNoteRanges, ppPort, pdwGroup, pdwMChannel); return S_OK; }
@@ -774,7 +774,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Invalidate(IDirectMusicPerfor { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %d, %d): stub\n", This, mtTime, dwFlags); + FIXME("(%p, %ld, %ld): stub\n", This, mtTime, dwFlags); return S_OK; }
@@ -784,7 +784,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetParam(IDirectMusicPerforma { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %s, %d, %d, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pmtNext, pParam); return S_OK; }
@@ -793,7 +793,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetParam(IDirectMusicPerforma { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %s, %d, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; }
@@ -802,8 +802,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetGlobalParam(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- TRACE("(%p, %s, %p, %d): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); - + TRACE("(%p, %s, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), pParam, dwSize); + if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) memcpy(pParam, &This->fAutoDownload, sizeof(This->fAutoDownload)); if (IsEqualGUID (rguidType, &GUID_PerfMasterGrooveLevel)) @@ -821,8 +821,8 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGlobalParam(IDirectMusicPe { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- TRACE("(%p, %s, %p, %d)\n", This, debugstr_dmguid(rguidType), pParam, dwSize); - + TRACE("(%p, %s, %p, %ld)\n", This, debugstr_dmguid(rguidType), pParam, dwSize); + if (IsEqualGUID (rguidType, &GUID_PerfAutoDownload)) { memcpy(&This->fAutoDownload, pParam, dwSize); TRACE("=> AutoDownload set to %d\n", This->fAutoDownload); @@ -900,7 +900,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetResolvedTime(IDirectMusicP { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, 0x%s, %p, %d): stub\n", This, wine_dbgstr_longlong(rtTime), + FIXME("(%p, 0x%s, %p, %ld): stub\n", This, wine_dbgstr_longlong(rtTime), prtResolved, dwTimeResolveFlags); return S_OK; } @@ -931,7 +931,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_TimeToRhythm(IDirectMusicPerf { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %d, %p, %p, %p, %p, %p): stub\n", This, mtTime, pTimeSig, pwMeasure, pbBeat, pbGrid, pnOffset); + FIXME("(%p, %ld, %p, %p, %p, %p, %p): stub\n", This, mtTime, pTimeSig, pwMeasure, pbBeat, pbGrid, pnOffset); return S_OK; }
@@ -953,7 +953,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio(IDirectMusicPerform IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); HRESULT hr = S_OK;
- TRACE("(%p, %p, %p, %p, %x, %u, %x, %p)\n", This, dmusic, dsound, hwnd, default_path_type, + TRACE("(%p, %p, %p, %p, %lx, %lu, %lx, %p)\n", This, dmusic, dsound, hwnd, default_path_type, num_channels, flags, params);
if (This->dmusic) @@ -1038,7 +1038,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_PlaySegmentEx(IDirectMusicPer { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %p, %p, %p, %d, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, + FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath); if (ppSegmentState) return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); @@ -1050,7 +1050,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_StopEx(IDirectMusicPerformanc { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %p, 0x%s, %d): stub\n", This, pObjectToStop, + FIXME("(%p, %p, 0x%s, %ld): stub\n", This, pObjectToStop, wine_dbgstr_longlong(i64StopTime), dwFlags); return S_OK; } @@ -1097,7 +1097,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire IDirectSoundBuffer *buffer, *primary_buffer; HRESULT hr = S_OK;
- FIXME("(%p)->(%d, %d, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath); + FIXME("(%p)->(%ld, %ld, %d, %p): semi-stub\n", This, dwType, pchannel_count, fActivate, ppNewPath);
if (NULL == ppNewPath) { return E_POINTER; @@ -1222,7 +1222,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_GetParamEx(IDirectMusicPerfor { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface);
- FIXME("(%p, %s, %d, %d, %d, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwTrackID, dwGroupBits, dwIndex, mtTime, pmtNext, pParam); + FIXME("(%p, %s, %ld, %ld, %ld, %ld, %p, %p): stub\n", This, debugstr_dmguid(rguidType), dwTrackID, dwGroupBits, dwIndex, mtTime, pmtNext, pParam);
return S_OK; } diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 326ffe98e18..8ec4059e8f9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -71,7 +71,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_AddRef(IDirectMusicSegment8 *iface) IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -81,7 +81,7 @@ static ULONG WINAPI IDirectMusicSegment8Impl_Release(IDirectMusicSegment8 *iface IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -109,7 +109,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetLength(IDirectMusicSegment8 *i { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
- TRACE("(%p, %d)\n", This, mtLength); + TRACE("(%p, %ld)\n", This, mtLength); This->header.mtLength = mtLength; return S_OK; } @@ -132,7 +132,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetRepeats(IDirectMusicSegment8 * { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
- TRACE("(%p, %d)\n", This, dwRepeats); + TRACE("(%p, %ld)\n", This, dwRepeats); This->header.dwRepeats = dwRepeats; return S_OK; } @@ -155,7 +155,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetDefaultResolution(IDirectMusic { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
- TRACE("(%p, %d)\n", This, dwResolution); + TRACE("(%p, %ld)\n", This, dwResolution); This->header.dwResolution = dwResolution; return S_OK; } @@ -170,7 +170,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if IPersistStream* pCLSIDStream = NULL; HRESULT hr = S_OK;
- TRACE("(%p, %s, %#x, %#x, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); + TRACE("(%p, %s, %#lx, %#lx, %p)\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack);
if (NULL == ppTrack) { return E_POINTER; @@ -178,7 +178,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrack(IDirectMusicSegment8 *if
LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#lx,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ; if (FALSE == IsEqualGUID(&GUID_NULL, rguidType)) { /** @@ -224,7 +224,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetTrackGroup(IDirectMusicSegment
LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - %p -> %#x, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - %p -> %#lx, %p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { *pdwGroupBits = pIt->dwGroupBits; return S_OK; @@ -243,7 +243,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LPDMUS_PRIVATE_SEGMENT_TRACK pIt = NULL; LPDMUS_PRIVATE_SEGMENT_TRACK pNewSegTrack = NULL;
- TRACE("(%p, %p, %#x)\n", This, pTrack, group); + TRACE("(%p, %p, %#lx)\n", This, pTrack, group);
if (!group) return E_INVALIDARG; @@ -251,7 +251,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InsertTrack(IDirectMusicSegment8 LIST_FOR_EACH (pEntry, &This->Tracks) { i++; pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); - TRACE(" - #%u: %p -> %#x, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); + TRACE(" - #%lu: %p -> %#lx, %p\n", i, pIt, pIt->dwGroupBits, pIt->pTrack); if (NULL != pIt && pIt->pTrack == pTrack) { ERR("(%p, %p): track is already in list\n", This, pTrack); return E_FAIL; @@ -303,7 +303,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_InitPlay(IDirectMusicSegment8 *if IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); HRESULT hr;
- FIXME("(%p, %p, %p, %d): semi-stub\n", This, ppSegState, pPerformance, dwFlags); + FIXME("(%p, %p, %p, %ld): semi-stub\n", This, ppSegState, pPerformance, dwFlags); if (NULL == ppSegState) { return E_POINTER; } @@ -376,7 +376,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetParam(IDirectMusicSegment8 *if unsigned int i, count; HRESULT hr = DMUS_E_TRACK_NOT_FOUND;
- TRACE("(%p, %s, %#x, %u, %d, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, + TRACE("(%p, %s, %#lx, %lu, %ld, %p, %p)\n", This, debugstr_dmguid(type), group, index, time, next, param);
if (!type) @@ -406,7 +406,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetParam(IDirectMusicSegment8 *if REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void *pParam) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %#x, %d, %d, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); + FIXME("(%p, %s, %#lx, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, mtTime, pParam); return S_OK; }
@@ -414,7 +414,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Clone(IDirectMusicSegment8 *iface MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicSegment **ppSegment) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppSegment); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppSegment); return S_OK; }
@@ -423,7 +423,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetStartPoint(IDirectMusicSegment { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
- TRACE("(%p, %d)\n", This, mtStart); + TRACE("(%p, %ld)\n", This, mtStart); if (mtStart >= This->header.mtLength) { return DMUS_E_OUT_OF_RANGE; } @@ -449,7 +449,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetLoopPoints(IDirectMusicSegment { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface);
- TRACE("(%p, %d, %d)\n", This, start, end); + TRACE("(%p, %ld, %ld)\n", This, start, end);
if ((end || start) && (start >= This->header.mtLength || end > This->header.mtLength || start > end)) @@ -479,7 +479,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetPChannelsUsed(IDirectMusicSegm DWORD dwNumPChannels, DWORD *paPChannels) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %p): stub\n", This, dwNumPChannels, paPChannels); + FIXME("(%p, %ld, %p): stub\n", This, dwNumPChannels, paPChannels); return S_OK; }
@@ -488,7 +488,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_SetTrackConfig(IDirectMusicSegmen DWORD dwFlagsOff) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %s, %#x, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %#lx, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; }
@@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_Compose(IDirectMusicSegment8 *ifa IDirectMusicSegment **ppComposedSegment) { IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - FIXME("(%p, %d, %p, %p, %p): stub\n", This, mtTime, pFromSegment, pToSegment, ppComposedSegment); + FIXME("(%p, %ld, %p, %p, %p): stub\n", This, mtTime, pFromSegment, pToSegment, ppComposedSegment); return S_OK; }
@@ -629,7 +629,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, return hr; TRACE("Found DMUS_IO_TRACK_HEADER\n"); TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); - TRACE("\tdwGroup: %#x\n", thdr.dwGroup); + TRACE("\tdwGroup: %#lx\n", thdr.dwGroup); TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType));
@@ -649,7 +649,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK && SUCCEEDED(stream_chunk_get_data(stream, &chunk, &txhdr, sizeof(txhdr)))) { FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not fully handled\n"); - TRACE("dwFlags: %#x, dwPriority: %u\n", txhdr.dwFlags, txhdr.dwPriority); + TRACE("dwFlags: %#lx, dwPriority: %lu\n", txhdr.dwFlags, txhdr.dwPriority); } } if (hr != S_OK) @@ -713,16 +713,16 @@ static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) else if (size == offsetof(DMUS_IO_SEGMENT_HEADER, rtLoopStart)) dx = 8; TRACE("Found DirectX%d DMUS_IO_SEGMENT_HEADER\n", dx); - TRACE("\tdwRepeats: %u\n", h->dwRepeats); - TRACE("\tmtLength: %u\n", h->mtLength); - TRACE("\tmtPlayStart: %u\n", h->mtPlayStart); - TRACE("\tmtLoopStart: %u\n", h->mtLoopStart); - TRACE("\tmtLoopEnd: %u\n", h->mtLoopEnd); - TRACE("\tdwResolution: %u\n", h->dwResolution); + TRACE("\tdwRepeats: %lu\n", h->dwRepeats); + TRACE("\tmtLength: %lu\n", h->mtLength); + TRACE("\tmtPlayStart: %lu\n", h->mtPlayStart); + TRACE("\tmtLoopStart: %lu\n", h->mtLoopStart); + TRACE("\tmtLoopEnd: %lu\n", h->mtLoopEnd); + TRACE("\tdwResolution: %lu\n", h->dwResolution); if (dx >= 8) { TRACE("\trtLength: %s\n", wine_dbgstr_longlong(h->rtLength)); - TRACE("\tdwFlags: %u\n", h->dwFlags); - TRACE("\tdwReserved: %u\n", h->dwReserved); + TRACE("\tdwFlags: %lu\n", h->dwFlags); + TRACE("\tdwReserved: %lu\n", h->dwReserved); } if (dx == 9) { TRACE("\trtLoopStart: %s\n", wine_dbgstr_longlong(h->rtLoopStart)); diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index edd7ed70f05..61347d8c1a2 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -61,7 +61,7 @@ static ULONG WINAPI DirectMusicSegmentState8_AddRef(IDirectMusicSegmentState8 *i IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref);
DMIME_LockModule();
@@ -73,7 +73,7 @@ static ULONG WINAPI DirectMusicSegmentState8_Release(IDirectMusicSegmentState8 * IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p): %d\n", This, ref); + TRACE("(%p): %ld\n", This, ref);
if (ref == 0) HeapFree(GetProcessHeap(), 0, This); @@ -120,13 +120,13 @@ static HRESULT WINAPI DirectMusicSegmentState8_GetStartPoint(IDirectMusicSegment
static HRESULT WINAPI DirectMusicSegmentState8_SetTrackConfig(IDirectMusicSegmentState8 *iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); + FIXME("(%p, %s, %ld, %ld, %ld, %ld): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); return S_OK; }
static HRESULT WINAPI DirectMusicSegmentState8_GetObjectInPath(IDirectMusicSegmentState8 *iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); + FIXME("(%p, %ld, %ld, %ld, %s, %ld, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); return S_OK; }
diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 9a7602f58db..14e013c8e16 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -76,7 +76,7 @@ static ULONG WINAPI segment_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { struct list *cursor, *cursor2; @@ -120,7 +120,7 @@ static HRESULT WINAPI segment_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; }
@@ -136,7 +136,7 @@ static HRESULT WINAPI segment_track_Play(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; }
@@ -145,7 +145,7 @@ static HRESULT WINAPI segment_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; }
@@ -154,7 +154,7 @@ static HRESULT WINAPI segment_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p): not supported\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): not supported\n", This, debugstr_dmguid(type), time, param); return S_OK; }
@@ -188,7 +188,7 @@ static HRESULT WINAPI segment_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
@@ -197,7 +197,7 @@ static HRESULT WINAPI segment_track_PlayEx(IDirectMusicTrack8 *iface, void *pSta IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -207,7 +207,7 @@ static HRESULT WINAPI segment_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUI DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -216,7 +216,7 @@ static HRESULT WINAPI segment_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUI REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -226,7 +226,7 @@ static HRESULT WINAPI segment_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; }
@@ -234,7 +234,7 @@ static HRESULT WINAPI segment_track_Join(IDirectMusicTrack8 *iface, IDirectMusic MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSegTriggerTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -282,10 +282,10 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st goto error;
TRACE("Found DMUS_IO_SEGMENT_ITEM_HEADER\n"); - TRACE("\tlTimePhysical: %u\n", item->header.lTimeLogical); - TRACE("\tlTimePhysical: %u\n", item->header.lTimePhysical); - TRACE("\tdwPlayFlags: %#08x\n", item->header.dwPlayFlags); - TRACE("\tdwFlags: %#08x\n", item->header.dwFlags); + TRACE("\tlTimePhysical: %lu\n", item->header.lTimeLogical); + TRACE("\tlTimePhysical: %lu\n", item->header.lTimePhysical); + TRACE("\tdwPlayFlags: %#08lx\n", item->header.dwPlayFlags); + TRACE("\tdwFlags: %#08lx\n", item->header.dwFlags);
/* Second chunk is a reference list */ if (stream_next_chunk(stream, &chunk) != S_OK || chunk.id != FOURCC_LIST || @@ -358,7 +358,7 @@ static HRESULT WINAPI trigger_IPersistStream_Load(IPersistStream *iface, IStream if (FAILED(hr)) return hr; if (header.dwFlags) - WARN("Got flags %#x; must be zero\n", header.dwFlags); + WARN("Got flags %#lx; must be zero\n", header.dwFlags);
if ((hr = stream_get_chunk(stream, &chunk)) != S_OK) return FAILED(hr) ? hr : DMUS_E_INVALID_SEGMENTTRIGGERTRACK; diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 5d9a579988d..3c4e2c22439 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI sequence_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI sequence_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI sequence_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; }
@@ -113,7 +113,7 @@ static HRESULT WINAPI sequence_track_Play(IDirectMusicTrack8 *iface, void *pStat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; }
@@ -122,7 +122,7 @@ static HRESULT WINAPI sequence_track_GetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI sequence_track_SetParam(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; }
@@ -166,7 +166,7 @@ static HRESULT WINAPI sequence_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
@@ -175,7 +175,7 @@ static HRESULT WINAPI sequence_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -185,7 +185,7 @@ static HRESULT WINAPI sequence_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -195,7 +195,7 @@ static HRESULT WINAPI sequence_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -205,7 +205,7 @@ static HRESULT WINAPI sequence_track_Compose(IDirectMusicTrack8 *iface, IUnknown { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; }
@@ -213,7 +213,7 @@ static HRESULT WINAPI sequence_track_Join(IDirectMusicTrack8 *iface, IDirectMusi MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 81d60f2a29e..ded348aede9 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -65,7 +65,7 @@ static ULONG WINAPI sysex_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI sysex_track_Release(IDirectMusicTrack8 *iface) IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -97,7 +97,7 @@ static HRESULT WINAPI sysex_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; }
@@ -113,7 +113,7 @@ static HRESULT WINAPI sysex_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; }
@@ -122,7 +122,7 @@ static HRESULT WINAPI sysex_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + TRACE("(%p, %s, %ld, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, next, param); return E_NOTIMPL; } @@ -132,7 +132,7 @@ static HRESULT WINAPI sysex_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); return E_NOTIMPL; }
@@ -165,7 +165,7 @@ static HRESULT WINAPI sysex_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
@@ -174,7 +174,7 @@ static HRESULT WINAPI sysex_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -184,7 +184,7 @@ static HRESULT WINAPI sysex_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), next, param, state, flags); return E_NOTIMPL; } @@ -194,7 +194,7 @@ static HRESULT WINAPI sysex_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + TRACE("(%p, %s, %s, %p, %p, %lx): method not implemented\n", This, debugstr_dmguid(type), wine_dbgstr_longlong(time), param, state, flags); return E_NOTIMPL; } @@ -204,7 +204,7 @@ static HRESULT WINAPI sysex_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; }
@@ -212,7 +212,7 @@ static HRESULT WINAPI sysex_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 57931bf1e56..0e8d5bcab48 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -72,7 +72,7 @@ static ULONG WINAPI tempo_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI tempo_track_Release(IDirectMusicTrack8 *iface) IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { heap_free(This->items); @@ -108,7 +108,7 @@ static HRESULT WINAPI tempo_track_InitPlay(IDirectMusicTrack8 *iface,
LPDMUS_PRIVATE_TEMPO_PLAY_STATE pState = NULL;
- FIXME("(%p, %p, %p, %p, %d, %d): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): semi-stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags);
pState = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_TEMPO_PLAY_STATE)); if (NULL == pState) @@ -141,7 +141,7 @@ static HRESULT WINAPI tempo_track_Play(IDirectMusicTrack8 *iface, void *pStateDa IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); /** should use IDirectMusicPerformance_SendPMsg here */ return S_OK; } @@ -153,7 +153,7 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty DMUS_TEMPO_PARAM *prm = param; unsigned int i;
- TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param);
if (!param) return E_POINTER; @@ -190,7 +190,7 @@ static HRESULT WINAPI tempo_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
if (IsEqualGUID(type, &GUID_DisableTempo)) { if (!param) @@ -250,7 +250,7 @@ static HRESULT WINAPI tempo_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
@@ -259,7 +259,7 @@ static HRESULT WINAPI tempo_track_PlayEx(IDirectMusicTrack8 *iface, void *pState IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -269,7 +269,7 @@ static HRESULT WINAPI tempo_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID DWORD dwFlags) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -278,7 +278,7 @@ static HRESULT WINAPI tempo_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -288,7 +288,7 @@ static HRESULT WINAPI tempo_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; }
@@ -297,7 +297,7 @@ static HRESULT WINAPI tempo_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr IDirectMusicTrack **ppResultTrack) { IDirectMusicTempoTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); + FIXME("(%p, %p, %ld, %p, %ld, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); return S_OK; }
@@ -351,7 +351,7 @@ static HRESULT WINAPI tempo_IPersistStream_Load(IPersistStream *iface, IStream *
for (i = 0; i < This->count; i++) { TRACE_(dmfile)("DMUS_IO_TEMPO_ITEM #%u\n", i); - TRACE_(dmfile)(" - lTime = %u\n", This->items[i].lTime); + TRACE_(dmfile)(" - lTime = %lu\n", This->items[i].lTime); TRACE_(dmfile)(" - dblTempo = %g\n", This->items[i].dblTempo); }
diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index c34049beb18..d6452e92e1b 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -83,7 +83,7 @@ static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { heap_free(This->items); @@ -107,7 +107,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; }
@@ -123,7 +123,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; }
@@ -132,7 +132,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface);
- TRACE("(%p, %s, %d, %p, %p)\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p)\n", This, debugstr_dmguid(type), time, next, param);
if (IsEqualGUID(type, &GUID_TimeSignature)) { FIXME("GUID_TimeSignature not handled yet\n"); @@ -147,7 +147,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface);
- TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
if (IsEqualGUID(type, &GUID_DisableTimeSig)) { FIXME("GUID_DisableTimeSig not handled yet\n"); @@ -197,7 +197,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSI MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
@@ -242,7 +242,7 @@ static HRESULT parse_timetrack_list(IDirectMusicTimeSigTrack *This, IStream *str for (i = 0; i < This->count; i++) { TRACE("Found DMUS_IO_TIMESIGNATURE_ITEM\n"); - TRACE(" - lTime %d\n", This->items[i].lTime); + TRACE(" - lTime %ld\n", This->items[i].lTime); TRACE(" - bBeatsPerMeasure %d\n", This->items[i].bBeatsPerMeasure); TRACE(" - bBeat %d\n", This->items[i].bBeat); TRACE(" - wGridsPerBeat %d\n", This->items[i].wGridsPerBeat); diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 454695ebfb6..171c3e5c6b7 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -85,7 +85,7 @@ static ULONG WINAPI wave_track_AddRef(IDirectMusicTrack8 *iface) IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -95,7 +95,7 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { struct wave_item *item, *item2; @@ -131,7 +131,7 @@ static HRESULT WINAPI wave_track_InitPlay(IDirectMusicTrack8 *iface, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); + FIXME("(%p, %p, %p, %p, %ld, %ld): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; }
@@ -147,7 +147,7 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateDat IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); + FIXME("(%p, %p, %ld, %ld, %ld, %ld, %p, %p, %ld): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; }
@@ -156,7 +156,7 @@ static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); + TRACE("(%p, %s, %ld, %p, %p): not supported\n", This, debugstr_dmguid(type), time, next, param); return DMUS_E_GET_UNSUPPORTED; }
@@ -165,7 +165,7 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(type), time, param); + TRACE("(%p, %s, %ld, %p)\n", This, debugstr_dmguid(type), time, param);
if (IsEqualGUID(type, &GUID_Disable_Auto_Download)) { FIXME("GUID_Disable_Auto_Download not handled yet\n"); @@ -239,7 +239,7 @@ static HRESULT WINAPI wave_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); + FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; }
@@ -248,7 +248,7 @@ static HRESULT WINAPI wave_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateD IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %ld, %p, %p, %ld): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -258,7 +258,7 @@ static HRESULT WINAPI wave_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID r DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); return S_OK; } @@ -267,7 +267,7 @@ static HRESULT WINAPI wave_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), + FIXME("(%p, %s, 0x%s, %p, %p, %ld): stub\n", This, debugstr_dmguid(rguidType), wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); return S_OK; } @@ -277,7 +277,7 @@ static HRESULT WINAPI wave_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
- TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + TRACE("(%p, %p, %ld, %p): method not implemented\n", This, context, trackgroup, track); return E_NOTIMPL; }
@@ -285,7 +285,7 @@ static HRESULT WINAPI wave_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) { IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + TRACE("(%p, %p, %ld, %p, %ld, %p): method not implemented\n", This, newtrack, join, context, trackgroup, resulttrack); return E_NOTIMPL; } @@ -341,15 +341,15 @@ static HRESULT parse_wave_item(struct wave_part *part, IStream *stream, struct c }
TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); - TRACE("\tlVolume %d\n", item->header.lVolume); - TRACE("\tdwVariations %d\n", item->header.dwVariations); + TRACE("\tlVolume %ld\n", item->header.lVolume); + TRACE("\tdwVariations %ld\n", item->header.dwVariations); TRACE("\trtTime %s\n", wine_dbgstr_longlong(item->header.rtTime)); TRACE("\trtStartOffset %s\n", wine_dbgstr_longlong(item->header.rtStartOffset)); TRACE("\trtReserved %s\n", wine_dbgstr_longlong(item->header.rtReserved)); TRACE("\trtDuration %s\n", wine_dbgstr_longlong(item->header.rtDuration)); - TRACE("\tdwLoopStart %d\n", item->header.dwLoopStart); - TRACE("\tdwLoopEnd %d\n", item->header.dwLoopEnd); - TRACE("\tdwFlags %#08x\n", item->header.dwFlags); + TRACE("\tdwLoopStart %ld\n", item->header.dwLoopStart); + TRACE("\tdwLoopEnd %ld\n", item->header.dwLoopEnd); + TRACE("\tdwFlags %#08lx\n", item->header.dwFlags); TRACE("\twVolumeRange %d\n", item->header.wVolumeRange); TRACE("\twPitchRange %d\n", item->header.wPitchRange);
@@ -394,12 +394,12 @@ static HRESULT parse_wave_part(IDirectMusicWaveTrack *This, IStream *stream, }
TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); - TRACE("\tlVolume %d\n", part->header.lVolume); - TRACE("\tdwVariations %d\n", part->header.dwVariations); - TRACE("\tdwPChannel %d\n", part->header.dwPChannel); - TRACE("\tdwLockToPart %d\n", part->header.dwLockToPart); - TRACE("\tdwFlags %#08x\n", part->header.dwFlags); - TRACE("\tdwIndex %d\n", part->header.dwIndex); + TRACE("\tlVolume %ld\n", part->header.lVolume); + TRACE("\tdwVariations %ld\n", part->header.dwVariations); + TRACE("\tdwPChannel %ld\n", part->header.dwPChannel); + TRACE("\tdwLockToPart %ld\n", part->header.dwLockToPart); + TRACE("\tdwFlags %#08lx\n", part->header.dwFlags); + TRACE("\tdwIndex %ld\n", part->header.dwIndex);
/* Array of wave items */ while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) @@ -447,8 +447,8 @@ static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *s return hr;
TRACE("Found DMUS_IO_WAVE_TRACK_HEADER\n"); - TRACE("\tlVolume %d\n", This->header.lVolume); - TRACE("\tdwFlags %#08x\n", This->header.dwFlags); + TRACE("\tlVolume %ld\n", This->header.lVolume); + TRACE("\tdwFlags %#08lx\n", This->header.dwFlags);
/* Array of wave parts */ while ((hr = stream_next_chunk(stream, &chunk)) == S_OK)