user32/tests: Allow tracing in menu tests (try 2)

[André Hentschel]

try 2: Fixed indentation and use winetest_debug for other traces too


Signed-off-by: André Hentschel <nerv at dawncrow.de>

---
 dlls/user32/tests/menu.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index 62c3229..65caaa4 100644
--- a/dlls/user32/tests/menu.c
+++ b/dlls/user32/tests/menu.c
@@ -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;
         ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii);
         ok(ret, "GetMenuItemInfo(%u) failed\n", i);
-if (0)
-        trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n",
-               i, mii.fType, mii.fState, mii.wID, mii.hSubMenu);
+
+        if (winetest_debug > 1)
+            trace("item #%u: fType %04x, fState %04x, wID %u, hSubMenu %p\n",
+                  i, mii.fType, mii.fState, mii.wID, mii.hSubMenu);
 
         if (mii.hSubMenu)
         {
@@ -2672,9 +2673,9 @@ static void test_menu_resource_layout(void)
         mii.fMask  = MIIM_FTYPE | MIIM_STATE | MIIM_ID | MIIM_STRING;
         ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii);
         ok(ret, "GetMenuItemInfo(%u) failed\n", i);
-if (0)
-        trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n",
-               i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData);
+        if (winetest_debug > 1)
+            trace("item #%u: fType %04x, fState %04x, wID %u, dwTypeData %s\n",
+                  i, mii.fType, mii.fState, mii.wID, (LPCSTR)mii.dwTypeData);
 
         ok(mii.fType == menu_data[i].type,
            "%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
         mii.fMask  = MIIM_FTYPE | MIIM_ID | MIIM_STRING | MIIM_BITMAP;
         ret = GetMenuItemInfoA(hmenu, i, TRUE, &mii);
         ok(ret, "GetMenuItemInfo(%u) failed\n", i);
-if (0)
-        trace("item #%u: fType %04x, fState %04x, wID %04x, hbmp %p\n",
-               i, mii.fType, mii.fState, mii.wID, mii.hbmpItem);
+
+        if (winetest_debug > 1)
+            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,
            "%u: expected fType %04x, got %04x\n", i, item[i].type, mii.fType);
-- 
1.9.1