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

Alexandre Julliard julliard at winehq.org
Mon Jan 30 06:03:04 CST 2017


Fabian Maurer <dark.shadow4 at web.de> writes:

> @@ -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;
> +                }

It would be cleaner to avoid TranslateMessage instead of removing the
message (possibly getting the wrong one).

-- 
Alexandre Julliard
julliard at winehq.org



More information about the wine-devel mailing list