Changeset 78747 in vbox

Timestamp:

May 25, 2019 4:26:09 PM (6 years ago)

Author:

vboxsync

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

130834

Message:

Main/Appliance::i_readImpl: Fixes for regressions introduced by r130427 (bugref:130427) and cleaning up the code, getting rid of the very silly way of returning status codes by exception. Untested.

Location:

trunk/src/VBox/Main

Files:

• include/ApplianceImpl.h (modified) (1 diff)
• src-server/ApplianceImplImport.cpp (modified) (2 diffs)

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

@@ -161 +161 @@
      * @{
      */
-    void    i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
+    HRESULT i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress);
 
     HRESULT i_readFS(TaskOVF *pTask);

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

@@ -89 +89 @@
     }
 
+    /* Parse all necessary info out of the URI (please not how stupid utterly wasteful
+       this status & allocation error throwing is): */
+    try
+    {
+        i_parseURI(aFile, m->locInfo); /* may trhow rc. */
+    }
+    catch (HRESULT aRC)
+    {
+        return aRC;
+    }
+    catch (std::bad_alloc &)
+    {
+        return E_OUTOFMEMORY;
+    }
+
+    // see if we can handle this file; for now we insist it has an ovf/ova extension
+    if (   m->locInfo.storageType == VFSType_File
+        && !aFile.endsWith(".ovf", Utf8Str::CaseInsensitive)
+        && !aFile.endsWith(".ova", Utf8Str::CaseInsensitive))
+        return setError(VBOX_E_FILE_ERROR, tr("Appliance file must have .ovf or .ova extension"));
+
     ComObjPtr<Progress> progress;
-    try
-    {
-        /* Parse all necessary info out of the URI */
-        i_parseURI(aFile, m->locInfo);
-
-        // see if we can handle this file; for now we insist it has an ovf/ova extension
-        if (   m->locInfo.storageType == VFSType_File
-            && !aFile.endsWith(".ovf", Utf8Str::CaseInsensitive)
-            && !aFile.endsWith(".ova", Utf8Str::CaseInsensitive))
-            return setError(VBOX_E_FILE_ERROR, tr("Appliance file must have .ovf or .ova extension"));
-
-        i_readImpl(m->locInfo, progress);
-    }
-    catch (HRESULT aRC)
-    {
-        return aRC;
-    }
-
-    /* Return progress to the caller */
-    progress.queryInterfaceTo(aProgress.asOutParam());
-    return S_OK;
+    HRESULT hrc = i_readImpl(m->locInfo, progress);
+    if (SUCCEEDED(hrc))
+        progress.queryInterfaceTo(aProgress.asOutParam());
+    return hrc;
 }
 
@@ -1109 +1113 @@
  *    called Appliance::readFSOVA(), which called Appliance::i_importImpl(), which then called this again.
  *
+ * @returns COM status with error info set.
  * @param   aLocInfo    The OVF location.
  * @param   aProgress   Where to return the progress object.
- * @throws  COM error codes will be thrown.
  */
-void Appliance::i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
+HRESULT Appliance::i_readImpl(const LocationInfo &aLocInfo, ComObjPtr<Progress> &aProgress)
 {
-    BstrFmt bstrDesc = BstrFmt(tr("Reading appliance '%s'"),
-                               aLocInfo.strPath.c_str());
-    HRESULT rc;
-    /* Create the progress object */
+    /*
+     * Create the progress object.
+     */
+    HRESULT hrc;
     aProgress.createObject();
-    if (aLocInfo.storageType == VFSType_File)
-        /* 1 operation only */
-        rc = aProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                             bstrDesc.raw(),
-                             TRUE /* aCancelable */);
-
-    else if (aLocInfo.storageType == VFSType_Cloud)
-        /* 1 operation only for now */
-        rc = aProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                             "Getting cloud instance information...",
-                             TRUE /* aCancelable */);
-    else
-        /* 4/5 is downloading, 1/5 is reading */
-        rc = aProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
-                             bstrDesc.raw(),
-                             TRUE /* aCancelable */,
-                             2, // ULONG cOperations,
-                             5, // ULONG ulTotalOperationsWeight,
-                             BstrFmt(tr("Download appliance '%s'"),
-                                     aLocInfo.strPath.c_str()).raw(), // CBSTR bstrFirstOperationDescription,
-                             4); // ULONG ulFirstOperationWeight,
-    if (FAILED(rc)) throw rc;
-
-    /* Initialize our worker task */
-    TaskOVF *ovfTask = NULL;
-    TaskCloud *cloudTask = NULL;
     try
     {
-        if (aLocInfo.storageType == VFSType_File)
-        {
-            ovfTask = new TaskOVF(this, TaskOVF::Read, aLocInfo, aProgress);
-            rc = ovfTask->createThread();
-            if (FAILED(rc)) throw rc;
-        }
-        else if (aLocInfo.storageType == VFSType_Cloud)
-        {
-            cloudTask = new TaskCloud(this, TaskCloud::ReadData, aLocInfo, aProgress);
-            rc = cloudTask->createThread();
-            if (FAILED(rc)) throw rc;
-        }
-    }
-    catch (HRESULT aRc)
-    {
-        rc = aRc;
-    }
-    catch (...)
-    {
-        rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                      tr("Could not create a task object for reading the Appliance data"));
-    }
-
-    if (FAILED(rc))
-    {
-        if (ovfTask)
-            delete ovfTask;
-        if (cloudTask)
-            delete cloudTask;
-        throw rc;
-    }
+        if (aLocInfo.storageType == VFSType_Cloud)
+            /* 1 operation only */
+            hrc = aProgress->init(mVirtualBox, static_cast<IAppliance*>(this),
+                                  Utf8Str(tr("Getting cloud instance information...")), TRUE /* aCancelable */);
+        else
+        {
+            Utf8StrFmt strDesc(tr("Reading appliance '%s'"), aLocInfo.strPath.c_str());
+            if (aLocInfo.storageType == VFSType_File)
+                /* 1 operation only */
+                hrc = aProgress->init(mVirtualBox, static_cast<IAppliance*>(this), strDesc, TRUE /* aCancelable */);
+            else
+                /* 4/5 is downloading, 1/5 is reading */
+                hrc = aProgress->init(mVirtualBox, static_cast<IAppliance*>(this), strDesc, TRUE /* aCancelable */,
+                                      2, // ULONG cOperations,
+                                      5, // ULONG ulTotalOperationsWeight,
+                                      Utf8StrFmt(tr("Download appliance '%s'"),
+                                                 aLocInfo.strPath.c_str()).raw(), // CBSTR bstrFirstOperationDescription,
+                                      4); // ULONG ulFirstOperationWeight,
+        }
+    }
+    catch (std::bad_alloc &) /* Utf8Str/Utf8StrFmt */
+    {
+        return E_OUTOFMEMORY;
+    }
+    if (FAILED(hrc))
+        return hrc;
+
+    /*
+     * Initialize the worker task.
+     */
+    ThreadTask *pTask;
+    try
+    {
+        if (aLocInfo.storageType == VFSType_Cloud)
+            pTask = new TaskCloud(this, TaskCloud::ReadData, aLocInfo, aProgress);
+        else
+            pTask = new TaskOVF(this, TaskOVF::Read, aLocInfo, aProgress);
+    }
+    catch (std::bad_alloc &)
+    {
+        return E_OUTOFMEMORY;
+    }
+
+    /*
+     * Kick off the worker thread.
+     */
+    hrc = pTask->createThread();
+    pTask = NULL; /* Note! createThread has consumed the task.*/
+    if (SUCCEEDED(hrc))
+        return hrc;
+    return setError(hrc, tr("Failed to create thread for reading appliance data"));
 }