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

wxBSTR cleanup: fixed a bug in wxBSTR::operator=(const wxBSTR& wxbstr); slightly improved comments in the code.

Browse Source
This commit is contained in:
pbfordev
2017-06-17 08:52:48 +02:00
parent 82104e0e54
commit 3dd7d57bd4
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/msw/ole/oleutils.h
View File

@@ -172,19 +172,20 @@ WXDLLIMPEXP_CORE BSTR wxConvertStringToOle(const wxString& str);
// Convert string from BSTR to wxString // Convert string from BSTR to wxString
WXDLLIMPEXP_CORE wxString wxConvertStringFromOle(BSTR bStr); WXDLLIMPEXP_CORE wxString wxConvertStringFromOle(BSTR bStr);
// A thin RAII wrapper for BSTR, which can create BSTR // A thin RAII wrapper for BSTR, which can also create BSTR
// from wxString as well as return the owned BSTR as wxString. // from wxString as well as return the owned BSTR as wxString.
// Unlike _b_str_t, wxBSTR is NOT reference counted. // Unlike _b_str_t, wxBSTR is NOT reference counted.
class WXDLLIMPEXP_CORE wxBSTR class WXDLLIMPEXP_CORE wxBSTR
{ {
public: public:
// Creates with the owned BSTR set to NULL
wxBSTR() : m_bstr(NULL) {} wxBSTR() : m_bstr(NULL) {}
// If copy is true then a copy of bstr is created, // If copy is true then a copy of bstr is created,
// if not then ownership of bstr is taken. // if not then ownership of bstr is taken.
wxBSTR(BSTR bstr, bool copy); wxBSTR(BSTR bstr, bool copy);
// Creates BSTR from wxString // Creates the owned BSTR from wxString str
wxBSTR(const wxString& str) : m_bstr(::SysAllocString(str.wc_str(*wxConvCurrent))) {} wxBSTR(const wxString& str) : m_bstr(::SysAllocString(str.wc_str(*wxConvCurrent))) {}
// Creates a copy of BSTR owned by wxbstr // Creates a copy of BSTR owned by wxbstr
@@ -193,7 +194,7 @@ public:
// Frees the owned BSTR // Frees the owned BSTR
~wxBSTR() { Free(); } ~wxBSTR() { Free(); }
// Creates a copy of wxbstr // Creates a copy of the BSTR owned by wxbstr
wxBSTR& operator=(const wxBSTR& wxbstr); wxBSTR& operator=(const wxBSTR& wxbstr);
// Takes ownership of bstr // Takes ownership of bstr
@@ -205,17 +206,17 @@ public:
// Frees the owned BSTR // Frees the owned BSTR
void Free(); void Free();
// Returnes the owned BSTR while keeping its ownership // Returns the owned BSTR while keeping its ownership
BSTR GetBSTR() const { return m_bstr; } BSTR GetBSTR() const { return m_bstr; }
operator BSTR() const { return GetBSTR(); } operator BSTR() const { return GetBSTR(); }
// Returns the address of owned BSTR // Returns the address of owned BSTR
BSTR* GetAddress() { return &m_bstr; } BSTR* GetAddress() { return &m_bstr; }
// Return a copy of owned BSTR // Returns a copy of owned BSTR
BSTR GetCopy() const { return ::SysAllocString(m_bstr); } BSTR GetCopy() const { return ::SysAllocString(m_bstr); }
// Returns the owned BSTR convert to wxString // Returns the owned BSTR converted to wxString
wxString GetwxString() const { return wxConvertStringFromOle(m_bstr); } wxString GetwxString() const { return wxConvertStringFromOle(m_bstr); }
private: private:
BSTR m_bstr; BSTR m_bstr;

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

@@ -81,7 +81,7 @@ wxBSTR::wxBSTR(BSTR bstr, bool copy)
wxBSTR& wxBSTR::operator=(const wxBSTR& wxbstr) wxBSTR& wxBSTR::operator=(const wxBSTR& wxbstr)
{ {
if ( wxbstr != *this ) if ( this != &wxbstr )
{ {
Free(); Free();
m_bstr = wxbstr.GetCopy(); m_bstr = wxbstr.GetCopy();