Changeset 73003 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 9, 2018 11:09:32 AM (7 years ago)

Author:

vboxsync

Message:

Main: Use setErrorBoth when we've got a VBox status code handy. (The COM status codes aren't too specfic and this may help us decode error messages and provide an alternative to strstr for API clients. setErrorBoth isn't new, btw.)

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImplExport.cpp (modified) (3 diffs)
• ApplianceImplImport.cpp (modified) (3 diffs)
• DHCPServerImpl.cpp (modified) (7 diffs)
• HostUSBDeviceImpl.cpp (modified) (1 diff)
• HostVideoInputDeviceImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (22 diffs)
• MachineImplCloneVM.cpp (modified) (5 diffs)
• MachineImplMoveVM.cpp (modified) (17 diffs)
• MediumImpl.cpp (modified) (33 diffs)
• SystemPropertiesImpl.cpp (modified) (3 diffs)
• USBProxyService.cpp (modified) (1 diff)
• VFSExplorerImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp

@@ -490 +490 @@
                         throw setError(VBOX_E_NOT_SUPPORTED,
                                        tr("Cannot handle medium attachment: channel is %d, device is %d"), lChannel, lDevice);
-                break;
+                    break;
 
                 case StorageBus_SATA:
                     lChannelVsys = lChannel;        // should be between 0 and 29
                     lControllerVsys = lSATAControllerIndex;
-                break;
+                    break;
 
                 case StorageBus_SCSI:
@@ -501 +501 @@
                     lChannelVsys = lChannel;        // should be between 0 and 15
                     lControllerVsys = lSCSIControllerIndex;
-                break;
+                    break;
 
                 case StorageBus_Floppy:
                     lChannelVsys = 0;
                     lControllerVsys = 0;
-                break;
+                    break;
 
                 default:
@@ -512 +512 @@
                                    tr("Cannot handle medium attachment: storageBus is %d, channel is %d, device is %d"),
                                    storageBus, lChannel, lDevice);
-                break;
             }
 

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -1843 +1843 @@
                     vrc = RTCrX509CertPathsSetTrustedStore(hCertPaths, hTrustedCerts);
                     if (RT_FAILURE(vrc))
-                        hrc2 = setError(E_FAIL, tr("RTCrX509CertPathsSetTrustedStore failed (%Rrc)"), vrc);
+                        hrc2 = setErrorBoth(E_FAIL, vrc, tr("RTCrX509CertPathsSetTrustedStore failed (%Rrc)"), vrc);
                     RTCrStoreRelease(hTrustedCerts);
                 }
                 else
-                    hrc2 = setError(E_FAIL,
-                                    tr("Failed to query trusted CAs and Certificates from the system and for the current user (%Rrc, %s)"),
-                                    vrc, StaticErrInfo.Core.pszMsg);
+                    hrc2 = setErrorBoth(E_FAIL, vrc,
+                                        tr("Failed to query trusted CAs and Certificates from the system and for the current user (%Rrc, %s)"),
+                                        vrc, StaticErrInfo.Core.pszMsg);
 
                 /* Add untrusted intermediate certificates. */
@@ -1913 +1913 @@
                         }
                         else
-                            hrc2 = setError(E_FAIL, tr("Certificate path validation failed (%Rrc, %s)"),
-                                            vrc, StaticErrInfo.Core.pszMsg);
+                            hrc2 = setErrorBoth(E_FAIL, vrc, tr("Certificate path validation failed (%Rrc, %s)"),
+                                                vrc, StaticErrInfo.Core.pszMsg);
                     }
                     else
-                        hrc2 = setError(E_FAIL, tr("Certificate path building failed (%Rrc, %s)"),
-                                        vrc, StaticErrInfo.Core.pszMsg);
+                        hrc2 = setErrorBoth(E_FAIL, vrc, tr("Certificate path building failed (%Rrc, %s)"),
+                                            vrc, StaticErrInfo.Core.pszMsg);
                 }
                 RTCrX509CertPathsRelease(hCertPaths);
@@ -2239 +2239 @@
                                              NULL /*pszAttr*/, szDigest, fType);
             if (RT_FAILURE(vrc))
-                return setError(VBOX_E_IPRT_ERROR, tr("Error fudging missing OVF digest in manifest: %Rrc"), vrc);
+                return setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Error fudging missing OVF digest in manifest: %Rrc"), vrc);
         }
 

trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp

@@ -258 +258 @@
 {
     RTNETADDRIPV4 IPAddress, NetworkMask, LowerIP, UpperIP;
-    int rc;
-
-    rc = RTNetStrToIPv4Addr(aIPAddress.c_str(), &IPAddress);
-    if (RT_FAILURE(rc))
-        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
-                   "Invalid server address");
-
-    rc = RTNetStrToIPv4Addr(aNetworkMask.c_str(), &NetworkMask);
-    if (RT_FAILURE(rc))
-        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
-                   "Invalid netmask");
-
-    rc = RTNetStrToIPv4Addr(aLowerIP.c_str(), &LowerIP);
-    if (RT_FAILURE(rc))
-        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
-                   "Invalid range lower address");
-
-    rc = RTNetStrToIPv4Addr(aUpperIP.c_str(), &UpperIP);
-    if (RT_FAILURE(rc))
-        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
-                   "Invalid range upper address");
+
+    int vrc = RTNetStrToIPv4Addr(aIPAddress.c_str(), &IPAddress);
+    if (RT_FAILURE(vrc))
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, vrc, "Invalid server address");
+
+    vrc = RTNetStrToIPv4Addr(aNetworkMask.c_str(), &NetworkMask);
+    if (RT_FAILURE(vrc))
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, vrc, "Invalid netmask");
+
+    vrc = RTNetStrToIPv4Addr(aLowerIP.c_str(), &LowerIP);
+    if (RT_FAILURE(vrc))
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, vrc, "Invalid range lower address");
+
+    vrc = RTNetStrToIPv4Addr(aUpperIP.c_str(), &UpperIP);
+    if (RT_FAILURE(vrc))
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, vrc, "Invalid range upper address");
 
     /*
@@ -284 +279 @@
      * here or address/prefix for aIPAddress?
      */
-    rc = RTNetMaskToPrefixIPv4(&NetworkMask, NULL);
-    if (RT_FAILURE(rc))
-        return mVirtualBox->setErrorBoth(E_INVALIDARG, rc,
-                   "Invalid netmask");
+    vrc = RTNetMaskToPrefixIPv4(&NetworkMask, NULL);
+    if (RT_FAILURE(vrc))
+        return mVirtualBox->setErrorBoth(E_INVALIDARG, vrc, "Invalid netmask");
 
     /* It's more convenient to convert to host order once */
@@ -301 +295 @@
         || (IPAddress.u & ~NetworkMask.u) == 0
         || ((IPAddress.u & ~NetworkMask.u) | NetworkMask.u) == UINT32_C(0xffffffff))
-    {
-        return mVirtualBox->setError(E_INVALIDARG,
-                   "Invalid server address");
-    }
+        return mVirtualBox->setError(E_INVALIDARG, "Invalid server address");
 
     if (   (LowerIP.u & UINT32_C(0xe0000000)) == UINT32_C(0xe0000000)
@@ -310 +301 @@
         || (LowerIP.u & ~NetworkMask.u) == 0
         || ((LowerIP.u & ~NetworkMask.u) | NetworkMask.u) == UINT32_C(0xffffffff))
-    {
-        return mVirtualBox->setError(E_INVALIDARG,
-                   "Invalid range lower address");
-    }
+        return mVirtualBox->setError(E_INVALIDARG, "Invalid range lower address");
 
     if (   (UpperIP.u & UINT32_C(0xe0000000)) == UINT32_C(0xe0000000)
@@ -319 +307 @@
         || (UpperIP.u & ~NetworkMask.u) == 0
         || ((UpperIP.u & ~NetworkMask.u) | NetworkMask.u) == UINT32_C(0xffffffff))
-    {
-        return mVirtualBox->setError(E_INVALIDARG,
-                   "Invalid range upper address");
-    }
+        return mVirtualBox->setError(E_INVALIDARG, "Invalid range upper address");
 
     /* The range should be valid ... */
     if (LowerIP.u > UpperIP.u)
-        return mVirtualBox->setError(E_INVALIDARG,
-                   "Invalid range bounds");
+        return mVirtualBox->setError(E_INVALIDARG, "Invalid range bounds");
 
     /* ... and shouldn't contain the server's address */
     if (LowerIP.u <= IPAddress.u && IPAddress.u <= UpperIP.u)
-        return mVirtualBox->setError(E_INVALIDARG,
-                   "Server address within range bounds");
+        return mVirtualBox->setError(E_INVALIDARG, "Server address within range bounds");
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -416 +399 @@
     {
         uint8_t u8Code;
+        char    *pszNext;
+        int vrc = RTStrToUInt8Ex(aValue.c_str(), &pszNext, 10, &u8Code);
+        if (!RT_SUCCESS(vrc))
+            return VERR_PARSE_ERROR;
+
         uint32_t u32Enc;
-        char *pszNext;
-        int rc;
-
-        rc = RTStrToUInt8Ex(aValue.c_str(), &pszNext, 10, &u8Code);
-        if (!RT_SUCCESS(rc))
-            return VERR_PARSE_ERROR;
-
         switch (*pszNext)
         {
@@ -440 +421 @@
             case '@':
             {
-                rc = RTStrToUInt32Ex(pszNext + 1, &pszNext, 10, &u32Enc);
-                if (!RT_SUCCESS(rc))
+                vrc = RTStrToUInt32Ex(pszNext + 1, &pszNext, 10, &u32Enc);
+                if (!RT_SUCCESS(vrc))
                     return VERR_PARSE_ERROR;
                 if (*pszNext != '=')

trunk/src/VBox/Main/src-server/HostUSBDeviceImpl.cpp

@@ -474 +474 @@
     mCaptureFilename = aCaptureFilename;
     alock.release();
-    int rc = mUSBProxyBackend->captureDevice(this);
-    if (RT_FAILURE(rc))
+    int vrc = mUSBProxyBackend->captureDevice(this);
+    if (RT_FAILURE(vrc))
     {
         alock.acquire();
         i_failTransition(kHostUSBDeviceState_Invalid);
         mMachine.setNull();
-        if (rc == VERR_SHARING_VIOLATION)
-            return setError(E_FAIL,
-                            tr("USB device '%s' with UUID {%RTuuid} is in use by someone else"),
-                            mName, mId.raw());
+        if (vrc == VERR_SHARING_VIOLATION)
+            return setErrorBoth(E_FAIL, vrc,
+                                tr("USB device '%s' with UUID {%RTuuid} is in use by someone else"),
+                                mName, mId.raw());
         return E_FAIL;
     }

trunk/src/VBox/Main/src-server/HostVideoInputDeviceImpl.cpp

@@ -184 +184 @@
         PFNVBOXHOSTWEBCAMLIST pfn = NULL;
         RTLDRMOD hmod = NIL_RTLDRMOD;
-        int rc = loadHostWebcamLibrary(strLibrary.c_str(), &hmod, &pfn);
-
-        LogRel(("Load [%s] rc %Rrc\n", strLibrary.c_str(), rc));
-
-        if (RT_SUCCESS(rc))
+        int vrc = loadHostWebcamLibrary(strLibrary.c_str(), &hmod, &pfn);
+
+        LogRel(("Load [%s] vrc=%Rrc\n", strLibrary.c_str(), vrc));
+
+        if (RT_SUCCESS(vrc))
         {
             uint64_t u64Result = S_OK;
-            rc = pfn(hostWebcamAdd, pList, &u64Result);
-            Log(("VBoxHostWebcamList rc %Rrc, result 0x%08X\n", rc, u64Result));
-            if (RT_FAILURE(rc))
+            vrc = pfn(hostWebcamAdd, pList, &u64Result);
+            Log(("VBoxHostWebcamList vrc %Rrc, result 0x%08X\n", vrc, u64Result));
+            if (RT_FAILURE(vrc))
             {
                 hr = (HRESULT)u64Result;
@@ -204 +204 @@
         if (SUCCEEDED(hr))
         {
-            if (RT_FAILURE(rc))
-                hr = pVirtualBox->setError(VBOX_E_IPRT_ERROR,
-                         "Failed to get webcam list: %Rrc", rc);
+            if (RT_FAILURE(vrc))
+                hr = pVirtualBox->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, "Failed to get webcam list: %Rrc", vrc);
         }
     }

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -641 +641 @@
     int vrc1 = mParent->i_calculateFullPath(strConfigFile, mData->m_strConfigFileFull);
     if (RT_FAILURE(vrc1))
-        return setError(VBOX_E_FILE_ERROR,
-                        tr("Invalid machine settings file name '%s' (%Rrc)"),
-                        strConfigFile.c_str(),
-                        vrc1);
+        return setErrorBoth(VBOX_E_FILE_ERROR, vrc1,
+                            tr("Invalid machine settings file name '%s' (%Rrc)"),
+                            strConfigFile.c_str(),
+                            vrc1);
 
     LogFlowThisFuncLeave();
@@ -680 +680 @@
             int vrc2 = RTFileDelete(mData->m_strConfigFileFull.c_str());
             if (RT_FAILURE(vrc2))
-                rc = setError(VBOX_E_FILE_ERROR,
-                              tr("Could not delete the existing settings file '%s' (%Rrc)"),
-                              mData->m_strConfigFileFull.c_str(), vrc2);
+                rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc2,
+                                  tr("Could not delete the existing settings file '%s' (%Rrc)"),
+                                  mData->m_strConfigFileFull.c_str(), vrc2);
         }
     }
@@ -688 +688 @@
               && vrc != VERR_PATH_NOT_FOUND
             )
-        rc = setError(VBOX_E_FILE_ERROR,
-                      tr("Invalid machine settings file name '%s' (%Rrc)"),
-                      mData->m_strConfigFileFull.c_str(),
-                      vrc);
+        rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                          tr("Invalid machine settings file name '%s' (%Rrc)"),
+                          mData->m_strConfigFileFull.c_str(),
+                          vrc);
     return rc;
 }
@@ -2664 +2664 @@
                                 strSnapshotFolder);
     if (RT_FAILURE(vrc))
-        return setError(E_FAIL,
-                        tr("Invalid snapshot folder '%s' (%Rrc)"),
-                        strSnapshotFolder.c_str(), vrc);
+        return setErrorBoth(E_FAIL, vrc,
+                            tr("Invalid snapshot folder '%s' (%Rrc)"),
+                            strSnapshotFolder.c_str(), vrc);
 
     i_setModified(IsModified_MachineData);
@@ -4866 +4866 @@
             case DeviceType_DVD:
             case DeviceType_Floppy:
-            break;
+                break;
 
             default:
@@ -5493 +5493 @@
             int vrc = RTFileDelete(strFile.c_str());
             if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_IPRT_ERROR,
-                               tr("Could not delete file '%s' (%Rrc)"), strFile.c_str(), vrc);
+                throw setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                                   tr("Could not delete file '%s' (%Rrc)"), strFile.c_str(), vrc);
         }
 
@@ -6520 +6520 @@
         *aEnabled = TRUE;
 #endif
-        return setError(VBOX_E_IPRT_ERROR,
-                        tr("Saved guest size is not available (%Rrc)"),
-                        vrc);
+        return setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                            tr("Saved guest size is not available (%Rrc)"),
+                            vrc);
     }
 
@@ -6557 +6557 @@
 
     if (RT_FAILURE(vrc))
-        return setError(VBOX_E_IPRT_ERROR,
-                        tr("Saved thumbnail data is not available (%Rrc)"),
-                        vrc);
+        return setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                            tr("Saved thumbnail data is not available (%Rrc)"),
+                            vrc);
 
     HRESULT hr = S_OK;
@@ -6615 +6615 @@
             }
             else
-                hr = setError(VBOX_E_IPRT_ERROR,
-                              tr("Could not convert saved thumbnail to PNG (%Rrc)"),
-                              vrc);
+                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                                  tr("Could not convert saved thumbnail to PNG (%Rrc)"),
+                                  vrc);
 
             RTMemFree(pu8PNG);
@@ -6646 +6646 @@
 
     if (RT_FAILURE(vrc))
-        return setError(VBOX_E_IPRT_ERROR,
-                        tr("Saved screenshot data is not available (%Rrc)"),
-                        vrc);
+        return setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                            tr("Saved screenshot data is not available (%Rrc)"),
+                            vrc);
 
     *aWidth = u32Width;
@@ -6682 +6682 @@
 
     if (RT_FAILURE(vrc))
-        return setError(VBOX_E_IPRT_ERROR,
-                        tr("Saved screenshot thumbnail data is not available (%Rrc)"),
-                        vrc);
+        return setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                            tr("Saved screenshot thumbnail data is not available (%Rrc)"),
+                            vrc);
 
     *aWidth = u32Width;
@@ -6828 +6828 @@
             aData.resize(cbData);
         else
-            rc = setError(VBOX_E_IPRT_ERROR,
-                          tr("Could not read log file '%s' (%Rrc)"),
+            rc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                              tr("Could not read log file '%s' (%Rrc)"),
+                              log.c_str(), vrc);
+        RTFileClose(LogFile);
+    }
+    else
+        rc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                          tr("Could not open log file '%s' (%Rrc)"),
                           log.c_str(), vrc);
-        RTFileClose(LogFile);
-    }
-    else
-        rc = setError(VBOX_E_IPRT_ERROR,
-                      tr("Could not open log file '%s' (%Rrc)"),
-                      log.c_str(), vrc);
 
     if (FAILED(rc))
@@ -7950 +7950 @@
 
     if (RT_FAILURE(vrc))
-        return setError(VBOX_E_IPRT_ERROR,
-                        tr("Could not launch a process for the machine '%s' (%Rrc)"),
-                        mUserData->s.strName.c_str(), vrc);
+        return setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                            tr("Could not launch a process for the machine '%s' (%Rrc)"),
+                            mUserData->s.strName.c_str(), vrc);
 
     LogFlowThisFunc(("launched.pid=%d(0x%x)\n", pid, pid));
@@ -8150 +8150 @@
                           i_getName().c_str(), status.iStatus, strExtraInfo.c_str());
         else
-            rc = setError(E_FAIL,
-                          tr("The virtual machine '%s' has terminated unexpectedly during startup (%Rrc)%s"),
-                          i_getName().c_str(), vrc, strExtraInfo.c_str());
+            rc = setErrorBoth(E_FAIL, vrc,
+                              tr("The virtual machine '%s' has terminated unexpectedly during startup (%Rrc)%s"),
+                              i_getName().c_str(), vrc, strExtraInfo.c_str());
     }
 
@@ -8856 +8856 @@
         int vrc = i_calculateFullPath(stateFilePathFull, stateFilePathFull);
         if (RT_FAILURE(vrc))
-            return setError(E_FAIL,
-                            tr("Invalid saved state file path '%s' (%Rrc)"),
-                            config.strStateFile.c_str(),
-                            vrc);
+            return setErrorBoth(E_FAIL, vrc,
+                                tr("Invalid saved state file path '%s' (%Rrc)"),
+                                config.strStateFile.c_str(),
+                                vrc);
         mSSData->strStateFilePath = stateFilePathFull;
     }
@@ -8966 +8966 @@
         int vrc = i_calculateFullPath(strStateFile, strStateFile);
         if (RT_FAILURE(vrc))
-            return setError(E_FAIL,
-                            tr("Invalid saved state file path '%s' (%Rrc)"),
-                            strStateFile.c_str(),
-                            vrc);
+            return setErrorBoth(E_FAIL, vrc,
+                                tr("Invalid saved state file path '%s' (%Rrc)"),
+                                strStateFile.c_str(),
+                                vrc);
     }
 
@@ -9951 +9951 @@
                     if (RT_FAILURE(vrc))
                     {
-                        rc = setError(E_FAIL,
-                                      tr("Could not rename the directory '%s' to '%s' to save the settings file (%Rrc)"),
-                                      configDir.c_str(),
-                                      newConfigDir.c_str(),
-                                      vrc);
+                        rc = setErrorBoth(E_FAIL, vrc,
+                                          tr("Could not rename the directory '%s' to '%s' to save the settings file (%Rrc)"),
+                                          configDir.c_str(),
+                                          newConfigDir.c_str(),
+                                          vrc);
                         break;
                     }
@@ -9989 +9989 @@
                     if (RT_FAILURE(vrc))
                     {
-                        rc = setError(E_FAIL,
-                                      tr("Could not rename the settings file '%s' to '%s' (%Rrc)"),
-                                      configFile.c_str(),
-                                      newConfigFile.c_str(),
-                                      vrc);
+                        rc = setErrorBoth(E_FAIL, vrc,
+                                          tr("Could not rename the settings file '%s' to '%s' (%Rrc)"),
+                                          configFile.c_str(),
+                                          newConfigFile.c_str(),
+                                          vrc);
                         break;
                     }
@@ -10063 +10063 @@
             if (RT_FAILURE(vrc))
             {
-                return setError(E_FAIL,
-                                tr("Could not create a directory '%s' to save the settings file (%Rrc)"),
-                                path.c_str(),
-                                vrc);
+                return setErrorBoth(E_FAIL, vrc,
+                                    tr("Could not create a directory '%s' to save the settings file (%Rrc)"),
+                                    path.c_str(),
+                                    vrc);
             }
         }
@@ -10076 +10076 @@
                          RTFILE_O_READWRITE | RTFILE_O_CREATE | RTFILE_O_DENY_WRITE);
         if (RT_FAILURE(vrc))
-            return setError(E_FAIL,
-                            tr("Could not create the settings file '%s' (%Rrc)"),
-                            path.c_str(),
-                            vrc);
+            return setErrorBoth(E_FAIL, vrc,
+                                tr("Could not create the settings file '%s' (%Rrc)"),
+                                path.c_str(),
+                                vrc);
         RTFileClose(f);
     }
@@ -13274 +13274 @@
     int vrc = i_calculateFullPath(aSavedStateFile, stateFilePathFull);
     if (RT_FAILURE(vrc))
-        return setError(VBOX_E_FILE_ERROR,
-                        tr("Invalid saved state file path '%s' (%Rrc)"),
-                        aSavedStateFile.c_str(),
-                        vrc);
+        return setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                            tr("Invalid saved state file path '%s' (%Rrc)"),
+                            aSavedStateFile.c_str(),
+                            vrc);
 
     mSSData->strStateFilePath = stateFilePathFull;
@@ -13927 +13927 @@
         Utf8Str filename = authLibrary;
 
-        int rc = AuthLibLoad(&mAuthLibCtx, filename.c_str());
-        if (RT_FAILURE(rc))
-        {
-            hr = setError(E_FAIL,
-                          tr("Could not load the external authentication library '%s' (%Rrc)"),
-                          filename.c_str(), rc);
-        }
+        int vrc = AuthLibLoad(&mAuthLibCtx, filename.c_str());
+        if (RT_FAILURE(vrc))
+            hr = setErrorBoth(E_FAIL, vrc,
+                              tr("Could not load the external authentication library '%s' (%Rrc)"),
+                              filename.c_str(), vrc);
     }
 

trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp

@@ -221 +221 @@
         int vrc = RTFileQuerySize(sst.strSaveStateFile.c_str(), &cbSize);
         if (RT_FAILURE(vrc))
-            return p->setError(VBOX_E_IPRT_ERROR, p->tr("Could not query file size of '%s' (%Rrc)"),
-                               sst.strSaveStateFile.c_str(), vrc);
-        /* same rule as above: count both the data which needs to
+            return p->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, p->tr("Could not query file size of '%s' (%Rrc)"),
+                                   sst.strSaveStateFile.c_str(), vrc);
+        /*  same rule as above: count both the data which needs to
          * be read and written */
         sst.uWeight = (ULONG)(2 * (cbSize + _1M - 1) / _1M);
@@ -965 +965 @@
 
         if (RT_FAILURE(vrc))
-            p->setError(VBOX_E_IPRT_ERROR, "Could not create machine clone thread (%Rrc)", vrc);
+            p->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, "Could not create machine clone thread (%Rrc)", vrc);
     }
     catch (HRESULT rc2)
@@ -1393 +1393 @@
             int vrc = RTDirCreateFullPath(strTrgSnapshotFolder.c_str(), 0700);
             if (RT_FAILURE(vrc))
-                throw p->setError(VBOX_E_IPRT_ERROR,
-                                  p->tr("Could not create snapshots folder '%s' (%Rrc)"),
-                                        strTrgSnapshotFolder.c_str(), vrc);
+                throw p->setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                                      p->tr("Could not create snapshots folder '%s' (%Rrc)"),
+                                            strTrgSnapshotFolder.c_str(), vrc);
         }
         /* Clone all save state files. */
@@ -1414 +1414 @@
                                        MachineCloneVMPrivate::copyStateFileProgress, &d->pProgress);
                 if (RT_FAILURE(vrc))
-                    throw p->setError(VBOX_E_IPRT_ERROR,
-                                      p->tr("Could not copy state file '%s' to '%s' (%Rrc)"),
-                                            sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), vrc);
+                    throw p->setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                                          p->tr("Could not copy state file '%s' to '%s' (%Rrc)"),
+                                          sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), vrc);
                 newFiles.append(strTrgSaveState);
             }
@@ -1507 +1507 @@
             vrc = RTFileDelete(newFiles.at(i).c_str());
             if (RT_FAILURE(vrc))
-                mrc = p->setError(VBOX_E_IPRT_ERROR, p->tr("Could not delete file '%s' (%Rrc)"), newFiles.at(i).c_str(), vrc);
+                mrc = p->setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                                      p->tr("Could not delete file '%s' (%Rrc)"), newFiles.at(i).c_str(), vrc);
         }
         /* Delete all already created medias. (Reverse, cause there could be

trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

@@ -185 +185 @@
                                  strTargetFolder.c_str());
             errorsList.push_back(ErrorInfoItem(E_FAIL, errorDesc.c_str()));
-            rc = m_pMachine->setError(E_FAIL, m_pMachine->tr(errorDesc.c_str()));
+            rc = m_pMachine->setErrorBoth(E_FAIL, vrc, m_pMachine->tr(errorDesc.c_str()));
             throw rc;
         }
@@ -204 +204 @@
                                      "the destination folder.", strTargetFolder.c_str());
                 errorsList.push_back(ErrorInfoItem(HRESULT(vrc), errorDesc.c_str()));
-                rc = m_pMachine->setError(vrc, m_pMachine->tr(errorDesc.c_str()));
-
+                rc = m_pMachine->setErrorBoth(VBOX_E_FILE_ERROR, vrc, m_pMachine->tr(errorDesc.c_str()));
             }
 
@@ -493 +492 @@
                 errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                throw m_pMachine->setError(VBOX_E_IPRT_ERROR,m_pMachine->tr(errorDesc.c_str()));
+                throw m_pMachine->setError(VBOX_E_IPRT_ERROR, m_pMachine->tr(errorDesc.c_str()));
             }
         }
@@ -658 +657 @@
                     taskMoveVM->errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                    throw machine->setError(VBOX_E_IPRT_ERROR,machine->tr(errorDesc.c_str()));
+                    throw machine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, machine->tr(errorDesc.c_str()));
                 }
             }
@@ -682 +681 @@
                     taskMoveVM->errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                    throw machine->setError(VBOX_E_IPRT_ERROR,machine->tr(errorDesc.c_str()));
+                    throw machine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, machine->tr(errorDesc.c_str()));
                 }
 
@@ -731 +730 @@
                     taskMoveVM->errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                    throw machine->setError(VBOX_E_IPRT_ERROR,machine->tr(errorDesc.c_str()));
+                    throw machine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, machine->tr(errorDesc.c_str()));
                 }
                 LogRelFunc(("Created a home machine folder %s\n", strTargetSettingsFilePath.c_str()));
@@ -755 +754 @@
                 taskMoveVM->errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                throw machine->setError(VBOX_E_IPRT_ERROR, machine->tr(errorDesc.c_str()));
+                throw machine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, machine->tr(errorDesc.c_str()));
             }
 
@@ -789 +788 @@
                             taskMoveVM->errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                            throw machine->setError(VBOX_E_IPRT_ERROR,machine->tr(errorDesc.c_str()));
+                            throw machine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, machine->tr(errorDesc.c_str()));
                         }
                         LogRelFunc(("Created a log machine folder %s\n", strTargetLogFolderPath.c_str()));
@@ -807 +806 @@
                         /* Move to next sub-operation. */
                         rc = taskMoveVM->m_pProgress->SetNextOperation(BstrFmt(machine->tr("Copying the log file '%s' ..."),
-                                                                RTPathFilename(strFullSourceFilePath.c_str())).raw(), 1);
+                                                                               RTPathFilename(strFullSourceFilePath.c_str())).raw(),
+                                                                       1);
                         if (FAILED(rc)) throw rc;
 
                         int vrc = RTFileCopyEx(strFullSourceFilePath.c_str(), strFullTargetFilePath.c_str(), 0,
-                                       MachineMoveVM::copyFileProgress, &taskMoveVM->m_pProgress);
+                                               MachineMoveVM::copyFileProgress, &taskMoveVM->m_pProgress);
                         if (RT_FAILURE(vrc))
                         {
@@ -820 +820 @@
                             taskMoveVM->errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                            throw machine->setError(VBOX_E_IPRT_ERROR,machine->tr(errorDesc.c_str()));
+                            throw machine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, machine->tr(errorDesc.c_str()));
                         }
 
                         LogRelFunc(("The log file %s has been copied into the folder %s\n", strFullSourceFilePath.c_str(),
-                                         strFullTargetFilePath.stripFilename().c_str()));
+                                    strFullTargetFilePath.stripFilename().c_str()));
 
                         /* save new file in case of restoring */
@@ -1232 +1232 @@
 
         vrc = RTDirClose(hDir);
+        AssertRC(vrc);
     }
     else if (vrc == VERR_FILE_NOT_FOUND)
@@ -1238 +1239 @@
         errorsList.push_back(ErrorInfoItem(VERR_FILE_NOT_FOUND, errorDesc.c_str()));
 
-        m_pMachine->setError(VBOX_E_IPRT_ERROR, m_pMachine->tr(errorDesc.c_str()));
-        rc = vrc;
+        rc = m_pMachine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, m_pMachine->tr(errorDesc.c_str()));
     }
     else
@@ -1246 +1246 @@
         errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-        throw m_pMachine->setError(VBOX_E_IPRT_ERROR, m_pMachine->tr(errorDesc.c_str()));
+/** @todo r=bird: document this throwing business, please!  Error handling is
+ *        a bit fishy here.  See also */
+        throw m_pMachine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, m_pMachine->tr(errorDesc.c_str()));
     }
 
@@ -1270 +1272 @@
                 errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                rc = m_pMachine->setError(VBOX_E_IPRT_ERROR, m_pMachine->tr(errorDesc.c_str()));
+                rc = m_pMachine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, m_pMachine->tr(errorDesc.c_str()));
             }
             else
@@ -1317 +1319 @@
                     errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-                    throw m_pMachine->setError(VBOX_E_IPRT_ERROR, m_pMachine->tr(errorDesc.c_str()));
+                    throw m_pMachine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, m_pMachine->tr(errorDesc.c_str()));
                 }
                 ++it;
@@ -1326 +1328 @@
         else
         {
-            Utf8StrFmt errorDesc("Could not calculate the size of folder '%s' (%Rrc)", strRootFolder.c_str(), vrc);
+/** @todo r=bird: This only happens if RTDirOpen fails.  So, I'm not sure
+ * what you're going for here... See not about throwing in getFilesList(). */
+            Utf8StrFmt errorDesc("Could not calculate the size of folder '%s'", strRootFolder.c_str());
             errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
@@ -1502 +1506 @@
             errorsList.push_back(ErrorInfoItem(VBOX_E_IPRT_ERROR, errorDesc.c_str()));
 
-            return m_pMachine->setError(VBOX_E_IPRT_ERROR, m_pMachine->tr(errorDesc.c_str()));
+            return m_pMachine->setErrorBoth(VBOX_E_IPRT_ERROR, vrc, m_pMachine->tr(errorDesc.c_str()));
         }
         /* same rule as above: count both the data which needs to

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -3610 +3610 @@
                 int vrc = VDPluginLoadFromFilename(strPlugin.c_str());
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_NOT_SUPPORTED,
-                                   tr("Retrieving encryption settings of the image failed because the encryption plugin could not be loaded (%s)"),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,
+                                       tr("Retrieving encryption settings of the image failed because the encryption plugin could not be loaded (%s)"),
+                                       i_vdError(vrc).c_str());
             }
             else
@@ -3633 +3633 @@
         vrc = VDFilterAdd(pDisk, "CRYPT", VD_FILTER_FLAGS_READ | VD_FILTER_FLAGS_INFO, CryptoSettings.vdFilterIfaces);
         if (RT_FAILURE(vrc))
-            throw setError(VBOX_E_INVALID_OBJECT_STATE,
-                           tr("Failed to load the encryption filter: %s"),
-                           i_vdError(vrc).c_str());
+            throw setErrorBoth(VBOX_E_INVALID_OBJECT_STATE, vrc,
+                               tr("Failed to load the encryption filter: %s"),
+                               i_vdError(vrc).c_str());
 
         it = pBase->m->mapProperties.find("CRYPT/KeyId");
@@ -3686 +3686 @@
                 int vrc = VDPluginLoadFromFilename(strPlugin.c_str());
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_NOT_SUPPORTED,
-                                   tr("Retrieving encryption settings of the image failed because the encryption plugin could not be loaded (%s)"),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,
+                                       tr("Retrieving encryption settings of the image failed because the encryption plugin could not be loaded (%s)"),
+                                       i_vdError(vrc).c_str());
             }
             else
@@ -3713 +3713 @@
                            tr("The given password is incorrect"));
         else if (RT_FAILURE(vrc))
-            throw setError(VBOX_E_INVALID_OBJECT_STATE,
-                           tr("Failed to load the encryption filter: %s"),
-                           i_vdError(vrc).c_str());
+            throw setErrorBoth(VBOX_E_INVALID_OBJECT_STATE, vrc,
+                               tr("Failed to load the encryption filter: %s"),
+                               i_vdError(vrc).c_str());
 
         VDDestroy(pDisk);
@@ -6085 +6085 @@
         catch (int aVRC)
         {
-            rc = setError(E_FAIL,
-                          tr("Could not update medium UUID references to parent '%s' (%s)"),
-                          m->strLocationFull.c_str(),
-                          i_vdError(aVRC).c_str());
+            rc = setErrorBoth(E_FAIL, aVRC,
+                              tr("Could not update medium UUID references to parent '%s' (%s)"),
+                              m->strLocationFull.c_str(),
+                              i_vdError(aVRC).c_str());
         }
 
@@ -7425 +7425 @@
             {
                 if (vrc == VERR_ACCESS_DENIED)
-                    return setError(VBOX_E_FILE_ERROR,
-                                    tr("Permission problem accessing the file for the medium '%s' (%Rrc)"),
-                                    locationFull.c_str(), vrc);
+                    return setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                        tr("Permission problem accessing the file for the medium '%s' (%Rrc)"),
+                                        locationFull.c_str(), vrc);
                 else if (vrc == VERR_FILE_NOT_FOUND || vrc == VERR_PATH_NOT_FOUND)
-                    return setError(VBOX_E_FILE_ERROR,
-                                    tr("Could not find file for the medium '%s' (%Rrc)"),
-                                    locationFull.c_str(), vrc);
+                    return setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                        tr("Could not find file for the medium '%s' (%Rrc)"),
+                                        locationFull.c_str(), vrc);
                 else if (aFormat.isEmpty())
-                    return setError(VBOX_E_IPRT_ERROR,
-                                    tr("Could not get the storage format of the medium '%s' (%Rrc)"),
-                                    locationFull.c_str(), vrc);
+                    return setErrorBoth(VBOX_E_IPRT_ERROR, vrc,
+                                        tr("Could not get the storage format of the medium '%s' (%Rrc)"),
+                                        locationFull.c_str(), vrc);
                 else
                 {
@@ -8046 +8046 @@
                     vrc = VDPluginLoadFromFilename(strPlugin.c_str());
                     if (RT_FAILURE(vrc))
-                        throw setError(VBOX_E_NOT_SUPPORTED,
-                                       tr("Retrieving encryption settings of the image failed because the encryption plugin could not be loaded (%s)"),
-                                       i_vdError(vrc).c_str());
+                        throw setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,
+                                           tr("Retrieving encryption settings of the image failed because the encryption plugin could not be loaded (%s)"),
+                                           i_vdError(vrc).c_str());
                 }
                 else
@@ -8087 +8087 @@
             pKeyStore->releaseSecretKey(itKeyId->second);
             if (vrc == VERR_VD_PASSWORD_INCORRECT)
-                throw setError(VBOX_E_PASSWORD_INCORRECT, tr("The password to decrypt the image is incorrect"));
+                throw setErrorBoth(VBOX_E_PASSWORD_INCORRECT, vrc, tr("The password to decrypt the image is incorrect"));
             if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_INVALID_OBJECT_STATE, tr("Failed to load the decryption filter: %s"),
-                               i_vdError(vrc).c_str());
+                throw setErrorBoth(VBOX_E_INVALID_OBJECT_STATE, vrc, tr("Failed to load the decryption filter: %s"),
+                                   i_vdError(vrc).c_str());
         }
 
@@ -8117 +8117 @@
                          pMedium->m->vdImageIfaces);
             if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_FILE_ERROR,
-                               tr("Could not open the medium storage unit '%s'%s"),
-                               pMedium->m->strLocationFull.c_str(),
-                               i_vdError(vrc).c_str());
+                throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                   tr("Could not open the medium storage unit '%s'%s"),
+                                   pMedium->m->strLocationFull.c_str(),
+                                   i_vdError(vrc).c_str());
         }
 
@@ -8405 +8405 @@
                              pMedium->m->vdImageIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not open the medium storage unit '%s'%s"),
+                                       pMedium->m->strLocationFull.c_str(),
+                                       i_vdError(vrc).c_str());
             }
 
@@ -8434 +8434 @@
             {
                 if (vrc == VERR_VD_INVALID_TYPE)
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Parameters for creating the differencing medium storage unit '%s' are invalid%s"),
-                                   targetLocation.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Parameters for creating the differencing medium storage unit '%s' are invalid%s"),
+                                       targetLocation.c_str(), i_vdError(vrc).c_str());
                 else
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not create the differencing medium storage unit '%s'%s"),
-                                   targetLocation.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not create the differencing medium storage unit '%s'%s"),
+                                       targetLocation.c_str(), i_vdError(vrc).c_str());
             }
 
@@ -8687 +8687 @@
         catch (int aVRC)
         {
-            rcTmp = setError(VBOX_E_FILE_ERROR,
-                             tr("Could not merge the medium '%s' to '%s'%s"),
-                             m->strLocationFull.c_str(),
-                             pTarget->m->strLocationFull.c_str(),
-                             i_vdError(aVRC).c_str());
+            rcTmp = setErrorBoth(VBOX_E_FILE_ERROR, aVRC,
+                                 tr("Could not merge the medium '%s' to '%s'%s"),
+                                 m->strLocationFull.c_str(),
+                                 pTarget->m->strLocationFull.c_str(),
+                                 i_vdError(aVRC).c_str());
         }
 
@@ -8934 +8934 @@
                              pMedium->m->vdImageIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not open the medium storage unit '%s'%s"),
+                                       pMedium->m->strLocationFull.c_str(),
+                                       i_vdError(vrc).c_str());
             }
 
@@ -9004 +9004 @@
                                  pMedium->m->vdImageIfaces);
                     if (RT_FAILURE(vrc))
-                        throw setError(VBOX_E_FILE_ERROR,
-                                       tr("Could not open the medium storage unit '%s'%s"),
-                                       pMedium->m->strLocationFull.c_str(),
-                                       i_vdError(vrc).c_str());
+                        throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                           tr("Could not open the medium storage unit '%s'%s"),
+                                           pMedium->m->strLocationFull.c_str(),
+                                           i_vdError(vrc).c_str());
                 }
 
@@ -9046 +9046 @@
                 }
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not create the clone medium '%s'%s"),
-                                   targetLocation.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not create the clone medium '%s'%s"),
+                                       targetLocation.c_str(), i_vdError(vrc).c_str());
 
                 size = VDGetFileSize(targetHdd, VD_LAST_IMAGE);
@@ -9245 +9245 @@
                              pMedium->m->vdImageIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not open the medium storage unit '%s'%s"),
+                                       pMedium->m->strLocationFull.c_str(),
+                                       i_vdError(vrc).c_str());
             }
 
@@ -9291 +9291 @@
                              NULL);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not move medium '%s'%s"),
-                                   targetLocation.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not move medium '%s'%s"),
+                                       targetLocation.c_str(), i_vdError(vrc).c_str());
                 size = VDGetFileSize(hdd, VD_LAST_IMAGE);
                 logicalSize = VDGetSize(hdd, VD_LAST_IMAGE);
@@ -9383 +9383 @@
 
             if (RT_FAILURE(vrc) && vrc != VERR_FILE_NOT_FOUND)
-                throw setError(VBOX_E_FILE_ERROR,
-                               tr("Could not delete the medium storage unit '%s'%s"),
-                               location.c_str(), i_vdError(vrc).c_str());
+                throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                   tr("Could not delete the medium storage unit '%s'%s"),
+                                   location.c_str(), i_vdError(vrc).c_str());
 
         }
@@ -9478 +9478 @@
                              pMedium->m->vdImageIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not open the medium storage unit '%s'%s"),
+                                       pMedium->m->strLocationFull.c_str(),
+                                       i_vdError(vrc).c_str());
 
                 /* Done when we hit the media which should be reset */
@@ -9491 +9491 @@
             vrc = VDClose(hdd, true /* fDelete */);
             if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_FILE_ERROR,
-                               tr("Could not delete the medium storage unit '%s'%s"),
-                               location.c_str(), i_vdError(vrc).c_str());
+                throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                   tr("Could not delete the medium storage unit '%s'%s"),
+                                   location.c_str(), i_vdError(vrc).c_str());
 
             /* next, create it again */
@@ -9502 +9502 @@
                          m->vdImageIfaces);
             if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_FILE_ERROR,
-                               tr("Could not open the medium storage unit '%s'%s"),
-                               parentLocation.c_str(), i_vdError(vrc).c_str());
+                throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                   tr("Could not open the medium storage unit '%s'%s"),
+                                   parentLocation.c_str(), i_vdError(vrc).c_str());
 
             vrc = VDCreateDiff(hdd,
@@ -9520 +9520 @@
             {
                 if (vrc == VERR_VD_INVALID_TYPE)
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Parameters for creating the differencing medium storage unit '%s' are invalid%s"),
-                                   location.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Parameters for creating the differencing medium storage unit '%s' are invalid%s"),
+                                       location.c_str(), i_vdError(vrc).c_str());
                 else
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not create the differencing medium storage unit '%s'%s"),
-                                   location.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not create the differencing medium storage unit '%s'%s"),
+                                       location.c_str(), i_vdError(vrc).c_str());
             }
 
@@ -9608 +9608 @@
                              pMedium->m->vdImageIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not open the medium storage unit '%s'%s"),
+                                       pMedium->m->strLocationFull.c_str(),
+                                       i_vdError(vrc).c_str());
             }
 
@@ -9625 +9625 @@
             {
                 if (vrc == VERR_NOT_SUPPORTED)
-                    throw setError(VBOX_E_NOT_SUPPORTED,
-                                   tr("Compacting is not yet supported for medium '%s'"),
-                                   location.c_str());
+                    throw setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,
+                                       tr("Compacting is not yet supported for medium '%s'"),
+                                       location.c_str());
                 else if (vrc == VERR_NOT_IMPLEMENTED)
-                    throw setError(E_NOTIMPL,
-                                   tr("Compacting is not implemented, medium '%s'"),
-                                   location.c_str());
+                    throw setErrorBoth(E_NOTIMPL, vrc,
+                                       tr("Compacting is not implemented, medium '%s'"),
+                                       location.c_str());
                 else
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not compact medium '%s'%s"),
-                                   location.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not compact medium '%s'%s"),
+                                       location.c_str(),
+                                       i_vdError(vrc).c_str());
             }
         }
@@ -9706 +9706 @@
                              pMedium->m->vdImageIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not open the medium storage unit '%s'%s"),
+                                       pMedium->m->strLocationFull.c_str(),
+                                       i_vdError(vrc).c_str());
             }
 
@@ -9724 +9724 @@
             {
                 if (vrc == VERR_NOT_SUPPORTED)
-                    throw setError(VBOX_E_NOT_SUPPORTED,
-                                   tr("Resizing to new size %llu is not yet supported for medium '%s'"),
-                                   task.mSize, location.c_str());
+                    throw setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,
+                                       tr("Resizing to new size %llu is not yet supported for medium '%s'"),
+                                       task.mSize, location.c_str());
                 else if (vrc == VERR_NOT_IMPLEMENTED)
-                    throw setError(E_NOTIMPL,
-                                   tr("Resiting is not implemented, medium '%s'"),
-                                   location.c_str());
+                    throw setErrorBoth(E_NOTIMPL, vrc,
+                                       tr("Resiting is not implemented, medium '%s'"),
+                                       location.c_str());
                 else
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not resize medium '%s'%s"),
-                                   location.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not resize medium '%s'%s"),
+                                       location.c_str(),
+                                       i_vdError(vrc).c_str());
             }
             size = VDGetFileSize(hdd, VD_LAST_IMAGE);
@@ -9828 +9828 @@
                          task.mVDImageIfaces);
             if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_FILE_ERROR,
-                               tr("Could not open the medium storage unit '%s'%s"),
-                               task.mFilename.c_str(),
-                               i_vdError(vrc).c_str());
+                throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                   tr("Could not open the medium storage unit '%s'%s"),
+                                   task.mFilename.c_str(),
+                                   i_vdError(vrc).c_str());
 
             Utf8Str targetFormat(m->strFormat);
@@ -9896 +9896 @@
                                  pMedium->m->vdImageIfaces);
                     if (RT_FAILURE(vrc))
-                        throw setError(VBOX_E_FILE_ERROR,
-                                       tr("Could not open the medium storage unit '%s'%s"),
-                                       pMedium->m->strLocationFull.c_str(),
-                                       i_vdError(vrc).c_str());
+                        throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                           tr("Could not open the medium storage unit '%s'%s"),
+                                           pMedium->m->strLocationFull.c_str(),
+                                           i_vdError(vrc).c_str());
                 }
 
@@ -9916 +9916 @@
                              task.mVDOperationIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not create the imported medium '%s'%s"),
-                                   targetLocation.c_str(), i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not create the imported medium '%s'%s"),
+                                       targetLocation.c_str(), i_vdError(vrc).c_str());
 
                 size = VDGetFileSize(targetHdd, VD_LAST_IMAGE);
@@ -10094 +10094 @@
                 int vrc = VDPluginLoadFromFilename(strPlugin.c_str());
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_NOT_SUPPORTED,
-                                   tr("Encrypting the image failed because the encryption plugin could not be loaded (%s)"),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_NOT_SUPPORTED, vrc,
+                                       tr("Encrypting the image failed because the encryption plugin could not be loaded (%s)"),
+                                       i_vdError(vrc).c_str());
             }
             else
@@ -10172 +10172 @@
                 vrc = VDFilterAdd(pDisk, "CRYPT", VD_FILTER_FLAGS_WRITE, CryptoSettingsWrite.vdFilterIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_INVALID_OBJECT_STATE,
-                                   tr("Failed to load the encryption filter: %s"),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_INVALID_OBJECT_STATE, vrc,
+                                       tr("Failed to load the encryption filter: %s"),
+                                       i_vdError(vrc).c_str());
             }
             else if (task.mstrNewPasswordId.isNotEmpty() || task.mstrNewPassword.isNotEmpty())
@@ -10207 +10207 @@
                              pMedium->m->vdImageIfaces);
                 if (RT_FAILURE(vrc))
-                    throw setError(VBOX_E_FILE_ERROR,
-                                   tr("Could not open the medium storage unit '%s'%s"),
-                                   pMedium->m->strLocationFull.c_str(),
-                                   i_vdError(vrc).c_str());
+                    throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                       tr("Could not open the medium storage unit '%s'%s"),
+                                       pMedium->m->strLocationFull.c_str(),
+                                       i_vdError(vrc).c_str());
             }
 
@@ -10222 +10222 @@
             vrc = VDPrepareWithFilters(pDisk, task.mVDOperationIfaces);
             if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_FILE_ERROR,
-                               tr("Could not prepare disk images for encryption (%Rrc): %s"),
-                               vrc, i_vdError(vrc).c_str());
+                throw setErrorBoth(VBOX_E_FILE_ERROR, vrc,
+                                   tr("Could not prepare disk images for encryption (%Rrc): %s"),
+                                   vrc, i_vdError(vrc).c_str());
 
             thisLock.acquire();

trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp

@@ -1171 +1171 @@
     int vrc = RTPathUserHome(szHome, sizeof(szHome));
     if (RT_FAILURE(vrc))
-        return setError(E_FAIL,
-                        tr("Cannot determine user home directory (%Rrc)"),
-                        vrc);
+        return setErrorBoth(E_FAIL, vrc,
+                            tr("Cannot determine user home directory (%Rrc)"),
+                            vrc);
     strPath = szHome;
     return S_OK;
@@ -1287 +1287 @@
             m->strAutostartDatabasePath = aPath;
         else
-            rc = setError(E_FAIL,
-                          tr("Cannot set the autostart database path (%Rrc)"),
-                          vrc);
+            rc = setErrorBoth(E_FAIL, vrc,
+                              tr("Cannot set the autostart database path (%Rrc)"),
+                              vrc);
     }
     else
@@ -1297 +1297 @@
             m->strAutostartDatabasePath = "";
         else
-            rc = setError(E_FAIL,
-                          tr("Deleting the autostart database path failed (%Rrc)"),
-                          vrc);
+            rc = setErrorBoth(E_FAIL, vrc,
+                              tr("Deleting the autostart database path failed (%Rrc)"),
+                              vrc);
     }
 

trunk/src/VBox/Main/src-server/USBProxyService.cpp

@@ -949 +949 @@
     va_start(va, aText);
     HRESULT rc = VirtualBoxBase::setErrorInternal(aResultCode,
-                                                    COM_IIDOF(IHost),
-                                                    "USBProxyService",
-                                                    Utf8Str(aText, va),
-                                                    false /* aWarning*/,
-                                                    true /* aLogIt*/);
+                                                  COM_IIDOF(IHost),
+                                                  "USBProxyService",
+                                                  Utf8Str(aText, va),
+                                                  false /* aWarning*/,
+                                                  true /* aLogIt*/);
     va_end(va);
     return rc;

trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp

@@ -319 +319 @@
     }
     else
-        rc = setError(VBOX_E_FILE_ERROR, tr ("Can't open directory '%s' (%Rrc)"), m->strPath.c_str(), vrc);
+        rc = setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr ("Can't open directory '%s' (%Rrc)"), m->strPath.c_str(), vrc);
 
     if (aTask->m_ptrProgress)
@@ -362 +362 @@
             int vrc = RTPathJoin(szPath, sizeof(szPath), m->strPath.c_str(), (*it).c_str());
             if (RT_FAILURE(vrc))
-                throw setError(E_FAIL, tr("Internal Error (%Rrc)"), vrc);
+                throw setErrorBoth(E_FAIL, vrc, tr("Internal Error (%Rrc)"), vrc);
             vrc = RTFileDelete(szPath);
             if (RT_FAILURE(vrc))
-                throw setError(VBOX_E_FILE_ERROR, tr("Can't delete file '%s' (%Rrc)"), szPath, vrc);
+                throw setErrorBoth(VBOX_E_FILE_ERROR, vrc, tr("Can't delete file '%s' (%Rrc)"), szPath, vrc);
             if (aTask->m_ptrProgress)
                 aTask->m_ptrProgress->SetCurrentOperationProgress((ULONG)(fPercentStep * (float)i));

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -401 +401 @@
             int vrc = com::GetVBoxUserHomeDirectory(szHomeDir, sizeof(szHomeDir));
             if (RT_FAILURE(vrc))
-                throw setError(E_FAIL,
-                               tr("Could not create the VirtualBox home directory '%s' (%Rrc)"),
-                               szHomeDir, vrc);
+                throw setErrorBoth(E_FAIL, vrc,
+                                   tr("Could not create the VirtualBox home directory '%s' (%Rrc)"),
+                                   szHomeDir, vrc);
 
             unconst(m->strHomeDir) = szHomeDir;
@@ -2628 +2628 @@
         if (RT_FAILURE(vrc))
         {
-            rc = pTask->that->setError(E_FAIL, tr("Could not create the communication channel (%Rrc)"), vrc);
+            rc = pTask->that->setErrorBoth(E_FAIL, vrc, tr("Could not create the communication channel (%Rrc)"), vrc);
             break;
         }
@@ -2673 +2673 @@
                  * (pressing the Cancel button to close the Run As dialog) */
                 if (vrc2 == VERR_CANCELLED)
-                    rc = pTask->that->setError(E_FAIL, tr("Operation canceled by the user"));
+                    rc = pTask->that->setErrorBoth(E_FAIL, vrc, tr("Operation canceled by the user"));
                 else
-                    rc = pTask->that->setError(E_FAIL, tr("Could not launch a privileged process '%s' (%Rrc)"), exePath, vrc2);
+                    rc = pTask->that->setErrorBoth(E_FAIL, vrc, tr("Could not launch a privileged process '%s' (%Rrc)"), exePath, vrc2);
                 break;
             }
@@ -2685 +2685 @@
             if (RT_FAILURE(vrc))
             {
-                rc = pTask->that->setError(E_FAIL, tr("Could not launch a process '%s' (%Rrc)"), exePath, vrc);
+                rc = pTask->that->setErrorBoth(E_FAIL, vrc, tr("Could not launch a process '%s' (%Rrc)"), exePath, vrc);
                 break;
             }
@@ -2708 +2708 @@
         if (SUCCEEDED(rc) && RT_FAILURE(vrc))
         {
-            rc = pTask->that->setError(E_FAIL, tr("Could not operate the communication channel (%Rrc)"), vrc);
+            rc = pTask->that->setErrorBoth(E_FAIL, vrc, tr("Could not operate the communication channel (%Rrc)"), vrc);
             break;
         }
@@ -4856 +4856 @@
             int vrc = RTDirCreateFullPath(strDir.c_str(), 0700);
             if (RT_FAILURE(vrc))
-                return i_setErrorStatic(VBOX_E_IPRT_ERROR,
-                                        Utf8StrFmt(tr("Could not create the directory '%s' (%Rrc)"),
-                                                   strDir.c_str(),
-                                                   vrc));
+                return i_setErrorStaticBoth(VBOX_E_IPRT_ERROR, vrc,
+                                            Utf8StrFmt(tr("Could not create the directory '%s' (%Rrc)"),
+                                                       strDir.c_str(),
+                                                       vrc));
         }
         else
-            return i_setErrorStatic(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(tr("Directory '%s' does not exist"),
-                                               strDir.c_str()));
+            return i_setErrorStaticBoth(VBOX_E_IPRT_ERROR, VERR_FILE_NOT_FOUND,
+                                        Utf8StrFmt(tr("Directory '%s' does not exist"), strDir.c_str()));
     }