declare all NameStr[] strings as const char using the correct WXDLLIMPEXP_DATA_ macro...

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

diff --git a/src/common/ipcbase.cpp b/src/common/ipcbase.cpp
index 151b3004d1a3b4e6c48ef59a66f06a1d62eafbd1..64c6c1f76005b2f30df1ba6fc0348695ec7d1df8 100644 (file)
--- a/src/common/ipcbase.cpp
+++ b/src/common/ipcbase.cpp
@@ -25,13 +25,13 @@ IMPLEMENT_CLASS(wxServerBase, wxObject)
 IMPLEMENT_CLASS(wxClientBase, wxObject)
 IMPLEMENT_CLASS(wxConnectionBase, wxObject)
 
-wxConnectionBase::wxConnectionBase(wxChar *buffer, int bytes)
-    : m_connected(true),
-      m_buffer(buffer),
+wxConnectionBase::wxConnectionBase(void *buffer, size_t bytes)
+    : m_buffer((char *)buffer),
       m_buffersize(bytes),
-      m_deletebufferwhendone(false)
+      m_deletebufferwhendone(false),
+      m_connected(true)
 {
-  if ( buffer == (wxChar *)NULL )
+  if ( buffer == NULL )
   { // behave like next constructor
     m_buffersize = 0;
     m_deletebufferwhendone = true;
@@ -39,19 +39,19 @@ wxConnectionBase::wxConnectionBase(wxChar *buffer, int bytes)
 }
 
 wxConnectionBase::wxConnectionBase()
-    : m_connected(true),
-      m_buffer(NULL),
+    : m_buffer(NULL),
       m_buffersize(0),
-      m_deletebufferwhendone(true)
+      m_deletebufferwhendone(true),
+      m_connected(true)
 {
 }
 
 wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
     : wxObject(),
-      m_connected(copy.m_connected),
       m_buffer(copy.m_buffer),
       m_buffersize(copy.m_buffersize),
-      m_deletebufferwhendone(false)
+      m_deletebufferwhendone(false),
+      m_connected(copy.m_connected)
 
 {
   // copy constructor would require ref-counted pointer to buffer
@@ -59,13 +59,60 @@ wxConnectionBase::wxConnectionBase(const wxConnectionBase& copy)
 }
 
 
-wxConnectionBase::~wxConnectionBase(void)
+wxConnectionBase::~wxConnectionBase()
 {
-  if ( m_deletebufferwhendone && m_buffer )
-   delete m_buffer;
+  if ( m_deletebufferwhendone )
+    delete [] m_buffer;
 }
 
-wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
+/* 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 )
 {
   if ( m_buffersize >= bytes )
     return m_buffer;
@@ -73,12 +120,8 @@ wxChar *wxConnectionBase::GetBufferAtLeast( size_t bytes )
   {  // need to resize buffer
     if ( m_deletebufferwhendone )
     { // we're in charge of buffer, increase it
-      if ( m_buffer )
-        delete m_buffer;
-      // the argument specifies **byte size**, but m_buffer is of type
-      // wxChar. Under unicode: sizeof(wxChar) > 1, so the buffer size is
-      // bytes / sizeof(wxChar) rounded upwards.
-      m_buffer = new wxChar[(bytes + sizeof(wxChar) - 1) / sizeof(wxChar)];
+      delete [] m_buffer;
+      m_buffer = new char[bytes];
       m_buffersize = bytes;
       return m_buffer;
     } // user-supplied buffer, fail