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

[Alexandre Julliard]

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

Author: Frédéric Delanoy 
Date:   Sat Jan 25 15:24:38 2014 +0100

msxml3/tests: Use common wine_dbgstr_guid implementation from test.h.

---

dlls/msxml3/tests/domdoc.c  |   21 +++------------------
 dlls/msxml3/tests/httpreq.c |   19 ++-----------------
 2 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 9c698c2..e33db88 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -45,21 +45,6 @@

DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,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 int g_unexpectedcall, g_expectedcall;

struct msxmlsupported_data_t
@@ -102,7 +87,7 @@ static const char *debugstr_msxml_guid(REFIID riid)
     else if (IsEqualIID(&IID_IMXNamespaceManager, riid))
         return "IMXNamespaceManager";
     else
-        return debugstr_guid(riid);
+        return wine_dbgstr_guid(riid);
 }

static void get_class_support_data(struct msxmlsupported_data_t *table)
@@ -10839,7 +10824,7 @@ static void test_supporterrorinfo(void)
         if (hr == S_OK)
         {
             hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, *iid);
-            ok(hr == S_OK, "got 0x%08x for %s\n", hr, debugstr_guid(*iid));
+            ok(hr == S_OK, "got 0x%08x for %s\n", hr, wine_dbgstr_guid(*iid));
             IUnknown_Release(unk);
         }

@@ -10875,7 +10860,7 @@ static void test_supporterrorinfo(void)
             if (hr == S_OK)
             {
                 hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, *iid);
-                ok(hr == S_OK, "%d: got 0x%08x for %s\n", ptr->type, hr, debugstr_guid(*iid));
+                ok(hr == S_OK, "%d: got 0x%08x for %s\n", ptr->type, hr, wine_dbgstr_guid(*iid));
                 IUnknown_Release(unk);
             }

diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c
index ad074de..d74b01a 100644
--- a/dlls/msxml3/tests/httpreq.c
+++ b/dlls/msxml3/tests/httpreq.c
@@ -87,21 +87,6 @@ DEFINE_EXPECT(htmldoc2_get_all);
 DEFINE_EXPECT(htmldoc2_get_url);
 DEFINE_EXPECT(collection_get_length);

-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 int g_unexpectedcall, g_expectedcall;

static BSTR alloc_str_from_narrow(const char *str)
@@ -1099,7 +1084,7 @@ static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID riid, vo
         return S_OK;
     }

-    ok(0, "unexpected query interface: %s\n", debugstr_guid(riid));
+    ok(0, "unexpected query interface: %s\n", wine_dbgstr_guid(riid));

return E_NOINTERFACE;
 }
@@ -1158,7 +1143,7 @@ static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service,
     {
     }
     else
-        ok(0, "unexpected request: sid %s, riid %s\n", debugstr_guid(service), debugstr_guid(riid));
+        ok(0, "unexpected request: sid %s, riid %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(riid));

return E_NOTIMPL;
 }