[ros-diffs] [dquintana] 65803: [EXPLORER] * Handle WM_CONTEXTMENU in the notification area so it does not spread upwards to the taskbar window. * In theory, only one of the two handlers would be necessary, and...

Author: dquintana
Date: Tue Dec 23 01:13:05 2014
New Revision: 65803

URL: http://svn.reactos.org/svn/reactos?rev=65803&view=rev
Log:
[EXPLORER]
* Handle WM_CONTEXTMENU in the notification area so it does not spread upwards to the
taskbar window.
* In theory, only one of the two handlers would be necessary, and it is true when testing
in Windows, but in ReactOS, the handler in CSysPagerWnd was not enough. This may be worth
a look by the win32k experts to see if it's a bug, or Windows was correcting my
error.
CORE-8870 #resolve #comment Should be fixed in r65803. Thanks for reporting.

Modified:
    trunk/reactos/base/shell/explorer/trayntfy.cpp

Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt…
==============================================================================
--- trunk/reactos/base/shell/explorer/trayntfy.cpp	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/trayntfy.cpp	[iso-8859-1] Tue Dec 23 01:13:05 2014
@@ -533,12 +533,19 @@
         return Ret;
     }
 
+    LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+    {
+        bHandled = TRUE;
+        return 0;
+    }
+
     DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE)
 
     BEGIN_MSG_MAP(CTaskSwitchWnd)
         MESSAGE_HANDLER(WM_CREATE, OnCreate)
         MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground)
         MESSAGE_HANDLER(WM_SIZE, OnSize)
+        MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu)
         NOTIFY_CODE_HANDLER(TBN_GETINFOTIPW, OnGetInfoTip)
         NOTIFY_CODE_HANDLER(NM_CUSTOMDRAW, OnCustomDraw)
     END_MSG_MAP()
@@ -1529,6 +1536,12 @@
         return FALSE;
     }
 
+    LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+    {
+        bHandled = TRUE;
+        return 0;
+    }
+
     DECLARE_WND_CLASS_EX(szTrayNotifyWndClass, CS_DBLCLKS, COLOR_3DFACE)
 
     BEGIN_MSG_MAP(CTaskSwitchWnd)
@@ -1539,6 +1552,7 @@
         MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest)
         MESSAGE_HANDLER(WM_NOTIFY, OnNotify)
         MESSAGE_HANDLER(WM_SETFONT, OnSetFont)
+        MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu) // FIXME: This handler is not
necessary in Windows
         MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize)
         MESSAGE_HANDLER(TNWM_UPDATETIME, OnUpdateTime)
         MESSAGE_HANDLER(TNWM_SHOWCLOCK, OnShowClock)