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

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

July 3, 2015

Module: wine Branch: master Commit: 64e8b6c03a0d07bcf955162949aeae8e46de6f50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e8b6c03a0d07bcf95516294… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:10:10 2015 +0200 dmime: Use the generic IPersistStream for DMSysExTrack. --- dlls/dmime/sysextrack.c | 67 ++++++++++++------------------------------------ dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index caaa7bf..431fca7 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.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 IDirectMusicSysExTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicSysExTrack; /* IDirectMusicSysExTrack IDirectMusicTrack8 part: */ @@ -50,7 +50,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * IsEqualIID(riid, &IID_IDirectMusicTrack8)) *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; @@ -242,52 +242,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicSysExTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicSysExTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicSysExTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicSysExTrack_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 IDirectMusicSysExTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicSysExTrack_PersistStream_Vtbl = { - IDirectMusicSysExTrack_IPersistStream_QueryInterface, - IDirectMusicSysExTrack_IPersistStream_AddRef, - IDirectMusicSysExTrack_IPersistStream_Release, - IDirectMusicSysExTrack_IPersistStream_GetClassID, - IDirectMusicSysExTrack_IPersistStream_IsDirty, - IDirectMusicSysExTrack_IPersistStream_Load, - IDirectMusicSysExTrack_IPersistStream_Save, - IDirectMusicSysExTrack_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 */ @@ -302,12 +271,10 @@ HRESULT WINAPI create_dmsysextrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicSysExTrack_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_DirectMusicSysExTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicSysExTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 35b7d04..0c6f49c 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -499,7 +499,7 @@ static void test_track(void) { X(DirectMusicParamControlTrack), TRUE }, { X(DirectMusicSegmentTriggerTrack), FALSE }, { X(DirectMusicSeqTrack), FALSE }, - { X(DirectMusicSysExTrack), TRUE }, + { X(DirectMusicSysExTrack), FALSE }, { X(DirectMusicTempoTrack), FALSE }, { X(DirectMusicTimeSigTrack), FALSE }, { X(DirectMusicWaveTrack), TRUE }

1 0

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

July 3, 2015

Module: wine Branch: master Commit: b9360bd999fdeaa015afeeedaa1d0e31bb7d3e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9360bd999fdeaa015afeeeda… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:09:32 2015 +0200 dmime: Remove the extraneous IUnknown from DMSysExTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/sysextrack.c | 123 ++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 73 deletions(-) diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 65304eb..caaa7bf 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -25,68 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); * IDirectMusicSysExTrack implementation */ typedef struct IDirectMusicSysExTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicSysExTrack; -/* IDirectMusicSysExTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef(iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_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_guid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicSysExTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicSysExTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, 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 DirectMusicSysExTrack_Unknown_Vtbl = { - IDirectMusicSysExTrack_IUnknown_QueryInterface, - IDirectMusicSysExTrack_IUnknown_AddRef, - IDirectMusicSysExTrack_IUnknown_Release -}; - /* IDirectMusicSysExTrack IDirectMusicTrack8 part: */ static inline IDirectMusicSysExTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -94,22 +38,51 @@ static inline IDirectMusicSysExTrack *impl_from_IDirectMusicTrack8(IDirectMusicT } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(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) || + IsEqualIID(riid, &IID_IDirectMusicTrack8)) + *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 IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) { IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(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 IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -272,17 +245,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicSysExTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicSysExTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicSysExTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -320,21 +293,25 @@ static const IPersistStreamVtbl DirectMusicSysExTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmsysextrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicSysExTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSysExTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicSysExTrack_Unknown_Vtbl; + IDirectMusicSysExTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicSysExTrack_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_DirectMusicSysExTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMIME_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicSysExTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

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

July 3, 2015

Module: wine Branch: master Commit: 9a47a46a95ec1f384bf1dcb6a6662d08e33c07b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a47a46a95ec1f384bf1dcb6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:41:29 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMSysExTrack. --- dlls/dmime/sysextrack.c | 78 +++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index 12dad99..65304eb 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicSysExTrack { const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; + IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IUnknown_QueryInterface (LPUNKNOWN return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl; + *ppobj = &This->IDirectMusicTrack8_iface; IUnknown_AddRef(iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { @@ -90,48 +90,57 @@ static const IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl = { /* IDirectMusicSysExTrack IDirectMusicTrack8 part: */ static inline IDirectMusicSysExTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { - return CONTAINING_RECORD(iface, IDirectMusicSysExTrack, TrackVtbl); + return CONTAINING_RECORD(iface, IDirectMusicSysExTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, + void **ppobj) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); +static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); +static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment) +static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, + IDirectMusicSegment *pSegment) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) +static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, + IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, + void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData) +static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) +static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *pStateData, + MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, + IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -182,14 +191,19 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, + MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, + REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, + IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; @@ -234,21 +248,21 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static const IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = { - IDirectMusicSysExTrack_IDirectMusicTrack_QueryInterface, - IDirectMusicSysExTrack_IDirectMusicTrack_AddRef, - IDirectMusicSysExTrack_IDirectMusicTrack_Release, - IDirectMusicSysExTrack_IDirectMusicTrack_Init, - IDirectMusicSysExTrack_IDirectMusicTrack_InitPlay, - IDirectMusicSysExTrack_IDirectMusicTrack_EndPlay, - IDirectMusicSysExTrack_IDirectMusicTrack_Play, +static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { + IDirectMusicTrack8Impl_QueryInterface, + IDirectMusicTrack8Impl_AddRef, + IDirectMusicTrack8Impl_Release, + IDirectMusicTrack8Impl_Init, + IDirectMusicTrack8Impl_InitPlay, + IDirectMusicTrack8Impl_EndPlay, + IDirectMusicTrack8Impl_Play, IDirectMusicTrack8Impl_GetParam, IDirectMusicTrack8Impl_SetParam, IDirectMusicTrack8Impl_IsParamSupported, IDirectMusicTrack8Impl_AddNotificationType, IDirectMusicTrack8Impl_RemoveNotificationType, - IDirectMusicSysExTrack_IDirectMusicTrack_Clone, - IDirectMusicSysExTrack_IDirectMusicTrack_PlayEx, + IDirectMusicTrack8Impl_Clone, + IDirectMusicTrack8Impl_PlayEx, IDirectMusicTrack8Impl_GetParamEx, IDirectMusicTrack8Impl_SetParamEx, IDirectMusicTrack8Impl_Compose, @@ -314,7 +328,7 @@ HRESULT WINAPI create_dmsysextrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->UnknownVtbl = &DirectMusicSysExTrack_Unknown_Vtbl; - track->TrackVtbl = &DirectMusicSysExTrack_Track_Vtbl; + track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicSysExTrack_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 DMSeqTrack.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: ac18130e761bbdfdf1961a23b39609ba58ffbbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac18130e761bbdfdf1961a23b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:37:49 2015 +0200 dmime: Use the generic IPersistStream for DMSeqTrack. --- dlls/dmime/seqtrack.c | 67 ++++++++++++------------------------------------ dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 0a18c02..2d80db7 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.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 IDirectMusicSeqTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicSeqTrack; /* IDirectMusicSeqTrack IDirectMusicTrack8 part: */ @@ -50,7 +50,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * IsEqualIID(riid, &IID_IDirectMusicTrack8)) *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; @@ -242,52 +242,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicSeqTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicSeqTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicSeqTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicSeqTrack_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 IDirectMusicSeqTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicSeqTrack_PersistStream_Vtbl = { - IDirectMusicSeqTrack_IPersistStream_QueryInterface, - IDirectMusicSeqTrack_IPersistStream_AddRef, - IDirectMusicSeqTrack_IPersistStream_Release, - IDirectMusicSeqTrack_IPersistStream_GetClassID, - IDirectMusicSeqTrack_IPersistStream_IsDirty, - IDirectMusicSeqTrack_IPersistStream_Load, - IDirectMusicSeqTrack_IPersistStream_Save, - IDirectMusicSeqTrack_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 */ @@ -302,12 +271,10 @@ HRESULT WINAPI create_dmseqtrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicSeqTrack_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_DirectMusicSeqTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicSeqTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e2d1b0f..35b7d04 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -498,7 +498,7 @@ static void test_track(void) { X(DirectMusicMarkerTrack), FALSE }, { X(DirectMusicParamControlTrack), TRUE }, { X(DirectMusicSegmentTriggerTrack), FALSE }, - { X(DirectMusicSeqTrack), TRUE }, + { X(DirectMusicSeqTrack), FALSE }, { X(DirectMusicSysExTrack), TRUE }, { X(DirectMusicTempoTrack), FALSE }, { X(DirectMusicTimeSigTrack), FALSE },

1 0

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

July 3, 2015

Module: wine Branch: master Commit: 7da799a26f809a4c7fbdc34d677ecb86a5ef1387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7da799a26f809a4c7fbdc34d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:36:54 2015 +0200 dmime: Remove the extraneous IUnknown from DMSeqTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/seqtrack.c | 123 ++++++++++++++++++++------------------------------ 1 file changed, 50 insertions(+), 73 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index fed1882..0a18c02 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -25,68 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); * IDirectMusicSeqTrack implementation */ typedef struct IDirectMusicSeqTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicSeqTrack; -/* IDirectMusicSeqTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicSeqTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, 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) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_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 IDirectMusicSeqTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicSeqTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, 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 DirectMusicSeqTrack_Unknown_Vtbl = { - IDirectMusicSeqTrack_IUnknown_QueryInterface, - IDirectMusicSeqTrack_IUnknown_AddRef, - IDirectMusicSeqTrack_IUnknown_Release -}; - /* IDirectMusicSeqTrack IDirectMusicTrack8 part: */ static inline IDirectMusicSeqTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -94,22 +38,51 @@ static inline IDirectMusicSeqTrack *impl_from_IDirectMusicTrack8(IDirectMusicTra } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(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) || + IsEqualIID(riid, &IID_IDirectMusicTrack8)) + *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 IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) { IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(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 IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -272,17 +245,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicSeqTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSeqTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicSeqTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSeqTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicSeqTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSeqTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -320,21 +293,25 @@ static const IPersistStreamVtbl DirectMusicSeqTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmseqtrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicSeqTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSeqTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicSeqTrack_Unknown_Vtbl; + IDirectMusicSeqTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicSeqTrack_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_DirectMusicSeqTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMIME_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicSeqTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

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

July 3, 2015

Module: wine Branch: master Commit: 1b1d95e9d637cc995567def724d744374052f005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1d95e9d637cc995567def72… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:36:16 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMSeqTrack. --- dlls/dmime/seqtrack.c | 78 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 32 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index dafe6b5..fed1882 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicSeqTrack { const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; + IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; @@ -43,7 +43,7 @@ static HRESULT WINAPI IDirectMusicSeqTrack_IUnknown_QueryInterface (LPUNKNOWN if return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl; + *ppobj = &This->IDirectMusicTrack8_iface; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { @@ -90,48 +90,57 @@ static const IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl = { /* IDirectMusicSeqTrack IDirectMusicTrack8 part: */ static inline IDirectMusicSeqTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { - return CONTAINING_RECORD(iface, IDirectMusicSeqTrack, TrackVtbl); + return CONTAINING_RECORD(iface, IDirectMusicSeqTrack, IDirectMusicTrack8_iface); } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, + void **ppobj) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Release (LPDIRECTMUSICTRACK8 iface) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Init (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegment* pSegment) +static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, + IDirectMusicSegment *pSegment) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) +static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, + IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, + void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData) +static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p): stub\n", This, pStateData); return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) +static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *pStateData, + MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, + IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; } @@ -182,14 +191,19 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusic return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart, + MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %d, %d, %p): stub\n", This, mtStart, mtEnd, ppTrack); return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, + REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, + IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); return S_OK; @@ -234,21 +248,21 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, return E_NOTIMPL; } -static const IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = { - IDirectMusicSeqTrack_IDirectMusicTrack_QueryInterface, - IDirectMusicSeqTrack_IDirectMusicTrack_AddRef, - IDirectMusicSeqTrack_IDirectMusicTrack_Release, - IDirectMusicSeqTrack_IDirectMusicTrack_Init, - IDirectMusicSeqTrack_IDirectMusicTrack_InitPlay, - IDirectMusicSeqTrack_IDirectMusicTrack_EndPlay, - IDirectMusicSeqTrack_IDirectMusicTrack_Play, +static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { + IDirectMusicTrack8Impl_QueryInterface, + IDirectMusicTrack8Impl_AddRef, + IDirectMusicTrack8Impl_Release, + IDirectMusicTrack8Impl_Init, + IDirectMusicTrack8Impl_InitPlay, + IDirectMusicTrack8Impl_EndPlay, + IDirectMusicTrack8Impl_Play, IDirectMusicTrack8Impl_GetParam, IDirectMusicTrack8Impl_SetParam, IDirectMusicTrack8Impl_IsParamSupported, IDirectMusicTrack8Impl_AddNotificationType, IDirectMusicTrack8Impl_RemoveNotificationType, - IDirectMusicSeqTrack_IDirectMusicTrack_Clone, - IDirectMusicSeqTrack_IDirectMusicTrack_PlayEx, + IDirectMusicTrack8Impl_Clone, + IDirectMusicTrack8Impl_PlayEx, IDirectMusicTrack8Impl_GetParamEx, IDirectMusicTrack8Impl_SetParamEx, IDirectMusicTrack8Impl_Compose, @@ -314,7 +328,7 @@ HRESULT WINAPI create_dmseqtrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->UnknownVtbl = &DirectMusicSeqTrack_Unknown_Vtbl; - track->TrackVtbl = &DirectMusicSeqTrack_Track_Vtbl; + track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicSeqTrack_PersistStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc);

1 0

Michael Stefaniuc : dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSysExTrack.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 9b4ed8858f2342b2305f30cdb0d203b465713154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4ed8858f2342b2305f30cdb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:30:23 2015 +0200 dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSysExTrack. --- dlls/dmime/sysextrack.c | 129 ++++++++++++++++++++++++++++++------------------ 1 file changed, 80 insertions(+), 49 deletions(-) diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index ce5ae12..12dad99 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -88,6 +88,11 @@ static const IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl = { }; /* IDirectMusicSysExTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicSysExTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSysExTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -131,37 +136,50 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Play (LPDIRECTMUS return S_OK; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_guid(rguidType), mtTime, pmtNext, pParam); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + next, param); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_guid(rguidType), mtTime, pParam); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, + REFGUID type) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s)\n", This, debugstr_guid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_guid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_guid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -177,30 +195,43 @@ static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_PlayEx (LPDIRECTM return S_OK; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_guid(rguidType), - wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, REFGUID type, + REFERENCE_TIME time, REFERENCE_TIME *next, void *param, void *state, DWORD flags) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + wine_dbgstr_longlong(time), next, param, state, flags); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_guid(rguidType), - wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, REFGUID type, + REFERENCE_TIME time, void *param, void *state, DWORD flags) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + wine_dbgstr_longlong(time), param, state, flags); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSysExTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, + IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, + IDirectMusicTrack **resulttrack) +{ + IDirectMusicSysExTrack *This = impl_from_IDirectMusicTrack8(iface); + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + trackgroup, resulttrack); + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = { @@ -211,17 +242,17 @@ static const IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = { IDirectMusicSysExTrack_IDirectMusicTrack_InitPlay, IDirectMusicSysExTrack_IDirectMusicTrack_EndPlay, IDirectMusicSysExTrack_IDirectMusicTrack_Play, - IDirectMusicSysExTrack_IDirectMusicTrack_GetParam, - IDirectMusicSysExTrack_IDirectMusicTrack_SetParam, - IDirectMusicSysExTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicSysExTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicSysExTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_GetParam, + IDirectMusicTrack8Impl_SetParam, + IDirectMusicTrack8Impl_IsParamSupported, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicSysExTrack_IDirectMusicTrack_Clone, IDirectMusicSysExTrack_IDirectMusicTrack_PlayEx, - IDirectMusicSysExTrack_IDirectMusicTrack_GetParamEx, - IDirectMusicSysExTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicSysExTrack_IDirectMusicTrack_Compose, - IDirectMusicSysExTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_GetParamEx, + IDirectMusicTrack8Impl_SetParamEx, + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join }; /* IDirectMusicSysExTrack IPersistStream part: */

1 0

Michael Stefaniuc : dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSeqTrack.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 4a7664275fe599a6d2dc1705bcf2fda990dfa14f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7664275fe599a6d2dc1705b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 09:25:21 2015 +0200 dmime: Implement the E_NOTIMPL methods of IDMTrack8 for DMSeqTrack. --- dlls/dmime/seqtrack.c | 129 +++++++++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 49 deletions(-) diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index 2598138..dafe6b5 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -88,6 +88,11 @@ static const IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl = { }; /* IDirectMusicSeqTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicSeqTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSeqTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -131,37 +136,50 @@ static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Play (LPDIRECTMUSIC return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s, %d, %p, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pmtNext, pParam); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, MUSIC_TIME *next, void *param) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p, %p): method not implemented\n", This, debugstr_dmguid(type), time, + next, param); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_SetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, void* pParam) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s, %d, %p): stub\n", This, debugstr_dmguid(rguidType), mtTime, pParam); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID type, + MUSIC_TIME time, void *param) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %d, %p): method not implemented\n", This, debugstr_dmguid(type), time, param); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_IsParamSupported (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); +static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, + REFGUID type) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); - TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); - /* didn't find any params */ - TRACE("param unsupported\n"); - return DMUS_E_TYPE_UNSUPPORTED; + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(type)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -177,30 +195,43 @@ static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUS return S_OK; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), - wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, REFGUID type, + REFERENCE_TIME time, REFERENCE_TIME *next, void *param, void *state, DWORD flags) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %s, %p, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + wine_dbgstr_longlong(time), next, param, state, flags); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), - wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, REFGUID type, + REFERENCE_TIME time, void *param, void *state, DWORD flags) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s, %s, %p, %p, %x): method not implemented\n", This, debugstr_dmguid(type), + wine_dbgstr_longlong(time), param, state, flags); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p): stub\n", This, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, + DWORD trackgroup, IDirectMusicTrack **track) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicSeqTrack, TrackVtbl, iface); - FIXME("(%p, %p, %d, %p, %d, %p): stub\n", This, pNewTrack, mtJoin, pContext, dwTrackGroup, ppResultTrack); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, + IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, + IDirectMusicTrack **resulttrack) +{ + IDirectMusicSeqTrack *This = impl_from_IDirectMusicTrack8(iface); + TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, + trackgroup, resulttrack); + return E_NOTIMPL; } static const IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = { @@ -211,17 +242,17 @@ static const IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = { IDirectMusicSeqTrack_IDirectMusicTrack_InitPlay, IDirectMusicSeqTrack_IDirectMusicTrack_EndPlay, IDirectMusicSeqTrack_IDirectMusicTrack_Play, - IDirectMusicSeqTrack_IDirectMusicTrack_GetParam, - IDirectMusicSeqTrack_IDirectMusicTrack_SetParam, - IDirectMusicSeqTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicSeqTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicSeqTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_GetParam, + IDirectMusicTrack8Impl_SetParam, + IDirectMusicTrack8Impl_IsParamSupported, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicSeqTrack_IDirectMusicTrack_Clone, IDirectMusicSeqTrack_IDirectMusicTrack_PlayEx, - IDirectMusicSeqTrack_IDirectMusicTrack_GetParamEx, - IDirectMusicSeqTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicSeqTrack_IDirectMusicTrack_Compose, - IDirectMusicSeqTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_GetParamEx, + IDirectMusicTrack8Impl_SetParamEx, + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join }; /* IDirectMusicSeqTrack IPersistStream part: */

1 0

Sebastian Lackner : kernel32: Forward remaining threadpool functions to ntdll.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: eadd27a38a218e6ab27404d2981f3fe521f13361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eadd27a38a218e6ab27404d29… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 02:00:31 2015 +0200 kernel32: Forward remaining threadpool functions to ntdll. --- dlls/kernel32/kernel32.spec | 10 +++++----- dlls/kernel32/tests/thread.c | 6 +++--- dlls/kernel32/thread.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 5 +++++ 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0825bdb..a14d03b 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -228,7 +228,7 @@ # @ stub ClosePrivateNamespace @ stdcall CloseProfileUserMapping() @ stub CloseSystemHandle -# @ stub CloseThreadpool +@ stdcall CloseThreadpool(ptr) ntdll.TpReleasePool @ stdcall CloseThreadpoolCleanupGroup(ptr) ntdll.TpReleaseCleanupGroup @ stdcall CloseThreadpoolCleanupGroupMembers(ptr long ptr) ntdll.TpReleaseCleanupGroupMembers # @ stub CloseThreadpoolIo @@ -331,7 +331,7 @@ @ stdcall CreateSymbolicLinkW(wstr wstr long) @ stdcall CreateTapePartition(long long long long) @ stdcall CreateThread(ptr long ptr long long ptr) -# @ stub CreateThreadpool +@ stdcall CreateThreadpool(ptr) @ stdcall CreateThreadpoolCleanupGroup() # @ stub CreateThreadpoolIo @ stdcall CreateThreadpoolTimer(ptr ptr ptr) @@ -1454,8 +1454,8 @@ # @ stub SetThreadToken @ stdcall SetThreadUILanguage(long) # @ stub SetThreadpoolStackInformation -# @ stub SetThreadpoolThreadMaximum -# @ stub SetThreadpoolThreadMinimum +@ stdcall SetThreadpoolThreadMaximum(ptr long) ntdll.TpSetPoolMaxThreads +@ stdcall SetThreadpoolThreadMinimum(ptr long) ntdll.TpSetPoolMinThreads @ stdcall SetThreadpoolTimer(ptr ptr long long) # @ stub SetThreadpoolWait @ stdcall SetTimeZoneInformation(ptr) @@ -1509,7 +1509,7 @@ @ stdcall TryAcquireSRWLockExclusive(ptr) ntdll.RtlTryAcquireSRWLockExclusive @ stdcall TryAcquireSRWLockShared(ptr) ntdll.RtlTryAcquireSRWLockShared @ stdcall TryEnterCriticalSection(ptr) ntdll.RtlTryEnterCriticalSection -# @ stub TrySubmitThreadpoolCallback +@ stdcall TrySubmitThreadpoolCallback(ptr ptr ptr) @ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) # @ stub TzSpecificLocalTimeToSystemTimeEx # @ stub -arch=x86_64 uaw_lstrcmpW diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index d3ecd2a..25801b2 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1627,8 +1627,8 @@ static void test_threadpool(void) int workcalled = 0; if (!pCreateThreadpool) { - todo_wine win_skip("thread pool apis not supported.\n"); - return; + win_skip("thread pool apis not supported.\n"); + return; } work = pCreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); @@ -1640,7 +1640,7 @@ static void test_threadpool(void) ok (workcalled == 1, "expected work to be called once, got %d\n", workcalled); pool = pCreateThreadpool(NULL); - todo_wine ok (pool != NULL, "CreateThreadpool failed\n"); + ok (pool != NULL, "CreateThreadpool failed\n"); } static void test_reserved_tls(void) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index c8e906d..21ec276 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -881,6 +881,26 @@ BOOL WINAPI CallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) } /*********************************************************************** + * CreateThreadpool (KERNEL32.@) + */ +PTP_POOL WINAPI CreateThreadpool( PVOID reserved ) +{ + TP_POOL *pool; + NTSTATUS status; + + TRACE( "%p\n", reserved ); + + status = TpAllocPool( &pool, reserved ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return NULL; + } + + return pool; +} + +/*********************************************************************** * CreateThreadpoolCleanupGroup (KERNEL32.@) */ PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) @@ -960,3 +980,23 @@ VOID WINAPI SetThreadpoolTimer( TP_TIMER *timer, FILETIME *due_time, TpSetTimer( timer, due_time ? &timeout : NULL, period, window_length ); } + +/*********************************************************************** + * TrySubmitThreadpoolCallback (KERNEL32.@) + */ +BOOL WINAPI TrySubmitThreadpoolCallback( PTP_SIMPLE_CALLBACK callback, PVOID userdata, + TP_CALLBACK_ENVIRON *environment ) +{ + NTSTATUS status; + + TRACE( "%p, %p, %p\n", callback, userdata, environment ); + + status = TpSimpleTryPost( callback, userdata, environment ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + return TRUE; +} diff --git a/include/winternl.h b/include/winternl.h index 5b07994..e1707fd 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2619,6 +2619,7 @@ NTSYSAPI NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PC /* Threadpool functions */ NTSYSAPI NTSTATUS WINAPI TpAllocCleanupGroup(TP_CLEANUP_GROUP **); +NTSYSAPI NTSTATUS WINAPI TpAllocPool(TP_POOL **,PVOID); NTSYSAPI NTSTATUS WINAPI TpAllocTimer(TP_TIMER **,PTP_TIMER_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI NTSTATUS WINAPI TpAllocWork(TP_WORK **,PTP_WORK_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI void WINAPI TpCallbackLeaveCriticalSectionOnCompletion(TP_CALLBACK_INSTANCE *,RTL_CRITICAL_SECTION *); @@ -2632,9 +2633,13 @@ NTSYSAPI BOOL WINAPI TpIsTimerSet(TP_TIMER *); NTSYSAPI void WINAPI TpPostWork(TP_WORK *); NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *); NTSYSAPI void WINAPI TpReleaseCleanupGroupMembers(TP_CLEANUP_GROUP *,BOOL,PVOID); +NTSYSAPI void WINAPI TpReleasePool(TP_POOL *); NTSYSAPI void WINAPI TpReleaseTimer(TP_TIMER *); NTSYSAPI void WINAPI TpReleaseWork(TP_WORK *); +NTSYSAPI void WINAPI TpSetPoolMaxThreads(TP_POOL *,DWORD); +NTSYSAPI BOOL WINAPI TpSetPoolMinThreads(TP_POOL *,DWORD); NTSYSAPI void WINAPI TpSetTimer(TP_TIMER *, LARGE_INTEGER *,LONG,LONG); +NTSYSAPI NTSTATUS WINAPI TpSimpleTryPost(PTP_SIMPLE_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI void WINAPI TpWaitForTimer(TP_TIMER *,BOOL); NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL);

1 0

Sebastian Lackner : kernel32: Forward threadpool instance functions to ntdll.
by Alexandre Julliard July 3, 2015

July 3, 2015

Module: wine Branch: master Commit: 56b9af1150b706ed410f0bb0836f72cf6d9e8a19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b9af1150b706ed410f0bb08… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 3 02:00:14 2015 +0200 kernel32: Forward threadpool instance functions to ntdll. --- dlls/kernel32/kernel32.spec | 14 +++++++------- dlls/kernel32/thread.c | 19 +++++++++++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3d3a68b..0825bdb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -204,7 +204,7 @@ @ stdcall BuildCommDCBAndTimeoutsA(str ptr ptr) @ stdcall BuildCommDCBAndTimeoutsW(wstr ptr ptr) @ stdcall BuildCommDCBW(wstr ptr) -# @ stub CallbackMayRunLong +@ stdcall CallbackMayRunLong(ptr) @ stdcall CallNamedPipeA(str ptr long ptr long ptr long) @ stdcall CallNamedPipeW(wstr ptr long ptr long ptr long) @ stub CancelDeviceWakeupRequest @@ -369,7 +369,7 @@ @ stdcall DeleteFileW(wstr) # @ stub DeleteProcThreadAttributeList # @ stub DisableThreadProfiling -# @ stub DisassociateCurrentThreadFromCallback +@ stdcall DisassociateCurrentThreadFromCallback(ptr) ntdll.TpDisassociateCallback @ stdcall DeleteTimerQueue(long) @ stdcall DeleteTimerQueueEx (long long) @ stdcall DeleteTimerQueueTimer(long long long) @@ -495,7 +495,6 @@ @ stdcall FindFirstVolumeMountPointA(str ptr long) @ stdcall FindFirstVolumeMountPointW(wstr ptr long) @ stdcall FindFirstVolumeW(ptr long) -# @ stub FreeLibraryWhenCallbackReturns @ stdcall FindNextChangeNotification(long) @ stdcall FindNextFileA(long ptr) # @ stub FindNextFileNameW @@ -533,6 +532,7 @@ @ stub -i386 FreeLSCallback @ stdcall FreeLibrary(long) @ stdcall FreeLibraryAndExitThread(long long) +@ stdcall FreeLibraryWhenCallbackReturns(ptr ptr) ntdll.TpCallbackUnloadDllOnCompletion @ stdcall FreeResource(long) @ stdcall -i386 -private FreeSLCallback(long) krnl386.exe16.FreeSLCallback @ stub FreeUserPhysicalPages @@ -1035,7 +1035,7 @@ @ stdcall LZSeek(long long long) @ stdcall LZStart() @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection -# @ stub LeaveCriticalSectionWhenCallbackReturns +@ stdcall LeaveCriticalSectionWhenCallbackReturns(ptr ptr) ntdll.TpCallbackLeaveCriticalSectionOnCompletion # @ stub LoadAppInitDlls @ stdcall LoadLibraryA(str) @ stdcall LoadLibraryExA( str long long) @@ -1252,9 +1252,9 @@ @ stdcall ReinitializeCriticalSection(ptr) @ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) -# @ stub ReleaseMutexWhenCallbackReturns +@ stdcall ReleaseMutexWhenCallbackReturns(ptr long) ntdll.TpCallbackReleaseMutexOnCompletion @ stdcall ReleaseSemaphore(long long ptr) -# @ stub ReleaseSemaphoreWhenCallbackReturns +@ stdcall ReleaseSemaphoreWhenCallbackReturns(ptr long long) ntdll.TpCallbackReleaseSemaphoreOnCompletion @ stdcall ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive @ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared @ stdcall RemoveDirectoryA(str) @@ -1385,7 +1385,7 @@ @ stdcall SetEnvironmentVariableW(wstr wstr) @ stdcall SetErrorMode(long) @ stdcall SetEvent(long) -# @ stub SetEventWhenCallbackReturns +@ stdcall SetEventWhenCallbackReturns(ptr long) ntdll.TpCallbackSetEventOnCompletion @ stdcall SetFileApisToANSI() @ stdcall SetFileApisToOEM() @ stdcall SetFileAttributesA(str long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 1ca0945..c8e906d 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -862,6 +862,25 @@ BOOL WINAPI GetThreadPreferredUILanguages( DWORD flags, PULONG count, PCZZWSTR b } /*********************************************************************** + * CallbackMayRunLong (KERNEL32.@) + */ +BOOL WINAPI CallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) +{ + NTSTATUS status; + + TRACE( "%p\n", instance ); + + status = TpCallbackMayRunLong( instance ); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; + } + + return TRUE; +} + +/*********************************************************************** * CreateThreadpoolCleanupGroup (KERNEL32.@) */ PTP_CLEANUP_GROUP WINAPI CreateThreadpoolCleanupGroup( void ) diff --git a/include/winternl.h b/include/winternl.h index ab64a71..5b07994 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2621,6 +2621,13 @@ NTSYSAPI NTSTATUS WINAPI RtlLargeIntegerToChar(const ULONGLONG *,ULONG,ULONG,PC NTSYSAPI NTSTATUS WINAPI TpAllocCleanupGroup(TP_CLEANUP_GROUP **); NTSYSAPI NTSTATUS WINAPI TpAllocTimer(TP_TIMER **,PTP_TIMER_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); NTSYSAPI NTSTATUS WINAPI TpAllocWork(TP_WORK **,PTP_WORK_CALLBACK,PVOID,TP_CALLBACK_ENVIRON *); +NTSYSAPI void WINAPI TpCallbackLeaveCriticalSectionOnCompletion(TP_CALLBACK_INSTANCE *,RTL_CRITICAL_SECTION *); +NTSYSAPI NTSTATUS WINAPI TpCallbackMayRunLong(TP_CALLBACK_INSTANCE *); +NTSYSAPI void WINAPI TpCallbackReleaseMutexOnCompletion(TP_CALLBACK_INSTANCE *,HANDLE); +NTSYSAPI void WINAPI TpCallbackReleaseSemaphoreOnCompletion(TP_CALLBACK_INSTANCE *,HANDLE,DWORD); +NTSYSAPI void WINAPI TpCallbackSetEventOnCompletion(TP_CALLBACK_INSTANCE *,HANDLE); +NTSYSAPI void WINAPI TpCallbackUnloadDllOnCompletion(TP_CALLBACK_INSTANCE *,HMODULE); +NTSYSAPI void WINAPI TpDisassociateCallback(TP_CALLBACK_INSTANCE *); NTSYSAPI BOOL WINAPI TpIsTimerSet(TP_TIMER *); NTSYSAPI void WINAPI TpPostWork(TP_WORK *); NTSYSAPI void WINAPI TpReleaseCleanupGroup(TP_CLEANUP_GROUP *);

1 0