shell32: Use debugstr_guid() and debugstr_w() in TRACE() messages.

Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrey Gusev 2016-07-22 13:11:09 +03:00 committed by Alexandre Julliard
parent 3db78a2bb7
commit 954560f847
4 changed files with 13 additions and 11 deletions

View File

@ -198,7 +198,8 @@ static HRESULT WINAPI IExtractIconW_fnGetIconLocation(IExtractIconW * iface, UIN
GUID const * riid; GUID const * riid;
LPITEMIDLIST pSimplePidl = ILFindLastID(This->pidl); 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) if (pwFlags)
*pwFlags = 0; *pwFlags = 0;

View File

@ -61,7 +61,7 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem2 *iface, REFIID riid,
{ {
ShellItem *This = impl_from_IShellItem2(iface); 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; if (!ppv) return E_INVALIDARG;

View File

@ -2338,22 +2338,22 @@ static HRESULT CreateUnixFolder(IUnknown *outer, REFIID riid, void **ppv, const
} }
HRESULT WINAPI UnixFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { 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); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_UnixFolder);
} }
HRESULT WINAPI UnixDosFolder_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { 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); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_UnixDosFolder);
} }
HRESULT WINAPI FolderShortcut_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { 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); return CreateUnixFolder(pUnkOuter, riid, ppv, &CLSID_FolderShortcut);
} }
HRESULT WINAPI MyDocuments_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) { 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); 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, static HRESULT WINAPI UnixSubFolderIterator_IEnumIDList_QueryInterface(IEnumIDList* iface,
REFIID riid, void** ppv) 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; if (!ppv) return E_INVALIDARG;

View File

@ -3502,8 +3502,8 @@ static HRESULT WINAPI shellfolderviewdual_GetIDsOfNames(
ITypeInfo *ti; ITypeInfo *ti;
HRESULT hr; 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,
rgDispId); cNames, lcid, rgDispId);
hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); hr = get_typeinfo(IShellFolderViewDual3_tid, &ti);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
@ -3520,8 +3520,9 @@ static HRESULT WINAPI shellfolderviewdual_Invoke(IShellFolderViewDual3 *iface,
ITypeInfo *ti; ITypeInfo *ti;
HRESULT hr; 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,
wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult,
pExcepInfo, puArgErr);
hr = get_typeinfo(IShellFolderViewDual3_tid, &ti); hr = get_typeinfo(IShellFolderViewDual3_tid, &ti);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))