Changeset 21394 in vbox for trunk/src

Timestamp:

Jul 8, 2009 1:06:27 PM (16 years ago)

Author:

vboxsync

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

49764

Message:

Backing out r49763 to fix Windows burns.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (2 diffs)
• Frontends/VBoxManage/VBoxManageGuestProp.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageImport.cpp (modified) (2 diffs)
• Frontends/VBoxSDL/Framebuffer.cpp (modified) (1 diff)
• Main/ApplianceImpl.cpp (modified) (20 diffs)
• Main/ConsoleImpl.cpp (modified) (8 diffs)
• Main/ConsoleImpl2.cpp (modified) (3 diffs)
• Main/DHCPServerRunner.cpp (modified) (1 diff)
• Main/HardDiskImpl.cpp (modified) (2 diffs)
• Main/MachineImpl.cpp (modified) (9 diffs)
• Main/SnapshotImpl.cpp (modified) (1 diff)
• Main/VFSExplorerImpl.cpp (modified) (1 diff)
• Main/VirtualBoxImpl.cpp (modified) (4 diffs)
• Main/glue/string.cpp (modified) (2 diffs)
• Main/include/HostHardwareLinux.h (modified) (2 diffs)
• Runtime/testcase/tstUtf8.cpp (modified) (1 diff)

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

@@ -750 +750 @@
     }
 
-    if (!rawdisk.length())
+    if (rawdisk.isEmpty())
         return errorSyntax(USAGE_LISTPARTITIONS, "Mandatory parameter -rawdisk missing");
 
@@ -865 +865 @@
     if (filename.isEmpty())
         return errorSyntax(USAGE_CREATERAWVMDK, "Mandatory parameter -filename missing");
-    if (!rawdisk.length())
+    if (rawdisk.isEmpty())
         return errorSyntax(USAGE_CREATERAWVMDK, "Mandatory parameter -rawdisk missing");
     if (!pszPartitions && pszMBRFilename)

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/Frontends/VBoxManage/VBoxManageImport.cpp

@@ -202 +202 @@
 
             case VINF_GETOPT_NOT_OPTION:
-                if (!strOvfFilename.length())
+                if (strOvfFilename.isEmpty())
                     strOvfFilename = ValueUnion.psz;
                 else
@@ -225 +225 @@
     }
 
-    if (!strOvfFilename.length())
+    if (strOvfFilename.isEmpty())
         return errorSyntax(USAGE_IMPORTAPPLIANCE, "Not enough arguments for \"import\" command.");
 

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -1178 +1178 @@
     /* now the text */
     if (    mLabelFont != NULL
-         && mSecureLabelText.length()
+         && !mSecureLabelText.isEmpty()
        )
     {

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1370 +1370 @@
             /* If the there isn't any name specified create a default one out of
              * the OS type */
-            Utf8Str nameVBox(vsysThis.strName);
-            if (!nameVBox.length())
+            Utf8Str nameVBox = vsysThis.strName;
+            if (nameVBox.isEmpty())
                 nameVBox = strOsTypeVBox;
             searchUniqueVMName(nameVBox);
@@ -1380 +1380 @@
 
             /* VM Product */
-            if (vsysThis.strProduct.length())
+            if (!vsysThis.strProduct.isEmpty())
                 pNewDesc->addEntry(VirtualSystemDescriptionType_Product,
                                     "",
@@ -1387 +1387 @@
 
             /* VM Vendor */
-            if (vsysThis.strVendor.length())
+            if (!vsysThis.strVendor.isEmpty())
                 pNewDesc->addEntry(VirtualSystemDescriptionType_Vendor,
                                     "",
@@ -1394 +1394 @@
 
             /* VM Version */
-            if (vsysThis.strVersion.length())
+            if (!vsysThis.strVersion.isEmpty())
                 pNewDesc->addEntry(VirtualSystemDescriptionType_Version,
                                     "",
@@ -1401 +1401 @@
 
             /* VM ProductUrl */
-            if (vsysThis.strProductUrl.length())
+            if (!vsysThis.strProductUrl.isEmpty())
                 pNewDesc->addEntry(VirtualSystemDescriptionType_ProductUrl,
                                     "",
@@ -1408 +1408 @@
 
             /* VM VendorUrl */
-            if (vsysThis.strVendorUrl.length())
+            if (!vsysThis.strVendorUrl.isEmpty())
                 pNewDesc->addEntry(VirtualSystemDescriptionType_VendorUrl,
                                     "",
@@ -1415 +1415 @@
 
             /* VM description */
-            if (vsysThis.strDescription.length())
+            if (!vsysThis.strDescription.isEmpty())
                 pNewDesc->addEntry(VirtualSystemDescriptionType_Description,
                                     "",
@@ -1422 +1422 @@
 
             /* VM license */
-            if (vsysThis.strLicenseText.length())
+            if (!vsysThis.strLicenseText.isEmpty())
                 pNewDesc->addEntry(VirtualSystemDescriptionType_License,
                                     "",
@@ -1475 +1475 @@
 
             /* Audio */
-            if (vsysThis.strSoundCardType.length())
+            if (!vsysThis.strSoundCardType.isNull())
                 /* Currently we set the AC97 always.
                    @todo: figure out the hardware which could be possible */
@@ -2285 +2285 @@
                         ComPtr<IHardDisk> dstHdVBox;
                         /* If strHref is empty we have to create a new file */
-                        if (!di.strHref.length())
+                        if (di.strHref.isEmpty())
                         {
                             /* Which format to use? */
@@ -2928 +2928 @@
             std::list<VirtualSystemDescriptionEntry*> llVendorUrl = vsdescThis->findByType(VirtualSystemDescriptionType_VendorUrl);
             std::list<VirtualSystemDescriptionEntry*> llVersion = vsdescThis->findByType(VirtualSystemDescriptionType_Version);
-            bool fProduct = llProduct.size() && (llProduct.front()->strVbox.length() > 0);
-            bool fProductUrl = llProductUrl.size() && (llProductUrl.front()->strVbox.length() > 0);
-            bool fVendor = llVendor.size() && (llVendor.front()->strVbox.length() > 0);
-            bool fVendorUrl = llVendorUrl.size() && (llVendorUrl.front()->strVbox.length() > 0);
-            bool fVersion = llVersion.size() && (llVersion.front()->strVbox.length() > 0);
+            bool fProduct = llProduct.size() && !llProduct.front()->strVbox.isEmpty();
+            bool fProductUrl = llProductUrl.size() && !llProductUrl.front()->strVbox.isEmpty();
+            bool fVendor = llVendor.size() && !llVendor.front()->strVbox.isEmpty();
+            bool fVendorUrl = llVendorUrl.size() && !llVendorUrl.front()->strVbox.isEmpty();
+            bool fVersion = llVersion.size() && !llVersion.front()->strVbox.isEmpty();
             if (fProduct ||
                 fProductUrl ||
@@ -2972 +2972 @@
             // description
             std::list<VirtualSystemDescriptionEntry*> llDescription = vsdescThis->findByType(VirtualSystemDescriptionType_Description);
-            if (    llDescription.size()
-                 && (llDescription.front()->strVbox.length() > 0)
-               )
+            if (llDescription.size() &&
+                !llDescription.front()->strVbox.isEmpty())
             {
                 /*  <Section ovf:required="false" xsi:type="ovf:AnnotationSection_Type">
@@ -2996 +2995 @@
             // license
             std::list<VirtualSystemDescriptionEntry*> llLicense = vsdescThis->findByType(VirtualSystemDescriptionType_License);
-            if (    llLicense.size()
-                 && (llLicense.front()->strVbox.length() > 0)
-               )
+            if (llLicense.size() &&
+                !llLicense.front()->strVbox.isEmpty())
             {
                 /* <EulaSection>
@@ -3217 +3215 @@
                                 lBusNumber = 0;
 
-                                if (    !desc.strVbox.length()      // AHCI is the default in VirtualBox
+                                if (    desc.strVbox.isEmpty()      // AHCI is the default in VirtualBox
                                      || (!desc.strVbox.compare("ahci", Utf8Str::CaseInsensitive))
                                    )
@@ -3252 +3250 @@
                                 lBusNumber = 0;
 
-                                if (    !desc.strVbox.length()      // LsiLogic is the default in VirtualBox
+                                if (    desc.strVbox.isEmpty()      // LsiLogic is the default in VirtualBox
                                      || (!desc.strVbox.compare("lsilogic", Utf8Str::CaseInsensitive))
                                    )
@@ -3428 +3426 @@
                         // exactly this order, as stupid as it seems.
 
-                        if (strCaption.length())
+                        if (!strCaption.isEmpty())
                         {
                             pItem->createChild("rasd:Caption")->addContent(strCaption);
@@ -3435 +3433 @@
                         }
 
-                        if (strDescription.length())
+                        if (!strDescription.isEmpty())
                             pItem->createChild("rasd:Description")->addContent(strDescription);
 
@@ -3448 +3446 @@
                         // <rasd:ResourceType>3</rasd:ResourceType>
                         pItem->createChild("rasd:ResourceType")->addContent(Utf8StrFmt("%d", type));
-                        if (strResourceSubType.length())
+                        if (!strResourceSubType.isEmpty())
                             pItem->createChild("rasd:ResourceSubType")->addContent(strResourceSubType);
 
-                        if (strHostResource.length())
+                        if (!strHostResource.isEmpty())
                             pItem->createChild("rasd:HostResource")->addContent(strHostResource);
 
-                        if (strAllocationUnits.length())
+                        if (!strAllocationUnits.isEmpty())
                             pItem->createChild("rasd:AllocationUnits")->addContent(strAllocationUnits);
 
@@ -3464 +3462 @@
                             pItem->createChild("rasd:AutomaticAllocation")->addContent( (lAutomaticAllocation) ? "true" : "false" );
 
-                        if (strConnection.length())
+                        if (!strConnection.isEmpty())
                             pItem->createChild("rasd:Connection")->addContent(strConnection);
 
@@ -3651 +3649 @@
     }
     /* If there is no bucket name provided reject the upload */
-    if (!bucket.length())
+    if (bucket.isEmpty())
         return setError(E_INVALIDARG,
                         tr("You doesn't provide a bucket name in the URI"), tmpPath.c_str());

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1084 +1084 @@
     for (unsigned i = 0; i < 10 && (VERR_BUFFER_OVERFLOW == vrc); ++i)
     {
-        try
-        {
-            Utf8Buf.reserve(cchBuf + 1024);
-        }
-        catch(...)
-        {
+        Utf8Buf.reserve(cchBuf + 1024);
+        if (Utf8Buf.isNull())
             return E_OUTOFMEMORY;
-        }
         parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
         parm[1].u.pointer.addr = Utf8Buf.mutableRaw();
@@ -3876 +3871 @@
     using namespace guestProp;
 
-    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;
+    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);
         }
         else
-            rc = setError (E_UNEXPECTED,
-                tr ("The service call failed with the error %Rrc"), vrc);
-    }
-    catch(std::bad_alloc &e)
-    {
-        rc = E_OUTOFMEMORY;
-    }
+            aValue = NULL;
+    }
+    else
+        rc = setError (E_UNEXPECTED,
+            tr ("The service call failed with the error %Rrc"), vrc);
     return rc;
 #endif /* else !defined (VBOX_WITH_GUEST_PROPS) */
@@ -4403 +4392 @@
 
     /* make sure the Logs folder exists */
-    Assert(logDir.length());
+    Assert (!logDir.isEmpty());
     if (!RTDirExists (logDir))
         RTDirCreateFullPath (logDir, 0777);
@@ -6202 +6191 @@
 
     /* append to the existing error message if any */
-    if (task->mErrorMsg.length())
+    if (!task->mErrorMsg.isEmpty())
         task->mErrorMsg = Utf8StrFmt ("%s.\n%N (%Rrc)", task->mErrorMsg.raw(),
                                       pszFormat, &va2, rc, rc);
@@ -6677 +6666 @@
 
                 /* Load saved state? */
-                if (task->mSavedStateFile.length())
+                if (!task->mSavedStateFile.isEmpty())
                 {
                     LogFlowFunc (("Restoring saved state from '%s'...\n",
@@ -6760 +6749 @@
              * this function is not updated.
              */
-            if (!task->mErrorMsg.length())
+            if (task->mErrorMsg.isNull())
             {
                 /* If the error message is not set but we've got a failure,
@@ -7106 +7095 @@
     AssertReturn (task.get(), VERR_INVALID_PARAMETER);
 
-    Assert(task->mSavedStateFile.length());
-    Assert(!task->mProgress.isNull());
+    Assert (!task->mSavedStateFile.isNull());
+    Assert (!task->mProgress.isNull());
 
     const ComObjPtr <Console> &that = task->mConsole;
@@ -7263 +7252 @@
     else
     {
-        if (errMsg.length())
-            task->mProgress->notifyComplete(rc,
-                                            COM_IIDOF(IConsole),
-                                            Console::getComponentName(),
-                                            errMsg);
+        if (!errMsg.isNull())
+            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 */
@@ -1845 +1844 @@
                 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)
@@ -1883 +1889 @@
             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].length())
+        if (!mOptions[i].isNull())
         {
             const ARGDEF * pArgDef = getArgDef((DHCPCFG)i);
-            args[index++] = pArgDef->Name;      // e.g. "--network"
-            args[index++] = mOptions[i].raw();  // value
+            args[index++] = pArgDef->Name;
+            if (!mOptions[i].isEmpty())
+            {
+                args[index++] = mOptions[i].raw();
+            }
         }
     }

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -3570 +3570 @@
     Utf8Str error;
 
-    if (!mm.vdError.length())
+    if (mm.vdError.isEmpty())
         error = Utf8StrFmt (" (%Rrc)", aVRC);
     else
@@ -3603 +3603 @@
     AssertReturnVoid (that != NULL);
 
-    if (!that->mm.vdError.length())
+    if (that->mm.vdError.isEmpty())
         that->mm.vdError =
             Utf8StrFmt ("%s (%Rrc)", Utf8StrFmtVA (pszFormat, va).raw(), rc);

trunk/src/VBox/Main/MachineImpl.cpp

@@ -1408 +1408 @@
     Utf8Str snapshotFolder = aSnapshotFolder;
 
-    if (!snapshotFolder.length())
+    if (snapshotFolder.isEmpty())
     {
         if (isInOwnDir())
@@ -2780 +2780 @@
         Utf8Str logFolder;
         getLogFolder (logFolder);
-        Assert(logFolder.length());
-        if (RTDirExists(logFolder))
+        Assert (!logFolder.isEmpty());
+        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.length());
-        if (RTDirExists(snapshotFolder))
-            RTDirRemove(snapshotFolder);
+        Utf8Str snapshotFolder = mUserData->mSnapshotFolderFull;
+        Assert (!snapshotFolder.isEmpty());
+        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)
@@ -3070 +3068 @@
         return E_INVALIDARG;
 
-    HRESULT rc = S_OK;
-
-    try
-    {
-        Utf8Str utf8Name(aName);
-        Utf8Str utf8Flags(aFlags);
-        Utf8Str utf8Patterns(mHWData->mGuestPropertyNotificationPatterns);
-
-        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);
-
-        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)
+    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)
+                {
+                    property = *it;
+                    if (it->mFlags & (RDONLYHOST))
+                        rc = setError (E_ACCESSDENIED,
+                            tr ("The property '%ls' cannot be changed by the host"),
+                            aName);
+                    else
                     {
-                        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;
+                        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);
                     }
-            }
-            if (found && SUCCEEDED (rc))
-            {
-                if (*aValue)
-                {
-                    RTTIMESPEC time;
-                    property.mValue = aValue;
-                    property.mTimestamp = RTTimeSpecGetNano (RTTimeNow (&time));
-                    if (aFlags != NULL)
-                        property.mFlags = fFlags;
-                    mHWData->mGuestProperties.push_back (property);
+                    found = true;
+                    break;
                 }
-            }
-            else if (SUCCEEDED (rc) && *aValue)
+        }
+        if (found && SUCCEEDED (rc))
+        {
+            if (*aValue)
             {
                 RTTIMESPEC time;
-                mHWData.backup();
-                property.mName = aName;
                 property.mValue = aValue;
                 property.mTimestamp = RTTimeSpecGetNano (RTTimeNow (&time));
-                property.mFlags = fFlags;
+                if (aFlags != NULL)
+                    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 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;
         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;
-            else
-                rc = directControl->AccessGuestProperty(aName, aValue, aFlags,
-                                                        true /* isSetter */,
-                                                        &dummy, &dummy64, &dummy);
-        }
-    }
-    catch (std::bad_alloc &e)
-    {
-        rc = E_OUTOFMEMORY;
-    }
-
+            rc = directControl->AccessGuestProperty (aName, aValue, aFlags,
+                                                     true /* isSetter */,
+                                                     &dummy, &dummy64, &dummy);
+    }
     return rc;
 #endif /* else !defined (VBOX_WITH_GUEST_PROPS) */
@@ -5411 +5401 @@
 #ifdef VBOX_WITH_GUEST_PROPS
     /* Guest properties (optional) */
-    try
     {
         using namespace guestProp;
@@ -5433 +5422 @@
                 /* property flags (optional, defaults to empty) */
                 Bstr flags = (*it).stringValue ("flags");
-                Utf8Str utf8Flags(flags);
+                Utf8Str utf8Flags (flags);
+                if (utf8Flags.isNull ())
+                    return E_OUTOFMEMORY;
                 validateFlags (utf8Flags.raw(), &fFlags);
                 HWData::GuestProperty property = { name, value, timestamp, fFlags };
@@ -5451 +5442 @@
         if (mHWData->mGuestPropertyNotificationPatterns.isNull ())
             return E_OUTOFMEMORY;
-    }
-    catch(std::bad_alloc &e)
-    {
-        return E_OUTOFMEMORY;
     }
 #endif /* VBOX_WITH_GUEST_PROPS defined */
@@ -9629 +9616 @@
         return E_POINTER;  /* aValue can be NULL to indicate deletion */
 
-    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.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);
-    }
-    catch(std::bad_alloc &e)
-    {
+    Utf8Str utf8Name (aName);
+    Utf8Str utf8Flags (aFlags);
+    Utf8Str utf8Patterns (mHWData->mGuestPropertyNotificationPatterns);
+    if (   utf8Name.isNull()
+        || ((aFlags != NULL) && utf8Flags.isNull())
+        || utf8Patterns.isNull()
+       )
         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.length()
+    if (    !path.isEmpty()
          && RTPathStartsWith(path, aOldPath)
        )

trunk/src/VBox/Main/VFSExplorerImpl.cpp

@@ -403 +403 @@
         RTS3SetProgressCallback(hS3, VFSExplorer::TaskVFSExplorer::uploadProgress, &aTask);
         /* Do we need the list of buckets or keys? */
-        if (!m->strBucket.length())
+        if (m->strBucket.isEmpty())
         {
             PCRTS3BUCKETENTRY pBuckets = NULL;

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3481 +3481 @@
     AutoReadLock hardDiskLock (aHardDisk);
 
-    Utf8Str strConflict;
-    HRESULT rc = checkMediaForConflicts2(aHardDisk->id(),
-                                         aHardDisk->locationFull(),
-                                         strConflict);
+    Utf8Str conflict;
+    HRESULT rc = checkMediaForConflicts2 (aHardDisk->id(),
+                                          aHardDisk->locationFull(),
+                                          conflict);
     CheckComRCReturnRC (rc);
 
-    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());
+    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());
     }
 
@@ -3599 +3598 @@
     AutoReadLock imageLock (aImage);
 
-    Utf8Str strConflict;
-    HRESULT rc = checkMediaForConflicts2(aImage->id(),
-                                         aImage->locationFull(),
-                                         strConflict);
+    Utf8Str conflict;
+    HRESULT rc = checkMediaForConflicts2 (aImage->id(), aImage->locationFull(),
+                                          conflict);
     CheckComRCReturnRC (rc);
 
-    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());
+    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());
     }
 
@@ -3702 +3699 @@
     AutoReadLock imageLock (aImage);
 
-    Utf8Str strConflict;
-    HRESULT rc = checkMediaForConflicts2(aImage->id(),
-                                         aImage->locationFull(),
-                                         strConflict);
+    Utf8Str conflict;
+    HRESULT rc = checkMediaForConflicts2 (aImage->id(), aImage->locationFull(),
+                                          conflict);
     CheckComRCReturnRC (rc);
 
-    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());
+    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());
     }
 
@@ -3942 +3937 @@
         {
             *aFormatVersion = aTree.oldVersion();
-            if (!aFormatVersion->length())
+            if (aFormatVersion->isNull())
                 *aFormatVersion = VBOX_XML_VERSION_FULL;
         }

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

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

trunk/src/VBox/Main/include/HostHardwareLinux.h

@@ -66 +66 @@
             mDescription (aDescription != NULL ? aDescription : std::string ()) {}
     };
-
+    
     /** List (resp vector) holding drive information */
     typedef std::vector <DriveInfo> DriveInfoList;
@@ -144 +144 @@
         USBDeviceInfo () {}
     };
-
+    
     /** List (resp vector) holding drive information */
     typedef std::vector <USBDeviceInfo> DeviceInfoList;

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

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