Alex Henrie : user32: Tell MENU_SuspendPopup which message to remove.

[Alexandre Julliard]

Module: wine
Branch: oldstable
Commit: 24a1fd1ab4da3a9a6921d2d132c1b9aead950b48
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=24a1fd1ab4da3a9a6921d2d132...

Author: Alex Henrie 
Date:   Mon Dec  5 21:28:50 2016 -0700

user32: Tell MENU_SuspendPopup which message to remove.

Signed-off-by: Alex Henrie 
Signed-off-by: Alexandre Julliard 
(cherry picked from commit 68ca28a8bc3197a09cd3b82d90969f44f844dc2e)
Signed-off-by: Michael Stefaniuc

---

dlls/user32/menu.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index bb737ac..77294b4 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -2809,7 +2809,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk, UINT wFlags )
  * The idea is not to show the popup if the next input message is
  * going to hide it anyway.
  */
-static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg )
+static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT uMsg )
 {
     MSG msg;

@@ -2881,7 +2881,7 @@ static BOOL MENU_KeyEscape(MTRACKER* pmt, UINT wFlags)
  *
  * Handle a VK_LEFT key event in a menu.
  */
-static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags )
+static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags, UINT msg )
 {
     POPUPMENU *menu;
     HMENU hmenutmp, hmenuprev;
@@ -2921,7 +2921,7 @@ static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags )
       /* A sublevel menu was displayed - display the next one
        * unless there is another displacement coming up */

-	    if( !MENU_SuspendPopup( pmt, WM_KEYDOWN ) )
+	    if( !MENU_SuspendPopup( pmt, msg ) )
    	pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,
    					pmt->hTopMenu, TRUE, wFlags);
    }
@@ -2934,7 +2934,7 @@ static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags )
  *
  * Handle a VK_RIGHT key event in a menu.
  */
-static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags )
+static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags, UINT msg )
 {
     HMENU hmenutmp;
     POPUPMENU *menu = MENU_GetMenu( pmt->hTopMenu );
@@ -2978,7 +2978,7 @@ static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags )
         MENU_MoveSelection( pmt->hOwnerWnd, pmt->hTopMenu, ITEM_NEXT );

if( hmenutmp || pmt->trackFlags & TF_SUSPENDPOPUP )
-	    if( !MENU_SuspendPopup(pmt, WM_KEYDOWN) )
+	    if( !MENU_SuspendPopup( pmt, msg ) )
    	pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd,
    					       pmt->hTopMenu, TRUE, wFlags);
     }
@@ -3178,11 +3178,11 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
    	    break;

case VK_LEFT:
-		    MENU_KeyLeft( &mt, wFlags );
+		    MENU_KeyLeft( &mt, wFlags, msg.message );
    	    break;

case VK_RIGHT:
-		    MENU_KeyRight( &mt, wFlags );
+		    MENU_KeyRight( &mt, wFlags, msg.message );
    	    break;

case VK_ESCAPE: