fixed wxXmlResource::Load's detection of filenames to be done as early as possible

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 7a8f627a555d2bd5e0724a64582c2376799b9a29..b732f23a1c869cbd02541ce34ca67ba755ff50dc 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -96,12 +96,17 @@
     #define _MAXPATHLEN 1024
 #endif
 
     #define _MAXPATHLEN 1024
 #endif
 

+#ifndef INVALID_FILE_ATTRIBUTES
+    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+#endif
+

 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // private globals
 // ----------------------------------------------------------------------------
 

-// MT-FIXME: get rid of this horror and all code using it
+#if WXWIN_COMPATIBILITY_2_8

 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];

+#endif

 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //
 
 #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
 //


@@ -111,13 +116,6 @@ static wxChar wxFileFunctionsBuffer[4*_MAXPATHLEN];
 const int wxInvalidOffset = -1;
 #endif
 
 const int wxInvalidOffset = -1;
 #endif
 

-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// translate the filenames before passing them to OS functions
-#define OS_FILENAME(s) (s.fn_str())
-

 // ============================================================================
 // implementation
 // ============================================================================
 // ============================================================================
 // implementation
 // ============================================================================


@@ -289,9 +287,10 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file) const
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// miscellaneous global functions (TOFIX!)
+// miscellaneous global functions

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

+#if WXWIN_COMPATIBILITY_2_8

 static inline wxChar* MYcopystring(const wxString& s)
 {
     wxChar* copy = new wxChar[s.length() + 1];
 static inline wxChar* MYcopystring(const wxString& s)
 {
     wxChar* copy = new wxChar[s.length() + 1];


@@ -304,6 +303,7 @@ static inline CharType* MYcopystring(const CharType* s)
     CharType* copy = new CharType[wxStrlen(s) + 1];
     return wxStrcpy(copy, s);
 }
     CharType* copy = new CharType[wxStrlen(s) + 1];
     return wxStrcpy(copy, s);
 }

+#endif

 
 
 bool
 
 
 bool


@@ -316,7 +316,7 @@ wxFileExists (const wxString& filename)
     // it can cope with network (UNC) paths unlike them
     DWORD ret = ::GetFileAttributes(filename.fn_str());
 
     // it can cope with network (UNC) paths unlike them
     DWORD ret = ::GetFileAttributes(filename.fn_str());
 

-    return (ret != (DWORD)-1) && !(ret & FILE_ATTRIBUTE_DIRECTORY);
+    return (ret != INVALID_FILE_ATTRIBUTES) && !(ret & FILE_ATTRIBUTE_DIRECTORY);

 #else // !__WIN32__
     #ifndef S_ISREG
         #define S_ISREG(mode) ((mode) & S_IFREG)
 #else // !__WIN32__
     #ifndef S_ISREG
         #define S_ISREG(mode) ((mode) & S_IFREG)


@@ -356,6 +356,7 @@ wxIsAbsolutePath (const wxString& filename)
     return false ;
 }
 
     return false ;
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 /*
  * Strip off any extension (dot something) from end of file,
  * IF one exists. Inserts zero into buffer.
 /*
  * Strip off any extension (dot something) from end of file,
  * IF one exists. Inserts zero into buffer.


@@ -474,7 +475,7 @@ wxString wxRealPath(const wxString& path)
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {
     if (filename.empty())
 wxChar *wxCopyAbsolutePath(const wxString& filename)
 {
     if (filename.empty())

-        return (wxChar *) NULL;
+        return NULL;

 
     if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
     {
 
     if (! wxIsAbsolutePath(wxExpandPath(wxFileFunctionsBuffer, filename)))
     {


@@ -707,7 +708,7 @@ wxContractPath (const wxString& filename,
   static wxChar dest[_MAXPATHLEN];
 
   if (filename.empty())
   static wxChar dest[_MAXPATHLEN];
 
   if (filename.empty())

-    return (wxChar *) NULL;
+    return NULL;

 
   wxStrcpy (dest, filename);
 #ifdef __WXMSW__
 
   wxStrcpy (dest, filename);
 #ifdef __WXMSW__


@@ -751,6 +752,8 @@ wxContractPath (const wxString& filename,
   return dest;
 }
 
   return dest;
 }
 

+#endif // #if WXWIN_COMPATIBILITY_2_8
+

 // Return just the filename, not the path (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {
 // Return just the filename, not the path (basename)
 wxChar *wxFileNameFromPath (wxChar *path)
 {


@@ -818,7 +821,7 @@ wxPathOnly (wxChar *path)
         }
 #endif
     }
         }
 #endif
     }

-    return (wxChar *) NULL;
+    return NULL;

 }
 
 // Return just the directory, or NULL if no directory
 }
 
 // Return just the directory, or NULL if no directory


@@ -945,13 +948,16 @@ void wxMacFilename2FSSpec( const wxString& path , FSSpec *spec )
     OSStatus err = noErr;
     FSRef fsRef;
     wxMacPathToFSRef( path , &fsRef );
     OSStatus err = noErr;
     FSRef fsRef;
     wxMacPathToFSRef( path , &fsRef );

-       err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);
+    err = FSGetCatalogInfo(&fsRef, kFSCatInfoNone, NULL, NULL, spec, NULL);

     verify_noerr( err );
 }
 #endif
 
 #endif // __WXMAC__
 
     verify_noerr( err );
 }
 #endif
 
 #endif // __WXMAC__
 

+
+#if WXWIN_COMPATIBILITY_2_8
+

 template<typename T>
 static void wxDoDos2UnixFilename(T *s)
 {
 template<typename T>
 static void wxDoDos2UnixFilename(T *s)
 {


@@ -994,6 +1000,8 @@ wxDoUnix2DosFilename(T *WXUNUSED(s) )
 void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
 void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
 
 void wxUnix2DosFilename(char *s) { wxDoUnix2DosFilename(s); }
 void wxUnix2DosFilename(wchar_t *s) { wxDoUnix2DosFilename(s); }
 

+#endif // #if WXWIN_COMPATIBILITY_2_8
+

 // Concatenate two files to form third
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)
 // Concatenate two files to form third
 bool
 wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& file3)


@@ -1173,7 +1181,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
 #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
     // no chmod in VA.  Should be some permission API for HPFS386 partitions
     // however
 #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
     // no chmod in VA.  Should be some permission API for HPFS386 partitions
     // however

-    if ( chmod(OS_FILENAME(file2), fbuf.st_mode) != 0 )
+    if ( chmod(file2.fn_str(), fbuf.st_mode) != 0 )

     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());
     {
         wxLogSysError(_("Impossible to set permissions for the file '%s'"),
                       file2.c_str());


@@ -1238,7 +1246,7 @@ bool wxRemoveFile(const wxString& file)
     int res = 1;
     // TODO with VFSFileDelete()
 #else
     int res = 1;
     // TODO with VFSFileDelete()
 #else

-    int res = unlink(OS_FILENAME(file));
+    int res = unlink(file.fn_str());

 #endif
 
     return res == 0;
 #endif
 
     return res == 0;


@@ -1248,14 +1256,16 @@ bool wxMkdir(const wxString& dir, int perm)
 {
 #if defined(__WXPALMOS__)
     return false;
 {
 #if defined(__WXPALMOS__)
     return false;

-#elif defined(__WXMAC__) && !defined(__UNIX__)
-    return (mkdir(dir.fn_str() , 0 ) == 0);
-#else // !Mac
-    const wxChar *dirname = dir.c_str();
+#else
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    if ( mkdir(dir.fn_str(), 0) != 0 )

 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler
 
     // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too
     // for the GNU compiler

-#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
+#elif (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || \
+      (defined(__GNUWIN32__) && !defined(__MINGW32__)) ||                \
+      defined(__WINE__) || defined(__WXMICROWIN__)
+    const wxChar *dirname = dir.c_str();

   #if defined(MSVCRT)
     wxUnusedVar(perm);
     if ( mkdir(wxFNCONV(dirname)) != 0 )
   #if defined(MSVCRT)
     wxUnusedVar(perm);
     if ( mkdir(wxFNCONV(dirname)) != 0 )


@@ -1264,8 +1274,9 @@ bool wxMkdir(const wxString& dir, int perm)
   #endif
 #elif defined(__OS2__)
     wxUnusedVar(perm);
   #endif
 #elif defined(__OS2__)
     wxUnusedVar(perm);

-    if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's??
+    if (::DosCreateDir(dir.c_str(), NULL) != 0) // enhance for EAB's??

 #elif defined(__DOS__)
 #elif defined(__DOS__)

+    const wxChar *dirname = dir.c_str();

   #if defined(__WATCOMC__)
     (void)perm;
     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )
   #if defined(__WATCOMC__)
     (void)perm;
     if ( wxMkDir(wxFNSTRINGCAST wxFNCONV(dirname)) != 0 )


@@ -1276,36 +1287,43 @@ bool wxMkdir(const wxString& dir, int perm)
   #endif
 #else  // !MSW, !DOS and !OS/2 VAC++
     wxUnusedVar(perm);
   #endif
 #else  // !MSW, !DOS and !OS/2 VAC++
     wxUnusedVar(perm);

-#ifdef __WXWINCE__
-    if ( !CreateDirectory(dirname, NULL) )
-#else
+  #ifdef __WXWINCE__
+    if ( CreateDirectory(dir, NULL) == 0 )
+  #else

     if ( wxMkDir(dir.fn_str()) != 0 )
     if ( wxMkDir(dir.fn_str()) != 0 )

-#endif
+  #endif

 #endif // !MSW/MSW
     {
 #endif // !MSW/MSW
     {

-        wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
-
+        wxLogSysError(_("Directory '%s' couldn't be created"), dir);

         return false;
     }
 
     return true;
         return false;
     }
 
     return true;

-#endif // Mac/!Mac
+#endif // PALMOS/!PALMOS

 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #if defined(__VMS__)
     return false; //to be changed since rmdir exists in VMS7.x
 }
 
 bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
 {
 #if defined(__VMS__)
     return false; //to be changed since rmdir exists in VMS7.x

-#elif defined(__OS2__)
-    return (::DosDeleteDir(dir.c_str()) == 0);
-#elif defined(__WXWINCE__)
-    return (RemoveDirectory(dir) != 0);

 #elif defined(__WXPALMOS__)
     // TODO with VFSFileRename()
     return false;
 #else
 #elif defined(__WXPALMOS__)
     // TODO with VFSFileRename()
     return false;
 #else

-    return (wxRmDir(OS_FILENAME(dir)) == 0);
-#endif
+  #if defined(__OS2__)
+    if ( ::DosDeleteDir(dir.c_str()) != 0 )
+  #elif defined(__WXWINCE__)
+    if ( RemoveDirectory(dir) == 0 )
+  #else
+    if ( wxRmDir(dir.fn_str()) != 0 )
+  #endif
+    {
+        wxLogSysError(_("Directory '%s' couldn't be deleted"), dir);
+        return false;
+    }
+
+    return true;
+#endif // PALMOS/!PALMOS

 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)


@@ -1339,7 +1357,7 @@ bool wxDirExists(const wxString& pathName)
     // stat() can't cope with network paths
     DWORD ret = ::GetFileAttributes(strPath.fn_str());
 
     // stat() can't cope with network paths
     DWORD ret = ::GetFileAttributes(strPath.fn_str());
 

-    return (ret != (DWORD)-1) && (ret & FILE_ATTRIBUTE_DIRECTORY);
+    return (ret != INVALID_FILE_ATTRIBUTES) && (ret & FILE_ATTRIBUTE_DIRECTORY);

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


@@ -1361,6 +1379,8 @@ bool wxDirExists(const wxString& pathName)
 #endif // __WIN32__/!__WIN32__
 }
 
 #endif // __WIN32__/!__WIN32__
 }
 

+#if WXWIN_COMPATIBILITY_2_8
+

 // Get a temporary filename, opening and closing the file.
 wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 {
 // Get a temporary filename, opening and closing the file.
 wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
 {


@@ -1395,6 +1415,8 @@ bool wxGetTempFileName(const wxString& prefix, wxString& buf)
 #endif // wxUSE_FILE/!wxUSE_FILE
 }
 
 #endif // wxUSE_FILE/!wxUSE_FILE
 }
 

+#endif // #if WXWIN_COMPATIBILITY_2_8
+

 // Get first file name matching given wild card.
 
 static wxDir *gs_dir = NULL;
 // Get first file name matching given wild card.
 
 static wxDir *gs_dir = NULL;


@@ -1402,7 +1424,7 @@ static wxString gs_dirPath;
 
 wxString wxFindFirstFile(const wxString& spec, int flags)
 {
 
 wxString wxFindFirstFile(const wxString& spec, int flags)
 {

-    wxSplitPath(spec, &gs_dirPath, NULL, NULL);
+    wxFileName::SplitPath(spec, &gs_dirPath, NULL, NULL);

     if ( gs_dirPath.empty() )
         gs_dirPath = wxT(".");
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )
     if ( gs_dirPath.empty() )
         gs_dirPath = wxT(".");
     if ( !wxEndsWithPathSeparator(gs_dirPath ) )


@@ -1516,7 +1538,7 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         {
             sz -= 3;
             rc = ::DosQueryCurrentDir( 0 // current drive
         {
             sz -= 3;
             rc = ::DosQueryCurrentDir( 0 // current drive

-                                      ,cbuf + 3
+                                      ,(PBYTE)cbuf + 3

                                       ,(PULONG)&sz
                                      );
             cbuf[0] = char('A' + (ulDriveNum - 1));
                                       ,(PULONG)&sz
                                      );
             cbuf[0] = char('A' + (ulDriveNum - 1));


@@ -1701,6 +1723,7 @@ bool wxFindFileInPath(wxString *pStr, const wxString& szPath, const wxString& sz
     return false;
 }
 
     return false;
 }
 

+#if WXWIN_COMPATIBILITY_2_8

 void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
                              wxString *pstrPath,
                              wxString *pstrName,
 void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
                              wxString *pstrPath,
                              wxString *pstrName,


@@ -1708,6 +1731,7 @@ void WXDLLIMPEXP_BASE wxSplitPath(const wxString& fileName,
 {
     wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
 }
 {
     wxFileName::SplitPath(fileName, pstrPath, pstrName, pstrExt);
 }

+#endif  // #if WXWIN_COMPATIBILITY_2_8

 
 #if wxUSE_DATETIME
 
 
 #if wxUSE_DATETIME
 


@@ -1840,12 +1864,20 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access)
     // quoting the MSDN: "To obtain a handle to a directory, call the
     // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
     // doesn't work under Win9x/ME but then it's not needed there anyhow
     // quoting the MSDN: "To obtain a handle to a directory, call the
     // CreateFile function with the FILE_FLAG_BACKUP_SEMANTICS flag", but this
     // doesn't work under Win9x/ME but then it's not needed there anyhow

-    bool isdir = wxDirExists(path);
-    if ( isdir && wxGetOsVersion() == wxOS_WINDOWS_9X )
+    const DWORD dwAttr = ::GetFileAttributes(path.fn_str());
+    if ( dwAttr == INVALID_FILE_ATTRIBUTES )
+    {
+        // file probably doesn't exist at all
+        return false;
+    }
+
+    if ( wxGetOsVersion() == wxOS_WINDOWS_9X )

     {
         // FAT directories always allow all access, even if they have the
     {
         // FAT directories always allow all access, even if they have the

-        // readonly flag set
-        return true;
+        // readonly flag set, and FAT files can only be read-only
+        return (dwAttr & FILE_ATTRIBUTE_DIRECTORY) ||
+                    (access != GENERIC_WRITE ||
+                        !(dwAttr & FILE_ATTRIBUTE_READONLY));

     }
 
     HANDLE h = ::CreateFile
     }
 
     HANDLE h = ::CreateFile


@@ -1855,7 +1887,9 @@ static bool wxCheckWin32Permission(const wxString& path, DWORD access)
                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                     NULL,
                     OPEN_EXISTING,
                     FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                     NULL,
                     OPEN_EXISTING,

-                    isdir ? FILE_FLAG_BACKUP_SEMANTICS : 0,
+                    dwAttr & FILE_ATTRIBUTE_DIRECTORY
+                        ? FILE_FLAG_BACKUP_SEMANTICS
+                        : 0,

                     NULL
                  );
     if ( h != INVALID_HANDLE_VALUE )
                     NULL
                  );
     if ( h != INVALID_HANDLE_VALUE )