[ros-diffs] [akhaldi] 72308: [SHLWAPI_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

[akhaldi]

Author: akhaldi
Date: Thu Aug 18 10:44:39 2016
New Revision: 72308

URL: http://svn.reactos.org/svn/reactos?rev=72308&view=rev
Log:
[SHLWAPI_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

Modified:
    trunk/rostests/winetests/shlwapi/ordinal.c
    trunk/rostests/winetests/shlwapi/thread.c

Modified: trunk/rostests/winetests/shlwapi/ordinal.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/ordinal.c?rev=72308&r1=72307&r2=72308&view=diff
==============================================================================
--- trunk/rostests/winetests/shlwapi/ordinal.c  [iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/ordinal.c  [iso-8859-1] Thu Aug 18 
10:44:39 2016
@@ -1015,7 +1015,8 @@
         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 @@
     HRESULT hr;
 
 if (0) /* crashes on native systems */
+{
     hr = pIUnknown_GetClassID(NULL, NULL);
+}
 
     memset(&clsid, 0xcc, sizeof(clsid));
     memset(&clsid3, 0xcc, sizeof(clsid3));

Modified: trunk/rostests/winetests/shlwapi/thread.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/thread.c?rev=72308&r1=72307&r2=72308&view=diff
==============================================================================
--- trunk/rostests/winetests/shlwapi/thread.c   [iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/thread.c   [iso-8859-1] Thu Aug 18 
10:44:39 2016
@@ -57,7 +57,7 @@
 {
     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;
 }