#ifdef __WINDOWS__
#include "wx/msw/private.h"
+ #include "wx/msw/missing.h"
#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>
+ #include <cygwin/version.h>
#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__
#define _MAXPATHLEN 1024
#endif
-#ifndef INVALID_FILE_ATTRIBUTES
- #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-
// ----------------------------------------------------------------------------
// private globals
// ----------------------------------------------------------------------------
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
static CharType *wxDoRealPath (CharType *path)
{
static const CharType SEP = wxFILE_SEP_PATH;
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
wxUnix2DosFilename(path);
#endif
if (path[0] && path[1]) {
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])
{
{
wxString buf = ::wxGetCwd();
wxChar ch = buf.Last();
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
if (ch != wxT('\\') && ch != wxT('/'))
buf << wxT("\\");
#else
trimchars[3] = 0;
static const CharType SEP = wxFILE_SEP_PATH;
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
//wxUnix2DosFilename(path);
#endif
s = nm;
d = lnm;
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
q = FALSE;
#else
q = nm[0] == wxT('\\') && nm[1] == wxT('~');
else
#else
while ((*d++ = *s) != 0) {
-# ifndef __WXMSW__
+# ifndef __WINDOWS__
if (*s == wxT('\\')) {
if ((*(d - 1) = *++s)!=0) {
s++;
#endif
// No env variables on WinCE
#ifndef __WXWINCE__
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
if (*s++ == wxT('$') && (*s == wxT('{') || *s == wxT(')')))
#else
if (*s++ == wxT('$'))
return NULL;
wxStrcpy (dest, filename);
-#ifdef __WXMSW__
+#ifdef __WINDOWS__
wxUnix2DosFilename(dest);
#endif
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
{
static wxChar buf[_MAXPATHLEN];
- // Local copy
- wxStrcpy (buf, path);
-
int l = wxStrlen(path);
int i = l - 1;
+ if ( i >= _MAXPATHLEN )
+ return NULL;
+
+ // Local copy
+ wxStrcpy (buf, path);
// Search backward for a backward or forward slash
while (i > -1)
i --;
}
-#if defined(__WXMSW__) || defined(__OS2__)
+#if defined(__WINDOWS__) || defined(__OS2__)
// Try Drive specifier
if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
{
wxChar buf[_MAXPATHLEN];
- // Local copy
- wxStrcpy(buf, path);
-
int l = path.length();
int i = l - 1;
+ if ( i >= _MAXPATHLEN )
+ return wxString();
+
+ // Local copy
+ wxStrcpy(buf, path);
+
// Search backward for a backward or forward slash
while (i > -1)
{
i --;
}
-#if defined(__WXMSW__) || defined(__OS2__)
+#if defined(__WINDOWS__) || defined(__OS2__)
// Try Drive specifier
if (wxIsalpha (buf[0]) && buf[1] == wxT(':'))
{
{
CFURLRef fullURLRef;
fullURLRef = CFURLCreateFromFSRef(NULL, fsRef);
+ if ( fullURLRef == NULL)
+ return wxEmptyString;
+
if ( additionalPathComponent )
{
CFURLRef parentURLRef = fullURLRef ;
additionalPathComponent,false);
CFRelease( parentURLRef ) ;
}
- CFStringRef cfString = CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle);
+ wxCFStringRef cfString( CFURLCopyFileSystemPath(fullURLRef, kDefaultPathStyle ));
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 )
wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname )
{
- CFStringRef cfname = CFStringCreateWithCharacters( kCFAllocatorDefault,
+ wxCFStringRef cfname( CFStringCreateWithCharacters( kCFAllocatorDefault,
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__
if (s)
while (*s)
{
- if (*s == _T('\\'))
- *s = _T('/');
-#ifdef __WXMSW__
+ if (*s == wxT('\\'))
+ *s = wxT('/');
+#ifdef __WINDOWS__
else
*s = wxTolower(*s); // Case INDEPENDENT
#endif
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
-#if defined(__WXMSW__) || defined(__OS2__)
+#if defined(__WINDOWS__) || defined(__OS2__)
if (s)
while (*s)
{
}
// 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,
// 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());
#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
- 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
wxUnusedVar(overwrite);
return false;
-#endif // __WXMSW__ && __WIN32__
+#endif // __WINDOWS__ && __WIN32__
return true;
}
return false;
}
-#if !defined(__WXWINCE__) && !defined(__WXPALMOS__)
+#if !defined(__WXWINCE__)
// Normal system call
if ( wxRename (file1, file2) == 0 )
return true;
return true;
}
// Give up
+ wxLogSysError(_("File '%s' couldn't be renamed '%s'"), file1, file2);
return false;
}
|| 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());
-#elif defined(__WXPALMOS__)
- int res = 1;
- // TODO with VFSFileDelete()
#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)
{
-#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
-#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();
}
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
-#elif defined(__WXPALMOS__)
- // TODO with VFSFileRename()
- return false;
#else
#if defined(__OS2__)
if ( ::DosDeleteDir(dir.c_str()) != 0 )
}
return true;
-#endif // PALMOS/!PALMOS
+#endif
}
// 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] == _T(':')) )
- 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] == _T(':'))
- strPath << _T('.');
-#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
return NULL;
if ( buf )
-#ifdef _PACC_VER
- // work around the PalmOS pacc compiler bug
- wxStrcpy(buf, filename.data());
-#else
wxStrcpy(buf, filename);
-#endif
else
buf = MYcopystring(filename);
if ( !gs_dir->IsOpened() )
{
- wxLogSysError(_("Can not enumerate files '%s'"), spec);
+ wxLogSysError(_("Cannot enumerate files '%s'"), spec);
return wxEmptyString;
}
wxCHECK_MSG( gs_dir, "", "You must call wxFindFirstFile before!" );
wxString result;
- gs_dir->GetNext(&result);
-
- if ( result.empty() )
+ if ( !gs_dir->GetNext(&result) || result.empty() )
{
wxDELETE(gs_dir);
return result;
wxChar *wxDoGetCwd(wxChar *buf, int sz)
{
-#if defined(__WXPALMOS__)
- // TODO
- if(buf && sz>0) buf[0] = _T('\0');
- return buf;
-#elif defined(__WXWINCE__)
+#if defined(__WXWINCE__)
// TODO
- if(buf && sz>0) buf[0] = _T('\0');
+ if(buf && sz>0) buf[0] = wxT('\0');
return buf;
#else
if ( !buf )
buf = new wxChar[sz + 1];
}
- bool ok wxDUMMY_INITIALIZE(false);
+ bool ok = false;
// for the compilers which have Unicode version of _getcwd(), call it
// directly, for the others call the ANSI version and do the translation
// sense at all to me - empty string is a better error indicator
// (NULL might be even better but I'm afraid this could lead to
// problems with the old code assuming the return is never NULL)
- buf[0] = _T('\0');
+ buf[0] = wxT('\0');
}
else // ok, but we might need to massage the path into the right format
{
// 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);
+ #endif
#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);
+ #endif
#endif // wxUSE_UNICODE
#endif // __CYGWIN__
}
bool wxSetWorkingDirectory(const wxString& d)
{
+ bool success = false;
#if defined(__OS2__)
if (d[1] == ':')
{
- ::DosSetDefaultDisk(wxToupper(d[0]) - _T('A') + 1);
+ ::DosSetDefaultDisk(wxToupper(d[0]) - wxT('A') + 1);
// do not call DosSetCurrentDir when just changing drive,
// since it requires e.g. "d:." instead of "d:"!
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__)
- 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);
- return false;
#else
- return (bool)(SetCurrentDirectory(d.fn_str()) != 0);
+ success = (SetCurrentDirectory(d.t_str()) != 0);
#endif
#else
// Must change drive, too.
_dos_setdrive(driveNo, &noDrives);
}
}
- bool success = (chdir(WXSTRINGCAST d) == 0);
-
- return success;
+ success = (chdir(WXSTRINGCAST d) == 0);
#endif
#endif
+ if ( !success )
+ {
+ wxLogSysError(_("Could not set current working directory"));
+ }
+ return success;
}
// Get the OS directory if appropriate (such as the Windows directory).
#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 wxMacFindFolder(kOnSystemDisk, 'macs', false);
+ return wxMacFindFolderNoSeparator(kOnSystemDisk, 'macs', false);
#else
return wxEmptyString;
#endif
{
// we assume that it's not empty
wxCHECK_MSG( !szFile.empty(), false,
- _T("empty file name in wxFindFileInPath"));
+ wxT("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present
wxString szFile2;
}
else
{
- wxFAIL_MSG( _T("missing '|' in the wildcard string!") );
+ wxFAIL_MSG( wxT("missing '|' in the wildcard string!") );
}
break;
{
wxString before = descriptions[k].Left(pos);
wxString after = descriptions[k].Mid(pos+filters[k].Len());
- pos = before.Find(_T('('),true);
- if (pos>before.Find(_T(')'),true))
+ pos = before.Find(wxT('('),true);
+ if (pos>before.Find(wxT(')'),true))
{
before = before.Left(pos+1);
before << filters[k];
- pos = after.Find(_T(')'));
- int pos1 = after.Find(_T('('));
+ pos = after.Find(wxT(')'));
+ int pos1 = after.Find(wxT('('));
if (pos != wxNOT_FOUND && (pos<pos1 || pos1==wxNOT_FOUND))
{
before << after.Mid(pos);
// 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
//
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:
projects / wxWidgets.git / blobdiff