Applied patch [ 1349607 ] [msw] Multiline notebook tab label change can add extra row

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

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index d19c6458891251f4ee40f27242f1950f3fa3cea3..d69720c31db060a22fdb9a0f4c606b02e04de38b 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -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"
 


@@ -44,7 +40,6 @@
 
 #include <string.h>
 #include <ddeml.h>
 
 #include <string.h>
 #include <ddeml.h>

-#include <math.h>

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


@@ -109,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;


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

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

 {
     DWORD result;
     if (size < 0)
     {
 {
     DWORD result;
     if (size < 0)
     {

-        size = wxStrlen(data) + 1;
+        size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL

     }
 
     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;


@@ -595,7 +592,6 @@ 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);

-    len = ceil( double(len)/sizeof(wxChar) );

 
     wxChar *data = GetBufferAtLeast( len );
     wxASSERT_MSG(data != NULL,
 
     wxChar *data = GetBufferAtLeast( len );
     wxASSERT_MSG(data != NULL,


@@ -605,7 +601,7 @@ wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat fo
     (void) DdeFreeDataHandle(returned_data);
 
     if (size)
     (void) DdeFreeDataHandle(returned_data);
 
     if (size)

-        *size = len;
+        *size = (int)len;

 
     return data;
 }
 
     return data;
 }


@@ -615,12 +611,12 @@ bool wxDDEConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFo
     DWORD result;
     if (size < 0)
     {
     DWORD result;
     if (size < 0)
     {

-        size = wxStrlen(data) + 1;
+        size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL

     }
 
     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,


@@ -680,14 +676,15 @@ bool wxDDEConnection::Advise(const wxString& item,
 {
     if (size < 0)
     {
 {
     if (size < 0)
     {

-        size = wxStrlen(data) + 1;
+        size = (wxStrlen(data) + 1) * sizeof(wxChar);    // includes final NUL

     }
 
     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 )


@@ -777,7 +774,6 @@ _DDECallback(WORD wType,
                 if (connection)
                 {
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
                 if (connection)
                 {
                     DWORD len = DdeGetData(hData, NULL, 0, 0);

-                    len = ceil( double(len)/sizeof(wxChar) );

 
                     wxChar *data = connection->GetBufferAtLeast( len );
                     wxASSERT_MSG(data != NULL,
 
                     wxChar *data = connection->GetBufferAtLeast( len );
                     wxASSERT_MSG(data != NULL,


@@ -787,10 +783,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,
                                                (int)len,
                     if ( connection->OnExecute(connection->m_topicName,
                                                data,
                                                (int)len,

-                                               (wxIPCFormat) wFmt) )
+                                               wxIPC_TEXT ) )

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


@@ -815,11 +812,11 @@ _DDECallback(WORD wType,
                     if (data)
                     {
                         if (user_size < 0)
                     if (data)
                     {
                         if (user_size < 0)

-                            user_size = wxStrlen((wxChar*)data) + 1;
+                            user_size = (wxStrlen((wxChar*)data) + 1) * sizeof(wxChar);    // includes final NUL

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

-                                                              user_size*sizeof(wxChar),
+                                                              user_size,

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


@@ -839,11 +836,10 @@ _DDECallback(WORD wType,
                     wxString item_name = DDEStringFromAtom(hsz2);
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
                     wxString item_name = DDEStringFromAtom(hsz2);
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);

-                    len = ceil( double(len) / sizeof(wxChar) );

 
                     wxChar *data = connection->GetBufferAtLeast( len );
                     wxASSERT_MSG(data != NULL,
 
                     wxChar *data = connection->GetBufferAtLeast( len );
                     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);
 


@@ -903,7 +899,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,


@@ -927,7 +923,6 @@ _DDECallback(WORD wType,
                     wxString item_name = DDEStringFromAtom(hsz2);
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);
                     wxString item_name = DDEStringFromAtom(hsz2);
 
                     DWORD len = DdeGetData(hData, NULL, 0, 0);

-                    len = ceil( double(len) / sizeof(wxChar) );

 
                     wxChar *data = connection->GetBufferAtLeast( len );
                     wxASSERT_MSG(data != NULL,
 
                     wxChar *data = connection->GetBufferAtLeast( len );
                     wxASSERT_MSG(data != NULL,