fixes #14193

[wxWidgets.git] / src / common / filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 130d42951006eb9adb1202bae00dbe310f94e3fd..bc4b31b23fb3a352d33ac2b59dc1e0d818bc1fe0 100644 (file)
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -22,9 +22,18 @@
                 drive:\dir1\dir2\...\dirN\filename.ext where drive is a single
                 letter. "." and ".." as for Unix but no "~".
 
                 drive:\dir1\dir2\...\dirN\filename.ext where drive is a single
                 letter. "." and ".." as for Unix but no "~".
 

-                There are also UNC names of the form \\share\fullpath
+                There are also UNC names of the form \\share\fullpath and
+                MSW unique volume names of the form \\?\Volume{GUID}\fullpath.

 
 

-   wxPATH_MAC:  Mac OS 8/9 and Mac OS X under CodeWarrior 7 format, absolute file
+                The latter provide a uniform way to access a volume regardless of
+                its current mount point, i.e. you can change a volume's mount
+                point from D: to E:, or even remove it, and still be able to
+                access it through its unique volume name. More on the subject can
+                be found in MSDN's article "Naming a Volume" that is currently at
+                http://msdn.microsoft.com/en-us/library/aa365248(VS.85).aspx.
+
+
+   wxPATH_MAC:  Mac OS 8/9 only, not used any longer, absolute file

                 names have the form
                     volume:dir1:...:dirN:filename
                 and the relative file names are either
                 names have the form
                     volume:dir1:...:dirN:filename
                 and the relative file names are either


@@ -68,7 +77,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #ifdef __WXMSW__
+    #ifdef __WINDOWS__

         #include "wx/msw/wrapwin.h" // For GetShort/LongPathName
     #endif
     #include "wx/dynarray.h"
         #include "wx/msw/wrapwin.h" // For GetShort/LongPathName
     #endif
     #include "wx/dynarray.h"


@@ -89,7 +98,7 @@
     #include "wx/msw/gccpriv.h"
 #endif
 
     #include "wx/msw/gccpriv.h"
 #endif
 

-#ifdef __WXWINCE__
+#ifdef __WINDOWS__

 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"
 #endif
 


@@ -109,19 +118,6 @@
 #include <unistd.h>
 #endif
 
 #include <unistd.h>
 #endif
 

-#ifdef __MWERKS__
-#ifdef __MACH__
-#include <sys/types.h>
-#include <utime.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#else
-#include <stat.h>
-#include <unistd.h>
-#include <unix.h>
-#endif
-#endif
-

 #ifdef __WATCOMC__
 #include <io.h>
 #include <sys/utime.h>
 #ifdef __WATCOMC__
 #include <io.h>
 #include <sys/utime.h>


@@ -139,6 +135,12 @@
 #define MAX_PATH _MAX_PATH
 #endif
 
 #define MAX_PATH _MAX_PATH
 #endif
 

+#ifndef S_ISREG
+    #define S_ISREG(mode) ((mode) & S_IFREG)
+#endif
+#ifndef S_ISDIR
+    #define S_ISDIR(mode) ((mode) & S_IFDIR)
+#endif

 
 #if wxUSE_LONGLONG
 extern const wxULongLong wxInvalidSize = (unsigned)-1;
 
 #if wxUSE_LONGLONG
 extern const wxULongLong wxInvalidSize = (unsigned)-1;


@@ -172,7 +174,7 @@ public:
         // access time (see #10567)
         m_hFile = ::CreateFile
                     (
         // access time (see #10567)
         m_hFile = ::CreateFile
                     (

-                     filename.fn_str(),             // name
+                     filename.t_str(),             // name

                      mode == ReadAttr ? FILE_READ_ATTRIBUTES    // access mask
                                       : FILE_WRITE_ATTRIBUTES,
                      FILE_SHARE_READ |              // sharing mode
                      mode == ReadAttr ? FILE_READ_ATTRIBUTES    // access mask
                                       : FILE_WRITE_ATTRIBUTES,
                      FILE_SHARE_READ |              // sharing mode


@@ -289,7 +291,18 @@ static wxString wxGetVolumeString(const wxString& volume, wxPathFormat format)
         // although I didn't find any authoritative docs on this)
         if ( format == wxPATH_DOS && volume.length() > 1 )
         {
         // although I didn't find any authoritative docs on this)
         if ( format == wxPATH_DOS && volume.length() > 1 )
         {

-            path << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << volume;
+            // We also have to check for Windows unique volume names here and
+            // return it with '\\?\' prepended to it
+            if ( wxFileName::IsMSWUniqueVolumeNamePath("\\\\?\\" + volume + "\\",
+                                                       format) )
+            {
+                path << "\\\\?\\" << volume;
+            }
+            else
+            {
+                // it must be a UNC path
+                path << wxFILE_SEP_PATH_DOS << wxFILE_SEP_PATH_DOS << volume;
+            }

         }
         else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
         {
         }
         else if  ( format == wxPATH_DOS || format == wxPATH_VMS )
         {


@@ -319,6 +332,13 @@ static bool IsUNCPath(const wxString& path, wxPathFormat format)
                             !IsDOSPathSep(path[2u]);
 }
 
                             !IsDOSPathSep(path[2u]);
 }
 

+// ----------------------------------------------------------------------------
+// private constants
+// ----------------------------------------------------------------------------
+
+// length of \\?\Volume{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}\ string
+static const size_t wxMSWUniqueVolumePrefixLength = 49;
+

 } // anonymous namespace
 
 // ============================================================================
 } // anonymous namespace
 
 // ============================================================================


@@ -566,96 +586,143 @@ wxFileName wxFileName::DirName(const wxString& dir, wxPathFormat format)
 // existence tests
 // ----------------------------------------------------------------------------
 
 // existence tests
 // ----------------------------------------------------------------------------
 

-bool wxFileName::FileExists() const
+namespace

 {
 {

-    return wxFileName::FileExists( GetFullPath() );
-}

 
 

-/* static */
-bool wxFileName::FileExists( const wxString &filePath )
+// Flags for wxFileSystemObjectExists() asking it to check for:
+enum

 {
 {

-    #if defined(__WXPALMOS__)
-    return false;
-#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
-    // we must use GetFileAttributes() instead of the ANSI C functions because
-    // it can cope with network (UNC) paths unlike them
-    DWORD ret = ::GetFileAttributes(filePath.fn_str());
-
-    return (ret != INVALID_FILE_ATTRIBUTES) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
-#else // !__WIN32__
-    #ifndef S_ISREG
-        #define S_ISREG(mode) ((mode) & S_IFREG)
-    #endif
-    wxStructStat st;
-#ifndef wxNEED_WX_UNISTD_H
-    return (wxStat( filePath.fn_str() , &st) == 0 && S_ISREG(st.st_mode))
-#ifdef __OS2__
-      || (errno == EACCES) // if access is denied something with that name
-                            // exists and is opened in exclusive mode.
-#endif
-      ;
-#else
-    return wxStat( filePath , &st) == 0 && S_ISREG(st.st_mode);
-#endif
-#endif // __WIN32__/!__WIN32__
-}
+    wxFileSystemObject_File  = 1,   // file existence
+    wxFileSystemObject_Dir   = 2,   // directory existence
+    wxFileSystemObject_Other = 4,   // existence of something else, e.g.
+                                    // device, socket, FIFO under Unix
+    wxFileSystemObject_Any   = 7    // existence of anything at all
+};

 
 

-bool wxFileName::DirExists() const
-{
-    return wxFileName::DirExists( GetPath() );
-}
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

 
 

-/* static */
-bool wxFileName::DirExists( const wxString &dirPath )
+void RemoveTrailingSeparatorsFromPath(wxString& strPath)

 {
 {

-    wxString strPath(dirPath);
-
-#if defined(__WINDOWS__) || defined(__OS2__)

     // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
     // so remove all trailing backslashes from the path - but don't do this for
     // Windows fails to find directory named "c:\dir\" even if "c:\dir" exists,
     // so remove all trailing backslashes from the path - but don't do this for

-    // the paths "d:\" (which are different from "d:") nor for just "\"
-    while ( wxEndsWithPathSeparator(strPath) )
+    // the paths "d:\" (which are different from "d:"), for just "\" or for
+    // windows unique volume names ("\\?\Volume{GUID}\")
+    while ( wxEndsWithPathSeparator( strPath ) )

     {
         size_t len = strPath.length();
     {
         size_t len = strPath.length();

-        if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) )
+        if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) ||
+                (len == wxMSWUniqueVolumePrefixLength &&
+                 wxFileName::IsMSWUniqueVolumeNamePath(strPath)))
+        {

             break;
             break;

+        }

 
         strPath.Truncate(len - 1);
     }
 
         strPath.Truncate(len - 1);
     }

-#endif // __WINDOWS__
+}

 
 

-#ifdef __OS2__
-    // OS/2 can't handle "d:", it wants either "d:\" or "d:."
-    if (strPath.length() == 2 && strPath[1u] == wxT(':'))
-        strPath << wxT('.');
-#endif
+#endif // __WINDOWS__ || __OS2__

 
 

-#if defined(__WXPALMOS__)
-    return false;
-#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
-    // stat() can't cope with network paths
-    DWORD ret = ::GetFileAttributes(strPath.fn_str());
+bool wxFileSystemObjectExists(const wxString& path, int flags)
+{
+    // Should the existence of file/directory with this name be accepted, i.e.
+    // result in the true return value from this function?
+    const bool acceptFile = (flags & wxFileSystemObject_File) != 0;
+    const bool acceptDir  = (flags & wxFileSystemObject_Dir) != 0;

 
 

-    return (ret != INVALID_FILE_ATTRIBUTES) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+    wxString strPath(path);
+
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)
+    if ( acceptDir )
+    {
+        // Ensure that the path doesn't have any trailing separators when
+        // checking for directories.
+        RemoveTrailingSeparatorsFromPath(strPath);
+    }
+
+    // we must use GetFileAttributes() instead of the ANSI C functions because
+    // it can cope with network (UNC) paths unlike them
+    DWORD ret = ::GetFileAttributes(path.t_str());
+
+    if ( ret == INVALID_FILE_ATTRIBUTES )
+        return false;
+
+    if ( ret & FILE_ATTRIBUTE_DIRECTORY )
+        return acceptDir;
+
+    // Anything else must be a file (perhaps we should check for
+    // FILE_ATTRIBUTE_REPARSE_POINT?)
+    return acceptFile;

 #elif defined(__OS2__)
 #elif defined(__OS2__)

+    if ( acceptDir )
+    {
+        // OS/2 can't handle "d:", it wants either "d:\" or "d:."
+        if (strPath.length() == 2 && strPath[1u] == wxT(':'))
+            strPath << wxT('.');
+    }
+

     FILESTATUS3 Info = {{0}};
     APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
     FILESTATUS3 Info = {{0}};
     APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,

-                                   (void*) &Info, sizeof(FILESTATUS3));
+            (void*) &Info, sizeof(FILESTATUS3));

 
 

-    return ((rc == NO_ERROR) && (Info.attrFile & FILE_DIRECTORY)) ||
-      (rc == ERROR_SHARING_VIOLATION);
-    // If we got a sharing violation, there must be something with this name.
-#else // !__WIN32__
+    if ( rc == NO_ERROR )
+    {
+        if ( Info.attrFile & FILE_DIRECTORY )
+            return acceptDir;
+        else
+            return acceptFile;
+    }

 
 

+    // We consider that the path must exist if we get a sharing violation for
+    // it but we don't know what is it in this case.
+    if ( rc == ERROR_SHARING_VIOLATION )
+        return flags & wxFileSystemObject_Other;
+
+    // Any other error (usually ERROR_PATH_NOT_FOUND), means there is nothing
+    // there.
+    return false;
+#else // Non-MSW, non-OS/2

     wxStructStat st;
     wxStructStat st;

-#ifndef __VISAGECPP__
-    return wxStat(strPath.c_str(), &st) == 0 && ((st.st_mode & S_IFMT) == S_IFDIR);
-#else
-    // S_IFMT not supported in VA compilers.. st_mode is a 2byte value only
-    return wxStat(strPath.c_str(), &st) == 0 && (st.st_mode == S_IFDIR);
-#endif
+    if ( wxStat(strPath, &st) != 0 )
+        return false;
+
+    if ( S_ISREG(st.st_mode) )
+        return acceptFile;
+    if ( S_ISDIR(st.st_mode) )
+        return acceptDir;
+
+    return flags & wxFileSystemObject_Other;
+#endif // Platforms
+}
+
+} // anonymous namespace

 
 

-#endif // __WIN32__/!__WIN32__
+bool wxFileName::FileExists() const
+{
+    return wxFileName::FileExists( GetFullPath() );
+}
+
+/* static */
+bool wxFileName::FileExists( const wxString &filePath )
+{
+    return wxFileSystemObjectExists(filePath, wxFileSystemObject_File);
+}
+
+bool wxFileName::DirExists() const
+{
+    return wxFileName::DirExists( GetPath() );
+}
+
+/* static */
+bool wxFileName::DirExists( const wxString &dirPath )
+{
+    return wxFileSystemObjectExists(dirPath, wxFileSystemObject_Dir);
+}
+
+/* static */
+bool wxFileName::Exists(const wxString& path)
+{
+    return wxFileSystemObjectExists(path, wxFileSystemObject_Any);

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


@@ -780,7 +847,7 @@ static bool wxTempOpen(wxFFile *file, const wxString& path, bool *deleteOnClose)
     int fd = wxTempOpen(path, deleteOnClose);
     if (fd == -1)
         return false;
     int fd = wxTempOpen(path, deleteOnClose);
     if (fd == -1)
         return false;

-    file->Attach(wx_fdopen(fd, "w+b"));
+    file->Attach(wx_fdopen(fd, "w+b"), path);

     return file->IsOpened();
 #endif // wx_fdopen
 }
     return file->IsOpened();
 #endif // wx_fdopen
 }


@@ -840,8 +907,8 @@ static wxString wxCreateTempImpl(
     }
 
 #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
     }
 
 #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)

-    if ( !::GetTempFileName(dir.fn_str(), name.fn_str(), 0,
-                            wxStringBuffer(path, MAX_PATH + 1)) )
+    if (!::GetTempFileName(dir.t_str(), name.t_str(), 0,
+                           wxStringBuffer(path, MAX_PATH + 1)))

     {
         wxLogLastError(wxT("GetTempFileName"));
 
     {
         wxLogLastError(wxT("GetTempFileName"));
 


@@ -891,7 +958,7 @@ static wxString wxCreateTempImpl(
         if ( ffileTemp )
         {
         #ifdef wx_fdopen
         if ( ffileTemp )
         {
         #ifdef wx_fdopen

-            ffileTemp->Attach(wx_fdopen(fdTemp, "r+b"));
+            ffileTemp->Attach(wx_fdopen(fdTemp, "r+b"), path);

         #else
             ffileTemp->Open(path, wxT("r+b"));
             close(fdTemp);
         #else
             ffileTemp->Open(path, wxT("r+b"));
             close(fdTemp);


@@ -921,7 +988,7 @@ static wxString wxCreateTempImpl(
     }
 #else // !HAVE_MKTEMP (includes __DOS__)
     // generate the unique file name ourselves
     }
 #else // !HAVE_MKTEMP (includes __DOS__)
     // generate the unique file name ourselves

-    #if !defined(__DOS__) && !defined(__PALMOS__) && (!defined(__MWERKS__) || defined(__DARWIN__) )
+    #if !defined(__DOS__)

     path << (unsigned int)getpid();
     #endif
 
     path << (unsigned int)getpid();
     #endif
 


@@ -1155,9 +1222,24 @@ wxString wxFileName::GetTempDir()
             wxLogLastError(wxT("GetTempPath"));
         }
 #elif defined(__WXMAC__) && wxOSX_USE_CARBON
             wxLogLastError(wxT("GetTempPath"));
         }
 #elif defined(__WXMAC__) && wxOSX_USE_CARBON

-        dir = wxMacFindFolder(short(kOnSystemDisk), kTemporaryFolderType, kCreateFolder);
+        dir = wxMacFindFolderNoSeparator(short(kOnSystemDisk), kTemporaryFolderType, kCreateFolder);

 #endif // systems with native way
     }
 #endif // systems with native way
     }

+    else // we got directory from an environment variable
+    {
+        // remove any trailing path separators, we don't want to ever return
+        // them from this function for consistency
+        const size_t lastNonSep = dir.find_last_not_of(GetPathSeparators());
+        if ( lastNonSep == wxString::npos )
+        {
+            // the string consists entirely of separators, leave only one
+            dir = GetPathSeparator();
+        }
+        else
+        {
+            dir.erase(lastNonSep + 1);
+        }
+    }

 
     // fall back to hard coded value
     if ( dir.empty() )
 
     // fall back to hard coded value
     if ( dir.empty() )


@@ -1223,7 +1305,7 @@ bool wxFileName::Rmdir(int flags) const
 
 bool wxFileName::Rmdir(const wxString& dir, int flags)
 {
 
 bool wxFileName::Rmdir(const wxString& dir, int flags)
 {

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     if ( flags & wxPATH_RMDIR_RECURSIVE )
     {
         // SHFileOperation needs double null termination string
     if ( flags & wxPATH_RMDIR_RECURSIVE )
     {
         // SHFileOperation needs double null termination string


@@ -1236,7 +1318,11 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
         SHFILEOPSTRUCT fileop;
         wxZeroMemory(fileop);
         fileop.wFunc = FO_DELETE;
         SHFILEOPSTRUCT fileop;
         wxZeroMemory(fileop);
         fileop.wFunc = FO_DELETE;

+    #if defined(__CYGWIN__) && defined(wxUSE_UNICODE)
+        fileop.pFrom = path.wc_str();
+    #else

         fileop.pFrom = path.fn_str();
         fileop.pFrom = path.fn_str();

+    #endif

         fileop.fFlags = FOF_SILENT | FOF_NOCONFIRMATION;
     #ifndef __WXWINCE__
         // FOF_NOERRORUI is not defined in WinCE
         fileop.fFlags = FOF_SILENT | FOF_NOCONFIRMATION;
     #ifndef __WXWINCE__
         // FOF_NOERRORUI is not defined in WinCE


@@ -1255,9 +1341,9 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
         return true;
     }
     else if ( flags & wxPATH_RMDIR_FULL )
         return true;
     }
     else if ( flags & wxPATH_RMDIR_FULL )

-#else // !__WXMSW__
+#else // !__WINDOWS__

     if ( flags != 0 )   // wxPATH_RMDIR_FULL or wxPATH_RMDIR_RECURSIVE
     if ( flags != 0 )   // wxPATH_RMDIR_FULL or wxPATH_RMDIR_RECURSIVE

-#endif // !__WXMSW__
+#endif // !__WINDOWS__

     {
         wxString path(dir);
         if ( path.Last() != wxFILE_SEP_PATH )
     {
         wxString path(dir);
         if ( path.Last() != wxFILE_SEP_PATH )


@@ -1278,7 +1364,7 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
             cont = d.GetNext(&filename);
         }
 
             cont = d.GetNext(&filename);
         }
 

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

         if ( flags & wxPATH_RMDIR_RECURSIVE )
         {
             // delete all files too
         if ( flags & wxPATH_RMDIR_RECURSIVE )
         {
             // delete all files too


@@ -1289,7 +1375,7 @@ bool wxFileName::Rmdir(const wxString& dir, int flags)
                 cont = d.GetNext(&filename);
             }
         }
                 cont = d.GetNext(&filename);
             }
         }

-#endif // !__WXMSW__
+#endif // !__WINDOWS__

     }
 
     return ::wxRmdir(dir);
     }
 
     return ::wxRmdir(dir);


@@ -1400,15 +1486,24 @@ bool wxFileName::Normalize(int flags,
 
             if ( dir == wxT("..") )
             {
 
             if ( dir == wxT("..") )
             {

-                if ( m_dirs.IsEmpty() )
+                if ( m_dirs.empty() )

                 {
                 {

-                    wxLogError(_("The path '%s' contains too many \"..\"!"),
-                               GetFullPath().c_str());
-                    return false;
-                }
+                    // We have more ".." than directory components so far.
+                    // Don't treat this as an error as the path could have been
+                    // entered by user so try to handle it reasonably: if the
+                    // path is absolute, just ignore the extra ".." because
+                    // "/.." is the same as "/". Otherwise, i.e. for relative
+                    // paths, keep ".." unchanged because removing it would
+                    // modify the file a relative path refers to.
+                    if ( !m_relative )
+                        continue;

 
 

-                m_dirs.RemoveAt(m_dirs.GetCount() - 1);
-                continue;
+                }
+                else // Normal case, go one step up.
+                {
+                    m_dirs.pop_back();
+                    continue;
+                }

             }
         }
 
             }
         }
 


@@ -1686,8 +1781,16 @@ bool wxFileName::SameAs(const wxFileName& filepath, wxPathFormat format) const
     if ( fn1.GetFullPath() == fn2.GetFullPath() )
         return true;
 
     if ( fn1.GetFullPath() == fn2.GetFullPath() )
         return true;
 

-    // TODO: compare inodes for Unix, this works even when filenames are
-    //       different but files are the same (symlinks) (VZ)
+#if defined(__UNIX__)
+    wxStructStat st1, st2;
+    if ( wxStat(fn1.GetFullPath(), &st1) == 0 &&
+            wxStat(fn2.GetFullPath(), &st2) == 0 )
+    {
+        if ( st1.st_ino == st2.st_ino && st1.st_dev == st2.st_dev )
+            return true;
+    }
+    //else: It's not an error if one or both files don't exist.
+#endif // defined __UNIX__

 
     return false;
 }
 
     return false;
 }


@@ -1803,6 +1906,18 @@ bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format)
     return ch != wxT('\0') && GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
 }
 
     return ch != wxT('\0') && GetPathSeparators(format).Find(ch) != wxNOT_FOUND;
 }
 

+/* static */
+bool
+wxFileName::IsMSWUniqueVolumeNamePath(const wxString& path, wxPathFormat format)
+{
+    // return true if the format used is the DOS/Windows one and the string begins
+    // with a Windows unique volume name ("\\?\Volume{guid}\")
+    return format == wxPATH_DOS &&
+            path.length() >= wxMSWUniqueVolumePrefixLength &&
+             path.StartsWith(wxS("\\\\?\\Volume{")) &&
+              path[wxMSWUniqueVolumePrefixLength - 1] == wxFILE_SEP_PATH_DOS;
+}
+

 // ----------------------------------------------------------------------------
 // path components manipulation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // path components manipulation
 // ----------------------------------------------------------------------------


@@ -1994,14 +2109,14 @@ wxString wxFileName::GetShortPath() const
 {
     wxString path(GetFullPath());
 
 {
     wxString path(GetFullPath());
 

-#if defined(__WXMSW__) && defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-    DWORD sz = ::GetShortPathName(path.fn_str(), NULL, 0);
+#if defined(__WINDOWS__) && defined(__WIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
+    DWORD sz = ::GetShortPathName(path.t_str(), NULL, 0);

     if ( sz != 0 )
     {
         wxString pathOut;
         if ( ::GetShortPathName
                (
     if ( sz != 0 )
     {
         wxString pathOut;
         if ( ::GetShortPathName
                (

-                path.fn_str(),
+                path.t_str(),

                 wxStringBuffer(pathOut, sz),
                 sz
                ) != 0 )
                 wxStringBuffer(pathOut, sz),
                 sz
                ) != 0 )


@@ -2059,12 +2174,12 @@ wxString wxFileName::GetLongPath() const
 
     if ( s_pfnGetLongPathName )
     {
 
     if ( s_pfnGetLongPathName )
     {

-        DWORD dwSize = (*s_pfnGetLongPathName)(path.fn_str(), NULL, 0);
+        DWORD dwSize = (*s_pfnGetLongPathName)(path.t_str(), NULL, 0);

         if ( dwSize > 0 )
         {
             if ( (*s_pfnGetLongPathName)
                  (
         if ( dwSize > 0 )
         {
             if ( (*s_pfnGetLongPathName)
                  (

-                  path.fn_str(),
+                  path.t_str(),

                   wxStringBuffer(pathOut, dwSize),
                   dwSize
                  ) != 0 )
                   wxStringBuffer(pathOut, dwSize),
                   dwSize
                  ) != 0 )


@@ -2116,7 +2231,7 @@ wxString wxFileName::GetLongPath() const
             continue;
         }
 
             continue;
         }
 

-        hFind = ::FindFirstFile(tmpPath.fn_str(), &findFileData);
+        hFind = ::FindFirstFile(tmpPath.t_str(), &findFileData);

         if (hFind == INVALID_HANDLE_VALUE)
         {
             // Error: most likely reason is that path doesn't exist, so
         if (hFind == INVALID_HANDLE_VALUE)
         {
             // Error: most likely reason is that path doesn't exist, so


@@ -2144,7 +2259,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 {
     if (format == wxPATH_NATIVE)
     {
 {
     if (format == wxPATH_NATIVE)
     {

-#if defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__)
+#if defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__)

         format = wxPATH_DOS;
 #elif defined(__VMS)
         format = wxPATH_VMS;
         format = wxPATH_DOS;
 #elif defined(__VMS)
         format = wxPATH_VMS;


@@ -2187,9 +2302,26 @@ wxFileName::SplitVolume(const wxString& fullpathWithVolume,
 
     wxString fullpath = fullpathWithVolume;
 
 
     wxString fullpath = fullpathWithVolume;
 

-    // special Windows UNC paths hack: transform \\share\path into share:path
-    if ( IsUNCPath(fullpath, format) )
+    if ( IsMSWUniqueVolumeNamePath(fullpath, format) )

     {
     {

+        // special Windows unique volume names hack: transform
+        // \\?\Volume{guid}\path into Volume{guid}:path
+        // note: this check must be done before the check for UNC path
+
+        // we know the last backslash from the unique volume name is located
+        // there from IsMSWUniqueVolumeNamePath
+        fullpath[wxMSWUniqueVolumePrefixLength - 1] = wxFILE_SEP_DSK;
+
+        // paths starting with a unique volume name should always be absolute
+        fullpath.insert(wxMSWUniqueVolumePrefixLength, 1, wxFILE_SEP_PATH_DOS);
+
+        // remove the leading "\\?\" part
+        fullpath.erase(0, 4);
+    }
+    else if ( IsUNCPath(fullpath, format) )
+    {
+        // special Windows UNC paths hack: transform \\share\path into share:path
+

         fullpath.erase(0, 2);
 
         size_t posFirstSlash =
         fullpath.erase(0, 2);
 
         size_t posFirstSlash =


@@ -2519,14 +2651,16 @@ bool wxFileName::GetTimes(wxDateTime *dtAccess,
 #elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__))
     // no need to test for IsDir() here
     wxStructStat stBuf;
 #elif defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__OS2__) || (defined(__DOS__) && defined(__WATCOMC__))
     // no need to test for IsDir() here
     wxStructStat stBuf;

-    if ( wxStat( GetFullPath().c_str(), &stBuf) == 0 )
+    if ( wxStat( GetFullPath(), &stBuf) == 0 )

     {
     {

+        // Android defines st_*time fields as unsigned long, but time_t as long,
+        // hence the static_casts.

         if ( dtAccess )
         if ( dtAccess )

-            dtAccess->Set(stBuf.st_atime);
+            dtAccess->Set(static_cast<time_t>(stBuf.st_atime));

         if ( dtMod )
         if ( dtMod )

-            dtMod->Set(stBuf.st_mtime);
+            dtMod->Set(static_cast<time_t>(stBuf.st_mtime));

         if ( dtCreate )
         if ( dtCreate )

-            dtCreate->Set(stBuf.st_ctime);
+            dtCreate->Set(static_cast<time_t>(stBuf.st_ctime));

 
         return true;
     }
 
         return true;
     }


@@ -2557,10 +2691,7 @@ wxULongLong wxFileName::GetSize(const wxString &filename)
     if (!wxFileExists(filename))
         return wxInvalidSize;
 
     if (!wxFileExists(filename))
         return wxInvalidSize;
 

-#if defined(__WXPALMOS__)
-    // TODO
-    return wxInvalidSize;
-#elif defined(__WIN32__)
+#if defined(__WIN32__)

     wxFileHandle f(filename, wxFileHandle::ReadAttr);
     if (!f.IsOk())
         return wxInvalidSize;
     wxFileHandle f(filename, wxFileHandle::ReadAttr);
     if (!f.IsOk())
         return wxInvalidSize;


@@ -2573,11 +2704,7 @@ wxULongLong wxFileName::GetSize(const wxString &filename)
     return wxULongLong(lpFileSizeHigh, ret);
 #else // ! __WIN32__
     wxStructStat st;
     return wxULongLong(lpFileSizeHigh, ret);
 #else // ! __WIN32__
     wxStructStat st;

-#ifndef wxNEED_WX_UNISTD_H
-    if (wxStat( filename.fn_str() , &st) != 0)
-#else

     if (wxStat( filename, &st) != 0)
     if (wxStat( filename, &st) != 0)

-#endif

         return wxInvalidSize;
     return wxULongLong(st.st_size);
 #endif
         return wxInvalidSize;
     return wxULongLong(st.st_size);
 #endif


@@ -2586,27 +2713,54 @@ wxULongLong wxFileName::GetSize(const wxString &filename)
 /* static */
 wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs,
                                           const wxString &nullsize,
 /* static */
 wxString wxFileName::GetHumanReadableSize(const wxULongLong &bs,
                                           const wxString &nullsize,

-                                          int precision)
+                                          int precision,
+                                          wxSizeConvention conv)

 {
 {

-    static const double KILOBYTESIZE = 1024.0;
-    static const double MEGABYTESIZE = 1024.0*KILOBYTESIZE;
-    static const double GIGABYTESIZE = 1024.0*MEGABYTESIZE;
-    static const double TERABYTESIZE = 1024.0*GIGABYTESIZE;
-
-    if (bs == 0 || bs == wxInvalidSize)
+    // deal with trivial case first
+    if ( bs == 0 || bs == wxInvalidSize )

         return nullsize;
 
         return nullsize;
 

-    double bytesize = bs.ToDouble();
-    if (bytesize < KILOBYTESIZE)
-        return wxString::Format(_("%s B"), bs.ToString().c_str());
-    if (bytesize < MEGABYTESIZE)
-        return wxString::Format(_("%.*f kB"), precision, bytesize/KILOBYTESIZE);
-    if (bytesize < GIGABYTESIZE)
-        return wxString::Format(_("%.*f MB"), precision, bytesize/MEGABYTESIZE);
-    if (bytesize < TERABYTESIZE)
-        return wxString::Format(_("%.*f GB"), precision, bytesize/GIGABYTESIZE);
+    // depending on the convention used the multiplier may be either 1000 or
+    // 1024 and the binary infix may be empty (for "KB") or "i" (for "KiB")
+    double multiplier = 1024.;
+    wxString biInfix;
+
+    switch ( conv )
+    {
+        case wxSIZE_CONV_TRADITIONAL:
+            // nothing to do, this corresponds to the default values of both
+            // the multiplier and infix string
+            break;
+
+        case wxSIZE_CONV_IEC:
+            biInfix = "i";
+            break;
+
+        case wxSIZE_CONV_SI:
+            multiplier = 1000;
+            break;
+    }
+
+    const double kiloByteSize = multiplier;
+    const double megaByteSize = multiplier * kiloByteSize;
+    const double gigaByteSize = multiplier * megaByteSize;
+    const double teraByteSize = multiplier * gigaByteSize;
+
+    const double bytesize = bs.ToDouble();
+
+    wxString result;
+    if ( bytesize < kiloByteSize )
+        result.Printf("%s B", bs.ToString());
+    else if ( bytesize < megaByteSize )
+        result.Printf("%.*f K%sB", precision, bytesize/kiloByteSize, biInfix);
+    else if (bytesize < gigaByteSize)
+        result.Printf("%.*f M%sB", precision, bytesize/megaByteSize, biInfix);
+    else if (bytesize < teraByteSize)
+        result.Printf("%.*f G%sB", precision, bytesize/gigaByteSize, biInfix);
+    else
+        result.Printf("%.*f T%sB", precision, bytesize/teraByteSize, biInfix);

 
 

-    return wxString::Format(_("%.*f TB"), precision, bytesize/TERABYTESIZE);
+    return result;

 }
 
 wxULongLong wxFileName::GetSize() const
 }
 
 wxULongLong wxFileName::GetSize() const


@@ -2614,9 +2768,11 @@ wxULongLong wxFileName::GetSize() const
     return GetSize(GetFullPath());
 }
 
     return GetSize(GetFullPath());
 }
 

-wxString wxFileName::GetHumanReadableSize(const wxString &failmsg, int precision) const
+wxString wxFileName::GetHumanReadableSize(const wxString& failmsg,
+                                          int precision,
+                                          wxSizeConvention conv) const

 {
 {

-    return GetHumanReadableSize(GetSize(), failmsg, precision);
+    return GetHumanReadableSize(GetSize(), failmsg, precision, conv);

 }
 
 #endif // wxUSE_LONGLONG
 }
 
 #endif // wxUSE_LONGLONG