Frédéric Delanoy : ieframe/tests: Use common wine_dbgstr_guid implementation from test.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 783176aa74ab046712648ed3ae90290454e14d0c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=783176aa74ab046712648ed3ae...

Author: Frédéric Delanoy 
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);