shell32: Some debug tracing improvements.

diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c
index 0556f97b0cab580d2290b424868d9ded95790576..9fbdf0e51213e9b8fae79158c008614f6c81a813 100644 (file)
--- a/dlls/shell32/classes.c
+++ b/dlls/shell32/classes.c
@@ -386,7 +386,7 @@ BOOL HCR_GetClassNameA(REFIID riid, LPSTR szDest, DWORD len)
          }
        }
 
-       TRACE("-- %s\n", szDest);
+       TRACE("-- (%s)\n", szDest);
 
        return ret;
 }

diff --git a/dlls/shell32/debughlp.c b/dlls/shell32/debughlp.c
index 98d78999cfda1cb62583676e4747f2a2c24e99cd..3cab8bb4e100e8a0a843892bad81941da062713c 100644 (file)
--- a/dlls/shell32/debughlp.c
+++ b/dlls/shell32/debughlp.c
@@ -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;
-           }
-
-            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" );
+       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( "%s (%s)", debugstr_guid(id), name ? name : "unknown" );
 }

diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c
index 4bb7ee4730c37f0e01edcf4615136dd38191aece..8d09d9cf39e734c627aa2480b64046dd40b92386 100644 (file)
--- a/dlls/shell32/shellole.c
+++ b/dlls/shell32/shellole.c
@@ -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);
+       hres = ISF_Desktop_Constructor(NULL, &IID_IShellFolder, (LPVOID*)psf);
 
-       TRACE("-- %p->(%p)\n",psf, *psf);
+       TRACE("-- %p->(%p) 0x%08x\n", psf, *psf, hres);
        return hres;
 }
 /**************************************************************************

diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 19ab6e17e552c942f7f77293d128118c6d12843c..894fc56dd029282bc69ee6a93d5bb3699a3be087 100644 (file)
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -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);

diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index bf8f9798ad7709a2effd30bb33bf0483ea3f35c9..633d767f4e0ab0bc87cbd81ad015992e5a5238e2 100644 (file)
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -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;