=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: oleaut32/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: f4fa510ea00c350a8f0767d105295f685736d5db
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f4fa510ea00c350a8f0767d105295f685736d5db

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




More information about the wine-cvs mailing list