Skip to content

W
wine-cw
Commit 347da355 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

dmime: COM cleanup of IDirectMusicSegmentState8 interface.

parent b89f9218
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 63 deletions
dlls/dmime/dmime_private.h
View file @ 347da355
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
* Interfaces * Interfaces
*/ */
typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl; typedef struct IDirectMusicSegment8Impl IDirectMusicSegment8Impl;
typedef struct IDirectMusicSegmentState8Impl IDirectMusicSegmentState8Impl;
typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl; typedef struct IDirectMusicGraphImpl IDirectMusicGraphImpl;
typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl; typedef struct IDirectMusicAudioPathImpl IDirectMusicAudioPathImpl;
...@@ -139,17 +138,6 @@ struct IDirectMusicSegment8Impl { ...@@ -139,17 +138,6 @@ struct IDirectMusicSegment8Impl {
}; };
/***************************************************************************** /*****************************************************************************
* IDirectMusicSegmentState8Impl implementation structure
*/
struct IDirectMusicSegmentState8Impl {
/* IUnknown fields */
const IDirectMusicSegmentState8Vtbl *lpVtbl;
LONG ref;
/* IDirectMusicSegmentState8Impl fields */
};
/*****************************************************************************
* IDirectMusicGraphImpl implementation structure * IDirectMusicGraphImpl implementation structure
*/ */
struct IDirectMusicGraphImpl { struct IDirectMusicGraphImpl {
......
dlls/dmime/segmentstate.c
View file @ 347da355
...@@ -21,119 +21,140 @@ ...@@ -21,119 +21,140 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmime); WINE_DEFAULT_DEBUG_CHANNEL(dmime);
/* IDirectMusicSegmentState8Impl IUnknown part: */ typedef struct IDirectMusicSegmentState8Impl {
static HRESULT WINAPI IDirectMusicSegmentState8Impl_QueryInterface (LPDIRECTMUSICSEGMENTSTATE8 iface, REFIID riid, LPVOID *ppobj) { IDirectMusicSegmentState8 IDirectMusicSegmentState8_iface;
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; LONG ref;
} IDirectMusicSegmentState8Impl;
static inline IDirectMusicSegmentState8Impl *impl_from_IDirectMusicSegmentState8(IDirectMusicSegmentState8 *iface)
{
return CONTAINING_RECORD(iface, IDirectMusicSegmentState8Impl, IDirectMusicSegmentState8_iface);
}
static HRESULT WINAPI DirectMusicSegmentState8_QueryInterface(IDirectMusicSegmentState8 *iface, REFIID riid, void **ppobj)
{
IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
if (!riid || !ppobj) *ppobj = NULL;
return E_POINTER;
if (IsEqualIID(riid, &IID_IUnknown) || if (IsEqualIID(riid, &IID_IUnknown) ||
IsEqualIID(riid, &IID_IDirectMusicSegmentState) || IsEqualIID(riid, &IID_IDirectMusicSegmentState) ||
IsEqualIID(riid, &IID_IDirectMusicSegmentState8)) { IsEqualIID(riid, &IID_IDirectMusicSegmentState8))
IUnknown_AddRef(iface); {
*ppobj = This; IDirectMusicSegmentState8_AddRef(iface);
*ppobj = &This->IDirectMusicSegmentState8_iface;
return S_OK; return S_OK;
} }
WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI IDirectMusicSegmentState8Impl_AddRef (LPDIRECTMUSICSEGMENTSTATE8 iface) { static ULONG WINAPI DirectMusicSegmentState8_AddRef(IDirectMusicSegmentState8 *iface)
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; {
IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p): AddRef from %d\n", This, ref - 1); TRACE("(%p): %d\n", This, ref);
DMIME_LockModule(); DMIME_LockModule();
return ref; return ref;
} }
static ULONG WINAPI IDirectMusicSegmentState8Impl_Release (LPDIRECTMUSICSEGMENTSTATE8 iface) { static ULONG WINAPI DirectMusicSegmentState8_Release(IDirectMusicSegmentState8 *iface)
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; {
IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p): ReleaseRef to %d\n", This, ref);
if (ref == 0) { TRACE("(%p): %d\n", This, ref);
if (ref == 0)
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
}
DMIME_UnlockModule(); DMIME_UnlockModule();
return ref; return ref;
} }
/* IDirectMusicSegmentState8Impl IDirectMusicSegmentState part: */ static HRESULT WINAPI DirectMusicSegmentState8_GetRepeats(IDirectMusicSegmentState8 *iface, DWORD* pdwRepeats)
static HRESULT WINAPI IDirectMusicSegmentState8Impl_GetRepeats (LPDIRECTMUSICSEGMENTSTATE8 iface, DWORD* pdwRepeats) { {
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
FIXME("(%p, %p): stub\n", This, pdwRepeats); FIXME("(%p, %p): stub\n", This, pdwRepeats);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSegmentState8Impl_GetSegment (LPDIRECTMUSICSEGMENTSTATE8 iface, IDirectMusicSegment** ppSegment) { static HRESULT WINAPI DirectMusicSegmentState8_GetSegment(IDirectMusicSegmentState8 *iface, IDirectMusicSegment** ppSegment)
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; {
IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
FIXME("(%p, %p): stub\n", This, ppSegment); FIXME("(%p, %p): stub\n", This, ppSegment);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSegmentState8Impl_GetStartTime (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtStart) { static HRESULT WINAPI DirectMusicSegmentState8_GetStartTime(IDirectMusicSegmentState8 *iface, MUSIC_TIME* pmtStart)
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; {
IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
FIXME("(%p, %p): stub\n", This, pmtStart); FIXME("(%p, %p): stub\n", This, pmtStart);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSegmentState8Impl_GetSeek (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtSeek) { static HRESULT WINAPI DirectMusicSegmentState8_GetSeek(IDirectMusicSegmentState8 *iface, MUSIC_TIME* pmtSeek)
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; {
IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
FIXME("(%p, %p): stub\n", This, pmtSeek); FIXME("(%p, %p): stub\n", This, pmtSeek);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSegmentState8Impl_GetStartPoint (LPDIRECTMUSICSEGMENTSTATE8 iface, MUSIC_TIME* pmtStart) { static HRESULT WINAPI DirectMusicSegmentState8_GetStartPoint(IDirectMusicSegmentState8 *iface, MUSIC_TIME* pmtStart)
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; {
IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
FIXME("(%p, %p): stub\n", This, pmtStart); FIXME("(%p, %p): stub\n", This, pmtStart);
return S_OK; return S_OK;
} }
/* IDirectMusicSegmentState8Impl IDirectMusicSegmentState8 part: */ static HRESULT WINAPI DirectMusicSegmentState8_SetTrackConfig(IDirectMusicSegmentState8 *iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) {
static HRESULT WINAPI IDirectMusicSegmentState8Impl_SetTrackConfig (LPDIRECTMUSICSEGMENTSTATE8 iface, REFGUID rguidTrackClassID, DWORD dwGroupBits, DWORD dwIndex, DWORD dwFlagsOn, DWORD dwFlagsOff) { IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface;
FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff); FIXME("(%p, %s, %d, %d, %d, %d): stub\n", This, debugstr_dmguid(rguidTrackClassID), dwGroupBits, dwIndex, dwFlagsOn, dwFlagsOff);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicSegmentState8Impl_GetObjectInPath (LPDIRECTMUSICSEGMENTSTATE8 iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) { static HRESULT WINAPI DirectMusicSegmentState8_GetObjectInPath(IDirectMusicSegmentState8 *iface, DWORD dwPChannel, DWORD dwStage, DWORD dwBuffer, REFGUID guidObject, DWORD dwIndex, REFGUID iidInterface, void** ppObject) {
IDirectMusicSegmentState8Impl *This = (IDirectMusicSegmentState8Impl *)iface; IDirectMusicSegmentState8Impl *This = impl_from_IDirectMusicSegmentState8(iface);
FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject); FIXME("(%p, %d, %d, %d, %s, %d, %s, %p): stub\n", This, dwPChannel, dwStage, dwBuffer, debugstr_dmguid(guidObject), dwIndex, debugstr_dmguid(iidInterface), ppObject);
return S_OK; return S_OK;
} }
static const IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8_Vtbl = { static const IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8Vtbl = {
IDirectMusicSegmentState8Impl_QueryInterface, DirectMusicSegmentState8_QueryInterface,
IDirectMusicSegmentState8Impl_AddRef, DirectMusicSegmentState8_AddRef,
IDirectMusicSegmentState8Impl_Release, DirectMusicSegmentState8_Release,
IDirectMusicSegmentState8Impl_GetRepeats, DirectMusicSegmentState8_GetRepeats,
IDirectMusicSegmentState8Impl_GetSegment, DirectMusicSegmentState8_GetSegment,
IDirectMusicSegmentState8Impl_GetStartTime, DirectMusicSegmentState8_GetStartTime,
IDirectMusicSegmentState8Impl_GetSeek, DirectMusicSegmentState8_GetSeek,
IDirectMusicSegmentState8Impl_GetStartPoint, DirectMusicSegmentState8_GetStartPoint,
IDirectMusicSegmentState8Impl_SetTrackConfig, DirectMusicSegmentState8_SetTrackConfig,
IDirectMusicSegmentState8Impl_GetObjectInPath DirectMusicSegmentState8_GetObjectInPath
}; };
/* for ClassFactory */ /* for ClassFactory */
HRESULT WINAPI create_dmsegmentstate(REFIID lpcGUID, void **ppobj) HRESULT WINAPI create_dmsegmentstate(REFIID riid, void **ret_iface)
{ {
IDirectMusicSegmentState8Impl* obj; IDirectMusicSegmentState8Impl* obj;
HRESULT hr;
obj = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegmentState8Impl)); *ret_iface = NULL;
if (NULL == obj) {
*ppobj = NULL; obj = HeapAlloc (GetProcessHeap(), 0, sizeof(IDirectMusicSegmentState8Impl));
if (!obj)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
}
obj->lpVtbl = &DirectMusicSegmentState8_Vtbl;
obj->ref = 0; /* will be inited by QueryInterface */
return IDirectMusicSegmentState8Impl_QueryInterface ((LPDIRECTMUSICSEGMENTSTATE8)obj, lpcGUID, ppobj); obj->IDirectMusicSegmentState8_iface.lpVtbl = &DirectMusicSegmentState8Vtbl;
obj->ref = 1;
hr = IDirectMusicSegmentState8_QueryInterface(&obj->IDirectMusicSegmentState8_iface, riid, ret_iface);
IDirectMusicSegmentState8_Release(&obj->IDirectMusicSegmentState8_iface);
return hr;
} }
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