ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Some debug tracing improvements.

This commit is contained in:
Nikolay Sivov 2010-03-21 04:42:59 +03:00 committed by Alexandre Julliard
parent 1168b79266
commit 0f794f9510
5 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/classes.c
View File

@ -386,7 +386,7 @@ BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len)
}
}
TRACE("-- %s\n", szDest);
TRACE("-- (%s)\n", szDest);
return ret;
}

19
dlls/shell32/debughlp.c
View File

@ -422,16 +422,13 @@ const char * shdebugstr_guid( const struct _GUID *id )
if (!id) return "(null)";
for (i=0;InterfaceDesc[i].riid && !name;i++) {
if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name;
}
if (!name) {
if (HCR_GetClassNameA(id, clsidbuf, 100))
name = clsidbuf;
}
for (i = 0; InterfaceDesc[i].riid && !name; i++) {
if (IsEqualIID(InterfaceDesc[i].riid, id)) name = InterfaceDesc[i].name;
}
if (!name) {
if (HCR_GetClassNameA(id, clsidbuf, 100))
name = clsidbuf;
}
return wine_dbg_sprintf( "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x} (%s)",
id->Data1, id->Data2, id->Data3,
id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3],
id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7], name ? name : "unknown" );
return wine_dbg_sprintf( "%s (%s)", debugstr_guid(id), name ? name : "unknown" );
}

12
dlls/shell32/shellole.c
View File

@ -330,14 +330,16 @@ void WINAPI SHFree(LPVOID pv)
*/
HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf)
{
HRESULT hres = S_OK;
TRACE("\n");
HRESULT hres;
TRACE("(%p)\n", psf);
if(!psf) return E_INVALIDARG;
*psf = NULL;
hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder,(LPVOID*)psf);
TRACE("-- %p->(%p)\n",psf, *psf);
*psf = NULL;
hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder, (LPVOID*)psf);
TRACE("-- %p->(%p) 0x%08x\n", psf, *psf, hres);
return hres;
}
/**************************************************************************

17
dlls/shell32/shlfolder.c
View File

@ -125,9 +125,9 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut)
LPCWSTR pszTail = pszNext;
DWORD dwCopy;
TRACE ("(%s %p 0x%08x)\n", debugstr_w (pszNext), pszOut, dwOut);
TRACE ("(%s %p 0x%08x)\n", debugstr_w(pszNext), pszOut, dwOut);
*pszOut = 0x0000;
*pszOut = 0;
if (!pszNext || !*pszNext)
return NULL;
@ -150,10 +150,9 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut)
HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc,
LPITEMIDLIST * pidlInOut, LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes)
{
HRESULT hr = E_INVALIDARG;
LPITEMIDLIST pidlOut = NULL,
pidlTemp = NULL;
LPITEMIDLIST pidlOut = NULL, pidlTemp = NULL;
IShellFolder *psfChild;
HRESULT hr;
TRACE ("(%p, %p, %p, %s)\n", psf, pbc, pidlInOut ? *pidlInOut : NULL, debugstr_w (szNext));
@ -197,7 +196,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot,
{
HRESULT hr;
TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild);
TRACE ("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlChild, debugstr_guid(clsid), ppvOut);
hr = SHCoCreateInstance(NULL, clsid, NULL, &IID_IShellFolder, ppvOut);
if (SUCCEEDED (hr))
@ -268,6 +267,8 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot,
HRESULT hr;
LPITEMIDLIST pidlChild;
TRACE("(%p %s %p %s %p)\n", pidlRoot, debugstr_w(pathRoot), pidlComplete, debugstr_guid(riid), ppvOut);
if (!pidlRoot || !ppvOut || !pidlComplete || !pidlComplete->mkid.cb)
return E_INVALIDARG;
@ -312,7 +313,7 @@ HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot,
IShellFolder_Release (pSF);
}
TRACE ("-- returning (%p) %08x\n", *ppvOut, hr);
TRACE ("-- returning (%p) 0x%08x\n", *ppvOut, hr);
return hr;
}
@ -335,7 +336,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf,
LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, DWORD dwOutLen)
{
LPITEMIDLIST pidlFirst;
HRESULT hr = E_INVALIDARG;
HRESULT hr;
TRACE ("(%p)->(pidl=%p 0x%08x %p 0x%08x)\n", psf, pidl, dwFlags, szOut, dwOutLen);
pdump (pidl);

12
dlls/shell32/shlview.c
View File

@ -2218,16 +2218,16 @@ static ULONG WINAPI ISVOleCmdTarget_Release(
*/
static HRESULT WINAPI ISVOleCmdTarget_QueryStatus(
IOleCommandTarget *iface,
const GUID* pguidCmdGroup,
const GUID *pguidCmdGroup,
ULONG cCmds,
OLECMD * prgCmds,
OLECMDTEXT* pCmdText)
OLECMD *prgCmds,
OLECMDTEXT *pCmdText)
{
UINT i;
IShellViewImpl *This = impl_from_IOleCommandTarget(iface);
UINT i;
FIXME("(%p)->(%p(%s) 0x%08x %p %p\n",
This, pguidCmdGroup, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText);
FIXME("(%p)->(%s %d %p %p)\n",
This, debugstr_guid(pguidCmdGroup), cCmds, prgCmds, pCmdText);
if (!prgCmds)
return E_POINTER;