July 2015 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DMTimeSigTrack.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: ad81735d05561a0790ccfe7bfdeebb4d8dbe89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad81735d05561a0790ccfe7bf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:52:54 2015 +0200 dmime: Remove the extraneous IUnknown from DMTimeSigTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/timesigtrack.c | 121 +++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 72 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 44adb30..b56f4de 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -25,67 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); * IDirectMusicTimeSigTrack implementation */ typedef struct IDirectMusicTimeSigTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack IDirectMusicTrack_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicTimeSigTrack; -/* IDirectMusicTimeSigTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)) { - *ppobj = &This->IDirectMusicTrack_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicTimeSigTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicTimeSigTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMIME_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl = { - IDirectMusicTimeSigTrack_IUnknown_QueryInterface, - IDirectMusicTimeSigTrack_IUnknown_AddRef, - IDirectMusicTimeSigTrack_IUnknown_Release -}; - /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusicTrack *iface) { @@ -93,22 +38,50 @@ static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusic } static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) { IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMIME_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrackImpl_Init(IDirectMusicTrack *iface, @@ -219,17 +192,17 @@ static const IDirectMusicTrackVtbl dmtack_vtbl = { /* IDirectMusicTimeSigTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack_QueryInterface(&This->IDirectMusicTrack_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicTimeSigTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack_AddRef(&This->IDirectMusicTrack_iface); } static ULONG WINAPI IDirectMusicTimeSigTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack_Release(&This->IDirectMusicTrack_iface); } static HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -267,21 +240,25 @@ static const IPersistStreamVtbl DirectMusicTimeSigTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmtimesigtrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicTimeSigTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicTimeSigTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicTimeSigTrack_Unknown_Vtbl; + IDirectMusicTimeSigTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack_iface.lpVtbl = &dmtack_vtbl; track->PersistStreamVtbl = &DirectMusicTimeSigTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicTimeSigTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMIME_LockModule(); + hr = IDirectMusicTrack_QueryInterface(&track->IDirectMusicTrack_iface, lpcGUID, ppobj); + IDirectMusicTrack_Release(&track->IDirectMusicTrack_iface); - return IDirectMusicTimeSigTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicTrack of DMTimeSigTrack.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: dd1dc8cc81af4180f46b196f16d7053d0310d9f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1dc8cc81af4180f46b196f1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:51:21 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMTimeSigTrack. --- dlls/dmime/timesigtrack.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index bae0e58..44adb30 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicTimeSigTrack { const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrackVtbl *TrackVtbl; + IDirectMusicTrack IDirectMusicTrack_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; @@ -42,7 +42,7 @@ static HRESULT WINAPI IDirectMusicTimeSigTrack_IUnknown_QueryInterface (LPUNKNOW IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)) { - *ppobj = &This->TrackVtbl; + *ppobj = &This->IDirectMusicTrack_iface; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { @@ -87,29 +87,34 @@ static const IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl = { }; /* IDirectMusicTimeSigTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicTimeSigTrack *impl_from_IDirectMusicTrack(IDirectMusicTrack *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicTimeSigTrack, IDirectMusicTrack_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } static HRESULT WINAPI IDirectMusicTrackImpl_Init(IDirectMusicTrack *iface, IDirectMusicSegment *pSegment) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } @@ -118,14 +123,14 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicTrackImpl_EndPlay(IDirectMusicTrack *iface, void *pStateData) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } @@ -134,7 +139,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -142,7 +147,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); return S_OK; } @@ -150,7 +155,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); return S_OK; } @@ -158,7 +163,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack *iface, REFGUID rguidType) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); if (IsEqualGUID (rguidType, &GUID_DisableTimeSig) @@ -174,7 +179,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack * static HRESULT WINAPI IDirectMusicTrackImpl_AddNotificationType(IDirectMusicTrack *iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); return S_OK; } @@ -182,7 +187,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_AddNotificationType(IDirectMusicTrac static HRESULT WINAPI IDirectMusicTrackImpl_RemoveNotificationType(IDirectMusicTrack *iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); return S_OK; } @@ -190,12 +195,12 @@ static HRESULT WINAPI IDirectMusicTrackImpl_RemoveNotificationType(IDirectMusicT static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { - ICOM_THIS_MULTI(IDirectMusicTimeSigTrack, TrackVtbl, iface); + IDirectMusicTimeSigTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } -static const IDirectMusicTrackVtbl DirectMusicTimeSigTrack_Track_Vtbl = { +static const IDirectMusicTrackVtbl dmtack_vtbl = { IDirectMusicTrackImpl_QueryInterface, IDirectMusicTrackImpl_AddRef, IDirectMusicTrackImpl_Release, @@ -270,7 +275,7 @@ HRESULT WINAPI create_dmtimesigtrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->UnknownVtbl = &DirectMusicTimeSigTrack_Unknown_Vtbl; - track->TrackVtbl = &DirectMusicTimeSigTrack_Track_Vtbl; + track->IDirectMusicTrack_iface.lpVtbl = &dmtack_vtbl; track->PersistStreamVtbl = &DirectMusicTimeSigTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc);

1 0

Michael Stefaniuc : dmime: Use the generic IPersistStream for DMMarkerTrack.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: 5bf9d04581483ae1df73b44e0413a1c07ad56825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf9d04581483ae1df73b44e0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:50:59 2015 +0200 dmime: Use the generic IPersistStream for DMMarkerTrack. --- dlls/dmime/markertrack.c | 67 ++++++++++++------------------------------------ dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 70a50c3..852948a 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -18,6 +18,7 @@ */ #include "dmime_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicMarkerTrack { IDirectMusicTrack IDirectMusicTrack_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicMarkerTrack; /* IDirectMusicMarkerTrack IDirectMusicTrack8 part: */ @@ -49,7 +49,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *if if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack)) *ret_iface = iface; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ret_iface = &This->PersistStreamVtbl; + *ret_iface = &This->dmobj.IPersistStream_iface; else { WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; @@ -188,52 +188,21 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { IDirectMusicTrackImpl_Clone }; -/* IDirectMusicMarkerTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_QueryInterface(&This->IDirectMusicTrack_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicMarkerTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_AddRef(&This->IDirectMusicTrack_iface); -} - -static ULONG WINAPI IDirectMusicMarkerTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack_Release(&This->IDirectMusicTrack_iface); -} - -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +{ FIXME(": Loading not implemented yet\n"); return S_OK; } -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl = { - IDirectMusicMarkerTrack_IPersistStream_QueryInterface, - IDirectMusicMarkerTrack_IPersistStream_AddRef, - IDirectMusicMarkerTrack_IPersistStream_Release, - IDirectMusicMarkerTrack_IPersistStream_GetClassID, - IDirectMusicMarkerTrack_IPersistStream_IsDirty, - IDirectMusicMarkerTrack_IPersistStream_Load, - IDirectMusicMarkerTrack_IPersistStream_Save, - IDirectMusicMarkerTrack_IPersistStream_GetSizeMax +static const IPersistStreamVtbl persiststream_vtbl = { + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + IPersistStreamImpl_Load, + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax }; /* for ClassFactory */ @@ -248,12 +217,10 @@ HRESULT WINAPI create_dmmarkertrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack_iface.lpVtbl = &dmtrack_vtbl; - track->PersistStreamVtbl = &DirectMusicMarkerTrack_PersistStream_Vtbl; - track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(track->pDesc); - track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - track->pDesc->guidClass = CLSID_DirectMusicMarkerTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicMarkerTrack, + (IUnknown *)&track->IDirectMusicTrack_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMIME_LockModule(); hr = IDirectMusicTrack_QueryInterface(&track->IDirectMusicTrack_iface, lpcGUID, ppobj); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e0cc313..30afee3 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -495,7 +495,7 @@ static void test_track(void) BOOL todo; } class[] = { { X(DirectMusicLyricsTrack), TRUE }, - { X(DirectMusicMarkerTrack), TRUE }, + { X(DirectMusicMarkerTrack), FALSE }, { X(DirectMusicParamControlTrack), TRUE }, { X(DirectMusicSegmentTriggerTrack), FALSE }, { X(DirectMusicSeqTrack), TRUE },

1 0

Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DMMarkerTrack.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: ef6a8035923cfeb328f5a219cfb5ab288cf994f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef6a8035923cfeb328f5a219c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:50:31 2015 +0200 dmime: Remove the extraneous IUnknown from DMMarkerTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/markertrack.c | 123 +++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 73 deletions(-) diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 6261ceb..70a50c3 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -25,67 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); * IDirectMusicMarkerTrack implementation */ typedef struct IDirectMusicMarkerTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack IDirectMusicTrack_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicMarkerTrack; -/* IDirectMusicMarkerTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)) { - *ppobj = &This->IDirectMusicTrack_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicMarkerTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicMarkerTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMIME_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl = { - IDirectMusicMarkerTrack_IUnknown_QueryInterface, - IDirectMusicMarkerTrack_IUnknown_AddRef, - IDirectMusicMarkerTrack_IUnknown_Release -}; - /* IDirectMusicMarkerTrack IDirectMusicTrack8 part: */ static inline IDirectMusicMarkerTrack *impl_from_IDirectMusicTrack(IDirectMusicTrack *iface) { @@ -93,22 +38,50 @@ static inline IDirectMusicMarkerTrack *impl_from_IDirectMusicTrack(IDirectMusicT } static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) { IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMIME_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrackImpl_Init(IDirectMusicTrack *iface, @@ -218,17 +191,17 @@ static const IDirectMusicTrackVtbl dmtrack_vtbl = { /* IDirectMusicMarkerTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack_QueryInterface(&This->IDirectMusicTrack_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicMarkerTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack_AddRef(&This->IDirectMusicTrack_iface); } static ULONG WINAPI IDirectMusicMarkerTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicMarkerTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack_Release(&This->IDirectMusicTrack_iface); } static HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -266,21 +239,25 @@ static const IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmmarkertrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicMarkerTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicMarkerTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicMarkerTrack_Unknown_Vtbl; + IDirectMusicMarkerTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack_iface.lpVtbl = &dmtrack_vtbl; track->PersistStreamVtbl = &DirectMusicMarkerTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicMarkerTrack; - track->ref = 0; /* will be inited by QueryInterface */ - - return IDirectMusicMarkerTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + track->ref = 1; + + DMIME_LockModule(); + hr = IDirectMusicTrack_QueryInterface(&track->IDirectMusicTrack_iface, lpcGUID, ppobj); + IDirectMusicTrack_Release(&track->IDirectMusicTrack_iface); + + return hr; }

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicTrack of DMMarkerTrack.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: d487e5e6ce46776f8d625e0afdd367c8a8edb742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d487e5e6ce46776f8d625e0af… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:50:05 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMMarkerTrack. --- dlls/dmime/markertrack.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index 11872e0..6261ceb 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicMarkerTrack { const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrackVtbl *TrackVtbl; + IDirectMusicTrack IDirectMusicTrack_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; @@ -42,7 +42,7 @@ static HRESULT WINAPI IDirectMusicMarkerTrack_IUnknown_QueryInterface (LPUNKNOWN IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack)) { - *ppobj = &This->TrackVtbl; + *ppobj = &This->IDirectMusicTrack_iface; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { @@ -87,29 +87,34 @@ static const IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl = { }; /* IDirectMusicMarkerTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicMarkerTrack *impl_from_IDirectMusicTrack(IDirectMusicTrack *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicMarkerTrack, IDirectMusicTrack_iface); +} + static HRESULT WINAPI IDirectMusicTrackImpl_QueryInterface(IDirectMusicTrack *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicTrackImpl_AddRef(IDirectMusicTrack *iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicTrackImpl_Release(IDirectMusicTrack *iface) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } static HRESULT WINAPI IDirectMusicTrackImpl_Init(IDirectMusicTrack *iface, IDirectMusicSegment *pSegment) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } @@ -118,14 +123,14 @@ static HRESULT WINAPI IDirectMusicTrackImpl_InitPlay(IDirectMusicTrack *iface, IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } static HRESULT WINAPI IDirectMusicTrackImpl_EndPlay(IDirectMusicTrack *iface, void *pStateData) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } @@ -134,7 +139,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -142,7 +147,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_Play(IDirectMusicTrack *iface, void static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); return S_OK; } @@ -150,7 +155,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_GetParam(IDirectMusicTrack *iface, R static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, REFGUID rguidType, MUSIC_TIME mtTime, void *pParam) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); return S_OK; } @@ -158,7 +163,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_SetParam(IDirectMusicTrack *iface, R static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack *iface, REFGUID rguidType) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); if (IsEqualGUID (rguidType, &GUID_Play_Marker) @@ -173,7 +178,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_IsParamSupported(IDirectMusicTrack * static HRESULT WINAPI IDirectMusicTrackImpl_AddNotificationType(IDirectMusicTrack *iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); return S_OK; } @@ -181,7 +186,7 @@ static HRESULT WINAPI IDirectMusicTrackImpl_AddNotificationType(IDirectMusicTrac static HRESULT WINAPI IDirectMusicTrackImpl_RemoveNotificationType(IDirectMusicTrack *iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); return S_OK; } @@ -189,12 +194,12 @@ static HRESULT WINAPI IDirectMusicTrackImpl_RemoveNotificationType(IDirectMusicT static HRESULT WINAPI IDirectMusicTrackImpl_Clone(IDirectMusicTrack *iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) { - ICOM_THIS_MULTI(IDirectMusicMarkerTrack, TrackVtbl, iface); + IDirectMusicMarkerTrack *This = impl_from_IDirectMusicTrack(iface); FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } -static const IDirectMusicTrackVtbl DirectMusicMarkerTrack_Track_Vtbl = { +static const IDirectMusicTrackVtbl dmtrack_vtbl = { IDirectMusicTrackImpl_QueryInterface, IDirectMusicTrackImpl_AddRef, IDirectMusicTrackImpl_Release, @@ -269,7 +274,7 @@ HRESULT WINAPI create_dmmarkertrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->UnknownVtbl = &DirectMusicMarkerTrack_Unknown_Vtbl; - track->TrackVtbl = &DirectMusicMarkerTrack_Track_Vtbl; + track->IDirectMusicTrack_iface.lpVtbl = &dmtrack_vtbl; track->PersistStreamVtbl = &DirectMusicMarkerTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc);

1 0

Michael Stefaniuc : dmime/tests: Deal with DMTrack objects without IDirectMusicTrack8.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: 5525f5d0fa02e9ca360faded570a066cb10e37cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5525f5d0fa02e9ca360faded5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:49:22 2015 +0200 dmime/tests: Deal with DMTrack objects without IDirectMusicTrack8. --- dlls/dmime/tests/dmime.c | 63 +++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 7738332..e0cc313 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -302,6 +302,7 @@ static void test_COM_segmentstate(void) static void test_COM_track(void) { + IDirectMusicTrack *dmt; IDirectMusicTrack8 *dmt8; IPersistStream *ps; IUnknown *unk; @@ -311,21 +312,23 @@ static void test_COM_track(void) const struct { REFCLSID clsid; const char *name; + BOOL has_dmt8; } class[] = { - { X(DirectMusicLyricsTrack) }, - { X(DirectMusicMarkerTrack) }, - { X(DirectMusicParamControlTrack) }, - { X(DirectMusicSegmentTriggerTrack) }, - { X(DirectMusicSeqTrack) }, - { X(DirectMusicSysExTrack) }, - { X(DirectMusicTempoTrack) }, - { X(DirectMusicTimeSigTrack) }, - { X(DirectMusicWaveTrack) } + { X(DirectMusicLyricsTrack), TRUE }, + { X(DirectMusicMarkerTrack), FALSE }, + { X(DirectMusicParamControlTrack), TRUE }, + { X(DirectMusicSegmentTriggerTrack), TRUE }, + { X(DirectMusicSeqTrack), TRUE }, + { X(DirectMusicSysExTrack), TRUE }, + { X(DirectMusicTempoTrack), TRUE }, + { X(DirectMusicTimeSigTrack), FALSE }, + { X(DirectMusicWaveTrack), TRUE } }; #undef X unsigned int i; for (i = 0; i < ARRAY_SIZE(class); i++) { + trace("Testing %s\n", class[i].name); /* COM aggregation */ dmt8 = (IDirectMusicTrack8*)0xdeadbeef; hr = CoCreateInstance(class[i].clsid, (IUnknown*)&dmt8, CLSCTX_INPROC_SERVER, &IID_IUnknown, @@ -345,29 +348,37 @@ static void test_COM_track(void) class[i].name, hr); /* Same refcount for all DirectMusicTrack interfaces */ - hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, - (void**)&dmt8); - if (hr == E_NOINTERFACE && !dmt8) { - skip("%s not created with CoCreateInstance()\n", class[i].name); - continue; - } + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void**)&dmt); ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); - refcount = IDirectMusicTrack8_AddRef(dmt8); + refcount = IDirectMusicTrack_AddRef(dmt); ok(refcount == 2, "refcount == %u, expected 2\n", refcount); - hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); refcount = IPersistStream_AddRef(ps); ok(refcount == 4, "refcount == %u, expected 4\n", refcount); IPersistStream_Release(ps); - hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IUnknown, (void**)&unk); + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IUnknown, (void**)&unk); ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); refcount = IUnknown_AddRef(unk); ok(refcount == 5, "refcount == %u, expected 5\n", refcount); refcount = IUnknown_Release(unk); - while (IDirectMusicTrack8_Release(dmt8)); + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); + if (class[i].has_dmt8) { + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + refcount = IDirectMusicTrack8_AddRef(dmt8); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IDirectMusicTrack8_Release(dmt8); + } else { + ok(hr == E_NOINTERFACE, "QueryInterface for IID_IDirectMusicTrack8 failed: %08x\n", hr); + refcount = IDirectMusicTrack_AddRef(dmt); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + } + + while (IDirectMusicTrack_Release(dmt)); } } @@ -472,7 +483,7 @@ static void test_segment(void) static void test_track(void) { - IDirectMusicTrack8 *dmt8; + IDirectMusicTrack *dmt; IPersistStream *ps; CLSID classid; ULARGE_INTEGER size; @@ -498,16 +509,12 @@ static void test_track(void) for (i = 0; i < ARRAY_SIZE(class); i++) { trace("Testing %s\n", class[i].name); - hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack8, - (void**)&dmt8); - if (hr == E_NOINTERFACE && !dmt8) { - skip("%s not created with CoCreateInstance()\n", class[i].name); - continue; - } + hr = CoCreateInstance(class[i].clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void**)&dmt); ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); /* IPersistStream */ - hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &classid); if (class[i].todo) { @@ -532,7 +539,7 @@ static void test_track(void) hr = IPersistStream_Save(ps, NULL, TRUE); ok(hr == E_NOTIMPL, "IPersistStream_Save failed: %08x\n", hr); - while (IDirectMusicTrack8_Release(dmt8)); + while (IDirectMusicTrack_Release(dmt)); } }

1 0

Michael Stefaniuc : dmime: DMTimeSigTrack doesn't have IDirectMusicTrack8.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: edfa74fe454ecf9b9d301a210be0eaedba35379e URL: http://source.winehq.org/git/wine.git/?a=commit;h=edfa74fe454ecf9b9d301a210… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 2 11:48:48 2015 +0200 dmime: DMTimeSigTrack doesn't have IDirectMusicTrack8. --- dlls/dmime/timesigtrack.c | 120 ++++++++++++++++++++-------------------------- 1 file changed, 51 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edfa74fe454ecf9b9d301…

1 0

Sebastian Lackner : ntdll: Implement TpCallbackUnloadDllOnCompletion.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: 8965511957d3d9f92fa0d6f41e5961d8a867f927 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8965511957d3d9f92fa0d6f41… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 22:58:23 2015 +0200 ntdll: Implement TpCallbackUnloadDllOnCompletion. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/threadpool.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 03f3af2..134a3f7 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -978,6 +978,7 @@ @ stdcall TpCallbackReleaseMutexOnCompletion(ptr long) @ stdcall TpCallbackReleaseSemaphoreOnCompletion(ptr long long) @ stdcall TpCallbackSetEventOnCompletion(ptr long) +@ stdcall TpCallbackUnloadDllOnCompletion(ptr ptr) @ stdcall TpPostWork(ptr) @ stdcall TpReleaseCleanupGroup(ptr) @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index af4f620..eeb275f 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -210,6 +210,7 @@ struct threadpool_instance HANDLE semaphore; LONG semaphore_count; HANDLE event; + HMODULE library; } cleanup; }; @@ -1644,6 +1645,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) instance.cleanup.semaphore = NULL; instance.cleanup.semaphore_count = 0; instance.cleanup.event = NULL; + instance.cleanup.library = NULL; switch (object->type) { @@ -1696,7 +1698,12 @@ static void CALLBACK threadpool_worker_proc( void *param ) } if (instance.cleanup.event) { - NtSetEvent( instance.cleanup.event, NULL ); + status = NtSetEvent( instance.cleanup.event, NULL ); + if (status != STATUS_SUCCESS) goto skip_cleanup; + } + if (instance.cleanup.library) + { + LdrUnloadDll( instance.cleanup.library ); } skip_cleanup: @@ -1893,6 +1900,19 @@ VOID WINAPI TpCallbackSetEventOnCompletion( TP_CALLBACK_INSTANCE *instance, HAND } /*********************************************************************** + * TpCallbackUnloadDllOnCompletion (NTDLL.@) + */ +VOID WINAPI TpCallbackUnloadDllOnCompletion( TP_CALLBACK_INSTANCE *instance, HMODULE module ) +{ + struct threadpool_instance *this = impl_from_TP_CALLBACK_INSTANCE( instance ); + + TRACE( "%p %p\n", instance, module ); + + if (!this->cleanup.library) + this->cleanup.library = module; +} + +/*********************************************************************** * TpPostWork (NTDLL.@) */ VOID WINAPI TpPostWork( TP_WORK *work )

1 0

Sebastian Lackner : ntdll: Implement TpCallbackSetEventOnCompletion.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: 15110b1770e61593a69a726a6a0238a895fd2b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15110b1770e61593a69a726a6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 22:57:53 2015 +0200 ntdll: Implement TpCallbackSetEventOnCompletion. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/threadpool.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8d89c58..03f3af2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -977,6 +977,7 @@ @ stdcall TpCallbackMayRunLong(ptr) @ stdcall TpCallbackReleaseMutexOnCompletion(ptr long) @ stdcall TpCallbackReleaseSemaphoreOnCompletion(ptr long long) +@ stdcall TpCallbackSetEventOnCompletion(ptr long) @ stdcall TpPostWork(ptr) @ stdcall TpReleaseCleanupGroup(ptr) @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 46ed810..af4f620 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -209,6 +209,7 @@ struct threadpool_instance HANDLE mutex; HANDLE semaphore; LONG semaphore_count; + HANDLE event; } cleanup; }; @@ -1642,6 +1643,7 @@ static void CALLBACK threadpool_worker_proc( void *param ) instance.cleanup.mutex = NULL; instance.cleanup.semaphore = NULL; instance.cleanup.semaphore_count = 0; + instance.cleanup.event = NULL; switch (object->type) { @@ -1689,7 +1691,12 @@ static void CALLBACK threadpool_worker_proc( void *param ) } if (instance.cleanup.semaphore) { - NtReleaseSemaphore( instance.cleanup.semaphore, instance.cleanup.semaphore_count, NULL ); + status = NtReleaseSemaphore( instance.cleanup.semaphore, instance.cleanup.semaphore_count, NULL ); + if (status != STATUS_SUCCESS) goto skip_cleanup; + } + if (instance.cleanup.event) + { + NtSetEvent( instance.cleanup.event, NULL ); } skip_cleanup: @@ -1873,6 +1880,19 @@ VOID WINAPI TpCallbackReleaseSemaphoreOnCompletion( TP_CALLBACK_INSTANCE *instan } /*********************************************************************** + * TpCallbackSetEventOnCompletion (NTDLL.@) + */ +VOID WINAPI TpCallbackSetEventOnCompletion( TP_CALLBACK_INSTANCE *instance, HANDLE event ) +{ + struct threadpool_instance *this = impl_from_TP_CALLBACK_INSTANCE( instance ); + + TRACE( "%p %p\n", instance, event ); + + if (!this->cleanup.event) + this->cleanup.event = event; +} + +/*********************************************************************** * TpPostWork (NTDLL.@) */ VOID WINAPI TpPostWork( TP_WORK *work )

1 0

Sebastian Lackner : ntdll: Implement instance objects and the TpCallbackMayRunLong function.
by Alexandre Julliard July 2, 2015

July 2, 2015

Module: wine Branch: master Commit: eb974bcd7a4eb6e0205c6309f48b885701f3a56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb974bcd7a4eb6e0205c6309f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 1 22:55:30 2015 +0200 ntdll: Implement instance objects and the TpCallbackMayRunLong function. The instance is marked as long-running even if TpCallbackMayRunLong fails, a second call will lead to an exception on Windows. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/tests/threadpool.c | 9 ++++ dlls/ntdll/threadpool.c | 98 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 98 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 4b5ece5..5a698c4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -973,6 +973,7 @@ @ stdcall TpAllocCleanupGroup(ptr) @ stdcall TpAllocPool(ptr ptr) @ stdcall TpAllocWork(ptr ptr ptr ptr) +@ stdcall TpCallbackMayRunLong(ptr) @ stdcall TpPostWork(ptr) @ stdcall TpReleaseCleanupGroup(ptr) @ stdcall TpReleaseCleanupGroupMembers(ptr long ptr) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 2d64471..e920300 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -24,6 +24,7 @@ static HMODULE hntdll = 0; static NTSTATUS (WINAPI *pTpAllocCleanupGroup)(TP_CLEANUP_GROUP **); static NTSTATUS (WINAPI *pTpAllocPool)(TP_POOL **,PVOID); static NTSTATUS (WINAPI *pTpAllocWork)(TP_WORK **,PTP_WORK_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); +static NTSTATUS (WINAPI *pTpCallbackMayRunLong)(TP_CALLBACK_INSTANCE *); static VOID (WINAPI *pTpPostWork)(TP_WORK *); static VOID (WINAPI *pTpReleaseCleanupGroup)(TP_CLEANUP_GROUP *); static VOID (WINAPI *pTpReleaseCleanupGroupMembers)(TP_CLEANUP_GROUP *,BOOL,PVOID); @@ -53,6 +54,7 @@ static BOOL init_threadpool(void) NTDLL_GET_PROC(TpAllocCleanupGroup); NTDLL_GET_PROC(TpAllocPool); NTDLL_GET_PROC(TpAllocWork); + NTDLL_GET_PROC(TpCallbackMayRunLong); NTDLL_GET_PROC(TpPostWork); NTDLL_GET_PROC(TpReleaseCleanupGroup); NTDLL_GET_PROC(TpReleaseCleanupGroupMembers); @@ -312,8 +314,15 @@ static DWORD group_cancel_tid; static void CALLBACK group_cancel_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) { HANDLE *semaphores = userdata; + NTSTATUS status; DWORD result; + trace("Running group cancel callback\n"); + + status = pTpCallbackMayRunLong(instance); + ok(status == STATUS_TOO_MANY_THREADS || broken(status == 1) /* Win Vista / 2008 */, + "expected STATUS_TOO_MANY_THREADS, got %08x\n", status); + result = WaitForSingleObject(semaphores[0], 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); ReleaseSemaphore(semaphores[1], 1, NULL); diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 4ae81b0..a0090c0 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -173,6 +173,7 @@ struct threadpool_object PVOID userdata; PTP_CLEANUP_GROUP_CANCEL_CALLBACK group_cancel_callback; PTP_SIMPLE_CALLBACK finalization_callback; + BOOL may_run_long; HMODULE race_dll; /* information about the group, locked via .group->cs */ struct list group_entry; @@ -196,6 +197,14 @@ struct threadpool_object } u; }; +/* internal threadpool instance representation */ +struct threadpool_instance +{ + struct threadpool_object *object; + DWORD threadid; + BOOL may_run_long; +}; + /* internal threadpool group representation */ struct threadpool_group { @@ -223,6 +232,11 @@ static inline struct threadpool_group *impl_from_TP_CLEANUP_GROUP( TP_CLEANUP_GR return (struct threadpool_group *)group; } +static inline struct threadpool_instance *impl_from_TP_CALLBACK_INSTANCE( TP_CALLBACK_INSTANCE *instance ) +{ + return (struct threadpool_instance *)instance; +} + static void CALLBACK threadpool_worker_proc( void *param ); static void tp_object_submit( struct threadpool_object *object ); static void tp_object_shutdown( struct threadpool_object *object ); @@ -1375,6 +1389,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa object->userdata = userdata; object->group_cancel_callback = NULL; object->finalization_callback = NULL; + object->may_run_long = 0; object->race_dll = NULL; memset( &object->group_entry, 0, sizeof(object->group_entry) ); @@ -1393,9 +1408,14 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa object->group = impl_from_TP_CLEANUP_GROUP( environment->CleanupGroup ); object->group_cancel_callback = environment->CleanupGroupCancelCallback; object->finalization_callback = environment->FinalizationCallback; + object->may_run_long = environment->u.s.LongFunction != 0; object->race_dll = environment->RaceDll; - WARN( "environment not fully implemented yet\n" ); + if (environment->ActivationContext) + FIXME( "activation context not supported yet\n" ); + + if (environment->u.s.Persistent) + FIXME( "persistent threads not supported yet\n" ); } if (object->race_dll) @@ -1578,6 +1598,8 @@ static BOOL tp_object_release( struct threadpool_object *object ) */ static void CALLBACK threadpool_worker_proc( void *param ) { + TP_CALLBACK_INSTANCE *callback_instance; + struct threadpool_instance instance; struct threadpool *pool = param; LARGE_INTEGER timeout; struct list *ptr; @@ -1603,22 +1625,28 @@ static void CALLBACK threadpool_worker_proc( void *param ) pool->num_busy_workers++; RtlLeaveCriticalSection( &pool->cs ); + /* Initialize threadpool instance struct. */ + callback_instance = (TP_CALLBACK_INSTANCE *)&instance; + instance.object = object; + instance.threadid = GetCurrentThreadId(); + instance.may_run_long = object->may_run_long; + switch (object->type) { case TP_OBJECT_TYPE_SIMPLE: { - TRACE( "executing simple callback %p(NULL, %p)\n", - object->u.simple.callback, object->userdata ); - object->u.simple.callback( NULL, object->userdata ); + TRACE( "executing simple callback %p(%p, %p)\n", + object->u.simple.callback, callback_instance, object->userdata ); + object->u.simple.callback( callback_instance, object->userdata ); TRACE( "callback %p returned\n", object->u.simple.callback ); break; } case TP_OBJECT_TYPE_WORK: { - TRACE( "executing work callback %p(NULL, %p, %p)\n", - object->u.work.callback, object->userdata, object ); - object->u.work.callback( NULL, object->userdata, (TP_WORK *)object ); + TRACE( "executing work callback %p(%p, %p, %p)\n", + object->u.work.callback, callback_instance, object->userdata, object ); + object->u.work.callback( callback_instance, object->userdata, (TP_WORK *)object ); TRACE( "callback %p returned\n", object->u.work.callback ); break; } @@ -1631,9 +1659,9 @@ static void CALLBACK threadpool_worker_proc( void *param ) /* Execute finalization callback. */ if (object->finalization_callback) { - TRACE( "executing finalization callback %p(NULL, %p)\n", - object->finalization_callback, object->userdata ); - object->finalization_callback( NULL, object->userdata ); + TRACE( "executing finalization callback %p(%p, %p)\n", + object->finalization_callback, callback_instance, object->userdata ); + object->finalization_callback( callback_instance, object->userdata ); TRACE( "callback %p returned\n", object->finalization_callback ); } @@ -1725,6 +1753,56 @@ NTSTATUS WINAPI TpAllocWork( TP_WORK **out, PTP_WORK_CALLBACK callback, PVOID us } /*********************************************************************** + * TpCallbackMayRunLong (NTDLL.@) + */ +NTSTATUS WINAPI TpCallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) +{ + struct threadpool_instance *this = impl_from_TP_CALLBACK_INSTANCE( instance ); + struct threadpool_object *object = this->object; + struct threadpool *pool; + NTSTATUS status = STATUS_SUCCESS; + + TRACE( "%p\n", instance ); + + if (this->threadid != GetCurrentThreadId()) + { + ERR("called from wrong thread, ignoring\n"); + return STATUS_UNSUCCESSFUL; /* FIXME */ + } + + if (this->may_run_long) + return STATUS_SUCCESS; + + pool = object->pool; + RtlEnterCriticalSection( &pool->cs ); + + /* Start new worker threads if required. */ + if (pool->num_busy_workers >= pool->num_workers) + { + if (pool->num_workers < pool->max_workers) + { + HANDLE thread; + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, + threadpool_worker_proc, pool, &thread, NULL ); + if (status == STATUS_SUCCESS) + { + interlocked_inc( &pool->refcount ); + pool->num_workers++; + NtClose( thread ); + } + } + else + { + status = STATUS_TOO_MANY_THREADS; + } + } + + RtlLeaveCriticalSection( &pool->cs ); + this->may_run_long = TRUE; + return status; +} + +/*********************************************************************** * TpPostWork (NTDLL.@) */ VOID WINAPI TpPostWork( TP_WORK *work )

1 0