[jimtabor] 75380: [NtUser] - Patch by Alex Henrie : Tell MENU_SuspendPopup which message to remove.

Author: jimtabor
Date: Thu Jul 20 19:46:17 2017
New Revision: 75380

URL: http://svn.reactos.org/svn/reactos?rev=75380&view=rev
Log:
[NtUser]
- Patch by Alex Henrie : Tell MENU_SuspendPopup which message to remove.

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 Jul 20 19:46:17 2017
@@ -3729,7 +3729,7 @@
  *
  * Handle a VK_LEFT key event in a menu.
  */
-static void FASTCALL MENU_KeyLeft(MTRACKER* pmt, UINT Flags)
+static void FASTCALL MENU_KeyLeft(MTRACKER* pmt, UINT Flags, UINT msg)
 {
   PMENU MenuTmp, MenuPrev;
   UINT PrevCol;
@@ -3765,7 +3765,7 @@
           /* 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->CurrentMenu = MENU_ShowSubPopup(pmt->OwnerWnd, pmt->TopMenu,
                                                  TRUE, Flags);
       }
@@ -3777,7 +3777,7 @@
  *
  * Handle a VK_RIGHT key event in a menu.
  */
-static void FASTCALL MENU_KeyRight(MTRACKER *pmt, UINT Flags)
+static void FASTCALL MENU_KeyRight(MTRACKER *pmt, UINT Flags, UINT msg)
 {
     PMENU menutmp;
     UINT NextCol;
@@ -3822,7 +3822,7 @@

if ( menutmp || pmt->TrackFlags & TF_SUSPENDPOPUP )
        {
-           if ( !MENU_SuspendPopup(pmt, WM_KEYDOWN) )
+           if ( !MENU_SuspendPopup(pmt, msg) )
                pmt->CurrentMenu = MENU_ShowSubPopup(pmt->OwnerWnd, pmt->TopMenu, TRUE, Flags);
        }
     }
@@ -4038,11 +4038,11 @@
                         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: