fix memory leak in wxScreenDC, fixes #13249

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

diff --git a/src/common/txtstrm.cpp b/src/common/txtstrm.cpp
index 404f31f59487225079a4444e63600310b5bda2a1..94083459604484ffd4c4ce691548884a31ce56a6 100644 (file)
--- a/src/common/txtstrm.cpp
+++ b/src/common/txtstrm.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        txtstrm.cpp
+// Name:        src/common/txtstrm.cpp

 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:
 // Purpose:     Text stream classes
 // Author:      Guilhem Lavaux
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "txtstrm.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -23,24 +19,22 @@
 #if wxUSE_STREAMS
 
 #include "wx/txtstrm.h"
 #if wxUSE_STREAMS
 
 #include "wx/txtstrm.h"

-#include <ctype.h>

 
 

+#ifndef WX_PRECOMP
+    #include "wx/crt.h"
+#endif

 
 

-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// Unix: "\n"
-// Dos:  "\r\n"
-// Mac:  "\r"
+#include <ctype.h>

 
 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 
 #if wxUSE_UNICODE
 
 // ----------------------------------------------------------------------------
 // wxTextInputStream
 // ----------------------------------------------------------------------------
 
 #if wxUSE_UNICODE

-wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep, wxMBConv& conv)
-  : m_input(s), m_separators(sep), m_conv(conv)
+wxTextInputStream::wxTextInputStream(wxInputStream &s,
+                                     const wxString &sep,
+                                     const wxMBConv& conv)
+  : m_input(s), m_separators(sep), m_conv(conv.Clone())

 {
     memset((void*)m_lastBytes, 0, 10);
 }
 {
     memset((void*)m_lastBytes, 0, 10);
 }


@@ -54,6 +48,9 @@ wxTextInputStream::wxTextInputStream(wxInputStream &s, const wxString &sep)
 
 wxTextInputStream::~wxTextInputStream()
 {
 
 wxTextInputStream::~wxTextInputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE

 }
 
 void wxTextInputStream::UngetLast()
 }
 
 void wxTextInputStream::UngetLast()


@@ -70,29 +67,53 @@ wxChar wxTextInputStream::NextChar()
 #if wxUSE_UNICODE
     wxChar wbuf[2];
     memset((void*)m_lastBytes, 0, 10);
 #if wxUSE_UNICODE
     wxChar wbuf[2];
     memset((void*)m_lastBytes, 0, 10);

-    for(size_t inlen = 0; inlen < 9; inlen++) 
+    for(size_t inlen = 0; inlen < 9; inlen++)

     {
         // actually read the next character
         m_lastBytes[inlen] = m_input.GetC();
 
     {
         // actually read the next character
         m_lastBytes[inlen] = m_input.GetC();
 

-        if(m_input.LastRead() <= 0) 
+        if(m_input.LastRead() <= 0)

             return wxEOT;
             return wxEOT;

-        
-        int retlen = (int) m_conv.MB2WC(wbuf, m_lastBytes, 2); // returns -1 for failure
-        if(retlen >= 0) // res == 0 could happen for '\0' char
-            return wbuf[0];
+
+        switch ( m_conv->ToWChar(wbuf, WXSIZEOF(wbuf), m_lastBytes, inlen + 1) )
+        {
+            case 0:
+                // this is a bug in converter object as it should either fail
+                // or decode non-empty string to something non-empty
+                wxFAIL_MSG("ToWChar() can't return 0 for non-empty input");
+                break;
+
+            case wxCONV_FAILED:
+                // the buffer probably doesn't contain enough bytes to decode
+                // as a complete character, try with more bytes
+                break;
+
+            default:
+                // if we couldn't decode a single character during the last
+                // loop iteration we shouldn't be able to decode 2 or more of
+                // them with an extra single byte, something fishy is going on
+                wxFAIL_MSG("unexpected decoding result");
+                // fall through nevertheless and return at least something
+
+            case 1:
+                // we finally decoded a character
+                return wbuf[0];
+        }

     }
     }

-    // there should be no encoding which requires more than nine bytes for one character...
+
+    // there should be no encoding which requires more than nine bytes for one
+    // character so something must be wrong with our conversion but we have no
+    // way to signal it from here

     return wxEOT;
 #else
     m_lastBytes[0] = m_input.GetC();
     return wxEOT;
 #else
     m_lastBytes[0] = m_input.GetC();

-    
-    if(m_input.LastRead() <= 0) 
+
+    if(m_input.LastRead() <= 0)

         return wxEOT;
         return wxEOT;

-    
+

     return m_lastBytes[0];
 #endif
     return m_lastBytes[0];
 #endif

-    
+

 }
 
 wxChar wxTextInputStream::NextNonSeparators()
 }
 
 wxChar wxTextInputStream::NextNonSeparators()


@@ -104,7 +125,7 @@ wxChar wxTextInputStream::NextNonSeparators()
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&
 
         if (c != wxT('\n') &&
             c != wxT('\r') &&

-            !m_separators.Contains(c))
+            m_separators.Find(c) < 0)

           return c;
     }
 
           return c;
     }
 


@@ -112,27 +133,27 @@ wxChar wxTextInputStream::NextNonSeparators()
 
 bool wxTextInputStream::EatEOL(const wxChar &c)
 {
 
 bool wxTextInputStream::EatEOL(const wxChar &c)
 {

-    if (c == wxT('\n')) return TRUE; // eat on UNIX
+    if (c == wxT('\n')) return true; // eat on UNIX

 
     if (c == wxT('\r')) // eat on both Mac and DOS
     {
         wxChar c2 = NextChar();
 
     if (c == wxT('\r')) // eat on both Mac and DOS
     {
         wxChar c2 = NextChar();

-        if(c2 == wxEOT) return TRUE; // end of stream reached, had enough :-)
+        if(c2 == wxEOT) return true; // end of stream reached, had enough :-)

 
         if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac
 
         if (c2 != wxT('\n')) UngetLast(); // Don't eat on Mac

-        return TRUE;
+        return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 wxUint32 wxTextInputStream::Read32(int base)
 {
 }
 
 wxUint32 wxTextInputStream::Read32(int base)
 {

-    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );

     if(!m_input) return 0;
 
     wxString word = ReadWord();
     if(!m_input) return 0;
 
     wxString word = ReadWord();

-    if(word.IsEmpty())
+    if(word.empty())

         return 0;
     return wxStrtoul(word.c_str(), 0, base);
 }
         return 0;
     return wxStrtoul(word.c_str(), 0, base);
 }


@@ -149,11 +170,11 @@ wxUint8 wxTextInputStream::Read8(int base)
 
 wxInt32 wxTextInputStream::Read32S(int base)
 {
 
 wxInt32 wxTextInputStream::Read32S(int base)
 {

-    wxASSERT_MSG( !base || (base > 1 && base <= 36), _T("invalid base") );
+    wxASSERT_MSG( !base || (base > 1 && base <= 36), wxT("invalid base") );

     if(!m_input) return 0;
 
     wxString word = ReadWord();
     if(!m_input) return 0;
 
     wxString word = ReadWord();

-    if(word.IsEmpty())
+    if(word.empty())

         return 0;
     return wxStrtol(word.c_str(), 0, base);
 }
         return 0;
     return wxStrtol(word.c_str(), 0, base);
 }


@@ -172,16 +193,20 @@ double wxTextInputStream::ReadDouble()
 {
     if(!m_input) return 0;
     wxString word = ReadWord();
 {
     if(!m_input) return 0;
     wxString word = ReadWord();

-    if(word.IsEmpty())
+    if(word.empty())

         return 0;
     return wxStrtod(word.c_str(), 0);
 }
 
         return 0;
     return wxStrtod(word.c_str(), 0);
 }
 

+#if WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 
 wxString wxTextInputStream::ReadString()
 {
     return ReadLine();
 }
 

+#endif // WXWIN_COMPATIBILITY_2_6
+

 wxString wxTextInputStream::ReadLine()
 {
     wxString line;
 wxString wxTextInputStream::ReadLine()
 {
     wxString line;


@@ -191,9 +216,6 @@ wxString wxTextInputStream::ReadLine()
         wxChar c = NextChar();
         if(c == wxEOT)
             break;
         wxChar c = NextChar();
         if(c == wxEOT)
             break;

-        
-        if ( !m_input )
-            break;

 
         if (EatEOL(c))
             break;
 
         if (EatEOL(c))
             break;


@@ -216,14 +238,14 @@ wxString wxTextInputStream::ReadWord()
         return word;
 
     word += c;
         return word;
 
     word += c;

-    
+

     while ( !m_input.Eof() )
     {
         c = NextChar();
         if(c == wxEOT)
             break;
     while ( !m_input.Eof() )
     {
         c = NextChar();
         if(c == wxEOT)
             break;

-            
-        if (m_separators.Contains(c))
+
+        if (m_separators.Find(c) >= 0)

             break;
 
         if (EatEOL(c))
             break;
 
         if (EatEOL(c))


@@ -252,6 +274,17 @@ wxTextInputStream& wxTextInputStream::operator>>(char& c)
     return *this;
 }
 
     return *this;
 }
 

+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE
+
+wxTextInputStream& wxTextInputStream::operator>>(wchar_t& wc)
+{
+    wc = GetChar();
+
+    return *this;
+}
+
+#endif // wxUSE_UNICODE
+

 wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
 {
     i = (wxInt16)Read16();
 wxTextInputStream& wxTextInputStream::operator>>(wxInt16& i)
 {
     i = (wxInt16)Read16();


@@ -291,8 +324,10 @@ wxTextInputStream& wxTextInputStream::operator>>(float& f)
 
 
 #if wxUSE_UNICODE
 
 
 #if wxUSE_UNICODE

-wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode, wxMBConv& conv)
-  : m_output(s), m_conv(conv)
+wxTextOutputStream::wxTextOutputStream(wxOutputStream& s,
+                                       wxEOL mode,
+                                       const wxMBConv& conv)
+  : m_output(s), m_conv(conv.Clone())

 #else
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)
 #else
 wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
   : m_output(s)


@@ -303,8 +338,6 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif


@@ -313,6 +346,9 @@ wxTextOutputStream::wxTextOutputStream(wxOutputStream& s, wxEOL mode)
 
 wxTextOutputStream::~wxTextOutputStream()
 {
 
 wxTextOutputStream::~wxTextOutputStream()
 {

+#if wxUSE_UNICODE
+    delete m_conv;
+#endif // wxUSE_UNICODE

 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)
 }
 
 void wxTextOutputStream::SetMode(wxEOL mode)


@@ -322,8 +358,6 @@ void wxTextOutputStream::SetMode(wxEOL mode)
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;
     {
 #if defined(__WXMSW__) || defined(__WXPM__)
         m_mode = wxEOL_DOS;

-#elif defined(__WXMAC__) && !defined(__DARWIN__)
-        m_mode = wxEOL_MAC;

 #else
         m_mode = wxEOL_UNIX;
 #endif
 #else
         m_mode = wxEOL_UNIX;
 #endif


@@ -341,7 +375,7 @@ void wxTextOutputStream::Write32(wxUint32 i)
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;

-    str.Printf(wxT("%u"), i);
+    str.Printf(wxT("%u"), (unsigned)i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -349,7 +383,7 @@ void wxTextOutputStream::Write16(wxUint16 i)
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;

-    str.Printf(wxT("%u"), i);
+    str.Printf(wxT("%u"), (unsigned)i);

 
     WriteString(str);
 }
 
     WriteString(str);
 }


@@ -377,15 +411,15 @@ void wxTextOutputStream::WriteString(const wxString& string)
             switch ( m_mode )
             {
                 case wxEOL_DOS:
             switch ( m_mode )
             {
                 case wxEOL_DOS:

-                    out << _T("\r\n");
+                    out << wxT("\r\n");

                     continue;
 
                 case wxEOL_MAC:
                     continue;
 
                 case wxEOL_MAC:

-                    out << _T('\r');
+                    out << wxT('\r');

                     continue;
 
                 default:
                     continue;
 
                 default:

-                    wxFAIL_MSG( _T("unknown EOL mode in wxTextOutputStream") );
+                    wxFAIL_MSG( wxT("unknown EOL mode in wxTextOutputStream") );

                     // fall through
 
                 case wxEOL_UNIX:
                     // fall through
 
                 case wxEOL_UNIX:


@@ -395,23 +429,40 @@ void wxTextOutputStream::WriteString(const wxString& string)
         }
 
         out << c;
         }
 
         out << c;

-   }
+    }

 
 

-    // We must not write the trailing NULL here

 #if wxUSE_UNICODE
 #if wxUSE_UNICODE

-    wxCharBuffer buffer = m_conv.cWC2MB( out );
-    m_output.Write( (const char*) buffer, strlen( (const char*) buffer ) );
+    // FIXME-UTF8: use wxCharBufferWithLength if/when we have it
+    wxCharBuffer buffer = m_conv->cWC2MB(out.wc_str(), out.length(), &len);
+    m_output.Write(buffer, len);

 #else
     m_output.Write(out.c_str(), out.length() );
 #endif
 }
 
 #else
     m_output.Write(out.c_str(), out.length() );
 #endif
 }
 

-wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
+wxTextOutputStream& wxTextOutputStream::PutChar(wxChar c)

 {
 {

-    WriteString( wxString(string) );
+#if wxUSE_UNICODE
+    WriteString( wxString(&c, *m_conv, 1) );
+#else
+    WriteString( wxString(&c, wxConvLocal, 1) );
+#endif

     return *this;
 }
 
     return *this;
 }
 

+void wxTextOutputStream::Flush()
+{
+#if wxUSE_UNICODE
+    const size_t len = m_conv->FromWChar(NULL, 0, L"", 1);
+    if ( len > m_conv->GetMBNulLen() )
+    {
+        wxCharBuffer buf(len);
+        m_conv->FromWChar(buf.data(), len, L"", 1);
+        m_output.Write(buf, len - m_conv->GetMBNulLen());
+    }
+#endif // wxUSE_UNICODE
+}
+

 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
     WriteString( string );
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 {
     WriteString( string );


@@ -421,18 +472,20 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 {
     WriteString( wxString::FromAscii(c) );
 wxTextOutputStream& wxTextOutputStream::operator<<(char c)
 {
     WriteString( wxString::FromAscii(c) );

-    
+

     return *this;
 }
 
     return *this;
 }
 

-#if wxUSE_WCHAR_T && wxWCHAR_T_IS_REAL_TYPE
+#if wxUSE_UNICODE && wxWCHAR_T_IS_REAL_TYPE

 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wchar_t wc)
 {

-    WriteString( wxString(&wc, m_conv, 1) );
+    WriteString( wxString(&wc, *m_conv, 1) );
+
+    return *this;

 }
 
 }
 

-#endif // wxUSE_WCHAR_T
+#endif // wxUSE_UNICODE

 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxInt16 c)
 {


@@ -484,7 +537,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(float f)
 
 wxTextOutputStream &endl( wxTextOutputStream &stream )
 {
 
 wxTextOutputStream &endl( wxTextOutputStream &stream )
 {

-    return stream << wxT('\n');
+    return stream.PutChar(wxT('\n'));

 }
 
 #endif
 }
 
 #endif