wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

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

30 Jan '14

Module: wine Branch: master Commit: a2b548ac3ae7e26ad7495f3f2d880261b8610d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b548ac3ae7e26ad7495f3f2… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 30 02:41:06 2014 +0100 shell32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/shell32/tests/ebrowser.c | 25 +++++-------------------- dlls/shell32/tests/shellole.c | 20 ++++---------------- dlls/shell32/tests/shellpath.c | 36 ++++++++++-------------------------- dlls/shell32/tests/shlfolder.c | 14 +------------- 4 files changed, 20 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2b548ac3ae7e26ad7495…

1 0

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

30 Jan '14

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 30 Jan '14

30 Jan '14

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 30 Jan '14

30 Jan '14

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

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014