Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-27 21:18:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] Fix TrackCtxMenu about NULL ppt (#666)

Browse source 
CORE-14772
This commit is contained in:
Katayama Hirofumi MZ 2018-07-08 23:36:28 +09:00 committed by Hermès BÉLUSCA - MAÏTO
parent a882ec7a02
commit 58825de892
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
base/shell/explorer/traywnd.cpp
View file

@ -709,8 +709,9 @@ public:
IN BOOL TrackUp, IN BOOL TrackUp,
IN PVOID Context OPTIONAL) IN PVOID Context OPTIONAL)
{ {
INT x = ppt->x; POINT pt;
INT y = ppt->y; TPMPARAMS params;
RECT rc;
HRESULT hr; HRESULT hr;
UINT uCommand; UINT uCommand;
HMENU popup = CreatePopupMenu(); HMENU popup = CreatePopupMenu();
@ -718,6 +719,17 @@ public:
if (popup == NULL) if (popup == NULL)
return E_FAIL; return E_FAIL;
if (ppt)
{
pt = *ppt;
}
else
{
::GetWindowRect(m_hWnd, &rc);
pt.x = rc.left;
pt.y = rc.top;
}
TRACE("Before Query\n"); TRACE("Before Query\n");
hr = contextMenu->QueryContextMenu(popup, 0, 0, UINT_MAX, CMF_NORMAL); hr = contextMenu->QueryContextMenu(popup, 0, 0, UINT_MAX, CMF_NORMAL);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
@ -728,7 +740,20 @@ public:
} }
TRACE("Before Tracking\n"); TRACE("Before Tracking\n");
uCommand = ::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, m_hWnd, NULL); ::SetForegroundWindow(m_hWnd);
if (hwndExclude)
{
::GetWindowRect(hwndExclude, &rc);
ZeroMemory(&params, sizeof(params));
params.cbSize = sizeof(params);
params.rcExclude = rc;
uCommand = ::TrackPopupMenuEx(popup, TPM_RETURNCMD, pt.x, pt.y, m_hWnd, &params);
}
else
{
uCommand = ::TrackPopupMenuEx(popup, TPM_RETURNCMD, pt.x, pt.y, m_hWnd, NULL);
}
::PostMessage(m_hWnd, WM_NULL, 0, 0);
if (uCommand != 0) if (uCommand != 0)
{ {