[ros-diffs] [reactos] 01/01: [BROWSEUI][SHELLFIND] Allow to 'Open Containing Folder'

[Joachim Henze]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd2a274ef7fcf42f24b63…

commit cd2a274ef7fcf42f24b634ffa5b4de3ce299e1e4
Author:     Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Sat Oct 12 15:44:58 2019 +0200
Commit:     Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Sat Oct 12 15:44:58 2019 +0200

    [BROWSEUI][SHELLFIND] Allow to 'Open Containing Folder'
    
    of a search result again.
    
    The feature regressed by 0.4.13-dev-1133-g
    a3ee648d8b641604a87fcc3733d0946ced056074
    
    I chose the shorter solution of Brock Mammen instead
    of the patch of Doug Lyons from PR1960.
    
    Still many thanks to Doug Lyons for his encouragement
    in creating a fix as well and performing
    regression-testing.
    
    I intend to merge that back into 0.4.13RCs as well.
---
 dll/win32/browseui/shellfind/CFindFolder.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp
b/dll/win32/browseui/shellfind/CFindFolder.cpp
index 4db35f633b3..dcac0c0c60c 100644
--- a/dll/win32/browseui/shellfind/CFindFolder.cpp
+++ b/dll/win32/browseui/shellfind/CFindFolder.cpp
@@ -556,8 +556,10 @@ class CFindFolderContextMenu :
                 CComHeapPtr<ITEMIDLIST>
folderPidl(ILCreateFromPathW(_ILGetPath(apidl[i])));
                 if (!folderPidl)
                     return E_OUTOFMEMORY;
-                LPCITEMIDLIST pidl = _ILGetFSPidl(apidl[i]);
-                SHOpenFolderAndSelectItems(folderPidl, 1, &pidl, 0);
+                CComHeapPtr<ITEMIDLIST> filePidl(ILCombine(folderPidl,
_ILGetFSPidl(apidl[i])));
+                if (!filePidl)
+                    return E_OUTOFMEMORY;
+                SHOpenFolderAndSelectItems(folderPidl, 1, &filePidl, 0);
             }
             return S_OK;
         }