X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b39dbf34b887a73c525da903d8599f4f6b7eb8f9..e0c5c96f67eaf13ccbd378616bdf98c8dba01e78:/src/msw/dde.cpp diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index 606abdac8b..6554c530de 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dde.h" #endif @@ -38,12 +38,11 @@ #include "wx/module.h" #include "wx/dde.h" #include "wx/intl.h" - +#include "wx/hashmap.h" #include "wx/msw/private.h" #include -#include #include #ifdef __GNUWIN32_OLD__ @@ -113,6 +112,7 @@ static HSZ DDEGetAtom(const wxString& string); // 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); @@ -122,9 +122,11 @@ static void DDELogError(const wxString& s, UINT error = DMLERR_NO_ERROR); // global variables // ---------------------------------------------------------------------------- +WX_DECLARE_STRING_HASH_MAP( HSZ, wxAtomMap ); + static DWORD DDEIdInst = 0L; static wxDDEConnection *DDECurrentlyConnecting = NULL; -static wxList wxAtomTable(wxKEY_STRING); +static wxAtomMap wxAtomTable; #include "wx/listimpl.cpp" @@ -193,15 +195,12 @@ extern void wxDDEInitialize() 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 ) { @@ -217,7 +216,7 @@ void wxDDECleanUp() // Global find connection static wxDDEConnection *DDEFindConnection(HCONV hConv) { - wxDDEServerList::Node *serverNode = wxDDEServerObjects.GetFirst(); + wxDDEServerList::compatibility_iterator serverNode = wxDDEServerObjects.GetFirst(); wxDDEConnection *found = NULL; while (serverNode && !found) { @@ -231,7 +230,7 @@ static wxDDEConnection *DDEFindConnection(HCONV hConv) return found; } - wxDDEClientList::Node *clientNode = wxDDEClientObjects.GetFirst(); + wxDDEClientList::compatibility_iterator clientNode = wxDDEClientObjects.GetFirst(); while (clientNode && !found) { wxDDEClient *object = clientNode->GetData(); @@ -244,7 +243,7 @@ static wxDDEConnection *DDEFindConnection(HCONV hConv) // Global delete connection static void DDEDeleteConnection(HCONV hConv) { - wxDDEServerList::Node *serverNode = wxDDEServerObjects.GetFirst(); + wxDDEServerList::compatibility_iterator serverNode = wxDDEServerObjects.GetFirst(); bool found = false; while (serverNode && !found) { @@ -257,7 +256,7 @@ static void DDEDeleteConnection(HCONV hConv) return; } - wxDDEClientList::Node *clientNode = wxDDEClientObjects.GetFirst(); + wxDDEClientList::compatibility_iterator clientNode = wxDDEClientObjects.GetFirst(); while (clientNode && !found) { wxDDEClient *object = clientNode->GetData(); @@ -269,7 +268,7 @@ static void DDEDeleteConnection(HCONV hConv) // Find a server from a service name static wxDDEServer *DDEFindServer(const wxString& s) { - wxDDEServerList::Node *node = wxDDEServerObjects.GetFirst(); + wxDDEServerList::compatibility_iterator node = wxDDEServerObjects.GetFirst(); wxDDEServer *found = NULL; while (node && !found) { @@ -303,36 +302,55 @@ bool wxDDEServer::Create(const wxString& 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 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 ) { - 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); - wxDDEConnectionList::Node *node = m_connections.GetFirst(); + wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst(); while (node) { wxDDEConnection *connection = node->GetData(); - wxDDEConnectionList::Node *next = node->GetNext(); + wxDDEConnectionList::compatibility_iterator next = node->GetNext(); connection->SetConnected(false); connection->OnDisconnect(); // May delete the node implicitly node = next; @@ -343,7 +361,7 @@ wxDDEServer::~wxDDEServer() while (node) { wxDDEConnection *connection = node->GetData(); - wxDDEConnectionList::Node *next = node->GetNext(); + wxDDEConnectionList::compatibility_iterator next = node->GetNext(); delete connection; node = next; } @@ -356,7 +374,7 @@ wxConnectionBase *wxDDEServer::OnAcceptConnection(const wxString& /* topic */) wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv) { - wxDDEConnectionList::Node *node = m_connections.GetFirst(); + wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst(); wxDDEConnection *found = NULL; while (node && !found) { @@ -371,22 +389,21 @@ wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv) // Only delete the entry in the map, not the actual connection bool wxDDEServer::DeleteConnection(WXHCONV conv) { - wxDDEConnectionList::Node *node = m_connections.GetFirst(); - bool found = false; - while (node && !found) + wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst(); + while (node) { wxDDEConnection *connection = node->GetData(); if (connection->m_hConv == conv) { - found = true; - delete node; + m_connections.Erase(node); + return true; } else { node = node->GetNext(); } } - return found; + return false; } // ---------------------------------------------------------------------------- @@ -403,7 +420,7 @@ wxDDEClient::wxDDEClient() wxDDEClient::~wxDDEClient() { wxDDEClientObjects.DeleteObject(this); - wxDDEConnectionList::Node *node = m_connections.GetFirst(); + wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst(); while (node) { wxDDEConnection *connection = node->GetData(); @@ -421,12 +438,35 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host), 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 ) { - 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 { @@ -451,7 +491,7 @@ wxConnectionBase *wxDDEClient::OnMakeConnection() wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv) { - wxDDEConnectionList::Node *node = m_connections.GetFirst(); + wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst(); wxDDEConnection *found = NULL; while (node && !found) { @@ -466,19 +506,18 @@ wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv) // Only delete the entry in the map, not the actual connection bool wxDDEClient::DeleteConnection(WXHCONV conv) { - wxDDEConnectionList::Node *node = m_connections.GetFirst(); - bool found = false; - while (node && !found) + wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst(); + while (node) { wxDDEConnection *connection = node->GetData(); if (connection->m_hConv == conv) { - found = true; - delete node; + m_connections.Erase(node); + return true; } else node = node->GetNext(); } - return found; + return false; } // ---------------------------------------------------------------------------- @@ -580,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") ); - 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; @@ -934,26 +973,27 @@ _DDECallback(WORD wType, // ---------------------------------------------------------------------------- // 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; } -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") ); @@ -973,12 +1013,20 @@ static wxString DDEStringFromAtom(HSZ hsz) 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; } +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 // ----------------------------------------------------------------------------