Skip to content

W
wine-cw
Commit db134bbd authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

comdlg32/tests: Use wine_dbgstr_rect() to print RECTs.

Signed-off-by: 's avatarMichael Stefaniuc <mstefani@redhat.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2e4f89ed
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 32 deletions
dlls/comdlg32/tests/filedlg.c
View file @ db134bbd
...@@ -422,63 +422,56 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L ...@@ -422,63 +422,56 @@ static UINT_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L
case cmb1: case cmb1:
case edt1: case edt1:
ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0), ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 10, 0),
"control id %03x should have sized horizontally and moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", "control id %03x should have sized horizontally and moved vertically, before %s after %s\n",
ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
ctrlrcs[i].right, ctrlrcs[i].bottom, wine_dbgstr_rect( &rc ));
rc.left, rc.top, rc.right, rc.bottom);
break; break;
/* sized horizontal and vertical */ /* sized horizontal and vertical */
case lst2: case lst2:
ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 10), ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 10),
"control id %03x should have sized horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", "control id %03x should have sized horizontally and vertically, before %s after %s\n",
ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
ctrlrcs[i].right, ctrlrcs[i].bottom, wine_dbgstr_rect( &rc ));
rc.left, rc.top, rc.right, rc.bottom);
break; break;
/* moved horizontal and vertical */ /* moved horizontal and vertical */
case IDCANCEL: case IDCANCEL:
case pshHelp: case pshHelp:
ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0), ok( TESTRECTS( ctrlrcs[i], rc, 10, 10, 0, 0),
"control id %03x should have moved horizontally and vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", "control id %03x should have moved horizontally and vertically, before %s after %s\n",
ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
ctrlrcs[i].right, ctrlrcs[i].bottom, wine_dbgstr_rect( &rc ));
rc.left, rc.top, rc.right, rc.bottom);
break; break;
/* moved vertically */ /* moved vertically */
case chx1: case chx1:
case stc2: case stc2:
case stc3: case stc3:
ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0), ok( TESTRECTS( ctrlrcs[i], rc, 0, 10, 0, 0),
"control id %03x should have moved vertically, before %d,%d-%d,%d after %d,%d-%d,%d\n", "control id %03x should have moved vertically, before %s after %s\n",
ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
ctrlrcs[i].right, ctrlrcs[i].bottom, wine_dbgstr_rect( &rc ));
rc.left, rc.top, rc.right, rc.bottom);
break; break;
/* resized horizontal */ /* resized horizontal */
case cmb2: /* aka IDC_LOOKIN */ case cmb2: /* aka IDC_LOOKIN */
ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 0)|| ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 0)||
TESTRECTS( ctrlrcs[i], rc, 0, 0, 0, 0), /* Vista and higher */ TESTRECTS( ctrlrcs[i], rc, 0, 0, 0, 0), /* Vista and higher */
"control id %03x should have resized horizontally, before %d,%d-%d,%d after %d,%d-%d,%d\n", "control id %03x should have resized horizontally, before %s after %s\n",
ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
ctrlrcs[i].right, ctrlrcs[i].bottom, wine_dbgstr_rect( &rc ));
rc.left, rc.top, rc.right, rc.bottom);
break; break;
/* non moving non sizing controls */ /* non moving non sizing controls */
case stc4: case stc4:
ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0), ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0),
"control id %03x was moved/resized, before %d,%d-%d,%d after %d,%d-%d,%d\n", "control id %03x was moved/resized, before %s after %s\n",
ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
ctrlrcs[i].right, ctrlrcs[i].bottom, wine_dbgstr_rect( &rc ));
rc.left, rc.top, rc.right, rc.bottom);
break; break;
/* todo_wine: non moving non sizing controls */ /* todo_wine: non moving non sizing controls */
case lst1: case lst1:
todo_wine todo_wine
ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0), ok( TESTRECTS( rc, ctrlrcs[i], 0, 0, 0, 0),
"control id %03x was moved/resized, before %d,%d-%d,%d after %d,%d-%d,%d\n", "control id %03x was moved/resized, before %s after %s\n",
ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
ctrlrcs[i].right, ctrlrcs[i].bottom, wine_dbgstr_rect( &rc ));
rc.left, rc.top, rc.right, rc.bottom);
break; break;
/* don't test: id is not unique */ /* don't test: id is not unique */
case IDOK: case IDOK:
...@@ -487,10 +480,9 @@ todo_wine ...@@ -487,10 +480,9 @@ todo_wine
case -1: case -1:
break; break;
default: default:
trace("untested control id %03x before %d,%d-%d,%d after %d,%d-%d,%d\n", trace("untested control id %03x before %s after %s\n",
ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top, ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
ctrlrcs[i].right, ctrlrcs[i].bottom, wine_dbgstr_rect( &rc ));
rc.left, rc.top, rc.right, rc.bottom);
#undef TESTRECTS #undef TESTRECTS
#undef MAXNRCTRLS #undef MAXNRCTRLS
} }
......
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