Changeset 105922 in vbox for trunk/src/VBox

Timestamp:

Sep 2, 2024 6:08:46 PM (3 months ago)

Author:

vboxsync

Message:

Unattended: bugref:10511, bugref:10384. Simplify check if the detected guest OS type is supported by the host system.

File:

• trunk/src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (3 diffs)

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

@@ -341 +341 @@
 {
     HRESULT       hrc;
-    HRESULT       getSupportedGuestOSTypesRC;
+
     /* Get a list of guest OS Type Ids supported by the host. */
     ComPtr<ISystemProperties> pSystemProperties;
@@ -353 +353 @@
         if (SUCCEEDED(hrc))
         {
-            getSupportedGuestOSTypesRC = pPlatformProperties->COMGETTER(SupportedGuestOSTypes)(ComSafeArrayAsOutParam(supportedGuestOSTypes));
+            hrc = pPlatformProperties->COMGETTER(SupportedGuestOSTypes)(ComSafeArrayAsOutParam(supportedGuestOSTypes));
+            if (!SUCCEEDED(hrc))
+                supportedGuestOSTypes.resize(0);
         }
     }
@@ -506 +508 @@
     }
 
-    if (SUCCEEDED(getSupportedGuestOSTypesRC))
-    {
-        bool fSupported = false;
-        for (size_t i = 0; i < supportedGuestOSTypes.size() && !fSupported; ++i)
-        {
-            ComPtr<IGuestOSType> guestOSType = supportedGuestOSTypes[i];
-
-            Bstr guestId;
-            guestOSType->COMGETTER(Id)(guestId.asOutParam());
-            if (guestId == mStrDetectedOSTypeId)
-                fSupported = true;
-        }
-        if (!fSupported)
-        {
-            mStrDetectedOSTypeId.setNull();
-            mStrDetectedOSVersion.setNull();
-            mStrDetectedOSFlavor.setNull();
-            mDetectedOSLanguages.clear();
-            mStrDetectedOSHints.setNull();
-            mDetectedImages.clear();
-        }
-    }
+    /* Check if detected OS type is supported (covers platform architecture). */
+    bool fSupported = false;
+    for (size_t i = 0; i < supportedGuestOSTypes.size() && !fSupported; ++i)
+    {
+        ComPtr<IGuestOSType> guestOSType = supportedGuestOSTypes[i];
+
+        Bstr guestId;
+        guestOSType->COMGETTER(Id)(guestId.asOutParam());
+        if (guestId == mStrDetectedOSTypeId)
+            fSupported = true;
+    }
+    if (!fSupported)
+    {
+        mStrDetectedOSTypeId.setNull();
+        mStrDetectedOSVersion.setNull();
+        mStrDetectedOSFlavor.setNull();
+        mDetectedOSLanguages.clear();
+        mStrDetectedOSHints.setNull();
+        mDetectedImages.clear();
+        hrc = E_FAIL;
+    }
+
     /** @todo implement actual detection logic. */
     return hrc;