Removed use of SET_DEBUGGING, it's broken anyway.
This commit is contained in:
parent
e0ab2b7f2a
commit
18f4d651c5
|
@ -29,17 +29,10 @@ DECLARE_DEBUG_CHANNEL(shell);
|
||||||
|
|
||||||
void pdump (LPCITEMIDLIST pidl)
|
void pdump (LPCITEMIDLIST pidl)
|
||||||
{
|
{
|
||||||
BOOL bIsShellDebug;
|
|
||||||
|
|
||||||
LPITEMIDLIST pidltemp = pidl;
|
LPITEMIDLIST pidltemp = pidl;
|
||||||
if (!TRACE_ON(pidl))
|
if (!TRACE_ON(pidl))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* silence the sub-functions */
|
|
||||||
bIsShellDebug = TRACE_ON(shell);
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_shell, FALSE);
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_pidl, FALSE);
|
|
||||||
|
|
||||||
if (! pidltemp)
|
if (! pidltemp)
|
||||||
{
|
{
|
||||||
MESSAGE ("-------- pidl=NULL (Desktop)\n");
|
MESSAGE ("-------- pidl=NULL (Desktop)\n");
|
||||||
|
@ -77,21 +70,13 @@ void pdump (LPCITEMIDLIST pidl)
|
||||||
}
|
}
|
||||||
pcheck(pidl);
|
pcheck(pidl);
|
||||||
}
|
}
|
||||||
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_shell, bIsShellDebug);
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_pidl, TRUE);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
#define BYTES_PRINTED 32
|
#define BYTES_PRINTED 32
|
||||||
BOOL pcheck (LPCITEMIDLIST pidl)
|
BOOL pcheck (LPCITEMIDLIST pidl)
|
||||||
{ DWORD type, ret=TRUE;
|
{
|
||||||
BOOL bIsPidlDebug;
|
DWORD type, ret=TRUE;
|
||||||
|
|
||||||
LPITEMIDLIST pidltemp = pidl;
|
LPITEMIDLIST pidltemp = pidl;
|
||||||
|
|
||||||
bIsPidlDebug = TRACE_ON(shell);
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_pidl, FALSE);
|
|
||||||
|
|
||||||
if (pidltemp && pidltemp->mkid.cb)
|
if (pidltemp && pidltemp->mkid.cb)
|
||||||
{ do
|
{ do
|
||||||
{ type = _ILGetDataPointer(pidltemp)->type;
|
{ type = _ILGetDataPointer(pidltemp)->type;
|
||||||
|
@ -137,7 +122,6 @@ BOOL pcheck (LPCITEMIDLIST pidl)
|
||||||
pidltemp = ILGetNext(pidltemp);
|
pidltemp = ILGetNext(pidltemp);
|
||||||
} while (pidltemp->mkid.cb);
|
} while (pidltemp->mkid.cb);
|
||||||
}
|
}
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_pidl, bIsPidlDebug);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -660,8 +644,6 @@ DWORD WINAPI ILGetSize(LPITEMIDLIST pidl)
|
||||||
LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl)
|
LPITEMIDLIST WINAPI ILGetNext(LPITEMIDLIST pidl)
|
||||||
{
|
{
|
||||||
WORD len;
|
WORD len;
|
||||||
|
|
||||||
TRACE("(pidl=%p)\n",pidl);
|
|
||||||
|
|
||||||
if(pidl)
|
if(pidl)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1470,20 +1470,12 @@ HRESULT WINAPI CIDLData_CreateFromIDArray(
|
||||||
{
|
{
|
||||||
INT i;
|
INT i;
|
||||||
HWND hwnd = 0; /*FIXME: who should be hwnd of owner? set to desktop */
|
HWND hwnd = 0; /*FIXME: who should be hwnd of owner? set to desktop */
|
||||||
BOOL boldpidl;
|
|
||||||
|
|
||||||
if (TRACE_ON(shell)) {
|
TRACE("(%p, %ld, %p, %p)\n", pidlFolder, cpidlFiles, lppidlFiles, ppdataObject);
|
||||||
TRACE("(%p, %ld, %p, %p)\n", pidlFolder, cpidlFiles,
|
if (TRACE_ON(pidl))
|
||||||
lppidlFiles, ppdataObject);
|
{
|
||||||
boldpidl = TRACE_ON(pidl);
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_shell, FALSE);
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_pidl, TRUE);
|
|
||||||
pdump (pidlFolder);
|
pdump (pidlFolder);
|
||||||
for (i=0; i<cpidlFiles; i++){
|
for (i=0; i<cpidlFiles; i++) pdump (lppidlFiles[i]);
|
||||||
pdump (lppidlFiles[i]);
|
|
||||||
}
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_shell, TRUE);
|
|
||||||
__WINE_SET_DEBUGGING(__WINE_DBCL_TRACE, __wine_dbch_pidl, boldpidl);
|
|
||||||
}
|
}
|
||||||
*ppdataObject = IDataObject_Constructor( hwnd, pidlFolder,
|
*ppdataObject = IDataObject_Constructor( hwnd, pidlFolder,
|
||||||
lppidlFiles, cpidlFiles);
|
lppidlFiles, cpidlFiles);
|
||||||
|
|
Loading…
Reference in New Issue