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

Timestamp:

Sep 16, 2019 8:30:40 PM (5 years ago)

Author:

vboxsync

Message:

Main/glue: Added bstr testcase and fixed printf bugs. Introduced jolt, joltNoThrow, reserve and reserveNoThrow for the low level allocation operations needed by printf.

File:

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

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

@@ -112 +112 @@
                 if (cwcAlloc <= cwcBoth)
                     cwcAlloc = RT_ALIGN_Z(cwcBoth + 1, 512);
-                if (pArgs->cwcAlloc)
-                    AssertMsgReturnStmt(::SysReAllocStringLen(&pThis->m_bstr, NULL, (unsigned)cwcAlloc),
-                                        ("cwcAlloc=%#zx\n", cwcAlloc), pArgs->hrc = E_OUTOFMEMORY, 0);
-                else
-                {
-                    Assert(pThis->m_bstr == NULL);
-                    pThis->m_bstr = ::SysAllocStringLen(NULL, (unsigned)cwcAlloc);
-                    AssertMsgReturnStmt(pThis->m_bstr, ("cwcAlloc=%#zx\n", cwcAlloc), pArgs->hrc = E_OUTOFMEMORY, 0);
-                }
+                pArgs->hrc = pThis->reserveNoThrow(cwcAlloc, true /*fForce*/);
+                AssertMsgReturn(pArgs->hrc == S_OK, ("cwcAlloc=%#zx\n", cwcAlloc), 0);
                 pArgs->cwcAlloc = cwcAlloc;
             }
@@ -134 +127 @@
         rc = ::RTStrToUtf16Ex(pachChars, cbChars, &pwszDst, pArgs->cwcAlloc - pArgs->offDst, &cwcAppend);
         AssertRCReturnStmt(rc, pArgs->hrc = E_UNEXPECTED, 0);
+        pArgs->offDst += cwcAppend;
     }
     return cbChars;
@@ -142 +136 @@
     cleanup();
     BSTRNOTHROW Args = { this, 0, 0, S_OK };
-    RTStrFormatV(printfOutputCallbackNoThrow, this, NULL, NULL, pszFormat, va);
+    RTStrFormatV(printfOutputCallbackNoThrow, &Args, NULL, NULL, pszFormat, va);
     if (Args.hrc == S_OK)
     {
-#ifdef RT_OS_WINDOWS
-        if (Args.offDst + 1 == Args.cwcAlloc)
+        Args.hrc = joltNoThrow(Args.offDst);
+        if (Args.hrc == S_OK)
             return S_OK;
-
-        /* Official way: Reallocate the string.   We could of course just update the size-prefix if we dare... */
-        if (SysReAllocStringLen(&m_bstr, NULL, (unsigned)(Args.offDst + 1)))
-            return S_OK;
-        AssertMsgFailed(("offDst=%#zx\n", Args.offDst));
-        Args.hrc = E_OUTOFMEMORY;
-#else
-        return S_OK;
-#endif
     }
     cleanup();
@@ -244 +229 @@
 
 
+#ifndef VBOX_WITH_XPCOM
+
+HRESULT Bstr::joltNoThrow(ssize_t cwcNew /* = -1*/)
+{
+    if (m_bstr)
+    {
+        size_t const cwcAlloc  = ::SysStringLen(m_bstr);
+        size_t const cwcActual = cwcNew < 0 ? ::RTUtf16Len(m_bstr) : (size_t)cwcNew;
+        Assert(cwcNew < 0 || cwcActual == ::RTUtf16Len(m_bstr));
+        if (cwcActual != cwcAlloc)
+        {
+            Assert(cwcActual <= cwcAlloc);
+            Assert((unsigned int)cwcActual == cwcActual);
+
+            /* Official way: Reallocate the string.   We could of course just update the size-prefix if we dared... */
+            if (!::SysReAllocStringLen(&m_bstr, NULL, (unsigned int)cwcActual))
+            {
+                AssertFailed();
+                return E_OUTOFMEMORY;
+            }
+        }
+    }
+    else
+        Assert(cwcNew <= 0);
+    return S_OK;
+}
+
+
+void Bstr::jolt(ssize_t cwcNew /* = -1*/)
+{
+    HRESULT hrc = joltNoThrow(cwcNew);
+    if (hrc != S_OK)
+        throw std::bad_alloc();
+}
+
+#endif /* !VBOX_WITH_XPCOM */
+
+
+HRESULT Bstr::reserveNoThrow(size_t cwcMin, bool fForce /*= false*/) RT_NOEXCEPT
+{
+    /* If not forcing the string to the cwcMin length, check cwcMin against the
+       current string length: */
+    if (!fForce)
+    {
+        size_t cwcCur = m_bstr ? ::SysStringLen(m_bstr) : 0;
+        if (cwcCur >= cwcMin)
+            return S_OK;
+    }
+
+    /* The documentation for SysReAllocStringLen hints about it being allergic
+       to NULL in some way or another, so we call SysAllocStringLen directly
+       when appropriate: */
+    if (m_bstr)
+        AssertReturn(::SysReAllocStringLen(&m_bstr, NULL, (unsigned int)cwcMin) != FALSE, E_OUTOFMEMORY);
+    else if (cwcMin > 0)
+    {
+        m_bstr = ::SysAllocStringLen(NULL, (unsigned int)cwcMin);
+        AssertReturn(m_bstr, E_OUTOFMEMORY);
+    }
+
+    return S_OK;
+}
+
+
+void Bstr::reserve(size_t cwcMin, bool fForce /*= false*/)
+{
+    HRESULT hrc = reserveNoThrow(cwcMin, fForce);
+    if (hrc != S_OK)
+        throw std::bad_alloc();
+}
+
+
 /* static */
 const Utf8Str Utf8Str::Empty; /* default ctor is OK */