X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c5a1681bfec8912fae00c399f49492d80b946c37..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/dir.cpp?ds=sidebyside diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 2304b540e5..5525d72a61 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,149 +30,65 @@ #endif // PCH #include "wx/dir.h" -#include "wx/filefn.h" // for wxPathExists() +#include "wx/filefn.h" // for wxDirExists() + +#ifdef __WINDOWS__ + #include "wx/msw/private.h" +#endif // ---------------------------------------------------------------------------- // 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; - - 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); } - - 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); - - return NULL; - } - } +typedef WIN32_FIND_DATA FIND_STRUCT; +typedef HANDLE FIND_DATA; +typedef DWORD FIND_ATTR; - static inline bool FindNext(FIND_DATA fd, FIND_STRUCT * WXUNUSED(finddata)) - { - #ifdef __VISUALC__ - return _dos_findnext(fd) == 0; - #else // Borland - return findnext(fd) == 0; - #endif - } +static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; } - static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata) - { - #ifdef __VISUALC__ - return finddata->name; - #else // Borland - return finddata->ff_name; - #endif - } - - static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) - { - #ifdef __VISUALC__ - return finddata->attrib; - #else // Borland - return finddata->ff_attrib; - #endif - } - - static inline bool IsDir(FIND_ATTR attr) - { - return (attr & _A_SUBDIR) != 0; - } - - static inline bool IsHidden(FIND_ATTR attr) - { - return (attr & (_A_SYSTEM | _A_HIDDEN)) != 0; - } -#else // Win32 - #include - - 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) - { +static inline bool IsFindDataOk(FIND_DATA fd) +{ return fd != INVALID_HANDLE_VALUE; - } +} - static inline void FreeFindData(FIND_DATA fd) - { +static inline void FreeFindData(FIND_DATA fd) +{ if ( !::FindClose(fd) ) { wxLogLastError(_T("FindClose")); } - } +} - static inline FIND_DATA FindFirst(const wxString& spec, +static inline FIND_DATA FindFirst(const wxString& spec, FIND_STRUCT *finddata) - { - return ::FindFirstFile(spec, finddata); - } +{ + return ::FindFirstFile(spec.fn_str(), finddata); +} - static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata) - { +static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata) +{ return ::FindNextFile(fd, finddata) != 0; - } +} - static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata) - { +static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata) +{ return finddata->cFileName; - } +} - static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) - { +static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) +{ return finddata->dwFileAttributes; - } +} - static inline bool IsDir(FIND_ATTR attr) - { +static inline bool IsDir(FIND_ATTR attr) +{ return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0; - } +} - static inline bool IsHidden(FIND_ATTR attr) - { +static inline bool IsHidden(FIND_ATTR attr) +{ return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0; - } -#endif // __WIN16__ +} // ---------------------------------------------------------------------------- // constants @@ -210,6 +122,8 @@ public: void Rewind(); bool Read(wxString *filename); + const wxString& GetName() const { return m_dirname; } + private: FIND_DATA m_finddata; @@ -217,6 +131,8 @@ private: wxString m_filespec; int m_flags; + + DECLARE_NO_COPY_CLASS(wxDirData) }; // ============================================================================ @@ -255,25 +171,27 @@ 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) ) { // open first - wxString filespec; - filespec << m_dirname << _T('\\') - << (!m_filespec ? _T("*.*") : m_filespec.c_str()); + wxString filespec = m_dirname; + if ( !wxEndsWithPathSeparator(filespec) ) + { + filespec += _T('\\'); + } + if ( !m_filespec ) + filespec += _T("*.*"); + else + filespec += m_filespec; m_finddata = FindFirst(filespec, PTR_TO_FINDDATA); - first = TRUE; + first = true; } if ( !IsFindDataOk(m_finddata) ) @@ -281,7 +199,7 @@ 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'"), m_dirname.c_str()); @@ -289,7 +207,7 @@ bool wxDirData::Read(wxString *filename) #endif // __WIN32__ //else: not an error, just no (such) files - return FALSE; + return false; } const wxChar *name; @@ -299,7 +217,7 @@ bool wxDirData::Read(wxString *filename) { if ( first ) { - first = FALSE; + first = false; } else { @@ -315,7 +233,7 @@ bool wxDirData::Read(wxString *filename) #endif // __WIN32__ //else: not an error, just no more (such) files - return FALSE; + return false; } } @@ -358,7 +276,7 @@ bool wxDirData::Read(wxString *filename) break; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -368,7 +286,7 @@ bool wxDirData::Read(wxString *filename) /* static */ bool wxDir::Exists(const wxString& dir) { - return wxPathExists(dir); + return wxDirExists(dir); } // ---------------------------------------------------------------------------- @@ -387,7 +305,7 @@ bool wxDir::Open(const wxString& dirname) delete M_DIR; m_data = new wxDirData(dirname); - return TRUE; + return true; } bool wxDir::IsOpened() const @@ -395,6 +313,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; @@ -408,7 +348,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(); @@ -420,9 +360,48 @@ 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) +{ +#ifdef __WXWINCE__ + // FindFirst() is going to fail + wxASSERT_MSG( !dirname.empty(), + _T("incorrect directory name format in wxGetDirectoryTimes") ); +#else + // FindFirst() is going to fail + wxASSERT_MSG( !dirname.empty() && dirname.Last() != _T('\\'), + _T("incorrect directory name format in wxGetDirectoryTimes") ); +#endif + + 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__ +