wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Michael Stefaniuc : dmcompos: Mark IPersistStream_Save of DMSignPostTrack as a stub.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 9c5336ee80b0b4f936019d163162c6c2b40dc688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c5336ee80b0b4f936019d163… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:37:09 2015 +0200 dmcompos: Mark IPersistStream_Save of DMSignPostTrack as a stub. --- dlls/dmcompos/signposttrack.c | 9 ++++++++- dlls/dmcompos/tests/dmcompos.c | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 2b4712b..1c77e4d 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -253,7 +253,14 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, BOOL cleardirty) { - return E_NOTIMPL; + IDirectMusicSignPostTrack *This = impl_from_IPersistStream(iface); + + FIXME("(%p, %p, %d): stub\n", This, stream, cleardirty); + + if (!stream) + return E_POINTER; + + return E_NOTIMPL; } static const IPersistStreamVtbl persiststream_vtbl = { diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 6d81145..4e9a80d 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -387,7 +387,7 @@ static void test_signposttrack(void) ok(IsEqualGUID(&class, &CLSID_DirectMusicSignPostTrack), "Expected class CLSID_DirectMusicSignPostTrack got %s\n", wine_dbgstr_guid(&class)); hr = IPersistStream_Save(ps, NULL, TRUE); - todo_wine ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); + ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps);

1 0

Michael Stefaniuc : dmcompos: Use the generic IPersistStream for DMSignPostTrack.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 3e624359897e2ee998d29c8a5eb5af20d18ec7e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e624359897e2ee998d29c8a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 29 09:55:17 2015 +0200 dmcompos: Use the generic IPersistStream for DMSignPostTrack. --- dlls/dmcompos/dmcompos_private.h | 8 ----- dlls/dmcompos/signposttrack.c | 71 ++++++++++++++-------------------------- dlls/dmcompos/tests/dmcompos.c | 6 ++-- 3 files changed, 27 insertions(+), 58 deletions(-) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 8e67a18..a74c1fb 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -78,17 +78,9 @@ typedef struct { } guid_info; /* used for initialising structs (primarily for DMUS_OBJECTDESC) */ -#define DM_STRUCT_INIT(x) \ - do { \ - memset((x), 0, sizeof(*(x))); \ - (x)->dwSize = sizeof(*x); \ - } while (0) - #define FE(x) { x, #x } #define GE(x) { &x, #x } -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) - /* FOURCC to string conversion for debug messages */ extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN; /* returns name of given GUID */ diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index e91f7bb..2b4712b 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -18,6 +18,7 @@ */ #include "dmcompos_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); @@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); */ typedef struct IDirectMusicSignPostTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicSignPostTrack; /* IDirectMusicSignPostTrack 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; @@ -238,54 +238,33 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicSignPostTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; +static inline IDirectMusicSignPostTrack * impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicSignPostTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +{ + IDirectMusicSignPostTrack *This = impl_from_IPersistStream(iface); FIXME("(%p, %p): Loading not implemented yet\n", This, pStm); return S_OK; } -static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { +static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream, + BOOL cleardirty) +{ return E_NOTIMPL; } -static const IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl = -{ - IDirectMusicSignPostTrack_IPersistStream_QueryInterface, - IDirectMusicSignPostTrack_IPersistStream_AddRef, - IDirectMusicSignPostTrack_IPersistStream_Release, - IDirectMusicSignPostTrack_IPersistStream_GetClassID, - IDirectMusicSignPostTrack_IPersistStream_IsDirty, - IDirectMusicSignPostTrack_IPersistStream_Load, - IDirectMusicSignPostTrack_IPersistStream_Save, - IDirectMusicSignPostTrack_IPersistStream_GetSizeMax +static const IPersistStreamVtbl persiststream_vtbl = { + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + IPersistStreamImpl_Load, + IPersistStreamImpl_Save, + unimpl_IPersistStream_GetSizeMax }; /* for ClassFactory */ @@ -300,12 +279,10 @@ HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicSignPostTrack_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_DirectMusicSignPostTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicSignPostTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMCOMPOS_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 0ca5599..6d81145 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -383,15 +383,15 @@ static void test_signposttrack(void) hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicSignPostTrack), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicSignPostTrack), "Expected class CLSID_DirectMusicSignPostTrack got %s\n", wine_dbgstr_guid(&class)); hr = IPersistStream_Save(ps, NULL, TRUE); todo_wine ok(hr == E_POINTER, "IPersistStream_Save failed: %08x\n", hr); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmcompos: Remove the extraneous IUnknown from DMSignPostTrack.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 61343bdce6038a5d1d9580f89f6b334ba441720d URL: http://source.winehq.org/git/wine.git/?a=commit;h=61343bdce6038a5d1d9580f89… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:36:13 2015 +0200 dmcompos: Remove the extraneous IUnknown from DMSignPostTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmcompos/signposttrack.c | 127 +++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index c368874..e91f7bb 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -21,76 +21,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); -static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicSignPostTrack implementation */ typedef struct IDirectMusicSignPostTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicSignPostTrack; -/* IDirectMusicSignPostTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicSignPostTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_iface; - IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IDirectMusicSignPostTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMCOMPOS_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicSignPostTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMCOMPOS_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = { - IDirectMusicSignPostTrack_IUnknown_QueryInterface, - IDirectMusicSignPostTrack_IUnknown_AddRef, - IDirectMusicSignPostTrack_IUnknown_Release -}; - /* IDirectMusicSignPostTrack IDirectMusicTrack8 part: */ static inline IDirectMusicSignPostTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -98,22 +38,51 @@ static inline IDirectMusicSignPostTrack *impl_from_IDirectMusicTrack8(IDirectMus } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_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) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_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) { IDirectMusicSignPostTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicSignPostTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMCOMPOS_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -272,17 +241,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicSignPostTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicSignPostTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicSignPostTrack, PersistStreamVtbl, iface); - return IDirectMusicSignPostTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -322,21 +291,25 @@ static const IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl = /* for ClassFactory */ HRESULT WINAPI create_dmsignposttrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicSignPostTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSignPostTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicSignPostTrack_Unknown_Vtbl; + IDirectMusicSignPostTrack *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 = &DirectMusicSignPostTrack_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_DirectMusicSignPostTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMCOMPOS_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicSignPostTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicTrack8 of DMSignPostTrack.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: ead9325e1d319c801a999c78baa66da5ca5c9f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ead9325e1d319c801a999c78b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:35:47 2015 +0200 dmcompos: COM cleanup for IDirectMusicTrack8 of DMSignPostTrack. --- dlls/dmcompos/signposttrack.c | 118 ++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ead9325e1d319c801a999…

1 0

Michael Stefaniuc : dmcompos: Use the generic IPersistStream for DMChordMapTrack.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: d9a54d563d26abb527f2aafaf46cd910e3cfd678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a54d563d26abb527f2aafaf… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:35:25 2015 +0200 dmcompos: Use the generic IPersistStream for DMChordMapTrack. --- dlls/dmcompos/chordmaptrack.c | 70 +++++++++++++----------------------------- dlls/dmcompos/tests/dmcompos.c | 6 ++-- 2 files changed, 24 insertions(+), 52 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 80d54e1..6ebc274 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -18,6 +18,7 @@ */ #include "dmcompos_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); @@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); */ typedef struct IDirectMusicChordMapTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicChordMapTrack; /* IDirectMusicChordMapTrack 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; @@ -244,53 +244,27 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join }; -/* IDirectMusicChordMapTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; +static inline IDirectMusicChordMapTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicChordMapTrack, dmobj.IPersistStream_iface); } -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +{ + IDirectMusicChordMapTrack *This = impl_from_IPersistStream(iface); FIXME("(%p, %p): Loading not implemented yet\n", This, pStm); return S_OK; } -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = { - IDirectMusicChordMapTrack_IPersistStream_QueryInterface, - IDirectMusicChordMapTrack_IPersistStream_AddRef, - IDirectMusicChordMapTrack_IPersistStream_Release, - IDirectMusicChordMapTrack_IPersistStream_GetClassID, - IDirectMusicChordMapTrack_IPersistStream_IsDirty, - IDirectMusicChordMapTrack_IPersistStream_Load, - IDirectMusicChordMapTrack_IPersistStream_Save, - IDirectMusicChordMapTrack_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 */ @@ -305,12 +279,10 @@ HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicChordMapTrack_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_DirectMusicChordMapTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicChordMapTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; DMCOMPOS_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index b0646a7..0ca5599 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -313,13 +313,13 @@ static void test_chordmaptrack(void) hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); hr = IPersistStream_GetClassID(ps, &class); - todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); - todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack), + ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); + ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack), "Expected class CLSID_DirectMusicChordMapTrack got %s\n", wine_dbgstr_guid(&class)); /* Unimplemented IPersistStream methods */ hr = IPersistStream_IsDirty(ps); - todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); + ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); hr = IPersistStream_GetSizeMax(ps, &size); ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); hr = IPersistStream_Save(ps, NULL, TRUE);

1 0

Michael Stefaniuc : dmcompos: Remove the extraneous IUnknown from DMChordMapTrack.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 836a392bd35e6cea980663815129dddc21a9f9a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836a392bd35e6cea980663815… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:34:45 2015 +0200 dmcompos: Remove the extraneous IUnknown from DMChordMapTrack. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmcompos/chordmaptrack.c | 127 +++++++++++++++++------------------------- 1 file changed, 50 insertions(+), 77 deletions(-) diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 8d07a78..80d54e1 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -21,76 +21,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); -static ULONG WINAPI IDirectMusicChordMapTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicChordMapTrack implementation */ typedef struct IDirectMusicChordMapTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; DMUS_OBJECTDESC *pDesc; } IDirectMusicChordMapTrack; -/* IDirectMusicChordMapTrack IUnknown part: */ -static HRESULT WINAPI IDirectMusicChordMapTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IDirectMusicChordMapTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_iface; - IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IDirectMusicChordMapTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); - return S_OK; - } - - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicChordMapTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p): AddRef from %d\n", This, ref - 1); - - DMCOMPOS_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicChordMapTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicChordMapTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p): ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMCOMPOS_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl = { - IDirectMusicChordMapTrack_IUnknown_QueryInterface, - IDirectMusicChordMapTrack_IUnknown_AddRef, - IDirectMusicChordMapTrack_IUnknown_Release -}; - /* IDirectMusicChordMapTrack IDirectMusicTrack8 part: */ static inline IDirectMusicChordMapTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -98,22 +38,51 @@ static inline IDirectMusicChordMapTrack *impl_from_IDirectMusicTrack8(IDirectMus } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicChordMapTrack_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) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicChordMapTrack_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) { IDirectMusicChordMapTrack *This = impl_from_IDirectMusicTrack8(iface); - return IDirectMusicChordMapTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMCOMPOS_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -278,17 +247,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicChordMapTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicChordMapTrack_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicChordMapTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface); - return IDirectMusicChordMapTrack_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -327,21 +296,25 @@ static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicChordMapTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicChordMapTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicChordMapTrack_Unknown_Vtbl; + IDirectMusicChordMapTrack* 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 = &DirectMusicChordMapTrack_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_DirectMusicChordMapTrack; - track->ref = 0; /* will be inited by QueryInterface */ + track->ref = 1; + + DMCOMPOS_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); - return IDirectMusicChordMapTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + return hr; }

1 0

Michael Stefaniuc : dmcompos: COM cleanup for IDirectMusicTrack8 of DMChordMapTrack.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 023d72a81e39c9f14520abc349d4fdc240957a10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=023d72a81e39c9f14520abc34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:34:15 2015 +0200 dmcompos: COM cleanup for IDirectMusicTrack8 of DMChordMapTrack. --- dlls/dmcompos/chordmaptrack.c | 134 ++++++++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=023d72a81e39c9f14520a…

1 0

Michael Stefaniuc : dmstyle: Remove unused DirectMusicMelodyFormulationTrack stuff.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 809b8604e981ab5213c28371041638b7c68ef2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=809b8604e981ab5213c283710… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:33:52 2015 +0200 dmstyle: Remove unused DirectMusicMelodyFormulationTrack stuff. --- dlls/dmstyle/dmstyle_private.h | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 3382468..978d75f 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -43,11 +43,6 @@ #include "dmusics.h" /***************************************************************************** - * Interfaces - */ -typedef struct IDirectMusicMelodyFormulationTrack IDirectMusicMelodyFormulationTrack; - -/***************************************************************************** * ClassFactory */ extern HRESULT WINAPI create_dmstyle(REFIID lpcGUID, LPVOID* ppobj) DECLSPEC_HIDDEN; @@ -97,28 +92,6 @@ typedef struct _DMUS_PRIVATE_COMMAND { IDirectMusicCollection* ppReferenceCollection; } DMUS_PRIVATE_COMMAND, *LPDMUS_PRIVATE_COMMAND; -/***************************************************************************** - * IDirectMusicMelodyFormulationTrack implementation structure - */ -struct IDirectMusicMelodyFormulationTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicMelodyFormulationTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/* IUnknown: */ -extern HRESULT WINAPI IDirectMusicMelodyFormulationTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IUnknown_AddRef (LPUNKNOWN iface) DECLSPEC_HIDDEN; -/* IDirectMusicTrack(8): */ -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface) DECLSPEC_HIDDEN; -/* IPersistStream: */ -extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) DECLSPEC_HIDDEN; - /********************************************************************** * Dll lifetime tracking declaration for dmstyle.dll */

1 0

Michael Stefaniuc : dmstyle: Move struct definitions to the files that need them.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 0b4bc2f965dccd2f464cd31be37cedf6485c64d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b4bc2f965dccd2f464cd31be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 28 23:32:38 2015 +0200 dmstyle: Move struct definitions to the files that need them. --- dlls/dmstyle/auditiontrack.c | 8 ++++ dlls/dmstyle/chordtrack.c | 9 ++++ dlls/dmstyle/commandtrack.c | 9 ++++ dlls/dmstyle/dmstyle_private.h | 95 ------------------------------------------ dlls/dmstyle/motiftrack.c | 8 ++++ dlls/dmstyle/mutetrack.c | 8 ++++ dlls/dmstyle/styletrack.c | 9 ++++ 7 files changed, 51 insertions(+), 95 deletions(-) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index f237a72..448adfc 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicAuditionTrack_IPersistStream_AddRef (LPPERSISTST /***************************************************************************** * IDirectMusicAuditionTrack implementation */ +typedef struct IDirectMusicAuditionTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicAuditionTrack; + /* IDirectMusicAuditionTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicAuditionTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicAuditionTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 23fe16b..bf65752 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -30,6 +30,15 @@ static ULONG WINAPI IDirectMusicChordTrack_IPersistStream_AddRef (LPPERSISTSTREA /***************************************************************************** * IDirectMusicChordTrack implementation */ +typedef struct IDirectMusicChordTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + DWORD dwScale; +} IDirectMusicChordTrack; + /* IDirectMusicChordTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicChordTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicChordTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 35415fb..c82fad6 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -29,6 +29,15 @@ static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_AddRef (LPPERSISTSTR /***************************************************************************** * IDirectMusicCommandTrack implementation */ +typedef struct IDirectMusicCommandTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + struct list Commands; +} IDirectMusicCommandTrack; + /* IDirectMusicCommandTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicCommandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicCommandTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index 95ad92f..3382468 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -45,13 +45,7 @@ /***************************************************************************** * Interfaces */ -typedef struct IDirectMusicAuditionTrack IDirectMusicAuditionTrack; -typedef struct IDirectMusicChordTrack IDirectMusicChordTrack; -typedef struct IDirectMusicCommandTrack IDirectMusicCommandTrack; typedef struct IDirectMusicMelodyFormulationTrack IDirectMusicMelodyFormulationTrack; -typedef struct IDirectMusicMotifTrack IDirectMusicMotifTrack; -typedef struct IDirectMusicMuteTrack IDirectMusicMuteTrack; -typedef struct IDirectMusicStyleTrack IDirectMusicStyleTrack; /***************************************************************************** * ClassFactory @@ -97,35 +91,6 @@ typedef struct _DMUS_PRIVATE_STYLE_ITEM { } DMUS_PRIVATE_STYLE_ITEM, *LPDMUS_PRIVATE_STYLE_ITEM; -/***************************************************************************** - * IDirectMusicAuditionTrack implementation structure - */ -struct IDirectMusicAuditionTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicAuditionTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicChordTrack implementation structure - */ -struct IDirectMusicChordTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicChordTrack fields */ - LPDMUS_OBJECTDESC pDesc; - DWORD dwScale; -}; - typedef struct _DMUS_PRIVATE_COMMAND { struct list entry; /* for listing elements */ DMUS_IO_COMMAND pCommand; @@ -133,22 +98,6 @@ typedef struct _DMUS_PRIVATE_COMMAND { } DMUS_PRIVATE_COMMAND, *LPDMUS_PRIVATE_COMMAND; /***************************************************************************** - * IDirectMusicCommandTrack implementation structure - */ -struct IDirectMusicCommandTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicCommandTrack fields */ - LPDMUS_OBJECTDESC pDesc; - /* track data */ - struct list Commands; -}; - -/***************************************************************************** * IDirectMusicMelodyFormulationTrack implementation structure */ struct IDirectMusicMelodyFormulationTrack { @@ -170,50 +119,6 @@ extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IDirectMusicTrack_AddRe /* IPersistStream: */ extern ULONG WINAPI IDirectMusicMelodyFormulationTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) DECLSPEC_HIDDEN; -/***************************************************************************** - * IDirectMusicMotifTrack implementation structure - */ -struct IDirectMusicMotifTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicMotifTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicMuteTrack implementation structure - */ -struct IDirectMusicMuteTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicMuteTrack fields */ - LPDMUS_OBJECTDESC pDesc; -}; - -/***************************************************************************** - * IDirectMusicStyleTrack implementation structure - */ -struct IDirectMusicStyleTrack { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; - const IDirectMusicTrack8Vtbl *TrackVtbl; - const IPersistStreamVtbl *PersistStreamVtbl; - LONG ref; - - /* IDirectMusicStyleTrack fields */ - LPDMUS_OBJECTDESC pDesc; - - struct list Items; -}; - /********************************************************************** * Dll lifetime tracking declaration for dmstyle.dll */ diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index d0449a7..e068406 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_AddRef (LPPERSISTSTREA /***************************************************************************** * IDirectMusicMotifTrack implementation */ +typedef struct IDirectMusicMotifTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicMotifTrack; + /* IDirectMusicMotifTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicMotifTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMotifTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 3010ad6..33fb954 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -28,6 +28,14 @@ static ULONG WINAPI IDirectMusicMuteTrack_IPersistStream_AddRef (LPPERSISTSTREAM /***************************************************************************** * IDirectMusicMuteTrack implementation */ +typedef struct IDirectMusicMuteTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; +} IDirectMusicMuteTrack; + /* IDirectMusicMuteTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicMuteTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicMuteTrack, UnknownVtbl, iface); diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 69c3889..0de6558 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -29,6 +29,15 @@ static ULONG WINAPI IDirectMusicStyleTrack_IPersistStream_AddRef (LPPERSISTSTREA /***************************************************************************** * IDirectMusicStyleTrack implementation */ +typedef struct IDirectMusicStyleTrack { + const IUnknownVtbl *UnknownVtbl; + const IDirectMusicTrack8Vtbl *TrackVtbl; + const IPersistStreamVtbl *PersistStreamVtbl; + LONG ref; + DMUS_OBJECTDESC *pDesc; + struct list Items; +} IDirectMusicStyleTrack; + /* IDirectMusicStyleTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicStyleTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicStyleTrack, UnknownVtbl, iface);

1 0

Nikolay Sivov : kernel32: Implement EnumCalendarInfoExEx().
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 15eba3997888e50968da6d6c0c2e758319437e49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15eba3997888e50968da6d6c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 28 16:03:57 2015 +0300 kernel32: Implement EnumCalendarInfoExEx(). --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/lcformat.c | 38 ++++++++++++++++++++++++++++++-------- include/winnls.h | 2 ++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9a0770..0070c98 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -396,7 +396,7 @@ @ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection @ stdcall EnumCalendarInfoA(ptr long long long) @ stdcall EnumCalendarInfoExA(ptr long long long) -# @ stub EnumCalendarInfoExEx +@ stdcall EnumCalendarInfoExEx(ptr wstr long wstr long long) @ stdcall EnumCalendarInfoExW(ptr long long long) @ stdcall EnumCalendarInfoW(ptr long long long) @ stdcall EnumDateFormatsA(ptr long long) diff --git a/dlls/kernel32/lcformat.c b/dlls/kernel32/lcformat.c index ea96167..2c81d02 100644 --- a/dlls/kernel32/lcformat.c +++ b/dlls/kernel32/lcformat.c @@ -1974,6 +1974,7 @@ BOOL WINAPI EnumTimeFormatsW(TIMEFMT_ENUMPROCW proc, LCID lcid, DWORD flags) enum enumcalendar_callback_type { CALLBACK_ENUMPROC, CALLBACK_ENUMPROCEX, + CALLBACK_ENUMPROCEXEX }; struct enumcalendar_context { @@ -1981,10 +1982,12 @@ struct enumcalendar_context { union { CALINFO_ENUMPROCW callback; /* user callback pointer */ CALINFO_ENUMPROCEXW callbackex; + CALINFO_ENUMPROCEXEX callbackexex; } u; LCID lcid; /* locale of interest */ CALID calendar; /* specific calendar or ENUM_ALL_CALENDARS */ CALTYPE caltype; /* calendar information type */ + LPARAM lParam; /* user input parameter passed to callback, for ExEx case only */ BOOL unicode; /* A vs W callback type, only for regular and Ex callbacks */ }; @@ -2090,6 +2093,9 @@ static BOOL NLS_EnumCalendarInfo(const struct enumcalendar_context *ctxt) case CALLBACK_ENUMPROCEX: ret = ctxt->u.callbackex(buf, calendar); break; + case CALLBACK_ENUMPROCEXEX: + ret = ctxt->u.callbackexex(buf, calendar, NULL, ctxt->lParam); + break; default: ; } @@ -2122,8 +2128,6 @@ cleanup: /****************************************************************************** * EnumCalendarInfoA [KERNEL32.@] - * - * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) @@ -2137,14 +2141,13 @@ BOOL WINAPI EnumCalendarInfoA( CALINFO_ENUMPROCA calinfoproc,LCID locale, ctxt.lcid = locale; ctxt.calendar = calendar; ctxt.caltype = caltype; + ctxt.lParam = 0; ctxt.unicode = FALSE; return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** * EnumCalendarInfoW [KERNEL32.@] - * - * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoW( CALINFO_ENUMPROCW calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) @@ -2158,14 +2161,13 @@ BOOL WINAPI EnumCalendarInfoW( CALINFO_ENUMPROCW calinfoproc,LCID locale, ctxt.lcid = locale; ctxt.calendar = calendar; ctxt.caltype = caltype; + ctxt.lParam = 0; ctxt.unicode = TRUE; return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** * EnumCalendarInfoExA [KERNEL32.@] - * - * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoExA( CALINFO_ENUMPROCEXA calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) @@ -2179,14 +2181,13 @@ BOOL WINAPI EnumCalendarInfoExA( CALINFO_ENUMPROCEXA calinfoproc,LCID locale, ctxt.lcid = locale; ctxt.calendar = calendar; ctxt.caltype = caltype; + ctxt.lParam = 0; ctxt.unicode = FALSE; return NLS_EnumCalendarInfo(&ctxt); } /****************************************************************************** * EnumCalendarInfoExW [KERNEL32.@] - * - * See EnumCalendarInfoAW. */ BOOL WINAPI EnumCalendarInfoExW( CALINFO_ENUMPROCEXW calinfoproc,LCID locale, CALID calendar,CALTYPE caltype ) @@ -2200,6 +2201,27 @@ BOOL WINAPI EnumCalendarInfoExW( CALINFO_ENUMPROCEXW calinfoproc,LCID locale, ctxt.lcid = locale; ctxt.calendar = calendar; ctxt.caltype = caltype; + ctxt.lParam = 0; + ctxt.unicode = TRUE; + return NLS_EnumCalendarInfo(&ctxt); +} + +/****************************************************************************** + * EnumCalendarInfoExEx [KERNEL32.@] + */ +BOOL WINAPI EnumCalendarInfoExEx( CALINFO_ENUMPROCEXEX calinfoproc, LPCWSTR locale, CALID calendar, + LPCWSTR reserved, CALTYPE caltype, LPARAM lParam) +{ + struct enumcalendar_context ctxt; + + TRACE("(%p,%s,0x%08x,%p,0x%08x,0x%ld)\n", calinfoproc, debugstr_w(locale), calendar, reserved, caltype, lParam); + + ctxt.type = CALLBACK_ENUMPROCEXEX; + ctxt.u.callbackexex = calinfoproc; + ctxt.lcid = LocaleNameToLCID(locale, 0); + ctxt.calendar = calendar; + ctxt.caltype = caltype; + ctxt.lParam = lParam; ctxt.unicode = TRUE; return NLS_EnumCalendarInfo(&ctxt); } diff --git a/include/winnls.h b/include/winnls.h index 693cb30..bf5431f 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -733,6 +733,7 @@ typedef struct _nlsversioninfoex { /* Define a bunch of callback types */ +typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXEX)(LPWSTR,CALID,LPWSTR,LPARAM); #if defined(STRICT) typedef BOOL (CALLBACK *CALINFO_ENUMPROCA)(LPSTR); typedef BOOL (CALLBACK *CALINFO_ENUMPROCW)(LPWSTR); @@ -832,6 +833,7 @@ WINBASEAPI BOOL WINAPI EnumCalendarInfoW(CALINFO_ENUMPROCW,LCID,CALID,CAL WINBASEAPI BOOL WINAPI EnumCalendarInfoExA(CALINFO_ENUMPROCEXA,LCID,CALID,CALTYPE); WINBASEAPI BOOL WINAPI EnumCalendarInfoExW(CALINFO_ENUMPROCEXW,LCID,CALID,CALTYPE); #define EnumCalendarInfoEx WINELIB_NAME_AW(EnumCalendarInfoEx) +WINBASEAPI BOOL WINAPI EnumCalendarInfoExEx(CALINFO_ENUMPROCEXEX,LPCWSTR,CALID,LPCWSTR,CALTYPE,LPARAM); WINBASEAPI BOOL WINAPI EnumDateFormatsA(DATEFMT_ENUMPROCA,LCID,DWORD); WINBASEAPI BOOL WINAPI EnumDateFormatsW(DATEFMT_ENUMPROCW,LCID,DWORD); #define EnumDateFormats WINELIB_NAME_AW(EnumDateFormats)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015