January 2014 - Wine-commits

Jacek Caban : atl80: Share registrar.c with atl100.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 62cc1da580250265a9083af4c21cfec1ae2f7419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cc1da580250265a9083af4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 10:25:10 2014 +0100 atl80: Share registrar.c with atl100. --- dlls/atl80/Makefile.in | 5 +++-- dlls/atl80/atl80.spec | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index e05e197..cbd10ec 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,12 +1,13 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_80 PARENTSRC = ../atl100 C_SRCS = \ atl.c \ atl80.c \ - atl_ax.c + atl_ax.c \ + registrar.c RC_SRCS = atl80.rc diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 88d74ed..fb5fae8 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -9,7 +9,7 @@ 19 stdcall AtlRegisterTypeLib(ptr wstr) 20 stdcall AtlComModuleRevokeClassObjects(ptr) 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) -23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) @@ -45,7 +45,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr)

1 0

Piotr Caban : msvcm90: Don't forward to msvcm80.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 965987bb59ffbd2e531a3a8e71fbce4baaa59865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965987bb59ffbd2e531a3a8e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 29 10:32:28 2014 +0100 msvcm90: Don't forward to msvcm80. --- dlls/msvcm90/msvcm90.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcm90/msvcm90.spec b/dlls/msvcm90/msvcm90.spec index 319e506..9d57dc7 100644 --- a/dlls/msvcm90/msvcm90.spec +++ b/dlls/msvcm90/msvcm90.spec @@ -1,8 +1,8 @@ @ stub -arch=win32 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6GJPAX(a)Z0@Z @ stub -arch=win64 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6AJPEAX(a)Z0@Z -@ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() msvcm80.?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ -@ cdecl -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z(ptr) msvcm80.?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z -@ cdecl -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z(ptr) msvcm80.?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z +@ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() CrtImplementationDetails_DoDllLanguageSupportValidation +@ cdecl -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer +@ cdecl -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z(ptr) CrtImplementationDetails_RegisterModuleUninitializer @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@@Z @ stub -arch=win64 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXPE$AAVString(a)System@@@Z @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@P$AAVException(a)3@@Z @@ -175,7 +175,7 @@ @ stub -arch=win64 ?setw(a)std@@YA?AU?$_Smanip(a)_J@1(a)_J@Z @ stub ?signal@@YAP6MXH(a)ZHH@Z @ stub ?signal@@YAP6MXH(a)ZHP6MXH@Z(a)Z -@ cdecl __setusermatherr_m(ptr) msvcm80.__setusermatherr_m +@ cdecl __setusermatherr_m(ptr) @ stub towctrans @ stub wctrans @ stub wctype

1 0

Hans Leidekker : winhttp/tests: Ignore some missing notifications.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 513372f04417c7f12d98a7d1f7a6862102b46ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=513372f04417c7f12d98a7d1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 29 12:04:18 2014 +0100 winhttp/tests: Ignore some missing notifications. --- dlls/winhttp/tests/notification.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 9fcc64c..cc375e6 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -377,8 +377,8 @@ static const struct notification async_test[] = { { winhttp_connect, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, { winhttp_open_request, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME }, - { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, FALSE, TRUE }, + { winhttp_send_request, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, FALSE, TRUE }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER }, { winhttp_send_request, WINHTTP_CALLBACK_STATUS_SENDING_REQUEST },

1 0

Hans Leidekker : winhttp/tests: Only advance to the next notification test if the function is ok.
by Alexandre Julliard 29 Jan '14

29 Jan '14

Module: wine Branch: master Commit: 21ff41341325310b63cd8111cdb9f0845d87a3fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ff41341325310b63cd8111c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 29 12:05:02 2014 +0100 winhttp/tests: Only advance to the next notification test if the function is ok. --- dlls/winhttp/tests/notification.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index cc375e6..f2a3692 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -107,7 +107,7 @@ static void CALLBACK check_notification( HINTERNET handle, DWORD_PTR context, DW todo_wine ok(function_ok, "%u: expected function %u got %u\n", info->line, info->test[i].function, info->function); } } - if (status_ok) info->index++; + if (status_ok && function_ok) info->index++; if (proxy_active()) { while (info->test[info->index].skipped_for_proxy)

1 0

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

29 Jan '14

Module: wine Branch: master Commit: d22a32b514811f8d237733323296dc6ab00314f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22a32b514811f8d237733323… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:35 2014 +0100 mmdevapi/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/mmdevapi/tests/dependency.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/mmdevapi/tests/dependency.c b/dlls/mmdevapi/tests/dependency.c index 6744b63..8780565 100644 --- a/dlls/mmdevapi/tests/dependency.c +++ b/dlls/mmdevapi/tests/dependency.c @@ -30,17 +30,6 @@ #include "dshow.h" #include "dsound.h" -static inline const char *dump_guid( const GUID *id ) -{ - static char data[39]; - if (!id) return "(null)"; - wsprintfA( data, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - return data; -} - START_TEST(dependency) { HRESULT hr; @@ -93,7 +82,7 @@ START_TEST(dependency) hr = IBaseFilter_GetClassID(bf, &clsid); ok(hr == S_OK, "GetClassId failed with 0x%08x\n", hr); if (hr == S_OK) - ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", dump_guid(&clsid)); + ok(IsEqualCLSID(&clsid, &CLSID_DSoundRender), "Wrong class id %s\n", wine_dbgstr_guid(&clsid)); } }

1 0

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

29 Jan '14

Module: wine Branch: master Commit: cb71d30c360578aa065a05146bed9393d3f5074a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb71d30c360578aa065a05146… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:36 2014 +0100 mscoree/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/mscoree/tests/debugging.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/mscoree/tests/debugging.c b/dlls/mscoree/tests/debugging.c index bd961ed..2515793 100644 --- a/dlls/mscoree/tests/debugging.c +++ b/dlls/mscoree/tests/debugging.c @@ -36,21 +36,6 @@ static HRESULT (WINAPI *pCreateDebuggingInterfaceFromVersion)(int, LPCWSTR, IUnk const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',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 HRESULT WINAPI ManagedCallback2_QueryInterface(ICorDebugManagedCallback2 *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ICorDebugManagedCallback2, riid)) @@ -59,7 +44,7 @@ static HRESULT WINAPI ManagedCallback2_QueryInterface(ICorDebugManagedCallback2 return S_OK; } - ok(0, "unexpected riid (%s)\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; @@ -167,7 +152,7 @@ static HRESULT WINAPI ManagedCallback_QueryInterface(ICorDebugManagedCallback *i return S_OK; } - ok(0, "unexpected riid (%s)\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

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

29 Jan '14

Module: wine Branch: master Commit: 3201f970b62e4e1e360270afd1799b2150bd26fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3201f970b62e4e1e360270afd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:34 2014 +0100 kernel32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/kernel32/tests/actctx.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 46b6a44..8499333 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -49,18 +49,6 @@ static const char* strw(LPCWSTR x) return buffer; } -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; -} - #ifdef __i386__ #define ARCH "x86" #elif defined __x86_64__ @@ -1222,7 +1210,7 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU clsid, &data); if (!ret) { - skip("failed for guid %s\n", debugstr_guid(clsid)); + skip("failed for guid %s\n", wine_dbgstr_guid(clsid)); return; } ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); @@ -1242,10 +1230,10 @@ static void test_find_com_redirection(HANDLE handle, const GUID *clsid, const GU ok_(__FILE__, line)(comclass->res1[0] == 0, "got res1[0] as %02x\n", comclass->res1[0]); ok_(__FILE__, line)(comclass->res1[1] == 0, "got res1[1] as %02x\n", comclass->res1[1]); ok_(__FILE__, line)(comclass->model == ThreadingModel_Neutral, "got model %d\n", comclass->model); - ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid, clsid), "got wrong clsid %s\n", debugstr_guid(&comclass->clsid)); - ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid2, clsid), "got wrong clsid2 %s\n", debugstr_guid(&comclass->clsid2)); + ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid, clsid), "got wrong clsid %s\n", wine_dbgstr_guid(&comclass->clsid)); + ok_(__FILE__, line)(IsEqualGUID(&comclass->clsid2, clsid), "got wrong clsid2 %s\n", wine_dbgstr_guid(&comclass->clsid2)); if (tlid) - ok_(__FILE__, line)(IsEqualGUID(&comclass->tlid, tlid), "got wrong tlid %s\n", debugstr_guid(&comclass->tlid)); + ok_(__FILE__, line)(IsEqualGUID(&comclass->tlid, tlid), "got wrong tlid %s\n", wine_dbgstr_guid(&comclass->tlid)); ok_(__FILE__, line)(comclass->name_len > 0, "got modulename len %d\n", comclass->name_len); if (progid) @@ -1393,12 +1381,12 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const /* for external proxy stubs it contains a value from 'proxyStubClsid32' */ if (ps32) { - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, ps32), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, ps32), "got wrong iid %s\n", wine_dbgstr_guid(&ifaceps->iid)); } else - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", wine_dbgstr_guid(&ifaceps->iid)); - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->tlbid, tlbid), "got wrong tlid %s\n", debugstr_guid(&ifaceps->tlbid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->tlbid, tlbid), "got wrong tlid %s\n", wine_dbgstr_guid(&ifaceps->tlbid)); ok_(__FILE__, line)(ifaceps->name_len > 0, "got modulename len %d\n", ifaceps->name_len); ok_(__FILE__, line)(ifaceps->name_offset == ifaceps->size, "got progid offset %d\n", ifaceps->name_offset); @@ -1411,7 +1399,7 @@ static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const if (ifaceps->mask & NumMethods) ok_(__FILE__, line)(ifaceps->nummethods != 0, "got nummethods %d\n", ifaceps->nummethods); if (ifaceps->mask & BaseIface) - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->base, base), "got base %s\n", debugstr_guid(&ifaceps->base)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->base, base), "got base %s\n", wine_dbgstr_guid(&ifaceps->base)); } ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); @@ -1468,7 +1456,7 @@ static void test_find_surrogate(HANDLE handle, const GUID *clsid, const WCHAR *n ULONG len; ok_(__FILE__, line)(surrogate->res == 0, "invalid res value %d\n", surrogate->res); - ok_(__FILE__, line)(IsEqualGUID(&surrogate->clsid, clsid), "got wrong clsid %s\n", debugstr_guid(&surrogate->clsid)); + ok_(__FILE__, line)(IsEqualGUID(&surrogate->clsid, clsid), "got wrong clsid %s\n", wine_dbgstr_guid(&surrogate->clsid)); ok_(__FILE__, line)(surrogate->version_len == lstrlenW(version)*sizeof(WCHAR), "got version len %d\n", surrogate->version_len); ok_(__FILE__, line)(surrogate->version_offset == surrogate->size, "got version offset %d\n", surrogate->version_offset); @@ -1537,8 +1525,8 @@ static void test_find_progid_redirection(HANDLE handle, const GUID *clsid, const ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); comclass = (struct comclassredirect_data*)data2.lpData; - ok_(__FILE__, line)(IsEqualGUID(guid, &comclass->alias), "got wrong alias referenced from progid %s, %s\n", progid, debugstr_guid(guid)); - ok_(__FILE__, line)(IsEqualGUID(clsid, &comclass->clsid), "got wrong class referenced from progid %s, %s\n", progid, debugstr_guid(clsid)); + ok_(__FILE__, line)(IsEqualGUID(guid, &comclass->alias), "got wrong alias referenced from progid %s, %s\n", progid, wine_dbgstr_guid(guid)); + ok_(__FILE__, line)(IsEqualGUID(clsid, &comclass->clsid), "got wrong class referenced from progid %s, %s\n", progid, wine_dbgstr_guid(clsid)); } header = (struct strsection_header*)data.lpSectionBase;

1 0

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

29 Jan '14

Module: wine Branch: master Commit: 86a9e6a366dd8f41871b81aa15ec85b76a559b14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a9e6a366dd8f41871b81aa1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:39 2014 +0100 ole32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/ole32/tests/compobj.c | 26 +++++++------------------- dlls/ole32/tests/defaulthandler.c | 16 ++-------------- dlls/ole32/tests/ole_server.c | 7 +------ 3 files changed, 10 insertions(+), 39 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b615034..c23a4d7 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -77,18 +77,6 @@ static const WCHAR progidW[] = {'P','r','o','g','I','d','.','P','r','o','g','I', DEFINE_GUID(IID_IWineTest, 0x5201163f, 0x8164, 0x4fd0, 0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd); DEFINE_GUID(CLSID_WineOOPTest, 0x5201163f, 0x8164, 0x4fd0, 0xa1, 0xa2, 0x5d, 0x5a, 0x36, 0x54, 0xd3, 0xbd); -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 LONG cLocks; static void LockModule(void) @@ -381,7 +369,7 @@ static void test_CLSIDFromProgID(void) hr = CLSIDFromProgID(progidW, &clsid); /* it returns generated CLSID here */ ok(!IsEqualCLSID(&clsid, &CLSID_non_existent) && !IsEqualCLSID(&clsid, &CLSID_NULL), - "got wrong clsid %s\n", debugstr_guid(&clsid)); + "got wrong clsid %s\n", wine_dbgstr_guid(&clsid)); /* duplicate progid present in context - returns generated guid here too */ clsid = CLSID_NULL; @@ -391,7 +379,7 @@ static void test_CLSIDFromProgID(void) /* that's where it differs from StdFont */ clsid1.Data4[7] = 0x52; ok(!IsEqualCLSID(&clsid, &CLSID_StdFont) && !IsEqualCLSID(&clsid, &CLSID_NULL) && !IsEqualCLSID(&clsid, &clsid1), - "got %s\n", debugstr_guid(&clsid)); + "got %s\n", wine_dbgstr_guid(&clsid)); pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); @@ -1034,22 +1022,22 @@ static void test_CoGetPSClsid(void) memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &IID_Testiface), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &IID_Testiface), "got clsid %s\n", wine_dbgstr_guid(&clsid)); memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface2, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &IID_Testiface2), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &IID_Testiface2), "got clsid %s\n", wine_dbgstr_guid(&clsid)); memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface3, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &IID_TestPS), "got clsid %s\n", wine_dbgstr_guid(&clsid)); memset(&clsid, 0xaa, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface4, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &GUID_NULL), "got clsid %s\n", wine_dbgstr_guid(&clsid)); /* register same interface and try to get CLSID back */ hr = CoRegisterPSClsid(&IID_Testiface, &IID_Testiface4); @@ -1057,7 +1045,7 @@ static void test_CoGetPSClsid(void) memset(&clsid, 0, sizeof(clsid)); hr = CoGetPSClsid(&IID_Testiface, &clsid); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(IsEqualGUID(&clsid, &IID_Testiface4), "got clsid %s\n", debugstr_guid(&clsid)); + ok(IsEqualGUID(&clsid, &IID_Testiface4), "got clsid %s\n", wine_dbgstr_guid(&clsid)); pDeactivateActCtx(0, cookie); pReleaseActCtx(handle); diff --git a/dlls/ole32/tests/defaulthandler.c b/dlls/ole32/tests/defaulthandler.c index efbd431..60bc29c 100644 --- a/dlls/ole32/tests/defaulthandler.c +++ b/dlls/ole32/tests/defaulthandler.c @@ -64,18 +64,6 @@ DEFINE_EXPECT(CF_QueryInterface_ClassFactory); DEFINE_EXPECT(CF_CreateInstance); DEFINE_EXPECT(CF_QueryInterface_IMarshal); -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 HRESULT create_storage(IStorage **stg) { HRESULT hr; @@ -194,7 +182,7 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r return S_OK; } - ok(0, "unexpected interface: %s\n", debugstr_guid(riid)); + ok(0, "unexpected interface: %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; } @@ -215,7 +203,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, CHECK_EXPECT(CF_CreateInstance); ok(pUnkOuter == NULL, "pUnkOuter != NULL\n"); - todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", debugstr_guid(riid)); + todo_wine ok(IsEqualGUID(riid, &IID_IUnknown), "riid = %s\n", wine_dbgstr_guid(riid)); if(IsEqualGUID(riid, &IID_IOleObject)) { *ppv = NULL; return E_NOINTERFACE; diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 7a9dc30..77abda4 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -65,7 +65,6 @@ static LONG obj_ref, class_ref, server_locks; static const char *debugstr_guid(const GUID *guid) { - static char buf[50]; int i; if (!guid) return "(null)"; @@ -76,11 +75,7 @@ static const char *debugstr_guid(const GUID *guid) return guid_name[i].name; } - sprintf(buf, "{%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; + return wine_dbgstr_guid(guid); } /******************************* OLE server *******************************/

1 0

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

29 Jan '14

Module: wine Branch: master Commit: f4fa510ea00c350a8f0767d105295f685736d5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4fa510ea00c350a8f0767d10… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:40 2014 +0100 oleaut32/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/oleaut32/tests/vartype.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 035502a..8ec56c7 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -510,18 +510,6 @@ static HRESULT (WINAPI *pVarBstrCat)(BSTR,BSTR,BSTR*); static INT (WINAPI *pSystemTimeToVariantTime)(LPSYSTEMTIME,double*); static void (WINAPI *pClearCustData)(LPCUSTDATA); -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; -} - /* Internal representation of a BSTR */ typedef struct tagINTERNAL_BSTR { @@ -602,7 +590,7 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, CHECK_EXPECT(dispatch_invoke); ok(dispid == DISPID_VALUE, "got dispid %d\n", dispid); - ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", debugstr_guid(riid)); + ok(IsEqualIID(riid, &IID_NULL), "go riid %s\n", wine_dbgstr_guid(riid)); ok(wFlags == DISPATCH_PROPERTYGET, "Flags wrong\n"); ok(params->rgvarg == NULL, "got %p\n", params->rgvarg);

1 0

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

29 Jan '14

Module: wine Branch: master Commit: 781a0a009a2a39d28d72807c660b3990703e5424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781a0a009a2a39d28d72807c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:46 2014 +0100 urlmon/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/urlmon/tests/protocol.c | 24 +++++-------------- dlls/urlmon/tests/url.c | 54 ++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=781a0a009a2a39d28d728…

1 0