X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5613bc20ed8fbd2736f96bc1ecb98977870448d0..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/msw/dir.cpp diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 3fd7ebb9d4..55f855cf6f 100644 --- 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: @@ -30,7 +30,6 @@ #endif // PCH #include "wx/dir.h" -#include "wx/filefn.h" // for wxDirExists() #ifdef __WINDOWS__ #include "wx/msw/private.h" @@ -40,56 +39,104 @@ // define the types and functions used for file searching // ---------------------------------------------------------------------------- +namespace +{ + typedef WIN32_FIND_DATA FIND_STRUCT; typedef HANDLE FIND_DATA; typedef DWORD FIND_ATTR; -static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; } +inline FIND_DATA InitFindData() +{ + return INVALID_HANDLE_VALUE; +} -static inline bool IsFindDataOk(FIND_DATA fd) +inline bool IsFindDataOk(FIND_DATA fd) { return fd != INVALID_HANDLE_VALUE; } -static inline void FreeFindData(FIND_DATA fd) +inline void FreeFindData(FIND_DATA fd) { - if ( !::FindClose(fd) ) - { - wxLogLastError(_T("FindClose")); - } + if ( !::FindClose(fd) ) + { + wxLogLastError(wxT("FindClose")); + } +} + +const wxChar *GetNameFromFindData(const FIND_STRUCT *finddata) +{ + return finddata->cFileName; } -static inline FIND_DATA FindFirst(const wxString& spec, - 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 ::FindFirstFile(spec, finddata); + return filter.empty() || + wxString(GetNameFromFindData(finddata)).Matches(filter); } -static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata) +inline bool +FindNext(FIND_DATA fd, const wxString& filter, FIND_STRUCT *finddata) { - return ::FindNextFile(fd, finddata) != 0; + for ( ;; ) + { + if ( !::FindNextFile(fd, finddata) ) + return false; + + // If we did find something, check that it really matches. + if ( CheckFoundMatch(finddata, filter) ) + return true; + } } -static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata) +inline FIND_DATA +FindFirst(const wxString& spec, + const wxString& filter, + FIND_STRUCT *finddata) { - return finddata->cFileName; + 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; } -static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) +inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) { - return finddata->dwFileAttributes; + return finddata->dwFileAttributes; } -static inline bool IsDir(FIND_ATTR attr) +inline bool IsDir(FIND_ATTR attr) { - return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0; + return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0; } -static inline bool IsHidden(FIND_ATTR attr) +inline bool IsHidden(FIND_ATTR attr) { - return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0; + return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0; } +} // anonymous namespace + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -132,7 +179,7 @@ private: int m_flags; - DECLARE_NO_COPY_CLASS(wxDirData) + wxDECLARE_NO_COPY_CLASS(wxDirData); }; // ============================================================================ @@ -182,11 +229,14 @@ bool wxDirData::Read(wxString *filename) 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; } @@ -198,7 +248,7 @@ bool wxDirData::Read(wxString *filename) 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__ @@ -218,14 +268,14 @@ bool wxDirData::Read(wxString *filename) } 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 ) { - wxLogLastError(_T("FindNext")); + wxLogLastError(wxT("FindNext")); } #endif // __WIN32__ //else: not an error, just no more (such) files @@ -238,9 +288,9 @@ bool wxDirData::Read(wxString *filename) 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; @@ -276,16 +326,6 @@ bool wxDirData::Read(wxString *filename) return true; } -// ---------------------------------------------------------------------------- -// wxDir helpers -// ---------------------------------------------------------------------------- - -/* static */ -bool wxDir::Exists(const wxString& dir) -{ - return wxDirExists(dir); -} - // ---------------------------------------------------------------------------- // wxDir construction/destruction // ---------------------------------------------------------------------------- @@ -300,9 +340,20 @@ wxDir::wxDir(const wxString& dirname) 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 @@ -319,9 +370,9 @@ wxString wxDir::GetName() const if ( !name.empty() ) { // bring to canonical Windows form - name.Replace(_T("/"), _T("\\")); + name.Replace(wxT("/"), wxT("\\")); - if ( name.Last() == _T('\\') ) + if ( name.Last() == wxT('\\') ) { // chop off the last (back)slash name.Truncate(name.length() - 1); @@ -332,9 +383,13 @@ wxString wxDir::GetName() const return name; } -wxDir::~wxDir() +void wxDir::Close() { - delete M_DIR; + if ( m_data ) + { + delete m_data; + m_data = NULL; + } } // ---------------------------------------------------------------------------- @@ -345,7 +400,7 @@ bool wxDir::GetFirst(wxString *filename, 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(); @@ -357,9 +412,9 @@ bool wxDir::GetFirst(wxString *filename, 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); } @@ -374,12 +429,18 @@ extern bool wxGetDirectoryTimes(const wxString& dirname, FILETIME *ftAccess, FILETIME *ftCreate, FILETIME *ftMod) { +#ifdef __WXWINCE__ // FindFirst() is going to fail - wxASSERT_MSG( !dirname.empty() && dirname.Last() != _T('\\'), - _T("incorrect directory name format in wxGetDirectoryTimes") ); + 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, &fs); + FIND_DATA fd = FindFirst(dirname, wxEmptyString, &fs); if ( !IsFindDataOk(fd) ) { return false;