January 2014 - Wine-Commits

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

Jan. 30, 2014

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

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

Jan. 30, 2014

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 : windowscodecs/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

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

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

Jan. 30, 2014

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

Dmitry Timoshkov : scrrun: Fix file object leak on destruction.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 5a14d9e1e30ab348c38bd8fab99dcbf4fdc548b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a14d9e1e30ab348c38bd8fab… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 30 14:20:03 2014 +0900 scrrun: Fix file object leak on destruction. --- dlls/scrrun/filesystem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 41cb51f..59add71 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1522,7 +1522,10 @@ static ULONG WINAPI file_Release(IFile *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref) + { heap_free(This->path); + heap_free(This); + } return ref; }

1 0

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

Jan. 30, 2014

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

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

Jan. 30, 2014

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

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

Jan. 30, 2014

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

Alexandre Julliard : msxml3/tests: Run tests against the winehq server.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: d5c5c0684e4123692bfbd8053d41c6d64d475313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5c5c0684e4123692bfbd8053… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 21:54:22 2014 +0100 msxml3/tests: Run tests against the winehq server. --- dlls/msxml3/tests/httpreq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index d74b01a..b82de03 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1422,8 +1422,8 @@ static void _test_open(unsigned line, IXMLHttpRequest *xhr, const char *method, static void test_XMLHTTP(void) { static const char bodyA[] = "mode=Test"; - static const char urlA[] = "http://crossover.codeweavers.com/posttest.php"; - static const char xmltestA[] = "http://crossover.codeweavers.com/xmltest.xml"; + static const char urlA[] = "http://test.winehq.org/tests/post.php"; + static const char xmltestA[] = "http://test.winehq.org/tests/xmltest.xml"; static const char referertesturl[] = "http://test.winehq.org/tests/referer.php"; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; @@ -1559,7 +1559,7 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_send(xhr, varbody); if (hr == INET_E_RESOURCE_NOT_FOUND) { - skip("No connection could be made with crossover.codeweavers.com\n"); + skip("No connection could be made with test.winehq.org\n"); IXMLHttpRequest_Release(xhr); return; } @@ -1636,7 +1636,7 @@ static void test_XMLHTTP(void) hr = IXMLHttpRequest_send(xhr, varbody); if (hr == INET_E_RESOURCE_NOT_FOUND) { - skip("No connection could be made with crossover.codeweavers.com\n"); + skip("No connection could be made with test.winehq.org\n"); IXMLHttpRequest_Release(xhr); return; }

1 0

Alexandre Julliard : urlmon/tests: Run tests against the winehq server.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 357f0f4656c85706b2ecb60f9f52ec0ebe8d771b URL: http://source.winehq.org/git/wine.git/?a=commit;h=357f0f4656c85706b2ecb60f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 21:57:23 2014 +0100 urlmon/tests: Run tests against the winehq server. --- dlls/urlmon/tests/url.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 191e178..6948102 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2838,7 +2838,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = "its:test.chm::/blank.html"; break; case HTTPS_TEST: - url_a = (flags & BINDTEST_INVALID_CN) ? "https://209.46.25.132/test.html" : "https://www.codeweavers.com/test.html"; + url_a = (flags & BINDTEST_INVALID_CN) ? "https://209.46.25.134/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: url_a = "ftp://ftp.winehq.org/pub/other/winelogo.xcf.tar.bz2";

1 0