Changeset 85288 in vbox for trunk/include/VBox

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/include/VBox/com/string.h (modified) (2 diffs)

trunk/include/VBox/com/string.h

@@ -173 +173 @@
     }
 
+    /**
+     * Extended assignment method that returns a COM status code instead of an
+     * exception on failure.
+     *
+     * @returns S_OK or E_OUTOFMEMORY.
+     * @param   a_rSrcStr   The source string
+     */
+    HRESULT assignEx(const Bstr &a_rSrcStr) RT_NOEXCEPT
+    {
+        return cleanupAndCopyFromEx((const OLECHAR *)a_rSrcStr.m_bstr);
+    }
+
+    /**
+     * Extended assignment method that returns a COM status code instead of an
+     * exception on failure.
+     *
+     * @returns S_OK or E_OUTOFMEMORY.
+     * @param   a_pSrcStr   The source string
+     */
+    HRESULT assignEx(CBSTR a_pSrcStr) RT_NOEXCEPT
+    {
+        return cleanupAndCopyFromEx((const OLECHAR *)a_pSrcStr);
+    }
+
 #ifdef _MSC_VER
 # if _MSC_VER >= 1400
@@ -950 +974 @@
     /** cleanup() + copyFrom() - for assignment operators.  */
     void cleanupAndCopyFrom(const OLECHAR *a_bstrSrc);
+
+    /**
+     * Protected internal helper to copy a string, implying cleanup().
+     *
+     * This variant copies from a zero-terminated UTF-16 string (which need not be a
+     * BSTR, i.e. need not have a length prefix).
+     *
+     * If the source is empty, this sets the member string to NULL.
+     *
+     * @param   a_bstrSrc           The source string.  The caller guarantees
+     *                              that this is valid UTF-16.
+     * @returns S_OK or E_OUTOFMEMORY
+     */
+    HRESULT cleanupAndCopyFromEx(const OLECHAR *a_bstrSrc) RT_NOEXCEPT;
 
     /**