missing commit

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

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index adfa2dd7e31284b383d42e536a6033e79bb1b7e3..55f855cf6f9ffe9ecbd48b917a64f6e2b829b98b 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxDir implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     wxDir implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "dir.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,160 +24,118 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-// For _A_SUBDIR, etc.
-#if defined(__BORLANDC__) && defined(__WIN16__)
-#include <dos.h>
-#endif
-

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // PCH
 
 #include "wx/dir.h"
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // PCH
 
 #include "wx/dir.h"

-#include "wx/filefn.h"          // for wxPathExists()
+
+#ifdef __WINDOWS__
+    #include "wx/msw/private.h"
+#endif

 
 // ----------------------------------------------------------------------------
 // define the types and functions used for file searching
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // define the types and functions used for file searching
 // ----------------------------------------------------------------------------
 

-// under Win16 use compiler-specific functions
-#ifdef __WIN16__
-    #ifdef __VISUALC__
-        #include <dos.h>
-        #include <errno.h>
-
-        typedef struct _find_t FIND_STRUCT;
-    #elif defined(__BORLANDC__)
-        #include <dir.h>
-
-        typedef struct ffblk FIND_STRUCT;
-    #else
-        #error "No directory searching functions for this compiler"
-    #endif
-
-    typedef FIND_STRUCT *FIND_DATA;
-    typedef char FIND_ATTR;
+namespace
+{

 
 

-    static inline FIND_DATA InitFindData() { return (FIND_DATA)NULL; }
-    static inline bool IsFindDataOk(FIND_DATA fd) { return fd != NULL; }
-    static inline void FreeFindData(FIND_DATA fd) { free(fd); }
+typedef WIN32_FIND_DATA FIND_STRUCT;
+typedef HANDLE FIND_DATA;
+typedef DWORD FIND_ATTR;

 
 

-    static inline FIND_DATA FindFirst(const wxString& spec,
-                                      FIND_STRUCT * WXUNUSED(finddata))
-    {
-        // attribute to find all files
-        static const FIND_ATTR attr = 0x3F;
-
-        FIND_DATA fd = (FIND_DATA)malloc(sizeof(FIND_STRUCT));
-
-        if (
-        #ifdef __VISUALC__
-            _dos_findfirst(spec, attr, fd) == 0
-        #else // Borland
-            findfirst(spec, fd, attr) == 0
-        #endif
-           )
-        {
-            return fd;
-        }
-        else
-        {
-            free(fd);
+inline FIND_DATA InitFindData()
+{
+    return INVALID_HANDLE_VALUE;
+}

 
 

-            return NULL;
-        }
-    }
+inline bool IsFindDataOk(FIND_DATA fd)
+{
+        return fd != INVALID_HANDLE_VALUE;
+}

 
 

-    static inline bool FindNext(FIND_DATA fd, FIND_STRUCT * WXUNUSED(finddata))
+inline void FreeFindData(FIND_DATA fd)
+{
+    if ( !::FindClose(fd) )

     {
     {

-        #ifdef __VISUALC__
-            return _dos_findnext(fd) == 0;
-        #else // Borland
-            return findnext(fd) == 0;
-        #endif
+        wxLogLastError(wxT("FindClose"));

     }
     }

+}

 
 

-    static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
-    {
-        #ifdef __VISUALC__
-            return finddata->name;
-        #else // Borland
-            return finddata->ff_name;
-        #endif
-    }
+const wxChar *GetNameFromFindData(const FIND_STRUCT *finddata)
+{
+    return finddata->cFileName;
+}

 
 

-    static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
-    {
-        #ifdef __VISUALC__
-            return finddata->attrib;
-        #else // Borland
-            return finddata->ff_attrib;
-        #endif
-    }
+// Helper function checking that the contents of the given FIND_STRUCT really
+// match our filter. We need to do it ourselves as native Windows functions
+// apply the filter to both the long and the short names of the file, so
+// something like "*.bar" matches "foo.bar.baz" too and not only "foo.bar", so
+// we have to double check that we have a real match.
+inline bool
+CheckFoundMatch(const FIND_STRUCT* finddata, const wxString& filter)
+{
+    return filter.empty() ||
+                wxString(GetNameFromFindData(finddata)).Matches(filter);
+}

 
 

-    static inline bool IsDir(FIND_ATTR attr)
+inline bool
+FindNext(FIND_DATA fd, const wxString& filter, FIND_STRUCT *finddata)
+{
+    for ( ;; )

     {
     {

-        return (attr & _A_SUBDIR) != 0;
-    }
+        if ( !::FindNextFile(fd, finddata) )
+            return false;

 
 

-    static inline bool IsHidden(FIND_ATTR attr)
-    {
-        return (attr & (_A_SYSTEM | _A_HIDDEN)) != 0;
+        // If we did find something, check that it really matches.
+        if ( CheckFoundMatch(finddata, filter) )
+            return true;

     }
     }

-#else // Win32
-    #include <windows.h>
-
-    typedef WIN32_FIND_DATA FIND_STRUCT;
-    typedef HANDLE FIND_DATA;
-    typedef DWORD FIND_ATTR;
-
-    static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; }
+}

 
 

-    static inline bool IsFindDataOk(FIND_DATA fd)
-    {
-        return fd != INVALID_HANDLE_VALUE;
-    }
+inline FIND_DATA
+FindFirst(const wxString& spec,
+          const wxString& filter,
+          FIND_STRUCT *finddata)
+{
+    FIND_DATA fd = ::FindFirstFile(spec.t_str(), finddata);

 
 

-    static inline void FreeFindData(FIND_DATA fd)
+    // As in FindNext() above, we need to check that the file name we found
+    // really matches our filter and look for the next match if it doesn't.
+    if ( IsFindDataOk(fd) && !CheckFoundMatch(finddata, filter) )

     {
     {

-        if ( !::FindClose(fd) )
+        if ( !FindNext(fd, filter, finddata) )

         {
         {

-            wxLogLastError(_T("FindClose"));
-        }
-    }
+            // As we return the invalid handle from here to indicate that we
+            // didn't find anything, close the one we initially received
+            // ourselves.
+            FreeFindData(fd);

 
 

-    static inline FIND_DATA FindFirst(const wxString& spec,
-                                      FIND_STRUCT *finddata)
-    {
-        return ::FindFirstFile(spec, finddata);
+            return INVALID_HANDLE_VALUE;
+        }

     }
 
     }
 

-    static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
-    {
-        return ::FindNextFile(fd, finddata) != 0;
-    }
+    return fd;
+}

 
 

-    static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
-    {
-        return finddata->cFileName;
-    }
+inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
+{
+    return finddata->dwFileAttributes;
+}

 
 

-    static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
-    {
-        return finddata->dwFileAttributes;
-    }
+inline bool IsDir(FIND_ATTR attr)
+{
+    return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
+}

 
 

-    static inline bool IsDir(FIND_ATTR attr)
-    {
-        return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
-    }
+inline bool IsHidden(FIND_ATTR attr)
+{
+    return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
+}

 
 

-    static inline bool IsHidden(FIND_ATTR attr)
-    {
-        return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
-    }
-#endif // __WIN16__
+} // anonymous namespace

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -215,6 +169,8 @@ public:
     void Rewind();
     bool Read(wxString *filename);
 
     void Rewind();
     bool Read(wxString *filename);
 

+    const wxString& GetName() const { return m_dirname; }
+

 private:
     FIND_DATA m_finddata;
 
 private:
     FIND_DATA m_finddata;
 


@@ -222,6 +178,8 @@ private:
     wxString m_filespec;
 
     int      m_flags;
     wxString m_filespec;
 
     int      m_flags;

+
+    wxDECLARE_NO_COPY_CLASS(wxDirData);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -260,14 +218,10 @@ void wxDirData::Rewind()
 
 bool wxDirData::Read(wxString *filename)
 {
 
 bool wxDirData::Read(wxString *filename)
 {

-    bool first = FALSE;
+    bool first = false;

 
 

-#ifdef __WIN32__

     WIN32_FIND_DATA finddata;
     #define PTR_TO_FINDDATA (&finddata)
     WIN32_FIND_DATA finddata;
     #define PTR_TO_FINDDATA (&finddata)

-#else // Win16
-    #define PTR_TO_FINDDATA (m_finddata)
-#endif

 
     if ( !IsFindDataOk(m_finddata) )
     {
 
     if ( !IsFindDataOk(m_finddata) )
     {


@@ -275,13 +229,16 @@ bool wxDirData::Read(wxString *filename)
         wxString filespec = m_dirname;
         if ( !wxEndsWithPathSeparator(filespec) )
         {
         wxString filespec = m_dirname;
         if ( !wxEndsWithPathSeparator(filespec) )
         {

-            filespec += _T('\\');
+            filespec += wxT('\\');

         }
         }

-        filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
+        if ( !m_filespec )
+            filespec += wxT("*.*");
+        else
+            filespec += m_filespec;

 
 

-        m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
+        m_finddata = FindFirst(filespec, m_filespec, PTR_TO_FINDDATA);

 
 

-        first = TRUE;
+        first = true;

     }
 
     if ( !IsFindDataOk(m_finddata) )
     }
 
     if ( !IsFindDataOk(m_finddata) )


@@ -289,15 +246,15 @@ bool wxDirData::Read(wxString *filename)
 #ifdef __WIN32__
         DWORD err = ::GetLastError();
 
 #ifdef __WIN32__
         DWORD err = ::GetLastError();
 

-        if ( err != ERROR_FILE_NOT_FOUND )
+        if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )

         {
         {

-            wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
+            wxLogSysError(err, _("Cannot enumerate files in directory '%s'"),

                           m_dirname.c_str());
         }
 #endif // __WIN32__
         //else: not an error, just no (such) files
 
                           m_dirname.c_str());
         }
 #endif // __WIN32__
         //else: not an error, just no (such) files
 

-        return FALSE;
+        return false;

     }
 
     const wxChar *name;
     }
 
     const wxChar *name;


@@ -307,23 +264,23 @@ bool wxDirData::Read(wxString *filename)
     {
         if ( first )
         {
     {
         if ( first )
         {

-            first = FALSE;
+            first = false;

         }
         else
         {
         }
         else
         {

-            if ( !FindNext(m_finddata, PTR_TO_FINDDATA) )
+            if ( !FindNext(m_finddata, m_filespec, PTR_TO_FINDDATA) )

             {
 #ifdef __WIN32__
                 DWORD err = ::GetLastError();
 
                 if ( err != ERROR_NO_MORE_FILES )
                 {
             {
 #ifdef __WIN32__
                 DWORD err = ::GetLastError();
 
                 if ( err != ERROR_NO_MORE_FILES )
                 {

-                    wxLogLastError(_T("FindNext"));
+                    wxLogLastError(wxT("FindNext"));

                 }
 #endif // __WIN32__
                 //else: not an error, just no more (such) files
 
                 }
 #endif // __WIN32__
                 //else: not an error, just no more (such) files
 

-                return FALSE;
+                return false;

             }
         }
 
             }
         }
 


@@ -331,9 +288,9 @@ bool wxDirData::Read(wxString *filename)
         attr = GetAttrFromFindData(PTR_TO_FINDDATA);
 
         // don't return "." and ".." unless asked for
         attr = GetAttrFromFindData(PTR_TO_FINDDATA);
 
         // don't return "." and ".." unless asked for

-        if ( name[0] == _T('.') &&
-             ((name[1] == _T('.') && name[2] == _T('\0')) ||
-              (name[1] == _T('\0'))) )
+        if ( name[0] == wxT('.') &&
+             ((name[1] == wxT('.') && name[2] == wxT('\0')) ||
+              (name[1] == wxT('\0'))) )

         {
             if ( !(m_flags & wxDIR_DOTDOT) )
                 continue;
         {
             if ( !(m_flags & wxDIR_DOTDOT) )
                 continue;


@@ -366,17 +323,7 @@ bool wxDirData::Read(wxString *filename)
         break;
     }
 
         break;
     }
 

-    return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxPathExists(dir);
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -393,9 +340,20 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;

-    m_data = new wxDirData(dirname);

 
 

-    return TRUE;
+    // The Unix code does a similar test
+    if (wxDirExists(dirname))
+    {
+        m_data = new wxDirData(dirname);
+
+        return true;
+    }
+    else
+    {
+        m_data = NULL;
+
+        return false;
+    }

 }
 
 bool wxDir::IsOpened() const
 }
 
 bool wxDir::IsOpened() const


@@ -403,9 +361,35 @@ bool wxDir::IsOpened() const
     return m_data != NULL;
 }
 
     return m_data != NULL;
 }
 

-wxDir::~wxDir()
+wxString wxDir::GetName() const

 {
 {

-    delete M_DIR;
+    wxString name;
+    if ( m_data )
+    {
+        name = M_DIR->GetName();
+        if ( !name.empty() )
+        {
+            // bring to canonical Windows form
+            name.Replace(wxT("/"), wxT("\\"));
+
+            if ( name.Last() == wxT('\\') )
+            {
+                // chop off the last (back)slash
+                name.Truncate(name.length() - 1);
+            }
+        }
+    }
+
+    return name;
+}
+
+void wxDir::Close()
+{
+    if ( m_data )
+    {
+        delete m_data;
+        m_data = NULL;
+    }

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -416,7 +400,7 @@ bool wxDir::GetFirst(wxString *filename,
                      const wxString& filespec,
                      int flags) const
 {
                      const wxString& filespec,
                      int flags) const
 {

-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );

 
     M_DIR->Rewind();
 
 
     M_DIR->Rewind();
 


@@ -428,9 +412,48 @@ bool wxDir::GetFirst(wxString *filename,
 
 bool wxDir::GetNext(wxString *filename) const
 {
 
 bool wxDir::GetNext(wxString *filename) const
 {

-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );

 
 

-    wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( filename, false, wxT("bad pointer in wxDir::GetNext()") );

 
     return M_DIR->Read(filename);
 }
 
     return M_DIR->Read(filename);
 }

+
+// ----------------------------------------------------------------------------
+// wxGetDirectoryTimes: used by wxFileName::GetTimes()
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+
+extern bool
+wxGetDirectoryTimes(const wxString& dirname,
+                    FILETIME *ftAccess, FILETIME *ftCreate, FILETIME *ftMod)
+{
+#ifdef __WXWINCE__
+    // FindFirst() is going to fail
+    wxASSERT_MSG( !dirname.empty(),
+                  wxT("incorrect directory name format in wxGetDirectoryTimes") );
+#else
+    // FindFirst() is going to fail
+    wxASSERT_MSG( !dirname.empty() && dirname.Last() != wxT('\\'),
+                  wxT("incorrect directory name format in wxGetDirectoryTimes") );
+#endif
+
+    FIND_STRUCT fs;
+    FIND_DATA fd = FindFirst(dirname, wxEmptyString, &fs);
+    if ( !IsFindDataOk(fd) )
+    {
+        return false;
+    }
+
+    *ftAccess = fs.ftLastAccessTime;
+    *ftCreate = fs.ftCreationTime;
+    *ftMod = fs.ftLastWriteTime;
+
+    FindClose(fd);
+
+    return true;
+}
+
+#endif // __WIN32__
+