Don't use wxCHECK_W32API_VERSION() in #if when it can be undefined.

[wxWidgets.git] / src / msw / dir.cpp

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 06e86573f5ffbe85f035734e84d2b8d6a98711ae..bb059dc99292e3d4546b9a98a23ad07f9bace458 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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>
 // 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 license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "dir.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -34,9 +30,72 @@
 #endif // PCH
 
 #include "wx/dir.h"
 #endif // PCH
 
 #include "wx/dir.h"

-#include "wx/filefn.h"          // for wxPathExists()

 
 

-#include <windows.h>
+#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;
+
+inline FIND_DATA InitFindData()
+{
+    return INVALID_HANDLE_VALUE;
+}
+
+inline bool IsFindDataOk(FIND_DATA fd)
+{
+        return fd != INVALID_HANDLE_VALUE;
+}
+
+inline void FreeFindData(FIND_DATA fd)
+{
+    if ( !::FindClose(fd) )
+    {
+        wxLogLastError(wxT("FindClose"));
+    }
+}
+
+inline FIND_DATA FindFirst(const wxString& spec,
+                           FIND_STRUCT *finddata)
+{
+    return ::FindFirstFile(spec.t_str(), finddata);
+}
+
+inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
+{
+    return ::FindNextFile(fd, finddata) != 0;
+}
+
+const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+{
+    return finddata->cFileName;
+}
+
+inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
+{
+    return finddata->dwFileAttributes;
+}
+
+inline bool IsDir(FIND_ATTR attr)
+{
+    return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
+}
+
+inline bool IsHidden(FIND_ATTR attr)
+{
+    return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
+}
+
+} // anonymous namespace

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -70,13 +129,17 @@ public:
     void Rewind();
     bool Read(wxString *filename);
 
     void Rewind();
     bool Read(wxString *filename);
 

+    const wxString& GetName() const { return m_dirname; }
+

 private:
 private:

-    HANDLE   m_handle;
+    FIND_DATA m_finddata;

 
     wxString m_dirname;
     wxString m_filespec;
 
     int      m_flags;
 
     wxString m_dirname;
     wxString m_filespec;
 
     int      m_flags;

+
+    wxDECLARE_NO_COPY_CLASS(wxDirData);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -90,7 +153,7 @@ private:
 wxDirData::wxDirData(const wxString& dirname)
          : m_dirname(dirname)
 {
 wxDirData::wxDirData(const wxString& dirname)
          : m_dirname(dirname)
 {

-    m_handle = INVALID_HANDLE_VALUE;
+    m_finddata = InitFindData();

 }
 
 wxDirData::~wxDirData()
 }
 
 wxDirData::~wxDirData()


@@ -100,14 +163,11 @@ wxDirData::~wxDirData()
 
 void wxDirData::Close()
 {
 
 void wxDirData::Close()
 {

-    if ( m_handle != INVALID_HANDLE_VALUE )
+    if ( IsFindDataOk(m_finddata) )

     {
     {

-        if ( !::FindClose(m_handle) )
-        {
-            wxLogLastError(_T("FindClose"));
-        }
+        FreeFindData(m_finddata);

 
 

-        m_handle = INVALID_HANDLE_VALUE;
+        m_finddata = InitFindData();

     }
 }
 
     }
 }
 


@@ -118,79 +178,91 @@ void wxDirData::Rewind()
 
 bool wxDirData::Read(wxString *filename)
 {
 
 bool wxDirData::Read(wxString *filename)
 {

-    bool first = FALSE;
+    bool first = false;

 
     WIN32_FIND_DATA finddata;
 
     WIN32_FIND_DATA finddata;

-    if ( m_handle == INVALID_HANDLE_VALUE )
+    #define PTR_TO_FINDDATA (&finddata)
+
+    if ( !IsFindDataOk(m_finddata) )

     {
         // open first
     {
         // open first

-        wxString filespec;
-        filespec << m_dirname << _T('\\')
-                 << (!m_filespec ? _T("*.*") : m_filespec.c_str());
+        wxString filespec = m_dirname;
+        if ( !wxEndsWithPathSeparator(filespec) )
+        {
+            filespec += wxT('\\');
+        }
+        if ( !m_filespec )
+            filespec += wxT("*.*");
+        else
+            filespec += m_filespec;

 
 

-        m_handle = ::FindFirstFile(filespec, &finddata);
+        m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);

 
 

-        first = TRUE;
+        first = true;

     }
 
     }
 

-    if ( m_handle == INVALID_HANDLE_VALUE )
+    if ( !IsFindDataOk(m_finddata) )

     {
     {

+#ifdef __WIN32__

         DWORD err = ::GetLastError();
 
         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());
         }
                           m_dirname.c_str());
         }

+#endif // __WIN32__

         //else: not an error, just no (such) files
 
         //else: not an error, just no (such) files
 

-        return FALSE;
+        return false;

     }
 
     const wxChar *name;
     }
 
     const wxChar *name;

-    DWORD attr;
+    FIND_ATTR attr;

 
     for ( ;; )
     {
         if ( first )
         {
 
     for ( ;; )
     {
         if ( first )
         {

-            first = FALSE;
+            first = false;

         }
         else
         {
         }
         else
         {

-            if ( !::FindNextFile(m_handle, &finddata) )
+            if ( !FindNext(m_finddata, PTR_TO_FINDDATA) )

             {
             {

+#ifdef __WIN32__

                 DWORD err = ::GetLastError();
 
                 if ( err != ERROR_NO_MORE_FILES )
                 {
                 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
 
                 //else: not an error, just no more (such) files
 

-                return FALSE;
+                return false;

             }
         }
 
             }
         }
 

-        name = finddata.cFileName;
-        attr = finddata.dwFileAttributes;
+        name = GetNameFromFindData(PTR_TO_FINDDATA);
+        attr = GetAttrFromFindData(PTR_TO_FINDDATA);

 
         // don't return "." and ".." unless asked for
 
         // 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;
         }
 
         // check the type now
         {
             if ( !(m_flags & wxDIR_DOTDOT) )
                 continue;
         }
 
         // check the type now

-        if ( !(m_flags & wxDIR_FILES) && !(attr & FILE_ATTRIBUTE_DIRECTORY) )
+        if ( !(m_flags & wxDIR_FILES) && !IsDir(attr) )

         {
             // it's a file, but we don't want them
             continue;
         }
         {
             // it's a file, but we don't want them
             continue;
         }

-        else if ( !(m_flags & wxDIR_DIRS) && (attr & FILE_ATTRIBUTE_DIRECTORY) )
+        else if ( !(m_flags & wxDIR_DIRS) && IsDir(attr) )

         {
             // it's a dir, and we don't want it
             continue;
         {
             // it's a dir, and we don't want it
             continue;


@@ -199,7 +271,7 @@ bool wxDirData::Read(wxString *filename)
         // finally, check whether it's a hidden file
         if ( !(m_flags & wxDIR_HIDDEN) )
         {
         // finally, check whether it's a hidden file
         if ( !(m_flags & wxDIR_HIDDEN) )
         {

-            if ( attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM) )
+            if ( IsHidden(attr) )

             {
                 // it's a hidden file, skip it
                 continue;
             {
                 // it's a hidden file, skip it
                 continue;


@@ -211,17 +283,7 @@ bool wxDirData::Read(wxString *filename)
         break;
     }
 
         break;
     }
 

-    return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxPathExists(dir);
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -238,9 +300,20 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
 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
 }
 
 bool wxDir::IsOpened() const


@@ -248,6 +321,28 @@ bool wxDir::IsOpened() const
     return m_data != NULL;
 }
 
     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(wxT("/"), wxT("\\"));
+
+            if ( name.Last() == wxT('\\') )
+            {
+                // chop off the last (back)slash
+                name.Truncate(name.length() - 1);
+            }
+        }
+    }
+
+    return name;
+}
+

 wxDir::~wxDir()
 {
     delete M_DIR;
 wxDir::~wxDir()
 {
     delete M_DIR;


@@ -261,7 +356,7 @@ bool wxDir::GetFirst(wxString *filename,
                      const wxString& filespec,
                      int flags) const
 {
                      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();
 
 
     M_DIR->Rewind();
 


@@ -273,9 +368,48 @@ bool wxDir::GetFirst(wxString *filename,
 
 bool wxDir::GetNext(wxString *filename) const
 {
 
 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);
 }
 
     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(),
+                  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;
+    }
+
+    *ftAccess = fs.ftLastAccessTime;
+    *ftCreate = fs.ftCreationTime;
+    *ftMod = fs.ftLastWriteTime;
+
+    FindClose(fd);
+
+    return true;
+}
+
+#endif // __WIN32__
+