[SHLWAPI_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

svn path=/trunk/; revision=72308

diff --git a/rostests/winetests/shlwapi/ordinal.c b/rostests/winetests/shlwapi/ordinal.c
index 8b516aa..b7e6f60 100755 (executable)
--- a/rostests/winetests/shlwapi/ordinal.c
+++ b/rostests/winetests/shlwapi/ordinal.c
@@ -1015,7 +1015,8 @@ static HRESULT WINAPI Disp_Invoke(
         EXCEPINFO *pExcepInfo,
         UINT *puArgErr)
 {
-    trace("%p %x %p %x %x %p %p %p %p\n",This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr);
+    trace("%p %x %s %x %x %p %p %p %p\n", This, dispIdMember, wine_dbgstr_guid(riid), lcid, wFlags,
+          pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     ok(dispIdMember == 0xa0 || dispIdMember == 0xa1, "Unknown dispIdMember\n");
     ok(pDispParams != NULL, "Invoked with NULL pDispParams\n");
@@ -3243,7 +3244,9 @@ static void test_IUnknown_GetClassID(void)
     HRESULT hr;
 
 if (0) /* crashes on native systems */
+{
     hr = pIUnknown_GetClassID(NULL, NULL);
+}
 
     memset(&clsid, 0xcc, sizeof(clsid));
     memset(&clsid3, 0xcc, sizeof(clsid3));

diff --git a/rostests/winetests/shlwapi/thread.c b/rostests/winetests/shlwapi/thread.c
index fc141d3..28b4ccd 100644 (file)
--- a/rostests/winetests/shlwapi/thread.c
+++ b/rostests/winetests/shlwapi/thread.c
@@ -57,7 +57,7 @@ static HRESULT WINAPI threadref_QueryInterface(IUnknown *iface, REFIID riid, LPV
 {
     threadref * This = impl_from_IUnknown(iface);
 
-    trace("unexpected QueryInterface(%p, %p, %p) called\n", This, riid, ppvObj);
+    trace("unexpected QueryInterface(%p, %s, %p) called\n", This, wine_dbgstr_guid(riid), ppvObj);
     *ppvObj = NULL;
     return E_NOINTERFACE;
 }