WinCE fixes from "Viktor Voroshylo" <viktor@voroshylo.com>

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

diff --git a/src/common/wfstream.cpp b/src/common/wfstream.cpp
index 3605e2a7071b91c19e617a079665f092f5a16336..086022626645255f96ddbeedaef1c3d30c3f02d9 100644 (file)
--- a/src/common/wfstream.cpp
+++ b/src/common/wfstream.cpp
@@ -6,10 +6,10 @@
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     11/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "wfstream.h"
 #endif
 
 #pragma implementation "wfstream.h"
 #endif
 


@@ -69,18 +69,26 @@ size_t wxFileInputStream::GetSize() const
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {
 
 size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
 {

-    off_t ret;
+    off_t ret = m_file->Read(buffer, size);

 
 

-    ret = m_file->Read(buffer, size);
+    // NB: we can't use a switch here because HP-UX CC doesn't allow
+    //     switching over long long (which off_t is in 64bit mode)

 
 

-    m_lasterror = wxStream_NOERROR;
-    if (m_file->Eof())
-        m_lasterror = wxStream_EOF;
-    if (ret == wxInvalidOffset) 
+    if ( !ret )
+    {
+        // nothing read, so nothing more to read
+        m_lasterror = wxSTREAM_EOF;
+    }
+    else if ( ret == wxInvalidOffset )

     {
     {

-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;

         ret = 0;
     }
         ret = 0;
     }

+    else
+    {
+        // normal case
+        m_lasterror = wxSTREAM_NO_ERROR;
+    }

 
     return ret;
 }
 
     return ret;
 }


@@ -103,7 +111,7 @@ wxFileOutputStream::wxFileOutputStream(const wxString& fileName)
 {
     m_file = new wxFile(fileName, wxFile::write);
     m_file_destroy = TRUE;
 {
     m_file = new wxFile(fileName, wxFile::write);
     m_file_destroy = TRUE;

-    
+

     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;
     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;


@@ -122,7 +130,7 @@ wxFileOutputStream::wxFileOutputStream(wxFile& file)
 }
 
 wxFileOutputStream::wxFileOutputStream()
 }
 
 wxFileOutputStream::wxFileOutputStream()

-  : wxOutputStream()
+                  : wxOutputStream()

 {
     m_file_destroy = FALSE;
     m_file = NULL;
 {
     m_file_destroy = FALSE;
     m_file = NULL;


@@ -136,7 +144,7 @@ wxFileOutputStream::wxFileOutputStream(int fd)
 
 wxFileOutputStream::~wxFileOutputStream()
 {
 
 wxFileOutputStream::~wxFileOutputStream()
 {

-    if (m_file_destroy) 
+    if (m_file_destroy)

     {
         Sync();
         delete m_file;
     {
         Sync();
         delete m_file;


@@ -146,10 +154,9 @@ wxFileOutputStream::~wxFileOutputStream()
 size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);
 size_t wxFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);

-    if (m_file->Error())
-        m_lasterror = wxStream_WRITE_ERR;
-    else
-        m_lasterror = wxStream_NOERROR;
+
+    m_lasterror = m_file->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
+

     return ret;
 }
 
     return ret;
 }
 


@@ -191,7 +198,7 @@ wxFileStream::wxFileStream(const wxString& fileName)
 wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
   : wxInputStream()
 {
 wxFFileInputStream::wxFFileInputStream(const wxString& fileName)
   : wxInputStream()
 {

-    m_file = new wxFFile(fileName, "rb");
+    m_file = new wxFFile(fileName, _T("rb"));

     m_file_destroy = TRUE;
 }
 
     m_file_destroy = TRUE;
 }
 


@@ -232,10 +239,10 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
     ret = m_file->Read(buffer, size);
 
     if (m_file->Eof())
     ret = m_file->Read(buffer, size);
 
     if (m_file->Eof())

-        m_lasterror = wxStream_EOF;
-    if (ret == wxInvalidOffset) 
+        m_lasterror = wxSTREAM_EOF;
+    if (ret == wxInvalidOffset)

     {
     {

-        m_lasterror = wxStream_READ_ERR;
+        m_lasterror = wxSTREAM_READ_ERROR;

         ret = 0;
     }
 
         ret = 0;
     }
 


@@ -244,7 +251,7 @@ size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
 
 off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
 
 off_t wxFFileInputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {

-    return m_file->Seek(pos, mode);
+    return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset );

 }
 
 off_t wxFFileInputStream::OnSysTell() const
 }
 
 off_t wxFFileInputStream::OnSysTell() const


@@ -258,9 +265,9 @@ off_t wxFFileInputStream::OnSysTell() const
 
 wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
 {
 
 wxFFileOutputStream::wxFFileOutputStream(const wxString& fileName)
 {

-    m_file = new wxFFile(fileName, "w+b");
+    m_file = new wxFFile(fileName, _T("w+b"));

     m_file_destroy = TRUE;
     m_file_destroy = TRUE;

-    
+

     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;
     if (!m_file->IsOpened())
     {
         m_lasterror = wxSTREAM_WRITE_ERROR;


@@ -293,7 +300,7 @@ wxFFileOutputStream::wxFFileOutputStream(FILE *file)
 
 wxFFileOutputStream::~wxFFileOutputStream()
 {
 
 wxFFileOutputStream::~wxFFileOutputStream()
 {

-    if (m_file_destroy) 
+    if (m_file_destroy)

     {
         Sync();
         delete m_file;
     {
         Sync();
         delete m_file;


@@ -304,9 +311,9 @@ size_t wxFFileOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
     size_t ret = m_file->Write(buffer, size);
     if (m_file->Error())
 {
     size_t ret = m_file->Write(buffer, size);
     if (m_file->Error())

-        m_lasterror = wxStream_WRITE_ERR;
+        m_lasterror = wxSTREAM_WRITE_ERROR;

     else
     else

-        m_lasterror = wxStream_NOERROR;
+        m_lasterror = wxSTREAM_NO_ERROR;

     return ret;
 }
 
     return ret;
 }
 


@@ -317,7 +324,7 @@ off_t wxFFileOutputStream::OnSysTell() const
 
 off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {
 
 off_t wxFFileOutputStream::OnSysSeek(off_t pos, wxSeekMode mode)
 {

-    return m_file->Seek(pos, mode);
+    return ( m_file->Seek(pos, mode) ? pos : wxInvalidOffset );

 }
 
 void wxFFileOutputStream::Sync()
 }
 
 void wxFFileOutputStream::Sync()