Author: jimtabor
Date: Wed May 4 12:18:57 2011
New Revision: 51574
URL: http://svn.reactos.org/svn/reactos?rev=51574&view=rev
Log:
[User32]
- Fix loop when using arrow keys in menu mode, other miscellaneous code changes.
Modified:
trunk/reactos/dll/win32/user32/windows/menu.c
Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/menu.c?rev=51574&r1=51573&r2=51574&view=diff
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed May 4
12:18:57 2011
@@ -2913,8 +2913,8 @@
if (NewWnd != Mt->OwnerWnd)
{
Mt->OwnerWnd = NewWnd;
- SetCapture(Mt->OwnerWnd);
- (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd);
+ (void)NtUserSetGUIThreadHandle(MSQ_STATE_MENUOWNER, Mt->OwnerWnd);
// 1
+ SetCapture(Mt->OwnerWnd);
// 2
}
Mt->TopMenu = Mt->CurrentMenu = NewMenu; /* all subpopups are hidden */
@@ -2936,37 +2936,35 @@
* going to hide it anyway.
*/
static BOOL FASTCALL
-MenuSuspendPopup(MTRACKER* Mt, UINT Message)
-{
- MSG Msg;
-
- Msg.hwnd = Mt->OwnerWnd;
-
- PeekMessageW(&Msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE);
- Mt->TrackFlags |= TF_SKIPREMOVE;
-
- switch (Message)
- {
- case WM_KEYDOWN:
- PeekMessageW(&Msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE);
- if (WM_KEYUP == Msg.message || WM_PAINT == Msg.message)
- {
- PeekMessageW(&Msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE);
- PeekMessageW(&Msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE);
- if (WM_KEYDOWN == Msg.message
- && (VK_LEFT == Msg.wParam || VK_RIGHT == Msg.wParam))
- {
- Mt->TrackFlags |= TF_SUSPENDPOPUP;
- return TRUE;
- }
- }
- break;
- }
-
- /* failures go through this */
- Mt->TrackFlags &= ~TF_SUSPENDPOPUP;
-
- return FALSE;
+MenuSuspendPopup(MTRACKER* Mt, UINT uMsg)
+{
+ MSG msg;
+
+ msg.hwnd = Mt->OwnerWnd;
+
+ PeekMessageW( &msg, 0, uMsg, uMsg, PM_NOYIELD | PM_REMOVE); // ported
incorrectly since 8317 GvG
+// Mt->TrackFlags |= TF_SKIPREMOVE; // This sends TrackMenu into a loop
with arrow keys!!!!
+
+ switch( uMsg )
+ {
+ case WM_KEYDOWN:
+ PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE);
+ if( msg.message == WM_KEYUP || msg.message == WM_PAINT )
+ {
+ PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_REMOVE);
+ PeekMessageW( &msg, 0, 0, 0, PM_NOYIELD | PM_NOREMOVE);
+ if( msg.message == WM_KEYDOWN &&
+ (msg.wParam == VK_LEFT || msg.wParam == VK_RIGHT))
+ {
+ Mt->TrackFlags |= TF_SUSPENDPOPUP;
+ return TRUE;
+ }
+ }
+ break;
+ }
+ /* failures go through this */
+ Mt->TrackFlags &= ~TF_SUSPENDPOPUP;
+ return FALSE;
}
/***********************************************************************
@@ -3029,14 +3027,14 @@
}
/* Try to move 1 column left (if possible) */
- if (NO_SELECTED_ITEM != (PrevCol = MenuGetStartOfPrevColumn(&MenuInfo)))
- {
- if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu))
- {
+ if ( (PrevCol = MenuGetStartOfPrevColumn(&MenuInfo)) != NO_SELECTED_ITEM)
+ {
+ if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu))
+ {
MenuSelectItem(Mt->OwnerWnd, &MenuInfo, PrevCol, TRUE, 0);
- }
- return;
- }
+ }
+ return;
+ }
/* close topmost popup */
while (MenuTmp != Mt->CurrentMenu)
@@ -3056,16 +3054,16 @@
{
return;
}
- if ((MenuPrev == Mt->TopMenu) && 0 == (TopMenuInfo.Flags & MF_POPUP))
+ if ((MenuPrev == Mt->TopMenu) && !(TopMenuInfo.Flags & MF_POPUP))
{
/* move menu bar selection if no more popups are left */
- if (! MenuDoNextMenu(Mt, VK_LEFT, Flags))
+ if (!MenuDoNextMenu(Mt, VK_LEFT, Flags))
{
MenuMoveSelection(Mt->OwnerWnd, &TopMenuInfo, ITEM_PREV);
}
- if (MenuPrev != MenuTmp || 0 != (Mt->TrackFlags & TF_SUSPENDPOPUP))
+ if (MenuPrev != MenuTmp || Mt->TrackFlags & TF_SUSPENDPOPUP)
{
/* A sublevel menu was displayed - display the next one
* unless there is another displacement coming up */
@@ -3110,23 +3108,23 @@
if (hmenutmp != Mt->CurrentMenu) return;
}
- if (! MenuGetRosMenuInfo(&CurrentMenuInfo, Mt->CurrentMenu))
+ if (! MenuGetRosMenuInfo(&CurrentMenuInfo, Mt->CurrentMenu))
{
return;
}
- /* Check to see if there's another column */
- if (NO_SELECTED_ITEM != (NextCol =
MenuGetStartOfNextColumn(&CurrentMenuInfo)))
- {
- TRACE("Going to %d.\n", NextCol);
- if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu))
- {
+ /* Check to see if there's another column */
+ if ( (NextCol = MenuGetStartOfNextColumn(&CurrentMenuInfo)) !=
NO_SELECTED_ITEM)
+ {
+ TRACE("Going to %d.\n", NextCol);
+ if (MenuGetRosMenuInfo(&MenuInfo, Mt->CurrentMenu))
+ {
MenuSelectItem(Mt->OwnerWnd, &MenuInfo, NextCol, TRUE, 0);
- }
- return;
- }
-
- if (0 == (MenuInfo.Flags & MF_POPUP)) /* menu bar tracking */
+ }
+ return;
+ }
+
+ if (!(MenuInfo.Flags & MF_POPUP)) /* menu bar tracking */
{
if (Mt->CurrentMenu != Mt->TopMenu)
{
@@ -3325,8 +3323,8 @@
if (hmenu)
fEndMenu |= !MenuMouseMove( &mt, hmenu, wFlags );
- } /* switch(msg.message) - mouse */
- }
+ } /* switch(msg.message) - mouse */
+ }
else if ((msg.message >= WM_KEYFIRST) && (msg.message <= WM_KEYLAST))
{
fRemove = TRUE; /* Keyboard messages are always removed */
@@ -3339,7 +3337,7 @@
case VK_MENU:
case VK_F10:
fEndMenu = TRUE;
- break;
+ break;
case VK_HOME:
case VK_END:
@@ -3668,7 +3666,6 @@
track_menu:
MenuTrackMenu( hTrackMenu, wFlags, 0, 0, hwnd, NULL );
MenuExitTracking( hwnd, FALSE );
-
}
/**********************************************************************
