Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:05:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

preciser error codes for some shell functions

Browse source 
svn path=/trunk/; revision=7506
This commit is contained in:
Martin Fuchs 2004-01-07 21:48:29 +00:00
parent 18f935cbb8
commit 01c51c2aab
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/shell32/shfldr_fs.c
View file

@ -325,7 +325,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface,
{
_ICOM_THIS_From_IShellFolder2 (IGenericSFImpl, iface)
HRESULT hr = E_OUTOFMEMORY;
HRESULT hr = E_INVALIDARG;
LPCWSTR szNext = NULL;
WCHAR szElement[MAX_PATH];
CHAR szPath[MAX_PATH];

2
reactos/lib/shell32/shfldr_mycomp.c
View file

@ -191,7 +191,7 @@ ISF_MyComputer_fnParseDisplayName (IShellFolder2 * iface,
{
ICOM_THIS (IGenericSFImpl, iface);
HRESULT hr = E_OUTOFMEMORY;
HRESULT hr = E_INVALIDARG;
LPCWSTR szNext = NULL;
WCHAR szElement[MAX_PATH];
CHAR szTempA[MAX_PATH];

13
reactos/lib/shell32/shlfolder.c
View file

@ -108,7 +108,7 @@ 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_OUTOFMEMORY;
HRESULT hr = E_INVALIDARG;
LPITEMIDLIST pidlOut = NULL,
pidlTemp = NULL;
IShellFolder *psfChild;
@ -124,6 +124,9 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc,
pidlTemp = ILCombine (*pidlInOut, pidlOut);
if (!pidlTemp)
hr = E_OUTOFMEMORY;
if (pidlOut)
ILFree (pidlOut);
}
@ -159,6 +162,9 @@ HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot,
IPersistFolder_Initialize (pPF, pidlAbsolute);
IPersistFolder_Release (pPF);
SHFree (pidlAbsolute);
if (!pidlAbsolute)
hr = E_OUTOFMEMORY;
}
}
@ -293,7 +299,7 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf,
LPCITEMIDLIST pidl, DWORD dwFlags, LPSTR szOut, DWORD dwOutLen)
{
LPITEMIDLIST pidlFirst;
HRESULT hr = E_OUTOFMEMORY;
HRESULT hr = E_INVALIDARG;
TRACE ("(%p)->(pidl=%p 0x%08lx %p 0x%08lx)\n", psf, pidl, dwFlags, szOut, dwOutLen);
pdump (pidl);
@ -314,7 +320,8 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf,
IShellFolder_Release (psfChild);
}
ILFree (pidlFirst);
}
} else
hr = E_OUTOFMEMORY;
TRACE ("-- ret=0x%08lx %s\n", hr, szOut);