Commit 56b2ab24 authored by Reece Dunn's avatar Reece Dunn Committed by Alexandre Julliard

user32: Fixed the HiliteMenuItem tests to pass on Windows 9x.

parent f3380958
...@@ -1903,18 +1903,17 @@ static void test_menu_hilitemenuitem( void ) ...@@ -1903,18 +1903,17 @@ static void test_menu_hilitemenuitem( void )
{ {
ok(!HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE | MF_BYPOSITION), ok(!HiliteMenuItem(NULL, hPopupMenu, 1, MF_HILITE | MF_BYPOSITION),
"HiliteMenuItem: call should have failed.\n"); "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); SetLastError(0xdeadbeef);
ok(!HiliteMenuItem(hWnd, NULL, 1, MF_HILITE | MF_BYPOSITION), ok(!HiliteMenuItem(hWnd, NULL, 1, MF_HILITE | MF_BYPOSITION),
"HiliteMenuItem: call should have failed.\n"); "HiliteMenuItem: call should have failed.\n");
todo_wine ok(GetLastError() == 0xdeadbeef || /* 9x */
{ GetLastError() == ERROR_INVALID_MENU_HANDLE /* NT */,
ok(GetLastError() == ERROR_INVALID_MENU_HANDLE,
"HiliteMenuItem: expected error ERROR_INVALID_MENU_HANDLE, got: %d\n", GetLastError()); "HiliteMenuItem: expected error ERROR_INVALID_MENU_HANDLE, got: %d\n", GetLastError());
}
ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE), ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE),
"HiliteMenuItem: Item 2 is hilited\n"); "HiliteMenuItem: Item 2 is hilited\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment