Patch [ 1816051 ] MSW DrawEllipticArc inconsistent with other platforms

[wxWidgets.git] / src / msw / dde.cpp

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 26a13fc678e989e9e765d1bda136dc2fcdda16cb..976b8a2dafbd750069498161072770ce8db6cddd 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/dde.cpp
+// Name:        src/msw/dde.cpp

 // Purpose:     DDE classes
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     DDE classes
 // Author:      Julian Smart
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dde.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"
 


@@ -33,22 +29,18 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"

+    #include "wx/hashmap.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/module.h"

 #include "wx/dde.h"
 #include "wx/intl.h"
 #include "wx/dde.h"
 #include "wx/intl.h"

-#include "wx/hashmap.h"

 
 #include "wx/msw/private.h"
 
 #include <string.h>
 #include <ddeml.h>
 
 
 #include "wx/msw/private.h"
 
 #include <string.h>
 #include <ddeml.h>
 

-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // macros and constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros and constants
 // ----------------------------------------------------------------------------


@@ -112,9 +104,9 @@ static wxAtomMap wxAtomTable;
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxDDEClientList);
-WX_DEFINE_LIST(wxDDEServerList);
-WX_DEFINE_LIST(wxDDEConnectionList);
+WX_DEFINE_LIST(wxDDEClientList)
+WX_DEFINE_LIST(wxDDEServerList)
+WX_DEFINE_LIST(wxDDEConnectionList)

 
 static wxDDEClientList wxDDEClientObjects;
 static wxDDEServerList wxDDEServerObjects;
 
 static wxDDEClientList wxDDEClientObjects;
 static wxDDEServerList wxDDEServerObjects;


@@ -308,7 +300,7 @@ bool wxDDEServer::Create(const wxString& server)
 
 wxDDEServer::~wxDDEServer()
 {
 
 wxDDEServer::~wxDDEServer()
 {

-    if ( !m_serviceName.IsEmpty() )
+    if ( !m_serviceName.empty() )

     {
         HSZ hsz = DDEAtomFromString(m_serviceName);
 
     {
         HSZ hsz = DDEAtomFromString(m_serviceName);
 


@@ -506,7 +498,7 @@ bool wxDDEClient::DeleteConnection(WXHCONV conv)
 // wxDDEConnection
 // ----------------------------------------------------------------------------
 
 // wxDDEConnection
 // ----------------------------------------------------------------------------
 

-wxDDEConnection::wxDDEConnection(wxChar *buffer, int size)
+wxDDEConnection::wxDDEConnection(void *buffer, size_t size)

      : wxConnectionBase(buffer, size)
 {
     m_client = NULL;
      : wxConnectionBase(buffer, size)
 {
     m_client = NULL;


@@ -553,19 +545,17 @@ bool wxDDEConnection::Disconnect()
     return ok;
 }
 
     return ok;
 }
 

-bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
+bool wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat WXUNUSED(format))

 {
     DWORD result;
 {
     DWORD result;

-    if (size < 0)
-    {
-        size = wxStrlen(data) + 1;
-    }

 
     bool ok = DdeClientTransaction((LPBYTE)data,
 
     bool ok = DdeClientTransaction((LPBYTE)data,

-                                    size * sizeof(wxChar),
+                                    size,

                                     GetHConv(),
                                     NULL,
                                     GetHConv(),
                                     NULL,

-                                    format,
+// If the transaction specified by the wType parameter does not pass data or is XTYP_EXECUTE,
+// wFmt should be zero.
+                                    0,

                                     XTYP_EXECUTE,
                                     DDE_TIMEOUT,
                                     &result) != 0;
                                     XTYP_EXECUTE,
                                     DDE_TIMEOUT,
                                     &result) != 0;


@@ -578,7 +568,7 @@ bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
     return ok;
 }
 
     return ok;
 }
 

-wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format)
+const void *wxDDEConnection::Request(const wxString& item, size_t *size, wxIPCFormat format)

 {
     DWORD result;
 
 {
     DWORD result;
 


@@ -599,7 +589,7 @@ wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat fo
 
     DWORD len = DdeGetData(returned_data, NULL, 0, 0);
 
 
     DWORD len = DdeGetData(returned_data, NULL, 0, 0);
 

-    wxChar *data = GetBufferAtLeast( len/sizeof(wxChar) );
+    void *data = GetBufferAtLeast(len);

     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxDDEConnection::Request") );
     (void) DdeGetData(returned_data, (LPBYTE)data, len, 0);
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxDDEConnection::Request") );
     (void) DdeGetData(returned_data, (LPBYTE)data, len, 0);


@@ -607,22 +597,18 @@ wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat fo
     (void) DdeFreeDataHandle(returned_data);
 
     if (size)
     (void) DdeFreeDataHandle(returned_data);
 
     if (size)

-        *size = (int)len/sizeof(wxChar);
+        *size = (size_t)len;

 
     return data;
 }
 
 
     return data;
 }
 

-bool wxDDEConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
+bool wxDDEConnection::DoPoke(const wxString& item, const void *data, size_t size, wxIPCFormat format)

 {
     DWORD result;
 {
     DWORD result;

-    if (size < 0)
-    {
-        size = wxStrlen(data) + 1;
-    }

 
     HSZ item_atom = DDEGetAtom(item);
     bool ok = DdeClientTransaction((LPBYTE)data,
 
     HSZ item_atom = DDEGetAtom(item);
     bool ok = DdeClientTransaction((LPBYTE)data,

-                                   size * sizeof(wxChar),
+                                   size,

                                    GetHConv(),
                                    item_atom, format,
                                    XTYP_POKE,
                                    GetHConv(),
                                    item_atom, format,
                                    XTYP_POKE,


@@ -675,21 +661,17 @@ bool wxDDEConnection::StopAdvise(const wxString& item)
 }
 
 // Calls that SERVER can make
 }
 
 // Calls that SERVER can make

-bool wxDDEConnection::Advise(const wxString& item,
-                             wxChar *data,
-                             int size,
-                             wxIPCFormat format)
+bool wxDDEConnection::DoAdvise(const wxString& item,
+                               const void *data,
+                               size_t size,
+                               wxIPCFormat format)

 {
 {

-    if (size < 0)
-    {
-        size = wxStrlen(data) + 1;
-    }
-

     HSZ item_atom = DDEGetAtom(item);
     HSZ topic_atom = DDEGetAtom(m_topicName);
     m_sendingData = data;  // mrf: potential for scope problems here?
     m_dataSize = size;
     HSZ item_atom = DDEGetAtom(item);
     HSZ topic_atom = DDEGetAtom(m_topicName);
     m_sendingData = data;  // mrf: potential for scope problems here?
     m_dataSize = size;

-    m_dataType = format;
+    // wxIPC_PRIVATE does not succeed, so use text instead
+    m_dataType = format == wxIPC_PRIVATE ? wxIPC_TEXT : format;

 
     bool ok = DdePostAdvise(DDEIdInst, topic_atom, item_atom) != 0;
     if ( !ok )
 
     bool ok = DdePostAdvise(DDEIdInst, topic_atom, item_atom) != 0;
     if ( !ok )


@@ -700,12 +682,6 @@ bool wxDDEConnection::Advise(const wxString& item,
     return ok;
 }
 
     return ok;
 }
 

-bool wxDDEConnection::OnDisconnect()
-{
-    delete this;
-    return true;
-}
-

 // ----------------------------------------------------------------------------
 // _DDECallback
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // _DDECallback
 // ----------------------------------------------------------------------------


@@ -780,7 +756,7 @@ _DDECallback(WORD wType,
                 {
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 
                 {
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 

-                    wxChar *data = connection->GetBufferAtLeast( len/sizeof(wxChar) );
+                    void *data = connection->GetBufferAtLeast(len);

                     wxASSERT_MSG(data != NULL,
                                  _T("Buffer too small in _DDECallback (XTYP_EXECUTE)") );
 
                     wxASSERT_MSG(data != NULL,
                                  _T("Buffer too small in _DDECallback (XTYP_EXECUTE)") );
 


@@ -788,10 +764,11 @@ _DDECallback(WORD wType,
 
                     DdeFreeDataHandle(hData);
 
 
                     DdeFreeDataHandle(hData);
 

+// XTYP_EXECUTE cannot be used for arbitrary data, but only for text

                     if ( connection->OnExecute(connection->m_topicName,
                                                data,
                     if ( connection->OnExecute(connection->m_topicName,
                                                data,

-                                               (int)len/sizeof(wxChar),
-                                               (wxIPCFormat) wFmt) )
+                                               (int)len,
+                                               wxIPC_TEXT ) )

                     {
                         return (DDERETURN)(DWORD)DDE_FACK;
                     }
                     {
                         return (DDERETURN)(DWORD)DDE_FACK;
                     }


@@ -808,19 +785,30 @@ _DDECallback(WORD wType,
                 {
                     wxString item_name = DDEStringFromAtom(hsz2);
 
                 {
                     wxString item_name = DDEStringFromAtom(hsz2);
 

-                    int user_size = -1;
-                    wxChar *data = connection->OnRequest(connection->m_topicName,
-                                                       item_name,
-                                                       &user_size,
-                                                       (wxIPCFormat) wFmt);
+                    size_t user_size = wxNO_LEN;
+                    const void *data = connection->OnRequest(connection->m_topicName,
+                                                             item_name,
+                                                             &user_size,
+                                                             (wxIPCFormat)wFmt);

                     if (data)
                     {
                     if (data)
                     {

-                        if (user_size < 0)
-                            user_size = wxStrlen((wxChar*)data) + 1;
+                      if (user_size == wxNO_LEN)
+                        switch (wFmt)
+                        {
+                          case wxIPC_TEXT:
+                          case wxIPC_UTF8TEXT:
+                            user_size = strlen((const char*)data) + 1;  // includes final NUL
+                            break;
+                          case wxIPC_UNICODETEXT:
+                            user_size = (wcslen((const wchar_t*)data) + 1) * sizeof(wchar_t);  // includes final NUL
+                            break;
+                          default:
+                            user_size = 0;
+                        }

 
                         HDDEDATA handle = DdeCreateDataHandle(DDEIdInst,
                                                               (LPBYTE)data,
 
                         HDDEDATA handle = DdeCreateDataHandle(DDEIdInst,
                                                               (LPBYTE)data,

-                                                              user_size*sizeof(wxChar),
+                                                              user_size,

                                                               0,
                                                               hsz2,
                                                               wFmt,
                                                               0,
                                                               hsz2,
                                                               wFmt,


@@ -841,9 +829,9 @@ _DDECallback(WORD wType,
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 

-                    wxChar *data = connection->GetBufferAtLeast( len/sizeof(wxChar) );
+                    void *data = connection->GetBufferAtLeast(len);

                     wxASSERT_MSG(data != NULL,
                     wxASSERT_MSG(data != NULL,

-                                 _T("Buffer too small in _DDECallback (XTYP_EXECUTE)") );
+                                 _T("Buffer too small in _DDECallback (XTYP_POKE)") );

 
                     DdeGetData(hData, (LPBYTE)data, len, 0);
 
 
                     DdeGetData(hData, (LPBYTE)data, len, 0);
 


@@ -852,7 +840,7 @@ _DDECallback(WORD wType,
                     connection->OnPoke(connection->m_topicName,
                                        item_name,
                                        data,
                     connection->OnPoke(connection->m_topicName,
                                        item_name,
                                        data,

-                                       (int)len/sizeof(wxChar),
+                                       (int)len,

                                        (wxIPCFormat) wFmt);
 
                     return (DDERETURN)DDE_FACK;
                                        (wxIPCFormat) wFmt);
 
                     return (DDERETURN)DDE_FACK;


@@ -903,7 +891,7 @@ _DDECallback(WORD wType,
                                     (
                                         DDEIdInst,
                                         (LPBYTE)connection->m_sendingData,
                                     (
                                         DDEIdInst,
                                         (LPBYTE)connection->m_sendingData,

-                                        connection->m_dataSize*sizeof(wxChar),
+                                        connection->m_dataSize,

                                         0,
                                         hsz2,
                                         connection->m_dataType,
                                         0,
                                         hsz2,
                                         connection->m_dataType,


@@ -928,7 +916,7 @@ _DDECallback(WORD wType,
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
 

-                    wxChar *data = connection->GetBufferAtLeast( len/sizeof(wxChar) );
+                    void *data = connection->GetBufferAtLeast(len);

                     wxASSERT_MSG(data != NULL,
                                  _T("Buffer too small in _DDECallback (XTYP_ADVDATA)") );
 
                     wxASSERT_MSG(data != NULL,
                                  _T("Buffer too small in _DDECallback (XTYP_ADVDATA)") );
 


@@ -938,7 +926,7 @@ _DDECallback(WORD wType,
                     if ( connection->OnAdvise(connection->m_topicName,
                                               item_name,
                                               data,
                     if ( connection->OnAdvise(connection->m_topicName,
                                               item_name,
                                               data,

-                                              (int)len/sizeof(wxChar),
+                                              (int)len,

                                               (wxIPCFormat) wFmt) )
                     {
                         return (DDERETURN)(DWORD)DDE_FACK;
                                               (wxIPCFormat) wFmt) )
                     {
                         return (DDERETURN)(DWORD)DDE_FACK;


@@ -982,7 +970,7 @@ static HSZ DDEAtomFromString(const wxString& s)
 {
     wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );
 
 {
     wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );
 

-    HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*) s.c_str(), DDE_CP);
+    HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*)s.wx_str(), DDE_CP);

     if ( !hsz )
     {
         DDELogError(_("Failed to create DDE string"));
     if ( !hsz )
     {
         DDELogError(_("Failed to create DDE string"));