[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-cvs
Subject:    =?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: jscript/tests: Use common wine_dbgstr_guid implementati
From:       Alexandre Julliard <julliard () winehq ! org>
Date:       2014-01-30 19:25:26
Message-ID: E1W8xEs-0001Jp-Gi () wine ! codeweavers ! com
[Download RAW message or body]

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


Author: Frédéric Delanoy <frederic.delanoy@gmail.com>
Date:   Sat Jan 25 15:24:33 2014 +0100

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

---

 dlls/jscript/tests/activex.c |   22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c
index b4a8bdc..1153409 100644
--- a/dlls/jscript/tests/activex.c
+++ b/dlls/jscript/tests/activex.c
@@ -116,18 +116,6 @@ const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY =
 
 #define DISPID_GLOBAL_OK             0x2000
 
-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;
@@ -433,7 +421,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory \
*iface, IUnknown  CHECK_EXPECT(CreateInstance);
 
     ok(!outer, "outer = %p\n", outer);
-    ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", \
debugstr_guid(riid)); +    ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid \
%s\n", wine_dbgstr_guid(riid));  
     if(SUCCEEDED(CreateInstance_hres))
         *ppv = &testObj;
@@ -489,7 +477,7 @@ static HRESULT WINAPI \
InternetHostSecurityManager_ProcessUrlAction(IInternetHost  ok(cbPolicy == \
sizeof(DWORD), "cbPolicy = %d\n", cbPolicy);  ok(pContext != NULL, "pContext == \
NULL\n");  ok(cbContext == sizeof(GUID), "cbContext = %d\n", cbContext);
-    ok(IsEqualGUID(pContext, &CLSID_TestObj), "pContext = %s\n", \
debugstr_guid((const IID*)pContext)); +    ok(IsEqualGUID(pContext, &CLSID_TestObj), \
"pContext = %s\n", wine_dbgstr_guid((const IID*)pContext));  ok(!dwFlags, "dwFlags = \
%x\n", dwFlags);  ok(!dwReserved, "dwReserved = %x\n", dwReserved);
 
@@ -506,7 +494,7 @@ static HRESULT WINAPI \
InternetHostSecurityManager_QueryCustomPolicy(IInternetHos  
     CHECK_EXPECT(QueryCustomPolicy);
 
-    ok(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, guidKey), "guidKey = %s\n", \
debugstr_guid(guidKey)); +    ok(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, \
guidKey), "guidKey = %s\n", wine_dbgstr_guid(guidKey));  
     ok(ppPolicy != NULL, "ppPolicy == NULL\n");
     ok(pcbPolicy != NULL, "pcbPolicy == NULL\n");
@@ -571,13 +559,13 @@ static HRESULT WINAPI \
ServiceProvider_QueryService(IServiceProvider *iface,  CHECK_EXPECT(Host_QS_SecMgr);
         else
             CHECK_EXPECT(Caller_QS_SecMgr);
-        ok(IsEqualGUID(&IID_IInternetHostSecurityManager, riid), "unexpected riid \
%s\n", debugstr_guid(riid)); +        \
ok(IsEqualGUID(&IID_IInternetHostSecurityManager, riid), "unexpected riid %s\n", \
wine_dbgstr_guid(riid));  if(SUCCEEDED(QS_SecMgr_hres))
             *ppv = &InternetHostSecurityManager;
         return QS_SecMgr_hres;
     }
 
-    ok(0, "unexpected service %s\n", debugstr_guid(guidService));
+    ok(0, "unexpected service %s\n", wine_dbgstr_guid(guidService));
     return E_NOINTERFACE;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]