Changeset 21404 in vbox for trunk

Timestamp:

Jul 8, 2009 3:19:42 PM (16 years ago)

Author:

vboxsync

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

49780

Message:

IPRT, Main: make ministring throw std::bad_alloc on allocation failure; remove isEmpty() and isNull(), change Main code to using length() instead; second try

Location:

trunk

Files:

• include/iprt/ministring_cpp.h (modified) (5 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp (modified) (1 diff)
• src/VBox/Main/ApplianceImpl.cpp (modified) (1 diff)
• src/VBox/Main/ConsoleImpl.cpp (modified) (8 diffs)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (3 diffs)
• src/VBox/Main/DHCPServerRunner.cpp (modified) (1 diff)
• src/VBox/Main/MachineImpl.cpp (modified) (8 diffs)
• src/VBox/Main/SnapshotImpl.cpp (modified) (1 diff)
• src/VBox/Main/VirtualBoxImpl.cpp (modified) (4 diffs)
• src/VBox/Main/glue/string.cpp (modified) (2 diffs)
• src/VBox/Main/win/svchlp.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstUtf8.cpp (modified) (1 diff)

trunk/include/iprt/ministring_cpp.h

@@ -35 +35 @@
 #include <iprt/string.h>
 
+#include <new>
+
 /**
  *  "ministring" is a small C++ string class that does not depend on anything
@@ -125 +127 @@
         {
             m_psz = (char*)RTMemRealloc(m_psz, cb);
+#ifdef RT_EXCEPTIONS_ENABLED
+            if (!m_psz)
+                throw std::bad_alloc();
+#endif
             m_cbAllocated = cb;
         }
@@ -255 +261 @@
     {
         return length() == 0;
-    }
-
-    /**
-     * Returns true if no memory is currently allocated.
-     * @return
-     */
-    bool isNull() const
-    {
-        return m_psz == NULL;
     }
 
@@ -349 +346 @@
             m_cbAllocated = m_cbLength + 1;
             m_psz = (char*)RTMemAlloc(m_cbAllocated);
+#ifdef RT_EXCEPTIONS_ENABLED
+            if (!m_psz)
+                throw std::bad_alloc();
+#endif
             memcpy(m_psz, s.m_psz, m_cbAllocated);      // include 0 terminator
         }
@@ -374 +375 @@
             m_cbAllocated = m_cbLength + 1;
             m_psz = (char*)RTMemAlloc(m_cbAllocated);
+#ifdef RT_EXCEPTIONS_ENABLED
+            if (!m_psz)
+                throw std::bad_alloc();
+#endif
             memcpy(m_psz, pcsz, m_cbAllocated);      // include 0 terminator
         }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

@@ -167 +167 @@
     {
         HRESULT rc = S_OK;
-        Utf8Str utf8Name (name);
+        Utf8Str utf8Name(name);
         Guid uuid(machineId);
-        if (utf8Name.isNull())
-            rc = E_OUTOFMEMORY;
         if (   SUCCEEDED (rc)
             && uuid == mUuid

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1475 +1475 @@
 
             /* Audio */
-            if (!vsysThis.strSoundCardType.isNull())
+            if (!vsysThis.strSoundCardType.isEmpty())
                 /* Currently we set the AC97 always.
                    @todo: figure out the hardware which could be possible */

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1084 +1084 @@
     for (unsigned i = 0; i < 10 && (VERR_BUFFER_OVERFLOW == vrc); ++i)
     {
-        Utf8Buf.reserve(cchBuf + 1024);
-        if (Utf8Buf.isNull())
+        try
+        {
+            Utf8Buf.reserve(cchBuf + 1024);
+        }
+        catch(...)
+        {
             return E_OUTOFMEMORY;
+        }
         parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
         parm[1].u.pointer.addr = Utf8Buf.mutableRaw();
@@ -3871 +3876 @@
     using namespace guestProp;
 
-    VBOXHGCMSVCPARM parm[4];
-    Utf8Str Utf8Name = aName;
-    AssertReturn(!Utf8Name.isNull(), E_OUTOFMEMORY);
-    char pszBuffer[MAX_VALUE_LEN + MAX_FLAGS_LEN];
-
-    parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
-    parm[0].u.pointer.addr = (void*)Utf8Name.c_str();
-    /* The + 1 is the null terminator */
-    parm[0].u.pointer.size = (uint32_t)Utf8Name.length() + 1;
-    parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
-    parm[1].u.pointer.addr = pszBuffer;
-    parm[1].u.pointer.size = sizeof(pszBuffer);
-    int vrc = mVMMDev->hgcmHostCall ("VBoxGuestPropSvc", GET_PROP_HOST,
-                                     4, &parm[0]);
-    /* The returned string should never be able to be greater than our buffer */
-    AssertLogRel (vrc != VERR_BUFFER_OVERFLOW);
-    AssertLogRel (RT_FAILURE(vrc) || VBOX_HGCM_SVC_PARM_64BIT == parm[2].type);
-    if (RT_SUCCESS (vrc) || (VERR_NOT_FOUND == vrc))
-    {
-        rc = S_OK;
-        if (vrc != VERR_NOT_FOUND)
-        {
-            Utf8Str strBuffer(pszBuffer);
-            strBuffer.cloneTo(aValue);
-
-            *aTimestamp = parm[2].u.uint64;
-
-            size_t iFlags = strBuffer.length() + 1;
-            Utf8Str(pszBuffer + iFlags).cloneTo(aFlags);
+    try
+    {
+        VBOXHGCMSVCPARM parm[4];
+        Utf8Str Utf8Name = aName;
+        char pszBuffer[MAX_VALUE_LEN + MAX_FLAGS_LEN];
+
+        parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
+        parm[0].u.pointer.addr = (void*)Utf8Name.c_str();
+        /* The + 1 is the null terminator */
+        parm[0].u.pointer.size = (uint32_t)Utf8Name.length() + 1;
+        parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
+        parm[1].u.pointer.addr = pszBuffer;
+        parm[1].u.pointer.size = sizeof(pszBuffer);
+        int vrc = mVMMDev->hgcmHostCall ("VBoxGuestPropSvc", GET_PROP_HOST,
+                                        4, &parm[0]);
+        /* The returned string should never be able to be greater than our buffer */
+        AssertLogRel (vrc != VERR_BUFFER_OVERFLOW);
+        AssertLogRel (RT_FAILURE(vrc) || VBOX_HGCM_SVC_PARM_64BIT == parm[2].type);
+        if (RT_SUCCESS (vrc) || (VERR_NOT_FOUND == vrc))
+        {
+            rc = S_OK;
+            if (vrc != VERR_NOT_FOUND)
+            {
+                Utf8Str strBuffer(pszBuffer);
+                strBuffer.cloneTo(aValue);
+
+                *aTimestamp = parm[2].u.uint64;
+
+                size_t iFlags = strBuffer.length() + 1;
+                Utf8Str(pszBuffer + iFlags).cloneTo(aFlags);
+            }
+            else
+                aValue = NULL;
         }
         else
-            aValue = NULL;
-    }
-    else
-        rc = setError (E_UNEXPECTED,
-            tr ("The service call failed with the error %Rrc"), vrc);
+            rc = setError (E_UNEXPECTED,
+                tr ("The service call failed with the error %Rrc"), vrc);
+    }
+    catch(std::bad_alloc &e)
+    {
+        rc = E_OUTOFMEMORY;
+    }
     return rc;
 #endif /* else !defined (VBOX_WITH_GUEST_PROPS) */
@@ -4392 +4403 @@
 
     /* make sure the Logs folder exists */
-    Assert (!logDir.isEmpty());
+    Assert(logDir.length());
     if (!RTDirExists (logDir))
         RTDirCreateFullPath (logDir, 0777);
@@ -6191 +6202 @@
 
     /* append to the existing error message if any */
-    if (!task->mErrorMsg.isEmpty())
+    if (task->mErrorMsg.length())
         task->mErrorMsg = Utf8StrFmt ("%s.\n%N (%Rrc)", task->mErrorMsg.raw(),
                                       pszFormat, &va2, rc, rc);
@@ -6666 +6677 @@
 
                 /* Load saved state? */
-                if (!task->mSavedStateFile.isEmpty())
+                if (task->mSavedStateFile.length())
                 {
                     LogFlowFunc (("Restoring saved state from '%s'...\n",
@@ -6749 +6760 @@
              * this function is not updated.
              */
-            if (task->mErrorMsg.isNull())
+            if (!task->mErrorMsg.length())
             {
                 /* If the error message is not set but we've got a failure,
@@ -7095 +7106 @@
     AssertReturn (task.get(), VERR_INVALID_PARAMETER);
 
-    Assert (!task->mSavedStateFile.isNull());
-    Assert (!task->mProgress.isNull());
+    Assert(task->mSavedStateFile.length());
+    Assert(!task->mProgress.isNull());
 
     const ComObjPtr <Console> &that = task->mConsole;
@@ -7252 +7263 @@
     else
     {
-        if (!errMsg.isNull())
-            task->mProgress->notifyComplete (rc,
-                COM_IIDOF(IConsole), Console::getComponentName(), errMsg);
+        if (errMsg.length())
+            task->mProgress->notifyComplete(rc,
+                                            COM_IIDOF(IConsole),
+                                            Console::getComponentName(),
+                                            errMsg);
         else
             task->mProgress->notifyComplete (rc);

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1801 +1801 @@
      * Guest property service
      */
+    try
     {
         /* Load the service */
@@ -1844 +1845 @@
                 timestamps.push_back(timestampsOut[i]);
                 utf8Flags.push_back(Bstr(flagsOut[i]));
-#if 0 /** @todo r=bird: Who is gonna catch this? Why does it trigger now? */
-                if (   utf8Names.back().isNull()
-                    || utf8Values.back().isNull()
-                    || utf8Flags.back().isNull()
-                   )
-                    throw std::bad_alloc();
-#endif
             }
             for (unsigned i = 0; i < cProps && RT_SUCCESS(rc); ++i)
@@ -1889 +1883 @@
             Log(("Set VBoxGuestPropSvc property store\n"));
         }
+    }
+    catch(std::bad_alloc &e)
+    {
+        return VERR_NO_MEMORY;
     }
 #endif /* VBOX_WITH_GUEST_PROPS defined */

trunk/src/VBox/Main/DHCPServerRunner.cpp

@@ -97 +97 @@
     for (unsigned i = 0; i < DHCPCFG_NOTOPT_MAXVAL; i++)
     {
-        if (!mOptions[i].isNull())
+        if (mOptions[i].length())
         {
             const ARGDEF * pArgDef = getArgDef((DHCPCFG)i);
-            args[index++] = pArgDef->Name;
-            if (!mOptions[i].isEmpty())
-            {
-                args[index++] = mOptions[i].raw();
-            }
+            args[index++] = pArgDef->Name;      // e.g. "--network"
+            args[index++] = mOptions[i].raw();  // value
         }
     }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2780 +2780 @@
         Utf8Str logFolder;
         getLogFolder (logFolder);
-        Assert (!logFolder.isEmpty());
-        if (RTDirExists (logFolder))
+        Assert(logFolder.length());
+        if (RTDirExists(logFolder))
         {
             /* Delete all VBox.log[.N] files from the Logs folder
@@ -2805 +2805 @@
          * there (we don't check for errors because the user might have
          * some private files there that we don't want to delete) */
-        Utf8Str snapshotFolder = mUserData->mSnapshotFolderFull;
-        Assert (!snapshotFolder.isEmpty());
-        if (RTDirExists (snapshotFolder))
-            RTDirRemove (snapshotFolder);
+        Utf8Str snapshotFolder(mUserData->mSnapshotFolderFull);
+        Assert(snapshotFolder.length());
+        if (RTDirExists(snapshotFolder))
+            RTDirRemove(snapshotFolder);
 
         /* delete the directory that contains the settings file, but only
@@ -3056 +3056 @@
 }
 
-STDMETHODIMP Machine::SetGuestProperty (IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags)
+STDMETHODIMP Machine::SetGuestProperty(IN_BSTR aName,
+                                       IN_BSTR aValue,
+                                       IN_BSTR aFlags)
 {
 #if !defined (VBOX_WITH_GUEST_PROPS)
@@ -3068 +3070 @@
         return E_INVALIDARG;
 
-    Utf8Str utf8Name (aName);
-    Utf8Str utf8Flags (aFlags);
-    Utf8Str utf8Patterns (mHWData->mGuestPropertyNotificationPatterns);
-    if (   utf8Name.isNull()
-        || ((aFlags != NULL) && utf8Flags.isNull())
-        || utf8Patterns.isNull()
-       )
-        return E_OUTOFMEMORY;
-    bool matchAll = false;
-    if (0 == utf8Patterns.length())
-        matchAll = true;
-
-    uint32_t fFlags = NILFLAG;
-    if ((aFlags != NULL) && RT_FAILURE (validateFlags (utf8Flags.raw(), &fFlags))
-       )
-        return setError (E_INVALIDARG, tr ("Invalid flag values: '%ls'"),
-                aFlags);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
-    HRESULT rc = checkStateDependency (MutableStateDep);
-    CheckComRCReturnRC (rc);
-
-    rc = S_OK;
-
-    if (!mHWData->mPropertyServiceActive)
-    {
-        bool found = false;
-        HWData::GuestProperty property;
-        property.mFlags = NILFLAG;
-        if (fFlags & TRANSIENT)
-            rc = setError (VBOX_E_INVALID_OBJECT_STATE,
-                tr ("Cannot set a transient property when the "
-                    "machine is not running"));
-        if (SUCCEEDED (rc))
-        {
-            for (HWData::GuestPropertyList::iterator it =
-                    mHWData->mGuestProperties.begin();
-                 it != mHWData->mGuestProperties.end(); ++ it)
-                if (it->mName == aName)
+    HRESULT rc = S_OK;
+
+    try
+    {
+        Utf8Str utf8Name(aName);
+        Utf8Str utf8Flags(aFlags);
+        Utf8Str utf8Patterns(mHWData->mGuestPropertyNotificationPatterns);
+
+        bool matchAll = false;
+        if (utf8Patterns.isEmpty())
+            matchAll = true;
+
+        uint32_t fFlags = NILFLAG;
+        if (    (aFlags != NULL)
+             && RT_FAILURE (validateFlags (utf8Flags.raw(), &fFlags))
+           )
+            return setError(E_INVALIDARG,
+                            tr("Invalid flag values: '%ls'"),
+                            aFlags);
+
+        AutoCaller autoCaller(this);
+        CheckComRCReturnRC(autoCaller.rc());
+
+        AutoWriteLock alock(this);
+
+        rc = checkStateDependency(MutableStateDep);
+        CheckComRCReturnRC (rc);
+
+        rc = S_OK;
+
+        if (!mHWData->mPropertyServiceActive)
+        {
+            bool found = false;
+            HWData::GuestProperty property;
+            property.mFlags = NILFLAG;
+            if (fFlags & TRANSIENT)
+                rc = setError(VBOX_E_INVALID_OBJECT_STATE,
+                              tr("Cannot set a transient property when the machine is not running"));
+
+            if (SUCCEEDED (rc))
+            {
+                for (HWData::GuestPropertyList::iterator it =
+                        mHWData->mGuestProperties.begin();
+                    it != mHWData->mGuestProperties.end(); ++ it)
+                    if (it->mName == aName)
+                    {
+                        property = *it;
+                        if (it->mFlags & (RDONLYHOST))
+                            rc = setError (E_ACCESSDENIED,
+                                tr ("The property '%ls' cannot be changed by the host"),
+                                aName);
+                        else
+                        {
+                            mHWData.backup();
+                            /* The backup() operation invalidates our iterator, so
+                            * get a new one. */
+                            for (it = mHWData->mGuestProperties.begin();
+                                it->mName != aName; ++ it)
+                                ;
+                            mHWData->mGuestProperties.erase (it);
+                        }
+                        found = true;
+                        break;
+                    }
+            }
+            if (found && SUCCEEDED (rc))
+            {
+                if (*aValue)
                 {
-                    property = *it;
-                    if (it->mFlags & (RDONLYHOST))
-                        rc = setError (E_ACCESSDENIED,
-                            tr ("The property '%ls' cannot be changed by the host"),
-                            aName);
-                    else
-                    {
-                        mHWData.backup();
-                        /* The backup() operation invalidates our iterator, so
-                         * get a new one. */
-                        for (it = mHWData->mGuestProperties.begin();
-                            it->mName != aName; ++ it)
-                            ;
-                        mHWData->mGuestProperties.erase (it);
-                    }
-                    found = true;
-                    break;
+                    RTTIMESPEC time;
+                    property.mValue = aValue;
+                    property.mTimestamp = RTTimeSpecGetNano (RTTimeNow (&time));
+                    if (aFlags != NULL)
+                        property.mFlags = fFlags;
+                    mHWData->mGuestProperties.push_back (property);
                 }
-        }
-        if (found && SUCCEEDED (rc))
-        {
-            if (*aValue)
+            }
+            else if (SUCCEEDED (rc) && *aValue)
             {
                 RTTIMESPEC time;
+                mHWData.backup();
+                property.mName = aName;
                 property.mValue = aValue;
                 property.mTimestamp = RTTimeSpecGetNano (RTTimeNow (&time));
-                if (aFlags != NULL)
-                    property.mFlags = fFlags;
+                property.mFlags = fFlags;
                 mHWData->mGuestProperties.push_back (property);
             }
-        }
-        else if (SUCCEEDED (rc) && *aValue)
-        {
-            RTTIMESPEC time;
-            mHWData.backup();
-            property.mName = aName;
-            property.mValue = aValue;
-            property.mTimestamp = RTTimeSpecGetNano (RTTimeNow (&time));
-            property.mFlags = fFlags;
-            mHWData->mGuestProperties.push_back (property);
-        }
-        if (   SUCCEEDED (rc)
-            && (   matchAll
-                || RTStrSimplePatternMultiMatch (utf8Patterns.raw(), RTSTR_MAX,
-                                                utf8Name.raw(), RTSTR_MAX, NULL)
-              )
-          )
-            mParent->onGuestPropertyChange (mData->mUuid, aName, aValue, aFlags);
-    }
-    else
-    {
-        ComPtr <IInternalSessionControl> directControl =
-            mData->mSession.mDirectControl;
-
-        /* just be on the safe side when calling another process */
-        alock.leave();
-
-        BSTR dummy = NULL;
-        ULONG64 dummy64;
-        if (!directControl)
-            rc = E_FAIL;
+            if (   SUCCEEDED (rc)
+                && (   matchAll
+                    || RTStrSimplePatternMultiMatch (utf8Patterns.raw(), RTSTR_MAX,
+                                                    utf8Name.raw(), RTSTR_MAX, NULL)
+                )
+            )
+                mParent->onGuestPropertyChange (mData->mUuid, aName, aValue, aFlags);
+        }
         else
-            rc = directControl->AccessGuestProperty (aName, aValue, aFlags,
-                                                     true /* isSetter */,
-                                                     &dummy, &dummy64, &dummy);
-    }
+        {
+            ComPtr <IInternalSessionControl> directControl =
+                mData->mSession.mDirectControl;
+
+            /* just be on the safe side when calling another process */
+            alock.leave();
+
+            BSTR dummy = NULL;
+            ULONG64 dummy64;
+            if (!directControl)
+                rc = E_FAIL;
+            else
+                rc = directControl->AccessGuestProperty(aName, aValue, aFlags,
+                                                        true /* isSetter */,
+                                                        &dummy, &dummy64, &dummy);
+        }
+    }
+    catch (std::bad_alloc &e)
+    {
+        rc = E_OUTOFMEMORY;
+    }
+
     return rc;
 #endif /* else !defined (VBOX_WITH_GUEST_PROPS) */
@@ -5401 +5411 @@
 #ifdef VBOX_WITH_GUEST_PROPS
     /* Guest properties (optional) */
+    try
     {
         using namespace guestProp;
@@ -5422 +5433 @@
                 /* property flags (optional, defaults to empty) */
                 Bstr flags = (*it).stringValue ("flags");
-                Utf8Str utf8Flags (flags);
-                if (utf8Flags.isNull ())
-                    return E_OUTOFMEMORY;
+                Utf8Str utf8Flags(flags);
                 validateFlags (utf8Flags.raw(), &fFlags);
                 HWData::GuestProperty property = { name, value, timestamp, fFlags };
@@ -5442 +5451 @@
         if (mHWData->mGuestPropertyNotificationPatterns.isNull ())
             return E_OUTOFMEMORY;
+    }
+    catch(std::bad_alloc &e)
+    {
+        return E_OUTOFMEMORY;
     }
 #endif /* VBOX_WITH_GUEST_PROPS defined */
@@ -9616 +9629 @@
         return E_POINTER;  /* aValue can be NULL to indicate deletion */
 
-    Utf8Str utf8Name (aName);
-    Utf8Str utf8Flags (aFlags);
-    Utf8Str utf8Patterns (mHWData->mGuestPropertyNotificationPatterns);
-    if (   utf8Name.isNull()
-        || ((aFlags != NULL) && utf8Flags.isNull())
-        || utf8Patterns.isNull()
-       )
+    try
+    {
+        Utf8Str utf8Name(aName);
+        Utf8Str utf8Flags(aFlags);
+        Utf8Str utf8Patterns(mHWData->mGuestPropertyNotificationPatterns);
+
+        uint32_t fFlags = NILFLAG;
+        if ((aFlags != NULL) && RT_FAILURE (validateFlags (utf8Flags.raw(), &fFlags)))
+            return E_INVALIDARG;
+
+        bool matchAll = false;
+        if (utf8Patterns.isEmpty())
+            matchAll = true;
+
+        AutoCaller autoCaller (this);
+        CheckComRCReturnRC (autoCaller.rc());
+
+        AutoWriteLock alock (this);
+
+        HRESULT rc = checkStateDependency (MutableStateDep);
+        CheckComRCReturnRC (rc);
+
+        mHWData.backup();
+        for (HWData::GuestPropertyList::iterator iter = mHWData->mGuestProperties.begin();
+            iter != mHWData->mGuestProperties.end(); ++iter)
+            if (aName == iter->mName)
+            {
+                mHWData->mGuestProperties.erase (iter);
+                break;
+            }
+        if (aValue != NULL)
+        {
+            HWData::GuestProperty property = { aName, aValue, aTimestamp, fFlags };
+            mHWData->mGuestProperties.push_back (property);
+        }
+
+        /* send a callback notification if appropriate */
+        alock.leave();
+        if (   matchAll
+            || RTStrSimplePatternMultiMatch (utf8Patterns.raw(), RTSTR_MAX,
+                                            utf8Name.raw(), RTSTR_MAX, NULL)
+        )
+            mParent->onGuestPropertyChange (mData->mUuid, aName, aValue, aFlags);
+    }
+    catch(std::bad_alloc &e)
+    {
         return E_OUTOFMEMORY;
-
-    uint32_t fFlags = NILFLAG;
-    if ((aFlags != NULL) && RT_FAILURE (validateFlags (utf8Flags.raw(), &fFlags)))
-        return E_INVALIDARG;
-
-    bool matchAll = false;
-    if (utf8Patterns.length() == 0)
-        matchAll = true;
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoWriteLock alock (this);
-
-    HRESULT rc = checkStateDependency (MutableStateDep);
-    CheckComRCReturnRC (rc);
-
-    mHWData.backup();
-    for (HWData::GuestPropertyList::iterator iter = mHWData->mGuestProperties.begin();
-         iter != mHWData->mGuestProperties.end(); ++iter)
-        if (aName == iter->mName)
-        {
-            mHWData->mGuestProperties.erase (iter);
-            break;
-        }
-    if (aValue != NULL)
-    {
-        HWData::GuestProperty property = { aName, aValue, aTimestamp, fFlags };
-        mHWData->mGuestProperties.push_back (property);
-    }
-
-    /* send a callback notification if appropriate */
-    alock.leave();
-    if (   matchAll
-        || RTStrSimplePatternMultiMatch (utf8Patterns.raw(), RTSTR_MAX,
-                                         utf8Name.raw(), RTSTR_MAX, NULL)
-       )
-        mParent->onGuestPropertyChange (mData->mUuid, aName, aValue, aFlags);
-
+    }
     return S_OK;
 #else

trunk/src/VBox/Main/SnapshotImpl.cpp

@@ -412 +412 @@
 
     /* state file may be NULL (for offline snapshots) */
-    if (    !path.isEmpty()
+    if (    path.length()
          && RTPathStartsWith(path, aOldPath)
        )

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3481 +3481 @@
     AutoReadLock hardDiskLock (aHardDisk);
 
-    Utf8Str conflict;
-    HRESULT rc = checkMediaForConflicts2 (aHardDisk->id(),
-                                          aHardDisk->locationFull(),
-                                          conflict);
+    Utf8Str strConflict;
+    HRESULT rc = checkMediaForConflicts2(aHardDisk->id(),
+                                         aHardDisk->locationFull(),
+                                         strConflict);
     CheckComRCReturnRC (rc);
 
-    if (!conflict.isNull())
-    {
-        return setError (E_INVALIDARG,
-            tr ("Cannot register the hard disk '%ls' with UUID {%RTuuid} "
-                "because a %s already exists in the media registry ('%ls')"),
-            aHardDisk->locationFull().raw(), aHardDisk->id().raw(),
-            conflict.raw(), mData.mCfgFile.mName.raw());
+    if (strConflict.length())
+    {
+        return setError(E_INVALIDARG,
+                        tr("Cannot register the hard disk '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%ls')"),
+                        aHardDisk->locationFull().raw(),
+                        aHardDisk->id().raw(),
+                        strConflict.raw(),
+                        mData.mCfgFile.mName.raw());
     }
 
@@ -3598 +3599 @@
     AutoReadLock imageLock (aImage);
 
-    Utf8Str conflict;
-    HRESULT rc = checkMediaForConflicts2 (aImage->id(), aImage->locationFull(),
-                                          conflict);
+    Utf8Str strConflict;
+    HRESULT rc = checkMediaForConflicts2(aImage->id(),
+                                         aImage->locationFull(),
+                                         strConflict);
     CheckComRCReturnRC (rc);
 
-    if (!conflict.isNull())
-    {
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("Cannot register the CD/DVD image '%ls' with UUID {%RTuuid} "
-                "because a %s already exists in the media registry ('%ls')"),
-            aImage->locationFull().raw(), aImage->id().raw(),
-            conflict.raw(), mData.mCfgFile.mName.raw());
+    if (strConflict.length())
+    {
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("Cannot register the CD/DVD image '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%ls')"),
+                        aImage->locationFull().raw(),
+                        aImage->id().raw(),
+                        strConflict.raw(),
+                        mData.mCfgFile.mName.raw());
     }
 
@@ -3699 +3702 @@
     AutoReadLock imageLock (aImage);
 
-    Utf8Str conflict;
-    HRESULT rc = checkMediaForConflicts2 (aImage->id(), aImage->locationFull(),
-                                          conflict);
+    Utf8Str strConflict;
+    HRESULT rc = checkMediaForConflicts2(aImage->id(),
+                                         aImage->locationFull(),
+                                         strConflict);
     CheckComRCReturnRC (rc);
 
-    if (!conflict.isNull())
-    {
-        return setError (VBOX_E_INVALID_OBJECT_STATE,
-            tr ("Cannot register the floppy image '%ls' with UUID {%RTuuid} "
-                "because a %s already exists in the media registry ('%ls')"),
-            aImage->locationFull().raw(), aImage->id().raw(),
-            conflict.raw(), mData.mCfgFile.mName.raw());
+    if (strConflict.length())
+    {
+        return setError(VBOX_E_INVALID_OBJECT_STATE,
+                        tr("Cannot register the floppy image '%ls' with UUID {%RTuuid} because a %s already exists in the media registry ('%ls')"),
+                        aImage->locationFull().raw(),
+                        aImage->id().raw(),
+                        strConflict.raw(),
+                        mData.mCfgFile.mName.raw());
     }
 
@@ -3937 +3942 @@
         {
             *aFormatVersion = aTree.oldVersion();
-            if (aFormatVersion->isNull())
+            if (!aFormatVersion->length())
                 *aFormatVersion = VBOX_XML_VERSION_FULL;
         }

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

@@ -139 +139 @@
 Utf8Str& Utf8Str::toLower()
 {
-    if (!isEmpty())
+    if (length())
         ::RTStrToLower(m_psz);
     return *this;
@@ -146 +146 @@
 Utf8Str& Utf8Str::toUpper()
 {
-    if (!isEmpty())
+    if (length())
         ::RTStrToUpper(m_psz);
     return *this;

trunk/src/VBox/Main/win/svchlp.cpp

@@ -179 +179 @@
 
     /* write -1 for NULL strings */
-    if (aVal.isNull())
+    if (aVal.isEmpty())
         return write ((size_t) ~0);
 

trunk/src/VBox/Runtime/testcase/tstUtf8.cpp

@@ -987 +987 @@
 
     copy1 = NULL;
-    CHECK( (copy1.isNull()) );
+    CHECK( (copy1.length() == 0) );
 
     copy1 = "";
-    CHECK( (copy1.isEmpty()) );
+    CHECK( (copy1.length() == 0) );
 
     CHECK( (ministring("abc") < ministring("def")) );