Changeset 105917 in vbox

Timestamp:

Sep 2, 2024 2:30:09 PM (5 months ago)

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (2 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;
+    com::SafeIfaceArray<IGuestOSType> supportedGuestOSTypes;
+
+    hrc = mParent->COMGETTER(SystemProperties)(pSystemProperties.asOutParam());
+    if (SUCCEEDED(hrc))
+    {
+        ComPtr<IPlatformProperties> pPlatformProperties;
+        hrc = pSystemProperties->COMGETTER(Platform)(pPlatformProperties.asOutParam());
+        if (SUCCEEDED(hrc))
+        {
+            getSupportedGuestOSTypesRC = pPlatformProperties->COMGETTER(SupportedGuestOSTypes)(ComSafeArrayAsOutParam(supportedGuestOSTypes));
+        }
+    }
+
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-/** @todo once UDF is implemented properly and we've tested this code a lot
- *        more, replace E_NOTIMPL with E_FAIL. */
+    /** @todo once UDF is implemented properly and we've tested this code a lot
+     *        more, replace E_NOTIMPL with E_FAIL. */
 
     /*
@@ -490 +506 @@
     }
 
+    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();
+        }
+    }
     /** @todo implement actual detection logic. */
     return hrc;