Skip to content

W
wine-cw
Commit 83bfda7c authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

user32/tests: Allow tracing in menu tests.

Signed-off-by: 's avatarAndré Hentschel <nerv@dawncrow.de>
parent 9d58aac4
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
dlls/user32/tests/menu.c
View file @ 83bfda7c
...@@ -2508,9 +2508,10 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type, ...@@ -2508,9 +2508,10 @@ static void check_menu_items(HMENU hmenu, UINT checked_cmd, UINT checked_type,
mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU; mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_SUBMENU;
ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii);
ok(ret, "GetMenuItemInfo(%u) failed\n", i); ok(ret, "GetMenuItemInfo(%u) failed\n", i);
if (0)
trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n", if (winetest_debug > 1)
i, mii.fType, mii.fState, mii.wID, mii.hSubMenu); trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n",
i, mii.fType, mii.fState, mii.wID, mii.hSubMenu);
if (mii.hSubMenu) if (mii.hSubMenu)
{ {
...@@ -2672,9 +2673,9 @@ static void test_menu_resource_layout(void) ...@@ -2672,9 +2673,9 @@ static void test_menu_resource_layout(void)
mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING; mii.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING;
ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii);
ok(ret, "GetMenuItemInfo(%u) failed\n", i); ok(ret, "GetMenuItemInfo(%u) failed\n", i);
if (0) if (winetest_debug > 1)
trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n", trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n",
i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData); i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData);
ok(mii.fType == menu_data[i].type, ok(mii.fType == menu_data[i].type,
"%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType); "%u: expected fType %04x, got %04x\n", i, menu_data[i].type, mii.fType);
...@@ -2778,9 +2779,10 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite ...@@ -2778,9 +2779,10 @@ static void compare_menu_data(HMENU hmenu, const struct menu_data *item, INT ite
mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP; mii.fMask = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP;
ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii); ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii);
ok(ret, "GetMenuItemInfo(%u) failed\n", i); ok(ret, "GetMenuItemInfo(%u) failed\n", i);
if (0)
trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n", if (winetest_debug > 1)
i, mii.fType, mii.fState, mii.wID, mii.hbmpItem); trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n",
i, mii.fType, mii.fState, mii.wID, mii.hbmpItem);
ok(mii.fType == item[i].type, ok(mii.fType == item[i].type,
"%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType); "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType);
......
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