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

user32/tests: Add AppendMenu/ModifyMenu MF_POPUP tests.

This commit is contained in:
Dmitry Timoshkov 2014-04-21 14:16:37 +09:00 committed by Alexandre Julliard
parent fe3f12335d
commit 7744c7003b
1 changed files with 129 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2510,6 +2510,11 @@ if (0)
if (mii.hSubMenu)
{
ok(mii.wID == (UINT_PTR)mii.hSubMenu, "id %u: wID should be equal to hSubMenu\n", checked_cmd);
if (!GetMenuItemCount(mii.hSubMenu))
{
ok(mii.fType == checked_type, "id %u: expected fType %04x, got %04x\n", checked_cmd, checked_type, mii.fType);
ok(mii.fState == checked_state, "id %u: expected fState %04x, got %04x\n", checked_cmd, checked_state, mii.fState);
}
check_menu_items(mii.hSubMenu, checked_cmd, checked_type, checked_state);
}
else
@ -3618,6 +3623,129 @@ static void test_emptypopup(void)
ok(ret, "DestroyMenu failed with error %d\n", GetLastError());
}
static void test_AppendMenu(void)
{
MENUITEMINFOA mii;
HMENU hmenu, hsubmenu;
BOOL ret;
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
ret = AppendMenuA(hmenu, MF_OWNERDRAW, 201, "item 1");
ok(ret, "AppendMenu failed\n");
check_menu_items(hmenu, 201, MF_OWNERDRAW, 0);
DestroyMenu(hmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
ret = AppendMenuA(hmenu, MF_POPUP, 202, "item 1");
todo_wine
ok(ret, "AppendMenu failed\n");
if (ret) /* FIXME: uncomment once Wine is fixed */
check_menu_items(hmenu, 202, MF_STRING, 0);
DestroyMenu(hmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, 203, "item 1");
todo_wine
ok(ret, "AppendMenu failed\n");
if (ret) /* FIXME: uncomment once Wine is fixed */
check_menu_items(hmenu, 203, MF_OWNERDRAW, 0);
DestroyMenu(hmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
hsubmenu = CreateMenu();
ok(hsubmenu != 0, "CreateMenu failed\n");
ret = AppendMenuA(hmenu, MF_OWNERDRAW, (UINT_PTR)hsubmenu, "item 1");
ok(ret, "AppendMenu failed\n");
check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0);
DestroyMenu(hmenu);
DestroyMenu(hsubmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
hsubmenu = CreateMenu();
ok(hsubmenu != 0, "CreateMenu failed\n");
ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1");
ok(ret, "AppendMenu failed\n");
check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0);
DestroyMenu(hmenu);
DestroyMenu(hsubmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
hsubmenu = CreateMenu();
ok(hsubmenu != 0, "CreateMenu failed\n");
ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1");
ok(ret, "AppendMenu failed\n");
check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0);
DestroyMenu(hmenu);
DestroyMenu(hsubmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
hsubmenu = CreatePopupMenu();
ok(hsubmenu != 0, "CreatePopupMenu failed\n");
ret = AppendMenuA(hmenu, MF_OWNERDRAW, (UINT_PTR)hsubmenu, "item 1");
ok(ret, "AppendMenu failed\n");
check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0);
DestroyMenu(hmenu);
DestroyMenu(hsubmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
hsubmenu = CreatePopupMenu();
ok(hsubmenu != 0, "CreatePopupMenu failed\n");
ret = AppendMenuA(hmenu, MF_POPUP, (UINT_PTR)hsubmenu, "item 1");
ok(ret, "AppendMenu failed\n");
check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_STRING, 0);
DestroyMenu(hmenu);
DestroyMenu(hsubmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
hsubmenu = CreatePopupMenu();
ok(hsubmenu != 0, "CreatePopupMenu failed\n");
ret = AppendMenuA(hmenu, MF_OWNERDRAW | MF_POPUP, (UINT_PTR)hsubmenu, "item 1");
ok(ret, "AppendMenu failed\n");
check_menu_items(hmenu, (UINT_PTR)hsubmenu, MF_OWNERDRAW, 0);
DestroyMenu(hmenu);
DestroyMenu(hsubmenu);
hmenu = CreateMenu();
ok(hmenu != 0, "CreateMenu failed\n");
ret = AppendMenuA(hmenu, MF_STRING, 204, "item 1");
ok(ret, "AppendMenu failed\n");
check_menu_items(hmenu, 204, MF_STRING, 0);
ret = ModifyMenuA(hmenu, 0, MF_POPUP | MF_BYPOSITION, 205, "item 2");
todo_wine
ok(ret, "ModifyMenu failed\n");
if (ret) /* FIXME: uncomment once Wine is fixed */
check_menu_items(hmenu, 205, MF_STRING, 0);
memset(&mii, 0, sizeof(mii));
mii.cbSize = sizeof(mii);
mii.fMask = MIIM_SUBMENU;
mii.hSubMenu = (HMENU)204;
ret = InsertMenuItemA(hmenu, 0, TRUE, &mii);
ok(!ret, "InsertMenuItem should fail\n");
ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);
ok(!ret, "SetMenuItemInfo should fail\n");
mii.fMask = MIIM_ID;
mii.wID = 206;
ret = InsertMenuItemA(hmenu, 0, TRUE, &mii);
ok(ret, "InsertMenuItem failed\n");
if (0) /* FIXME: uncomment once Wine is fixed */
check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED);
mii.wID = 207;
ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);
ok(ret, "SetMenuItemInfo failed\n");
if (0) /* FIXME: uncomment once Wine is fixed */
check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED);
DestroyMenu(hmenu);
}
START_TEST(menu)
{
init_function_pointers();
@ -3655,4 +3783,5 @@ START_TEST(menu)
test_menu_maxdepth();
test_menu_circref();
test_emptypopup();
test_AppendMenu();
}