Changeset 103293 in vbox for trunk/src/VBox

Timestamp:

Feb 9, 2024 2:35:42 PM (12 months ago)

Author:

vboxsync

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

161587

Message:

Main/ConsoleImpl.cpp: Some HRESULT vs. VBox status code mixup fixes, bugref:3409

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -974 +974 @@
                                        ComSafeArrayOut(LONG64, timestamps), ComSafeArrayOut(BSTR, flags))
 {
-    AssertReturn(mControl.isNotNull(), VERR_INVALID_POINTER);
+    AssertReturn(mControl.isNotNull(), E_POINTER);
     return mControl->PullGuestProperties(ComSafeArrayOutArg(names), ComSafeArrayOutArg(values),
                                          ComSafeArrayOutArg(timestamps), ComSafeArrayOutArg(flags));
@@ -5713 +5713 @@
         {
             /* No need to call in the EMT thread. */
-            hrc = ptrVM.vtable()->pfnVMR3SetCpuExecutionCap(ptrVM.rawUVM(), aExecutionCap);
+            int vrc = ptrVM.vtable()->pfnVMR3SetCpuExecutionCap(ptrVM.rawUVM(), aExecutionCap);
+            if (RT_FAILURE(vrc))
+                hrc = setErrorBoth(E_FAIL, vrc, tr("Failed to change the CPU execution limit (%Rrc)"), vrc);
         }
         else
@@ -7500 +7502 @@
     if (   mRecording.mCtx.IsStarted()
         && mRecording.mCtx.IsFeatureEnabled(RecordingFeature_Audio))
-        return mRecording.mCtx.SendAudioFrame(pvData, cbData, uTimestampMs);
+    {
+        int vrc = mRecording.mCtx.SendAudioFrame(pvData, cbData, uTimestampMs);
+        if (RT_FAILURE(vrc))
+            return E_FAIL;
+    }
 
     return S_OK;
@@ -9598 +9604 @@
 
         ComPtr<IVirtualBox> pVirtualBox;
-        mMachine->COMGETTER(Parent)(pVirtualBox.asOutParam());
+        hrc = mMachine->COMGETTER(Parent)(pVirtualBox.asOutParam());
         ComPtr<ISystemProperties> pSystemProperties;
-        if (pVirtualBox)
-            pVirtualBox->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
-        if (pSystemProperties)
-            pSystemProperties->COMGETTER(DefaultCryptoExtPack)(bstrExtPack.asOutParam());
+        if (SUCCEEDED(hrc))
+            hrc = pVirtualBox->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
+        if (SUCCEEDED(hrc))
+            hrc = pSystemProperties->COMGETTER(DefaultCryptoExtPack)(bstrExtPack.asOutParam());
         if (FAILED(hrc))
-            return hrc;
+        {
+            setErrorBoth(hrc, VERR_INVALID_PARAMETER,
+                         tr("Failed to query default extension pack name for the cryptographic module"));
+            return VERR_INVALID_PARAMETER;
+        }
 
         Utf8Str strExtPack(bstrExtPack);