Changeset 85232 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Jul 11, 2020 4:29:36 PM (5 years ago)

Author:

vboxsync

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

139209

Message:

Main/ExtPackManagerImpl.cpp: Fixed error accumulation bug in ExtPackManager::initExtPackManager() and a few sign warnings. bugref:9790

File:

• trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -1918 +1918 @@
         eik.getVirtualBoxErrorInfo(errorInfo);
     }
-    return pProgressControl->NotifyComplete(uResultCode, errorInfo);
+    return pProgressControl->NotifyComplete((LONG)uResultCode, errorInfo);
 }
 
@@ -2217 +2217 @@
                             m->cUpdate++;
                         }
-                        else if (SUCCEEDED(rc))
+                        else if (SUCCEEDED(hrc))
                             hrc = hrc2;
                     }
@@ -2598 +2598 @@
         {
             *pszSuccessInd = '\0';
-            offStdErrBuf  = pszSuccessInd - pszStdErrBuf;
+            offStdErrBuf  = (size_t)(pszSuccessInd - pszStdErrBuf);
         }
         else if (   ProcStatus.enmReason == RTPROCEXITREASON_NORMAL
@@ -3356 +3356 @@
  * library path.
  *
- * @returns S_OK if a path is returned, COM error status and message return if
- *          not.
+ * @returns VINF_SUCCESS if a path is returned, VBox error status and message
+ *          return if not.
  * @param   a_pstrExtPack       The extension pack.
  * @param   a_pstrVrdeLibrary   Where to return the path.
@@ -3377 +3377 @@
     }
 
-    return hrc;
+    return Global::vboxStatusCodeFromCOM(hrc);
 }