mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-08-26 19:33:31 +00:00
[SHELL32] Add extra information when encountering an unexpected pidl
In addition, make pdump slightly less unusable
This commit is contained in:
@@ -245,11 +245,10 @@ void _dbg_ILSimpleGetText (LPCITEMIDLIST pidl, LPSTR szOut, UINT uOutSize)
|
||||
|
||||
|
||||
|
||||
void pdump (LPCITEMIDLIST pidl)
|
||||
static void pdump_impl (LPCITEMIDLIST pidl)
|
||||
{
|
||||
LPCITEMIDLIST pidltemp = pidl;
|
||||
|
||||
if (!TRACE_ON(pidl)) return;
|
||||
|
||||
if (! pidltemp)
|
||||
{
|
||||
@@ -309,6 +308,20 @@ void pdump (LPCITEMIDLIST pidl)
|
||||
}
|
||||
}
|
||||
|
||||
void pdump(LPCITEMIDLIST pidl)
|
||||
{
|
||||
if (!TRACE_ON(pidl)) return;
|
||||
|
||||
return pdump_impl(pidl);
|
||||
}
|
||||
|
||||
|
||||
void pdump_always(LPCITEMIDLIST pidl)
|
||||
{
|
||||
pdump_impl(pidl);
|
||||
}
|
||||
|
||||
|
||||
static void dump_pidl_hex( LPCITEMIDLIST pidl )
|
||||
{
|
||||
const unsigned char *p = (const unsigned char *)pidl;
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#define __WINE_SHELL32_DEBUGHLP_H
|
||||
|
||||
extern void pdump (LPCITEMIDLIST pidl);
|
||||
extern void pdump_always (LPCITEMIDLIST pidl);
|
||||
extern BOOL pcheck (LPCITEMIDLIST pidl);
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
|
||||
@@ -40,7 +40,8 @@ static WCHAR* BuildPathsList(LPCWSTR wszBasePath, int cidl, LPCITEMIDLIST *pidls
|
||||
FileStructW* pDataW = _ILGetFileStructW(pidls[i]);
|
||||
if (!pDataW)
|
||||
{
|
||||
ERR("Got garbage pidl\n");
|
||||
ERR("Mistreating a pidl:\n");
|
||||
pdump_always(pidls[i]);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -1410,7 +1410,8 @@ HRESULT WINAPI CFSFolder::SetNameOf(
|
||||
FileStructW* pDataW = _ILGetFileStructW(pidl);
|
||||
if (!pDataW)
|
||||
{
|
||||
ERR("Got garbage pidl\n");
|
||||
ERR("Got garbage pidl:\n");
|
||||
pdump_always(pidl);
|
||||
return E_INVALIDARG;
|
||||
}
|
||||
|
||||
@@ -1778,6 +1779,7 @@ HRESULT CFSFolder::_CreateShellExtInstance(const CLSID *pclsid, LPCITEMIDLIST pi
|
||||
if (!pDataW)
|
||||
{
|
||||
ERR("Got garbage pidl\n");
|
||||
pdump_always(pidl);
|
||||
return E_INVALIDARG;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user