/////////////////////////////////////////////////////////////////////////////
-// Name: msw/dir.cpp
+// Name: src/msw/dir.cpp
// Purpose: wxDir implementation for Win32
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "dir.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#endif // PCH
#include "wx/dir.h"
-#include "wx/filefn.h" // for wxPathExists()
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
#include "wx/msw/private.h"
#endif
// 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
// ----------------------------------------------------------------------------
int m_flags;
- DECLARE_NO_COPY_CLASS(wxDirData)
+ wxDECLARE_NO_COPY_CLASS(wxDirData);
};
// ============================================================================
bool wxDirData::Read(wxString *filename)
{
- bool first = FALSE;
+ bool first = false;
WIN32_FIND_DATA finddata;
#define PTR_TO_FINDDATA (&finddata)
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) )
#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;
{
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;
}
}
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;
break;
}
- return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
- return wxPathExists(dir);
+ return true;
}
// ----------------------------------------------------------------------------
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
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);
return name;
}
-wxDir::~wxDir()
+void wxDir::Close()
{
- delete M_DIR;
+ if ( m_data )
+ {
+ delete m_data;
+ m_data = NULL;
+ }
}
// ----------------------------------------------------------------------------
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();
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);
}
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;
FindClose(fd);
- return TRUE;
+ return true;
}
#endif // __WIN32__
projects / wxWidgets.git / blobdiff