X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/dir.cpp?ds=inline diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 79635bd446..5525d72a61 100644 --- a/src/msw/dir.cpp +++ b/src/msw/dir.cpp @@ -62,7 +62,7 @@ static inline void FreeFindData(FIND_DATA fd) 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) @@ -184,7 +184,10 @@ bool wxDirData::Read(wxString *filename) { filespec += _T('\\'); } - filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str()); + if ( !m_filespec ) + filespec += _T("*.*"); + else + filespec += m_filespec; m_finddata = FindFirst(filespec, PTR_TO_FINDDATA); @@ -196,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()); @@ -374,9 +377,15 @@ 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);