Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use standard functions for BSTR handling instead of doing it ourselves incorrectly (fixed patch 1829152)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-13 01:18:06 +00:00
parent 49b3b52cc8
commit a518e5080d
2 changed files with 18 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/msw/ole/oleutils.cpp
View File

@@ -91,49 +91,25 @@ WXDLLEXPORT wxString wxConvertStringFromOle(BSTR bStr)
// wxBasicString
// ----------------------------------------------------------------------------
// ctor takes an ANSI string and transforms it to Unicode
wxBasicString::wxBasicString(const char *sz)
{
Init(sz);
}
// ctor takes an ANSI or Unicode string and transforms it to Unicode
wxBasicString::wxBasicString(const wxString& str)
{
#if wxUSE_UNICODE
m_wzBuf = new OLECHAR[str.length() + 1];
memcpy(m_wzBuf, str.c_str(), str.length()*2);
m_wzBuf[str.length()] = L'\0';
#else
Init(str.c_str());
#endif
m_bstrBuf = SysAllocString(str.wc_str(*wxConvCurrent));
}
// Takes an ANSI string and transforms it to Unicode
void wxBasicString::Init(const char *sz)
wxBasicString::wxBasicString(const wxBasicString& src)
{
// get the size of required buffer
UINT lenAnsi = strlen(sz);
#ifdef __MWERKS__
UINT lenWide = lenAnsi * 2 ;
#else
UINT lenWide = mbstowcs(NULL, sz, lenAnsi);
#endif
if ( lenWide > 0 ) {
m_wzBuf = new OLECHAR[lenWide + 1];
mbstowcs(m_wzBuf, sz, lenAnsi);
m_wzBuf[lenWide] = L'\0';
}
else {
m_wzBuf = NULL;
}
m_bstrBuf = src.Get();
}
wxBasicString& wxBasicString::operator=(const wxBasicString& src)
{
SysReAllocString(&m_bstrBuf, src);
return *this;
}
// dtor frees memory
wxBasicString::~wxBasicString()
{
delete [] m_wzBuf;
SysFreeString(m_bstrBuf);
}
#if wxUSE_DATAOBJ