SHELL32_ParseNextElement() error handling

Martin Fuchs martin-fuchs at gmx.net
Tue Apr 13 16:05:25 CDT 2004


Changelog:
correct error handling in SHELL32_ParseNextElement()


Index: shlfolder.c
===================================================================
RCS file: /CVS/ReactOS/reactos/lib/shell32/shlfolder.c,v
retrieving revision 1.7
diff -u -p -d -r1.7 shlfolder.c
--- shlfolder.c	23 Jan 2004 21:44:15 -0000	1.7
+++ shlfolder.c	13 Apr 2004 20:51:06 -0000
@@ -118,14 +118,16 @@ HRESULT SHELL32_ParseNextElement (IShell
     /* get the shellfolder for the child pidl and let it analyse further */
     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);
 	IShellFolder_Release (psfChild);
 
-	pidlTemp = ILCombine (*pidlInOut, pidlOut);
+	if (SUCCEEDED(hr)) {
+	    pidlTemp = ILCombine (*pidlInOut, pidlOut);
 
-	if (!pidlTemp)
-	    hr = E_OUTOFMEMORY;
+	    if (!pidlTemp)
+		hr = E_OUTOFMEMORY;
+	}
 
 	if (pidlOut)
 	    ILFree (pidlOut);





More information about the wine-patches mailing list