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

[Alexandre Julliard]

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

Author: Reece Dunn 
Date:   Fri Mar 21 09:16:33 2008 +0000

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

---

dlls/user32/tests/menu.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index 2f7677c..0ff6a1c 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");