January 2014 - Wine-commits

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: 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

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

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

Frédéric Delanoy : oledb32/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 408c351035cf357d530a3a28f3d4a49163e5fe72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=408c351035cf357d530a3a28f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:41 2014 +0100 oledb32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/oledb32/tests/database.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index fa56e56..b7020ab 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -40,21 +40,6 @@ DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44 static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static void test_GetDataSource(WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -266,7 +251,7 @@ if (hr == S_OK) { ok(hr == S_OK, "got 0x%08x\n", hr); hr = IConnectionPoint_GetConnectionInterface(cp, &iid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualIID(&iid, &IID_IRowPositionChange), "got %s\n", debugstr_guid(&iid)); + ok(IsEqualIID(&iid, &IID_IRowPositionChange), "got %s\n", wine_dbgstr_guid(&iid)); IConnectionPoint_Release(cp); hr = IEnumConnectionPoints_Next(enum_points, 1, &cp, NULL); @@ -300,7 +285,7 @@ static HRESULT WINAPI rset_QI(IRowset *iface, REFIID riid, void **obj) return S_OK; } - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; }

1 0

Frédéric Delanoy : vbscript/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: e04c7359ed01dd8e3a9ca46db0a99d782c8a24a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e04c7359ed01dd8e3a9ca46db… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:47 2014 +0100 vbscript/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/vbscript/tests/createobj.c | 22 +++++----------------- dlls/vbscript/tests/run.c | 18 +++--------------- 2 files changed, 8 insertions(+), 32 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 3fffb5f..729fa3e 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -117,18 +117,6 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = #define VB_E_CANNOT_CREATE_OBJ 0x800a01ad -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -436,7 +424,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown CHECK_EXPECT(CreateInstance); ok(!outer, "outer = %p\n", outer); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); if(SUCCEEDED(CreateInstance_hres)) *ppv = &testObj; @@ -492,7 +480,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost ok(cbPolicy == sizeof(DWORD), "cbPolicy = %d\n", cbPolicy); ok(pContext != NULL, "pContext == NULL\n"); ok(cbContext == sizeof(GUID), "cbContext = %d\n", cbContext); - ok(IsEqualGUID(pContext, &CLSID_TestObj), "pContext = %s\n", debugstr_guid((const IID*)pContext)); + ok(IsEqualGUID(pContext, &CLSID_TestObj), "pContext = %s\n", wine_dbgstr_guid((const IID*)pContext)); ok(!dwFlags, "dwFlags = %x\n", dwFlags); ok(!dwReserved, "dwReserved = %x\n", dwReserved); @@ -509,7 +497,7 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos CHECK_EXPECT(QueryCustomPolicy); - ok(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, guidKey), "guidKey = %s\n", debugstr_guid(guidKey)); + ok(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, guidKey), "guidKey = %s\n", wine_dbgstr_guid(guidKey)); ok(ppPolicy != NULL, "ppPolicy == NULL\n"); ok(pcbPolicy != NULL, "pcbPolicy == NULL\n"); @@ -574,13 +562,13 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, CHECK_EXPECT(Host_QS_SecMgr); else CHECK_EXPECT(Caller_QS_SecMgr); - ok(IsEqualGUID(&IID_IInternetHostSecurityManager, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(IsEqualGUID(&IID_IInternetHostSecurityManager, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); if(SUCCEEDED(QS_SecMgr_hres)) *ppv = &InternetHostSecurityManager; return QS_SecMgr_hres; } - ok(0, "unexpected service %s\n", debugstr_guid(guidService)); + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6d4b38a..b5c3688 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -146,18 +146,6 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(buf, stra); } -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static const char *vt2a(VARIANT *v) { if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { @@ -237,7 +225,7 @@ static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { - ok(0, "unexpected service %s\n", debugstr_guid(guidService)); + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -482,7 +470,7 @@ static HRESULT WINAPI EnumVARIANT_QueryInterface(IEnumVARIANT *iface, REFIID rii return S_OK; } - ok(0, "unexpected call %s\n", debugstr_guid(riid)); + ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -555,7 +543,7 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, || IsEqualGUID(riid, &IID_IDispatchEx)) *ppv = iface; else { - trace("QI %s\n", debugstr_guid(riid)); + trace("QI %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; }

1 0

Frédéric Delanoy : windowscodecs/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 9be7e1e82e561eff65e0eb8bf0d2aad3de8b785e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be7e1e82e561eff65e0eb8bf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:48 2014 +0100 windowscodecs/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/windowscodecs/tests/bitmap.c | 28 ++++--------- dlls/windowscodecs/tests/gifformat.c | 22 +++------- dlls/windowscodecs/tests/info.c | 21 ++-------- dlls/windowscodecs/tests/metadata.c | 71 +++++++++++++-------------------- dlls/windowscodecs/tests/pngformat.c | 16 +------- dlls/windowscodecs/tests/tiffformat.c | 14 +------ 6 files changed, 47 insertions(+), 125 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9be7e1e82e561eff65e0e…

1 0

Frédéric Delanoy : riched20/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: e877ec4c5a740eb4c224646f3a3d2cc2286c72b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e877ec4c5a740eb4c224646f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:43 2014 +0100 riched20/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/riched20/tests/txtsrv.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 566381c..efda32c 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -42,21 +42,6 @@ static IID *pIID_ITextHost; static IID *pIID_ITextHost2; static PCreateTextServices pCreateTextServices; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - /* Define C Macros for ITextServices calls. */ /* Use a special table for x86 machines to convert the thiscall @@ -806,11 +791,11 @@ DEFINE_GUID(expected_iid_itexthost2, 0x13e670f5,0x1a5a,0x11cf,0xab,0xeb,0x00,0xa static void test_IIDs(void) { ok(IsEqualIID(pIID_ITextServices, &expected_iid_itextservices), - "unexpected value for IID_ITextServices: %s\n", debugstr_guid(pIID_ITextServices)); + "unexpected value for IID_ITextServices: %s\n", wine_dbgstr_guid(pIID_ITextServices)); ok(IsEqualIID(pIID_ITextHost, &expected_iid_itexthost), - "unexpected value for IID_ITextHost: %s\n", debugstr_guid(pIID_ITextHost)); + "unexpected value for IID_ITextHost: %s\n", wine_dbgstr_guid(pIID_ITextHost)); ok(IsEqualIID(pIID_ITextHost2, &expected_iid_itexthost2), - "unexpected value for IID_ITextHost2: %s\n", debugstr_guid(pIID_ITextHost2)); + "unexpected value for IID_ITextHost2: %s\n", wine_dbgstr_guid(pIID_ITextHost2)); } /* Outer IUnknown for COM aggregation tests */

1 0

Frédéric Delanoy : jscript/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: bb2a07f81e52427bf85276fef3913633d00baa25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb2a07f81e52427bf85276fef… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:33 2014 +0100 jscript/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/jscript/tests/activex.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index b4a8bdc..1153409 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -116,18 +116,6 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY = #define DISPID_GLOBAL_OK 0x2000 -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -433,7 +421,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown CHECK_EXPECT(CreateInstance); ok(!outer, "outer = %p\n", outer); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); if(SUCCEEDED(CreateInstance_hres)) *ppv = &testObj; @@ -489,7 +477,7 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost ok(cbPolicy == sizeof(DWORD), "cbPolicy = %d\n", cbPolicy); ok(pContext != NULL, "pContext == NULL\n"); ok(cbContext == sizeof(GUID), "cbContext = %d\n", cbContext); - ok(IsEqualGUID(pContext, &CLSID_TestObj), "pContext = %s\n", debugstr_guid((const IID*)pContext)); + ok(IsEqualGUID(pContext, &CLSID_TestObj), "pContext = %s\n", wine_dbgstr_guid((const IID*)pContext)); ok(!dwFlags, "dwFlags = %x\n", dwFlags); ok(!dwReserved, "dwReserved = %x\n", dwReserved); @@ -506,7 +494,7 @@ static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHos CHECK_EXPECT(QueryCustomPolicy); - ok(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, guidKey), "guidKey = %s\n", debugstr_guid(guidKey)); + ok(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, guidKey), "guidKey = %s\n", wine_dbgstr_guid(guidKey)); ok(ppPolicy != NULL, "ppPolicy == NULL\n"); ok(pcbPolicy != NULL, "pcbPolicy == NULL\n"); @@ -571,13 +559,13 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, CHECK_EXPECT(Host_QS_SecMgr); else CHECK_EXPECT(Caller_QS_SecMgr); - ok(IsEqualGUID(&IID_IInternetHostSecurityManager, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(IsEqualGUID(&IID_IInternetHostSecurityManager, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); if(SUCCEEDED(QS_SecMgr_hres)) *ppv = &InternetHostSecurityManager; return QS_SecMgr_hres; } - ok(0, "unexpected service %s\n", debugstr_guid(guidService)); + ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; }

1 0

Frédéric Delanoy : ieframe/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard 30 Jan '14

30 Jan '14

Module: wine Branch: master Commit: 783176aa74ab046712648ed3ae90290454e14d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=783176aa74ab046712648ed3a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:32 2014 +0100 ieframe/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/ieframe/tests/intshcut.c | 15 +-------------- dlls/ieframe/tests/webbrowser.c | 22 +++++----------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index bbc7a18..d1da424 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -70,19 +70,6 @@ static IUnknown unknown = { &unknownVtbl }; -static const char *printGUID(const GUID *guid) -{ - static char guidSTR[39]; - - if (!guid) return NULL; - - sprintf(guidSTR, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); - return guidSTR; -} - static void test_Aggregability(void) { HRESULT hr; @@ -109,7 +96,7 @@ static void can_query_interface(IUnknown *pUnknown, REFIID riid) HRESULT hr; IUnknown *newInterface; hr = IUnknown_QueryInterface(pUnknown, riid, (void**)&newInterface); - ok(hr == S_OK, "interface %s could not be queried\n", printGUID(riid)); + ok(hr == S_OK, "interface %s could not be queried\n", wine_dbgstr_guid(riid)); if (SUCCEEDED(hr)) IUnknown_Release(newInterface); } diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index d045658..776e2bc 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -213,18 +213,6 @@ static BOOL iface_cmp(IUnknown *iface1, IUnknown *iface2) return unk1 == unk2; } -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static BSTR a2bstr(const char *str) { BSTR ret; @@ -483,7 +471,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID ok(0, "unexpected nCmdID %d of CGID_DocHostCommandHandler\n", nCmdID); } }else { - ok(0, "unexpected pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); + ok(0, "unexpected pguidCmdGroup %s\n", wine_dbgstr_guid(pguidCmdGroup)); } return E_FAIL; @@ -664,7 +652,7 @@ static HRESULT WINAPI WebBrowserEvents2_QueryInterface(IDispatch *iface, REFIID return S_OK; } - ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1699,7 +1687,7 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, /* 20C46561-8491-11CF-960C-0080C7F4EE85 no info */ else - trace("Service %s not supported\n", debugstr_guid(guidService)); + trace("Service %s not supported\n", wine_dbgstr_guid(guidService)); return E_NOINTERFACE; } @@ -1745,7 +1733,7 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) else { /* are there more interfaces, that a host can support? */ - trace("%s: interface not supported\n", debugstr_guid(riid)); + trace("%s: interface not supported\n", wine_dbgstr_guid(riid)); } return (*ppv) ? S_OK : E_NOINTERFACE; @@ -1991,7 +1979,7 @@ static void test_ClassInfo(IWebBrowser2 *unk) ok(hres == S_OK, "GetTypeAtr failed: %08x\n", hres); ok(IsEqualGUID(&type_attr->guid, wb_version > 1 ? &CLSID_WebBrowser : &CLSID_WebBrowser_V1), - "guid = %s\n", debugstr_guid(&type_attr->guid)); + "guid = %s\n", wine_dbgstr_guid(&type_attr->guid)); ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr); ITypeInfo_Release(typeinfo);

1 0