[22/28] riched20/tests: Use common wine_dbgstr_guid implementation from test.h

Frédéric Delanoy frederic.delanoy at gmail.com
Fri Jan 17 09:52:11 CST 2014


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




More information about the wine-patches mailing list