ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32/tests: Fix some test failures on Win98/WinME.

This commit is contained in:
Paul Vriens 2009-03-02 13:20:30 +01:00 committed by Alexandre Julliard
parent 2619dda6b7
commit 66bd3d428f
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/user32/tests/menu.c
View File

@ -2447,13 +2447,17 @@ static void test_menu_getmenuinfo(void)
ret = pGetMenuInfo( hmenu, NULL);
gle= GetLastError();
ok( !ret, "GetMenuInfo() should have failed\n");
ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
ok( gle == ERROR_INVALID_PARAMETER ||
broken(gle == 0xdeadbeef), /* Win98, WinME */
"GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
SetLastError(0xdeadbeef);
mi.cbSize = 0;
ret = pGetMenuInfo( hmenu, &mi);
gle= GetLastError();
ok( !ret, "GetMenuInfo() should have failed\n");
ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
ok( gle == ERROR_INVALID_PARAMETER ||
broken(gle == 0xdeadbeef), /* Win98, WinME */
"GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
SetLastError(0xdeadbeef);
mi.cbSize = sizeof( MENUINFO);
ret = pGetMenuInfo( hmenu, &mi);
@ -2465,8 +2469,10 @@ static void test_menu_getmenuinfo(void)
ret = pGetMenuInfo( NULL, &mi);
gle= GetLastError();
ok( !ret, "GetMenuInfo() should have failed\n");
ok( gle == ERROR_INVALID_PARAMETER, "GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
/* clean up */
ok( gle == ERROR_INVALID_PARAMETER ||
broken(gle == 0xdeadbeef), /* Win98, WinME */
"GetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
/* clean up */
DestroyMenu( hmenu);
return;
}
@ -2492,13 +2498,17 @@ static void test_menu_setmenuinfo(void)
ret = pSetMenuInfo( hmenu, NULL);
gle= GetLastError();
ok( !ret, "SetMenuInfo() should have failed\n");
ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
ok( gle == ERROR_INVALID_PARAMETER ||
broken(gle == 0xdeadbeef), /* Win98, WinME */
"SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
SetLastError(0xdeadbeef);
mi.cbSize = 0;
ret = pSetMenuInfo( hmenu, &mi);
gle= GetLastError();
ok( !ret, "SetMenuInfo() should have failed\n");
ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
ok( gle == ERROR_INVALID_PARAMETER ||
broken(gle == 0xdeadbeef), /* Win98, WinME */
"SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
SetLastError(0xdeadbeef);
mi.cbSize = sizeof( MENUINFO);
ret = pSetMenuInfo( hmenu, &mi);
@ -2510,7 +2520,9 @@ static void test_menu_setmenuinfo(void)
ret = pSetMenuInfo( NULL, &mi);
gle= GetLastError();
ok( !ret, "SetMenuInfo() should have failed\n");
ok( gle == ERROR_INVALID_PARAMETER, "SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
ok( gle == ERROR_INVALID_PARAMETER ||
broken(gle == 0xdeadbeef), /* Win98, WinME */
"SetMenuInfo() error got %u expected %u\n", gle, ERROR_INVALID_PARAMETER);
/* functional tests */
/* menu and submenu should have the CHECKORBMP style bit cleared */
SetLastError(0xdeadbeef);