X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55d99c7a77789ff4904bf96eddca3715eb5af9b9..8a942c3dd3de286de6e9f374c05712d7e5c43f6d:/src/common/file.cpp diff --git a/src/common/file.cpp b/src/common/file.cpp index 504bdbceea..3eacce8a6a 100644 --- a/src/common/file.cpp +++ b/src/common/file.cpp @@ -10,11 +10,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +/* + TODO: remove all the WinCE ugliness from here, implement the wxOpen(), + wxSeek(), ... functions in a separate file for WinCE instead!!! + */ + // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "file.h" #endif @@ -28,7 +33,7 @@ #if wxUSE_FILE // standard -#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) +#if defined(__WXMSW__) && !defined(__GNUWIN32__) && !defined(__WXMICROWIN__) && !defined(__WXWINCE__) #include #ifndef __SALFORDC__ @@ -54,11 +59,16 @@ #define NOMCX #endif +#elif defined(__WXMSW__) && defined(__WXWINCE__) + // TODO: what to include? +#elif (defined(__OS2__)) + #include #elif (defined(__UNIX__) || defined(__GNUWIN32__)) #include + #include #include #ifdef __GNUWIN32__ - #include + #include "wx/msw/wrapwin.h" #endif #elif defined(__DOS__) #if defined(__WATCOMC__) @@ -70,8 +80,6 @@ #else #error "Please specify the header with file functions declarations." #endif -#elif (defined(__WXPM__)) - #include #elif (defined(__WXSTUBS__)) // Have to ifdef this for different environments #include @@ -89,9 +97,17 @@ #endif //Win/UNIX #include // SEEK_xxx constants + +#ifndef __WXWINCE__ #include // O_RDONLY &c +#endif -#if !defined(__MWERKS__) || defined(__WXMSW__) +#ifdef __WXWINCE__ +// Nothing +#elif !defined(__MWERKS__) + #include // needed for stat + #include // stat +#elif defined(__MWERKS__) && ( defined(__WXMSW__) || defined(__MACH__) ) #include // needed for stat #include // stat #endif @@ -144,6 +160,10 @@ #include "wx/msw/mslu.h" #endif +#ifdef __WXWINCE__ + #include "wx/msw/private.h" +#endif + // ============================================================================ // implementation of wxFile // ============================================================================ @@ -180,7 +200,12 @@ bool wxFile::Access(const wxChar *name, OpenMode mode) break; } +#ifdef __WXWINCE__ + // FIXME: use CreateFile with 0 access to query the file + return TRUE; +#else return wxAccess(name, how) == 0; +#endif } // ---------------------------------------------------------------------------- @@ -201,15 +226,26 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode) { // if bOverwrite we create a new file or truncate the existing one, // otherwise we only create the new file and fail if it already exists -#if defined(__WXMAC__) && !defined(__UNIX__) +#if defined(__WXMAC__) && !defined(__UNIX__) && !wxUSE_UNICODE // Dominic Mazzoni [dmazzoni+@cs.cmu.edu] reports that open is still broken on the mac, so we replace // int fd = open(wxUnix2MacFilename( szFileName ), O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL), access); int fd = creat( szFileName , accessMode); +#else +#ifdef __WXWINCE__ + HANDLE fileHandle = ::CreateFile(szFileName, GENERIC_WRITE, 0, NULL, + bOverwrite ? CREATE_ALWAYS : CREATE_NEW, FILE_ATTRIBUTE_NORMAL, + 0); + int fd = 0; + if (fileHandle == INVALID_HANDLE_VALUE) + fd = (int) fileHandle; + else + fd = -1; #else int fd = wxOpen( szFileName, O_BINARY | O_WRONLY | O_CREAT | (bOverwrite ? O_TRUNC : O_EXCL) ACCESS(accessMode) ); +#endif #endif if ( fd == -1 ) { @@ -226,6 +262,59 @@ bool wxFile::Create(const wxChar *szFileName, bool bOverwrite, int accessMode) // open the file bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) { +#ifdef __WXWINCE__ + DWORD access = 0; + DWORD shareMode = 0; + DWORD disposition = 0; + + int flags = O_BINARY; + + switch ( mode ) + { + case read: + access = GENERIC_READ; + shareMode = FILE_SHARE_READ|FILE_SHARE_WRITE; + disposition = OPEN_EXISTING; + break; + + case write_append: + if ( wxFile::Exists(szFileName) ) + { + access = GENERIC_READ|GENERIC_WRITE; + shareMode = FILE_SHARE_READ; + disposition = 0; + break; + } + //else: fall through as write_append is the same as write if the + // file doesn't exist + + case write: + access = GENERIC_WRITE; + shareMode = 0; + disposition = TRUNCATE_EXISTING; + break; + + case write_excl: + access = GENERIC_WRITE; + shareMode = 0; + disposition = TRUNCATE_EXISTING; + break; + + case read_write: + access = GENERIC_READ|GENERIC_WRITE; + shareMode = 0; + disposition = 0; + break; + } + + int fd = 0; + HANDLE fileHandle = ::CreateFile(szFileName, access, shareMode, NULL, + disposition, FILE_ATTRIBUTE_NORMAL, 0); + if (fileHandle == INVALID_HANDLE_VALUE) + fd = -1; + else + fd = (int) fileHandle; +#else int flags = O_BINARY; switch ( mode ) @@ -257,6 +346,7 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) } int fd = wxOpen( szFileName, flags ACCESS(accessMode)); +#endif if ( fd == -1 ) { wxLogSysError(_("can't open file '%s'"), szFileName); @@ -272,7 +362,12 @@ bool wxFile::Open(const wxChar *szFileName, OpenMode mode, int accessMode) bool wxFile::Close() { if ( IsOpened() ) { - if ( close(m_fd) == -1 ) { +#ifdef __WXWINCE__ + if (!CloseHandle((HANDLE) m_fd)) +#else + if ( close(m_fd) == -1 ) +#endif + { wxLogSysError(_("can't close file descriptor %d"), m_fd); m_fd = fd_invalid; return FALSE; @@ -293,7 +388,14 @@ off_t wxFile::Read(void *pBuf, off_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); -#ifdef __MWERKS__ +#ifdef __WXWINCE__ + DWORD bytesRead = 0; + int iRc = 0; + if (ReadFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesRead, NULL)) + iRc = bytesRead; + else + iRc = -1; +#elif defined(__MWERKS__) int iRc = ::read(m_fd, (char*) pBuf, nCount); #else int iRc = ::read(m_fd, pBuf, nCount); @@ -311,7 +413,14 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) { wxCHECK( (pBuf != NULL) && IsOpened(), 0 ); -#ifdef __MWERKS__ +#ifdef __WXWINCE__ + DWORD bytesRead = 0; + int iRc = 0; + if (WriteFile((HANDLE) m_fd, pBuf, (DWORD) nCount, & bytesRead, NULL)) + iRc = bytesRead; + else + iRc = -1; +#elif defined(__MWERKS__) #if __MSL__ >= 0x6000 int iRc = ::write(m_fd, (void*) pBuf, nCount); #else @@ -333,7 +442,9 @@ size_t wxFile::Write(const void *pBuf, size_t nCount) bool wxFile::Flush() { if ( IsOpened() ) { -#if defined(__VISUALC__) || wxHAVE_FSYNC +#ifdef __WXWINCE__ + // Do nothing +#elif defined(__VISUALC__) || wxHAVE_FSYNC if ( wxFsync(m_fd) == -1 ) { wxLogSysError(_("can't flush file descriptor %d"), m_fd); @@ -356,6 +467,34 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode) { wxASSERT( IsOpened() ); +#ifdef __WXWINCE__ + int origin; + switch ( mode ) { + default: + wxFAIL_MSG(_("unknown seek origin")); + + case wxFromStart: + origin = FILE_BEGIN; + break; + + case wxFromCurrent: + origin = FILE_CURRENT; + break; + + case wxFromEnd: + origin = FILE_END; + break; + } + + DWORD res = SetFilePointer((HANDLE) m_fd, ofs, 0, origin) ; + if (res == 0xFFFFFFFF && GetLastError() != NO_ERROR) + { + wxLogSysError(_("can't seek on file descriptor %d"), m_fd); + return wxInvalidOffset; + } + else + return (off_t)res; +#else int origin; switch ( mode ) { default: @@ -381,6 +520,7 @@ off_t wxFile::Seek(off_t ofs, wxSeekMode mode) } else return (off_t)iRc; +#endif } // get current off_t @@ -388,6 +528,16 @@ off_t wxFile::Tell() const { wxASSERT( IsOpened() ); +#ifdef __WXWINCE__ + DWORD res = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT) ; + if (res == 0xFFFFFFFF && GetLastError() != NO_ERROR) + { + wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); + return wxInvalidOffset; + } + else + return (off_t)res; +#else int iRc = wxTell(m_fd); if ( iRc == -1 ) { wxLogSysError(_("can't get seek position on file descriptor %d"), m_fd); @@ -395,6 +545,7 @@ off_t wxFile::Tell() const } else return (off_t)iRc; +#endif } // get current file length @@ -402,6 +553,15 @@ off_t wxFile::Length() const { wxASSERT( IsOpened() ); +#ifdef __WXWINCE__ + DWORD off0 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT); + DWORD off1 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_END); + off_t len = off1; + + // Restore position + SetFilePointer((HANDLE) m_fd, off0, 0, FILE_BEGIN); + return len; +#else #ifdef __VISUALC__ int iRc = _filelength(m_fd); #else // !VC++ @@ -427,6 +587,7 @@ off_t wxFile::Length() const } else return (off_t)iRc; +#endif } // is end of file reached? @@ -434,6 +595,17 @@ bool wxFile::Eof() const { wxASSERT( IsOpened() ); +#ifdef __WXWINCE__ + DWORD off0 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_CURRENT); + DWORD off1 = SetFilePointer((HANDLE) m_fd, 0, 0, FILE_END); + if (off0 == off1) + return TRUE; + else + { + SetFilePointer((HANDLE) m_fd, off0, 0, FILE_BEGIN); + return FALSE; + } +#else int iRc; #if defined(__DOS__) || defined(__UNIX__) || defined(__GNUWIN32__) || defined( __MWERKS__ ) || defined(__SALFORDC__) @@ -464,6 +636,7 @@ bool wxFile::Eof() const } return TRUE; +#endif } // ============================================================================ @@ -524,7 +697,9 @@ bool wxTempFile::Open(const wxString& strName) if ( chmod( (const char*) m_strTemp.fn_str(), mode) == -1 ) { +#ifndef __OS2__ wxLogSysError(_("Failed to set temporary file permissions")); +#endif } #endif // Unix @@ -550,7 +725,7 @@ bool wxTempFile::Commit() return FALSE; } - if ( wxRename(m_strTemp, m_strName) != 0 ) { + if ( !wxRenameFile(m_strTemp, m_strName) ) { wxLogSysError(_("can't commit changes to file '%s'"), m_strName.c_str()); return FALSE; }