wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Dmitry Timoshkov : server: Fix generic access mapping for a mutex.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 422116490ba4281aa440c256ad010a059a449471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=422116490ba4281aa440c256a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 30 14:48:10 2014 +0900 server: Fix generic access mapping for a mutex. --- dlls/advapi32/tests/security.c | 16 ++++++---------- server/mutex.c | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6f98c70..e649674 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4539,14 +4539,14 @@ static void test_mutex_security(HANDLE token) STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS }; static const struct { - int todo, generic, mapped; + int generic, mapped; } map[] = { - { 0, 0, 0 }, - { 1, GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE }, - { 0, GENERIC_WRITE, STANDARD_RIGHTS_WRITE }, - { 0, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, - { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | MUTANT_QUERY_STATE } + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, STANDARD_RIGHTS_ALL | MUTANT_QUERY_STATE } }; SetLastError(0xdeadbeef); @@ -4569,10 +4569,6 @@ static void test_mutex_security(HANDLE token) ok(ret, "DuplicateHandle error %d\n", GetLastError()); access = get_obj_access(dup); - if (map[i].todo) -todo_wine - ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); - else ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); diff --git a/server/mutex.c b/server/mutex.c index 3b6f2c0..910fbca 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -169,7 +169,7 @@ static void mutex_satisfied( struct object *obj, struct wait_queue_entry *entry static unsigned int mutex_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | MUTANT_QUERY_STATE; if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE; if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS;

1 0

Sebastian Lackner : ntdll: Fix incorrect value passed to RtlDeleteTimerQueueEx.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 23adc9aaed72ed38d0c682ee27451de6546e9794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23adc9aaed72ed38d0c682ee2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jan 30 03:56:19 2014 +0100 ntdll: Fix incorrect value passed to RtlDeleteTimerQueueEx. --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 4edd069..5bf3385 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -889,7 +889,7 @@ static struct timer_queue *get_timer_queue(HANDLE TimerQueue) (void **) &default_timer_queue, q, NULL); if (p) /* Got beat to the punch. */ - RtlDeleteTimerQueueEx(p, NULL); + RtlDeleteTimerQueueEx(q, NULL); } } return default_timer_queue;

1 0

Michael Stefaniuc : dmband: Remove the extraneous IUnknown from DirectMusicBand.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: c1b3b58eac830c83200def7642dac0180e261822 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1b3b58eac830c83200def764… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 01:06:43 2014 +0100 dmband: Remove the extraneous IUnknown from DirectMusicBand. Also lock/unlock the module only on creation/destruction of the object. --- dlls/dmband/band.c | 122 +++++++++++++++++------------------------- dlls/dmband/dmband_private.h | 2 - 2 files changed, 49 insertions(+), 75 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index a985977..97e7c30 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -31,83 +31,55 @@ static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); } -/* IDirectMusicBandImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, 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_IDirectMusicBand)) { - *ppobj = &This->IDirectMusicBand_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { - *ppobj = &This->ObjectVtbl; - 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 IDirectMusicBandImpl_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) : AddRef from %d\n", This, ref - 1); - - DMBAND_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicBandImpl_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) : ReleaseRef to %d\n", This, ref); +/* DirectMusicBandImpl IDirectMusicBand part: */ +static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, + void **ret_iface) +{ + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } + TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); - DMBAND_UnlockModule(); - - return ref; -} + *ret_iface = NULL; -static const IUnknownVtbl DirectMusicBand_Unknown_Vtbl = { - IDirectMusicBandImpl_IUnknown_QueryInterface, - IDirectMusicBandImpl_IUnknown_AddRef, - IDirectMusicBandImpl_IUnknown_Release -}; + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicBand)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IDirectMusicObject)) + *ret_iface = &This->ObjectVtbl; + 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; + } -/* IDirectMusicBandImpl IDirectMusicBand part: */ -static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, - void **ppobj) -{ - IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + IDirectMusicBand_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) { IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(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->pDesc); + HeapFree(GetProcessHeap(), 0, This); + DMBAND_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface, @@ -146,17 +118,17 @@ static const IDirectMusicBandVtbl dmband_vtbl = { /* IDirectMusicBandImpl IDirectMusicObject part: */ static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandImpl, ObjectVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicBand_QueryInterface(&This->IDirectMusicBand_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicBandImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicBandImpl, ObjectVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicBand_AddRef(&This->IDirectMusicBand_iface); } static ULONG WINAPI IDirectMusicBandImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) { ICOM_THIS_MULTI(IDirectMusicBandImpl, ObjectVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicBand_Release(&This->IDirectMusicBand_iface); } static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) { @@ -360,17 +332,17 @@ static const IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl = { /* IDirectMusicBandImpl IPersistStream part: */ static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicBand_QueryInterface(&This->IDirectMusicBand_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicBandImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicBand_AddRef(&This->IDirectMusicBand_iface); } static ULONG WINAPI IDirectMusicBandImpl_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicBandImpl, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicBand_Release(&This->IDirectMusicBand_iface); } static HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -705,13 +677,13 @@ static const IPersistStreamVtbl DirectMusicBand_PersistStream_Vtbl = { HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) { IDirectMusicBandImpl* obj; - + HRESULT hr; + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl)); if (NULL == obj) { *ppobj = NULL; return E_OUTOFMEMORY; } - obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl; obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl; obj->ObjectVtbl = &DirectMusicBand_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicBand_PersistStream_Vtbl; @@ -719,8 +691,12 @@ HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) DM_STRUCT_INIT(obj->pDesc); obj->pDesc->dwValidData |= DMUS_OBJ_CLASS; obj->pDesc->guidClass = CLSID_DirectMusicBand; - obj->ref = 0; /* will be inited by QueryInterface */ + obj->ref = 1; list_init (&obj->Instruments); - return IDirectMusicBandImpl_IUnknown_QueryInterface ((LPUNKNOWN)&obj->UnknownVtbl, lpcGUID, ppobj); + DMBAND_LockModule(); + hr = IDirectMusicBand_QueryInterface(&obj->IDirectMusicBand_iface, lpcGUID, ppobj); + IDirectMusicBand_Release(&obj->IDirectMusicBand_iface); + + return hr; } diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 8dc0b12..6be6ae8 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -86,8 +86,6 @@ typedef struct _DMUS_PRIVATE_BAND { * IDirectMusicBandImpl implementation structure */ struct IDirectMusicBandImpl { - /* IUnknown fields */ - const IUnknownVtbl *UnknownVtbl; IDirectMusicBand IDirectMusicBand_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl;

1 0

Michael Stefaniuc : dmband: COM cleanup for IDirectMusicBand.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 868ad7dc723e339ab59fbf5430fa08fc17062bf1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=868ad7dc723e339ab59fbf543… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 01:04:58 2014 +0100 dmband: COM cleanup for IDirectMusicBand. --- dlls/dmband/band.c | 23 ++++++++++++++--------- dlls/dmband/dmband_private.h | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 74cd98c..a985977 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -26,6 +26,11 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicBandImpl implementation */ +static inline IDirectMusicBandImpl *impl_from_IDirectMusicBand(IDirectMusicBand *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicBandImpl, IDirectMusicBand_iface); +} + /* IDirectMusicBandImpl IUnknown part: */ static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandImpl, UnknownVtbl, iface); @@ -36,7 +41,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_IUnknown_QueryInterface (LPUNKNOWN if IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicBand)) { - *ppobj = &This->BandVtbl; + *ppobj = &This->IDirectMusicBand_iface; IUnknown_AddRef (iface); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { @@ -89,26 +94,26 @@ static const IUnknownVtbl DirectMusicBand_Unknown_Vtbl = { static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, void **ppobj) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface, IDirectMusicSegment **ppSegment) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); FIXME("(%p, %p): stub\n", This, ppSegment); return S_OK; } @@ -116,7 +121,7 @@ static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface, IDirectMusicPerformance *pPerformance) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); FIXME("(%p, %p): stub\n", This, pPerformance); return S_OK; } @@ -124,12 +129,12 @@ static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface, static HRESULT WINAPI IDirectMusicBandImpl_Unload(IDirectMusicBand *iface, IDirectMusicPerformance *pPerformance) { - ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); + IDirectMusicBandImpl *This = impl_from_IDirectMusicBand(iface); FIXME("(%p, %p): stub\n", This, pPerformance); return S_OK; } -static const IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl = { +static const IDirectMusicBandVtbl dmband_vtbl = { IDirectMusicBandImpl_QueryInterface, IDirectMusicBandImpl_AddRef, IDirectMusicBandImpl_Release, @@ -707,7 +712,7 @@ HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } obj->UnknownVtbl = &DirectMusicBand_Unknown_Vtbl; - obj->BandVtbl = &DirectMusicBand_Band_Vtbl; + obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl; obj->ObjectVtbl = &DirectMusicBand_Object_Vtbl; obj->PersistStreamVtbl = &DirectMusicBand_PersistStream_Vtbl; obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index b69e967..8dc0b12 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -88,7 +88,7 @@ typedef struct _DMUS_PRIVATE_BAND { struct IDirectMusicBandImpl { /* IUnknown fields */ const IUnknownVtbl *UnknownVtbl; - const IDirectMusicBandVtbl *BandVtbl; + IDirectMusicBand IDirectMusicBand_iface; const IDirectMusicObjectVtbl *ObjectVtbl; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref;

1 0

Michael Stefaniuc : dmband: Store the iface instead of the COM object in _DMUS_PRIVATE_BAND.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 0d94b4b0f03be4999fba57009ceb03b75d853c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d94b4b0f03be4999fba57009… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 01:02:57 2014 +0100 dmband: Store the iface instead of the COM object in _DMUS_PRIVATE_BAND. --- dlls/dmband/bandtrack.c | 2 +- dlls/dmband/dmband_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 8be6b29..459c158 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -317,7 +317,7 @@ static HRESULT IDirectMusicBandTrack_IPersistStream_LoadBand (LPPERSISTSTREAM if return E_OUTOFMEMORY; } pNewBand->BandHeader = *pHeader; - pNewBand->pBand = (IDirectMusicBandImpl*)((char*)(*ppBand) - offsetof(IDirectMusicBandImpl,BandVtbl)); + pNewBand->band = *ppBand; IDirectMusicBand_AddRef(*ppBand); list_add_tail (&This->Bands, &pNewBand->entry); } diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 0f5f939..b69e967 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -78,7 +78,7 @@ typedef struct _DMUS_PRIVATE_INSTRUMENT { typedef struct _DMUS_PRIVATE_BAND { struct list entry; /* for listing elements */ DMUS_PRIVATE_BAND_ITEM_HEADER BandHeader; - IDirectMusicBandImpl* pBand; + IDirectMusicBand *band; } DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND;

1 0

Michael Stefaniuc : dmband: Remove the redundant "IDirectMusicBand" from method names.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: fa9e47812c2df2aa6c089c49da2c19ac59d2afba URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9e47812c2df2aa6c089c49d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 01:01:06 2014 +0100 dmband: Remove the redundant "IDirectMusicBand" from method names. --- dlls/dmband/band.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index e72a042..74cd98c 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -86,46 +86,56 @@ static const IUnknownVtbl DirectMusicBand_Unknown_Vtbl = { }; /* IDirectMusicBandImpl IDirectMusicBand part: */ -static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_QueryInterface (LPDIRECTMUSICBAND iface, REFIID riid, LPVOID *ppobj) { +static HRESULT WINAPI IDirectMusicBandImpl_QueryInterface(IDirectMusicBand *iface, REFIID riid, + void **ppobj) +{ ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicBandImpl_IDirectMusicBand_AddRef (LPDIRECTMUSICBAND iface) { +static ULONG WINAPI IDirectMusicBandImpl_AddRef(IDirectMusicBand *iface) +{ ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicBandImpl_IDirectMusicBand_Release (LPDIRECTMUSICBAND iface) { +static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) +{ ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } -static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_CreateSegment (LPDIRECTMUSICBAND iface, IDirectMusicSegment** ppSegment) { +static HRESULT WINAPI IDirectMusicBandImpl_CreateSegment(IDirectMusicBand *iface, + IDirectMusicSegment **ppSegment) +{ ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); FIXME("(%p, %p): stub\n", This, ppSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_Download (LPDIRECTMUSICBAND iface, IDirectMusicPerformance* pPerformance) { +static HRESULT WINAPI IDirectMusicBandImpl_Download(IDirectMusicBand *iface, + IDirectMusicPerformance *pPerformance) +{ ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); FIXME("(%p, %p): stub\n", This, pPerformance); return S_OK; } -static HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_Unload (LPDIRECTMUSICBAND iface, IDirectMusicPerformance* pPerformance) { +static HRESULT WINAPI IDirectMusicBandImpl_Unload(IDirectMusicBand *iface, + IDirectMusicPerformance *pPerformance) +{ ICOM_THIS_MULTI(IDirectMusicBandImpl, BandVtbl, iface); FIXME("(%p, %p): stub\n", This, pPerformance); return S_OK; } static const IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl = { - IDirectMusicBandImpl_IDirectMusicBand_QueryInterface, - IDirectMusicBandImpl_IDirectMusicBand_AddRef, - IDirectMusicBandImpl_IDirectMusicBand_Release, - IDirectMusicBandImpl_IDirectMusicBand_CreateSegment, - IDirectMusicBandImpl_IDirectMusicBand_Download, - IDirectMusicBandImpl_IDirectMusicBand_Unload + IDirectMusicBandImpl_QueryInterface, + IDirectMusicBandImpl_AddRef, + IDirectMusicBandImpl_Release, + IDirectMusicBandImpl_CreateSegment, + IDirectMusicBandImpl_Download, + IDirectMusicBandImpl_Unload }; /* IDirectMusicBandImpl IDirectMusicObject part: */

1 0

Michael Stefaniuc : dmband/tests: Use the standard COM tests for DirectMusicBandTrack.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: e2ced54e2b4e3d277bfcb96b93774d086b753f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2ced54e2b4e3d277bfcb96b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 00:54:41 2014 +0100 dmband/tests: Use the standard COM tests for DirectMusicBandTrack. --- dlls/dmband/tests/dmband.c | 75 ++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 0594c3e..60dbaca 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -94,35 +94,56 @@ static void test_COM(void) while (IDirectMusicBand_Release(dmb)); } -static void test_dmband(void) +static void test_COM_bandtrack(void) { - IUnknown *unknown = NULL; - IDirectMusicTrack *track = NULL; - IPersistStream *stream = NULL; - IPersistStream *private = NULL; + IDirectMusicTrack *dmbt = (IDirectMusicTrack*)0xdeadbeef; + IPersistStream *ps; + IUnknown *private; + IUnknown *unk; + ULONG refcount; HRESULT hr; - hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unknown); - ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); - hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicTrack, (LPVOID*)&track); - ok(hr == S_OK, "QueryInterface returned: %x\n", hr); - todo_wine ok((LPVOID)track == (LPVOID)unknown, "Interface are not the same %p != %p\n", stream, private); - hr = IUnknown_QueryInterface(unknown, &IID_IPersistStream, (LPVOID*)&stream); - ok(hr == S_OK, "QueryInterface returned: %x\n", hr); - /* Query private interface */ - hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicBandTrackPrivate, (LPVOID*)&private); - todo_wine ok(hr == S_OK, "QueryInterface returned: %x\n", hr); - - trace("Interfaces: unknown = %p, track = %p, stream = %p, private = %p\n", unknown, track, stream, private); - - if (private) - IPersistStream_Release(private); - if (stream) - IPersistStream_Release(stream); - if (track) - IDirectMusicTrack_Release(track); - if (unknown) - IUnknown_Release(unknown); + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, (IUnknown*)&dmbt, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmbt); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicBandTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmbt, "dmbt = %p\n", dmbt); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmbt); + ok(hr == E_NOINTERFACE, "DirectMusicBandTrack create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicBandTrack interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void**)&dmbt); + ok(hr == S_OK, "DirectMusicBandTrack create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicTrack_AddRef(dmbt); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + hr = IDirectMusicTrack_QueryInterface(dmbt, &IID_IDirectMusicBandTrackPrivate, + (void**)&private); + todo_wine ok(hr == S_OK, "QueryInterface for IID_IDirectMusicBandTrackPrivate failed: %08x\n", hr); + if (hr == S_OK) { + refcount = IUnknown_AddRef(private); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(private); + } + + while (IDirectMusicTrack_Release(dmbt)); } START_TEST(dmband) @@ -137,7 +158,7 @@ START_TEST(dmband) } test_COM(); - test_dmband(); + test_COM_bandtrack(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmband/tests: Add COM tests for DirectMusicBand.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 2c6b86418d2162fa7b71d01e694ba45fc9149e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6b86418d2162fa7b71d01e6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 00:52:33 2014 +0100 dmband/tests: Add COM tests for DirectMusicBand. --- dlls/dmband/tests/dmband.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index 5195066..0594c3e 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -45,6 +45,55 @@ static BOOL missing_dmband(void) return TRUE; } +static void test_COM(void) +{ + IDirectMusicBand *dmb = (IDirectMusicBand*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicBand, (IUnknown*)&dmb, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmb); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicBand create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmb, "dmb = %p\n", dmb); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IClassFactory, + (void**)&dmb); + ok(hr == E_NOINTERFACE, "DirectMusicBand create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicBand interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, + (void**)&dmb); + ok(hr == S_OK, "DirectMusicBand create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicBand_AddRef(dmb); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicBand_QueryInterface(dmb, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicBand_QueryInterface(dmb, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicBand_QueryInterface(dmb, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicBand_Release(dmb)); +} + static void test_dmband(void) { IUnknown *unknown = NULL; @@ -87,6 +136,7 @@ START_TEST(dmband) return; } + test_COM(); test_dmband(); CoUninitialize();

1 0

Michael Stefaniuc : dmband/tests: Move the dll availability check to a separate function.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 7012235479de36862f55962915a5600b2f8af6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7012235479de36862f5596291… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 00:49:42 2014 +0100 dmband/tests: Move the dll availability check to a separate function. --- dlls/dmband/tests/dmband.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c index ecc767a..5195066 100644 --- a/dlls/dmband/tests/dmband.c +++ b/dlls/dmband/tests/dmband.c @@ -31,22 +31,28 @@ DEFINE_GUID(IID_IDirectMusicBandTrackPrivate, 0x53466056, 0x6dc4, 0x11d1, 0xbf, 0x7b, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef); +static BOOL missing_dmband(void) +{ + IDirectMusicBand *dmb; + HRESULT hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicBand, (void**)&dmb); + + if (hr == S_OK && dmb) + { + IDirectMusicBand_Release(dmb); + return FALSE; + } + return TRUE; +} + static void test_dmband(void) { - IDirectMusicBand *band; IUnknown *unknown = NULL; IDirectMusicTrack *track = NULL; IPersistStream *stream = NULL; IPersistStream *private = NULL; HRESULT hr; - hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (LPVOID*)&band); - if (hr != S_OK) - { - skip("Cannot create DirectMusicBand object (%x)\n", hr); - return; - } - hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unknown); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicTrack, (LPVOID*)&track); @@ -68,13 +74,19 @@ static void test_dmband(void) IDirectMusicTrack_Release(track); if (unknown) IUnknown_Release(unknown); - IDirectMusicBand_Release(band); } START_TEST(dmband) { CoInitializeEx(NULL, COINIT_MULTITHREADED); + if (missing_dmband()) + { + skip("dmband not available\n"); + CoUninitialize(); + return; + } + test_dmband(); CoUninitialize();

1 0

Michael Stefaniuc : dmband: None of the COM classes support aggregation.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 05d1872575765be02a3304f10cad103c9ce5e84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d1872575765be02a3304f10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 30 00:46:19 2014 +0100 dmband: None of the COM classes support aggregation. --- dlls/dmband/band.c | 3 ++- dlls/dmband/bandtrack.c | 3 ++- dlls/dmband/dmband_main.c | 13 +++++++++---- dlls/dmband/dmband_private.h | 5 ++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index e67bc8e..e72a042 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -687,7 +687,8 @@ static const IPersistStreamVtbl DirectMusicBand_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmband(REFIID lpcGUID, void **ppobj) +{ IDirectMusicBandImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl)); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 878ccc0..8be6b29 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -606,7 +606,8 @@ static const IPersistStreamVtbl DirectMusicBandTrack_PerststStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicBandTrack (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmbandtrack(REFIID lpcGUID, void **ppobj) +{ IDirectMusicBandTrack* track; track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandTrack)); diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index 414f5e4..f72b415 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -27,7 +27,7 @@ LONG DMBAND_refCount = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ret_iface); } IClassFactoryImpl; /****************************************************************** @@ -79,7 +79,12 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + return This->fnCreateInstance(riid, ppv); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -102,8 +107,8 @@ static const IClassFactoryVtbl classfactory_vtbl = { ClassFactory_LockServer }; -static IClassFactoryImpl Band_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicBandImpl}; -static IClassFactoryImpl BandTrack_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicBandTrack}; +static IClassFactoryImpl Band_CF = {{&classfactory_vtbl}, create_dmband}; +static IClassFactoryImpl BandTrack_CF = {{&classfactory_vtbl}, create_dmbandtrack}; /****************************************************************** * DllMain diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index aa775df..0f5f939 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -52,9 +52,8 @@ typedef struct IDirectMusicBandTrack IDirectMusicBandTrack; /***************************************************************************** * ClassFactory */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; - -extern HRESULT WINAPI DMUSIC_CreateDirectMusicBandTrack (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmband(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmbandtrack(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; /*****************************************************************************

1 0

← Newer
1
2
3
4
5
6
7
...
82
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 January 2014