Skip to content

W
wine-winehq
Commit 849337b9 authored by Martin Fuchs's avatar Martin Fuchs Committed by Alexandre Julliard
Browse files
Options

Correct error handling in SHELL32_ParseNextElement().

parent bc2328fc
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
dlls/shell32/shlfolder.c
View file @ 849337b9
...@@ -118,14 +118,16 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, ...@@ -118,14 +118,16 @@ HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc,
/* get the shellfolder for the child pidl and let it analyse further */ /* get the shellfolder for the child pidl and let it analyse further */
hr = IShellFolder_BindToObject (psf, *pidlInOut, pbc, &IID_IShellFolder, (LPVOID *) & psfChild); hr = IShellFolder_BindToObject (psf, *pidlInOut, pbc, &IID_IShellFolder, (LPVOID *) & psfChild);
if (SUCCEEDED (hr)) { if (SUCCEEDED(hr)) {
hr = IShellFolder_ParseDisplayName (psfChild, hwndOwner, pbc, szNext, pEaten, &pidlOut, pdwAttributes); hr = IShellFolder_ParseDisplayName (psfChild, hwndOwner, pbc, szNext, pEaten, &pidlOut, pdwAttributes);
IShellFolder_Release (psfChild); IShellFolder_Release (psfChild);
pidlTemp = ILCombine (*pidlInOut, pidlOut); if (SUCCEEDED(hr)) {
pidlTemp = ILCombine (*pidlInOut, pidlOut);
if (!pidlTemp) if (!pidlTemp)
hr = E_OUTOFMEMORY; hr = E_OUTOFMEMORY;
}
if (pidlOut) if (pidlOut)
ILFree (pidlOut); ILFree (pidlOut);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment