Author: jimtabor
Date: Thu Sep 10 14:27:14 2015
New Revision: 69172
URL:
http://svn.reactos.org/svn/reactos?rev=69172&view=rev
Log:
[Win32k]
- Trap out right button double clicks. See CORE-6754.
Modified:
trunk/reactos/win32ss/user/ntuser/menu.c
Modified: trunk/reactos/win32ss/user/ntuser/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Sep 10 14:27:14 2015
@@ -3929,7 +3929,11 @@
case WM_RBUTTONDBLCLK:
case WM_RBUTTONDOWN:
- if (!(wFlags & TPM_RIGHTBUTTON)) break;
+ if (!(wFlags & TPM_RIGHTBUTTON))
+ {
+ if ( msg.message == WM_RBUTTONDBLCLK ) fInsideMenuLoop = FALSE;
// Must exit or loop forever!
+ break;
+ }
/* fall through */
case WM_LBUTTONDBLCLK:
case WM_LBUTTONDOWN:
@@ -3937,7 +3941,8 @@
/* Else, end menu tracking */
fRemove = MENU_ButtonDown(&mt, pmMouse, wFlags);
fInsideMenuLoop = fRemove;
- if (msg.message == WM_LBUTTONDBLCLK) fInsideMenuLoop = FALSE; // Must
exit or loop forever!
+ if ( msg.message == WM_LBUTTONDBLCLK ||
+ msg.message == WM_RBUTTONDBLCLK ) fInsideMenuLoop = FALSE; //
Must exit or loop forever!
break;
case WM_RBUTTONUP: