X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1944c6bdd0daa0a9793e9a57f0800c169fec958b..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/msw/dir.cpp?ds=sidebyside diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 8e993552a5..3fd7ebb9d4 100644 --- a/src/msw/dir.cpp +++ b/src/msw/dir.cpp @@ -6,7 +6,7 @@ // Created: 08.12.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "dir.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -34,9 +30,65 @@ #endif // PCH #include "wx/dir.h" -#include "wx/filefn.h" // for wxPathExists() +#include "wx/filefn.h" // for wxDirExists() -#include +#ifdef __WINDOWS__ + #include "wx/msw/private.h" +#endif + +// ---------------------------------------------------------------------------- +// define the types and functions used for file searching +// ---------------------------------------------------------------------------- + +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; +} + +static inline void FreeFindData(FIND_DATA fd) +{ + if ( !::FindClose(fd) ) + { + wxLogLastError(_T("FindClose")); + } +} + +static inline FIND_DATA FindFirst(const wxString& spec, + FIND_STRUCT *finddata) +{ + return ::FindFirstFile(spec, finddata); +} + +static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata) +{ + return ::FindNextFile(fd, finddata) != 0; +} + +static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata) +{ + return finddata->cFileName; +} + +static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) +{ + return finddata->dwFileAttributes; +} + +static inline bool IsDir(FIND_ATTR attr) +{ + return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0; +} + +static inline bool IsHidden(FIND_ATTR attr) +{ + return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0; +} // ---------------------------------------------------------------------------- // constants @@ -70,13 +122,17 @@ public: void Rewind(); bool Read(wxString *filename); + const wxString& GetName() const { return m_dirname; } + private: - HANDLE m_handle; + FIND_DATA m_finddata; wxString m_dirname; wxString m_filespec; int m_flags; + + DECLARE_NO_COPY_CLASS(wxDirData) }; // ============================================================================ @@ -90,16 +146,7 @@ private: wxDirData::wxDirData(const wxString& dirname) : m_dirname(dirname) { - m_handle = INVALID_HANDLE_VALUE; - - // throw away the trailing slashes - size_t n = m_dirname.length(); - wxCHECK_RET( n, _T("empty dir name in wxDir") ); - - while ( n > 0 && wxIsPathSeparator(m_dirname[--n]) ) - ; - - m_dirname.Truncate(n + 1); + m_finddata = InitFindData(); } wxDirData::~wxDirData() @@ -109,12 +156,11 @@ wxDirData::~wxDirData() void wxDirData::Close() { - if ( m_handle != INVALID_HANDLE_VALUE ) + if ( IsFindDataOk(m_finddata) ) { - if ( !::FindClose(m_handle) ) - { - wxLogLastError(_T("FindClose")); - } + FreeFindData(m_finddata); + + m_finddata = InitFindData(); } } @@ -125,61 +171,71 @@ void wxDirData::Rewind() bool wxDirData::Read(wxString *filename) { - bool first = FALSE; + bool first = false; WIN32_FIND_DATA finddata; - if ( m_handle == INVALID_HANDLE_VALUE ) + #define PTR_TO_FINDDATA (&finddata) + + if ( !IsFindDataOk(m_finddata) ) { // open first - m_handle = ::FindFirstFile(!m_filespec ? _T("*.*") : m_filespec.c_str(), - &finddata); + wxString filespec = m_dirname; + if ( !wxEndsWithPathSeparator(filespec) ) + { + filespec += _T('\\'); + } + filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str()); + + m_finddata = FindFirst(filespec, PTR_TO_FINDDATA); - first = TRUE; + first = true; } - if ( m_handle == INVALID_HANDLE_VALUE ) + if ( !IsFindDataOk(m_finddata) ) { +#ifdef __WIN32__ DWORD err = ::GetLastError(); - if ( 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'"), m_dirname.c_str()); } +#endif // __WIN32__ //else: not an error, just no (such) files - return FALSE; + return false; } - bool matches = FALSE; - const wxChar *name; - DWORD attr; + FIND_ATTR attr; - while ( !matches ) + for ( ;; ) { if ( first ) { - first = FALSE; + first = false; } else { - if ( !::FindNextFile(m_handle, &finddata) ) + if ( !FindNext(m_finddata, PTR_TO_FINDDATA) ) { +#ifdef __WIN32__ DWORD err = ::GetLastError(); if ( err != ERROR_NO_MORE_FILES ) { wxLogLastError(_T("FindNext")); } +#endif // __WIN32__ //else: not an error, just no more (such) files - return FALSE; + return false; } } - name = finddata.cFileName; - attr = finddata.dwFileAttributes; + name = GetNameFromFindData(PTR_TO_FINDDATA); + attr = GetAttrFromFindData(PTR_TO_FINDDATA); // don't return "." and ".." unless asked for if ( name[0] == _T('.') && @@ -191,12 +247,12 @@ bool wxDirData::Read(wxString *filename) } // check the type now - if ( !(m_flags & wxDIR_FILES) && !(attr & FILE_ATTRIBUTE_DIRECTORY) ) + if ( !(m_flags & wxDIR_FILES) && !IsDir(attr) ) { // it's a file, but we don't want them continue; } - else if ( !(m_flags & wxDIR_DIRS) && (attr & FILE_ATTRIBUTE_DIRECTORY) ) + else if ( !(m_flags & wxDIR_DIRS) && IsDir(attr) ) { // it's a dir, and we don't want it continue; @@ -205,13 +261,19 @@ bool wxDirData::Read(wxString *filename) // finally, check whether it's a hidden file if ( !(m_flags & wxDIR_HIDDEN) ) { - matches = !(attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)); + if ( IsHidden(attr) ) + { + // it's a hidden file, skip it + continue; + } } - } - *filename = name; + *filename = name; - return TRUE; + break; + } + + return true; } // ---------------------------------------------------------------------------- @@ -221,7 +283,7 @@ bool wxDirData::Read(wxString *filename) /* static */ bool wxDir::Exists(const wxString& dir) { - return wxPathExists(dir); + return wxDirExists(dir); } // ---------------------------------------------------------------------------- @@ -240,7 +302,7 @@ bool wxDir::Open(const wxString& dirname) delete M_DIR; m_data = new wxDirData(dirname); - return TRUE; + return true; } bool wxDir::IsOpened() const @@ -248,6 +310,28 @@ bool wxDir::IsOpened() const return m_data != NULL; } +wxString wxDir::GetName() const +{ + wxString name; + if ( m_data ) + { + name = M_DIR->GetName(); + if ( !name.empty() ) + { + // bring to canonical Windows form + name.Replace(_T("/"), _T("\\")); + + if ( name.Last() == _T('\\') ) + { + // chop off the last (back)slash + name.Truncate(name.length() - 1); + } + } + } + + return name; +} + wxDir::~wxDir() { delete M_DIR; @@ -261,7 +345,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, _T("must wxDir::Open() first") ); M_DIR->Rewind(); @@ -273,9 +357,42 @@ bool wxDir::GetFirst(wxString *filename, bool wxDir::GetNext(wxString *filename) const { - wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") ); + wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") ); - wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") ); + wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") ); return M_DIR->Read(filename); } + +// ---------------------------------------------------------------------------- +// wxGetDirectoryTimes: used by wxFileName::GetTimes() +// ---------------------------------------------------------------------------- + +#ifdef __WIN32__ + +extern bool +wxGetDirectoryTimes(const wxString& dirname, + FILETIME *ftAccess, FILETIME *ftCreate, FILETIME *ftMod) +{ + // FindFirst() is going to fail + wxASSERT_MSG( !dirname.empty() && dirname.Last() != _T('\\'), + _T("incorrect directory name format in wxGetDirectoryTimes") ); + + FIND_STRUCT fs; + FIND_DATA fd = FindFirst(dirname, &fs); + if ( !IsFindDataOk(fd) ) + { + return false; + } + + *ftAccess = fs.ftLastAccessTime; + *ftCreate = fs.ftCreationTime; + *ftMod = fs.ftLastWriteTime; + + FindClose(fd); + + return true; +} + +#endif // __WIN32__ +