=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: mscoree/tests: Use common wine_dbgstr_guid implementation from test.h.

Alexandre Julliard julliard at winehq.org
Wed Jan 29 14:53:32 CST 2014


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

Author: Frédéric Delanoy <frederic.delanoy at 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;
 }




More information about the wine-cvs mailing list