diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 593292dfcdd..eaa93a58e8c 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -172,7 +172,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, case WM_MEASUREITEM: { MEASUREITEMSTRUCT* pmis = (MEASUREITEMSTRUCT*)lparam; - if( winetest_debug) + if (winetest_debug > 1) trace("WM_MEASUREITEM received data %lx size %dx%d\n", pmis->itemData, pmis->itemWidth, pmis->itemHeight); ok( !wparam, "wrong wparam %lx\n", wparam ); @@ -191,7 +191,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, SIZE sz; int i; pdis = (DRAWITEMSTRUCT *) lparam; - if( winetest_debug) { + if (winetest_debug > 1) { RECT rc; GetMenuItemRect( hwnd, (HMENU)pdis->hwndItem, pdis->itemData ,&rc); trace("WM_DRAWITEM received hwnd %p hmenu %p itemdata %ld item %d rc %d,%d-%d,%d itemrc: %d,%d-%d,%d\n", diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5bdfed64507..bf9bb2c9767 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1643,12 +1643,7 @@ static LRESULT WINAPI mdi_child_wnd_proc_1(HWND hwnd, UINT msg, WPARAM wparam, L style = GetWindowLongA(hwnd, GWL_STYLE); exstyle = GetWindowLongA(hwnd, GWL_EXSTYLE); - GetWindowRect(client, &rc); - trace("MDI client %p window size = (%d x %d)\n", client, rc.right-rc.left, rc.bottom-rc.top); GetClientRect(client, &rc); - trace("MDI client %p client size = (%d x %d)\n", client, rc.right, rc.bottom); - trace("screen size: %d x %d\n", GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN)); GetClientRect(client, &rc); if ((style & WS_CAPTION) == WS_CAPTION) @@ -6276,7 +6271,6 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR case WM_NCCREATE: { CREATESTRUCTA *cs = (CREATESTRUCTA *)lp; - trace("WM_NCCREATE: rect %d,%d-%d,%d\n", cs->x, cs->y, cs->cx, cs->cy); ok(cs->x == mi.rcMonitor.left && cs->y == mi.rcMonitor.top && cs->cx == mi.rcMonitor.right && cs->cy == mi.rcMonitor.bottom, "expected %d,%d-%d,%d, got %d,%d-%d,%d\n", @@ -6287,7 +6281,6 @@ static LRESULT CALLBACK fullscreen_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPAR case WM_GETMINMAXINFO: { MINMAXINFO *minmax = (MINMAXINFO *)lp; - dump_minmax_info(minmax); ok(minmax->ptMaxPosition.x <= mi.rcMonitor.left, "%d <= %d\n", minmax->ptMaxPosition.x, mi.rcMonitor.left); ok(minmax->ptMaxPosition.y <= mi.rcMonitor.top, "%d <= %d\n", minmax->ptMaxPosition.y, mi.rcMonitor.top); ok(minmax->ptMaxSize.x >= mi.rcMonitor.right, "%d >= %d\n", minmax->ptMaxSize.x, mi.rcMonitor.right);