lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-01 08:50:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Don't pass menu band hwnd to InvokeCommand (#7945)

Browse Source 
The menu band window is about to go away, don't pass it to InvokeCommand because it's invalid as an owner window for any dialogs the callee might display.
This commit is contained in:
Whindmar Saksit
2025-04-28 00:24:15 +02:00
committed by GitHub
parent 9b70d4380c
commit 378a335468
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dll/win32/shell32/shellmenu/CMenuBand.cpp
View File

@@ -861,7 +861,8 @@ HRESULT CMenuBand::_TrackContextMenu(IContextMenu * contextMenu, INT x, INT y)
_MenuItemSelect(MPOS_FULLCANCEL);
TRACE("Before InvokeCommand\n");
CMINVOKECOMMANDINFO cmi = { sizeof(cmi), 0, hwnd };
// Note: Not passing hwnd to InvokeCommand because it can be a BaseBar window that is about to die
CMINVOKECOMMANDINFO cmi = { sizeof(cmi), 0, NULL };
cmi.lpVerb = MAKEINTRESOURCEA(uCommand - idCmdFirst);
if (GetKeyState(VK_SHIFT) < 0)
cmi.fMask |= CMIC_MASK_SHIFT_DOWN;