Kusanagi Kouichi : user32: F10 key deactivates menu.

Alexandre Julliard julliard at winehq.org
Mon Jan 18 10:58:55 CST 2010


Module: wine
Branch: master
Commit: 56416b09a6988c31b333f8e1c9e5750364ad0c69
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=56416b09a6988c31b333f8e1c9e5750364ad0c69

Author: Kusanagi Kouichi <slash at ac.auone-net.jp>
Date:   Mon Jan 18 18:30:06 2010 +0900

user32: F10 key deactivates menu.

---

 dlls/user32/menu.c       |    1 +
 dlls/user32/tests/menu.c |    4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 0f083ff..6e7e663 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -3119,6 +3119,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
 		switch(msg.wParam)
 		{
 		case VK_MENU:
+		case VK_F10:
 		    fEndMenu = TRUE;
 		    break;
 
diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index 88e2753..761d70c 100644
--- a/dlls/user32/tests/menu.c
+++ b/dlls/user32/tests/menu.c
@@ -1890,8 +1890,10 @@ static struct menu_mouse_tests_s {
     { INPUT_KEYBOARD, {{0}}, {'D', 0}, FALSE, FALSE },
     { INPUT_KEYBOARD, {{0}}, {VK_MENU, 'M', 'P', 0}, TRUE, FALSE },
     { INPUT_KEYBOARD, {{0}}, {'E', 0}, FALSE, FALSE },
+    { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, TRUE, FALSE },
+    { INPUT_KEYBOARD, {{0}}, {VK_F10, 0}, FALSE, FALSE },
 
-    { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 18 */
+    { INPUT_MOUSE, {{1, 2}, {0}}, {0}, TRUE, TRUE }, /* test 20 */
     { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE },
     { INPUT_MOUSE, {{1, 0}, {0}}, {0}, TRUE, TRUE },
     { INPUT_MOUSE, {{1, 1}, {0}}, {0}, FALSE, FALSE },




More information about the wine-cvs mailing list