static wxList wxDDEClientObjects;
static wxList wxDDEServerObjects;
-char *DDEDefaultIPCBuffer = NULL;
-int DDEDefaultIPCBufferSize = 0;
-static bool DDEInitialized = FALSE;
+static bool DDEInitialized = false;
// ----------------------------------------------------------------------------
// private classes
{
public:
wxDDEModule() {}
- bool OnInit() { return TRUE; }
+ bool OnInit() { return true; }
void OnExit() { wxDDECleanUp(); }
private:
}
else
{
- DDEInitialized = TRUE;
+ DDEInitialized = true;
}
}
}
void wxDDECleanUp()
{
+ wxDDEClientObjects.DeleteContents(true);
+ wxDDEClientObjects.Clear();
+ wxDDEClientObjects.DeleteContents(false);
+
+ wxDDEServerObjects.DeleteContents(true);
+ wxDDEServerObjects.Clear();
+ wxDDEServerObjects.DeleteContents(false);
+
+ wxAtomTable.Clear();
+
if ( DDEIdInst != 0 )
{
DdeUninitialize(DDEIdInst);
DDEIdInst = 0;
}
-
- delete [] DDEDefaultIPCBuffer;
}
// ----------------------------------------------------------------------------
// Global find connection
static wxDDEConnection *DDEFindConnection(HCONV hConv)
{
- wxNode *node = wxDDEServerObjects.First();
+ wxNode *node = wxDDEServerObjects.GetFirst();
wxDDEConnection *found = NULL;
while (node && !found)
{
- wxDDEServer *object = (wxDDEServer *)node->Data();
+ wxDDEServer *object = (wxDDEServer *)node->GetData();
found = object->FindConnection((WXHCONV) hConv);
- node = node->Next();
+ node = node->GetNext();
}
if (found)
return found;
- node = wxDDEClientObjects.First();
+ node = wxDDEClientObjects.GetFirst();
while (node && !found)
{
- wxDDEClient *object = (wxDDEClient *)node->Data();
+ wxDDEClient *object = (wxDDEClient *)node->GetData();
found = object->FindConnection((WXHCONV) hConv);
- node = node->Next();
+ node = node->GetNext();
}
return found;
}
// Global delete connection
static void DDEDeleteConnection(HCONV hConv)
{
- wxNode *node = wxDDEServerObjects.First();
- bool found = FALSE;
+ wxNode *node = wxDDEServerObjects.GetFirst();
+ bool found = false;
while (node && !found)
{
- wxDDEServer *object = (wxDDEServer *)node->Data();
+ wxDDEServer *object = (wxDDEServer *)node->GetData();
found = object->DeleteConnection((WXHCONV) hConv);
- node = node->Next();
+ node = node->GetNext();
}
if (found)
return;
- node = wxDDEClientObjects.First();
+ node = wxDDEClientObjects.GetFirst();
while (node && !found)
{
- wxDDEClient *object = (wxDDEClient *)node->Data();
+ wxDDEClient *object = (wxDDEClient *)node->GetData();
found = object->DeleteConnection((WXHCONV) hConv);
- node = node->Next();
+ node = node->GetNext();
}
}
// Find a server from a service name
static wxDDEServer *DDEFindServer(const wxString& s)
{
- wxNode *node = wxDDEServerObjects.First();
+ wxNode *node = wxDDEServerObjects.GetFirst();
wxDDEServer *found = NULL;
while (node && !found)
{
- wxDDEServer *object = (wxDDEServer *)node->Data();
+ wxDDEServer *object = (wxDDEServer *)node->GetData();
if (object->GetServiceName() == s)
found = object;
- else node = node->Next();
+ else node = node->GetNext();
}
return found;
}
DDELogError(wxString::Format(_("Failed to register DDE server '%s'"),
server.c_str()));
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
wxDDEServer::~wxDDEServer()
wxDDEServerObjects.DeleteObject(this);
- wxNode *node = m_connections.First();
+ wxNode *node = m_connections.GetFirst();
while (node)
{
- wxDDEConnection *connection = (wxDDEConnection *)node->Data();
- wxNode *next = node->Next();
+ wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+ wxNode *next = node->GetNext();
+ connection->SetConnected(false);
connection->OnDisconnect(); // May delete the node implicitly
node = next;
}
// If any left after this, delete them
- node = m_connections.First();
+ node = m_connections.GetFirst();
while (node)
{
- wxDDEConnection *connection = (wxDDEConnection *)node->Data();
- wxNode *next = node->Next();
+ wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
+ wxNode *next = node->GetNext();
delete connection;
node = next;
}
wxDDEConnection *wxDDEServer::FindConnection(WXHCONV conv)
{
- wxNode *node = m_connections.First();
+ wxNode *node = m_connections.GetFirst();
wxDDEConnection *found = NULL;
while (node && !found)
{
- wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+ wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
if (connection->m_hConv == conv)
found = connection;
- else node = node->Next();
+ else node = node->GetNext();
}
return found;
}
// Only delete the entry in the map, not the actual connection
bool wxDDEServer::DeleteConnection(WXHCONV conv)
{
- wxNode *node = m_connections.First();
- bool found = FALSE;
+ wxNode *node = m_connections.GetFirst();
+ bool found = false;
while (node && !found)
{
- wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+ wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
if (connection->m_hConv == conv)
{
- found = TRUE;
+ found = true;
delete node;
}
- else node = node->Next();
+ else node = node->GetNext();
}
return found;
}
wxDDEClient::~wxDDEClient()
{
wxDDEClientObjects.DeleteObject(this);
- wxNode *node = m_connections.First();
+ wxNode *node = m_connections.GetFirst();
while (node)
{
- wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+ wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
delete connection; // Deletes the node implicitly (see ~wxDDEConnection)
- node = m_connections.First();
+ node = m_connections.GetFirst();
}
}
bool wxDDEClient::ValidHost(const wxString& /* host */)
{
- return TRUE;
+ return true;
}
wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host),
wxDDEConnection *wxDDEClient::FindConnection(WXHCONV conv)
{
- wxNode *node = m_connections.First();
+ wxNode *node = m_connections.GetFirst();
wxDDEConnection *found = NULL;
while (node && !found)
{
- wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+ wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
if (connection->m_hConv == conv)
found = connection;
- else node = node->Next();
+ else node = node->GetNext();
}
return found;
}
// Only delete the entry in the map, not the actual connection
bool wxDDEClient::DeleteConnection(WXHCONV conv)
{
- wxNode *node = m_connections.First();
- bool found = FALSE;
+ wxNode *node = m_connections.GetFirst();
+ bool found = false;
while (node && !found)
{
- wxDDEConnection *connection = (wxDDEConnection *)node->Data();
+ wxDDEConnection *connection = (wxDDEConnection *)node->GetData();
if (connection->m_hConv == conv)
{
- found = TRUE;
+ found = true;
delete node;
}
- else node = node->Next();
+ else node = node->GetNext();
}
return found;
}
// wxDDEConnection
// ----------------------------------------------------------------------------
-wxDDEConnection::wxDDEConnection(char *buffer, int size)
+wxDDEConnection::wxDDEConnection(wxChar *buffer, int size)
+ : wxConnectionBase(buffer, size)
{
- if (buffer == NULL)
- {
- if (DDEDefaultIPCBuffer == NULL)
- DDEDefaultIPCBuffer = new char[DDEDefaultIPCBufferSize];
- m_bufPtr = DDEDefaultIPCBuffer;
- m_bufSize = DDEDefaultIPCBufferSize;
- }
- else
- {
- m_bufPtr = buffer;
- m_bufSize = size;
- }
-
m_client = NULL;
m_server = NULL;
}
wxDDEConnection::wxDDEConnection()
+ : wxConnectionBase()
{
m_hConv = 0;
m_sendingData = NULL;
m_server = NULL;
m_client = NULL;
- if (DDEDefaultIPCBuffer == NULL)
- DDEDefaultIPCBuffer = new char[DDEDefaultIPCBufferSize];
-
- m_bufPtr = DDEDefaultIPCBuffer;
- m_bufSize = DDEDefaultIPCBufferSize;
}
wxDDEConnection::~wxDDEConnection()
{
+ Disconnect();
if (m_server)
m_server->GetConnections().DeleteObject(this);
else
// Calls that CLIENT can make
bool wxDDEConnection::Disconnect()
{
+ if ( !GetConnected() )
+ return true;
+
DDEDeleteConnection(GetHConv());
bool ok = DdeDisconnect(GetHConv()) != 0;
DDELogError(_T("Failed to disconnect from DDE server gracefully"));
}
+ SetConnected( false ); // so we don't try and disconnect again
+
return ok;
}
return ok;
}
-char *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format)
+wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format)
{
DWORD result;
+
HSZ atom = DDEGetAtom(item);
HDDEDATA returned_data = DdeClientTransaction(NULL, 0,
return NULL;
}
- DWORD len = DdeGetData(returned_data, (LPBYTE)m_bufPtr, m_bufSize, 0);
+ DWORD len = DdeGetData(returned_data, NULL, 0, 0);
+
+ wxChar *data = GetBufferAtLeast( len );
+ wxASSERT_MSG(data != NULL,
+ _T("Buffer too small in wxDDEConnection::Request") );
+ DdeGetData(returned_data, (LPBYTE)data, len, 0);
DdeFreeDataHandle(returned_data);
if (size)
*size = (int)len;
- return m_bufPtr;
+ return data;
}
bool wxDDEConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
HSZ item_atom = DDEGetAtom(item);
HSZ topic_atom = DDEGetAtom(m_topicName);
- m_sendingData = data;
+ m_sendingData = data; // mrf: potential for scope problems here?
m_dataSize = size;
m_dataType = format;
bool wxDDEConnection::OnDisconnect()
{
delete this;
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
connection->m_hConv = 0;
connection->m_topicName = topic;
DDECurrentlyConnecting = connection;
- return (DDERETURN)(DWORD)TRUE;
+ return (DDERETURN)(DWORD)true;
}
}
break;
{
DDECurrentlyConnecting->m_hConv = (WXHCONV) hConv;
DDECurrentlyConnecting = NULL;
- return (DDERETURN)(DWORD)TRUE;
+ return (DDERETURN)(DWORD)true;
}
break;
}
case XTYP_DISCONNECT:
{
wxDDEConnection *connection = DDEFindConnection(hConv);
- if (connection && connection->OnDisconnect())
+ if (connection)
{
- DDEDeleteConnection(hConv); // Delete mapping: hConv => connection
- return (DDERETURN)(DWORD)TRUE;
+ connection->SetConnected( false );
+ if (connection->OnDisconnect())
+ {
+ DDEDeleteConnection(hConv); // Delete mapping: hConv => connection
+ return (DDERETURN)(DWORD)true;
+ }
}
break;
}
if (connection)
{
- DWORD len = DdeGetData(hData,
- (LPBYTE)connection->m_bufPtr,
- connection->m_bufSize,
- 0);
+ DWORD len = DdeGetData(hData, NULL, 0, 0);
+
+ wxChar *data = connection->GetBufferAtLeast( len );
+ wxASSERT_MSG(data != NULL,
+ _T("Buffer too small in _DDECallback (XTYP_EXECUTE)") );
+
+ DdeGetData(hData, (LPBYTE)data, len, 0);
+
DdeFreeDataHandle(hData);
+
if ( connection->OnExecute(connection->m_topicName,
- connection->m_bufPtr,
+ data,
(int)len,
(wxIPCFormat) wFmt) )
{
wxString item_name = DDEStringFromAtom(hsz2);
int user_size = -1;
- char *data = connection->OnRequest(connection->m_topicName,
+ wxChar *data = connection->OnRequest(connection->m_topicName,
item_name,
&user_size,
(wxIPCFormat) wFmt);
{
wxString item_name = DDEStringFromAtom(hsz2);
- DWORD len = DdeGetData(hData,
- (LPBYTE)connection->m_bufPtr,
- connection->m_bufSize,
- 0);
+ DWORD len = DdeGetData(hData, NULL, 0, 0);
+
+ wxChar *data = connection->GetBufferAtLeast( len );
+ wxASSERT_MSG(data != NULL,
+ _T("Buffer too small in _DDECallback (XTYP_EXECUTE)") );
+
+ DdeGetData(hData, (LPBYTE)data, len, 0);
+
DdeFreeDataHandle(hData);
connection->OnPoke(connection->m_topicName,
item_name,
- (wxChar*)connection->m_bufPtr,
+ data,
(int)len,
(wxIPCFormat) wFmt);
{
wxString item_name = DDEStringFromAtom(hsz2);
- DWORD len = DdeGetData(hData,
- (LPBYTE)connection->m_bufPtr,
- connection->m_bufSize,
- 0);
+ DWORD len = DdeGetData(hData, NULL, 0, 0);
+
+ wxChar *data = connection->GetBufferAtLeast( len );
+ wxASSERT_MSG(data != NULL,
+ _T("Buffer too small in _DDECallback (XTYP_ADVDATA)") );
+
+ DdeGetData(hData, (LPBYTE)data, len, 0);
+
DdeFreeDataHandle(hData);
if ( connection->OnAdvise(connection->m_topicName,
item_name,
- connection->m_bufPtr,
+ data,
(int)len,
(wxIPCFormat) wFmt) )
{
{
wxNode *node = wxAtomTable.Find(string);
if (node)
- return (HSZ)node->Data();
+ return (HSZ)node->GetData();
else
{
DDEAddAtom(string);
- return (HSZ)(wxAtomTable.Find(string)->Data());
+ return (HSZ)(wxAtomTable.Find(string)->GetData());
}
}
projects / wxWidgets.git / blobdiff