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

[RSHELL]

Browse source 
* Fix the focus manager to properly close the shell menus when clicking outside the menu area.
* Close the shell menus when activating a context menu action.
* Open the shell menus without activating. Fixes titlebar color changing to inactive for the Favorites menu.

[RSHELL]
[SHELL32]
[BROWSEUI]
* Remove a few DbgPrints and downgrade some others into TRACEs.

CORE-8836 #resolve

svn path=/trunk/; revision=65740
This commit is contained in:
David Quintana 2014-12-18 17:34:46 +00:00
parent 217eef81d8
commit d73c38b69c
12 changed files with 153 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/shell/explorer/taskswnd.cpp
View file

@ -1131,7 +1131,6 @@ public:
if (Horizontal) if (Horizontal)
{ {
DbgPrint("HORIZONTAL!\n");
TBMETRICS tbm = { 0 }; TBMETRICS tbm = { 0 };
tbm.cbSize = sizeof(tbm); tbm.cbSize = sizeof(tbm);
tbm.dwMask = TBMF_BUTTONSPACING; tbm.dwMask = TBMF_BUTTONSPACING;
@ -1145,7 +1144,6 @@ public:
} }
else else
{ {
DbgPrint("VERTICAL!\n");
uiBtnsPerLine = 1; uiBtnsPerLine = 1;
uiRows = m_ButtonCount; uiRows = m_ButtonCount;
} }

23
reactos/base/shell/rshell/CMenuBand.cpp
View file

@ -439,7 +439,7 @@ HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved)
if (m_subMenuChild) if (m_subMenuChild)
{ {
DbgPrint("Child object should have removed itself.\n"); TRACE("Child object should have removed itself.\n");
} }
ShowDW(FALSE); ShowDW(FALSE);
@ -781,6 +781,10 @@ HRESULT CMenuBand::_TrackContextMenu(IContextMenu * contextMenu, INT x, INT y)
{ {
HRESULT hr; HRESULT hr;
UINT uCommand; UINT uCommand;
// Ensure that the menu doesn't disappear on us
CComPtr<IContextMenu> ctxMenu = contextMenu;
HMENU popup = CreatePopupMenu(); HMENU popup = CreatePopupMenu();
if (popup == NULL) if (popup == NULL)
@ -806,12 +810,15 @@ HRESULT CMenuBand::_TrackContextMenu(IContextMenu * contextMenu, INT x, INT y)
if (uCommand != 0) if (uCommand != 0)
{ {
_MenuItemSelect(MPOS_FULLCANCEL);
TRACE("Before InvokeCommand\n"); TRACE("Before InvokeCommand\n");
CMINVOKECOMMANDINFO cmi = { 0 }; CMINVOKECOMMANDINFO cmi = { 0 };
cmi.cbSize = sizeof(cmi); cmi.cbSize = sizeof(cmi);
cmi.lpVerb = MAKEINTRESOURCEA(uCommand); cmi.lpVerb = MAKEINTRESOURCEA(uCommand);
cmi.hwnd = hwnd; cmi.hwnd = hwnd;
hr = contextMenu->InvokeCommand(&cmi); hr = contextMenu->InvokeCommand(&cmi);
TRACE("InvokeCommand returned hr=%08x\n", hr);
} }
else else
{ {
@ -843,7 +850,7 @@ HRESULT CMenuBand::_ChangeHotItem(CMenuToolbarBase * tb, INT id, DWORD dwFlags)
if (m_staticToolbar) m_staticToolbar->ChangeHotItem(tb, id, dwFlags); if (m_staticToolbar) m_staticToolbar->ChangeHotItem(tb, id, dwFlags);
if (m_SFToolbar) m_SFToolbar->ChangeHotItem(tb, id, dwFlags); if (m_SFToolbar) m_SFToolbar->ChangeHotItem(tb, id, dwFlags);
_MenuItemHotTrack(MPOS_CHILDTRACKING); _MenuItemSelect(MPOS_CHILDTRACKING);
return S_OK; return S_OK;
@ -904,7 +911,7 @@ HRESULT CMenuBand::_KeyboardItemChange(DWORD change)
return tb->KeyboardItemChange(change == VK_DOWN ? VK_HOME : VK_END); return tb->KeyboardItemChange(change == VK_DOWN ? VK_HOME : VK_END);
} }
HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType) HRESULT CMenuBand::_MenuItemSelect(DWORD changeType)
{ {
CComPtr<CMenuBand> safeThis = this; CComPtr<CMenuBand> safeThis = this;
HRESULT hr; HRESULT hr;
@ -959,7 +966,7 @@ HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
} }
case MPOS_SELECTLEFT: case MPOS_SELECTLEFT:
if (m_parentBand && m_parentBand->_IsPopup()==S_FALSE) if (m_parentBand && m_parentBand->_IsPopup()==S_FALSE)
return m_parentBand->_MenuItemHotTrack(VK_LEFT); return m_parentBand->_MenuItemSelect(VK_LEFT);
if (m_subMenuChild) if (m_subMenuChild)
return m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); return m_subMenuChild->OnSelect(MPOS_CANCELLEVEL);
if (!m_subMenuParent) if (!m_subMenuParent)
@ -970,7 +977,7 @@ HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType)
if (m_hotBar && m_hotItem >= 0 && m_hotBar->PopupItem(m_hotItem, TRUE) == S_OK) if (m_hotBar && m_hotItem >= 0 && m_hotBar->PopupItem(m_hotItem, TRUE) == S_OK)
return S_FALSE; return S_FALSE;
if (m_parentBand) if (m_parentBand)
return m_parentBand->_MenuItemHotTrack(VK_RIGHT); return m_parentBand->_MenuItemSelect(VK_RIGHT);
if (!m_subMenuParent) if (!m_subMenuParent)
return S_OK; return S_OK;
return m_subMenuParent->OnSelect(MPOS_SELECTRIGHT); return m_subMenuParent->OnSelect(MPOS_SELECTRIGHT);
@ -1093,12 +1100,12 @@ HRESULT CMenuBand::_KillPopupTimers()
return hr; return hr;
} }
HRESULT CMenuBand::_MenuBarMouseDown(HWND hwnd, INT item) HRESULT CMenuBand::_MenuBarMouseDown(HWND hwnd, INT item, BOOL isLButton)
{ {
if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hwnd) == S_OK) if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hwnd) == S_OK)
m_staticToolbar->MenuBarMouseDown(item); m_staticToolbar->MenuBarMouseDown(item, isLButton);
if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hwnd) == S_OK) if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hwnd) == S_OK)
m_SFToolbar->MenuBarMouseDown(item); m_SFToolbar->MenuBarMouseDown(item, isLButton);
return S_OK; return S_OK;
} }

4
reactos/base/shell/rshell/CMenuBand.h
View file

@ -186,7 +186,7 @@ public:
HRESULT _GetTopLevelWindow(HWND*topLevel); HRESULT _GetTopLevelWindow(HWND*topLevel);
HRESULT _ChangeHotItem(CMenuToolbarBase * tb, INT id, DWORD dwFlags); HRESULT _ChangeHotItem(CMenuToolbarBase * tb, INT id, DWORD dwFlags);
HRESULT _ChangePopupItem(CMenuToolbarBase * tb, INT id); HRESULT _ChangePopupItem(CMenuToolbarBase * tb, INT id);
HRESULT _MenuItemHotTrack(DWORD changeType); HRESULT _MenuItemSelect(DWORD changeType);
HRESULT _CancelCurrentPopup(); HRESULT _CancelCurrentPopup();
HRESULT _OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude, BOOL mouseInitiated); HRESULT _OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude, BOOL mouseInitiated);
HRESULT _BeforeCancelPopup(); HRESULT _BeforeCancelPopup();
@ -196,7 +196,7 @@ public:
HRESULT _IsPopup(); HRESULT _IsPopup();
HRESULT _IsTracking(); HRESULT _IsTracking();
HRESULT _KillPopupTimers(); HRESULT _KillPopupTimers();
HRESULT _MenuBarMouseDown(HWND hwnd, INT item); HRESULT _MenuBarMouseDown(HWND hwnd, INT item, BOOL isLButton);
HRESULT _MenuBarMouseUp(HWND hwnd, INT item); HRESULT _MenuBarMouseUp(HWND hwnd, INT item);
HRESULT _HasSubMenu(); HRESULT _HasSubMenu();

4
reactos/base/shell/rshell/CMenuDeskBar.cpp
View file

@ -372,7 +372,9 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::Popup(POINTL *ppt, RECTL *prcExclude, MP
y = rcWorkArea.bottom - cy; y = rcWorkArea.bottom - cy;
} }
this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); int flags = SWP_SHOWWINDOW | SWP_NOACTIVATE;
this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, flags);
m_ShowFlags = dwFlags; m_ShowFlags = dwFlags;
m_Shown = true; m_Shown = true;

113
reactos/base/shell/rshell/CMenuFocusManager.cpp
View file

@ -163,7 +163,8 @@ CMenuFocusManager::CMenuFocusManager() :
m_isLButtonDown(FALSE), m_isLButtonDown(FALSE),
m_movedSinceDown(FALSE), m_movedSinceDown(FALSE),
m_windowAtDown(NULL), m_windowAtDown(NULL),
m_bandCount(0) m_bandCount(0),
m_menuDepth(0)
{ {
m_ptPrev.x = 0; m_ptPrev.x = 0;
m_ptPrev.y = 0; m_ptPrev.y = 0;
@ -207,7 +208,7 @@ void CMenuFocusManager::DisableMouseTrack(HWND parent, BOOL disableThis)
m_mouseTrackDisabled = lastDisable; m_mouseTrackDisabled = lastDisable;
} }
void CMenuFocusManager::SetCapture(HWND child) void CMenuFocusManager::SetMenuCapture(HWND child)
{ {
if (m_captureHwnd != child) if (m_captureHwnd != child)
{ {
@ -215,13 +216,13 @@ void CMenuFocusManager::SetCapture(HWND child)
{ {
::SetCapture(child); ::SetCapture(child);
m_captureHwnd = child; m_captureHwnd = child;
TRACE("MouseTrack is now capturing %p\n", child); TRACE("Capturing %p\n", child);
} }
else else
{ {
::ReleaseCapture(); ::ReleaseCapture();
m_captureHwnd = NULL; m_captureHwnd = NULL;
TRACE("MouseTrack is now off\n"); TRACE("Capture is now off\n");
} }
} }
@ -305,7 +306,6 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
if (cCapture && cCapture != m_captureHwnd && m_current->type != TrackedMenuEntry) if (cCapture && cCapture != m_captureHwnd && m_current->type != TrackedMenuEntry)
return TRUE; return TRUE;
m_movedSinceDown = TRUE; m_movedSinceDown = TRUE;
m_ptPrev = pt; m_ptPrev = pt;
@ -344,8 +344,6 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
{ {
m_entryUnderMouse->mb->_ChangeHotItem(NULL, -1, HICF_MOUSE); m_entryUnderMouse->mb->_ChangeHotItem(NULL, -1, HICF_MOUSE);
} }
if (cCapture == m_captureHwnd)
SetCapture(NULL);
} }
if (m_hwndUnderMouse != child) if (m_hwndUnderMouse != child)
@ -373,7 +371,7 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
return TRUE; return TRUE;
} }
LRESULT CMenuFocusManager::ProcessMouseDown(MSG* msg) LRESULT CMenuFocusManager::ProcessMouseDown(MSG* msg, BOOL isLButton)
{ {
HWND child; HWND child;
int iHitTestResult = -1; int iHitTestResult = -1;
@ -418,7 +416,7 @@ LRESULT CMenuFocusManager::ProcessMouseDown(MSG* msg)
if (iHitTestResult >= 0) if (iHitTestResult >= 0)
{ {
TRACE("MouseDown send %d\n", iHitTestResult); TRACE("MouseDown send %d\n", iHitTestResult);
entry->mb->_MenuBarMouseDown(child, iHitTestResult); entry->mb->_MenuBarMouseDown(child, iHitTestResult, isLButton);
} }
} }
@ -521,13 +519,13 @@ LRESULT CMenuFocusManager::MsgFilterHook(INT nCode, WPARAM hookWParam, LPARAM ho
case VK_LEFT: case VK_LEFT:
if (m_current->hmenu == m_selectedMenu) if (m_current->hmenu == m_selectedMenu)
{ {
m_parent->mb->_MenuItemHotTrack(VK_LEFT); m_parent->mb->_MenuItemSelect(VK_LEFT);
} }
break; break;
case VK_RIGHT: case VK_RIGHT:
if (m_selectedItem < 0 || !(m_selectedItemFlags & MF_POPUP)) if (m_selectedItem < 0 || !(m_selectedItemFlags & MF_POPUP))
{ {
m_parent->mb->_MenuItemHotTrack(VK_RIGHT); m_parent->mb->_MenuItemSelect(VK_RIGHT);
} }
break; break;
} }
@ -555,9 +553,18 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM hookWParam, LPARAM hookL
switch (msg->message) switch (msg->message)
{ {
case WM_CAPTURECHANGED:
if (m_captureHwnd)
{
TRACE("Capture lost.\n");
m_captureHwnd = NULL;
}
break;
case WM_NCLBUTTONDOWN: case WM_NCLBUTTONDOWN:
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
isLButton = TRUE; isLButton = TRUE;
TRACE("LB\n");
// fallthrough; // fallthrough;
case WM_NCRBUTTONDOWN: case WM_NCRBUTTONDOWN:
@ -569,7 +576,7 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM hookWParam, LPARAM hookL
BOOL hoveringMenuBar = m_menuBar->mb->IsWindowOwner(child) == S_OK; BOOL hoveringMenuBar = m_menuBar->mb->IsWindowOwner(child) == S_OK;
if (hoveringMenuBar) if (hoveringMenuBar)
{ {
m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); m_current->mb->_MenuItemSelect(MPOS_FULLCANCEL);
break; break;
} }
} }
@ -580,16 +587,13 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM hookWParam, LPARAM hookL
if (IsTrackedWindowOrParent(child) != S_OK) if (IsTrackedWindowOrParent(child) != S_OK)
{ {
SetCapture(NULL); m_current->mb->_MenuItemSelect(MPOS_FULLCANCEL);
m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL);
break; break;
} }
} }
if (isLButton) ProcessMouseDown(msg, isLButton);
{
ProcessMouseDown(msg);
}
break; break;
case WM_NCLBUTTONUP: case WM_NCLBUTTONUP:
case WM_LBUTTONUP: case WM_LBUTTONUP:
@ -613,22 +617,22 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM hookWParam, LPARAM hookL
case VK_MENU: case VK_MENU:
case VK_LMENU: case VK_LMENU:
case VK_RMENU: case VK_RMENU:
m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); m_current->mb->_MenuItemSelect(MPOS_FULLCANCEL);
break; break;
case VK_RETURN: case VK_RETURN:
m_current->mb->_MenuItemHotTrack(MPOS_EXECUTE); m_current->mb->_MenuItemSelect(MPOS_EXECUTE);
break; break;
case VK_LEFT: case VK_LEFT:
m_current->mb->_MenuItemHotTrack(VK_LEFT); m_current->mb->_MenuItemSelect(VK_LEFT);
break; break;
case VK_RIGHT: case VK_RIGHT:
m_current->mb->_MenuItemHotTrack(VK_RIGHT); m_current->mb->_MenuItemSelect(VK_RIGHT);
break; break;
case VK_UP: case VK_UP:
m_current->mb->_MenuItemHotTrack(VK_UP); m_current->mb->_MenuItemSelect(VK_UP);
break; break;
case VK_DOWN: case VK_DOWN:
m_current->mb->_MenuItemHotTrack(VK_DOWN); m_current->mb->_MenuItemSelect(VK_DOWN);
break; break;
} }
msg->message = WM_NULL; msg->message = WM_NULL;
@ -672,13 +676,18 @@ HRESULT CMenuFocusManager::PlaceHooks()
HRESULT CMenuFocusManager::RemoveHooks() HRESULT CMenuFocusManager::RemoveHooks()
{ {
TRACE("Removing all hooks...\n");
if (m_hMsgFilterHook) if (m_hMsgFilterHook)
{
TRACE("Removing MSGFILTER hook...\n");
UnhookWindowsHookEx(m_hMsgFilterHook); UnhookWindowsHookEx(m_hMsgFilterHook);
if (m_hGetMsgHook)
UnhookWindowsHookEx(m_hGetMsgHook);
m_hMsgFilterHook = NULL; m_hMsgFilterHook = NULL;
}
if (m_hGetMsgHook)
{
TRACE("Removing GETMESSAGE hook...\n");
UnhookWindowsHookEx(m_hGetMsgHook);
m_hGetMsgHook = NULL; m_hGetMsgHook = NULL;
}
return S_OK; return S_OK;
} }
@ -689,14 +698,14 @@ HRESULT CMenuFocusManager::UpdateFocus()
TRACE("UpdateFocus\n"); TRACE("UpdateFocus\n");
if (old)
SetCapture(NULL);
if (m_bandCount > 0) if (m_bandCount > 0)
m_current = &(m_bandStack[m_bandCount - 1]); m_current = &(m_bandStack[m_bandCount - 1]);
else else
m_current = NULL; m_current = NULL;
if (!m_current || m_current->type != MenuPopupEntry)
SetMenuCapture(NULL);
if (m_current && m_current->type != TrackedMenuEntry) if (m_current && m_current->type != TrackedMenuEntry)
{ {
hr = m_current->mb->_GetTopLevelWindow(&(m_current->hwnd)); hr = m_current->mb->_GetTopLevelWindow(&(m_current->hwnd));
@ -747,12 +756,29 @@ HRESULT CMenuFocusManager::UpdateFocus()
DisableMouseTrack(m_parent->hwnd, TRUE); DisableMouseTrack(m_parent->hwnd, TRUE);
} }
if ((m_current && m_current->type == MenuPopupEntry) && if (m_current && m_current->type == MenuPopupEntry)
(!m_parent || m_parent->type == MenuBarEntry))
{ {
// When the mouse moves, it should set itself to the proper band if (m_captureHwnd == NULL)
SetCapture(m_current->hwnd); {
// We need to restore the capture after a non-shell submenu or context menu is shown
StackEntry * topMenu = m_bandStack;
if (topMenu->type == MenuBarEntry)
topMenu++;
// Get the top-level window from the top popup
CComPtr<IServiceProvider> bandSite;
CComPtr<IOleWindow> deskBar;
hr = topMenu->mb->GetSite(IID_PPV_ARG(IServiceProvider, &bandSite));
hr = bandSite->QueryService(SID_SMenuBandParent, IID_PPV_ARG(IOleWindow, &deskBar));
// Get the HWND of the top-level window
HWND hWndSite;
hr = deskBar->GetWindow(&hWndSite);
SetMenuCapture(hWndSite);
}
if (!m_parent || m_parent->type == MenuBarEntry)
{
if (old && old->type == TrackedMenuEntry) if (old && old->type == TrackedMenuEntry)
{ {
// FIXME: Debugging code, probably not right // FIXME: Debugging code, probably not right
@ -767,6 +793,7 @@ HRESULT CMenuFocusManager::UpdateFocus()
SendMessage(m_current->hwnd, WM_MOUSELEAVE, 0, 0); SendMessage(m_current->hwnd, WM_MOUSELEAVE, 0, 0);
} }
} }
}
_ASSERT(!m_parent || m_parent->type != TrackedMenuEntry); _ASSERT(!m_parent || m_parent->type != TrackedMenuEntry);
@ -775,7 +802,7 @@ HRESULT CMenuFocusManager::UpdateFocus()
HRESULT CMenuFocusManager::PushMenuBar(CMenuBand * mb) HRESULT CMenuFocusManager::PushMenuBar(CMenuBand * mb)
{ {
DbgPrint("PushMenuBar %p\n", mb); TRACE("PushMenuBar %p\n", mb);
mb->AddRef(); mb->AddRef();
@ -790,7 +817,7 @@ HRESULT CMenuFocusManager::PushMenuBar(CMenuBand * mb)
HRESULT CMenuFocusManager::PushMenuPopup(CMenuBand * mb) HRESULT CMenuFocusManager::PushMenuPopup(CMenuBand * mb)
{ {
DbgPrint("PushTrackedPopup %p\n", mb); TRACE("PushTrackedPopup %p\n", mb);
mb->AddRef(); mb->AddRef();
@ -802,6 +829,8 @@ HRESULT CMenuFocusManager::PushMenuPopup(CMenuBand * mb)
hr = UpdateFocus(); hr = UpdateFocus();
m_menuDepth++;
if (m_parent && m_parent->type != TrackedMenuEntry) if (m_parent && m_parent->type != TrackedMenuEntry)
{ {
m_parent->mb->_SetChildBand(mb); m_parent->mb->_SetChildBand(mb);
@ -813,7 +842,7 @@ HRESULT CMenuFocusManager::PushMenuPopup(CMenuBand * mb)
HRESULT CMenuFocusManager::PushTrackedPopup(HMENU popup) HRESULT CMenuFocusManager::PushTrackedPopup(HMENU popup)
{ {
DbgPrint("PushTrackedPopup %p\n", popup); TRACE("PushTrackedPopup %p\n", popup);
_ASSERT(m_bandCount > 0); _ASSERT(m_bandCount > 0);
_ASSERT(!m_current || m_current->type != TrackedMenuEntry); _ASSERT(!m_current || m_current->type != TrackedMenuEntry);
@ -822,7 +851,7 @@ HRESULT CMenuFocusManager::PushTrackedPopup(HMENU popup)
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
return hr; return hr;
DbgPrint("PushTrackedPopup %p\n", popup); TRACE("PushTrackedPopup %p\n", popup);
m_selectedMenu = popup; m_selectedMenu = popup;
m_selectedItem = -1; m_selectedItem = -1;
m_selectedItemFlags = 0; m_selectedItemFlags = 0;
@ -836,7 +865,7 @@ HRESULT CMenuFocusManager::PopMenuBar(CMenuBand * mb)
CMenuBand * mbc; CMenuBand * mbc;
HRESULT hr; HRESULT hr;
DbgPrint("PopMenuBar %p\n", mb); TRACE("PopMenuBar %p\n", mb);
if (m_current == m_entryUnderMouse) if (m_current == m_entryUnderMouse)
{ {
@ -880,13 +909,15 @@ HRESULT CMenuFocusManager::PopMenuPopup(CMenuBand * mb)
CMenuBand * mbc; CMenuBand * mbc;
HRESULT hr; HRESULT hr;
DbgPrint("PopMenuPopup %p\n", mb); TRACE("PopMenuPopup %p\n", mb);
if (m_current == m_entryUnderMouse) if (m_current == m_entryUnderMouse)
{ {
m_entryUnderMouse = NULL; m_entryUnderMouse = NULL;
} }
m_menuDepth--;
hr = PopFromArray(&type, &mbc, NULL); hr = PopFromArray(&type, &mbc, NULL);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))
{ {
@ -924,7 +955,7 @@ HRESULT CMenuFocusManager::PopTrackedPopup(HMENU popup)
HMENU hmenu; HMENU hmenu;
HRESULT hr; HRESULT hr;
DbgPrint("PopTrackedPopup %p\n", popup); TRACE("PopTrackedPopup %p\n", popup);
hr = PopFromArray(&type, NULL, &hmenu); hr = PopFromArray(&type, NULL, &hmenu);
if (FAILED_UNEXPECTEDLY(hr)) if (FAILED_UNEXPECTEDLY(hr))

5
reactos/base/shell/rshell/CMenuFocusManager.h
View file

@ -85,6 +85,7 @@ private:
#define MAX_RECURSE 20 #define MAX_RECURSE 20
StackEntry m_bandStack[MAX_RECURSE]; StackEntry m_bandStack[MAX_RECURSE];
int m_bandCount; int m_bandCount;
int m_menuDepth;
HRESULT PushToArray(StackEntryType type, CMenuBand * mb, HMENU hmenu); HRESULT PushToArray(StackEntryType type, CMenuBand * mb, HMENU hmenu);
HRESULT PopFromArray(StackEntryType * pType, CMenuBand ** pMb, HMENU * pHmenu); HRESULT PopFromArray(StackEntryType * pType, CMenuBand ** pMb, HMENU * pHmenu);
@ -110,10 +111,10 @@ private:
HRESULT IsTrackedWindowOrParent(HWND hWnd); HRESULT IsTrackedWindowOrParent(HWND hWnd);
void DisableMouseTrack(HWND parent, BOOL disableThis); void DisableMouseTrack(HWND parent, BOOL disableThis);
void SetCapture(HWND child); void SetMenuCapture(HWND child);
LRESULT ProcessMouseMove(MSG* msg); LRESULT ProcessMouseMove(MSG* msg);
LRESULT ProcessMouseDown(MSG* msg); LRESULT ProcessMouseDown(MSG* msg, BOOL isLButton);
LRESULT ProcessMouseUp(MSG* msg); LRESULT ProcessMouseUp(MSG* msg);
public: public:
HRESULT PushMenuBar(CMenuBand * mb); HRESULT PushMenuBar(CMenuBand * mb);

38
reactos/base/shell/rshell/CMenuToolbars.cpp
View file

@ -73,9 +73,6 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
//return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr), theResult); //return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr), theResult);
return S_OK; return S_OK;
case NM_RCLICK:
return OnContextMenu(reinterpret_cast<LPNMMOUSE>(hdr));
case NM_CUSTOMDRAW: case NM_CUSTOMDRAW:
return OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), theResult); return OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), theResult);
@ -770,7 +767,7 @@ HRESULT CMenuToolbarBase::TrackContextMenu(IContextMenu* contextMenu, POINT pt)
HRESULT CMenuToolbarBase::BeforeCancelPopup() HRESULT CMenuToolbarBase::BeforeCancelPopup()
{ {
m_cancelingPopup = TRUE; m_cancelingPopup = TRUE;
DbgPrint("BeforeCancelPopup\n"); TRACE("BeforeCancelPopup\n");
return S_OK; return S_OK;
} }
@ -797,13 +794,30 @@ HRESULT CMenuToolbarBase::ProcessClick(INT iItem)
TRACE("Executing...\n"); TRACE("Executing...\n");
return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); return m_menuBand->_MenuItemSelect(MPOS_EXECUTE);
} }
HRESULT CMenuToolbarBase::MenuBarMouseDown(INT iIndex) HRESULT CMenuToolbarBase::ProcessContextMenu(INT iItem)
{
INT index;
DWORD_PTR data;
GetDataFromId(iItem, &index, &data);
DWORD pos = GetMessagePos();
POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) };
return InternalContextMenu(iItem, index, data, pt);
}
HRESULT CMenuToolbarBase::MenuBarMouseDown(INT iIndex, BOOL isLButton)
{ {
TBBUTTON btn; TBBUTTON btn;
GetButton(iIndex, &btn);
if (!isLButton)
return ProcessContextMenu(btn.idCommand);
if ((m_initFlags & SMINIT_VERTICAL) if ((m_initFlags & SMINIT_VERTICAL)
|| m_popupBar || m_popupBar
|| m_cancelingPopup) || m_cancelingPopup)
@ -812,7 +826,6 @@ HRESULT CMenuToolbarBase::MenuBarMouseDown(INT iIndex)
return S_OK; return S_OK;
} }
GetButton(iIndex, &btn);
return ProcessClick(btn.idCommand); return ProcessClick(btn.idCommand);
} }
@ -842,17 +855,6 @@ HRESULT CMenuToolbarBase::ExecuteItem()
return InternalExecuteItem(m_executeItem, m_executeItem, m_executeData); return InternalExecuteItem(m_executeItem, m_executeItem, m_executeData);
} }
HRESULT CMenuToolbarBase::OnContextMenu(NMMOUSE * rclick)
{
INT iItem = rclick->dwItemSpec;
INT index = rclick->dwHitInfo;
DWORD_PTR data = rclick->dwItemData;
GetDataFromId(iItem, &index, &data);
return InternalContextMenu(iItem, index, data, rclick->pt);
}
HRESULT CMenuToolbarBase::KeyboardItemChange(DWORD dwSelectType) HRESULT CMenuToolbarBase::KeyboardItemChange(DWORD dwSelectType)
{ {
int prev = m_hotItem; int prev = m_hotItem;

4
reactos/base/shell/rshell/CMenuToolbars.h
View file

@ -96,9 +96,10 @@ public:
HRESULT KillPopupTimer(); HRESULT KillPopupTimer();
HRESULT MenuBarMouseDown(INT iIndex); HRESULT MenuBarMouseDown(INT iIndex, BOOL isLButton);
HRESULT MenuBarMouseUp(INT iIndex); HRESULT MenuBarMouseUp(INT iIndex);
HRESULT ProcessClick(INT iItem); HRESULT ProcessClick(INT iItem);
HRESULT ProcessContextMenu(INT iItem);
HRESULT BeforeCancelPopup(); HRESULT BeforeCancelPopup();
protected: protected:
@ -121,7 +122,6 @@ private:
HRESULT UpdateImageLists(); HRESULT UpdateImageLists();
HRESULT OnPagerCalcSize(LPNMPGCALCSIZE csize); HRESULT OnPagerCalcSize(LPNMPGCALCSIZE csize);
HRESULT OnContextMenu(NMMOUSE * rclick);
HRESULT OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResult); HRESULT OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResult);
HRESULT OnGetInfoTip(NMTBGETINFOTIP * tip); HRESULT OnGetInfoTip(NMTBGETINFOTIP * tip);

18
reactos/base/shell/rshell/ShellDDE.cpp
View file

@ -56,7 +56,7 @@ static BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService)
DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE);
DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE);
DbgPrint("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); TRACE("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService);
return TRUE; return TRUE;
} }
@ -69,7 +69,7 @@ static void Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService)
DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE);
DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE);
DbgPrint("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); TRACE("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService);
} }
static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService)
@ -80,7 +80,7 @@ static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService)
DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE);
DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE);
DbgPrint("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); TRACE("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService);
return FALSE; return FALSE;
} }
@ -93,7 +93,7 @@ static HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HSZ hszItem)
DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE);
DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE);
DbgPrint("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); TRACE("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem);
return NULL; return NULL;
} }
@ -140,7 +140,7 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
DdeUnaccessData(hdata); DdeUnaccessData(hdata);
DbgPrint("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); TRACE("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand);
/* /*
[ViewFolder("%l", %I, %S)] -- Open a folder in standard mode [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode
@ -261,7 +261,7 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
UnknownParameter = StrToIntW(cmd); UnknownParameter = StrToIntW(cmd);
} }
DbgPrint("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); TRACE("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path);
// Find handler in list // Find handler in list
for (int i = 0; i < HandlerListLength; i++) for (int i = 0; i < HandlerListLength; i++)
@ -280,7 +280,7 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
static void Dde_OnDisconnect(HCONV hconv) static void Dde_OnDisconnect(HCONV hconv)
{ {
DbgPrint("Dde_OnDisconnect: hconv=%p\n", hconv); TRACE("Dde_OnDisconnect: hconv=%p\n", hconv);
} }
static HDDEDATA CALLBACK DdeCallback( static HDDEDATA CALLBACK DdeCallback(
@ -312,7 +312,7 @@ static HDDEDATA CALLBACK DdeCallback(
case XTYP_REGISTER: case XTYP_REGISTER:
return NULL; return NULL;
default: default:
DbgPrint("DdeCallback: unknown uType=%d\n", uType); TRACE("DdeCallback: unknown uType=%d\n", uType);
return NULL; return NULL;
} }
} }
@ -330,7 +330,7 @@ static HDDEDATA CALLBACK DdeCallback(
*/ */
EXTERN_C void WINAPI ShellDDEInit(BOOL bInit) EXTERN_C void WINAPI ShellDDEInit(BOOL bInit)
{ {
DbgPrint("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); TRACE("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE");
if (bInit && !bInitialized) if (bInit && !bInitialized)
{ {

8
reactos/dll/win32/shell32/CDefView.cpp
View file

@ -1898,14 +1898,14 @@ LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
MENUITEMINFOW mii = { 0 }; MENUITEMINFOW mii = { 0 };
HMENU hSubmenu = (HMENU) wParam; HMENU hSubmenu = (HMENU) wParam;
DbgPrint("OnInitMenuPopup lParam=%d\n", lParam); TRACE("OnInitMenuPopup lParam=%d\n", lParam);
mii.cbSize = sizeof(mii); mii.cbSize = sizeof(mii);
mii.fMask = MIIM_ID | MIIM_SUBMENU; mii.fMask = MIIM_ID | MIIM_SUBMENU;
if (!GetMenuItemInfoW(this->m_hMenu, lParam, TRUE, &mii)) if (!GetMenuItemInfoW(this->m_hMenu, lParam, TRUE, &mii))
{ {
DbgPrint("OnInitMenuPopup GetMenuItemInfoW failed!\n"); TRACE("OnInitMenuPopup GetMenuItemInfoW failed!\n");
return FALSE; return FALSE;
} }
@ -1913,11 +1913,11 @@ LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
if (mii.hSubMenu != hSubmenu) if (mii.hSubMenu != hSubmenu)
{ {
DbgPrint("OnInitMenuPopup submenu does not match!!!!\n"); TRACE("OnInitMenuPopup submenu does not match!!!!\n");
return FALSE; return FALSE;
} }
DbgPrint("OnInitMenuPopup id=%d\n", menuItemId); TRACE("OnInitMenuPopup id=%d\n", menuItemId);
switch (menuItemId) switch (menuItemId)
{ {

2
reactos/dll/win32/shell32/CDesktopBrowser.cpp
View file

@ -519,7 +519,7 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg,
} }
case WM_EXPLORER_OPEN_NEW_WINDOW: case WM_EXPLORER_OPEN_NEW_WINDOW:
DbgPrint("Proxy Desktop message 1035 received.\n"); TRACE("Proxy Desktop message 1035 received.\n");
SHOnCWMCommandLine((HANDLE)lParam); SHOnCWMCommandLine((HANDLE)lParam);
break; break;

18
reactos/dll/win32/shell32/dde.cpp
View file

@ -55,7 +55,7 @@ static BOOL Dde_OnConnect(HSZ hszTopic, HSZ hszService)
DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE);
DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE);
DbgPrint("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); TRACE("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService);
return TRUE; return TRUE;
} }
@ -68,7 +68,7 @@ static void Dde_OnConnectConfirm(HCONV hconv, HSZ hszTopic, HSZ hszService)
DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE);
DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE);
DbgPrint("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); TRACE("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService);
} }
static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService)
@ -79,7 +79,7 @@ static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService)
DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE);
DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE);
DbgPrint("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); TRACE("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService);
return FALSE; return FALSE;
} }
@ -92,7 +92,7 @@ static HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, HSZ hszItem)
DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE);
DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE);
DbgPrint("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); TRACE("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem);
return NULL; return NULL;
} }
@ -139,7 +139,7 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
DdeUnaccessData(hdata); DdeUnaccessData(hdata);
DbgPrint("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); TRACE("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand);
/* /*
[ViewFolder("%l", %I, %S)] -- Open a folder in standard mode [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode
@ -260,7 +260,7 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
UnknownParameter = StrToIntW(cmd); UnknownParameter = StrToIntW(cmd);
} }
DbgPrint("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); TRACE("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path);
// Find handler in list // Find handler in list
for (int i = 0; i < HandlerListLength; i++) for (int i = 0; i < HandlerListLength; i++)
@ -279,7 +279,7 @@ static DWORD Dde_OnExecute(HCONV hconv, HSZ hszTopic, HDDEDATA hdata)
static void Dde_OnDisconnect(HCONV hconv) static void Dde_OnDisconnect(HCONV hconv)
{ {
DbgPrint("Dde_OnDisconnect: hconv=%p\n", hconv); TRACE("Dde_OnDisconnect: hconv=%p\n", hconv);
} }
static HDDEDATA CALLBACK DdeCallback( static HDDEDATA CALLBACK DdeCallback(
@ -311,7 +311,7 @@ static HDDEDATA CALLBACK DdeCallback(
case XTYP_REGISTER: case XTYP_REGISTER:
return NULL; return NULL;
default: default:
DbgPrint("DdeCallback: unknown uType=%d\n", uType); WARN("DdeCallback: unknown uType=%d\n", uType);
return NULL; return NULL;
} }
} }
@ -329,7 +329,7 @@ static HDDEDATA CALLBACK DdeCallback(
*/ */
EXTERN_C void WINAPI ShellDDEInit(BOOL bInit) EXTERN_C void WINAPI ShellDDEInit(BOOL bInit)
{ {
DbgPrint("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); TRACE("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE");
if (bInit && !bInitialized) if (bInit && !bInitialized)
{ {