From 954560f8479fc0c7f7357e4d105d29431d0447d2 Mon Sep 17 00:00:00 2001 From: Andrey Gusev Date: Fri, 22 Jul 2016 13:11:09 +0300 Subject: [PATCH] shell32: Use debugstr_guid() and debugstr_w() in TRACE() messages. Signed-off-by: Andrey Gusev Signed-off-by: Alexandre Julliard --- dlls/shell32/folders.c | 3 ++- dlls/shell32/shellitem.c | 2 +- dlls/shell32/shfldr_unixfs.c | 10 +++++----- dlls/shell32/shlview.c | 9 +++++---- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 34e51426487..cf26caf8b06 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -198,7 +198,8 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN GUID const * riid; LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); - TRACE("(%p) (flags=%u %p %u %p %p)\n", This, uFlags, szIconFile, cchMax, piIndex, pwFlags); + TRACE("(%p) (flags=%u, %s, %u, %p, %p)\n", This, uFlags, debugstr_w(szIconFile), + cchMax, piIndex, pwFlags); if (pwFlags) *pwFlags = 0; diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d688f17673e..b0af6d61e5f 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 884fc0a86b6..9df761fcbc7 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); } @@ -2390,7 +2390,7 @@ static void UnixSubFolderIterator_Destroy(UnixSubFolderIterator *iterator) { static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_QueryInterface(IEnumIDList* iface, REFIID riid, void** ppv) { - TRACE("(iface=%p, riid=%p, ppv=%p)\n", iface, riid, ppv); + TRACE("(iface=%p, riid=%s, ppv=%p)\n", iface, debugstr_guid(riid), ppv); if (!ppv) return E_INVALIDARG; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index b7634682595..5990982a34c 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3502,8 +3502,8 @@ static HRESULT WINAPI shellfolderviewdual_GetIDsOfNames( ITypeInfo *ti; HRESULT hr; - TRACE("(%p,%p,%p,%u,%d,%p)\n", This, riid, rgszNames, cNames, lcid, - rgDispId); + TRACE("(%p, %s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, + cNames, lcid, rgDispId); hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); if (SUCCEEDED(hr)) @@ -3520,8 +3520,9 @@ 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, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + 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); if (SUCCEEDED(hr))