[USER32_WINETEST]

[reactos.git] / rostests / winetests / user32 / menu.c

diff --git a/rostests/winetests/user32/menu.c b/rostests/winetests/user32/menu.c
index 56535ae..26a2862 100755 (executable)
--- a/rostests/winetests/user32/menu.c
+++ b/rostests/winetests/user32/menu.c
@@ -390,8 +390,9 @@ static void test_subpopup_locked_by_menu(void)
             ok( ret == itemid , "TrackPopupMenu returned %d error is %d\n", ret, gle);
         }
         ok( gle == 0 ||
-                broken( gle ==  ERROR_INVALID_PARAMETER), /* win2k0 */
-                "Last error is %d\n", gle);
+            broken(gle == 0xdeadbeef) || /* wow64 */
+            broken(gle == ERROR_INVALID_PARAMETER), /* win2k0 */
+            "Last error is %d\n", gle);
     }
     /* clean up */
     DestroyMenu( hmenu);
@@ -1889,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 },
@@ -2999,6 +3002,9 @@ static void test_menu_cancelmode(void)
         ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle);
     }
     ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle);
+
+    skip("skipping TrackPopupMenu, that hangs on reactos\n");
+#if 0
     /* menu owner is child window */
     g_hwndtosend = hwndchild;
     ret = TrackPopupMenu( menu, 0x100, 100,100, 0, hwndchild, NULL);
@@ -3011,6 +3017,7 @@ static void test_menu_cancelmode(void)
     g_hwndtosend = hwnd;
     ret = TrackPopupMenu( menu, 0x100, 100,100, 0, hwndchild, NULL);
     ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle);
+#endif
     /* cleanup */
     DestroyMenu( menu);
     DestroyWindow( hwndchild);