Skip to content

W
wine-cw
Commit 73a05ffb authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard
Browse files
Options

dmstyle: Enable compilation with long types.

Signed-off-by: 's avatarEric Pouech <eric.pouech@gmail.com> Signed-off-by: 's avatarMichael Stefaniuc <mstefani@winehq.org> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 223d76cd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 140 deletions
dlls/dmstyle/Makefile.in
View file @ 73a05ffb
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = dmstyle.dll MODULE = dmstyle.dll
IMPORTS = dxguid uuid ole32 advapi32 IMPORTS = dxguid uuid ole32 advapi32
......
dlls/dmstyle/auditiontrack.c
View file @ 73a05ffb
...@@ -65,7 +65,7 @@ static ULONG WINAPI audition_track_AddRef(IDirectMusicTrack8 *iface) ...@@ -65,7 +65,7 @@ static ULONG WINAPI audition_track_AddRef(IDirectMusicTrack8 *iface)
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -75,7 +75,7 @@ static ULONG WINAPI audition_track_Release(IDirectMusicTrack8 *iface) ...@@ -75,7 +75,7 @@ static ULONG WINAPI audition_track_Release(IDirectMusicTrack8 *iface)
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -97,7 +97,7 @@ static HRESULT WINAPI audition_track_InitPlay(IDirectMusicTrack8 *iface, ...@@ -97,7 +97,7 @@ static HRESULT WINAPI audition_track_InitPlay(IDirectMusicTrack8 *iface,
void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *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; return S_OK;
} }
...@@ -113,7 +113,7 @@ static HRESULT WINAPI audition_track_Play(IDirectMusicTrack8 *iface, void *pStat ...@@ -113,7 +113,7 @@ static HRESULT WINAPI audition_track_Play(IDirectMusicTrack8 *iface, void *pStat
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *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; return S_OK;
} }
...@@ -122,7 +122,7 @@ static HRESULT WINAPI audition_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ...@@ -122,7 +122,7 @@ static HRESULT WINAPI audition_track_GetParam(IDirectMusicTrack8 *iface, REFGUID
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -143,7 +143,7 @@ static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ...@@ -143,7 +143,7 @@ static HRESULT WINAPI audition_track_SetParam(IDirectMusicTrack8 *iface, REFGUID
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -208,7 +208,7 @@ static HRESULT WINAPI audition_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME ...@@ -208,7 +208,7 @@ static HRESULT WINAPI audition_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *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; return S_OK;
} }
...@@ -217,7 +217,7 @@ static HRESULT WINAPI audition_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt ...@@ -217,7 +217,7 @@ static HRESULT WINAPI audition_track_PlayEx(IDirectMusicTrack8 *iface, void *pSt
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *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); wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
} }
...@@ -227,7 +227,7 @@ static HRESULT WINAPI audition_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU ...@@ -227,7 +227,7 @@ static HRESULT WINAPI audition_track_GetParamEx(IDirectMusicTrack8 *iface, REFGU
DWORD dwFlags) DWORD dwFlags)
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *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); wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -236,7 +236,7 @@ static HRESULT WINAPI audition_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU ...@@ -236,7 +236,7 @@ static HRESULT WINAPI audition_track_SetParamEx(IDirectMusicTrack8 *iface, REFGU
REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *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); wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -246,7 +246,7 @@ static HRESULT WINAPI audition_track_Compose(IDirectMusicTrack8 *iface, IUnknown ...@@ -246,7 +246,7 @@ static HRESULT WINAPI audition_track_Compose(IDirectMusicTrack8 *iface, IUnknown
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *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; return E_NOTIMPL;
} }
...@@ -254,7 +254,7 @@ static HRESULT WINAPI audition_track_Join(IDirectMusicTrack8 *iface, IDirectMusi ...@@ -254,7 +254,7 @@ static HRESULT WINAPI audition_track_Join(IDirectMusicTrack8 *iface, IDirectMusi
MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
{ {
IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicAuditionTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup, TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup,
resulttrack); resulttrack);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/dmstyle/chordtrack.c
View file @ 73a05ffb
...@@ -68,7 +68,7 @@ static ULONG WINAPI chord_track_AddRef(IDirectMusicTrack8 *iface) ...@@ -68,7 +68,7 @@ static ULONG WINAPI chord_track_AddRef(IDirectMusicTrack8 *iface)
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -78,7 +78,7 @@ static ULONG WINAPI chord_track_Release(IDirectMusicTrack8 *iface) ...@@ -78,7 +78,7 @@ static ULONG WINAPI chord_track_Release(IDirectMusicTrack8 *iface)
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -100,7 +100,7 @@ static HRESULT WINAPI chord_track_InitPlay(IDirectMusicTrack8 *iface, ...@@ -100,7 +100,7 @@ static HRESULT WINAPI chord_track_InitPlay(IDirectMusicTrack8 *iface,
void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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; return S_OK;
} }
...@@ -116,7 +116,7 @@ static HRESULT WINAPI chord_track_Play(IDirectMusicTrack8 *iface, void *pStateDa ...@@ -116,7 +116,7 @@ static HRESULT WINAPI chord_track_Play(IDirectMusicTrack8 *iface, void *pStateDa
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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; return S_OK;
} }
...@@ -125,7 +125,7 @@ static HRESULT WINAPI chord_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty ...@@ -125,7 +125,7 @@ static HRESULT WINAPI chord_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -146,7 +146,7 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty ...@@ -146,7 +146,7 @@ static HRESULT WINAPI chord_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -194,7 +194,7 @@ static HRESULT WINAPI chord_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt ...@@ -194,7 +194,7 @@ static HRESULT WINAPI chord_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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; return S_OK;
} }
...@@ -203,7 +203,7 @@ static HRESULT WINAPI chord_track_PlayEx(IDirectMusicTrack8 *iface, void *pState ...@@ -203,7 +203,7 @@ static HRESULT WINAPI chord_track_PlayEx(IDirectMusicTrack8 *iface, void *pState
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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); wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
} }
...@@ -213,7 +213,7 @@ static HRESULT WINAPI chord_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID ...@@ -213,7 +213,7 @@ static HRESULT WINAPI chord_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID
DWORD dwFlags) DWORD dwFlags)
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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); wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -222,7 +222,7 @@ static HRESULT WINAPI chord_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID ...@@ -222,7 +222,7 @@ static HRESULT WINAPI chord_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID
REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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); wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -232,7 +232,7 @@ static HRESULT WINAPI chord_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c ...@@ -232,7 +232,7 @@ static HRESULT WINAPI chord_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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; return E_NOTIMPL;
} }
...@@ -241,7 +241,7 @@ static HRESULT WINAPI chord_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr ...@@ -241,7 +241,7 @@ static HRESULT WINAPI chord_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr
IDirectMusicTrack **ppResultTrack) IDirectMusicTrack **ppResultTrack)
{ {
IDirectMusicChordTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicChordTrack *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; return S_OK;
} }
...@@ -284,12 +284,12 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_ ...@@ -284,12 +284,12 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_
do { do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) { switch (Chunk.fccID) {
case DMUS_FOURCC_CHORDTRACKHEADER_CHUNK: { case DMUS_FOURCC_CHORDTRACKHEADER_CHUNK: {
TRACE_(dmfile)(": Chord track header chunk\n"); TRACE_(dmfile)(": Chord track header chunk\n");
IStream_Read (pStm, &This->dwScale, sizeof(DWORD), NULL); IStream_Read (pStm, &This->dwScale, sizeof(DWORD), NULL);
TRACE_(dmfile)(" - dwScale: %d\n", This->dwScale); TRACE_(dmfile)(" - dwScale: %ld\n", This->dwScale);
break; break;
} }
case DMUS_FOURCC_CHORDTRACKBODY_CHUNK: { case DMUS_FOURCC_CHORDTRACKBODY_CHUNK: {
...@@ -302,28 +302,28 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_ ...@@ -302,28 +302,28 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_
TRACE_(dmfile)(": Chord track body chunk\n"); TRACE_(dmfile)(": Chord track body chunk\n");
IStream_Read (pStm, &sz, sizeof(DWORD), NULL); IStream_Read (pStm, &sz, sizeof(DWORD), NULL);
TRACE_(dmfile)(" - sizeof(DMUS_IO_CHORD): %d\n", sz); TRACE_(dmfile)(" - sizeof(DMUS_IO_CHORD): %ld\n", sz);
if (sz != sizeof(DMUS_IO_CHORD)) return E_FAIL; if (sz != sizeof(DMUS_IO_CHORD)) return E_FAIL;
IStream_Read (pStm, &body, sizeof(DMUS_IO_CHORD), NULL); IStream_Read (pStm, &body, sizeof(DMUS_IO_CHORD), NULL);
TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(body.wszName)); TRACE_(dmfile)(" - wszName: %s\n", debugstr_w(body.wszName));
TRACE_(dmfile)(" - mtTime: %u\n", body.mtTime); TRACE_(dmfile)(" - mtTime: %lu\n", body.mtTime);
TRACE_(dmfile)(" - wMeasure: %u\n", body.wMeasure); TRACE_(dmfile)(" - wMeasure: %u\n", body.wMeasure);
TRACE_(dmfile)(" - bBeat: %u\n", body.bBeat); TRACE_(dmfile)(" - bBeat: %u\n", body.bBeat);
TRACE_(dmfile)(" - bFlags: 0x%02x\n", body.bFlags); TRACE_(dmfile)(" - bFlags: 0x%02x\n", body.bFlags);
IStream_Read (pStm, &num, sizeof(DWORD), NULL); IStream_Read (pStm, &num, sizeof(DWORD), NULL);
TRACE_(dmfile)(" - # DMUS_IO_SUBCHORDS: %d\n", num); TRACE_(dmfile)(" - # DMUS_IO_SUBCHORDS: %ld\n", num);
IStream_Read (pStm, &sz, sizeof(DWORD), NULL); IStream_Read (pStm, &sz, sizeof(DWORD), NULL);
TRACE_(dmfile)(" - sizeof(DMUS_IO_SUBCHORDS): %d\n", sz); TRACE_(dmfile)(" - sizeof(DMUS_IO_SUBCHORDS): %ld\n", sz);
if (sz != sizeof(DMUS_IO_SUBCHORD)) return E_FAIL; if (sz != sizeof(DMUS_IO_SUBCHORD)) return E_FAIL;
for (it = 0; it < num; ++it) { for (it = 0; it < num; ++it) {
IStream_Read (pStm, &subchords, sizeof(DMUS_IO_SUBCHORD), NULL); IStream_Read (pStm, &subchords, sizeof(DMUS_IO_SUBCHORD), NULL);
TRACE_(dmfile)("DMUS_IO_SUBCHORD #%d\n", it+1); TRACE_(dmfile)("DMUS_IO_SUBCHORD #%ld\n", it+1);
TRACE_(dmfile)(" - dwChordPattern: %u\n", subchords.dwChordPattern); TRACE_(dmfile)(" - dwChordPattern: %lu\n", subchords.dwChordPattern);
TRACE_(dmfile)(" - dwScalePattern: %u\n", subchords.dwScalePattern); TRACE_(dmfile)(" - dwScalePattern: %lu\n", subchords.dwScalePattern);
TRACE_(dmfile)(" - dwInversionPoints: %u\n", subchords.dwInversionPoints); TRACE_(dmfile)(" - dwInversionPoints: %lu\n", subchords.dwInversionPoints);
TRACE_(dmfile)(" - dwLevels: %u\n", subchords.dwLevels); TRACE_(dmfile)(" - dwLevels: %lu\n", subchords.dwLevels);
TRACE_(dmfile)(" - bChordRoot: %u\n", subchords.bChordRoot); TRACE_(dmfile)(" - bChordRoot: %u\n", subchords.bChordRoot);
TRACE_(dmfile)(" - bScaleRoot: %u\n", subchords.bScaleRoot); TRACE_(dmfile)(" - bScaleRoot: %u\n", subchords.bScaleRoot);
} }
...@@ -336,7 +336,7 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_ ...@@ -336,7 +336,7 @@ static HRESULT parse_chordtrack_list(IDirectMusicChordTrack *This, DMUS_PRIVATE_
break; break;
} }
} }
TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]); } while (ListCount[0] < ListSize[0]);
return S_OK; return S_OK;
...@@ -357,11 +357,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -357,11 +357,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
TRACE("(%p, %p): Loading\n", This, pStm); TRACE("(%p, %p): Loading\n", This, pStm);
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) { switch (Chunk.fccID) {
case FOURCC_LIST: { case FOURCC_LIST: {
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) { switch (Chunk.fccID) {
case DMUS_FOURCC_CHORDTRACK_LIST: { case DMUS_FOURCC_CHORDTRACK_LIST: {
TRACE_(dmfile)(": Chord track list\n"); TRACE_(dmfile)(": Chord track list\n");
......
dlls/dmstyle/commandtrack.c
View file @ 73a05ffb
...@@ -67,7 +67,7 @@ static ULONG WINAPI command_track_AddRef(IDirectMusicTrack8 *iface) ...@@ -67,7 +67,7 @@ static ULONG WINAPI command_track_AddRef(IDirectMusicTrack8 *iface)
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -77,7 +77,7 @@ static ULONG WINAPI command_track_Release(IDirectMusicTrack8 *iface) ...@@ -77,7 +77,7 @@ static ULONG WINAPI command_track_Release(IDirectMusicTrack8 *iface)
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -99,7 +99,7 @@ static HRESULT WINAPI command_track_InitPlay(IDirectMusicTrack8 *iface, ...@@ -99,7 +99,7 @@ static HRESULT WINAPI command_track_InitPlay(IDirectMusicTrack8 *iface,
void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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; return S_OK;
} }
...@@ -115,7 +115,7 @@ static HRESULT WINAPI command_track_Play(IDirectMusicTrack8 *iface, void *pState ...@@ -115,7 +115,7 @@ static HRESULT WINAPI command_track_Play(IDirectMusicTrack8 *iface, void *pState
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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; return S_OK;
} }
...@@ -124,7 +124,7 @@ static HRESULT WINAPI command_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ...@@ -124,7 +124,7 @@ static HRESULT WINAPI command_track_GetParam(IDirectMusicTrack8 *iface, REFGUID
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -148,7 +148,7 @@ static HRESULT WINAPI command_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ...@@ -148,7 +148,7 @@ static HRESULT WINAPI command_track_SetParam(IDirectMusicTrack8 *iface, REFGUID
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -204,7 +204,7 @@ static HRESULT WINAPI command_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME ...@@ -204,7 +204,7 @@ static HRESULT WINAPI command_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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; return S_OK;
} }
...@@ -213,7 +213,7 @@ static HRESULT WINAPI command_track_PlayEx(IDirectMusicTrack8 *iface, void *pSta ...@@ -213,7 +213,7 @@ static HRESULT WINAPI command_track_PlayEx(IDirectMusicTrack8 *iface, void *pSta
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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); wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
} }
...@@ -223,7 +223,7 @@ static HRESULT WINAPI command_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUI ...@@ -223,7 +223,7 @@ static HRESULT WINAPI command_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUI
void *pStateData, DWORD dwFlags) void *pStateData, DWORD dwFlags)
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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); wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -232,7 +232,7 @@ static HRESULT WINAPI command_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUI ...@@ -232,7 +232,7 @@ static HRESULT WINAPI command_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUI
REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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); wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -242,7 +242,7 @@ static HRESULT WINAPI command_track_Compose(IDirectMusicTrack8 *iface, IUnknown ...@@ -242,7 +242,7 @@ static HRESULT WINAPI command_track_Compose(IDirectMusicTrack8 *iface, IUnknown
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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; return E_NOTIMPL;
} }
...@@ -251,7 +251,7 @@ static HRESULT WINAPI command_track_Join(IDirectMusicTrack8 *iface, IDirectMusic ...@@ -251,7 +251,7 @@ static HRESULT WINAPI command_track_Join(IDirectMusicTrack8 *iface, IDirectMusic
IDirectMusicTrack **ppResultTrack) IDirectMusicTrack **ppResultTrack)
{ {
IDirectMusicCommandTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicCommandTrack *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; return S_OK;
} }
...@@ -290,14 +290,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -290,14 +290,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL); IStream_Read (pStm, &chunkID, sizeof(FOURCC), NULL);
IStream_Read (pStm, &chunkSize, sizeof(DWORD), NULL); IStream_Read (pStm, &chunkSize, sizeof(DWORD), NULL);
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (chunkID), chunkSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (chunkID), chunkSize);
switch (chunkID) { switch (chunkID) {
case DMUS_FOURCC_COMMANDTRACK_CHUNK: { case DMUS_FOURCC_COMMANDTRACK_CHUNK: {
DWORD count; DWORD count;
TRACE_(dmfile)(": command track chunk\n"); TRACE_(dmfile)(": command track chunk\n");
IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL); IStream_Read (pStm, &dwSizeOfStruct, sizeof(DWORD), NULL);
if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) { if (dwSizeOfStruct != sizeof(DMUS_IO_COMMAND)) {
TRACE_(dmfile)(": declared size of struct (=%d) != actual size; indicates older direct music version\n", dwSizeOfStruct); TRACE_(dmfile)(": declared size of struct (=%ld) != actual size; indicates older direct music version\n", dwSizeOfStruct);
} }
chunkSize -= sizeof(DWORD); /* now chunk size is one DWORD shorter */ chunkSize -= sizeof(DWORD); /* now chunk size is one DWORD shorter */
nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */ nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */
...@@ -329,7 +329,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -329,7 +329,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
LIST_FOR_EACH (listEntry, &This->Commands) { LIST_FOR_EACH (listEntry, &This->Commands) {
tmpEntry = LIST_ENTRY (listEntry, DMUS_PRIVATE_COMMAND, entry); tmpEntry = LIST_ENTRY (listEntry, DMUS_PRIVATE_COMMAND, entry);
TRACE(" - Command[%i]:\n", r); TRACE(" - Command[%i]:\n", r);
TRACE(" - mtTime = %i\n", tmpEntry->pCommand.mtTime); TRACE(" - mtTime = %li\n", tmpEntry->pCommand.mtTime);
TRACE(" - wMeasure = %d\n", tmpEntry->pCommand.wMeasure); TRACE(" - wMeasure = %d\n", tmpEntry->pCommand.wMeasure);
TRACE(" - bBeat = %i\n", tmpEntry->pCommand.bBeat); TRACE(" - bBeat = %i\n", tmpEntry->pCommand.bBeat);
TRACE(" - bCommand = %i\n", tmpEntry->pCommand.bCommand); TRACE(" - bCommand = %i\n", tmpEntry->pCommand.bCommand);
......
dlls/dmstyle/dmobject.c
View file @ 73a05ffb
...@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc) ...@@ -226,10 +226,10 @@ void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
return; return;
TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc); 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 " ") #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_OBJECT);
X(DMUS_OBJ_CLASS); X(DMUS_OBJ_CLASS);
X(DMUS_OBJ_NAME); X(DMUS_OBJ_NAME);
...@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk) ...@@ -285,7 +285,7 @@ const char *debugstr_chunk(const struct chunk_entry *chunk)
return "(null)"; return "(null)";
if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST) if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type)); 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) static HRESULT stream_read(IStream *stream, void *data, ULONG size)
...@@ -295,10 +295,10 @@ 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); hr = IStream_Read(stream, data, size, &read);
if (FAILED(hr)) if (FAILED(hr))
TRACE_(dmfile)("IStream_Read failed: %08x\n", hr); TRACE_(dmfile)("IStream_Read failed: %08lx\n", hr);
else if (!read && read < size) { else if (!read && read < size) {
/* All or nothing: Handle a partial read due to end of stream as an error */ /* 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; return E_FAIL;
} }
...@@ -393,7 +393,7 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, ...@@ -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)))) if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
return hr; return hr;
if (size != elem_size) { 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); debugstr_chunk(chunk), size, elem_size);
return DMUS_E_UNSUPPORTED_STREAM; return DMUS_E_UNSUPPORTED_STREAM;
} }
...@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, ...@@ -420,7 +420,7 @@ HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk,
ULONG size) ULONG size)
{ {
if (chunk->size != 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, debugstr_fourcc(chunk->id), chunk->size,
wine_dbgstr_longlong(chunk->offset.QuadPart), size); wine_dbgstr_longlong(chunk->offset.QuadPart), size);
return E_FAIL; return E_FAIL;
...@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, ...@@ -567,7 +567,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
struct chunk_entry chunk = {.parent = riff}; struct chunk_entry chunk = {.parent = riff};
HRESULT hr; 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->dwValidData = 0;
desc->dwSize = sizeof(*desc); desc->dwSize = sizeof(*desc);
...@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff, ...@@ -612,7 +612,7 @@ HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
break; break;
} }
} }
TRACE("Found %#x\n", desc->dwValidData); TRACE("Found %#lx\n", desc->dwValidData);
return hr; return hr;
} }
...@@ -636,7 +636,7 @@ HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list, ...@@ -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)); WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
return hr; 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); reference.dwValidData);
if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData))) if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
......
dlls/dmstyle/dmutils.c
View file @ 73a05ffb
...@@ -167,7 +167,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, ...@@ -167,7 +167,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
do { do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
TRACE(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc); hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &ref_desc);
if (FAILED(hr)) return hr; if (FAILED(hr)) return hr;
...@@ -179,7 +179,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, ...@@ -179,7 +179,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL; if (Chunk.dwSize != sizeof(DMUS_IO_REFERENCE)) return E_FAIL;
IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL); IStream_Read (pStm, &ref, sizeof(DMUS_IO_REFERENCE), NULL);
TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID)); TRACE(" - guidClassID: %s\n", debugstr_dmguid(&ref.guidClassID));
TRACE(" - dwValidData: %u\n", ref.dwValidData); TRACE(" - dwValidData: %lu\n", ref.dwValidData);
break; break;
} }
default: { default: {
...@@ -190,7 +190,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface, ...@@ -190,7 +190,7 @@ HRESULT IDirectMusicUtils_IPersistStream_ParseReference (LPPERSISTSTREAM iface,
} }
} }
} }
TRACE(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); TRACE(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]); } while (ListCount[0] < ListSize[0]);
ref_desc.dwValidData |= DMUS_OBJ_CLASS; ref_desc.dwValidData |= DMUS_OBJ_CLASS;
......
dlls/dmstyle/motiftrack.c
View file @ 73a05ffb
...@@ -65,7 +65,7 @@ static ULONG WINAPI motif_track_AddRef(IDirectMusicTrack8 *iface) ...@@ -65,7 +65,7 @@ static ULONG WINAPI motif_track_AddRef(IDirectMusicTrack8 *iface)
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -75,7 +75,7 @@ static ULONG WINAPI motif_track_Release(IDirectMusicTrack8 *iface) ...@@ -75,7 +75,7 @@ static ULONG WINAPI motif_track_Release(IDirectMusicTrack8 *iface)
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -97,7 +97,7 @@ static HRESULT WINAPI motif_track_InitPlay(IDirectMusicTrack8 *iface, ...@@ -97,7 +97,7 @@ static HRESULT WINAPI motif_track_InitPlay(IDirectMusicTrack8 *iface,
void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *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; return S_OK;
} }
...@@ -113,7 +113,7 @@ static HRESULT WINAPI motif_track_Play(IDirectMusicTrack8 *iface, void *pStateDa ...@@ -113,7 +113,7 @@ static HRESULT WINAPI motif_track_Play(IDirectMusicTrack8 *iface, void *pStateDa
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *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; return S_OK;
} }
...@@ -122,7 +122,7 @@ static HRESULT WINAPI motif_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty ...@@ -122,7 +122,7 @@ static HRESULT WINAPI motif_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -139,7 +139,7 @@ static HRESULT WINAPI motif_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty ...@@ -139,7 +139,7 @@ static HRESULT WINAPI motif_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -198,7 +198,7 @@ static HRESULT WINAPI motif_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt ...@@ -198,7 +198,7 @@ static HRESULT WINAPI motif_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *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; return S_OK;
} }
...@@ -207,7 +207,7 @@ static HRESULT WINAPI motif_track_PlayEx(IDirectMusicTrack8 *iface, void *pState ...@@ -207,7 +207,7 @@ static HRESULT WINAPI motif_track_PlayEx(IDirectMusicTrack8 *iface, void *pState
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *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); wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
} }
...@@ -217,7 +217,7 @@ static HRESULT WINAPI motif_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID ...@@ -217,7 +217,7 @@ static HRESULT WINAPI motif_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID
DWORD dwFlags) DWORD dwFlags)
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *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); wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -226,7 +226,7 @@ static HRESULT WINAPI motif_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID ...@@ -226,7 +226,7 @@ static HRESULT WINAPI motif_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID
REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *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); wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -236,7 +236,7 @@ static HRESULT WINAPI motif_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c ...@@ -236,7 +236,7 @@ static HRESULT WINAPI motif_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *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; return E_NOTIMPL;
} }
...@@ -244,7 +244,7 @@ static HRESULT WINAPI motif_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr ...@@ -244,7 +244,7 @@ static HRESULT WINAPI motif_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr
MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
{ {
IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMotifTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup, TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup,
resulttrack); resulttrack);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/dmstyle/mutetrack.c
View file @ 73a05ffb
...@@ -65,7 +65,7 @@ static ULONG WINAPI mute_track_AddRef(IDirectMusicTrack8 *iface) ...@@ -65,7 +65,7 @@ static ULONG WINAPI mute_track_AddRef(IDirectMusicTrack8 *iface)
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -75,7 +75,7 @@ static ULONG WINAPI mute_track_Release(IDirectMusicTrack8 *iface) ...@@ -75,7 +75,7 @@ static ULONG WINAPI mute_track_Release(IDirectMusicTrack8 *iface)
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { if (!ref) {
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
...@@ -97,7 +97,7 @@ static HRESULT WINAPI mute_track_InitPlay(IDirectMusicTrack8 *iface, ...@@ -97,7 +97,7 @@ static HRESULT WINAPI mute_track_InitPlay(IDirectMusicTrack8 *iface,
void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *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; return S_OK;
} }
...@@ -113,7 +113,7 @@ static HRESULT WINAPI mute_track_Play(IDirectMusicTrack8 *iface, void *pStateDat ...@@ -113,7 +113,7 @@ static HRESULT WINAPI mute_track_Play(IDirectMusicTrack8 *iface, void *pStateDat
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *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; return S_OK;
} }
...@@ -122,7 +122,7 @@ static HRESULT WINAPI mute_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ ...@@ -122,7 +122,7 @@ static HRESULT WINAPI mute_track_GetParam(IDirectMusicTrack8 *iface, REFGUID typ
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -139,7 +139,7 @@ static HRESULT WINAPI mute_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ ...@@ -139,7 +139,7 @@ static HRESULT WINAPI mute_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -189,7 +189,7 @@ static HRESULT WINAPI mute_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS ...@@ -189,7 +189,7 @@ static HRESULT WINAPI mute_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtS
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *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; return S_OK;
} }
...@@ -198,7 +198,7 @@ static HRESULT WINAPI mute_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateD ...@@ -198,7 +198,7 @@ static HRESULT WINAPI mute_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateD
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *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); wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
} }
...@@ -208,7 +208,7 @@ static HRESULT WINAPI mute_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID r ...@@ -208,7 +208,7 @@ static HRESULT WINAPI mute_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID r
DWORD dwFlags) DWORD dwFlags)
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *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); wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -217,7 +217,7 @@ static HRESULT WINAPI mute_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r ...@@ -217,7 +217,7 @@ static HRESULT WINAPI mute_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID r
REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *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); wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -227,7 +227,7 @@ static HRESULT WINAPI mute_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co ...@@ -227,7 +227,7 @@ static HRESULT WINAPI mute_track_Compose(IDirectMusicTrack8 *iface, IUnknown *co
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *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; return E_NOTIMPL;
} }
...@@ -235,7 +235,7 @@ static HRESULT WINAPI mute_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra ...@@ -235,7 +235,7 @@ static HRESULT WINAPI mute_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTra
MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack) MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
{ {
IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicMuteTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %p, %d, %p, %d, %p): stub\n", This, newtrack, join, context, trackgroup, TRACE("(%p, %p, %ld, %p, %ld, %p): stub\n", This, newtrack, join, context, trackgroup,
resulttrack); resulttrack);
return E_NOTIMPL; return E_NOTIMPL;
} }
......
dlls/dmstyle/styletrack.c
View file @ 73a05ffb
...@@ -69,7 +69,7 @@ static ULONG WINAPI style_track_AddRef(IDirectMusicTrack8 *iface) ...@@ -69,7 +69,7 @@ static ULONG WINAPI style_track_AddRef(IDirectMusicTrack8 *iface)
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
return ref; return ref;
} }
...@@ -79,7 +79,7 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface) ...@@ -79,7 +79,7 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface)
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%ld\n", This, ref);
if (!ref) { if (!ref) {
struct list *cursor, *cursor2; struct list *cursor, *cursor2;
...@@ -112,7 +112,7 @@ static HRESULT WINAPI style_track_InitPlay(IDirectMusicTrack8 *iface, ...@@ -112,7 +112,7 @@ static HRESULT WINAPI style_track_InitPlay(IDirectMusicTrack8 *iface,
void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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; return S_OK;
} }
...@@ -128,7 +128,7 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa ...@@ -128,7 +128,7 @@ static HRESULT WINAPI style_track_Play(IDirectMusicTrack8 *iface, void *pStateDa
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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; return S_OK;
} }
...@@ -138,7 +138,7 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty ...@@ -138,7 +138,7 @@ static HRESULT WINAPI style_track_GetParam(IDirectMusicTrack8 *iface, REFGUID ty
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface);
struct list *item = NULL; struct list *item = NULL;
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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -168,7 +168,7 @@ static HRESULT WINAPI style_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty ...@@ -168,7 +168,7 @@ static HRESULT WINAPI style_track_SetParam(IDirectMusicTrack8 *iface, REFGUID ty
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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 (!type) if (!type)
return E_POINTER; return E_POINTER;
...@@ -231,7 +231,7 @@ static HRESULT WINAPI style_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt ...@@ -231,7 +231,7 @@ static HRESULT WINAPI style_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mt
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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; return S_OK;
} }
...@@ -240,7 +240,7 @@ static HRESULT WINAPI style_track_PlayEx(IDirectMusicTrack8 *iface, void *pState ...@@ -240,7 +240,7 @@ static HRESULT WINAPI style_track_PlayEx(IDirectMusicTrack8 *iface, void *pState
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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); wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID);
return S_OK; return S_OK;
} }
...@@ -250,7 +250,7 @@ static HRESULT WINAPI style_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID ...@@ -250,7 +250,7 @@ static HRESULT WINAPI style_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID
DWORD dwFlags) DWORD dwFlags)
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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); wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -259,7 +259,7 @@ static HRESULT WINAPI style_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID ...@@ -259,7 +259,7 @@ static HRESULT WINAPI style_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID
REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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); wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags);
return S_OK; return S_OK;
} }
...@@ -269,7 +269,7 @@ static HRESULT WINAPI style_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c ...@@ -269,7 +269,7 @@ static HRESULT WINAPI style_track_Compose(IDirectMusicTrack8 *iface, IUnknown *c
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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; return E_NOTIMPL;
} }
...@@ -278,7 +278,7 @@ static HRESULT WINAPI style_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr ...@@ -278,7 +278,7 @@ static HRESULT WINAPI style_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTr
IDirectMusicTrack **ppResultTrack) IDirectMusicTrack **ppResultTrack)
{ {
IDirectMusicStyleTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicStyleTrack *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; return S_OK;
} }
...@@ -325,7 +325,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK ...@@ -325,7 +325,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK
do { do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) { switch (Chunk.fccID) {
case DMUS_FOURCC_TIME_STAMP_CHUNK: { case DMUS_FOURCC_TIME_STAMP_CHUNK: {
TRACE_(dmfile)(": Time Stamp chunk\n"); TRACE_(dmfile)(": Time Stamp chunk\n");
...@@ -335,7 +335,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK ...@@ -335,7 +335,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
IStream_Read (pStm, &pNewItem->dwTimeStamp, sizeof(DWORD), NULL); IStream_Read (pStm, &pNewItem->dwTimeStamp, sizeof(DWORD), NULL);
TRACE_(dmfile)(" - dwTimeStamp: %u\n", pNewItem->dwTimeStamp); TRACE_(dmfile)(" - dwTimeStamp: %lu\n", pNewItem->dwTimeStamp);
list_add_tail (&This->Items, &pNewItem->entry); list_add_tail (&This->Items, &pNewItem->entry);
break; break;
} }
...@@ -381,7 +381,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK ...@@ -381,7 +381,7 @@ static HRESULT parse_style_ref(IDirectMusicStyleTrack *This, DMUS_PRIVATE_CHUNK
break; break;
} }
} }
TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]); } while (ListCount[0] < ListSize[0]);
return S_OK; return S_OK;
...@@ -406,7 +406,7 @@ static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_ ...@@ -406,7 +406,7 @@ static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_
do { do {
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize;
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) { switch (Chunk.fccID) {
case FOURCC_LIST: { case FOURCC_LIST: {
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
...@@ -436,7 +436,7 @@ static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_ ...@@ -436,7 +436,7 @@ static HRESULT parse_styletrack_list(IDirectMusicStyleTrack *This, DMUS_PRIVATE_
break; break;
} }
} }
TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]);
} while (ListCount[0] < ListSize[0]); } while (ListCount[0] < ListSize[0]);
return S_OK; return S_OK;
...@@ -457,11 +457,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS ...@@ -457,11 +457,11 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm);
IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL);
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) { switch (Chunk.fccID) {
case FOURCC_LIST: { case FOURCC_LIST: {
IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL);
TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) { switch (Chunk.fccID) {
case DMUS_FOURCC_STYLE_TRACK_LIST: { case DMUS_FOURCC_STYLE_TRACK_LIST: {
TRACE_(dmfile)(": Chord track list\n"); TRACE_(dmfile)(": Chord track list\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment