fixing overrelease and out-of-bounds write, fixes #13725

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

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 6d9401b4a31efbb6d303c862e5afb5a89c9d734b..2e04e80098cb9d0233f83ef37ca598cf4315d576 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -64,17 +64,19 @@
     #include "wx/msw/mslu.h"
 
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()
     #include "wx/msw/mslu.h"
 
     // sys/cygwin.h is needed for cygwin_conv_to_full_win32_path()

+    // and for cygwin_conv_path()

     //
     // note that it must be included after <windows.h>
     #ifdef __GNUWIN32__
         #ifdef __CYGWIN__
             #include <sys/cygwin.h>
     //
     // note that it must be included after <windows.h>
     #ifdef __GNUWIN32__
         #ifdef __CYGWIN__
             #include <sys/cygwin.h>

+            #include <cygwin/version.h>

         #endif
     #endif // __GNUWIN32__
 
     // io.h is needed for _get_osfhandle()
     // Already included by filefn.h for many Windows compilers
         #endif
     #endif // __GNUWIN32__
 
     // io.h is needed for _get_osfhandle()
     // Already included by filefn.h for many Windows compilers

-    #if defined __MWERKS__ || defined __CYGWIN__
+    #if defined __CYGWIN__

         #include <io.h>
     #endif
 #endif // __WINDOWS__
         #include <io.h>
     #endif
 #endif // __WINDOWS__


@@ -96,10 +98,6 @@
     #define _MAXPATHLEN 1024
 #endif
 
     #define _MAXPATHLEN 1024
 #endif
 

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

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


@@ -309,30 +307,7 @@ static inline CharType* MYcopystring(const CharType* s)
 bool
 wxFileExists (const wxString& filename)
 {
 bool
 wxFileExists (const wxString& filename)
 {

-#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(filename.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( filename.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( filename , &st) == 0 && S_ISREG(st.st_mode);
-#endif
-#endif // __WIN32__/!__WIN32__
+    return wxFileName::FileExists(filename);

 }
 
 bool
 }
 
 bool


@@ -392,7 +367,7 @@ template<typename CharType>
 static CharType *wxDoRealPath (CharType *path)
 {
   static const CharType SEP = wxFILE_SEP_PATH;
 static CharType *wxDoRealPath (CharType *path)
 {
   static const CharType SEP = wxFILE_SEP_PATH;

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

   wxUnix2DosFilename(path);
 #endif
   if (path[0] && path[1]) {
   wxUnix2DosFilename(path);
 #endif
   if (path[0] && path[1]) {


@@ -423,7 +398,7 @@ static CharType *wxDoRealPath (CharType *path)
                         path[0] = SEP;
                         path[1] = wxT('\0');
                       }
                         path[0] = SEP;
                         path[1] = wxT('\0');
                       }

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

                     /* Check that path[2] is NULL! */
                     else if (path[1] == wxT(':') && !path[2])
                       {
                     /* Check that path[2] is NULL! */
                     else if (path[1] == wxT(':') && !path[2])
                       {


@@ -472,7 +447,7 @@ wxChar *wxCopyAbsolutePath(const wxString& filename)
     {
         wxString buf = ::wxGetCwd();
         wxChar ch = buf.Last();
     {
         wxString buf = ::wxGetCwd();
         wxChar ch = buf.Last();

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

         if (ch != wxT('\\') && ch != wxT('/'))
             buf << wxT("\\");
 #else
         if (ch != wxT('\\') && ch != wxT('/'))
             buf << wxT("\\");
 #else


@@ -526,7 +501,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
     trimchars[3] = 0;
 
     static const CharType SEP = wxFILE_SEP_PATH;
     trimchars[3] = 0;
 
     static const CharType SEP = wxFILE_SEP_PATH;

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     //wxUnix2DosFilename(path);
 #endif
 
     //wxUnix2DosFilename(path);
 #endif
 


@@ -546,7 +521,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
 
     s = nm;
     d = lnm;
 
     s = nm;
     d = lnm;

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

     q = FALSE;
 #else
     q = nm[0] == wxT('\\') && nm[1] == wxT('~');
     q = FALSE;
 #else
     q = nm[0] == wxT('\\') && nm[1] == wxT('~');


@@ -571,7 +546,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
       else
 #else
     while ((*d++ = *s) != 0) {
       else
 #else
     while ((*d++ = *s) != 0) {

-#  ifndef __WXMSW__
+#  ifndef __WINDOWS__

         if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)!=0) {
                 s++;
         if (*s == wxT('\\')) {
             if ((*(d - 1) = *++s)!=0) {
                 s++;


@@ -583,7 +558,7 @@ static CharType *wxDoExpandPath(CharType *buf, const wxString& name)
 #endif
             // No env variables on WinCE
 #ifndef __WXWINCE__
 #endif
             // No env variables on WinCE
 #ifndef __WXWINCE__

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

         if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
 #else
         if (*s++ == wxT('$'))
         if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
 #else
         if (*s++ == wxT('$'))


@@ -702,7 +677,7 @@ wxContractPath (const wxString& filename,
     return NULL;
 
   wxStrcpy (dest, filename);
     return NULL;
 
   wxStrcpy (dest, filename);

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

   wxUnix2DosFilename(dest);
 #endif
 
   wxUnix2DosFilename(dest);
 #endif
 


@@ -756,16 +731,7 @@ wxChar *wxFileNameFromPath (wxChar *path)
 
 wxString wxFileNameFromPath (const wxString& path)
 {
 
 wxString wxFileNameFromPath (const wxString& path)
 {

-    wxString name, ext;
-    wxFileName::SplitPath(path, NULL, &name, &ext);
-
-    wxString fullname = name;
-    if ( !ext.empty() )
-    {
-        fullname << wxFILE_SEP_EXT << ext;
-    }
-
-    return fullname;
+    return wxFileName(path).GetFullName();

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


@@ -801,7 +767,7 @@ wxPathOnly (wxChar *path)
             i --;
         }
 
             i --;
         }
 

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

         // Try Drive specifier
         if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {
         // Try Drive specifier
         if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {


@@ -850,7 +816,7 @@ wxString wxPathOnly (const wxString& path)
             i --;
         }
 
             i --;
         }
 

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

         // Try Drive specifier
         if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {
         // Try Drive specifier
         if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
         {


@@ -876,6 +842,9 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
 {
     CFURLRef fullURLRef;
     fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
 {
     CFURLRef fullURLRef;
     fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);

+    if ( fullURLRef == NULL)
+        return wxEmptyString;
+    

     if ( additionalPathComponent )
     {
         CFURLRef parentURLRef = fullURLRef ;
     if ( additionalPathComponent )
     {
         CFURLRef parentURLRef = fullURLRef ;


@@ -883,12 +852,10 @@ wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathCompon
             additionalPathComponent,false);
         CFRelease( parentURLRef ) ;
     }
             additionalPathComponent,false);
         CFRelease( parentURLRef ) ;
     }

-    CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+    wxCFStringRef cfString( CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle ));

     CFRelease( fullURLRef ) ;
     CFRelease( fullURLRef ) ;

-    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfString);
-    CFRelease( cfString );
-    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
-    return wxCFStringRef(cfMutableString).AsString();
+
+    return wxCFStringRef::AsStringWithNormalizationFormC(cfString);

 }
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
 }
 
 OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )


@@ -913,13 +880,10 @@ OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef )
 
 wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
 {
 
 wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
 {

-    CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+    wxCFStringRef cfname( CFStringCreateWithCharacters( kCFAllocatorDefault,

                                                       uniname->unicode,
                                                       uniname->unicode,

-                                                      uniname->length );
-    CFMutableStringRef cfMutableString = CFStringCreateMutableCopy(NULL, 0, cfname);
-    CFRelease( cfname );
-    CFStringNormalize(cfMutableString,kCFStringNormalizationFormC);
-    return wxCFStringRef(cfMutableString).AsString() ;
+                                                      uniname->length ) );
+    return wxCFStringRef::AsStringWithNormalizationFormC(cfname);

 }
 
 #ifndef __LP64__
 }
 
 #ifndef __LP64__


@@ -957,7 +921,7 @@ static void wxDoDos2UnixFilename(T *s)
       {
         if (*s == wxT('\\'))
           *s = wxT('/');
       {
         if (*s == wxT('\\'))
           *s = wxT('/');

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

         else
           *s = wxTolower(*s);        // Case INDEPENDENT
 #endif
         else
           *s = wxTolower(*s);        // Case INDEPENDENT
 #endif


@@ -970,14 +934,14 @@ void wxDos2UnixFilename(wchar_t *s) { wxDoDos2UnixFilename(s); }
 
 template<typename T>
 static void
 
 template<typename T>
 static void

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

 wxDoUnix2DosFilename(T *s)
 #else
 wxDoUnix2DosFilename(T *WXUNUSED(s) )
 #endif
 {
 // Yes, I really mean this to happen under DOS only! JACS
 wxDoUnix2DosFilename(T *s)
 #else
 wxDoUnix2DosFilename(T *WXUNUSED(s) )
 #endif
 {
 // Yes, I really mean this to happen under DOS only! JACS

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

   if (s)
     while (*s)
       {
   if (s)
     while (*s)
       {


@@ -1032,8 +996,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
 }
 
 // helper of generic implementation of wxCopyFile()
 }
 
 // helper of generic implementation of wxCopyFile()

-#if !(defined(__WIN32__) || defined(__OS2__) || defined(__PALMOS__)) && \
-    wxUSE_FILE
+#if !(defined(__WIN32__) || defined(__OS2__)) && wxUSE_FILE

 
 static bool
 wxDoCopyFile(wxFile& fileIn,
 
 static bool
 wxDoCopyFile(wxFile& fileIn,


@@ -1085,7 +1048,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     // instead of our code if available
     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite
     // instead of our code if available
     //
     // NB: 3rd parameter is bFailIfExists i.e. the inverse of overwrite

-    if ( !::CopyFile(file1.fn_str(), file2.fn_str(), !overwrite) )
+    if ( !::CopyFile(file1.t_str(), file2.t_str(), !overwrite) )

     {
         wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
                       file1.c_str(), file2.c_str());
     {
         wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
                       file1.c_str(), file2.c_str());


@@ -1095,14 +1058,11 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
 #elif defined(__OS2__)
     if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
         return false;
 #elif defined(__OS2__)
     if ( ::DosCopy(file1.c_str(), file2.c_str(), overwrite ? DCPY_EXISTING : 0) != 0 )
         return false;

-#elif defined(__PALMOS__)
-    // TODO with http://www.palmos.com/dev/support/docs/protein_books/Memory_Databases_Files/
-    return false;

 #elif wxUSE_FILE // !Win32
 
     wxStructStat fbuf;
     // get permissions of file1
 #elif wxUSE_FILE // !Win32
 
     wxStructStat fbuf;
     // get permissions of file1

-    if ( wxStat( file1.c_str(), &fbuf) != 0 )
+    if ( wxStat( file1, &fbuf) != 0 )

     {
         // the file probably doesn't exist or we haven't the rights to read
         // from it anyhow
     {
         // the file probably doesn't exist or we haven't the rights to read
         // from it anyhow


@@ -1188,7 +1148,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
     wxUnusedVar(overwrite);
     return false;
 
     wxUnusedVar(overwrite);
     return false;
 

-#endif // __WXMSW__ && __WIN32__
+#endif // __WINDOWS__ && __WIN32__

 
     return true;
 }
 
     return true;
 }


@@ -1207,7 +1167,7 @@ wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)
         return false;
     }
 
         return false;
     }
 

-#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
+#if !defined(__WXWINCE__)

     // Normal system call
   if ( wxRename (file1, file2) == 0 )
     return true;
     // Normal system call
   if ( wxRename (file1, file2) == 0 )
     return true;


@@ -1219,6 +1179,7 @@ wxRenameFile(const wxString& file1, const wxString& file2, bool overwrite)
     return true;
   }
   // Give up
     return true;
   }
   // Give up

+  wxLogSysError(_("File '%s' couldn't be renamed '%s'"), file1, file2);

   return false;
 }
 
   return false;
 }
 


@@ -1228,32 +1189,28 @@ bool wxRemoveFile(const wxString& file)
  || defined(__BORLANDC__) \
  || defined(__WATCOMC__) \
  || defined(__DMC__) \
  || defined(__BORLANDC__) \
  || defined(__WATCOMC__) \
  || defined(__DMC__) \

- || defined(__GNUWIN32__) \
- || (defined(__MWERKS__) && defined(__MSL__))
+ || defined(__GNUWIN32__)

     int res = wxRemove(file);
 #elif defined(__WXMAC__)
     int res = unlink(file.fn_str());
     int res = wxRemove(file);
 #elif defined(__WXMAC__)
     int res = unlink(file.fn_str());

-#elif defined(__WXPALMOS__)
-    int res = 1;
-    // TODO with VFSFileDelete()

 #else
     int res = unlink(file.fn_str());
 #endif
 #else
     int res = unlink(file.fn_str());
 #endif

-
+    if ( res )
+    {
+        wxLogSysError(_("File '%s' couldn't be removed"), file);
+    }

     return res == 0;
 }
 
 bool wxMkdir(const wxString& dir, int perm)
 {
     return res == 0;
 }
 
 bool wxMkdir(const wxString& dir, int perm)
 {

-#if defined(__WXPALMOS__)
-    return false;
-#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
 #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

-#elif (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || \
+#elif (!(defined(__WINDOWS__) || defined(__OS2__) || defined(__DOS__))) || \

       (defined(__GNUWIN32__) && !defined(__MINGW32__)) ||                \
       defined(__WINE__) || defined(__WXMICROWIN__)
     const wxChar *dirname = dir.c_str();
       (defined(__GNUWIN32__) && !defined(__MINGW32__)) ||                \
       defined(__WINE__) || defined(__WXMICROWIN__)
     const wxChar *dirname = dir.c_str();


@@ -1290,16 +1247,12 @@ bool wxMkdir(const wxString& dir, int perm)
     }
 
     return true;
     }
 
     return true;

-#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(__WXPALMOS__)
-    // TODO with VFSFileRename()
-    return false;

 #else
   #if defined(__OS2__)
     if ( ::DosDeleteDir(dir.c_str()) != 0 )
 #else
   #if defined(__OS2__)
     if ( ::DosDeleteDir(dir.c_str()) != 0 )


@@ -1314,60 +1267,13 @@ bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
     }
 
     return true;
     }
 
     return true;

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

 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxDirExists(const wxString& pathName)
 {
 }
 
 // does the path exists? (may have or not '/' or '\\' at the end)
 bool wxDirExists(const wxString& pathName)
 {

-    wxString strPath(pathName);
-
-#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
-    // the paths "d:\" (which are different from "d:") nor for just "\"
-    while ( wxEndsWithPathSeparator(strPath) )
-    {
-        size_t len = strPath.length();
-        if ( len == 1 || (len == 3 && strPath[len - 2] == wxT(':')) )
-            break;
-
-        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
-
-#if defined(__WXPALMOS__)
-    return false;
-#elif defined(__WIN32__) && !defined(__WXMICROWIN__)
-    // stat() can't cope with network paths
-    DWORD ret = ::GetFileAttributes(strPath.fn_str());
-
-    return (ret != INVALID_FILE_ATTRIBUTES) && (ret & FILE_ATTRIBUTE_DIRECTORY);
-#elif defined(__OS2__)
-    FILESTATUS3 Info = {{0}};
-    APIRET rc = ::DosQueryPathInfo((PSZ)(WXSTRINGCAST strPath), FIL_STANDARD,
-                                   (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__
-
-    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
-
-#endif // __WIN32__/!__WIN32__
+    return wxFileName::DirExists(pathName);

 }
 
 #if WXWIN_COMPATIBILITY_2_8
 }
 
 #if WXWIN_COMPATIBILITY_2_8


@@ -1380,12 +1286,7 @@ wxChar *wxGetTempFileName(const wxString& prefix, wxChar *buf)
         return NULL;
 
     if ( buf )
         return NULL;
 
     if ( buf )

-#ifdef _PACC_VER
-        // work around the PalmOS pacc compiler bug
-        wxStrcpy(buf, filename.data());
-#else

         wxStrcpy(buf, filename);
         wxStrcpy(buf, filename);

-#endif

     else
         buf = MYcopystring(filename);
 
     else
         buf = MYcopystring(filename);
 


@@ -1426,7 +1327,7 @@ wxString wxFindFirstFile(const wxString& spec, int flags)
 
     if ( !gs_dir->IsOpened() )
     {
 
     if ( !gs_dir->IsOpened() )
     {

-        wxLogSysError(_("Can not enumerate files '%s'"), spec);
+        wxLogSysError(_("Cannot enumerate files '%s'"), spec);

         return wxEmptyString;
     }
 
         return wxEmptyString;
     }
 


@@ -1475,11 +1376,7 @@ wxString wxFindNextFile()
 
 wxChar *wxDoGetCwd(wxChar *buf, int sz)
 {
 
 wxChar *wxDoGetCwd(wxChar *buf, int sz)
 {

-#if defined(__WXPALMOS__)
-    // TODO
-    if(buf && sz>0) buf[0] = wxT('\0');
-    return buf;
-#elif defined(__WXWINCE__)
+#if defined(__WXWINCE__)

     // TODO
     if(buf && sz>0) buf[0] = wxT('\0');
     return buf;
     // TODO
     if(buf && sz>0) buf[0] = wxT('\0');
     return buf;


@@ -1575,11 +1472,19 @@ wxChar *wxDoGetCwd(wxChar *buf, int sz)
         // another example of DOS/Unix mix (Cygwin)
         wxString pathUnix = buf;
 #if wxUSE_UNICODE
         // another example of DOS/Unix mix (Cygwin)
         wxString pathUnix = buf;
 #if wxUSE_UNICODE

+    #if CYGWIN_VERSION_DLL_MAJOR >= 1007
+        cygwin_conv_path(CCP_POSIX_TO_WIN_W, pathUnix.mb_str(wxConvFile), buf, sz);
+    #else

         char bufA[_MAXPATHLEN];
         cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
         wxConvFile.MB2WC(buf, bufA, sz);
         char bufA[_MAXPATHLEN];
         cygwin_conv_to_full_win32_path(pathUnix.mb_str(wxConvFile), bufA);
         wxConvFile.MB2WC(buf, bufA, sz);

+    #endif

 #else
 #else

+    #if CYGWIN_VERSION_DLL_MAJOR >= 1007
+        cygwin_conv_path(CCP_POSIX_TO_WIN_A, pathUnix, buf, sz);
+    #else

         cygwin_conv_to_full_win32_path(pathUnix, buf);
         cygwin_conv_to_full_win32_path(pathUnix, buf);

+    #endif

 #endif // wxUSE_UNICODE
 #endif // __CYGWIN__
     }
 #endif // wxUSE_UNICODE
 #endif // __CYGWIN__
     }


@@ -1610,6 +1515,7 @@ wxString wxGetCwd()
 
 bool wxSetWorkingDirectory(const wxString& d)
 {
 
 bool wxSetWorkingDirectory(const wxString& d)
 {

+    bool success = false;

 #if defined(__OS2__)
     if (d[1] == ':')
     {
 #if defined(__OS2__)
     if (d[1] == ':')
     {


@@ -1619,18 +1525,17 @@ bool wxSetWorkingDirectory(const wxString& d)
     if (d.length() == 2)
         return true;
     }
     if (d.length() == 2)
         return true;
     }

-    return (::DosSetCurrentDir(d.c_str()) == 0);
+    success = (::DosSetCurrentDir(d.c_str()) == 0);

 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)
 #elif defined(__UNIX__) || defined(__WXMAC__) || defined(__DOS__)

-    return (chdir(wxFNSTRINGCAST d.fn_str()) == 0);
+    success = (chdir(wxFNSTRINGCAST d.fn_str()) == 0);

 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE
     wxUnusedVar(d);
 #elif defined(__WINDOWS__)
 
 #ifdef __WIN32__
 #ifdef __WXWINCE__
     // No equivalent in WinCE
     wxUnusedVar(d);

-    return false;

 #else
 #else

-    return (bool)(SetCurrentDirectory(d.fn_str()) != 0);
+    success = (SetCurrentDirectory(d.t_str()) != 0);

 #endif
 #else
     // Must change drive, too.
 #endif
 #else
     // Must change drive, too.


@@ -1651,12 +1556,15 @@ bool wxSetWorkingDirectory(const wxString& d)
             _dos_setdrive(driveNo, &noDrives);
         }
     }
             _dos_setdrive(driveNo, &noDrives);
         }
     }

-    bool success = (chdir(WXSTRINGCAST d) == 0);
-
-    return success;
+    success = (chdir(WXSTRINGCAST d) == 0);

 #endif
 
 #endif
 #endif
 
 #endif

+    if ( !success )
+    {
+       wxLogSysError(_("Could not set current working directory"));
+    }
+    return success;

 }
 
 // Get the OS directory if appropriate (such as the Windows directory).
 }
 
 // Get the OS directory if appropriate (such as the Windows directory).


@@ -1666,11 +1574,15 @@ wxString wxGetOSDirectory()
 #ifdef __WXWINCE__
     return wxString(wxT("\\Windows"));
 #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)
 #ifdef __WXWINCE__
     return wxString(wxT("\\Windows"));
 #elif defined(__WINDOWS__) && !defined(__WXMICROWIN__)

-    wxChar buf[256];
-    GetWindowsDirectory(buf, 256);
+    wxChar buf[MAX_PATH];
+    if ( !GetWindowsDirectory(buf, MAX_PATH) )
+    {
+        wxLogLastError(wxS("GetWindowsDirectory"));
+    }
+

     return wxString(buf);
 #elif defined(__WXMAC__) && wxOSX_USE_CARBON
     return wxString(buf);
 #elif defined(__WXMAC__) && wxOSX_USE_CARBON

-    return wxMacFindFolder(kOnSystemDisk, 'macs', false);
+    return wxMacFindFolderNoSeparator(kOnSystemDisk, 'macs', false);

 #else
     return wxEmptyString;
 #endif
 #else
     return wxEmptyString;
 #endif


@@ -1855,7 +1767,7 @@ 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

-    const DWORD dwAttr = ::GetFileAttributes(path.fn_str());
+    const DWORD dwAttr = ::GetFileAttributes(path.t_str());

     if ( dwAttr == INVALID_FILE_ATTRIBUTES )
     {
         // file probably doesn't exist at all
     if ( dwAttr == INVALID_FILE_ATTRIBUTES )
     {
         // file probably doesn't exist at all


@@ -1952,7 +1864,7 @@ bool wxIsExecutable(const wxString &path)
 //
 wxFileKind wxGetFileKind(int fd)
 {
 //
 wxFileKind wxGetFileKind(int fd)
 {

-#if defined __WXMSW__ && !defined __WXWINCE__ && defined wxGetOSFHandle
+#if defined __WINDOWS__ && !defined __WXWINCE__ && defined wxGetOSFHandle

     switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
     {
         case FILE_TYPE_CHAR:
     switch (::GetFileType(wxGetOSFHandle(fd)) & ~FILE_TYPE_REMOTE)
     {
         case FILE_TYPE_CHAR: