From: Giannis Adamopoulos Date: Sat, 5 Nov 2016 15:05:00 +0000 (+0000) Subject: [SHELL32] X-Git-Tag: ReactOS-0.4.4-FOSDEM2017~400 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=072c1d16c8f235343bd5e975e24d75c4f997ec53 [SHELL32] CDesktopBrowser: Forward the parameters pased in CDesktopBrowser::BrowseObject to SHOpenNewFrame. Thus the same parameters are eventually passed to CShellBrowser::Initialize. [BROWSEUI] CShellBrowser: Handle SBSP_EXPLOREMODE flag so as to show the tree view when the user selects the Explore option from the context menu. svn path=/trunk/; revision=73134 --- diff --git a/reactos/dll/win32/browseui/shellbrowser.cpp b/reactos/dll/win32/browseui/shellbrowser.cpp index 8419af6af23..63c58694caa 100644 --- a/reactos/dll/win32/browseui/shellbrowser.cpp +++ b/reactos/dll/win32/browseui/shellbrowser.cpp @@ -780,6 +780,9 @@ HRESULT CShellBrowser::Initialize(LPITEMIDLIST pidl, DWORD dwFlags) if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + if ((dwFlags & SBSP_EXPLOREMODE) != NULL) + ShowBand(CLSID_ExplorerBand, true); + ShowWindow(SW_SHOWNORMAL); return S_OK; @@ -2182,6 +2185,9 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::TranslateAcceleratorSB(MSG *pmsg, WORD HRESULT STDMETHODCALLTYPE CShellBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) { + if ((wFlags & SBSP_EXPLOREMODE) != NULL) + ShowBand(CLSID_ExplorerBand, true); + return BrowseToPIDL(pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); } diff --git a/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp b/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp index 733504176db..fe64747c6c2 100644 --- a/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp +++ b/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp @@ -284,7 +284,7 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT * find an open shell window that shows the requested pidl and activate it */ - return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, 0); + return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, wFlags); } HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm)