https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a68717c58a39590a6ee595839b6520b7ba27bc8
commit 6a68717c58a39590a6ee595839b6520b7ba27bc8 Author: Mark Jansen <[email protected]> AuthorDate: Tue Feb 15 22:20:42 2022 +0100 Commit: Mark Jansen <[email protected]> CommitDate: Tue Feb 22 19:40:09 2022 +0100 [SHELL32] CDefaultContextMenu: Provide a fallback property sheet CORE-17691 --- dll/shellext/fontext/CFontMenu.cpp | 2 +- dll/win32/shell32/CDefaultContextMenu.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/shellext/fontext/CFontMenu.cpp b/dll/shellext/fontext/CFontMenu.cpp index fdd20bbd6ef..a57e1843c65 100644 --- a/dll/shellext/fontext/CFontMenu.cpp +++ b/dll/shellext/fontext/CFontMenu.cpp @@ -93,7 +93,7 @@ static HRESULT CALLBACK FontFolderMenuCallback(IShellFolder *psf, HWND hwnd, IDa } else if (wParam == DFM_CMD_PROPERTIES) { - ERR("Default properties handling!\n"); + TRACE("Default properties handling!\n"); return S_FALSE; } else diff --git a/dll/win32/shell32/CDefaultContextMenu.cpp b/dll/win32/shell32/CDefaultContextMenu.cpp index fc1e5e97ff2..05978136e62 100644 --- a/dll/win32/shell32/CDefaultContextMenu.cpp +++ b/dll/win32/shell32/CDefaultContextMenu.cpp @@ -836,9 +836,15 @@ HRESULT CDefaultContextMenu::DoProperties( LPCMINVOKECOMMANDINFO lpcmi) { - _DoCallback(DFM_INVOKECOMMAND, DFM_CMD_PROPERTIES, NULL); + HRESULT hr = _DoCallback(DFM_INVOKECOMMAND, DFM_CMD_PROPERTIES, NULL); - return S_OK; + // We are asked to run the default property sheet + if (hr == S_FALSE) + { + return Shell_DefaultContextMenuCallBack(m_psf, m_pDataObj); + } + + return hr; } HRESULT
