} else if( count == 1){
resize = resize_testcases[index].resize_check;
GetWindowRect( parent, &rc);
- if( resize_testcases[index].todo){
- todo_wine {
+ todo_wine_if( resize_testcases[index].todo){
ok( resize == rc.right - rc.left - initrc.right + initrc.left,
"testid %d size-x change %d expected %d\n", index,
rc.right - rc.left - initrc.right + initrc.left, resize);
"testid %d size-y change %d expected %d\n", index,
rc.bottom - rc.top - initrc.bottom + initrc.top, resize);
}
- }else{
- ok( resize == rc.right - rc.left - initrc.right + initrc.left,
- "testid %d size-x change %d expected %d\n", index,
- rc.right - rc.left - initrc.right + initrc.left, resize);
- ok( resize == rc.bottom - rc.top - initrc.bottom + initrc.top,
- "testid %d size-y change %d expected %d\n", index,
- rc.bottom - rc.top - initrc.bottom + initrc.top, resize);
- }
if( resize_testcases[index].testcontrols) {
int i;
RECT rc;
case cmb1:
case edt1:
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",
- ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have sized horizontally and moved vertically, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
+ wine_dbgstr_rect( &rc ));
break;
/* sized horizontal and vertical */
case lst2:
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",
- ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have sized horizontally and vertically, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
+ wine_dbgstr_rect( &rc ));
break;
/* moved horizontal and vertical */
case IDCANCEL:
case pshHelp:
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",
- ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have moved horizontally and vertically, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
+ wine_dbgstr_rect( &rc ));
break;
/* moved vertically */
case chx1:
case stc2:
case stc3:
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",
- ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have moved vertically, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
+ wine_dbgstr_rect( &rc ));
break;
/* resized horizontal */
case cmb2: /* aka IDC_LOOKIN */
ok( TESTRECTS( ctrlrcs[i], rc, 0, 0, 10, 0)||
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",
- ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x should have resized horizontally, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
+ wine_dbgstr_rect( &rc ));
break;
/* non moving non sizing controls */
case stc4:
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",
- ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x was moved/resized, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
+ wine_dbgstr_rect( &rc ));
break;
/* todo_wine: non moving non sizing controls */
case lst1:
todo_wine
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",
- ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ "control id %03x was moved/resized, before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
+ wine_dbgstr_rect( &rc ));
break;
/* don't test: id is not unique */
case IDOK:
case -1:
break;
default:
- trace("untested control id %03x before %d,%d-%d,%d after %d,%d-%d,%d\n",
- ctrlids[i], ctrlrcs[i].left, ctrlrcs[i].top,
- ctrlrcs[i].right, ctrlrcs[i].bottom,
- rc.left, rc.top, rc.right, rc.bottom);
+ trace("untested control id %03x before %s after %s\n",
+ ctrlids[i], wine_dbgstr_rect( &ctrlrcs[i] ),
+ wine_dbgstr_rect( &rc ));
#undef TESTRECTS
#undef MAXNRCTRLS
}
ok( wrcParent.right - wrcParent.left == expectx,
"Wrong width of dialog %d, expected %d\n",
wrcParent.right - wrcParent.left, expectx);
- } else todo_wine {
+ } else {
/* with the OFN_ENABLESIZING flag */
ok( wrcParent.bottom - wrcParent.top > expecty,
"Wrong height of dialog %d, expected more than %d\n",
for (i = 0; i < ARRAY_SIZE(defext_wildcard_filters); i++) {
test_extension_helper(&ofn, defext_wildcard_filters[i], "deadbeef.xyz");
}
+
+ /* Append valid extensions consisting of multiple parts */
+ test_extension_helper(&ofn, "TestFilter (*.abc.def)\0*.abc.def\0", "deadbeef.abc.def");
+ test_extension_helper(&ofn, "TestFilter (.abc.def)\0.abc.def\0", "deadbeef.abc.def");
+ test_extension_helper(&ofn, "TestFilter (*.*.def)\0*.*.def\0", "deadbeef.xyz");
}
#undef ARRAY_SIZE
ok(ofnW.nFileExtension == 0, "ofnW.nFileExtension is 0x%x, should be 0\n", ofnW.nFileExtension);
}
+static void test_directory_filename(void)
+{
+ OPENFILENAMEA ofnA = {0};
+ OPENFILENAMEW ofnW = {0};
+ WCHAR filterW[] = {'t','e','x','t','\0','*','.','t','x','t','\0',
+ 'A','l','l','\0','*','\0','\0'};
+ char szInitialDir[MAX_PATH] = {0};
+ WCHAR szInitialDirW[MAX_PATH] = {0};
+ DWORD ret;
+
+ GetWindowsDirectoryA(szInitialDir, MAX_PATH);
+ GetWindowsDirectoryW(szInitialDirW, MAX_PATH);
+
+ szInitialDir[strlen(szInitialDir)] = '\\';
+ szInitialDirW[lstrlenW(szInitialDirW)] = '\\';
+
+ ofnA.lStructSize = OPENFILENAME_SIZE_VERSION_400A;
+ ofnA.lpstrFile = szInitialDir;
+ ofnA.nMaxFile = MAX_PATH;
+ ofnA.lpfnHook = test_null_wndproc;
+ ofnA.Flags = OFN_ENABLEHOOK | OFN_EXPLORER;
+ ofnA.hInstance = GetModuleHandleA(NULL);
+ ofnA.lpstrFilter = "text\0*.txt\0All\0*\0\0";
+ ofnA.lpstrDefExt = NULL;
+ ret = GetOpenFileNameA(&ofnA);
+ todo_wine ok(!ret, "GetOpenFileNameA returned %#x\n", ret);
+
+ /* unicode tests */
+ ofnW.lStructSize = OPENFILENAME_SIZE_VERSION_400W;
+ ofnW.lpstrFile = szInitialDirW;
+ ofnW.nMaxFile = MAX_PATH;
+ ofnW.lpfnHook = test_null_wndproc;
+ ofnW.Flags = OFN_ENABLEHOOK | OFN_EXPLORER;
+ ofnW.hInstance = GetModuleHandleW(NULL);
+ ofnW.lpstrFilter = filterW;
+ ofnW.lpstrDefExt = NULL;
+ ret = GetOpenFileNameW(&ofnW);
+ todo_wine ok(!ret, "GetOpenFileNameW returned %#x\n", ret);
+}
+
START_TEST(filedlg)
{
test_DialogCancel();
if( resizesupported) test_resizable2();
test_extension();
test_null_filename();
+ test_directory_filename();
}
projects / reactos.git / blobdiff