// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dde.h"
#endif
#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 <windows.h>
#include <ddeml.h>
#ifdef __GNUWIN32_OLD__
// 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);
// 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"
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 )
{
// 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)
{
return found;
}
- wxDDEClientList::Node *clientNode = wxDDEClientObjects.GetFirst();
+ wxDDEClientList::compatibility_iterator clientNode = wxDDEClientObjects.GetFirst();
while (clientNode && !found)
{
wxDDEClient *object = clientNode->GetData();
// 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)
{
return;
}
- wxDDEClientList::Node *clientNode = wxDDEClientObjects.GetFirst();
+ wxDDEClientList::compatibility_iterator clientNode = wxDDEClientObjects.GetFirst();
while (clientNode && !found)
{
wxDDEClient *object = clientNode->GetData();
// 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)
{
{
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;
while (node)
{
wxDDEConnection *connection = node->GetData();
- wxDDEConnectionList::Node *next = node->GetNext();
+ wxDDEConnectionList::compatibility_iterator next = node->GetNext();
delete connection;
node = next;
}
wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv)
{
- wxDDEConnectionList::Node *node = m_connections.GetFirst();
+ wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();
wxDDEConnection *found = NULL;
while (node && !found)
{
// 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;
}
// ----------------------------------------------------------------------------
wxDDEClient::~wxDDEClient()
{
wxDDEClientObjects.DeleteObject(this);
- wxDDEConnectionList::Node *node = m_connections.GetFirst();
+ wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();
while (node)
{
wxDDEConnection *connection = node->GetData();
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
{
wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv)
{
- wxDDEConnectionList::Node *node = m_connections.GetFirst();
+ wxDDEConnectionList::compatibility_iterator node = m_connections.GetFirst();
wxDDEConnection *found = NULL;
while (node && !found)
{
// 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;
}
// ----------------------------------------------------------------------------
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;
// ----------------------------------------------------------------------------
// 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") );
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
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff