patch to fix various filename-related functions for cygwin

[wxWidgets.git] / src / msw / filedlg.cpp

diff --git a/src/msw/filedlg.cpp b/src/msw/filedlg.cpp
index 0bc3273b386759b9c6b6525d0c971b5eff9258a6..4f0d03e24345fb24b8f8ca722316464d0a822f00 100644 (file)
--- a/src/msw/filedlg.cpp
+++ b/src/msw/filedlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filedlg.cpp
+// Name:        src/msw/filedlg.cpp

 // Purpose:     wxFileDialog
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxFileDialog
 // Author:      Julian Smart
 // Modified by:


@@ -9,6 +9,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
     #pragma implementation "filedlg.h"
 #endif
 #ifdef __GNUG__
     #pragma implementation "filedlg.h"
 #endif


@@ -20,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_FILEDLG
+

 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/msgdlg.h"


@@ -27,10 +37,11 @@
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/filedlg.h"
     #include "wx/intl.h"
     #include "wx/log.h"

-
-    #include "wx/msw/private.h"
+    #include "wx/app.h"

 #endif
 
 #endif
 

+#include "wx/msw/private.h"
+

 #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
     #include <commdlg.h>
 #endif
 #if !defined(__WIN32__) || defined(__SALFORDC__) || defined(__WXWINE__)
     #include <commdlg.h>
 #endif


@@ -41,8 +52,38 @@
 
 #include "wx/tokenzr.h"
 
 
 #include "wx/tokenzr.h"
 

+#ifndef OFN_EXPLORER
+    #define OFN_EXPLORER 0x00080000
+#endif
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+# define wxMAXPATH   4096
+#else
+# define wxMAXPATH   1024
+#endif
+
+# define wxMAXFILE   1024
+
+# define wxMAXEXT    5
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 

+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+

 wxString wxFileSelector(const wxChar *title,
                         const wxChar *defaultDir,
                         const wxChar *defaultFileName,
 wxString wxFileSelector(const wxChar *title,
                         const wxChar *defaultDir,
                         const wxChar *defaultFileName,


@@ -83,7 +124,7 @@ wxString wxFileSelector(const wxChar *title,
                             flags, wxPoint(x, y));
     if( wxStrlen(defaultExtension) != 0 )
     {
                             flags, wxPoint(x, y));
     if( wxStrlen(defaultExtension) != 0 )
     {

-        int filterFind = 1,
+        int filterFind = 0,

             filterIndex = 0;
 
         for( unsigned int i = 0; i < filter2.Len(); i++ )
             filterIndex = 0;
 
         for( unsigned int i = 0; i < filter2.Len(); i++ )


@@ -92,7 +133,6 @@ wxString wxFileSelector(const wxChar *title,
             {
                 // save the start index of the new filter
                 unsigned int is = i++;
             {
                 // save the start index of the new filter
                 unsigned int is = i++;

-                filterIndex++;

 
                 // find the end of the filter
                 for( ; i < filter2.Len(); i++ )
 
                 // find the end of the filter
                 for( ; i < filter2.Len(); i++ )


@@ -104,46 +144,27 @@ wxString wxFileSelector(const wxChar *title,
                 if( i-is-1 > 0 && is+1 < filter2.Len() )
                 {
                     if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )
                 if( i-is-1 > 0 && is+1 < filter2.Len() )
                 {
                     if( filter2.Mid(is+1,i-is-1).Contains(defaultExtension) )

-//                    if( filter2.Mid(is+1,i-is-1) == defaultExtension )

                     {
                         filterFind = filterIndex;
                         break;
                     }
                 }
                     {
                         filterFind = filterIndex;
                         break;
                     }
                 }

+
+                filterIndex++;

             }
         }
 
         fileDialog.SetFilterIndex(filterFind);
     }
 
             }
         }
 
         fileDialog.SetFilterIndex(filterFind);
     }
 

+    wxString filename;

     if ( fileDialog.ShowModal() == wxID_OK )
     {
     if ( fileDialog.ShowModal() == wxID_OK )
     {

-        wxStrcpy(wxBuffer, (const wxChar *)fileDialog.GetPath());
-        return wxBuffer;
+        filename = fileDialog.GetPath();

     }
     }

-    else
-        return wxGetEmptyString();
-}
-
-# if __BORLANDC__
-#   include <dir.h>  // for MAXPATH etc. ( Borland 3.1 )
-# endif

 
 

-# ifndef MAXPATH
-# define MAXPATH   400
-# endif
-
-# ifndef MAXDRIVE
-# define MAXDRIVE  3
-# endif
-
-# ifndef MAXFILE
-# define MAXFILE   9
-# endif
-
-# ifndef MAXEXT
-# define MAXEXT    5
-# endif
+    return filename;
+}

 
 
 wxString wxFileSelectorEx(const wxChar *title,
 
 
 wxString wxFileSelectorEx(const wxChar *title,


@@ -157,22 +178,28 @@ wxString wxFileSelectorEx(const wxChar *title,
                        int       y)
 
 {
                        int       y)
 
 {

-    wxFileDialog fileDialog(parent, title ? title : wxT(""), defaultDir ? defaultDir : wxT(""),
-        defaultFileName ? defaultFileName : wxT(""), filter ? filter : wxT(""), flags, wxPoint(x, y));
+    wxFileDialog fileDialog(parent,
+                            title ? title : wxT(""),
+                            defaultDir ? defaultDir : wxT(""),
+                            defaultFileName ? defaultFileName : wxT(""),
+                            filter ? filter : wxT(""),
+                            flags, wxPoint(x, y));

 
 

+    wxString filename;

     if ( fileDialog.ShowModal() == wxID_OK )
     {
     if ( fileDialog.ShowModal() == wxID_OK )
     {

-        *defaultFilterIndex = fileDialog.GetFilterIndex();
-        wxStrcpy(wxBuffer, (const wxChar *)fileDialog.GetPath());
-        return wxBuffer;
+        if ( defaultFilterIndex )
+            *defaultFilterIndex = fileDialog.GetFilterIndex();
+
+        filename = fileDialog.GetPath();

     }
     }

-    else
-        return wxGetEmptyString();
+
+    return filename;

 }
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,
 }
 
 wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         const wxString& defaultDir, const wxString& defaultFileName, const wxString& wildCard,

-        long style, const wxPoint& pos)
+        long style, const wxPoint& WXUNUSED(pos))

 {
     m_message = message;
     m_dialogStyle = style;
 {
     m_message = message;
     m_dialogStyle = style;


@@ -183,7 +210,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;
     m_fileName = defaultFileName;
     m_dir = defaultDir;
     m_wildCard = wildCard;

-    m_filterIndex = 1;
+    m_filterIndex = 0;

 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const
 }
 
 void wxFileDialog::GetPaths(wxArrayString& paths) const


@@ -205,9 +232,11 @@ int wxFileDialog::ShowModal()
 {
     HWND hWnd = 0;
     if (m_parent) hWnd = (HWND) m_parent->GetHWND();
 {
     HWND hWnd = 0;
     if (m_parent) hWnd = (HWND) m_parent->GetHWND();

+    if (!hWnd && wxTheApp->GetTopWindow())
+        hWnd = (HWND) wxTheApp->GetTopWindow()->GetHWND();

 
 

-    static wxChar fileNameBuffer [ MAXPATH ];           // the file-name
-    wxChar        titleBuffer    [ MAXFILE+1+MAXEXT ];  // the file-name, without path
+    static wxChar fileNameBuffer [ wxMAXPATH ];           // the file-name
+    wxChar        titleBuffer    [ wxMAXFILE+1+wxMAXEXT ];  // the file-name, without path

 
     *fileNameBuffer = wxT('\0');
     *titleBuffer    = wxT('\0');
 
     *fileNameBuffer = wxT('\0');
     *titleBuffer    = wxT('\0');


@@ -217,40 +246,81 @@ int wxFileDialog::ShowModal()
         msw_flags |= OFN_HIDEREADONLY;
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
         msw_flags |= OFN_HIDEREADONLY;
     if ( m_dialogStyle & wxFILE_MUST_EXIST )
         msw_flags |= OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;

-    if (m_dialogStyle & wxMULTIPLE )
-        msw_flags |=
-#if defined(OFN_EXPLORER)
-        OFN_EXPLORER |
-#endif // OFN_EXPLORER
-        OFN_ALLOWMULTISELECT;

 
 

-    OPENFILENAME of;
-    memset(&of, 0, sizeof(OPENFILENAME));
+    if (m_dialogStyle & wxMULTIPLE )
+    {
+        // OFN_EXPLORER must always be specified with OFN_ALLOWMULTISELECT
+        msw_flags |= OFN_EXPLORER | OFN_ALLOWMULTISELECT;
+    }

 
 

-    of.lpstrCustomFilter = NULL;   // system should not save custom filter
-    of.nMaxCustFilter    = 0L;
+    // if wxCHANGE_DIR flag is not given we shouldn't change the CWD which the
+    // standard dialog does by default
+    if ( !(m_dialogStyle & wxCHANGE_DIR) )
+    {
+        msw_flags |= OFN_NOCHANGEDIR;
+    }

 
 

-    of.nFileOffset       = 0;      // 0-based pointer to filname in lpstFile
-    of.nFileExtension    = 0;      // 0-based pointer to extension in lpstrFile
-    of.lpstrDefExt       = NULL;   // no default extension
+    if ( m_dialogStyle & wxOVERWRITE_PROMPT )
+    {
+        msw_flags |= OFN_OVERWRITEPROMPT;
+    }

 
 

+    OPENFILENAME of;
+    wxZeroMemory(of);
+
+    // the OPENFILENAME struct has been extended in newer version of
+    // comcdlg32.dll, but as we don't use the extended fields anyhow, set
+    // the struct size to the old value - otherwise, the programs compiled
+    // with new headers will not work with the old libraries
+#if defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0500)
+    of.lStructSize       = sizeof(OPENFILENAME) -
+                           (sizeof(void *) + 2*sizeof(DWORD));
+#else // old headers

     of.lStructSize       = sizeof(OPENFILENAME);
     of.lStructSize       = sizeof(OPENFILENAME);

+#endif
+

     of.hwndOwner         = hWnd;
     of.lpstrTitle        = WXSTRINGCAST m_message;
     of.hwndOwner         = hWnd;
     of.lpstrTitle        = WXSTRINGCAST m_message;

-
-

     of.lpstrFileTitle    = titleBuffer;
     of.lpstrFileTitle    = titleBuffer;

-    of.nMaxFileTitle     = MAXFILE + 1 + MAXEXT;    // Windows 3.0 and 3.1
+    of.nMaxFileTitle     = wxMAXFILE + 1 + wxMAXEXT;    // Windows 3.0 and 3.1

 
     // Convert forward slashes to backslashes (file selector doesn't like
 
     // Convert forward slashes to backslashes (file selector doesn't like

-    // forward slashes)
-    size_t i = 0;
-    size_t len = m_dir.Length();
-    for (i = 0; i < len; i++)
-        if (m_dir[i] == wxT('/'))
-            m_dir[i] = wxT('\\');
+    // forward slashes) and also squeeze multiple consecutive slashes into one
+    // as it doesn't like two backslashes in a row neither
+
+    wxString   dir;
+    size_t     i, len = m_dir.length();
+    dir.reserve(len);
+    for ( i = 0; i < len; i++ )
+    {
+        wxChar ch = m_dir[i];
+        switch ( ch )
+        {
+            case _T('/'):
+                // convert to backslash
+                ch = _T('\\');
+
+                // fall through
+
+            case _T('\\'):
+                while ( i < len - 1 )
+                {
+                    wxChar chNext = m_dir[i + 1];
+                    if ( chNext != _T('\\') && chNext != _T('/') )
+                        break;
+
+                    // ignore the next one
+                    i++;
+                }
+                // fall through
+
+            default:
+                // normal char
+                dir += ch;
+        }
+    }

 
 

-    of.lpstrInitialDir   = m_dir.c_str();
+    of.lpstrInitialDir   = dir.c_str();

 
     of.Flags             = msw_flags;
 
 
     of.Flags             = msw_flags;
 


@@ -297,16 +367,61 @@ int wxFileDialog::ShowModal()
 
     //=== Setting defaultFileName >>=========================================
 
 
     //=== Setting defaultFileName >>=========================================
 

-    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, MAXPATH-1 );
-    fileNameBuffer[ MAXPATH-1 ] = wxT('\0');
+    wxStrncpy( fileNameBuffer, (const wxChar *)m_fileName, wxMAXPATH-1 );
+    fileNameBuffer[ wxMAXPATH-1 ] = wxT('\0');

 
     of.lpstrFile = fileNameBuffer;  // holds returned filename
 
     of.lpstrFile = fileNameBuffer;  // holds returned filename

-    of.nMaxFile  = MAXPATH;
+    of.nMaxFile  = wxMAXPATH;

 
     //== Execute FileDialog >>=================================================
 
 
     //== Execute FileDialog >>=================================================
 

-    bool success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
+    bool success = (m_dialogStyle & wxSAVE ? GetSaveFileName(&of)
+                                           : GetOpenFileName(&of)) != 0;
+
+    DWORD errCode = CommDlgExtendedError();
+
+#ifdef __WIN32__
+    if (!success && (errCode == CDERR_STRUCTSIZE))
+    {
+        // The struct size has changed so try a smaller or bigger size
+
+        int oldStructSize = of.lStructSize;
+        of.lStructSize       = oldStructSize - (sizeof(void *) + 2*sizeof(DWORD));
+        success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)

                                             : (GetOpenFileName(&of) != 0);
                                             : (GetOpenFileName(&of) != 0);

+        errCode = CommDlgExtendedError();
+
+        if (!success && (errCode == CDERR_STRUCTSIZE))
+        {
+            of.lStructSize       = oldStructSize + (sizeof(void *) + 2*sizeof(DWORD));
+            success = (m_dialogStyle & wxSAVE) ? (GetSaveFileName(&of) != 0)
+                                            : (GetOpenFileName(&of) != 0);
+        }
+    }
+
+#if wxUSE_UNICODE_MSLU && defined(OFN_EXPLORER)
+    // VS: there's a bug in unicows.dll - when multiple files are selected, 
+    //     of.nFileOffset doesn't point to the first filename but rather to 
+    //     the last component of directory name. This bug is known to MSLU
+    //     developers, but they are not going to fix it: "this is a true 
+    //     limitation, that we have decided to live with" and "working
+    //     harder on this case just did not seem worth the effort"...
+    //
+    //     Our only option is to try to fix it ourselves:
+
+    if ( (m_dialogStyle & wxMULTIPLE) &&
+         (fileNameBuffer[of.nFileOffset-1] != wxT('\0')) &&
+         wxGetOsVersion() == wxWIN95 /*using unicows.dll*/)
+    {
+        if ( wxDirExists(fileNameBuffer) )
+        {
+            // 1st component is dir => multiple files selected
+            of.nFileOffset = wxStrlen(fileNameBuffer)+1;
+        }
+    }
+#endif // wxUSE_UNICODE_MSLU
+
+#endif // __WIN32__

 
     if ( success )
     {
 
     if ( success )
     {


@@ -332,7 +447,7 @@ int wxFileDialog::ShowModal()
                 i += wxStrlen(&fileNameBuffer[i]) + 1;
             }
 #else
                 i += wxStrlen(&fileNameBuffer[i]) + 1;
             }
 #else

-            wxStringTokenizer toke(fileNameBuffer, " \t\r\n");
+            wxStringTokenizer toke(fileNameBuffer, _T(" \t\r\n"));

             m_dir = toke.GetNextToken();
             m_fileName = toke.GetNextToken();
             m_fileNames.Add(m_fileName);
             m_dir = toke.GetNextToken();
             m_fileName = toke.GetNextToken();
             m_fileNames.Add(m_fileName);


@@ -356,9 +471,21 @@ int wxFileDialog::ShowModal()
 
             m_filterIndex = (int)of.nFilterIndex - 1;
 
 
             m_filterIndex = (int)of.nFilterIndex - 1;
 

-            if ( of.nFileExtension && fileNameBuffer[ of.nFileExtension-1] != wxT('.') )
-            {                                    // user has typed an filename
-                // without an extension:
+            if ( !of.nFileExtension || 
+                 (of.nFileExtension && fileNameBuffer[of.nFileExtension] == wxT('\0')) )
+            {
+                // User has typed a filename without an extension:
+
+                // A filename can end in a "." here ("abc."), this means it
+                // does not have an extension. Because later on a "." with
+                // the default extension is appended we remove the "." if
+                // filename ends with one (We don't want files called
+                // "abc..ext")
+                int idx = wxStrlen(fileNameBuffer) - 1;
+                if ( fileNameBuffer[idx] == wxT('.') )
+                {
+                    fileNameBuffer[idx] = wxT('\0');
+                }

 
                 int   maxFilter = (int)(of.nFilterIndex*2L-1L);
                 extension = filterBuffer;
 
                 int   maxFilter = (int)(of.nFilterIndex*2L-1L);
                 extension = filterBuffer;


@@ -378,8 +505,8 @@ int wxFileDialog::ShowModal()
                     m_fileName = wxString(fileNameBuffer) + extension;
 
                     int len = wxStrlen( fileNameBuffer );
                     m_fileName = wxString(fileNameBuffer) + extension;
 
                     int len = wxStrlen( fileNameBuffer );

-                    wxStrncpy( fileNameBuffer + len, extension, MAXPATH - len );
-                    fileNameBuffer[ MAXPATH -1 ] = wxT('\0');
+                    wxStrncpy( fileNameBuffer + len, extension, wxMAXPATH - len );
+                    fileNameBuffer[ wxMAXPATH -1 ] = wxT('\0');

                 }
             }
 
                 }
             }
 


@@ -388,22 +515,6 @@ int wxFileDialog::ShowModal()
             m_fileNames.Add(m_fileName);
             m_dir = wxPathOnly(fileNameBuffer);
         }
             m_fileNames.Add(m_fileName);
             m_dir = wxPathOnly(fileNameBuffer);
         }

-
-
-        //=== Simulating the wxOVERWRITE_PROMPT >>============================
-
-        if ( (m_dialogStyle & wxOVERWRITE_PROMPT) &&
-             ::wxFileExists( fileNameBuffer ) )
-        {
-            wxString messageText;
-            messageText.Printf(_("Replace file '%s'?"), fileNameBuffer);
-
-            if ( wxMessageBox(messageText, m_message, wxYES_NO ) != wxYES )
-            {
-                success = FALSE;
-            }
-        }
-

     }
     else
     {
     }
     else
     {


@@ -432,20 +543,23 @@ wxString wxDefaultFileSelector(bool load,
                                const wxChar *default_name,
                                wxWindow *parent)
 {
                                const wxChar *default_name,
                                wxWindow *parent)
 {

-  wxString prompt;
-  wxString str;
-  if (load) str = _("Load %s file");
-  else str = _("Save %s file");
-  prompt.Printf(str, what);
+    wxString prompt;
+    wxString str;
+    if (load)
+        str = _("Load %s file");
+    else
+        str = _("Save %s file");
+    prompt.Printf(str, what);

 
 

-  const wxChar *ext = extension;
-  if (*ext == wxT('.'))
-      ext++;
+    const wxChar *ext = extension;
+    if (*ext == wxT('.'))
+        ext++;

 
 

-  wxString wild;
-  wild.Printf(wxT("*.%s"), ext);
+    wxString wild;
+    wild.Printf(wxT("*.%s"), ext);

 
 

-  return wxFileSelector (prompt, NULL, default_name, ext, wild, 0, parent);
+    return wxFileSelector(prompt, NULL, default_name, ext, wild,
+                          load ? wxOPEN : wxSAVE, parent);

 }
 
 // Generic file load dialog
 }
 
 // Generic file load dialog


@@ -466,4 +580,5 @@ WXDLLEXPORT wxString wxSaveFileSelector(const wxChar *what,
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 
     return wxDefaultFileSelector(FALSE, what, extension, default_name, parent);
 }
 

+#endif // wxUSE_FILEDLG