Changeset 85288 in vbox for trunk/src/VBox/Main/glue

Timestamp:

Jul 13, 2020 12:19:47 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139265

Message:

Main: Adding two Bstr::assignEx variants that returns HRESULT instead of throwing exceptions. bugref:9790

File:

• trunk/src/VBox/Main/glue/string.cpp (modified) (2 diffs)

trunk/src/VBox/Main/glue/string.cpp

@@ -620 +620 @@
     {
         m_bstr = ::SysAllocString(a_bstrSrc);
-        if (!m_bstr)
+        if (RT_LIKELY(m_bstr))
+        { /* likely */ }
+        else
             throw std::bad_alloc();
     }
@@ -632 +634 @@
     cleanup();
     copyFrom(a_bstrSrc);
+}
+
+
+HRESULT Bstr::cleanupAndCopyFromEx(const OLECHAR *a_bstrSrc) RT_NOEXCEPT
+{
+    cleanup();
+
+    if (a_bstrSrc && *a_bstrSrc)
+    {
+        m_bstr = ::SysAllocString(a_bstrSrc);
+        if (RT_LIKELY(m_bstr))
+        { /* likely */ }
+        else
+            return E_OUTOFMEMORY;
+    }
+    else
+        m_bstr = NULL;
+    return S_OK;
 }