X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f363e05c6d7d29ac152c86b526e25b983d05eea5..785f5eaa05195f5e44a974861864324667a3326e:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 125aae19f6..0659a8b565 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -60,7 +60,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "filename.h" #endif @@ -135,6 +135,7 @@ #endif #ifdef __EMX__ +#include #define MAX_PATH _MAX_PATH #endif @@ -584,7 +585,7 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) } #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__) -#ifdef __WIN32__ + if ( dir.empty() ) { if ( !::GetTempPath(MAX_PATH, wxStringBuffer(dir, MAX_PATH + 1)) ) @@ -611,28 +612,8 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) path.clear(); } -#else // Win16 - if ( !::GetTempFileName(NULL, prefix, 0, wxStringBuffer(path, 1025)) ) - { - path.clear(); - } -#endif // Win32/16 - -#elif defined(__WXPM__) - // for now just create a file - // - // future enhancements can be to set some extended attributes for file - // systems OS/2 supports that have them (HPFS, FAT32) and security - // (HPFS386) - static const wxChar *szMktempSuffix = wxT("XXX"); - path << dir << _T('/') << name << szMktempSuffix; - - // Temporarily remove - MN - #ifndef __WATCOMC__ - ::DosCreateDir(wxStringBuffer(path, MAX_PATH), NULL); - #endif -#else // !Windows, !OS/2 +#else // !Windows if ( dir.empty() ) { #if defined(__WXMAC__) && !defined(__DARWIN__) @@ -647,7 +628,7 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) if ( dir.empty() ) { // default - #ifdef __DOS__ + #if defined(__DOS__) || defined(__OS2__) dir = _T("."); #else dir = _T("/tmp"); @@ -722,7 +703,7 @@ wxFileName::CreateTempFileName(const wxString& prefix, wxFile *fileTemp) for ( size_t n = 0; n < numTries; n++ ) { // 3 hex digits is enough for numTries == 1000 < 4096 - pathTry = path + wxString::Format(_T("%.03x"), n); + pathTry = path + wxString::Format(_T("%.03x"), (unsigned int) n); if ( !wxFile::Exists(pathTry) ) { break; @@ -847,6 +828,18 @@ bool wxFileName::Normalize(int flags, const wxString& cwd, wxPathFormat format) { + // deal with env vars renaming first as this may seriously change the path + if ( flags & wxPATH_NORM_ENV_VARS ) + { + wxString pathOrig = GetFullPath(format); + wxString path = wxExpandEnvVars(pathOrig); + if ( path != pathOrig ) + { + Assign(path); + } + } + + // the existing path components wxArrayString dirs = GetDirs(); @@ -939,11 +932,6 @@ bool wxFileName::Normalize(int flags, } } - if ( flags & wxPATH_NORM_ENV_VARS ) - { - dir = wxExpandEnvVars(dir); - } - if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) ) { dir.MakeLower(); @@ -951,6 +939,23 @@ bool wxFileName::Normalize(int flags, m_dirs.Add(dir); } + +#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE + if ( (flags & wxPATH_NORM_SHORTCUT) ) + { + wxString filename; + if (GetShortcutTarget(GetFullPath(format), filename)) + { + // Repeat this since we may now have a new path + if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) ) + { + filename.MakeLower(); + } + m_relative = false; + Assign(filename); + } + } +#endif if ( (flags & wxPATH_NORM_CASE) && !IsCaseSensitive(format) ) { @@ -975,6 +980,81 @@ bool wxFileName::Normalize(int flags, return true; } +// ---------------------------------------------------------------------------- +// get the shortcut target +// ---------------------------------------------------------------------------- + +// WinCE (3) doesn't have CLSID_ShellLink, IID_IShellLink definitions. +// The .lnk file is a plain text file so it should be easy to +// make it work. Hint from Google Groups: +// "If you open up a lnk file, you'll see a +// number, followed by a pound sign (#), followed by more text. The +// number is the number of characters that follows the pound sign. The +// characters after the pound sign are the command line (which _can_ +// include arguments) to be executed. Any path (e.g. \windows\program +// files\myapp.exe) that includes spaces needs to be enclosed in +// quotation marks." + +#if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE +// The following lines are necessary under WinCE +// #include "wx/msw/private.h" +// #include +#include +#if defined(__WXWINCE__) +#include +#endif + +bool wxFileName::GetShortcutTarget(const wxString& shortcutPath, wxString& targetFilename, wxString* arguments) +{ + wxString path, file, ext; + wxSplitPath(shortcutPath, & path, & file, & ext); + + HRESULT hres; + IShellLink* psl; + bool success = FALSE; + + // Assume it's not a shortcut if it doesn't end with lnk + if (ext.Lower() != wxT("lnk")) + return FALSE; + + // create a ShellLink object + hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + IID_IShellLink, (LPVOID*) &psl); + + if (SUCCEEDED(hres)) + { + IPersistFile* ppf; + hres = psl->QueryInterface( IID_IPersistFile, (LPVOID *) &ppf); + if (SUCCEEDED(hres)) + { + WCHAR wsz[MAX_PATH]; + + MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, shortcutPath.mb_str(), -1, wsz, + MAX_PATH); + + hres = ppf->Load(wsz, 0); + if (SUCCEEDED(hres)) + { + wxChar buf[2048]; + psl->GetPath(buf, 2048, NULL, SLGP_UNCPRIORITY); + targetFilename = wxString(buf); + success = (shortcutPath != targetFilename); + + psl->GetArguments(buf, 2048); + wxString args(buf); + if (!args.IsEmpty() && arguments) + { + *arguments = args; + } + } + } + } + psl->Release(); + return success; +} +#endif + + // ---------------------------------------------------------------------------- // absolute/relative paths // ---------------------------------------------------------------------------- @@ -1176,19 +1256,44 @@ bool wxFileName::IsPathSeparator(wxChar ch, wxPathFormat format) // path components manipulation // ---------------------------------------------------------------------------- +/* static */ bool wxFileName::IsValidDirComponent(const wxString& dir) +{ + if ( dir.empty() ) + { + wxFAIL_MSG( _T("empty directory passed to wxFileName::InsertDir()") ); + + return false; + } + + const size_t len = dir.length(); + for ( size_t n = 0; n < len; n++ ) + { + if ( dir[n] == GetVolumeSeparator() || IsPathSeparator(dir[n]) ) + { + wxFAIL_MSG( _T("invalid directory component in wxFileName") ); + + return false; + } + } + + return true; +} + void wxFileName::AppendDir( const wxString &dir ) { - m_dirs.Add( dir ); + if ( IsValidDirComponent(dir) ) + m_dirs.Add( dir ); } void wxFileName::PrependDir( const wxString &dir ) { - m_dirs.Insert( dir, 0 ); + InsertDir(0, dir); } void wxFileName::InsertDir( int before, const wxString &dir ) { - m_dirs.Insert( dir, before ); + if ( IsValidDirComponent(dir) ) + m_dirs.Insert( dir, before ); } void wxFileName::RemoveDir( int pos ) @@ -1237,7 +1342,7 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const break; case wxPATH_DOS: - if (!m_relative) + if ( !m_relative ) fullpath += wxFILE_SEP_PATH_DOS; break; @@ -1248,8 +1353,9 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const case wxPATH_UNIX: if ( !m_relative ) { - // normally the absolute file names starts with a slash with - // one exception: file names like "~/foo.bar" don't have it + // normally the absolute file names start with a slash + // with one exception: the ones like "~/foo.bar" don't + // have it if ( m_dirs.IsEmpty() || m_dirs[0u] != _T('~') ) { fullpath += wxFILE_SEP_PATH_UNIX; @@ -1259,64 +1365,67 @@ wxString wxFileName::GetPath( int flags, wxPathFormat format ) const case wxPATH_VMS: // no leading character here but use this place to unset - // wxPATH_GET_SEPARATOR flag: under VMS it doesn't make sense as, - // if I understand correctly, there should never be a dot before - // the closing bracket + // wxPATH_GET_SEPARATOR flag: under VMS it doesn't make sense + // as, if I understand correctly, there should never be a dot + // before the closing bracket flags &= ~wxPATH_GET_SEPARATOR; } + if ( m_dirs.empty() ) + { + // there is nothing more + return fullpath; + } + // then concatenate all the path components using the path separator - size_t dirCount = m_dirs.GetCount(); - if ( dirCount ) + if ( format == wxPATH_VMS ) { - if ( format == wxPATH_VMS ) - { - fullpath += wxT('['); - } + fullpath += wxT('['); + } - for ( size_t i = 0; i < dirCount; i++ ) + const size_t dirCount = m_dirs.GetCount(); + for ( size_t i = 0; i < dirCount; i++ ) + { + switch (format) { - switch (format) - { - case wxPATH_MAC: - if ( m_dirs[i] == wxT(".") ) - { - // skip appending ':', this shouldn't be done in this - // case as "::" is interpreted as ".." under Unix - continue; - } - - // convert back from ".." to nothing - if ( m_dirs[i] != wxT("..") ) - fullpath += m_dirs[i]; - break; + case wxPATH_MAC: + if ( m_dirs[i] == wxT(".") ) + { + // skip appending ':', this shouldn't be done in this + // case as "::" is interpreted as ".." under Unix + continue; + } - default: - wxFAIL_MSG( wxT("Unexpected path format") ); - // still fall through + // convert back from ".." to nothing + if ( m_dirs[i] != wxT("..") ) + fullpath += m_dirs[i]; + break; - case wxPATH_DOS: - case wxPATH_UNIX: - fullpath += m_dirs[i]; - break; + default: + wxFAIL_MSG( wxT("Unexpected path format") ); + // still fall through - case wxPATH_VMS: - // TODO: What to do with ".." under VMS + case wxPATH_DOS: + case wxPATH_UNIX: + fullpath += m_dirs[i]; + break; - // convert back from ".." to nothing - if ( m_dirs[i] != wxT("..") ) - fullpath += m_dirs[i]; - break; - } + case wxPATH_VMS: + // TODO: What to do with ".." under VMS - if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) ) - fullpath += GetPathSeparator(format); + // convert back from ".." to nothing + if ( m_dirs[i] != wxT("..") ) + fullpath += m_dirs[i]; + break; } - if ( format == wxPATH_VMS ) - { - fullpath += wxT(']'); - } + if ( (flags & wxPATH_GET_SEPARATOR) || (i != dirCount - 1) ) + fullpath += GetPathSeparator(format); + } + + if ( format == wxPATH_VMS ) + { + fullpath += wxT(']'); } return fullpath; @@ -1347,10 +1456,9 @@ wxString wxFileName::GetShortPath() const ok = ::GetShortPathName ( path, - pathOut.GetWriteBuf(sz), + wxStringBuffer(pathOut, sz), sz ) != 0; - pathOut.UngetWriteBuf(); } if (ok) return pathOut; @@ -1406,11 +1514,9 @@ wxString wxFileName::GetLongPath() const ok = (*s_pfnGetLongPathName) ( path, - pathOut.GetWriteBuf(sz), + wxStringBuffer(pathOut, sz), sz ) != 0; - pathOut.UngetWriteBuf(); - success = true; } } @@ -1492,7 +1598,7 @@ wxPathFormat wxFileName::GetFormat( wxPathFormat format ) { if (format == wxPATH_NATIVE) { -#if defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__) +#if defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__) format = wxPATH_DOS; #elif defined(__WXMAC__) && !defined(__DARWIN__) format = wxPATH_MAC; @@ -1541,7 +1647,7 @@ void wxFileName::SplitPath(const wxString& fullpathWithVolume, fullpath[posFirstSlash] = wxFILE_SEP_DSK; // UNC paths are always absolute, right? (FIXME) - fullpath.insert(posFirstSlash + 1, wxFILE_SEP_PATH_DOS); + fullpath.insert(posFirstSlash + 1, 1, wxFILE_SEP_PATH_DOS); } } } @@ -1871,25 +1977,25 @@ WX_DEFINE_EXPORTED_OBJARRAY(MacDefaultExtensionArray) ; MacDefaultExtensionArray gMacDefaultExtensions ; -static void MacEnsureDefaultExtensionsLoaded() +// load the default extensions +MacDefaultExtensionRecord gDefaults[] = { - if ( !gMacDefaultExtensionsInited ) - { - - // load the default extensions - MacDefaultExtensionRecord defaults[1] = - { - MacDefaultExtensionRecord( wxT("txt") , 'TEXT' , 'ttxt' ) , - - } ; - // we could load the pc exchange prefs here too + MacDefaultExtensionRecord( wxT("txt") , 'TEXT' , 'ttxt' ) , + MacDefaultExtensionRecord( wxT("tif") , 'TIFF' , '****' ) , + MacDefaultExtensionRecord( wxT("jpg") , 'JPEG' , '****' ) , +} ; - for ( size_t i = 0 ; i < WXSIZEOF( defaults ) ; ++i ) +static void MacEnsureDefaultExtensionsLoaded() +{ + if ( !gMacDefaultExtensionsInited ) { - gMacDefaultExtensions.Add( defaults[i] ) ; + // we could load the pc exchange prefs here too + for ( size_t i = 0 ; i < WXSIZEOF( gDefaults ) ; ++i ) + { + gMacDefaultExtensions.Add( gDefaults[i] ) ; + } + gMacDefaultExtensionsInited = true ; } - gMacDefaultExtensionsInited = true ; - } } bool wxFileName::MacSetTypeAndCreator( wxUint32 type , wxUint32 creator ) {