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

comdlg32: Make explorer type file dialogs without custom template or hook proc resizable.

This commit is contained in:
Rein Klazes 2009-10-07 11:17:05 +02:00 committed by Alexandre Julliard
parent 2158999382
commit 3e76f88d27
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/comdlg32/filedlg.c
View File

@ -271,6 +271,13 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos)
return FALSE;
}
/* msdn: explorer style dialogs permit sizing by default.
* The OFN_ENABLESIZING flag is only needed when a hook or
* custom tmeplate is provided */
if( (fodInfos->ofnInfos->Flags & OFN_EXPLORER) &&
!(fodInfos->ofnInfos->Flags & ( OFN_ENABLEHOOK | OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE)))
fodInfos->ofnInfos->Flags |= OFN_ENABLESIZING;
if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)
{
((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX;

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

@ -29,6 +29,8 @@
/* ##### */
static int resizesupported = TRUE;
static void toolbarcheck( HWND hDlg)
{
/* test toolbar properties */
@ -349,6 +351,7 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L
if( resize_testcases[index].flags & OFN_ENABLESIZING)
if( !(style & WS_SIZEBOX)) {
win_skip( "OFN_ENABLESIZING flag not supported.\n");
resizesupported = FALSE;
PostMessage( parent, WM_COMMAND, IDCANCEL, 0);
} else
ok( style & WS_SIZEBOX,
@ -934,6 +937,49 @@ static void test_getfolderpath(void)
CommDlgExtendedError());
}
static void test_resizable2(void)
{
OPENFILENAMEA ofn = {0};
char filename[1024] = "pls press Enter if sizable, Esc otherwise";
DWORD ret;
/* interactive because there is no hook function */
if( !winetest_interactive) {
skip( "some interactive resizable dialog tests (set WINETEST_INTERACTIVE=1)\n");
return;
}
ofn.lStructSize = sizeof(ofn);
ofn.lpstrFile = filename;
ofn.nMaxFile = 1024;
ofn.lpfnHook = NULL;
ofn.hInstance = GetModuleHandleA(NULL);
ofn.lpTemplateName = "template1";
ofn.Flags = OFN_EXPLORER;
#define ISSIZABLE 1
ret = GetOpenFileNameA(&ofn);
ok( ret == ISSIZABLE, "File Dialog should have been sizable\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATE;
ret = GetOpenFileNameA(&ofn);
ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
ofn.Flags = OFN_EXPLORER | OFN_ENABLETEMPLATEHANDLE;
ofn.hInstance = LoadResource( GetModuleHandle(NULL), FindResource( GetModuleHandle(NULL), "template1", (LPSTR)RT_DIALOG));
ofn.lpTemplateName = NULL;
ret = GetOpenFileNameA(&ofn);
ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK;
ret = GetOpenFileNameA(&ofn);
ok( ret != ISSIZABLE, "File Dialog should NOT have been sizable\n");
ret = CommDlgExtendedError();
ok(!ret, "CommDlgExtendedError returned %#x\n", ret);
#undef ISSIZABLE
}
START_TEST(filedlg)
{
test_DialogCancel();
@ -943,4 +989,5 @@ START_TEST(filedlg)
test_resize();
test_ok();
test_getfolderpath();
if( resizesupported) test_resizable2();
}