user32/tests: Fix some test failures on Win98/WinME.
This commit is contained in:
parent
2619dda6b7
commit
66bd3d428f
|
@ -2447,13 +2447,17 @@ static void test_menu_getmenuinfo(void)
|
||||||
ret = pGetMenuInfo( hmenu, NULL);
|
ret = pGetMenuInfo( hmenu, NULL);
|
||||||
gle= GetLastError();
|
gle= GetLastError();
|
||||||
ok( !ret, "GetMenuInfo() should have failed\n");
|
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);
|
SetLastError(0xdeadbeef);
|
||||||
mi.cbSize = 0;
|
mi.cbSize = 0;
|
||||||
ret = pGetMenuInfo( hmenu, &mi);
|
ret = pGetMenuInfo( hmenu, &mi);
|
||||||
gle= GetLastError();
|
gle= GetLastError();
|
||||||
ok( !ret, "GetMenuInfo() should have failed\n");
|
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);
|
SetLastError(0xdeadbeef);
|
||||||
mi.cbSize = sizeof( MENUINFO);
|
mi.cbSize = sizeof( MENUINFO);
|
||||||
ret = pGetMenuInfo( hmenu, &mi);
|
ret = pGetMenuInfo( hmenu, &mi);
|
||||||
|
@ -2465,7 +2469,9 @@ static void test_menu_getmenuinfo(void)
|
||||||
ret = pGetMenuInfo( NULL, &mi);
|
ret = pGetMenuInfo( NULL, &mi);
|
||||||
gle= GetLastError();
|
gle= GetLastError();
|
||||||
ok( !ret, "GetMenuInfo() should have failed\n");
|
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);
|
||||||
/* clean up */
|
/* clean up */
|
||||||
DestroyMenu( hmenu);
|
DestroyMenu( hmenu);
|
||||||
return;
|
return;
|
||||||
|
@ -2492,13 +2498,17 @@ static void test_menu_setmenuinfo(void)
|
||||||
ret = pSetMenuInfo( hmenu, NULL);
|
ret = pSetMenuInfo( hmenu, NULL);
|
||||||
gle= GetLastError();
|
gle= GetLastError();
|
||||||
ok( !ret, "SetMenuInfo() should have failed\n");
|
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);
|
SetLastError(0xdeadbeef);
|
||||||
mi.cbSize = 0;
|
mi.cbSize = 0;
|
||||||
ret = pSetMenuInfo( hmenu, &mi);
|
ret = pSetMenuInfo( hmenu, &mi);
|
||||||
gle= GetLastError();
|
gle= GetLastError();
|
||||||
ok( !ret, "SetMenuInfo() should have failed\n");
|
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);
|
SetLastError(0xdeadbeef);
|
||||||
mi.cbSize = sizeof( MENUINFO);
|
mi.cbSize = sizeof( MENUINFO);
|
||||||
ret = pSetMenuInfo( hmenu, &mi);
|
ret = pSetMenuInfo( hmenu, &mi);
|
||||||
|
@ -2510,7 +2520,9 @@ static void test_menu_setmenuinfo(void)
|
||||||
ret = pSetMenuInfo( NULL, &mi);
|
ret = pSetMenuInfo( NULL, &mi);
|
||||||
gle= GetLastError();
|
gle= GetLastError();
|
||||||
ok( !ret, "SetMenuInfo() should have failed\n");
|
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 */
|
/* functional tests */
|
||||||
/* menu and submenu should have the CHECKORBMP style bit cleared */
|
/* menu and submenu should have the CHECKORBMP style bit cleared */
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
|
|
Loading…
Reference in New Issue