missing commit

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

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

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

 // Purpose:     wxDir implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxDir implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -64,20 +64,60 @@ inline void FreeFindData(FIND_DATA fd)
     }
 }
 
     }
 }
 

-inline FIND_DATA FindFirst(const wxString& spec,
-                           FIND_STRUCT *finddata)
+const wxChar *GetNameFromFindData(const FIND_STRUCT *finddata)

 {
 {

-    return ::FindFirstFile(spec.t_str(), finddata);
+    return finddata->cFileName;

 }
 
 }
 

-inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
+// 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 ::FindNextFile(fd, finddata) != 0;
+    return filter.empty() ||
+                wxString(GetNameFromFindData(finddata)).Matches(filter);

 }
 
 }
 

-const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+inline bool
+FindNext(FIND_DATA fd, const wxString& filter, FIND_STRUCT *finddata)

 {
 {

-    return finddata->cFileName;
+    for ( ;; )
+    {
+        if ( !::FindNextFile(fd, finddata) )
+            return false;
+
+        // If we did find something, check that it really matches.
+        if ( CheckFoundMatch(finddata, filter) )
+            return true;
+    }
+}
+
+inline FIND_DATA
+FindFirst(const wxString& spec,
+          const wxString& filter,
+          FIND_STRUCT *finddata)
+{
+    FIND_DATA fd = ::FindFirstFile(spec.t_str(), finddata);
+
+    // 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 ( !FindNext(fd, filter, finddata) )
+        {
+            // 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);
+
+            return INVALID_HANDLE_VALUE;
+        }
+    }
+
+    return fd;

 }
 
 inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
 }
 
 inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)


@@ -196,7 +236,7 @@ bool wxDirData::Read(wxString *filename)
         else
             filespec += m_filespec;
 
         else
             filespec += m_filespec;
 

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

 
         first = true;
     }
 
         first = true;
     }


@@ -208,7 +248,7 @@ bool wxDirData::Read(wxString *filename)
 
         if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
         {
 
         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__
                           m_dirname.c_str());
         }
 #endif // __WIN32__


@@ -228,7 +268,7 @@ bool wxDirData::Read(wxString *filename)
         }
         else
         {
         }
         else
         {

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

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


@@ -343,9 +383,13 @@ wxString wxDir::GetName() const
     return name;
 }
 
     return name;
 }
 

-wxDir::~wxDir()
+void wxDir::Close()

 {
 {

-    delete M_DIR;
+    if ( m_data )
+    {
+        delete m_data;
+        m_data = NULL;
+    }

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


@@ -396,7 +440,7 @@ wxGetDirectoryTimes(const wxString& dirname,
 #endif
 
     FIND_STRUCT fs;
 #endif
 
     FIND_STRUCT fs;

-    FIND_DATA fd = FindFirst(dirname, &fs);
+    FIND_DATA fd = FindFirst(dirname, wxEmptyString, &fs);

     if ( !IsFindDataOk(fd) )
     {
         return false;
     if ( !IsFindDataOk(fd) )
     {
         return false;