January 2014 - Wine-Commits

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

Jan. 30, 2014

Module: wine Branch: master Commit: 672e2811ffd1dd8d51998dcb4229de3025f2e782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672e2811ffd1dd8d51998dcb4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 29 23:10:43 2014 +0100 mshtml/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/mshtml/tests/activex.c | 32 +++++++++------------------ dlls/mshtml/tests/dom.c | 22 +++++-------------- dlls/mshtml/tests/events.c | 30 ++++++++------------------ dlls/mshtml/tests/htmldoc.c | 49 +++++++++++++++--------------------------- dlls/mshtml/tests/protocol.c | 16 ++------------ dlls/mshtml/tests/script.c | 36 +++++++++++-------------------- 6 files changed, 55 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=672e2811ffd1dd8d51998…

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: b553f543235110d77644784b2880fe167e7d23a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b553f543235110d77644784b2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:44 2014 +0100 rpcrt4/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/rpcrt4/tests/rpc.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 7ec2942..07ca7eb 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -730,15 +730,6 @@ static void test_RpcStringBindingFromBinding(void) ok(status == RPC_S_OK, "RpcBindingFree failed with error %u\n", status); } -static char *printGuid(char *buf, int size, const UUID *guid) -{ - snprintf(buf, size, "{%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 buf; -} - static void test_UuidCreate(void) { UUID guid; @@ -756,7 +747,6 @@ static void test_UuidCreate(void) UUID and, or; RPC_STATUS rslt; int i; - char buf[39]; and = guid; or = guid; @@ -780,9 +770,9 @@ static void test_UuidCreate(void) *dst |= *src; } ok(UuidEqual(&and, &v4and, &rslt), - "unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &and)); + "unexpected bits set in V4 UUID: %s\n", wine_dbgstr_guid(&and)); ok(UuidEqual(&or, &v4or, &rslt), - "unexpected bits set in V4 UUID: %s\n", printGuid(buf, sizeof(buf), &or)); + "unexpected bits set in V4 UUID: %s\n", wine_dbgstr_guid(&or)); } else { @@ -816,7 +806,6 @@ static void test_UuidCreateSequential(void) if (version == 1) { UUID guid2; - char buf[39]; if (!ret) { @@ -825,7 +814,7 @@ static void test_UuidCreateSequential(void) */ ok(!(guid1.Data4[2] & 0x01), "GUID does not appear to contain a MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid1)); + wine_dbgstr_guid(&guid1)); } else { @@ -834,7 +823,7 @@ static void test_UuidCreateSequential(void) */ ok((guid1.Data4[2] & 0x01), "GUID does not appear to contain a multicast MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid1)); + wine_dbgstr_guid(&guid1)); } /* Generate another GUID, and make sure its MAC address matches the * first. @@ -846,7 +835,7 @@ static void test_UuidCreateSequential(void) ok(version == 1, "unexpected version %d\n", version); ok(!memcmp(guid1.Data4, guid2.Data4, sizeof(guid2.Data4)), "unexpected value in MAC address: %s\n", - printGuid(buf, sizeof(buf), &guid2)); + wine_dbgstr_guid(&guid2)); } }

1 0

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

Jan. 30, 2014

Module: wine Branch: master Commit: 2769763c64185cbd10673676654834cef5eba58d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2769763c64185cbd106736766… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:42 2014 +0100 qcap/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/qcap/tests/qcap.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index b403a74..83d38c8 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -61,18 +61,6 @@ DEFINE_EXPECT(NotifyAllocator); DEFINE_EXPECT(Reconnect); DEFINE_EXPECT(Read_FccHandler); -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 int strcmp_wa(LPCWSTR strw, const char *stra) { CHAR buf[512]; @@ -395,7 +383,7 @@ static HRESULT WINAPI GraphBuilder_QueryInterface( } ok(IsEqualIID(riid, &IID_IMediaEvent) || IsEqualIID(riid, &IID_IMediaEventSink), - "QueryInterface(%s)\n", debugstr_guid(riid)); + "QueryInterface(%s)\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -561,7 +549,7 @@ static HRESULT WINAPI BaseFilter_QueryInterface(IBaseFilter *iface, REFIID riid, } check_calls_list("BaseFilter_QueryInterface", BASEFILTER_QUERYINTERFACE, This->filter_type); - ok(IsEqualIID(riid, &IID_IPin), "riid = %s\n", debugstr_guid(riid)); + ok(IsEqualIID(riid, &IID_IPin), "riid = %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -768,7 +756,7 @@ static HRESULT WINAPI Pin_QueryInterface(IPin *iface, REFIID riid, void **ppv) return S_OK; } - ok(0, "unexpected call: %s\n", debugstr_guid(riid)); + ok(0, "unexpected call: %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -795,14 +783,14 @@ static HRESULT WINAPI Pin_ReceiveConnection(IPin *iface, CHECK_EXPECT(ReceiveConnection); ok(IsEqualIID(&pmt->majortype, &MEDIATYPE_Stream), "majortype = %s\n", - debugstr_guid(&pmt->majortype)); + wine_dbgstr_guid(&pmt->majortype)); ok(IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_Avi), "subtype = %s\n", - debugstr_guid(&pmt->subtype)); + wine_dbgstr_guid(&pmt->subtype)); ok(pmt->bFixedSizeSamples, "bFixedSizeSamples = %x\n", pmt->bFixedSizeSamples); ok(!pmt->bTemporalCompression, "bTemporalCompression = %x\n", pmt->bTemporalCompression); ok(pmt->lSampleSize == 1, "lSampleSize = %d\n", pmt->lSampleSize); ok(IsEqualIID(&pmt->formattype, &GUID_NULL), "formattype = %s\n", - debugstr_guid(&pmt->formattype)); + wine_dbgstr_guid(&pmt->formattype)); ok(!pmt->pUnk, "pUnk = %p\n", pmt->pUnk); ok(!pmt->cbFormat, "cbFormat = %d\n", pmt->cbFormat); ok(!pmt->pbFormat, "pbFormat = %p\n", pmt->pbFormat); @@ -956,7 +944,7 @@ static HRESULT WINAPI KsPropertySet_Get(IKsPropertySet *iface, REFGUID guidPropS test_filter *This = impl_from_IKsPropertySet(iface); check_calls_list("KsPropertySet_Get", KSPROPERTYSET_GET, This->filter_type); - ok(IsEqualIID(guidPropSet, &AMPROPSETID_Pin), "guidPropSet = %s\n", debugstr_guid(guidPropSet)); + ok(IsEqualIID(guidPropSet, &AMPROPSETID_Pin), "guidPropSet = %s\n", wine_dbgstr_guid(guidPropSet)); ok(dwPropID == 0, "dwPropID = %d\n", dwPropID); ok(pInstanceData == NULL, "pInstanceData != NULL\n"); ok(cbInstanceData == 0, "cbInstanceData != 0\n"); @@ -1278,14 +1266,14 @@ static void test_AviMux(void) hr = IEnumMediaTypes_Next(emt, 1, &media_type, NULL); ok(hr == S_OK, "Next returned %x\n", hr); ok(IsEqualIID(&media_type->majortype, &MEDIATYPE_Stream), "majortype = %s\n", - debugstr_guid(&media_type->majortype)); + wine_dbgstr_guid(&media_type->majortype)); ok(IsEqualIID(&media_type->subtype, &MEDIASUBTYPE_Avi), "subtype = %s\n", - debugstr_guid(&media_type->subtype)); + wine_dbgstr_guid(&media_type->subtype)); ok(media_type->bFixedSizeSamples, "bFixedSizeSamples = %x\n", media_type->bFixedSizeSamples); ok(!media_type->bTemporalCompression, "bTemporalCompression = %x\n", media_type->bTemporalCompression); ok(media_type->lSampleSize == 1, "lSampleSize = %d\n", media_type->lSampleSize); ok(IsEqualIID(&media_type->formattype, &GUID_NULL), "formattype = %s\n", - debugstr_guid(&media_type->formattype)); + wine_dbgstr_guid(&media_type->formattype)); ok(!media_type->pUnk, "pUnk = %p\n", media_type->pUnk); ok(!media_type->cbFormat, "cbFormat = %d\n", media_type->cbFormat); ok(!media_type->pbFormat, "pbFormat = %p\n", media_type->pbFormat); @@ -1363,7 +1351,7 @@ static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *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)); *ppv = NULL; return E_NOINTERFACE; }

1 0

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

Jan. 30, 2014

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

Dmitry Timoshkov : scrrun: Make file and folder collection constructors static.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: e526f120a9db000827fdeaaf20ebf92d99840441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e526f120a9db000827fdeaaf2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 30 14:19:53 2014 +0900 scrrun: Make file and folder collection constructors static. --- dlls/scrrun/filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 630e7e3..41cb51f 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -615,7 +615,7 @@ static const IEnumVARIANTVtbl foldercollenumvariantvtbl = { foldercoll_enumvariant_Clone }; -HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) +static HRESULT create_foldercoll_enum(struct foldercollection *collection, IUnknown **newenum) { struct enumvariant *This; @@ -770,7 +770,7 @@ static const IEnumVARIANTVtbl filecollenumvariantvtbl = { filecoll_enumvariant_Clone }; -HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) +static HRESULT create_filecoll_enum(struct filecollection *collection, IUnknown **newenum) { struct enumvariant *This;

1 0

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

Bruno Jesus : wininet: InternetGetConnectedStateExW must return TRUE for success.
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: 2ef27a232239bcd614e53ff48054ac5fecadd354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef27a232239bcd614e53ff48… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jan 29 20:01:09 2014 -0200 wininet: InternetGetConnectedStateExW must return TRUE for success. --- dlls/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index a49026c..3cf3ea6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1219,7 +1219,7 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti WARN("always returning LAN connection.\n"); *lpdwStatus = INTERNET_CONNECTION_LAN; } - return LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen); + return LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen) > 0; }

1 0

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

Jan. 30, 2014

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

André Hentschel : kernel32: Fix out of bounds access in DnsHostnameToComputerName[AW].
by Alexandre Julliard Jan. 30, 2014

Jan. 30, 2014

Module: wine Branch: master Commit: bbd71d6b72497f6ab24e43548ad924747549d090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd71d6b72497f6ab24e43548… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 29 23:41:28 2014 +0100 kernel32: Fix out of bounds access in DnsHostnameToComputerName[AW]. --- dlls/kernel32/computername.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/computername.c b/dlls/kernel32/computername.c index 8650440..0c81ac0 100644 --- a/dlls/kernel32/computername.c +++ b/dlls/kernel32/computername.c @@ -688,7 +688,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname, if (len > MAX_COMPUTERNAME_LENGTH) len = MAX_COMPUTERNAME_LENGTH; - if (*size < len) + if (*size < len + 1) { *size = len; return FALSE; @@ -696,7 +696,7 @@ BOOL WINAPI DnsHostnameToComputerNameA(LPCSTR hostname, if (!computername) return FALSE; memcpy( computername, hostname, len ); - computername[len + 1] = 0; + computername[len] = 0; return TRUE; } @@ -716,7 +716,7 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname, if (len > MAX_COMPUTERNAME_LENGTH) len = MAX_COMPUTERNAME_LENGTH; - if (*size < len) + if (*size < len + 1) { *size = len; return FALSE; @@ -724,6 +724,6 @@ BOOL WINAPI DnsHostnameToComputerNameW(LPCWSTR hostname, if (!computername) return FALSE; memcpy( computername, hostname, len * sizeof(WCHAR) ); - computername[len + 1] = 0; + computername[len] = 0; return TRUE; }

1 0

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

Jan. 30, 2014

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

Alexandre Julliard : winetest: Add an XML test file.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: tools Branch: master Commit: 8897feeefe53e84d4419e8ec92d14d4b51146b50 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8897feeefe53e84d4419e8ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 29 21:45:36 2014 +0100 winetest: Add an XML test file. --- winetest/tests/xmltest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/tests/xmltest.xml b/winetest/tests/xmltest.xml new file mode 100644 index 0000000..792f884 --- /dev/null +++ b/winetest/tests/xmltest.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<a>TEST</a>

1 0

Henri Verbeet : d3d9/tests: Direct3DCreate9() is always available if we have d3d9.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: a1b963490a80f92aa3359f5ee97215c0b3064c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b963490a80f92aa3359f5ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:39 2014 +0100 d3d9/tests: Direct3DCreate9() is always available if we have d3d9. --- dlls/d3d9/tests/Makefile.in | 2 +- dlls/d3d9/tests/d3d9ex.c | 8 +- dlls/d3d9/tests/device.c | 299 +++++++++++++++++------------------ dlls/d3d9/tests/stateblock.c | 63 +++----- dlls/d3d9/tests/vertexdeclaration.c | 48 ++---- dlls/d3d9/tests/visual.c | 28 +--- 6 files changed, 188 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1b963490a80f92aa3359…

1 0

Henri Verbeet : d3d8/tests: Direct3DCreate8() is always available if we have d3d8.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 56d1225ec208c46d4899e3f7f0f02f6b24fca230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d1225ec208c46d4899e3f7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:38 2014 +0100 d3d8/tests: Direct3DCreate8() is always available if we have d3d8. --- dlls/d3d8/tests/Makefile.in | 2 +- dlls/d3d8/tests/device.c | 224 +++++++++++++++++++++--------------------- dlls/d3d8/tests/stateblock.c | 47 +++------ dlls/d3d8/tests/visual.c | 33 ++----- 4 files changed, 135 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56d1225ec208c46d4899e…

1 0

Henri Verbeet : d3d9/tests: Cleanup test_display_formats() a bit.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 71d018b25b8ee8a4454b047188775e527a33a79e URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d018b25b8ee8a4454b04718… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:37 2014 +0100 d3d9/tests: Cleanup test_display_formats() a bit. --- dlls/d3d9/tests/device.c | 115 ++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 60 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index eeb2b07..71b0a51 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2271,59 +2271,57 @@ cleanup: if(d3d9) IDirect3D9_Release(d3d9); } -struct format { - D3DFORMAT format; - D3DFORMAT alpha_format; - const char* name; - BOOL display; - BOOL windowed; -}; - -static const struct format formats[] = -{ -#define FORMAT(f, a, d, w) { f, a, #f, d, w } - FORMAT(D3DFMT_R5G6B5, 0, TRUE, TRUE), - FORMAT(D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE, TRUE), - FORMAT(D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE, FALSE), - FORMAT(D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE, TRUE), - FORMAT(D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, FALSE), - FORMAT(D3DFMT_A2R10G10B10, 0, TRUE, FALSE), - FORMAT(D3DFMT_UNKNOWN, 0, FALSE, FALSE), -#undef FORMAT -}; - +/* Direct3D9 offers 4 display formats: R5G6B5, X1R5G5B5, X8R8G8B8 and + * A2R10G10B10. Next to these there are 6 different back buffer formats. Only + * a fixed number of combinations are possible in fullscreen mode. In windowed + * mode more combinations are allowed due to format conversion and this is + * likely driver dependent. */ static void test_display_formats(void) { - /* Direct3D9 offers 4 display formats R5G6B5, X1R5G5B5, X8R8G8B8 and A2R10G10B10. - * Next to these there are 6 different backbuffer formats. Only a fixed number of - * combinations are possible in FULLSCREEN mode. In windowed mode more combinations are - * allowed due to depth conversion and this is likely driver dependent. */ - - UINT Adapter = D3DADAPTER_DEFAULT; - D3DDEVTYPE DeviceType = D3DDEVTYPE_HAL; - int display; + D3DDEVTYPE device_type = D3DDEVTYPE_HAL; + unsigned int backbuffer, display; + unsigned int windowed; + IDirect3D9 *d3d9; + BOOL should_pass; + BOOL has_modes; + HRESULT hr; - IDirect3D9 *d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); - ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); - if(!d3d9) return; + static const struct + { + const char *name; + D3DFORMAT format; + D3DFORMAT alpha_format; + BOOL display; + BOOL windowed; + } + formats[] = + { + {"D3DFMT_R5G6B5", D3DFMT_R5G6B5, 0, TRUE, TRUE}, + {"D3DFMT_X1R5G5B5", D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE, TRUE}, + {"D3DFMT_A1R5G5B5", D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE, FALSE}, + {"D3DFMT_X8R8G8B8", D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE, TRUE}, + {"D3DFMT_A8R8G8B8", D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, FALSE}, + {"D3DFMT_A2R10G10B10", D3DFMT_A2R10G10B10, 0, TRUE, FALSE}, + {"D3DFMT_UNKNOWN", D3DFMT_UNKNOWN, 0, FALSE, FALSE}, + }; - for (display = 0; display < sizeof(formats) / sizeof(formats[0]); display++) + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { - int nmodes, windowed; + skip("Failed to create an IDirect3D9 object, skipping test.\n"); + return; + } - nmodes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, formats[display].format); + for (display = 0; display < sizeof(formats) / sizeof(*formats); ++display) + { + has_modes = IDirect3D9_GetAdapterModeCount(d3d9, D3DADAPTER_DEFAULT, formats[display].format); - for (windowed = 0; windowed <= 1; windowed++) + for (windowed = 0; windowed <= 1; ++windowed) { - int backbuffer; - for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(formats[0]); backbuffer++) + for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(*formats); ++backbuffer) { - BOOL shouldPass; - HRESULT hr; + should_pass = FALSE; - if (!formats[display].display || (windowed && !formats[display].windowed) || (!windowed && !nmodes)) - shouldPass = FALSE; - else + if (formats[display].display && (formats[display].windowed || !windowed) && (has_modes || windowed)) { D3DFORMAT backbuffer_format; @@ -2332,36 +2330,33 @@ static void test_display_formats(void) else backbuffer_format = formats[backbuffer].format; - hr = IDirect3D9_CheckDeviceFormat(d3d9, Adapter, DeviceType, formats[display].format, D3DUSAGE_RENDERTARGET, - D3DRTYPE_SURFACE, backbuffer_format); + hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, device_type, formats[display].format, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, backbuffer_format); if (hr == D3D_OK) { if (windowed) { - hr = IDirect3D9_CheckDeviceFormatConversion(d3d9, Adapter, DeviceType, backbuffer_format, formats[display].format); - shouldPass = (hr == D3D_OK); + hr = IDirect3D9_CheckDeviceFormatConversion(d3d9, D3DADAPTER_DEFAULT, device_type, + backbuffer_format, formats[display].format); + should_pass = (hr == D3D_OK); } else - shouldPass = (formats[display].format == formats[backbuffer].format || - (formats[display].alpha_format && formats[display].alpha_format == formats[backbuffer].alpha_format)); + should_pass = (formats[display].format == formats[backbuffer].format + || (formats[display].alpha_format + && formats[display].alpha_format == formats[backbuffer].alpha_format)); } - else - shouldPass = FALSE; } - hr = IDirect3D9_CheckDeviceType(d3d9, Adapter, DeviceType, formats[display].format, formats[backbuffer].format, windowed); - - if (shouldPass) - ok(hr == D3D_OK, "CheckDeviceType(..., %s, %s, windowed=%d) failed with hr=%#08x\n", formats[display].name, - formats[backbuffer].name, windowed, hr); - else - ok(hr != D3D_OK, "CheckDeviceType(..., %s, %s, windowed=%d) succeeded when it was expected to fail\n", formats[display].name, - formats[backbuffer].name, windowed); + hr = IDirect3D9_CheckDeviceType(d3d9, D3DADAPTER_DEFAULT, device_type, + formats[display].format, formats[backbuffer].format, windowed); + ok(SUCCEEDED(hr) == should_pass, + "Got unexpected hr %#x for %s / %s, windowed %#x, should_pass %#x.\n", + hr, formats[display].name, formats[backbuffer].name, windowed, should_pass); } } } - if(d3d9) IDirect3D9_Release(d3d9); + IDirect3D9_Release(d3d9); } static void test_scissor_size(void)

1 0

Henri Verbeet : wined3d: Don't allow format conversion on Present() for d3d8.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 175c63773dac411d3cfa80034ff7024a895740c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175c63773dac411d3cfa80034… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:35 2014 +0100 wined3d: Don't allow format conversion on Present() for d3d8. Note that this isn't currently enforced by wined3d_swapchain_create() or wined3d_device_reset() though. --- dlls/d3d9/directx.c | 5 ++- dlls/wined3d/directx.c | 90 +++++++++++++++++++++--------------------------- include/wine/wined3d.h | 1 + 3 files changed, 44 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index e73051d..79e9eb5 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -636,7 +636,10 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { - DWORD flags = extended ? 0 : WINED3D_VIDMEM_ACCOUNTING; + DWORD flags = WINED3D_PRESENT_CONVERSION; + + if (!extended) + flags |= WINED3D_VIDMEM_ACCOUNTING; d3d9->IDirect3D9Ex_iface.lpVtbl = &d3d9_vtbl; d3d9->refcount = 1; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6617c3a..3ebf43a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4000,7 +4000,7 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap enum wined3d_device_type device_type, enum wined3d_format_id display_format, enum wined3d_format_id backbuffer_format, BOOL windowed) { - HRESULT hr; + BOOL present_conversion = wined3d->flags & WINED3D_PRESENT_CONVERSION; TRACE("wined3d %p, adapter_idx %u, device_type %s, display_format %s, backbuffer_format %s, windowed %#x.\n", wined3d, adapter_idx, debug_d3ddevicetype(device_type), debug_d3dformat(display_format), @@ -4025,100 +4025,88 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap return WINED3DERR_NOTAVAILABLE; } - if (windowed) + if (!windowed) { - /* WINED3DFMT_B10G10R10A2_UNORM is only allowed in fullscreen mode. */ - if (display_format == WINED3DFMT_B10G10R10A2_UNORM) + /* If the requested display format is not available, don't continue. */ + if (!wined3d_get_adapter_mode_count(wined3d, adapter_idx, + display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN)) { - TRACE("Unsupported display/backbuffer format combination %s / %s for windowed mode.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); return WINED3DERR_NOTAVAILABLE; } - /* Windowed mode allows you to specify WINED3DFMT_UNKNOWN for the backbuffer format, - * it means 'reuse' the display format for the backbuffer. */ + present_conversion = FALSE; + } + else if (display_format == WINED3DFMT_B10G10R10A2_UNORM) + { + /* WINED3DFMT_B10G10R10A2_UNORM is only allowed in fullscreen mode. */ + TRACE("Unsupported format combination %s / %s in windowed mode.\n", + debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } + + if (present_conversion) + { + /* Use the display format as back buffer format if the latter is + * WINED3DFMT_UNKNOWN. */ if (backbuffer_format == WINED3DFMT_UNKNOWN) backbuffer_format = display_format; - /* In windowed mode, if color conversion from the backbuffer format to the - * display format is supported, then the format combination is supported. */ - hr = wined3d_check_device_format_conversion(wined3d, adapter_idx, device_type, backbuffer_format, display_format); - if (FAILED(hr)) + if (FAILED(wined3d_check_device_format_conversion(wined3d, adapter_idx, + device_type, backbuffer_format, display_format))) { - TRACE("Unsupported display/backbuffer format combination %s / %s; no color conversion.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + TRACE("Format conversion from %s to %s not supported.\n", + debug_d3dformat(backbuffer_format), debug_d3dformat(display_format)); return WINED3DERR_NOTAVAILABLE; } } else { - UINT mode_count; + /* When format conversion from the back buffer format to the display + * format is not allowed, only a limited number of combinations are + * valid. */ - /* If the requested display format is not available, don't continue. */ - mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, - display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); - if (!mode_count) - { - TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); - return WINED3DERR_NOTAVAILABLE; - } - - if (backbuffer_format == WINED3DFMT_UNKNOWN) - { - TRACE("backbuffer_format WINED3FMT_UNKNOWN only available in windowed mode.\n"); - return WINED3DERR_NOTAVAILABLE; - } - - /* In FULLSCREEN mode WINED3DFMT_B5G6R5_UNORM can only be mixed with - * backbuffer format WINED3DFMT_B5G6R5_UNORM. */ if (display_format == WINED3DFMT_B5G6R5_UNORM && backbuffer_format != WINED3DFMT_B5G6R5_UNORM) { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + TRACE("Unsupported format combination %s / %s.\n", debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; } - /* In FULLSCREEN mode WINED3DFMT_B5G5R5X1_UNORM can only be mixed with - * backbuffer formats WINED3DFMT_B5G5R5X1_UNORM and - * WINED3DFMT_B5G5R5A1_UNORM. */ if (display_format == WINED3DFMT_B5G5R5X1_UNORM && !(backbuffer_format == WINED3DFMT_B5G5R5X1_UNORM || backbuffer_format == WINED3DFMT_B5G5R5A1_UNORM)) { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + TRACE("Unsupported format combination %s / %s.\n", debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; } - /* In FULLSCREEN mode WINED3DFMT_B8G8R8X8_UNORM can only be mixed with - * backbuffer formats WINED3DFMT_B8G8R8X8_UNORM and - * WINED3DFMT_B8G8R8A8_UNORM. */ if (display_format == WINED3DFMT_B8G8R8X8_UNORM && !(backbuffer_format == WINED3DFMT_B8G8R8X8_UNORM || backbuffer_format == WINED3DFMT_B8G8R8A8_UNORM)) { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + TRACE("Unsupported format combination %s / %s.\n", debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; } - /* WINED3DFMT_B10G10R10A2_UNORM can only be mixed with backbuffer format - * WINED3DFMT_B10G10R10A2_UNORM. */ if (display_format == WINED3DFMT_B10G10R10A2_UNORM && backbuffer_format != WINED3DFMT_B10G10R10A2_UNORM) { - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", + TRACE("Unsupported format combination %s / %s.\n", debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); return WINED3DERR_NOTAVAILABLE; } } - /* Use CheckDeviceFormat to see if the backbuffer_format is usable with the given display_format */ - hr = wined3d_check_device_format(wined3d, adapter_idx, device_type, display_format, - WINED3DUSAGE_RENDERTARGET, WINED3D_RTYPE_SURFACE, backbuffer_format); - if (FAILED(hr)) - TRACE("Unsupported display/backbuffer format combination %s / %s.\n", - debug_d3dformat(display_format), debug_d3dformat(backbuffer_format)); + /* Validate that the back buffer format is usable for render targets. */ + if (FAILED(wined3d_check_device_format(wined3d, adapter_idx, device_type, display_format, + WINED3DUSAGE_RENDERTARGET, WINED3D_RTYPE_SURFACE, backbuffer_format))) + { + TRACE("Format %s not allowed for render targets.\n", debug_d3dformat(backbuffer_format)); + return WINED3DERR_NOTAVAILABLE; + } - return hr; + return WINED3D_OK; } HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7ddd466..de1884f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1217,6 +1217,7 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 #define WINED3D_NO3D 0x00000002 #define WINED3D_VIDMEM_ACCOUNTING 0x00000004 +#define WINED3D_PRESENT_CONVERSION 0x00000008 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Henri Verbeet : d3d8/tests: Port test_display_formats() to d3d8.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 1438c74b744d1e06b2efde04e050971d51ed11f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1438c74b744d1e06b2efde04e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 29 19:28:36 2014 +0100 d3d8/tests: Port test_display_formats() to d3d8. --- dlls/d3d8/tests/device.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f5afbc4..6bcd05e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -984,6 +984,85 @@ static void test_shader_versions(void) } } +static void test_display_formats(void) +{ + D3DDEVTYPE device_type = D3DDEVTYPE_HAL; + unsigned int backbuffer, display; + unsigned int windowed, i; + D3DDISPLAYMODE mode; + IDirect3D8 *d3d8; + BOOL should_pass; + BOOL has_modes; + HRESULT hr; + + static const struct + { + const char *name; + D3DFORMAT format; + D3DFORMAT alpha_format; + BOOL display; + BOOL windowed; + } + formats[] = + { + {"D3DFMT_R5G6B5", D3DFMT_R5G6B5, 0, TRUE, TRUE}, + {"D3DFMT_X1R5G5B5", D3DFMT_X1R5G5B5, D3DFMT_A1R5G5B5, TRUE, TRUE}, + {"D3DFMT_A1R5G5B5", D3DFMT_A1R5G5B5, D3DFMT_A1R5G5B5, FALSE, FALSE}, + {"D3DFMT_X8R8G8B8", D3DFMT_X8R8G8B8, D3DFMT_A8R8G8B8, TRUE, TRUE}, + {"D3DFMT_A8R8G8B8", D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, FALSE}, + {"D3DFMT_UNKNOWN", D3DFMT_UNKNOWN, 0, FALSE, FALSE}, + }; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create an IDirect3D8 object, skipping test.\n"); + return; + } + + for (display = 0; display < sizeof(formats) / sizeof(*formats); ++display) + { + for (i = 0, has_modes = FALSE; SUCCEEDED(IDirect3D8_EnumAdapterModes(d3d8, D3DADAPTER_DEFAULT, i, &mode)); ++i) + { + if (mode.Format == formats[display].format) + { + has_modes = TRUE; + break; + } + } + + for (windowed = 0; windowed <= 1; ++windowed) + { + for (backbuffer = 0; backbuffer < sizeof(formats) / sizeof(*formats); ++backbuffer) + { + should_pass = FALSE; + + if (formats[display].display && (formats[display].windowed || !windowed) && (has_modes || windowed)) + { + D3DFORMAT backbuffer_format; + + if (windowed && formats[backbuffer].format == D3DFMT_UNKNOWN) + backbuffer_format = formats[display].format; + else + backbuffer_format = formats[backbuffer].format; + + hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, device_type, formats[display].format, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, backbuffer_format); + should_pass = (hr == D3D_OK) && (formats[display].format == formats[backbuffer].format + || (formats[display].alpha_format + && formats[display].alpha_format == formats[backbuffer].alpha_format)); + } + + hr = IDirect3D8_CheckDeviceType(d3d8, D3DADAPTER_DEFAULT, device_type, + formats[display].format, formats[backbuffer].format, windowed); + ok(SUCCEEDED(hr) == should_pass, + "Got unexpected hr %#x for %s / %s, windowed %#x, should_pass %#x.\n", + hr, formats[display].name, formats[backbuffer].name, windowed, should_pass); + } + } + } + + IDirect3D8_Release(d3d8); +} /* Test adapter display modes */ static void test_display_modes(void) @@ -5793,6 +5872,7 @@ START_TEST(device) screen_height = GetSystemMetrics(SM_CYSCREEN); test_fpu_setup(); + test_display_formats(); test_display_modes(); test_shader_versions(); test_swapchain();

1 0