* Turn back some DbgPrints into TRACEs.
* Remove the desktop from the rshell exports, as it works better in ros that way, and it's only needed for debugging in windows 8.

svn path=/branches/shell-experiments/; revision=63352
This commit is contained in:
David Quintana 2014-05-18 14:20:27 +00:00
parent 6600002283
commit a55f7c589b
2 changed files with 9 additions and 12 deletions

View file

@ -212,13 +212,13 @@ void CMenuFocusManager::SetCapture(HWND child)
{ {
::SetCapture(child); ::SetCapture(child);
m_captureHwnd = child; m_captureHwnd = child;
DbgPrint("MouseTrack is now capturing %p\n", child); TRACE("MouseTrack is now capturing %p\n", child);
} }
else else
{ {
::ReleaseCapture(); ::ReleaseCapture();
m_captureHwnd = NULL; m_captureHwnd = NULL;
DbgPrint("MouseTrack is now off\n"); TRACE("MouseTrack is now off\n");
} }
} }
@ -318,7 +318,7 @@ LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg)
if (SendMessage(child, WM_USER_ISTRACKEDITEM, iHitTestResult, 0) == S_FALSE) if (SendMessage(child, WM_USER_ISTRACKEDITEM, iHitTestResult, 0) == S_FALSE)
{ {
DbgPrint("Hot item tracking detected a change (capture=%p / cCapture=%p)...\n", m_captureHwnd, cCapture); TRACE("Hot item tracking detected a change (capture=%p / cCapture=%p)...\n", m_captureHwnd, cCapture);
DisableMouseTrack(NULL, FALSE); DisableMouseTrack(NULL, FALSE);
if (isTracking && iHitTestResult>=0 && m_current->type == TrackedMenuEntry) if (isTracking && iHitTestResult>=0 && m_current->type == TrackedMenuEntry)
SendMessage(entry->hwnd, WM_CANCELMODE, 0, 0); SendMessage(entry->hwnd, WM_CANCELMODE, 0, 0);
@ -393,13 +393,13 @@ LRESULT CMenuFocusManager::MsgFilterHook(INT nCode, WPARAM hookWParam, LPARAM ho
callNext = ProcessMouseMove(msg); callNext = ProcessMouseMove(msg);
break; break;
case WM_INITMENUPOPUP: case WM_INITMENUPOPUP:
DbgPrint("WM_INITMENUPOPUP %p %p\n", msg->wParam, msg->lParam); TRACE("WM_INITMENUPOPUP %p %p\n", msg->wParam, msg->lParam);
m_selectedMenu = reinterpret_cast<HMENU>(msg->lParam); m_selectedMenu = reinterpret_cast<HMENU>(msg->lParam);
m_selectedItem = -1; m_selectedItem = -1;
m_selectedItemFlags = 0; m_selectedItemFlags = 0;
break; break;
case WM_MENUSELECT: case WM_MENUSELECT:
DbgPrint("WM_MENUSELECT %p %p\n", msg->wParam, msg->lParam); TRACE("WM_MENUSELECT %p %p\n", msg->wParam, msg->lParam);
m_selectedMenu = reinterpret_cast<HMENU>(msg->lParam); m_selectedMenu = reinterpret_cast<HMENU>(msg->lParam);
m_selectedItem = GET_X_LPARAM(msg->wParam); m_selectedItem = GET_X_LPARAM(msg->wParam);
m_selectedItemFlags = HIWORD(msg->wParam); m_selectedItemFlags = HIWORD(msg->wParam);
@ -510,12 +510,12 @@ HRESULT CMenuFocusManager::PlaceHooks()
{ {
if (m_current->type == TrackedMenuEntry) if (m_current->type == TrackedMenuEntry)
{ {
DbgPrint("Entering MSGFILTER hook...\n"); TRACE("Entering MSGFILTER hook...\n");
m_hMsgFilterHook = SetWindowsHookEx(WH_MSGFILTER, s_MsgFilterHook, NULL, m_threadId); m_hMsgFilterHook = SetWindowsHookEx(WH_MSGFILTER, s_MsgFilterHook, NULL, m_threadId);
} }
else else
{ {
DbgPrint("Entering GETMESSAGE hook...\n"); TRACE("Entering GETMESSAGE hook...\n");
m_hGetMsgHook = SetWindowsHookEx(WH_GETMESSAGE, s_GetMsgHook, NULL, m_threadId); m_hGetMsgHook = SetWindowsHookEx(WH_GETMESSAGE, s_GetMsgHook, NULL, m_threadId);
} }
return S_OK; return S_OK;
@ -523,7 +523,7 @@ HRESULT CMenuFocusManager::PlaceHooks()
HRESULT CMenuFocusManager::RemoveHooks() HRESULT CMenuFocusManager::RemoveHooks()
{ {
DbgPrint("Removing all hooks...\n"); TRACE("Removing all hooks...\n");
if (m_hMsgFilterHook) if (m_hMsgFilterHook)
UnhookWindowsHookEx(m_hMsgFilterHook); UnhookWindowsHookEx(m_hMsgFilterHook);
if (m_hGetMsgHook) if (m_hGetMsgHook)
@ -661,7 +661,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;

View file

@ -2,6 +2,3 @@
@ stdcall CMenuDeskBar_Constructor(ptr ptr); @ stdcall CMenuDeskBar_Constructor(ptr ptr);
@ stdcall CMenuSite_Constructor(ptr ptr); @ stdcall CMenuSite_Constructor(ptr ptr);
@ stdcall CMenuBand_Constructor(ptr ptr); @ stdcall CMenuBand_Constructor(ptr ptr);
@ stdcall SHDesktopMessageLoop(ptr)
@ stdcall SHCreateDesktop(ptr)
@ stdcall WinList_Init()