/////////////////////////////////////////////////////////////////////////////
-// Name: msw/dir.cpp
+// Name: src/msw/dir.cpp
// Purpose: wxDir implementation for Win32
// Author: Vadim Zeitlin
// Modified by:
// Created: 08.12.99
-// RCS-ID: $Id$
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#endif // PCH
#include "wx/dir.h"
-#include "wx/filefn.h" // for wxDirExists()
#ifdef __WINDOWS__
#include "wx/msw/private.h"
{
if ( !::FindClose(fd) )
{
- wxLogLastError(_T("FindClose"));
+ wxLogLastError(wxT("FindClose"));
}
}
-inline FIND_DATA FindFirst(const wxString& spec,
- FIND_STRUCT *finddata)
+const wxChar *GetNameFromFindData(const FIND_STRUCT *finddata)
{
- return ::FindFirstFile(spec.fn_str(), finddata);
+ return finddata->cFileName;
}
-inline bool FindNext(FIND_DATA fd, 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 ::FindNextFile(fd, finddata) != 0;
+ // If there is no filter, the found file must be the one we really are
+ // looking for.
+ if ( filter.empty() )
+ return true;
+
+ // Otherwise do check the match validity. Notice that we must do it
+ // case-insensitively because the case of the file names is not supposed to
+ // matter under Windows.
+ wxString fn(GetNameFromFindData(finddata));
+
+ // However if the filter contains only special characters (which is a
+ // common case), we can skip the case conversion.
+ if ( filter.find_first_not_of(wxS("*?.")) == wxString::npos )
+ return fn.Matches(filter);
+
+ return fn.MakeUpper().Matches(filter.Upper());
}
-const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+inline bool
+FindNext(FIND_DATA fd, const wxString& filter, FIND_STRUCT *finddata)
{
- return finddata->cFileName;
+ for ( ;; )
+ {
+ if ( !::FindNextFile(fd, finddata) )
+ return false;
+
+ // If we did find something, check that it really matches.
+ if ( CheckFoundMatch(finddata, filter) )
+ return true;
+ }
+}
+
+inline FIND_DATA
+FindFirst(const wxString& spec,
+ const wxString& filter,
+ FIND_STRUCT *finddata)
+{
+ 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;
}
inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
wxString filespec = m_dirname;
if ( !wxEndsWithPathSeparator(filespec) )
{
- filespec += _T('\\');
+ filespec += wxT('\\');
}
if ( !m_filespec )
- filespec += _T("*.*");
+ filespec += wxT("*.*");
else
filespec += m_filespec;
- m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
+ m_finddata = FindFirst(filespec, m_filespec, PTR_TO_FINDDATA);
first = true;
}
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
{
- 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
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;
return true;
}
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
- return wxDirExists(dir);
-}
-
// ----------------------------------------------------------------------------
// wxDir construction/destruction
// ----------------------------------------------------------------------------
bool wxDir::Open(const wxString& dirname)
{
delete M_DIR;
-
+
// The Unix code does a similar test
if (wxDirExists(dirname))
{
else
{
m_data = NULL;
-
+
return false;
}
}
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);
}
#ifdef __WXWINCE__
// FindFirst() is going to fail
wxASSERT_MSG( !dirname.empty(),
- _T("incorrect directory name format in wxGetDirectoryTimes") );
+ wxT("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") );
+ 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;
projects / wxWidgets.git / blobdiff