X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2597135af78aa28fb582e788b5c4b1b1e4f7b9ba..4178000933f0618d2cc9dc2f80dfed91b0c61464:/src/common/filename.cpp

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 9495f6f929..5e4f6beaad 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -38,6 +38,12 @@
 #include "wx/config.h"          // for wxExpandEnvVars
 #include "wx/utils.h"
 
+// For GetShort/LongPathName
+#ifdef __WIN32__
+#include <windows.h>
+#include "wx/msw/winundef.h"
+#endif
+
 // ============================================================================
 // implementation
 // ============================================================================
@@ -316,6 +322,13 @@ bool wxFileName::Normalize(wxPathNormalize flags,
         m_ext.MakeLower();
     }
 
+#if defined(__WXMSW__) && defined(__WIN32__)
+    if (flags & wxPATH_NORM_LONG)
+    {
+        Assign(GetLongPath());
+    }
+#endif
+
     return TRUE;
 }
 
@@ -358,9 +371,15 @@ bool wxFileName::IsAbsolute( wxPathFormat format )
 {
     wxChar ch = m_dirs.IsEmpty() ? _T('\0') : m_dirs[0u][0u];
 
+    // Hack to cope with e.g. c:\thing - need something better
+    wxChar driveSep = _T('\0');
+    if (!m_dirs.IsEmpty() && m_dirs[0].Length() > 1)
+        driveSep = m_dirs[0u][1u];
+
     // the path is absolute if it starts with a path separator or, only for
     // Unix filenames, with "~" or "~user"
     return IsPathSeparator(ch, format) ||
+           driveSep == _T(':') ||
            (GetFormat(format) == wxPATH_UNIX && ch == _T('~') );
 }
 
@@ -469,6 +488,60 @@ wxString wxFileName::GetFullPath( wxPathFormat format ) const
     return GetPathWithSep() + GetFullName();
 }
 
+// Return the short form of the path (returns identity on non-Windows platforms)
+wxString wxFileName::GetShortPath() const
+{
+#if defined(__WXMSW__) && defined(__WIN32__)
+    wxString path(GetFullPath());
+    wxString pathOut;
+    DWORD sz = ::GetShortPathName(path, NULL, 0);
+    bool ok = sz != 0;
+    if ( ok )
+    {
+        ok = ::GetShortPathName
+               (
+                path,
+                pathOut.GetWriteBuf(sz),
+                sz
+               ) != 0;
+        pathOut.UngetWriteBuf();
+    }
+    if (ok)
+        return pathOut;
+    else
+        return path;
+#else
+    return GetFullPath();
+#endif
+}
+
+// Return the long form of the path (returns identity on non-Windows platforms)
+wxString wxFileName::GetLongPath() const
+{
+#if defined(__WXMSW__) && defined(__WIN32__)
+    wxString path(GetFullPath());
+    wxString pathOut;
+    DWORD sz = ::GetLongPathName(path, NULL, 0);
+    bool ok = sz != 0;
+    if ( ok )
+    {
+        ok = ::GetLongPathName
+               (
+                path,
+                pathOut.GetWriteBuf(sz),
+                sz
+               ) != 0;
+        pathOut.UngetWriteBuf();
+    }
+    if (ok)
+        return pathOut;
+    else
+        return path;
+#else
+    return GetFullPath();
+#endif
+}
+
 wxPathFormat wxFileName::GetFormat( wxPathFormat format )
 {
     if (format == wxPATH_NATIVE)