applying patch, closes #13045

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

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 0de6f3b045204f938ad5675f830f09502a3d1d57..6f6c8c162907f740c641836da4697796c4f1ecb6 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -21,9 +21,9 @@
 
 #include "wx/ipcbase.h"
 
 
 #include "wx/ipcbase.h"
 

-IMPLEMENT_CLASS(wxServerBase, wxObject)
-IMPLEMENT_CLASS(wxClientBase, wxObject)
-IMPLEMENT_CLASS(wxConnectionBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxServerBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxClientBase, wxObject)
+wxIMPLEMENT_ABSTRACT_CLASS(wxConnectionBase, wxObject)

 
 wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
     : m_buffer((char *)buffer),
 
 wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
     : m_buffer((char *)buffer),


@@ -55,14 +55,61 @@ wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
 
 {
   // copy constructor would require ref-counted pointer to buffer
 
 {
   // copy constructor would require ref-counted pointer to buffer

-  wxFAIL_MSG( _T("Copy constructor of wxConnectionBase not implemented") );
+  wxFAIL_MSG( wxT("Copy constructor of wxConnectionBase not implemented") );

 }
 
 
 }
 
 

-wxConnectionBase::~wxConnectionBase(void)
+wxConnectionBase::~wxConnectionBase()

 {
 {

-  if ( m_deletebufferwhendone && m_buffer )
-    delete m_buffer;
+  if ( m_deletebufferwhendone )
+    delete [] m_buffer;
+}
+
+/* static */
+wxString wxConnectionBase::GetTextFromData(const void* data,
+                                           size_t size,
+                                           wxIPCFormat fmt)
+{
+    wxString s;
+    switch ( fmt )
+    {
+        case wxIPC_TEXT:
+            // normally the string should be NUL-terminated and size should
+            // include the total size of the buffer, including NUL -- but don't
+            // crash (by trying to access (size_t)-1 bytes) if it doesn't
+            if ( size )
+                size--;
+
+            s = wxString(static_cast<const char *>(data), size);
+            break;
+
+#if wxUSE_UNICODE
+        // TODO: we should handle both wxIPC_UTF16TEXT and wxIPC_UTF32TEXT here
+        //       for inter-platform IPC
+        case wxIPC_UNICODETEXT:
+            wxASSERT_MSG( !(size % sizeof(wchar_t)), "invalid buffer size" );
+            if ( size )
+            {
+                size /= sizeof(wchar_t);
+                size--;
+            }
+
+            s = wxString(static_cast<const wchar_t *>(data), size);
+            break;
+
+        case wxIPC_UTF8TEXT:
+            if ( size )
+                size--;
+
+            s = wxString::FromUTF8(static_cast<const char *>(data), size);
+            break;
+#endif // wxUSE_UNICODE
+
+        default:
+            wxFAIL_MSG( "non-string IPC format in GetTextFromData()" );
+    }
+
+    return s;

 }
 
 void *wxConnectionBase::GetBufferAtLeast( size_t bytes )
 }
 
 void *wxConnectionBase::GetBufferAtLeast( size_t bytes )


@@ -73,8 +120,7 @@ void *wxConnectionBase::GetBufferAtLeast( size_t bytes )
   {  // need to resize buffer
     if ( m_deletebufferwhendone )
     { // we're in charge of buffer, increase it
   {  // need to resize buffer
     if ( m_deletebufferwhendone )
     { // we're in charge of buffer, increase it

-      if ( m_buffer )
-        delete m_buffer;
+      delete [] m_buffer;

       m_buffer = new char[bytes];
       m_buffersize = bytes;
       return m_buffer;
       m_buffer = new char[bytes];
       m_buffersize = bytes;
       return m_buffer;