ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comdlg32: Filedlg should not add extension if it contains a glob.

Browse Source
This commit is contained in:
Wolfram Sang 2011-01-29 09:15:34 +01:00 committed by Alexandre Julliard
parent 08f13cbd39
commit 5cb4c55335
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/comdlg32/filedlg.c
View File

@ -2491,8 +2491,8 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
else if ( fodInfos->defext ) /* attach the default file extension*/ else if ( fodInfos->defext ) /* attach the default file extension*/
filterExt = fodInfos->defext; filterExt = fodInfos->defext;
/* If extension is .*, ignore it */ /* If extension contains a glob, ignore it */
if (filterExt[0] != '*') if ( filterExt && !strchrW(filterExt, '*') && !strchrW(filterExt, '?') )
{ {
/* Attach the dot*/ /* Attach the dot*/
lstrcatW(lpstrPathAndFile, szwDot); lstrcatW(lpstrPathAndFile, szwDot);

32
dlls/comdlg32/tests/filedlg.c
View File

@ -1052,6 +1052,15 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam,
return FALSE; return FALSE;
} }
static const char *defext_filters[] = {
"TestFilter (*.pt*)\0*.pt*\0",
"TestFilter (*.ab?)\0*.ab?\0",
"TestFilter (*.*)\0*.*\0",
NULL /* is a test, not an endmark! */
};
#define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0]))
static void test_extension(void) static void test_extension(void)
{ {
OPENFILENAME ofn = { sizeof(OPENFILENAME)}; OPENFILENAME ofn = { sizeof(OPENFILENAME)};
@ -1059,11 +1068,12 @@ static void test_extension(void)
char curdir[MAX_PATH]; char curdir[MAX_PATH];
char *filename_ptr; char *filename_ptr;
const char *test_file_name = "deadbeef"; const char *test_file_name = "deadbeef";
const char **cur_filter;
DWORD ret; DWORD ret;
BOOL cdret; BOOL boolret;
cdret = GetCurrentDirectoryA(sizeof(curdir), curdir); boolret = GetCurrentDirectoryA(sizeof(curdir), curdir);
ok(cdret, "Failed to get current dir err %d\n", GetLastError()); ok(boolret, "Failed to get current dir err %d\n", GetLastError());
/* Ignore .* extension */ /* Ignore .* extension */
ofn.lStructSize = sizeof(ofn); ofn.lStructSize = sizeof(ofn);
@ -1075,17 +1085,23 @@ static void test_extension(void)
ofn.lpstrInitialDir = curdir; ofn.lpstrInitialDir = curdir;
ofn.lpfnHook = test_extension_wndproc; ofn.lpfnHook = test_extension_wndproc;
ofn.nFileExtension = 0; ofn.nFileExtension = 0;
ofn.lpstrFilter = "All Files (*.*)\0*.*\0";
strcpy(filename, test_file_name);
ret = GetSaveFileNameA(&ofn); for (cur_filter = defext_filters; cur_filter < defext_filters + ARRAY_SIZE(defext_filters); cur_filter++) {
ofn.lpstrFilter = *cur_filter;
strcpy(filename, test_file_name);
boolret = GetSaveFileNameA(&ofn);
ok(boolret, "expected true\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name ); filename_ptr = ofn.lpstrFile + strlen( ofn.lpstrFile ) - strlen( test_file_name );
ok(1 == ret, "expected 1, got %d\n", ret); ok( strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile );
ok(strlen(ofn.lpstrFile) >= strlen(test_file_name), "Filename %s is too short\n", ofn.lpstrFile );
ok( strcmp(filename_ptr, test_file_name) == 0, ok( strcmp(filename_ptr, test_file_name) == 0,
"Filename is %s, expected %s\n", filename_ptr, test_file_name ); "Filename is %s, expected %s\n", filename_ptr, test_file_name );
}
} }
#undef ARRAY_SIZE
START_TEST(filedlg) START_TEST(filedlg)
{ {
test_DialogCancel(); test_DialogCancel();