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

André Hentschel : Add WWN 394
by Jeremy Newman 06 Jul '15

06 Jul '15

Module: website Branch: master Commit: c994ada2323961b9c5dba3f7e5d444aa6f4a26e3 URL: http://source.winehq.org/git/website.git/?a=commit;h=c994ada2323961b9c5dba3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jul 5 22:35:39 2015 +0200 Add WWN 394 --- news/de/2015070301.xml | 10 ++ news/en/2015070301.xml | 10 ++ wwn/en/wn20150703_394.xml | 426 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 446 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=c994ada2323961b9c5…

1 0

Michael Stefaniuc : dmime: Implement the E_NOTIMPL methods in DMParamControlTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 10f3d166a9be0c5e9779317dba025e12c4006e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f3d166a9be0c5e9779317db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:18:32 2015 +0200 dmime: Implement the E_NOTIMPL methods in DMParamControlTrack. --- dlls/dmime/paramcontroltrack.c | 58 +++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 78e3327..c7ef2c3 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -88,6 +88,11 @@ static const IUnknownVtbl DirectMusicParamControlTrack_Unknown_Vtbl = { }; /* IDirectMusicParamControlTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicParamControlTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicParamControlTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicParamControlTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -152,16 +157,22 @@ static HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_IsParamSup return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -191,16 +202,23 @@ static HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_SetParamEx return S_OK; } -static HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, 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) +{ + IDirectMusicParamControlTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, 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) +{ + IDirectMusicParamControlTrack *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 DirectMusicParamControlTrack_Track_Vtbl = { @@ -214,14 +232,14 @@ static const IDirectMusicTrack8Vtbl DirectMusicParamControlTrack_Track_Vtbl = { IDirectMusicParamControlTrack_IDirectMusicTrack_GetParam, IDirectMusicParamControlTrack_IDirectMusicTrack_SetParam, IDirectMusicParamControlTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicParamControlTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicParamControlTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicParamControlTrack_IDirectMusicTrack_Clone, IDirectMusicParamControlTrack_IDirectMusicTrack_PlayEx, IDirectMusicParamControlTrack_IDirectMusicTrack_GetParamEx, IDirectMusicParamControlTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicParamControlTrack_IDirectMusicTrack_Compose, - IDirectMusicParamControlTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join }; /* IDirectMusicParamControlTrack IPersistStream part: */

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicTrack of DMParamControlTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 243ff86fbf469773d8eb9d907fe0280f32ecc394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=243ff86fbf469773d8eb9d907… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:28:17 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMParamControlTrack. --- dlls/dmime/paramcontroltrack.c | 119 +++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=243ff86fbf469773d8eb9…

1 0

Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DMParamControlTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 22184e3694ca4abb1fa5912da1fe01f8fddd88da URL: http://source.winehq.org/git/wine.git/?a=commit;h=22184e3694ca4abb1fa5912da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:29:48 2015 +0200 dmime: Remove the extraneous IUnknown from DMParamControlTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/paramcontroltrack.c | 123 +++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 73 deletions(-) diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index af21a40..2f5f1c0 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -25,68 +25,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); * IDirectMusicParamControlTrack implementation */ typedef struct IDirectMusicParamControlTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicParamControlTrack; -/* IDirectMusicParamControlTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicParamControlTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, 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 IDirectMusicParamControlTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicParamControlTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, 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 DirectMusicParamControlTrack_Unknown_Vtbl = { - IDirectMusicParamControlTrack_IUnknown_QueryInterface, - IDirectMusicParamControlTrack_IUnknown_AddRef, - IDirectMusicParamControlTrack_IUnknown_Release -}; - /* IDirectMusicParamControlTrack IDirectMusicTrack8 part: */ static inline IDirectMusicParamControlTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -94,22 +38,51 @@ static inline IDirectMusicParamControlTrack *impl_from_IDirectMusicTrack8(IDirec } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicParamControlTrack *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) { IDirectMusicParamControlTrack *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) { IDirectMusicParamControlTrack *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, @@ -270,17 +243,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicParamControlTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicParamControlTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicParamControlTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -318,21 +291,25 @@ static const IPersistStreamVtbl DirectMusicParamControlTrack_PersistStream_Vtbl /* for ClassFactory */ HRESULT WINAPI create_dmparamcontroltrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicParamControlTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicParamControlTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicParamControlTrack_Unknown_Vtbl; + IDirectMusicParamControlTrack *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 = &DirectMusicParamControlTrack_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_DirectMusicParamControlTrack; - 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 IDirectMusicParamControlTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmime: Use the generic IPersistStream for DMParamControlTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 4a9eb8bfe029ed67cb9727f47be27de143eea42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9eb8bfe029ed67cb9727f47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:32:06 2015 +0200 dmime: Use the generic IPersistStream for DMParamControlTrack. --- dlls/dmime/paramcontroltrack.c | 67 +++++++++++------------------------------- dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 2f5f1c0..affea1d 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.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 IDirectMusicParamControlTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicParamControlTrack; /* IDirectMusicParamControlTrack 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; @@ -240,52 +240,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicParamControlTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicParamControlTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicParamControlTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicParamControlTrack_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 IDirectMusicParamControlTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicParamControlTrack_PersistStream_Vtbl = { - IDirectMusicParamControlTrack_IPersistStream_QueryInterface, - IDirectMusicParamControlTrack_IPersistStream_AddRef, - IDirectMusicParamControlTrack_IPersistStream_Release, - IDirectMusicParamControlTrack_IPersistStream_GetClassID, - IDirectMusicParamControlTrack_IPersistStream_IsDirty, - IDirectMusicParamControlTrack_IPersistStream_Load, - IDirectMusicParamControlTrack_IPersistStream_Save, - IDirectMusicParamControlTrack_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 */ @@ -300,12 +269,10 @@ HRESULT WINAPI create_dmparamcontroltrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicParamControlTrack_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_DirectMusicParamControlTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicParamControlTrack, + (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 bf81aaf..c370a9d 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -496,7 +496,7 @@ static void test_track(void) } class[] = { { X(DirectMusicLyricsTrack), FALSE }, { X(DirectMusicMarkerTrack), FALSE }, - { X(DirectMusicParamControlTrack), TRUE }, + { X(DirectMusicParamControlTrack), FALSE }, { X(DirectMusicSegmentTriggerTrack), FALSE }, { X(DirectMusicSeqTrack), FALSE }, { X(DirectMusicSysExTrack), FALSE },

1 0

Michael Stefaniuc : dmime: Implement the E_NOTIMPL methods in DMWaveTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: b90599976134b41a4d83ef2d2f84b38098fa3cae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90599976134b41a4d83ef2d2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:32:51 2015 +0200 dmime: Implement the E_NOTIMPL methods in DMWaveTrack. --- dlls/dmime/wavetrack.c | 58 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index b895c27..25420d1 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -91,6 +91,11 @@ static const IUnknownVtbl DirectMusicWaveTrack_Unknown_Vtbl = { }; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ +static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, TrackVtbl); +} + static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_QueryInterface (LPDIRECTMUSICTRACK8 iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); @@ -161,16 +166,22 @@ static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_IsParamSupported ( return DMUS_E_TYPE_UNSUPPORTED; } -static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_AddNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_RemoveNotificationType (LPDIRECTMUSICTRACK8 iface, REFGUID rguidNotificationType) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, TrackVtbl, iface); - FIXME("(%p, %s): stub\n", This, debugstr_dmguid(rguidNotificationType)); - return S_OK; +static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, + REFGUID notiftype) +{ + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype)); + return E_NOTIMPL; } static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Clone (LPDIRECTMUSICTRACK8 iface, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, IDirectMusicTrack** ppTrack) { @@ -200,16 +211,23 @@ static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_SetParamEx (LPDIRE return S_OK; } -static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, 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) +{ + IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); + + TRACE("(%p, %p, %d, %p): method not implemented\n", This, context, trackgroup, track); + return E_NOTIMPL; } -static HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 iface, IDirectMusicTrack* pNewTrack, MUSIC_TIME mtJoin, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, 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) +{ + IDirectMusicWaveTrack *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 DirectMusicWaveTrack_Track_Vtbl = { @@ -223,14 +241,14 @@ static const IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl = { IDirectMusicWaveTrack_IDirectMusicTrack_GetParam, IDirectMusicWaveTrack_IDirectMusicTrack_SetParam, IDirectMusicWaveTrack_IDirectMusicTrack_IsParamSupported, - IDirectMusicWaveTrack_IDirectMusicTrack_AddNotificationType, - IDirectMusicWaveTrack_IDirectMusicTrack_RemoveNotificationType, + IDirectMusicTrack8Impl_AddNotificationType, + IDirectMusicTrack8Impl_RemoveNotificationType, IDirectMusicWaveTrack_IDirectMusicTrack_Clone, IDirectMusicWaveTrack_IDirectMusicTrack_PlayEx, IDirectMusicWaveTrack_IDirectMusicTrack_GetParamEx, IDirectMusicWaveTrack_IDirectMusicTrack_SetParamEx, - IDirectMusicWaveTrack_IDirectMusicTrack_Compose, - IDirectMusicWaveTrack_IDirectMusicTrack_Join + IDirectMusicTrack8Impl_Compose, + IDirectMusicTrack8Impl_Join }; /* IDirectMusicWaveTrack IPersistStream part: */

1 0

Michael Stefaniuc : dmime: COM cleanup for IDirectMusicTrack of DMWaveTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 861081be6557c572e07c4d9b705ab64d8992c7a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861081be6557c572e07c4d9b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:33:45 2015 +0200 dmime: COM cleanup for IDirectMusicTrack of DMWaveTrack. --- dlls/dmime/wavetrack.c | 119 ++++++++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=861081be6557c572e07c4…

1 0

Michael Stefaniuc : dmime: Remove the extraneous IUnknown from DMWaveTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: f70498f1216b9283e31b7f40e29e40d0718cb5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70498f1216b9283e31b7f40e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:39:11 2015 +0200 dmime: Remove the extraneous IUnknown from DMWaveTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmime/wavetrack.c | 123 ++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 73 deletions(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index ec5a177..981f5fb 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -28,68 +28,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); * IDirectMusicChordMapTrack implementation */ typedef struct IDirectMusicWaveTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicWaveTrack; -/* IDirectMusicWaveTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicWaveTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, 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 IDirectMusicWaveTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) : AddRef from %d\n", This, ref - 1); - - DMIME_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicWaveTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, 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 DirectMusicWaveTrack_Unknown_Vtbl = { - IDirectMusicWaveTrack_IUnknown_QueryInterface, - IDirectMusicWaveTrack_IUnknown_AddRef, - IDirectMusicWaveTrack_IUnknown_Release -}; - /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -97,22 +41,51 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicWaveTrack *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) { IDirectMusicWaveTrack *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) { IDirectMusicWaveTrack *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, @@ -279,17 +252,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicWaveTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicWaveTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicWaveTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -327,21 +300,25 @@ static const IPersistStreamVtbl DirectMusicWaveTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicWaveTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicWaveTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicWaveTrack_Unknown_Vtbl; + IDirectMusicWaveTrack *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 = &DirectMusicWaveTrack_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_DirectMusicWaveTrack; - 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 IDirectMusicWaveTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmime: Use the generic IPersistStream for DMWaveTrack.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: 0789ddc322f4175af43a3bc84e3ec15958514a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0789ddc322f4175af43a3bc84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 3 10:40:53 2015 +0200 dmime: Use the generic IPersistStream for DMWaveTrack. --- dlls/dmime/tests/dmime.c | 39 ++++++++++------------------ dlls/dmime/wavetrack.c | 67 ++++++++++++------------------------------------ 2 files changed, 31 insertions(+), 75 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index c370a9d..85dd8f0 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -492,17 +492,16 @@ static void test_track(void) const struct { REFCLSID clsid; const char *name; - BOOL todo; } class[] = { - { X(DirectMusicLyricsTrack), FALSE }, - { X(DirectMusicMarkerTrack), FALSE }, - { X(DirectMusicParamControlTrack), FALSE }, - { X(DirectMusicSegmentTriggerTrack), FALSE }, - { X(DirectMusicSeqTrack), FALSE }, - { X(DirectMusicSysExTrack), FALSE }, - { X(DirectMusicTempoTrack), FALSE }, - { X(DirectMusicTimeSigTrack), FALSE }, - { X(DirectMusicWaveTrack), TRUE } + { X(DirectMusicLyricsTrack) }, + { X(DirectMusicMarkerTrack) }, + { X(DirectMusicParamControlTrack) }, + { X(DirectMusicSegmentTriggerTrack) }, + { X(DirectMusicSeqTrack) }, + { X(DirectMusicSysExTrack) }, + { X(DirectMusicTempoTrack) }, + { X(DirectMusicTimeSigTrack) }, + { X(DirectMusicWaveTrack) } }; #undef X unsigned int i; @@ -517,21 +516,11 @@ static void test_track(void) 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) { - todo_wine { - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&classid, class[i].clsid), - "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); - hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); - } - } else { - ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - ok(IsEqualGUID(&classid, class[i].clsid), - "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); - hr = IPersistStream_IsDirty(ps); - ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); - } + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&classid, class[i].clsid), + "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); /* Unimplemented IPersistStream methods */ hr = IPersistStream_GetSizeMax(ps, &size); diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 981f5fb..bc6e3ca 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -18,6 +18,7 @@ */ #include "dmime_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); @@ -29,9 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicWaveTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicWaveTrack; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ @@ -53,7 +53,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; @@ -249,52 +249,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicWaveTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicWaveTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicWaveTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicWaveTrack_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 IDirectMusicWaveTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicWaveTrack_PersistStream_Vtbl = { - IDirectMusicWaveTrack_IPersistStream_QueryInterface, - IDirectMusicWaveTrack_IPersistStream_AddRef, - IDirectMusicWaveTrack_IPersistStream_Release, - IDirectMusicWaveTrack_IPersistStream_GetClassID, - IDirectMusicWaveTrack_IPersistStream_IsDirty, - IDirectMusicWaveTrack_IPersistStream_Load, - IDirectMusicWaveTrack_IPersistStream_Save, - IDirectMusicWaveTrack_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 */ @@ -309,12 +278,10 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicWaveTrack_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_DirectMusicWaveTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);

1 0

Nikolay Sivov : dwrite: Store layout width/ height directly in metrics structure.
by Alexandre Julliard 03 Jul '15

03 Jul '15

Module: wine Branch: master Commit: ed54767030261e766ea464b32db412fedf077896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed54767030261e766ea464b32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 3 11:00:45 2015 +0300 dwrite: Store layout width/height directly in metrics structure. --- dlls/dwrite/layout.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4dbb53f..fbd7df0 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -223,8 +223,6 @@ struct dwrite_textlayout { WCHAR *str; UINT32 len; struct dwrite_textformat_data format; - FLOAT maxwidth; - FLOAT maxheight; struct list strike_ranges; struct list effects; struct list spacing; @@ -1120,7 +1118,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) } overflow = layout->clustermetrics[i].canWrapLineAfter && - (width + layout->clustermetrics[i].width > layout->maxwidth); + (width + layout->clustermetrics[i].width > layout->metrics.layoutWidth); /* check if we got new */ if (overflow || layout->clustermetrics[i].isNewline || /* always wrap on new line */ @@ -1195,7 +1193,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (width - trailingspacewidth > layout->metrics.width) layout->metrics.width = width - trailingspacewidth; - metrics.isTrimmed = width > layout->maxwidth; + metrics.isTrimmed = width > layout->metrics.layoutWidth; hr = layout_set_line_metrics(layout, &metrics, &line); if (FAILED(hr)) return hr; @@ -1215,8 +1213,6 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) } layout->metrics.left = layout->metrics.top = 0.0; - layout->metrics.layoutWidth = layout->maxwidth; - layout->metrics.layoutHeight = layout->maxheight; layout->metrics.maxBidiReorderingDepth = 1; /* FIXME */ layout->metrics.lineCount = layout->line_count; @@ -2139,24 +2135,26 @@ static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout2 *iface, static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout2 *iface, FLOAT maxWidth) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%.1f)\n", This, maxWidth); + + TRACE("(%p)->(%.2f)\n", This, maxWidth); if (maxWidth < 0.0) return E_INVALIDARG; - This->maxwidth = maxWidth; + This->metrics.layoutWidth = maxWidth; return S_OK; } static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout2 *iface, FLOAT maxHeight) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%.1f)\n", This, maxHeight); + + TRACE("(%p)->(%.2f)\n", This, maxHeight); if (maxHeight < 0.0) return E_INVALIDARG; - This->maxheight = maxHeight; + This->metrics.layoutHeight = maxHeight; return S_OK; } @@ -2318,14 +2316,14 @@ static FLOAT WINAPI dwritetextlayout_GetMaxWidth(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); TRACE("(%p)\n", This); - return This->maxwidth; + return This->metrics.layoutWidth; } static FLOAT WINAPI dwritetextlayout_GetMaxHeight(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); TRACE("(%p)\n", This); - return This->maxheight; + return This->metrics.layoutHeight; } static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayout2 *iface, UINT32 position, @@ -3550,8 +3548,6 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->IDWriteTextAnalysisSource_iface.lpVtbl = &dwritetextlayoutsourcevtbl; layout->ref = 1; layout->len = len; - layout->maxwidth = maxwidth; - layout->maxheight = maxheight; layout->recompute = RECOMPUTE_EVERYTHING; layout->nominal_breakpoints = NULL; layout->actual_breakpoints = NULL; @@ -3572,6 +3568,8 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * list_init(&layout->spacing); memset(&layout->format, 0, sizeof(layout->format)); memset(&layout->metrics, 0, sizeof(layout->metrics)); + layout->metrics.layoutWidth = maxwidth; + layout->metrics.layoutHeight = maxheight; layout->gdicompatible = FALSE; layout->pixels_per_dip = 0.0;

1 0