[PATCH v2] shell32: Use debugstr_guid() in TRACE() messages.

Andrey Gusev andrey.goosev at gmail.com
Thu Jul 21 07:13:33 CDT 2016


Extended version.

>From ae3e100abaa1f11a4c4cf7fff326df59ace779a5 Mon Sep 17 00:00:00 2001
Message-Id: <ae3e100abaa1f11a4c4cf7fff326df59ace779a5.1469103028.git.andrey.goosev at gmail.com>
From: Andrey Gusev <andrey.goosev at gmail.com>
Date: Thu, 21 Jul 2016 15:12:10 +0300
Subject: [PATCH v2] shell32: Use debugstr_guid() in TRACE() messages.

Signed-off-by: Andrey Gusev <andrey.goosev at gmail.com>
---
 dlls/shell32/shellitem.c     | 2 +-
 dlls/shell32/shfldr_unixfs.c | 8 ++++----
 dlls/shell32/shlview.c       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c
index d688f17..8837c74 100644
--- a/dlls/shell32/shellitem.c
+++ b/dlls/shell32/shellitem.c
@@ -61,7 +61,7 @@ static HRESULT WINAPI
ShellItem_QueryInterface(IShellItem2 *iface, REFIID riid,
 {
     ShellItem *This = impl_from_IShellItem2(iface);

-    TRACE("(%p,%p,%p)\n", iface, riid, ppv);
+    TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv);

     if (!ppv) return E_INVALIDARG;

diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index 884fc0a..772bc6a 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -2338,22 +2338,22 @@ static HRESULT CreateUnixFolder(IUnknown
*outer, REFIID riid, void **ppv, const
 }

 HRESULT WINAPI UnixFolder_Constructor(IUnknown *pUnkOuter, REFIID
riid, LPVOID *ppv) {
-    TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv);
+    TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter,
debugstr_guid(riid), ppv);
     return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_UnixFolder);
 }

 HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *pUnkOuter, REFIID
riid, LPVOID *ppv) {
-    TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv);
+    TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter,
debugstr_guid(riid), ppv);
     return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_UnixDosFolder);
 }

 HRESULT WINAPI FolderShortcut_Constructor(IUnknown *pUnkOuter, REFIID
riid, LPVOID *ppv) {
-    TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv);
+    TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter,
debugstr_guid(riid), ppv);
     return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_FolderShortcut);
 }

 HRESULT WINAPI MyDocuments_Constructor(IUnknown *pUnkOuter, REFIID
riid, LPVOID *ppv) {
-    TRACE("(pUnkOuter=%p, riid=%p, ppv=%p)\n", pUnkOuter, riid, ppv);
+    TRACE("(pUnkOuter=%p, riid=%s, ppv=%p)\n", pUnkOuter,
debugstr_guid(riid), ppv);
     return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_MyDocuments);
 }

diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index b763468..fc1d6f0 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -3502,7 +3502,7 @@ static HRESULT WINAPI shellfolderviewdual_GetIDsOfNames(
     ITypeInfo *ti;
     HRESULT hr;

-    TRACE("(%p,%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid,
+    TRACE("(%p,%s,%p,%u,%d,%p)\n", This, debugstr_guid(riid),
rgszNames, cNames, lcid,
             rgDispId);

     hr = get_typeinfo(IShellFolderViewDual3_tid, &ti);
@@ -3520,7 +3520,7 @@ static HRESULT WINAPI
shellfolderviewdual_Invoke(IShellFolderViewDual3 *iface,
     ITypeInfo *ti;
     HRESULT hr;

-    TRACE("(%p,%d,%p,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember, riid, lcid,
+    TRACE("(%p,%d,%s,%d,%u,%p,%p,%p,%p)\n", This, dispIdMember,
debugstr_guid(riid), lcid,
             wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);

     hr = get_typeinfo(IShellFolderViewDual3_tid, &ti);
-- 
2.5.5



More information about the wine-patches mailing list