X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4676948b6814c97b93c431a8cbcd8c0352c87ba9..b960795ea82b702f302e99e547416cb573865413:/src/msw/dir.cpp diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 514c4c3c89..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: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "dir.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -28,20 +24,14 @@ #pragma hdrstop #endif -// For _A_SUBDIR, etc. -#if defined(__BORLANDC__) && defined(__WIN16__) -#include -#endif - #ifndef WX_PRECOMP #include "wx/intl.h" #include "wx/log.h" #endif // PCH #include "wx/dir.h" -#include "wx/filefn.h" // for wxPathExists() -#ifdef __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/private.h" #endif @@ -49,141 +39,103 @@ // define the types and functions used for file searching // ---------------------------------------------------------------------------- -// under Win16 use compiler-specific functions -#ifdef __WIN16__ - #ifdef __VISUALC__ - #include - #include - - typedef struct _find_t FIND_STRUCT; - #elif defined(__BORLANDC__) - #include - - 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 - 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 @@ -227,7 +179,7 @@ private: int m_flags; - DECLARE_NO_COPY_CLASS(wxDirData) + wxDECLARE_NO_COPY_CLASS(wxDirData); }; // ============================================================================ @@ -266,14 +218,10 @@ void wxDirData::Rewind() bool wxDirData::Read(wxString *filename) { - bool first = FALSE; + bool first = false; -#ifdef __WIN32__ WIN32_FIND_DATA finddata; #define PTR_TO_FINDDATA (&finddata) -#else // Win16 - #define PTR_TO_FINDDATA (m_finddata) -#endif if ( !IsFindDataOk(m_finddata) ) { @@ -281,13 +229,16 @@ 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; + first = true; } if ( !IsFindDataOk(m_finddata) ) @@ -295,15 +246,15 @@ bool wxDirData::Read(wxString *filename) #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 - return FALSE; + return false; } const wxChar *name; @@ -313,23 +264,23 @@ bool wxDirData::Read(wxString *filename) { if ( first ) { - first = FALSE; + first = false; } 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 - return FALSE; + return false; } } @@ -337,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; @@ -372,17 +323,7 @@ bool wxDirData::Read(wxString *filename) break; } - return TRUE; -} - -// ---------------------------------------------------------------------------- -// wxDir helpers -// ---------------------------------------------------------------------------- - -/* static */ -bool wxDir::Exists(const wxString& dir) -{ - return wxPathExists(dir); + return true; } // ---------------------------------------------------------------------------- @@ -399,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 @@ -418,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); @@ -431,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; + } } // ---------------------------------------------------------------------------- @@ -444,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(); @@ -456,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); } @@ -473,15 +429,21 @@ 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; + return false; } *ftAccess = fs.ftLastAccessTime; @@ -490,7 +452,7 @@ wxGetDirectoryTimes(const wxString& dirname, FindClose(fd); - return TRUE; + return true; } #endif // __WIN32__