From a55f7c589b2e93ec263828212c64d2b51c39241c Mon Sep 17 00:00:00 2001
From: David Quintana <gigaherz@gmail.com>
Date: Sun, 18 May 2014 14:20:27 +0000
Subject: [PATCH] [RSHELL] * 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
---
 base/shell/rshell/CMenuFocusManager.cpp | 18 +++++++++---------
 base/shell/rshell/rshell.spec           |  3 ---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/base/shell/rshell/CMenuFocusManager.cpp b/base/shell/rshell/CMenuFocusManager.cpp
index 970be9b9a2e..9bc1b7daeb5 100644
--- a/base/shell/rshell/CMenuFocusManager.cpp
+++ b/base/shell/rshell/CMenuFocusManager.cpp
@@ -212,13 +212,13 @@ void CMenuFocusManager::SetCapture(HWND child)
         {
             ::SetCapture(child);
             m_captureHwnd = child;
-            DbgPrint("MouseTrack is now capturing %p\n", child);
+            TRACE("MouseTrack is now capturing %p\n", child);
         }
         else
         {
             ::ReleaseCapture();
             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)
         {
-            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);
             if (isTracking && iHitTestResult>=0 && m_current->type == TrackedMenuEntry)
                 SendMessage(entry->hwnd, WM_CANCELMODE, 0, 0);
@@ -393,13 +393,13 @@ LRESULT CMenuFocusManager::MsgFilterHook(INT nCode, WPARAM hookWParam, LPARAM ho
             callNext = ProcessMouseMove(msg);
             break;
         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_selectedItem = -1;
             m_selectedItemFlags = 0;
             break;
         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_selectedItem = GET_X_LPARAM(msg->wParam);
             m_selectedItemFlags = HIWORD(msg->wParam);
@@ -510,12 +510,12 @@ HRESULT CMenuFocusManager::PlaceHooks()
 {
     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);
     }
     else
     {
-        DbgPrint("Entering GETMESSAGE hook...\n");
+        TRACE("Entering GETMESSAGE hook...\n");
         m_hGetMsgHook = SetWindowsHookEx(WH_GETMESSAGE, s_GetMsgHook, NULL, m_threadId);
     }
     return S_OK;
@@ -523,7 +523,7 @@ HRESULT CMenuFocusManager::PlaceHooks()
 
 HRESULT CMenuFocusManager::RemoveHooks()
 {
-    DbgPrint("Removing all hooks...\n");
+    TRACE("Removing all hooks...\n");
     if (m_hMsgFilterHook)
         UnhookWindowsHookEx(m_hMsgFilterHook);
     if (m_hGetMsgHook)
@@ -661,7 +661,7 @@ HRESULT CMenuFocusManager::PushTrackedPopup(HMENU popup)
     if (FAILED_UNEXPECTEDLY(hr))
         return hr;
 
-    DbgPrint("PushTrackedPopup %p\n", popup);
+    TRACE("PushTrackedPopup %p\n", popup);
     m_selectedMenu = popup;
     m_selectedItem = -1;
     m_selectedItemFlags = 0;
diff --git a/base/shell/rshell/rshell.spec b/base/shell/rshell/rshell.spec
index e0b5934882c..f9695d0a369 100644
--- a/base/shell/rshell/rshell.spec
+++ b/base/shell/rshell/rshell.spec
@@ -2,6 +2,3 @@
 @   stdcall CMenuDeskBar_Constructor(ptr ptr);
 @   stdcall CMenuSite_Constructor(ptr ptr);
 @   stdcall CMenuBand_Constructor(ptr ptr);
-@   stdcall SHDesktopMessageLoop(ptr)
-@   stdcall SHCreateDesktop(ptr)
-@   stdcall WinList_Init()
\ No newline at end of file