Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 08:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32] Use common default DFM callback message handler (#6779)

Browse source 
Moves default processing of all DFM_ callback messages in SHELL32 to a single function.

CORE-18585
This commit is contained in:
Whindmar Saksit 2024-05-09 19:52:05 +02:00 • committed by GitHub
parent 9e8214fa13
commit daf806802a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 58 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dll/win32/shell32/CDefaultContextMenu.cpp
View file

@ -700,9 +700,8 @@ void
CDefaultContextMenu::TryPickDefault(HMENU hMenu, UINT idCmdFirst, UINT DfltOffset, UINT uFlags)
{
// Are we allowed to pick a default?
UINT ntver = RosGetProcessEffectiveVersion();
if (((uFlags & CMF_NODEFAULT) && ntver >= _WIN32_WINNT_VISTA) ||
((uFlags & CMF_DONOTPICKDEFAULT) && ntver >= _WIN32_WINNT_WIN7))
if ((uFlags & CMF_NODEFAULT) ||
((uFlags & CMF_DONOTPICKDEFAULT) && RosGetProcessEffectiveVersion() >= _WIN32_WINNT_WIN7))
{
return;
}
@ -713,7 +712,7 @@ CDefaultContextMenu::TryPickDefault(HMENU hMenu, UINT idCmdFirst, UINT DfltOffse
// Does the view want to pick one?
INT_PTR forceDfm = 0;
if (_DoCallback(DFM_GETDEFSTATICID, 0, &forceDfm) == S_OK && forceDfm)
if (SUCCEEDED(_DoCallback(DFM_GETDEFSTATICID, 0, &forceDfm)) && forceDfm)
{
for (UINT i = 0; i < _countof(g_StaticInvokeCmdMap); ++i)
{
@ -974,7 +973,7 @@ CDefaultContextMenu::DoProperties(
// We are asked to run the default property sheet
if (hr == S_FALSE)
{
return Shell_DefaultContextMenuCallBack(m_psf, m_pDataObj);
return SHELL32_ShowPropertiesDialog(m_pDataObj);
}
return hr;