dswave: Make the virtual table functions static where possible.

This commit is contained in:
Alexandre Julliard 2006-06-10 11:58:01 +02:00
parent bbeeea4b88
commit 9d1d5c2aa2
2 changed files with 53 additions and 58 deletions

View File

@ -26,11 +26,16 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
as some sort of bridge between object and loader? */ as some sort of bridge between object and loader? */
static const GUID IID_IDirectMusicWavePRIVATE = {0x69e934e4,0x97f1,0x4f1d,{0x88,0xe8,0xf2,0xac,0x88,0x67,0x13,0x27}}; static const GUID IID_IDirectMusicWavePRIVATE = {0x69e934e4,0x97f1,0x4f1d,{0x88,0xe8,0xf2,0xac,0x88,0x67,0x13,0x27}};
static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface);
static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_AddRef (LPDIRECTMUSICSEGMENT8 iface);
static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface);
static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface);
/***************************************************************************** /*****************************************************************************
* IDirectMusicWaveImpl implementation * IDirectMusicWaveImpl implementation
*/ */
/* IDirectMusicWaveImpl IUnknown part: */ /* IDirectMusicWaveImpl IUnknown part: */
HRESULT WINAPI IDirectMusicWaveImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicWaveImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface);
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
@ -62,7 +67,7 @@ HRESULT WINAPI IDirectMusicWaveImpl_IUnknown_QueryInterface (LPUNKNOWN iface, RE
return E_NOINTERFACE; return E_NOINTERFACE;
} }
ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface) { static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface);
ULONG refCount = InterlockedIncrement(&This->ref); ULONG refCount = InterlockedIncrement(&This->ref);
@ -73,7 +78,7 @@ ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface) {
return refCount; return refCount;
} }
ULONG WINAPI IDirectMusicWaveImpl_IUnknown_Release (LPUNKNOWN iface) { static ULONG WINAPI IDirectMusicWaveImpl_IUnknown_Release (LPUNKNOWN iface) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, UnknownVtbl, iface);
ULONG refCount = InterlockedDecrement(&This->ref); ULONG refCount = InterlockedDecrement(&This->ref);
@ -95,184 +100,184 @@ static const IUnknownVtbl DirectMusicWave_Unknown_Vtbl = {
}; };
/* IDirectMusicSegment8Impl IDirectMusicSegment part: */ /* IDirectMusicSegment8Impl IDirectMusicSegment part: */
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_QueryInterface (LPDIRECTMUSICSEGMENT8 iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_QueryInterface (LPDIRECTMUSICSEGMENT8 iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
} }
ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_AddRef (LPDIRECTMUSICSEGMENT8 iface) { static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_AddRef (LPDIRECTMUSICSEGMENT8 iface) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
} }
ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Release (LPDIRECTMUSICSEGMENT8 iface) { static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Release (LPDIRECTMUSICSEGMENT8 iface) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetLength (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME* pmtLength) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetLength (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME* pmtLength) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, pmtLength); FIXME("(%p, %p): stub\n", This, pmtLength);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetLength (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtLength) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetLength (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtLength) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %ld): stub\n", This, mtLength); FIXME("(%p, %ld): stub\n", This, mtLength);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetRepeats (LPDIRECTMUSICSEGMENT8 iface, DWORD* pdwRepeats) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetRepeats (LPDIRECTMUSICSEGMENT8 iface, DWORD* pdwRepeats) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, pdwRepeats); FIXME("(%p, %p): stub\n", This, pdwRepeats);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetRepeats (LPDIRECTMUSICSEGMENT8 iface, DWORD dwRepeats) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetRepeats (LPDIRECTMUSICSEGMENT8 iface, DWORD dwRepeats) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %ld): stub\n", This, dwRepeats); FIXME("(%p, %ld): stub\n", This, dwRepeats);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetDefaultResolution (LPDIRECTMUSICSEGMENT8 iface, DWORD* pdwResolution) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetDefaultResolution (LPDIRECTMUSICSEGMENT8 iface, DWORD* pdwResolution) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, pdwResolution); FIXME("(%p, %p): stub\n", This, pdwResolution);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetDefaultResolution (LPDIRECTMUSICSEGMENT8 iface, DWORD dwResolution) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetDefaultResolution (LPDIRECTMUSICSEGMENT8 iface, DWORD dwResolution) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %ld): stub\n", This, dwResolution); FIXME("(%p, %ld): stub\n", This, dwResolution);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetTrack (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, IDirectMusicTrack** ppTrack) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetTrack (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, IDirectMusicTrack** ppTrack) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %s, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack); FIXME("(%p, %s, %ld, %ld, %p): stub\n", This, debugstr_dmguid(rguidType), dwGroupBits, dwIndex, ppTrack);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetTrackGroup (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicTrack* pTrack, DWORD* pdwGroupBits) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetTrackGroup (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicTrack* pTrack, DWORD* pdwGroupBits) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p, %p): stub\n", This, pTrack, pdwGroupBits); FIXME("(%p, %p, %p): stub\n", This, pTrack, pdwGroupBits);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_InsertTrack (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicTrack* pTrack, DWORD dwGroupBits) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_InsertTrack (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicTrack* pTrack, DWORD dwGroupBits) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p, %ld): stub\n", This, pTrack, dwGroupBits); FIXME("(%p, %p, %ld): stub\n", This, pTrack, dwGroupBits);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_RemoveTrack (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicTrack* pTrack) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_RemoveTrack (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicTrack* pTrack) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, pTrack); FIXME("(%p, %p): stub\n", This, pTrack);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_InitPlay (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicSegmentState** ppSegState, IDirectMusicPerformance* pPerformance, DWORD dwFlags) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_InitPlay (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicSegmentState** ppSegState, IDirectMusicPerformance* pPerformance, DWORD dwFlags) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p, %p, %ld): stub\n", This, ppSegState, pPerformance, dwFlags); FIXME("(%p, %p, %p, %ld): stub\n", This, ppSegState, pPerformance, dwFlags);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetGraph (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicGraph** ppGraph) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetGraph (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicGraph** ppGraph) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, ppGraph); FIXME("(%p, %p): stub\n", This, ppGraph);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetGraph (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicGraph* pGraph) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetGraph (LPDIRECTMUSICSEGMENT8 iface, IDirectMusicGraph* pGraph) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, pGraph); FIXME("(%p, %p): stub\n", This, pGraph);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_AddNotificationType (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidNotificationType) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_AddNotificationType (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidNotificationType) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_RemoveNotificationType (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidNotificationType) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_RemoveNotificationType (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidNotificationType) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType));
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetParam (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetParam (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %s, %ld, %ld, %ld, %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; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetParam (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void* pParam) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetParam (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidType, DWORD dwGroupBits, DWORD dwIndex, MUSIC_TIME mtTime, void* pParam) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %s, %ld, %ld, %ld, %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; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Clone (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicSegment** ppSegment) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Clone (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicSegment** ppSegment) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppSegment); FIXME("(%p, %ld, %ld, %p): stub\n", This, mtStart, mtEnd, ppSegment);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetStartPoint (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtStart) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetStartPoint (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtStart) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %ld): stub\n", This, mtStart); FIXME("(%p, %ld): stub\n", This, mtStart);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetStartPoint (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME* pmtStart) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetStartPoint (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME* pmtStart) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, pmtStart); FIXME("(%p, %p): stub\n", This, pmtStart);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetLoopPoints (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetLoopPoints (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %ld, %ld): stub\n", This, mtStart, mtEnd); FIXME("(%p, %ld, %ld): stub\n", This, mtStart, mtEnd);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetLoopPoints (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME* pmtStart, MUSIC_TIME* pmtEnd) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetLoopPoints (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME* pmtStart, MUSIC_TIME* pmtEnd) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p, %p): stub\n", This, pmtStart, pmtEnd); FIXME("(%p, %p, %p): stub\n", This, pmtStart, pmtEnd);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetPChannelsUsed (LPDIRECTMUSICSEGMENT8 iface, DWORD dwNumPChannels, DWORD* paPChannels) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetPChannelsUsed (LPDIRECTMUSICSEGMENT8 iface, DWORD dwNumPChannels, DWORD* paPChannels) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %ld, %p): stub\n", This, dwNumPChannels, paPChannels); FIXME("(%p, %ld, %p): stub\n", This, dwNumPChannels, paPChannels);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetTrackConfig (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_SetTrackConfig (LPDIRECTMUSICSEGMENT8 iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %s, %ld, %ld, %ld, %ld): 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; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetAudioPathConfig (LPDIRECTMUSICSEGMENT8 iface, IUnknown** ppAudioPathConfig){ static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_GetAudioPathConfig (LPDIRECTMUSICSEGMENT8 iface, IUnknown** ppAudioPathConfig){
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, ppAudioPathConfig); FIXME("(%p, %p): stub\n", This, ppAudioPathConfig);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Compose (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtTime, IDirectMusicSegment* pFromSegment, IDirectMusicSegment* pToSegment, IDirectMusicSegment** ppComposedSegment) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Compose (LPDIRECTMUSICSEGMENT8 iface, MUSIC_TIME mtTime, IDirectMusicSegment* pFromSegment, IDirectMusicSegment* pToSegment, IDirectMusicSegment** ppComposedSegment) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %ld, %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; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Download (LPDIRECTMUSICSEGMENT8 iface, IUnknown *pAudioPath) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Download (LPDIRECTMUSICSEGMENT8 iface, IUnknown *pAudioPath) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, pAudioPath); FIXME("(%p, %p): stub\n", This, pAudioPath);
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Unload (LPDIRECTMUSICSEGMENT8 iface, IUnknown *pAudioPath) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Unload (LPDIRECTMUSICSEGMENT8 iface, IUnknown *pAudioPath) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, SegmentVtbl, iface);
FIXME("(%p, %p): stub\n", This, pAudioPath); FIXME("(%p, %p): stub\n", This, pAudioPath);
return S_OK; return S_OK;
@ -313,22 +318,22 @@ static const IDirectMusicSegment8Vtbl DirectMusicSegment8_Segment_Vtbl = {
}; };
/* IDirectMusicWaveImpl IDirectMusicObject part: */ /* IDirectMusicWaveImpl IDirectMusicObject part: */
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
} }
ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
} }
ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { static ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface);
TRACE("(%p, %p)\n", This, pDesc); TRACE("(%p, %p)\n", This, pDesc);
/* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */ /* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */
@ -336,7 +341,7 @@ HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMU
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, ObjectVtbl, iface);
TRACE("(%p, %p, %s): setting descriptor:\n", This, pDesc, debugstr_DMUS_OBJECTDESC(pDesc)); TRACE("(%p, %p, %s): setting descriptor:\n", This, pDesc, debugstr_DMUS_OBJECTDESC(pDesc));
@ -370,7 +375,7 @@ HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMU
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) { static HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) {
DMUS_PRIVATE_CHUNK Chunk; DMUS_PRIVATE_CHUNK Chunk;
DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1];
LARGE_INTEGER liMove; /* used when skipping chunks */ LARGE_INTEGER liMove; /* used when skipping chunks */
@ -527,30 +532,30 @@ static const IDirectMusicObjectVtbl DirectMusicWave_Object_Vtbl = {
}; };
/* IDirectMusicWaveImpl IPersistStream part: */ /* IDirectMusicWaveImpl IPersistStream part: */
HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); return IDirectMusicWaveImpl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj);
} }
ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return IDirectMusicWaveImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
} }
ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { static ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_Release (LPPERSISTSTREAM iface) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface);
return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); return IDirectMusicWaveImpl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl);
} }
HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {
ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface); ICOM_THIS_MULTI(IDirectMusicWaveImpl, PersistStreamVtbl, iface);
DMUS_PRIVATE_CHUNK Chunk; DMUS_PRIVATE_CHUNK Chunk;
@ -697,11 +702,11 @@ HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Load (LPPERSISTSTREAM iface,
return S_OK; return S_OK;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) {
return E_NOTIMPL; return E_NOTIMPL;
} }
HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { static HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) {
return E_NOTIMPL; return E_NOTIMPL;
} }

View File

@ -67,16 +67,6 @@ struct IDirectMusicWaveImpl {
}; };
/* IUnknown: */
extern ULONG WINAPI IDirectMusicWaveImpl_IUnknown_AddRef (LPUNKNOWN iface);
/* IDirectMusicSegment(8): */
extern ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_AddRef (LPDIRECTMUSICSEGMENT8 iface);
/* IDirectMusicObject: */
extern ULONG WINAPI IDirectMusicWaveImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface);
/* IPersistStream: */
extern ULONG WINAPI IDirectMusicWaveImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface);
/********************************************************************** /**********************************************************************
* Dll lifetime tracking declaration for dswave.dll * Dll lifetime tracking declaration for dswave.dll
*/ */