Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-05-29 08:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.14][EXPLORER] Send WM_POPUPSYSTEMMENU asynchronously (#4047) CORE-16353

Browse source 
- Delete useless SendMessageTimeout:WM_NULL call.
- Add useful SendMessageCallbackW:WM_POPUPSYSTEMMENU call.
- In the callback function of SendMessageCallbackW, do PostMessageW:WM_NULL
to properly handle the popup menu.

Fix picked from 0.4.15-dev-3297-g 037c744eb1
This commit is contained in:
Joachim Henze 2021-10-22 18:58:21 +02:00
parent 6ef3e43fc0
commit 14ea2f20d3
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
base/shell/explorer/taskswnd.cpp
View file

@ -1625,6 +1625,11 @@ public:
return FALSE;
}
static VOID CALLBACK
SendAsyncProc(HWND hwnd, UINT uMsg, DWORD_PTR dwData, LRESULT lResult)
{
::PostMessageW(hwnd, WM_NULL, 0, 0);
}
VOID HandleTaskItemRightClick(IN OUT PTASK_ITEM TaskItem)
{
@ -1635,14 +1640,11 @@ public:
ActivateTask(TaskItem->hWnd);
/* Wait up to 2 seconds for the window to process the foreground notification. */
DWORD_PTR resultDummy;
if (!SendMessageTimeout(TaskItem->hWnd, WM_NULL, 0, 0, 0, 2000, &resultDummy))
ERR("HandleTaskItemRightClick detected the window was unresponsive for 2 seconds, or was destroyed\n");
if (GetForegroundWindow() != TaskItem->hWnd)
ERR("HandleTaskItemRightClick detected the window did not become foreground\n");
::SendMessageW(TaskItem->hWnd, WM_POPUPSYSTEMMENU, 0, MAKELPARAM(pt.x, pt.y));
::SendMessageCallbackW(TaskItem->hWnd, WM_POPUPSYSTEMMENU, 0, MAKELPARAM(pt.x, pt.y),
SendAsyncProc, (ULONG_PTR)TaskItem);
}
VOID HandleTaskGroupRightClick(IN OUT PTASK_GROUP TaskGroup)