From 52f2ffa3e358482044aaa850ff5d29b8d4f1264c Mon Sep 17 00:00:00 2001 From: Giannis Adamopoulos Date: Mon, 11 Nov 2013 17:49:30 +0000 Subject: [PATCH] [shell32] - Fix a couple of bugs I introduced in latest commit svn path=/trunk/; revision=60945 --- reactos/dll/win32/shell32/shlfolder.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/shell32/shlfolder.cpp b/reactos/dll/win32/shell32/shlfolder.cpp index f15fc43c220..e821066ec1d 100644 --- a/reactos/dll/win32/shell32/shlfolder.cpp +++ b/reactos/dll/win32/shell32/shlfolder.cpp @@ -171,7 +171,7 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlChild, REFCLSID clsid, LPVOID * ppvOut) { HRESULT hr; - IShellFolder* pShellFolder; + IShellFolder* pShellFolder = NULL; TRACE ("%p %s %p\n", pidlRoot, debugstr_w(pathRoot), pidlChild); @@ -218,10 +218,11 @@ static HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, } ILFree (pidlAbsolute); } - TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr); *ppvOut = pShellFolder; + TRACE ("-- (%p) ret=0x%08x\n", *ppvOut, hr); + return hr; }