From 56b2ab241e311d845f9446cfae3451888ac1799b Mon Sep 17 00:00:00 2001 From: Reece Dunn Date: Fri, 21 Mar 2008 09:16:33 +0000 Subject: [PATCH] user32: Fixed the HiliteMenuItem tests to pass on Windows 9x. --- dlls/user32/tests/menu.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 2f7677c5d71..0ff6a1c9773 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -1903,18 +1903,17 @@ static void test_menu_hilitemenuitem( void ) { ok(!HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE | MF_BYPOSITION), "HiliteMenuItem: call should have failed.\n"); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, - "HiliteMenuItem: expected error ERROR_INVALID_WINDOW_HANDLE, got: %d\n", GetLastError()); } + ok(GetLastError() == 0xdeadbeef || /* 9x */ + GetLastError() == ERROR_INVALID_WINDOW_HANDLE /* NT */, + "HiliteMenuItem: expected error ERROR_INVALID_WINDOW_HANDLE, got: %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!HiliteMenuItem(hWnd, NULL, 1, MF_HILITE | MF_BYPOSITION), "HiliteMenuItem: call should have failed.\n"); - todo_wine - { - ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, + ok(GetLastError() == 0xdeadbeef || /* 9x */ + GetLastError() == ERROR_INVALID_MENU_HANDLE /* NT */, "HiliteMenuItem: expected error ERROR_INVALID_MENU_HANDLE, got: %d\n", GetLastError()); - } ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), "HiliteMenuItem: Item 2 is hilited\n"); -- 2.11.4.GIT