[PATCH v2] user32: Also remove WM_CHAR from queue when a menu gets VK_ESCAPE and add tests

[Fabian Maurer]

Fixes https://bugs.winehq.org/show_bug.cgi?id=41489

v2: Moved and improved test

Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
---
 dlls/user32/menu.c      |  6 +++++-
 dlls/user32/tests/msg.c | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 59fcd9c488..d8b36a5460 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -3186,8 +3186,12 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
 		    break;
 
 		case VK_ESCAPE:
+                {
+                    MSG msg_dummy;
                     fEndMenu = MENU_KeyEscape(&mt, wFlags);
-		    break;
+                    PeekMessageW(&msg_dummy, 0, WM_CHAR, WM_CHAR, PM_REMOVE);
+                    break;
+                }
 
 		case VK_F1:
 		    {
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 45b5222deb..36a162fd30 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -1675,6 +1675,10 @@ static const struct message WmTrackPopupMenu[] = {
     { 0 }
 };
 
+static const struct message WmTrackPopupMenuEsc[] = {
+    { 0 }
+};
+
 static const struct message WmTrackPopupMenuCapture[] = {
     { HCBT_CREATEWND, hook },
     { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 },
@@ -15637,6 +15641,7 @@ static LRESULT WINAPI cancel_init_proc(HWND hwnd, UINT message, WPARAM wParam, L
 
 static void test_TrackPopupMenu(void)
 {
+    MSG msg;
     HWND hwnd;
     BOOL ret;
 
@@ -15659,6 +15664,20 @@ static void test_TrackPopupMenu(void)
     ok_sequence(WmTrackPopupMenu, "TrackPopupMenu", TRUE);
     ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError());
 
+    /* Test popup closing with an ESC-press */
+    flush_events();
+    PostMessageW(hwnd, WM_KEYDOWN, VK_ESCAPE, 0);
+    ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL);
+    ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError());
+    PostQuitMessage(0);
+    flush_sequence();
+    while ( PeekMessageA(&msg, 0, 0, 0, PM_REMOVE) )
+    {
+        TranslateMessage(&msg);
+        DispatchMessageA(&msg);
+    }
+    ok_sequence(WmTrackPopupMenuEsc, "TrackPopupMenu", FALSE); /* Shouldn't get any message */
+
     SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_init_proc);
 
     flush_events();
-- 
2.11.0