Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle FNERR_INVALIDFILENAME which happens if an invalid file name is passed to wxFileDialog (#9688)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-03 16:04:48 +00:00
parent 67cb1dfa7f
commit fe048d7736
1 changed files with 111 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/msw/filedlg.cpp
View File

@@ -250,10 +250,10 @@ void wxFileDialog::MSWOnInitDone(WXHWND hDlg)
SetHWND(NULL); SetHWND(NULL);
} }
// helper used below in ShowModal(): style is used to determine whether to show // helper used below in ShowCommFileDialog(): style is used to determine
// the "Save file" dialog (if it contains wxFD_SAVE bit) or "Open file" one; // whether to show the "Save file" dialog (if it contains wxFD_SAVE bit) or
// returns true on success or false on failure in which case err is filled with // "Open file" one; returns true on success or false on failure in which case
// the CDERR_XXX constant // err is filled with the CDERR_XXX constant
static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err) static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
{ {
if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) ) if ( style & wxFD_SAVE ? GetSaveFileName(of) : GetOpenFileName(of) )
@@ -308,6 +308,52 @@ static bool DoShowCommFileDialog(OPENFILENAME *of, long style, DWORD *err)
static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE; static DWORD gs_ofStructSize = wxOPENFILENAME_V5_SIZE;
#endif // __WXWINCE__ || __WIN64__/!... #endif // __WXWINCE__ || __WIN64__/!...
static bool ShowCommFileDialog(OPENFILENAME *of, long style)
{
DWORD errCode;
bool success = DoShowCommFileDialog(of, style, &errCode);
#ifdef wxTRY_SMALLER_OPENFILENAME
// the system might be too old to support the new version file dialog
// boxes, try with the old size
if ( !success && errCode == CDERR_STRUCTSIZE &&
of->lStructSize != wxOPENFILENAME_V4_SIZE )
{
of->lStructSize = wxOPENFILENAME_V4_SIZE;
success = DoShowCommFileDialog(of, style, &errCode);
if ( success || !errCode )
{
// use this struct size for subsequent dialogs
gs_ofStructSize = of->lStructSize;
}
}
#endif // wxTRY_SMALLER_OPENFILENAME
if ( !success && errCode == FNERR_INVALIDFILENAME && of->lpstrFile[0] )
{
// this can happen if the default file name is invalid, try without it
// now
of->lpstrFile[0] = _T('\0');
success = DoShowCommFileDialog(of, style, &errCode);
}
if ( !success )
{
// common dialog failed - why?
if ( errCode != 0 )
{
wxLogError(_("File dialog failed with error code %0lx."), errCode);
}
//else: it was just cancelled
return false;
}
return true;
}
int wxFileDialog::ShowModal() int wxFileDialog::ShowModal()
{ {
HWND hWnd = 0; HWND hWnd = 0;
@@ -475,29 +521,9 @@ int wxFileDialog::ShowModal()
//== Execute FileDialog >>================================================= //== Execute FileDialog >>=================================================
DWORD errCode; if ( !ShowCommFileDialog(&of, m_windowStyle) )
bool success = DoShowCommFileDialog(&of, m_windowStyle, &errCode); return wxID_CANCEL;
#ifdef wxTRY_SMALLER_OPENFILENAME
// the system might be too old to support the new version file dialog
// boxes, try with the old size
if ( !success && errCode == CDERR_STRUCTSIZE &&
of.lStructSize != wxOPENFILENAME_V4_SIZE )
{
of.lStructSize = wxOPENFILENAME_V4_SIZE;
success = DoShowCommFileDialog(&of, m_windowStyle, &errCode);
if ( success || !errCode )
{
// use this struct size for subsequent dialogs
gs_ofStructSize = of.lStructSize;
}
}
#endif // wxTRY_SMALLER_OPENFILENAME
if ( success )
{
// GetOpenFileName will always change the current working directory on // GetOpenFileName will always change the current working directory on
// (according to MSDN) "Windows NT 4.0/2000/XP" because the flag // (according to MSDN) "Windows NT 4.0/2000/XP" because the flag
// OFN_NOCHANGEDIR has no effect. If the user did not specify // OFN_NOCHANGEDIR has no effect. If the user did not specify
@@ -573,22 +599,8 @@ int wxFileDialog::ShowModal()
m_fileNames.Add(m_fileName); m_fileNames.Add(m_fileName);
m_dir = wxPathOnly(fileNameBuffer); m_dir = wxPathOnly(fileNameBuffer);
} }
}
#ifdef __WXDEBUG__
else
{
// common dialog failed - why?
if ( errCode != 0 )
{
// this msg is only for developers so don't translate it
wxLogError(wxT("Common dialog failed with error code %0lx."),
errCode);
}
//else: it was just cancelled
}
#endif // __WXDEBUG__
return success ? wxID_OK : wxID_CANCEL; return wxID_OK;
} }