/////////////////////////////////////////////////////////////////////////////
-// Name: msw/dde.cpp
+// Name: src/msw/dde.cpp
// Purpose: DDE classes
// Author: Julian Smart
// Modified by:
// 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"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/app.h"
+ #include "wx/hashmap.h"
+ #include "wx/module.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 <ddeml.h>
-#ifdef __GNUWIN32_OLD__
- #include "wx/msw/gnuwin32/extra.h"
-#endif
-
// ----------------------------------------------------------------------------
// macros and constants
// ----------------------------------------------------------------------------
#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;
wxDDEServer::~wxDDEServer()
{
- if ( !m_serviceName.IsEmpty() )
+ if ( !m_serviceName.empty() )
{
HSZ hsz = DDEAtomFromString(m_serviceName);
// wxDDEConnection
// ----------------------------------------------------------------------------
-wxDDEConnection::wxDDEConnection(wxChar *buffer, int size)
+wxDDEConnection::wxDDEConnection(void *buffer, size_t size)
: wxConnectionBase(buffer, size)
{
m_client = NULL;
return ok;
}
-bool wxDDEConnection::Execute(const wxChar *data, int size, wxIPCFormat format)
+bool wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat WXUNUSED(format))
{
DWORD result;
- if (size < 0)
- {
- size = wxStrlen(data) + 1;
- }
bool ok = DdeClientTransaction((LPBYTE)data,
- size * sizeof(wxChar),
+ size,
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;
return ok;
}
-wxChar *wxDDEConnection::Request(const wxString& item, int *size, wxIPCFormat format)
+const void *wxDDEConnection::Request(const wxString& item, size_t *size, wxIPCFormat format)
{
DWORD result;
DWORD len = DdeGetData(returned_data, NULL, 0, 0);
- wxChar *data = GetBufferAtLeast( len/sizeof(wxChar) );
+ void *data = GetBufferAtLeast(len);
wxASSERT_MSG(data != NULL,
_T("Buffer too small in wxDDEConnection::Request") );
(void) DdeGetData(returned_data, (LPBYTE)data, len, 0);
(void) DdeFreeDataHandle(returned_data);
if (size)
- *size = (int)len/sizeof(wxChar);
+ *size = (size_t)len;
return data;
}
-bool wxDDEConnection::Poke(const wxString& item, wxChar *data, int size, wxIPCFormat format)
+bool wxDDEConnection::DoPoke(const wxString& item, const void *data, size_t size, wxIPCFormat format)
{
DWORD result;
- if (size < 0)
- {
- size = wxStrlen(data) + 1;
- }
HSZ item_atom = DDEGetAtom(item);
bool ok = DdeClientTransaction((LPBYTE)data,
- size * sizeof(wxChar),
+ size,
GetHConv(),
item_atom, format,
XTYP_POKE,
}
// Calls that SERVER can make
-bool wxDDEConnection::Advise(const wxString& item,
- wxChar *data,
- int size,
- wxIPCFormat format)
+bool wxDDEConnection::DoAdvise(const wxString& item,
+ const void *data,
+ size_t size,
+ wxIPCFormat format)
{
- if (size < 0)
- {
- size = wxStrlen(data) + 1;
- }
-
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 )
return ok;
}
-bool wxDDEConnection::OnDisconnect()
-{
- delete this;
- return true;
-}
-
// ----------------------------------------------------------------------------
// _DDECallback
// ----------------------------------------------------------------------------
{
DWORD len = DdeGetData(hData, NULL, 0, 0);
- wxChar *data = connection->GetBufferAtLeast( len/sizeof(wxChar) );
+ void *data = connection->GetBufferAtLeast(len);
wxASSERT_MSG(data != NULL,
_T("Buffer too small in _DDECallback (XTYP_EXECUTE)") );
DdeFreeDataHandle(hData);
+// XTYP_EXECUTE cannot be used for arbitrary data, but only for text
if ( connection->OnExecute(connection->m_topicName,
data,
- (int)len/sizeof(wxChar),
- (wxIPCFormat) wFmt) )
+ (int)len,
+ wxIPC_TEXT ) )
{
return (DDERETURN)(DWORD)DDE_FACK;
}
{
wxString item_name = DDEStringFromAtom(hsz2);
- int user_size = -1;
- wxChar *data = connection->OnRequest(connection->m_topicName,
- item_name,
- &user_size,
- (wxIPCFormat) wFmt);
+ size_t user_size = wxNO_LEN;
+ const void *data = connection->OnRequest(connection->m_topicName,
+ item_name,
+ &user_size,
+ (wxIPCFormat)wFmt);
if (data)
{
- if (user_size < 0)
- user_size = wxStrlen((wxChar*)data) + 1;
+ if (user_size == wxNO_LEN)
+ switch (wFmt)
+ {
+ case wxIPC_TEXT:
+ case wxIPC_UTF8TEXT:
+ user_size = strlen((const char*)data) + 1; // includes final NUL
+ break;
+ case wxIPC_UNICODETEXT:
+ user_size = (wcslen((const wchar_t*)data) + 1) * sizeof(wchar_t); // includes final NUL
+ break;
+ default:
+ user_size = 0;
+ }
HDDEDATA handle = DdeCreateDataHandle(DDEIdInst,
(LPBYTE)data,
- user_size*sizeof(wxChar),
+ user_size,
0,
hsz2,
wFmt,
DWORD len = DdeGetData(hData, NULL, 0, 0);
- wxChar *data = connection->GetBufferAtLeast( len/sizeof(wxChar) );
+ void *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);
connection->OnPoke(connection->m_topicName,
item_name,
data,
- (int)len/sizeof(wxChar),
+ (int)len,
(wxIPCFormat) wFmt);
return (DDERETURN)DDE_FACK;
(
DDEIdInst,
(LPBYTE)connection->m_sendingData,
- connection->m_dataSize*sizeof(wxChar),
+ connection->m_dataSize,
0,
hsz2,
connection->m_dataType,
DWORD len = DdeGetData(hData, NULL, 0, 0);
- wxChar *data = connection->GetBufferAtLeast( len/sizeof(wxChar) );
+ void *data = connection->GetBufferAtLeast(len);
wxASSERT_MSG(data != NULL,
_T("Buffer too small in _DDECallback (XTYP_ADVDATA)") );
if ( connection->OnAdvise(connection->m_topicName,
item_name,
data,
- (int)len/sizeof(wxChar),
+ (int)len,
(wxIPCFormat) wFmt) )
{
return (DDERETURN)(DWORD)DDE_FACK;
{
wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") );
- HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*) s.c_str(), DDE_CP);
+ HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*)s.wx_str(), DDE_CP);
if ( !hsz )
{
DDELogError(_("Failed to create DDE string"));
projects / wxWidgets.git / blobdiff