Changeset 85281 in vbox

Timestamp:

Jul 12, 2020 2:44:40 PM (4 years ago)

Author:

vboxsync

Message:

Main/ApplianceImplImport.cpp: Fixed a VERR/HRESULT mixup, change all setErrorVrc/VERR_COM_OBJECT_NOT_FOUND calls to setError/VBOX_E_OBJECT_NOT_FOUND, as that was the cause of the previous mixup (seriously how difficult can this be to get right?). bugref:9790

File:

• trunk/src/VBox/Main/src-server/ApplianceImplExport.cpp (modified) (6 diffs)

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

@@ -936 +936 @@
     {
         if (aLocInfo.strProvider.equals("OCI"))
-        {
             hrc = aProgress->init(mVirtualBox, static_cast<IAppliance *>(this),
                                   Utf8Str(tr("Exporting VM to Cloud...")),
@@ -944 +943 @@
                                   Utf8Str(tr("Exporting VM to Cloud...")), // aFirstOperationDescription
                                   10); // ULONG ulFirstOperationWeight
-        }
         else
-            hrc = setErrorVrc(VBOX_E_NOT_SUPPORTED,
-                              tr("Only \"OCI\" cloud provider is supported for now. \"%s\" isn't supported."),
-                              aLocInfo.strProvider.c_str());
+            hrc = setError(VBOX_E_NOT_SUPPORTED,
+                           tr("Only \"OCI\" cloud provider is supported for now. \"%s\" isn't supported."),
+                           aLocInfo.strProvider.c_str());
         if (SUCCEEDED(hrc))
         {
@@ -2346 +2344 @@
     hrc = mVirtualBox->COMGETTER(CloudProviderManager)(cpm.asOutParam());
     if (FAILED(hrc))
-        return setErrorVrc(VERR_COM_OBJECT_NOT_FOUND, tr("%: Cloud provider manager object wasn't found"), __FUNCTION__);
+        return setError(VBOX_E_OBJECT_NOT_FOUND, tr("%: Cloud provider manager object wasn't found"), __FUNCTION__);
 
     Utf8Str strProviderName = pTask->locInfo.strProvider;
@@ -2354 +2352 @@
 
     if (FAILED(hrc))
-        return setErrorVrc(VERR_COM_OBJECT_NOT_FOUND, tr("%s: Cloud provider object wasn't found"), __FUNCTION__);
+        return setError(VBOX_E_OBJECT_NOT_FOUND, tr("%s: Cloud provider object wasn't found"), __FUNCTION__);
 
     ComPtr<IVirtualSystemDescription> vsd = m->virtualSystemDescriptions.front();
@@ -2365 +2363 @@
 
     hrc = vsd->GetDescriptionByType(VirtualSystemDescriptionType_CloudProfileName,
-                             ComSafeArrayAsOutParam(retTypes),
-                             ComSafeArrayAsOutParam(aRefs),
-                             ComSafeArrayAsOutParam(aOvfValues),
-                             ComSafeArrayAsOutParam(aVBoxValues),
-                             ComSafeArrayAsOutParam(aExtraConfigValues));
+                                    ComSafeArrayAsOutParam(retTypes),
+                                    ComSafeArrayAsOutParam(aRefs),
+                                    ComSafeArrayAsOutParam(aOvfValues),
+                                    ComSafeArrayAsOutParam(aVBoxValues),
+                                    ComSafeArrayAsOutParam(aExtraConfigValues));
     if (FAILED(hrc))
         return hrc;
@@ -2375 +2373 @@
     Utf8Str profileName(aVBoxValues[0]);
     if (profileName.isEmpty())
-        return setErrorVrc(VBOX_E_OBJECT_NOT_FOUND, tr("%s: Cloud user profile name wasn't found"), __FUNCTION__);
+        return setError(VBOX_E_OBJECT_NOT_FOUND, tr("%s: Cloud user profile name wasn't found"), __FUNCTION__);
 
     hrc = cloudProvider->GetProfileByName(aVBoxValues[0], cloudProfile.asOutParam());
     if (FAILED(hrc))
-        return setErrorVrc(VERR_COM_OBJECT_NOT_FOUND, tr("%s: Cloud profile object wasn't found"), __FUNCTION__);
+        return setError(VBOX_E_OBJECT_NOT_FOUND, tr("%s: Cloud profile object wasn't found"), __FUNCTION__);
 
     ComObjPtr<ICloudClient> cloudClient;
     hrc = cloudProfile->CreateCloudClient(cloudClient.asOutParam());
     if (FAILED(hrc))
-        return setErrorVrc(VERR_COM_OBJECT_NOT_FOUND, tr("%s: Cloud client object wasn't found"), __FUNCTION__);
+        return setError(VBOX_E_OBJECT_NOT_FOUND, tr("%s: Cloud client object wasn't found"), __FUNCTION__);
 
     if (m->virtualSystemDescriptions.size() == 1)