X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..1f77d487b7ce351b20033312a038f9bb1eb01efc:/src/msw/dir.cpp?ds=inline diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 6e51506f8b..48d4e4e0a5 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" @@ -28,160 +24,78 @@ #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 __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; - } - } - - 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 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 +namespace +{ - typedef WIN32_FIND_DATA FIND_STRUCT; - typedef HANDLE FIND_DATA; - typedef DWORD FIND_ATTR; +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) ) { - if ( !::FindClose(fd) ) - { - wxLogLastError(_T("FindClose")); - } + wxLogLastError(wxT("FindClose")); } +} - static inline FIND_DATA FindFirst(const wxString& spec, - FIND_STRUCT *finddata) - { - return ::FindFirstFile(spec, finddata); - } +inline FIND_DATA FindFirst(const wxString& spec, + FIND_STRUCT *finddata) +{ + return ::FindFirstFile(spec.t_str(), finddata); +} - static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata) - { - return ::FindNextFile(fd, finddata) != 0; - } +inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata) +{ + return ::FindNextFile(fd, finddata) != 0; +} - static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata) - { - return finddata->cFileName; - } +const wxChar *GetNameFromFindData(FIND_STRUCT *finddata) +{ + return finddata->cFileName; +} - static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) - { - return finddata->dwFileAttributes; - } +inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata) +{ + return finddata->dwFileAttributes; +} - static inline bool IsDir(FIND_ATTR attr) - { - return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0; - } +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; - } -#endif // __WIN16__ +inline bool IsHidden(FIND_ATTR attr) +{ + return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0; +} + +} // anonymous namespace // ---------------------------------------------------------------------------- // constants @@ -224,6 +138,8 @@ private: wxString m_filespec; int m_flags; + + wxDECLARE_NO_COPY_CLASS(wxDirData); }; // ============================================================================ @@ -262,14 +178,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) ) { @@ -277,13 +189,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); - first = TRUE; + first = true; } if ( !IsFindDataOk(m_finddata) ) @@ -291,7 +206,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()); @@ -299,7 +214,7 @@ bool wxDirData::Read(wxString *filename) #endif // __WIN32__ //else: not an error, just no (such) files - return FALSE; + return false; } const wxChar *name; @@ -309,7 +224,7 @@ bool wxDirData::Read(wxString *filename) { if ( first ) { - first = FALSE; + first = false; } else { @@ -320,12 +235,12 @@ bool wxDirData::Read(wxString *filename) 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; } } @@ -333,9 +248,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; @@ -368,17 +283,7 @@ bool wxDirData::Read(wxString *filename) break; } - return TRUE; -} - -// ---------------------------------------------------------------------------- -// wxDir helpers -// ---------------------------------------------------------------------------- - -/* static */ -bool wxDir::Exists(const wxString& dir) -{ - return wxPathExists(dir); + return true; } // ---------------------------------------------------------------------------- @@ -395,9 +300,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 @@ -414,9 +330,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); @@ -440,7 +356,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(); @@ -452,9 +368,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); } @@ -469,15 +385,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); if ( !IsFindDataOk(fd) ) { - return FALSE; + return false; } *ftAccess = fs.ftLastAccessTime; @@ -486,7 +408,7 @@ wxGetDirectoryTimes(const wxString& dirname, FindClose(fd); - return TRUE; + return true; } #endif // __WIN32__