Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32]

Browse source 
- CDesktopBrowser: The flags that SHOpenNewFrame takes are the same that SHExplorerParseCmdLine returns, not the SBSP_ ones.

[BROWSEUI]
- Move the hack to fill the parsed pidl if none was found to SHCreateFromDesktop.
- Convert the SH_EXPLORER_CMDLINE_FLAG_E flag to a SBSP_EXPLOREMODE and pass it to the CShellBrowser.

svn path=/trunk/; revision=73157
This commit is contained in:
Giannis Adamopoulos 2016-11-06 20:13:17 +00:00
parent ce0d9e3727
commit 3c58a339dc
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/dll/win32/browseui/desktopipc.cpp
View file

@ -357,13 +357,11 @@ static HRESULT ExplorerMessageLoop(IEThreadParamBlock * parameters)
if (parameters && parameters->offsetF8) if (parameters && parameters->offsetF8)
parameters->offsetF8->AddRef(); parameters->offsetF8->AddRef();
// HACK! This shouldn't happen! SHExplorerParseCmdLine needs fixing. UINT wFlags = 0;
if (!parameters->directoryPIDL) if ((parameters->dwFlags & SH_EXPLORER_CMDLINE_FLAG_E))
{ wFlags |= SBSP_EXPLOREMODE;
SHGetFolderLocation(NULL, CSIDL_PERSONAL, NULL, NULL, &parameters->directoryPIDL);
}
hResult = CShellBrowser_CreateInstance(parameters->directoryPIDL, parameters->dwFlags, IID_PPV_ARG(IBrowserService2, &browser)); hResult = CShellBrowser_CreateInstance(parameters->directoryPIDL, wFlags, IID_PPV_ARG(IBrowserService2, &browser));
if (FAILED_UNEXPECTEDLY(hResult)) if (FAILED_UNEXPECTEDLY(hResult))
return hResult; return hResult;
@ -609,6 +607,12 @@ BOOL WINAPI SHCreateFromDesktop(ExplorerCommandLineParseResults * parseResults)
} }
} }
// HACK! This shouldn't happen! SHExplorerParseCmdLine needs fixing.
if (!pidl)
{
SHGetFolderLocation(NULL, CSIDL_PERSONAL, NULL, NULL, &pidl);
}
parameters->directoryPIDL = pidl; parameters->directoryPIDL = pidl;
// Try to find the owner of the idlist, if we aren't running /SEPARATE // Try to find the owner of the idlist, if we aren't running /SEPARATE

3
reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp
View file

@ -284,7 +284,8 @@ HRESULT STDMETHODCALLTYPE CDesktopBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT
* find an open shell window that shows the requested pidl and activate it * find an open shell window that shows the requested pidl and activate it
*/ */
return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, wFlags); DWORD dwFlags = ((wFlags & SBSP_EXPLOREMODE) != 0) ? SH_EXPLORER_CMDLINE_FLAG_E : 0;
return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, dwFlags);
} }
HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm) HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm)