inform the IM context about focus changes

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

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index 03fdc05daf2504188e0c827e9a30a91ddc089f01..6554c530debad9e0d4e76e18a56404fb72b4193e 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dde.h"
 #endif
 
     #pragma implementation "dde.h"
 #endif
 


@@ -38,15 +38,14 @@
 #include "wx/module.h"
 #include "wx/dde.h"
 #include "wx/intl.h"
 #include "wx/module.h"
 #include "wx/dde.h"
 #include "wx/intl.h"

-
+#include "wx/hashmap.h"

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

-#include <windows.h>

 #include <ddeml.h>
 
 #include <ddeml.h>
 

-#if defined(__TWIN32__) || defined(__GNUWIN32_OLD__)
+#ifdef __GNUWIN32_OLD__

     #include "wx/msw/gnuwin32/extra.h"
 #endif
 
     #include "wx/msw/gnuwin32/extra.h"
 #endif
 


@@ -113,6 +112,7 @@ static HSZ DDEGetAtom(const wxString& string);
 // string handles
 static HSZ DDEAtomFromString(const wxString& s);
 static wxString DDEStringFromAtom(HSZ hsz);
 // string handles
 static HSZ DDEAtomFromString(const wxString& s);
 static wxString DDEStringFromAtom(HSZ hsz);

+static void DDEFreeString(HSZ hsz);

 
 // error handling
 static wxString DDEGetErrorMsg(UINT error);
 
 // error handling
 static wxString DDEGetErrorMsg(UINT error);


@@ -122,12 +122,20 @@ static void DDELogError(const wxString& s, UINT error = DMLERR_NO_ERROR);
 // global variables
 // ----------------------------------------------------------------------------
 
 // global variables
 // ----------------------------------------------------------------------------
 

+WX_DECLARE_STRING_HASH_MAP( HSZ, wxAtomMap );
+

 static DWORD DDEIdInst = 0L;
 static wxDDEConnection *DDECurrentlyConnecting = NULL;
 static DWORD DDEIdInst = 0L;
 static wxDDEConnection *DDECurrentlyConnecting = NULL;

+static wxAtomMap wxAtomTable;
+
+#include "wx/listimpl.cpp"

 
 

-static wxList wxAtomTable(wxKEY_STRING);
-static wxList wxDDEClientObjects;
-static wxList wxDDEServerObjects;
+WX_DEFINE_LIST(wxDDEClientList);
+WX_DEFINE_LIST(wxDDEServerList);
+WX_DEFINE_LIST(wxDDEConnectionList);
+
+static wxDDEClientList wxDDEClientObjects;
+static wxDDEServerList wxDDEServerObjects;

 
 static bool DDEInitialized = false;
 
 
 static bool DDEInitialized = false;
 


@@ -187,15 +195,12 @@ extern void wxDDEInitialize()
 
 void wxDDECleanUp()
 {
 
 void wxDDECleanUp()
 {

-    wxDDEClientObjects.DeleteContents(true);
-    wxDDEClientObjects.Clear();
-    wxDDEClientObjects.DeleteContents(false);
-
-    wxDDEServerObjects.DeleteContents(true);
-    wxDDEServerObjects.Clear();
-    wxDDEServerObjects.DeleteContents(false);
+    // deleting them later won't work as DDE won't be initialized any more
+    wxASSERT_MSG( wxDDEServerObjects.empty() &&
+                    wxDDEClientObjects.empty(),
+                    _T("all DDE objects should be deleted by now") );

 
 

-    wxAtomTable.Clear();
+    wxAtomTable.clear();

 
     if ( DDEIdInst != 0 )
     {
 
     if ( DDEIdInst != 0 )
     {


@@ -211,64 +216,75 @@ void wxDDECleanUp()
 // Global find connection
 static wxDDEConnection *DDEFindConnection(HCONV hConv)
 {
 // Global find connection
 static wxDDEConnection *DDEFindConnection(HCONV hConv)
 {

-  wxNode *node = wxDDEServerObjects.GetFirst();
-  wxDDEConnection *found = NULL;
-  while (node && !found)
-  {
-    wxDDEServer *object = (wxDDEServer *)node->GetData();
-    found = object->FindConnection((WXHCONV) hConv);
-    node = node->GetNext();
-  }
-  if (found)
-      return found;
-
-  node = wxDDEClientObjects.GetFirst();
-  while (node && !found)
-  {
-    wxDDEClient *object = (wxDDEClient *)node->GetData();
-    found = object->FindConnection((WXHCONV) hConv);
-    node = node->GetNext();
-  }
-  return found;
+    wxDDEServerList::compatibility_iterator serverNode = wxDDEServerObjects.GetFirst();
+    wxDDEConnection *found = NULL;
+    while (serverNode && !found)
+    {
+        wxDDEServer *object = serverNode->GetData();
+        found = object->FindConnection((WXHCONV) hConv);
+        serverNode = serverNode->GetNext();
+    }
+
+    if (found)
+    {
+        return found;
+    }
+
+    wxDDEClientList::compatibility_iterator clientNode = wxDDEClientObjects.GetFirst();
+    while (clientNode && !found)
+    {
+        wxDDEClient *object = clientNode->GetData();
+        found = object->FindConnection((WXHCONV) hConv);
+        clientNode = clientNode->GetNext();
+    }
+    return found;

 }
 
 // Global delete connection
 static void DDEDeleteConnection(HCONV hConv)
 {
 }
 
 // Global delete connection
 static void DDEDeleteConnection(HCONV hConv)
 {

-  wxNode *node = wxDDEServerObjects.GetFirst();
-  bool found = false;
-  while (node && !found)
-  {
-    wxDDEServer *object = (wxDDEServer *)node->GetData();
-    found = object->DeleteConnection((WXHCONV) hConv);
-    node = node->GetNext();
-  }
-  if (found)
-    return;
-
-  node = wxDDEClientObjects.GetFirst();
-  while (node && !found)
-  {
-    wxDDEClient *object = (wxDDEClient *)node->GetData();
-    found = object->DeleteConnection((WXHCONV) hConv);
-    node = node->GetNext();
-  }
+    wxDDEServerList::compatibility_iterator serverNode = wxDDEServerObjects.GetFirst();
+    bool found = false;
+    while (serverNode && !found)
+    {
+        wxDDEServer *object = serverNode->GetData();
+        found = object->DeleteConnection((WXHCONV) hConv);
+        serverNode = serverNode->GetNext();
+    }
+    if (found)
+    {
+        return;
+    }
+
+    wxDDEClientList::compatibility_iterator clientNode = wxDDEClientObjects.GetFirst();
+    while (clientNode && !found)
+    {
+        wxDDEClient *object = clientNode->GetData();
+        found = object->DeleteConnection((WXHCONV) hConv);
+        clientNode = clientNode->GetNext();
+    }

 }
 
 // Find a server from a service name
 static wxDDEServer *DDEFindServer(const wxString& s)
 {
 }
 
 // Find a server from a service name
 static wxDDEServer *DDEFindServer(const wxString& s)
 {

-  wxNode *node = wxDDEServerObjects.GetFirst();
-  wxDDEServer *found = NULL;
-  while (node && !found)
-  {
-    wxDDEServer *object = (wxDDEServer *)node->GetData();
-
-    if (object->GetServiceName() == s)
-      found = object;
-    else node = node->GetNext();
-  }
-  return found;
+    wxDDEServerList::compatibility_iterator node = wxDDEServerObjects.GetFirst();
+    wxDDEServer *found = NULL;
+    while (node && !found)
+    {
+        wxDDEServer *object = node->GetData();
+
+        if (object->GetServiceName() == s)
+        {
+            found = object;
+        }
+        else
+        {
+            node = node->GetNext();
+        }
+    }
+
+    return found;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -286,36 +302,55 @@ bool wxDDEServer::Create(const wxString& server)
 {
     m_serviceName = server;
 
 {
     m_serviceName = server;
 

-    if ( !DdeNameService(DDEIdInst, DDEAtomFromString(server), (HSZ)NULL, DNS_REGISTER) )
-    {
-        DDELogError(wxString::Format(_("Failed to register DDE server '%s'"),
-                                     server.c_str()));
+    HSZ hsz = DDEAtomFromString(server);

 
 

+    if ( !hsz )
+    {

         return false;
     }
 
         return false;
     }
 

-    return true;
+
+    bool success = (DdeNameService(DDEIdInst, hsz, (HSZ) NULL, DNS_REGISTER)
+        != NULL);
+
+    if (!success)
+    {
+        DDELogError(wxString::Format(_("Failed to register DDE server '%s'"),
+            server.c_str()));
+    }
+
+    DDEFreeString(hsz);
+
+    return success;

 }
 
 wxDDEServer::~wxDDEServer()
 {
     if ( !!m_serviceName )
     {
 }
 
 wxDDEServer::~wxDDEServer()
 {
     if ( !!m_serviceName )
     {

-        if ( !DdeNameService(DDEIdInst, DDEAtomFromString(m_serviceName),
-                             (HSZ)NULL, DNS_UNREGISTER) )
+        HSZ hsz = DDEAtomFromString(m_serviceName);
+
+        if (hsz)

         {
         {

-            DDELogError(wxString::Format(_("Failed to unregister DDE server '%s'"),
-                                         m_serviceName.c_str()));
+            if ( !DdeNameService(DDEIdInst, hsz,
+                (HSZ) NULL, DNS_UNREGISTER) )
+            {
+                DDELogError(wxString::Format(
+                    _("Failed to unregister DDE server '%s'"),
+                    m_serviceName.c_str()));
+            }
+
+            DDEFreeString(hsz);

         }
     }
 
     wxDDEServerObjects.DeleteObject(this);
 
         }
     }
 
     wxDDEServerObjects.DeleteObject(this);
 

-    wxNode *node = m_connections.GetFirst();
+    wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
-        wxNode *next = node->GetNext();
+        wxDDEConnection *connection = node->GetData();
+        wxDDEConnectionList::compatibility_iterator next = node->GetNext();

         connection->SetConnected(false);
         connection->OnDisconnect(); // May delete the node implicitly
         node = next;
         connection->SetConnected(false);
         connection->OnDisconnect(); // May delete the node implicitly
         node = next;


@@ -325,8 +360,8 @@ wxDDEServer::~wxDDEServer()
     node = m_connections.GetFirst();
     while (node)
     {
     node = m_connections.GetFirst();
     while (node)
     {

-        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
-        wxNode *next = node->GetNext();
+        wxDDEConnection *connection = node->GetData();
+        wxDDEConnectionList::compatibility_iterator next = node->GetNext();

         delete connection;
         node = next;
     }
         delete connection;
         node = next;
     }


@@ -339,11 +374,11 @@ wxConnectionBase *wxDDEServer::OnAcceptConnection(const wxString& /* topic */)
 
 wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv)
 {
 
 wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv)
 {

-    wxNode *node = m_connections.GetFirst();
+    wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();

     wxDDEConnection *found = NULL;
     while (node && !found)
     {
     wxDDEConnection *found = NULL;
     while (node && !found)
     {

-        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+        wxDDEConnection *connection = node->GetData();

         if (connection->m_hConv == conv)
             found = connection;
         else node = node->GetNext();
         if (connection->m_hConv == conv)
             found = connection;
         else node = node->GetNext();


@@ -354,19 +389,21 @@ wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv)
 // Only delete the entry in the map, not the actual connection
 bool wxDDEServer::DeleteConnection(WXHCONV conv)
 {
 // Only delete the entry in the map, not the actual connection
 bool wxDDEServer::DeleteConnection(WXHCONV conv)
 {

-    wxNode *node = m_connections.GetFirst();
-    bool found = false;
-    while (node && !found)
+    wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();
+    while (node)

     {
     {

-        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+        wxDDEConnection *connection = node->GetData();

         if (connection->m_hConv == conv)
         {
         if (connection->m_hConv == conv)
         {

-            found = true;
-            delete node;
+            m_connections.Erase(node);
+            return true;
+        }
+        else
+        {
+            node = node->GetNext();

         }
         }

-        else node = node->GetNext();

     }
     }

-    return found;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -383,10 +420,10 @@ wxDDEClient::wxDDEClient()
 wxDDEClient::~wxDDEClient()
 {
     wxDDEClientObjects.DeleteObject(this);
 wxDDEClient::~wxDDEClient()
 {
     wxDDEClientObjects.DeleteObject(this);

-    wxNode *node = m_connections.GetFirst();
+    wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+        wxDDEConnection *connection = node->GetData();

         delete connection;  // Deletes the node implicitly (see ~wxDDEConnection)
         node = m_connections.GetFirst();
     }
         delete connection;  // Deletes the node implicitly (see ~wxDDEConnection)
         node = m_connections.GetFirst();
     }


@@ -401,12 +438,35 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
                                               const wxString& server,
                                               const wxString& topic)
 {
                                               const wxString& server,
                                               const wxString& topic)
 {

-    HCONV hConv = DdeConnect(DDEIdInst, DDEAtomFromString(server), DDEAtomFromString(topic),
-                             (PCONVCONTEXT)NULL);
+    HSZ hszServer = DDEAtomFromString(server);
+
+    if ( !hszServer )
+    {
+        return (wxConnectionBase*) NULL;
+    }
+
+
+    HSZ hszTopic = DDEAtomFromString(topic);
+
+    if ( !hszTopic )
+    {
+        DDEFreeString(hszServer);
+        return (wxConnectionBase*) NULL;
+    }
+
+
+    HCONV hConv = ::DdeConnect(DDEIdInst, hszServer, hszTopic,
+        (PCONVCONTEXT) NULL);
+
+    DDEFreeString(hszServer);
+    DDEFreeString(hszTopic);
+
+

     if ( !hConv )
     {
     if ( !hConv )
     {

-        DDELogError(wxString::Format(_("Failed to create connection to server '%s' on topic '%s'"),
-                                     server.c_str(), topic.c_str()));
+        DDELogError( wxString::Format(
+            _("Failed to create connection to server '%s' on topic '%s'"),
+            server.c_str(), topic.c_str()) );

     }
     else
     {
     }
     else
     {


@@ -431,11 +491,11 @@ wxConnectionBase *wxDDEClient::OnMakeConnection()
 
 wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv)
 {
 
 wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv)
 {

-    wxNode *node = m_connections.GetFirst();
+    wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();

     wxDDEConnection *found = NULL;
     while (node && !found)
     {
     wxDDEConnection *found = NULL;
     while (node && !found)
     {

-        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+        wxDDEConnection *connection = node->GetData();

         if (connection->m_hConv == conv)
             found = connection;
         else node = node->GetNext();
         if (connection->m_hConv == conv)
             found = connection;
         else node = node->GetNext();


@@ -446,19 +506,18 @@ wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv)
 // Only delete the entry in the map, not the actual connection
 bool wxDDEClient::DeleteConnection(WXHCONV conv)
 {
 // Only delete the entry in the map, not the actual connection
 bool wxDDEClient::DeleteConnection(WXHCONV conv)
 {

-    wxNode *node = m_connections.GetFirst();
-    bool found = false;
-    while (node && !found)
+    wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();
+    while (node)

     {
     {

-        wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+        wxDDEConnection *connection = node->GetData();

         if (connection->m_hConv == conv)
         {
         if (connection->m_hConv == conv)
         {

-            found = true;
-            delete node;
+            m_connections.Erase(node);
+            return true;

         }
         else node = node->GetNext();
     }
         }
         else node = node->GetNext();
     }

-    return found;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -560,9 +619,9 @@ wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat fo
     wxChar *data = GetBufferAtLeast( len );
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxDDEConnection::Request") );
     wxChar *data = GetBufferAtLeast( len );
     wxASSERT_MSG(data != NULL,
                  _T("Buffer too small in wxDDEConnection::Request") );

-    DdeGetData(returned_data, (LPBYTE)data, len, 0);
+    (void) DdeGetData(returned_data, (LPBYTE)data, len, 0);

 
 

-    DdeFreeDataHandle(returned_data);
+    (void) DdeFreeDataHandle(returned_data);

 
     if (size)
         *size = (int)len;
 
     if (size)
         *size = (int)len;


@@ -914,26 +973,27 @@ _DDECallback(WORD wType,
 // ----------------------------------------------------------------------------
 
 // Atom table stuff
 // ----------------------------------------------------------------------------
 
 // Atom table stuff

-static HSZ DDEAddAtom(const wxString& string)
+static HSZ DDEAddAtom(const wxString& str)

 {
 {

-    HSZ atom = DDEAtomFromString(string);
-    wxAtomTable.Append(string, (wxObject *)atom);
+    HSZ atom = DDEAtomFromString(str);
+    wxAtomTable[str] = atom;

     return atom;
 }
 
     return atom;
 }
 

-static HSZ DDEGetAtom(const wxString& string)
+static HSZ DDEGetAtom(const wxString& str)

 {
 {

-    wxNode *node = wxAtomTable.Find(string);
-    if (node)
-        return (HSZ)node->GetData();
-    else
-    {
-        DDEAddAtom(string);
-        return (HSZ)(wxAtomTable.Find(string)->GetData());
-    }
+    wxAtomMap::iterator it = wxAtomTable.find(str);
+
+    if (it != wxAtomTable.end())
+        return it->second;
+
+    return DDEAddAtom(str);

 }
 
 }
 

-// atom <-> strings
+/* atom <-> strings
+The returned handle has to be freed by the caller (using
+(static) DDEFreeString).
+*/

 static HSZ DDEAtomFromString(const wxString& s)
 {
     wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );
 static HSZ DDEAtomFromString(const wxString& s)
 {
     wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );


@@ -953,12 +1013,20 @@ static wxString DDEStringFromAtom(HSZ hsz)
     static const size_t len = 256;
 
     wxString s;
     static const size_t len = 256;
 
     wxString s;

-    (void)DdeQueryString(DDEIdInst, hsz, s.GetWriteBuf(len), len, DDE_CP);
-    s.UngetWriteBuf();
+    (void)DdeQueryString(DDEIdInst, hsz, wxStringBuffer(s, len), len, DDE_CP);

 
     return s;
 }
 
 
     return s;
 }
 

+static void DDEFreeString(HSZ hsz)
+{
+    // DS: Failure to free a string handle might indicate there's
+    // some other severe error.
+    bool ok = (::DdeFreeStringHandle(DDEIdInst, hsz) != 0);
+    wxASSERT_MSG( ok, wxT("Failed to free DDE string handle") );
+    wxUnusedVar(ok);
+}
+

 // ----------------------------------------------------------------------------
 // error handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // error handling
 // ----------------------------------------------------------------------------