X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/50c549b98d8e61e19f59c61989af293bb58319f8..e75390d4aa51b46b9217dc4699267c1345893054:/src/msw/dde.cpp diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index 976b8a2daf..330ffa077d 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -35,6 +35,8 @@ #include "wx/dde.h" #include "wx/intl.h" +#include "wx/buffer.h" +#include "wx/strconv.h" #include "wx/msw/private.h" @@ -158,7 +160,7 @@ extern void wxDDEInitialize() UINT rc = DdeInitialize(&DDEIdInst, callback, APPCLASS_STANDARD, 0L); if ( rc != DMLERR_NO_ERROR ) { - DDELogError(_T("Failed to initialize DDE"), rc); + DDELogError(wxT("Failed to initialize DDE"), rc); } else { @@ -172,7 +174,7 @@ void wxDDECleanUp() // 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") ); + wxT("all DDE objects should be deleted by now") ); wxAtomTable.clear(); @@ -416,7 +418,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host), if ( !hszServer ) { - return (wxConnectionBase*) NULL; + return NULL; } @@ -425,7 +427,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host), if ( !hszTopic ) { DDEFreeString(hszServer); - return (wxConnectionBase*) NULL; + return NULL; } @@ -455,7 +457,7 @@ wxConnectionBase *wxDDEClient::MakeConnection(const wxString& WXUNUSED(host), } } - return (wxConnectionBase*) NULL; + return NULL; } wxConnectionBase *wxDDEClient::OnMakeConnection() @@ -537,7 +539,7 @@ bool wxDDEConnection::Disconnect() bool ok = DdeDisconnect(GetHConv()) != 0; if ( !ok ) { - DDELogError(_T("Failed to disconnect from DDE server gracefully")); + DDELogError(wxT("Failed to disconnect from DDE server gracefully")); } SetConnected( false ); // so we don't try and disconnect again @@ -545,24 +547,109 @@ bool wxDDEConnection::Disconnect() return ok; } -bool wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat WXUNUSED(format)) +bool +wxDDEConnection::DoExecute(const void *data, size_t size, wxIPCFormat format) { - DWORD result; + wxCHECK_MSG( format == wxIPC_TEXT || + format == wxIPC_UTF8TEXT || + format == wxIPC_UNICODETEXT, + false, + wxT("wxDDEServer::Execute() supports only text data") ); + + wxMemoryBuffer buffer; + LPBYTE realData = NULL; + size_t realSize = 0; + wxMBConv *conv = NULL; + + // Windows only supports either ANSI or UTF-16 format depending on the + // build, so we need to convert the data if it doesn't use it already +#if wxUSE_UNICODE + if ( format == wxIPC_TEXT ) + { + conv = &wxConvLibc; + } + else if ( format == wxIPC_UTF8TEXT ) + { + conv = &wxConvUTF8; + } + else // no conversion necessary for wxIPC_UNICODETEXT + { + realData = (LPBYTE)data; + realSize = size; + } - bool ok = DdeClientTransaction((LPBYTE)data, - size, - GetHConv(), - NULL, -// 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; + if ( conv ) + { + const char * const text = (const char *)data; + const size_t len = size/sizeof(char); + + realSize = conv->ToWChar(NULL, 0, text, len); + if ( realSize == wxCONV_FAILED ) + return false; + + realData = (LPBYTE)buffer.GetWriteBuf(realSize*sizeof(wchar_t)); + if ( !realData ) + return false; + + realSize = conv->ToWChar((wchar_t *)realData, realSize, text, len); + if ( realSize == wxCONV_FAILED ) + return false; + } +#else // !wxUSE_UNICODE + if ( format == wxIPC_UNICODETEXT ) + { + conv = &wxConvLibc; + } + else if ( format == wxIPC_UTF8TEXT ) + { + // we could implement this in theory but it's not obvious how to pass + // the format information and, basically, why bother -- just use + // Unicode build + wxFAIL_MSG( wxT("UTF-8 text not supported in ANSI build") ); + + return false; + } + else // don't convert wxIPC_TEXT + { + realData = (LPBYTE)data; + realSize = size; + } + + if ( conv ) + { + const wchar_t * const wtext = (const wchar_t *)data; + const size_t len = size/sizeof(wchar_t); + + realSize = conv->FromWChar(NULL, 0, wtext, len); + if ( realSize == wxCONV_FAILED ) + return false; + + realData = (LPBYTE)buffer.GetWriteBuf(realSize*sizeof(char)); + if ( !realData ) + return false; + + realSize = conv->FromWChar((char*)realData, realSize, wtext, len); + if ( realSize == wxCONV_FAILED ) + return false; + } +#endif // wxUSE_UNICODE/!wxUSE_UNICODE + + DWORD result; + bool ok = DdeClientTransaction(realData, + realSize*sizeof(wxChar), + GetHConv(), + NULL, + // MSDN: 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; if ( !ok ) { - DDELogError(_T("DDE execute request failed")); + DDELogError(wxT("DDE execute request failed")); } return ok; @@ -582,7 +669,7 @@ const void *wxDDEConnection::Request(const wxString& item, size_t *size, wxIPCFo &result); if ( !returned_data ) { - DDELogError(_T("DDE data request failed")); + DDELogError(wxT("DDE data request failed")); return NULL; } @@ -591,7 +678,7 @@ const void *wxDDEConnection::Request(const wxString& item, size_t *size, wxIPCFo void *data = GetBufferAtLeast(len); wxASSERT_MSG(data != NULL, - _T("Buffer too small in wxDDEConnection::Request") ); + wxT("Buffer too small in wxDDEConnection::Request") ); (void) DdeGetData(returned_data, (LPBYTE)data, len, 0); (void) DdeFreeDataHandle(returned_data); @@ -758,17 +845,25 @@ _DDECallback(WORD wType, void *data = connection->GetBufferAtLeast(len); wxASSERT_MSG(data != NULL, - _T("Buffer too small in _DDECallback (XTYP_EXECUTE)") ); + wxT("Buffer too small in _DDECallback (XTYP_EXECUTE)") ); DdeGetData(hData, (LPBYTE)data, len, 0); DdeFreeDataHandle(hData); -// XTYP_EXECUTE cannot be used for arbitrary data, but only for text + // XTYP_EXECUTE can be used for text only and the text is + // always in ANSI format for ANSI build and Unicode format + // in Unicode build + #if wxUSE_UNICODE + wFmt = wxIPC_UNICODETEXT; + #else + wFmt = wxIPC_TEXT; + #endif + if ( connection->OnExecute(connection->m_topicName, data, (int)len, - wxIPC_TEXT ) ) + (wxIPCFormat)wFmt) ) { return (DDERETURN)(DWORD)DDE_FACK; } @@ -831,7 +926,7 @@ _DDECallback(WORD wType, void *data = connection->GetBufferAtLeast(len); wxASSERT_MSG(data != NULL, - _T("Buffer too small in _DDECallback (XTYP_POKE)") ); + wxT("Buffer too small in _DDECallback (XTYP_POKE)") ); DdeGetData(hData, (LPBYTE)data, len, 0); @@ -918,7 +1013,7 @@ _DDECallback(WORD wType, void *data = connection->GetBufferAtLeast(len); wxASSERT_MSG(data != NULL, - _T("Buffer too small in _DDECallback (XTYP_ADVDATA)") ); + wxT("Buffer too small in _DDECallback (XTYP_ADVDATA)") ); DdeGetData(hData, (LPBYTE)data, len, 0); @@ -968,7 +1063,7 @@ The returned handle has to be freed by the caller (using */ static HSZ DDEAtomFromString(const wxString& s) { - wxASSERT_MSG( DDEIdInst, _T("DDE not initialized") ); + wxASSERT_MSG( DDEIdInst, wxT("DDE not initialized") ); HSZ hsz = DdeCreateStringHandle(DDEIdInst, (wxChar*)s.wx_str(), DDE_CP); if ( !hsz ) @@ -1010,7 +1105,7 @@ static void DDELogError(const wxString& s, UINT error) error = DdeGetLastError(DDEIdInst); } - wxLogError(s + _T(": ") + DDEGetErrorMsg(error)); + wxLogError(s + wxT(": ") + DDEGetErrorMsg(error)); } static wxString DDEGetErrorMsg(UINT error)